May 2013 - Wine-commits - list.winehq.org

André Hentschel : difxapi: Add stub dll.
by Alexandre Julliard 20 May '13

20 May '13

Module: wine Branch: master Commit: 124d5a879d24cdee9637b55e5ea32edc61509e0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=124d5a879d24cdee9637b55e5… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon May 20 01:55:43 2013 +0200 difxapi: Add stub dll. --- configure | 1 + configure.ac | 1 + dlls/difxapi/Makefile.in | 3 +++ dlls/difxapi/difxapi.spec | 10 ++++++++++ 4 files changed, 15 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 9110105..333594a 100755 --- a/configure +++ b/configure @@ -15806,6 +15806,7 @@ wine_fn_config_test dlls/ddrawex/tests ddrawex_test wine_fn_config_dll devenum enable_devenum po wine_fn_config_test dlls/devenum/tests devenum_test wine_fn_config_dll dhcpcsvc enable_dhcpcsvc +wine_fn_config_dll difxapi enable_difxapi wine_fn_config_dll dinput enable_dinput implib,po,staticimplib wine_fn_config_test dlls/dinput/tests dinput_test wine_fn_config_dll dinput8 enable_dinput8 implib diff --git a/configure.ac b/configure.ac index 98b51e3..4835bf3 100644 --- a/configure.ac +++ b/configure.ac @@ -2701,6 +2701,7 @@ WINE_CONFIG_TEST(dlls/ddrawex/tests) WINE_CONFIG_DLL(devenum,,[po]) WINE_CONFIG_TEST(dlls/devenum/tests) WINE_CONFIG_DLL(dhcpcsvc) +WINE_CONFIG_DLL(difxapi) WINE_CONFIG_DLL(dinput,,[implib,po,staticimplib]) WINE_CONFIG_TEST(dlls/dinput/tests) WINE_CONFIG_DLL(dinput8,,[implib]) diff --git a/dlls/difxapi/Makefile.in b/dlls/difxapi/Makefile.in new file mode 100644 index 0000000..17ddaa2 --- /dev/null +++ b/dlls/difxapi/Makefile.in @@ -0,0 +1,3 @@ +MODULE = difxapi.dll + +(a)MAKE_DLL_RULES@ diff --git a/dlls/difxapi/difxapi.spec b/dlls/difxapi/difxapi.spec new file mode 100644 index 0000000..a7f6ade --- /dev/null +++ b/dlls/difxapi/difxapi.spec @@ -0,0 +1,10 @@ +@ stub DIFXAPISetLogCallbackA +@ stub DIFXAPISetLogCallbackW +@ stub DriverPackageGetPathA +@ stub DriverPackageGetPathW +@ stub DriverPackageInstallA +@ stub DriverPackageInstallW +@ stub DriverPackagePreinstallA +@ stub DriverPackagePreinstallW +@ stub DriverPackageUninstallA +@ stub DriverPackageUninstallW

1 0

Stefan Dösinger : d3d: d3d9ex does not do video memory accounting for D3DPOOL_DEFAULT resources.
by Alexandre Julliard 20 May '13

20 May '13

