December 2016 - Wine-Commits

Hans Leidekker : wintrust/tests: Fix test failures on Windows 8.1 and 10.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: master Commit: 14444fab92662d2d7da5ec9a442b397c1e3f8d46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=14444fab92662d2d7da5ec9a4… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 19 11:38:55 2016 +0100 wintrust/tests: Fix test failures on Windows 8.1 and 10. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/tests/crypt.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wintrust/tests/crypt.c b/dlls/wintrust/tests/crypt.c index cfed53b..503831e 100644 --- a/dlls/wintrust/tests/crypt.c +++ b/dlls/wintrust/tests/crypt.c @@ -1020,8 +1020,11 @@ static void test_cdf_parsing(void) catmember = NULL; catmembertag = NULL; while ((catmembertag = pCryptCATCDFEnumMembersByCDFTagEx(catcdf, catmembertag, cdf_callback, &catmember, FALSE, NULL))) ; - todo_wine - CHECK_EXPECT(CRYPTCAT_E_AREA_MEMBER, CRYPTCAT_E_CDF_MEMBER_FILE_PATH); + ok(error_area == 0xffffffff || broken(error_area == CRYPTCAT_E_AREA_MEMBER) /* < win81 */, + "Expected area 0xffffffff, got %08x\n", error_area); + ok(local_error == 0xffffffff || broken(local_error == CRYPTCAT_E_CDF_MEMBER_FILE_PATH) /* < win81 */, + "Expected error 0xffffffff, got %08x\n", local_error); + pCryptCATCDFClose(catcdf); DeleteFileA(cdffileA); todo_wine

1 0

Hans Leidekker : setupapi/tests: Skip SetupCopyOEMInfA tests if the user doesn't have admin rights.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: master Commit: 0922deda9360259a8d1c374599e5ced80357d037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0922deda9360259a8d1c37459… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 19 11:38:51 2016 +0100 setupapi/tests: Skip SetupCopyOEMInfA tests if the user doesn't have admin rights. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/misc.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/tests/misc.c b/dlls/setupapi/tests/misc.c index 04b2171..dbe684b 100644 --- a/dlls/setupapi/tests/misc.c +++ b/dlls/setupapi/tests/misc.c @@ -231,6 +231,11 @@ static void test_SetupCopyOEMInf(void) strcat(path, tmpfile); SetLastError(0xdeadbeef); res = pSetupCopyOEMInfA(path, NULL, SPOST_NONE, 0, NULL, 0, NULL, NULL); + if (!res && GetLastError() == ERROR_ACCESS_DENIED) + { + skip("SetupCopyOEMInfA() failed on insufficient permissions\n"); + return; + } ok(res == TRUE, "Expected TRUE, got %d\n", res); ok(GetLastError() == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", GetLastError()); ok(file_exists(path), "Expected source inf to exist\n"); @@ -792,7 +797,7 @@ static void test_SetupLogError(void) ret = SetupOpenLog(FALSE); if (!ret && GetLastError() == ERROR_ACCESS_DENIED) { - win_skip("SetupOpenLog() failed on insufficient permissions\n"); + skip("SetupOpenLog() failed on insufficient permissions\n"); return; } ok(ret, "SetupOpenLog failed, error %d\n", GetLastError());

1 0

Hans Leidekker : mstask/tests: Skip ITaskScheduler:: SetTargetComputer tests if the user doesn't have admin rights.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: master Commit: 64c1353925a9ed3f9023561a36c3d34bc86ba655 URL: http://source.winehq.org/git/wine.git/?a=commit;h=64c1353925a9ed3f9023561a3… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 19 11:38:50 2016 +0100 mstask/tests: Skip ITaskScheduler::SetTargetComputer tests if the user doesn't have admin rights. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mstask/tests/task_scheduler.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index 3bf660f..31d2848 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -184,6 +184,11 @@ static void test_SetTargetComputer(void) /* the two backslashes are optional */ hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, oldname + 2); + if (hres == E_ACCESSDENIED) + { + skip("SetTargetComputer failed with E_ACCESSDENIED (needs admin rights)\n"); + goto done; + } ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); /* the case is ignored */ @@ -198,6 +203,7 @@ static void test_SetTargetComputer(void) hres = ITaskScheduler_SetTargetComputer(test_task_scheduler, oldname); ok(hres == S_OK, "got 0x%x (expected S_OK)\n", hres); +done: CoTaskMemFree(oldname); ITaskScheduler_Release(test_task_scheduler); return;

