November 2018 - Wine-devel - list.winehq.org

[PATCH 3/5] kernelbase: Implement PathCchCombine.
by Zhiyi Zhang 26 Nov '18

26 Nov '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-core-path-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/path.c | 7 ++ dlls/kernelbase/tests/path.c | 64 +++++++++++++++++++ include/pathcch.h | 1 + 5 files changed, 74 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec index dfa7b81ba0..a722f24443 100644 --- a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec @@ -7,7 +7,7 @@ @ stub PathCchAppendEx @ stdcall PathCchCanonicalize(ptr long wstr) kernelbase.PathCchCanonicalize @ stdcall PathCchCanonicalizeEx(ptr long wstr long) kernelbase.PathCchCanonicalizeEx -@ stub PathCchCombine +@ stdcall PathCchCombine(ptr long wstr wstr) kernelbase.PathCchCombine @ stdcall PathCchCombineEx(ptr long wstr wstr long) kernelbase.PathCchCombineEx @ stdcall PathCchFindExtension(wstr long ptr) kernelbase.PathCchFindExtension @ stdcall PathCchIsRoot(wstr) kernelbase.PathCchIsRoot diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 9040633324..bad32e8db4 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1036,7 +1036,7 @@ # @ stub PathCchAppendEx @ stdcall PathCchCanonicalize(ptr long wstr) @ stdcall PathCchCanonicalizeEx(ptr long wstr long) -# @ stub PathCchCombine +@ stdcall PathCchCombine(ptr long wstr wstr) @ stdcall PathCchCombineEx(ptr long wstr wstr long) @ stdcall PathCchFindExtension(wstr long ptr) @ stdcall PathCchIsRoot(wstr) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 92a747bd0b..a9186a1156 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -496,6 +496,13 @@ HRESULT WINAPI PathCchCanonicalizeEx(WCHAR *out, SIZE_T size, const WCHAR *in, D return hr; } +HRESULT WINAPI PathCchCombine(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2) +{ + TRACE("%p %s %s\n", out, wine_dbgstr_w(path1), wine_dbgstr_w(path2)); + + return PathCchCombineEx(out, size, path1, path2, PATHCCH_NONE); +} + HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags) { HRESULT hr; diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 4061988fb1..30528b7768 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -37,6 +37,7 @@ HRESULT (WINAPI *pPathCchAddBackslashEx)(WCHAR *out, SIZE_T size, WCHAR **endptr HRESULT (WINAPI *pPathCchAddExtension)(WCHAR *path, SIZE_T size, const WCHAR *extension); HRESULT (WINAPI *pPathCchCanonicalize)(WCHAR *out, SIZE_T size, const WCHAR *in); HRESULT (WINAPI *pPathCchCanonicalizeEx)(WCHAR *out, SIZE_T size, const WCHAR *in, DWORD flags); +HRESULT (WINAPI *pPathCchCombine)(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2); HRESULT (WINAPI *pPathCchCombineEx)(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags); HRESULT (WINAPI *pPathCchFindExtension)(const WCHAR *path, SIZE_T size, const WCHAR **extension); BOOL (WINAPI *pPathCchIsRoot)(const WCHAR *path); @@ -474,6 +475,67 @@ static void test_PathAllocCombine(void) } } +static void test_PathCchCombine(void) +{ + WCHAR expected[PATHCCH_MAX_CCH] = {'C', ':', '\\', 'a', 0}; + WCHAR p1[PATHCCH_MAX_CCH] = {'C', ':', '\\', 0}; + WCHAR p2[PATHCCH_MAX_CCH] = {'a', 0}; + WCHAR output[PATHCCH_MAX_CCH]; + HRESULT hr; + INT i; + + if (!pPathCchCombine) + { + win_skip("PathCchCombine() is not available.\n"); + return; + } + + hr = pPathCchCombine(output, 5, NULL, NULL); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + hr = pPathCchCombine(NULL, 2, p1, p2); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + memset(output, 0xff, sizeof(output)); + hr = pPathCchCombine(output, 0, p1, p2); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + ok(output[0] == 0xffff, "Expected output buffer to be unchanged\n"); + + memset(output, 0xff, sizeof(output)); + hr = pPathCchCombine(output, 1, p1, p2); + ok(hr == STRSAFE_E_INSUFFICIENT_BUFFER, "Expected STRSAFE_E_INSUFFICIENT_BUFFER, got %08x\n", hr); + ok(output[0] == 0, "Expected output buffer to contain NULL string\n"); + + memset(output, 0xff, sizeof(output)); + hr = pPathCchCombine(output, 4, p1, p2); + ok(hr == STRSAFE_E_INSUFFICIENT_BUFFER, "Expected STRSAFE_E_INSUFFICIENT_BUFFER, got %08x\n", hr); + ok(output[0] == 0x0, "Expected output buffer to contain NULL string\n"); + + memset(output, 0xff, sizeof(output)); + hr = pPathCchCombine(output, 5, p1, p2); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(!lstrcmpW(output, expected), "Combination of %s + %s returned %s, expected %s\n", wine_dbgstr_w(p1), + wine_dbgstr_w(p2), wine_dbgstr_w(output), wine_dbgstr_w(expected)); + + hr = pPathCchCombine(output, PATHCCH_MAX_CCH + 1, p1, p2); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + + hr = pPathCchCombine(output, PATHCCH_MAX_CCH, p1, p2); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + + for (i = 0; i < ARRAY_SIZE(combine_tests); i++) + { + MultiByteToWideChar(CP_ACP, 0, combine_tests[i].path1, -1, p1, ARRAY_SIZE(p1)); + MultiByteToWideChar(CP_ACP, 0, combine_tests[i].path2, -1, p2, ARRAY_SIZE(p2)); + MultiByteToWideChar(CP_ACP, 0, combine_tests[i].result, -1, expected, ARRAY_SIZE(expected)); + + hr = pPathCchCombine(output, ARRAY_SIZE(output), p1, p2); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + ok(!lstrcmpW(output, expected), "Combining %s with %s returned %s, expected %s\n", wine_dbgstr_w(p1), + wine_dbgstr_w(p2), wine_dbgstr_w(output), wine_dbgstr_w(expected)); + } +} + static void test_PathCchCombineEx(void) { WCHAR expected[MAX_PATH] = {'C',':','\\','a',0}; @@ -2049,6 +2111,7 @@ START_TEST(path) pPathCchAddExtension = (void *)GetProcAddress(hmod, "PathCchAddExtension"); pPathCchCanonicalize = (void *)GetProcAddress(hmod, "PathCchCanonicalize"); pPathCchCanonicalizeEx = (void *)GetProcAddress(hmod, "PathCchCanonicalizeEx"); + pPathCchCombine = (void *)GetProcAddress(hmod, "PathCchCombine"); pPathCchCombineEx = (void *)GetProcAddress(hmod, "PathCchCombineEx"); pPathCchFindExtension = (void *)GetProcAddress(hmod, "PathCchFindExtension"); pPathCchIsRoot = (void *)GetProcAddress(hmod, "PathCchIsRoot"); @@ -2069,6 +2132,7 @@ START_TEST(path) test_PathCchAddExtension(); test_PathCchCanonicalize(); test_PathCchCanonicalizeEx(); + test_PathCchCombine(); test_PathCchCombineEx(); test_PathCchFindExtension(); test_PathCchIsRoot(); diff --git a/include/pathcch.h b/include/pathcch.h index 3cec09cadc..205d4a23a3 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -33,6 +33,7 @@ HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **end, SIZE HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); HRESULT WINAPI PathCchCanonicalize(WCHAR *out, SIZE_T size, const WCHAR *in); HRESULT WINAPI PathCchCanonicalizeEx(WCHAR *out, SIZE_T size, const WCHAR *in, DWORD flags); +HRESULT WINAPI PathCchCombine(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2); HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags); HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR **extension); BOOL WINAPI PathCchIsRoot(const WCHAR *path); -- 2.19.1

1 0

[PATCH 2/5] kernelbase: Implement PathCchCombineEx.
by Zhiyi Zhang 26 Nov '18

