ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Cleanup WNDPROC functions

This commit is contained in:
twinaphex 2020-01-18 11:34:50 +01:00
parent a01e6652df
commit c26c9483ec
1 changed files with 97 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

134
gfx/common/win32_common.c
View File

@ -89,6 +89,20 @@
#define EDS_ROTATEDMODE 4 #define EDS_ROTATEDMODE 4
#endif #endif
/* These are defined in later SDKs, thus ifdeffed. */
#ifndef WM_POINTERUPDATE
#define WM_POINTERUPDATE 0x0245
#endif
#ifndef WM_POINTERDOWN
#define WM_POINTERDOWN 0x0246
#endif
#ifndef WM_POINTERUP
#define WM_POINTERUP 0x0247
#endif
const GUID GUID_DEVINTERFACE_HID = { 0x4d1e55b2, 0xf16f, 0x11Cf, { 0x88, 0xcb, 0x00, 0x11, 0x11, 0x00, 0x00, 0x30 } }; const GUID GUID_DEVINTERFACE_HID = { 0x4d1e55b2, 0xf16f, 0x11Cf, { 0x88, 0xcb, 0x00, 0x11, 0x11, 0x00, 0x00, 0x30 } };
#if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x501 #if defined(_WIN32_WINNT) && _WIN32_WINNT >= 0x501
static HDEVNOTIFY notification_handler; static HDEVNOTIFY notification_handler;
@ -972,8 +986,33 @@ LRESULT CALLBACK WndProcD3D(HWND hwnd, UINT message,
switch (message) switch (message)
{ {
case WM_MOUSEMOVE:
case WM_POINTERDOWN:
case WM_POINTERUP:
case WM_POINTERUPDATE:
case WM_DEVICECHANGE:
case WM_MOUSEWHEEL:
case WM_MOUSEHWHEEL:
#if _WIN32_WINNT >= 0x0500 /* 2K */
if (g_taskbar_message && message == g_taskbar_message)
taskbar_is_created = true;
#endif
#ifdef HAVE_DINPUT
if (input_get_ptr() == &input_dinput)
{
void* input_data = input_get_data();
if (input_data && dinput_handle_message(input_data,
message, wparam, lparam))
return 0;
}
#endif
break;
case WM_NCLBUTTONDBLCLK: case WM_NCLBUTTONDBLCLK:
doubleclick_on_titlebar = true; doubleclick_on_titlebar = true;
#if _WIN32_WINNT >= 0x0500 /* 2K */
if (g_taskbar_message && message == g_taskbar_message)
taskbar_is_created = true;
#endif
break; break;
case WM_DROPFILES: case WM_DROPFILES:
case WM_SYSCOMMAND: case WM_SYSCOMMAND:
@ -991,6 +1030,10 @@ LRESULT CALLBACK WndProcD3D(HWND hwnd, UINT message,
ret = WndProcCommon(&quit, hwnd, message, wparam, lparam); ret = WndProcCommon(&quit, hwnd, message, wparam, lparam);
if (quit) if (quit)
return ret; return ret;
#if _WIN32_WINNT >= 0x0500 /* 2K */
if (g_taskbar_message && message == g_taskbar_message)
taskbar_is_created = true;
#endif
break; break;
case WM_CREATE: case WM_CREATE:
{ {
@ -1004,20 +1047,6 @@ LRESULT CALLBACK WndProcD3D(HWND hwnd, UINT message,
return 0; return 0;
} }
#if _WIN32_WINNT >= 0x0500 /* 2K */
if (g_taskbar_message && message == g_taskbar_message)
taskbar_is_created = true;
#endif
#ifdef HAVE_DINPUT
if (input_get_ptr() == &input_dinput)
{
void* input_data = input_get_data();
if (input_data && dinput_handle_message(input_data,
message, wparam, lparam))
return 0;
}
#endif
return DefWindowProc(hwnd, message, wparam, lparam); return DefWindowProc(hwnd, message, wparam, lparam);
} }
#endif #endif
@ -1029,11 +1058,31 @@ LRESULT CALLBACK WndProcGL(HWND hwnd, UINT message,
LRESULT ret; LRESULT ret;
bool quit = false; bool quit = false;
switch (message) switch (message)
{ {
case WM_MOUSEMOVE:
case WM_POINTERDOWN:
case WM_POINTERUP:
case WM_POINTERUPDATE:
case WM_DEVICECHANGE:
case WM_MOUSEWHEEL:
case WM_MOUSEHWHEEL:
#if _WIN32_WINNT >= 0x0500 /* 2K */
if (g_taskbar_message && message == g_taskbar_message)
taskbar_is_created = true;
#endif
#ifdef HAVE_DINPUT
if (dinput_wgl && dinput_handle_message(dinput_wgl,
message, wparam, lparam))
return 0;
#endif
break;
case WM_NCLBUTTONDBLCLK: case WM_NCLBUTTONDBLCLK:
doubleclick_on_titlebar = true; doubleclick_on_titlebar = true;
#if _WIN32_WINNT >= 0x0500 /* 2K */
if (g_taskbar_message && message == g_taskbar_message)
taskbar_is_created = true;
#endif
break; break;
case WM_DROPFILES: case WM_DROPFILES:
case WM_SYSCOMMAND: case WM_SYSCOMMAND:
@ -1052,25 +1101,18 @@ LRESULT CALLBACK WndProcGL(HWND hwnd, UINT message,
hwnd, message, wparam, lparam); hwnd, message, wparam, lparam);
if (quit) if (quit)
return ret; return ret;
#if _WIN32_WINNT >= 0x0500 /* 2K */
if (g_taskbar_message && message == g_taskbar_message)
taskbar_is_created = true;
#endif
break; break;
case WM_CREATE: case WM_CREATE:
create_graphics_context(hwnd, &g_win32_quit); create_graphics_context(hwnd, &g_win32_quit);
if (DragAcceptFiles_func) if (DragAcceptFiles_func)
DragAcceptFiles_func(hwnd, true); DragAcceptFiles_func(hwnd, true);
return 0; return 0;
} }
#if _WIN32_WINNT >= 0x0500 /* 2K */
if (g_taskbar_message && message == g_taskbar_message)
taskbar_is_created = true;
#endif
#ifdef HAVE_DINPUT
if (dinput_wgl && dinput_handle_message(dinput_wgl,
message, wparam, lparam))
return 0;
#endif
return DefWindowProc(hwnd, message, wparam, lparam); return DefWindowProc(hwnd, message, wparam, lparam);
} }
#endif #endif
@ -1084,8 +1126,29 @@ LRESULT CALLBACK WndProcGDI(HWND hwnd, UINT message,
switch (message) switch (message)
{ {
case WM_MOUSEMOVE:
case WM_POINTERDOWN:
case WM_POINTERUP:
case WM_POINTERUPDATE:
case WM_DEVICECHANGE:
case WM_MOUSEWHEEL:
case WM_MOUSEHWHEEL:
#if _WIN32_WINNT >= 0x0500 /* 2K */
if (g_taskbar_message && message == g_taskbar_message)
taskbar_is_created = true;
#endif
#ifdef HAVE_DINPUT
if (dinput_gdi && dinput_handle_message(dinput_gdi,
message, wparam, lparam))
return 0;
#endif
break;
case WM_NCLBUTTONDBLCLK: case WM_NCLBUTTONDBLCLK:
doubleclick_on_titlebar = true; doubleclick_on_titlebar = true;
#if _WIN32_WINNT >= 0x0500 /* 2K */
if (g_taskbar_message && message == g_taskbar_message)
taskbar_is_created = true;
#endif
break; break;
case WM_PAINT: case WM_PAINT:
{ {
@ -1120,6 +1183,10 @@ LRESULT CALLBACK WndProcGDI(HWND hwnd, UINT message,
SelectObject(gdi->memDC, gdi->bmp_old); SelectObject(gdi->memDC, gdi->bmp_old);
} }
#if _WIN32_WINNT >= 0x0500 /* 2K */
if (g_taskbar_message && message == g_taskbar_message)
taskbar_is_created = true;
#endif
break; break;
} }
case WM_DROPFILES: case WM_DROPFILES:
@ -1138,25 +1205,18 @@ LRESULT CALLBACK WndProcGDI(HWND hwnd, UINT message,
ret = WndProcCommon(&quit, hwnd, message, wparam, lparam); ret = WndProcCommon(&quit, hwnd, message, wparam, lparam);
if (quit) if (quit)
return ret; return ret;
#if _WIN32_WINNT >= 0x0500 /* 2K */
if (g_taskbar_message && message == g_taskbar_message)
taskbar_is_created = true;
#endif
break; break;
case WM_CREATE: case WM_CREATE:
create_gdi_context(hwnd, &g_win32_quit); create_gdi_context(hwnd, &g_win32_quit);
if (DragAcceptFiles_func) if (DragAcceptFiles_func)
DragAcceptFiles_func(hwnd, true); DragAcceptFiles_func(hwnd, true);
return 0; return 0;
} }
#if _WIN32_WINNT >= 0x0500 /* 2K */
if (g_taskbar_message && message == g_taskbar_message)
taskbar_is_created = true;
#endif
#ifdef HAVE_DINPUT
if (dinput_gdi && dinput_handle_message(dinput_gdi,
message, wparam, lparam))
return 0;
#endif
return DefWindowProc(hwnd, message, wparam, lparam); return DefWindowProc(hwnd, message, wparam, lparam);
} }
#endif #endif