February 2020 - Wine-devel - list.winehq.org

[PATCH 6/6] kernel32/tests: Test timeout behaviour on system clock change.
by Piotr Caban 17 Feb '20

17 Feb '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- I don't think that changing system clock in the tests is a good idea. I'm not sure if the tests should be included to Wine. dlls/kernel32/tests/timer.c | 242 ++++++++++++++++++++++++++++++++++++ 1 file changed, 242 insertions(+)

1 0

[PATCH 5/6] server: Introduce when_t type that stores absolute timeout using regular or monotonic clock.
by Piotr Caban 17 Feb '20

17 Feb '20

1 0

[PATCH 4/6] server: Use correct timeout in select.
by Piotr Caban 17 Feb '20

17 Feb '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ntdll/server.c | 15 +++++++++++---- dlls/ntdll/sync.c | 15 +++++++++++---- server/protocol.def | 1 - server/thread.c | 38 +++++++++++++++++++------------------- 4 files changed, 41 insertions(+), 28 deletions(-)

1 0

[PATCH 3/6] server: Use monotonic timer for SetTimer timeouts.
by Piotr Caban 17 Feb '20

17 Feb '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- server/queue.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)

1 0

[PATCH 2/6] server: Use correct timeouts in waitable timers.
by Piotr Caban 17 Feb '20

17 Feb '20

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ntdll/sync.c | 11 +++++++++-- server/fd.c | 2 +- server/file.h | 1 + server/timer.c | 22 +++++++++++++++------- 4 files changed, 26 insertions(+), 10 deletions(-)

1 0

[PATCH] configure: Use -nostartfiles -nodefaultlibs in cross compiler checks.
by Jacek Caban 17 Feb '20

17 Feb '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- This matches how we actually use the cross compiler. aclocal.m4 | 4 ++-- configure.ac | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)

1 0

[PATCH 1/2] ole32/test: Test reentrancy of QueryContinueDrag.
by Roman Pišl 17 Feb '20

17 Feb '20

QueryContinueDrag is not reentrant on Windows. Signed-off-by: Roman Pišl <rpisl(a)seznam.cz> --- dlls/ole32/tests/dragdrop.c | 38 ++++++++++++++++++++++++++----------- 1 file changed, 27 insertions(+), 11 deletions(-) diff --git a/dlls/ole32/tests/dragdrop.c b/dlls/ole32/tests/dragdrop.c index 77e47d723d..82564a620a 100644 --- a/dlls/ole32/tests/dragdrop.c +++ b/dlls/ole32/tests/dragdrop.c @@ -260,6 +260,7 @@ struct method_call call_lists[][30] = }; static int droptarget_refs; +static int test_reentrance; /* helper macros to make tests a bit leaner */ #define ok_ole_success(hr, func) ok(hr == S_OK, func " failed with error 0x%08x\n", hr) @@ -359,7 +360,19 @@ static HRESULT WINAPI DropSource_QueryContinueDrag( BOOL fEscapePressed, DWORD grfKeyState) { - return check_expect(DS_QueryContinueDrag, 0, NULL); + HRESULT hr = check_expect(DS_QueryContinueDrag, 0, NULL); + if (test_reentrance) + { + MSG msg; + Sleep(100); + /* run the message loop for this thread */ + while (PeekMessageA(&msg, NULL, 0, 0, PM_REMOVE)) + { + TranslateMessage(&msg); + DispatchMessageA(&msg); + } + } + return hr; } static HRESULT WINAPI DropSource_GiveFeedback( @@ -701,17 +714,20 @@ static void test_DoDragDrop(void) GetWindowRect(hwnd, &rect); ok(SetCursorPos(rect.left+50, rect.top+50), "SetCursorPos failed\n"); - for (seq = 0; seq < ARRAY_SIZE(call_lists); seq++) + for (test_reentrance = 0; test_reentrance < 2; test_reentrance++) { - DWORD effect_in; - trace("%d\n", seq); - call_ptr = call_lists[seq]; - effect_in = call_ptr->set_param; - call_ptr++; - - hr = DoDragDrop(&DataObject, &DropSource, effect_in, &effect); - check_expect(DoDragDrop_ret, hr, NULL); - check_expect(DoDragDrop_effect_out, effect, NULL); + for (seq = 0; seq < ARRAY_SIZE(call_lists); seq++) + { + DWORD effect_in; + trace("%d\n", seq); + call_ptr = call_lists[seq]; + effect_in = call_ptr->set_param; + call_ptr++; + + hr = DoDragDrop(&DataObject, &DropSource, effect_in, &effect); + check_expect(DoDragDrop_ret, hr, NULL); + check_expect(DoDragDrop_effect_out, effect, NULL); + } } OleUninitialize(); -- 2.20.1

3 4

[PATCH] wschom/tests: Use wide string literals.
by Nikolay Sivov 17 Feb '20