1 0

Józef Kucia : d2d1/tests: Change scale factors in test_bitmap_brush().
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: master Commit: 89ffad1f20dd93f18982c60984b0a223a7b5b1b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=89ffad1f20dd93f18982c6098… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Dec 18 00:22:27 2016 +0100 d2d1/tests: Change scale factors in test_bitmap_brush(). 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/d2d1/tests/d2d1.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 941a43a..cde8579 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -1145,7 +1145,7 @@ static void test_bitmap_brush(void) ID2D1RenderTarget_SetTransform(rt, &matrix); set_matrix_identity(&matrix); translate_matrix(&matrix, -80.0f, -60.0f); - scale_matrix(&matrix, 40.0f, 30.0f); + scale_matrix(&matrix, 64.0f, 32.0f); ID2D1BitmapBrush_SetTransform(brush, &matrix); ID2D1BitmapBrush_SetOpacity(brush, 0.75f); set_rect(&dst_rect, -80.0f, -60.0f, 80.0f, 60.0f); @@ -1167,7 +1167,7 @@ static void test_bitmap_brush(void) hr = ID2D1RenderTarget_EndDraw(rt, NULL, NULL); ok(SUCCEEDED(hr), "Failed to end draw, hr %#x.\n", hr); - match = compare_surface(surface, "393636185359a550d459e1e5f0e25411814f724c"); + match = compare_surface(surface, "9437f4447d98feaad41a1c4202ee90aadc718ee6"); ok(match, "Surface does not match.\n"); ID2D1RenderTarget_BeginDraw(rt);

1 0

Józef Kucia : wined3d: Always check if context window needs to be updated.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: master Commit: 6b94fb1e4a6828f5a2f366bd065609bd127aa55f URL: http://source.winehq.org/git/wine.git/?a=commit;h=6b94fb1e4a6828f5a2f366bd0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Dec 18 00:22:25 2016 +0100 wined3d: Always check if context window needs to be updated. Fixes a regression introduced by commit 8673dca87df76b8f94be65c82e4a1a389c13dd9b. 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/wined3d/context.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 8fdd297..6112b40 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1114,18 +1114,21 @@ static void context_restore_gl_context(const struct wined3d_gl_info *gl_info, HD } } -static void context_update_window(struct wined3d_context *context, HWND win_handle) +static void context_update_window(struct wined3d_context *context) { - if (context->win_handle == win_handle) + if (!context->swapchain) + return; + + if (context->win_handle == context->swapchain->win_handle) return; TRACE("Updating context %p window from %p to %p.\n", - context, context->win_handle, win_handle); + context, context->win_handle, context->swapchain->win_handle); if (context->hdc) wined3d_release_dc(context->win_handle, context->hdc); - context->win_handle = win_handle; + context->win_handle = context->swapchain->win_handle; context->hdc_is_private = FALSE; context->hdc_has_format = FALSE; context->needs_set = 1; @@ -3616,7 +3619,6 @@ static void context_setup_target(struct wined3d_context *context, struct wined3d_context *context_acquire(const struct wined3d_device *device, struct wined3d_surface *target) { struct wined3d_context *current_context = context_get_current(); - struct wined3d_swapchain *swapchain = NULL; struct wined3d_texture *target_texture; unsigned int target_sub_resource_idx; struct wined3d_context *context; @@ -3656,11 +3658,11 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, str { context = current_context; } - else if ((swapchain = target_texture->swapchain)) + else if (target_texture->swapchain) { TRACE("Rendering onscreen.\n"); - context = swapchain_get_context(swapchain); + context = swapchain_get_context(target_texture->swapchain); } else { @@ -3669,19 +3671,13 @@ struct wined3d_context *context_acquire(const struct wined3d_device *device, str /* Stay with the current context if possible. Otherwise use the * context for the primary swapchain. */ if (current_context && current_context->device == device) - { context = current_context; - } else - { - swapchain = device->swapchains[0]; - context = swapchain_get_context(swapchain); - } + context = swapchain_get_context(device->swapchains[0]); } context_enter(context); - if (swapchain) - context_update_window(context, swapchain->win_handle); + context_update_window(context); context_setup_target(context, target_texture, target_sub_resource_idx); if (!context->valid) return context;

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: master Commit: 7aedfe0e9fa761c23dd82fab6485d2f39f2030f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7aedfe0e9fa761c23dd82fab6… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Dec 19 08:43:04 2016 -0700 po: Update Catalan translation. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ca.po | 321 ++++++++++++++++++++++++++------------------------------------- 1 file changed, 131 insertions(+), 190 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7aedfe0e9fa761c23dd82…

