March 2014 - Wine-Commits - list.winehq.org

Henri Verbeet : d3d9/tests: Give add_dirty_rect_test() its own device.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: b02129aa9046dfeb8b090eda1c434842586c8309 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b02129aa9046dfeb8b090eda1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 13 12:51:19 2014 +0100 d3d9/tests: Give add_dirty_rect_test() its own device. We want to avoid tests accidentally depending on state set by previous tests. For example, add_dirty_rect_test() had a dependency on D3DRS_CULLMODE being D3DCULL_NONE, set by lighting_test(). --- dlls/d3d9/tests/visual.c | 58 ++++++++++++++++++++++++++++++++++++---------- 1 file changed, 46 insertions(+), 12 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index ca1eb6f..7ee8be5 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -171,13 +171,13 @@ out: return ret; } -static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9) +static IDirect3DDevice9 *create_device(IDirect3D9 *d3d, HWND device_window, HWND focus_window, BOOL windowed) { D3DPRESENT_PARAMETERS present_parameters = {0}; IDirect3DDevice9 *device; - present_parameters.Windowed = TRUE; - present_parameters.hDeviceWindow = create_window(); + present_parameters.Windowed = windowed; + present_parameters.hDeviceWindow = device_window; present_parameters.SwapEffect = D3DSWAPEFFECT_DISCARD; present_parameters.BackBufferWidth = 640; present_parameters.BackBufferHeight = 480; @@ -185,18 +185,19 @@ static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9) present_parameters.EnableAutoDepthStencil = TRUE; present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; - if (SUCCEEDED(IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, - present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device))) + if (SUCCEEDED(IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, focus_window, + D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device))) return device; - DestroyWindow(present_parameters.hDeviceWindow); return NULL; } static IDirect3DDevice9 *init_d3d9(void) { D3DADAPTER_IDENTIFIER9 identifier; + IDirect3DDevice9 *device; IDirect3D9 *d3d9; + HWND window; HRESULT hr; if (!(d3d9 = Direct3DCreate9(D3D_SDK_VERSION))) @@ -220,7 +221,13 @@ static IDirect3DDevice9 *init_d3d9(void) HIWORD(U(identifier.DriverVersion).HighPart), LOWORD(U(identifier.DriverVersion).HighPart), HIWORD(U(identifier.DriverVersion).LowPart), LOWORD(U(identifier.DriverVersion).LowPart)); - return create_device(d3d9); + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + if ((device = create_device(d3d9, window, window, TRUE))) + return device; + + DestroyWindow(window); + return NULL; } static void cleanup_device(IDirect3DDevice9 *device) @@ -8727,7 +8734,9 @@ static void stencil_cull_test(void) { IDirect3DDevice9 *device; IDirect3D9 *d3d; + ULONG refcount; D3DCAPS9 caps; + HWND window; HRESULT hr; static const float quad1[] = { @@ -8769,11 +8778,14 @@ static void stencil_cull_test(void) unsigned int i; DWORD color; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); d3d = Direct3DCreate9(D3D_SDK_VERSION); ok(!!d3d, "Failed to create a D3D object.\n"); - if (!(device = create_device(d3d))) + if (!(device = create_device(d3d, window, window, TRUE))) { skip("Cannot create a device with a D24S8 stencil buffer.\n"); + DestroyWindow(window); IDirect3D9_Release(d3d); return; } @@ -8925,8 +8937,10 @@ static void stencil_cull_test(void) ok(hr == D3D_OK, "IDirect3DDevice9_Present failed with %08x\n", hr); cleanup: - cleanup_device(device); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); IDirect3D9_Release(d3d); + DestroyWindow(window); } static void vpos_register_test(IDirect3DDevice9 *device) @@ -14986,8 +15000,8 @@ static void add_dirty_rect_test_draw(IDirect3DDevice9 *device) quad[] = { {{-1.0, -1.0, 0.0}, {0.0, 0.0}}, - {{ 1.0, -1.0, 0.0}, {1.0, 0.0}}, {{-1.0, 1.0, 0.0}, {0.0, 1.0}}, + {{ 1.0, -1.0, 0.0}, {1.0, 0.0}}, {{ 1.0, 1.0, 0.0}, {1.0, 1.0}}, }; @@ -14999,17 +15013,33 @@ static void add_dirty_rect_test_draw(IDirect3DDevice9 *device) ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); } -static void add_dirty_rect_test(IDirect3DDevice9 *device) +static void add_dirty_rect_test(void) { HRESULT hr; IDirect3DTexture9 *tex_dst1, *tex_dst2, *tex_src_red, *tex_src_green, *tex_managed; IDirect3DSurface9 *surface_dst2, *surface_src_green, *surface_src_red, *surface_managed; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; unsigned int i; + ULONG refcount; DWORD *texel; + HWND window; D3DLOCKED_RECT locked_rect; static const RECT part_rect = {96, 96, 160, 160}; DWORD color; + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 0, 0, 640, 480, NULL, NULL, NULL, NULL); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d); + DestroyWindow(window); + return; + } + hr = IDirect3DDevice9_CreateTexture(device, 256, 256, 1, 0, D3DFMT_X8R8G8B8, D3DPOOL_DEFAULT, &tex_dst1, NULL); ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); @@ -15297,6 +15327,10 @@ static void add_dirty_rect_test(IDirect3DDevice9 *device) IDirect3DTexture9_Release(tex_dst1); IDirect3DTexture9_Release(tex_dst2); IDirect3DTexture9_Release(tex_managed); + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d); + DestroyWindow(window); } START_TEST(visual) @@ -15468,11 +15502,11 @@ START_TEST(visual) fog_special_test(device_ptr); volume_srgb_test(device_ptr); volume_dxt5_test(device_ptr); - add_dirty_rect_test(device_ptr); cleanup_device(device_ptr); device_ptr = NULL; + add_dirty_rect_test(); multisampled_depth_buffer_test(); resz_test(); stencil_cull_test();

1 0

