December 2016 - Wine-commits

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

19 Dec '16

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

Hans Leidekker : advpack/tests: Skip inf install tests if the user doesn' t have admin rights.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: master Commit: ea7c86a715a25b779bd536976a1f0a78cf5b2962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea7c86a715a25b779bd536976… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Dec 19 11:38:49 2016 +0100 advpack/tests: Skip inf install 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/advpack/tests/advpack.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/advpack/tests/advpack.c b/dlls/advpack/tests/advpack.c index f7ac66b..d595876 100644 --- a/dlls/advpack/tests/advpack.c +++ b/dlls/advpack/tests/advpack.c @@ -337,7 +337,7 @@ static void translateinfstringex_test(void) } create_inf_file(); - + /* need to see if there are any flags */ /* try a NULL filename */ @@ -424,6 +424,12 @@ static void translateinfstringex_test(void) /* open the inf with the install section */ hr = pOpenINFEngine(inf_file, "section", 0, &hinf, NULL); + if (hr == E_FAIL) + { + skip("can't open engine with install section (needs admin rights)\n"); + DeleteFileA(inf_file); + return; + } ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); /* translate the string with the install section specified */

1 0

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

19 Dec '16

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

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

19 Dec '16

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 : setupapi/tests: Skip devinst tests if the user doesn' t have admin rights.
by Alexandre Julliard 19 Dec '16

19 Dec '16

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

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

19 Dec '16

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 : wintrust/tests: Fix test failures on Windows 8.1 and 10.
by Alexandre Julliard 19 Dec '16

19 Dec '16

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

Hugh McMaster : regedit: Load Binary editor from context menu.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: master Commit: dc6e2eaf09be532daaee68582744c27dca52e7dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc6e2eaf09be532daaee68582… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Mon Dec 19 10:10:55 2016 +0000 regedit: Load Binary editor from context menu. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 0a56f94..b1611cf 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -730,6 +730,7 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) break; } case ID_EDIT_MODIFY: + case ID_EDIT_MODIFY_BIN: { LPCWSTR valueName = GetValueName(g_pChildWnd->hListWnd); WCHAR* keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot);

1 0

Nikolay Sivov : gdiplus/tests: Test for initial properties of adjustable arrow caps.
by Alexandre Julliard 19 Dec '16

19 Dec '16

Module: wine Branch: master Commit: 134cb70fed15e55b3461808fb5244371bb54dce1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=134cb70fed15e55b3461808fb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 16 15:21:12 2016 +0300 gdiplus/tests: Test for initial properties of adjustable arrow caps. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/customlinecap.c | 51 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/gdiplus/tests/customlinecap.c b/dlls/gdiplus/tests/customlinecap.c index f70c134..c2a1dab 100644 --- a/dlls/gdiplus/tests/customlinecap.c +++ b/dlls/gdiplus/tests/customlinecap.c @@ -217,6 +217,56 @@ static void test_scale(void) GdipDeletePath(path); } +static void test_create_adjustable_cap(void) +{ + GpAdjustableArrowCap *cap; + REAL inset, scale; + GpLineJoin join; + GpStatus stat; + GpLineCap base; + + stat = GdipCreateAdjustableArrowCap(10.0, 10.0, TRUE, NULL); +todo_wine + ok(stat == InvalidParameter, "Unexpected return code, %d\n", stat); + + stat = GdipCreateAdjustableArrowCap(17.0, 15.0, TRUE, &cap); +todo_wine + ok(stat == Ok, "Failed to create adjustable cap, %d\n", stat); + if (stat != Ok) + return; + + stat = GdipGetAdjustableArrowCapMiddleInset(cap, NULL); + ok(stat == InvalidParameter, "Unexpected return code, %d\n", stat); + + stat = GdipGetAdjustableArrowCapMiddleInset(cap, &inset); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + ok(inset == 0.0f, "Unexpected middle inset %f\n", inset); + + stat = GdipGetCustomLineCapBaseCap((GpCustomLineCap*)cap, &base); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + ok(base == LineCapTriangle, "Unexpected base cap %d\n", base); + + stat = GdipSetCustomLineCapBaseCap((GpCustomLineCap*)cap, LineCapSquare); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + + stat = GdipGetCustomLineCapBaseCap((GpCustomLineCap*)cap, &base); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + ok(base == LineCapSquare, "Unexpected base cap %d\n", base); + + stat = GdipGetCustomLineCapBaseInset((GpCustomLineCap*)cap, &inset); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + + stat = GdipGetCustomLineCapWidthScale((GpCustomLineCap*)cap, &scale); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + ok(scale == 1.0f, "Unexpected width scale %f\n", scale); + + stat = GdipGetCustomLineCapStrokeJoin((GpCustomLineCap*)cap, &join); + ok(stat == Ok, "Unexpected return code, %d\n", stat); + ok(join == LineJoinMiter, "Unexpected stroke join %d\n", join); + + GdipDeleteCustomLineCap((GpCustomLineCap*)cap); +} + START_TEST(customlinecap) { struct GdiplusStartupInput gdiplusStartupInput; @@ -233,6 +283,7 @@ START_TEST(customlinecap) test_linejoin(); test_inset(); test_scale(); + test_create_adjustable_cap(); GdiplusShutdown(gdiplusToken); }

1 0

Alex Henrie : po: Update Catalan translation.
by Alexandre Julliard 19 Dec '16

19 Dec '16

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