ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user32: Handle MN_GETHMENU in PopupMenuWndProc.

This commit is contained in:
Rein Klazes 2009-10-16 13:12:33 +02:00 committed by Alexandre Julliard
parent 7f8e4e275d
commit b94f63ef38
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/user32/menu.c
View File

@ -3509,6 +3509,7 @@ static LRESULT WINAPI PopupMenuWndProc( HWND hwnd, UINT message, WPARAM wParam,
break;
case MM_GETMENUHANDLE:
case MN_GETHMENU:
return GetWindowLongPtrW( hwnd, 0 );
default:

7
dlls/user32/tests/menu.c
View File

@ -150,10 +150,12 @@ static int gflag_initmenupopup,
static LRESULT WINAPI menu_ownerdraw_wnd_proc(HWND hwnd, UINT msg,
WPARAM wparam, LPARAM lparam)
{
static HMENU hmenupopup;
switch (msg)
{
case WM_INITMENUPOPUP:
gflag_initmenupopup++;
hmenupopup = (HMENU) wparam;
break;
case WM_ENTERMENULOOP:
gflag_entermenuloop++;
@ -229,6 +231,11 @@ static LRESULT WINAPI menu_ownerdraw_wnd_proc(HWND hwnd, UINT msg,
{
ok( lparam || broken(!lparam), /* win9x, nt4 */
"Menu window handle is NULL!\n");
if( lparam) {
HMENU hmenu = (HMENU)SendMessageA( (HWND)lparam, MN_GETHMENU, 0, 0);
ok( hmenupopup == hmenu, "MN_GETHMENU returns %p expected %p\n",
hmenu, hmenupopup);
}
PostMessage(hwnd, WM_CANCELMODE, 0, 0);
return TRUE;
}