Henri Verbeet : d3d9/tests: Don' t share the D3D object either in visual.c tests that have their own device.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: cac52b4b10ffed8328d82988dbe48972e6a6a791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac52b4b10ffed8328d82988d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 13 12:51:18 2014 +0100 d3d9/tests: Don't share the D3D object either in visual.c tests that have their own device. --- dlls/d3d9/tests/visual.c | 81 ++++++++++++++++++++++++++-------------------- 1 file changed, 46 insertions(+), 35 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4d921dc..ca1eb6f 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -8723,9 +8723,10 @@ cleanup: IDirect3DVertexDeclaration9_Release(vertex_declaration); } -static void stencil_cull_test(IDirect3D9 *d3d9) +static void stencil_cull_test(void) { IDirect3DDevice9 *device; + IDirect3D9 *d3d; D3DCAPS9 caps; HRESULT hr; static const float quad1[] = @@ -8768,10 +8769,12 @@ static void stencil_cull_test(IDirect3D9 *d3d9) unsigned int i; DWORD color; - device = create_device(d3d9); - if (!device) + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + if (!(device = create_device(d3d))) { skip("Cannot create a device with a D24S8 stencil buffer.\n"); + IDirect3D9_Release(d3d); return; } hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); @@ -8923,6 +8926,7 @@ static void stencil_cull_test(IDirect3D9 *d3d9) cleanup: cleanup_device(device); + IDirect3D9_Release(d3d); } static void vpos_register_test(IDirect3DDevice9 *device) @@ -13528,10 +13532,11 @@ static void multisample_get_rtdata_test(IDirect3DDevice9 *device) IDirect3DSurface9_Release(rt); } -static void multisampled_depth_buffer_test(IDirect3D9 *d3d9) +static void multisampled_depth_buffer_test(void) { IDirect3DDevice9 *device = 0; IDirect3DSurface9 *original_rt, *rt, *readback, *ds, *original_ds; + IDirect3D9 *d3d; D3DCAPS9 caps; HRESULT hr; D3DPRESENT_PARAMETERS present_parameters; @@ -13572,18 +13577,21 @@ static void multisampled_depth_buffer_test(IDirect3D9 *d3d9) {560, 450, D3DCOLOR_ARGB(0xff, 0x00, 0x00, 0xff)}, }; - hr = IDirect3D9_CheckDeviceMultiSampleType(d3d9, D3DADAPTER_DEFAULT, - D3DDEVTYPE_HAL, D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL); - if (FAILED(hr)) + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (FAILED(IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL))) { skip("Multisampling not supported for D3DFMT_A8R8G8B8, skipping multisampled depth buffer test.\n"); + IDirect3D9_Release(d3d); return; } - hr = IDirect3D9_CheckDeviceMultiSampleType(d3d9, D3DADAPTER_DEFAULT, - D3DDEVTYPE_HAL, D3DFMT_D24S8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL); - if (FAILED(hr)) + if (FAILED(IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_D24S8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL))) { skip("Multisampling not supported for D3DFMT_D24S8, skipping multisampled depth buffer test.\n"); + IDirect3D9_Release(d3d); return; } @@ -13598,7 +13606,7 @@ static void multisampled_depth_buffer_test(IDirect3D9 *d3d9) present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; present_parameters.MultiSampleType = D3DMULTISAMPLE_2_SAMPLES; - hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); ok(hr == D3D_OK, "Failed to create a device, hr %#x.\n", hr); @@ -13735,7 +13743,7 @@ static void multisampled_depth_buffer_test(IDirect3D9 *d3d9) present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; present_parameters.MultiSampleType = D3DMULTISAMPLE_NONE; - hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); ok(hr == D3D_OK, "Failed to create a device, hr %#x.\n", hr); @@ -13828,9 +13836,10 @@ static void multisampled_depth_buffer_test(IDirect3D9 *d3d9) IDirect3DSurface9_Release(rt); cleanup: cleanup_device(device); + IDirect3D9_Release(d3d); } -static void resz_test(IDirect3D9 *d3d9) +static void resz_test(void) { IDirect3DDevice9 *device = 0; IDirect3DSurface9 *rt, *original_rt, *ds, *readback, *intz_ds; @@ -13882,36 +13891,40 @@ static void resz_test(IDirect3D9 *d3d9) }; IDirect3DTexture9 *texture; IDirect3DPixelShader9 *ps; + IDirect3D9 *d3d; DWORD value; - hr = IDirect3D9_CheckDeviceMultiSampleType(d3d9, D3DADAPTER_DEFAULT, - D3DDEVTYPE_HAL, D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL); - if (FAILED(hr)) + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + if (FAILED(IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL))) { skip("Multisampling not supported for D3DFMT_A8R8G8B8, skipping RESZ test.\n"); + IDirect3D9_Release(d3d); return; } - hr = IDirect3D9_CheckDeviceMultiSampleType(d3d9, D3DADAPTER_DEFAULT, - D3DDEVTYPE_HAL, D3DFMT_D24S8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL); - if (FAILED(hr)) + if (FAILED(IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, + D3DDEVTYPE_HAL, D3DFMT_D24S8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL))) { skip("Multisampling not supported for D3DFMT_D24S8, skipping RESZ test.\n"); + IDirect3D9_Release(d3d); return; } - hr = IDirect3D9_CheckDeviceFormat(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, - D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_TEXTURE, MAKEFOURCC('I','N','T','Z')); - if (FAILED(hr)) + if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_DEPTHSTENCIL, D3DRTYPE_TEXTURE, MAKEFOURCC('I','N','T','Z')))) { skip("No INTZ support, skipping RESZ test.\n"); + IDirect3D9_Release(d3d); return; } - hr = IDirect3D9_CheckDeviceFormat(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, - D3DUSAGE_RENDERTARGET, D3DRTYPE_SURFACE, MAKEFOURCC('R','E','S','Z')); - if (FAILED(hr)) + if (FAILED(IDirect3D9_CheckDeviceFormat(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, D3DFMT_X8R8G8B8, + D3DUSAGE_RENDERTARGET, D3DRTYPE_SURFACE, MAKEFOURCC('R','E','S','Z')))) { skip("No RESZ support, skipping RESZ test.\n"); + IDirect3D9_Release(d3d); return; } @@ -13926,7 +13939,7 @@ static void resz_test(IDirect3D9 *d3d9) present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; present_parameters.MultiSampleType = D3DMULTISAMPLE_NONE; - hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); ok(hr == D3D_OK, "Failed to create a device, hr %#x.\n", hr); @@ -13936,12 +13949,14 @@ static void resz_test(IDirect3D9 *d3d9) { skip("No pixel shader 2.0 support, skipping INTZ test.\n"); cleanup_device(device); + IDirect3D9_Release(d3d); return; } if (caps.TextureCaps & D3DPTEXTURECAPS_POW2) { skip("No unconditional NP2 texture support, skipping INTZ test.\n"); cleanup_device(device); + IDirect3D9_Release(d3d); return; } @@ -14082,7 +14097,7 @@ static void resz_test(IDirect3D9 *d3d9) present_parameters.AutoDepthStencilFormat = D3DFMT_D24S8; present_parameters.MultiSampleType = D3DMULTISAMPLE_2_SAMPLES; - hr = IDirect3D9_CreateDevice(d3d9, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + hr = IDirect3D9_CreateDevice(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, present_parameters.hDeviceWindow, D3DCREATE_HARDWARE_VERTEXPROCESSING, &present_parameters, &device); ok(hr == D3D_OK, "Failed to create a device, hr %#x.\n", hr); @@ -14301,6 +14316,7 @@ static void resz_test(IDirect3D9 *d3d9) IDirect3DSurface9_Release(readback); IDirect3DSurface9_Release(original_rt); cleanup_device(device); + IDirect3D9_Release(d3d); } static void zenable_test(IDirect3DDevice9 *device) @@ -15285,7 +15301,6 @@ static void add_dirty_rect_test(IDirect3DDevice9 *device) START_TEST(visual) { - IDirect3D9 *d3d9; IDirect3DDevice9 *device_ptr; D3DCAPS9 caps; HRESULT hr; @@ -15455,16 +15470,12 @@ START_TEST(visual) volume_dxt5_test(device_ptr); add_dirty_rect_test(device_ptr); - hr = IDirect3DDevice9_GetDirect3D(device_ptr, &d3d9); - ok(SUCCEEDED(hr), "Failed to get d3d9 interface, hr %#x.\n", hr); cleanup_device(device_ptr); device_ptr = NULL; - multisampled_depth_buffer_test(d3d9); - resz_test(d3d9); - stencil_cull_test(d3d9); - - IDirect3D9_Release(d3d9); + multisampled_depth_buffer_test(); + resz_test(); + stencil_cull_test(); cleanup: cleanup_device(device_ptr);

1 0

Michael Stefaniuc : dmloader/tests: Add COM tests for DirectMusicContainer.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: a539e13f23e92eec195964ad6a5b49c030994185 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a539e13f23e92eec195964ad6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 12 23:14:41 2014 +0100 dmloader/tests: Add COM tests for DirectMusicContainer. --- dlls/dmloader/tests/loader.c | 50 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 1105afa..273149d 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -169,6 +169,55 @@ static void test_COM(void) while (IDirectMusicLoader8_Release(dml8)); } +static void test_COM_container(void) +{ + IDirectMusicContainer *dmc = (IDirectMusicContainer*)0xdeadbeef; + IDirectMusicObject *dmo; + IPersistStream *ps; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicContainer, (IUnknown*)&dmc, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dmc); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicContainer create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dmc, "dmc = %p\n", dmc); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicContainer, NULL, CLSCTX_INPROC_SERVER, + &IID_IClassFactory, (void**)&dmc); + ok(hr == E_NOINTERFACE, "DirectMusicContainer create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all DirectMusicContainer interfaces */ + hr = CoCreateInstance(&CLSID_DirectMusicContainer, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicContainer, (void**)&dmc); + ok(hr == S_OK, "DirectMusicContainer create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusicContainer_AddRef(dmc); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicContainer_QueryInterface(dmc, &IID_IDirectMusicObject, (void**)&dmo); + ok(hr == S_OK, "QueryInterface for IID_IDirectMusicObject failed: %08x\n", hr); + refcount = IDirectMusicObject_AddRef(dmo); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IDirectMusicObject_Release(dmo); + + hr = IDirectMusicContainer_QueryInterface(dmc, &IID_IPersistStream, (void**)&ps); + ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr); + refcount = IPersistStream_AddRef(ps); + ok(refcount == 5, "refcount == %u, expected 5\n", refcount); + refcount = IPersistStream_Release(ps); + + hr = IDirectMusicContainer_QueryInterface(dmc, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 6, "refcount == %u, expected 6\n", refcount); + refcount = IUnknown_Release(unk); + + while (IDirectMusicContainer_Release(dmc)); +} + START_TEST(loader) { CoInitialize(NULL); @@ -182,5 +231,6 @@ START_TEST(loader) test_release_object(); test_simple_playing(); test_COM(); + test_COM_container(); CoUninitialize(); }