26 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42474 Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-core-path-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/path.c | 32 +++++++++++++++++++ dlls/kernelbase/tests/path.c | 21 ++++++++++-- 4 files changed, 52 insertions(+), 5 deletions(-) diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec index f33d589d03..dfa7b81ba0 100644 --- a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec @@ -8,7 +8,7 @@ @ stdcall PathCchCanonicalize(ptr long wstr) kernelbase.PathCchCanonicalize @ stdcall PathCchCanonicalizeEx(ptr long wstr long) kernelbase.PathCchCanonicalizeEx @ stub PathCchCombine -@ stub PathCchCombineEx +@ stdcall PathCchCombineEx(ptr long wstr wstr long) kernelbase.PathCchCombineEx @ stdcall PathCchFindExtension(wstr long ptr) kernelbase.PathCchFindExtension @ stdcall PathCchIsRoot(wstr) kernelbase.PathCchIsRoot @ stdcall PathCchRemoveBackslash(wstr long) kernelbase.PathCchRemoveBackslash diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 303fd3bf47..9040633324 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1037,7 +1037,7 @@ @ stdcall PathCchCanonicalize(ptr long wstr) @ stdcall PathCchCanonicalizeEx(ptr long wstr long) # @ stub PathCchCombine -# @ stub PathCchCombineEx +@ stdcall PathCchCombineEx(ptr long wstr wstr long) @ stdcall PathCchFindExtension(wstr long ptr) @ stdcall PathCchIsRoot(wstr) @ stdcall PathCchRemoveBackslash(wstr long) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 3380b8b4e4..92a747bd0b 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -496,6 +496,38 @@ HRESULT WINAPI PathCchCanonicalizeEx(WCHAR *out, SIZE_T size, const WCHAR *in, D return hr; } +HRESULT WINAPI PathCchCombineEx(WCHAR *out, SIZE_T size, const WCHAR *path1, const WCHAR *path2, DWORD flags) +{ + HRESULT hr; + WCHAR *buffer; + SIZE_T length; + + TRACE("%p %s %s %#x\n", out, wine_dbgstr_w(path1), wine_dbgstr_w(path2), flags); + + if (!out || !size || size > PATHCCH_MAX_CCH) return E_INVALIDARG; + + hr = PathAllocCombine(path1, path2, flags, &buffer); + if (FAILED(hr)) + { + out[0] = 0; + return hr; + } + + length = strlenW(buffer); + if (length + 1 > size) + { + out[0] = 0; + LocalFree(buffer); + return STRSAFE_E_INSUFFICIENT_BUFFER; + } + else + { + memcpy(out, buffer, (length + 1) * sizeof(WCHAR)); + LocalFree(buffer); + return S_OK; + } +} + HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR **extension) { const WCHAR *lastpoint = NULL; diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 2c012ab2bc..4061988fb1 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -485,12 +485,19 @@ static void test_PathCchCombineEx(void) if (!pPathCchCombineEx) { - skip("PathCchCombineEx() is not available.\n"); + win_skip("PathCchCombineEx() is not available.\n"); return; } + output[0] = 0xff; + hr = pPathCchCombineEx(output, 5, NULL, NULL, 0); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + ok(output[0] == 0, "Expected output buffer to be empty\n"); + + output[0] = 0xff; hr = pPathCchCombineEx(NULL, 2, p1, p2, 0); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + ok(output[0] == 0xff, "Expected output buffer to be unchanged\n"); memset(output, 0xff, sizeof(output)); hr = pPathCchCombineEx(output, 0, p1, p2, 0); @@ -507,6 +514,14 @@ static void test_PathCchCombineEx(void) ok(hr == STRSAFE_E_INSUFFICIENT_BUFFER, "Expected STRSAFE_E_INSUFFICIENT_BUFFER, got %08x\n", hr); ok(output[0] == 0x0, "Expected output buffer to contain NULL string\n"); + output[0] = 0xff; + hr = pPathCchCombineEx(output, PATHCCH_MAX_CCH + 1, p1, p2, 0); + ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %08x\n", hr); + ok(output[0] == 0xff, "Expected output buffer to be 0xff\n"); + + hr = pPathCchCombineEx(output, PATHCCH_MAX_CCH, p1, p2, 0); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + memset(output, 0xff, sizeof(output)); hr = pPathCchCombineEx(output, 5, p1, p2, 0); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); @@ -2029,12 +2044,12 @@ START_TEST(path) pPathAllocCanonicalize = (void *)GetProcAddress(hmod, "PathAllocCanonicalize"); pPathAllocCombine = (void *)GetProcAddress(hmod, "PathAllocCombine"); - pPathCchCombineEx = (void *)GetProcAddress(hmod, "PathCchCombineEx"); pPathCchAddBackslash = (void *)GetProcAddress(hmod, "PathCchAddBackslash"); pPathCchAddBackslashEx = (void *)GetProcAddress(hmod, "PathCchAddBackslashEx"); pPathCchAddExtension = (void *)GetProcAddress(hmod, "PathCchAddExtension"); pPathCchCanonicalize = (void *)GetProcAddress(hmod, "PathCchCanonicalize"); pPathCchCanonicalizeEx = (void *)GetProcAddress(hmod, "PathCchCanonicalizeEx"); + pPathCchCombineEx = (void *)GetProcAddress(hmod, "PathCchCombineEx"); pPathCchFindExtension = (void *)GetProcAddress(hmod, "PathCchFindExtension"); pPathCchIsRoot = (void *)GetProcAddress(hmod, "PathCchIsRoot"); pPathCchRemoveBackslash = (void *)GetProcAddress(hmod, "PathCchRemoveBackslash"); @@ -2049,12 +2064,12 @@ START_TEST(path) test_PathAllocCanonicalize(); test_PathAllocCombine(); - test_PathCchCombineEx(); test_PathCchAddBackslash(); test_PathCchAddBackslashEx(); test_PathCchAddExtension(); test_PathCchCanonicalize(); test_PathCchCanonicalizeEx(); + test_PathCchCombineEx(); test_PathCchFindExtension(); test_PathCchIsRoot(); test_PathCchRemoveBackslash(); -- 2.19.1

1 0

[PATCH 1/5] kernelbase: Implement PathAllocCombine.
by Zhiyi Zhang 26 Nov '18

