Author: jimtabor
Date: Sat Mar 6 00:10:16 2010
New Revision: 45901
URL:
http://svn.reactos.org/svn/reactos?rev=45901&view=rev
Log:
- [Win32k] Fix DrawMenuBar.
Modified:
trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c
Modified: trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt…
==============================================================================
--- trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/win32k/ntuser/simplecall.c [iso-8859-1] Sat Mar 6
00:10:16 2010
@@ -490,28 +490,17 @@
case HWNDLOCK_ROUTINE_DRAWMENUBAR:
{
- PMENU_OBJECT Menu;
DPRINT("HWNDLOCK_ROUTINE_DRAWMENUBAR\n");
- Ret = FALSE;
- if (!((Wnd->style & (WS_CHILD | WS_POPUP)) != WS_CHILD))
- break;
-
- if(!(Menu = UserGetMenuObject((HMENU)(DWORD_PTR) Wnd->IDMenu)))
- break;
-
- Menu->MenuInfo.WndOwner = hWnd;
- Menu->MenuInfo.Height = 0;
-
- co_WinPosSetWindowPos( Window,
- HWND_DESKTOP,
- 0,0,0,0,
- SWP_NOSIZE|
- SWP_NOMOVE|
- SWP_NOZORDER|
- SWP_NOACTIVATE|
- SWP_FRAMECHANGED );
-
Ret = TRUE;
+ if ((Wnd->style & (WS_CHILD | WS_POPUP)) != WS_CHILD)
+ co_WinPosSetWindowPos( Window,
+ HWND_DESKTOP,
+ 0,0,0,0,
+ SWP_NOSIZE|
+ SWP_NOMOVE|
+ SWP_NOZORDER|
+ SWP_NOACTIVATE|
+ SWP_FRAMECHANGED );
break;
}