1 0

Michael Stefaniuc : dmloader: Add COM tests for DirectMusicLoader.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: 9cb38a4ad0b9943c8699e6c9795253ac53616f97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9cb38a4ad0b9943c8699e6c97… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 12 23:04:09 2014 +0100 dmloader: Add COM tests for DirectMusicLoader. --- dlls/dmloader/tests/loader.c | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/dlls/dmloader/tests/loader.c b/dlls/dmloader/tests/loader.c index 3d8dd80..1105afa 100644 --- a/dlls/dmloader/tests/loader.c +++ b/dlls/dmloader/tests/loader.c @@ -134,6 +134,41 @@ static void test_simple_playing(void) IDirectMusicLoader8_Release(loader); } +static void test_COM(void) +{ + IDirectMusicLoader8 *dml8 = (IDirectMusicLoader8*)0xdeadbeef; + IUnknown *unk; + ULONG refcount; + HRESULT hr; + + /* COM aggregation */ + hr = CoCreateInstance(&CLSID_DirectMusicLoader, (IUnknown*)&dml8, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void**)&dml8); + ok(hr == CLASS_E_NOAGGREGATION, + "DirectMusicLoader create failed: %08x, expected CLASS_E_NOAGGREGATION\n", hr); + ok(!dml8, "dml8 = %p\n", dml8); + + /* Invalid RIID */ + hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicObject, (void**)&dml8); + ok(hr == E_NOINTERFACE, "DirectMusicLoader create failed: %08x, expected E_NOINTERFACE\n", hr); + + /* Same refcount for all DirectMusicLoader interfaces */ + hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC_SERVER, + &IID_IDirectMusicLoader8, (void**)&dml8); + ok(hr == S_OK, "DirectMusicLoader create failed: %08x, expected S_OK\n", hr); + refcount = IDirectMusicLoader8_AddRef(dml8); + ok(refcount == 2, "refcount == %u, expected 2\n", refcount); + + hr = IDirectMusicLoader8_QueryInterface(dml8, &IID_IUnknown, (void**)&unk); + ok(hr == S_OK, "QueryInterface for IID_IUnknown failed: %08x\n", hr); + refcount = IUnknown_AddRef(unk); + ok(refcount == 4, "refcount == %u, expected 4\n", refcount); + refcount = IUnknown_Release(unk); + + while (IDirectMusicLoader8_Release(dml8)); +} + START_TEST(loader) { CoInitialize(NULL); @@ -146,5 +181,6 @@ START_TEST(loader) } test_release_object(); test_simple_playing(); + test_COM(); CoUninitialize(); }

