November 2017 - Wine-Commits

Michael Müller : advapi32: Implement GetExplicitEntriesFromAclW.
by Alexandre Julliard Nov. 13, 2017

Nov. 13, 2017

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

Alexandre Julliard : kernel32: Also match script name when looking for a locale.
by Alexandre Julliard Nov. 13, 2017

Nov. 13, 2017

Module: wine Branch: master Commit: de7e687801e3e66c27c0b9822767e37f52d93c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de7e687801e3e66c27c0b9822… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Nov 13 19:04:04 2017 +0100 kernel32: Also match script name when looking for a locale. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 36 +++++++++++++++++++++++++++++++----- 1 file changed, 31 insertions(+), 5 deletions(-) diff --git a/dlls/kernel32/locale.c b/dlls/kernel32/locale.c index 64966e5..47d0c89 100644 --- a/dlls/kernel32/locale.c +++ b/dlls/kernel32/locale.c @@ -406,6 +406,24 @@ static BOOL CALLBACK find_locale_id_callback( HMODULE hModule, LPCWSTR type, if (strcmpiW( buffer, data->lang )) return TRUE; matches++; /* language name matched */ + if (data->script) + { + if (GetLocaleInfoW( lcid, LOCALE_SSCRIPTS | LOCALE_NOUSEROVERRIDE, + buffer, sizeof(buffer)/sizeof(WCHAR) )) + { + const WCHAR *p = buffer; + unsigned int len = strlenW( data->script ); + while (*p) + { + if (!strncmpiW( p, data->script, len ) && (!p[len] || p[len] == ';')) break; + if (!(p = strchrW( p, ';'))) goto done; + p++; + } + if (!*p) goto done; + matches++; /* script matched */ + } + } + if (data->country) { if (GetLocaleInfoW( lcid, LOCALE_SISO3166CTRYNAME|LOCALE_NOUSEROVERRIDE, @@ -489,16 +507,24 @@ static void parse_locale_name( const WCHAR *str, struct locale_name *name ) strcpyW( name->win_name, name->lang ); *p++ = 0; name->country = p; - if (!(p = strpbrkW( p, winsepW ))) goto done; - if (*p == '-') + if ((p = strpbrkW( p, winsepW )) && *p == '-') { *p++ = 0; name->script = name->country; name->country = p; - if (!(p = strpbrkW( p, winsepW ))) goto done; + p = strpbrkW( p, winsepW ); + } + if (p) + { + *p++ = 0; + name->modifier = p; + } + /* second value can be script or country, check length to resolve the ambiguity */ + if (!name->script && strlenW( name->country ) == 4) + { + name->script = name->country; + name->country = NULL; } - *p++ = 0; - name->modifier = p; } else /* Unix format */ {

1 0

Piotr Caban : msvcrt/tests: Rewrite clock() tests.
by Alexandre Julliard Nov. 13, 2017

Nov. 13, 2017

Module: wine Branch: master Commit: 20a11fd6ccef0bb3f96e86dc89a60e002a04b5c7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20a11fd6ccef0bb3f96e86dc8… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Nov 13 15:22:50 2017 +0100 msvcrt/tests: Rewrite clock() tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/time.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 6865e3d..bc1c6c8 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -875,18 +875,18 @@ static void test__tzset(void) static void test_clock(void) { - static const int THRESH = 50; - clock_t s, e; - int i; - - for (i = 0; i < 10; i++) - { - s = clock(); - Sleep(1000); - e = clock(); - - ok(abs((e-s) - 1000) < THRESH, "clock off on loop %i: %i\n", i, e-s); - } + static const int THRESH = 100; + FILETIME start, cur; + int c, expect; + + ok(GetProcessTimes(GetCurrentProcess(), &start, &cur, &cur, &cur), + "GetProcessTimes failed with error: %d\n", GetLastError()); + GetSystemTimeAsFileTime(&cur); + expect = (((LONGLONG)cur.dwHighDateTime<<32)+cur.dwLowDateTime - + ((LONGLONG)start.dwHighDateTime<<32)-start.dwLowDateTime) / 10000; + + c = clock(); + ok(abs(c-expect) < THRESH, "clock() = %d, expected %d\n", c, expect); } START_TEST(time)

1 0

Rafał Harabień : kernel32/tests: Check last error after successful Tls/FlsGetValue calls.
by Alexandre Julliard Nov. 13, 2017

Nov. 13, 2017

Module: wine Branch: master Commit: 56424c5b6fdabc59de188a1971d17beccfff73b2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56424c5b6fdabc59de188a197… Author: Rafał Harabień <rafalh1992(a)o2.pl> Date: Mon Nov 13 00:32:19 2017 +0100 kernel32/tests: Check last error after successful Tls/FlsGetValue calls. Signed-off-by: Rafał Harabień <rafalh1992(a)o2.pl> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/thread.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/kernel32/tests/thread.c b/dlls/kernel32/tests/thread.c index 334bdf4..5918a58 100644 --- a/dlls/kernel32/tests/thread.c +++ b/dlls/kernel32/tests/thread.c @@ -1325,10 +1325,12 @@ static DWORD WINAPI LS_ThreadProc(LPVOID p) ok(LS_index0 != LS_index1, "%s failed\n", LS_AllocFuncName); /* Both slots should be initialized to NULL */ + SetLastError(0xdeadbeef); val = LS_GetValueFunc(LS_index0); ok(GetLastError() == ERROR_SUCCESS, "%s failed\n", LS_GetValueFuncName); ok(val == NULL, "Slot not initialized correctly\n"); + SetLastError(0xdeadbeef); val = LS_GetValueFunc(LS_index1); ok(GetLastError() == ERROR_SUCCESS, "%s failed\n", LS_GetValueFuncName); ok(val == NULL, "Slot not initialized correctly\n"); @@ -1337,10 +1339,12 @@ static DWORD WINAPI LS_ThreadProc(LPVOID p) if (sync_threads_and_run_one(0, id)) { + SetLastError(0xdeadbeef); val = LS_GetValueFunc(LS_index0); ok(GetLastError() == ERROR_SUCCESS, "%s failed\n", LS_GetValueFuncName); ok(val == NULL, "Slot not initialized correctly\n"); + SetLastError(0xdeadbeef); val = LS_GetValueFunc(LS_index1); ok(GetLastError() == ERROR_SUCCESS, "%s failed\n", LS_GetValueFuncName); ok(val == NULL, "Slot not initialized correctly\n"); @@ -1351,10 +1355,12 @@ static DWORD WINAPI LS_ThreadProc(LPVOID p) ret = LS_SetValueFunc(LS_index1, (LPVOID) 2); ok(ret, "%s failed\n", LS_SetValueFuncName); + SetLastError(0xdeadbeef); val = LS_GetValueFunc(LS_index0); ok(GetLastError() == ERROR_SUCCESS, "%s failed\n", LS_GetValueFuncName); ok(val == (LPVOID) 1, "Slot not initialized correctly\n"); + SetLastError(0xdeadbeef); val = LS_GetValueFunc(LS_index1); ok(GetLastError() == ERROR_SUCCESS, "%s failed\n", LS_GetValueFuncName); ok(val == (LPVOID) 2, "Slot not initialized correctly\n");

1 0

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

Nov. 13, 2017

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

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

Nov. 13, 2017

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

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

Nov. 13, 2017

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: Don't leave a stray test window behind.
by Alexandre Julliard Nov. 13, 2017

Nov. 13, 2017

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: Make WS_EX_TOPMOST tests more generic.
by Alexandre Julliard Nov. 13, 2017

Nov. 13, 2017

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: Separate WS_EX_TOPMOST tests from SetWindowPos ones.
by Alexandre Julliard Nov. 13, 2017

Nov. 13, 2017

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