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

[PATCH v3 1/6] user32/tests: Add basic GetRegisteredRawInputDevices tests.
by Rémi Bernon 10 Aug '20

10 Aug '20

There's already some in dinput, but this is a more appropriate location. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- v3: Add some more error case tests with insufficient buffer sizes. dlls/user32/tests/input.c | 79 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 75 insertions(+), 4 deletions(-) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index bab0fd97536..4310ad1f296 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -1764,11 +1764,15 @@ static void test_GetRawInputData(void) static void test_RegisterRawInputDevices(void) { HWND hwnd; - RAWINPUTDEVICE raw_devices[1]; + RAWINPUTDEVICE raw_devices[2]; + UINT count, raw_devices_count; BOOL res; + memset(raw_devices, 0, sizeof(raw_devices)); raw_devices[0].usUsagePage = 0x01; raw_devices[0].usUsage = 0x05; + raw_devices[1].usUsagePage = 0x01; + raw_devices[1].usUsage = 0x04; hwnd = CreateWindowExA(WS_EX_TOPMOST, "static", "dinput", WS_POPUP | WS_VISIBLE, 0, 0, 100, 100, NULL, NULL, NULL, NULL); ok(hwnd != NULL, "CreateWindowExA failed\n"); @@ -1778,9 +1782,6 @@ static void test_RegisterRawInputDevices(void) ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); - raw_devices[0].dwFlags = 0; - raw_devices[0].hwndTarget = 0; - SetLastError(0xdeadbeef); res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), 0); ok(res == FALSE, "RegisterRawInputDevices succeeded\n"); @@ -1791,10 +1792,76 @@ static void test_RegisterRawInputDevices(void) ok(res == TRUE, "RegisterRawInputDevices failed\n"); ok(GetLastError() == 0xdeadbeef, "RegisterRawInputDevices returned %08x\n", GetLastError()); + SetLastError(0xdeadbeef); + count = GetRegisteredRawInputDevices(NULL, NULL, 0); + todo_wine + ok(count == ~0U, "GetRegisteredRawInputDevices returned %u\n", count); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + raw_devices_count = 0; + count = GetRegisteredRawInputDevices(NULL, &raw_devices_count, 0); + todo_wine + ok(count == ~0U, "GetRegisteredRawInputDevices returned %u\n", count); + ok(raw_devices_count == 0, "Unexpected registered devices count: %u\n", raw_devices_count); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + raw_devices_count = 0; + count = GetRegisteredRawInputDevices(NULL, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + ok(count == 0, "GetRegisteredRawInputDevices returned %u\n", count); + todo_wine + ok(raw_devices_count == 2, "Unexpected registered devices count: %u\n", raw_devices_count); + ok(GetLastError() == 0xdeadbeef, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + raw_devices_count = 0; + count = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + if (broken(count == 0) /* depends on windows versions */) + win_skip("Ignoring GetRegisteredRawInputDevices success\n"); + else + { + todo_wine + ok(count == ~0U, "GetRegisteredRawInputDevices returned %u\n", count); + ok(raw_devices_count == 0, "Unexpected registered devices count: %u\n", raw_devices_count); + todo_wine + ok(GetLastError() == ERROR_INVALID_PARAMETER, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + } + + SetLastError(0xdeadbeef); + raw_devices_count = 1; + count = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + todo_wine + ok(count == ~0U, "GetRegisteredRawInputDevices returned %u\n", count); + todo_wine + ok(raw_devices_count == 2, "Unexpected registered devices count: %u\n", raw_devices_count); + todo_wine + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + + SetLastError(0xdeadbeef); + memset(raw_devices, 0, sizeof(raw_devices)); + raw_devices_count = ARRAY_SIZE(raw_devices); + count = GetRegisteredRawInputDevices(raw_devices, &raw_devices_count, sizeof(RAWINPUTDEVICE)); + todo_wine + ok(count == 2, "GetRegisteredRawInputDevices returned %u\n", count); + ok(raw_devices_count == 2, "Unexpected registered devices count: %u\n", raw_devices_count); + ok(GetLastError() == 0xdeadbeef, "GetRegisteredRawInputDevices unexpected error %08x\n", GetLastError()); + todo_wine + ok(raw_devices[0].usUsagePage == 0x01, "Unexpected usage page: %x\n", raw_devices[0].usUsagePage); + todo_wine + ok(raw_devices[0].usUsage == 0x04, "Unexpected usage: %x\n", raw_devices[0].usUsage); + todo_wine + ok(raw_devices[1].usUsagePage == 0x01, "Unexpected usage page: %x\n", raw_devices[1].usUsagePage); + todo_wine + ok(raw_devices[1].usUsage == 0x05, "Unexpected usage: %x\n", raw_devices[1].usUsage); /* RIDEV_REMOVE requires hwndTarget == NULL */ raw_devices[0].dwFlags = RIDEV_REMOVE; raw_devices[0].hwndTarget = hwnd; + raw_devices[1].dwFlags = RIDEV_REMOVE; + raw_devices[1].hwndTarget = hwnd; SetLastError(0xdeadbeef); res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); @@ -1802,6 +1869,7 @@ static void test_RegisterRawInputDevices(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); raw_devices[0].hwndTarget = 0; + raw_devices[1].hwndTarget = 0; SetLastError(0xdeadbeef); res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); @@ -1812,6 +1880,8 @@ static void test_RegisterRawInputDevices(void) /* RIDEV_INPUTSINK requires hwndTarget != NULL */ raw_devices[0].dwFlags = RIDEV_INPUTSINK; raw_devices[0].hwndTarget = 0; + raw_devices[1].dwFlags = RIDEV_INPUTSINK; + raw_devices[1].hwndTarget = 0; SetLastError(0xdeadbeef); res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); @@ -1819,6 +1889,7 @@ static void test_RegisterRawInputDevices(void) ok(GetLastError() == ERROR_INVALID_PARAMETER, "RegisterRawInputDevices returned %08x\n", GetLastError()); raw_devices[0].hwndTarget = hwnd; + raw_devices[1].hwndTarget = hwnd; SetLastError(0xdeadbeef); res = RegisterRawInputDevices(raw_devices, ARRAY_SIZE(raw_devices), sizeof(RAWINPUTDEVICE)); -- 2.27.0