1 0

Michael Stefaniuc : dmloader: None of the COM classes support aggregation.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: 917d5eabe64f34bb3dcae1c65c02a93829f2174a URL: http://source.winehq.org/git/wine.git/?a=commit;h=917d5eabe64f34bb3dcae1c65… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Mar 12 22:58:17 2014 +0100 dmloader: None of the COM classes support aggregation. --- dlls/dmloader/container.c | 3 ++- dlls/dmloader/dmloader_main.c | 18 +++++++++++------- dlls/dmloader/dmloader_private.h | 4 ++-- dlls/dmloader/loader.c | 4 ++-- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/dmloader/container.c b/dlls/dmloader/container.c index 68ee573..871c8b0 100644 --- a/dlls/dmloader/container.c +++ b/dlls/dmloader/container.c @@ -909,7 +909,8 @@ static const IPersistStreamVtbl DirectMusicContainer_PersistStream_Vtbl = { }; /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicContainerImpl (LPCGUID lpcGUID, LPVOID* ppobj, LPUNKNOWN pUnkOuter) { +HRESULT WINAPI create_dmcontainer(REFIID lpcGUID, void **ppobj) +{ IDirectMusicContainerImpl* obj; obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicContainerImpl)); diff --git a/dlls/dmloader/dmloader_main.c b/dlls/dmloader/dmloader_main.c index eaed633..38faa8e 100644 --- a/dlls/dmloader/dmloader_main.c +++ b/dlls/dmloader/dmloader_main.c @@ -27,7 +27,7 @@ LONG module_ref = 0; typedef struct { IClassFactory IClassFactory_iface; - HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ppv, IUnknown *pUnkOuter); + HRESULT WINAPI (*fnCreateInstance)(REFIID riid, void **ppv); } IClassFactoryImpl; /****************************************************************** @@ -73,13 +73,18 @@ static ULONG WINAPI ClassFactory_Release(IClassFactory *iface) } static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown *pUnkOuter, - REFIID riid, void **ppv) + REFIID riid, void **ret_iface) { IClassFactoryImpl *This = impl_from_IClassFactory(iface); - TRACE ("(%p, %s, %p)\n", pUnkOuter, debugstr_dmguid(riid), ppv); + TRACE ("(%s, %p)\n", debugstr_dmguid(riid), ret_iface); - return This->fnCreateInstance(riid, ppv, pUnkOuter); + if (pUnkOuter) { + *ret_iface = NULL; + return CLASS_E_NOAGGREGATION; + } + + return This->fnCreateInstance(riid, ret_iface); } static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL dolock) @@ -102,9 +107,8 @@ static const IClassFactoryVtbl classfactory_vtbl = { ClassFactory_LockServer }; -static IClassFactoryImpl dm_loader_CF = {{&classfactory_vtbl}, DMUSIC_CreateDirectMusicLoaderImpl}; -static IClassFactoryImpl dm_container_CF = {{&classfactory_vtbl}, - DMUSIC_CreateDirectMusicContainerImpl}; +static IClassFactoryImpl dm_loader_CF = {{&classfactory_vtbl}, create_dmloader}; +static IClassFactoryImpl dm_container_CF = {{&classfactory_vtbl}, create_dmcontainer}; /****************************************************************** * DllMain diff --git a/dlls/dmloader/dmloader_private.h b/dlls/dmloader/dmloader_private.h index e393080..f01acfc 100644 --- a/dlls/dmloader/dmloader_private.h +++ b/dlls/dmloader/dmloader_private.h @@ -65,8 +65,8 @@ typedef struct IDirectMusicLoaderGenericStream IDirectMusicLoaderGenericStream; /***************************************************************************** * Creation helpers */ -extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; -extern HRESULT WINAPI DMUSIC_CreateDirectMusicContainerImpl (LPCGUID lpcGUID, LPVOID *ppobj, LPUNKNOWN pUnkOuter) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dmloader(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; +extern HRESULT WINAPI create_dmcontainer(REFIID riid, void **ret_iface) DECLSPEC_HIDDEN; extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderFileStream (LPVOID *ppobj) DECLSPEC_HIDDEN; extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderResourceStream (LPVOID *ppobj) DECLSPEC_HIDDEN; extern HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderGenericStream (LPVOID *ppobj) DECLSPEC_HIDDEN; diff --git a/dlls/dmloader/loader.c b/dlls/dmloader/loader.c index 39f00a0..967b093 100644 --- a/dlls/dmloader/loader.c +++ b/dlls/dmloader/loader.c @@ -888,14 +888,14 @@ static HRESULT DMUSIC_GetDefaultGMPath (WCHAR wszPath[MAX_PATH]) { } /* for ClassFactory */ -HRESULT WINAPI DMUSIC_CreateDirectMusicLoaderImpl(const GUID *lpcGUID, void **ppobj, IUnknown *pUnkOuter) +HRESULT WINAPI create_dmloader(REFIID lpcGUID, void **ppobj) { IDirectMusicLoaderImpl *obj; DMUS_OBJECTDESC Desc; LPWINE_LOADER_ENTRY pDefaultDLSEntry; struct list *pEntry; - TRACE("(%s, %p, %p)\n", debugstr_dmguid(lpcGUID), ppobj, pUnkOuter); + TRACE("(%s, %p)\n", debugstr_dmguid(lpcGUID), ppobj); obj = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicLoaderImpl)); if (NULL == obj) { *ppobj = NULL;

