November 2017 - Wine-commits

Michael Müller : advapi32: Implement GetExplicitEntriesFromAclW.
by Alexandre Julliard 13 Nov '17

13 Nov '17

Module: wine Branch: master Commit: 07b629e8e4472785809bcdf9820922c2b874c313 URL: http://source.winehq.org/git/wine.git/?a=commit;h=07b629e8e4472785809bcdf98… Author: Michael Müller <michael(a)fds-team.de> Date: Fri Nov 10 15:50:31 2017 -0600 advapi32: Implement GetExplicitEntriesFromAclW. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/security.c | 84 ++++++++++++++++++++++-- dlls/advapi32/tests/security.c | 142 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 222 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=07b629e8e4472785809bc…

1 0

Nikolay Sivov : quartz/tests: Add a couple of tests for return values ( Coverity).
by Alexandre Julliard 13 Nov '17

13 Nov '17

Module: wine Branch: master Commit: b356673d01c29b9cd283b42e86b78588e5ea4ee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b356673d01c29b9cd283b42e8… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 13 21:56:39 2017 +0300 quartz/tests: Add a couple of tests for return values (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplitter.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index 23167b5..8bafb14 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -422,8 +422,10 @@ static void test_filter_graph(void) } ok(hr == S_OK, "Could not create null renderer: %08x\n", hr); - IBaseFilter_EnumPins(pnull, &nullenum); - IEnumPins_Next(nullenum, 1, &nullpin, NULL); + hr = IBaseFilter_EnumPins(pnull, &nullenum); + ok(hr == S_OK, "Failed to enum pins, hr %#x.\n", hr); + hr = IEnumPins_Next(nullenum, 1, &nullpin, NULL); + ok(hr == S_OK, "Failed to get next pin, hr %#x.\n", hr); IEnumPins_Release(nullenum); IPin_QueryDirection(nullpin, &dir); @@ -489,7 +491,9 @@ fail2: if (dir == PINDIR_OUTPUT) { PIN_INFO info; - IPin_QueryPinInfo(to, &info); + + hr = IPin_QueryPinInfo(to, &info); + ok(hr == S_OK, "Failed to query pin info, hr %#x.\n", hr); /* Release twice: Once normal, second from the * previous while loop

1 0

Alex Henrie : libport: Fix typo in rintf.
by Alexandre Julliard 13 Nov '17

13 Nov '17

Module: wine Branch: master Commit: ef104c3a336661b72a7485adb3d98477e755f6c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ef104c3a336661b72a7485adb… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Mon Nov 13 14:16:48 2017 -0700 libport: Fix typo in rintf. Spotted by Joris Huizer. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/rint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/port/rint.c b/libs/port/rint.c index a99c00b..2c0d222 100644 --- a/libs/port/rint.c +++ b/libs/port/rint.c @@ -33,7 +33,7 @@ double rint(double x) #ifndef HAVE_RINTF float rintf(float x) { - return rintf(x); + return rint(x); } #endif

1 0

Marcus Meissner : ws2_32/tests: Avoid crashes on flaky/ non-present network.
by Alexandre Julliard 13 Nov '17

13 Nov '17

Module: wine Branch: master Commit: 0e18800f3955718dbf47a162810495e7ad4f477b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e18800f3955718dbf47a1628… Author: Marcus Meissner <meissner(a)suse.de> Date: Sun Nov 12 20:50:45 2017 +0100 ws2_32/tests: Avoid crashes on flaky/non-present network. Signed-off-by: Marcus Meissner <meissner(a)suse.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 179ace4..4cbc1e9 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7657,10 +7657,13 @@ static void test_GetAddrInfoExW(void) ok(overlapped.Internal == ERROR_SUCCESS, "overlapped.Internal = %lx\n", overlapped.Internal); ok(overlapped.Pointer == &result, "overlapped.Pointer != &result\n"); ok(result != NULL, "result == NULL\n"); - ok(!result->ai_blob, "ai_blob != NULL\n"); - ok(!result->ai_bloblen, "ai_bloblen != 0\n"); - ok(!result->ai_provider, "ai_provider = %s\n", wine_dbgstr_guid(result->ai_provider)); - pFreeAddrInfoExW(result); + if (result != NULL) + { + ok(!result->ai_blob, "ai_blob != NULL\n"); + ok(!result->ai_bloblen, "ai_bloblen != 0\n"); + ok(!result->ai_provider, "ai_provider = %s\n", wine_dbgstr_guid(result->ai_provider)); + pFreeAddrInfoExW(result); + } result = (void*)0xdeadbeef; memset(&overlapped, 0xcc, sizeof(overlapped));

1 0

Dmitry Timoshkov : user32/tests: Don't leave a stray test window behind.
by Alexandre Julliard 13 Nov '17

13 Nov '17

Module: wine Branch: master Commit: 5aafd080d1941904e3ae9ad1b0705cea973919f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5aafd080d1941904e3ae9ad1b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 13 18:11:56 2017 +0800 user32/tests: Don't leave a stray test window behind. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index feca2be..eace140 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -4932,6 +4932,7 @@ static void test_dialog_parent(void) ok(!IsWindowEnabled(other), "other is enabled\n"); EnableWindow(other, TRUE); + DestroyWindow(other); DestroyWindow(parent); }

1 0

Dmitry Timoshkov : user32/tests: Fix test failures under Windows.
by Alexandre Julliard 13 Nov '17

13 Nov '17

Module: wine Branch: master Commit: 825d2337b51420c3d5afdb96a349440399bcbd48 URL: http://source.winehq.org/git/wine.git/?a=commit;h=825d2337b51420c3d5afdb96a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 13 18:12:48 2017 +0800 user32/tests: Fix test failures under Windows. Without SetForegroundWindow() these tests fail in some testbot runs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index eace140..992fbf4 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2909,6 +2909,13 @@ static void test_popup_zorder(HWND hwnd_D, HWND hwnd_E, DWORD style) { HWND hwnd_A, hwnd_B, hwnd_C, hwnd_F; + /* Give current thread foreground state otherwise the tests may fail. */ + if (!SetForegroundWindow(hwnd_D)) + { + skip("SetForegroundWindow not working\n"); + return; + } + trace("hwnd_D %p, hwnd_E %p\n", hwnd_D, hwnd_E); SetWindowPos(hwnd_E, hwnd_D, 0,0,0,0, SWP_NOSIZE|SWP_NOMOVE|SWP_NOACTIVATE);

1 0

Dmitry Timoshkov : user32/tests: Separate WS_EX_TOPMOST tests from SetWindowPos ones.
by Alexandre Julliard 13 Nov '17

13 Nov '17

Module: wine Branch: master Commit: 91b09e0c5bbd17f0633331e40be4f83b47cfc982 URL: http://source.winehq.org/git/wine.git/?a=commit;h=91b09e0c5bbd17f0633331e40… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 13 18:13:46 2017 +0800 user32/tests: Separate WS_EX_TOPMOST tests from SetWindowPos ones. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 28 +++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 992fbf4..fdfdf92 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2573,17 +2573,6 @@ static void test_SetWindowPos(HWND hwnd, HWND hwnd2) orig_win_rc.right, orig_win_rc.bottom, 0); ok(ret, "Got %d\n", ret); - ok(!(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST), "WS_EX_TOPMOST should not be set\n"); - ret = SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); - ok(ret, "Got %d\n", ret); - ok(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST, "WS_EX_TOPMOST should be set\n"); - ret = SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); - ok(ret, "Got %d\n", ret); - ok(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST, "WS_EX_TOPMOST should be set\n"); - ret = SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); - ok(ret, "Got %d\n", ret); - ok(!(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST), "WS_EX_TOPMOST should not be set\n"); - hwnd_desktop = GetDesktopWindow(); ok(!!hwnd_desktop, "Failed to get hwnd_desktop window (%d).\n", GetLastError()); hwnd_child = create_tool_window(WS_VISIBLE|WS_CHILD, hwnd); @@ -9867,6 +9856,22 @@ static void test_desktop( void ) } } +static void test_topmost(HWND hwnd) +{ + BOOL ret; + + ok(!(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST), "WS_EX_TOPMOST should not be set\n"); + ret = SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + ok(ret, "Got %d\n", ret); + ok(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST, "WS_EX_TOPMOST should be set\n"); + ret = SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + ok(ret, "Got %d\n", ret); + ok(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST, "WS_EX_TOPMOST should be set\n"); + ret = SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + ok(ret, "Got %d\n", ret); + ok(!(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST), "WS_EX_TOPMOST should not be set\n"); +} + START_TEST(win) { char **argv; @@ -9944,6 +9949,7 @@ START_TEST(win) our_pid = GetWindowThreadProcessId(hwndMain, NULL); /* Add the tests below this line */ + test_topmost(hwndMain); test_child_window_from_point(); test_window_from_point(argv[0]); test_thick_child_size(hwndMain);

1 0

Dmitry Timoshkov : user32/tests: Make WS_EX_TOPMOST tests more generic.
by Alexandre Julliard 13 Nov '17

13 Nov '17

Module: wine Branch: master Commit: 82cf34562e661e513ace5579c9f884d8f5288154 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82cf34562e661e513ace5579c… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 13 18:14:30 2017 +0800 user32/tests: Make WS_EX_TOPMOST tests more generic. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 31 ++++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index fdfdf92..d9491f5 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -9856,20 +9856,29 @@ static void test_desktop( void ) } } -static void test_topmost(HWND hwnd) +static BOOL is_topmost(HWND hwnd) +{ + return (GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST) != 0; +} + +static void swp_after(HWND hwnd, HWND after) { BOOL ret; - ok(!(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST), "WS_EX_TOPMOST should not be set\n"); - ret = SetWindowPos(hwnd, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); - ok(ret, "Got %d\n", ret); - ok(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST, "WS_EX_TOPMOST should be set\n"); - ret = SetWindowPos(hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); - ok(ret, "Got %d\n", ret); - ok(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST, "WS_EX_TOPMOST should be set\n"); - ret = SetWindowPos(hwnd, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); - ok(ret, "Got %d\n", ret); - ok(!(GetWindowLongA(hwnd, GWL_EXSTYLE) & WS_EX_TOPMOST), "WS_EX_TOPMOST should not be set\n"); + ret = SetWindowPos(hwnd, after, 0, 0, 0, 0, SWP_NOSIZE|SWP_NOMOVE); + ok(ret, "SetWindowPos failed\n"); +} + +static void test_topmost(HWND hwnd) +{ + ok(!is_topmost(hwnd), "WS_EX_TOPMOST should not be set\n"); + + swp_after(hwnd, HWND_TOPMOST); + ok(is_topmost(hwnd), "WS_EX_TOPMOST should be set\n"); + swp_after(hwnd, HWND_TOP); + ok(is_topmost(hwnd), "WS_EX_TOPMOST should be set\n"); + swp_after(hwnd, HWND_NOTOPMOST); + ok(!is_topmost(hwnd), "WS_EX_TOPMOST should not be set\n"); } START_TEST(win)