17 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/wshom.ocx/tests/wshom.c | 81 ++++++++++++------------------------ 1 file changed, 26 insertions(+), 55 deletions(-) diff --git a/dlls/wshom.ocx/tests/wshom.c b/dlls/wshom.ocx/tests/wshom.c index c00f7abfa8..bc913de3b7 100644 --- a/dlls/wshom.ocx/tests/wshom.c +++ b/dlls/wshom.ocx/tests/wshom.c @@ -65,24 +65,8 @@ static void check_bstr_length(BSTR str, int line) static void test_wshshell(void) { - static const WCHAR notepadW[] = {'n','o','t','e','p','a','d','.','e','x','e',0}; - static const WCHAR desktopW[] = {'D','e','s','k','t','o','p',0}; - static const WCHAR lnk1W[] = {'f','i','l','e','.','l','n','k',0}; - static const WCHAR pathW[] = {'%','P','A','T','H','%',0}; - static const WCHAR sysW[] = {'S','Y','S','T','E','M',0}; - static const WCHAR path2W[] = {'P','A','T','H',0}; - static const WCHAR dummydirW[] = {'d','e','a','d','p','a','r','r','o','t',0}; - static const WCHAR emptyW[] = {'e','m','p','t','y',0}; - static const WCHAR cmdexeW[] = {'\\','c','m','d','.','e','x','e',0}; - static const WCHAR testdirW[] = {'w','s','h','o','m',' ','t','e','s','t',' ','d','i','r',0}; - static const WCHAR paramsW[] = - {' ','/','c',' ','r','d',' ','/','s',' ','/','q',' ','c',':','\\','n','o','s','u','c','h','d','i','r',0}; - static const WCHAR cmdW[] = - {'c','m','d','.','e','x','e',' ','/','c',' ','r','d',' ','/','s',' ','/','q',' ','c',':','\\', - 'n','o','s','u','c','h','d','i','r',0}; - static const WCHAR cmd2W[] = - {'"','c','m','d','.','e','x','e',' ','"',' ','/','c',' ','r','d',' ','/','s',' ','/','q',' ','c',':','\\', - 'n','o','s','u','c','h','d','i','r',0}; + static const WCHAR emptyW[] = L"empty"; + static const WCHAR cmdexeW[] = L"\\cmd.exe"; WCHAR path[MAX_PATH], path2[MAX_PATH], buf[MAX_PATH]; IWshEnvironment *env; IWshExec *shexec; @@ -148,7 +132,7 @@ static void test_wshshell(void) ITypeInfo_ReleaseTypeAttr(ti, tattr); /* try to call Item() with normal IDispatch procedure */ - str = SysAllocString(desktopW); + str = SysAllocString(L"Desktop"); V_VT(&arg) = VT_BSTR; V_BSTR(&arg) = str; dp.rgvarg = &arg; @@ -168,7 +152,7 @@ static void test_wshshell(void) VariantClear(&res); /* CreateShortcut() */ - str = SysAllocString(lnk1W); + str = SysAllocString(L"file.lnk"); hr = IWshShell3_CreateShortcut(sh3, str, &shortcut); EXPECT_HR(hr, S_OK); SysFreeString(str); @@ -189,13 +173,13 @@ static void test_wshshell(void) hr = IWshShell3_ExpandEnvironmentStrings(sh3, NULL, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); - str = SysAllocString(pathW); + str = SysAllocString(L"%PATH%"); hr = IWshShell3_ExpandEnvironmentStrings(sh3, str, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); SysFreeString(str); V_VT(&arg) = VT_BSTR; - V_BSTR(&arg) = SysAllocString(sysW); + V_BSTR(&arg) = SysAllocString(L"SYSTEM"); hr = IWshShell3_get_Environment(sh3, &arg, &env); ok(hr == S_OK, "got 0x%08x\n", hr); VariantClear(&arg); @@ -211,7 +195,7 @@ static void test_wshshell(void) SysFreeString(ret); /* invalid var name */ - str = SysAllocString(lnk1W); + str = SysAllocString(L"file.lnk"); hr = IWshEnvironment_get_Item(env, str, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); @@ -224,7 +208,7 @@ static void test_wshshell(void) SysFreeString(str); /* valid name */ - str = SysAllocString(path2W); + str = SysAllocString(L"PATH"); hr = IWshEnvironment_get_Item(env, str, &ret); ok(hr == S_OK, "got 0x%08x\n", hr); ok(ret && *ret != 0, "got %s\n", wine_dbgstr_w(ret)); @@ -239,7 +223,7 @@ static void test_wshshell(void) V_VT(&arg2) = VT_ERROR; V_ERROR(&arg2) = DISP_E_PARAMNOTFOUND; - str = SysAllocString(notepadW); + str = SysAllocString(L"notepad.exe"); hr = IWshShell3_Run(sh3, str, &arg, &arg2, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); @@ -265,14 +249,14 @@ static void test_wshshell(void) V_BOOL(&arg2) = VARIANT_TRUE; retval = 0xdeadbeef; - str = SysAllocString(cmdW); + str = SysAllocString(L"cmd.exe /c rd /s /q c:\\nosuchdir"); hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); ok(hr == S_OK, "got 0x%08x\n", hr); todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "got %u\n", retval); SysFreeString(str); retval = 0xdeadbeef; - str = SysAllocString(cmd2W); + str = SysAllocString(L"\"cmd.exe \" /c rd /s /q c:\\nosuchdir"); hr = IWshShell3_Run(sh3, str, &arg, &arg2, &retval); ok(hr == S_OK, "got 0x%08x\n", hr); todo_wine ok(retval == ERROR_FILE_NOT_FOUND, "got %u\n", retval); @@ -285,7 +269,7 @@ static void test_wshshell(void) /* copy cmd.exe to a path with spaces */ GetTempPathW(ARRAY_SIZE(path2), path2); - lstrcatW(path2, testdirW); + lstrcatW(path2, L"wshom test dir"); CreateDirectoryW(path2, NULL); lstrcatW(path2, cmdexeW); CopyFileW(path, path2, FALSE); @@ -293,7 +277,7 @@ static void test_wshshell(void) buf[0] = '"'; lstrcpyW(buf + 1, path2); buf[lstrlenW(buf)] = '"'; - lstrcpyW(buf + lstrlenW(path2) + 2, paramsW); + lstrcpyW(buf + lstrlenW(path2) + 2, L" /c rd /s /q c:\\nosuchdir"); retval = 0xdeadbeef; str = SysAllocString(buf); @@ -326,7 +310,7 @@ static void test_wshshell(void) ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); SysFreeString(str); - str = SysAllocString(dummydirW); + str = SysAllocString(L"deadparrot"); hr = IWshShell3_put_CurrentDirectory(sh3, str); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); SysFreeString(str); @@ -370,20 +354,8 @@ static DWORD delete_key(HKEY hkey) static void test_registry(void) { - static const WCHAR keypathW[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R','\\', - 'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','T','e','s','t','\\',0}; - static const WCHAR regsz2W[] = {'r','e','g','s','z','2',0}; - static const WCHAR regszW[] = {'r','e','g','s','z',0}; - static const WCHAR regdwordW[] = {'r','e','g','d','w','o','r','d',0}; - static const WCHAR regbinaryW[] = {'r','e','g','b','i','n','a','r','y',0}; - static const WCHAR regmultiszW[] = {'r','e','g','m','u','l','t','i','s','z',0}; - - static const WCHAR regsz1W[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R','\\', - 'S','o','f','t','w','a','r','e','\\','W','i','n','e','\\','T','e','s','t','\\','r','e','g','s','z','1',0}; - static const WCHAR foobarW[] = {'f','o','o','b','a','r',0}; - static const WCHAR fooW[] = {'f','o','o',0}; - static const WCHAR brokenW[] = {'H','K','E','Y','_','b','r','o','k','e','n','_','k','e','y',0}; - static const WCHAR broken2W[] = {'H','K','E','Y','_','C','U','R','R','E','N','T','_','U','S','E','R','a',0}; + static const WCHAR keypathW[] = L"HKEY_CURRENT_USER\\Software\\Wine\\Test\\"; + static const WCHAR regszW[] = L"regsz"; WCHAR pathW[MAX_PATH]; DWORD dwvalue, type; VARIANT value, v; @@ -406,7 +378,7 @@ static void test_registry(void) ok(hr == E_POINTER, "got 0x%08x\n", hr); ok(V_VT(&value) == VT_I2, "got %d\n", V_VT(&value)); - name = SysAllocString(brokenW); + name = SysAllocString(L"HKEY_broken_key"); hr = IWshShell3_RegRead(sh3, name, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); V_VT(&value) = VT_I2; @@ -415,7 +387,7 @@ static void test_registry(void) ok(V_VT(&value) == VT_I2, "got %d\n", V_VT(&value)); SysFreeString(name); - name = SysAllocString(broken2W); + name = SysAllocString(L"HKEY_CURRENT_USERa"); V_VT(&value) = VT_I2; hr = IWshShell3_RegRead(sh3, name, &value); ok(hr == HRESULT_FROM_WIN32(ERROR_PATH_NOT_FOUND), "got 0x%08x\n", hr); @@ -450,14 +422,14 @@ static void test_registry(void) hr = IWshShell3_RegRead(sh3, name, &value); ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&value) == VT_BSTR, "got %d\n", V_VT(&value)); - ok(!lstrcmpW(V_BSTR(&value), foobarW), "got %s\n", wine_dbgstr_w(V_BSTR(&value))); + ok(!lstrcmpW(V_BSTR(&value), L"foobar"), "got %s\n", wine_dbgstr_w(V_BSTR(&value))); CHECK_BSTR_LENGTH(V_BSTR(&value)); VariantClear(&value); SysFreeString(name); /* REG_SZ with embedded NULL */ lstrcpyW(pathW, keypathW); - lstrcatW(pathW, regsz2W); + lstrcatW(pathW, L"regsz2"); name = SysAllocString(pathW); VariantInit(&value); hr = IWshShell3_RegRead(sh3, name, &value); @@ -470,7 +442,7 @@ static void test_registry(void) /* REG_DWORD */ lstrcpyW(pathW, keypathW); - lstrcatW(pathW, regdwordW); + lstrcatW(pathW, L"regdword"); name = SysAllocString(pathW); VariantInit(&value); hr = IWshShell3_RegRead(sh3, name, &value); @@ -481,7 +453,7 @@ static void test_registry(void) /* REG_BINARY */ lstrcpyW(pathW, keypathW); - lstrcatW(pathW, regbinaryW); + lstrcatW(pathW, L"regbinary"); name = SysAllocString(pathW); VariantInit(&value); hr = IWshShell3_RegRead(sh3, name, &value); @@ -513,7 +485,7 @@ static void test_registry(void) /* REG_MULTI_SZ */ lstrcpyW(pathW, keypathW); - lstrcatW(pathW, regmultiszW); + lstrcatW(pathW, L"regmultisz"); name = SysAllocString(pathW); VariantInit(&value); hr = IWshShell3_RegRead(sh3, name, &value); @@ -540,12 +512,12 @@ static void test_registry(void) hr = SafeArrayGetElement(V_ARRAY(&value), &bound, &v); ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&v) == VT_BSTR, "got %d\n", V_VT(&v)); - ok(!lstrcmpW(V_BSTR(&v), fooW), "got %s\n", wine_dbgstr_w(V_BSTR(&v))); + ok(!lstrcmpW(V_BSTR(&v), L"foo"), "got %s\n", wine_dbgstr_w(V_BSTR(&v))); CHECK_BSTR_LENGTH(V_BSTR(&v)); VariantClear(&v); VariantClear(&value); - name = SysAllocString(regsz1W); + name = SysAllocString(L"HKEY_CURRENT_USER\\Software\\Wine\\Test\\regsz1"); V_VT(&value) = VT_I2; hr = IWshShell3_RegRead(sh3, name, &value); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got 0x%08x\n", hr); @@ -637,7 +609,6 @@ static void test_registry(void) static void test_popup(void) { - static const WCHAR textW[] = {'T','e','x','t',0}; VARIANT timeout, type, title, optional; IWshShell *sh; int button; @@ -649,7 +620,7 @@ static void test_popup(void) ok(hr == S_OK, "Failed to create WshShell object, hr %#x.\n", hr); button = 123; - text = SysAllocString(textW); + text = SysAllocString(L"Text"); hr = IWshShell_Popup(sh, NULL, NULL, NULL, NULL, &button); ok(hr == E_POINTER, "Unexpected retval %#x.\n", hr); -- 2.25.0

