January 2019 - Wine-commits

Józef Kucia : d3d10core/tests: Add option to enable debug layer.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 446dc11aa4e695ca3905aac8c8c33417337d5b75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=446dc11aa4e695ca3905aac8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 24 12:31:24 2019 +0100 d3d10core/tests: Add option to enable debug layer. Some tests crash with the debug layer enabled. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 54edf50..06b9a16 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -34,6 +34,7 @@ #define BITS_1_0 0x3f800000 static unsigned int use_adapter_idx; +static BOOL enable_debug_layer; static BOOL use_warp_adapter; static BOOL use_mt = TRUE; @@ -1093,20 +1094,24 @@ static IDXGIAdapter *create_adapter(void) static ID3D10Device *create_device(void) { + unsigned int flags = 0; IDXGIAdapter *adapter; ID3D10Device *device; HRESULT hr; + if (enable_debug_layer) + flags |= D3D10_CREATE_DEVICE_DEBUG; + adapter = create_adapter(); - hr = D3D10CreateDevice(adapter, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, D3D10_SDK_VERSION, &device); + hr = D3D10CreateDevice(adapter, D3D10_DRIVER_TYPE_HARDWARE, NULL, flags, D3D10_SDK_VERSION, &device); if (adapter) IDXGIAdapter_Release(adapter); if (SUCCEEDED(hr)) return device; - if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_WARP, NULL, 0, D3D10_SDK_VERSION, &device))) + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_WARP, NULL, flags, D3D10_SDK_VERSION, &device))) return device; - if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, 0, D3D10_SDK_VERSION, &device))) + if (SUCCEEDED(D3D10CreateDevice(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, flags, D3D10_SDK_VERSION, &device))) return device; return NULL; @@ -17878,7 +17883,9 @@ START_TEST(d3d10core) argc = winetest_get_mainargs(&argv); for (i = 2; i < argc; ++i) { - if (!strcmp(argv[i], "--warp")) + if (!strcmp(argv[i], "--validate")) + enable_debug_layer = TRUE; + else if (!strcmp(argv[i], "--warp")) use_warp_adapter = TRUE; else if (!strcmp(argv[i], "--adapter") && i + 1 < argc) use_adapter_idx = atoi(argv[++i]);

1 0