1 0

Hans Leidekker : urlmon/tests: Skip domain tests if the user doesn' t have admin rights.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: master Commit: 3a8801b1cc3aa2720dd2e189fc35cf856afb282c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a8801b1cc3aa2720dd2e189f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 19 11:38:54 2016 +0100 urlmon/tests: Skip domain tests if the user doesn't have admin rights. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/tests/sec_mgr.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/sec_mgr.c b/dlls/urlmon/tests/sec_mgr.c index ad0fcf6..33e295a 100644 --- a/dlls/urlmon/tests/sec_mgr.c +++ b/dlls/urlmon/tests/sec_mgr.c @@ -758,7 +758,7 @@ static const zone_domain_mapping zone_domain_mappings[] = { {"wine.testing",NULL,"*",URLZONE_CUSTOM2} }; -static void register_zone_domains(void) +static BOOL register_zone_domains(void) { HKEY domains; DWORD res, i; @@ -771,6 +771,12 @@ static void register_zone_domains(void) DWORD zone = URLZONE_CUSTOM; res = RegCreateKeyA(domains, "local.machine", &domain); + if (res == ERROR_ACCESS_DENIED) + { + skip("need admin rights\n"); + RegCloseKey(domains); + return FALSE; + } ok(res == ERROR_SUCCESS, "RegCreateKey failed: %d\n", res); res = RegSetValueExA(domain, "http", 0, REG_DWORD, (BYTE*)&zone, sizeof(DWORD)); @@ -810,6 +816,7 @@ static void register_zone_domains(void) } RegCloseKey(domains); + return TRUE; } static void unregister_zone_domains(void) @@ -964,7 +971,7 @@ static void test_zone_domains(void) test_zone_domain_cache(); - register_zone_domains(); + if (!register_zone_domains()) return; run_child_process(); unregister_zone_domains(); }

1 0