5 26

[PATCH] wbemprox: Return WBEM_E_NOT_FOUND from get_object() if no object is available.
by Zebediah Figura 10 Aug '20

10 Aug '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49685 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wbemprox/services.c | 4 +++- dlls/wbemprox/tests/query.c | 10 ++++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/dlls/wbemprox/services.c b/dlls/wbemprox/services.c index e2b452e217e..c0e535b3a11 100644 --- a/dlls/wbemprox/services.c +++ b/dlls/wbemprox/services.c @@ -450,6 +450,7 @@ HRESULT get_object( const WCHAR *object_path, IWbemClassObject **obj ) { IEnumWbemClassObject *iter; struct path *path; + ULONG count; HRESULT hr; hr = parse_path( object_path, &path ); @@ -461,7 +462,8 @@ HRESULT get_object( const WCHAR *object_path, IWbemClassObject **obj ) free_path( path ); return hr; } - hr = create_class_object( path->class, iter, 0, NULL, obj ); + hr = IEnumWbemClassObject_Next( iter, WBEM_INFINITE, 1, obj, &count ); + if (hr == WBEM_S_FALSE) hr = WBEM_E_NOT_FOUND; IEnumWbemClassObject_Release( iter ); free_path( path ); return hr; diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index e48722f3bc9..a50002e1baf 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -267,7 +267,9 @@ static void test_Win32_Service( IWbemServices *services ) if (hr != S_OK) { win_skip( "Win32_Service not available\n" ); - goto out; + SysFreeString( empty ); + SysFreeString( class ); + return; } check_property( service, L"ProcessID", VT_I4, CIM_UINT32 ); @@ -343,9 +345,13 @@ static void test_Win32_Service( IWbemServices *services ) ok( hr == S_OK, "got %08x\n", hr ); if (service) IWbemClassObject_Release( service ); -out: SysFreeString( empty ); SysFreeString( class ); + + class = SysAllocString( L"Win32_Service.Name=\"nonexistent\"" ); + hr = IWbemServices_GetObject( services, class, 0, NULL, &service, NULL ); + ok( hr == WBEM_E_NOT_FOUND, "got %#08x\n", hr ); + SysFreeString( class ); } static void test_Win32_Bios( IWbemServices *services ) -- 2.28.0

