Author: tkreuzer Date: Fri Sep 28 05:49:06 2007 New Revision: 29265
URL: http://svn.reactos.org/svn/reactos?rev=29265&view=rev Log: win32k compatibility update - NtUserCreateWindowEx: add 15th parameter - NtUserCreateWindowStation: add 7th parameter - rename NtUserDestroyCursorIcon to NtUserDestroyCursor - rename NtUserSetCursorIconContents to NtUserSetCursorContents - implement about 50 NtUser stubs
Modified: trunk/reactos/dll/win32/user32/misc/winsta.c trunk/reactos/dll/win32/user32/windows/cursor.c trunk/reactos/dll/win32/user32/windows/icon.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/reactos/win32k/ntuser.h trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c trunk/reactos/subsystems/win32/win32k/w32ksvc.db
Modified: trunk/reactos/dll/win32/user32/misc/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/winst... ============================================================================== --- trunk/reactos/dll/win32/user32/misc/winsta.c (original) +++ trunk/reactos/dll/win32/user32/misc/winsta.c Fri Sep 28 05:49:06 2007 @@ -73,7 +73,7 @@
return NtUserCreateWindowStation(&WindowStationName, dwDesiredAccess, - lpsa, 0, 0, 0); + lpsa, 0, 0, 0, 0); }
/*
Modified: trunk/reactos/dll/win32/user32/windows/cursor.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/cu... ============================================================================== --- trunk/reactos/dll/win32/user32/windows/cursor.c (original) +++ trunk/reactos/dll/win32/user32/windows/cursor.c Fri Sep 28 05:49:06 2007 @@ -153,7 +153,7 @@ BOOL STDCALL DestroyCursor(HCURSOR hCursor) { - return (BOOL)NtUserDestroyCursorIcon((HANDLE)hCursor, 0); + return (BOOL)NtUserDestroyCursor((HANDLE)hCursor, 0); }
Modified: trunk/reactos/dll/win32/user32/windows/icon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/ic... ============================================================================== --- trunk/reactos/dll/win32/user32/windows/icon.c (original) +++ trunk/reactos/dll/win32/user32/windows/icon.c Fri Sep 28 05:49:06 2007 @@ -351,7 +351,7 @@ DestroyIcon( HICON hIcon) { - return (BOOL)NtUserDestroyCursorIcon((HANDLE)hIcon, 0); + return (BOOL)NtUserDestroyCursor((HANDLE)hIcon, 0); }
Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/wi... ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c (original) +++ trunk/reactos/dll/win32/user32/windows/window.c Fri Sep 28 05:49:06 2007 @@ -241,7 +241,8 @@ hInstance, lpParam, SW_SHOW, - FALSE); + FALSE, + 0);
#if 0 DbgPrint("[window] NtUserCreateWindowEx() == %d\n", Handle);
Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntus... ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h Fri Sep 28 05:49:06 2007 @@ -93,6 +93,21 @@
DWORD NTAPI +NtUserAssociateInputContext( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3); + +DWORD +NTAPI +NtUserBuildHimcList( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4); + +DWORD +NTAPI NtUserBuildMenuItemList( HMENU hMenu, PVOID Buffer, @@ -101,10 +116,26 @@
DWORD NTAPI +NtUserCalcMenuBar( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4, + DWORD dwUnknown5); + +DWORD +NTAPI NtUserCheckMenuItem( HMENU hmenu, UINT uIDCheckItem, UINT uCheck); + +DWORD +NTAPI +NtUserCtxDisplayIOCtl( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3);
BOOL NTAPI @@ -528,6 +559,12 @@ DWORD dwflags, LPVOID lParam);
+DWORD +STDCALL +NtUserCheckImeHotKey( + DWORD dwUnknown1, + DWORD dwUnknown2); + HWND NTAPI NtUserChildWindowFromPointEx(HWND Parent, LONG x, @@ -552,6 +589,13 @@ NTAPI NtUserCloseWindowStation( HWINSTA hWinSta); + +DWORD +NTAPI +NtUserConsoleControl( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3);
DWORD NTAPI @@ -598,6 +642,11 @@ ACCESS_MASK dwDesiredAccess, LPSECURITY_ATTRIBUTES lpSecurity, HWINSTA hWindowStation); + +DWORD +NTAPI +NtUserCreateInputContext( + DWORD dwUnknown1);
DWORD NTAPI @@ -623,7 +672,8 @@ HINSTANCE hInstance, LPVOID lpParam, DWORD dwShowMode, - BOOL bUnicodeWindow); + BOOL bUnicodeWindow, + DWORD dwUnknown);
HWINSTA NTAPI @@ -633,7 +683,8 @@ LPSECURITY_ATTRIBUTES lpSecurity, DWORD Unknown3, DWORD Unknown4, - DWORD Unknown5); + DWORD Unknown5, + DWORD Unknown6);
DWORD NTAPI @@ -677,12 +728,22 @@
BOOL NTAPI -NtUserDestroyCursorIcon( +NtUserDestroyCursor( HANDLE Handle, DWORD Unknown);
+DWORD +NTAPI +NtUserDestroyInputContext( + DWORD dwUnknown1); + BOOLEAN NTAPI NtUserDestroyWindow(HWND Wnd); + +DWORD +NTAPI +NtUserDisableThreadIme( + DWORD dwUnknown1);
typedef struct tagNTUSERDISPATCHMESSAGEINFO { @@ -862,11 +923,21 @@ HWND NTAPI NtUserGetAncestor(HWND hWnd, UINT Flags);
+DWORD +NTAPI +NtUserGetAppImeLevel( + DWORD dwUnknown1);
DWORD NTAPI NtUserGetAsyncKeyState( DWORD Unknown0); + +DWORD +NTAPI +NtUserGetAtomName( + DWORD dwUnknown1, + DWORD dwUnknown2);
UINT NTAPI @@ -1007,11 +1078,35 @@
DWORD NTAPI +NtUserGetIconInfo( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4, + DWORD dwUnknown5, + DWORD dwUnknown6); + +DWORD +NTAPI +NtUserGetIconSize( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4); + +DWORD +NTAPI NtUserGetImeHotKey( DWORD Unknown0, DWORD Unknown1, DWORD Unknown2, DWORD Unknown3); + +DWORD +NTAPI +NtUserGetImeInfoEx( + DWORD dwUnknown1, + DWORD dwUnknown2);
DWORD NTAPI @@ -1059,6 +1154,14 @@ NTAPI NtUserGetLastInputInfo( PLASTINPUTINFO plii); + +DWORD +NTAPI +NtUserGetLayeredWindowAttributes( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4);
DWORD NTAPI @@ -1117,6 +1220,44 @@ NTAPI NtUserGetProcessWindowStation(VOID);
+DWORD +NTAPI +NtUserGetRawInputBuffer( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3); + +DWORD +NTAPI +NtUserGetRawInputData( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4, + DWORD dwUnknown5); + +DWORD +NTAPI +NtUserGetRawInputDeviceInfo( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4); + +DWORD +NTAPI +NtUserGetRawInputDeviceList( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3); + +DWORD +NTAPI +NtUserGetRegisteredRawInputDevices( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3); + BOOL NTAPI NtUserGetScrollBarInfo( @@ -1182,9 +1323,23 @@
DWORD NTAPI +NtUserHardErrorControl( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3); + +DWORD +NTAPI NtUserImpersonateDdeClientWindow( DWORD Unknown0, DWORD Unknown1); + +DWORD +NTAPI +NtUserInitialize( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3);
DWORD NTAPI @@ -1216,6 +1371,19 @@ LPWSTR lpString, INT nMaxCount);
+BOOL +NTAPI +NtUserInvalidateRect( + HWND hWnd, + CONST RECT *lpRect, + BOOL bErase); + +BOOL +NTAPI +NtUserInvalidateRgn( + HWND hWnd, + HRGN hRgn, + BOOL bErase);
BOOL NTAPI @@ -1281,6 +1449,13 @@ DWORD Unknown5, DWORD Unknown6);
+DWORD +NTAPI +NtUserMinMaximize( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3); + BOOL NTAPI NtUserGetMinMaxInfo( @@ -1343,6 +1518,14 @@
DWORD NTAPI +NtUserNotifyProcessCreate( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4); + +DWORD +NTAPI NtUserNotifyWinEvent( DWORD Unknown0, DWORD Unknown1, @@ -1379,6 +1562,16 @@ NTAPI NtUserPaintDesktop( HDC hDC); + +DWORD +NTAPI +NtUserPaintMenuBar( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4, + DWORD dwUnknown5, + DWORD dwUnknown6);
BOOL NTAPI @@ -1407,6 +1600,35 @@
DWORD NTAPI +NtUserPrintWindow( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3); + +DWORD +NTAPI +NtUserProcessConnect( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3); + +DWORD +NTAPI +NtUserQueryInformationThread( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4, + DWORD dwUnknown5); + +DWORD +NTAPI +NtUserQueryInputContext( + DWORD dwUnknown1, + DWORD dwUnknown2); + +DWORD +NTAPI NtUserQuerySendMessage( DWORD Unknown0);
@@ -1428,6 +1650,16 @@ HWND hWnd, DWORD Index);
+DWORD +NTAPI +NtUserRealInternalGetMessage( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4, + DWORD dwUnknown5, + DWORD dwUnknown6); + UINT NTAPI NtUserRealizePalette(HDC hDC); @@ -1438,6 +1670,12 @@ DWORD Unknown0, DWORD Unknown1, DWORD Unknown2); + +DWORD +NTAPI +NtUserRealWaitMessageEx( + DWORD dwUnknown1, + DWORD dwUnknown2);
BOOL NTAPI @@ -1449,19 +1687,29 @@ UINT flags );
-BOOL -NTAPI -NtUserInvalidateRect( - HWND hWnd, - CONST RECT *lpRect, - BOOL bErase); - -BOOL -NTAPI -NtUserInvalidateRgn( - HWND hWnd, - HRGN hRgn, - BOOL bErase); +HWINSTA +NTAPI +NtUserRegisterClassExWOW( + CONST WNDCLASSEXW* lpwcx, + BOOL bUnicodeClass, + WNDPROC wpExtra, + DWORD dwUnknown4, + DWORD dwUnknown5, + DWORD dwUnknown6, + DWORD dwUnknown7); + +DWORD +NTAPI +NtUserRegisterRawInputDevices( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3); + +DWORD +NTAPI +NtUserRegisterUserApiHook( + DWORD dwUnknown1, + DWORD dwUnknown2);
/* FIXME: These flag constans aren't what Windows uses. */ #define REGISTERCLASS_ANSI 2 @@ -1489,7 +1737,6 @@ UINT fsModifiers, UINT vk);
- BOOL NTAPI NtUserGetLastInputInfo( @@ -1503,8 +1750,39 @@ UINT NTAPI NtUserRegisterWindowMessage(PUNICODE_STRING MessageName);
+DWORD +NTAPI +NtUserRemoteConnect( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3); + +DWORD +NTAPI +NtUserRemoteRedrawRectangle( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4); + +DWORD +NTAPI +NtUserRemoteRedrawScreen(VOID); + +DWORD +NTAPI +NtUserRemoteStopScreenUpdates(VOID); + HANDLE NTAPI NtUserRemoveProp(HWND hWnd, ATOM Atom); + +DWORD +NTAPI +NtUserResolveDesktop( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4);
DWORD NTAPI @@ -1573,7 +1851,7 @@ UINT uFlags, UINT uTimeout, ULONG_PTR *uResult, - PNTUSERSENDMESSAGEINFO Info); + PNTUSERSENDMESSAGEINFO Info);
BOOL NTAPI @@ -1585,11 +1863,19 @@
HWND NTAPI NtUserSetActiveWindow(HWND Wnd); + HWND NTAPI NtUserGetActiveWindow(VOID);
+DWORD +NTAPI +NtUserSetAppImeLevel( + DWORD dwUnknown1, + DWORD dwUnknown2); + HWND NTAPI NtUserSetCapture(HWND Wnd); + HWND NTAPI NtUserGetCapture(VOID);
@@ -1599,7 +1885,6 @@ INT Offset, ULONG_PTR dwNewLong, BOOL Ansi ); -
DWORD NTAPI @@ -1641,7 +1926,7 @@
BOOL NTAPI -NtUserSetCursorIconContents( +NtUserSetCursorContents( HANDLE Handle, PICONINFO IconInfo);
@@ -1677,9 +1962,30 @@
DWORD NTAPI +NtUserSetImeInfoEx( + DWORD dwUnknown1); + +DWORD +NTAPI NtUserSetImeOwnerWindow( DWORD Unknown0, DWORD Unknown1); + +DWORD +NTAPI +NtUserSetInformationProcess( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4); + +DWORD +NTAPI +NtUserSetInformationThread( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4);
DWORD NTAPI @@ -1787,6 +2093,12 @@ UINT uElapse, TIMERPROC lpTimerFunc ); + +DWORD +NTAPI +NtUserSetThreadLayoutHandles( + DWORD dwUnknown1, + DWORD dwUnknown2);
UINT_PTR NTAPI @@ -1902,6 +2214,10 @@ HWND hWnd, LONG nCmdShow);
+DWORD +NTAPI +NtUserSoundSentry(VOID); + BOOL NTAPI NtUserSwitchDesktop( @@ -1915,7 +2231,12 @@ PVOID pvParam, UINT fWinIni);
-int +DWORD +NTAPI +NtUserTestForInteractiveUser( + DWORD dwUnknown1); + +INT NTAPI NtUserToUnicodeEx( UINT wVirtKey, @@ -1977,6 +2298,10 @@
DWORD NTAPI +NtUserUnregisterUserApiHook(VOID); + +DWORD +NTAPI NtUserUpdateInputContext( DWORD Unknown0, DWORD Unknown1, @@ -2020,6 +2345,19 @@ NtUserValidateHandleSecure( HANDLE hHdl, BOOL Restricted); + +BOOL +NTAPI +NtUserValidateRect( + HWND hWnd, + CONST RECT *lpRect); + +DWORD +NTAPI +NtUserValidateTimerCallback( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3);
DWORD NTAPI
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/cursoricon.c Fri Sep 28 05:49:06 2007 @@ -911,7 +911,7 @@ */ BOOL STDCALL -NtUserDestroyCursorIcon( +NtUserDestroyCursor( HANDLE hCurIcon, DWORD Unknown) { @@ -1101,7 +1101,7 @@ */ BOOL STDCALL -NtUserSetCursorIconContents( +NtUserSetCursorContents( HANDLE hCurIcon, PICONINFO IconInfo) { @@ -1112,7 +1112,7 @@ BOOL Ret = FALSE; DECLARE_RETURN(BOOL);
- DPRINT("Enter NtUserSetCursorIconContents\n"); + DPRINT("Enter NtUserSetCursorContents\n"); UserEnterExclusive();
WinSta = IntGetWinStaObj(); @@ -1164,7 +1164,7 @@ RETURN( Ret);
CLEANUP: - DPRINT("Leave NtUserSetCursorIconContents, ret=%i\n",_ret_); + DPRINT("Leave NtUserSetCursorContents, ret=%i\n",_ret_); UserLeave(); END_CLEANUP; }
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c Fri Sep 28 05:49:06 2007 @@ -14,6 +14,17 @@ #include <debug.h>
DWORD +NTAPI +NtUserAssociateInputContext( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3) +{ + UNIMPLEMENTED + return 0; +} + +DWORD STDCALL NtUserAttachThreadInput( DWORD Unknown0, @@ -40,6 +51,18 @@ UNIMPLEMENTED
return 0; +} + +DWORD +NTAPI +NtUserBuildHimcList( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4) +{ + UNIMPLEMENTED; + return 0; }
DWORD @@ -683,4 +706,524 @@ return 0; }
+ +DWORD +STDCALL +NtUserCheckImeHotKey( + DWORD dwUnknown1, + DWORD dwUnknown2) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserConsoleControl( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserCreateInputContext( + DWORD dwUnknown1) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserDestroyInputContext( + DWORD dwUnknown1) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserDisableThreadIme( + DWORD dwUnknown1) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserGetAppImeLevel( + DWORD dwUnknown1) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserGetAtomName( + DWORD dwUnknown1, + DWORD dwUnknown2) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserGetIconInfo( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4, + DWORD dwUnknown5, + DWORD dwUnknown6) +{ + UNIMPLEMENTED; + return 0; +} + +/* for hints how the prototype might be, see + http://forum.grafika.cz/read.php?23,1816012,1816139,quote=1 + http://www.cyber-ta.org/releases/malware-analysis/public/SOURCES/b47155634cc... */ +DWORD +NTAPI +NtUserGetIconSize( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserGetImeInfoEx( + DWORD dwUnknown1, + DWORD dwUnknown2) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserGetRawInputBuffer( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserGetRawInputData( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4, + DWORD dwUnknown5) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserGetRawInputDeviceInfo( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserGetRawInputDeviceList( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserGetRegisteredRawInputDevices( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserHardErrorControl( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserInitialize( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserMinMaximize( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserNotifyProcessCreate( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserPrintWindow( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserProcessConnect( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserQueryInformationThread( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4, + DWORD dwUnknown5) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserQueryInputContext( + DWORD dwUnknown1, + DWORD dwUnknown2) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserRealInternalGetMessage( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4, + DWORD dwUnknown5, + DWORD dwUnknown6) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserRealWaitMessageEx( + DWORD dwUnknown1, + DWORD dwUnknown2) +{ + UNIMPLEMENTED; + return 0; +} + +/* http://www.reactos.org/pipermail/ros-kernel/2003-November/000589.html */ +HWINSTA +NTAPI +NtUserRegisterClassExWOW( + CONST WNDCLASSEXW* lpwcx, + BOOL bUnicodeClass, + WNDPROC wpExtra, + DWORD dwUnknown4, + DWORD dwUnknown5, + DWORD dwUnknown6, + DWORD dwUnknown7) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserRegisterUserApiHook( + DWORD dwUnknown1, + DWORD dwUnknown2) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserRegisterRawInputDevices( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserResolveDesktop( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserSetAppImeLevel( + DWORD dwUnknown1, + DWORD dwUnknown2) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserSetImeInfoEx( + DWORD dwUnknown1) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserSetInformationProcess( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserSetInformationThread( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserSetThreadLayoutHandles( + DWORD dwUnknown1, + DWORD dwUnknown2) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserSoundSentry(VOID) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserTestForInteractiveUser( + DWORD dwUnknown1) +{ + UNIMPLEMENTED; + return 0; +} + +/* http://www.cyber-ta.org/releases/malware-analysis/public/SOURCES/b47155634cc... */ +DWORD +NTAPI +NtUserCalcMenuBar( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4, + DWORD dwUnknown5) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserPaintMenuBar( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4, + DWORD dwUnknown5, + DWORD dwUnknown6) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserUnregisterUserApiHook(VOID) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserGetLayeredWindowAttributes( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4) +{ + UNIMPLEMENTED; + return 0; +} + +/* ValidateRect gets redirected to NtUserValidateRect: + http://blog.csdn.net/ntdll/archive/2005/10/19/509299.aspx */ +BOOL +NTAPI +NtUserValidateRect( + HWND hWnd, + CONST RECT *lpRect) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserValidateTimerCallback( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserRemoteConnect( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserRemoteRedrawRectangle( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3, + DWORD dwUnknown4) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserRemoteRedrawScreen(VOID) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserRemoteStopScreenUpdates(VOID) +{ + UNIMPLEMENTED; + return 0; +} + +DWORD +NTAPI +NtUserCtxDisplayIOCtl( + DWORD dwUnknown1, + DWORD dwUnknown2, + DWORD dwUnknown3) +{ + UNIMPLEMENTED; + return 0; +} + + /* EOF */
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c Fri Sep 28 05:49:06 2007 @@ -2087,7 +2087,8 @@ HINSTANCE hInstance, LPVOID lpParam, DWORD dwShowMode, - BOOL bUnicodeWindow) + BOOL bUnicodeWindow, + DWORD dwUnknown) { NTSTATUS Status; UNICODE_STRING WindowName;
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/winsta.c Fri Sep 28 05:49:06 2007 @@ -377,7 +377,8 @@ LPSECURITY_ATTRIBUTES lpSecurity, DWORD Unknown3, DWORD Unknown4, - DWORD Unknown5) + DWORD Unknown5, + DWORD Unknown6) { PSYSTEM_CURSORINFO CurInfo; UNICODE_STRING WindowStationName;
Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/w32... ============================================================================== --- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original) +++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Fri Sep 28 05:49:06 2007 @@ -312,12 +312,12 @@ NtGdiWidenPath 1 NtUserActivateKeyboardLayout 2 NtUserAlterWindowStyle 3 -# NtUserAssociateInputContext 3 +NtUserAssociateInputContext 3 NtUserAttachThreadInput 3 NtUserBeginPaint 2 NtUserBitBltSysBmp 8 NtUserBlockInput 1 -# NtUserBuildHimcList 4 +NtUserBuildHimcList 4 NtUserBuildHwndList 7 NtUserBuildNameList 4 NtUserBuildPropList 4 @@ -333,24 +333,24 @@ NtUserCallTwoParam 3 NtUserChangeClipboardChain 2 NtUserChangeDisplaySettings 5 -# NtUserCheckImeHotKey 2 +NtUserCheckImeHotKey 2 NtUserCheckMenuItem 3 NtUserChildWindowFromPointEx 4 NtUserClipCursor 1 NtUserCloseClipboard 0 NtUserCloseDesktop 1 NtUserCloseWindowStation 1 -# NtUserConsoleControl 3 +NtUserConsoleControl 3 NtUserConvertMemHandle 2 NtUserCopyAcceleratorTable 3 NtUserCountClipboardFormats 0 NtUserCreateAcceleratorTable 2 NtUserCreateCaret 4 NtUserCreateDesktop 5 -# NtUserCreateInputContext 1 +NtUserCreateInputContext 1 NtUserCreateLocalMemHandle 4 -# NtUserCreateWindowEx 15 Wrong number of param ? -# NtUserCreateWindowStation 7 Wrong number of param ? +NtUserCreateWindowEx 15 +NtUserCreateWindowStation 7 NtUserDdeGetQualityOfService 3 NtUserDdeInitialize 5 NtUserDdeSetQualityOfService 3 @@ -358,11 +358,11 @@ NtUserDefSetText 2 NtUserDeleteMenu 3 NtUserDestroyAcceleratorTable 1 -# NtUserDestroyCursor 2 -# NtUserDestroyInputContext 1 +NtUserDestroyCursor 2 +NtUserDestroyInputContext 1 NtUserDestroyMenu 1 NtUserDestroyWindow 1 -# NtUserDisableThreadIme 1 +NtUserDisableThreadIme 1 NtUserDispatchMessage 1 NtUserDragDetect 3 NtUserDragObject 5 @@ -388,9 +388,9 @@ NtUserFlashWindowEx 1 NtUserGetAltTabInfo 6 NtUserGetAncestor 2 -# NtUserGetAppImeLevel 1 +NtUserGetAppImeLevel 1 NtUserGetAsyncKeyState 1 -# NtUserGetAtomName 2 +NtUserGetAtomName 2 NtUserGetCaretBlinkTime 0 NtUserGetCaretPos 1 # NtUserGetClassInfo 5 Wrong number of param ? @@ -413,10 +413,10 @@ NtUserGetForegroundWindow 0 NtUserGetGuiResources 2 NtUserGetGUIThreadInfo 2 -# NtUserGetIconInfo 6 -# NtUserGetIconSize 4 +NtUserGetIconInfo 6 +NtUserGetIconSize 4 NtUserGetImeHotKey 4 -# NtUserGetImeInfoEx 2 +NtUserGetImeInfoEx 2 NtUserGetInternalWindowPos 3 NtUserGetKeyboardLayoutList 2 NtUserGetKeyboardLayoutName 1 @@ -433,11 +433,11 @@ NtUserGetOpenClipboardWindow 0 NtUserGetPriorityClipboardFormat 2 NtUserGetProcessWindowStation 0 -# NtUserGetRawInputBuffer 3 -# NtUserGetRawInputData 5 -# NtUserGetRawInputDeviceInfo 4 -# NtUserGetRawInputDeviceList 3 -# NtUserGetRegisteredRawInputDevices 3 +NtUserGetRawInputBuffer 3 +NtUserGetRawInputData 5 +NtUserGetRawInputDeviceInfo 4 +NtUserGetRawInputDeviceList 3 +NtUserGetRegisteredRawInputDevices 3 NtUserGetScrollBarInfo 3 NtUserGetSystemMenu 2 NtUserGetThreadDesktop 2 @@ -448,11 +448,11 @@ NtUserGetWindowDC 1 NtUserGetWindowPlacement 2 NtUserGetWOWClass 2 -# NtUserHardErrorControl 3 +NtUserHardErrorControl 3 NtUserHideCaret 1 NtUserHiliteMenuItem 4 NtUserImpersonateDdeClientWindow 2 -# NtUserInitialize 3 +NtUserInitialize 3 NtUserInitializeClientPfnArrays 4 # NtUserInitTask 12 Wrong number of param ? NtUserInternalGetWindowText 3 @@ -467,13 +467,13 @@ NtUserMapVirtualKeyEx 4 NtUserMenuItemFromPoint 4 NtUserMessageCall 7 -# NtUserMinMaximize 3 +NtUserMinMaximize 3 NtUserMNDragLeave 0 NtUserMNDragOver 2 NtUserModifyUserStartupInfoFlags 2 NtUserMoveWindow 6 NtUserNotifyIMEStatus 3 -# NtUserNotifyProcessCreate 4 +NtUserNotifyProcessCreate 4 NtUserNotifyWinEvent 4 NtUserOpenClipboard 2 NtUserOpenDesktop 3 @@ -483,26 +483,26 @@ NtUserPeekMessage 5 NtUserPostMessage 4 NtUserPostThreadMessage 4 -# NtUserPrintWindow 3 -# NtUserProcessConnect 3 -# NtUserQueryInformationThread 5 -# NtUserQueryInputContext 2 +NtUserPrintWindow 3 +NtUserProcessConnect 3 +NtUserQueryInformationThread 5 +NtUserQueryInputContext 2 NtUserQuerySendMessage 1 NtUserQueryUserCounters 5 NtUserQueryWindow 2 NtUserRealChildWindowFromPoint 3 -# NtUserRealInternalGetMessage 6 -# NtUserRealWaitMessageEx 2 +NtUserRealInternalGetMessage 6 +NtUserRealWaitMessageEx 2 NtUserRedrawWindow 4 -# NtUserRegisterClassExWOW 7 -# NtUserRegisterUserApiHook 2 +NtUserRegisterClassExWOW 7 +NtUserRegisterUserApiHook 2 NtUserRegisterHotKey 4 -# NtUserRegisterRawInputDevices 3 +NtUserRegisterRawInputDevices 3 NtUserRegisterTasklist 1 NtUserRegisterWindowMessage 1 NtUserRemoveMenu 3 NtUserRemoveProp 2 -# NtUserResolveDesktop 4 +NtUserResolveDesktop 4 NtUserResolveDesktopForWOW 1 NtUserSBGetParms 4 NtUserScrollDC 7 @@ -510,7 +510,7 @@ NtUserSelectPalette 3 NtUserSendInput 3 NtUserSetActiveWindow 1 -# NtUserSetAppImeLevel 2 +NtUserSetAppImeLevel 2 NtUserSetCapture 1 NtUserSetClassLong 4 NtUserSetClassWord 3 @@ -518,15 +518,15 @@ NtUserSetClipboardViewer 1 NtUserSetConsoleReserveKeys 2 NtUserSetCursor 1 -# NtUserSetCursorContents 2 +NtUserSetCursorContents 2 # NtUserSetCursorIconData 4 Wrong number of param ? NtUserSetDbgTag 2 NtUserSetFocus 1 NtUserSetImeHotKey 5 -# NtUserSetImeInfoEx 1 +NtUserSetImeInfoEx 1 NtUserSetImeOwnerWindow 2 -# NtUserSetInformationProcess 4 -# NtUserSetInformationThread 4 +NtUserSetInformationProcess 4 +NtUserSetInformationThread 4 NtUserSetInternalWindowPos 4 NtUserSetKeyboardState 1 NtUserSetLogonNotifyWindow 1 @@ -546,7 +546,7 @@ NtUserSetSystemMenu 2 NtUserSetSystemTimer 4 NtUserSetThreadDesktop 1 -# NtUserSetThreadLayoutHandles 2 +NtUserSetThreadLayoutHandles 2 NtUserSetThreadState 2 NtUserSetTimer 4 NtUserSetWindowFNID 2 @@ -563,17 +563,17 @@ NtUserShowScrollBar 3 NtUserShowWindow 2 NtUserShowWindowAsync 2 -# NtUserSoundSentry 0 +NtUserSoundSentry 0 NtUserSwitchDesktop 1 NtUserSystemParametersInfo 4 -# NtUserTestForInteractiveUser 1 +NtUserTestForInteractiveUser 1 NtUserThunkedMenuInfo 2 NtUserThunkedMenuItemInfo 6 NtUserToUnicodeEx 7 NtUserTrackMouseEvent 1 NtUserTrackPopupMenuEx 6 -# NtUserCalcMenuBar 5 -# NtUserPaintMenuBar 6 +NtUserCalcMenuBar 5 +NtUserPaintMenuBar 6 NtUserTranslateAccelerator 3 NtUserTranslateMessage 2 NtUserUnhookWindowsHookEx 1 @@ -581,18 +581,18 @@ NtUserUnloadKeyboardLayout 1 NtUserUnlockWindowStation 1 # NtUserUnregisterClass 3 Wrong number of param ? -# NtUserUnregisterUserApiHook 0 +NtUserUnregisterUserApiHook 0 NtUserUnregisterHotKey 2 NtUserUpdateInputContext 3 NtUserUpdateInstance 3 NtUserUpdateLayeredWindow 9 -# NtUserGetLayeredWindowAttributes 4 +NtUserGetLayeredWindowAttributes 4 NtUserSetLayeredWindowAttributes 4 NtUserUpdatePerUserSystemParameters 2 NtUserUserHandleGrantAccess 3 NtUserValidateHandleSecure 2 -# NtUserValidateRect 2 -# NtUserValidateTimerCallback 3 +NtUserValidateRect 2 +NtUserValidateTimerCallback 3 NtUserVkKeyScanEx 3 NtUserWaitForInputIdle 3 NtUserWaitForMsgAndEvent 1 @@ -600,11 +600,11 @@ NtUserWin32PoolAllocationStats 6 NtUserWindowFromPoint 2 NtUserYieldTask 0 -# NtUserRemoteConnect 3 -# NtUserRemoteRedrawRectangle 4 -# NtUserRemoteRedrawScreen 0 -# NtUserRemoteStopScreenUpdates 0 -# NtUserCtxDisplayIOCtl 3 +NtUserRemoteConnect 3 +NtUserRemoteRedrawRectangle 4 +NtUserRemoteRedrawScreen 0 +NtUserRemoteStopScreenUpdates 0 +NtUserCtxDisplayIOCtl 3 NtGdiEngAssociateSurface 3 NtGdiEngCreateBitmap 6 NtGdiEngCreateDeviceSurface 4 @@ -676,8 +676,6 @@ # # # Wrong number of param ? -NtUserCreateWindowEx 14 -NtUserCreateWindowStation 6 NtUserEnumDisplayMonitors 5 NtUserFindExistingCursorIcon 4 NtUserFindWindowEx 4 @@ -709,7 +707,6 @@ NtGdiUpdateICMRegKey 4 NtUserBuildMenuItemList 4 NtUserCreateCursorIconHandle 2 -NtUserDestroyCursorIcon 2 NtUserEnumClipboardFormats 1 NtUserGetActiveWindow 0 NtUserGetCapture 0 @@ -740,7 +737,6 @@ NtUserSendMessageCallback 6 NtUserSendMessageTimeout 8 NtUserSendNotifyMessage 4 -NtUserSetCursorIconContents 2 NtUserSetScrollBarInfo 3 NtUserGetDesktopWindow 0 NtGdiAddFontResource 2