eden-emu/SDL
18
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Xbox buildfixes

Browse source
This commit is contained in:
Ethan Lee 2024-08-04 15:31:15 -04:00
parent 4b3a80bb73
commit 4bea89e945
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/video/windows/SDL_windowsvideo.c
View file

@ -473,12 +473,14 @@ int WIN_VideoInit(SDL_VideoDevice *_this)
if (SUCCEEDED(hr)) { if (SUCCEEDED(hr)) {
data->coinitialized = SDL_TRUE; data->coinitialized = SDL_TRUE;
#if !(defined(SDL_PLATFORM_XBOXONE) || defined(SDL_PLATFORM_XBOXSERIES))
hr = OleInitialize(NULL); hr = OleInitialize(NULL);
if (SUCCEEDED(hr)) { if (SUCCEEDED(hr)) {
data->oleinitialized = SDL_TRUE; data->oleinitialized = SDL_TRUE;
} else { } else {
SDL_LogInfo(SDL_LOG_CATEGORY_VIDEO, "OleInitialize() failed: 0x%.8x, using fallback drag-n-drop functionality\n", (unsigned int)hr); SDL_LogInfo(SDL_LOG_CATEGORY_VIDEO, "OleInitialize() failed: 0x%.8x, using fallback drag-n-drop functionality\n", (unsigned int)hr);
} }
#endif /* !(defined(SDL_PLATFORM_XBOXONE) || defined(SDL_PLATFORM_XBOXSERIES)) */
} else { } else {
SDL_LogInfo(SDL_LOG_CATEGORY_VIDEO, "CoInitialize() failed: 0x%.8x, using fallback drag-n-drop functionality\n", (unsigned int)hr); SDL_LogInfo(SDL_LOG_CATEGORY_VIDEO, "CoInitialize() failed: 0x%.8x, using fallback drag-n-drop functionality\n", (unsigned int)hr);
} }
@ -543,10 +545,12 @@ void WIN_VideoQuit(SDL_VideoDevice *_this)
WIN_SetRawMouseEnabled(_this, SDL_FALSE); WIN_SetRawMouseEnabled(_this, SDL_FALSE);
WIN_SetRawKeyboardEnabled(_this, SDL_FALSE); WIN_SetRawKeyboardEnabled(_this, SDL_FALSE);
#if !(defined(SDL_PLATFORM_XBOXONE) || defined(SDL_PLATFORM_XBOXSERIES))
if (data->oleinitialized) { if (data->oleinitialized) {
OleUninitialize(); OleUninitialize();
data->oleinitialized = SDL_FALSE; data->oleinitialized = SDL_FALSE;
} }
#endif /* !(defined(SDL_PLATFORM_XBOXONE) || defined(SDL_PLATFORM_XBOXSERIES)) */
if (data->coinitialized) { if (data->coinitialized) {
WIN_CoUninitialize(); WIN_CoUninitialize();
data->coinitialized = SDL_FALSE; data->coinitialized = SDL_FALSE;

2
src/video/windows/SDL_windowsvideo.h
View file

@ -380,7 +380,9 @@ struct SDL_VideoData
int render; int render;
SDL_bool coinitialized; SDL_bool coinitialized;
#if !(defined(SDL_PLATFORM_XBOXONE) || defined(SDL_PLATFORM_XBOXSERIES))
SDL_bool oleinitialized; SDL_bool oleinitialized;
#endif /* !(defined(SDL_PLATFORM_XBOXONE) || defined(SDL_PLATFORM_XBOXSERIES)) */
DWORD clipboard_count; DWORD clipboard_count;

3
src/video/windows/SDL_windowswindow.c
View file

@ -589,11 +589,10 @@ static void CleanupWindowData(SDL_VideoDevice *_this, SDL_Window *window)
if (data) { if (data) {
SDL_DelHintCallback(SDL_HINT_MOUSE_RELATIVE_MODE_CENTER, WIN_MouseRelativeModeCenterChanged, data); SDL_DelHintCallback(SDL_HINT_MOUSE_RELATIVE_MODE_CENTER, WIN_MouseRelativeModeCenterChanged, data);
#if !defined(SDL_PLATFORM_XBOXONE) && !defined(SDL_PLATFORM_XBOXSERIES)
if (data->drop_target) { if (data->drop_target) {
WIN_AcceptDragAndDrop(window, SDL_FALSE); WIN_AcceptDragAndDrop(window, SDL_FALSE);
} }
#if !defined(SDL_PLATFORM_XBOXONE) && !defined(SDL_PLATFORM_XBOXSERIES)
if (data->ICMFileName) { if (data->ICMFileName) {
SDL_free(data->ICMFileName); SDL_free(data->ICMFileName);
} }