2 1

[PATCH] wbemprox: Don't fail when given invalid flag combinations in IWbemClassObject::GetNames().
by Gijs Vermeulen 10 Aug '20

10 Aug '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=34770 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/wbemprox/class.c | 15 ++++++++++----- dlls/wbemprox/tests/query.c | 15 +++++++++++++++ 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/dlls/wbemprox/class.c b/dlls/wbemprox/class.c index db6017e0c9..b146b04df8 100644 --- a/dlls/wbemprox/class.c +++ b/dlls/wbemprox/class.c @@ -484,13 +484,18 @@ static HRESULT WINAPI class_object_GetNames( TRACE("%p, %s, %08x, %s, %p\n", iface, debugstr_w(wszQualifierName), lFlags, debugstr_variant(pQualifierVal), pNames); - if (lFlags != WBEM_FLAG_ALWAYS && + if (!pNames) + return WBEM_E_INVALID_PARAMETER; + + /* Combination used in a handful of broken apps */ + if (lFlags == (WBEM_FLAG_ALWAYS | WBEM_MASK_CONDITION_ORIGIN)) + lFlags = WBEM_FLAG_ALWAYS; + + if (!!lFlags && (lFlags != WBEM_FLAG_ALWAYS && lFlags != WBEM_FLAG_NONSYSTEM_ONLY && - lFlags != WBEM_FLAG_SYSTEM_ONLY) - { + lFlags != WBEM_FLAG_SYSTEM_ONLY)) FIXME("flags %08x not supported\n", lFlags); - return E_NOTIMPL; - } + if (wszQualifierName || pQualifierVal) FIXME("qualifier not supported\n"); diff --git a/dlls/wbemprox/tests/query.c b/dlls/wbemprox/tests/query.c index e48722f3bc..476840fbc3 100644 --- a/dlls/wbemprox/tests/query.c +++ b/dlls/wbemprox/tests/query.c @@ -1009,6 +1009,21 @@ static void test_GetNames( IWbemServices *services ) IEnumWbemClassObject_Next( result, 10000, 1, &obj, &count ); if (!count) break; + hr = IWbemClassObject_GetNames( obj, NULL, 0, NULL, NULL ); + ok( hr == WBEM_E_INVALID_PARAMETER, "got %08x\n", hr ); + + hr = IWbemClassObject_GetNames( obj, NULL, 0, NULL, &names ); + ok( hr == S_OK, "got %08x\n", hr ); + SafeArrayDestroy( names ); + + hr = IWbemClassObject_GetNames( obj, NULL, WBEM_FLAG_ALWAYS, NULL, &names ); + ok( hr == S_OK, "got %08x\n", hr ); + SafeArrayDestroy( names ); + + hr = IWbemClassObject_GetNames( obj, NULL, WBEM_FLAG_ALWAYS | WBEM_MASK_CONDITION_ORIGIN, NULL, &names ); + ok( hr == S_OK, "got %08x\n", hr ); + SafeArrayDestroy( names ); + VariantInit( &val ); hr = IWbemClassObject_GetNames( obj, NULL, WBEM_FLAG_NONSYSTEM_ONLY, &val, &names ); ok( hr == S_OK, "got %08x\n", hr ); -- 2.28.0

2 1

[PATCH 1/6] combase: Move CoGetInstanceFromIStorage().
by Nikolay Sivov 10 Aug '20