Józef Kucia : d3d10core/tests: Fix crashes with debug layer enabled.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: a3af3e872264f462ee8664820ee38d4760d6c164 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a3af3e872264f462ee866482… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 24 12:31:25 2019 +0100 d3d10core/tests: Fix crashes with debug layer enabled. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 74 +++++++++++++++++++++++----------------- 1 file changed, 43 insertions(+), 31 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 06b9a16..7b0d2fb 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -2825,8 +2825,11 @@ static void test_create_rendertarget_view(void) U(rtv_desc).Buffer.ElementOffset = 0; U(rtv_desc).Buffer.ElementWidth = 64; - hr = ID3D10Device_CreateRenderTargetView(device, NULL, &rtv_desc, &rtview); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + if (!enable_debug_layer) + { + hr = ID3D10Device_CreateRenderTargetView(device, NULL, &rtv_desc, &rtview); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + } expected_refcount = get_refcount(device) + 1; hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)buffer, &rtv_desc, &rtview); @@ -5173,6 +5176,7 @@ float4 main(float4 color : COLOR) : SV_TARGET } ok(!tmp_dsv, "Got unexpected depth stencil view %p.\n", tmp_dsv); + count = 0; ID3D10Device_RSGetScissorRects(device, &count, NULL); ok(!count, "Got unexpected scissor rect count %u.\n", count); memset(tmp_rect, 0x55, sizeof(tmp_rect)); @@ -8567,16 +8571,19 @@ static void test_private_data(void) ok(hr == DXGI_ERROR_MORE_DATA, "Got unexpected hr %#x.\n", hr); ok(size == sizeof(device), "Got unexpected size %u.\n", size); ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); - hr = ID3D10Device_GetPrivateData(device, &test_guid2, NULL, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - size = 0xdeadbabe; - hr = ID3D10Device_GetPrivateData(device, &test_guid2, &size, &ptr); - ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); - ok(size == 0, "Got unexpected size %u.\n", size); - ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); - hr = ID3D10Device_GetPrivateData(device, &test_guid, NULL, &ptr); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); - ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + if (!enable_debug_layer) + { + hr = ID3D10Device_GetPrivateData(device, &test_guid2, NULL, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + size = 0xdeadbabe; + hr = ID3D10Device_GetPrivateData(device, &test_guid2, &size, &ptr); + ok(hr == DXGI_ERROR_NOT_FOUND, "Got unexpected hr %#x.\n", hr); + ok(size == 0, "Got unexpected size %u.\n", size); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + hr = ID3D10Device_GetPrivateData(device, &test_guid, NULL, &ptr); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + ok(ptr == (IUnknown *)0xdeadbeef, "Got unexpected pointer %p.\n", ptr); + } hr = ID3D10Texture2D_SetPrivateDataInterface(texture, &test_guid, (IUnknown *)test_object); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); @@ -10271,23 +10278,27 @@ static void test_check_multisample_quality_levels(void) ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); todo_wine ok(quality_levels == 0xdeadbeef, "Got unexpected quality_levels %u.\n", quality_levels); + if (!enable_debug_layer) + { + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 0, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 1, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + } + quality_levels = 0xdeadbeef; - hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 0, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 0, &quality_levels); ok(hr == E_FAIL, "Got unexpected hr %#x.\n", hr); ok(!quality_levels, "Got unexpected quality_levels %u.\n", quality_levels); quality_levels = 0xdeadbeef; - hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 1, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 1, &quality_levels); ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); ok(quality_levels == 1, "Got unexpected quality_levels %u.\n", quality_levels); quality_levels = 0xdeadbeef; - hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, NULL); - ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); hr = ID3D10Device_CheckMultisampleQualityLevels(device, DXGI_FORMAT_R8G8B8A8_UNORM, 2, &quality_levels); ok(SUCCEEDED(hr), "Got unexpected hr %#x.\n", hr); ok(quality_levels, "Got unexpected quality_levels %u.\n", quality_levels); @@ -11022,15 +11033,11 @@ static void test_clear_render_target_view_2d(void) ID3D10Device_ClearRenderTargetView(device, rtv, color); check_texture_color(texture, expected_color, 1); - if (is_d3d11_interface_available(device)) + if (is_d3d11_interface_available(device) && !enable_debug_layer) { ID3D10Device_ClearRenderTargetView(device, NULL, green); check_texture_color(texture, expected_color, 1); } - else - { - win_skip("D3D11 is not available.\n"); - } ID3D10Device_ClearRenderTargetView(device, srgb_rtv, color); check_texture_color(srgb_texture, expected_srgb_color, 1); @@ -11140,13 +11147,11 @@ static void test_clear_depth_stencil_view(void) ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH | D3D10_CLEAR_STENCIL, 0.0f, 0); check_texture_color(depth_texture, 0x00000000, 0); - if (is_d3d11_interface_available(device)) + if (is_d3d11_interface_available(device) && !enable_debug_layer) { ID3D10Device_ClearDepthStencilView(device, NULL, D3D10_CLEAR_DEPTH | D3D10_CLEAR_STENCIL, 1.0f, 0xff); check_texture_color(depth_texture, 0x00000000, 0); } - else - win_skip("D3D11 is not available, skipping test.\n"); ID3D10Device_ClearDepthStencilView(device, dsv, D3D10_CLEAR_DEPTH, 1.0f, 0xff); todo_wine check_texture_color(depth_texture, 0x00ffffff, 0); @@ -14335,10 +14340,13 @@ static void test_render_target_device_mismatch(void) rtv = (ID3D10RenderTargetView *)0xdeadbeef; ID3D10Device_OMGetRenderTargets(device, 1, &rtv, NULL); ok(!rtv, "Got unexpected render target view %p.\n", rtv); - ID3D10Device_OMSetRenderTargets(device, 1, &test_context.backbuffer_rtv, NULL); - ID3D10Device_OMGetRenderTargets(device, 1, &rtv, NULL); - ok(rtv == test_context.backbuffer_rtv, "Got unexpected render target view %p.\n", rtv); - ID3D10RenderTargetView_Release(rtv); + if (!enable_debug_layer) + { + ID3D10Device_OMSetRenderTargets(device, 1, &test_context.backbuffer_rtv, NULL); + ID3D10Device_OMGetRenderTargets(device, 1, &rtv, NULL); + ok(rtv == test_context.backbuffer_rtv, "Got unexpected render target view %p.\n", rtv); + ID3D10RenderTargetView_Release(rtv); + } rtv = NULL; ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); @@ -17385,7 +17393,7 @@ static void test_multiple_viewports(void) vp[1].Width = width; ID3D10Device_RSSetViewports(device, 2, vp); - count = ARRAY_SIZE(vp); + count = enable_debug_layer ? ARRAY_SIZE(vp) - 1 : ARRAY_SIZE(vp); ID3D10Device_RSGetViewports(device, &count, vp); ok(count == 2, "Unexpected viewport count %d.\n", count); @@ -17467,6 +17475,9 @@ static void test_multiple_viewports(void) SetRect(&rect, width, texture_desc.Height / 2, 2 * width - 1, texture_desc.Height - 1); check_texture_sub_resource_vec4(texture, 0, &rect, &expected_values[11], 1); + if (enable_debug_layer) + goto done; + /* Viewport count exceeding maximum value. */ ID3D10Device_RSSetViewports(device, 1, vp); @@ -17488,6 +17499,7 @@ static void test_multiple_viewports(void) ok(count == 1, "Unexpected viewport count %d.\n", count); ok(vp[0].TopLeftX == 0.0f && vp[0].Width == width, "Unexpected viewport.\n"); +done: ID3D10RasterizerState_Release(rasterizer_state); ID3D10RenderTargetView_Release(rtv); ID3D10Texture2D_Release(texture);

