Skip to content

Commit 354dd95

Browse files
SternXDSternXD
committed
UWP/WinRT: Fix Errors with rebase and fix testdraw project
1 parent 5f5fe5d commit 354dd95

File tree

9 files changed

+301
-28
lines changed

9 files changed

+301
-28
lines changed

‎VisualC-WinRT/SDL-UWP.vcxproj‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@
8686
<ClInclude Include="..\src\core\windows\SDL_xinput.h" />
8787
<ClInclude Include="..\src\core\winrt\SDL_winrtapp_common.h" />
8888
<ClInclude Include="..\src\core\winrt\SDL_winrtapp_direct3d.h" />
89+
<ClInclude Include="..\src\core\winrt\SDL_winrtapp_xaml.h" />
8990
<ClInclude Include="..\src\cpuinfo\SDL_cpuinfo_c.h" />
9091
<ClInclude Include="..\src\dynapi\SDL_dynapi.h" />
9192
<ClInclude Include="..\src\dynapi\SDL_dynapi_overrides.h" />
@@ -238,6 +239,11 @@
238239
<PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)$(TargetName)_cpp.pch</PrecompiledHeaderOutputFile>
239240
<PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)$(TargetName)_cpp.pch</PrecompiledHeaderOutputFile>
240241
</ClCompile>
242+
<ClCompile Include="..\src\core\winrt\SDL_winrtapp_xaml.cpp">
243+
<CompileAsWinRT>true</CompileAsWinRT>
244+
<PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(IntDir)$(TargetName)_cpp.pch</PrecompiledHeaderOutputFile>
245+
<PrecompiledHeaderOutputFile Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(IntDir)$(TargetName)_cpp.pch</PrecompiledHeaderOutputFile>
246+
</ClCompile>
241247
<ClCompile Include="..\src\cpuinfo\SDL_cpuinfo.c" />
242248
<ClCompile Include="..\src\dynapi\SDL_dynapi.c">
243249
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
@@ -519,11 +525,11 @@
519525
<IncludePath>$(SolutionDir)/../src;$(IncludePath)</IncludePath>
520526
</PropertyGroup>
521527
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
522-
<ClCompile>
523-
<PrecompiledHeader>Use</PrecompiledHeader>
524-
<CompileAsWinRT>false</CompileAsWinRT>
525-
<AdditionalIncludeDirectories>$(ProjectDir)\..\include;$(ProjectDir)\..\include\build_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
526-
<PreprocessorDefinitions>__XBOXSERIES__;SDL_PLATFORM_XBOXSERIES;DLL_EXPORT;_CRT_SECURE_NO_WARNINGS;SDL_BUILDING_WINRT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
528+
<ClCompile>
529+
<PrecompiledHeader>Use</PrecompiledHeader>
530+
<CompileAsWinRT>false</CompileAsWinRT>
531+
<AdditionalIncludeDirectories>$(ProjectDir)\..\include;$(ProjectDir)\..\include\build_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
532+
<PreprocessorDefinitions>__XBOXSERIES__;SDL_PLATFORM_XBOXSERIES;DLL_EXPORT;_CRT_SECURE_NO_WARNINGS;SDL_BUILDING_WINRT=1;SDL_VIDEO_RENDER_D3D11=1;SDL_TRAY_DUMMY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
527533
<PrecompiledHeaderFile>SDL_internal.h</PrecompiledHeaderFile>
528534
</ClCompile>
529535
<Link>
@@ -534,11 +540,11 @@
534540
</Link>
535541
</ItemDefinitionGroup>
536542
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
537-
<ClCompile>
538-
<PrecompiledHeader>Use</PrecompiledHeader>
539-
<CompileAsWinRT>false</CompileAsWinRT>
540-
<AdditionalIncludeDirectories>$(ProjectDir)\..\include;$(ProjectDir)\..\include\build_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
541-
<PreprocessorDefinitions>__XBOXSERIES__;SDL_PLATFORM_XBOXSERIES;DLL_EXPORT;_CRT_SECURE_NO_WARNINGS;SDL_BUILDING_WINRT=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
543+
<ClCompile>
544+
<PrecompiledHeader>Use</PrecompiledHeader>
545+
<CompileAsWinRT>false</CompileAsWinRT>
546+
<AdditionalIncludeDirectories>$(ProjectDir)\..\include;$(ProjectDir)\..\include\build_config;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
547+
<PreprocessorDefinitions>__XBOXSERIES__;SDL_PLATFORM_XBOXSERIES;DLL_EXPORT;_CRT_SECURE_NO_WARNINGS;SDL_BUILDING_WINRT=1;SDL_VIDEO_RENDER_D3D11=1;SDL_TRAY_DUMMY;%(PreprocessorDefinitions)</PreprocessorDefinitions>
542548
<PrecompiledHeaderFile>SDL_internal.h</PrecompiledHeaderFile>
543549
</ClCompile>
544550
<Link>