1 0

Frédéric Delanoy : krnl386.exe16: Use BOOL type where appropriate.
by Alexandre Julliard March 13, 2014

March 13, 2014

Module: wine Branch: master Commit: 03cec9d886938aafbc33b805e6197327f0709fca URL: http://source.winehq.org/git/wine.git/?a=commit;h=03cec9d886938aafbc33b805e… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Thu Mar 13 08:58:47 2014 +0100 krnl386.exe16: Use BOOL type where appropriate. --- dlls/krnl386.exe16/int21.c | 4 ++-- dlls/krnl386.exe16/int31.c | 6 +++--- dlls/krnl386.exe16/soundblaster.c | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/krnl386.exe16/int21.c b/dlls/krnl386.exe16/int21.c index 53b6537..45a8149 100644 --- a/dlls/krnl386.exe16/int21.c +++ b/dlls/krnl386.exe16/int21.c @@ -2737,7 +2737,7 @@ static void INT21_IoctlHPScanHandler( CONTEXT *context ) static void INT21_Ioctl_Char( CONTEXT *context ) { int status; - int IsConsoleIOHandle = 0; + BOOL IsConsoleIOHandle = FALSE; IO_STATUS_BLOCK io; FILE_INTERNAL_INFORMATION info; HANDLE handle = DosFileHandleToWin32Handle(BX_reg(context)); @@ -2746,7 +2746,7 @@ static void INT21_Ioctl_Char( CONTEXT *context ) if (status) { if( VerifyConsoleIoHandle( handle)) - IsConsoleIOHandle = 1; + IsConsoleIOHandle = TRUE; else { SET_AX( context, RtlNtStatusToDosError(status) ); SET_CFLAG( context ); diff --git a/dlls/krnl386.exe16/int31.c b/dlls/krnl386.exe16/int31.c index e7413cc..2f01452 100644 --- a/dlls/krnl386.exe16/int31.c +++ b/dlls/krnl386.exe16/int31.c @@ -439,7 +439,7 @@ int DPMI_CallRMProc( CONTEXT *context, LPWORD stack, int args, int iret ) LPWORD stack16; LPVOID addr = NULL; /* avoid gcc warning */ RMCB *CurrRMCB; - int alloc = 0, already = 0; + BOOL alloc = FALSE, already = FALSE; BYTE *code; TRACE("EAX=%08x EBX=%08x ECX=%08x EDX=%08x\n", @@ -490,7 +490,7 @@ callrmproc_again: } if (!already) { if (!context->SegSs) { - alloc = 1; /* allocate default stack */ + alloc = TRUE; /* allocate default stack */ stack16 = addr = DOSMEM_AllocBlock( 64, (UINT16 *)&(context->SegSs) ); context->Esp = 64-2; stack16 += 32-1; @@ -514,7 +514,7 @@ callrmproc_again: *(--stack16) = 0; /* adjust stack */ context->Esp -= 2*sizeof(WORD); - already = 1; + already = TRUE; } if (CurrRMCB) { diff --git a/dlls/krnl386.exe16/soundblaster.c b/dlls/krnl386.exe16/soundblaster.c index ca62732..8939bb3 100644 --- a/dlls/krnl386.exe16/soundblaster.c +++ b/dlls/krnl386.exe16/soundblaster.c @@ -48,8 +48,8 @@ static int InSize; /* Nb of bytes in InBuffer */ static BYTE DSP_OutBuffer[10]; /* Store DSP information bytes to host */ static int OutSize; /* Nb of bytes in InBuffer */ static int command; /* Current command */ -static int end_sound_loop = 0; -static int dma_enable = 0; +static BOOL end_sound_loop = FALSE; +static BOOL dma_enable = FALSE; /* The maximum size of a dma transfer can be 65536 */ #define DMATRFSIZE 1024 @@ -112,7 +112,7 @@ static DWORD CALLBACK SB_Poll( void *dummy ) SamplesCount -= size; if (!SamplesCount) { DOSVM_QueueEvent(SB_IRQ,SB_IRQ_PRI,NULL,NULL); - dma_enable = 0; + dma_enable = FALSE; } } return 0; @@ -166,7 +166,7 @@ static BOOL SB_Init(void) } buf_off = 0; - end_sound_loop = 0; + end_sound_loop = FALSE; SB_Thread = CreateThread(NULL, 0, SB_Poll, NULL, 0, NULL); TRACE("thread\n"); if (!SB_Thread) { @@ -254,7 +254,7 @@ void SB_ioport_out( WORD port, BYTE val ) case 0x14: /* SB */ SamplesCount = DSP_InBuffer[1]+(val<<8)+1; TRACE("DMA DAC (8-bit) for %x samples\n",SamplesCount); - dma_enable = 1; + dma_enable = TRUE; break; case 0x20: FIXME("Direct ADC (8-bit) - Not Implemented\n"); @@ -274,7 +274,7 @@ void SB_ioport_out( WORD port, BYTE val ) /* case 0xBX/0xCX -> See below */ case 0xD0: /* SB */ TRACE("Halt DMA operation (8-bit)\n"); - dma_enable = 0; + dma_enable = FALSE; break; case 0xD1: /* SB */ FIXME("Enable Speaker - Not Implemented\n"); @@ -331,7 +331,7 @@ void SB_ioport_out( WORD port, BYTE val ) FIXME("Generic DAC/ADC stereo mode not supported\n"); SamplesCount = DSP_InBuffer[2]+(val<<8)+1; TRACE("Generic DMA for %x samples\n",SamplesCount); - dma_enable = 1; + dma_enable = TRUE; } else FIXME("DSP command %x not supported\n",val);

1 0

Akihiro Sagawa : gdi32: Improve the font enumeration order for complex script locales.
by Alexandre Julliard March 12, 2014