1 0

Józef Kucia : d3d10core/tests: Avoid "skipping tests" in skip() messages.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: d32ac5f49f16a4fd77d58b463de40b259e92b088 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d32ac5f49f16a4fd77d58b46… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jan 24 12:31:26 2019 +0100 d3d10core/tests: Avoid "skipping tests" in skip() messages. skip() prints "Tests skipped:". Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 7b0d2fb..5b8e7e1 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -1500,7 +1500,7 @@ static void test_feature_level(void) if (!(d3d10_device = create_device())) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -1689,7 +1689,7 @@ static void test_texture1d_interfaces(void) if (!(device = create_device())) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -1709,7 +1709,7 @@ static void test_texture1d_interfaces(void) ID3D10Texture1D_Release(texture); if (FAILED(hr)) { - win_skip("1D textures do not implement ID3D11Texture1D, skipping tests.\n"); + win_skip("1D textures do not implement ID3D11Texture1D.\n"); ID3D10Device_Release(device); return; } @@ -1880,7 +1880,7 @@ static void test_create_texture2d(void) if (!(device = create_device())) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -2024,7 +2024,7 @@ static void test_texture2d_interfaces(void) if (!(device = create_device())) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -2047,7 +2047,7 @@ static void test_texture2d_interfaces(void) ID3D10Texture2D_Release(texture); if (FAILED(hr)) { - win_skip("D3D11 is not available, skipping tests.\n"); + win_skip("D3D11 is not available.\n"); ID3D10Device_Release(device); return; } @@ -2157,7 +2157,7 @@ static void test_create_texture3d(void) if (!(device = create_device())) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -3733,7 +3733,7 @@ void main(point float4 vin[1] : POSITION, inout TriangleStream<gs_out> vout) if (!(device = create_device())) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -3859,7 +3859,7 @@ static void test_create_sampler_state(void) if (!(device = create_device())) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -4222,7 +4222,7 @@ static void test_create_depthstencil_state(void) if (!(device = create_device())) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -4326,7 +4326,7 @@ static void test_create_rasterizer_state(void) if (!(device = create_device())) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -4873,7 +4873,7 @@ static void test_device_removed_reason(void) if (!(device = create_device())) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -5083,7 +5083,7 @@ float4 main(float4 color : COLOR) : SV_TARGET if (!(device = create_device())) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -5981,7 +5981,7 @@ static void test_blend(void) /* DXGI_FORMAT_B8G8R8X8_UNORM is not supported on all implementations. */ if (FAILED(ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &offscreen))) { - skip("DXGI_FORMAT_B8G8R8X8_UNORM not supported, skipping tests.\n"); + skip("DXGI_FORMAT_B8G8R8X8_UNORM not supported.\n"); goto done; } @@ -8434,7 +8434,7 @@ static void test_private_data(void) if (!(device = create_device())) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } @@ -10265,7 +10265,7 @@ static void test_check_multisample_quality_levels(void) ok(hr == S_OK, "Failed to check multisample quality levels, hr %#x.\n", hr); if (!quality_levels) { - skip("Multisampling not supported for DXGI_FORMAT_R8G8B8A8_UNORM, skipping test.\n"); + skip("Multisampling not supported for DXGI_FORMAT_R8G8B8A8_UNORM.\n"); goto done; } @@ -10791,7 +10791,7 @@ static void test_swapchain_flip(void) if (!(device = create_device())) { - skip("Failed to create device, skipping tests.\n"); + skip("Failed to create device.\n"); return; } SetRect(&rect, 0, 0, 640, 480); @@ -15875,7 +15875,7 @@ static void test_format_compatibility(void) hr = ID3D10Device_CreateTexture2D(device, &texture_desc, &resource_data, &dst_texture); if (FAILED(hr) && test_data[i].dst_format == DXGI_FORMAT_B8G8R8A8_UNORM) { - skip("B8G8R8A8_UNORM not supported, skipping test.\n"); + skip("B8G8R8A8_UNORM not supported.\n"); ID3D10Texture2D_Release(src_texture); continue; }