Hans Leidekker : setupapi/tests: Skip devinst tests if the user doesn' t have admin rights.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: master Commit: 162a40e1455725501e0f55c36fec2d32ecc612fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=162a40e1455725501e0f55c36… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 19 11:38:52 2016 +0100 setupapi/tests: Skip devinst tests if the user doesn't have admin rights. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index c8452d6..6ca0e92 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1349,8 +1349,17 @@ static void testSetupDiGetINFClassA(void) START_TEST(devinst) { + HKEY hkey; + init_function_pointers(); + if ((hkey = SetupDiOpenClassRegKey(NULL, KEY_ALL_ACCESS)) == INVALID_HANDLE_VALUE) + { + skip("needs admin rights\n"); + return; + } + RegCloseKey(hkey); + if (pIsWow64Process) pIsWow64Process(GetCurrentProcess(), &is_wow64);

1 0

Aric Stewart : hidclass.sys: Do not use device after free.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: master Commit: 3af89f1d96f74e81f159a3a6b3deb2c5cb69e42a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3af89f1d96f74e81f159a3a6b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Sat Dec 17 12:21:11 2016 -0600 hidclass.sys: Do not use device after free. Spotted by Marcus Meissner (Coverity issue 1372459). Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/pnp.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/pnp.c b/dlls/hidclass.sys/pnp.c index 5df7692..b92457f 100644 --- a/dlls/hidclass.sys/pnp.c +++ b/dlls/hidclass.sys/pnp.c @@ -255,8 +255,9 @@ NTSTATUS WINAPI HID_PNP_Dispatch(DEVICE_OBJECT *device, IRP *irp) } case IRP_MN_REMOVE_DEVICE: { + rc = minidriver->PNPDispatch(device, irp); HID_DeleteDevice(&minidriver->minidriver, device); - return minidriver->PNPDispatch(device, irp); + return rc; } default: {

1 0

Józef Kucia : d3d11/tests: Skip test_depth_stencil_sampling() on AMD Windows drivers.
by Alexandre Julliard Dec. 19, 2016

Dec. 19, 2016

Module: wine Branch: master Commit: 6d5048d5602baeb13eeaf560561d92284d5dd34e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6d5048d5602baeb13eeaf5605… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Dec 18 00:22:28 2016 +0100 d3d11/tests: Skip test_depth_stencil_sampling() on AMD Windows drivers. 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/d3d11/tests/d3d11.c | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 98aaa4a..1957ad3 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -962,9 +962,8 @@ static ID3D11Device *create_device(const struct device_desc *desc) return NULL; } -static BOOL is_warp_device(ID3D11Device *device) +static void get_device_adapter_desc(ID3D11Device *device, DXGI_ADAPTER_DESC *adapter_desc) { - DXGI_ADAPTER_DESC adapter_desc; IDXGIDevice *dxgi_device; IDXGIAdapter *adapter; HRESULT hr; @@ -974,15 +973,31 @@ static BOOL is_warp_device(ID3D11Device *device) hr = IDXGIDevice_GetAdapter(dxgi_device, &adapter); ok(SUCCEEDED(hr), "Failed to get adapter, hr %#x.\n", hr); IDXGIDevice_Release(dxgi_device); - hr = IDXGIAdapter_GetDesc(adapter, &adapter_desc); + hr = IDXGIAdapter_GetDesc(adapter, adapter_desc); ok(SUCCEEDED(hr), "Failed to get adapter desc, hr %#x.\n", hr); IDXGIAdapter_Release(adapter); +} +static BOOL is_warp_device(ID3D11Device *device) +{ + DXGI_ADAPTER_DESC adapter_desc; + get_device_adapter_desc(device, &adapter_desc); return !adapter_desc.SubSysId && !adapter_desc.Revision && ((!adapter_desc.VendorId && !adapter_desc.DeviceId) || (adapter_desc.VendorId == 0x1414 && adapter_desc.DeviceId == 0x008c)); } +static BOOL is_amd_device(ID3D11Device *device) +{ + DXGI_ADAPTER_DESC adapter_desc; + + if (!strcmp(winetest_platform, "wine")) + return FALSE; + + get_device_adapter_desc(device, &adapter_desc); + return adapter_desc.VendorId == 0x1002; +} + static IDXGISwapChain *create_swapchain(ID3D11Device *device, HWND window, const struct swapchain_desc *swapchain_desc) { DXGI_SWAP_CHAIN_DESC dxgi_desc; @@ -6442,6 +6457,14 @@ static void test_depth_stencil_sampling(void) device = test_context.device; context = test_context.immediate_context; + if (is_amd_device(device)) + { + /* Reads from depth/stencil shader resource views return stale values on some AMD drivers. */ + win_skip("Some AMD drivers have a bug affecting the test.\n"); + release_test_context(&test_context); + return; + } + sampler_desc.Filter = D3D11_FILTER_COMPARISON_MIN_MAG_MIP_POINT; sampler_desc.AddressU = D3D11_TEXTURE_ADDRESS_CLAMP; sampler_desc.AddressV = D3D11_TEXTURE_ADDRESS_CLAMP;

1 0