Module: wine Branch: master Commit: 9287bb80dc974235d43d5ee4fadc86e1a11dbfeb URL: http://source.winehq.org/git/wine.git/?a=commit;h=9287bb80dc974235d43d5ee4f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun May 19 23:13:30 2013 +0200 d3d: d3d9ex does not do video memory accounting for D3DPOOL_DEFAULT resources. --- dlls/d3d8/directx.c | 4 +++- dlls/d3d9/directx.c | 3 ++- dlls/ddraw/ddraw.c | 2 +- dlls/wined3d/resource.c | 7 +++++-- include/wine/wined3d.h | 1 + 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 61d187d..4aac722 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -404,11 +404,13 @@ static const struct IDirect3D8Vtbl d3d8_vtbl = BOOL d3d8_init(struct d3d8 *d3d8) { + DWORD flags = WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING; + d3d8->IDirect3D8_iface.lpVtbl = &d3d8_vtbl; d3d8->refcount = 1; wined3d_mutex_lock(); - d3d8->wined3d = wined3d_create(8, WINED3D_LEGACY_DEPTH_BIAS); + d3d8->wined3d = wined3d_create(8, flags); wined3d_mutex_unlock(); if (!d3d8->wined3d) return FALSE; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index a335375..537e6af 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -632,11 +632,12 @@ static const struct IDirect3D9ExVtbl d3d9_vtbl = BOOL d3d9_init(struct d3d9 *d3d9, BOOL extended) { + DWORD flags = extended ? 0 : WINED3D_VIDMEM_ACCOUNTING; d3d9->IDirect3D9Ex_iface.lpVtbl = &d3d9_vtbl; d3d9->refcount = 1; wined3d_mutex_lock(); - d3d9->wined3d = wined3d_create(9, 0); + d3d9->wined3d = wined3d_create(9, flags); wined3d_mutex_unlock(); if (!d3d9->wined3d) return FALSE; diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index a459e5f..b2b637e 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -5234,7 +5234,7 @@ HRESULT ddraw_init(struct ddraw *ddraw, enum wined3d_device_type device_type) ddraw->numIfaces = 1; ddraw->ref7 = 1; - flags = WINED3D_LEGACY_DEPTH_BIAS; + flags = WINED3D_LEGACY_DEPTH_BIAS | WINED3D_VIDMEM_ACCOUNTING; if (DefaultSurfaceType != DDRAW_SURFACE_TYPE_OPENGL) flags |= WINED3D_NO3D; diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index d784622..0e0678d 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -84,6 +84,8 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * void *parent, const struct wined3d_parent_ops *parent_ops, const struct wined3d_resource_ops *resource_ops) { + const struct wined3d *d3d = device->wined3d; + resource->ref = 1; resource->device = device; resource->type = type; @@ -124,7 +126,7 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * + (RESOURCE_ALIGNMENT - 1)) & ~(RESOURCE_ALIGNMENT - 1)); /* Check that we have enough video ram left */ - if (pool == WINED3D_POOL_DEFAULT) + if (pool == WINED3D_POOL_DEFAULT && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) { if (size > wined3d_device_get_available_texture_mem(device)) { @@ -142,13 +144,14 @@ HRESULT resource_init(struct wined3d_resource *resource, struct wined3d_device * void resource_cleanup(struct wined3d_resource *resource) { + const struct wined3d *d3d = resource->device->wined3d; struct private_data *data; struct list *e1, *e2; HRESULT hr; TRACE("Cleaning up resource %p.\n", resource); - if (resource->pool == WINED3D_POOL_DEFAULT) + if (resource->pool == WINED3D_POOL_DEFAULT && d3d->flags & WINED3D_VIDMEM_ACCOUNTING) { TRACE("Decrementing device memory pool by %u.\n", resource->size); adapter_adjust_memory(resource->device->adapter, 0 - resource->size); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 75cba55..27575bb 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1216,6 +1216,7 @@ enum wined3d_display_rotation #define WINED3D_LEGACY_DEPTH_BIAS 0x00000001 #define WINED3D_NO3D 0x00000002 +#define WINED3D_VIDMEM_ACCOUNTING 0x00000004 #define WINED3D_RESZ_CODE 0x7fa05000

1 0

Alistair Leslie-Hughes : oledb32: Implement DataConvert DBTYPE_VARIANT( VT_DATE) to, DBTYPE_DBTIMESTAMP.
by Alexandre Julliard 20 May '13

20 May '13