1 0

Zhiyi Zhang : user32: Check for null handle in GetRawInputData().
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: bd730a5f412c1e3b8a05b3b297ca0642e23fb92b URL: https://source.winehq.org/git/wine.git/?a=commit;h=bd730a5f412c1e3b8a05b3b2… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Jan 23 23:27:09 2019 +0800 user32: Check for null handle in GetRawInputData(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46499 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/rawinput.c | 3 +++ dlls/user32/tests/input.c | 11 +++++++++++ 2 files changed, 14 insertions(+) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index cf3028a..4bfccdf 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -281,6 +281,9 @@ UINT WINAPI GetRawInputData(HRAWINPUT rawinput, UINT command, void *data, UINT * TRACE("rawinput %p, command %#x, data %p, data_size %p, header_size %u.\n", rawinput, command, data, data_size, header_size); + if (!ri) + return ~0U; + if (header_size != sizeof(RAWINPUTHEADER)) { WARN("Invalid structure size %u.\n", header_size); diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 14fd5f8..ffdd4b7 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1530,6 +1530,16 @@ static void test_GetRawInputDeviceList(void) ok(odevcount == oret, "expected %d, got %d\n", oret, odevcount); } +static void test_GetRawInputData(void) +{ + UINT size; + UINT ret; + + /* Null raw input handle */ + ret = GetRawInputData(NULL, RID_INPUT, NULL, &size, sizeof(RAWINPUTHEADER)); + ok(ret == ~0U, "Expect ret %u, got %u\n", ~0U, ret); +} + static void test_key_map(void) { HKL kl = GetKeyboardLayout(0); @@ -2697,6 +2707,7 @@ START_TEST(input) test_attach_input(); test_GetKeyState(); test_OemKeyScan(); + test_GetRawInputData(); if(pGetMouseMovePointsEx) test_GetMouseMovePointsEx();

1 0