March 12, 2014

Module: wine Branch: master Commit: 04e8b00ab08a046f52ffbbd841b17b10b3bf720a URL: http://source.winehq.org/git/wine.git/?a=commit;h=04e8b00ab08a046f52ffbbd84… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Fri Mar 7 01:22:19 2014 +0900 gdi32: Improve the font enumeration order for complex script locales. --- dlls/gdi32/freetype.c | 11 ++++++++++- dlls/gdi32/tests/font.c | 14 +++++++++----- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 5f4a570..cece358 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -5527,12 +5527,20 @@ static INT load_script_name( UINT id, WCHAR buffer[LF_FACESIZE] ) return i; } +static inline BOOL is_complex_script_ansi_cp(UINT ansi_cp) +{ + return (ansi_cp == 874 /* Thai */ + || ansi_cp == 1255 /* Hebrew */ + || ansi_cp == 1256 /* Arabic */ + ); +} /*************************************************** * create_enum_charset_list * * This function creates charset enumeration list because in DEFAULT_CHARSET * case, the ANSI codepage's charset takes precedence over other charsets. + * Above rule doesn't apply if the ANSI codepage uses complex script (e.g. Thai). * This function works as a filter other than DEFAULT_CHARSET case. */ static DWORD create_enum_charset_list(DWORD charset, struct enum_charset_list *list) @@ -5553,7 +5561,8 @@ static DWORD create_enum_charset_list(DWORD charset, struct enum_charset_list *l /* Set the current codepage's charset as the first element. */ acp = GetACP(); - if (TranslateCharsetInfo((DWORD*)(INT_PTR)acp, &csi, TCI_SRCCODEPAGE) && + if (!is_complex_script_ansi_cp(acp) && + TranslateCharsetInfo((DWORD*)(INT_PTR)acp, &csi, TCI_SRCCODEPAGE) && csi.fs.fsCsb[0] != 0) { list->element[n].mask = csi.fs.fsCsb[0]; list->element[n].charset = csi.ciCharset; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index daa160c..a9d2fb0 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -2957,7 +2957,7 @@ static INT CALLBACK enum_multi_charset_font_proc(const LOGFONTA *lf, const TEXTM if (TranslateCharsetInfo(ULongToPtr(target->lfCharSet), &csi, TCI_SRCCHARSET)) { fs = ntm->ntmFontSig.fsCsb[0] & valid_bits; - if ((fs & csi.fs.fsCsb[0]) && (fs & ~csi.fs.fsCsb[0])) { + if ((fs & csi.fs.fsCsb[0]) && (fs & ~csi.fs.fsCsb[0]) && (fs & FS_LATIN1)) { *target = *lf; return FALSE; } @@ -2998,13 +2998,13 @@ static void test_EnumFontFamiliesEx_default_charset(void) { struct enum_font_data efd; LOGFONTA target, enum_font; - DWORD ret; + UINT acp; HDC hdc; CHARSETINFO csi; - ret = GetACP(); - if (!TranslateCharsetInfo(ULongToPtr(ret), &csi, TCI_SRCCODEPAGE)) { - skip("TranslateCharsetInfo failed for code page %d.\n", ret); + acp = GetACP(); + if (!TranslateCharsetInfo(ULongToPtr(acp), &csi, TCI_SRCCODEPAGE)) { + skip("TranslateCharsetInfo failed for code page %u.\n", acp); return; } @@ -3018,6 +3018,10 @@ static void test_EnumFontFamiliesEx_default_charset(void) skip("suitable font isn't found for charset %d.\n", enum_font.lfCharSet); return; } + if (acp == 874 || acp == 1255 || acp == 1256) { + /* these codepage use complex script, expecting ANSI_CHARSET here. */ + target.lfCharSet = ANSI_CHARSET; + } efd.total = 0; memset(&enum_font, 0, sizeof(enum_font));

1 0

Vincent Povirk : user32: Create popup menu windows before WM_ENTERMENULOOP.
by Alexandre Julliard March 12, 2014

March 12, 2014

