wine-commits November 2017

wine-commits@winehq.org

2 participants
436 discussions

Kimmo Myllyvirta : xaudio2: Add support for float formats with more than 2 channels.
by Alexandre Julliard 13 Nov '17

13 Nov '17

Module: wine Branch: master Commit: 8b94c5b51c2c706dd8fa42cec4631f386f3a8562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8b94c5b51c2c706dd8fa42cec… Author: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Date: Sun Nov 12 12:35:34 2017 +0200 xaudio2: Add support for float formats with more than 2 channels. Signed-off-by: Kimmo Myllyvirta <kimmo.myllyvirta(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/xaudio_dll.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/xaudio2_7/xaudio_dll.c b/dlls/xaudio2_7/xaudio_dll.c index a091629..13f5916 100644 --- a/dlls/xaudio2_7/xaudio_dll.c +++ b/dlls/xaudio2_7/xaudio_dll.c @@ -499,6 +499,14 @@ static ALenum get_al_format(const WAVEFORMATEX *fmt) return AL_FORMAT_MONO_FLOAT32; case 2: return AL_FORMAT_STEREO_FLOAT32; + case 4: + return AL_FORMAT_QUAD32; + case 6: + return AL_FORMAT_51CHN32; + case 7: + return AL_FORMAT_61CHN32; + case 8: + return AL_FORMAT_71CHN32; } } }

1 0

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

13 Nov '17

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

Andrey Semakin : winemine: Add confirmation to reset results button.
by Alexandre Julliard 13 Nov '17

13 Nov '17

Module: wine Branch: master Commit: 247faa857fff9e929c5c7e74859af38aa889035f URL: http://source.winehq.org/git/wine.git/?a=commit;h=247faa857fff9e929c5c7e748… Author: Andrey Semakin <and-semakin(a)ya.ru> Date: Sat Nov 11 00:24:03 2017 +0100 winemine: Add confirmation to reset results button. Signed-off-by: Andrey Semakin <and-semakin(a)ya.ru> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ar.po | 54 +++++++++++++++++++++++-------------------- po/bg.po | 54 +++++++++++++++++++++++-------------------- po/ca.po | 54 +++++++++++++++++++++++-------------------- po/cs.po | 54 +++++++++++++++++++++++-------------------- po/da.po | 54 +++++++++++++++++++++++-------------------- po/de.po | 54 +++++++++++++++++++++++-------------------- po/el.po | 54 +++++++++++++++++++++++-------------------- po/en.po | 54 +++++++++++++++++++++++-------------------- po/en_US.po | 54 +++++++++++++++++++++++-------------------- po/eo.po | 54 +++++++++++++++++++++++-------------------- po/es.po | 54 +++++++++++++++++++++++-------------------- po/fa.po | 54 +++++++++++++++++++++++-------------------- po/fi.po | 54 +++++++++++++++++++++++-------------------- po/fr.po | 54 +++++++++++++++++++++++-------------------- po/he.po | 54 +++++++++++++++++++++++-------------------- po/hi.po | 54 +++++++++++++++++++++++-------------------- po/hr.po | 54 +++++++++++++++++++++++-------------------- po/hu.po | 54 +++++++++++++++++++++++-------------------- po/it.po | 54 +++++++++++++++++++++++-------------------- po/ja.po | 54 +++++++++++++++++++++++-------------------- po/ko.po | 54 +++++++++++++++++++++++-------------------- po/lt.po | 54 +++++++++++++++++++++++-------------------- po/ml.po | 54 +++++++++++++++++++++++-------------------- po/nb_NO.po | 54 +++++++++++++++++++++++-------------------- po/nl.po | 54 +++++++++++++++++++++++-------------------- po/or.po | 54 +++++++++++++++++++++++-------------------- po/pa.po | 54 +++++++++++++++++++++++-------------------- po/pl.po | 54 +++++++++++++++++++++++-------------------- po/pt_BR.po | 54 +++++++++++++++++++++++-------------------- po/pt_PT.po | 54 +++++++++++++++++++++++-------------------- po/rm.po | 54 +++++++++++++++++++++++-------------------- po/ro.po | 54 +++++++++++++++++++++++-------------------- po/ru.po | 54 +++++++++++++++++++++++-------------------- po/sk.po | 54 +++++++++++++++++++++++-------------------- po/sl.po | 54 +++++++++++++++++++++++-------------------- po/sr_RS(a)cyrillic.po | 54 +++++++++++++++++++++++-------------------- po/sr_RS(a)latin.po | 54 +++++++++++++++++++++++-------------------- po/sv.po | 54 +++++++++++++++++++++++-------------------- po/te.po | 54 +++++++++++++++++++++++-------------------- po/th.po | 54 +++++++++++++++++++++++-------------------- po/tr.po | 54 +++++++++++++++++++++++-------------------- po/uk.po | 54 +++++++++++++++++++++++-------------------- po/wa.po | 54 +++++++++++++++++++++++-------------------- po/wine.pot | 54 +++++++++++++++++++++++-------------------- po/zh_CN.po | 54 +++++++++++++++++++++++-------------------- po/zh_TW.po | 54 +++++++++++++++++++++++-------------------- programs/winemine/dialog.c | 8 +++++++ programs/winemine/resource.h | 3 +++ programs/winemine/winemine.rc | 8 ++++--- 49 files changed, 1350 insertions(+), 1153 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=247faa857fff9e929c5c7…

1 0

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

13 Nov '17

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 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

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

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: 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: 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: 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

← Newer
1
...
21
22
23
24
25
26
27
...
44
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits November 2017