October 2019 - Wine-devel - list.winehq.org

[PATCH] vkd3d: Handle CPUPageProperty options for D3D12_HEAP_TYPE_CUSTOM.
by Conor McCarthy 23 Oct '19

23 Oct '19

Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/resource.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/resource.c b/libs/vkd3d/resource.c index 626772e..ddd8bfc 100644 --- a/libs/vkd3d/resource.c +++ b/libs/vkd3d/resource.c @@ -58,9 +58,19 @@ static unsigned int vkd3d_select_memory_type(struct d3d12_device *device, uint32 break; case D3D12_HEAP_TYPE_CUSTOM: - FIXME("Custom heaps not supported yet.\n"); - flags[count++] = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT - | VK_MEMORY_PROPERTY_HOST_CACHED_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; + switch (heap_properties->CPUPageProperty) + { + case D3D12_CPU_PAGE_PROPERTY_WRITE_COMBINE: + flags[count++] = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; + break; + default: + WARN("Invalid CPU page property.\n"); + /* Fall through. */ + case D3D12_CPU_PAGE_PROPERTY_WRITE_BACK: + flags[count++] = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT + | VK_MEMORY_PROPERTY_HOST_CACHED_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; + break; + } flags[count++] = VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT | VK_MEMORY_PROPERTY_HOST_COHERENT_BIT; flags[count++] = VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT; break; -- 2.23.0

2 1

[PATCH v2] user32/tests: Skip some tests with inconsistent results with non-us kbd.
by Rémi Bernon 23 Oct '19

23 Oct '19

See the same binary being tested twice here: * https://testbot.winehq.org/JobDetails.pl?Key=58277 * https://testbot.winehq.org/JobDetails.pl?Key=58278 Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v2: This was PATCH 4/4 of the previous series for user32/tests, it's now doing what it was supposed to do. It would be better to fix the inconsistencies, but in the meantime this creates noise on testbot. dlls/user32/tests/input.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 130ce49bb57..c5cf9556ede 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -284,6 +284,13 @@ static BOOL TestASet( HWND hWnd, int nrkev, const KEV kevdwn[], const KEV kevup[ int i,j,k,l,m,n; static int count=0; KEV kbuf[MAXKEYEVENTS]; + BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409); + if (!us_kbd) + { + win_skip( "skipping test with inconsistent results on non-us keyboard\n" ); + return TRUE; + } + assert( nrkev==2 || nrkev==3); for(i=0;i<MAXKEYEVENTS;i++) kbuf[i]=0; /* two keys involved gives 4 test cases */ @@ -1184,6 +1191,12 @@ static void test_Input_unicode(void) HHOOK hook; HMODULE hModuleImm32; BOOL (WINAPI *pImmDisableIME)(DWORD); + BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409); + if (!us_kbd) + { + win_skip( "skipping test with inconsistent results on non-us keyboard\n" ); + return; + } wclass.lpszClassName = classNameW; wclass.style = CS_HREDRAW | CS_VREDRAW; -- 2.24.0.rc0

2 1

[PATCH] vbscript: Replace custom buffer management code by BSTR based helper.
by Dmitry Timoshkov 23 Oct '19

23 Oct '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/vbscript/vbregexp.c | 76 +++++++++++++--------------------------- 1 file changed, 25 insertions(+), 51 deletions(-) diff --git a/dlls/vbscript/vbregexp.c b/dlls/vbscript/vbregexp.c index 4edf9dcbfe..50652da953 100644 --- a/dlls/vbscript/vbregexp.c +++ b/dlls/vbscript/vbregexp.c @@ -1433,45 +1433,14 @@ static HRESULT WINAPI RegExp2_Test(IRegExp2 *iface, BSTR sourceString, VARIANT_B return hres; } -typedef struct { - WCHAR *buf; - DWORD size; - DWORD len; -} strbuf_t; - -static BOOL strbuf_ensure_size(strbuf_t *buf, unsigned len) -{ - WCHAR *new_buf; - DWORD new_size; - - if(len <= buf->size) - return TRUE; - - new_size = buf->size ? buf->size<<1 : 16; - if(new_size < len) - new_size = len; - if(buf->buf) - new_buf = heap_realloc(buf->buf, new_size*sizeof(WCHAR)); - else - new_buf = heap_alloc(new_size*sizeof(WCHAR)); - if(!new_buf) - return FALSE; - - buf->buf = new_buf; - buf->size = new_size; - return TRUE; -} - -static HRESULT strbuf_append(strbuf_t *buf, const WCHAR *str, DWORD len) +static HRESULT bstrcat(BSTR *str, const WCHAR *append, unsigned int len) { - if(!len) - return S_OK; + unsigned int old_len = SysStringLen(*str); - if(!strbuf_ensure_size(buf, buf->len+len)) + if (!SysReAllocStringLen(str, NULL, old_len + len)) return E_OUTOFMEMORY; - memcpy(buf->buf+buf->len, str, len*sizeof(WCHAR)); - buf->len += len; + memcpy(*str + old_len, append, len * sizeof(WCHAR)); return S_OK; } @@ -1480,11 +1449,10 @@ static HRESULT WINAPI RegExp2_Replace(IRegExp2 *iface, BSTR source, VARIANT repl RegExp2 *This = impl_from_IRegExp2(iface); const WCHAR *cp, *prev_cp = NULL, *ptr, *prev_ptr; size_t match_len = 0, source_len, replace_len; - strbuf_t buf = { NULL, 0, 0 }; match_state_t *state = NULL; heap_pool_t *mark; VARIANT strv; - BSTR replace; + BSTR replace, buf; HRESULT hres; TRACE("(%p)->(%s %s %p)\n", This, debugstr_w(source), debugstr_variant(&replaceVar), ret); @@ -1515,6 +1483,10 @@ static HRESULT WINAPI RegExp2_Replace(IRegExp2 *iface, BSTR source, VARIANT repl if(This->regexp && !(state = alloc_match_state(This->regexp, &This->pool, cp))) hres = E_OUTOFMEMORY; + buf = SysAllocString(L""); + if(!buf) + hres = E_OUTOFMEMORY; + while(SUCCEEDED(hres)) { if(This->regexp) { prev_cp = cp; @@ -1530,38 +1502,38 @@ static HRESULT WINAPI RegExp2_Replace(IRegExp2 *iface, BSTR source, VARIANT repl prev_cp = cp; } - hres = strbuf_append(&buf, prev_cp, cp - prev_cp - match_len); + hres = bstrcat(&buf, prev_cp, cp - prev_cp - match_len); if(FAILED(hres)) break; prev_ptr = replace; while((ptr = wmemchr(prev_ptr, '$', replace + replace_len - prev_ptr))) { - hres = strbuf_append(&buf, prev_ptr, ptr - prev_ptr); + hres = bstrcat(&buf, prev_ptr, ptr - prev_ptr); if(FAILED(hres)) break; switch(ptr[1]) { case '$': - hres = strbuf_append(&buf, ptr, 1); + hres = bstrcat(&buf, ptr, 1); prev_ptr = ptr + 2; break; case '&': - hres = strbuf_append(&buf, cp - match_len, match_len); + hres = bstrcat(&buf, cp - match_len, match_len); prev_ptr = ptr + 2; break; case '`': - hres = strbuf_append(&buf, source, cp - source - match_len); + hres = bstrcat(&buf, source, cp - source - match_len); prev_ptr = ptr + 2; break; case '\'': - hres = strbuf_append(&buf, cp, source + source_len - cp); + hres = bstrcat(&buf, cp, source + source_len - cp); prev_ptr = ptr + 2; break; default: { DWORD idx; if(!iswdigit(ptr[1])) { - hres = strbuf_append(&buf, ptr, 1); + hres = bstrcat(&buf, ptr, 1); prev_ptr = ptr + 1; break; } @@ -1573,13 +1545,13 @@ static HRESULT WINAPI RegExp2_Replace(IRegExp2 *iface, BSTR source, VARIANT repl }else if(idx && idx <= state->paren_count) { prev_ptr = ptr + 2; }else { - hres = strbuf_append(&buf, ptr, 1); + hres = bstrcat(&buf, ptr, 1); prev_ptr = ptr + 1; break; } if(state->parens[idx - 1].index != -1) - hres = strbuf_append(&buf, source + state->parens[idx - 1].index, + hres = bstrcat(&buf, source + state->parens[idx - 1].index, state->parens[idx - 1].length); break; } @@ -1588,7 +1560,7 @@ static HRESULT WINAPI RegExp2_Replace(IRegExp2 *iface, BSTR source, VARIANT repl break; } if(SUCCEEDED(hres)) - hres = strbuf_append(&buf, prev_ptr, replace + replace_len - prev_ptr); + hres = bstrcat(&buf, prev_ptr, replace + replace_len - prev_ptr); if(FAILED(hres)) break; @@ -1597,13 +1569,15 @@ static HRESULT WINAPI RegExp2_Replace(IRegExp2 *iface, BSTR source, VARIANT repl } if(SUCCEEDED(hres)) { - hres = strbuf_append(&buf, cp, source + source_len - cp); - if(SUCCEEDED(hres) && !(*ret = SysAllocStringLen(buf.buf, buf.len))) - hres = E_OUTOFMEMORY; + hres = bstrcat(&buf, cp, source + source_len - cp); + if(SUCCEEDED(hres)) + *ret = buf; } + if(FAILED(hres)) + SysFreeString(buf); + heap_pool_clear(mark); - heap_free(buf.buf); SysFreeString(replace); return hres; } -- 2.20.1

2 2

[PATCH 1/4] user32/tests: Update input test result for w1064v1809.
by Rémi Bernon 23 Oct '19

23 Oct '19

Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/user32/tests/input.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index d0dc4a8bcf3..d768e64cdc1 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1409,7 +1409,9 @@ static void test_mouse_ll_hook(void) ok(pt_old.x == 149 && pt_old.y == 149, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); mouse_event(MOUSEEVENTF_MOVE, 0, 0, 0, 0); GetCursorPos(&pt_old); - ok(pt_old.x == 150 && pt_old.y == 150, "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); + ok((pt_old.x == 150 && pt_old.y == 150) || + broken(pt_old.x == 149 && pt_old.y == 149) /* w1064v1809 */, + "Wrong new pos: (%d,%d)\n", pt_old.x, pt_old.y); mouse_event(MOUSEEVENTF_MOVE, 0, 0, 0, 0); GetCursorPos(&pt_old); todo_wine -- 2.24.0.rc0

2 7

[PATCH v2] setupapi/tests: Get rid of variables holding empty strings
by Vijay Kiran Kamuju 23 Oct '19

23 Oct '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/setupapi/tests/diskspace.c | 10 ++++------ dlls/setupapi/tests/setupcab.c | 5 ++--- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/dlls/setupapi/tests/diskspace.c b/dlls/setupapi/tests/diskspace.c index dab6705eee33..c92c15a821ae 100644 --- a/dlls/setupapi/tests/diskspace.c +++ b/dlls/setupapi/tests/diskspace.c @@ -375,8 +375,6 @@ static void test_SetupQuerySpaceRequiredOnDriveA(void) static void test_SetupQuerySpaceRequiredOnDriveW(void) { - static const WCHAR emptyW[] = {0}; - BOOL ret; HDSKSPC handle; LONGLONG space; @@ -403,7 +401,7 @@ static void test_SetupQuerySpaceRequiredOnDriveW(void) GetLastError()); SetLastError(0xdeadbeef); - ret = SetupQuerySpaceRequiredOnDriveW(NULL, emptyW, NULL, NULL, 0); + ret = SetupQuerySpaceRequiredOnDriveW(NULL, L"", NULL, NULL, 0); ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveW to return FALSE, got %d\n", ret); ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected GetLastError() to return ERROR_INVALID_HANDLE, got %u\n", @@ -411,7 +409,7 @@ static void test_SetupQuerySpaceRequiredOnDriveW(void) SetLastError(0xdeadbeef); space = 0xdeadbeef; - ret = SetupQuerySpaceRequiredOnDriveW(NULL, emptyW, &space, NULL, 0); + ret = SetupQuerySpaceRequiredOnDriveW(NULL, L"", &space, NULL, 0); ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveW to return FALSE, got %d\n", ret); ok(space == 0xdeadbeef, "Expected output space parameter to be untouched\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, @@ -441,7 +439,7 @@ static void test_SetupQuerySpaceRequiredOnDriveW(void) GetLastError()); SetLastError(0xdeadbeef); - ret = SetupQuerySpaceRequiredOnDriveW(handle, emptyW, NULL, NULL, 0); + ret = SetupQuerySpaceRequiredOnDriveW(handle, L"", NULL, NULL, 0); ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveW to return FALSE, got %d\n", ret); ok(GetLastError() == ERROR_INVALID_DRIVE, "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", @@ -449,7 +447,7 @@ static void test_SetupQuerySpaceRequiredOnDriveW(void) SetLastError(0xdeadbeef); space = 0xdeadbeef; - ret = SetupQuerySpaceRequiredOnDriveW(handle, emptyW, &space, NULL, 0); + ret = SetupQuerySpaceRequiredOnDriveW(handle, L"", &space, NULL, 0); ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveW to return FALSE, got %d\n", ret); ok(space == 0xdeadbeef, "Expected output space parameter to be untouched\n"); ok(GetLastError() == ERROR_INVALID_DRIVE, diff --git a/dlls/setupapi/tests/setupcab.c b/dlls/setupapi/tests/setupcab.c index bb9add035dbb..183da9016594 100644 --- a/dlls/setupapi/tests/setupcab.c +++ b/dlls/setupapi/tests/setupcab.c @@ -143,7 +143,6 @@ static void test_invalid_parametersA(void) static void test_invalid_parametersW(void) { static const WCHAR nonexistentW[] = {'c',':','\\','n','o','n','e','x','i','s','t','e','n','t','.','c','a','b',0}; - static const WCHAR emptyW[] = {0}; BOOL ret; WCHAR source[MAX_PATH], temp[MAX_PATH]; @@ -204,7 +203,7 @@ static void test_invalid_parametersW(void) GetLastError()); SetLastError(0xdeadbeef); - ret = SetupIterateCabinetW(emptyW, 0, NULL, NULL); + ret = SetupIterateCabinetW(L"", 0, NULL, NULL); ok(!ret, "Expected SetupIterateCabinetW to return 0, got %d\n", ret); ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY || GetLastError() == ERROR_FILE_NOT_FOUND, /* NT4/Win2k */ @@ -212,7 +211,7 @@ static void test_invalid_parametersW(void) GetLastError()); SetLastError(0xdeadbeef); - ret = SetupIterateCabinetW(emptyW, 0, dummy_callbackW, NULL); + ret = SetupIterateCabinetW(L"", 0, dummy_callbackW, NULL); ok(!ret, "Expected SetupIterateCabinetW to return 0, got %d\n", ret); ok(GetLastError() == ERROR_NOT_ENOUGH_MEMORY || GetLastError() == ERROR_FILE_NOT_FOUND, /* NT4/Win2k */ -- 2.21.0

1 0

[PATCH] vbscript/tests: Fix tests failures on Win10.
by Nikolay Sivov 23 Oct '19

23 Oct '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/vbscript/tests/createobj.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/vbscript/tests/createobj.c b/dlls/vbscript/tests/createobj.c index 1c72ed25c4..b16be88b85 100644 --- a/dlls/vbscript/tests/createobj.c +++ b/dlls/vbscript/tests/createobj.c @@ -229,7 +229,6 @@ static HRESULT WINAPI DispatchEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pcti static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - ok(0, "unexpected call\n"); return E_NOTIMPL; } -- 2.23.0

2 1

[PATCH] wscript/tests: Fix test failures on Win10.
by Nikolay Sivov 23 Oct '19

23 Oct '19

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- programs/wscript/tests/run.c | 1 - 1 file changed, 1 deletion(-) diff --git a/programs/wscript/tests/run.c b/programs/wscript/tests/run.c index 16d14ff79f..96ce03044c 100644 --- a/programs/wscript/tests/run.c +++ b/programs/wscript/tests/run.c @@ -134,7 +134,6 @@ static HRESULT WINAPI Dispatch_GetTypeInfoCount(IDispatch *iface, UINT *pctinfo) static HRESULT WINAPI Dispatch_GetTypeInfo(IDispatch *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - ok(0, "unexpected call\n"); return E_NOTIMPL; } -- 2.23.0

2 1

[PATCH] vbscript/tests: Add some tests for IRegExp2::Replace().
by Dmitry Timoshkov 23 Oct '19

23 Oct '19

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/vbscript/tests/vbscript.c | 60 ++++++++++++++++++++++++++++++++++ 1 file changed, 60 insertions(+) diff --git a/dlls/vbscript/tests/vbscript.c b/dlls/vbscript/tests/vbscript.c index 08edfc1be7..fdbfc4465b 100644 --- a/dlls/vbscript/tests/vbscript.c +++ b/dlls/vbscript/tests/vbscript.c @@ -1,5 +1,6 @@ /* * Copyright 2011 Jacek Caban for CodeWeavers + * Copyright 2019 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -1131,6 +1132,64 @@ static void test_RegExp(void) IRegExp2_Release(regexp); } +static void test_RegExp_Replace(void) +{ + static const struct + { + const char *pattern; + const char *replace; + const char *source; + const char *result; + BOOL global; + } test[] = + { + { "abc", "", "123abc456", "123456", FALSE }, + { "abc", "dcba", "123abc456", "123dcba456", FALSE }, + { "[\r\n\t\f]+", " ", "\nHello\rNew\fWorld\t!", " Hello\rNew\fWorld\t!", FALSE }, + { "[\r\n\t\f]+", " ", "\nHello\rNew\fWorld\t!", " Hello New World !", TRUE }, + }; + HRESULT hr; + IRegExp2 *regexp; + VARIANT var; + BSTR str, ret, result; + int i; + + hr = CoCreateInstance(&CLSID_VBScriptRegExp, NULL, + CLSCTX_INPROC_SERVER | CLSCTX_INPROC_HANDLER, + &IID_IRegExp2, (void **)&regexp); + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip("VBScriptRegExp is not registered\n"); + return; + } + ok(hr == S_OK, "got %#x\n", hr); + + for (i = 0; i < ARRAY_SIZE(test); i++) + { + hr = IRegExp2_put_Global(regexp, test[i].global ? VARIANT_TRUE : VARIANT_FALSE); + ok(hr == S_OK, "got %#x\n", hr); + + str = a2bstr(test[i].pattern); + hr = IRegExp2_put_Pattern(regexp, str); + ok(hr == S_OK, "got %#x\n", hr); + SysFreeString(str); + + str = a2bstr(test[i].source); + V_VT(&var) = VT_BSTR; + V_BSTR(&var) = a2bstr(test[i].replace); + hr = IRegExp2_Replace(regexp, str, var, &ret); + ok(hr == S_OK, "got %#x\n", hr); + result = a2bstr(test[i].result); + ok(!wcscmp(ret, result), "got %s, expected %s\n", wine_dbgstr_w(ret), wine_dbgstr_w(result)); + SysFreeString(result); + SysFreeString(ret); + SysFreeString(V_BSTR(&var)); + SysFreeString(str); + } + + IRegExp2_Release(regexp); +} + static BOOL check_vbscript(void) { IActiveScriptParseProcedure2 *vbscript; @@ -1157,6 +1216,7 @@ START_TEST(vbscript) test_named_items(); test_scriptdisp(); test_RegExp(); + test_RegExp_Replace(); }else { win_skip("VBScript engine not available or too old\n"); } -- 2.20.1

2 1

[PATCH] setupapi/tests: Get rid of variables holding empty strings
by Vijay Kiran Kamuju 23 Oct '19

23 Oct '19

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> --- dlls/setupapi/tests/diskspace.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/setupapi/tests/diskspace.c b/dlls/setupapi/tests/diskspace.c index dab6705eee33..c92c15a821ae 100644 --- a/dlls/setupapi/tests/diskspace.c +++ b/dlls/setupapi/tests/diskspace.c @@ -375,8 +375,6 @@ static void test_SetupQuerySpaceRequiredOnDriveA(void) static void test_SetupQuerySpaceRequiredOnDriveW(void) { - static const WCHAR emptyW[] = {0}; - BOOL ret; HDSKSPC handle; LONGLONG space; @@ -403,7 +401,7 @@ static void test_SetupQuerySpaceRequiredOnDriveW(void) GetLastError()); SetLastError(0xdeadbeef); - ret = SetupQuerySpaceRequiredOnDriveW(NULL, emptyW, NULL, NULL, 0); + ret = SetupQuerySpaceRequiredOnDriveW(NULL, L"", NULL, NULL, 0); ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveW to return FALSE, got %d\n", ret); ok(GetLastError() == ERROR_INVALID_HANDLE, "Expected GetLastError() to return ERROR_INVALID_HANDLE, got %u\n", @@ -411,7 +409,7 @@ static void test_SetupQuerySpaceRequiredOnDriveW(void) SetLastError(0xdeadbeef); space = 0xdeadbeef; - ret = SetupQuerySpaceRequiredOnDriveW(NULL, emptyW, &space, NULL, 0); + ret = SetupQuerySpaceRequiredOnDriveW(NULL, L"", &space, NULL, 0); ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveW to return FALSE, got %d\n", ret); ok(space == 0xdeadbeef, "Expected output space parameter to be untouched\n"); ok(GetLastError() == ERROR_INVALID_HANDLE, @@ -441,7 +439,7 @@ static void test_SetupQuerySpaceRequiredOnDriveW(void) GetLastError()); SetLastError(0xdeadbeef); - ret = SetupQuerySpaceRequiredOnDriveW(handle, emptyW, NULL, NULL, 0); + ret = SetupQuerySpaceRequiredOnDriveW(handle, L"", NULL, NULL, 0); ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveW to return FALSE, got %d\n", ret); ok(GetLastError() == ERROR_INVALID_DRIVE, "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", @@ -449,7 +447,7 @@ static void test_SetupQuerySpaceRequiredOnDriveW(void) SetLastError(0xdeadbeef); space = 0xdeadbeef; - ret = SetupQuerySpaceRequiredOnDriveW(handle, emptyW, &space, NULL, 0); + ret = SetupQuerySpaceRequiredOnDriveW(handle, L"", &space, NULL, 0); ok(!ret, "Expected SetupQuerySpaceRequiredOnDriveW to return FALSE, got %d\n", ret); ok(space == 0xdeadbeef, "Expected output space parameter to be untouched\n"); ok(GetLastError() == ERROR_INVALID_DRIVE, -- 2.21.0

1 0

Re: Michael Stefaniuc : comctl32/tests: Get rid of variables holding empty strings.
by Michael Stefaniuc 23 Oct '19

23 Oct '19

Uhm, this patch introduces test failures. I had assumed the Marvin email is enough to reject this with "Test failures". I doubt this patch is the real culprit but I didn't have time to properly debug the issue. On 10/22/19 11:57 PM, Alexandre Julliard wrote: > Module: wine > Branch: master > Commit: f8979fee1fa2e6aeed5a5026465dffa680c0848f > URL: https://source.winehq.org/git/wine.git/?a=commit;h=f8979fee1fa2e6aeed5a5026… > > Author: Michael Stefaniuc <mstefani(a)winehq.org> > Date: Tue Oct 22 01:24:32 2019 +0200 > > comctl32/tests: Get rid of variables holding empty strings. > > Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> > Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> > > --- > diff --git a/dlls/comctl32/tests/pager.c b/dlls/comctl32/tests/pager.c > index 0e2c25b08a..30005c88fa 100644 > --- a/dlls/comctl32/tests/pager.c > +++ b/dlls/comctl32/tests/pager.c > @@ -132,17 +130,17 @@ static const struct notify_test_send test_dont_convert_send_data[] = > > static const struct notify_test_receive test_convert_receive_data[] = > { > - {empty_w, sizeof(empty_w), ARRAY_SIZE(buffer), NULL, test_a, sizeof(test_a), -1, test_w, ARRAY_SIZE(buffer)}, > - {empty_w, sizeof(empty_w), ARRAY_SIZE(buffer), test_a, NULL, 0, -1, test_w, ARRAY_SIZE(buffer)}, > - {NULL, sizeof(empty_w), ARRAY_SIZE(buffer), test_a, NULL, 0, -1, NULL, ARRAY_SIZE(buffer)}, > - {empty_w, sizeof(empty_w), ARRAY_SIZE(buffer), large_a, NULL, 0, -1, large_truncated_65_w, ARRAY_SIZE(buffer)}, > - {empty_w, sizeof(empty_w), ARRAY_SIZE(buffer), empty_a, 0, 0, 1, empty_w, 1}, > + {L"", sizeof(L""), ARRAY_SIZE(buffer), NULL, test_a, sizeof(test_a), -1, test_w, ARRAY_SIZE(buffer)}, > + {L"", sizeof(L""), ARRAY_SIZE(buffer), test_a, NULL, 0, -1, test_w, ARRAY_SIZE(buffer)}, > + {NULL, sizeof(L""), ARRAY_SIZE(buffer), test_a, NULL, 0, -1, NULL, ARRAY_SIZE(buffer)}, > + {L"", sizeof(L""), ARRAY_SIZE(buffer), large_a, NULL, 0, -1, large_truncated_65_w, ARRAY_SIZE(buffer)}, ^^^ changing that back to empty_w makes the test failures go away... bye michael

2 2