Module: wine Branch: master Commit: a07966dba809d18416e818e1dec80d5fe7dbe326 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a07966dba809d18416e818e1d… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 26 15:08:11 2014 -0600 user32: Create popup menu windows before WM_ENTERMENULOOP. --- dlls/user32/menu.c | 90 +++++++++++++++++++++++++++++++++++----------------- 1 file changed, 61 insertions(+), 29 deletions(-) diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index 915b1c5..8bb508d 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -1817,6 +1817,41 @@ UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect, HWND hwnd ) /*********************************************************************** + * MENU_InitPopup + * + * Popup menu initialization before WM_ENTERMENULOOP. + */ +static BOOL MENU_InitPopup( HWND hwndOwner, HMENU hmenu, UINT flags ) +{ + POPUPMENU *menu; + DWORD ex_style = 0; + + TRACE("owner=%p hmenu=%p\n", hwndOwner, hmenu); + + if (!(menu = MENU_GetMenu( hmenu ))) return FALSE; + + /* store the owner for DrawItem */ + if (!IsWindow( hwndOwner )) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); + return FALSE; + } + menu->hwndOwner = hwndOwner; + + if (flags & TPM_LAYOUTRTL) + ex_style = WS_EX_LAYOUTRTL; + + /* NOTE: In Windows, top menu popup is not owned. */ + menu->hWnd = CreateWindowExW( ex_style, (LPCWSTR)POPUPMENU_CLASS_ATOM, NULL, + WS_POPUP, 0, 0, 0, 0, + hwndOwner, 0, (HINSTANCE)GetWindowLongPtrW(hwndOwner, GWLP_HINSTANCE), + (LPVOID)hmenu ); + if( !menu->hWnd ) return FALSE; + return TRUE; +} + + +/*********************************************************************** * MENU_ShowPopup * * Display a popup menu. @@ -1829,7 +1864,6 @@ static BOOL MENU_ShowPopup( HWND hwndOwner, HMENU hmenu, UINT id, UINT flags, POINT pt; HMONITOR monitor; MONITORINFO info; - DWORD ex_style = 0; TRACE("owner=%p hmenu=%p id=0x%04x x=0x%04x y=0x%04x xa=0x%04x ya=0x%04x\n", hwndOwner, hmenu, id, x, y, xanchor, yanchor); @@ -1841,14 +1875,6 @@ static BOOL MENU_ShowPopup( HWND hwndOwner, HMENU hmenu, UINT id, UINT flags, menu->FocusedItem = NO_SELECTED_ITEM; } - /* store the owner for DrawItem */ - if (!IsWindow( hwndOwner )) - { - SetLastError( ERROR_INVALID_WINDOW_HANDLE ); - return FALSE; - } - menu->hwndOwner = hwndOwner; - menu->nScrollPos = 0; MENU_PopupMenuCalcSize( menu ); @@ -1865,10 +1891,7 @@ static BOOL MENU_ShowPopup( HWND hwndOwner, HMENU hmenu, UINT id, UINT flags, GetMonitorInfoW( monitor, &info ); if (flags & TPM_LAYOUTRTL) - { - ex_style = WS_EX_LAYOUTRTL; flags ^= TPM_RIGHTALIGN; - } if( flags & TPM_RIGHTALIGN ) x -= width; if( flags & TPM_CENTERALIGN ) x -= width / 2; @@ -1896,20 +1919,14 @@ static BOOL MENU_ShowPopup( HWND hwndOwner, HMENU hmenu, UINT id, UINT flags, } if( y < info.rcWork.top ) y = info.rcWork.top; - /* NOTE: In Windows, top menu popup is not owned. */ - menu->hWnd = CreateWindowExW( ex_style, (LPCWSTR)POPUPMENU_CLASS_ATOM, NULL, - WS_POPUP, x, y, width, height, - hwndOwner, 0, (HINSTANCE)GetWindowLongPtrW(hwndOwner, GWLP_HINSTANCE), - (LPVOID)hmenu ); - if( !menu->hWnd ) return FALSE; if (!top_popup) { top_popup = menu->hWnd; top_popup_hmenu = hmenu; } /* Display the window */ - SetWindowPos( menu->hWnd, HWND_TOPMOST, 0, 0, 0, 0, - SWP_SHOWWINDOW | SWP_NOSIZE | SWP_NOMOVE | SWP_NOACTIVATE ); + SetWindowPos( menu->hWnd, HWND_TOPMOST, x, y, width, height, + SWP_SHOWWINDOW | SWP_NOACTIVATE ); UpdateWindow( menu->hWnd ); return TRUE; } @@ -2386,6 +2403,8 @@ static HMENU MENU_ShowSubPopup( HWND hwndOwner, HMENU hmenu, /* use default alignment for submenus */ wFlags &= ~(TPM_CENTERALIGN | TPM_RIGHTALIGN | TPM_VCENTERALIGN | TPM_BOTTOMALIGN); + MENU_InitPopup( hwndOwner, item->hSubMenu, wFlags ); + MENU_ShowPopup( hwndOwner, item->hSubMenu, menu->FocusedItem, wFlags, rect.left, rect.top, rect.right, rect.bottom ); if (selectFirst) @@ -3291,7 +3310,7 @@ static BOOL MENU_InitTracking(HWND hWnd, HMENU hMenu, BOOL bPopup, UINT wFlags) * It also enables menus to be displayed in more than one window, * but there are some bugs left that need to be fixed in this case. */ - if ((menu = MENU_GetMenu( hMenu ))) menu->hWnd = hWnd; + if (!bPopup && (menu = MENU_GetMenu( hMenu ))) menu->hWnd = hWnd; if (!top_popup) top_popup_hmenu = hMenu; /* Send WM_ENTERMENULOOP and WM_INITMENU message only if TPM_NONOTIFY flag is not specified */ @@ -3442,16 +3461,29 @@ BOOL WINAPI TrackPopupMenuEx( HMENU hMenu, UINT wFlags, INT x, INT y, return FALSE; } - MENU_InitTracking(hWnd, hMenu, TRUE, wFlags); + if (MENU_InitPopup( hWnd, hMenu, wFlags )) + { + MENU_InitTracking(hWnd, hMenu, TRUE, wFlags); - /* Send WM_INITMENUPOPUP message only if TPM_NONOTIFY flag is not specified */ - if (!(wFlags & TPM_NONOTIFY)) - SendMessageW( hWnd, WM_INITMENUPOPUP, (WPARAM)hMenu, 0); + /* Send WM_INITMENUPOPUP message only if TPM_NONOTIFY flag is not specified */ + if (!(wFlags & TPM_NONOTIFY)) + SendMessageW( hWnd, WM_INITMENUPOPUP, (WPARAM)hMenu, 0); - if (MENU_ShowPopup( hWnd, hMenu, 0, wFlags, x, y, 0, 0 )) - ret = MENU_TrackMenu( hMenu, wFlags | TPM_POPUPMENU, 0, 0, hWnd, - lpTpm ? &lpTpm->rcExclude : NULL ); - MENU_ExitTracking(hWnd, TRUE); + if (MENU_ShowPopup( hWnd, hMenu, 0, wFlags, x, y, 0, 0 )) + ret = MENU_TrackMenu( hMenu, wFlags | TPM_POPUPMENU, 0, 0, hWnd, + lpTpm ? &lpTpm->rcExclude : NULL ); + MENU_ExitTracking(hWnd, TRUE); + + if (menu->hWnd) + { + DestroyWindow( menu->hWnd ); + menu->hWnd = 0; + + if (!(wFlags & TPM_NONOTIFY)) + SendMessageW( hWnd, WM_UNINITMENUPOPUP, (WPARAM)hMenu, + MAKELPARAM(0, IS_SYSTEM_MENU(menu)) ); + } + } return ret; }

1 0

Vincent Povirk : user32/tests: Add message tests for TrackPopupMenu.
by Alexandre Julliard March 12, 2014

March 12, 2014

