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

user32/tests: Remove runtime check for EndMenu(). 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2017-12-06 15:23:38 +03:00 committed by Alexandre Julliard
parent 3ea7102cbe
commit 84a35f532f
2 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dlls/user32/tests/edit.c
View File

@ -38,14 +38,12 @@ struct edit_notify {
static struct edit_notify notifications; static struct edit_notify notifications;
static BOOL (WINAPI *pEndMenu) (void);
static BOOL (WINAPI *pGetMenuBarInfo)(HWND,LONG,LONG,PMENUBARINFO); static BOOL (WINAPI *pGetMenuBarInfo)(HWND,LONG,LONG,PMENUBARINFO);
static void init_function_pointers(void) static void init_function_pointers(void)
{ {
HMODULE hdll = GetModuleHandleA("user32"); HMODULE hdll = GetModuleHandleA("user32");
pEndMenu = (void*)GetProcAddress(hdll, "EndMenu");
pGetMenuBarInfo = (void*)GetProcAddress(hdll, "GetMenuBarInfo"); pGetMenuBarInfo = (void*)GetProcAddress(hdll, "GetMenuBarInfo");
} }
@ -2294,7 +2292,7 @@ static LRESULT CALLBACK edit4_wnd_procA(HWND hWnd, UINT msg, WPARAM wParam, LPAR
if (hWnd != (HWND)lParam) if (hWnd != (HWND)lParam)
{ {
got_wm_capturechanged = TRUE; got_wm_capturechanged = TRUE;
pEndMenu(); EndMenu();
} }
break; break;
} }
@ -2337,7 +2335,7 @@ static LRESULT CALLBACK edit_proc_proxy(HWND hWnd, UINT msg, WPARAM wParam, LPAR
ok(!mbi.fFocused, "mbi.fFocused = TRUE\n"); ok(!mbi.fFocused, "mbi.fFocused = TRUE\n");
} }
pEndMenu(); EndMenu();
break; break;
} }
} }
@ -2985,11 +2983,7 @@ START_TEST(edit)
test_child_edit_wmkeydown(); test_child_edit_wmkeydown();
test_fontsize(); test_fontsize();
test_dialogmode(); test_dialogmode();
if (pEndMenu) test_contextmenu();
test_contextmenu();
else
win_skip("EndMenu is not available\n");
test_EM_GETHANDLE(); test_EM_GETHANDLE();
test_paste(); test_paste();

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

@ -41,7 +41,6 @@ static BOOL (WINAPI *pGetMenuInfo)(HMENU,LPCMENUINFO);
static BOOL (WINAPI *pGetMenuBarInfo)(HWND,LONG,LONG,PMENUBARINFO); static BOOL (WINAPI *pGetMenuBarInfo)(HWND,LONG,LONG,PMENUBARINFO);
static UINT (WINAPI *pSendInput)(UINT, INPUT*, size_t); static UINT (WINAPI *pSendInput)(UINT, INPUT*, size_t);
static BOOL (WINAPI *pSetMenuInfo)(HMENU,LPCMENUINFO); static BOOL (WINAPI *pSetMenuInfo)(HMENU,LPCMENUINFO);
static BOOL (WINAPI *pEndMenu) (void);
static void init_function_pointers(void) static void init_function_pointers(void)
{ {
@ -56,7 +55,6 @@ static void init_function_pointers(void)
GET_PROC(GetMenuBarInfo) GET_PROC(GetMenuBarInfo)
GET_PROC(SendInput) GET_PROC(SendInput)
GET_PROC(SetMenuInfo) GET_PROC(SetMenuInfo)
GET_PROC(EndMenu)
#undef GET_PROC #undef GET_PROC
} }
@ -3518,7 +3516,7 @@ static LRESULT WINAPI menu_cancelmode_wnd_proc(HWND hwnd, UINT msg,
PostMessageA( hwnd, WM_MOUSEMOVE, 0, 0); PostMessageA( hwnd, WM_MOUSEMOVE, 0, 0);
return SendMessageA( g_hwndtosend, WM_CANCELMODE, 0, 0); return SendMessageA( g_hwndtosend, WM_CANCELMODE, 0, 0);
} }
pEndMenu(); EndMenu();
return TRUE; return TRUE;
} }
} }
@ -3531,10 +3529,7 @@ static void test_menu_cancelmode(void)
HWND hwnd, hwndchild; HWND hwnd, hwndchild;
HMENU menu, menubar; HMENU menu, menubar;
MSG msg; MSG msg;
if( !pEndMenu) { /* win95 */
win_skip( "EndMenu is not available\n");
return;
}
hwnd = CreateWindowExA( 0, (LPCSTR)MAKEINTATOM(atomMenuCheckClass), NULL, hwnd = CreateWindowExA( 0, (LPCSTR)MAKEINTATOM(atomMenuCheckClass), NULL,
WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 200, 200, WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 200, 200,
NULL, NULL, NULL, NULL); NULL, NULL, NULL, NULL);