Joshua Ashton : include: Mark IDirect3D9Ex::GetAdapterDisplayModeEx() as PURE.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: d21691a26ac3416914c409ae2eaa5bf4e2ecdd68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d21691a26ac3416914c409ae… Author: Joshua Ashton <joshua(a)froggi.es> Date: Thu Jan 24 20:39:00 2019 +0330 include: Mark IDirect3D9Ex::GetAdapterDisplayModeEx() as PURE. Signed-off-by: Joshua Ashton <joshua(a)froggi.es> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d9.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/d3d9.h b/include/d3d9.h index 08f4555..ef3ea2a9 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -1617,7 +1617,8 @@ DECLARE_INTERFACE_(IDirect3D9Ex, IDirect3D9) STDMETHOD_(UINT, GetAdapterModeCountEx)(THIS_ UINT adapter_idx, const D3DDISPLAYMODEFILTER *filter) PURE; STDMETHOD(EnumAdapterModesEx)(THIS_ UINT adapter_idx, const D3DDISPLAYMODEFILTER *filter, UINT mode_idx, D3DDISPLAYMODEEX *mode) PURE; - STDMETHOD(GetAdapterDisplayModeEx)(THIS_ UINT adapter_idx, D3DDISPLAYMODEEX *mode, D3DDISPLAYROTATION *rotation); + STDMETHOD(GetAdapterDisplayModeEx)(THIS_ UINT adapter_idx, + D3DDISPLAYMODEEX *mode, D3DDISPLAYROTATION *rotation) PURE; STDMETHOD(CreateDeviceEx)(THIS_ UINT adapter_idx, D3DDEVTYPE device_type, HWND focus_window, DWORD flags, D3DPRESENT_PARAMETERS *parameters, D3DDISPLAYMODEEX *mode, struct IDirect3DDevice9Ex **device) PURE; STDMETHOD(GetAdapterLUID)(THIS_ UINT adapter_idx, LUID *luid) PURE;

1 0

Joshua Ashton : include: Add a few missing d3d9 constants.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 9f258dab603334d95115e7170144c8031affcbd3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9f258dab603334d95115e717… Author: Joshua Ashton <joshua(a)froggi.es> Date: Thu Jan 24 20:39:01 2019 +0330 include: Add a few missing d3d9 constants. Signed-off-by: Joshua Ashton <joshua(a)froggi.es> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/d3d9.h | 2 ++ include/d3d9types.h | 3 +++ 2 files changed, 5 insertions(+) diff --git a/include/d3d9.h b/include/d3d9.h index ef3ea2a9..3ebde45 100644 --- a/include/d3d9.h +++ b/include/d3d9.h @@ -65,8 +65,10 @@ #define D3DPRESENT_DONOTWAIT __MSABI_LONG(1) #define D3DPRESENT_LINEAR_CONTENT __MSABI_LONG(2) #define D3DPRESENT_BACK_BUFFERS_MAX __MSABI_LONG(3) +#define D3DPRESENT_BACK_BUFFERS_MAX_EX __MSABI_LONG(30) #define D3DSGR_NO_CALIBRATION __MSABI_LONG(0x00000000) #define D3DSGR_CALIBRATE __MSABI_LONG(0x00000001) +#define D3DCURSOR_IMMEDIATE_UPDATE __MSABI_LONG(0x00000001) #define _FACD3D 0x876 #define MAKE_D3DHRESULT( code ) MAKE_HRESULT( 1, _FACD3D, code ) diff --git a/include/d3d9types.h b/include/d3d9types.h index 4891858..56394df 100644 --- a/include/d3d9types.h +++ b/include/d3d9types.h @@ -481,6 +481,9 @@ typedef enum _D3DSHADER_INSTRUCTION_OPCODE_TYPE { #define D3DSP_DCL_USAGEINDEX_SHIFT 16 #define D3DSP_DCL_USAGEINDEX_MASK 0x000f0000 +#define D3DSP_OPCODESPECIFICCONTROL_SHIFT 16 +#define D3DSP_OPCODESPECIFICCONTROL_MASK 0x00ff0000 + #define D3DSP_TEXTURETYPE_SHIFT 27 #define D3DSP_TEXTURETYPE_MASK 0x78000000

1 0