Module: wine Branch: master Commit: 7f8d1de1b7510a58a5793392ed5e6a5c950728fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f8d1de1b7510a58a5793392e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Feb 26 13:04:42 2014 -0600 user32/tests: Add message tests for TrackPopupMenu. --- dlls/user32/tests/msg.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 108 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 20248dd..9c1320d 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -1719,6 +1719,38 @@ static const struct message WmSHOWNATopInvisible[] = { { 0 } }; +static const struct message WmTrackPopupMenu[] = { + { HCBT_CREATEWND, hook }, + { WM_ENTERMENULOOP, sent|wparam|lparam, TRUE, 0 }, + { WM_INITMENU, sent|lparam, 0, 0 }, + { WM_INITMENUPOPUP, sent|lparam, 0, 0 }, + { 0x0093, sent|optional }, + { 0x0094, sent|optional }, + { 0x0094, sent|optional }, + { WM_ENTERIDLE, sent|wparam, 2 }, + { WM_CAPTURECHANGED, sent }, + { HCBT_DESTROYWND, hook }, + { WM_UNINITMENUPOPUP, sent|lparam, 0, 0 }, + { WM_MENUSELECT, sent|wparam|lparam, 0xffff0000, 0 }, + { WM_EXITMENULOOP, sent|wparam|lparam, 1, 0 }, + { 0 } +}; + +static const struct message WmTrackPopupMenuEmpty[] = { + { HCBT_CREATEWND, hook }, + { WM_ENTERMENULOOP, sent|wparam|lparam, TRUE, 0 }, + { WM_INITMENU, sent|lparam, 0, 0 }, + { WM_INITMENUPOPUP, sent|lparam, 0, 0 }, + { 0x0093, sent|optional }, + { 0x0094, sent|optional }, + { 0x0094, sent|optional }, + { WM_CAPTURECHANGED, sent }, + { WM_EXITMENULOOP, sent|wparam|lparam, 1, 0 }, + { HCBT_DESTROYWND, hook }, + { WM_UNINITMENUPOPUP, sent|lparam, 0, 0 }, + { 0 } +}; + static BOOL after_end_dialog, test_def_id, paint_loop_done; static int sequence_cnt, sequence_size; static struct recvd_message* sequence; @@ -14260,6 +14292,80 @@ static void test_layered_window(void) DeleteObject( bmp ); } +static HMENU hpopupmenu; + +static LRESULT WINAPI cancel_popup_proc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam) +{ + if (ignore_message( message )) return 0; + + switch (message) { + case WM_ENTERIDLE: + ok(GetCapture() == hwnd, "expected %p, got %p\n", hwnd, GetCapture()); + EndMenu(); + break; + case WM_INITMENU: + case WM_INITMENUPOPUP: + case WM_UNINITMENUPOPUP: + ok((HMENU)wParam == hpopupmenu, "expected %p, got %lx\n", hpopupmenu, wParam); + break; + } + + return MsgCheckProc (FALSE, hwnd, message, wParam, lParam); +} + +static void test_TrackPopupMenu(void) +{ + HWND hwnd; + BOOL ret; + + hwnd = CreateWindowExA(0, "TestWindowClass", NULL, 0, + 0, 0, 1, 1, 0, + NULL, NULL, 0); + ok(hwnd != NULL, "CreateWindowEx failed with error %d\n", GetLastError()); + + SetWindowLongPtrA( hwnd, GWLP_WNDPROC, (LONG_PTR)cancel_popup_proc); + + hpopupmenu = CreatePopupMenu(); + ok(hpopupmenu != NULL, "CreateMenu failed with error %d\n", GetLastError()); + + AppendMenuA(hpopupmenu, MF_STRING, 100, "item 1"); + AppendMenuA(hpopupmenu, MF_STRING, 100, "item 2"); + + flush_events(); + flush_sequence(); + ret = TrackPopupMenu(hpopupmenu, 0, 100,100, 0, hwnd, NULL); + ok_sequence(WmTrackPopupMenu, "TrackPopupMenu", TRUE); + ok(ret == 1, "TrackPopupMenu failed with error %i\n", GetLastError()); + + DestroyMenu(hpopupmenu); + DestroyWindow(hwnd); +} + +static void test_TrackPopupMenuEmpty(void) +{ + HWND hwnd; + BOOL ret; + + hwnd = CreateWindowExA(0, "TestWindowClass", NULL, 0, + 0, 0, 1, 1, 0, + NULL, NULL, 0); + ok(hwnd != NULL, "CreateWindowEx failed with error %d\n", GetLastError()); + + SetWindowLongPtrA( hwnd, GWLP_WNDPROC, (LONG_PTR)cancel_popup_proc); + + hpopupmenu = CreatePopupMenu(); + ok(hpopupmenu != NULL, "CreateMenu failed with error %d\n", GetLastError()); + + flush_events(); + flush_sequence(); + ret = TrackPopupMenu(hpopupmenu, 0, 100,100, 0, hwnd, NULL); + ok_sequence(WmTrackPopupMenuEmpty, "TrackPopupMenuEmpty", TRUE); + todo_wine ok(ret == 0, "TrackPopupMenu succeeded\n"); + + DestroyMenu(hpopupmenu); + DestroyWindow(hwnd); +} + static void init_funcs(void) { HMODULE hKernel32 = GetModuleHandleA("kernel32.dll"); @@ -14337,7 +14443,6 @@ START_TEST(msg) pUnhookWinEvent = 0; } hEvent_hook = 0; - test_SetFocus(); test_SetParent(); test_PostMessage(); @@ -14389,6 +14494,8 @@ START_TEST(msg) test_keyflags(); test_hotkey(); test_layered_window(); + test_TrackPopupMenu(); + test_TrackPopupMenuEmpty(); /* keep it the last test, under Windows it tends to break the tests * which rely on active/foreground windows being correct. */

1 0

Jacek Caban : mshtml: Moved htmldoc5.c content into htmldoc3.c.
by Alexandre Julliard March 12, 2014

March 12, 2014

Module: wine Branch: master Commit: e7553b56fee8f9792aeb050845cc1af01951b577 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7553b56fee8f9792aeb05084… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 12 18:35:33 2014 +0100 mshtml: Moved htmldoc5.c content into htmldoc3.c. --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/htmldoc.c | 1 - dlls/mshtml/htmldoc3.c | 404 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/htmldoc5.c | 443 ----------------------------------------------- 4 files changed, 404 insertions(+), 445 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e7553b56fee8f9792aeb0…

1 0