26 Nov '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- .../api-ms-win-core-path-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/path.c | 57 +++++++++ dlls/kernelbase/tests/path.c | 117 ++++++++++++++++-- include/pathcch.h | 1 + 5 files changed, 166 insertions(+), 13 deletions(-) diff --git a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec index 6896e4a8d4..f33d589d03 100644 --- a/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec +++ b/dlls/api-ms-win-core-path-l1-1-0/api-ms-win-core-path-l1-1-0.spec @@ -1,5 +1,5 @@ @ stdcall PathAllocCanonicalize(wstr long ptr) kernelbase.PathAllocCanonicalize -@ stub PathAllocCombine +@ stdcall PathAllocCombine(wstr wstr long ptr) kernelbase.PathAllocCombine @ stdcall PathCchAddBackslash(wstr long) kernelbase.PathCchAddBackslash @ stdcall PathCchAddBackslashEx(wstr long ptr ptr) kernelbase.PathCchAddBackslashEx @ stdcall PathCchAddExtension(wstr long wstr) kernelbase.PathCchAddExtension diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 752d489fba..303fd3bf47 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1024,7 +1024,7 @@ @ stdcall PathAddExtensionA(str str) shlwapi.PathAddExtensionA @ stdcall PathAddExtensionW(wstr wstr) shlwapi.PathAddExtensionW @ stdcall PathAllocCanonicalize(wstr long ptr) -# @ stub PathAllocCombine +@ stdcall PathAllocCombine(wstr wstr long ptr) @ stdcall PathAppendA(str str) shlwapi.PathAppendA @ stdcall PathAppendW(wstr wstr) shlwapi.PathAppendW @ stdcall PathCanonicalizeA(ptr str) shlwapi.PathCanonicalizeA diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index cc15d1c097..3380b8b4e4 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -308,6 +308,63 @@ HRESULT WINAPI PathAllocCanonicalize(const WCHAR *path_in, DWORD flags, WCHAR ** return S_OK; } +HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD flags, WCHAR **out) +{ + SIZE_T combined_length, length2; + WCHAR *combined_path; + BOOL from_path2 = FALSE; + HRESULT hr; + + TRACE("%s %s %#x %p\n", wine_dbgstr_w(path1), wine_dbgstr_w(path2), flags, out); + + if ((!path1 && !path2) || !out) + { + if (out) *out = NULL; + return E_INVALIDARG; + } + + if (!path1 || !path2) return PathAllocCanonicalize(path1 ? path1 : path2, flags, out); + + /* If path2 is fully qualified, use path2 only */ + if (path2 && ((isalphaW(path2[0]) && path2[1] == ':') || (path2[0] == '\\' && path2[1] == '\\'))) + { + path1 = path2; + path2 = NULL; + from_path2 = TRUE; + } + + length2 = path2 ? strlenW(path2) : 0; + /* path1 length + path2 length + possible backslash + NULL */ + combined_length = strlenW(path1) + length2 + 2; + + combined_path = HeapAlloc(GetProcessHeap(), 0, combined_length * sizeof(WCHAR)); + if (!combined_path) + { + *out = NULL; + return E_OUTOFMEMORY; + } + + lstrcpyW(combined_path, path1); + PathCchStripPrefix(combined_path, combined_length); + if (from_path2) PathCchAddBackslashEx(combined_path, combined_length, NULL, NULL); + + if (path2 && path2[0]) + { + if (path2[0] == '\\' && path2[1] != '\\') + { + PathCchStripToRoot(combined_path, combined_length); + path2++; + } + + PathCchAddBackslashEx(combined_path, combined_length, NULL, NULL); + lstrcatW(combined_path, path2); + } + + hr = PathAllocCanonicalize(combined_path, flags, out); + HeapFree(GetProcessHeap(), 0, combined_path); + return hr; +} + HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size) { return PathCchAddBackslashEx(path, size, NULL, NULL); diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index fd9c81df59..2c012ab2bc 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -31,6 +31,7 @@ #include "wine/test.h" HRESULT (WINAPI *pPathAllocCanonicalize)(const WCHAR *path_in, DWORD flags, WCHAR **path_out); +HRESULT (WINAPI *pPathAllocCombine)(const WCHAR *path1, const WCHAR *path2, DWORD flags, WCHAR **out); HRESULT (WINAPI *pPathCchAddBackslash)(WCHAR *out, SIZE_T size); HRESULT (WINAPI *pPathCchAddBackslashEx)(WCHAR *out, SIZE_T size, WCHAR **endptr, SIZE_T *remaining); HRESULT (WINAPI *pPathCchAddExtension)(WCHAR *path, SIZE_T size, const WCHAR *extension); @@ -352,13 +353,14 @@ static void test_PathAllocCanonicalize(void) } } -static const struct +struct combine_test { - const char *path1; - const char *path2; - const char *result; -} -combine_test[] = + const CHAR *path1; + const CHAR *path2; + const CHAR *result; +}; + +static const struct combine_test combine_tests[] = { /* normal paths */ {"C:\\", "a", "C:\\a" }, @@ -366,21 +368,112 @@ combine_test[] = {"C:", "a", "C:\\a" }, {"C:\\", ".", "C:\\" }, {"C:\\", "..", "C:\\" }, - {"\\a", "b", "\\a\\b" }, + {"C:\\a", "", "C:\\a" }, + {"\\", "a", "\\a"}, + {"\\a", "b", "\\a\\b" }, /* normal UNC paths */ {"\\\\192.168.1.1\\test", "a", "\\\\192.168.1.1\\test\\a" }, {"\\\\192.168.1.1\\test", "..", "\\\\192.168.1.1" }, + {"\\\\", "a", "\\\\a"}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", "a", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a"}, /* NT paths */ {"\\\\?\\C:\\", "a", "C:\\a" }, {"\\\\?\\C:\\", "..", "C:\\" }, + {"\\\\?\\C:", "a", "C:\\a"}, /* NT UNC path */ + {"\\\\?\\UNC\\", "a", "\\\\a"}, {"\\\\?\\UNC\\192.168.1.1\\test", "a", "\\\\192.168.1.1\\test\\a" }, {"\\\\?\\UNC\\192.168.1.1\\test", "..", "\\\\192.168.1.1" }, + + /* Second path begins with a single backslash */ + {"C:a\\b", "\\1", "C:\\1"}, + {"C:\\a\\b", "\\1", "C:\\1"}, + {"\\a\\b", "\\1", "\\1"}, + {"\\\\a\\b", "\\1", "\\\\a\\b\\1"}, + {"\\\\a\\b\\c", "\\1", "\\\\a\\b\\1"}, + {"\\\\?\\UNC\\a", "\\1", "\\\\a\\1"}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}a", "\\1", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\1"}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\a", "\\1", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\1"}, + {"C:\\a\\b", "\\", "C:\\"}, + + /* Second path is fully qualified */ + {"X:\\", "C:", "C:\\"}, + {"X:\\", "C:\\", "C:\\"}, + {"X:\\", "\\\\", "\\\\"}, + {"X:\\", "\\\\?\\C:", "C:\\"}, + {"X:\\", "\\\\?\\C:\\", "C:\\"}, + {"X:\\", "\\\\?\\UNC\\", "\\\\"}, + {"X:\\", "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\"}, + + /* Canonicalization */ + {"C:\\a", ".\\b", "C:\\a\\b"}, + {"C:\\a", "..\\b", "C:\\b"}, + + /* Other */ + {"", "", "\\"}, + {"a", "b", "a\\b"} }; +static void test_PathAllocCombine(void) +{ + WCHAR path1W[PATHCCH_MAX_CCH]; + WCHAR path2W[PATHCCH_MAX_CCH]; + WCHAR *resultW; + CHAR resultA[PATHCCH_MAX_CCH]; + HRESULT hr; + INT i; + + if (!pPathAllocCombine) + { + win_skip("PathAllocCombine() is not available.\n"); + return; + } + + resultW = (WCHAR *)0xdeadbeef; + hr = pPathAllocCombine(NULL, NULL, 0, &resultW); + ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); + ok(resultW == NULL, "expect resultW null, got %p\n", resultW); + + MultiByteToWideChar(CP_ACP, 0, "\\a", -1, path1W, ARRAY_SIZE(path1W)); + hr = pPathAllocCombine(path1W, NULL, 0, &resultW); + ok(hr == S_OK, "expect hr %#x, got %#x\n", S_OK, hr); + WideCharToMultiByte(CP_ACP, 0, resultW, -1, resultA, ARRAY_SIZE(resultA), NULL, NULL); + ok(!lstrcmpA(resultA, "\\a"), "expect \\a, got %s\n", resultA); + + MultiByteToWideChar(CP_ACP, 0, "\\b", -1, path2W, ARRAY_SIZE(path2W)); + hr = pPathAllocCombine(NULL, path2W, 0, &resultW); + ok(hr == S_OK, "expect hr %#x, got %#x\n", S_OK, hr); + WideCharToMultiByte(CP_ACP, 0, resultW, -1, resultA, ARRAY_SIZE(resultA), NULL, NULL); + ok(!lstrcmpA(resultA, "\\b"), "expect \\b, got %s\n", resultA); + + hr = pPathAllocCombine(path1W, path2W, 0, NULL); + ok(hr == E_INVALIDARG, "expect hr %#x, got %#x\n", E_INVALIDARG, hr); + + for (i = 0; i < ARRAY_SIZE(combine_tests); i++) + { + const struct combine_test *t = combine_tests + i; + + MultiByteToWideChar(CP_ACP, 0, t->path1, -1, path1W, ARRAY_SIZE(path1W)); + MultiByteToWideChar(CP_ACP, 0, t->path2, -1, path2W, ARRAY_SIZE(path2W)); + hr = pPathAllocCombine(path1W, path2W, 0, &resultW); + ok(hr == S_OK, "combine %s %s expect hr %#x, got %#x\n", t->path1, t->path2, S_OK, hr); + if (SUCCEEDED(hr)) + { + WideCharToMultiByte(CP_ACP, 0, resultW, -1, resultA, ARRAY_SIZE(resultA), NULL, NULL); + ok(!lstrcmpA(resultA, t->result), "combine %s %s expect result %s, got %s\n", t->path1, t->path2, t->result, + resultA); + LocalFree(resultW); + } + } +} + static void test_PathCchCombineEx(void) { WCHAR expected[MAX_PATH] = {'C',':','\\','a',0}; @@ -421,11 +514,11 @@ static void test_PathCchCombineEx(void) "Combination of %s + %s returned %s, expected %s\n", wine_dbgstr_w(p1), wine_dbgstr_w(p2), wine_dbgstr_w(output), wine_dbgstr_w(expected)); - for (i = 0; i < ARRAY_SIZE(combine_test); i++) + for (i = 0; i < ARRAY_SIZE(combine_tests); i++) { - MultiByteToWideChar(CP_ACP, 0, combine_test[i].path1, -1, p1, MAX_PATH); - MultiByteToWideChar(CP_ACP, 0, combine_test[i].path2, -1, p2, MAX_PATH); - MultiByteToWideChar(CP_ACP, 0, combine_test[i].result, -1, expected, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, combine_tests[i].path1, -1, p1, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, combine_tests[i].path2, -1, p2, MAX_PATH); + MultiByteToWideChar(CP_ACP, 0, combine_tests[i].result, -1, expected, MAX_PATH); hr = pPathCchCombineEx(output, MAX_PATH, p1, p2, 0); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); @@ -1935,6 +2028,7 @@ START_TEST(path) HMODULE hmod = LoadLibraryA("kernelbase.dll"); pPathAllocCanonicalize = (void *)GetProcAddress(hmod, "PathAllocCanonicalize"); + pPathAllocCombine = (void *)GetProcAddress(hmod, "PathAllocCombine"); pPathCchCombineEx = (void *)GetProcAddress(hmod, "PathCchCombineEx"); pPathCchAddBackslash = (void *)GetProcAddress(hmod, "PathCchAddBackslash"); pPathCchAddBackslashEx = (void *)GetProcAddress(hmod, "PathCchAddBackslashEx"); @@ -1954,6 +2048,7 @@ START_TEST(path) pPathIsUNCEx = (void *)GetProcAddress(hmod, "PathIsUNCEx"); test_PathAllocCanonicalize(); + test_PathAllocCombine(); test_PathCchCombineEx(); test_PathCchAddBackslash(); test_PathCchAddBackslashEx(); diff --git a/include/pathcch.h b/include/pathcch.h index 708e00e146..3cec09cadc 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -27,6 +27,7 @@ #define PATHCCH_MAX_CCH 0x8000 HRESULT WINAPI PathAllocCanonicalize(const WCHAR *path_in, DWORD flags, WCHAR **path_out); +HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD flags, WCHAR **out); HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size); HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **end, SIZE_T *remaining); HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); -- 2.19.1

1 0

[PATCH] testbot/web: Add a legend to the statistics page.
by Francois Gouget 26 Nov '18

26 Nov '18

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/web/Stats.pl | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/testbot/web/Stats.pl b/testbot/web/Stats.pl index ccabb321a3..2d426ac4e2 100644 --- a/testbot/web/Stats.pl +++ b/testbot/web/Stats.pl @@ -334,6 +334,22 @@ sub GenerateBody($) _GenStatsLine($VMsStats, "error.count", "Transient errors", $SortedVMKeys); print "</tbody></table></div>\n"; +} + +sub GenerateFooter($) +{ + my ($self) = @_; + print "<p></p><div class='CollectionBlock'><table>\n"; + print "<thead><tr><th class='Record'>Legend</th></tr></thead>\n"; + print "<tbody><tr><td class='Record'>\n"; + + print "<p>The <b>Job rate</b> and <b>Task rate</b> show the average hourly rate at which jobs / tasks are submitted to the TestBot. The <b>Revert rate</b> shows how many reverts have been done per hour to run those tasks. Note that the job and task rates provide a first approximation upper limit on the average time a job or task can take to complete.</p>\n"; + print "<p>The <b>Busy time</b> indicates how long the TestBot had at least one pending task and the <b>Busy %</b> shows how much of the wall clock time this represents. Note that the busy percentage and average <b>Job completion</b> times can be optimized by balancing the load on the different VM hosts.</p>\n"; + print "<p>The average and maximum time statistics show how long the VMs spend in each state of their lifecycle. A VM starts in the powered off or dirty state. It is then <b>reverted</b> to a clean state with the right configuration for the tests. Then it goes into the <b>sleep</b> state during which it gets ready to run the tests. Depending on the VM configuration this may be immediate or may require booting the VM first. Then it goes into the <b>run</b> state while the tests are being uploaded, run, and the results retrieved. This means the test itself takes less time to run than indicated in this statistic. Also note that the <b>WineTest</b> and <b>Wine update</b> tasks are tallied separately because they take much longer than regular tasks. Once the tests complete the VM is marked <b>dirty</b> while it waits for the TestBot to decide whether to power it off, or immediately revert it for the next task.</p>\n"; + print "<p>The errors section shows how many <b>Timeouts</b> occurred, that is how many tasks failed to complete within the alloted time; how many failed due to a <b>TestBot error</b>; and how many had to be rerun due to a <b>Transient error</b> such as a network connection issue.</p>\n"; + + print "</td></tr></tbody>\n"; + print "</tbody></table></div>\n"; print "<p class='GeneralFooterText'>Generated in ", Elapsed($self->{start}), " s</p>\n"; print "</div>\n"; } -- 2.19.1

