Skip to content

Commit 685073f

Browse files
robin-raymondrobin-raymond
committed
added cppwinrt dispatcher code to zsLib-eventing
1 parent 4621d10 commit 685073f

File tree

6 files changed

+69
-0
lines changed

6 files changed

+69
-0
lines changed

‎projects/msvc/zsLib.Eventing.Tool.Compiler.Universal/zsLib.Eventing.Tool.Compiler.vcxproj

+2
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,7 @@
225225
<ClInclude Include="..\..\..\..\zsLib\zsLib\internal\zsLib_MessageQueueThreadBasic.h" />
226226
<ClInclude Include="..\..\..\..\zsLib\zsLib\internal\zsLib_MessageQueueThreadPool.h" />
227227
<ClInclude Include="..\..\..\..\zsLib\zsLib\internal\zsLib_MessageQueueThreadUsingBlackberryChannels.h" />
228+
<ClInclude Include="..\..\..\..\zsLib\zsLib\internal\zsLib_MessageQueueThreadUsingCurrentGUIMessageQueueForCppWinrt.h" />
228229
<ClInclude Include="..\..\..\..\zsLib\zsLib\internal\zsLib_MessageQueueThreadUsingCurrentGUIMessageQueueForWindows.h" />
229230
<ClInclude Include="..\..\..\..\zsLib\zsLib\internal\zsLib_MessageQueueThreadUsingCurrentGUIMessageQueueForWinUWP.h" />
230231
<ClInclude Include="..\..\..\..\zsLib\zsLib\internal\zsLib_MessageQueueThreadUsingMainThreadMessageQueueForApple.h" />
@@ -357,6 +358,7 @@
357358
<ClCompile Include="..\..\..\..\zsLib\zsLib\cpp\zsLib_MessageQueueThreadBasic.cpp" />
358359
<ClCompile Include="..\..\..\..\zsLib\zsLib\cpp\zsLib_MessageQueueThreadPool.cpp" />
359360
<ClCompile Include="..\..\..\..\zsLib\zsLib\cpp\zsLib_MessageQueueThreadUsingBlackberryChannels.cpp" />
361+
<ClCompile Include="..\..\..\..\zsLib\zsLib\cpp\zsLib_MessageQueueThreadUsingCurrentGUIMessageQueueForCppWinrt.cpp" />
360362
<ClCompile Include="..\..\..\..\zsLib\zsLib\cpp\zsLib_MessageQueueThreadUsingCurrentGUIMessageQueueForWindows.cpp" />
361363
<ClCompile Include="..\..\..\..\zsLib\zsLib\cpp\zsLib_MessageQueueThreadUsingCurrentGUIMessageQueueForWinUWP.cpp" />
362364
<ClCompile Include="..\..\..\..\zsLib\zsLib\cpp\zsLib_MessageQueueThreadUsingMainThreadMessageQueueForApple.cpp" />

‎projects/msvc/zsLib.Eventing.Tool.Compiler.Universal/zsLib.Eventing.Tool.Compiler.vcxproj.filters

+6
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,9 @@
295295
<ClCompile Include="..\..\..\zsLib\eventing\tool\cpp\zsLib_eventing_tool_GenerateStructPython.cpp">
296296
<Filter>zsLib\eventing\tool\cpp</Filter>
297297
</ClCompile>
298+
<ClCompile Include="..\..\..\..\zsLib\zsLib\cpp\zsLib_MessageQueueThreadUsingCurrentGUIMessageQueueForCppWinrt.cpp">
299+
<Filter>zsLib\cpp</Filter>
300+
</ClCompile>
298301
</ItemGroup>
299302
<ItemGroup>
300303
<ClInclude Include="pch.h" />
@@ -609,6 +612,9 @@
609612
<ClInclude Include="..\..\..\zsLib\eventing\tool\internal\zsLib_eventing_tool_GenerateStructPython.h">
610613
<Filter>zsLib\eventing\tool\internal</Filter>
611614
</ClInclude>
615+
<ClInclude Include="..\..\..\..\zsLib\zsLib\internal\zsLib_MessageQueueThreadUsingCurrentGUIMessageQueueForCppWinrt.h">
616+
<Filter>zsLib\internal</Filter>
617+
</ClInclude>
612618
</ItemGroup>
613619
<ItemGroup>
614620
<Image Include="Assets\LockScreenLogo.scale-200.png">