1 0

Dmitry Timoshkov : user32/tests: Add a bunch of WS_EX_TOPMOST tests.
by Alexandre Julliard 13 Nov '17

13 Nov '17

Module: wine Branch: master Commit: ed7513f9c2570bfae46553a1a0d3d6e7d5bfcfde URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed7513f9c2570bfae46553a1a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Nov 13 18:15:31 2017 +0800 user32/tests: Add a bunch of WS_EX_TOPMOST tests. The tests most of the time pass cleanly here under MATE environment, but sometimes there are intermittent failures (like in some other tests) without visible reason, and another 'make test' runs cleanly again. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 381 +++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 375 insertions(+), 6 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ed7513f9c2570bfae4655…

1 0

Nikolay Sivov : uxtheme: Return NULL file handle on OpenThemeFile() failure.
by Alexandre Julliard 13 Nov '17

13 Nov '17

Module: wine Branch: master Commit: 3fd8a8f2095a0de132890423d8db8b994ac9c8ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=3fd8a8f2095a0de132890423d… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 13 13:49:20 2017 +0300 uxtheme: Return NULL file handle on OpenThemeFile() failure. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/uxtheme/msstyles.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/uxtheme/msstyles.c b/dlls/uxtheme/msstyles.c index 16cfbf5..e471c3c 100644 --- a/dlls/uxtheme/msstyles.c +++ b/dlls/uxtheme/msstyles.c @@ -188,6 +188,7 @@ HRESULT MSSTYLES_OpenThemeFile(LPCWSTR lpThemeFile, LPCWSTR pszColorName, LPCWST return S_OK; invalid_theme: + *tf = NULL; if(hTheme) FreeLibrary(hTheme); return hr; }

1 0