1 0

[PATCH 1/3] setupapi/devinst: Factor out get_device().
by Zebediah Figura 25 Nov '18

25 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/devinst.c | 385 ++++++++++++------------------------------------ 1 file changed, 95 insertions(+), 290 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 771fc70395..630d3e9587 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -129,6 +129,34 @@ struct device_iface struct list entry; }; +static struct device *get_device(HDEVINFO devinfo, const SP_DEVINFO_DATA *data) +{ + struct DeviceInfoSet *set = devinfo; + struct device *device; + + if (!devinfo || devinfo == INVALID_HANDLE_VALUE || set->magic != SETUP_DEVICE_INFO_SET_MAGIC) + { + SetLastError(ERROR_INVALID_HANDLE); + return NULL; + } + + if (!data || data->cbSize != sizeof(*data) || !data->Reserved) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + device = (struct device *)data->Reserved; + + if (device->set != set) + { + SetLastError(ERROR_INVALID_PARAMETER); + return NULL; + } + + return device; +} + static inline void copy_device_data(SP_DEVINFO_DATA *data, const struct device *device) { data->ClassGuid = device->class; @@ -1233,44 +1261,18 @@ HKEY WINAPI SetupDiCreateDevRegKeyA( /*********************************************************************** * SetupDiCreateDevRegKeyW (SETUPAPI.@) */ -HKEY WINAPI SetupDiCreateDevRegKeyW( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - DWORD Scope, - DWORD HwProfile, - DWORD KeyType, - HINF InfHandle, - PCWSTR InfSectionName) +HKEY WINAPI SetupDiCreateDevRegKeyW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, DWORD Scope, + DWORD HwProfile, DWORD KeyType, HINF InfHandle, const WCHAR *InfSectionName) { - struct DeviceInfoSet *set = DeviceInfoSet; struct device *device; HKEY key = INVALID_HANDLE_VALUE; - TRACE("%p %p %d %d %d %p %s\n", DeviceInfoSet, DeviceInfoData, Scope, - HwProfile, KeyType, InfHandle, debugstr_w(InfSectionName)); + TRACE("devinfo %p, device_data %p, scope %d, profile %d, type %d, inf_handle %p, inf_section %s.\n", + devinfo, device_data, Scope, HwProfile, KeyType, InfHandle, debugstr_w(InfSectionName)); - if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) - { - SetLastError(ERROR_INVALID_HANDLE); + if (!(device = get_device(devinfo, device_data))) return INVALID_HANDLE_VALUE; - } - if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) - { - SetLastError(ERROR_INVALID_HANDLE); - return INVALID_HANDLE_VALUE; - } - if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) - || !DeviceInfoData->Reserved) - { - SetLastError(ERROR_INVALID_PARAMETER); - return INVALID_HANDLE_VALUE; - } - device = (struct device *)DeviceInfoData->Reserved; - if (device->set != set) - { - SetLastError(ERROR_INVALID_PARAMETER); - return INVALID_HANDLE_VALUE; - } + if (Scope != DICS_FLAG_GLOBAL && Scope != DICS_FLAG_CONFIGSPECIFIC) { SetLastError(ERROR_INVALID_FLAGS); @@ -1301,8 +1303,7 @@ HKEY WINAPI SetupDiCreateDevRegKeyW( } if (InfHandle) SetupInstallFromInfSectionW(NULL, InfHandle, InfSectionName, SPINST_ALL, - NULL, NULL, SP_COPY_NEWER_ONLY, NULL, NULL, DeviceInfoSet, - DeviceInfoData); + NULL, NULL, SP_COPY_NEWER_ONLY, NULL, NULL, devinfo, device_data); return key; } @@ -1497,42 +1498,17 @@ BOOL WINAPI SetupDiCreateDeviceInfoW(HDEVINFO DeviceInfoSet, PCWSTR DeviceName, /*********************************************************************** * SetupDiRegisterDeviceInfo (SETUPAPI.@) */ -BOOL WINAPI SetupDiRegisterDeviceInfo( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - DWORD Flags, - PSP_DETSIG_CMPPROC CompareProc, - PVOID CompareContext, - PSP_DEVINFO_DATA DupDeviceInfoData) +BOOL WINAPI SetupDiRegisterDeviceInfo(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, DWORD flags, + PSP_DETSIG_CMPPROC compare_proc, void *context, SP_DEVINFO_DATA *duplicate_data) { - struct DeviceInfoSet *set = DeviceInfoSet; struct device *device; - TRACE("%p %p %08x %p %p %p\n", DeviceInfoSet, DeviceInfoData, Flags, - CompareProc, CompareContext, DupDeviceInfoData); + TRACE("devinfo %p, data %p, flags %#x, compare_proc %p, context %p, duplicate_data %p.\n", + devinfo, device_data, flags, compare_proc, context, duplicate_data); - if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) - { - SetLastError(ERROR_INVALID_HANDLE); + if (!(device = get_device(devinfo, device_data))) return FALSE; - } - if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) - || !DeviceInfoData->Reserved) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - device = (struct device *)DeviceInfoData->Reserved; - if (device->set != set) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + if (device->phantom) { device->phantom = FALSE; @@ -1675,41 +1651,17 @@ BOOL WINAPI SetupDiGetDeviceInstanceIdA( /*********************************************************************** * SetupDiGetDeviceInstanceIdW (SETUPAPI.@) */ -BOOL WINAPI SetupDiGetDeviceInstanceIdW( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PWSTR DeviceInstanceId, - DWORD DeviceInstanceIdSize, - PDWORD RequiredSize) +BOOL WINAPI SetupDiGetDeviceInstanceIdW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, + WCHAR *DeviceInstanceId, DWORD DeviceInstanceIdSize, DWORD *RequiredSize) { - struct DeviceInfoSet *set = DeviceInfoSet; struct device *device; - TRACE("%p %p %p %d %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstanceId, - DeviceInstanceIdSize, RequiredSize); + TRACE("devinfo %p, device_data %p, DeviceInstanceId %p, DeviceInstanceIdSize %d, RequiredSize %p.\n", + devinfo, device_data, DeviceInstanceId, DeviceInstanceIdSize, RequiredSize); - if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) - || !DeviceInfoData->Reserved) - { - SetLastError(ERROR_INVALID_PARAMETER); + if (!(device = get_device(devinfo, device_data))) return FALSE; - } - device = (struct device *)DeviceInfoData->Reserved; - if (device->set != set) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + TRACE("instance ID: %s\n", debugstr_w(device->instanceId)); if (DeviceInstanceIdSize < strlenW(device->instanceId) + 1) { @@ -2466,51 +2418,25 @@ BOOL WINAPI SetupDiCreateDeviceInterfaceA( /*********************************************************************** * SetupDiCreateDeviceInterfaceW (SETUPAPI.@) */ -BOOL WINAPI SetupDiCreateDeviceInterfaceW( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - const GUID *InterfaceClassGuid, - PCWSTR ReferenceString, - DWORD CreationFlags, - SP_DEVICE_INTERFACE_DATA *iface_data) +BOOL WINAPI SetupDiCreateDeviceInterfaceW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, + const GUID *class, const WCHAR *refstr, DWORD flags, SP_DEVICE_INTERFACE_DATA *iface_data) { - struct DeviceInfoSet *set = DeviceInfoSet; struct device *device; struct device_iface *iface; - TRACE("%p %p %s %s %08x %p\n", DeviceInfoSet, DeviceInfoData, - debugstr_guid(InterfaceClassGuid), debugstr_w(ReferenceString), - CreationFlags, iface_data); + TRACE("devinfo %p, device_data %p, class %s, refstr %s, flags %#x, iface_data %p.\n", + devinfo, device_data, debugstr_guid(class), debugstr_w(refstr), flags, iface_data); - if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) - || !DeviceInfoData->Reserved) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - device = (struct device *)DeviceInfoData->Reserved; - if (device->set != set) - { - SetLastError(ERROR_INVALID_PARAMETER); + if (!(device = get_device(devinfo, device_data))) return FALSE; - } - if (!InterfaceClassGuid) + + if (!class) { SetLastError(ERROR_INVALID_USER_BUFFER); return FALSE; } - if (!(iface = SETUPDI_CreateDeviceInterface(device, InterfaceClassGuid, - ReferenceString))) + + if (!(iface = SETUPDI_CreateDeviceInterface(device, class, refstr))) return FALSE; if (iface_data) @@ -2960,45 +2886,25 @@ BOOL WINAPI SetupDiGetDeviceInterfaceDetailW( /*********************************************************************** * SetupDiGetDeviceRegistryPropertyA (SETUPAPI.@) */ -BOOL WINAPI SetupDiGetDeviceRegistryPropertyA( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - DWORD Property, - PDWORD PropertyRegDataType, - PBYTE PropertyBuffer, - DWORD PropertyBufferSize, - PDWORD RequiredSize) +BOOL WINAPI SetupDiGetDeviceRegistryPropertyA(HDEVINFO devinfo, + SP_DEVINFO_DATA *device_data, DWORD Property, DWORD *PropertyRegDataType, + BYTE *PropertyBuffer, DWORD PropertyBufferSize, DWORD *RequiredSize) { BOOL ret = FALSE; - struct DeviceInfoSet *set = DeviceInfoSet; struct device *device; - TRACE("%p %p %d %p %p %d %p\n", DeviceInfoSet, DeviceInfoData, - Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize, - RequiredSize); + TRACE("devinfo %p, device_data %p, property %d, type %p, buffer %p, size %d, required %p\n", + devinfo, device_data, Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize, RequiredSize); - if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) - || !DeviceInfoData->Reserved) - { - SetLastError(ERROR_INVALID_PARAMETER); + if (!(device = get_device(devinfo, device_data))) return FALSE; - } + if (PropertyBufferSize && PropertyBuffer == NULL) { SetLastError(ERROR_INVALID_DATA); return FALSE; } - device = (struct device *)DeviceInfoData->Reserved; + if (Property < ARRAY_SIZE(PropertyMap) && PropertyMap[Property].nameA) { DWORD size = PropertyBufferSize; @@ -3022,45 +2928,25 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyA( /*********************************************************************** * SetupDiGetDeviceRegistryPropertyW (SETUPAPI.@) */ -BOOL WINAPI SetupDiGetDeviceRegistryPropertyW( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - DWORD Property, - PDWORD PropertyRegDataType, - PBYTE PropertyBuffer, - DWORD PropertyBufferSize, - PDWORD RequiredSize) +BOOL WINAPI SetupDiGetDeviceRegistryPropertyW(HDEVINFO devinfo, + SP_DEVINFO_DATA *device_data, DWORD Property, DWORD *PropertyRegDataType, + BYTE *PropertyBuffer, DWORD PropertyBufferSize, DWORD *RequiredSize) { BOOL ret = FALSE; - struct DeviceInfoSet *set = DeviceInfoSet; struct device *device; - TRACE("%p %p %d %p %p %d %p\n", DeviceInfoSet, DeviceInfoData, - Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize, - RequiredSize); + TRACE("devinfo %p, device_data %p, prop %d, type %p, buffer %p, size %d, required %p\n", + devinfo, device_data, Property, PropertyRegDataType, PropertyBuffer, PropertyBufferSize, RequiredSize); - if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) - { - SetLastError(ERROR_INVALID_HANDLE); + if (!(device = get_device(devinfo, device_data))) return FALSE; - } - if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) - || !DeviceInfoData->Reserved) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + if (PropertyBufferSize && PropertyBuffer == NULL) { SetLastError(ERROR_INVALID_DATA); return FALSE; } - device = (struct device *)DeviceInfoData->Reserved; + if (Property < ARRAY_SIZE(PropertyMap) && PropertyMap[Property].nameW) { DWORD size = PropertyBufferSize; @@ -3084,37 +2970,18 @@ BOOL WINAPI SetupDiGetDeviceRegistryPropertyW( /*********************************************************************** * SetupDiSetDeviceRegistryPropertyA (SETUPAPI.@) */ -BOOL WINAPI SetupDiSetDeviceRegistryPropertyA( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - DWORD Property, - const BYTE *PropertyBuffer, - DWORD PropertyBufferSize) +BOOL WINAPI SetupDiSetDeviceRegistryPropertyA(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, + DWORD Property, const BYTE *PropertyBuffer, DWORD PropertyBufferSize) { BOOL ret = FALSE; - struct DeviceInfoSet *set = DeviceInfoSet; struct device *device; - TRACE("%p %p %d %p %d\n", DeviceInfoSet, DeviceInfoData, Property, - PropertyBuffer, PropertyBufferSize); + TRACE("devinfo %p, device_data %p, prop %d, buffer %p, size %d.\n", + devinfo, device_data, Property, PropertyBuffer, PropertyBufferSize); - if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) - { - SetLastError(ERROR_INVALID_HANDLE); + if (!(device = get_device(devinfo, device_data))) return FALSE; - } - if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) - || !DeviceInfoData->Reserved) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - device = (struct device *)DeviceInfoData->Reserved; + if (Property < ARRAY_SIZE(PropertyMap) && PropertyMap[Property].nameA) { LONG l = RegSetValueExA(device->key, PropertyMap[Property].nameA, 0, @@ -3134,29 +3001,14 @@ BOOL WINAPI SetupDiSetDeviceRegistryPropertyA( BOOL WINAPI SetupDiSetDeviceRegistryPropertyW(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, DWORD prop, const BYTE *buffer, DWORD size) { - struct DeviceInfoSet *set = devinfo; struct device *device; - TRACE("%p %p %d %p %d\n", devinfo, device_data, prop, buffer, size); + TRACE("devinfo %p, device_data %p, prop %d, buffer %p, size %d.\n", + devinfo, device_data, prop, buffer, size); - if (!devinfo || devinfo == INVALID_HANDLE_VALUE) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) - { - SetLastError(ERROR_INVALID_HANDLE); + if (!(device = get_device(devinfo, device_data))) return FALSE; - } - if (!device_data || device_data->cbSize != sizeof(SP_DEVINFO_DATA) - || !device_data->Reserved) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - device = (struct device *)device_data->Reserved; return SETUPDI_SetDeviceRegistryPropertyW(device, prop, buffer, size); } @@ -3649,37 +3501,18 @@ static HKEY SETUPDI_OpenDrvKey(struct device *device, REGSAM samDesired) /*********************************************************************** * SetupDiOpenDevRegKey (SETUPAPI.@) */ -HKEY WINAPI SetupDiOpenDevRegKey( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - DWORD Scope, - DWORD HwProfile, - DWORD KeyType, - REGSAM samDesired) +HKEY WINAPI SetupDiOpenDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, + DWORD Scope, DWORD HwProfile, DWORD KeyType, REGSAM samDesired) { - struct DeviceInfoSet *set = DeviceInfoSet; struct device *device; HKEY key = INVALID_HANDLE_VALUE; - TRACE("%p %p %d %d %d %x\n", DeviceInfoSet, DeviceInfoData, - Scope, HwProfile, KeyType, samDesired); + TRACE("devinfo %p, device_data %p, scope %d, profile %d, type %d, access %#x.\n", + devinfo, device_data, Scope, HwProfile, KeyType, samDesired); - if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) - { - SetLastError(ERROR_INVALID_HANDLE); - return INVALID_HANDLE_VALUE; - } - if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) - { - SetLastError(ERROR_INVALID_HANDLE); + if (!(device = get_device(devinfo, device_data))) return INVALID_HANDLE_VALUE; - } - if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) - || !DeviceInfoData->Reserved) - { - SetLastError(ERROR_INVALID_PARAMETER); - return INVALID_HANDLE_VALUE; - } + if (Scope != DICS_FLAG_GLOBAL && Scope != DICS_FLAG_CONFIGSPECIFIC) { SetLastError(ERROR_INVALID_FLAGS); @@ -3690,12 +3523,7 @@ HKEY WINAPI SetupDiOpenDevRegKey( SetLastError(ERROR_INVALID_FLAGS); return INVALID_HANDLE_VALUE; } - device = (struct device *)DeviceInfoData->Reserved; - if (device->set != set) - { - SetLastError(ERROR_INVALID_PARAMETER); - return INVALID_HANDLE_VALUE; - } + if (device->phantom) { SetLastError(ERROR_DEVINFO_NOT_REGISTERED); @@ -3766,36 +3594,18 @@ static BOOL SETUPDI_DeleteDrvKey(struct device *device) /*********************************************************************** * SetupDiDeleteDevRegKey (SETUPAPI.@) */ -BOOL WINAPI SetupDiDeleteDevRegKey( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - DWORD Scope, - DWORD HwProfile, - DWORD KeyType) +BOOL WINAPI SetupDiDeleteDevRegKey(HDEVINFO devinfo, SP_DEVINFO_DATA *device_data, + DWORD Scope, DWORD HwProfile, DWORD KeyType) { - struct DeviceInfoSet *set = DeviceInfoSet; struct device *device; BOOL ret = FALSE; - TRACE("%p %p %d %d %d\n", DeviceInfoSet, DeviceInfoData, Scope, HwProfile, - KeyType); + TRACE("devinfo %p, device_data %p, scope %d, profile %d, type %d.\n", + devinfo, device_data, Scope, HwProfile, KeyType); - if (!DeviceInfoSet || DeviceInfoSet == INVALID_HANDLE_VALUE) - { - SetLastError(ERROR_INVALID_HANDLE); + if (!(device = get_device(devinfo, device_data))) return FALSE; - } - if (set->magic != SETUP_DEVICE_INFO_SET_MAGIC) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - if (!DeviceInfoData || DeviceInfoData->cbSize != sizeof(SP_DEVINFO_DATA) - || !DeviceInfoData->Reserved) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + if (Scope != DICS_FLAG_GLOBAL && Scope != DICS_FLAG_CONFIGSPECIFIC) { SetLastError(ERROR_INVALID_FLAGS); @@ -3806,12 +3616,7 @@ BOOL WINAPI SetupDiDeleteDevRegKey( SetLastError(ERROR_INVALID_FLAGS); return FALSE; } - device = (struct device *)DeviceInfoData->Reserved; - if (device->set != set) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } + if (device->phantom) { SetLastError(ERROR_DEVINFO_NOT_REGISTERED); -- 2.14.1

1 2

Wine staging 3.21 release
by Alistair Leslie-Hughes 25 Nov '18

25 Nov '18

Binary packages for various distributions will be available from: https://www.winehq.org/download Summary of the past few weeks * Rebased to current wine 3.21 (850 patches are applied to wine vanilla) * Reviewed and upstreamed patches. Upstreamed (Either directly from staging or fixed with a similar patch). * ddraw: Prevent division by zero in viewport_activate. * kernelbase: Implement PathCchRemoveBackslash()/PathCchRemoveBackslashEx() * oleaut32: Handle TKIND_COCLASS in proxy/stub marshalling. * oleaut32: Initial preparation to make marshalling compatible with x86_64. * oleaut32: Implement TMStubImpl_Invoke on x86_64. * oleaut32: Implement asm proxys for x86_64. * oleaut32: Fix calling function with instance and VARIANT return type. * oleaut32: Pass a HREFTYPE to get_iface_guid. * oleaut32: Implement ITypeInfo_fnInvoke for TKIND_COCLASS in arguments. * oleaut32/tests: Add a test for TKIND_COCLASS in proxy/stub marshalling. * wined3d: Add stubs for QUERY_TYPE_SO_STATISTICS and QUERY_TYPE_SO_OVERFLOW. * xinput1_3: Report SUCCESS from XInputSetState when FFB isn't available. Added * 32749 - atl: Implemented AtlAxDialogBox[A,W]. * 41591 - advapi32: Add RegLoadAppKeyA/RegLoadAppKeyW stubs. * 33456 - d3dx9_36: D3DXMatrixTransformation support NULL scaling matrix. * 18889 - ntdll: Support ISOLATIONAWARE_MANIFEST_RESOURCE_ID range. * 42255 - ntdll: Add RtlAddGrowableFunctionTable stub. * 46174 - qwave: Added QOSCreateHandle stub. * 45947 - virtdisk: Add stub for OpenVirtualDisk. * 44300 - wmvcore: Add stub for WMCheckURlExtension. * 37327 - wmvcore: Implement WMCreateSyncReaderPriv. Updated: * advapi32-RegLoadAppKey * bcrypt-BCryptDeriveKeyPBKDF2 * bcrypt-BCryptGenerateKeyPair * kernel32-Processor_Group * ntdll-RtlAddGrowableFunctionTable * server-Signal_Thread * user32-GetPointerType Where can you help * Run Steam/Battle.net/UPlay. * Try you favorite game: * Test your favorite applications. * Steal staging patches and get them accepted upstream. As always, if you find a bug, please report it via https://bugs.winehq.org Best Regards Alistair.

1 0

[PATCH] cmd: Avoid naming conflicts with the global HeapAlloc wrappers
by Michael Stefaniuc 25 Nov '18

25 Nov '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/cmd/batch.c | 4 ++-- programs/cmd/builtins.c | 24 ++++++++++++------------ programs/cmd/directory.c | 14 +++++++------- programs/cmd/wcmd.h | 10 +++------- programs/cmd/wcmdmain.c | 20 ++++++++++---------- 5 files changed, 34 insertions(+), 38 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 5b05d8811b..3bb325537b 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -257,7 +257,7 @@ WCHAR *WCMD_fgets(WCHAR *buf, DWORD noChars, HANDLE h) const char *p; cp = GetConsoleCP(); - bufA = heap_alloc(noChars); + bufA = heap_xalloc(noChars); /* Save current file position */ filepos.QuadPart = 0; @@ -508,7 +508,7 @@ void WCMD_HandleTildaModifiers(WCHAR **start, BOOL atExecute) size = GetEnvironmentVariableW(env, NULL, 0); if (size > 0) { - WCHAR *fullpath = heap_alloc(size * sizeof(WCHAR)); + WCHAR *fullpath = heap_xalloc(size * sizeof(WCHAR)); if (!fullpath || (GetEnvironmentVariableW(env, fullpath, size) == 0) || (SearchPathW(fullpath, outputparam, NULL, MAX_PATH, outputparam, NULL) == 0)) size = 0; diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 25b98813ba..209de26f10 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -720,7 +720,7 @@ void WCMD_copy(WCHAR * args) { } /* We have found something to process - build a COPY_FILE block to store it */ - thiscopy = heap_alloc(sizeof(COPY_FILES)); + thiscopy = heap_xalloc(sizeof(COPY_FILES)); WINE_TRACE("Not a switch, but probably a filename/list %s\n", wine_dbgstr_w(thisparam)); thiscopy->concatenate = concatnextfilename; @@ -731,7 +731,7 @@ void WCMD_copy(WCHAR * args) { leave space to append \* to the end) , then copy in character by character. Strip off quotes if we find them. */ len = strlenW(thisparam) + (sizeof(WCHAR) * 5); /* 5 spare characters, null + \*.* */ - thiscopy->name = heap_alloc(len*sizeof(WCHAR)); + thiscopy->name = heap_xalloc(len*sizeof(WCHAR)); memset(thiscopy->name, 0x00, len); pos1 = thisparam; @@ -810,7 +810,7 @@ void WCMD_copy(WCHAR * args) { strcpyW(destname, dotW); strcatW(destname, slashW); - destination = heap_alloc(sizeof(COPY_FILES)); + destination = heap_xalloc(sizeof(COPY_FILES)); if (destination == NULL) goto exitreturn; destination->concatenate = FALSE; /* Not used for destination */ destination->binarycopy = binarymode; @@ -1390,7 +1390,7 @@ static BOOL WCMD_delete_one (const WCHAR *thisArg) { WINE_TRACE("Recursive, Adding to search list '%s'\n", wine_dbgstr_w(subParm)); /* Allocate memory, add to list */ - nextDir = heap_alloc(sizeof(DIRECTORY_STACK)); + nextDir = heap_xalloc(sizeof(DIRECTORY_STACK)); if (allDirs == NULL) allDirs = nextDir; if (lastEntry != NULL) lastEntry->next = nextDir; lastEntry = nextDir; @@ -1476,7 +1476,7 @@ static WCHAR *WCMD_strtrim(const WCHAR *s) const WCHAR *start = s; WCHAR* result; - result = heap_alloc((len + 1) * sizeof(WCHAR)); + result = heap_xalloc((len + 1) * sizeof(WCHAR)); while (isspaceW(*start)) start++; if (*start) { @@ -1787,12 +1787,12 @@ static void WCMD_add_dirstowalk(DIRECTORY_STACK *dirsToWalk) { (strcmpW(fd.cFileName, dotW) != 0)) { /* Allocate memory, add to list */ - DIRECTORY_STACK *toWalk = heap_alloc(sizeof(DIRECTORY_STACK)); + DIRECTORY_STACK *toWalk = heap_xalloc(sizeof(DIRECTORY_STACK)); WINE_TRACE("(%p->%p)\n", remainingDirs, remainingDirs->next); toWalk->next = remainingDirs->next; remainingDirs->next = toWalk; remainingDirs = toWalk; - toWalk->dirName = heap_alloc(sizeof(WCHAR) * (strlenW(dirsToWalk->dirName) + 2 + strlenW(fd.cFileName))); + toWalk->dirName = heap_xalloc(sizeof(WCHAR) * (strlenW(dirsToWalk->dirName) + 2 + strlenW(fd.cFileName))); strcpyW(toWalk->dirName, dirsToWalk->dirName); strcatW(toWalk->dirName, slashW); strcatW(toWalk->dirName, fd.cFileName); @@ -2228,7 +2228,7 @@ void WCMD_for (WCHAR *p, CMD_LIST **cmdList) { /* Set up the list of directories to recurse if we are going to */ } else if (doRecurse) { /* Allocate memory, add to list */ - dirsToWalk = heap_alloc(sizeof(DIRECTORY_STACK)); + dirsToWalk = heap_xalloc(sizeof(DIRECTORY_STACK)); dirsToWalk->next = NULL; dirsToWalk->dirName = heap_strdupW(optionsRoot); WINE_TRACE("Starting with root directory %s\n", wine_dbgstr_w(dirsToWalk->dirName)); @@ -3673,7 +3673,7 @@ static int WCMD_getprecedence(const WCHAR in) * stack */ static void WCMD_pushnumber(WCHAR *var, int num, VARSTACK **varstack) { - VARSTACK *thisstack = heap_alloc(sizeof(VARSTACK)); + VARSTACK *thisstack = heap_xalloc(sizeof(VARSTACK)); thisstack->isnum = (var == NULL); if (var) { thisstack->variable = var; @@ -3736,7 +3736,7 @@ static int WCMD_popnumber(VARSTACK **varstack) { * Push an operator onto the supplied stack */ static void WCMD_pushoperator(WCHAR op, int precedence, OPSTACK **opstack) { - OPSTACK *thisstack = heap_alloc(sizeof(OPSTACK)); + OPSTACK *thisstack = heap_xalloc(sizeof(OPSTACK)); thisstack->precedence = precedence; thisstack->op = op; thisstack->next = *opstack; @@ -4206,7 +4206,7 @@ void WCMD_setshow_env (WCHAR *s) { WCHAR *src,*dst; /* Remove all quotes before doing any calculations */ - thisexpr = heap_alloc((strlenW(s+2)+1) * sizeof(WCHAR)); + thisexpr = heap_xalloc((strlenW(s+2)+1) * sizeof(WCHAR)); src = s+2; dst = thisexpr; while (*src) { @@ -4407,7 +4407,7 @@ void WCMD_start(WCHAR *args) GetWindowsDirectoryW( file, MAX_PATH ); strcatW( file, exeW ); - cmdline = heap_alloc( (strlenW(file) + strlenW(args) + 8) * sizeof(WCHAR) ); + cmdline = heap_xalloc( (strlenW(file) + strlenW(args) + 8) * sizeof(WCHAR) ); strcpyW( cmdline, file ); strcatW( cmdline, spaceW ); cmdline_params = cmdline + strlenW(cmdline); diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 70507892ea..435e0f36ed 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -203,7 +203,7 @@ static void WCMD_getfileowner(WCHAR *filename, WCHAR *owner, int ownerlen) { ULONG domainLen = MAXSTRING; SID_NAME_USE nameuse; - secBuffer = heap_alloc(sizeNeeded * sizeof(BYTE)); + secBuffer = heap_xalloc(sizeNeeded * sizeof(BYTE)); /* Get the owners security descriptor */ if(!GetFileSecurityW(filename, OWNER_SECURITY_INFORMATION, secBuffer, @@ -273,7 +273,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le same directory. Note issuing a directory header with no contents mirrors what windows does */ parms = inputparms; - fd = heap_alloc(sizeof(WIN32_FIND_DATAW)); + fd = heap_xalloc(sizeof(WIN32_FIND_DATAW)); while (parms && strcmpW(inputparms->dirName, parms->dirName) == 0) { concurrentDirs++; @@ -510,7 +510,7 @@ static DIRECTORY_STACK *WCMD_list_directory (DIRECTORY_STACK *inputparms, int le WINE_TRACE("Recursive, Adding to search list '%s'\n", wine_dbgstr_w(string)); /* Allocate memory, add to list */ - thisDir = heap_alloc(sizeof(DIRECTORY_STACK)); + thisDir = heap_xalloc(sizeof(DIRECTORY_STACK)); if (dirStack == NULL) dirStack = thisDir; if (lastEntry != NULL) lastEntry->next = thisDir; lastEntry = thisDir; @@ -841,7 +841,7 @@ void WCMD_directory (WCHAR *args) } WINE_TRACE("Using path '%s'\n", wine_dbgstr_w(path)); - thisEntry = heap_alloc(sizeof(DIRECTORY_STACK)); + thisEntry = heap_xalloc(sizeof(DIRECTORY_STACK)); if (fullParms == NULL) fullParms = thisEntry; if (prevEntry != NULL) prevEntry->next = thisEntry; prevEntry = thisEntry; @@ -853,11 +853,11 @@ void WCMD_directory (WCHAR *args) wine_dbgstr_w(drive), wine_dbgstr_w(dir), wine_dbgstr_w(fname), wine_dbgstr_w(ext)); - thisEntry->dirName = heap_alloc(sizeof(WCHAR) * (strlenW(drive)+strlenW(dir)+1)); + thisEntry->dirName = heap_xalloc(sizeof(WCHAR) * (strlenW(drive)+strlenW(dir)+1)); strcpyW(thisEntry->dirName, drive); strcatW(thisEntry->dirName, dir); - thisEntry->fileName = heap_alloc(sizeof(WCHAR) * (strlenW(fname)+strlenW(ext)+1)); + thisEntry->fileName = heap_xalloc(sizeof(WCHAR) * (strlenW(fname)+strlenW(ext)+1)); strcpyW(thisEntry->fileName, fname); strcatW(thisEntry->fileName, ext); @@ -867,7 +867,7 @@ void WCMD_directory (WCHAR *args) /* If just 'dir' entered, a '*' parameter is assumed */ if (fullParms == NULL) { WINE_TRACE("Inserting default '*'\n"); - fullParms = heap_alloc(sizeof(DIRECTORY_STACK)); + fullParms = heap_xalloc(sizeof(DIRECTORY_STACK)); fullParms->next = NULL; fullParms->dirName = heap_strdupW(cwd); fullParms->fileName = heap_strdupW(starW); diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 8d6eb6b48e..359c719175 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -28,6 +28,7 @@ #include <stdarg.h> #include <stdio.h> #include <ctype.h> +#include <wine/heap.h> #include <wine/unicode.h> /* msdn specified max for Win XP */ @@ -127,12 +128,7 @@ void WCMD_free_commands(CMD_LIST *cmds); void WCMD_execute (const WCHAR *orig_command, const WCHAR *redirects, CMD_LIST **cmdList, BOOL retrycall); -void *heap_alloc(size_t); - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} +void *heap_xalloc(size_t); static inline WCHAR *heap_strdupW(const WCHAR *str) { @@ -142,7 +138,7 @@ static inline WCHAR *heap_strdupW(const WCHAR *str) size_t size; size = (strlenW(str)+1)*sizeof(WCHAR); - ret = heap_alloc(size); + ret = heap_xalloc(size); memcpy(ret, str, size); } diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 1c99661b44..637c0e94bd 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -75,7 +75,7 @@ static char *get_file_buffer(void) { static char *output_bufA = NULL; if (!output_bufA) - output_bufA = heap_alloc(MAX_WRITECONSOLE_SIZE); + output_bufA = heap_xalloc(MAX_WRITECONSOLE_SIZE); return output_bufA; } @@ -438,11 +438,11 @@ static void WCMD_show_prompt (BOOL newLine) { WCMD_output_asis (out_string); } -void *heap_alloc(size_t size) +void *heap_xalloc(size_t size) { void *ret; - ret = HeapAlloc(GetProcessHeap(), 0, size); + ret = heap_alloc(size); if(!ret) { ERR("Out of memory\n"); ExitProcess(1); @@ -981,7 +981,7 @@ static void init_msvcrt_io_block(STARTUPINFOW* st) * its new input & output handles) */ sz = max(sizeof(unsigned) + (sizeof(char) + sizeof(HANDLE)) * 3, st_p.cbReserved2); - ptr = heap_alloc(sz); + ptr = heap_xalloc(sz); flags = (char*)(ptr + sizeof(unsigned)); handles = (HANDLE*)(flags + num * sizeof(char)); @@ -1300,12 +1300,12 @@ void WCMD_execute (const WCHAR *command, const WCHAR *redirects, wine_dbgstr_w(command), cmdList); /* Move copy of the command onto the heap so it can be expanded */ - new_cmd = heap_alloc(MAXSTRING * sizeof(WCHAR)); + new_cmd = heap_xalloc(MAXSTRING * sizeof(WCHAR)); strcpyW(new_cmd, command); cmd = new_cmd; /* Move copy of the redirects onto the heap so it can be expanded */ - new_redir = heap_alloc(MAXSTRING * sizeof(WCHAR)); + new_redir = heap_xalloc(MAXSTRING * sizeof(WCHAR)); redir = new_redir; /* Strip leading whitespaces, and a '@' if supplied */ @@ -1708,16 +1708,16 @@ static void WCMD_addCommand(WCHAR *command, int *commandLen, CMD_LIST *thisEntry = NULL; /* Allocate storage for command */ - thisEntry = heap_alloc(sizeof(CMD_LIST)); + thisEntry = heap_xalloc(sizeof(CMD_LIST)); /* Copy in the command */ if (command) { - thisEntry->command = heap_alloc((*commandLen+1) * sizeof(WCHAR)); + thisEntry->command = heap_xalloc((*commandLen+1) * sizeof(WCHAR)); memcpy(thisEntry->command, command, *commandLen * sizeof(WCHAR)); thisEntry->command[*commandLen] = 0x00; /* Copy in the redirects */ - thisEntry->redirects = heap_alloc((*redirLen+1) * sizeof(WCHAR)); + thisEntry->redirects = heap_xalloc((*redirLen+1) * sizeof(WCHAR)); memcpy(thisEntry->redirects, redirs, *redirLen * sizeof(WCHAR)); thisEntry->redirects[*redirLen] = 0x00; thisEntry->pipeFile[0] = 0x00; @@ -1849,7 +1849,7 @@ WCHAR *WCMD_ReadAndParseLine(const WCHAR *optionalcmd, CMD_LIST **output, HANDLE /* Allocate working space for a command read from keyboard, file etc */ if (!extraSpace) - extraSpace = heap_alloc((MAXSTRING+1) * sizeof(WCHAR)); + extraSpace = heap_xalloc((MAXSTRING+1) * sizeof(WCHAR)); if (!extraSpace) { WINE_ERR("Could not allocate memory for extraSpace\n"); -- 2.14.5

1 0

[PATCH] mf: Return S_OK from IMFMediaSession::Close.
by Sven Baars 25 Nov '18

25 Nov '18

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- dlls/mf/session.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mf/session.c b/dlls/mf/session.c index 18c5f3bf01..5913af39b9 100644 --- a/dlls/mf/session.c +++ b/dlls/mf/session.c @@ -176,7 +176,7 @@ static HRESULT WINAPI mfsession_Close(IMFMediaSession *iface) FIXME("(%p)\n", This); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI mfsession_Shutdown(IMFMediaSession *iface) -- 2.17.1

1 1

[PATCH 2/2] user32/tests: Add a message test for group of radio buttons.
by Dmitry Timoshkov 25 Nov '18

25 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/tests/msg.c | 125 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 28b58b6787..b39d0b251b 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6670,6 +6670,130 @@ static void test_button_bm_get_set_image(void) ReleaseDC(0, hdc); } +#define ID_RADIO1 0x00e1 +#define ID_RADIO2 0x00e2 + +static const struct message auto_radio_button_WM_CLICK[] = +{ + { BM_CLICK, sent|wparam|lparam, 0, 0 }, + { WM_LBUTTONDOWN, sent|wparam|lparam|defwinproc, 0, 0 }, + { EVENT_SYSTEM_CAPTURESTART, winevent_hook|wparam|lparam, 0, 0 }, + { BM_SETSTATE, sent|wparam|lparam|defwinproc, BST_CHECKED, 0 }, + { WM_CTLCOLORSTATIC, sent|parent }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_LBUTTONUP, sent|wparam|lparam|defwinproc, 0, 0 }, + { BM_SETSTATE, sent|wparam|lparam|defwinproc, BST_UNCHECKED, 0 }, + { WM_CTLCOLORSTATIC, sent|parent }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, 0, 0 }, + { BM_SETCHECK, sent|wparam|lparam|defwinproc, BST_CHECKED, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, 0, 0 }, + { BM_SETCHECK, sent|wparam|lparam|defwinproc, 0, 0 }, + { WM_CTLCOLORSTATIC, sent|parent }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, 0, 0 }, + { BM_SETCHECK, sent|wparam|lparam|defwinproc, 0, 0 }, + { WM_CTLCOLORSTATIC, sent|parent }, + { EVENT_OBJECT_STATECHANGE, winevent_hook|wparam|lparam, OBJID_CLIENT, 0 }, + { WM_GETDLGCODE, sent|wparam|lparam|defwinproc, 0, 0 }, + { EVENT_SYSTEM_CAPTUREEND, winevent_hook|wparam|lparam, 0, 0 }, + { WM_CAPTURECHANGED, sent|wparam|lparam|defwinproc, 0, 0 }, + { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_RADIO2, BN_CLICKED) }, + { WM_NCHITTEST, sent|optional, 0, 0 }, /* FIXME: Wine doesn't send it */ + { WM_SETCURSOR, sent|optional, 0, 0 }, /* FIXME: Wine doesn't send it */ + { WM_MOUSEMOVE, sent|optional, 0, 0 }, /* FIXME: Wine doesn't send it */ + { 0 } +}; + +static void test_autoradio_messages(void) +{ + HWND parent, radio1, radio2, radio3, child; + RECT rc; + MSG msg; + DWORD ret; + + subclass_button(); + + parent = CreateWindowExA(0, "TestParentClass", "Test parent", WS_OVERLAPPEDWINDOW | WS_VISIBLE, + 100, 100, 200, 200, 0, 0, 0, NULL); + ok(parent != 0, "failed to create parent window\n"); + radio1 = CreateWindowExA(0, "my_button_class", "radio1", WS_VISIBLE | WS_CHILD | WS_GROUP | BS_AUTORADIOBUTTON | BS_NOTIFY, + 0, 0, 70, 18, parent, (HMENU)ID_RADIO1, 0, NULL); + ok(radio1 != 0, "failed to create child window\n"); + radio3 = CreateWindowExA(0, "my_button_class", "radio3", WS_VISIBLE | WS_CHILD | BS_RADIOBUTTON | BS_NOTIFY, + 0, 25, 70, 18, parent, (HMENU)-1, 0, NULL); + ok(radio3 != 0, "failed to create child window\n"); + child = CreateWindowExA(0, "my_button_class", "text", WS_VISIBLE | WS_CHILD | BS_PUSHBUTTON | BS_NOTIFY, + 0, 50, 70, 18, parent, (HMENU)-1, 0, NULL); + ok(child != 0, "failed to create child window\n"); + radio2 = CreateWindowExA(0, "my_button_class", "radio2", WS_VISIBLE | WS_CHILD | BS_AUTORADIOBUTTON | BS_NOTIFY, + 0, 75, 70, 18, parent, (HMENU)ID_RADIO2, 0, NULL); + ok(radio2 != 0, "failed to create child window\n"); + + /* this avoids focus messages in the generated sequence */ + SetFocus(radio2); + + flush_events(); + flush_sequence(); + + ret = SendMessageA(radio1, BM_GETCHECK, 0, 0); + ok(ret == BST_UNCHECKED, "got %08x\n", ret); + ret = SendMessageA(radio2, BM_GETCHECK, 0, 0); + ok(ret == BST_UNCHECKED, "got %08x\n", ret); + ret = SendMessageA(radio3, BM_GETCHECK, 0, 0); + ok(ret == BST_UNCHECKED, "got %08x\n", ret); + + SendMessageA(radio1, BM_SETCHECK, BST_CHECKED, 0); + + ret = SendMessageA(radio1, BM_GETCHECK, 0, 0); + ok(ret == BST_CHECKED, "got %08x\n", ret); + ret = SendMessageA(radio2, BM_GETCHECK, 0, 0); + ok(ret == BST_UNCHECKED, "got %08x\n", ret); + ret = SendMessageA(radio3, BM_GETCHECK, 0, 0); + ok(ret == BST_UNCHECKED, "got %08x\n", ret); + + SendMessageA(radio2, BM_SETCHECK, BST_CHECKED, 0); + + ret = SendMessageA(radio1, BM_GETCHECK, 0, 0); + ok(ret == BST_CHECKED, "got %08x\n", ret); + ret = SendMessageA(radio2, BM_GETCHECK, 0, 0); + ok(ret == BST_CHECKED, "got %08x\n", ret); + ret = SendMessageA(radio3, BM_GETCHECK, 0, 0); + ok(ret == BST_UNCHECKED, "got %08x\n", ret); + + SendMessageA(radio3, BM_SETCHECK, BST_CHECKED, 0); + + ret = SendMessageA(radio1, BM_GETCHECK, 0, 0); + ok(ret == BST_CHECKED, "got %08x\n", ret); + ret = SendMessageA(radio2, BM_GETCHECK, 0, 0); + ok(ret == BST_CHECKED, "got %08x\n", ret); + ret = SendMessageA(radio3, BM_GETCHECK, 0, 0); + ok(ret == BST_CHECKED, "got %08x\n", ret); + + GetWindowRect(radio2, &rc); + SetCursorPos(rc.left+1, rc.top+1); + + flush_events(); + flush_sequence(); + + log_all_parent_messages++; + + SendMessageA(radio2, BM_CLICK, 0, 0); + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessageA(&msg); + ok_sequence(auto_radio_button_WM_CLICK, "BM_CLICK on auto-radio button", FALSE); + + log_all_parent_messages--; + + ret = SendMessageA(radio1, BM_GETCHECK, 0, 0); + ok(ret == BST_UNCHECKED, "got %08x\n", ret); + ret = SendMessageA(radio2, BM_GETCHECK, 0, 0); + ok(ret == BST_CHECKED, "got %08x\n", ret); + ret = SendMessageA(radio3, BM_GETCHECK, 0, 0); + ok(ret == BST_UNCHECKED, "got %08x\n", ret); + + DestroyWindow(parent); +} + /****************** static message test *************************/ static const struct message WmSetFontStaticSeq2[] = { @@ -17130,6 +17254,7 @@ START_TEST(msg) test_mdi_messages(); test_button_messages(); test_button_bm_get_set_image(); + test_autoradio_messages(); test_static_messages(); test_listbox_messages(); test_combobox_messages(); -- 2.17.1

2 1

[PATCH 1/2] user32: Move the auto radio button group logic from BM_SETCHECK to WM_LBUTTONUP handler.
by Dmitry Timoshkov 25 Nov '18

25 Nov '18

This patch also changes the logic to get the control style with WM_GETDLGCODE instead of GetWindowLong to make the message test pass. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/user32/button.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/dlls/user32/button.c b/dlls/user32/button.c index 9255a46343..9a011ba266 100644 --- a/dlls/user32/button.c +++ b/dlls/user32/button.c @@ -309,7 +309,7 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, SendMessageW( hWnd, BM_SETCHECK, !(state & BST_CHECKED), 0 ); break; case BS_AUTORADIOBUTTON: - SendMessageW( hWnd, BM_SETCHECK, TRUE, 0 ); + BUTTON_CheckAutoRadioButton( hWnd ); break; case BS_AUTO3STATE: SendMessageW( hWnd, BM_SETCHECK, @@ -475,8 +475,6 @@ LRESULT ButtonWndProc_common(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam, set_button_state( hWnd, (state & ~3) | wParam ); paint_button( hWnd, btn_type, ODA_SELECT ); } - if ((btn_type == BS_AUTORADIOBUTTON) && (wParam == BST_CHECKED) && (style & WS_CHILD)) - BUTTON_CheckAutoRadioButton( hWnd ); break; case BM_GETSTATE: @@ -961,13 +959,12 @@ static void BUTTON_CheckAutoRadioButton( HWND hwnd ) parent = GetParent(hwnd); /* make sure that starting control is not disabled or invisible */ - start = sibling = GetNextDlgGroupItem( parent, hwnd, TRUE ); + start = sibling = hwnd; do { if (!sibling) break; - if ((hwnd != sibling) && - ((GetWindowLongW( sibling, GWL_STYLE) & BS_TYPEMASK) == BS_AUTORADIOBUTTON)) - SendMessageW( sibling, BM_SETCHECK, BST_UNCHECKED, 0 ); + if (SendMessageW( sibling, WM_GETDLGCODE, 0, 0 ) == (DLGC_BUTTON | DLGC_RADIOBUTTON)) + SendMessageW( sibling, BM_SETCHECK, sibling == hwnd ? BST_CHECKED : BST_UNCHECKED, 0 ); sibling = GetNextDlgGroupItem( parent, sibling, FALSE ); } while (sibling != start); } -- 2.17.1

2 1