[ros-diffs] [jimtabor] 51201: [User32|Win32k] - Update NtUser pump functions, based on known values. Move one more function to the right place.
jimtabor at svn.reactos.org
jimtabor at svn.reactos.org
Wed Mar 30 01:00:28 UTC 2011
Author: jimtabor
Date: Wed Mar 30 01:00:28 2011
New Revision: 51201
URL: http://svn.reactos.org/svn/reactos?rev=51201&view=rev
Log:
[User32|Win32k]
- Update NtUser pump functions, based on known values. Move one more function to the right place.
Modified:
trunk/reactos/include/reactos/win32k/ntuser.h
trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c
trunk/reactos/subsystems/win32/win32k/ntuser/window.c
trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c
Modified: trunk/reactos/include/reactos/win32k/ntuser.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntuser.h?rev=51201&r1=51200&r2=51201&view=diff
==============================================================================
--- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Wed Mar 30 01:00:28 2011
@@ -2404,28 +2404,28 @@
HWND hWnd,
DWORD Index);
-DWORD
+BOOL
NTAPI
NtUserRealInternalGetMessage(
- DWORD dwUnknown1,
- DWORD dwUnknown2,
- DWORD dwUnknown3,
- DWORD dwUnknown4,
- DWORD dwUnknown5,
- DWORD dwUnknown6);
-
-DWORD
+ LPMSG lpMsg,
+ HWND hWnd,
+ UINT wMsgFilterMin,
+ UINT wMsgFilterMax,
+ UINT wRemoveMsg,
+ BOOL bGMSG);
+
+HWND
NTAPI
NtUserRealChildWindowFromPoint(
- DWORD Unknown0,
- DWORD Unknown1,
- DWORD Unknown2);
-
-DWORD
+ HWND Parent,
+ LONG x,
+ LONG y);
+
+BOOL
NTAPI
NtUserRealWaitMessageEx(
- DWORD dwUnknown1,
- DWORD dwUnknown2);
+ DWORD dwWakeMask,
+ UINT uTimeout);
BOOL
NTAPI
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c?rev=51201&r1=51200&r2=51201&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/ntstubs.c [iso-8859-1] Wed Mar 30 01:00:28 2011
@@ -935,25 +935,25 @@
return 0;
}
-DWORD
+BOOL
APIENTRY
NtUserRealInternalGetMessage(
- DWORD dwUnknown1,
- DWORD dwUnknown2,
- DWORD dwUnknown3,
- DWORD dwUnknown4,
- DWORD dwUnknown5,
- DWORD dwUnknown6)
-{
- UNIMPLEMENTED;
- return 0;
-}
-
-DWORD
+ LPMSG lpMsg,
+ HWND hWnd,
+ UINT wMsgFilterMin,
+ UINT wMsgFilterMax,
+ UINT wRemoveMsg,
+ BOOL bGMSG)
+{
+ UNIMPLEMENTED;
+ return 0;
+}
+
+BOOL
APIENTRY
NtUserRealWaitMessageEx(
- DWORD dwUnknown1,
- DWORD dwUnknown2)
+ DWORD dwWakeMask,
+ UINT uTimeout)
{
UNIMPLEMENTED;
return 0;
@@ -1252,10 +1252,10 @@
/*
* @unimplemented
*/
-DWORD APIENTRY
-NtUserRealChildWindowFromPoint(DWORD Unknown0,
- DWORD Unknown1,
- DWORD Unknown2)
+HWND APIENTRY
+NtUserRealChildWindowFromPoint(HWND Parent,
+ LONG x,
+ LONG y)
{
UNIMPLEMENTED
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/window.c?rev=51201&r1=51200&r2=51201&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Wed Mar 30 01:00:28 2011
@@ -1476,73 +1476,6 @@
*pBufSize = dwCount;
return STATUS_SUCCESS;
-}
-
-
-/*
- * @implemented
- */
-HWND APIENTRY
-NtUserChildWindowFromPointEx(HWND hwndParent,
- LONG x,
- LONG y,
- UINT uiFlags)
-{
- PWND Parent;
- POINTL Pt;
- HWND Ret;
- HWND *List, *phWnd;
-
- if(!(Parent = UserGetWindowObject(hwndParent)))
- {
- return NULL;
- }
-
- Pt.x = x;
- Pt.y = y;
-
- if(Parent->head.h != IntGetDesktopWindow())
- {
- Pt.x += Parent->rcClient.left;
- Pt.y += Parent->rcClient.top;
- }
-
- if(!IntPtInWindow(Parent, Pt.x, Pt.y))
- {
- return NULL;
- }
-
- Ret = Parent->head.h;
- if((List = IntWinListChildren(Parent)))
- {
- for(phWnd = List; *phWnd; phWnd++)
- {
- PWND Child;
- if((Child = UserGetWindowObject(*phWnd)))
- {
- if(!(Child->style & WS_VISIBLE) && (uiFlags & CWP_SKIPINVISIBLE))
- {
- continue;
- }
- if((Child->style & WS_DISABLED) && (uiFlags & CWP_SKIPDISABLED))
- {
- continue;
- }
- if((Child->ExStyle & WS_EX_TRANSPARENT) && (uiFlags & CWP_SKIPTRANSPARENT))
- {
- continue;
- }
- if(IntPtInWindow(Child, Pt.x, Pt.y))
- {
- Ret = Child->head.h;
- break;
- }
- }
- }
- ExFreePool(List);
- }
-
- return Ret;
}
static void IntSendParentNotify( PWND pWindow, UINT msg )
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c?rev=51201&r1=51200&r2=51201&view=diff
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/winpos.c [iso-8859-1] Wed Mar 30 01:00:28 2011
@@ -1800,6 +1800,72 @@
/*
* @implemented
*/
+HWND APIENTRY
+NtUserChildWindowFromPointEx(HWND hwndParent,
+ LONG x,
+ LONG y,
+ UINT uiFlags)
+{
+ PWND Parent;
+ POINTL Pt;
+ HWND Ret;
+ HWND *List, *phWnd;
+
+ if(!(Parent = UserGetWindowObject(hwndParent)))
+ {
+ return NULL;
+ }
+
+ Pt.x = x;
+ Pt.y = y;
+
+ if(Parent->head.h != IntGetDesktopWindow())
+ {
+ Pt.x += Parent->rcClient.left;
+ Pt.y += Parent->rcClient.top;
+ }
+
+ if(!IntPtInWindow(Parent, Pt.x, Pt.y))
+ {
+ return NULL;
+ }
+
+ Ret = Parent->head.h;
+ if((List = IntWinListChildren(Parent)))
+ {
+ for(phWnd = List; *phWnd; phWnd++)
+ {
+ PWND Child;
+ if((Child = UserGetWindowObject(*phWnd)))
+ {
+ if(!(Child->style & WS_VISIBLE) && (uiFlags & CWP_SKIPINVISIBLE))
+ {
+ continue;
+ }
+ if((Child->style & WS_DISABLED) && (uiFlags & CWP_SKIPDISABLED))
+ {
+ continue;
+ }
+ if((Child->ExStyle & WS_EX_TRANSPARENT) && (uiFlags & CWP_SKIPTRANSPARENT))
+ {
+ continue;
+ }
+ if(IntPtInWindow(Child, Pt.x, Pt.y))
+ {
+ Ret = Child->head.h;
+ break;
+ }
+ }
+ }
+ ExFreePool(List);
+ }
+
+ return Ret;
+}
+
+/*
+ * @implemented
+ */
BOOL APIENTRY
NtUserEndDeferWindowPosEx(HDWP WinPosInfo,
DWORD Unknown1)
More information about the Ros-diffs
mailing list