‎projects/msvc/zsLib.Eventing.Tool.Compiler.Win32/zsLib.Eventing.Tool.Compiler.vcxproj

+2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
<ClCompile Include="..\..\..\..\zsLib\zsLib\cpp\zsLib_MessageQueueThreadBasic.cpp" />
3939
<ClCompile Include="..\..\..\..\zsLib\zsLib\cpp\zsLib_MessageQueueThreadPool.cpp" />
4040
<ClCompile Include="..\..\..\..\zsLib\zsLib\cpp\zsLib_MessageQueueThreadUsingBlackberryChannels.cpp" />
41+
<ClCompile Include="..\..\..\..\zsLib\zsLib\cpp\zsLib_MessageQueueThreadUsingCurrentGUIMessageQueueForCppWinrt.cpp" />
4142
<ClCompile Include="..\..\..\..\zsLib\zsLib\cpp\zsLib_MessageQueueThreadUsingCurrentGUIMessageQueueForWindows.cpp" />
4243
<ClCompile Include="..\..\..\..\zsLib\zsLib\cpp\zsLib_MessageQueueThreadUsingCurrentGUIMessageQueueForWinUWP.cpp" />
4344
<ClCompile Include="..\..\..\..\zsLib\zsLib\cpp\zsLib_MessageQueueThreadUsingMainThreadMessageQueueForApple.cpp" />
@@ -203,6 +204,7 @@
203204
<ClInclude Include="..\..\..\..\zsLib\zsLib\internal\zsLib_MessageQueueThreadBasic.h" />
204205
<ClInclude Include="..\..\..\..\zsLib\zsLib\internal\zsLib_MessageQueueThreadPool.h" />
205206
<ClInclude Include="..\..\..\..\zsLib\zsLib\internal\zsLib_MessageQueueThreadUsingBlackberryChannels.h" />
207+
<ClInclude Include="..\..\..\..\zsLib\zsLib\internal\zsLib_MessageQueueThreadUsingCurrentGUIMessageQueueForCppWinrt.h" />
206208
<ClInclude Include="..\..\..\..\zsLib\zsLib\internal\zsLib_MessageQueueThreadUsingCurrentGUIMessageQueueForWindows.h" />
207209
<ClInclude Include="..\..\..\..\zsLib\zsLib\internal\zsLib_MessageQueueThreadUsingCurrentGUIMessageQueueForWinUWP.h" />
208210
<ClInclude Include="..\..\..\..\zsLib\zsLib\internal\zsLib_MessageQueueThreadUsingMainThreadMessageQueueForApple.h" />

‎projects/msvc/zsLib.Eventing.Tool.Compiler.Win32/zsLib.Eventing.Tool.Compiler.vcxproj.filters

+6
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,9 @@
242242
<ClCompile Include="..\..\..\zsLib\eventing\tool\cpp\zsLib_eventing_tool_GenerateStructCppWinrt.cpp">
243243
<Filter>zsLib\eventing\tool\cpp</Filter>
244244
</ClCompile>
245+
<ClCompile Include="..\..\..\..\zsLib\zsLib\cpp\zsLib_MessageQueueThreadUsingCurrentGUIMessageQueueForCppWinrt.cpp">
246+
<Filter>zsLib\cpp</Filter>
247+
</ClCompile>
245248
</ItemGroup>
246249
<ItemGroup>
247250
<ClInclude Include="..\..\..\..\zsLib\zsLib\extras\uuid\config.h">
@@ -571,6 +574,9 @@
571574
<ClInclude Include="..\..\..\zsLib\eventing\tool\internal\zsLib_eventing_tool_GenerateStructCppWinrt.h">
572575
<Filter>zsLib\eventing\tool\internal</Filter>
573576
</ClInclude>
577+
<ClInclude Include="..\..\..\..\zsLib\zsLib\internal\zsLib_MessageQueueThreadUsingCurrentGUIMessageQueueForCppWinrt.h">
578+
<Filter>zsLib\internal</Filter>
579+
</ClInclude>
574580
</ItemGroup>
575581
<ItemGroup>
576582
<Midl Include="..\..\..\..\zsLib\zsLib\idl\std.idl">