10 Aug '20

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/combase/combase.c | 50 +++++++++++++++++++++++++++++++ dlls/combase/combase.spec | 2 +- dlls/ole32/compobj.c | 63 --------------------------------------- dlls/ole32/ole32.spec | 2 +- 4 files changed, 52 insertions(+), 65 deletions(-) diff --git a/dlls/combase/combase.c b/dlls/combase/combase.c index 06fc97e17d4..88da5fb888e 100644 --- a/dlls/combase/combase.c +++ b/dlls/combase/combase.c @@ -725,3 +725,53 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoGetInstanceFromFile(COSERVERINFO *server_info return hr; } } + +/*********************************************************************** + * CoGetInstanceFromIStorage (combase.@) + */ +HRESULT WINAPI CoGetInstanceFromIStorage(COSERVERINFO *server_info, CLSID *rclsid, + IUnknown *outer, DWORD cls_context, IStorage *storage, DWORD count, MULTI_QI *results) +{ + IPersistStorage *ps = NULL; + IUnknown *obj = NULL; + STATSTG stat; + HRESULT hr; + + if (!count || !results || !storage) + return E_INVALIDARG; + + if (server_info) + FIXME("() non-NULL server_info not supported\n"); + + init_multi_qi(count, results, E_NOINTERFACE); + + if (!rclsid) + { + memset(&stat.clsid, 0, sizeof(stat.clsid)); + hr = IStorage_Stat(storage, &stat, STATFLAG_NONAME); + if (FAILED(hr)) + { + ERR("Failed to get CLSID from a storage.\n"); + return hr; + } + + rclsid = &stat.clsid; + } + + hr = CoCreateInstance(rclsid, outer, cls_context, &IID_IUnknown, (void **)&obj); + if (hr != S_OK) + return hr; + + /* Init from IStorage */ + hr = IUnknown_QueryInterface(obj, &IID_IPersistStorage, (void **)&ps); + if (FAILED(hr)) + ERR("failed to get IPersistStorage\n"); + + if (ps) + { + IPersistStorage_Load(ps, storage); + IPersistStorage_Release(ps); + } + + return return_multi_qi(obj, count, results, FALSE); +} diff --git a/dlls/combase/combase.spec b/dlls/combase/combase.spec index e90df05446e..de0ebe7cd31 100644 --- a/dlls/combase/combase.spec +++ b/dlls/combase/combase.spec @@ -108,7 +108,7 @@ @ stdcall CoGetDefaultContext(long ptr ptr) ole32.CoGetDefaultContext @ stub CoGetErrorInfo @ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) -@ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) ole32.CoGetInstanceFromIStorage +@ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) @ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) ole32.CoGetInterfaceAndReleaseStream @ stdcall CoGetMalloc(long ptr) @ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) ole32.CoGetMarshalSizeMax diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 1ad8a4b1d1d..e63759c0609 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3434,69 +3434,6 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoCreateInstanceEx( return return_multi_qi(unk, cmq, pResults, TRUE); } -/*********************************************************************** - * CoGetInstanceFromIStorage [OLE32.@] - */ -HRESULT WINAPI CoGetInstanceFromIStorage( - COSERVERINFO *server_info, - CLSID *rclsid, - IUnknown *outer, - DWORD cls_context, - IStorage *storage, - DWORD count, - MULTI_QI *results -) -{ - IPersistStorage *ps = NULL; - IUnknown* unk = NULL; - STATSTG stat; - HRESULT hr; - - if (count == 0 || !results || !storage) - return E_INVALIDARG; - - if (server_info) - FIXME("() non-NULL server_info not supported\n"); - - init_multi_qi(count, results, E_NOINTERFACE); - - /* optionally get CLSID from a file */ - if (!rclsid) - { - memset(&stat.clsid, 0, sizeof(stat.clsid)); - hr = IStorage_Stat(storage, &stat, STATFLAG_NONAME); - if (FAILED(hr)) - { - ERR("failed to get CLSID from a file\n"); - return hr; - } - - rclsid = &stat.clsid; - } - - hr = CoCreateInstance(rclsid, - outer, - cls_context, - &IID_IUnknown, - (void**)&unk); - - if (hr != S_OK) - return hr; - - /* init from IStorage */ - hr = IUnknown_QueryInterface(unk, &IID_IPersistStorage, (void**)&ps); - if (FAILED(hr)) - ERR("failed to get IPersistStorage\n"); - - if (ps) - { - IPersistStorage_Load(ps, storage); - IPersistStorage_Release(ps); - } - - return return_multi_qi(unk, count, results, FALSE); -} - /*********************************************************************** * CoLoadLibrary (OLE32.@) * diff --git a/dlls/ole32/ole32.spec b/dlls/ole32/ole32.spec index b1949eec8ec..6f44e298af8 100644 --- a/dlls/ole32/ole32.spec +++ b/dlls/ole32/ole32.spec @@ -36,7 +36,7 @@ @ stdcall CoGetCurrentProcess() @ stdcall CoGetDefaultContext(long ptr ptr) @ stdcall CoGetInstanceFromFile(ptr ptr ptr long long wstr long ptr) combase.CoGetInstanceFromFile -@ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) +@ stdcall CoGetInstanceFromIStorage(ptr ptr ptr long ptr long ptr) combase.CoGetInstanceFromIStorage @ stdcall CoGetInterfaceAndReleaseStream(ptr ptr ptr) @ stdcall CoGetMalloc(long ptr) combase.CoGetMalloc @ stdcall CoGetMarshalSizeMax(ptr ptr ptr long ptr long) -- 2.28.0

3 12

[PATCH] urlmon: Fix spelling of "hierpart"
by Alex Henrie 09 Aug '20

09 Aug '20

Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/urlmon/uri.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index b09e78839f..f490fc0302 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -3398,7 +3398,7 @@ static HRESULT canonicalize_uri(const parse_data *data, Uri *uri, DWORD flags) { uri->scheme_type = data->scheme_type; if(!canonicalize_hierpart(data, uri, flags, FALSE)) { - ERR("(%p %p %x): Unable to canonicalize the heirpart of the URI\n", data, uri, flags); + ERR("(%p %p %x): Unable to canonicalize the hierpart of the URI\n", data, uri, flags); return E_INVALIDARG; } -- 2.27.0

1 1

[PATCH] kernelbase/tests: Add test for Sleep(1).
by Myah Caron 09 Aug '20

09 Aug '20

Sleep(1) does not sleep for a millisecond, but rather a kernel tick. Thanks to Henri Verbeet for pointing this out. Wine-bug: https://bugs.winehq.org/show_bug.cgi?id=49564 Signed-off-by: Myah Caron <qsniyg(a)protonmail.com> --- I've tested it under Windows 10, but when testing shortly after the machine booted, it appears to sleep for ~1.6ms on average (rather than ~16ms). I'm not sure what is the reason, but my guess is that the kernel tick was possibly shorter when it booted? dlls/kernelbase/tests/sync.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/dlls/kernelbase/tests/sync.c b/dlls/kernelbase/tests/sync.c index 9f57cf7a95..f89e93261b 100644 --- a/dlls/kernelbase/tests/sync.c +++ b/dlls/kernelbase/tests/sync.c @@ -172,6 +172,31 @@ static void test_WaitOnAddress(void) ok(!address, "got unexpected value %s\n", wine_dbgstr_longlong(address)); } +static void test_Sleep(void) +{ + LARGE_INTEGER frequency; + LARGE_INTEGER t1, t2; + double elapsed_time; + BOOL ret; + int i; + + ret = QueryPerformanceFrequency(&frequency); + ok(ret, "QueryPerformanceFrequency failed\n"); + + ret = QueryPerformanceCounter(&t1); + ok(ret, "QueryPerformanceCounter failed\n"); + + for (i = 0; i < 100; i++) { + Sleep(1); + } + + ret = QueryPerformanceCounter(&t2); + ok(ret, "QueryPerformanceCounter failed\n"); + + elapsed_time = (t2.QuadPart - t1.QuadPart) / (double)frequency.QuadPart; + todo_wine ok(elapsed_time >= 1.5 && elapsed_time <= 2.1, "got %f\n", elapsed_time); +} + START_TEST(sync) { HMODULE hmod; @@ -186,4 +211,5 @@ START_TEST(sync) pWakeByAddressSingle = (void *)GetProcAddress(hmod, "WakeByAddressSingle"); test_WaitOnAddress(); + test_Sleep(); } -- 2.27.0

2 1

[PATCH v2] CMD: Always keep drive letter uppercase.
by Gareth Poole 08 Aug '20

08 Aug '20

Windows and DOS before it has always kept the drive letter in uppercase at the command line, regardless of what input it is given. Since drive letters are case-insensitive this should not affect path resolution, but it is more consistent with both the behaviour of Windows, and the behaviour that Wine CMD already displays with directory names, which it shows in their canonical case. Signed-off-by: Gareth Poole <girpoole(a)gmail.com> --- programs/cmd/wcmdmain.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 97cc607a64..a442046cea 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -392,12 +392,14 @@ static void WCMD_show_prompt (BOOL newLine) { break; case 'N': status = GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); + curdir[0] = toupper(curdir[0]); if (status) { *q++ = curdir[0]; } break; case 'P': status = GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); + curdir[0] = toupper(curdir[0]); if (status) { lstrcatW (q, curdir); while (*q) q++; @@ -1384,6 +1386,7 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, WCHAR envvar[5]; WCHAR dir[MAX_PATH]; + cmd[0] = toupper(cmd[0]); /* Ignore potential garbage on the same line */ cmd[2]=0x00; -- 2.27.0

