mirror
/
SDL
mirror of https://github.com/libsdl-org/SDL.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

VisualC-GDK: Fix Xbox builds

This commit is contained in:
Daniel Ludwig 2024-05-08 15:58:19 +02:00 committed by Sam Lantinga
parent 8af26cf463
commit 22bcee3318
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/video/windows/SDL_windowsevents.c
View File

@ -2114,6 +2114,7 @@ static void WIN_CleanRegisterApp(WNDCLASSEX wcex)
SDL_Appname = NULL; SDL_Appname = NULL;
} }
#if !defined(SDL_PLATFORM_XBOXONE) && !defined(SDL_PLATFORM_XBOXSERIES)
static BOOL CALLBACK WIN_ResourceNameCallback(HMODULE hModule, LPCTSTR lpType, LPTSTR lpName, LONG_PTR lParam) static BOOL CALLBACK WIN_ResourceNameCallback(HMODULE hModule, LPCTSTR lpType, LPTSTR lpName, LONG_PTR lParam)
{ {
WNDCLASSEX *wcex = (WNDCLASSEX *)lParam; WNDCLASSEX *wcex = (WNDCLASSEX *)lParam;
@ -2127,6 +2128,7 @@ static BOOL CALLBACK WIN_ResourceNameCallback(HMODULE hModule, LPCTSTR lpType, L
/* Do not bother enumerating any more. */ /* Do not bother enumerating any more. */
return FALSE; return FALSE;
} }
#endif /*!defined(SDL_PLATFORM_XBOXONE) && !defined(SDL_PLATFORM_XBOXSERIES)*/
/* Register the class for this application */ /* Register the class for this application */
int SDL_RegisterApp(const char *name, Uint32 style, void *hInst) int SDL_RegisterApp(const char *name, Uint32 style, void *hInst)

6
src/video/windows/SDL_windowswindow.c
View File

@ -984,9 +984,11 @@ void WIN_ShowWindow(SDL_VideoDevice *_this, SDL_Window *window)
WIN_SetWindowPosition(_this, window); WIN_SetWindowPosition(_this, window);
} }
#if !defined(SDL_PLATFORM_XBOXONE) && !defined(SDL_PLATFORM_XBOXSERIES)
if (window->flags & SDL_WINDOW_MODAL) { if (window->flags & SDL_WINDOW_MODAL) {
EnableWindow(window->parent->driverdata->hwnd, FALSE); EnableWindow(window->parent->driverdata->hwnd, FALSE);
} }
#endif /*!defined(SDL_PLATFORM_XBOXONE) && !defined(SDL_PLATFORM_XBOXSERIES)*/
hwnd = window->driverdata->hwnd; hwnd = window->driverdata->hwnd;
style = GetWindowLong(hwnd, GWL_EXSTYLE); style = GetWindowLong(hwnd, GWL_EXSTYLE);
@ -1011,9 +1013,11 @@ void WIN_HideWindow(SDL_VideoDevice *_this, SDL_Window *window)
{ {
HWND hwnd = window->driverdata->hwnd; HWND hwnd = window->driverdata->hwnd;
#if !defined(SDL_PLATFORM_XBOXONE) && !defined(SDL_PLATFORM_XBOXSERIES)
if (window->flags & SDL_WINDOW_MODAL) { if (window->flags & SDL_WINDOW_MODAL) {
EnableWindow(window->parent->driverdata->hwnd, TRUE); EnableWindow(window->parent->driverdata->hwnd, TRUE);
} }
#endif /*!defined(SDL_PLATFORM_XBOXONE) && !defined(SDL_PLATFORM_XBOXSERIES)*/
ShowWindow(hwnd, SW_HIDE); ShowWindow(hwnd, SW_HIDE);
@ -1731,6 +1735,7 @@ void WIN_UpdateDarkModeForHWND(HWND hwnd)
int WIN_SetWindowModalFor(SDL_VideoDevice *_this, SDL_Window *modal_window, SDL_Window *parent_window) int WIN_SetWindowModalFor(SDL_VideoDevice *_this, SDL_Window *modal_window, SDL_Window *parent_window)
{ {
#if !defined(SDL_PLATFORM_XBOXONE) && !defined(SDL_PLATFORM_XBOXSERIES)
SDL_WindowData *modal_data = modal_window->driverdata; SDL_WindowData *modal_data = modal_window->driverdata;
const LONG_PTR parent_hwnd = (LONG_PTR)(parent_window ? parent_window->driverdata->hwnd : NULL); const LONG_PTR parent_hwnd = (LONG_PTR)(parent_window ? parent_window->driverdata->hwnd : NULL);
const LONG_PTR old_ptr = GetWindowLongPtr(modal_data->hwnd, GWLP_HWNDPARENT); const LONG_PTR old_ptr = GetWindowLongPtr(modal_data->hwnd, GWLP_HWNDPARENT);
@ -1760,6 +1765,7 @@ int WIN_SetWindowModalFor(SDL_VideoDevice *_this, SDL_Window *modal_window, SDL_
if (!(modal_window->flags & SDL_WINDOW_HIDDEN) && parent_hwnd) { if (!(modal_window->flags & SDL_WINDOW_HIDDEN) && parent_hwnd) {
EnableWindow((HWND)parent_hwnd, FALSE); EnableWindow((HWND)parent_hwnd, FALSE);
} }
#endif /*!defined(SDL_PLATFORM_XBOXONE) && !defined(SDL_PLATFORM_XBOXSERIES)*/
return 0; return 0;
} }