Bang Jun-young : user32: Fix EndMenu() to match the PSDK.
Alexandre Julliard
julliard at winehq.org
Mon Feb 4 08:43:14 CST 2008
Module: wine
Branch: master
Commit: 9fcebb0055407b389874d7a35468c8de7cd27059
URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fcebb0055407b389874d7a35468c8de7cd27059
Author: Bang Jun-young <junyoung at mogua.com>
Date: Fri Feb 1 14:54:17 2008 +0900
user32: Fix EndMenu() to match the PSDK.
---
dlls/user32/menu.c | 3 ++-
include/winuser.h | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c
index 99c4933..660c5d5 100644
--- a/dlls/user32/menu.c
+++ b/dlls/user32/menu.c
@@ -4252,7 +4252,7 @@ END:
* EndMenu (USER.187)
* EndMenu (USER32.@)
*/
-void WINAPI EndMenu(void)
+BOOL WINAPI EndMenu(void)
{
/* if we are in the menu code, and it is active */
if (!fEndMenu && top_popup)
@@ -4266,6 +4266,7 @@ void WINAPI EndMenu(void)
/* don't end up with an orphaned menu */
PostMessageW( top_popup, WM_CANCELMODE, 0, 0);
}
+ return fEndMenu;
}
diff --git a/include/winuser.h b/include/winuser.h
index aec4a83..6e61e10 100644
--- a/include/winuser.h
+++ b/include/winuser.h
@@ -4482,7 +4482,7 @@ WINUSERAPI BOOL WINAPI EnableScrollBar(HWND,UINT,UINT);
WINUSERAPI BOOL WINAPI EnableWindow(HWND,BOOL);
WINUSERAPI BOOL WINAPI EndDeferWindowPos(HDWP);
WINUSERAPI BOOL WINAPI EndDialog(HWND,INT_PTR);
-WINUSERAPI VOID WINAPI EndMenu(void);
+WINUSERAPI BOOL WINAPI EndMenu(void);
WINUSERAPI BOOL WINAPI EndPaint(HWND,const PAINTSTRUCT*);
WINUSERAPI BOOL WINAPI EnumChildWindows(HWND,WNDENUMPROC,LPARAM);
WINUSERAPI UINT WINAPI EnumClipboardFormats(UINT);
More information about the wine-cvs
mailing list