9 Sep
2015
9 Sep
'15
7:12 p.m.
Author: sginsberg
Date: Wed Sep 9 19:12:48 2015
New Revision: 69158
URL: http://svn.reactos.org/svn/reactos?rev=69158&view=rev
Log:
[WIN32SS] Fix NtGdiOpenDCW and NtUserChangeDisplaySettings to have the correct amount of
parameters by removing two more unused/deprecated/ignored parameters.
NtUserEnumDisplayMonitors is the only remaining one now, which needs to do a usermode
callback to get rid of its extra parameter.
Modified:
trunk/reactos/include/psdk/ntgdi.h
trunk/reactos/win32ss/gdi/gdi32/objects/dc.c
trunk/reactos/win32ss/gdi/ntgdi/dclife.c
trunk/reactos/win32ss/include/ntuser.h
trunk/reactos/win32ss/user/ntuser/display.c
trunk/reactos/win32ss/user/user32/misc/display.c
trunk/reactos/win32ss/w32ksvc.db
trunk/reactos/win32ss/w32ksvc.h
Modified: trunk/reactos/include/psdk/ntgdi.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntgdi.h?rev=6…
==============================================================================
--- trunk/reactos/include/psdk/ntgdi.h [iso-8859-1] (original)
+++ trunk/reactos/include/psdk/ntgdi.h [iso-8859-1] Wed Sep 9 19:12:48 2015
@@ -2162,7 +2162,6 @@
_In_ ULONG iType,
_In_ BOOL bDisplay,
_In_opt_ HANDLE hspool,
- _In_opt_ DRIVER_INFO_2W *pDriverInfo2,
_At_((PUMDHPDEV*)pUMdhpdev, _Out_) PVOID pUMdhpdev);
__kernel_entry
Modified: trunk/reactos/win32ss/gdi/gdi32/objects/dc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/gdi32/objects/…
==============================================================================
--- trunk/reactos/win32ss/gdi/gdi32/objects/dc.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/gdi32/objects/dc.c [iso-8859-1] Wed Sep 9 19:12:48 2015
@@ -65,7 +65,6 @@
iType, // DCW 0 and ICW 1.
Display,
hspool,
- (PVOID) NULL, // NULL for now.
(PVOID) &UMdhpdev );
#if 0
// Handle something other than a normal dc object.
Modified: trunk/reactos/win32ss/gdi/ntgdi/dclife.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/dclife.c…
==============================================================================
--- trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/gdi/ntgdi/dclife.c [iso-8859-1] Wed Sep 9 19:12:48 2015
@@ -680,7 +680,6 @@
_In_ ULONG iType,
_In_ BOOL bDisplay,
_In_opt_ HANDLE hspool,
- _In_opt_ DRIVER_INFO_2W *pDriverInfo2,
_At_((PUMDHPDEV*)pUMdhpdev, _Out_) PVOID pUMdhpdev)
{
UNICODE_STRING ustrDevice;
Modified: trunk/reactos/win32ss/include/ntuser.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/include/ntuser.h?r…
==============================================================================
--- trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] (original)
+++ trunk/reactos/win32ss/include/ntuser.h [iso-8859-1] Wed Sep 9 19:12:48 2015
@@ -1696,7 +1696,6 @@
NtUserChangeDisplaySettings(
PUNICODE_STRING lpszDeviceName,
LPDEVMODEW lpDevMode,
- HWND hwnd,
DWORD dwflags);
BOOL
Modified: trunk/reactos/win32ss/user/ntuser/display.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/ntuser/displa…
==============================================================================
--- trunk/reactos/win32ss/user/ntuser/display.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/ntuser/display.c [iso-8859-1] Wed Sep 9 19:12:48 2015
@@ -655,7 +655,6 @@
UserChangeDisplaySettings(
PUNICODE_STRING pustrDevice,
LPDEVMODEW pdm,
- HWND hwnd,
DWORD flags,
LPVOID lParam)
{
@@ -815,7 +814,6 @@
NtUserChangeDisplaySettings(
PUNICODE_STRING pustrDevice,
LPDEVMODEW lpDevMode,
- HWND hwnd,
DWORD dwflags)
{
WCHAR awcDevice[CCHDEVICENAME];
@@ -824,8 +822,7 @@
LONG lRet;
/* Check arguments */
- if ((dwflags != CDS_VIDEOPARAMETERS) ||
- (hwnd != NULL))
+ if (dwflags != CDS_VIDEOPARAMETERS)
{
EngSetLastError(ERROR_INVALID_PARAMETER);
return DISP_CHANGE_BADPARAM;
@@ -904,7 +901,7 @@
UserEnterExclusive();
/* Call internal function */
- lRet = UserChangeDisplaySettings(pustrDevice, lpDevMode, hwnd, dwflags, NULL);
+ lRet = UserChangeDisplaySettings(pustrDevice, lpDevMode, dwflags, NULL);
/* Release lock */
UserLeave();
Modified: trunk/reactos/win32ss/user/user32/misc/display.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/user32/misc/d…
==============================================================================
--- trunk/reactos/win32ss/user/user32/misc/display.c [iso-8859-1] (original)
+++ trunk/reactos/win32ss/user/user32/misc/display.c [iso-8859-1] Wed Sep 9 19:12:48
2015
@@ -457,14 +457,14 @@
pDevModeW = GdiConvertToDevmodeW(lpDevMode);
if(pDevModeW)
{
- rc = NtUserChangeDisplaySettings(pDeviceName, pDevModeW, hwnd, dwflags);
+ rc = NtUserChangeDisplaySettings(pDeviceName, pDevModeW, dwflags);
RtlFreeHeap(GetProcessHeap(), 0, pDevModeW);
}
else
rc = DISP_CHANGE_SUCCESSFUL;
}
else
- rc = NtUserChangeDisplaySettings(pDeviceName, NULL, hwnd, dwflags);
+ rc = NtUserChangeDisplaySettings(pDeviceName, NULL, dwflags);
if (lpszDeviceName != NULL)
RtlFreeUnicodeString(&DeviceName);
@@ -509,7 +509,7 @@
else
pDeviceName = NULL;
- rc = NtUserChangeDisplaySettings(pDeviceName, lpDevMode, hwnd, dwflags);
+ rc = NtUserChangeDisplaySettings(pDeviceName, lpDevMode, dwflags);
return rc;
}
Modified: trunk/reactos/win32ss/w32ksvc.db
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/w32ksvc.db?rev=691…
==============================================================================
--- trunk/reactos/win32ss/w32ksvc.db [iso-8859-1] (original)
+++ trunk/reactos/win32ss/w32ksvc.db [iso-8859-1] Wed Sep 9 19:12:48 2015
@@ -1,6 +1,6 @@
# NAME ARG_COUNT
#
-# Funcs order should match Windows XP 5.1.2600 SP2
+# Funcs order should match Windows 2003 Service Pack 2
#
NtGdiAbortDoc 1
NtGdiAbortPath 1
@@ -234,7 +234,7 @@
NtGdiMoveTo 4
NtGdiOffsetClipRgn 3
NtGdiOffsetRgn 3
-NtGdiOpenDCW 8 #7
+NtGdiOpenDCW 7
NtGdiPatBlt 6
NtGdiPolyPatBlt 5
NtGdiPathToRegion 1
@@ -327,7 +327,7 @@
NtUserCallOneParam 2
NtUserCallTwoParam 3
NtUserChangeClipboardChain 2
-NtUserChangeDisplaySettings 5 #4
+NtUserChangeDisplaySettings 4
NtUserCheckImeHotKey 2
NtUserCheckMenuItem 3
NtUserChildWindowFromPointEx 4
@@ -388,7 +388,7 @@
NtUserGetAtomName 2
NtUserGetCaretBlinkTime 0
NtUserGetCaretPos 1
-NtUserGetClassInfo 5 #Ex?
+NtUserGetClassInfo 5
NtUserGetClassName 3
NtUserGetClipboardData 2
NtUserGetClipboardFormatName 3
@@ -513,7 +513,7 @@
NtUserSetConsoleReserveKeys 2
NtUserSetCursor 1
NtUserSetCursorContents 2
-NtUserSetCursorIconData 6 #4
+NtUserSetCursorIconData 4
NtUserSetFocus 1
NtUserSetImeHotKey 5
NtUserSetImeInfoEx 1
Modified: trunk/reactos/win32ss/w32ksvc.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/w32ksvc.h?rev=6915…
==============================================================================
--- trunk/reactos/win32ss/w32ksvc.h [iso-8859-1] (original)
+++ trunk/reactos/win32ss/w32ksvc.h [iso-8859-1] Wed Sep 9 19:12:48 2015
@@ -1,6 +1,6 @@
// SVC_(<NAME>, <ARG_COUNT>)
//
- // Funcs order should match Windows XP 5.1.2600 SP2
+ // Funcs order should match Windows 2003 Service Pack 2
// Note: these MUST be indented for the ARM assembler!
//
SVC_(GdiAbortDoc, 1)
@@ -235,7 +235,7 @@
SVC_(GdiMoveTo, 4)
SVC_(GdiOffsetClipRgn, 3)
SVC_(GdiOffsetRgn, 3)
- SVC_(GdiOpenDCW, 8) /* FIXME: 7 params on XP/2k3 */
+ SVC_(GdiOpenDCW, 7)
SVC_(GdiPatBlt, 6)
SVC_(GdiPolyPatBlt, 5)
SVC_(GdiPathToRegion, 1)
@@ -328,7 +328,7 @@
SVC_(UserCallOneParam, 2)
SVC_(UserCallTwoParam, 3)
SVC_(UserChangeClipboardChain, 2)
- SVC_(UserChangeDisplaySettings, 4)
+ SVC_(UserChangeDisplaySettings, 3)
SVC_(UserCheckImeHotKey, 2)
SVC_(UserCheckMenuItem, 3)
SVC_(UserChildWindowFromPointEx, 4)
@@ -490,7 +490,7 @@
SVC_(UserRealWaitMessageEx, 2)
SVC_(UserRedrawWindow, 4)
SVC_(UserRegisterClassExWOW, 7)
- SVC_(UserRegisterUserApiHook, 4) /* Note: 2 params on XP, 4 on 2k3 */
+ SVC_(UserRegisterUserApiHook, 4)
SVC_(UserRegisterHotKey, 4)
SVC_(UserRegisterRawInputDevices, 3)
SVC_(UserRegisterTasklist, 1)
@@ -578,7 +578,7 @@
SVC_(UserUnregisterHotKey, 2)
SVC_(UserUpdateInputContext, 3)
SVC_(UserUpdateInstance, 3)
- SVC_(UserUpdateLayeredWindow, 10) /* Note: 9 params on XP, 10 on 2k3 */
+ SVC_(UserUpdateLayeredWindow, 10)
SVC_(UserGetLayeredWindowAttributes, 4)
SVC_(UserSetLayeredWindowAttributes, 4)
SVC_(UserUpdatePerUserSystemParameters, 2)
@@ -674,17 +674,15 @@
SVC_(UserSetDbgTagCount, 1)
SVC_(UserSetRipFlags, 1)
#endif //DBG
- //Stray syscalls
+ //Stray syscalls (must be placed here to be correct for both checked/free builds)
SVC_(GdiMakeObjectXferable, 2)
SVC_(DxEngGetRedirectionBitmap, 1)
-
- // ReactOS-specific syscalls)
+ // ReactOS-specific syscalls (must be at the end to not interfere!)
SVC_(GdiSetViewportOrgEx, 4)
SVC_(GdiSetWindowOrgEx, 4)
SVC_(GdiGetFontFamilyInfo, 4)
SVC_(GdiOffsetViewportOrgEx, 4)
SVC_(GdiOffsetWindowOrgEx, 4)
-
SVC_(UserGetMonitorInfo, 2)
SVC_(UserMonitorFromPoint, 3)
SVC_(UserMonitorFromRect, 2)