Nikolay Sivov : user32/dialog: Fix setting negative dialog item ids.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 47a44e6d9c4ffafce562f73d31fa3318b229ab3a URL: https://source.winehq.org/git/wine.git/?a=commit;h=47a44e6d9c4ffafce562f73d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Jan 24 11:52:01 2019 +0300 user32/dialog: Fix setting negative dialog item ids. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46494 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/dialog.c | 4 ++-- dlls/user32/tests/dialog.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/user32/tests/resource.rc | 9 +++++++++ dlls/user32/user_private.h | 1 + 4 files changed, 53 insertions(+), 2 deletions(-) diff --git a/dlls/user32/dialog.c b/dlls/user32/dialog.c index 72e6eee..deaeb84 100644 --- a/dlls/user32/dialog.c +++ b/dlls/user32/dialog.c @@ -131,8 +131,8 @@ static const WORD *DIALOG_GetControl32( const WORD *p, DLG_CONTROL_INFO *info, if (dialogEx) { - /* id is a DWORD for DIALOGEX */ - info->id = GET_DWORD(p); + /* id is 4 bytes for DIALOGEX */ + info->id = GET_LONG(p); p += 2; } else diff --git a/dlls/user32/tests/dialog.c b/dlls/user32/tests/dialog.c index 8c9bd21..070ddce 100644 --- a/dlls/user32/tests/dialog.c +++ b/dlls/user32/tests/dialog.c @@ -1181,9 +1181,47 @@ static void test_GetDlgItemText(void) "string retrieved using GetDlgItemText should have been NULL terminated\n"); } +static INT_PTR CALLBACK getdlgitem_test_dialog_proc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM lparam) +{ + if (msg == WM_INITDIALOG) + { + char text[64]; + LONG_PTR val; + HWND hwnd; + BOOL ret; + + hwnd = GetDlgItem(hdlg, -1); + ok(hwnd != NULL, "Expected dialog item.\n"); + + *text = 0; + ret = GetDlgItemTextA(hdlg, -1, text, ARRAY_SIZE(text)); + ok(ret && !strcmp(text, "Text1"), "Unexpected item text.\n"); + + val = GetWindowLongA(hwnd, GWLP_ID); + ok(val == -1, "Unexpected id.\n"); + + val = GetWindowLongPtrA(hwnd, GWLP_ID); + ok(val == -1, "Unexpected id %ld.\n", val); + + hwnd = GetDlgItem(hdlg, -2); + ok(hwnd != NULL, "Expected dialog item.\n"); + + val = GetWindowLongA(hwnd, GWLP_ID); + ok(val == -2, "Unexpected id.\n"); + + val = GetWindowLongPtrA(hwnd, GWLP_ID); + ok(val == -2, "Unexpected id %ld.\n", val); + + EndDialog(hdlg, 0xdead); + } + + return FALSE; +} + static void test_GetDlgItem(void) { HWND hwnd, child1, child2, hwnd2; + INT_PTR retval; BOOL ret; hwnd = CreateWindowA("button", "parent", WS_VISIBLE, 0, 0, 100, 100, NULL, 0, g_hinst, NULL); @@ -1230,6 +1268,9 @@ static void test_GetDlgItem(void) DestroyWindow(child1); DestroyWindow(child2); DestroyWindow(hwnd); + + retval = DialogBoxParamA(g_hinst, "GETDLGITEM_TEST_DIALOG", NULL, getdlgitem_test_dialog_proc, 0); + ok(retval == 0xdead, "Unexpected return value.\n"); } static INT_PTR CALLBACK DestroyDlgWinProc (HWND hDlg, UINT uiMsg, diff --git a/dlls/user32/tests/resource.rc b/dlls/user32/tests/resource.rc index 3823ed3..4301af6 100644 --- a/dlls/user32/tests/resource.rc +++ b/dlls/user32/tests/resource.rc @@ -237,6 +237,15 @@ FONT 8, "MS Sans Serif" CONTROL "oddlengthtext", -1, "TESTCONTROL", WS_CHILD|WS_VISIBLE|WS_BORDER|WS_TABSTOP, 10,60,100,50 { 1,2,3,4,5 } } +GETDLGITEM_TEST_DIALOG DIALOGEX 6, 15, 207, 111 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Test Dialog" +FONT 8, "MS Shell Dlg" +{ + LTEXT "Text1",-1,10,10,100,50 + LTEXT "Text2",-2,10,10,100,50 +} + /* @makedep: test_mono.bmp */ 100 BITMAP test_mono.bmp diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index bf02ee5..514cf67 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -33,6 +33,7 @@ #define GET_WORD(ptr) (*(const WORD *)(ptr)) #define GET_DWORD(ptr) (*(const DWORD *)(ptr)) +#define GET_LONG(ptr) (*(const LONG *)(ptr)) #define WM_SYSTIMER 0x0118 #define WM_POPUPSYSTEMMENU 0x0313