‎VisualC-WinRT/testdraw/testdraw.vcxproj‎

Lines changed: 26 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@
140140
<AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\include</AdditionalIncludeDirectories>
141141
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
142142
<DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
143-
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
143+
<PreprocessorDefinitions>_DEBUG;SDL_PLATFORM_WINRT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
144144
<CompileAsWinRT>false</CompileAsWinRT>
145145
<PrecompiledHeader>NotUsing</PrecompiledHeader>
146146
</ClCompile>
@@ -157,7 +157,7 @@
157157
<AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\include</AdditionalIncludeDirectories>
158158
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
159159
<DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
160-
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
160+
<PreprocessorDefinitions>NDEBUG;SDL_PLATFORM_WINRT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
161161
<CompileAsWinRT>false</CompileAsWinRT>
162162
<PrecompiledHeader>NotUsing</PrecompiledHeader>
163163
</ClCompile>
@@ -174,7 +174,7 @@
174174
<AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\include</AdditionalIncludeDirectories>
175175
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
176176
<DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
177-
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
177+
<PreprocessorDefinitions>_DEBUG;SDL_PLATFORM_WINRT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
178178
<CompileAsWinRT>false</CompileAsWinRT>
179179
<PrecompiledHeader>NotUsing</PrecompiledHeader>
180180
</ClCompile>
@@ -191,7 +191,7 @@
191191
<AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\include</AdditionalIncludeDirectories>
192192
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
193193
<DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
194-
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
194+
<PreprocessorDefinitions>NDEBUG;SDL_PLATFORM_WINRT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
195195
<CompileAsWinRT>false</CompileAsWinRT>
196196
<PrecompiledHeader>NotUsing</PrecompiledHeader>
197197
</ClCompile>
@@ -208,7 +208,7 @@
208208
<AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\include</AdditionalIncludeDirectories>
209209
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
210210
<DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
211-
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
211+
<PreprocessorDefinitions>_DEBUG;SDL_PLATFORM_WINRT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
212212
<CompileAsWinRT>false</CompileAsWinRT>
213213
<PrecompiledHeader>NotUsing</PrecompiledHeader>
214214
</ClCompile>
@@ -225,7 +225,7 @@
225225
<AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\include</AdditionalIncludeDirectories>
226226
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
227227
<DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
228-
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
228+
<PreprocessorDefinitions>NDEBUG;SDL_PLATFORM_WINRT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
229229
<CompileAsWinRT>false</CompileAsWinRT>
230230
<PrecompiledHeader>NotUsing</PrecompiledHeader>
231231
</ClCompile>
@@ -242,7 +242,7 @@
242242
<AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\include</AdditionalIncludeDirectories>
243243
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
244244
<DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
245-
<PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
245+
<PreprocessorDefinitions>_DEBUG;SDL_PLATFORM_WINRT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
246246
<CompileAsWinRT>false</CompileAsWinRT>
247247
<PrecompiledHeader>NotUsing</PrecompiledHeader>
248248
</ClCompile>
@@ -259,7 +259,7 @@
259259
<AdditionalIncludeDirectories>$(ProjectDir);$(IntermediateOutputPath);..\..\include</AdditionalIncludeDirectories>
260260
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
261261
<DisableSpecificWarnings>4453;28204</DisableSpecificWarnings>
262-
<PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
262+
<PreprocessorDefinitions>NDEBUG;SDL_PLATFORM_WINRT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
263263
<CompileAsWinRT>false</CompileAsWinRT>
264264
<PrecompiledHeader>NotUsing</PrecompiledHeader>
265265
</ClCompile>
@@ -318,6 +318,24 @@
318318
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
319319
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsWinRT>
320320
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsWinRT>
321+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
322+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
323+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">true</ExcludedFromBuild>
324+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">true</ExcludedFromBuild>
325+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</ExcludedFromBuild>
326+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</ExcludedFromBuild>
327+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
328+
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
329+
</ClCompile>
330+
<ClCompile Include="..\..\test\testdraw_winrt.c">
331+
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
332+
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
333+
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">false</CompileAsWinRT>
334+
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">false</CompileAsWinRT>
335+
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
336+
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
337+
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsWinRT>
338+
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsWinRT>
321339
</ClCompile>
322340
</ItemGroup>
323341
<ItemGroup>

‎src/audio/wasapi/SDL_wasapi.c‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ static ManagementThreadPendingTask *ManagementThreadPendingTasks = NULL;
7474
static SDL_Mutex *ManagementThreadLock = NULL;
7575
static SDL_Condition *ManagementThreadCondition = NULL;
7676
static SDL_AtomicInt ManagementThreadShutdown;
77+
static bool immdevice_initialized = false;
7778