1 0

[PATCH] scrrun/tests: Use wide string literals.
by Nikolay Sivov 17 Feb '20

17 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/scrrun/tests/dictionary.c | 25 ++--- dlls/scrrun/tests/filesystem.c | 190 +++++++++++++-------------------- 2 files changed, 86 insertions(+), 129 deletions(-) diff --git a/dlls/scrrun/tests/dictionary.c b/dlls/scrrun/tests/dictionary.c index cda288b1bb..12c41c3e40 100644 --- a/dlls/scrrun/tests/dictionary.c +++ b/dlls/scrrun/tests/dictionary.c @@ -63,9 +63,6 @@ static void _test_provideclassinfo(IDispatch *disp, const GUID *guid, int line) static void test_interfaces(void) { - static const WCHAR key_add[] = {'a', 0}; - static const WCHAR key_add_value[] = {'a', 0}; - static const WCHAR key_non_exist[] = {'b', 0}; HRESULT hr; IDispatch *disp; IDispatchEx *dispex; @@ -94,9 +91,9 @@ static void test_interfaces(void) test_provideclassinfo(disp, &CLSID_Dictionary); V_VT(&key) = VT_BSTR; - V_BSTR(&key) = SysAllocString(key_add); + V_BSTR(&key) = SysAllocString(L"a"); V_VT(&value) = VT_BSTR; - V_BSTR(&value) = SysAllocString(key_add_value); + V_BSTR(&value) = SysAllocString(L"a"); hr = IDictionary_Add(dict, &key, &value); ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); VariantClear(&value); @@ -109,7 +106,7 @@ static void test_interfaces(void) exists = VARIANT_TRUE; V_VT(&key) = VT_BSTR; - V_BSTR(&key) = SysAllocString(key_non_exist); + V_BSTR(&key) = SysAllocString(L"b"); hr = IDictionary_Exists(dict, &key, &exists); ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); ok(exists == VARIANT_FALSE, "Expected FALSE but got TRUE.\n"); @@ -329,12 +326,13 @@ static IDispatch test_disp = { &test_disp_vtbl }; static void test_hash_value(void) { /* string test data */ - static const WCHAR str_hash_tests[][10] = { - {'a','b','c','d',0}, - {'a','B','C','d','1',0}, - {'1','2','3',0}, - {'A',0}, - {'a',0}, + static const WCHAR str_hash_tests[][10] = + { + L"abcd", + L"aBCd1", + L"123", + L"A", + L"a", { 0 } }; @@ -926,7 +924,6 @@ static void test_Item(void) static void test_Add(void) { - static const WCHAR testW[] = {'t','e','s','t','W',0}; VARIANT key, item; IDictionary *dict; HRESULT hr; @@ -936,7 +933,7 @@ static void test_Add(void) &IID_IDictionary, (void**)&dict); ok(hr == S_OK, "got 0x%08x\n", hr); - str = SysAllocString(testW); + str = SysAllocString(L"testW"); V_VT(&key) = VT_I2; V_I2(&key) = 1; V_VT(&item) = VT_BSTR|VT_BYREF; diff --git a/dlls/scrrun/tests/filesystem.c b/dlls/scrrun/tests/filesystem.c index c96f704ca7..5d64a0dcdd 100644 --- a/dlls/scrrun/tests/filesystem.c +++ b/dlls/scrrun/tests/filesystem.c @@ -46,7 +46,7 @@ static inline ULONG get_refcount(IUnknown *iface) static const WCHAR crlfW[] = {'\r','\n',0}; static const char utf16bom[] = {0xff,0xfe,0}; -static const WCHAR testfileW[] = {'t','e','s','t','.','t','x','t',0}; +static const WCHAR testfileW[] = L"test.txt"; #define GET_REFCOUNT(iface) \ get_refcount((IUnknown*)iface) @@ -134,11 +134,6 @@ static void _test_provideclassinfo(IDispatch *disp, const GUID *guid, int line) static void test_interfaces(void) { - static const WCHAR nonexistent_dirW[] = { - 'c', ':', '\\', 'N', 'o', 'n', 'e', 'x', 'i', 's', 't', 'e', 'n', 't', 0}; - static const WCHAR pathW[] = {'p','a','t','h',0}; - static const WCHAR file_kernel32W[] = { - '\\', 'k', 'e', 'r', 'n', 'e', 'l', '3', '2', '.', 'd', 'l', 'l', 0}; HRESULT hr; IDispatch *disp; IDispatchEx *dispex; @@ -152,7 +147,7 @@ static void test_interfaces(void) GetSystemDirectoryW(windows_path, MAX_PATH); lstrcpyW(file_path, windows_path); - lstrcatW(file_path, file_kernel32W); + lstrcatW(file_path, L"\\kernel32.dll"); test_provideclassinfo(disp, &CLSID_FileSystemObject); @@ -170,7 +165,7 @@ static void test_interfaces(void) hr = IFileSystem3_FileExists(fs3, NULL, NULL); ok(hr == E_POINTER, "got 0x%08x, expected 0x%08x\n", hr, E_POINTER); - path = SysAllocString(pathW); + path = SysAllocString(L"path"); b = VARIANT_TRUE; hr = IFileSystem3_FileExists(fs3, path, &b); ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); @@ -201,7 +196,7 @@ static void test_interfaces(void) ok(b == VARIANT_TRUE, "Folder doesn't exists\n"); SysFreeString(path); - path = SysAllocString(nonexistent_dirW); + path = SysAllocString(L"c:\\Nonexistent"); hr = IFileSystem3_FolderExists(fs3, path, &b); ok(hr == S_OK, "got 0x%08x, expected 0x%08x\n", hr, S_OK); ok(b == VARIANT_FALSE, "Folder exists\n"); @@ -369,8 +364,6 @@ todo_wine { static void test_GetFileVersion(void) { - static const WCHAR k32W[] = {'\\','k','e','r','n','e','l','3','2','.','d','l','l',0}; - static const WCHAR k33W[] = {'\\','k','e','r','n','e','l','3','3','.','d','l','l',0}; WCHAR pathW[MAX_PATH], filenameW[MAX_PATH]; BSTR path, version; HRESULT hr; @@ -378,7 +371,7 @@ static void test_GetFileVersion(void) GetSystemDirectoryW(pathW, ARRAY_SIZE(pathW)); lstrcpyW(filenameW, pathW); - lstrcatW(filenameW, k32W); + lstrcatW(filenameW, L"\\kernel32.dll"); path = SysAllocString(filenameW); hr = IFileSystem3_GetFileVersion(fs3, path, &version); @@ -388,7 +381,7 @@ static void test_GetFileVersion(void) SysFreeString(path); lstrcpyW(filenameW, pathW); - lstrcatW(filenameW, k33W); + lstrcatW(filenameW, L"\\kernel33.dll"); path = SysAllocString(filenameW); version = (void*)0xdeadbeef; @@ -406,29 +399,20 @@ static void test_GetFileVersion(void) static void test_GetParentFolderName(void) { - static const WCHAR path1[] = {'a',0}; - static const WCHAR path2[] = {'a','/','a','/','a',0}; - static const WCHAR path3[] = {'a','\\','a','\\','a',0}; - static const WCHAR path4[] = {'a','/','a','/','/','\\','\\',0}; - static const WCHAR path5[] = {'c',':','\\','\\','a',0}; - static const WCHAR path6[] = {'a','c',':','\\','a',0}; - static const WCHAR result2[] = {'a','/','a',0}; - static const WCHAR result3[] = {'a','\\','a',0}; - static const WCHAR result4[] = {'a',0}; - static const WCHAR result5[] = {'c',':','\\',0}; - static const WCHAR result6[] = {'a','c',':',0}; - - static const struct { + static const struct + { const WCHAR *path; const WCHAR *result; - } tests[] = { - {NULL, NULL}, - {path1, NULL}, - {path2, result2}, - {path3, result3}, - {path4, result4}, - {path5, result5}, - {path6, result6} + } + tests[] = + { + { NULL, NULL }, + { L"a", NULL }, + { L"a/a/a", L"a/a" }, + { L"a\\a\\a", L"a\\a" }, + { L"a/a//\\\\", L"a" }, + { L"c:\\\\a", L"c:\\" }, + { L"ac:\\a", L"ac:" } }; BSTR path, result; @@ -454,24 +438,18 @@ static void test_GetParentFolderName(void) static void test_GetFileName(void) { - static const WCHAR path1[] = {'a',0}; - static const WCHAR path2[] = {'a','/','a','.','b',0}; - static const WCHAR path3[] = {'a','\\',0}; - static const WCHAR path4[] = {'c',':',0}; - static const WCHAR path5[] = {'/','\\',0}; - static const WCHAR result2[] = {'a','.','b',0}; - static const WCHAR result3[] = {'a',0}; - - static const struct { + static const struct + { const WCHAR *path; const WCHAR *result; - } tests[] = { - {NULL, NULL}, - {path1, path1}, - {path2, result2}, - {path3, result3}, - {path4, NULL}, - {path5, NULL} + } tests[] = + { + { NULL, NULL }, + { L"a", L"a" }, + { L"a/a.b", L"a.b" }, + { L"a\\", L"a" }, + { L"c:", NULL }, + { L"/\\", NULL } }; BSTR path, result; @@ -497,27 +475,20 @@ static void test_GetFileName(void) static void test_GetBaseName(void) { - static const WCHAR path1[] = {'a',0}; - static const WCHAR path2[] = {'a','/','a','.','b','.','c',0}; - static const WCHAR path3[] = {'a','.','b','\\',0}; - static const WCHAR path4[] = {'c',':',0}; - static const WCHAR path5[] = {'/','\\',0}; - static const WCHAR path6[] = {'.','a',0}; - static const WCHAR result1[] = {'a',0}; - static const WCHAR result2[] = {'a','.','b',0}; - static const WCHAR result6[] = {0}; - - static const struct { + static const struct + { const WCHAR *path; const WCHAR *result; - } tests[] = { - {NULL, NULL}, - {path1, result1}, - {path2, result2}, - {path3, result1}, - {path4, NULL}, - {path5, NULL}, - {path6, result6} + } + tests[] = + { + { NULL, NULL}, + { L"a", L"a" }, + { L"a/a.b.c", L"a.b" }, + { L"a.b\\", L"a" }, + { L"c:", NULL }, + { L"/\\", NULL }, + { L".a", L"" } }; BSTR path, result; @@ -543,11 +514,10 @@ static void test_GetBaseName(void) static void test_GetAbsolutePathName(void) { - static const WCHAR dir1[] = {'t','e','s','t','_','d','i','r','1',0}; - static const WCHAR dir2[] = {'t','e','s','t','_','d','i','r','2',0}; - static const WCHAR dir_match1[] = {'t','e','s','t','_','d','i','r','*',0}; - static const WCHAR dir_match2[] = {'t','e','s','t','_','d','i','*',0}; - static const WCHAR cur_dir[] = {'.',0}; + static const WCHAR dir1[] = L"test_dir1"; + static const WCHAR dir2[] = L"test_dir2"; + static const WCHAR dir_match1[] = L"test_dir*"; + static const WCHAR dir_match2[] = L"test_di*"; WIN32_FIND_DATAW fdata; HANDLE find; @@ -560,7 +530,7 @@ static void test_GetAbsolutePathName(void) hr = IFileSystem3_GetAbsolutePathName(fs3, NULL, &result); ok(hr == S_OK, "GetAbsolutePathName returned %x, expected S_OK\n", hr); - GetFullPathNameW(cur_dir, MAX_PATH, buf, NULL); + GetFullPathNameW(L".", MAX_PATH, buf, NULL); ok(!lstrcmpiW(buf, result), "result = %s, expected %s\n", wine_dbgstr_w(result), wine_dbgstr_w(buf)); SysFreeString(result); @@ -614,7 +584,6 @@ static void test_GetAbsolutePathName(void) static void test_GetFile(void) { - static const WCHAR slW[] = {'\\',0}; BSTR path, str; WCHAR pathW[MAX_PATH]; FileAttribute fa; @@ -712,7 +681,7 @@ static void test_GetFile(void) SysFreeString(path); /* try with directory */ - lstrcatW(pathW, slW); + lstrcatW(pathW, L"\\"); ret = CreateDirectoryW(pathW, NULL); ok(ret, "got %d, error %d\n", ret, GetLastError()); @@ -741,11 +710,9 @@ static inline void create_path(const WCHAR *folder, const WCHAR *name, WCHAR *re static void test_CopyFolder(void) { - static const WCHAR filesystem3_dir[] = {'f','i','l','e','s','y','s','t','e','m','3','_','t','e','s','t',0}; - static const WCHAR s1[] = {'s','r','c','1',0}; - static const WCHAR s[] = {'s','r','c','*',0}; - static const WCHAR d[] = {'d','s','t',0}; - static const WCHAR empty[] = {0}; + static const WCHAR filesystem3_dir[] = L"filesystem3_test"; + static const WCHAR src1W[] = L"src1"; + static const WCHAR dstW[] = L"dst"; WCHAR tmp[MAX_PATH]; BSTR bsrc, bdst; @@ -756,9 +723,9 @@ static void test_CopyFolder(void) return; } - create_path(filesystem3_dir, s1, tmp); + create_path(filesystem3_dir, src1W, tmp); bsrc = SysAllocString(tmp); - create_path(filesystem3_dir, d, tmp); + create_path(filesystem3_dir, dstW, tmp); bdst = SysAllocString(tmp); hr = IFileSystem3_CopyFile(fs3, bsrc, bdst, VARIANT_TRUE); ok(hr == CTL_E_FILENOTFOUND, "CopyFile returned %x, expected CTL_E_FILENOTFOUND\n", hr); @@ -791,32 +758,31 @@ static void test_CopyFolder(void) hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); ok(hr == S_OK, "CopyFolder returned %x, expected S_OK\n", hr); - create_path(tmp, s1, tmp); + create_path(tmp, src1W, tmp); ok(GetFileAttributesW(tmp) == INVALID_FILE_ATTRIBUTES, "%s file exists\n", wine_dbgstr_w(tmp)); - create_path(filesystem3_dir, d, tmp); - create_path(tmp, empty, tmp); + create_path(filesystem3_dir, dstW, tmp); + create_path(tmp, L"", tmp); SysFreeString(bdst); bdst = SysAllocString(tmp); hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); ok(hr == S_OK, "CopyFolder returned %x, expected S_OK\n", hr); - create_path(tmp, s1, tmp); + create_path(tmp, src1W, tmp); ok(GetFileAttributesW(tmp) != INVALID_FILE_ATTRIBUTES, "%s directory doesn't exist\n", wine_dbgstr_w(tmp)); ok(RemoveDirectoryW(tmp), "can't remove %s directory\n", wine_dbgstr_w(tmp)); - create_path(filesystem3_dir, d, tmp); + create_path(filesystem3_dir, dstW, tmp); SysFreeString(bdst); bdst = SysAllocString(tmp); - - create_path(filesystem3_dir, s, tmp); + create_path(filesystem3_dir, L"src*", tmp); SysFreeString(bsrc); bsrc = SysAllocString(tmp); hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); ok(hr == S_OK, "CopyFolder returned %x, expected S_OK\n", hr); - create_path(filesystem3_dir, d, tmp); - create_path(tmp, s1, tmp); + create_path(filesystem3_dir, dstW, tmp); + create_path(tmp, src1W, tmp); ok(GetFileAttributesW(tmp) != INVALID_FILE_ATTRIBUTES, "%s directory doesn't exist\n", wine_dbgstr_w(tmp)); @@ -826,10 +792,10 @@ static void test_CopyFolder(void) hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_TRUE); ok(hr == CTL_E_PATHNOTFOUND, "CopyFolder returned %x, expected CTL_E_PATHNOTFOUND\n", hr); - create_path(filesystem3_dir, s1, tmp); + create_path(filesystem3_dir, src1W, tmp); SysFreeString(bsrc); bsrc = SysAllocString(tmp); - create_path(tmp, s1, tmp); + create_path(tmp, src1W, tmp); ok(create_file(tmp), "can't create %s file\n", wine_dbgstr_w(tmp)); hr = IFileSystem3_CopyFolder(fs3, bsrc, bdst, VARIANT_FALSE); ok(hr == S_OK, "CopyFolder returned %x, expected S_OK\n", hr); @@ -938,7 +904,6 @@ static void test_BuildPath(void) static void test_GetFolder(void) { - static const WCHAR dummyW[] = {'d','u','m','m','y',0}; WCHAR buffW[MAX_PATH]; IFolder *folder; HRESULT hr; @@ -953,7 +918,7 @@ static void test_GetFolder(void) ok(hr == E_POINTER, "got 0x%08x\n", hr); /* something that doesn't exist */ - str = SysAllocString(dummyW); + str = SysAllocString(L"dummy"); hr = IFileSystem3_GetFolder(fs3, str, NULL); ok(hr == E_POINTER, "got 0x%08x\n", hr); @@ -1031,10 +996,9 @@ static void _test_clone(IEnumVARIANT *enumvar, BOOL position_inherited, LONG cou /* Please keep the tests for IFolderCollection and IFileCollection in sync */ static void test_FolderCollection(void) { - static const WCHAR fooW[] = {'f','o','o',0}; - static const WCHAR aW[] = {'\\','a',0}; - static const WCHAR bW[] = {'\\','b',0}; - static const WCHAR cW[] = {'\\','c',0}; + static const WCHAR aW[] = L"\\a"; + static const WCHAR bW[] = L"\\b"; + static const WCHAR cW[] = L"\\c"; IFolderCollection *folders; WCHAR buffW[MAX_PATH], pathW[MAX_PATH]; IEnumVARIANT *enumvar; @@ -1047,7 +1011,7 @@ static void test_FolderCollection(void) BSTR str; int found_a = 0, found_b = 0, found_c = 0; - get_temp_path(fooW, buffW); + get_temp_path(L"foo", buffW); CreateDirectoryW(buffW, NULL); str = SysAllocString(buffW); @@ -1205,10 +1169,9 @@ static void test_FolderCollection(void) /* Please keep the tests for IFolderCollection and IFileCollection in sync */ static void test_FileCollection(void) { - static const WCHAR fooW[] = {'\\','f','o','o',0}; - static const WCHAR aW[] = {'\\','a',0}; - static const WCHAR bW[] = {'\\','b',0}; - static const WCHAR cW[] = {'\\','c',0}; + static const WCHAR aW[] = L"\\a"; + static const WCHAR bW[] = L"\\b"; + static const WCHAR cW[] = L"\\c"; WCHAR buffW[MAX_PATH], pathW[MAX_PATH]; IFolder *folder; IFileCollection *files; @@ -1223,7 +1186,7 @@ static void test_FileCollection(void) HANDLE file_a, file_b, file_c; int found_a = 0, found_b = 0, found_c = 0; - get_temp_path(fooW, buffW); + get_temp_path(L"\\foo", buffW); CreateDirectoryW(buffW, NULL); str = SysAllocString(buffW); @@ -1492,10 +1455,8 @@ static void test_DriveCollection(void) static void get_temp_filepath(const WCHAR *filename, WCHAR *path, WCHAR *dir) { - static const WCHAR scrrunW[] = {'s','c','r','r','u','n','\\',0}; - GetTempPathW(MAX_PATH, path); - lstrcatW(path, scrrunW); + lstrcatW(path, L"scrrun\\"); lstrcpyW(dir, path); lstrcatW(path, filename); } @@ -1646,8 +1607,8 @@ static void test_WriteLine(void) static void test_ReadAll(void) { - static const WCHAR secondlineW[] = {'s','e','c','o','n','d',0}; - static const WCHAR aW[] = {'A',0}; + static const WCHAR secondlineW[] = L"second"; + static const WCHAR aW[] = L"A"; WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[500]; ITextStream *stream; BSTR nameW; @@ -1773,8 +1734,7 @@ static void test_ReadAll(void) static void test_Read(void) { - static const WCHAR secondlineW[] = {'s','e','c','o','n','d',0}; - static const WCHAR aW[] = {'A',0}; + static const WCHAR secondlineW[] = L"second"; WCHAR pathW[MAX_PATH], dirW[MAX_PATH], buffW[500]; ITextStream *stream; BSTR nameW; @@ -2016,7 +1976,7 @@ static void test_Read(void) /* 1. one byte content, not enough for Unicode read */ hr = IFileSystem3_CreateTextFile(fs3, nameW, VARIANT_TRUE, VARIANT_FALSE, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); - str = SysAllocString(aW); + str = SysAllocString(L"A"); hr = ITextStream_Write(stream, str); ok(hr == S_OK, "got 0x%08x\n", hr); SysFreeString(str); -- 2.25.0

1 0

[PATCH] mfplat/tests: Use wide string literals.
by Nikolay Sivov 17 Feb '20

17 Feb '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/tests/mfplat.c | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) diff --git a/dlls/mfplat/tests/mfplat.c b/dlls/mfplat/tests/mfplat.c index ec84c6c261..6800441ba2 100644 --- a/dlls/mfplat/tests/mfplat.c +++ b/dlls/mfplat/tests/mfplat.c @@ -90,8 +90,7 @@ static HRESULT (WINAPI *pMFTUnregisterLocal)(IClassFactory *factory); static HRESULT (WINAPI *pMFTUnregisterLocalByCLSID)(CLSID clsid); static HRESULT (WINAPI *pMFAllocateWorkQueueEx)(MFASYNC_WORKQUEUE_TYPE queue_type, DWORD *queue); -static const WCHAR mp4file[] = {'t','e','s','t','.','m','p','4',0}; -static const WCHAR fileschemeW[] = {'f','i','l','e',':','/','/',0}; +static const WCHAR fileschemeW[] = L"file://"; static WCHAR *load_resource(const WCHAR *name) { @@ -177,7 +176,7 @@ static BOOL check_clsid(CLSID *clsids, UINT32 count) static void test_register(void) { - static WCHAR name[] = {'W','i','n','e',' ','t','e','s','t',0}; + WCHAR name[] = L"Wine test"; MFT_REGISTER_TYPE_INFO input[] = { { DUMMY_CLSID, DUMMY_GUID1 } @@ -433,7 +432,7 @@ static void test_source_resolver(void) IMFSourceResolver_Release(resolver2); - filename = load_resource(mp4file); + filename = load_resource(L"test.mp4"); hr = MFCreateFile(MF_ACCESSMODE_READ, MF_OPENMODE_FAIL_IF_NOT_EXIST, MF_FILEFLAGS_NONE, filename, &stream); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -862,7 +861,7 @@ static void check_attr_type(IMFAttributes *obj, const GUID *key, MF_ATTRIBUTE_TY static void test_attributes(void) { - static const WCHAR stringW[] = {'W','i','n','e',0}; + static const WCHAR stringW[] = L"Wine"; static const UINT8 blob[] = {0,1,2,3,4,5}; IMFAttributes *attributes, *attributes1; UINT8 blob_value[256], *blob_buf = NULL; @@ -1473,6 +1472,7 @@ static void test_MFCreateMFByteStreamOnStream(void) static void test_file_stream(void) { + static const WCHAR newfilename[] = L"new.mp4"; IMFByteStream *bytestream, *bytestream2; QWORD bytestream_length, position; IMFAttributes *attributes = NULL; @@ -1485,9 +1485,7 @@ static void test_file_stream(void) WCHAR *str; BOOL eos; - static const WCHAR newfilename[] = {'n','e','w','.','m','p','4',0}; - - filename = load_resource(mp4file); + filename = load_resource(L"test.mp4"); hr = MFStartup(MF_VERSION, MFSTARTUP_FULL); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -3231,7 +3229,6 @@ static void test_MFCompareFullToPartialMediaType(void) static void test_attributes_serialization(void) { - static const WCHAR textW[] = {'T','e','x','t',0}; static const UINT8 blob[] = {1,2,3}; IMFAttributes *attributes, *dest; UINT32 size, count, value32; @@ -3283,7 +3280,7 @@ static void test_attributes_serialization(void) IMFAttributes_SetDouble(attributes, &IID_IUnknown, 0.5); IMFAttributes_SetUnknown(attributes, &IID_IMFAttributes, (IUnknown *)attributes); IMFAttributes_SetGUID(attributes, &GUID_NULL, &IID_IUnknown); - IMFAttributes_SetString(attributes, &DUMMY_CLSID, textW); + IMFAttributes_SetString(attributes, &DUMMY_CLSID, L"Text"); IMFAttributes_SetBlob(attributes, &DUMMY_GUID1, blob, sizeof(blob)); hr = MFGetAttributesAsBlobSize(attributes, &size); @@ -3313,7 +3310,7 @@ static void test_attributes_serialization(void) ok(IsEqualGUID(&guid, &IID_IUnknown), "Unexpected guid.\n"); hr = IMFAttributes_GetAllocatedString(dest, &DUMMY_CLSID, &str, &size); ok(hr == S_OK, "Failed to get string value, hr %#x.\n", hr); - ok(!lstrcmpW(str, textW), "Unexpected string.\n"); + ok(!lstrcmpW(str, L"Text"), "Unexpected string.\n"); CoTaskMemFree(str); hr = IMFAttributes_GetAllocatedBlob(dest, &DUMMY_GUID1, &buffer, &size); ok(hr == S_OK, "Failed to get blob value, hr %#x.\n", hr); @@ -3755,7 +3752,7 @@ static const IMFActivateVtbl activate_object_vtbl = static void test_local_handlers(void) { IMFActivate local_activate = { &activate_object_vtbl }; - static const WCHAR localW[] = {'l','o','c','a','l',0}; + static const WCHAR localW[] = L"local"; HRESULT hr; if (!pMFRegisterLocalSchemeHandler) -- 2.25.0

1 0