‎zsLib/eventing/IHelper.h

+28
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,15 @@ either expressed or implied, of the FreeBSD Project.
3131

3232
#pragma once
3333

34+
#ifdef WINUWP
35+
#ifdef __cplusplus_winrt
36+
#include <windows.ui.core.h>
37+
#endif //__cplusplus_winrt
38+
#ifdef CPPWINRT_VERSION
39+
#include <winrt/windows.ui.core.h>
40+
#endif //CPPWINRT_VERSION
41+
#endif //WINUWP
42+
3443
#include <zsLib/eventing/types.h>
3544
#include <zsLib/IHelper.h>
3645

@@ -46,7 +55,26 @@ namespace zsLib
4655
{
4756
static void setup() noexcept;
4857
#ifdef WINUWP
58+
#ifdef __cplusplus_winrt
4959
static void setup(Windows::UI::Core::CoreDispatcher ^dispatcher) noexcept;
60+
#endif //__cplusplus_winrt
61+
#ifdef CPPWINRT_VERSION
62+
static void setup(winrt::Windows::UI::Core::CoreDispatcher dispatcher) noexcept;
63+
#endif //CPPWINRT_VERSION
64+
#endif //WINUWP
65+
66+
#ifdef WINUWP
67+
68+
#ifdef __cplusplus_winrt
69+
#include <windows.ui.core.h>
70+
#endif //__cplusplus_winrt
71+
72+
#ifdef __has_include
73+
#if __has_include(<winrt/windows.ui.core.h>)
74+
#include <winrt/windows.ui.core.h>
75+
#endif //__has_include(<winrt/windows.ui.core.h>)
76+
#endif //__has_include
77+
5078
#endif //WINUWP
5179

5280
static SecureByteBlockPtr loadFile(const char *path) noexcept(false); // throws StdError

‎zsLib/eventing/cpp/zsLib_eventing_Helper.cpp

+25
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,20 @@ either expressed or implied, of the FreeBSD Project.
2929
3030
*/
3131

32+
#ifdef WINUWP
33+
34+
#ifdef __cplusplus_winrt
35+
#include <windows.ui.core.h>
36+
#endif //__cplusplus_winrt
37+
38+
#ifdef __has_include
39+
#if __has_include(<winrt/windows.ui.core.h>)
40+
#include <winrt/windows.ui.core.h>
41+
#endif //__has_include(<winrt/windows.ui.core.h>)
42+
#endif //__has_include
43+
44+
#endif //WINUWP
45+
3246
#include <zsLib/eventing/internal/zsLib_eventing_Helper.h>
3347

3448
#include <zsLib/Numeric.h>
@@ -152,13 +166,24 @@ namespace zsLib
152166
}
153167

154168
#ifdef WINUWP
169+
#ifdef __cplusplus_winrt
155170
//-------------------------------------------------------------------------
156171
void IHelper::setup(Windows::UI::Core::CoreDispatcher ^dispatcher) noexcept
157172
{
158173
zsLib::IHelper::setup(dispatcher);
159174
internal::CryptoPPHelper::singleton();
160175
internal::installRemoteEventingSettingsDefaults();
161176
}
177+
#endif //__cplusplus_winrt
178+
#ifdef CPPWINRT_VERSION
179+
//-------------------------------------------------------------------------
180+
void IHelper::setup(winrt::Windows::UI::Core::CoreDispatcher dispatcher) noexcept
181+
{
182+
zsLib::IHelper::setup(dispatcher);
183+
internal::CryptoPPHelper::singleton();
184+
internal::installRemoteEventingSettingsDefaults();
185+
}
186+
#endif //CPPWINRT_VERSION
162187
#endif //WINUWP
163188

164189
//-------------------------------------------------------------------------

0 commit comments

Comments
 (0)