1 0

[PATCH] CMD: Always keep drive letter uppercase.
by Gareth Poole 08 Aug '20

08 Aug '20

Windows and DOS before it has always kept the drive letter in uppercase at the command line, regardless of what input it is given. Since paths are case-insensitive this should not affect path resolution, but it is more consistent with bothe behaviour of Windows, and the behaviour that Wine CMD already displays with directory names. Signed-off-by: Gareth Poole <girpoole(a)gmail.com> --- programs/cmd/wcmdmain.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 97cc607a64..5f5f65fe34 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -392,12 +392,20 @@ static void WCMD_show_prompt (BOOL newLine) { break; case 'N': status = GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); + /* No need to worry about surrogates here, because all possible */ + /* drive letters are in the BMP. */ + if (IsCharAlphaW(curdir[0])) { /* Check if the path begins with a drive letter. */ + curdir[0] = toupper(curdir[0]); /* Ensure that the drive letter is shown in uppercase. */ + } if (status) { *q++ = curdir[0]; } break; case 'P': status = GetCurrentDirectoryW(ARRAY_SIZE(curdir), curdir); + if (IsCharAlphaW(curdir[0])) { + curdir[0] = toupper(curdir[0]); + } if (status) { lstrcatW (q, curdir); while (*q) q++; @@ -1383,7 +1391,9 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, (!cmd[2] || cmd[2] == ' ' || cmd[2] == '\t')) { WCHAR envvar[5]; WCHAR dir[MAX_PATH]; - + /* Make sure that the working directory is set to the */ + /* canonical uppercase version of the drive letter. */ + cmd[0] = toupper(cmd[0]); /* Ignore potential garbage on the same line */ cmd[2]=0x00; -- 2.27.0

2 1

[PATCH vkd3d] vkd3d-shader: Make VKD3D_SHADER_SWIZZLE more legible.
by Zebediah Figura 08 Aug '20

08 Aug '20

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- include/vkd3d_shader.h | 14 ++++++-------- libs/vkd3d-shader/dxbc.c | 3 +-- libs/vkd3d/state.c | 3 +-- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index 7c7b727..88eca85 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -818,14 +818,12 @@ struct vkd3d_shader_signature #define VKD3D_SHADER_SWIZZLE_SHIFT(idx) (2u * (idx)) #define VKD3D_SHADER_SWIZZLE(x, y, z, w) \ - (((x & VKD3D_SHADER_SWIZZLE_MASK) << VKD3D_SHADER_SWIZZLE_SHIFT(0)) \ - | ((y & VKD3D_SHADER_SWIZZLE_MASK) << VKD3D_SHADER_SWIZZLE_SHIFT(1)) \ - | ((z & VKD3D_SHADER_SWIZZLE_MASK) << VKD3D_SHADER_SWIZZLE_SHIFT(2)) \ - | ((w & VKD3D_SHADER_SWIZZLE_MASK) << VKD3D_SHADER_SWIZZLE_SHIFT(3))) - -#define VKD3D_SHADER_NO_SWIZZLE \ - VKD3D_SHADER_SWIZZLE(VKD3D_SHADER_SWIZZLE_X, VKD3D_SHADER_SWIZZLE_Y, \ - VKD3D_SHADER_SWIZZLE_Z, VKD3D_SHADER_SWIZZLE_W) + (((VKD3D_SHADER_SWIZZLE_ ## x) << VKD3D_SHADER_SWIZZLE_SHIFT(0)) \ + | ((VKD3D_SHADER_SWIZZLE_ ## y) << VKD3D_SHADER_SWIZZLE_SHIFT(1)) \ + | ((VKD3D_SHADER_SWIZZLE_ ## z) << VKD3D_SHADER_SWIZZLE_SHIFT(2)) \ + | ((VKD3D_SHADER_SWIZZLE_ ## w) << VKD3D_SHADER_SWIZZLE_SHIFT(3))) + +#define VKD3D_SHADER_NO_SWIZZLE VKD3D_SHADER_SWIZZLE(X, Y, Z, W) typedef void (*PFN_vkd3d_shader_free_blob_data)(void *); diff --git a/libs/vkd3d-shader/dxbc.c b/libs/vkd3d-shader/dxbc.c index 1aa8a5c..81c1f48 100644 --- a/libs/vkd3d-shader/dxbc.c +++ b/libs/vkd3d-shader/dxbc.c @@ -1669,8 +1669,7 @@ static bool shader_sm4_read_src_param(struct vkd3d_sm4_data *priv, const DWORD * { case VKD3D_SM4_SWIZZLE_NONE: if (shader_sm4_is_scalar_register(&src_param->reg)) - src_param->swizzle = VKD3D_SHADER_SWIZZLE(VKD3D_SHADER_SWIZZLE_X, - VKD3D_SHADER_SWIZZLE_X, VKD3D_SHADER_SWIZZLE_X, VKD3D_SHADER_SWIZZLE_X); + src_param->swizzle = VKD3D_SHADER_SWIZZLE(X, X, X, X); else src_param->swizzle = VKD3D_SHADER_NO_SWIZZLE; break; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 449f242..a64d17f 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1971,8 +1971,7 @@ static HRESULT compute_input_layout_offsets(const struct d3d12_device *device, static unsigned int vkd3d_get_rt_format_swizzle(const struct vkd3d_format *format) { if (format->dxgi_format == DXGI_FORMAT_A8_UNORM) - return VKD3D_SHADER_SWIZZLE(VKD3D_SHADER_SWIZZLE_W, VKD3D_SHADER_SWIZZLE_X, - VKD3D_SHADER_SWIZZLE_Y, VKD3D_SHADER_SWIZZLE_Z); + return VKD3D_SHADER_SWIZZLE(W, X, Y, Z); return VKD3D_SHADER_NO_SWIZZLE; } -- 2.27.0

2 1

RE: Re: dispinterface/custdata typelib conformance
by Puetz Kevin A 07 Aug '20

07 Aug '20

> > Kind of a long series, but with the generated code in tests/typelib.c > > I found squashing much more made it difficult to keep straight, which > > presumably would make reviewing it hard too. > > Generally it's better just to send a few patches at a time (5 is a good > number), in particular just by waiting to send the rest rather than trying to > squash anything. Yeah, but if I just withheld the conclusion a reviewer couldn't see the conformance tests which demonstrate the changes match windows. Or, in v1, pointed out it didn't on x64 (oops!). I agree a series this long is not ideal and won't make a habit of it. It's perfectly fine if the review/merge is taken in smaller chunks, and that's why I included a cover letter pointing out 6/13 and 11/13 as reasonable spots to pause/split it at. The fixes are pretty independent, but the for-loop shape of test_dump_typelib doesn't lend itself to using todo_wine to suppress individual failures. And you said failing tests first, followed by subsequent fixes to make them pass, was not OK because it breaks bisecting (a reasonable objection). Which added up to a long series fixing multiple gaps in oleaut32/widl that all had to work before there could be coverage added to test_tlb.idl

1 0