20 Mar
2008
20 Mar
'08
2:30 p.m.
Author: tkreuzer
Date: Thu Mar 20 09:30:42 2008
New Revision: 32726
URL: http://svn.reactos.org/svn/reactos?rev=3D32726&view=3Drev
Log:
patch by Stefan Ginsberg (stefan__100__ AT hotmail DOT com):
- remove NtUserAcquireOrReleaseInputOwnership and NtUserSendMessageCallback
- move ros specific types belonging to ros specific ntuser calls into ntuse=
r.h near the respective prototypes
- add a commented out GDI_DEBUG define to gdiobj.c
Modified:
trunk/reactos/dll/win32/user32/user32.def
trunk/reactos/dll/win32/user32/windows/input.c
trunk/reactos/dll/win32/user32/windows/message.c
trunk/reactos/include/reactos/win32k/ntuser.h
trunk/reactos/include/reactos/win32k/ntusrtyp.h
trunk/reactos/subsystems/win32/win32k/ntuser/input.c
trunk/reactos/subsystems/win32/win32k/ntuser/message.c
trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c
trunk/reactos/subsystems/win32/win32k/w32ksvc.db
Modified: trunk/reactos/dll/win32/user32/user32.def
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/user=
32.def?rev=3D32726&r1=3D32725&r2=3D32726&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/dll/win32/user32/user32.def (original)
+++ trunk/reactos/dll/win32/user32/user32.def Thu Mar 20 09:30:42 2008
@@ -521,7 +521,6 @@
PostThreadMessageA@16
PostThreadMessageW@16
PrintWindow@12
-PrivateCsrssAcquireOrReleaseInputOwnership@4
PrivateCsrssRegisterPrimitive@0
PrivateCsrssManualGuiCheck@4
PrivateCsrssInitialized@0
Modified: trunk/reactos/dll/win32/user32/windows/input.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/wind=
ows/input.c?rev=3D32726&r1=3D32725&r2=3D32726&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/dll/win32/user32/windows/input.c (original)
+++ trunk/reactos/dll/win32/user32/windows/input.c Thu Mar 20 09:30:42 2008
@@ -582,16 +582,6 @@
PrivateCsrssRegisterPrimitive(VOID)
{
NtUserCallNoParam(NOPARAM_ROUTINE_REGISTER_PRIMITIVE);
-}
-
-/*
- * Another private call for CSRSS
- */
-VOID
-STDCALL
-PrivateCsrssAcquireOrReleaseInputOwnership(BOOL Release)
-{
- NtUserAcquireOrReleaseInputOwnership(Release);
}
=
/*
Modified: trunk/reactos/dll/win32/user32/windows/message.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/wind=
ows/message.c?rev=3D32726&r1=3D32725&r2=3D32726&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/dll/win32/user32/windows/message.c (original)
+++ trunk/reactos/dll/win32/user32/windows/message.c Thu Mar 20 09:30:42 20=
08
@@ -1829,7 +1829,7 @@
=
=
/*
- * @implemented
+ * @unimplemented
*/
BOOL
STDCALL
@@ -1841,18 +1841,13 @@
SENDASYNCPROC lpCallBack,
ULONG_PTR dwData)
{
- return NtUserSendMessageCallback(
- hWnd,
- Msg,
- wParam,
- lParam,
- lpCallBack,
- dwData);
-}
-
-
-/*
- * @implemented
+ UNIMPLEMENTED;
+ return FALSE;
+}
+
+
+/*
+ * @unimplemented
*/
BOOL
STDCALL
@@ -1864,13 +1859,8 @@
SENDASYNCPROC lpCallBack,
ULONG_PTR dwData)
{
- return NtUserSendMessageCallback(
- hWnd,
- Msg,
- wParam,
- lParam,
- lpCallBack,
- dwData);
+ UNIMPLEMENTED;
+ return FALSE;
}
=
=
Modified: trunk/reactos/include/reactos/win32k/ntuser.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32=
k/ntuser.h?rev=3D32726&r1=3D32725&r2=3D32726&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/include/reactos/win32k/ntuser.h (original)
+++ trunk/reactos/include/reactos/win32k/ntuser.h Thu Mar 20 09:30:42 2008
@@ -2378,7 +2378,7 @@
=
=
/* NtUserBad
-* ReactOS-specific NtUser calls which shouldn't exist.
+* ReactOS-specific NtUser calls and their related structures, both which=
shouldn't exist.
*/
=
=
@@ -2522,6 +2522,34 @@
NTAPI
NtUserManualGuiCheck(LONG Check);
=
+
+
+/* (other FocusedItem values give the position of the focused item) */
+#define NO_SELECTED_ITEM 0xffff
+
+typedef struct tagROSMENUINFO
+{
+ /* ----------- MENUINFO ----------- */
+ DWORD cbSize;
+ DWORD fMask;
+ DWORD dwStyle;
+ UINT cyMax;
+ HBRUSH hbrBack;
+ DWORD dwContextHelpID;
+ ULONG_PTR dwMenuData;
+ /* ----------- Extra ----------- */
+ HMENU Self; /* Handle of this menu */
+ WORD Flags; /* Menu flags (MF_POPUP, MF_SYSMENU) */
+ UINT FocusedItem; /* Currently focused item */
+ UINT MenuItemCount; /* Number of items in the menu */
+ HWND Wnd; /* Window containing the menu */
+ WORD Width; /* Width of the whole menu */
+ WORD Height; /* Height of the whole menu */
+ HWND WndOwner; /* window receiving the messages for ownerdraw */
+ BOOL TimeToHide; /* Request hiding when receiving a second click in =
the top-level menu item */
+ SIZE maxBmpSize; /* Maximum size of the bitmap items in MIIM_BITMAP =
state */
+} ROSMENUINFO, *PROSMENUINFO;
+
BOOL
NTAPI
NtUserMenuInfo(
@@ -2529,6 +2557,29 @@
PROSMENUINFO lpmi,
BOOL fsog
);
+
+
+
+typedef struct tagROSMENUITEMINFO
+{
+ /* ----------- MENUITEMINFOW ----------- */
+ UINT cbSize;
+ UINT fMask;
+ UINT fType;
+ UINT fState;
+ UINT wID;
+ HMENU hSubMenu;
+ HBITMAP hbmpChecked;
+ HBITMAP hbmpUnchecked;
+ DWORD dwItemData;
+ LPWSTR dwTypeData;
+ UINT cch;
+ HBITMAP hbmpItem;
+ /* ----------- Extra ----------- */
+ RECT Rect; /* Item area (relative to menu window) */
+ UINT XTab; /* X position of text after Tab */
+ LPWSTR Text; /* Copy of the text pointer in MenuItem->Text */
+} ROSMENUITEMINFO, *PROSMENUITEMINFO;
=
BOOL
NTAPI
Modified: trunk/reactos/include/reactos/win32k/ntusrtyp.h
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32=
k/ntusrtyp.h?rev=3D32726&r1=3D32725&r2=3D32726&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/include/reactos/win32k/ntusrtyp.h (original)
+++ trunk/reactos/include/reactos/win32k/ntusrtyp.h Thu Mar 20 09:30:42 2008
@@ -120,51 +120,4 @@
BYTE Showing;
} THRDCARETINFO, *PTHRDCARETINFO;
=
-typedef struct tagROSMENUINFO
-{
- /* ----------- MENUINFO ----------- */
- DWORD cbSize;
- DWORD fMask;
- DWORD dwStyle;
- UINT cyMax;
- HBRUSH hbrBack;
- DWORD dwContextHelpID;
- ULONG_PTR dwMenuData;
- /* ----------- Extra ----------- */
- HMENU Self; /* Handle of this menu */
- WORD Flags; /* Menu flags (MF_POPUP, MF_SYSMENU) */
- UINT FocusedItem; /* Currently focused item */
- UINT MenuItemCount; /* Number of items in the menu */
- HWND Wnd; /* Window containing the menu */
- WORD Width; /* Width of the whole menu */
- WORD Height; /* Height of the whole menu */
- HWND WndOwner; /* window receiving the messages for ownerdraw */
- BOOL TimeToHide; /* Request hiding when receiving a second click in =
the top-level menu item */
- SIZE maxBmpSize; /* Maximum size of the bitmap items in MIIM_BITMAP =
state */
-} ROSMENUINFO, *PROSMENUINFO;
-
-/* (other FocusedItem values give the position of the focused item) */
-#define NO_SELECTED_ITEM 0xffff
-
-typedef struct tagROSMENUITEMINFO
-{
- /* ----------- MENUITEMINFOW ----------- */
- UINT cbSize;
- UINT fMask;
- UINT fType;
- UINT fState;
- UINT wID;
- HMENU hSubMenu;
- HBITMAP hbmpChecked;
- HBITMAP hbmpUnchecked;
- DWORD dwItemData;
- LPWSTR dwTypeData;
- UINT cch;
- HBITMAP hbmpItem;
- /* ----------- Extra ----------- */
- RECT Rect; /* Item area (relative to menu window) */
- UINT XTab; /* X position of text after Tab */
- LPWSTR Text; /* Copy of the text pointer in MenuItem->Text */
-} ROSMENUITEMINFO, *PROSMENUITEMINFO;
-
#endif
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/input.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3=
2k/ntuser/input.c?rev=3D32726&r1=3D32725&r2=3D32726&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/subsystems/win32/win32k/ntuser/input.c (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/input.c Thu Mar 20 09:30:4=
2 2008
@@ -832,13 +832,6 @@
}
=
=
-NTSTATUS STDCALL
-NtUserAcquireOrReleaseInputOwnership(BOOLEAN Release)
-{
- return STATUS_SUCCESS;
-}
-
-
NTSTATUS FASTCALL
InitInputImpl(VOID)
{
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/message.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3=
2k/ntuser/message.c?rev=3D32726&r1=3D32725&r2=3D32726&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/subsystems/win32/win32k/ntuser/message.c (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/message.c Thu Mar 20 09:30=
:42 2008
@@ -1687,19 +1687,6 @@
END_CLEANUP;
}
=
-BOOL STDCALL
-NtUserSendMessageCallback(HWND hWnd,
- UINT Msg,
- WPARAM wParam,
- LPARAM lParam,
- SENDASYNCPROC lpCallBack,
- ULONG_PTR dwData)
-{
- UNIMPLEMENTED;
-
- return 0;
-}
-
=
BOOL FASTCALL
UserSendNotifyMessage(HWND hWnd,
Modified: trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3=
2k/objects/gdiobj.c?rev=3D32726&r1=3D32725&r2=3D32726&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c (original)
+++ trunk/reactos/subsystems/win32/win32k/objects/gdiobj.c Thu Mar 20 09:30=
:42 2008
@@ -29,6 +29,8 @@
=
/* FIXME include right header for KeRosDumpStackFrames */
VOID NTAPI KeRosDumpStackFrames(PULONG, ULONG);
+
+//#define GDI_DEBUG
=
#ifdef GDI_DEBUG
BOOLEAN STDCALL KiRosPrintAddress(PVOID Address);
@@ -730,6 +732,7 @@
* The object is currently locked, so freeing is forbidden!
*/
DPRINT1("Object->cExclusiveLock =3D %d\n",
Object->cExclus=
iveLock);
+ GDIDBG_TRACECALLER();
GDIDBG_TRACELOCKER(GDI_HANDLE_GET_INDEX(hObj));
ASSERT(FALSE);
}
Modified: trunk/reactos/subsystems/win32/win32k/w32ksvc.db
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win3=
2k/w32ksvc.db?rev=3D32726&r1=3D32725&r2=3D32726&view=3Ddiff
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/reactos/subsystems/win32/win32k/w32ksvc.db (original)
+++ trunk/reactos/subsystems/win32/win32k/w32ksvc.db Thu Mar 20 09:30:42 20=
08
@@ -679,7 +679,6 @@
NtGdiSetViewportOrgEx 4
NtGdiSetWindowExtEx 4
NtGdiSetWindowOrgEx 4
-NtUserAcquireOrReleaseInputOwnership 1
NtUserBuildMenuItemList 4
NtUserCreateCursorIconHandle 2
NtUserDereferenceWndProcHandle 2
@@ -714,7 +713,6 @@
NtUserRegisterClassEx 6
NtUserRegisterClipboardFormat 1
NtUserSendMessage 5
-NtUserSendMessageCallback 6
NtUserSendMessageTimeout 8
NtUserSendNotifyMessage 4
NtUserSetScrollBarInfo 3