1 0

Dmitry Timoshkov : wininet: Return proper cache path from GetUrlCacheConfigInfo.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 0cdca521e9bdf9838cd789cf3ef225a95cdaf6d5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0cdca521e9bdf9838cd789cf… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jan 23 14:51:26 2019 +0800 wininet: Return proper cache path from GetUrlCacheConfigInfo. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/urlcache.c | 2 - dlls/wininet/urlcache.c | 89 +++++++++++++++++++++++++++++++++++++++---- 2 files changed, 81 insertions(+), 10 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index acd4ff2..c5e72ae 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -1184,10 +1184,8 @@ static void test_GetUrlCacheConfigInfo(void) SetLastError(0xdeadbeef); ret = GetUrlCacheConfigInfoA(td[i].info, NULL, td[i].flags); -todo_wine ok(ret == td[i].ret, "%d: expected %d, got %d\n", i, td[i].ret, ret); if (!ret) -todo_wine ok(GetLastError() == td[i].error, "%d: expected %u, got %u\n", i, td[i].error, GetLastError()); else { diff --git a/dlls/wininet/urlcache.c b/dlls/wininet/urlcache.c index f26fa34..4d422c9 100644 --- a/dlls/wininet/urlcache.c +++ b/dlls/wininet/urlcache.c @@ -23,6 +23,7 @@ */ #define NONAMELESSUNION +#define NONAMELESSSTRUCT #include "ws2tcpip.h" @@ -3764,21 +3765,93 @@ BOOL WINAPI SetUrlCacheEntryGroupW(LPCWSTR lpszUrlName, DWORD dwFlags, /*********************************************************************** * GetUrlCacheConfigInfoW (WININET.@) */ -BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW CacheInfo, LPDWORD size, DWORD bitmask) +BOOL WINAPI GetUrlCacheConfigInfoW(LPINTERNET_CACHE_CONFIG_INFOW info, LPDWORD size, DWORD flags) { - FIXME("(%p, %p, %x)\n", CacheInfo, size, bitmask); - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + cache_container *container; + + FIXME("(%p, %p, %x): semi-stub\n", info, size, flags); + + if (!info) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + info->dwContainer = 0; + info->dwQuota = 0x3e800; /* FIXME */ + info->dwReserved4 = 0; + info->fPerUser = TRUE; + info->dwSyncMode = 0; + info->dwNumCachePaths = 1; + info->dwNormalUsage = 0; + info->dwExemptUsage = 0; + + info->u.s.CachePath[0] = 0; + info->u.s.dwCacheSize = 0x3e800; /* FIXME */ + + LIST_FOR_EACH_ENTRY(container, &UrlContainers, cache_container, entry) + { + switch (flags & (CACHE_CONFIG_CONTENT_PATHS_FC | CACHE_CONFIG_COOKIES_PATHS_FC | CACHE_CONFIG_HISTORY_PATHS_FC)) + { + case 0: + case CACHE_CONFIG_CONTENT_PATHS_FC: + if (container->default_entry_type == NORMAL_CACHE_ENTRY) + lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH); + break; + + case CACHE_CONFIG_COOKIES_PATHS_FC: + if (container->default_entry_type == COOKIE_CACHE_ENTRY) + lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH); + break; + + case CACHE_CONFIG_HISTORY_PATHS_FC: + if (container->default_entry_type == URLHISTORY_CACHE_ENTRY) + lstrcpynW(info->u.s.CachePath, container->path, MAX_PATH); + break; + + default: + FIXME("flags %08x not handled\n", flags); + break; + } + } + + TRACE("CachePath %s\n", debugstr_w(info->u.s.CachePath)); + + return TRUE; } /*********************************************************************** * GetUrlCacheConfigInfoA (WININET.@) */ -BOOL WINAPI GetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA CacheInfo, LPDWORD size, DWORD bitmask) +BOOL WINAPI GetUrlCacheConfigInfoA(LPINTERNET_CACHE_CONFIG_INFOA info, LPDWORD size, DWORD flags) { - FIXME("(%p, %p, %x)\n", CacheInfo, size, bitmask); - INTERNET_SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; + INTERNET_CACHE_CONFIG_INFOW infoW; + + TRACE("(%p, %p, %x)\n", info, size, flags); + + if (!info) + { + INTERNET_SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + infoW.dwStructSize = sizeof(infoW); + if (!GetUrlCacheConfigInfoW(&infoW, size, flags)) + return FALSE; + + info->dwContainer = infoW.dwContainer; + info->dwQuota = infoW.dwQuota; + info->dwReserved4 = infoW.dwReserved4; + info->fPerUser = infoW.fPerUser; + info->dwSyncMode = infoW.dwSyncMode; + info->dwNumCachePaths = infoW.dwNumCachePaths; + info->dwNormalUsage = infoW.dwNormalUsage; + info->dwExemptUsage = infoW.dwExemptUsage; + + info->u.s.dwCacheSize = infoW.u.s.dwCacheSize; + WideCharToMultiByte(CP_ACP, 0, infoW.u.s.CachePath, -1, info->u.s.CachePath, MAX_PATH, NULL, NULL); + + return TRUE; } BOOL WINAPI GetUrlCacheGroupAttributeA( GROUPID gid, DWORD dwFlags, DWORD dwAttributes,

1 0

Gabriel Ivăncescu : shell32/shfldr_desktop: Use friendly name instead of GUID when SHGDN_FORADDRESSBAR is set.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: ba31ce27fd12714b2a290856df9752ba473994cb URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba31ce27fd12714b2a290856… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jan 23 17:27:14 2019 +0200 shell32/shfldr_desktop: Use friendly name instead of GUID when SHGDN_FORADDRESSBAR is set. On Windows, SHGDN_FORPARSING returns the GUID name of a special folder, but only when SHGDN_FORADDRESSBAR is not set. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_desktop.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index d0b97c6..938871e 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -611,7 +611,7 @@ static HRESULT WINAPI ISF_Desktop_fnGetDisplayNameOf (IShellFolder2 * iface, if ((clsid = _ILGetGUIDPointer (pidl))) { - if (GET_SHGDN_FOR (dwFlags) & SHGDN_FORPARSING) + if ((GET_SHGDN_FOR (dwFlags) & (SHGDN_FORPARSING | SHGDN_FORADDRESSBAR)) == SHGDN_FORPARSING) { BOOL bWantsForParsing;

1 0

Gabriel Ivăncescu : shell32/shfldr_mycomp: Use friendly name instead of GUID when SHGDN_FORADDRESSBAR is set.
by Alexandre Julliard 24 Jan '19

24 Jan '19

Module: wine Branch: master Commit: 889fce0887451aa2b67541fe9b6951d66c4805d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=889fce0887451aa2b67541fe… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Wed Jan 23 17:27:15 2019 +0200 shell32/shfldr_mycomp: Use friendly name instead of GUID when SHGDN_FORADDRESSBAR is set. On Windows, SHGDN_FORPARSING returns the GUID name of a special folder, but only when SHGDN_FORADDRESSBAR is not set. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shfldr_mycomp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index 60f32f1..6a31e8c 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -615,7 +615,7 @@ static HRESULT WINAPI ISF_MyComputer_fnGetDisplayNameOf (IShellFolder2 *iface, clsid = _ILGetGUIDPointer (pidl); if (clsid) { - if (GET_SHGDN_FOR (dwFlags) & SHGDN_FORPARSING) + if ((GET_SHGDN_FOR (dwFlags) & (SHGDN_FORPARSING | SHGDN_FORADDRESSBAR)) == SHGDN_FORPARSING) { static const WCHAR clsidW[] = { 'C','L','S','I','D','\\',0 };

1 0