7879
static void ManagementThreadMainloop(void)
7980
{

‎src/core/windows/SDL_immdevice.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ static const ERole SDL_IMMDevice_role = eConsole; // !!! FIXME: should this be e
3838
// This is global to the WASAPI target, to handle hotplug and default device lookup.
3939
static IMMDeviceEnumerator *enumerator = NULL;
4040
static SDL_IMMDevice_callbacks immcallbacks;
41+
static bool immdevice_initialized = false;
4142

4243
// PropVariantInit() is an inline function/macro in PropIdl.h that calls the C runtime's memset() directly. Use ours instead, to avoid dependency.
4344
#ifdef PropVariantInit
@@ -322,6 +323,7 @@ bool SDL_IMMDevice_Init(const SDL_IMMDevice_callbacks *callbacks)
322323
immcallbacks.default_audio_device_changed = SDL_DefaultAudioDeviceChanged;
323324
}
324325

326+
immdevice_initialized = true;
325327
return true;
326328
}
327329

@@ -334,6 +336,7 @@ void SDL_IMMDevice_Quit(void)
334336
}
335337

336338
SDL_zero(immcallbacks);
339+
immdevice_initialized = false;
337340

338341
WIN_CoUninitialize();
339342
}

‎src/core/windows/SDL_windows.c‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ static const TCHAR *SDL_HelperWindowClassName = TEXT("SDLHelperWindowInputCatche
9090
static const TCHAR *SDL_HelperWindowName = TEXT("SDLHelperWindowInputMsgWindow");
9191
static ATOM SDL_HelperWindowClass = 0;
9292

93+
#if !defined(SDL_PLATFORM_WINRT) && !defined(SDL_PLATFORM_XBOXONE) && !defined(SDL_PLATFORM_XBOXSERIES)
9394
/*
9495
* Creates a HelperWindow used for DirectInput.
9596
*/
@@ -155,10 +156,9 @@ void SDL_HelperWindowDestroy(void)
155156
SDL_HelperWindowClass = 0;
156157
}
157158
}
158-
#else
159-
// Stub implementations for UWP/Xbox platforms
160-
HWND SDL_HelperWindow = NULL;
159+
#endif
161160

