September 2019 - Wine-Devel

[PATCH 4/6] vbscript: Add Hour function implementation.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/global.c | 9 +++++++-- dlls/vbscript/tests/api.vbs | 3 +++ 2 files changed, 10 insertions(+), 2 deletions(-)

Sept. 30, 2019

[PATCH 3/6] vbscript: Add Year function implementation.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/global.c | 9 +++++++-- dlls/vbscript/tests/api.vbs | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-)

Sept. 30, 2019

[PATCH 2/6] vbscript: Add Month function implementation.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/global.c | 9 +++++++-- dlls/vbscript/tests/api.vbs | 4 +++- 2 files changed, 10 insertions(+), 3 deletions(-)

Sept. 30, 2019

[PATCH 1/6] vbscript: Add Day function implementation.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/vbscript/global.c | 22 ++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 3 +++ 2 files changed, 23 insertions(+), 2 deletions(-)

Sept. 30, 2019

[PATCH] xinput: Check for NULL argument in XInputGetState

by Andrew Eikum

Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> --- dlls/xinput1_3/tests/xinput.c | 3 +++ dlls/xinput1_3/xinput_main.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/dlls/xinput1_3/tests/xinput.c b/dlls/xinput1_3/tests/xinput.c index e5eb504d522..a6e2107446c 100644 --- a/dlls/xinput1_3/tests/xinput.c +++ b/dlls/xinput1_3/tests/xinput.c @@ -126,6 +126,9 @@ static void test_get_state(void) } } + result = pXInputGetState(0, NULL); + ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result); + result = pXInputGetState(XUSER_MAX_COUNT, &state); ok(result == ERROR_BAD_ARGUMENTS, "XInputGetState returned (%d)\n", result); diff --git a/dlls/xinput1_3/xinput_main.c b/dlls/xinput1_3/xinput_main.c index 57337e09ad9..a417fec7ad1 100644 --- a/dlls/xinput1_3/xinput_main.c +++ b/dlls/xinput1_3/xinput_main.c @@ -88,6 +88,9 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputSetState(DWORD index, XINPUT_VIBRATION* vib * XInputGetState() in the hook, so we need a wrapper. */ static DWORD xinput_get_state(DWORD index, XINPUT_STATE *state) { + if (!state) + return ERROR_BAD_ARGUMENTS; + HID_find_gamepads(controllers); if (index >= XUSER_MAX_COUNT) -- 2.23.0

Sept. 30, 2019

Re: [PATCH v2] ntdll: Add exception handling around DbgBreakPoint.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=57152 Your paranoid android. === w7u (32 bit report) === kernel32: debugger.c:1427: Test failed: unexpected instruction pointer 77986074 === w1064v1809 (64 bit report) === kernel32: debugger.c:1427: Test failed: unexpected instruction pointer 00007FFC9194F844 === debian10 (32 bit report) === kernel32: debugger.c:320: Test failed: GetThreadContext failed: 5 === debian10 (32 bit Chinese:China report) === kernel32: debugger.c:320: Test failed: GetThreadContext failed: 5 debugger.c:320: Test failed: GetThreadContext failed: 5 debugger.c:320: Test failed: GetThreadContext failed: 5 debugger.c:320: Test failed: GetThreadContext failed: 5 === debian10 (32 bit WoW report) === kernel32: debugger.c:320: Test failed: GetThreadContext failed: 5 debugger.c:320: Test failed: GetThreadContext failed: 5 debugger.c:320: Test failed: GetThreadContext failed: 5 debugger.c:320: Test failed: GetThreadContext failed: 5 debugger.c:320: Test failed: GetThreadContext failed: 5 === debian10 (64 bit WoW report) === kernel32: debugger.c:320: Test failed: GetThreadContext failed: 5

Sept. 30, 2019

[PATCH] kernel32/tests: Fix some console tests on newer Win10.

by Gijs Vermeulen

Signed-off-by: Gijs Vermeulen <gijsvrm(a)codeweavers.com> --- dlls/kernel32/tests/console.c | 43 ++++++++++++++++++++--------------- 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/dlls/kernel32/tests/console.c b/dlls/kernel32/tests/console.c index acd61d078b..f85cd44ca7 100644 --- a/dlls/kernel32/tests/console.c +++ b/dlls/kernel32/tests/console.c @@ -819,9 +819,8 @@ static void testScreenBuffer(HANDLE hConOut) /* Trying to set SB handles with various access modes */ SetLastError(0); ok(!SetConsoleActiveScreenBuffer(hConOutRO), "Shouldn't succeed\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, - "GetLastError: expecting %u got %u\n", - ERROR_INVALID_HANDLE, GetLastError()); + ok(GetLastError() == ERROR_INVALID_HANDLE || broken(GetLastError() == ERROR_ACCESS_DENIED) /* win10 1809 */, + "unexpected last error %u\n", GetLastError()); ok(SetConsoleActiveScreenBuffer(hConOutWT), "Couldn't set new WriteOnly SB\n"); @@ -2744,9 +2743,13 @@ static void test_GetConsoleFontSize(HANDLE std_output) memset(&c, 10, sizeof(COORD)); SetLastError(0xdeadbeef); c = GetConsoleFontSize(std_output, index); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %u, expected 87\n", GetLastError()); - ok(!c.X, "got %d, expected 0\n", c.X); - ok(!c.Y, "got %d, expected 0\n", c.Y); + ok(GetLastError() == ERROR_INVALID_PARAMETER || broken(GetLastError() == 0xdeadbeef) /* win10 1809 */, + "unexpected last error %u\n", GetLastError()); + if (GetLastError() == ERROR_INVALID_PARAMETER) + { + ok(!c.X, "got %d, expected 0\n", c.X); + ok(!c.Y, "got %d, expected 0\n", c.Y); + } } static void test_GetLargestConsoleWindowSize(HANDLE std_output) @@ -2884,12 +2887,14 @@ static void test_GetConsoleFontInfo(HANDLE std_output) memset(cfi, 0, memsize); ret = pGetConsoleFontInfo(std_output, FALSE, num_fonts, cfi); - todo_wine ok(ret, "got %d, expected non-zero\n", ret); - - todo_wine ok(cfi[index].dwFontSize.X == win_width, "got %d, expected %d\n", - cfi[index].dwFontSize.X, win_width); - todo_wine ok(cfi[index].dwFontSize.Y == win_height, "got %d, expected %d\n", - cfi[index].dwFontSize.Y, win_height); + todo_wine ok(ret || broken(!ret) /* win10 1809 */, "got %d, expected non-zero\n", ret); + if (ret) + { + todo_wine ok(cfi[index].dwFontSize.X == win_width, "got %d, expected %d\n", + cfi[index].dwFontSize.X, win_width); + todo_wine ok(cfi[index].dwFontSize.Y == win_height, "got %d, expected %d\n", + cfi[index].dwFontSize.Y, win_height); + } for (i = 0; i < num_fonts; i++) { @@ -2918,12 +2923,14 @@ static void test_GetConsoleFontInfo(HANDLE std_output) memset(cfi, 0, memsize); ret = pGetConsoleFontInfo(std_output, TRUE, num_fonts, cfi); - todo_wine ok(ret, "got %d, expected non-zero\n", ret); - - todo_wine ok(cfi[index].dwFontSize.X == csbi.dwMaximumWindowSize.X, "got %d, expected %d\n", - cfi[index].dwFontSize.X, csbi.dwMaximumWindowSize.X); - todo_wine ok(cfi[index].dwFontSize.Y == csbi.dwMaximumWindowSize.Y, "got %d, expected %d\n", - cfi[index].dwFontSize.Y, csbi.dwMaximumWindowSize.Y); + todo_wine ok(ret || broken(!ret) /* win10 1809 */, "got %d, expected non-zero\n", ret); + if (ret) + { + todo_wine ok(cfi[index].dwFontSize.X == csbi.dwMaximumWindowSize.X, "got %d, expected %d\n", + cfi[index].dwFontSize.X, csbi.dwMaximumWindowSize.X); + todo_wine ok(cfi[index].dwFontSize.Y == csbi.dwMaximumWindowSize.Y, "got %d, expected %d\n", + cfi[index].dwFontSize.Y, csbi.dwMaximumWindowSize.Y); + } for (i = 0; i < num_fonts; i++) { -- 2.23.0

Sept. 30, 2019

[PATCH 2/2] msvcrt: Add wcrtomb_s tests.

by Piotr Caban

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/string.c | 40 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)

Sept. 30, 2019

[PATCH 1/2] msvcrt: Add wcrtomb_s implementation.

by Piotr Caban

Sept. 30, 2019

Re: [PATCH 1/6] vkd3d: Enable MSVC to compile.

by Chip Davis

September 30, 2019 9:17 AM, "Hans-Kristian Arntzen" <post(a)arntzen-software.no> wrote: > diff --git a/include/private/vkd3d_common.h b/include/private/vkd3d_common.h > index 1ac8a63..fab0cd4 100644 > --- a/include/private/vkd3d_common.h > +++ b/include/private/vkd3d_common.h > @@ -78,7 +84,11 @@ static inline bool vkd3d_bitmask_is_contiguous(unsigned int mask) > /* Undefined for x == 0. */ > static inline unsigned int vkd3d_log2i(unsigned int x) > { > -#ifdef HAVE_BUILTIN_CLZ > +#ifdef _MSC_VER > + unsigned long result; > + _BitScanReverse(&result, x); > + return (unsigned int)x; Are you sure this is correct? > diff --git a/include/private/vkd3d_threads.h b/include/private/vkd3d_threads.h > new file mode 100644 > index 0000000..b613b50 > --- /dev/null > +++ b/include/private/vkd3d_threads.h > @@ -0,0 +1,166 @@ [...] > +typedef struct pthread_mutex > +{ > + CRITICAL_SECTION *lock; > +} pthread_mutex_t; > + > +typedef struct pthread_cond > +{ > + CONDITION_VARIABLE *cond; > +} pthread_cond_t; Why not simply store the objects directly in the struct, instead of allocating them on the heap? [...] > +static DWORD WINAPI win32_thread_wrapper_routine(struct vkd3d_pthread_wrapper_struct *wrapper) > +{ > + struct vkd3d_pthread_wrapper_struct tmp = *wrapper; > + vkd3d_free(wrapper); I get why this is on the heap--if it were on the stack, then if pthread_create() returns before the new thread can access the struct, the new thread may end up using garbage. But I can't help thinking there has to be another way. Chip

Sept. 30, 2019