Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-09-28 13:34:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

[WIN32SS] Fix NtUserChangeDisplaySettings, I accidently removed one (unused) param too much (parameter count should be 4 after all), and it seems code relied on this check.

Browse source 
svn path=/trunk/; revision=69159
This commit is contained in:
Stefan Ginsberg 2015-09-09 19:38:36 +00:00
parent db9febf4fa
commit 30ea4eb1ae
4 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
reactos/win32ss/include/ntuser.h
View file

@ -1696,6 +1696,7 @@ NTAPI
NtUserChangeDisplaySettings( NtUserChangeDisplaySettings(
PUNICODE_STRING lpszDeviceName, PUNICODE_STRING lpszDeviceName,
LPDEVMODEW lpDevMode, LPDEVMODEW lpDevMode,
HWND hwnd,
DWORD dwflags); DWORD dwflags);
BOOL BOOL

4
reactos/win32ss/user/ntuser/display.c
View file

@ -814,6 +814,7 @@ APIENTRY
NtUserChangeDisplaySettings( NtUserChangeDisplaySettings(
PUNICODE_STRING pustrDevice, PUNICODE_STRING pustrDevice,
LPDEVMODEW lpDevMode, LPDEVMODEW lpDevMode,
HWND hWnd,
DWORD dwflags) DWORD dwflags)
{ {
WCHAR awcDevice[CCHDEVICENAME]; WCHAR awcDevice[CCHDEVICENAME];
@ -822,7 +823,8 @@ NtUserChangeDisplaySettings(
LONG lRet; LONG lRet;
/* Check arguments */ /* Check arguments */
if (dwflags != CDS_VIDEOPARAMETERS) if ((dwflags != CDS_VIDEOPARAMETERS) ||
(hWnd != NULL))
{ {
EngSetLastError(ERROR_INVALID_PARAMETER); EngSetLastError(ERROR_INVALID_PARAMETER);
return DISP_CHANGE_BADPARAM; return DISP_CHANGE_BADPARAM;

6
reactos/win32ss/user/user32/misc/display.c
View file

@ -457,14 +457,14 @@ ChangeDisplaySettingsExA(
pDevModeW = GdiConvertToDevmodeW(lpDevMode); pDevModeW = GdiConvertToDevmodeW(lpDevMode);
if(pDevModeW) if(pDevModeW)
{ {
rc = NtUserChangeDisplaySettings(pDeviceName, pDevModeW, dwflags); rc = NtUserChangeDisplaySettings(pDeviceName, pDevModeW, hwnd, dwflags);
RtlFreeHeap(GetProcessHeap(), 0, pDevModeW); RtlFreeHeap(GetProcessHeap(), 0, pDevModeW);
} }
else else
rc = DISP_CHANGE_SUCCESSFUL; rc = DISP_CHANGE_SUCCESSFUL;
} }
else else
rc = NtUserChangeDisplaySettings(pDeviceName, NULL, dwflags); rc = NtUserChangeDisplaySettings(pDeviceName, NULL, hwnd, dwflags);
if (lpszDeviceName != NULL) if (lpszDeviceName != NULL)
RtlFreeUnicodeString(&DeviceName); RtlFreeUnicodeString(&DeviceName);
@ -509,7 +509,7 @@ ChangeDisplaySettingsExW(
else else
pDeviceName = NULL; pDeviceName = NULL;
rc = NtUserChangeDisplaySettings(pDeviceName, lpDevMode, dwflags); rc = NtUserChangeDisplaySettings(pDeviceName, lpDevMode, hwnd, dwflags);
return rc; return rc;
} }

2
reactos/win32ss/w32ksvc.h
View file

@ -328,7 +328,7 @@
SVC_(UserCallOneParam, 2) SVC_(UserCallOneParam, 2)
SVC_(UserCallTwoParam, 3) SVC_(UserCallTwoParam, 3)
SVC_(UserChangeClipboardChain, 2) SVC_(UserChangeClipboardChain, 2)
SVC_(UserChangeDisplaySettings, 3) SVC_(UserChangeDisplaySettings, 4)
SVC_(UserCheckImeHotKey, 2) SVC_(UserCheckImeHotKey, 2)
SVC_(UserCheckMenuItem, 3) SVC_(UserCheckMenuItem, 3)
SVC_(UserChildWindowFromPointEx, 4) SVC_(UserChildWindowFromPointEx, 4)