Module: wine Branch: master Commit: 91cf6d716e09976ac1667f33499930d367c7479d URL: https://source.winehq.org/git/wine.git/?a=commit;h=91cf6d716e09976ac1667f334...
Author: Brendan Shanks bshanks@codeweavers.com Date: Mon May 4 18:08:28 2020 -0700
user32: Move DisplayConfig stubs together into sysparams.c.
Signed-off-by: Brendan Shanks bshanks@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/user32/misc.c | 26 -------------------------- dlls/user32/sysparams.c | 44 +++++++++++++++++++++++++++++++++++--------- 2 files changed, 35 insertions(+), 35 deletions(-)
diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index bed5812a47..6e1f60612b 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -240,17 +240,6 @@ DWORD WINAPI SetLogonNotifyWindow(HWINSTA hwinsta,HWND hwnd) return 1; }
-/*********************************************************************** - * QueryDisplayConfig (USER32.@) - */ -LONG WINAPI QueryDisplayConfig(UINT32 flags, UINT32 *numpathelements, DISPLAYCONFIG_PATH_INFO *pathinfo, - UINT32 *numinfoelements, DISPLAYCONFIG_MODE_INFO *modeinfo, - DISPLAYCONFIG_TOPOLOGY_ID *topologyid) -{ - FIXME("(%08x %p %p %p %p %p)\n", flags, numpathelements, pathinfo, numinfoelements, modeinfo, topologyid); - return ERROR_CALL_NOT_IMPLEMENTED; -} - /*********************************************************************** * RegisterSystemThread (USER32.@) */ @@ -545,21 +534,6 @@ BOOL WINAPI IsWindowRedirectedForPrint( HWND hwnd ) return FALSE; }
-/********************************************************************** - * GetDisplayConfigBufferSizes [USER32.@] - */ -LONG WINAPI GetDisplayConfigBufferSizes(UINT32 flags, UINT32 *num_path_info, UINT32 *num_mode_info) -{ - FIXME("(0x%x %p %p): stub\n", flags, num_path_info, num_mode_info); - - if (!num_path_info || !num_mode_info) - return ERROR_INVALID_PARAMETER; - - *num_path_info = 0; - *num_mode_info = 0; - return ERROR_NOT_SUPPORTED; -} - /********************************************************************** * RegisterPointerDeviceNotifications [USER32.@] */ diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index 043742a9bf..c43720eca8 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -3345,15 +3345,6 @@ LONG WINAPI ChangeDisplaySettingsExW( LPCWSTR devname, LPDEVMODEW devmode, HWND }
-/*********************************************************************** - * DisplayConfigGetDeviceInfo (USER32.@) - */ -LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) -{ - FIXME("stub: %p\n", packet); - return ERROR_NOT_SUPPORTED; -} - /*********************************************************************** * EnumDisplaySettingsW (USER32.@) * @@ -4494,3 +4485,38 @@ BOOL WINAPI PhysicalToLogicalPoint( HWND hwnd, POINT *point ) { return TRUE; } + +/********************************************************************** + * GetDisplayConfigBufferSizes (USER32.@) + */ +LONG WINAPI GetDisplayConfigBufferSizes(UINT32 flags, UINT32 *num_path_info, UINT32 *num_mode_info) +{ + FIXME("(0x%x %p %p): stub\n", flags, num_path_info, num_mode_info); + + if (!num_path_info || !num_mode_info) + return ERROR_INVALID_PARAMETER; + + *num_path_info = 0; + *num_mode_info = 0; + return ERROR_NOT_SUPPORTED; +} + +/*********************************************************************** + * QueryDisplayConfig (USER32.@) + */ +LONG WINAPI QueryDisplayConfig(UINT32 flags, UINT32 *numpathelements, DISPLAYCONFIG_PATH_INFO *pathinfo, + UINT32 *numinfoelements, DISPLAYCONFIG_MODE_INFO *modeinfo, + DISPLAYCONFIG_TOPOLOGY_ID *topologyid) +{ + FIXME("(%08x %p %p %p %p %p)\n", flags, numpathelements, pathinfo, numinfoelements, modeinfo, topologyid); + return ERROR_CALL_NOT_IMPLEMENTED; +} + +/*********************************************************************** + * DisplayConfigGetDeviceInfo (USER32.@) + */ +LONG WINAPI DisplayConfigGetDeviceInfo(DISPLAYCONFIG_DEVICE_INFO_HEADER *packet) +{ + FIXME("stub: %p\n", packet); + return ERROR_NOT_SUPPORTED; +}