161+
// Stub implementations for UWP/Xbox platforms
162162
bool SDL_HelperWindowCreate(void)
163163
{
164164
return true; // No-op for UWP/Xbox
@@ -168,7 +168,6 @@ void SDL_HelperWindowDestroy(void)
168168
{
169169
// No-op for UWP/Xbox
170170
}
171-
#endif
172171

173172
// Sets an error message based on an HRESULT
174173
bool WIN_SetErrorFromHRESULT(const char *prefix, HRESULT hr)

‎src/render/direct3d11/SDL_render_d3d11.c‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -543,10 +543,13 @@ static HRESULT D3D11_CreateDeviceResources(SDL_Renderer *renderer)
543543
{
544544
typedef HRESULT (WINAPI *pfnCreateDXGIFactory)(REFIID riid, void **ppFactory);
545545
typedef HRESULT (WINAPI *pfnCreateDXGIFactory2)(UINT flags, REFIID riid, void **ppFactory);
546+
typedef HRESULT (WINAPI *PFN_D3D11_CREATE_DEVICE)(IDXGIAdapter *, D3D_DRIVER_TYPE, HMODULE, UINT, const D3D_FEATURE_LEVEL *, UINT, UINT, ID3D11Device **, D3D_FEATURE_LEVEL *, ID3D11DeviceContext **);
546547
pfnCreateDXGIFactory pCreateDXGIFactory = NULL;
547548
pfnCreateDXGIFactory2 pCreateDXGIFactory2 = NULL;
548549
D3D11_RenderData *data = (D3D11_RenderData *)renderer->internal;
549550
PFN_D3D11_CREATE_DEVICE pD3D11CreateDevice;
551+
pfnCreateDXGIFactory2 CreateDXGIFactory2Func = NULL;
552+
PFN_D3D11_CREATE_DEVICE D3D11CreateDeviceFunc = NULL;
550553
IDXGIAdapter *dxgiAdapter = NULL;
551554
ID3D11Device *d3dDevice = NULL;
552555
ID3D11DeviceContext *d3dContext = NULL;
@@ -583,13 +586,15 @@ static HRESULT D3D11_CreateDeviceResources(SDL_Renderer *renderer)
583586
#ifdef SDL_PLATFORM_WINRT
584587
CreateDXGIFactory2Func = CreateDXGIFactory2;
585588
D3D11CreateDeviceFunc = D3D11CreateDevice;
589+
// For WinRT, we use the direct function pointers
590+
pCreateDXGIFactory2 = CreateDXGIFactory2Func;
591+
pD3D11CreateDevice = D3D11CreateDeviceFunc;
586592
#else
587593
data->hDXGIMod = SDL_LoadObject("dxgi.dll");
588594
if (!data->hDXGIMod) {
589595
result = E_FAIL;
590596
goto done;
591597
}
592-
#endif // SDL_PLATFORM_WINRT
593598

594599
pCreateDXGIFactory2 = (pfnCreateDXGIFactory2)SDL_LoadFunction(data->hDXGIMod, "CreateDXGIFactory2");
595600
if (!pCreateDXGIFactory2) {
@@ -611,6 +616,7 @@ static HRESULT D3D11_CreateDeviceResources(SDL_Renderer *renderer)
611616
result = E_FAIL;
612617
goto done;
613618
}
619+
#endif // SDL_PLATFORM_WINRT
614620

615621
if (createDebug) {
616622
#ifdef __IDXGIInfoQueue_INTERFACE_DEFINED__
@@ -998,6 +1004,7 @@ static HRESULT D3D11_CreateSwapChain(SDL_Renderer *renderer, int w, int h)
9981004
goto done;
9991005
#endif
10001006
} else {
1007+
// Desktop Windows case
10011008
#if defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_WINGDK)
10021009
HWND hwnd = (HWND)SDL_GetPointerProperty(SDL_GetWindowProperties(renderer->window), SDL_PROP_WINDOW_WIN32_HWND_POINTER, NULL);
10031010
if (!hwnd) {
@@ -1022,7 +1029,7 @@ static HRESULT D3D11_CreateSwapChain(SDL_Renderer *renderer, int w, int h)
10221029
#else
10231030
SDL_SetError(__FUNCTION__ ", Unable to find something to attach a swap chain to");
10241031
goto done;
1025-
#endif // defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_WINGDK) / else
1032+
#endif // defined(SDL_PLATFORM_WIN32) || defined(SDL_PLATFORM_WINGDK)
10261033
}
10271034
data->swapEffect = swapChainDesc.SwapEffect;
10281035

@@ -1159,7 +1166,7 @@ static HRESULT D3D11_CreateWindowSizeDependentResources(SDL_Renderer *renderer)
11591166
*
11601167
* TODO, WinRT: reexamine the docs for IDXGISwapChain1::SetRotation, see if might be available, usable, and prudent-to-call on WinPhone 8.1
11611168
*/
1162-
#endif
1169+
11631170
if (WIN_IsWindows8OrGreater()) {
11641171
if (data->swapEffect == DXGI_SWAP_EFFECT_FLIP_SEQUENTIAL) {
11651172
result = IDXGISwapChain1_SetRotation(data->swapChain, data->rotation);
@@ -1169,7 +1176,6 @@ static HRESULT D3D11_CreateWindowSizeDependentResources(SDL_Renderer *renderer)
11691176
}
11701177
}
11711178
}
1172-
#endif
11731179

11741180
result = IDXGISwapChain_GetBuffer(data->swapChain,
11751181
0,
@@ -1204,6 +1210,7 @@ static HRESULT D3D11_CreateWindowSizeDependentResources(SDL_Renderer *renderer)
12041210
done:
12051211
SAFE_RELEASE(backBuffer);
12061212
return result;
1213+
#endif // !SDL_WINAPI_FAMILY_PHONE
12071214
}
12081215

12091216
static bool D3D11_HandleDeviceLost(SDL_Renderer *renderer)

‎src/video/winrt/SDL_winrtvideo.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,8 +252,8 @@ bool WINRT_VideoInit(SDL_VideoDevice *_this)
252252
}
253253

254254
// Assume we have a mouse and keyboard
255-
SDL_AddKeyboard(SDL_DEFAULT_KEYBOARD_ID, NULL, false);
256-
SDL_AddMouse(SDL_DEFAULT_MOUSE_ID, NULL, false);
255+
SDL_AddKeyboard(SDL_DEFAULT_KEYBOARD_ID, NULL);
256+
SDL_AddMouse(SDL_DEFAULT_MOUSE_ID, NULL);
257257

258258
return true;
259259
}

‎test/main.cpp‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,13 @@
88

99
#include <SDL3/SDL_main.h>
1010

11+
#ifdef SDL_PLATFORM_WINRT
12+
extern "C" int testdraw_main(int argc, char *argv[]);
13+
14+
int main(int argc, char *argv[])
15+
{
16+
return testdraw_main(argc, argv);
17+
}
18+
#else
1119
// that's all, folks!
20+
#endif

0 commit comments

Comments
 (0)