Module: wine Branch: master Commit: 70af1dd0253f713a0271db50edf0dfcd5a2a8ec1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=70af1dd0253f713a0271db50e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 20 15:09:09 2013 +1000 oledb32: Implement DataConvert DBTYPE_VARIANT(VT_DATE) to, DBTYPE_DBTIMESTAMP. --- dlls/oledb32/convert.c | 18 ++++++++++++++++++ dlls/oledb32/tests/convert.c | 21 +++++++++++++++++++++ 2 files changed, 39 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index af603e4..6ae9a06 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -445,6 +445,24 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, d->fraction = st.wMilliseconds * 1000000; break; } + case DBTYPE_VARIANT: + { + if( V_VT((VARIANT*)src) == VT_DATE) + { + SYSTEMTIME st; + hr = (VariantTimeToSystemTime( V_DATE((VARIANT*)src), &st) ? S_OK : E_FAIL); + d->year = st.wYear; + d->month = st.wMonth; + d->day = st.wDay; + d->hour = st.wHour; + d->minute = st.wMinute; + d->second = st.wSecond; + d->fraction = st.wMilliseconds * 1000000; + break; + } + else + FIXME("Unimplemented variant type %d -> DBTIMESTAMP\n", V_VT((VARIANT*)src)); + } default: FIXME("Unimplemented conversion %04x -> DBTIMESTAMP\n", src_type); return E_NOTIMPL; } break; diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 6f02899..39f96d2 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2603,6 +2603,26 @@ static void test_converttovar(void) ok( (float)V_DATE(&dst) == 41409.0, "got %f\n", V_DATE(&dst)); } +static void test_converttotimestamp(void) +{ + DBTIMESTAMP ts = {2013, 5, 14, 2, 4, 12, 0}; + DBTIMESTAMP dst; + DBSTATUS dst_status; + DBLENGTH dst_len; + VARIANT var; + HRESULT hr; + + VariantInit(&var); + V_VT(&var) = VT_DATE; + V_DATE(&var) = 41408.086250; + dst_len = 0x1234; + hr = IDataConvert_DataConvert(convert, DBTYPE_VARIANT, DBTYPE_DBTIMESTAMP, 0, &dst_len, &var, &dst, sizeof(dst), 0, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_OK, "got %08x\n", dst_status); + ok(dst_len == sizeof(dst), "got %ld\n", dst_len); + ok(!memcmp(&ts, &dst, sizeof(ts)), "Wrong timestamp\n"); +} + START_TEST(convert) { HRESULT hr; @@ -2638,6 +2658,7 @@ START_TEST(convert) test_converttobytes(); test_converttodbdate(); test_getconversionsize(); + test_converttotimestamp(); IDataConvert_Release(convert);

1 0

Alistair Leslie-Hughes : oledb32: Support DBSTATUS_S_ISNULL when converting to VARIANT.
by Alexandre Julliard 20 May '13

20 May '13

Module: wine Branch: master Commit: 89312f9d4925dd45b8346ce2999fe866e8119709 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89312f9d4925dd45b8346ce29… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Mon May 20 15:33:22 2013 +1000 oledb32: Support DBSTATUS_S_ISNULL when converting to VARIANT. --- dlls/oledb32/convert.c | 7 +++++++ dlls/oledb32/tests/convert.c | 8 ++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/dlls/oledb32/convert.c b/dlls/oledb32/convert.c index 6ae9a06..fe7ba8c 100644 --- a/dlls/oledb32/convert.c +++ b/dlls/oledb32/convert.c @@ -789,6 +789,13 @@ static HRESULT WINAPI convert_DataConvert(IDataConvert* iface, { VARIANT *v = dst; + if(src_status == DBSTATUS_S_ISNULL) + { + *dst_status = DBSTATUS_S_ISNULL; + *dst_len = 0; + return S_OK; + } + switch(src_type) { case DBTYPE_BOOL: diff --git a/dlls/oledb32/tests/convert.c b/dlls/oledb32/tests/convert.c index 39f96d2..68df732 100644 --- a/dlls/oledb32/tests/convert.c +++ b/dlls/oledb32/tests/convert.c @@ -2601,6 +2601,14 @@ static void test_converttovar(void) ok(dst_len == sizeof(dst), "got %ld\n", dst_len); ok(V_VT(&dst) == VT_DATE, "got %d\n", V_VT(&dst)); ok( (float)V_DATE(&dst) == 41409.0, "got %f\n", V_DATE(&dst)); + + /* src_status = DBSTATUS_S_ISNULL */ + i4 = 123; + hr = IDataConvert_DataConvert(convert, DBTYPE_I4, DBTYPE_VARIANT, sizeof(i4), &dst_len, &i4, &dst, sizeof(dst), DBSTATUS_S_ISNULL, &dst_status, 0, 0, 0); + ok(hr == S_OK, "got %08x\n", hr); + ok(dst_status == DBSTATUS_S_ISNULL, "got %08x\n", dst_status); + ok(dst_len == 0, "got %ld\n", dst_len); + } static void test_converttotimestamp(void)

1 0

Christian Costa : d3dxof: Group and simplify templates and objects in a cleaner manner.
by Alexandre Julliard 20 May '13

20 May '13

Module: wine Branch: master Commit: 83f49b9855e8b1a8eaa494dc9fff32275f3de447 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83f49b9855e8b1a8eaa494dc9… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun May 19 22:32:58 2013 +0200 d3dxof: Group and simplify templates and objects in a cleaner manner. --- dlls/d3dxof/tests/d3dxof.c | 29 +++++++++++------------------ 1 files changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 87b7985..8e380a8 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -84,6 +84,15 @@ static char empty_bzip_file[] = "xof 0302bzip0064\x11\x00\x00\x00\x01\x00\x05\x0 static char empty_cmp_file[] = "xof 0302cmp 0064"; static char empty_xxxx_file[] = "xof 0302xxxx0064"; +static char templates_bad_file_type1[] = "xOf 0302txt 0064\n"; +static char templates_bad_file_version[] = "xof 0102txt 0064\n"; +static char templates_bad_file_type2[] = "xof 0302foo 0064\n"; +static char templates_bad_file_float_size[] = "xof 0302txt 0050\n"; + +static char templates_parse_error[] = +"xof 0302txt 0064" +"foobar;\n"; + static char object_noname[] = "xof 0302txt 0064\n" "Header\n" @@ -91,7 +100,7 @@ static char object_noname[] = "1; 2; 3;\n" "}\n"; -static char template_syntax_empty_array[] = +static char template_syntax_array_mixed[] = "xof 0302txt 0064\n" "template Buffer\n" "{\n" @@ -140,22 +149,6 @@ static char object_syntax_string_with_separator[] = "\"foo;bar\";\n" "}\n"; -static char templates_bad_file_type1[] = -"xOf 0302txt 0064\n"; - -static char templates_bad_file_version[] = -"xof 0102txt 0064\n"; - -static char templates_bad_file_type2[] = -"xof 0302foo 0064\n"; - -static char templates_bad_file_float_size[] = -"xof 0302txt 0050\n"; - -static char templates_parse_error[] = -"xof 0302txt 0064" -"foobar;\n"; - static void init_function_pointers(void) { /* We have to use LoadLibrary as no d3dxof functions are referenced directly */ @@ -592,7 +585,7 @@ static void test_syntax(void) return; } - hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template_syntax_empty_array, sizeof(template_syntax_empty_array) - 1); + hr = IDirectXFile_RegisterTemplates(lpDirectXFile, template_syntax_array_mixed, sizeof(template_syntax_array_mixed) - 1); ok(hr == DXFILE_OK, "IDirectXFileImpl_RegisterTemplates: %x\n", hr); dxflm.lpMemory = &object_syntax_empty_array_semicolon;

1 0

Christian Costa : d3dxof: Add some syntax tests and remove some useless ref count checks.
by Alexandre Julliard 20 May '13

20 May '13

Module: wine Branch: master Commit: 2df8998dbd0c4a5497b4707b61a601a34799997d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2df8998dbd0c4a5497b4707b6… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun May 19 22:33:07 2013 +0200 d3dxof: Add some syntax tests and remove some useless ref count checks. --- dlls/d3dxof/tests/d3dxof.c | 209 ++++++++++++++++++++++++++++++++++--------- 1 files changed, 165 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2df8998dbd0c4a5497b47…

1 0

Christian Costa : d3dxof: Add object separators tests for binary format.
by Alexandre Julliard 20 May '13

20 May '13

Module: wine Branch: master Commit: f63da07505d0d97434fff4cffb86223a1585c9b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f63da07505d0d97434fff4cff… Author: Christian Costa <titan.costa(a)gmail.com> Date: Sun May 19 22:33:16 2013 +0200 d3dxof: Add object separators tests for binary format. --- dlls/d3dxof/tests/d3dxof.c | 157 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 156 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f63da07505d0d97434fff…

1 0

André Hentschel : po: Improve German translation.
by Alexandre Julliard 20 May '13

20 May '13

Module: wine Branch: master Commit: d64793f17bacbf1dc2d798761d0305d1d73dfe19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d64793f17bacbf1dc2d798761… Author: André Hentschel <nerv(a)dawncrow.de> Date: Fri May 17 17:57:25 2013 +0200 po: Improve German translation. --- po/de.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 7728925..b07f371 100644 --- a/po/de.po +++ b/po/de.po @@ -10191,8 +10191,8 @@ msgstr " (Ja|Nein|Alle)" msgid "" "Can't recognize '%1' as an internal or external command, or batch script.\n" msgstr "" -"'%1' konnte nicht als interner oder externer Befehl, oder als Batchscript\n" -"erkannt werden.\n" +"'%1' konnte nicht als interner oder externer Befehl,\n" +"oder als Batch-Skript erkannt werden.\n" #: cmd.rc:357 msgid "Division by zero error.\n"

1 0

Ken Thomases : user32: Allow sent WM_CANCELMODE to end menu tracking in a window's menu bar.
by Alexandre Julliard 20 May '13

20 May '13

Module: wine Branch: master Commit: effc28e16effc43e91633c0a051f949a6a195438 URL: http://source.winehq.org/git/wine.git/?a=commit;h=effc28e16effc43e91633c0a0… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri May 17 00:40:30 2013 -0500 user32: Allow sent WM_CANCELMODE to end menu tracking in a window's menu bar. --- dlls/user32/menu.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 0a38440..ae5cb36 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -2429,7 +2429,7 @@ void MENU_EndMenu( HWND hwnd ) { POPUPMENU *menu; menu = top_popup_hmenu ? MENU_GetMenu( top_popup_hmenu ) : NULL; - if (menu && hwnd == menu->hwndOwner) EndMenu(); + if (menu && (hwnd == menu->hWnd || hwnd == menu->hwndOwner)) EndMenu(); } /***********************************************************************

1 0

Ken Thomases : user32/tests: Test that sending WM_CANCELMODE cancels tracking in window's menu bar.
by Alexandre Julliard 20 May '13

20 May '13

Module: wine Branch: master Commit: 7e0c42e8395abc51fd1058d54d89e693c2531b83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7e0c42e8395abc51fd1058d54… Author: Ken Thomases <ken(a)codeweavers.com> Date: Fri May 17 00:41:48 2013 -0500 user32/tests: Test that sending WM_CANCELMODE cancels tracking in window's menu bar. --- dlls/user32/tests/menu.c | 26 ++++++++++++++++++++++++-- 1 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 07cf437..3e4cf93 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -3266,7 +3266,8 @@ static void test_menu_cancelmode(void) { DWORD ret; HWND hwnd, hwndchild; - HMENU menu; + HMENU menu, menubar; + MSG msg; if( !pEndMenu) { /* win95 */ win_skip( "EndMenu is not available\n"); return; @@ -3287,7 +3288,8 @@ static void test_menu_cancelmode(void) ret = AppendMenuA( menu, MF_STRING, 1, "winetest"); ok( ret, "Functie failed lasterror is %u\n", GetLastError()); /* seems to be needed only on wine :( */ - {MSG msg; while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg);} + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessage(&msg); /* test the effect of sending a WM_CANCELMODE message in the WM_INITMENULOOP * handler of the menu owner */ /* test results is extracted from variable g_got_enteridle. Possible values: @@ -3314,7 +3316,27 @@ static void test_menu_cancelmode(void) g_hwndtosend = hwnd; TrackPopupMenu( menu, TPM_RETURNCMD, 100,100, 0, hwndchild, NULL); ok( g_got_enteridle == 2, "received %d WM_ENTERIDLE messages, should be 2\n", g_got_enteridle); + + /* test canceling tracking in a window's menu bar */ + menubar = CreateMenu(); + ok( menubar != NULL, "CreateMenu failed with error %d\n", GetLastError()); + ret = AppendMenuA( menubar, MF_POPUP|MF_STRING, (UINT_PTR)menu, "winetest"); + ok( ret, "AppendMenuA failed lasterror is %u\n", GetLastError()); + ret = SetMenu( hwnd, menubar ); + ok( ret, "SetMenu failed lasterror is %u\n", GetLastError()); + /* initiate tracking */ + g_hwndtosend = hwnd; + ret = SendMessage( hwnd, WM_SYSCOMMAND, SC_KEYMENU, 0 ); + ok( ret == 0, "Sending WM_SYSCOMMAND/SC_KEYMENU failed lasterror is %u\n", GetLastError()); + while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) + DispatchMessage(&msg); + todo_wine { + ok(g_got_enteridle == 0, "received %d WM_ENTERIDLE messages, none expected\n", g_got_enteridle); + } + ok(g_got_enteridle < 2, "received %d WM_ENTERIDLE messages, should be less than 2\n", g_got_enteridle); + /* cleanup */ + DestroyMenu( menubar ); DestroyMenu( menu); DestroyWindow( hwndchild); DestroyWindow( hwnd);

1 0