[ros-diffs] [jimtabor] 34363: Update more prototypes and stubs.

Author: jimtabor
Date: Tue Jul  8 00:43:14 2008
New Revision: 34363

URL: http://svn.reactos.org/svn/reactos?rev=34363&view=rev
Log:
Update more prototypes and stubs.

Modified:
    trunk/reactos/include/reactos/win32k/ntuser.h
    trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c
    trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c
    trunk/reactos/subsystems/win32/win32k/ntuser/window.c

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 [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Tue Jul  8 00:43:14 2008
@@ -1181,13 +1181,13 @@
   HDC hDC,
   HWND hWnd);

-DWORD
+BOOL
 NTAPI
 NtUserFillWindow(
-  DWORD Unknown0,
-  DWORD Unknown1,
-  DWORD Unknown2,
-  DWORD Unknown3);
+  HWND hWndPaint,
+  HWND hWndPaint1,
+  HDC  hDC,
+  HBRUSH hBrush);

HICON
 NTAPI
@@ -1313,13 +1313,13 @@
   HDC  hdc,
   UINT ctlType);

-DWORD
+HBRUSH
 NTAPI
 NtUserGetControlColor(
-  DWORD Unknown0,
-  DWORD Unknown1,
-  DWORD Unknown2,
-  DWORD Unknown3);
+   HWND hwndParent,
+   HWND hwnd,
+   HDC hdc,
+   UINT CtlMsg);

DWORD
 NTAPI
@@ -1408,9 +1408,9 @@
 DWORD
 NTAPI
 NtUserGetInternalWindowPos(
-  DWORD Unknown0,
-  DWORD Unknown1,
-  DWORD Unknown2);
+  HWND hwnd,
+  LPRECT rectWnd,
+  LPPOINT ptIcon);

HKL
 NTAPI
@@ -1442,10 +1442,10 @@
 NTAPI
 NtUserGetKeyNameText( LONG lParam, LPWSTR lpString, int nSize );

-DWORD
+SHORT
 NTAPI
 NtUserGetKeyState(
-  DWORD Unknown0);
+  INT VirtKey);

BOOL
 NTAPI
@@ -2497,18 +2497,18 @@
   DWORD Unknown1,
   DWORD Unknown2);

-DWORD
+BOOL
 NTAPI
 NtUserUpdateLayeredWindow(
-  DWORD Unknown0,
-  DWORD Unknown1,
-  DWORD Unknown2,
-  DWORD Unknown3,
-  DWORD Unknown4,
-  DWORD Unknown5,
-  DWORD Unknown6,
-  DWORD Unknown7,
-  DWORD Unknown8);
+  HWND hwnd,
+  HDC hdcDst,
+  POINT *pptDst,
+  SIZE *psize,
+  HDC hdcSrc,
+  POINT *pptSrc,
+  COLORREF crKey,
+  BLENDFUNCTION *pblend,
+  DWORD dwFlags);

BOOL
 NTAPI
@@ -2705,7 +2705,7 @@
 /* Should be done in usermode */
 HANDLE
 NTAPI
-NtUserGetProp(HWND hWnd, ATOM Atom);
+NtUserGetProp(HWND hWnd, ATOM Atom); // Done in both User/Kernel

BOOL
 NTAPI
@@ -2829,7 +2829,7 @@

RTL_ATOM
 NTAPI
-NtUserRegisterClassEx(
+NtUserRegisterClassEx(   // Need to use NtUserRegisterClassExWOW.
    CONST WNDCLASSEXW* lpwcx,
    PUNICODE_STRING ClassName,
    PUNICODE_STRING MenuName,

Modified: trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntu...
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/keyboard.c [iso-8859-1] Tue Jul  8 00:43:14 2008
@@ -361,10 +361,10 @@
 }

-DWORD
+SHORT
 STDCALL
 NtUserGetKeyState(
-   DWORD key)
+   INT key)
 {
    DECLARE_RETURN(DWORD);

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 [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Tue Jul  8 00:43:14 2008
@@ -254,13 +254,17 @@
    return 0;
 }

-DWORD
+
+/*
+ * Called from PaintRect, works almost like wine PaintRect16 but returns hBrush.
+ */
+HBRUSH
 STDCALL
 NtUserGetControlColor(
-   DWORD Unknown0,
-   DWORD Unknown1,
-   DWORD Unknown2,
-   DWORD Unknown3)
+   HWND hwndParent,
+   HWND hwnd, 
+   HDC hdc,
+   UINT CtlMsg) // Wine PaintRect: WM_CTLCOLORMSGBOX + hbrush
 {
    UNIMPLEMENTED

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 [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Tue Jul  8 00:43:14 2008
@@ -2505,13 +2505,16 @@

/*
+ * FillWindow: Called from User; Dialog, Edit and ListBox procs during a WM_ERASEBKGND.
+ */
+/*
  * @unimplemented
  */
-DWORD STDCALL
-NtUserFillWindow(DWORD Unknown0,
-                 DWORD Unknown1,
-                 DWORD Unknown2,
-                 DWORD Unknown3)
+BOOL STDCALL
+NtUserFillWindow(HWND hWndPaint,
+                 HWND hWndPaint1,
+                 HDC  hDC,
+                 HBRUSH hBrush)
 {
    UNIMPLEMENTED

@@ -2949,9 +2952,9 @@
  * @unimplemented
  */
 DWORD STDCALL
-NtUserGetInternalWindowPos(DWORD Unknown0,
-                           DWORD Unknown1,
-                           DWORD Unknown2)
+NtUserGetInternalWindowPos( HWND hwnd,
+                            LPRECT rectWnd,
+                            LPPOINT ptIcon)
 {
    UNIMPLEMENTED

@@ -4490,23 +4493,23 @@
 /*
  * @unimplemented
  */
-DWORD STDCALL
-NtUserUpdateLayeredWindow(DWORD Unknown0,
-                          DWORD Unknown1,
-                          DWORD Unknown2,
-                          DWORD Unknown3,
-                          DWORD Unknown4,
-                          DWORD Unknown5,
-                          DWORD Unknown6,
-                          DWORD Unknown7,
-                          DWORD Unknown8)
+BOOL
+STDCALL
+NtUserUpdateLayeredWindow(
+   HWND hwnd,
+   HDC hdcDst,
+   POINT *pptDst,
+   SIZE *psize,
+   HDC hdcSrc,
+   POINT *pptSrc,
+   COLORREF crKey,
+   BLENDFUNCTION *pblend,
+   DWORD dwFlags)
 {
    UNIMPLEMENTED

return 0;
 }
-
-

/*