- wine-devel - winehq.org

[PATCH 1/2] configure: Add __builtin_ctz
by Gabriel Ivăncescu 20 Nov '18

20 Nov '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- Needed for LBS_NODATA. configure.ac | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/configure.ac b/configure.ac index 294fe4b..c6bdbe7 100644 --- a/configure.ac +++ b/configure.ac @@ -2770,6 +2770,15 @@ then AC_DEFINE(HAVE___BUILTIN_CLZ, 1, [Define to 1 if you have the `__builtin_clz' built-in function.]) fi +dnl Check for __builtin_ctz +AC_CACHE_CHECK([for __builtin_ctz], ac_cv_have___builtin_ctz, + AC_LINK_IFELSE([AC_LANG_PROGRAM(,[[return __builtin_ctz(1)]])], + [ac_cv_have___builtin_ctz="yes"], [ac_cv_have___builtin_ctz="no"])) +if test "$ac_cv_have___builtin_ctz" = "yes" +then + AC_DEFINE(HAVE___BUILTIN_CTZ, 1, [Define to 1 if you have the `__builtin_ctz' built-in function.]) +fi + dnl Check for __builtin_popcount AC_CACHE_CHECK([for __builtin_popcount], ac_cv_have___builtin_popcount, AC_LINK_IFELSE([AC_LANG_PROGRAM(,[[return __builtin_popcount(1)]])], -- 2.19.1

3 15

[PATCH v3 3/3] comctl32/status: Checking size grip bounds in x-axis only.
by Waritnan Sookbuntherng 20 Nov '18

20 Nov '18

Signed-off-by: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> --- v2: Add this commit for checking bounds inclusively. v3: Determine bounds using x-axis only. --- dlls/comctl32/status.c | 5 +---- dlls/comctl32/tests/status.c | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index 3bf72fa577..6ea7d9e997 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -1009,10 +1009,7 @@ STATUSBAR_WMNCHitTest (const STATUS_INFO *infoPtr, INT x, INT y) pt.y = y; ScreenToClient (infoPtr->Self, &pt); - rect.left = rect.right - 13; - rect.top += 2; - - if (PtInRect (&rect, pt)) + if (pt.x >= rect.right - GetSystemMetrics(SM_CXVSCROLL)) { if (GetWindowLongW( infoPtr->Self, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) return HTBOTTOMLEFT; else return HTBOTTOMRIGHT; diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index 2841a502ae..f37f5ce431 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -625,12 +625,12 @@ static void test_sizegrip(void) /* check bounds when not maximized */ SETWNDLONG(FALSE, FALSE); - todo_wine TEST_NCHITTEST(rcGripper.left, rcGripper.top, HTBOTTOMRIGHT); + TEST_NCHITTEST(rcGripper.left, rcGripper.top, HTBOTTOMRIGHT); TEST_NCHITTEST(rcGripper.left - 1, rcGripper.top, HTCLIENT); - todo_wine TEST_NCHITTEST(rcGripper.left, rcGripper.top - 1, HTBOTTOMRIGHT); - todo_wine TEST_NCHITTEST(rcGripper.right, rcGripper.bottom, HTBOTTOMRIGHT); - todo_wine TEST_NCHITTEST(rcGripper.right + 1, rcGripper.bottom, HTBOTTOMRIGHT); - todo_wine TEST_NCHITTEST(rcGripper.right, rcGripper.bottom + 1, HTBOTTOMRIGHT); + TEST_NCHITTEST(rcGripper.left, rcGripper.top - 1, HTBOTTOMRIGHT); + TEST_NCHITTEST(rcGripper.right, rcGripper.bottom, HTBOTTOMRIGHT); + TEST_NCHITTEST(rcGripper.right + 1, rcGripper.bottom, HTBOTTOMRIGHT); + TEST_NCHITTEST(rcGripper.right, rcGripper.bottom + 1, HTBOTTOMRIGHT); TEST_NCHITTEST(rcGripper.right - 1, rcGripper.bottom - 1, HTBOTTOMRIGHT); /* maximized */ @@ -645,12 +645,12 @@ static void test_sizegrip(void) /* not maximized and right-to-left */ SETWNDLONG(FALSE, TRUE); - todo_wine TEST_NCHITTEST(rcGripper.left, rcGripper.top, HTBOTTOMLEFT); + TEST_NCHITTEST(rcGripper.left, rcGripper.top, HTBOTTOMLEFT); TEST_NCHITTEST(rcGripper.left - 1, rcGripper.top, HTCLIENT); - todo_wine TEST_NCHITTEST(rcGripper.left, rcGripper.top - 1, HTBOTTOMLEFT); - todo_wine TEST_NCHITTEST(rcGripper.right, rcGripper.bottom, HTBOTTOMLEFT); - todo_wine TEST_NCHITTEST(rcGripper.right + 1, rcGripper.bottom, HTBOTTOMLEFT); - todo_wine TEST_NCHITTEST(rcGripper.right, rcGripper.bottom + 1, HTBOTTOMLEFT); + TEST_NCHITTEST(rcGripper.left, rcGripper.top - 1, HTBOTTOMLEFT); + TEST_NCHITTEST(rcGripper.right, rcGripper.bottom, HTBOTTOMLEFT); + TEST_NCHITTEST(rcGripper.right + 1, rcGripper.bottom, HTBOTTOMLEFT); + TEST_NCHITTEST(rcGripper.right, rcGripper.bottom + 1, HTBOTTOMLEFT); TEST_NCHITTEST(rcGripper.right - 1, rcGripper.bottom - 1, HTBOTTOMLEFT); /* maximized with right-to-left */ -- 2.19.1

1 0

[PATCH v3 2/3] comctl32/status: Hide size grip when the parent window is maximized.
by Waritnan Sookbuntherng 20 Nov '18

20 Nov '18

Signed-off-by: Waritnan Sookbuntherng <lion328(a)hotmail.co.th> --- dlls/comctl32/status.c | 6 ++++-- dlls/comctl32/tests/status.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/status.c b/dlls/comctl32/status.c index cb27ee868c..3bf72fa577 100644 --- a/dlls/comctl32/status.c +++ b/dlls/comctl32/status.c @@ -284,7 +284,8 @@ STATUSBAR_Refresh (STATUS_INFO *infoPtr, HDC hdc) SelectObject (hdc, hOldFont); - if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) + if ((GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) + && !(GetWindowLongW (infoPtr->Notify, GWL_STYLE) & WS_MAXIMIZE)) STATUSBAR_DrawSizeGrip (theme, hdc, &rect); return 0; @@ -997,7 +998,8 @@ STATUSBAR_WMGetText (const STATUS_INFO *infoPtr, INT size, LPWSTR buf) static BOOL STATUSBAR_WMNCHitTest (const STATUS_INFO *infoPtr, INT x, INT y) { - if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) { + if ((GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) + && !(GetWindowLongW (infoPtr->Notify, GWL_STYLE) & WS_MAXIMIZE)) { RECT rect; POINT pt; diff --git a/dlls/comctl32/tests/status.c b/dlls/comctl32/tests/status.c index 074e637801..2841a502ae 100644 --- a/dlls/comctl32/tests/status.c +++ b/dlls/comctl32/tests/status.c @@ -641,7 +641,7 @@ static void test_sizegrip(void) TEST_NCHITTEST(rcGripper.right, rcGripper.bottom, HTNOWHERE); TEST_NCHITTEST(rcGripper.right + 1, rcGripper.bottom, HTNOWHERE); TEST_NCHITTEST(rcGripper.right, rcGripper.bottom + 1, HTNOWHERE); - todo_wine TEST_NCHITTEST(rcGripper.right - 1, rcGripper.bottom - 1, HTCLIENT); + TEST_NCHITTEST(rcGripper.right - 1, rcGripper.bottom - 1, HTCLIENT); /* not maximized and right-to-left */ SETWNDLONG(FALSE, TRUE); @@ -661,7 +661,7 @@ static void test_sizegrip(void) TEST_NCHITTEST(rcGripper.right, rcGripper.bottom, HTNOWHERE); TEST_NCHITTEST(rcGripper.right + 1, rcGripper.bottom, HTNOWHERE); TEST_NCHITTEST(rcGripper.right, rcGripper.bottom + 1, HTNOWHERE); - todo_wine TEST_NCHITTEST(rcGripper.right - 1, rcGripper.bottom - 1, HTCLIENT); + TEST_NCHITTEST(rcGripper.right - 1, rcGripper.bottom - 1, HTCLIENT); #undef TEST_NCHITTEST #undef SETWNDLONG -- 2.19.1

1 0

[PATCH v4 4/4] kernelbase: Implement PathCchRenameExtension.
by Zhiyi Zhang 20 Nov '18

20 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 | 13 +++ dlls/kernelbase/tests/path.c | 80 +++++++++++++++++++ include/pathcch.h | 1 + 5 files changed, 96 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 57e0a67792..0524e7c304 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 @@ -15,7 +15,7 @@ @ stub PathCchRemoveBackslashEx @ stdcall PathCchRemoveExtension(wstr long) kernelbase.PathCchRemoveExtension @ stub PathCchRemoveFileSpec -@ stub PathCchRenameExtension +@ stdcall PathCchRenameExtension(wstr long wstr) kernelbase.PathCchRenameExtension @ stub PathCchSkipRoot @ stub PathCchStripPrefix @ stub PathCchStripToRoot diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index ffe7be20df..286dae0001 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1044,7 +1044,7 @@ # @ stub PathCchRemoveBackslashEx @ stdcall PathCchRemoveExtension(wstr long) # @ stub PathCchRemoveFileSpec -# @ stub PathCchRenameExtension +@ stdcall PathCchRenameExtension(wstr long wstr) # @ stub PathCchSkipRoot # @ stub PathCchStripPrefix # @ stub PathCchStripToRoot diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 001c6828a6..12ca3919e4 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -170,3 +170,16 @@ HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size) return next == extension ? S_FALSE : S_OK; } + +HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *extension) +{ + HRESULT hr; + + TRACE("%s %lu %s\n", wine_dbgstr_w(path), size, wine_dbgstr_w(extension)); + + hr = PathCchRemoveExtension(path, size); + if (FAILED(hr)) return hr; + + hr = PathCchAddExtension(path, size, extension); + return FAILED(hr) ? hr : S_OK; +} diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index ec8ed85cba..9d8f5d82df 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -36,6 +36,7 @@ HRESULT (WINAPI *pPathCchAddExtension)(WCHAR *path, SIZE_T size, const WCHAR *ex 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); HRESULT (WINAPI *pPathCchRemoveExtension)(WCHAR *path, SIZE_T size); +HRESULT (WINAPI *pPathCchRenameExtension)(WCHAR *path, SIZE_T size, const WCHAR *extension); static const struct { @@ -554,6 +555,83 @@ static void test_PathCchRemoveExtension(void) } } +struct renameextension_test +{ + const CHAR *path; + const CHAR *extension; + const CHAR *expected; +}; + +static const struct renameextension_test renameextension_tests[] = +{ + {"1.exe", ".txt", "1.txt"}, + {"C:1.exe", ".txt", "C:1.txt"}, + {"C:\\1.exe", ".txt", "C:\\1.txt"}, + {"\\1.exe", ".txt", "\\1.txt"}, + {"\\\\1.exe", ".txt", "\\\\1.txt"}, + {"\\\\?\\C:1.exe", ".txt", "\\\\?\\C:1.txt"}, + {"\\\\?\\C:\\1.exe", ".txt", "\\\\?\\C:\\1.txt"}, + {"\\\\?\\UNC\\1.exe", ".txt", "\\\\?\\UNC\\1.txt"}, + {"\\\\?\\UNC\\192.168.1.1\\1.exe", ".txt", "\\\\?\\UNC\\192.168.1.1\\1.txt"}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\1.exe", ".txt", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\1.txt"}, + {"C:\\1.exe", "", "C:\\1"}, + {"C:\\1.exe", "txt", "C:\\1.txt"} +}; + +static void test_PathCchRenameExtension(void) +{ + WCHAR pathW[PATHCCH_MAX_CCH + 1]; + CHAR pathA[PATHCCH_MAX_CCH + 1]; + WCHAR extensionW[MAX_PATH]; + HRESULT hr; + INT i; + + if (!pPathCchRenameExtension) + { + win_skip("PathCchRenameExtension() is not available.\n"); + return; + } + + /* Invalid arguments */ + MultiByteToWideChar(CP_ACP, 0, "C:\\1.txt", -1, pathW, ARRAY_SIZE(pathW)); + MultiByteToWideChar(CP_ACP, 0, ".exe", -1, extensionW, ARRAY_SIZE(extensionW)); + + hr = pPathCchRenameExtension(NULL, PATHCCH_MAX_CCH, extensionW); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchRenameExtension(pathW, 0, extensionW); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchRenameExtension(pathW, PATHCCH_MAX_CCH, NULL); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + /* Path length */ + hr = pPathCchRenameExtension(pathW, ARRAY_SIZE("C:\\1.exe") - 1, extensionW); + ok(E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchRenameExtension(pathW, PATHCCH_MAX_CCH + 1, extensionW); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchRenameExtension(pathW, PATHCCH_MAX_CCH, extensionW); + ok(hr == S_OK, "expect result %#x, got %#x\n", S_OK, hr); + + for (i = 0; i < ARRAY_SIZE(renameextension_tests); i++) + { + const struct renameextension_test *t = renameextension_tests + i; + MultiByteToWideChar(CP_ACP, 0, t->path, -1, pathW, ARRAY_SIZE(pathW)); + MultiByteToWideChar(CP_ACP, 0, t->extension, -1, extensionW, ARRAY_SIZE(extensionW)); + hr = pPathCchRenameExtension(pathW, PATHCCH_MAX_CCH, extensionW); + ok(hr == S_OK, "path %s extension %s expect result %#x, got %#x\n", t->path, t->extension, S_OK, hr); + if (SUCCEEDED(hr)) + { + WideCharToMultiByte(CP_ACP, 0, pathW, -1, pathA, ARRAY_SIZE(pathA), NULL, NULL); + ok(!lstrcmpA(pathA, t->expected), "path %s extension %s expect output path %s, got %s\n", t->path, + t->extension, t->expected, pathA); + } + } +} + START_TEST(path) { HMODULE hmod = LoadLibraryA("kernelbase.dll"); @@ -564,6 +642,7 @@ START_TEST(path) pPathCchAddExtension = (void *)GetProcAddress(hmod, "PathCchAddExtension"); pPathCchFindExtension = (void *)GetProcAddress(hmod, "PathCchFindExtension"); pPathCchRemoveExtension = (void *)GetProcAddress(hmod, "PathCchRemoveExtension"); + pPathCchRenameExtension = (void *)GetProcAddress(hmod, "PathCchRenameExtension"); test_PathCchCombineEx(); test_PathCchAddBackslash(); @@ -571,4 +650,5 @@ START_TEST(path) test_PathCchAddExtension(); test_PathCchFindExtension(); test_PathCchRemoveExtension(); + test_PathCchRenameExtension(); } diff --git a/include/pathcch.h b/include/pathcch.h index 2f125bb9ed..3057b6c1ec 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -31,3 +31,4 @@ HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extens 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); HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size); +HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); -- 2.19.1

1 0

[PATCH v4 3/4] kernelbase: Implement PathCchRemoveExtension.
by Zhiyi Zhang 20 Nov '18

20 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 | 19 +++++ dlls/kernelbase/tests/path.c | 85 +++++++++++++++++++ include/pathcch.h | 1 + 5 files changed, 107 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 fed23cbac1..57e0a67792 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 @@ -13,7 +13,7 @@ @ stub PathCchIsRoot @ stub PathCchRemoveBackslash @ stub PathCchRemoveBackslashEx -@ stub PathCchRemoveExtension +@ stdcall PathCchRemoveExtension(wstr long) kernelbase.PathCchRemoveExtension @ stub PathCchRemoveFileSpec @ stub PathCchRenameExtension @ stub PathCchSkipRoot diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 27d10ce731..ffe7be20df 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1042,7 +1042,7 @@ # @ stub PathCchIsRoot # @ stub PathCchRemoveBackslash # @ stub PathCchRemoveBackslashEx -# @ stub PathCchRemoveExtension +@ stdcall PathCchRemoveExtension(wstr long) # @ stub PathCchRemoveFileSpec # @ stub PathCchRenameExtension # @ stub PathCchSkipRoot diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 2ddc708f07..001c6828a6 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -151,3 +151,22 @@ HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR *extension = lastpoint ? lastpoint : path; return S_OK; } + +HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size) +{ + const WCHAR *extension; + WCHAR *next; + HRESULT hr; + + TRACE("%s %lu\n", wine_dbgstr_w(path), size); + + if (!path || !size || size > PATHCCH_MAX_CCH) return E_INVALIDARG; + + hr = PathCchFindExtension(path, size, &extension); + if (FAILED(hr)) return hr; + + next = path + (extension - path); + while (next - path < size && *next) *next++ = 0; + + return next == extension ? S_FALSE : S_OK; +} diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 178031a116..ec8ed85cba 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -35,6 +35,7 @@ HRESULT (WINAPI *pPathCchAddBackslashEx)(WCHAR *out, SIZE_T size, WCHAR **endptr HRESULT (WINAPI *pPathCchAddExtension)(WCHAR *path, SIZE_T size, const WCHAR *extension); 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); +HRESULT (WINAPI *pPathCchRemoveExtension)(WCHAR *path, SIZE_T size); static const struct { @@ -471,6 +472,88 @@ static void test_PathCchFindExtension(void) } } +struct removeextension_test +{ + const CHAR *path; + const CHAR *expected; + HRESULT hr; +}; + +static const struct removeextension_test removeextension_tests[] = +{ + {"1.exe", "1", S_OK}, + {"C:1.exe", "C:1", S_OK}, + {"C:\\1.exe", "C:\\1", S_OK}, + {"\\1.exe", "\\1", S_OK}, + {"\\\\1.exe", "\\\\1", S_OK}, + {"\\\\?\\C:1.exe", "\\\\?\\C:1", S_OK}, + {"\\\\?\\C:\\1.exe", "\\\\?\\C:\\1", S_OK}, + {"\\\\?\\UNC\\1.exe", "\\\\?\\UNC\\1", S_OK}, + {"\\\\?\\UNC\\192.168.1.1\\1.exe", "\\\\?\\UNC\\192.168.1.1\\1", S_OK}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\1.exe", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\1", S_OK}, + + /* Malformed */ + {"", "", S_FALSE}, + {" ", " ", S_FALSE}, + {".", "", S_OK}, + {"..", ".", S_OK}, + {"a", "a", S_FALSE}, + {"a.", "a", S_OK}, + {".a.b.", ".a.b", S_OK}, + {"a. ", "a. ", S_FALSE}, + {"a.\\", "a.\\", S_FALSE}, + {"\\\\?\\UNC\\192.168.1.1", "\\\\?\\UNC\\192.168.1", S_OK}, + {"\\\\?\\UNC\\192.168.1.1\\", "\\\\?\\UNC\\192.168.1.1\\", S_FALSE}, + {"\\\\?\\UNC\\192.168.1.1\\a", "\\\\?\\UNC\\192.168.1.1\\a", S_FALSE} +}; + +static void test_PathCchRemoveExtension(void) +{ + WCHAR pathW[PATHCCH_MAX_CCH] = {0}; + CHAR pathA[PATHCCH_MAX_CCH]; + HRESULT hr; + INT i; + + if (!pPathCchRemoveExtension) + { + win_skip("PathCchRemoveExtension() is not available.\n"); + return; + } + + /* Arguments check */ + hr = pPathCchRemoveExtension(NULL, PATHCCH_MAX_CCH); + ok(hr == E_INVALIDARG, "expect %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchRemoveExtension(pathW, 0); + ok(hr == E_INVALIDARG, "expect %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchRemoveExtension(pathW, PATHCCH_MAX_CCH + 1); + ok(hr == E_INVALIDARG, "expect %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchRemoveExtension(pathW, PATHCCH_MAX_CCH); + ok(hr == S_FALSE, "expect %#x, got %#x\n", S_FALSE, hr); + + /* Size < original path length + 1 */ + MultiByteToWideChar(CP_ACP, 0, "C:\\1.exe", -1, pathW, ARRAY_SIZE(pathW)); + hr = pPathCchRemoveExtension(pathW, ARRAY_SIZE("C:\\1.exe") - 1); + ok(hr == E_INVALIDARG, "expect %#x, got %#x\n", E_INVALIDARG, hr); + + for (i = 0; i < ARRAY_SIZE(removeextension_tests); i++) + { + const struct removeextension_test *t = removeextension_tests + i; + + MultiByteToWideChar(CP_ACP, 0, t->path, -1, pathW, ARRAY_SIZE(pathW)); + hr = pPathCchRemoveExtension(pathW, ARRAY_SIZE(pathW)); + ok(hr == t->hr, "path %s expect result %#x, got %#x\n", t->path, t->hr, hr); + if (SUCCEEDED(hr)) + { + WideCharToMultiByte(CP_ACP, 0, pathW, -1, pathA, ARRAY_SIZE(pathA), NULL, NULL); + ok(!lstrcmpA(pathA, t->expected), "path %s expect stripped path %s, got %s\n", t->path, t->expected, pathA); + } + } +} + START_TEST(path) { HMODULE hmod = LoadLibraryA("kernelbase.dll"); @@ -480,10 +563,12 @@ START_TEST(path) pPathCchAddBackslashEx = (void *)GetProcAddress(hmod, "PathCchAddBackslashEx"); pPathCchAddExtension = (void *)GetProcAddress(hmod, "PathCchAddExtension"); pPathCchFindExtension = (void *)GetProcAddress(hmod, "PathCchFindExtension"); + pPathCchRemoveExtension = (void *)GetProcAddress(hmod, "PathCchRemoveExtension"); test_PathCchCombineEx(); test_PathCchAddBackslash(); test_PathCchAddBackslashEx(); test_PathCchAddExtension(); test_PathCchFindExtension(); + test_PathCchRemoveExtension(); } diff --git a/include/pathcch.h b/include/pathcch.h index 5a189bc0e7..2f125bb9ed 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -30,3 +30,4 @@ HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **end, SIZE HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); 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); +HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size); -- 2.19.1

1 0

[PATCH v4 2/4] kernelbase: Implement PathCchAddExtension.
by Zhiyi Zhang 20 Nov '18

20 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 | 52 +++++++++ dlls/kernelbase/tests/path.c | 108 ++++++++++++++++++ include/pathcch.h | 1 + 5 files changed, 163 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 7b812eb49d..fed23cbac1 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 @@ -2,7 +2,7 @@ @ stub PathAllocCombine @ stdcall PathCchAddBackslash(wstr long) kernelbase.PathCchAddBackslash @ stdcall PathCchAddBackslashEx(wstr long ptr ptr) kernelbase.PathCchAddBackslashEx -@ stub PathCchAddExtension +@ stdcall PathCchAddExtension(wstr long wstr) kernelbase.PathCchAddExtension @ stub PathCchAppend @ stub PathCchAppendEx @ stub PathCchCanonicalize diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 2372db821e..27d10ce731 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1031,7 +1031,7 @@ @ stdcall PathCanonicalizeW(ptr wstr) shlwapi.PathCanonicalizeW @ stdcall PathCchAddBackslash(wstr long) @ stdcall PathCchAddBackslashEx(wstr long ptr ptr) -# @ stub PathCchAddExtension +@ stdcall PathCchAddExtension(wstr long wstr) # @ stub PathCchAppend # @ stub PathCchAppendEx # @ stub PathCchCanonicalize diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index b051986031..2ddc708f07 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -29,6 +29,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(path); +static SIZE_T wcsnlen(const WCHAR *string, SIZE_T maxlen) +{ + SIZE_T i; + + for (i = 0; i < maxlen; i++) + if (!string[i]) break; + return i; +} + HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size) { return PathCchAddBackslashEx(path, size, NULL, NULL); @@ -67,6 +76,49 @@ HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **endptr, S return S_OK; } +HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extension) +{ + const WCHAR *existing_extension, *next; + SIZE_T path_length, extension_length, dot_length; + BOOL has_dot; + HRESULT hr; + + TRACE("%s %lu %s\n", wine_dbgstr_w(path), size, wine_dbgstr_w(extension)); + + if (!path || !size || size > PATHCCH_MAX_CCH || !extension) return E_INVALIDARG; + + next = extension; + while (*next) + { + if ((*next == '.' && next > extension) || *next == ' ' || *next == '\\') return E_INVALIDARG; + next++; + } + + has_dot = extension[0] == '.' ? TRUE : FALSE; + + hr = PathCchFindExtension(path, size, &existing_extension); + if (FAILED(hr)) return hr; + if (*existing_extension) return S_FALSE; + + path_length = wcsnlen(path, size); + dot_length = has_dot ? 0 : 1; + extension_length = strlenW(extension); + + if (path_length + dot_length + extension_length + 1 > size) return STRSAFE_E_INSUFFICIENT_BUFFER; + + /* If extension is empty or only dot, return S_OK with path unchanged */ + if (!extension[0] || (extension[0] == '.' && !extension[1])) return S_OK; + + if (!has_dot) + { + path[path_length] = '.'; + path_length++; + } + + strcpyW(path + path_length, extension); + 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 5408b6b9fd..178031a116 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -32,6 +32,7 @@ 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); 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); @@ -247,6 +248,111 @@ static void test_PathCchAddBackslashEx(void) } } +struct addextension_test +{ + const CHAR *path; + const CHAR *extension; + const CHAR *expected; + HRESULT hr; +}; + +static const struct addextension_test addextension_tests[] = +{ + /* Normal */ + {"", ".exe", ".exe", S_OK}, + {"C:\\", "", "C:\\", S_OK}, + {"C:", ".exe", "C:.exe", S_OK}, + {"C:\\", ".exe", "C:\\.exe", S_OK}, + {"\\", ".exe", "\\.exe", S_OK}, + {"\\\\", ".exe", "\\\\.exe", S_OK}, + {"\\\\?\\C:", ".exe", "\\\\?\\C:.exe", S_OK}, + {"\\\\?\\C:\\", ".exe", "\\\\?\\C:\\.exe", S_OK}, + {"\\\\?\\UNC\\", ".exe", "\\\\?\\UNC\\.exe", S_OK}, + {"\\\\?\\UNC\\192.168.1.1\\", ".exe", "\\\\?\\UNC\\192.168.1.1\\.exe", S_OK}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", ".exe", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\.exe", S_OK}, + {"C:\\", "exe", "C:\\.exe", S_OK}, + {"C:\\", ".", "C:\\", S_OK}, + {"C:\\1.exe", ".txt", "C:\\1.exe", S_FALSE}, + + /* Extension contains invalid characters but valid for PathCchAddExtension */ + {"C:\\", "./", "C:\\./", S_OK}, + {"C:\\", ".?", "C:\\.?", S_OK}, + {"C:\\", ".%", "C:\\.%", S_OK}, + {"C:\\", ".*", "C:\\.*", S_OK}, + {"C:\\", ".:", "C:\\.:", S_OK}, + {"C:\\", ".|", "C:\\.|", S_OK}, + {"C:\\", ".\"", "C:\\.\"", S_OK}, + {"C:\\", ".<", "C:\\.<", S_OK}, + {"C:\\", ".>", "C:\\.>", S_OK}, + + /* Invalid argument for extension */ + {"C:\\", " exe", NULL, E_INVALIDARG}, + {"C:\\", ". exe", NULL, E_INVALIDARG}, + {"C:\\", " ", NULL, E_INVALIDARG}, + {"C:\\", "\\", NULL, E_INVALIDARG}, + {"C:\\", "..", NULL, E_INVALIDARG}, + {"C:\\", ". ", NULL, E_INVALIDARG}, + {"C:\\", ".\\", NULL, E_INVALIDARG}, + {"C:\\", ".a.", NULL, E_INVALIDARG}, + {"C:\\", ".a ", NULL, E_INVALIDARG}, + {"C:\\", ".a\\", NULL, E_INVALIDARG}, + {"C:\\1.exe", " ", NULL, E_INVALIDARG} +}; + +static void test_PathCchAddExtension(void) +{ + WCHAR pathW[PATHCCH_MAX_CCH + 1]; + CHAR pathA[PATHCCH_MAX_CCH + 1]; + WCHAR extensionW[MAX_PATH]; + HRESULT hr; + INT i; + + if (!pPathCchAddExtension) + { + win_skip("PathCchAddExtension() is not available.\n"); + return; + } + + /* Arguments check */ + MultiByteToWideChar(CP_ACP, 0, "C:\\", -1, pathW, ARRAY_SIZE(pathW)); + MultiByteToWideChar(CP_ACP, 0, ".exe", -1, extensionW, ARRAY_SIZE(extensionW)); + + hr = pPathCchAddExtension(NULL, PATHCCH_MAX_CCH, extensionW); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchAddExtension(pathW, 0, extensionW); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchAddExtension(pathW, PATHCCH_MAX_CCH, NULL); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + /* Path length check */ + hr = pPathCchAddExtension(pathW, ARRAY_SIZE("C:\\.exe") - 1, extensionW); + ok(hr == STRSAFE_E_INSUFFICIENT_BUFFER, "expect result %#x, got %#x\n", STRSAFE_E_INSUFFICIENT_BUFFER, hr); + + hr = pPathCchAddExtension(pathW, PATHCCH_MAX_CCH + 1, extensionW); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchAddExtension(pathW, PATHCCH_MAX_CCH, extensionW); + ok(hr == S_OK, "expect result %#x, got %#x\n", S_OK, hr); + + for (i = 0; i < ARRAY_SIZE(addextension_tests); i++) + { + const struct addextension_test *t = addextension_tests + i; + MultiByteToWideChar(CP_ACP, 0, t->path, -1, pathW, ARRAY_SIZE(pathW)); + MultiByteToWideChar(CP_ACP, 0, t->extension, -1, extensionW, ARRAY_SIZE(extensionW)); + hr = pPathCchAddExtension(pathW, PATHCCH_MAX_CCH, extensionW); + ok(hr == t->hr, "path %s extension %s expect result %#x, got %#x\n", t->path, t->extension, t->hr, hr); + if (SUCCEEDED(hr)) + { + WideCharToMultiByte(CP_ACP, 0, pathW, -1, pathA, ARRAY_SIZE(pathA), NULL, NULL); + ok(!lstrcmpA(pathA, t->expected), "path %s extension %s expect output path %s, got %s\n", t->path, + t->extension, t->expected, pathA); + } + } +} + struct findextension_test { const CHAR *path; @@ -372,10 +478,12 @@ START_TEST(path) pPathCchCombineEx = (void *)GetProcAddress(hmod, "PathCchCombineEx"); pPathCchAddBackslash = (void *)GetProcAddress(hmod, "PathCchAddBackslash"); pPathCchAddBackslashEx = (void *)GetProcAddress(hmod, "PathCchAddBackslashEx"); + pPathCchAddExtension = (void *)GetProcAddress(hmod, "PathCchAddExtension"); pPathCchFindExtension = (void *)GetProcAddress(hmod, "PathCchFindExtension"); test_PathCchCombineEx(); test_PathCchAddBackslash(); test_PathCchAddBackslashEx(); + test_PathCchAddExtension(); test_PathCchFindExtension(); } diff --git a/include/pathcch.h b/include/pathcch.h index 6bb760ccdb..5a189bc0e7 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -27,5 +27,6 @@ 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); 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); -- 2.19.1

1 0

[PATCH v4 1/4] kernelbase: Implement PathCchFindExtension.
by Zhiyi Zhang 20 Nov '18

20 Nov '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Fix apply failure due to mail client text encoding. v3: Avoid possible buffer overrun. Add more tests. Thanks to Nikolay. v4: Revert back to using function checks to skip tests. Add more tests. .../api-ms-win-core-path-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/path.c | 34 +++++ dlls/kernelbase/tests/path.c | 122 ++++++++++++++++++ include/pathcch.h | 3 + 5 files changed, 161 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 287c5d61d9..7b812eb49d 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 @@ -9,7 +9,7 @@ @ stub PathCchCanonicalizeEx @ stub PathCchCombine @ stub PathCchCombineEx -@ stub PathCchFindExtension +@ stdcall PathCchFindExtension(wstr long ptr) kernelbase.PathCchFindExtension @ stub PathCchIsRoot @ stub PathCchRemoveBackslash @ stub PathCchRemoveBackslashEx diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index f3b4fd131f..2372db821e 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1038,7 +1038,7 @@ # @ stub PathCchCanonicalizeEx # @ stub PathCchCombine # @ stub PathCchCombineEx -# @ stub PathCchFindExtension +@ stdcall PathCchFindExtension(wstr long ptr) # @ stub PathCchIsRoot # @ stub PathCchRemoveBackslash # @ stub PathCchRemoveBackslashEx diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 373c34e979..b051986031 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -1,5 +1,6 @@ /* * Copyright 2018 Nikolay Sivov + * Copyright 2018 Zhiyi Zhang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -65,3 +66,36 @@ HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **endptr, S return S_OK; } + +HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR **extension) +{ + const WCHAR *lastpoint = NULL; + SIZE_T counter = 0; + + TRACE("%s %lu %p\n", wine_dbgstr_w(path), size, extension); + + if (!path || !size || size > PATHCCH_MAX_CCH) + { + *extension = NULL; + return E_INVALIDARG; + } + + while (*path) + { + if (*path == '\\' || *path == ' ') + lastpoint = NULL; + else if (*path == '.') + lastpoint = path; + + path++; + counter++; + if (counter == size || counter == PATHCCH_MAX_CCH) + { + *extension = NULL; + return E_INVALIDARG; + } + } + + *extension = lastpoint ? lastpoint : path; + return S_OK; +} diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index cdba51bf3f..5408b6b9fd 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -2,6 +2,7 @@ * Path tests for kernelbase.dll * * Copyright 2017 Michael Müller + * Copyright 2018 Zhiyi Zhang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -32,6 +33,7 @@ HRESULT (WINAPI *pPathCchAddBackslash)(WCHAR *out, SIZE_T size); HRESULT (WINAPI *pPathCchAddBackslashEx)(WCHAR *out, SIZE_T size, WCHAR **endptr, SIZE_T *remaining); 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); static const struct { @@ -245,6 +247,124 @@ static void test_PathCchAddBackslashEx(void) } } +struct findextension_test +{ + const CHAR *path; + INT extension_offset; +}; + +static const struct findextension_test findextension_tests[] = +{ + /* Normal */ + {"1.exe", 1}, + {"C:1.exe", 3}, + {"C:\\1.exe", 4}, + {"\\1.exe", 2}, + {"\\\\1.exe", 3}, + {"\\\\?\\C:1.exe", 7}, + {"\\\\?\\C:\\1.exe", 8}, + {"\\\\?\\UNC\\1.exe", 9}, + {"\\\\?\\UNC\\192.168.1.1\\1.exe", 21}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\1.exe", 50}, + + /* Contains forward slash */ + {"C:\\a/1.exe", 6}, + {"/1.exe", 2}, + {"//1.exe", 3}, + {"C:\\a/b/1.exe", 8}, + {"/a/1.exe", 4}, + {"/a/1.exe", 4}, + + /* Malformed */ + {"", 0}, + {" ", 1}, + {".", 0}, + {"..", 1}, + {"a", 1}, + {"a.", 1}, + {".a.b.", 4}, + {"a. ", 3}, + {"a.\\", 3}, + {"\\\\?\\UNC\\192.168.1.1", 17}, + {"\\\\?\\UNC\\192.168.1.1\\", 20}, + {"\\\\?\\UNC\\192.168.1.1\\a", 21} +}; + +static void test_PathCchFindExtension(void) +{ + WCHAR pathW[PATHCCH_MAX_CCH + 1] = {0}; + const WCHAR *extension; + HRESULT hr; + INT i; + + if (!pPathCchFindExtension) + { + win_skip("PathCchFindExtension() is not available.\n"); + return; + } + + /* Arguments check */ + extension = (const WCHAR *)0xdeadbeef; + hr = pPathCchFindExtension(NULL, PATHCCH_MAX_CCH, &extension); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + ok(extension == NULL, "Expect extension null, got %p\n", extension); + + extension = (const WCHAR *)0xdeadbeef; + hr = pPathCchFindExtension(pathW, 0, &extension); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + ok(extension == NULL, "Expect extension null, got %p\n", extension); + + /* Crashed on Windows */ + if (0) + { + hr = pPathCchFindExtension(pathW, PATHCCH_MAX_CCH, NULL); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + } + + /* Path length check */ + /* size == PATHCCH_MAX_CCH + 1 */ + MultiByteToWideChar(CP_ACP, 0, "C:\\1.exe", -1, pathW, ARRAY_SIZE(pathW)); + hr = pPathCchFindExtension(pathW, PATHCCH_MAX_CCH + 1, &extension); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + /* Size == path length + 1*/ + hr = pPathCchFindExtension(pathW, ARRAY_SIZE("C:\\1.exe"), &extension); + ok(hr == S_OK, "expect result %#x, got %#x\n", S_OK, hr); + ok(*extension == '.', "wrong extension value\n"); + + /* Size < path length + 1 */ + extension = (const WCHAR *)0xdeadbeef; + hr = pPathCchFindExtension(pathW, ARRAY_SIZE("C:\\1.exe") - 1, &extension); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + ok(extension == NULL, "Expect extension null, got %p\n", extension); + + /* Size == PATHCCH_MAX_CCH */ + hr = pPathCchFindExtension(pathW, PATHCCH_MAX_CCH, &extension); + ok(hr == S_OK, "expect result %#x, got %#x\n", S_OK, hr); + + /* Path length + 1 > PATHCCH_MAX_CCH */ + for (i = 0; i < ARRAY_SIZE(pathW) - 1; i++) pathW[i] = 'a'; + pathW[PATHCCH_MAX_CCH] = 0; + hr = pPathCchFindExtension(pathW, PATHCCH_MAX_CCH, &extension); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + /* Path length + 1 == PATHCCH_MAX_CCH */ + pathW[PATHCCH_MAX_CCH - 1] = 0; + hr = pPathCchFindExtension(pathW, PATHCCH_MAX_CCH, &extension); + ok(hr == S_OK, "expect result %#x, got %#x\n", S_OK, hr); + + for (i = 0; i < ARRAY_SIZE(findextension_tests); i++) + { + const struct findextension_test *t = findextension_tests + i; + MultiByteToWideChar(CP_ACP, 0, t->path, -1, pathW, ARRAY_SIZE(pathW)); + hr = pPathCchFindExtension(pathW, PATHCCH_MAX_CCH, &extension); + ok(hr == S_OK, "path %s expect result %#x, got %#x\n", t->path, S_OK, hr); + if (SUCCEEDED(hr)) + ok(extension - pathW == t->extension_offset, "path %s expect extension offset %d, got %d\n", t->path, + t->extension_offset, extension - pathW); + } +} + START_TEST(path) { HMODULE hmod = LoadLibraryA("kernelbase.dll"); @@ -252,8 +372,10 @@ START_TEST(path) pPathCchCombineEx = (void *)GetProcAddress(hmod, "PathCchCombineEx"); pPathCchAddBackslash = (void *)GetProcAddress(hmod, "PathCchAddBackslash"); pPathCchAddBackslashEx = (void *)GetProcAddress(hmod, "PathCchAddBackslashEx"); + pPathCchFindExtension = (void *)GetProcAddress(hmod, "PathCchFindExtension"); test_PathCchCombineEx(); test_PathCchAddBackslash(); test_PathCchAddBackslashEx(); + test_PathCchFindExtension(); } diff --git a/include/pathcch.h b/include/pathcch.h index 2b2aed4c8f..6bb760ccdb 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -23,6 +23,9 @@ #define PATHCCH_DO_NOT_NORMALIZE_SEGMENTS 0x08 #define PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH 0x10 +#define PATHCCH_MAX_CCH 0x8000 + HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size); HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **end, SIZE_T *remaining); 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); -- 2.19.1

1 0

[PATCH v2 1/3] ole32: Add NULL pointer checks to PropVariantCopy.
by Sven Baars 20 Nov '18

20 Nov '18

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- v2: Added NULL checks to PropVariantCopy instead. dlls/ole32/ole2.c | 3 +++ dlls/ole32/tests/propvariant.c | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 2de9edbb80..b3f0d1f9bf 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2928,6 +2928,9 @@ HRESULT WINAPI PropVariantCopy(PROPVARIANT *pvarDest, /* [out] */ ULONG len; HRESULT hr; + if (!pvarDest || !pvarSrc) + return E_INVALIDARG; + TRACE("(%p, %p vt %04x)\n", pvarDest, pvarSrc, pvarSrc->vt); hr = PROPVARIANT_ValidateType(pvarSrc->vt); diff --git a/dlls/ole32/tests/propvariant.c b/dlls/ole32/tests/propvariant.c index 97c4eec4ca..8d74391110 100644 --- a/dlls/ole32/tests/propvariant.c +++ b/dlls/ole32/tests/propvariant.c @@ -306,6 +306,20 @@ static void test_copy(void) PROPVARIANT propvarDst; HRESULT hr; + propvarSrc.vt = VT_ILLEGAL; + hr = PropVariantCopy(&propvarDst, &propvarSrc); + ok(hr == DISP_E_BADVARTYPE, "got 0x%08x\n", hr); + + hr = PropVariantCopy(NULL, &propvarSrc); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + propvarSrc.vt = VT_EMPTY; + hr = PropVariantCopy(NULL, &propvarSrc); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + + hr = PropVariantCopy(&propvarDst, NULL); + ok(hr == E_INVALIDARG, "got 0x%08x\n", hr); + propvarSrc.vt = VT_BSTR; U(propvarSrc).bstrVal = SysAllocString(wszTestString); -- 2.17.1

3 8

[PATCH v2 1/2] rpcrt4/tests: Add a test for FC_ALIGNM* directives.
by Zebediah Figura 20 Nov '18

20 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/rpcrt4/tests/ndr_marshall.c | 67 +++++++++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index d436b42648..d77e8b598e 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -25,7 +25,6 @@ #include <stdarg.h> -#include "wine/test.h" #include <windef.h> #include <winbase.h> #include <winnt.h> @@ -38,6 +37,9 @@ #include "midles.h" #include "ndrtypes.h" +#include "wine/heap.h" +#include "wine/test.h" + static int my_alloc_called; static int my_free_called; static void * CALLBACK my_alloc(SIZE_T size) @@ -1174,6 +1176,68 @@ static void test_simple_struct(void) test_pointer_marshal(fmtstr_pointer_struct, &ps1, 17, wiredata, 21, ps1_cmp, 2, "pointer_struct"); } +struct aligned +{ + int a; + LONGLONG b; +}; + +static void test_struct_align(void) +{ + RPC_MESSAGE RpcMessage; + MIDL_STUB_MESSAGE StubMsg; + MIDL_STUB_DESC StubDesc; + void *ptr; + struct aligned *memsrc_orig, *memsrc, *mem; + + /* force bogus struct so that members are marshalled individually */ + static const unsigned char fmtstr[] = + { + 0x1a, /* FC_BOGUS_STRUCT */ + 0x7, /* alignment 8 */ + NdrFcShort(0x10), /* memory size 16 */ + NdrFcShort(0x0), + NdrFcShort(0x0), + 0x08, /* FC_LONG */ + 0x39, /* FC_ALIGNM8 */ + 0x0b, /* FC_HYPER */ + 0x5b, /* FC_END */ + }; + + memsrc_orig = heap_alloc_zero(sizeof(struct aligned) + 8); + /* intentionally mis-align memsrc */ + memsrc = (struct aligned *)((((ULONG_PTR)memsrc_orig + 7) & ~7) + 4); + + memsrc->a = 0xdeadbeef; + memsrc->b = ((ULONGLONG) 0xbadefeed << 32) | 0x2468ace0; + + StubDesc = Object_StubDesc; + StubDesc.pFormatTypes = fmtstr; + NdrClientInitializeNew(&RpcMessage, &StubMsg, &StubDesc, 0); + + StubMsg.BufferLength = 0; + NdrComplexStructBufferSize(&StubMsg, (unsigned char *)memsrc, fmtstr); + + StubMsg.RpcMsg->Buffer = StubMsg.BufferStart = StubMsg.Buffer = heap_alloc(StubMsg.BufferLength); + StubMsg.BufferEnd = StubMsg.BufferStart + StubMsg.BufferLength; + + ptr = NdrComplexStructMarshall(&StubMsg, (unsigned char *)memsrc, fmtstr); + ok(ptr == NULL, "ret %p\n", ptr); + + /* Server */ + StubMsg.IsClient = 0; + mem = NULL; + StubMsg.Buffer = StubMsg.BufferStart; + ptr = NdrComplexStructUnmarshall(&StubMsg, (unsigned char **)&mem, fmtstr, 0); + ok(ptr == NULL, "ret %p\n", ptr); +todo_wine + ok(!memcmp(mem, memsrc, sizeof(*memsrc)), "struct wasn't unmarshalled correctly\n"); + StubMsg.pfnFree(mem); + + heap_free(StubMsg.RpcMsg->Buffer); + heap_free(memsrc_orig); +} + struct testiface { IPersist IPersist_iface; @@ -2908,6 +2972,7 @@ START_TEST( ndr_marshall ) test_simple_types(); test_nontrivial_pointer_types(); test_simple_struct(); + test_struct_align(); test_iface_ptr(); test_fullpointer_xlat(); test_client_init(); -- 2.14.1

2 3

[PATCH v2] kernel32: Implement FormatMessage variable prefixes I, I32, and I64
by Alex Henrie 20 Nov '18

20 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33392 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- v2: Drop I64 tests that fail on Windows --- dlls/kernel32/format_msg.c | 26 +++++++++++++++++++- dlls/kernel32/tests/format_msg.c | 42 ++++++++++++++++++++++++-------- 2 files changed, 57 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index 5741713d81..bd4b2df110 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -249,7 +249,31 @@ static LPCWSTR format_insert( BOOL unicode_caller, int insert, LPCWSTR format, { *p++ = 'c'; } - /* FIXME: handle I64 etc. */ + /* check for 32-bit integer format */ + else if (format[0] == 'I' && format[1] == '3' && format[2] == '2' && + (format[3] == 'd' || format[3] == 'i' || format[3] == 'u' || + format[3] == 'o' || format[3] == 'x' || format[3] == 'X')) + { + *p++ = format[3]; + } + /* check for 64-bit integer format */ + else if (format[0] == 'I' && format[1] == '6' && format[2] == '4' && + (format[3] == 'd' || format[3] == 'i' || format[3] == 'u' || + format[3] == 'o' || format[3] == 'x' || format[3] == 'X')) + { + *p++ = 'l'; + *p++ = format[3]; + } + /* check for pointer-size integer format */ + else if (format[0] == 'I' && + (format[1] == 'd' || format[1] == 'i' || format[1] == 'u' || + format[1] == 'o' || format[1] == 'x' || format[1] == 'x')) + { +#ifdef _WIN64 + *p++ = 'l'; +#endif + *p++ = format[1]; + } else while (*format && *format != '!') *p++ = *format++; *p = 0; diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 57ee78af9e..58d51104f7 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -26,6 +26,8 @@ #define ULL(a,b) (((ULONG64)(a) << 32) | (b)) +static const BOOL is_32bit = (sizeof(void *) == sizeof(int)); + static DWORD WINAPIV doit(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id, LPSTR out, DWORD outsize, ... ) { @@ -98,6 +100,8 @@ static void test_message_from_string_wide(void) static const WCHAR fmt_1oou1oou[] = {'%','1','!','*','.','*','u','!',',','%','1','!','*','.','*','u','!',0}; static const WCHAR fmt_1oou3oou[] = {'%','1','!','*','.','*','u','!',',','%','3','!','*','.','*','u','!',0}; static const WCHAR fmt_1oou4oou[] = {'%','1','!','*','.','*','u','!',',','%','4','!','*','.','*','u','!',0}; + static const WCHAR fmt_1I32d[] = {'%','1','!','I','3','2','d','!',0}; + static const WCHAR fmt_1Id[] = {'%','1','!','I','d','!',0}; static const WCHAR s_123d[] = {'1','2','3',0}; static const WCHAR s_14d[] = {' ',' ',' ','1',0}; @@ -390,6 +394,16 @@ static void test_message_from_string_wide(void) ok(r==12,"failed: r=%d\n",r); } + /* prefixes not shared with standard printf */ + + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1I32d, 0, 0, out, ARRAY_SIZE(out), 123); + ok(!lstrcmpW(s_123d, out), "failed out=%s\n", wine_dbgstr_w(out)); + ok(r==3,"failed: r=%d\n", r); + + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1Id, 0, 0, out, ARRAY_SIZE(out), 123); + ok(!lstrcmpW(s_123d, out), "failed out=%s\n", wine_dbgstr_w(out)); + ok(r==3,"failed: r=%d\n", r); + /* change of pace... test the low byte of dwflags */ /* line feed */ @@ -688,6 +702,16 @@ static void test_message_from_string(void) } } + /* prefixes not shared with standard printf */ + + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!I32d!", 0, 0, out, ARRAY_SIZE(out), 123); + ok(!strcmp("123", out),"failed out=[%s]\n",out); + ok(r==3,"failed: r=%d\n",r); + + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!Id!", 0, 0, out, ARRAY_SIZE(out), 123); + ok(!strcmp("123", out),"failed out=[%s]\n",out); + ok(r==3,"failed: r=%d\n",r); + /* change of pace... test the low byte of dwflags */ /* line feed */ @@ -1718,26 +1742,28 @@ static void test_message_from_64bit_number(void) UINT64 number; const char expected[32]; int len; + BOOL todo32; } unsigned_tests[] = { { 0, "0", 1 }, { 1234567890, "1234567890", 10}, - { ULL(0xFFFFFFFF,0xFFFFFFFF), "18446744073709551615", 20 }, - { ULL(0x7FFFFFFF,0xFFFFFFFF), "9223372036854775807", 19 }, + { ULL(0xFFFFFFFF,0xFFFFFFFF), "18446744073709551615", 20, TRUE }, + { ULL(0x7FFFFFFF,0xFFFFFFFF), "9223372036854775807", 19, TRUE }, }; static const struct { INT64 number; const char expected[32]; int len; + BOOL todo32; } signed_tests[] = { { 0, "0" , 1}, { 1234567890, "1234567890", 10 }, { -1, "-1", 2}, { ULL(0xFFFFFFFF,0xFFFFFFFF), "-1", 2}, - { ULL(0x7FFFFFFF,0xFFFFFFFF), "9223372036854775807", 19 }, - { -ULL(0x7FFFFFFF,0xFFFFFFFF), "-9223372036854775807", 20}, + { ULL(0x7FFFFFFF,0xFFFFFFFF), "9223372036854775807", 19, TRUE }, + { -ULL(0x7FFFFFFF,0xFFFFFFFF), "-9223372036854775807", 20, TRUE }, }; int i; @@ -1746,14 +1772,12 @@ static void test_message_from_64bit_number(void) r = doitW(FORMAT_MESSAGE_FROM_STRING, I64u, 0, 0, outW, ARRAY_SIZE(outW), unsigned_tests[i].number); MultiByteToWideChar(CP_ACP, 0, unsigned_tests[i].expected, -1, expW, ARRAY_SIZE(expW)); -todo_wine { +todo_wine_if(is_32bit && unsigned_tests[i].todo32) { ok(!lstrcmpW(outW, expW),"[%d] failed, expected %s, got %s\n", i, unsigned_tests[i].expected, wine_dbgstr_w(outW)); ok(r == unsigned_tests[i].len,"[%d] failed: r=%d\n", i, r); -} r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!I64u!", 0, 0, outA, sizeof(outA), unsigned_tests[i].number); -todo_wine { ok(!strcmp(outA, unsigned_tests[i].expected),"[%d] failed, expected %s, got %s\n", i, unsigned_tests[i].expected, outA); ok(r == unsigned_tests[i].len,"[%d] failed: r=%d\n", i, r); @@ -1765,14 +1789,12 @@ todo_wine { r = doitW(FORMAT_MESSAGE_FROM_STRING, I64d, 0, 0, outW, ARRAY_SIZE(outW), signed_tests[i].number); MultiByteToWideChar(CP_ACP, 0, signed_tests[i].expected, -1, expW, ARRAY_SIZE(expW)); -todo_wine { +todo_wine_if(is_32bit && signed_tests[i].todo32) { ok(!lstrcmpW(outW, expW),"[%d] failed, expected %s, got %s\n", i, signed_tests[i].expected, wine_dbgstr_w(outW)); ok(r == signed_tests[i].len,"[%d] failed: r=%d\n", i, r); -} r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!I64d!", 0, 0, outA, sizeof(outA), signed_tests[i].number); -todo_wine { ok(!strcmp(outA, signed_tests[i].expected),"[%d] failed, expected %s, got %s\n", i, signed_tests[i].expected, outA); ok(r == signed_tests[i].len,"[%d] failed: r=%d\n", i, r); -- 2.19.1

1 0

[PATCH] kernel32: Implement FormatMessage variable prefixes I, I32, and I64
by Alex Henrie 20 Nov '18

20 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33392 Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> --- dlls/kernel32/format_msg.c | 26 +++++++++++++++- dlls/kernel32/tests/format_msg.c | 51 +++++++++++++++++++++++++------- 2 files changed, 66 insertions(+), 11 deletions(-) diff --git a/dlls/kernel32/format_msg.c b/dlls/kernel32/format_msg.c index 5741713d81..bd4b2df110 100644 --- a/dlls/kernel32/format_msg.c +++ b/dlls/kernel32/format_msg.c @@ -249,7 +249,31 @@ static LPCWSTR format_insert( BOOL unicode_caller, int insert, LPCWSTR format, { *p++ = 'c'; } - /* FIXME: handle I64 etc. */ + /* check for 32-bit integer format */ + else if (format[0] == 'I' && format[1] == '3' && format[2] == '2' && + (format[3] == 'd' || format[3] == 'i' || format[3] == 'u' || + format[3] == 'o' || format[3] == 'x' || format[3] == 'X')) + { + *p++ = format[3]; + } + /* check for 64-bit integer format */ + else if (format[0] == 'I' && format[1] == '6' && format[2] == '4' && + (format[3] == 'd' || format[3] == 'i' || format[3] == 'u' || + format[3] == 'o' || format[3] == 'x' || format[3] == 'X')) + { + *p++ = 'l'; + *p++ = format[3]; + } + /* check for pointer-size integer format */ + else if (format[0] == 'I' && + (format[1] == 'd' || format[1] == 'i' || format[1] == 'u' || + format[1] == 'o' || format[1] == 'x' || format[1] == 'x')) + { +#ifdef _WIN64 + *p++ = 'l'; +#endif + *p++ = format[1]; + } else while (*format && *format != '!') *p++ = *format++; *p = 0; diff --git a/dlls/kernel32/tests/format_msg.c b/dlls/kernel32/tests/format_msg.c index 57ee78af9e..8aab9e7b43 100644 --- a/dlls/kernel32/tests/format_msg.c +++ b/dlls/kernel32/tests/format_msg.c @@ -26,6 +26,8 @@ #define ULL(a,b) (((ULONG64)(a) << 32) | (b)) +static const BOOL is_32bit = (sizeof(void *) == sizeof(int)); + static DWORD WINAPIV doit(DWORD flags, LPCVOID src, DWORD msg_id, DWORD lang_id, LPSTR out, DWORD outsize, ... ) { @@ -98,6 +100,9 @@ static void test_message_from_string_wide(void) static const WCHAR fmt_1oou1oou[] = {'%','1','!','*','.','*','u','!',',','%','1','!','*','.','*','u','!',0}; static const WCHAR fmt_1oou3oou[] = {'%','1','!','*','.','*','u','!',',','%','3','!','*','.','*','u','!',0}; static const WCHAR fmt_1oou4oou[] = {'%','1','!','*','.','*','u','!',',','%','4','!','*','.','*','u','!',0}; + static const WCHAR fmt_1I32d[] = {'%','1','!','I','3','2','d','!',0}; + static const WCHAR fmt_1I64d[] = {'%','1','!','I','6','4','d','!',0}; + static const WCHAR fmt_1Id[] = {'%','1','!','I','d','!',0}; static const WCHAR s_123d[] = {'1','2','3',0}; static const WCHAR s_14d[] = {' ',' ',' ','1',0}; @@ -390,6 +395,20 @@ static void test_message_from_string_wide(void) ok(r==12,"failed: r=%d\n",r); } + /* prefixes not shared with standard printf */ + + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1I32d, 0, 0, out, ARRAY_SIZE(out), 123); + ok(!lstrcmpW(s_123d, out), "failed out=%s\n", wine_dbgstr_w(out)); + ok(r==3,"failed: r=%d\n", r); + + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1I64d, 0, 0, out, ARRAY_SIZE(out), 123); + ok(!lstrcmpW(s_123d, out), "failed out=%s\n", wine_dbgstr_w(out)); + ok(r==3,"failed: r=%d\n", r); + + r = doitW(FORMAT_MESSAGE_FROM_STRING, fmt_1Id, 0, 0, out, ARRAY_SIZE(out), 123); + ok(!lstrcmpW(s_123d, out), "failed out=%s\n", wine_dbgstr_w(out)); + ok(r==3,"failed: r=%d\n", r); + /* change of pace... test the low byte of dwflags */ /* line feed */ @@ -688,6 +707,20 @@ static void test_message_from_string(void) } } + /* prefixes not shared with standard printf */ + + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!I32d!", 0, 0, out, ARRAY_SIZE(out), 123); + ok(!strcmp("123", out),"failed out=[%s]\n",out); + ok(r==3,"failed: r=%d\n",r); + + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!I64d!", 0, 0, out, ARRAY_SIZE(out), 123); + ok(!strcmp("123", out),"failed out=[%s]\n",out); + ok(r==3,"failed: r=%d\n",r); + + r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!Id!", 0, 0, out, ARRAY_SIZE(out), 123); + ok(!strcmp("123", out),"failed out=[%s]\n",out); + ok(r==3,"failed: r=%d\n",r); + /* change of pace... test the low byte of dwflags */ /* line feed */ @@ -1718,26 +1751,28 @@ static void test_message_from_64bit_number(void) UINT64 number; const char expected[32]; int len; + BOOL todo32; } unsigned_tests[] = { { 0, "0", 1 }, { 1234567890, "1234567890", 10}, - { ULL(0xFFFFFFFF,0xFFFFFFFF), "18446744073709551615", 20 }, - { ULL(0x7FFFFFFF,0xFFFFFFFF), "9223372036854775807", 19 }, + { ULL(0xFFFFFFFF,0xFFFFFFFF), "18446744073709551615", 20, TRUE }, + { ULL(0x7FFFFFFF,0xFFFFFFFF), "9223372036854775807", 19, TRUE }, }; static const struct { INT64 number; const char expected[32]; int len; + BOOL todo32; } signed_tests[] = { { 0, "0" , 1}, { 1234567890, "1234567890", 10 }, { -1, "-1", 2}, { ULL(0xFFFFFFFF,0xFFFFFFFF), "-1", 2}, - { ULL(0x7FFFFFFF,0xFFFFFFFF), "9223372036854775807", 19 }, - { -ULL(0x7FFFFFFF,0xFFFFFFFF), "-9223372036854775807", 20}, + { ULL(0x7FFFFFFF,0xFFFFFFFF), "9223372036854775807", 19, TRUE }, + { -ULL(0x7FFFFFFF,0xFFFFFFFF), "-9223372036854775807", 20, TRUE }, }; int i; @@ -1746,14 +1781,12 @@ static void test_message_from_64bit_number(void) r = doitW(FORMAT_MESSAGE_FROM_STRING, I64u, 0, 0, outW, ARRAY_SIZE(outW), unsigned_tests[i].number); MultiByteToWideChar(CP_ACP, 0, unsigned_tests[i].expected, -1, expW, ARRAY_SIZE(expW)); -todo_wine { +todo_wine_if(is_32bit && unsigned_tests[i].todo32) { ok(!lstrcmpW(outW, expW),"[%d] failed, expected %s, got %s\n", i, unsigned_tests[i].expected, wine_dbgstr_w(outW)); ok(r == unsigned_tests[i].len,"[%d] failed: r=%d\n", i, r); -} r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!I64u!", 0, 0, outA, sizeof(outA), unsigned_tests[i].number); -todo_wine { ok(!strcmp(outA, unsigned_tests[i].expected),"[%d] failed, expected %s, got %s\n", i, unsigned_tests[i].expected, outA); ok(r == unsigned_tests[i].len,"[%d] failed: r=%d\n", i, r); @@ -1765,14 +1798,12 @@ todo_wine { r = doitW(FORMAT_MESSAGE_FROM_STRING, I64d, 0, 0, outW, ARRAY_SIZE(outW), signed_tests[i].number); MultiByteToWideChar(CP_ACP, 0, signed_tests[i].expected, -1, expW, ARRAY_SIZE(expW)); -todo_wine { +todo_wine_if(is_32bit && signed_tests[i].todo32) { ok(!lstrcmpW(outW, expW),"[%d] failed, expected %s, got %s\n", i, signed_tests[i].expected, wine_dbgstr_w(outW)); ok(r == signed_tests[i].len,"[%d] failed: r=%d\n", i, r); -} r = doit(FORMAT_MESSAGE_FROM_STRING, "%1!I64d!", 0, 0, outA, sizeof(outA), signed_tests[i].number); -todo_wine { ok(!strcmp(outA, signed_tests[i].expected),"[%d] failed, expected %s, got %s\n", i, signed_tests[i].expected, outA); ok(r == signed_tests[i].len,"[%d] failed: r=%d\n", i, r); -- 2.19.1

2 1

[PATCH 1/3] setupapi/tests: Remove workarounds in testInstallClass().
by Zebediah Figura 20 Nov '18

20 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/setupapi/tests/devinst.c | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 9a8ecbc72b..1df049efce 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -43,7 +43,6 @@ static BOOL (WINAPI *pSetupDiDestroyDeviceInfoList)(HDEVINFO); static BOOL (WINAPI *pSetupDiEnumDeviceInfo)(HDEVINFO, DWORD, PSP_DEVINFO_DATA); static BOOL (WINAPI *pSetupDiEnumDeviceInterfaces)(HDEVINFO, PSP_DEVINFO_DATA, const GUID *, DWORD, PSP_DEVICE_INTERFACE_DATA); static BOOL (WINAPI *pSetupDiGetINFClassA)(PCSTR, LPGUID, PSTR, DWORD, PDWORD); -static BOOL (WINAPI *pSetupDiInstallClassA)(HWND, PCSTR, DWORD, HSPFILEQ); static HKEY (WINAPI *pSetupDiOpenClassRegKeyExA)(GUID*,REGSAM,DWORD,PCSTR,PVOID); static HKEY (WINAPI *pSetupDiOpenDevRegKey)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, DWORD, DWORD, REGSAM); static HKEY (WINAPI *pSetupDiCreateDevRegKeyW)(HDEVINFO, PSP_DEVINFO_DATA, DWORD, DWORD, DWORD, HINF, PCWSTR); @@ -83,7 +82,6 @@ static void init_function_pointers(void) pSetupDiGetDeviceInstanceIdA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceInstanceIdA"); pSetupDiGetDeviceInterfaceDetailA = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceInterfaceDetailA"); pSetupDiGetDeviceInterfaceDetailW = (void *)GetProcAddress(hSetupAPI, "SetupDiGetDeviceInterfaceDetailW"); - pSetupDiInstallClassA = (void *)GetProcAddress(hSetupAPI, "SetupDiInstallClassA"); pSetupDiOpenClassRegKeyExA = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenClassRegKeyExA"); pSetupDiOpenDevRegKey = (void *)GetProcAddress(hSetupAPI, "SetupDiOpenDevRegKey"); pSetupDiCreateDevRegKeyW = (void *)GetProcAddress(hSetupAPI, "SetupDiCreateDevRegKeyW"); @@ -291,7 +289,7 @@ static void get_temp_filename(LPSTR path) lstrcpyA(path, ptr + 1); } -static void testInstallClass(void) +static void test_install_class(void) { static const WCHAR classKey[] = {'S','y','s','t','e','m','\\', 'C','u','r','r','e','n','t','C','o','n','t','r','o','l','S','e','t','\\', @@ -307,27 +305,29 @@ static void testInstallClass(void) get_temp_filename(tmpfile + 2); create_inf_file(tmpfile + 2); - ret = pSetupDiInstallClassA(NULL, NULL, 0, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); - ret = pSetupDiInstallClassA(NULL, NULL, DI_NOVCP, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); - ret = pSetupDiInstallClassA(NULL, tmpfile + 2, DI_NOVCP, NULL); - ok(!ret && GetLastError() == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %08x\n", GetLastError()); - ret = pSetupDiInstallClassA(NULL, tmpfile + 2, 0, NULL); - ok(!ret && GetLastError() == ERROR_FILE_NOT_FOUND, - "Expected ERROR_FILE_NOT_FOUND, got %08x\n", GetLastError()); + ret = SetupDiInstallClassA(NULL, NULL, 0, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); + + ret = SetupDiInstallClassA(NULL, NULL, DI_NOVCP, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); + + ret = SetupDiInstallClassA(NULL, tmpfile + 2, DI_NOVCP, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "Got unexpected error %#x.\n", GetLastError()); + + ret = SetupDiInstallClassA(NULL, tmpfile + 2, 0, NULL); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_FILE_NOT_FOUND, "Got unexpected error %#x.\n", GetLastError()); + /* The next call will succeed. Information is put into the registry but the * location(s) is/are depending on the Windows version. */ - ret = pSetupDiInstallClassA(NULL, tmpfile, 0, NULL); - ok(ret, "SetupDiInstallClassA failed: %08x\n", GetLastError()); - - ok(!RegDeleteKeyW(HKEY_LOCAL_MACHINE, classKey), - "Couldn't delete classkey\n"); + ret = SetupDiInstallClassA(NULL, tmpfile, 0, NULL); + ok(ret, "Failed to install class, error %#x.\n", GetLastError()); + ok(!RegDeleteKeyW(HKEY_LOCAL_MACHINE, classKey), "Failed to delete class key, error %u.\n", GetLastError()); DeleteFileA(tmpfile); } @@ -1456,7 +1456,7 @@ START_TEST(devinst) else win_skip("SetupDiOpenClassRegKeyExA is not available\n"); - testInstallClass(); + test_install_class(); testCreateDeviceInfo(); testGetDeviceInstanceId(); testRegisterDeviceInfo(); -- 2.14.1

1 2

[PATCH] shell32/tests: Remove some obsolete workarounds from test_ShellWindows().
by Zebediah Figura 20 Nov '18

20 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/shell32/tests/shelldispatch.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/dlls/shell32/tests/shelldispatch.c b/dlls/shell32/tests/shelldispatch.c index 0d38cd02d7..e9948ae630 100644 --- a/dlls/shell32/tests/shelldispatch.c +++ b/dlls/shell32/tests/shelldispatch.c @@ -1025,18 +1025,14 @@ static void test_ShellWindows(void) hr = CoCreateInstance(&CLSID_ShellWindows, NULL, CLSCTX_LOCAL_SERVER, &IID_IShellWindows, (void**)&shellwindows); -#ifndef __i386__ -todo_wine -#endif ok(hr == S_OK, "got 0x%08x\n", hr); /* TODO: remove when explorer startup with clean prefix is fixed */ if (hr != S_OK) return; -if (0) /* NULL out argument - currently crashes on Wine */ { hr = IShellWindows_Register(shellwindows, NULL, 0, SWC_EXPLORER, NULL); ok(hr == HRESULT_FROM_WIN32(RPC_X_NULL_REF_POINTER), "got 0x%08x\n", hr); -} + hr = IShellWindows_Register(shellwindows, NULL, 0, SWC_EXPLORER, &cookie); todo_wine ok(hr == E_POINTER, "got 0x%08x\n", hr); @@ -1114,9 +1110,6 @@ todo_wine { IUnknown *unk; ok(disp != NULL, "got %p\n", disp); - - if (disp == NULL) goto skip_disp_tests; - ok(ret != HandleToUlong(hwnd), "got %d\n", ret); /* IDispatch-related tests */ @@ -1194,7 +1187,6 @@ if (hr == S_OK) { IServiceProvider_Release(sp); IDispatch_Release(disp); } -skip_disp_tests: disp = (void*)0xdeadbeef; ret = 0xdead; -- 2.14.1

1 0

[PATCH] winebus.sys: Allow XBOX Masquerade to be turned off
by Brendan McGrath 20 Nov '18

20 Nov '18

Elite Dangerous appears to iterate input devices via DInput and will only defer to XInput if there is a HID device with a matching VID and PID. The current behaviour of the SDLBUS is to masquerade any controller as an XBOX controller. This causes Elite Dangerous to treat any other type of contoller as a Joystick. This patch allows this masquerading behaviour to be switched off via a REG_BINARY registry entry: HKCU\Software\Wine\XInput\MasqueradeXBOXController 0 - Turns it off (so it uses the real VID and PID 1 - Turns it on (so it uses the XBOX controller VID and PID) The default behaviour is to leave it as is (i.e on). Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- dlls/winebus.sys/Makefile.in | 2 +- dlls/winebus.sys/bus_sdl.c | 19 ++++++++++++++++++- 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/dlls/winebus.sys/Makefile.in b/dlls/winebus.sys/Makefile.in index d3421b49f1a..76cd9e28c39 100644 --- a/dlls/winebus.sys/Makefile.in +++ b/dlls/winebus.sys/Makefile.in @@ -1,5 +1,5 @@ MODULE = winebus.sys -IMPORTS = ntoskrnl setupapi +IMPORTS = ntoskrnl setupapi advapi32 EXTRALIBS = $(IOKIT_LIBS) $(UDEV_LIBS) EXTRAINCL = $(UDEV_CFLAGS) $(SDL2_CFLAGS) EXTRADLLFLAGS = -Wb,--subsystem,native diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 6b2b28e8c90..22b63bad09b 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -39,6 +39,7 @@ #include "winbase.h" #include "winnls.h" #include "winternl.h" +#include "winreg.h" #include "ddk/wdm.h" #include "ddk/hidtypes.h" #include "wine/library.h" @@ -795,6 +796,22 @@ static void try_remove_device(SDL_JoystickID index) bus_remove_hid_device(device); } +static BOOL masquerade_xbox_controller(void) +{ + HKEY hkey; + BOOL ret = TRUE; + + /* @@ Wine registry key: HKCU\Software\Wine\XInput */ + if (RegOpenKeyA(HKEY_CURRENT_USER, "Software\\Wine\\XInput", &hkey) == ERROR_SUCCESS) + { + DWORD data_size = sizeof(ret); + RegQueryValueExA(hkey, "MasqueradeXBOXController", NULL, NULL, (LPBYTE) &ret, &data_size); + } + + TRACE("MasqueradeXBOXController = %d\n", ret); + return ret; +} + static void try_add_device(SDL_JoystickID index) { DWORD vid = 0, pid = 0, version = 0; @@ -818,7 +835,7 @@ static void try_add_device(SDL_JoystickID index) controller = pSDL_GameControllerOpen(index); id = pSDL_JoystickInstanceID(joystick); - if (controller) + if (controller && masquerade_xbox_controller()) { vid = VID_MICROSOFT; pid = PID_XBOX_CONTROLLERS[3]; -- 2.17.1

4 5

[PATCH] winebus.sys: Use JoystickNumButtons for button_count
by Brendan McGrath 20 Nov '18

20 Nov '18

Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> --- dlls/winebus.sys/bus_sdl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winebus.sys/bus_sdl.c b/dlls/winebus.sys/bus_sdl.c index 6b2b28e8c90..4f0f6859e70 100644 --- a/dlls/winebus.sys/bus_sdl.c +++ b/dlls/winebus.sys/bus_sdl.c @@ -857,7 +857,7 @@ static void try_add_device(SDL_JoystickID index) id, vid, pid, version, debugstr_w(serial)); axis_count = pSDL_JoystickNumAxes(joystick); - button_count = pSDL_JoystickNumAxes(joystick); + button_count = pSDL_JoystickNumButtons(joystick); is_xbox_gamepad = (axis_count == 6 && button_count >= 14); } -- 2.17.1

1 0

[PATCH 4/4] ucrtbase: Add _o_malloc implementation.
by Piotr Caban 20 Nov '18

20 Nov '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/ucrtbase/tests/misc.c | 21 +++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 23 insertions(+), 2 deletions(-)

1 0

[PATCH 3/4] ucrtbase: Fix wrong function calls in misc tests.
by Piotr Caban 20 Nov '18

20 Nov '18

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/ucrtbase/tests/misc.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-)

1 0

[PATCH 2/4] ucrtbase: Fix leaks in misc tests.
by Piotr Caban 20 Nov '18

20 Nov '18

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

1 0

[PATCH 1/4] ucrtbase: Add _o__*_onexit_table implementation.
by Piotr Caban 20 Nov '18

20 Nov '18

Used by unofficial libcef build. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- .../api-ms-win-crt-private-l1-1-0.spec | 6 +-- dlls/ucrtbase/tests/misc.c | 51 ++++++++++++++++++- dlls/ucrtbase/ucrtbase.spec | 6 +-- 3 files changed, 55 insertions(+), 8 deletions(-)

1 0

[PATCH v4 1/3] ntoskrnl.exe: Create the device interface symlink in IoSetDeviceInterfaceState
by Aric Stewart 19 Nov '18

19 Nov '18

v2: Divide patch as suggested by Zebediah Figura v3: fixed ISO C90 error found by Alexandre Julliard v4: Fixed a few more points found by Zebediah Figura Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 103 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 100 insertions(+), 3 deletions(-)

1 0

[PATCH v4 1/3] mpr: Implement remembered connection enumeration.
by Pierre Schweitzer 19 Nov '18

19 Nov '18

New attempt, with only mandatory comments. -- Pierre Schweitzer <pierre at reactos.org> System & Network Administrator Senior Kernel Developer ReactOS Deutschland e.V.

2 2

[PATCH 08/10] d3dx9: Use a staging texture to update unmappable surfaces in D3DXLoadSurfaceFromMemory().
by Henri Verbeet 19 Nov '18

19 Nov '18

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/d3dx9_36/surface.c | 53 +++++++++++++++++++++++++++++++++---------- dlls/d3dx9_36/tests/surface.c | 1 - 2 files changed, 41 insertions(+), 13 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index a44398cf9e5..7d48cc6b132 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1753,9 +1753,12 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, DWORD filter, D3DCOLOR color_key) { const struct pixel_format_desc *srcformatdesc, *destformatdesc; + IDirect3DSurface9 *surface = dst_surface; + IDirect3DDevice9 *device; D3DSURFACE_DESC surfdesc; D3DLOCKED_RECT lockrect; struct volume src_size, dst_size; + HRESULT hr; TRACE("(%p, %p, %s, %p, %#x, %u, %p, %s, %#x, 0x%08x)\n", dst_surface, dst_palette, wine_dbgstr_rect(dst_rect), src_memory, src_format, @@ -1811,6 +1814,26 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, return E_NOTIMPL; } + if (surfdesc.Pool == D3DPOOL_DEFAULT && !(surfdesc.Usage & D3DUSAGE_DYNAMIC)) + { + IDirect3DSurface9_GetDevice(dst_surface, &device); + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, surfdesc.Width, + surfdesc.Height, surfdesc.Format, D3DPOOL_SYSTEMMEM, &surface, NULL); + IDirect3DDevice9_Release(device); + if (FAILED(hr)) + { + WARN("Failed to create staging surface, hr %#x.\n", hr); + return D3DERR_INVALIDCALL; + } + } + + if (FAILED(IDirect3DSurface9_LockRect(surface, &lockrect, dst_rect, 0))) + { + if (surface != dst_surface) + IDirect3DSurface9_Release(surface); + return D3DXERR_INVALIDDATA; + } + if (src_format == surfdesc.Format && dst_size.width == src_size.width && dst_size.height == src_size.height @@ -1824,16 +1847,12 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, && src_size.height != surfdesc.Height)) { WARN("Source rect %s is misaligned.\n", wine_dbgstr_rect(src_rect)); - return D3DXERR_INVALIDDATA; + hr = D3DXERR_INVALIDDATA; + goto done; } - if (FAILED(IDirect3DSurface9_LockRect(dst_surface, &lockrect, dst_rect, 0))) - return D3DXERR_INVALIDDATA; - copy_pixels(src_memory, src_pitch, 0, lockrect.pBits, lockrect.Pitch, 0, &src_size, srcformatdesc); - - IDirect3DSurface9_UnlockRect(dst_surface); } else /* Stretching or format conversion. */ { @@ -1841,12 +1860,10 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, || !is_conversion_to_supported(destformatdesc)) { FIXME("Unsupported format conversion %#x -> %#x.\n", src_format, surfdesc.Format); - return E_NOTIMPL; + hr = E_NOTIMPL; + goto done; } - if (FAILED(IDirect3DSurface9_LockRect(dst_surface, &lockrect, dst_rect, 0))) - return D3DXERR_INVALIDDATA; - if ((filter & 0xf) == D3DX_FILTER_NONE) { convert_argb_pixels(src_memory, src_pitch, 0, &src_size, srcformatdesc, @@ -1862,11 +1879,23 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, point_filter_argb_pixels(src_memory, src_pitch, 0, &src_size, srcformatdesc, lockrect.pBits, lockrect.Pitch, 0, &dst_size, destformatdesc, color_key, src_palette); } + } - IDirect3DSurface9_UnlockRect(dst_surface); + hr = D3D_OK; +done: + IDirect3DSurface9_UnlockRect(surface); + if (surface != dst_surface) + { + if (SUCCEEDED(hr)) + { + IDirect3DSurface9_GetDevice(dst_surface, &device); + hr = IDirect3DDevice9_UpdateSurface(device, surface, NULL, dst_surface, NULL); + IDirect3DDevice9_Release(device); + } + IDirect3DSurface9_Release(surface); } - return D3D_OK; + return hr; } /************************************************************ diff --git a/dlls/d3dx9_36/tests/surface.c b/dlls/d3dx9_36/tests/surface.c index 469c864f308..f153cd92c65 100644 --- a/dlls/d3dx9_36/tests/surface.c +++ b/dlls/d3dx9_36/tests/surface.c @@ -867,7 +867,6 @@ static void test_D3DXLoadSurface(IDirect3DDevice9 *device) ok(hr == D3D_OK, "IDirect3DDevice9_GetRenderTarget returned %#x, expected %#x.\n", hr, D3D_OK); hr = D3DXLoadSurfaceFromSurface(newsurf, NULL, NULL, surf, NULL, NULL, D3DX_FILTER_NONE, 0); - todo_wine ok(hr == D3D_OK, "D3DXLoadSurfaceFromSurface returned %#x, expected %#x.\n", hr, D3D_OK); hr = D3DXLoadSurfaceFromSurface(surf, NULL, NULL, newsurf, NULL, NULL, D3DX_FILTER_NONE, 0); todo_wine -- 2.11.0

3 2

[PATCH v2] dbghelp: Only check process architecture if we are actually given a process.
by Zebediah Figura 19 Nov '18

19 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45407 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v2: check for process validity before calling check_live_target() as that depends on architecture. dlls/dbghelp/dbghelp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index a085cd140e..ed4d5f4321 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -310,7 +310,7 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP IsWow64Process(GetCurrentProcess(), &wow64); - if (!IsWow64Process(hProcess, &child_wow64)) + if (GetProcessId(hProcess) && !IsWow64Process(hProcess, &child_wow64)) return FALSE; pcs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pcs)); -- 2.14.1

1 0

[PATCH v3] ntoskrnl.exe: Create the device interface symlink in IoSetDeviceInterfaceState
by Aric Stewart 19 Nov '18

19 Nov '18

v2: Divide patch as suggested by Zebediah Figura v3: fixed ISO C90 error found by Alexandre Julliard Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 77 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+)

2 1

[PATCH] dbghelp: Only check process architecture if we are actually given a process.
by Zebediah Figura 19 Nov '18

19 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45407 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/dbghelp/dbghelp.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c index a085cd140e..92ef86f24c 100644 --- a/dlls/dbghelp/dbghelp.c +++ b/dlls/dbghelp/dbghelp.c @@ -308,16 +308,10 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP return TRUE; } - IsWow64Process(GetCurrentProcess(), &wow64); - - if (!IsWow64Process(hProcess, &child_wow64)) - return FALSE; - pcs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pcs)); if (!pcs) return FALSE; pcs->handle = hProcess; - pcs->is_64bit = (sizeof(void *) == 8 || wow64) && !child_wow64; if (UserSearchPath) { @@ -361,6 +355,14 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP if (check_live_target(pcs)) { + IsWow64Process(GetCurrentProcess(), &wow64); + if (!IsWow64Process(pcs->handle, &child_wow64)) + { + SymCleanup(pcs->handle); + return FALSE; + } + pcs->is_64bit = (sizeof(void *) == 8 || wow64) && !child_wow64; + if (fInvadeProcess) EnumerateLoadedModulesW64(hProcess, process_invade_cb, hProcess); elf_synchronize_module_list(pcs); -- 2.14.1

2 1

[PATCH v2] xinput: Avoid calling XInputGetStateEx() in XInputGetState().
by Zebediah Figura 19 Nov '18

19 Nov '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46142 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/xinput1_3/xinput_main.c | 32 ++++++++++++++++++++------------ 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/dlls/xinput1_3/xinput_main.c b/dlls/xinput1_3/xinput_main.c index 56bb36a05d..f6e3e15568 100644 --- a/dlls/xinput1_3/xinput_main.c +++ b/dlls/xinput1_3/xinput_main.c @@ -85,13 +85,31 @@ DWORD WINAPI XInputSetState(DWORD index, XINPUT_VIBRATION* vibration) return HID_set_state(&controllers[index], vibration); } +/* Some versions of SteamOverlayRenderer hot-patch XInputGetStateEx() and call + * XInputGetState() in the hook, so we need a wrapper. */ +static DWORD xinput_get_state(DWORD index, XINPUT_STATE *state) +{ + HID_find_gamepads(controllers); + + if (index >= XUSER_MAX_COUNT) + return ERROR_BAD_ARGUMENTS; + if (!controllers[index].connected) + return ERROR_DEVICE_NOT_CONNECTED; + + HID_update_state(&controllers[index]); + memcpy(state, &controllers[index].state, sizeof(XINPUT_STATE)); + + return ERROR_SUCCESS; +} + + DWORD WINAPI DECLSPEC_HOTPATCH XInputGetState(DWORD index, XINPUT_STATE* state) { DWORD ret; TRACE("(index %u, state %p)!\n", index, state); - ret = XInputGetStateEx(index, state); + ret = xinput_get_state(index, state); if (ret != ERROR_SUCCESS) return ret; @@ -105,17 +123,7 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetStateEx(DWORD index, XINPUT_STATE* state { TRACE("(index %u, state %p)!\n", index, state); - HID_find_gamepads(controllers); - - if (index >= XUSER_MAX_COUNT) - return ERROR_BAD_ARGUMENTS; - if (!controllers[index].connected) - return ERROR_DEVICE_NOT_CONNECTED; - - HID_update_state(&controllers[index]); - memcpy(state, &controllers[index].state, sizeof(XINPUT_STATE)); - - return ERROR_SUCCESS; + return xinput_get_state(index, state); } DWORD WINAPI XInputGetKeystroke(DWORD index, DWORD reserved, PXINPUT_KEYSTROKE keystroke) -- 2.19.1

2 1

[PATCH] testbot: Only quote strings when needed in ShQuote().
by Francois Gouget 19 Nov '18

19 Nov '18

Based on a short whitelist of safe characters. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Utils.pm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Utils.pm b/testbot/lib/WineTestBot/Utils.pm index 6681072caa..a80f809d4c 100644 --- a/testbot/lib/WineTestBot/Utils.pm +++ b/testbot/lib/WineTestBot/Utils.pm @@ -248,6 +248,8 @@ in another context. sub ShQuote($) { my ($Str)=@_; + return $Str if ($Str =~ /^[a-zA-Z0-9\/=:.,+_-]+$/); + $Str =~ s%\\%\\\\%g; $Str =~ s%\$%\\\$%g; $Str =~ s%\"%\\\"%g; @@ -269,7 +271,7 @@ See also ShQuote(). sub ShArgv2Cmd(@) { - return join(' ', map { /[^a-zA-Z0-9\/.,+_-]/ ? ShQuote($_) : $_ } @_); + return join(' ', map { ShQuote($_) } @_); } 1; -- 2.19.1

1 0

[PATCH] testbot: Build VMs expect their missions to be a list of builds.
by Francois Gouget 19 Nov '18

19 Nov '18

So replace 'build' with the actual builds that should be run. A consequence is that build VMs too may have more than one mission since they can build both exe32 and exe64 binaries in one go. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/VMs.pm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/testbot/lib/WineTestBot/VMs.pm b/testbot/lib/WineTestBot/VMs.pm index e7cd277494..6a08bc1aea 100644 --- a/testbot/lib/WineTestBot/VMs.pm +++ b/testbot/lib/WineTestBot/VMs.pm @@ -315,7 +315,7 @@ sub PutColValue($$$) } my $_SupportedMissions = { - "build" => { "build" => 1 }, + "build" => { "exe32" => 1, "exe64" => 1 }, "win32" => { "exe32" => 1 }, "win64" => { "exe32" => 1, "exe64" => 1 }, "wine" => { "win32" => 1, "wow32" => 1, "wow64" => 1 }, @@ -336,9 +336,10 @@ sub Validate($) return ("Missions", $ErrMessage) if (defined $ErrMessage); foreach my $TaskMissions (@$Missions) { - if ($self->Type ne "wine" and @{$TaskMissions->{Missions}} > 1) + if ($self->Type !~ /^(?:build|wine)$/ and + @{$TaskMissions->{Missions}} > 1) { - return ("Missions", "Only wine VMs can handle more than one mission per task"); + return ("Missions", "Only the build and wine VMs can handle more than one mission per task"); } foreach my $Mission (@{$TaskMissions->{Missions}}) { -- 2.19.1

1 0

[PATCH v3 5/5] kernelbase: Implement PathCchRenameExtension.
by Zhiyi Zhang 19 Nov '18

19 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 | 13 ++++ dlls/kernelbase/tests/path.c | 74 +++++++++++++++++++ include/pathcch.h | 1 + 5 files changed, 90 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 57e0a67792..0524e7c304 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 @@ -15,7 +15,7 @@ @ stub PathCchRemoveBackslashEx @ stdcall PathCchRemoveExtension(wstr long) kernelbase.PathCchRemoveExtension @ stub PathCchRemoveFileSpec -@ stub PathCchRenameExtension +@ stdcall PathCchRenameExtension(wstr long wstr) kernelbase.PathCchRenameExtension @ stub PathCchSkipRoot @ stub PathCchStripPrefix @ stub PathCchStripToRoot diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index ffe7be20df..286dae0001 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1044,7 +1044,7 @@ # @ stub PathCchRemoveBackslashEx @ stdcall PathCchRemoveExtension(wstr long) # @ stub PathCchRemoveFileSpec -# @ stub PathCchRenameExtension +@ stdcall PathCchRenameExtension(wstr long wstr) # @ stub PathCchSkipRoot # @ stub PathCchStripPrefix # @ stub PathCchStripToRoot diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 001c6828a6..12ca3919e4 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -170,3 +170,16 @@ HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size) return next == extension ? S_FALSE : S_OK; } + +HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *extension) +{ + HRESULT hr; + + TRACE("%s %lu %s\n", wine_dbgstr_w(path), size, wine_dbgstr_w(extension)); + + hr = PathCchRemoveExtension(path, size); + if (FAILED(hr)) return hr; + + hr = PathCchAddExtension(path, size, extension); + return FAILED(hr) ? hr : S_OK; +} diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 93579a8b3d..f00eb64f60 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -36,6 +36,7 @@ HRESULT (WINAPI *pPathCchAddExtension)(WCHAR *path, SIZE_T size, const WCHAR *ex 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); HRESULT (WINAPI *pPathCchRemoveExtension)(WCHAR *path, SIZE_T size); +HRESULT (WINAPI *pPathCchRenameExtension)(WCHAR *path, SIZE_T size, const WCHAR *extension); static const struct { @@ -519,6 +520,77 @@ static void test_PathCchRemoveExtension(void) } } +struct renameextension_test +{ + const CHAR *path; + const CHAR *extension; + const CHAR *expected; +}; + +static const struct renameextension_test renameextension_tests[] = +{ + {"1.exe", ".txt", "1.txt"}, + {"C:1.exe", ".txt", "C:1.txt"}, + {"C:\\1.exe", ".txt", "C:\\1.txt"}, + {"\\1.exe", ".txt", "\\1.txt"}, + {"\\\\1.exe", ".txt", "\\\\1.txt"}, + {"\\\\?\\C:1.exe", ".txt", "\\\\?\\C:1.txt"}, + {"\\\\?\\C:\\1.exe", ".txt", "\\\\?\\C:\\1.txt"}, + {"\\\\?\\UNC\\1.exe", ".txt", "\\\\?\\UNC\\1.txt"}, + {"\\\\?\\UNC\\192.168.1.1\\1.exe", ".txt", "\\\\?\\UNC\\192.168.1.1\\1.txt"}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\1.exe", ".txt", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\1.txt"}, + {"C:\\1.exe", "", "C:\\1"}, + {"C:\\1.exe", "txt", "C:\\1.txt"} +}; + +static void test_PathCchRenameExtension(void) +{ + WCHAR pathW[PATHCCH_MAX_CCH + 1]; + CHAR pathA[PATHCCH_MAX_CCH + 1]; + WCHAR extensionW[MAX_PATH]; + HRESULT hr; + INT i; + + /* Invalid arguments */ + MultiByteToWideChar(CP_ACP, 0, "C:\\1.txt", -1, pathW, ARRAY_SIZE(pathW)); + MultiByteToWideChar(CP_ACP, 0, ".exe", -1, extensionW, ARRAY_SIZE(extensionW)); + + hr = pPathCchRenameExtension(NULL, PATHCCH_MAX_CCH, extensionW); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchRenameExtension(pathW, 0, extensionW); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchRenameExtension(pathW, PATHCCH_MAX_CCH, NULL); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + /* Path length */ + hr = pPathCchRenameExtension(pathW, ARRAY_SIZE("C:\\1.exe") - 1, extensionW); + ok(E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchRenameExtension(pathW, PATHCCH_MAX_CCH + 1, extensionW); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchRenameExtension(pathW, PATHCCH_MAX_CCH, extensionW); + ok(hr == S_OK, "expect result %#x, got %#x\n", S_OK, hr); + + for (i = 0; i < ARRAY_SIZE(renameextension_tests); i++) + { + const struct renameextension_test *t = renameextension_tests + i; + MultiByteToWideChar(CP_ACP, 0, t->path, -1, pathW, ARRAY_SIZE(pathW)); + MultiByteToWideChar(CP_ACP, 0, t->extension, -1, extensionW, ARRAY_SIZE(extensionW)); + hr = pPathCchRenameExtension(pathW, PATHCCH_MAX_CCH, extensionW); + ok(hr == S_OK, "path %s extension %s expect result %#x, got %#x\n", t->path, t->extension, S_OK, hr); + if (SUCCEEDED(hr)) + { + WideCharToMultiByte(CP_ACP, 0, pathW, -1, pathA, ARRAY_SIZE(pathA), NULL, NULL); + ok(!lstrcmpA(pathA, t->expected), "path %s extension %s expect output path %s, got %s\n", t->path, + t->extension, t->expected, pathA); + } + } +} + START_TEST(path) { HMODULE hmod = LoadLibraryA("kernelbase.dll"); @@ -534,6 +606,7 @@ START_TEST(path) pPathCchAddExtension = (void *)GetProcAddress(hmod, "PathCchAddExtension"); pPathCchFindExtension = (void *)GetProcAddress(hmod, "PathCchFindExtension"); pPathCchRemoveExtension = (void *)GetProcAddress(hmod, "PathCchRemoveExtension"); + pPathCchRenameExtension = (void *)GetProcAddress(hmod, "PathCchRenameExtension"); test_PathCchCombineEx(); test_PathCchAddBackslash(); @@ -541,4 +614,5 @@ START_TEST(path) test_PathCchAddExtension(); test_PathCchFindExtension(); test_PathCchRemoveExtension(); + test_PathCchRenameExtension(); } diff --git a/include/pathcch.h b/include/pathcch.h index 2f125bb9ed..3057b6c1ec 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -31,3 +31,4 @@ HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extens 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); HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size); +HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); -- 2.19.1

2 1

[PATCH v3 4/5] kernelbase: Implement PathCchRemoveExtension.
by Zhiyi Zhang 19 Nov '18

19 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 | 19 +++++ dlls/kernelbase/tests/path.c | 74 +++++++++++++++++++ include/pathcch.h | 1 + 5 files changed, 96 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 fed23cbac1..57e0a67792 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 @@ -13,7 +13,7 @@ @ stub PathCchIsRoot @ stub PathCchRemoveBackslash @ stub PathCchRemoveBackslashEx -@ stub PathCchRemoveExtension +@ stdcall PathCchRemoveExtension(wstr long) kernelbase.PathCchRemoveExtension @ stub PathCchRemoveFileSpec @ stub PathCchRenameExtension @ stub PathCchSkipRoot diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 27d10ce731..ffe7be20df 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1042,7 +1042,7 @@ # @ stub PathCchIsRoot # @ stub PathCchRemoveBackslash # @ stub PathCchRemoveBackslashEx -# @ stub PathCchRemoveExtension +@ stdcall PathCchRemoveExtension(wstr long) # @ stub PathCchRemoveFileSpec # @ stub PathCchRenameExtension # @ stub PathCchSkipRoot diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 2ddc708f07..001c6828a6 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -151,3 +151,22 @@ HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR *extension = lastpoint ? lastpoint : path; return S_OK; } + +HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size) +{ + const WCHAR *extension; + WCHAR *next; + HRESULT hr; + + TRACE("%s %lu\n", wine_dbgstr_w(path), size); + + if (!path || !size || size > PATHCCH_MAX_CCH) return E_INVALIDARG; + + hr = PathCchFindExtension(path, size, &extension); + if (FAILED(hr)) return hr; + + next = path + (extension - path); + while (next - path < size && *next) *next++ = 0; + + return next == extension ? S_FALSE : S_OK; +} diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index e6ead730d5..93579a8b3d 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -35,6 +35,7 @@ HRESULT (WINAPI *pPathCchAddBackslashEx)(WCHAR *out, SIZE_T size, WCHAR **endptr HRESULT (WINAPI *pPathCchAddExtension)(WCHAR *path, SIZE_T size, const WCHAR *extension); 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); +HRESULT (WINAPI *pPathCchRemoveExtension)(WCHAR *path, SIZE_T size); static const struct { @@ -447,6 +448,77 @@ static void test_PathCchFindExtension(void) } } +struct removeextension_test +{ + const CHAR *path; + const CHAR *expected; + HRESULT hr; +}; + +static const struct removeextension_test removeextension_tests[] = +{ + {"1.exe", "1", S_OK}, + {"C:1.exe", "C:1", S_OK}, + {"C:\\1.exe", "C:\\1", S_OK}, + {"\\1.exe", "\\1", S_OK}, + {"\\\\1.exe", "\\\\1", S_OK}, + {"\\\\?\\C:1.exe", "\\\\?\\C:1", S_OK}, + {"\\\\?\\C:\\1.exe", "\\\\?\\C:\\1", S_OK}, + {"\\\\?\\UNC\\1.exe", "\\\\?\\UNC\\1", S_OK}, + {"\\\\?\\UNC\\192.168.1.1\\1.exe", "\\\\?\\UNC\\192.168.1.1\\1", S_OK}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\1.exe", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\1", S_OK}, + + /* Malformed */ + {"", "", S_FALSE}, + {" ", " ", S_FALSE}, + {".", "", S_OK}, + {"..", ".", S_OK}, + {"a", "a", S_FALSE}, + {"a.", "a", S_OK}, + {".a.b.", ".a.b", S_OK}, + {"a. ", "a. ", S_FALSE}, + {"a.\\", "a.\\", S_FALSE}, + {"\\\\?\\UNC\\192.168.1.1", "\\\\?\\UNC\\192.168.1", S_OK}, + {"\\\\?\\UNC\\192.168.1.1\\", "\\\\?\\UNC\\192.168.1.1\\", S_FALSE}, + {"\\\\?\\UNC\\192.168.1.1\\a", "\\\\?\\UNC\\192.168.1.1\\a", S_FALSE} +}; + +static void test_PathCchRemoveExtension(void) +{ + WCHAR pathW[PATHCCH_MAX_CCH] = {0}; + CHAR pathA[PATHCCH_MAX_CCH]; + HRESULT hr; + INT i; + + /* Arguments check */ + hr = pPathCchRemoveExtension(NULL, PATHCCH_MAX_CCH); + ok(hr == E_INVALIDARG, "expect %#x, got %#x\n", S_OK, hr); + + hr = pPathCchRemoveExtension(pathW, 0); + ok(hr == E_INVALIDARG, "expect %#x, got %#x\n", S_OK, hr); + + hr = pPathCchRemoveExtension(pathW, PATHCCH_MAX_CCH + 1); + ok(hr == E_INVALIDARG, "expect %#x, got %#x\n", S_OK, hr); + + hr = pPathCchRemoveExtension(pathW, PATHCCH_MAX_CCH); + ok(hr == S_FALSE, "expect %#x, got %#x\n", S_OK, hr); + + for (i = 0; i < ARRAY_SIZE(removeextension_tests); i++) + { + const struct removeextension_test *t = removeextension_tests + i; + + MultiByteToWideChar(CP_ACP, 0, t->path, -1, pathW, ARRAY_SIZE(pathW)); + hr = pPathCchRemoveExtension(pathW, ARRAY_SIZE(pathW)); + ok(hr == t->hr, "path %s expect result %#x, got %#x\n", t->path, t->hr, hr); + if (SUCCEEDED(hr)) + { + WideCharToMultiByte(CP_ACP, 0, pathW, -1, pathA, ARRAY_SIZE(pathA), NULL, NULL); + ok(!lstrcmpA(pathA, t->expected), "path %s expect stripped path %s, got %s\n", t->path, t->expected, pathA); + } + } +} + START_TEST(path) { HMODULE hmod = LoadLibraryA("kernelbase.dll"); @@ -461,10 +533,12 @@ START_TEST(path) pPathCchAddBackslashEx = (void *)GetProcAddress(hmod, "PathCchAddBackslashEx"); pPathCchAddExtension = (void *)GetProcAddress(hmod, "PathCchAddExtension"); pPathCchFindExtension = (void *)GetProcAddress(hmod, "PathCchFindExtension"); + pPathCchRemoveExtension = (void *)GetProcAddress(hmod, "PathCchRemoveExtension"); test_PathCchCombineEx(); test_PathCchAddBackslash(); test_PathCchAddBackslashEx(); test_PathCchAddExtension(); test_PathCchFindExtension(); + test_PathCchRemoveExtension(); } diff --git a/include/pathcch.h b/include/pathcch.h index 5a189bc0e7..2f125bb9ed 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -30,3 +30,4 @@ HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **end, SIZE HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); 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); +HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size); -- 2.19.1

2 1

[PATCH v3 3/5] kernelbase: Implement PathCchAddExtension.
by Zhiyi Zhang 19 Nov '18

19 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 | 52 +++++++++ dlls/kernelbase/tests/path.c | 102 ++++++++++++++++++ include/pathcch.h | 1 + 5 files changed, 157 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 7b812eb49d..fed23cbac1 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 @@ -2,7 +2,7 @@ @ stub PathAllocCombine @ stdcall PathCchAddBackslash(wstr long) kernelbase.PathCchAddBackslash @ stdcall PathCchAddBackslashEx(wstr long ptr ptr) kernelbase.PathCchAddBackslashEx -@ stub PathCchAddExtension +@ stdcall PathCchAddExtension(wstr long wstr) kernelbase.PathCchAddExtension @ stub PathCchAppend @ stub PathCchAppendEx @ stub PathCchCanonicalize diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 2372db821e..27d10ce731 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1031,7 +1031,7 @@ @ stdcall PathCanonicalizeW(ptr wstr) shlwapi.PathCanonicalizeW @ stdcall PathCchAddBackslash(wstr long) @ stdcall PathCchAddBackslashEx(wstr long ptr ptr) -# @ stub PathCchAddExtension +@ stdcall PathCchAddExtension(wstr long wstr) # @ stub PathCchAppend # @ stub PathCchAppendEx # @ stub PathCchCanonicalize diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index b051986031..2ddc708f07 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -29,6 +29,15 @@ WINE_DEFAULT_DEBUG_CHANNEL(path); +static SIZE_T wcsnlen(const WCHAR *string, SIZE_T maxlen) +{ + SIZE_T i; + + for (i = 0; i < maxlen; i++) + if (!string[i]) break; + return i; +} + HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size) { return PathCchAddBackslashEx(path, size, NULL, NULL); @@ -67,6 +76,49 @@ HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **endptr, S return S_OK; } +HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extension) +{ + const WCHAR *existing_extension, *next; + SIZE_T path_length, extension_length, dot_length; + BOOL has_dot; + HRESULT hr; + + TRACE("%s %lu %s\n", wine_dbgstr_w(path), size, wine_dbgstr_w(extension)); + + if (!path || !size || size > PATHCCH_MAX_CCH || !extension) return E_INVALIDARG; + + next = extension; + while (*next) + { + if ((*next == '.' && next > extension) || *next == ' ' || *next == '\\') return E_INVALIDARG; + next++; + } + + has_dot = extension[0] == '.' ? TRUE : FALSE; + + hr = PathCchFindExtension(path, size, &existing_extension); + if (FAILED(hr)) return hr; + if (*existing_extension) return S_FALSE; + + path_length = wcsnlen(path, size); + dot_length = has_dot ? 0 : 1; + extension_length = strlenW(extension); + + if (path_length + dot_length + extension_length + 1 > size) return STRSAFE_E_INSUFFICIENT_BUFFER; + + /* If extension is empty or only dot, return S_OK with path unchanged */ + if (!extension[0] || (extension[0] == '.' && !extension[1])) return S_OK; + + if (!has_dot) + { + path[path_length] = '.'; + path_length++; + } + + strcpyW(path + path_length, extension); + 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 80c65a95d1..e6ead730d5 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -32,6 +32,7 @@ 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); 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); @@ -235,6 +236,105 @@ static void test_PathCchAddBackslashEx(void) } } +struct addextension_test +{ + const CHAR *path; + const CHAR *extension; + const CHAR *expected; + HRESULT hr; +}; + +static const struct addextension_test addextension_tests[] = +{ + /* Normal */ + {"", ".exe", ".exe", S_OK}, + {"C:\\", "", "C:\\", S_OK}, + {"C:", ".exe", "C:.exe", S_OK}, + {"C:\\", ".exe", "C:\\.exe", S_OK}, + {"\\", ".exe", "\\.exe", S_OK}, + {"\\\\", ".exe", "\\\\.exe", S_OK}, + {"\\\\?\\C:", ".exe", "\\\\?\\C:.exe", S_OK}, + {"\\\\?\\C:\\", ".exe", "\\\\?\\C:\\.exe", S_OK}, + {"\\\\?\\UNC\\", ".exe", "\\\\?\\UNC\\.exe", S_OK}, + {"\\\\?\\UNC\\192.168.1.1\\", ".exe", "\\\\?\\UNC\\192.168.1.1\\.exe", S_OK}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", ".exe", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\.exe", S_OK}, + {"C:\\", "exe", "C:\\.exe", S_OK}, + {"C:\\", ".", "C:\\", S_OK}, + {"C:\\1.exe", ".txt", "C:\\1.exe", S_FALSE}, + + /* Extension contains invalid characters but valid for PathCchAddExtension */ + {"C:\\", "./", "C:\\./", S_OK}, + {"C:\\", ".?", "C:\\.?", S_OK}, + {"C:\\", ".%", "C:\\.%", S_OK}, + {"C:\\", ".*", "C:\\.*", S_OK}, + {"C:\\", ".:", "C:\\.:", S_OK}, + {"C:\\", ".|", "C:\\.|", S_OK}, + {"C:\\", ".\"", "C:\\.\"", S_OK}, + {"C:\\", ".<", "C:\\.<", S_OK}, + {"C:\\", ".>", "C:\\.>", S_OK}, + + /* Invalid argument for extension */ + {"C:\\", " exe", NULL, E_INVALIDARG}, + {"C:\\", ". exe", NULL, E_INVALIDARG}, + {"C:\\", " ", NULL, E_INVALIDARG}, + {"C:\\", "\\", NULL, E_INVALIDARG}, + {"C:\\", "..", NULL, E_INVALIDARG}, + {"C:\\", ". ", NULL, E_INVALIDARG}, + {"C:\\", ".\\", NULL, E_INVALIDARG}, + {"C:\\", ".a.", NULL, E_INVALIDARG}, + {"C:\\", ".a ", NULL, E_INVALIDARG}, + {"C:\\", ".a\\", NULL, E_INVALIDARG}, + {"C:\\1.exe", " ", NULL, E_INVALIDARG} +}; + +static void test_PathCchAddExtension(void) +{ + WCHAR pathW[PATHCCH_MAX_CCH + 1]; + CHAR pathA[PATHCCH_MAX_CCH + 1]; + WCHAR extensionW[MAX_PATH]; + HRESULT hr; + INT i; + + /* Arguments check */ + MultiByteToWideChar(CP_ACP, 0, "C:\\", -1, pathW, ARRAY_SIZE(pathW)); + MultiByteToWideChar(CP_ACP, 0, ".exe", -1, extensionW, ARRAY_SIZE(extensionW)); + + hr = pPathCchAddExtension(NULL, PATHCCH_MAX_CCH, extensionW); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchAddExtension(pathW, 0, extensionW); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchAddExtension(pathW, PATHCCH_MAX_CCH, NULL); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + /* Path length check */ + hr = pPathCchAddExtension(pathW, ARRAY_SIZE("C:\\.exe") - 1, extensionW); + ok(hr == STRSAFE_E_INSUFFICIENT_BUFFER, "expect result %#x, got %#x\n", STRSAFE_E_INSUFFICIENT_BUFFER, hr); + + hr = pPathCchAddExtension(pathW, PATHCCH_MAX_CCH + 1, extensionW); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchAddExtension(pathW, PATHCCH_MAX_CCH, extensionW); + ok(hr == S_OK, "expect result %#x, got %#x\n", S_OK, hr); + + for (i = 0; i < ARRAY_SIZE(addextension_tests); i++) + { + const struct addextension_test *t = addextension_tests + i; + MultiByteToWideChar(CP_ACP, 0, t->path, -1, pathW, ARRAY_SIZE(pathW)); + MultiByteToWideChar(CP_ACP, 0, t->extension, -1, extensionW, ARRAY_SIZE(extensionW)); + hr = pPathCchAddExtension(pathW, PATHCCH_MAX_CCH, extensionW); + ok(hr == t->hr, "path %s extension %s expect result %#x, got %#x\n", t->path, t->extension, t->hr, hr); + if (SUCCEEDED(hr)) + { + WideCharToMultiByte(CP_ACP, 0, pathW, -1, pathA, ARRAY_SIZE(pathA), NULL, NULL); + ok(!lstrcmpA(pathA, t->expected), "path %s extension %s expect output path %s, got %s\n", t->path, + t->extension, t->expected, pathA); + } + } +} + struct findextension_test { const CHAR *path; @@ -359,10 +459,12 @@ START_TEST(path) pPathCchCombineEx = (void *)GetProcAddress(hmod, "PathCchCombineEx"); pPathCchAddBackslash = (void *)GetProcAddress(hmod, "PathCchAddBackslash"); pPathCchAddBackslashEx = (void *)GetProcAddress(hmod, "PathCchAddBackslashEx"); + pPathCchAddExtension = (void *)GetProcAddress(hmod, "PathCchAddExtension"); pPathCchFindExtension = (void *)GetProcAddress(hmod, "PathCchFindExtension"); test_PathCchCombineEx(); test_PathCchAddBackslash(); test_PathCchAddBackslashEx(); + test_PathCchAddExtension(); test_PathCchFindExtension(); } diff --git a/include/pathcch.h b/include/pathcch.h index 6bb760ccdb..5a189bc0e7 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -27,5 +27,6 @@ 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); 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); -- 2.19.1

2 1

[PATCH v3 2/5] kernelbase: Implement PathCchFindExtension.
by Zhiyi Zhang 19 Nov '18

19 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 | 34 +++++ dlls/kernelbase/tests/path.c | 116 ++++++++++++++++++ include/pathcch.h | 3 + 5 files changed, 155 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 287c5d61d9..7b812eb49d 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 @@ -9,7 +9,7 @@ @ stub PathCchCanonicalizeEx @ stub PathCchCombine @ stub PathCchCombineEx -@ stub PathCchFindExtension +@ stdcall PathCchFindExtension(wstr long ptr) kernelbase.PathCchFindExtension @ stub PathCchIsRoot @ stub PathCchRemoveBackslash @ stub PathCchRemoveBackslashEx diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index f3b4fd131f..2372db821e 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1038,7 +1038,7 @@ # @ stub PathCchCanonicalizeEx # @ stub PathCchCombine # @ stub PathCchCombineEx -# @ stub PathCchFindExtension +@ stdcall PathCchFindExtension(wstr long ptr) # @ stub PathCchIsRoot # @ stub PathCchRemoveBackslash # @ stub PathCchRemoveBackslashEx diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 373c34e979..b051986031 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -1,5 +1,6 @@ /* * Copyright 2018 Nikolay Sivov + * Copyright 2018 Zhiyi Zhang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -65,3 +66,36 @@ HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **endptr, S return S_OK; } + +HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR **extension) +{ + const WCHAR *lastpoint = NULL; + SIZE_T counter = 0; + + TRACE("%s %lu %p\n", wine_dbgstr_w(path), size, extension); + + if (!path || !size || size > PATHCCH_MAX_CCH) + { + *extension = NULL; + return E_INVALIDARG; + } + + while (*path) + { + if (*path == '\\' || *path == ' ') + lastpoint = NULL; + else if (*path == '.') + lastpoint = path; + + path++; + counter++; + if (counter == size || counter == PATHCCH_MAX_CCH) + { + *extension = NULL; + return E_INVALIDARG; + } + } + + *extension = lastpoint ? lastpoint : path; + return S_OK; +} diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index ba271cbe6c..80c65a95d1 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -2,6 +2,7 @@ * Path tests for kernelbase.dll * * Copyright 2017 Michael Müller + * Copyright 2018 Zhiyi Zhang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -32,6 +33,7 @@ HRESULT (WINAPI *pPathCchAddBackslash)(WCHAR *out, SIZE_T size); HRESULT (WINAPI *pPathCchAddBackslashEx)(WCHAR *out, SIZE_T size, WCHAR **endptr, SIZE_T *remaining); 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); static const struct { @@ -233,6 +235,118 @@ static void test_PathCchAddBackslashEx(void) } } +struct findextension_test +{ + const CHAR *path; + INT extension_offset; +}; + +static const struct findextension_test findextension_tests[] = +{ + /* Normal */ + {"1.exe", 1}, + {"C:1.exe", 3}, + {"C:\\1.exe", 4}, + {"\\1.exe", 2}, + {"\\\\1.exe", 3}, + {"\\\\?\\C:1.exe", 7}, + {"\\\\?\\C:\\1.exe", 8}, + {"\\\\?\\UNC\\1.exe", 9}, + {"\\\\?\\UNC\\192.168.1.1\\1.exe", 21}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\1.exe", 50}, + + /* Contains forward slash */ + {"C:\\a/1.exe", 6}, + {"/1.exe", 2}, + {"//1.exe", 3}, + {"C:\\a/b/1.exe", 8}, + {"/a/1.exe", 4}, + {"/a/1.exe", 4}, + + /* Malformed */ + {"", 0}, + {" ", 1}, + {".", 0}, + {"..", 1}, + {"a", 1}, + {"a.", 1}, + {".a.b.", 4}, + {"a. ", 3}, + {"a.\\", 3}, + {"\\\\?\\UNC\\192.168.1.1", 17}, + {"\\\\?\\UNC\\192.168.1.1\\", 20}, + {"\\\\?\\UNC\\192.168.1.1\\a", 21} +}; + +static void test_PathCchFindExtension(void) +{ + WCHAR pathW[PATHCCH_MAX_CCH + 1] = {0}; + const WCHAR *extension; + HRESULT hr; + INT i; + + /* Arguments check */ + extension = (const WCHAR *)0xdeadbeef; + hr = pPathCchFindExtension(NULL, PATHCCH_MAX_CCH, &extension); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + ok(extension == NULL, "Expect extension null, got %p\n", extension); + + extension = (const WCHAR *)0xdeadbeef; + hr = pPathCchFindExtension(pathW, 0, &extension); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + ok(extension == NULL, "Expect extension null, got %p\n", extension); + + /* Crashed on Windows */ + if (0) + { + hr = pPathCchFindExtension(pathW, PATHCCH_MAX_CCH, NULL); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + } + + /* Path length check */ + /* size == PATHCCH_MAX_CCH + 1 */ + MultiByteToWideChar(CP_ACP, 0, "C:\\1.exe", -1, pathW, ARRAY_SIZE(pathW)); + hr = pPathCchFindExtension(pathW, PATHCCH_MAX_CCH + 1, &extension); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + /* size == path length */ + hr = pPathCchFindExtension(pathW, ARRAY_SIZE("C:\\1.exe"), &extension); + ok(hr == S_OK, "expect result %#x, got %#x\n", S_OK, hr); + ok(*extension == '.', "wrong extension value\n"); + + /* size < path length */ + extension = (const WCHAR *)0xdeadbeef; + hr = pPathCchFindExtension(pathW, ARRAY_SIZE("C:\\1.exe") - 1, &extension); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + ok(extension == NULL, "Expect extension null, got %p\n", extension); + + /* size == PATHCCH_MAX_CCH */ + hr = pPathCchFindExtension(pathW, PATHCCH_MAX_CCH, &extension); + ok(hr == S_OK, "expect result %#x, got %#x\n", S_OK, hr); + + /* path length + 1 > PATHCCH_MAX_CCH */ + for (i = 0; i < ARRAY_SIZE(pathW) - 1; i++) pathW[i] = 'a'; + pathW[PATHCCH_MAX_CCH] = 0; + hr = pPathCchFindExtension(pathW, PATHCCH_MAX_CCH, &extension); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + /* path length + 1 == PATHCCH_MAX_CCH */ + pathW[PATHCCH_MAX_CCH - 1] = 0; + hr = pPathCchFindExtension(pathW, PATHCCH_MAX_CCH, &extension); + ok(hr == S_OK, "expect result %#x, got %#x\n", S_OK, hr); + + for (i = 0; i < ARRAY_SIZE(findextension_tests); i++) + { + const struct findextension_test *t = findextension_tests + i; + MultiByteToWideChar(CP_ACP, 0, t->path, -1, pathW, ARRAY_SIZE(pathW)); + hr = pPathCchFindExtension(pathW, PATHCCH_MAX_CCH, &extension); + ok(hr == S_OK, "path %s expect result %#x, got %#x\n", t->path, S_OK, hr); + if (SUCCEEDED(hr)) + ok(extension - pathW == t->extension_offset, "path %s expect extension offset %d, got %d\n", t->path, + t->extension_offset, extension - pathW); + } +} + START_TEST(path) { HMODULE hmod = LoadLibraryA("kernelbase.dll"); @@ -245,8 +359,10 @@ START_TEST(path) pPathCchCombineEx = (void *)GetProcAddress(hmod, "PathCchCombineEx"); pPathCchAddBackslash = (void *)GetProcAddress(hmod, "PathCchAddBackslash"); pPathCchAddBackslashEx = (void *)GetProcAddress(hmod, "PathCchAddBackslashEx"); + pPathCchFindExtension = (void *)GetProcAddress(hmod, "PathCchFindExtension"); test_PathCchCombineEx(); test_PathCchAddBackslash(); test_PathCchAddBackslashEx(); + test_PathCchFindExtension(); } diff --git a/include/pathcch.h b/include/pathcch.h index 2b2aed4c8f..6bb760ccdb 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -23,6 +23,9 @@ #define PATHCCH_DO_NOT_NORMALIZE_SEGMENTS 0x08 #define PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH 0x10 +#define PATHCCH_MAX_CCH 0x8000 + HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size); HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **end, SIZE_T *remaining); 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); -- 2.19.1

2 1

[PATCH v3 1/5] kernelbase/tests: Check module instead of function existence.
by Zhiyi Zhang 19 Nov '18

19 Nov '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Fix apply failure due to mail client text encoding. v3: Avoid possible buffer overrun. Add more tests. Thanks Nikolay. dlls/kernelbase/tests/path.c | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index cdba51bf3f..ba271cbe6c 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -147,12 +147,6 @@ static void test_PathCchAddBackslash(void) unsigned int i; HRESULT hr; - if (!pPathCchAddBackslash) - { - win_skip("PathCchAddBackslash() is not available.\n"); - return; - } - pathW[0] = 0; hr = pPathCchAddBackslash(pathW, 0); ok(hr == STRSAFE_E_INSUFFICIENT_BUFFER, "Unexpected hr %#x.\n", hr); @@ -190,12 +184,6 @@ static void test_PathCchAddBackslashEx(void) HRESULT hr; WCHAR *ptrW; - if (!pPathCchAddBackslashEx) - { - win_skip("PathCchAddBackslashEx() is not available.\n"); - return; - } - pathW[0] = 0; hr = pPathCchAddBackslashEx(pathW, 0, NULL, NULL); ok(hr == STRSAFE_E_INSUFFICIENT_BUFFER, "Unexpected hr %#x.\n", hr); @@ -248,6 +236,11 @@ static void test_PathCchAddBackslashEx(void) START_TEST(path) { HMODULE hmod = LoadLibraryA("kernelbase.dll"); + if (!hmod) + { + win_skip("kernelbase.dll is not available.\n"); + return; + } pPathCchCombineEx = (void *)GetProcAddress(hmod, "PathCchCombineEx"); pPathCchAddBackslash = (void *)GetProcAddress(hmod, "PathCchAddBackslash"); -- 2.19.1

2 1

[PATCH] rpcrt4: Fix handling of FC_ALIGNM* directives.
by Zebediah Figura 19 Nov '18

19 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/rpcrt4/ndr_marshall.c | 41 +++++++++++++++++++++++++++----------- 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 38ead96afc..77bbf986ff 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -108,6 +108,19 @@ static inline void align_pointer_clear( unsigned char **ptr, unsigned int align *ptr = (unsigned char *)(((ULONG_PTR)*ptr + mask) & ~mask); } +static inline void align_pointer_offset( unsigned char **ptr, unsigned char *base, unsigned int align ) +{ + ULONG_PTR mask = align - 1; + *ptr = base + (((ULONG_PTR)(*ptr - base) + mask) & ~mask); +} + +static inline void align_pointer_offset_clear( unsigned char **ptr, unsigned char *base, unsigned int align ) +{ + ULONG_PTR mask = align - 1; + memset( *ptr, 0, (align - (ULONG_PTR)(*ptr - base)) & mask ); + *ptr = base + (((ULONG_PTR)(*ptr - base) + mask) & ~mask); +} + #define STD_OVERFLOW_CHECK(_Msg) do { \ TRACE("buffer=%d/%d\n", (ULONG)(_Msg->Buffer - (unsigned char *)_Msg->RpcMsg->Buffer), _Msg->BufferLength); \ if (_Msg->Buffer > (unsigned char *)_Msg->RpcMsg->Buffer + _Msg->BufferLength) \ @@ -2834,6 +2847,7 @@ static unsigned char * ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, PFORMAT_STRING pPointer) { + unsigned char *mem_base = pMemory; PFORMAT_STRING desc; NDR_MARSHALL m; ULONG size; @@ -2937,13 +2951,13 @@ static unsigned char * ComplexMarshall(PMIDL_STUB_MESSAGE pStubMsg, break; } case FC_ALIGNM2: - align_pointer(&pMemory, 2); + align_pointer_offset(&pMemory, mem_base, 2); break; case FC_ALIGNM4: - align_pointer(&pMemory, 4); + align_pointer_offset(&pMemory, mem_base, 4); break; case FC_ALIGNM8: - align_pointer(&pMemory, 8); + align_pointer_offset(&pMemory, mem_base, 8); break; case FC_STRUCTPAD1: case FC_STRUCTPAD2: @@ -2993,6 +3007,7 @@ static unsigned char * ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pPointer, unsigned char fMustAlloc) { + unsigned char *mem_base = pMemory; PFORMAT_STRING desc; NDR_UNMARSHALL m; ULONG size; @@ -3105,13 +3120,13 @@ static unsigned char * ComplexUnmarshall(PMIDL_STUB_MESSAGE pStubMsg, break; } case FC_ALIGNM2: - align_pointer_clear(&pMemory, 2); + align_pointer_offset_clear(&pMemory, mem_base, 2); break; case FC_ALIGNM4: - align_pointer_clear(&pMemory, 4); + align_pointer_offset_clear(&pMemory, mem_base, 4); break; case FC_ALIGNM8: - align_pointer_clear(&pMemory, 8); + align_pointer_offset_clear(&pMemory, mem_base, 8); break; case FC_STRUCTPAD1: case FC_STRUCTPAD2: @@ -3168,6 +3183,7 @@ static unsigned char * ComplexBufferSize(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, PFORMAT_STRING pPointer) { + unsigned char *mem_base = pMemory; PFORMAT_STRING desc; NDR_BUFFERSIZE m; ULONG size; @@ -3238,13 +3254,13 @@ static unsigned char * ComplexBufferSize(PMIDL_STUB_MESSAGE pStubMsg, pMemory += sizeof(void*); break; case FC_ALIGNM2: - align_pointer(&pMemory, 2); + align_pointer_offset(&pMemory, mem_base, 2); break; case FC_ALIGNM4: - align_pointer(&pMemory, 4); + align_pointer_offset(&pMemory, mem_base, 4); break; case FC_ALIGNM8: - align_pointer(&pMemory, 8); + align_pointer_offset(&pMemory, mem_base, 8); break; case FC_STRUCTPAD1: case FC_STRUCTPAD2: @@ -3292,6 +3308,7 @@ static unsigned char * ComplexFree(PMIDL_STUB_MESSAGE pStubMsg, PFORMAT_STRING pFormat, PFORMAT_STRING pPointer) { + unsigned char *mem_base = pMemory; PFORMAT_STRING desc; NDR_FREE m; ULONG size; @@ -3339,13 +3356,13 @@ static unsigned char * ComplexFree(PMIDL_STUB_MESSAGE pStubMsg, pMemory += sizeof(void *); break; case FC_ALIGNM2: - align_pointer(&pMemory, 2); + align_pointer_offset(&pMemory, mem_base, 2); break; case FC_ALIGNM4: - align_pointer(&pMemory, 4); + align_pointer_offset(&pMemory, mem_base, 4); break; case FC_ALIGNM8: - align_pointer(&pMemory, 8); + align_pointer_offset(&pMemory, mem_base, 8); break; case FC_STRUCTPAD1: case FC_STRUCTPAD2: -- 2.19.1

2 2

[PATCH] widl: Guard RPC includes with #ifdef _WIN32.
by Józef Kucia 19 Nov '18

19 Nov '18

This makes it easier to use header files generated by widl without Windows headers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- tools/widl/header.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index defc7f850371..1720587926d3 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1784,6 +1784,7 @@ void write_header(const statement_list_t *stmts) } fprintf(header, "/*** Autogenerated by WIDL %s from %s - Do not edit ***/\n\n", PACKAGE_VERSION, input_name); + fprintf(header, "#ifdef _WIN32\n"); fprintf(header, "#ifndef __REQUIRED_RPCNDR_H_VERSION__\n"); fprintf(header, "#define __REQUIRED_RPCNDR_H_VERSION__ 475\n"); fprintf(header, "#endif\n\n"); @@ -1792,7 +1793,7 @@ void write_header(const statement_list_t *stmts) fprintf(header, "#include <rpcndr.h>\n" ); if (!for_each_serializable(stmts, NULL, serializable_exists)) fprintf(header, "#include <midles.h>\n" ); - fprintf(header, "\n" ); + fprintf(header, "#endif\n\n"); fprintf(header, "#ifndef COM_NO_WINDOWS_H\n"); fprintf(header, "#include <windows.h>\n"); -- 2.18.1

1 0

[PATCH 1/2] user32/tests: Add FindWindow() test for versioned class.
by Nikolay Sivov 19 Nov '18

19 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/user32/tests/class.c | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/dlls/user32/tests/class.c b/dlls/user32/tests/class.c index 5db37d4a9a..6c5850f141 100644 --- a/dlls/user32/tests/class.c +++ b/dlls/user32/tests/class.c @@ -1319,7 +1319,7 @@ static void test_actctx_classes(void) ATOM class; HINSTANCE hinst; char buff[64]; - HWND hwnd; + HWND hwnd, hwnd2; char path[MAX_PATH]; GetTempPathA(ARRAY_SIZE(path), path); @@ -1353,6 +1353,14 @@ static void test_actctx_classes(void) hwnd = CreateWindowExA(0, testclass, "test", 0, 0, 0, 0, 0, 0, 0, hinst, 0); ok(hwnd != NULL, "Failed to create a window.\n"); + hwnd2 = FindWindowExA(NULL, NULL, "MyTestClass", NULL); +todo_wine + ok(hwnd2 == hwnd, "Failed to find test window.\n"); + + hwnd2 = FindWindowExA(NULL, NULL, "4.3.2.1!MyTestClass", NULL); +todo_wine + ok(hwnd2 == NULL, "Unexpected find result %p.\n", hwnd2); + ret = GetClassNameA(hwnd, buff, sizeof(buff)); ok(ret, "Failed to get class name.\n"); ok(!strcmp(buff, testclass), "Unexpected class name.\n"); @@ -1378,6 +1386,19 @@ static void test_actctx_classes(void) DestroyWindow(hwnd); + hwnd = CreateWindowExA(0, "4.3.2.1!MyTestClass", "test", 0, 0, 0, 0, 0, 0, 0, hinst, 0); + ok(hwnd != NULL, "Failed to create a window.\n"); + + hwnd2 = FindWindowExA(NULL, NULL, "MyTestClass", NULL); +todo_wine + ok(hwnd2 == hwnd, "Failed to find test window.\n"); + + hwnd2 = FindWindowExA(NULL, NULL, "4.3.2.1!MyTestClass", NULL); +todo_wine + ok(hwnd2 == NULL, "Unexpected find result %p.\n", hwnd2); + + DestroyWindow(hwnd); + ret = UnregisterClassA("MyTestClass", hinst); ok(!ret, "Unexpected ret value %d.\n", ret); -- 2.19.1

1 1

[v2 PATCH 1/2] gdi32/tests: Add some tests for font realization info for memory resource fonts.
by Nikolay Sivov 19 Nov '18

19 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- v2: added more tests. dlls/gdi32/tests/font.c | 229 ++++++++++++++++++++++++++++++++++------ 1 file changed, 196 insertions(+), 33 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 4f10e2f38d..c292d28330 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -20,6 +20,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include <assert.h> #include "windef.h" @@ -4254,25 +4255,33 @@ todo_wine DeleteDC(hdc); } -static void test_RealizationInfo(void) +struct font_realization_info { - struct font_realization_info { - DWORD size; - DWORD flags; - DWORD cache_num; - DWORD instance_id; - DWORD unk; - WORD face_index; - WORD simulations; - }; + DWORD size; + DWORD flags; + DWORD cache_num; + DWORD instance_id; + DWORD unk; + WORD face_index; + WORD simulations; +}; + +struct file_info +{ + FILETIME time; + LARGE_INTEGER size; + WCHAR path[MAX_PATH]; +}; +static void test_RealizationInfo(void) +{ struct realization_info_t { DWORD flags; DWORD cache_num; DWORD instance_id; }; - + struct file_info file_info; HDC hdc; DWORD info[4], info2[10]; BOOL r, have_file = FALSE; @@ -4281,12 +4290,6 @@ static void test_RealizationInfo(void) DWORD needed, read; HANDLE h; BYTE file[16], data[14]; - struct file_info - { - FILETIME time; - LARGE_INTEGER size; - WCHAR path[MAX_PATH]; - } file_info; FILETIME time; LARGE_INTEGER size; @@ -5049,9 +5052,14 @@ static void *load_font(const char *font_name, DWORD *font_size) HANDLE file, mapping; void *font; - if (!GetWindowsDirectoryA(file_name, sizeof(file_name))) return NULL; - strcat(file_name, "\\fonts\\"); - strcat(file_name, font_name); + if (font_name[1] == ':') + strcpy(file_name, font_name); + else + { + if (!GetWindowsDirectoryA(file_name, sizeof(file_name))) return NULL; + strcat(file_name, "\\fonts\\"); + strcat(file_name, font_name); + } file = CreateFileA(file_name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); if (file == INVALID_HANDLE_VALUE) return NULL; @@ -5072,8 +5080,101 @@ static void *load_font(const char *font_name, DWORD *font_size) return font; } +static void test_realization_info(const char *name, DWORD size, BOOL is_memory_resource) +{ + struct font_realization_info info; + struct file_info file_info; + HFONT hfont, hfont_prev; + DWORD needed; + LOGFONTA lf; + BYTE *data; + BOOL ret; + HDC hdc; + + if (!pGetFontRealizationInfo) + return; + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = 72; + strcpy(lf.lfFaceName, name); + + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "Failed to create a font, %u.\n", GetLastError()); + + hdc = GetDC(NULL); + + hfont_prev = SelectObject(hdc, hfont); + ok(hfont_prev != NULL, "Failed to select font.\n"); + + memset(&info, 0xcc, sizeof(info)); + info.size = sizeof(info); + ret = pGetFontRealizationInfo(hdc, (DWORD *)&info); + ok(ret != 0, "Unexpected return value %d.\n", ret); + + ok((info.flags & 0xf) == 0x3, "Unexpected flags %#x.\n", info.flags); + ok(info.cache_num != 0, "Unexpected cache num %u.\n", info.cache_num); + ok(info.instance_id != 0, "Unexpected instance id %u.\n", info.instance_id); + ok(info.simulations == 0, "Unexpected simulations %#x.\n", info.simulations); + ok(info.face_index == 0, "Unexpected face index %u.\n", info.face_index); + + needed = 0; + memset(&file_info, 0xcc, sizeof(file_info)); + ret = pGetFontFileInfo(info.instance_id, 0, &file_info, sizeof(file_info), &needed); + ok(ret != 0 || broken(GetLastError() == ERROR_NOACCESS), "Failed to get font file info, ret %d gle %d.\n", ret, GetLastError()); + if (ret) + { + todo_wine_if(is_memory_resource) + ok(is_memory_resource ? file_info.size.QuadPart == size : file_info.size.QuadPart > 0, "Unexpected file size.\n"); + ok(is_memory_resource ? !file_info.path[0] : file_info.path[0], "Unexpected file path %s.\n", + wine_dbgstr_w(file_info.path)); + } + +if (pGetFontFileData) +{ + size = file_info.size.LowPart; + data = HeapAlloc(GetProcessHeap(), 0, size + 16); + + memset(data, 0xcc, size); + ret = pGetFontFileData(info.instance_id, 0, 0, data, size); + ok(ret != 0, "Failed to get font file data, %d\n", GetLastError()); + ok(*(DWORD *)data == 0x00000100, "Unexpected sfnt header version %#x.\n", *(DWORD *)data); + ok(*(WORD *)(data + 4) == 0x0e00, "Unexpected table count %#x.\n", *(WORD *)(data + 4)); + + /* Larger than font data size. */ + memset(data, 0xcc, size); + ret = pGetFontFileData(info.instance_id, 0, 0, data, size + 16); + ok(ret == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "Unexpected return value %d, error %d\n", + ret, GetLastError()); + ok(*(DWORD *)data == 0xcccccccc, "Unexpected buffer contents %#x.\n", *(DWORD *)data); + + /* With offset. */ + memset(data, 0xcc, size); + ret = pGetFontFileData(info.instance_id, 0, 16, data, size - 16); + ok(ret != 0, "Failed to get font file data, %d\n", GetLastError()); + ok(*(DWORD *)data == 0x1000000, "Unexpected buffer contents %#x.\n", *(DWORD *)data); + + memset(data, 0xcc, size); + ret = pGetFontFileData(info.instance_id, 0, 16, data, size); + ok(ret == 0 && GetLastError() == ERROR_INVALID_PARAMETER, "Unexpected return value %d, error %d\n", + ret, GetLastError()); + ok(*(DWORD *)data == 0xcccccccc, "Unexpected buffer contents %#x.\n", *(DWORD *)data); + + /* Zero buffer size. */ + memset(data, 0xcc, size); + ret = pGetFontFileData(info.instance_id, 0, 16, data, 0); + ok(ret == 0 && GetLastError() == ERROR_NOACCESS, "Unexpected return value %d, error %d\n", ret, GetLastError()); + ok(*(DWORD *)data == 0xcccccccc, "Unexpected buffer contents %#x.\n", *(DWORD *)data); + + HeapFree(GetProcessHeap(), 0, data); +} + SelectObject(hdc, hfont_prev); + DeleteObject(hfont); + ReleaseDC(NULL, hdc); +} + static void test_AddFontMemResource(void) { + char ttf_name[MAX_PATH]; void *font; DWORD font_size, num_fonts; HANDLE ret; @@ -5085,13 +5186,6 @@ static void test_AddFontMemResource(void) return; } - font = load_font("sserife.fon", &font_size); - if (!font) - { - skip("Unable to locate and load font sserife.fon\n"); - return; - } - SetLastError(0xdeadbeef); ret = pAddFontMemResourceEx(NULL, 0, NULL, NULL); ok(!ret, "AddFontMemResourceEx should fail\n"); @@ -5120,6 +5214,42 @@ static void test_AddFontMemResource(void) "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + /* Now with scalable font */ + bRet = write_ttf_file("wine_test.ttf", ttf_name); + ok(bRet, "Failed to create test font file.\n"); + + font = load_font(ttf_name, &font_size); + ok(font != NULL, "Failed to map font file.\n"); + + bRet = is_truetype_font_installed("wine_test"); + ok(!bRet, "Font wine_test should not be enumerated.\n"); + + num_fonts = 0; + ret = pAddFontMemResourceEx(font, font_size, NULL, &num_fonts); + ok(ret != 0, "Failed to add resource, %d.\n", GetLastError()); + ok(num_fonts == 1, "Unexpected number of fonts %u.\n", num_fonts); + + bRet = is_truetype_font_installed("wine_test"); +todo_wine + ok(!bRet, "Font wine_test should not be enumerated.\n"); + + test_realization_info("wine_test", font_size, TRUE); + + bRet = pRemoveFontMemResourceEx(ret); + ok(bRet, "RemoveFontMemResourceEx error %d\n", GetLastError()); + + free_font(font); + + bRet = DeleteFileA(ttf_name); + ok(bRet, "Failed to delete font file, %d.\n", GetLastError()); + + font = load_font("sserife.fon", &font_size); + if (!font) + { + skip("Unable to locate and load font sserife.fon\n"); + return; + } + SetLastError(0xdeadbeef); ret = pAddFontMemResourceEx(font, 0, NULL, NULL); ok(!ret, "AddFontMemResourceEx should fail\n"); @@ -5839,6 +5969,7 @@ static void test_CreateScalableFontResource(void) test_GetGlyphOutline_empty_contour(); test_GetGlyphOutline_metric_clipping(); test_fstype_fixup(); + test_realization_info("wine_test", 0, FALSE); ret = pRemoveFontResourceExA(fot_name, FR_PRIVATE, 0); ok(!ret, "RemoveFontResourceEx() with not matching flags should fail\n"); @@ -6859,8 +6990,31 @@ static void test_long_names(void) START_TEST(font) { + static const char *test_names[] = + { + "AddFontMemResource", + "vertical_font", + "CreateScalableFontResource", + }; + char path_name[MAX_PATH]; + STARTUPINFOA startup; + char **argv; + int argc, i; + init(); + argc = winetest_get_mainargs(&argv); + if (argc >= 3) + { + if (!strcmp(argv[2], "AddFontMemResource")) + test_AddFontMemResource(); + else if (!strcmp(argv[2], "vertical_font")) + test_vertical_font(); + else if (!strcmp(argv[2], "CreateScalableFontResource")) + test_CreateScalableFontResource(); + return; + } + test_stock_fonts(); test_logfont(); test_bitmap_font(); @@ -6879,7 +7033,6 @@ START_TEST(font) test_nonexistent_font(); test_orientation(); test_height_selection(); - test_AddFontMemResource(); test_EnumFonts(); test_EnumFonts_subst(); @@ -6923,9 +7076,19 @@ START_TEST(font) test_GetCharWidthI(); test_long_names(); - /* These tests should be last test until RemoveFontResource - * is properly implemented. - */ - test_vertical_font(); - test_CreateScalableFontResource(); + /* These tests run in separate processes until RemoveFontResource */ + winetest_get_mainargs( &argv ); + for (i = 0; i < ARRAY_SIZE(test_names); ++i) + { + PROCESS_INFORMATION info; + + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + sprintf(path_name, "%s font %s", argv[0], test_names[i]); + ok(CreateProcessA(NULL, path_name, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info), + "CreateProcess failed.\n"); + winetest_wait_child_process(info.hProcess); + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + } } -- 2.19.1

3 5

[PATCH 1/3] gdi32/tests: Add some tests for font realization info for memory resource fonts.
by Nikolay Sivov 19 Nov '18

19 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/gdi32/tests/font.c | 198 +++++++++++++++++++++++++++++++++------- 1 file changed, 165 insertions(+), 33 deletions(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 4f10e2f38d..888335809d 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -20,6 +20,7 @@ */ #include <stdarg.h> +#include <stdio.h> #include <assert.h> #include "windef.h" @@ -4254,25 +4255,33 @@ todo_wine DeleteDC(hdc); } -static void test_RealizationInfo(void) +struct font_realization_info { - struct font_realization_info { - DWORD size; - DWORD flags; - DWORD cache_num; - DWORD instance_id; - DWORD unk; - WORD face_index; - WORD simulations; - }; + DWORD size; + DWORD flags; + DWORD cache_num; + DWORD instance_id; + DWORD unk; + WORD face_index; + WORD simulations; +}; + +struct file_info +{ + FILETIME time; + LARGE_INTEGER size; + WCHAR path[MAX_PATH]; +}; +static void test_RealizationInfo(void) +{ struct realization_info_t { DWORD flags; DWORD cache_num; DWORD instance_id; }; - + struct file_info file_info; HDC hdc; DWORD info[4], info2[10]; BOOL r, have_file = FALSE; @@ -4281,12 +4290,6 @@ static void test_RealizationInfo(void) DWORD needed, read; HANDLE h; BYTE file[16], data[14]; - struct file_info - { - FILETIME time; - LARGE_INTEGER size; - WCHAR path[MAX_PATH]; - } file_info; FILETIME time; LARGE_INTEGER size; @@ -5049,9 +5052,14 @@ static void *load_font(const char *font_name, DWORD *font_size) HANDLE file, mapping; void *font; - if (!GetWindowsDirectoryA(file_name, sizeof(file_name))) return NULL; - strcat(file_name, "\\fonts\\"); - strcat(file_name, font_name); + if (font_name[1] == ':') + strcpy(file_name, font_name); + else + { + if (!GetWindowsDirectoryA(file_name, sizeof(file_name))) return NULL; + strcat(file_name, "\\fonts\\"); + strcat(file_name, font_name); + } file = CreateFileA(file_name, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); if (file == INVALID_HANDLE_VALUE) return NULL; @@ -5072,8 +5080,70 @@ static void *load_font(const char *font_name, DWORD *font_size) return font; } +static void test_realization_info(const char *name, DWORD size, BOOL is_memory_resource) +{ + struct font_realization_info info; + struct file_info file_info; + HFONT hfont, hfont_prev; + BYTE data[16]; + DWORD needed; + LOGFONTA lf; + BOOL ret; + HDC hdc; + + if (!pGetFontRealizationInfo) + return; + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = 72; + strcpy(lf.lfFaceName, name); + + hfont = CreateFontIndirectA(&lf); + ok(hfont != 0, "Failed to create a font, %u.\n", GetLastError()); + + hdc = GetDC(NULL); + + hfont_prev = SelectObject(hdc, hfont); + ok(hfont_prev != NULL, "Failed to select font.\n"); + + memset(&info, 0xcc, sizeof(info)); + info.size = sizeof(info); + ret = pGetFontRealizationInfo(hdc, (DWORD *)&info); + ok(ret != 0, "Unexpected return value %d.\n", ret); + + ok((info.flags & 0xf) == 0x3, "Unexpected flags %#x.\n", info.flags); + ok(info.cache_num != 0, "Unexpected cache num %u.\n", info.cache_num); + ok(info.instance_id != 0, "Unexpected instance id %u.\n", info.instance_id); + ok(info.simulations == 0, "Unexpected simulations %#x.\n", info.simulations); + ok(info.face_index == 0, "Unexpected face index %u.\n", info.face_index); + + needed = 0; + memset(&file_info, 0xcc, sizeof(file_info)); + ret = pGetFontFileInfo(info.instance_id, 0, &file_info, sizeof(file_info), &needed); + ok(ret != 0 || broken(GetLastError() == ERROR_NOACCESS), "Failed to get font file info, ret %d gle %d.\n", ret, GetLastError()); + if (ret) + { + todo_wine_if(is_memory_resource) + ok(is_memory_resource ? file_info.size.QuadPart == size : file_info.size.QuadPart > 0, "Unexpected file size.\n"); + ok(is_memory_resource ? !file_info.path[0] : file_info.path[0], "Unexpected file path %s.\n", + wine_dbgstr_w(file_info.path)); + } + +if (pGetFontFileData) +{ + memset(data, 0xcc, sizeof(data)); + ret = pGetFontFileData(info.instance_id, 0, 16, data, sizeof(data)); + ok(ret != 0, "Failed to get font file data, %d\n", GetLastError()); + ok(*(DWORD *)data == 0x1000000, "Unexpected sfnt header version %#x.\n", *(DWORD *)data); +} + SelectObject(hdc, hfont_prev); + DeleteObject(hfont); + ReleaseDC(NULL, hdc); +} + static void test_AddFontMemResource(void) { + char ttf_name[MAX_PATH]; void *font; DWORD font_size, num_fonts; HANDLE ret; @@ -5085,13 +5155,6 @@ static void test_AddFontMemResource(void) return; } - font = load_font("sserife.fon", &font_size); - if (!font) - { - skip("Unable to locate and load font sserife.fon\n"); - return; - } - SetLastError(0xdeadbeef); ret = pAddFontMemResourceEx(NULL, 0, NULL, NULL); ok(!ret, "AddFontMemResourceEx should fail\n"); @@ -5120,6 +5183,42 @@ static void test_AddFontMemResource(void) "Expected GetLastError() to return ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + /* Now with scalable font */ + bRet = write_ttf_file("wine_test.ttf", ttf_name); + ok(bRet, "Failed to create test font file.\n"); + + font = load_font(ttf_name, &font_size); + ok(font != NULL, "Failed to map font file.\n"); + + bRet = is_truetype_font_installed("wine_test"); + ok(!bRet, "Font wine_test should not be enumerated.\n"); + + num_fonts = 0; + ret = pAddFontMemResourceEx(font, font_size, NULL, &num_fonts); + ok(ret != 0, "Failed to add resource, %d.\n", GetLastError()); + ok(num_fonts == 1, "Unexpected number of fonts %u.\n", num_fonts); + + bRet = is_truetype_font_installed("wine_test"); +todo_wine + ok(!bRet, "Font wine_test should not be enumerated.\n"); + + test_realization_info("wine_test", font_size, TRUE); + + bRet = pRemoveFontMemResourceEx(ret); + ok(bRet, "RemoveFontMemResourceEx error %d\n", GetLastError()); + + free_font(font); + + bRet = DeleteFileA(ttf_name); + ok(bRet, "Failed to delete font file, %d.\n", GetLastError()); + + font = load_font("sserife.fon", &font_size); + if (!font) + { + skip("Unable to locate and load font sserife.fon\n"); + return; + } + SetLastError(0xdeadbeef); ret = pAddFontMemResourceEx(font, 0, NULL, NULL); ok(!ret, "AddFontMemResourceEx should fail\n"); @@ -5839,6 +5938,7 @@ static void test_CreateScalableFontResource(void) test_GetGlyphOutline_empty_contour(); test_GetGlyphOutline_metric_clipping(); test_fstype_fixup(); + test_realization_info("wine_test", 0, FALSE); ret = pRemoveFontResourceExA(fot_name, FR_PRIVATE, 0); ok(!ret, "RemoveFontResourceEx() with not matching flags should fail\n"); @@ -6859,8 +6959,31 @@ static void test_long_names(void) START_TEST(font) { + static const char *test_names[] = + { + "AddFontMemResource", + "vertical_font", + "CreateScalableFontResource", + }; + char path_name[MAX_PATH]; + STARTUPINFOA startup; + char **argv; + int argc, i; + init(); + argc = winetest_get_mainargs(&argv); + if (argc >= 3) + { + if (!strcmp(argv[2], "AddFontMemResource")) + test_AddFontMemResource(); + else if (!strcmp(argv[2], "vertical_font")) + test_vertical_font(); + else if (!strcmp(argv[2], "CreateScalableFontResource")) + test_CreateScalableFontResource(); + return; + } + test_stock_fonts(); test_logfont(); test_bitmap_font(); @@ -6879,7 +7002,6 @@ START_TEST(font) test_nonexistent_font(); test_orientation(); test_height_selection(); - test_AddFontMemResource(); test_EnumFonts(); test_EnumFonts_subst(); @@ -6923,9 +7045,19 @@ START_TEST(font) test_GetCharWidthI(); test_long_names(); - /* These tests should be last test until RemoveFontResource - * is properly implemented. - */ - test_vertical_font(); - test_CreateScalableFontResource(); + /* These tests run in separate processes until RemoveFontResource */ + winetest_get_mainargs( &argv ); + for (i = 0; i < ARRAY_SIZE(test_names); ++i) + { + PROCESS_INFORMATION info; + + memset(&startup, 0, sizeof(startup)); + startup.cb = sizeof(startup); + sprintf(path_name, "%s font %s", argv[0], test_names[i]); + ok(CreateProcessA(NULL, path_name, NULL, NULL, FALSE, 0, NULL, NULL, &startup, &info), + "CreateProcess failed.\n"); + winetest_wait_child_process(info.hProcess); + CloseHandle(info.hProcess); + CloseHandle(info.hThread); + } } -- 2.19.1

1 3

[PATCH] gdi32: Fix the linked child font bold, italic style correctly.
by Byeongsik Jeon 19 Nov '18

19 Nov '18

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- dlls/gdi32/freetype.c | 30 +++++++++++++++++++++++++++--- 1 file changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 415aabedf1..a16c53286c 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -8118,8 +8118,30 @@ static UINT freetype_GetOutlineTextMetrics( PHYSDEV dev, UINT cbSize, OUTLINETEX static BOOL load_child_font(GdiFont *font, CHILD_FONT *child) { + const struct list *face_list; + Face *child_face = NULL, *best_face = NULL; + UINT penalty = 0, new_penalty = 0; + BOOL bold, italic, bd, it; + + italic = font->font_desc.lf.lfItalic ? TRUE : FALSE; + bold = font->font_desc.lf.lfWeight > FW_MEDIUM ? TRUE : FALSE; + + face_list = get_face_list_from_family( child->face->family ); + LIST_FOR_EACH_ENTRY( child_face, face_list, Face, entry ) + { + it = child_face->ntmFlags & NTM_ITALIC ? TRUE : FALSE; + bd = child_face->ntmFlags & NTM_BOLD ? TRUE : FALSE; + new_penalty = ( it ^ italic ) + ( bd ^ bold ); + if (!best_face || new_penalty < penalty) + { + penalty = new_penalty; + best_face = child_face; + } + } + child_face = best_face ? best_face : child->face; + child->font = alloc_font(); - child->font->ft_face = OpenFontFace(child->font, child->face, 0, -font->ppem); + child->font->ft_face = OpenFontFace( child->font, child_face, 0, -font->ppem ); if(!child->font->ft_face) { free_font(child->font); @@ -8127,11 +8149,13 @@ static BOOL load_child_font(GdiFont *font, CHILD_FONT *child) return FALSE; } + child->font->fake_italic = italic && !( child_face->ntmFlags & NTM_ITALIC ); + child->font->fake_bold = bold && !( child_face->ntmFlags & NTM_BOLD ); child->font->font_desc = font->font_desc; - child->font->ntmFlags = child->face->ntmFlags; + child->font->ntmFlags = child_face->ntmFlags; child->font->orientation = font->orientation; child->font->scale_y = font->scale_y; - child->font->name = strdupW(child->face->family->FamilyName); + child->font->name = strdupW( child_face->family->FamilyName ); child->font->base_font = font; TRACE("created child font %p for base %p\n", child->font, font); return TRUE; -- 2.19.1

2 1

[PATCH] dwrite/tests: Add CreateFontFaceFromHdc() test for in-memory font.
by Nikolay Sivov 19 Nov '18

19 Nov '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dwrite/tests/font.c | 158 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 154 insertions(+), 4 deletions(-) diff --git a/dlls/dwrite/tests/font.c b/dlls/dwrite/tests/font.c index 29fa2f3b53..2ac81573de 100644 --- a/dlls/dwrite/tests/font.c +++ b/dlls/dwrite/tests/font.c @@ -3711,16 +3711,52 @@ static void test_GetGdiInterop(void) ok(ref == 0, "factory not released, %u\n", ref); } +static void *map_font_file(const WCHAR *filename, DWORD *file_size) +{ + HANDLE file, mapping; + void *ptr; + + file = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, 0); + if (file == INVALID_HANDLE_VALUE) return NULL; + + *file_size = GetFileSize(file, NULL); + + mapping = CreateFileMappingA(file, NULL, PAGE_READONLY, 0, 0, NULL); + if (!mapping) + { + CloseHandle(file); + return NULL; + } + + ptr = MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0); + + CloseHandle(file); + CloseHandle(mapping); + return ptr; +} + static void test_CreateFontFaceFromHdc(void) { + IDWriteFontFileStream *stream, *stream2; + void *font_data, *fragment_context; + const void *refkey, *fragment; + IDWriteFontFileLoader *loader; + DWORD data_size, num_fonts; IDWriteGdiInterop *interop; IDWriteFontFace *fontface; IDWriteFactory *factory; + UINT64 size, writetime; + IDWriteFontFile *file; HFONT hfont, oldhfont; LOGFONTW logfont; + HANDLE resource; + IUnknown *unk; + UINT32 count; LOGFONTA lf; + WCHAR *path; HRESULT hr; ULONG ref; + BOOL ret; HDC hdc; factory = create_factory(); @@ -3771,8 +3807,91 @@ static void test_CreateFontFaceFromHdc(void) ok(fontface == NULL, "got %p\n", fontface); DeleteObject(SelectObject(hdc, oldhfont)); - DeleteDC(hdc); + /* Memory resource font */ + path = create_testfontfile(test_fontfile); + + data_size = 0; + font_data = map_font_file(path, &data_size); + + num_fonts = 0; + resource = AddFontMemResourceEx(font_data, data_size, NULL, &num_fonts); + ok(resource != NULL, "Failed to add memory resource font, %d.\n", GetLastError()); + ok(num_fonts == 1, "Unexpected number of fonts.\n"); + + memset(&lf, 0, sizeof(lf)); + lf.lfHeight = -12; + strcpy(lf.lfFaceName, "wine_test"); + + hfont = CreateFontIndirectA(&lf); + ok(hfont != NULL, "Failed to create a font.\n"); + oldhfont = SelectObject(hdc, hfont); + + hr = IDWriteGdiInterop_CreateFontFaceFromHdc(interop, hdc, &fontface); +todo_wine + ok(hr == S_OK, "Failed to create fontface, hr %#x.\n", hr); + +if (fontface) +{ + count = 1; + hr = IDWriteFontFace_GetFiles(fontface, &count, &file); + ok(hr == S_OK, "Failed to get font files, hr %#x.\n", hr); + + hr = IDWriteFontFile_GetLoader(file, &loader); + ok(hr == S_OK, "Failed to get file loader, hr %#x.\n", hr); + + hr = IDWriteFactory_RegisterFontFileLoader(factory, loader); + ok(hr == DWRITE_E_ALREADYREGISTERED, "Unexpected hr %#x.\n", hr); + + hr = IDWriteFontFileLoader_QueryInterface(loader, &IID_IDWriteInMemoryFontFileLoader, (void **)&unk); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + + hr = IDWriteFontFileLoader_QueryInterface(loader, &IID_IDWriteLocalFontFileLoader, (void **)&unk); + ok(hr == E_NOINTERFACE, "Unexpected hr %#x.\n", hr); + + count = 0; + hr = IDWriteFontFile_GetReferenceKey(file, &refkey, &count); + ok(hr == S_OK, "Failed to get ref key, hr %#x.\n", hr); + ok(count > 0, "Unexpected key length %u.\n", count); + + hr = IDWriteFontFileLoader_CreateStreamFromKey(loader, refkey, count, &stream); + ok(hr == S_OK, "Failed to create file stream, hr %#x.\n", hr); + + hr = IDWriteFontFileLoader_CreateStreamFromKey(loader, refkey, count, &stream2); + ok(hr == S_OK, "Failed to create file stream, hr %#x.\n", hr); + ok(stream2 != stream, "Unexpected stream instance.\n"); + IDWriteFontFileStream_Release(stream2); + + hr = IDWriteFontFileStream_GetFileSize(stream, &size); + ok(hr == S_OK, "Failed to get stream size, hr %#x.\n", hr); + ok(size == data_size, "Unexpected stream size.\n"); + + hr = IDWriteFontFileStream_GetLastWriteTime(stream, &writetime); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + + fragment_context = NULL; + hr = IDWriteFontFileStream_ReadFileFragment(stream, &fragment, 0, size, &fragment_context); + ok(hr == S_OK, "Failed to read fragment, hr %#x.\n", hr); + ok(fragment_context != NULL, "Unexpected context %p.\n", fragment_context); + ok(fragment == fragment_context, "Unexpected data pointer %p, context %p.\n", fragment, fragment_context); + IDWriteFontFileStream_ReleaseFileFragment(stream, fragment_context); + + IDWriteFontFileStream_Release(stream); + + IDWriteFontFileLoader_Release(loader); + IDWriteFontFile_Release(file); + + IDWriteFontFace_Release(fontface); +} + ret = RemoveFontMemResourceEx(resource); + ok(ret, "Failed to remove memory resource font, %d.\n", GetLastError()); + + UnmapViewOfFile(font_data); + + DELETE_FONTFILE(path); + + DeleteObject(SelectObject(hdc, oldhfont)); + DeleteDC(hdc); IDWriteGdiInterop_Release(interop); ref = IDWriteFactory_Release(factory); ok(ref == 0, "factory not released, %u\n", ref); @@ -7935,6 +8054,7 @@ static void test_inmemory_file_loader(void) hr = IDWriteInMemoryFontFileLoader_CreateStreamFromKey(inmemory, &ref_key, sizeof(ref_key), &stream2); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); + /* With owner object. */ hr = IDWriteInMemoryFontFileLoader_CreateInMemoryFontFileReference(inmemory, (IDWriteFactory *)factory, data, file_size, &ownerobject.IUnknown_iface, &file); ok(hr == S_OK, "Failed to create in-memory file reference, hr %#x.\n", hr); @@ -7946,7 +8066,7 @@ static void test_inmemory_file_loader(void) context2 = (void *)0xdeadbeef; hr = IDWriteFontFileStream_ReadFileFragment(stream2, &frag_start, 0, file_size, &context2); ok(hr == S_OK, "Failed to read a fragment, hr %#x.\n", hr); - ok(context == NULL, "Unexpected context %p.\n", context2); + ok(context2 == NULL, "Unexpected context %p.\n", context2); ok(frag_start == data, "Unexpected fragment pointer %p.\n", frag_start); hr = IDWriteFontFileStream_GetFileSize(stream2, &size); @@ -7962,6 +8082,36 @@ static void test_inmemory_file_loader(void) IDWriteFontFileStream_Release(stream2); + /* Without owner object. */ + hr = IDWriteInMemoryFontFileLoader_CreateInMemoryFontFileReference(inmemory, (IDWriteFactory *)factory, data, + file_size, NULL, &file2); + ok(hr == S_OK, "Failed to create in-memory file reference, hr %#x.\n", hr); + + ref_key = 1; + hr = IDWriteInMemoryFontFileLoader_CreateStreamFromKey(inmemory, &ref_key, sizeof(ref_key), &stream2); + ok(hr == S_OK, "Failed to create a stream, hr %#x.\n", hr); + + context2 = (void *)0xdeadbeef; + hr = IDWriteFontFileStream_ReadFileFragment(stream2, &frag_start, 0, file_size, &context2); + ok(hr == S_OK, "Failed to read a fragment, hr %#x.\n", hr); + ok(context2 == NULL, "Unexpected context %p.\n", context2); + ok(frag_start != data, "Unexpected fragment pointer %p.\n", frag_start); + + hr = IDWriteFontFileStream_GetFileSize(stream2, &size); + ok(hr == S_OK, "Failed to get file size, hr %#x.\n", hr); + ok(size == file_size, "Unexpected file size.\n"); + + IDWriteFontFileStream_ReleaseFileFragment(stream2, context2); + + writetime = 1; + hr = IDWriteFontFileStream_GetLastWriteTime(stream2, &writetime); + ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); + ok(writetime == 0, "Unexpected writetime.\n"); + + IDWriteFontFileStream_Release(stream2); + IDWriteFontFile_Release(file2); + + /* Key size validation. */ ref_key = 0; hr = IDWriteInMemoryFontFileLoader_CreateStreamFromKey(inmemory, NULL, sizeof(ref_key) - 1, &stream2); ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); @@ -7975,7 +8125,7 @@ static void test_inmemory_file_loader(void) ok(hr == E_INVALIDARG, "Unexpected hr %#x.\n", hr); count = IDWriteInMemoryFontFileLoader_GetFileCount(inmemory); - ok(count == 1, "Unexpected file count %u.\n", count); + ok(count == 2, "Unexpected file count %u.\n", count); hr = IDWriteFontFile_GetReferenceKey(file, &key, &key_size); ok(hr == S_OK, "Failed to get reference key, hr %#x.\n", hr); @@ -7986,7 +8136,7 @@ static void test_inmemory_file_loader(void) IDWriteFontFile_Release(file); count = IDWriteInMemoryFontFileLoader_GetFileCount(inmemory); - ok(count == 1, "Unexpected file count %u.\n", count); + ok(count == 2, "Unexpected file count %u.\n", count); hr = IDWriteFactory5_UnregisterFontFileLoader(factory, (IDWriteFontFileLoader *)inmemory); ok(hr == S_OK, "Failed to unregister loader, hr %#x.\n", hr); -- 2.19.1

1 0

[PATCH 1/2] shell32/autocomplete: Retrieve the count in show_listbox
by Gabriel Ivăncescu 19 Nov '18

19 Nov '18

Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/shell32/autocomplete.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/autocomplete.c b/dlls/shell32/autocomplete.c index 6d8988b..c9bf9ff 100644 --- a/dlls/shell32/autocomplete.c +++ b/dlls/shell32/autocomplete.c @@ -193,15 +193,16 @@ static void hide_listbox(IAutoCompleteImpl *ac, HWND hwnd, BOOL reset) if (reset) free_enum_strs(ac); } -static void show_listbox(IAutoCompleteImpl *ac, UINT cnt) +static void show_listbox(IAutoCompleteImpl *ac) { RECT r; - UINT width, height; + UINT cnt, width, height; GetWindowRect(ac->hwndEdit, &r); SendMessageW(ac->hwndListBox, LB_CARETOFF, 0, 0); /* Windows XP displays 7 lines at most, then it uses a scroll bar */ + cnt = SendMessageW(ac->hwndListBox, LB_GETCOUNT, 0, 0); height = SendMessageW(ac->hwndListBox, LB_GETITEMHEIGHT, 0, 0) * min(cnt + 1, 7); width = r.right - r.left; @@ -404,7 +405,7 @@ static BOOL display_matching_strs(IAutoCompleteImpl *ac, WCHAR *text, UINT len, { /* Return FALSE if we need to hide the listbox */ WCHAR **str = ac->enum_strs; - UINT cnt, start, end; + UINT start, end; if (!str) return (ac->options & ACO_AUTOSUGGEST) ? FALSE : TRUE; /* Windows seems to disable autoappend if ACO_NOPREFIXFILTERING is set */ @@ -432,15 +433,14 @@ static BOOL display_matching_strs(IAutoCompleteImpl *ac, WCHAR *text, UINT len, if (end == 0) return FALSE; } - cnt = end - start; SendMessageW(ac->hwndListBox, WM_SETREDRAW, FALSE, 0); SendMessageW(ac->hwndListBox, LB_RESETCONTENT, 0, 0); - SendMessageW(ac->hwndListBox, LB_INITSTORAGE, cnt, 0); + SendMessageW(ac->hwndListBox, LB_INITSTORAGE, end - start, 0); for (; start < end; start++) SendMessageW(ac->hwndListBox, LB_INSERTSTRING, -1, (LPARAM)str[start]); - show_listbox(ac, cnt); + show_listbox(ac); SendMessageW(ac->hwndListBox, WM_SETREDRAW, TRUE, 0); return TRUE; } -- 2.19.1

2 3

[PATCH] rpcrt4: Handle large arrays in EmbeddedComplexSize().
by Zebediah Figura 19 Nov '18

19 Nov '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/rpcrt4/ndr_marshall.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/rpcrt4/ndr_marshall.c b/dlls/rpcrt4/ndr_marshall.c index 82cc064c2c..38ead96afc 100644 --- a/dlls/rpcrt4/ndr_marshall.c +++ b/dlls/rpcrt4/ndr_marshall.c @@ -2765,6 +2765,9 @@ static ULONG EmbeddedComplexSize(MIDL_STUB_MESSAGE *pStubMsg, case FC_SMVARRAY: case FC_CSTRING: return *(const WORD*)&pFormat[2]; + case FC_LGFARRAY: + case FC_LGVARRAY: + return *(const ULONG*)&pFormat[2]; case FC_USER_MARSHAL: return *(const WORD*)&pFormat[4]; case FC_RANGE: { -- 2.14.1

2 1

[PATCH] stdole2: Avoid defining Automation typedefs as part of the public library.
by Zebediah Figura 19 Nov '18

19 Nov '18

This fixes a regression introduced by 70e5d5fd2e8501f36e4f3b2bccbdc55e25d31ee4. If the VARIANT struct is defined inside the library block, widl generates typeinfo for it at index 0. This confuses typelibs that import stdole2.tlb. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45949 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/stdole2.idl | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/include/stdole2.idl b/include/stdole2.idl index d372384533..b65907072d 100644 --- a/include/stdole2.idl +++ b/include/stdole2.idl @@ -25,6 +25,17 @@ #include <olectl.h> +/* These typedefs need to have the same size as their real counterparts. */ +typedef short VARIANT_BOOL; +typedef void *BSTR; +typedef double CURRENCY; +typedef unsigned long HRESULT; +typedef struct { + short word1, word2, word3, word4; + void *ptr1, *ptr2; +} VARIANT; +typedef unsigned long SCODE; + [ uuid(00020430-0000-0000-C000-000000000046), version(2.0), @@ -32,17 +43,6 @@ ] library stdole { - /* These typedefs need to have the same size as their real counterparts. */ - typedef short VARIANT_BOOL; - typedef void *BSTR; - typedef double CURRENCY; - typedef unsigned long HRESULT; - typedef struct { - short word1, word2, word3, word4; - void *ptr1, *ptr2; - } VARIANT; - typedef unsigned long SCODE; - typedef struct GUID { unsigned long Data1; unsigned short Data2; -- 2.19.1

2 1

[PATCH v2 1/4] kernelbase: Implement PathCchFindExtension.
by Zhiyi Zhang 19 Nov '18

19 Nov '18

Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- v2: Fix apply failure due to mail client text encoding. .../api-ms-win-core-path-l1-1-0.spec | 2 +- dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/path.c | 36 +++++++ dlls/kernelbase/tests/path.c | 98 +++++++++++++++++++ include/pathcch.h | 3 + 5 files changed, 139 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 287c5d61d9..7b812eb49d 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 @@ -9,7 +9,7 @@ @ stub PathCchCanonicalizeEx @ stub PathCchCombine @ stub PathCchCombineEx -@ stub PathCchFindExtension +@ stdcall PathCchFindExtension(wstr long ptr) kernelbase.PathCchFindExtension @ stub PathCchIsRoot @ stub PathCchRemoveBackslash @ stub PathCchRemoveBackslashEx diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index f3b4fd131f..2372db821e 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1038,7 +1038,7 @@ # @ stub PathCchCanonicalizeEx # @ stub PathCchCombine # @ stub PathCchCombineEx -# @ stub PathCchFindExtension +@ stdcall PathCchFindExtension(wstr long ptr) # @ stub PathCchIsRoot # @ stub PathCchRemoveBackslash # @ stub PathCchRemoveBackslashEx diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 373c34e979..0e391ecff0 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -1,5 +1,6 @@ /* * Copyright 2018 Nikolay Sivov + * Copyright 2018 Zhiyi Zhang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -65,3 +66,38 @@ HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **endptr, S return S_OK; } + +HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR **extension) +{ + const WCHAR *lastpoint = NULL; + const WCHAR *next; + SIZE_T length; + + TRACE("%s %lu %p\n", wine_dbgstr_w(path), size, extension); + + if (!path || !size || size > PATHCCH_MAX_CCH) + { + *extension = NULL; + return E_INVALIDARG; + } + + length = strlenW(path); + if (length + 1 > PATHCCH_MAX_CCH) + { + *extension = NULL; + return E_INVALIDARG; + } + + next = path; + while (*next) + { + if (*next == '\\' || *next == ' ') + lastpoint = NULL; + else if (*next == '.') + lastpoint = next; + next++; + } + + *extension = lastpoint ? lastpoint : path + length; + return S_OK; +} diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index cdba51bf3f..5be05a0a67 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -2,6 +2,7 @@ * Path tests for kernelbase.dll * * Copyright 2017 Michael Müller + * Copyright 2018 Zhiyi Zhang * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -32,6 +33,7 @@ HRESULT (WINAPI *pPathCchAddBackslash)(WCHAR *out, SIZE_T size); HRESULT (WINAPI *pPathCchAddBackslashEx)(WCHAR *out, SIZE_T size, WCHAR **endptr, SIZE_T *remaining); 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); static const struct { @@ -245,6 +247,100 @@ static void test_PathCchAddBackslashEx(void) } } +struct findextension_test +{ + const CHAR *path; + INT extension_offset; +}; + +static const struct findextension_test findextension_tests[] = +{ + {"1.exe", 1}, + {"C:1.exe", 3}, + {"C:\\1.exe", 4}, + {"\\1.exe", 2}, + {"\\\\1.exe", 3}, + {"\\\\?\\C:1.exe", 7}, + {"\\\\?\\C:\\1.exe", 8}, + {"\\\\?\\UNC\\1.exe", 9}, + {"\\\\?\\UNC\\192.168.1.1\\1.exe", 21}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\1.exe", 50}, + + /* Malformed */ + {"", 0}, + {" ", 1}, + {".", 0}, + {"..", 1}, + {"a", 1}, + {"a.", 1}, + {".a.b.", 4}, + {"a. ", 3}, + {"a.\\", 3}, + {"\\\\?\\UNC\\192.168.1.1", 17}, + {"\\\\?\\UNC\\192.168.1.1\\", 20}, + {"\\\\?\\UNC\\192.168.1.1\\a", 21} +}; + +static void test_PathCchFindExtension(void) +{ + WCHAR pathW[PATHCCH_MAX_CCH + 1] = {0}; + const WCHAR *extension; + HRESULT hr; + INT i; + + if (!pPathCchFindExtension) + { + win_skip("PathCchFindExtension() is not available.\n"); + return; + } + + /* Arguments check */ + extension = (const WCHAR *)0xdeadbeef; + hr = pPathCchFindExtension(NULL, PATHCCH_MAX_CCH, &extension); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + ok(extension == NULL, "Expect extension null, got %p\n", extension); + + extension = (const WCHAR *)0xdeadbeef; + hr = pPathCchFindExtension(pathW, 0, &extension); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + ok(extension == NULL, "Expect extension null, got %p\n", extension); + + /* Crashed on Windows */ + if (0) + { + hr = pPathCchFindExtension(pathW, PATHCCH_MAX_CCH, NULL); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + } + + /* Path length check */ + MultiByteToWideChar(CP_ACP, 0, "C:\\1.exe", -1, pathW, ARRAY_SIZE(pathW)); + hr = pPathCchFindExtension(pathW, PATHCCH_MAX_CCH + 1, &extension); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchFindExtension(pathW, PATHCCH_MAX_CCH, &extension); + ok(hr == S_OK, "expect result %#x, got %#x\n", S_OK, hr); + + for (i = 0; i < ARRAY_SIZE(pathW) - 1; i++) pathW[i] = 'a'; + pathW[PATHCCH_MAX_CCH] = 0; + hr = pPathCchFindExtension(pathW, PATHCCH_MAX_CCH, &extension); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + pathW[PATHCCH_MAX_CCH - 1] = 0; + hr = pPathCchFindExtension(pathW, PATHCCH_MAX_CCH, &extension); + ok(hr == S_OK, "expect result %#x, got %#x\n", S_OK, hr); + + for (i = 0; i < ARRAY_SIZE(findextension_tests); i++) + { + const struct findextension_test *t = findextension_tests + i; + MultiByteToWideChar(CP_ACP, 0, t->path, -1, pathW, ARRAY_SIZE(pathW)); + hr = pPathCchFindExtension(pathW, PATHCCH_MAX_CCH, &extension); + ok(hr == S_OK, "path %s expect result %#x, got %#x\n", t->path, S_OK, hr); + if (SUCCEEDED(hr)) + ok(extension - pathW == t->extension_offset, "path %s expect extension offset %d, got %d\n", t->path, + t->extension_offset, extension - pathW); + } +} + START_TEST(path) { HMODULE hmod = LoadLibraryA("kernelbase.dll"); @@ -252,8 +348,10 @@ START_TEST(path) pPathCchCombineEx = (void *)GetProcAddress(hmod, "PathCchCombineEx"); pPathCchAddBackslash = (void *)GetProcAddress(hmod, "PathCchAddBackslash"); pPathCchAddBackslashEx = (void *)GetProcAddress(hmod, "PathCchAddBackslashEx"); + pPathCchFindExtension = (void *)GetProcAddress(hmod, "PathCchFindExtension"); test_PathCchCombineEx(); test_PathCchAddBackslash(); test_PathCchAddBackslashEx(); + test_PathCchFindExtension(); } diff --git a/include/pathcch.h b/include/pathcch.h index 2b2aed4c8f..6bb760ccdb 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -23,6 +23,9 @@ #define PATHCCH_DO_NOT_NORMALIZE_SEGMENTS 0x08 #define PATHCCH_ENSURE_IS_EXTENDED_LENGTH_PATH 0x10 +#define PATHCCH_MAX_CCH 0x8000 + HRESULT WINAPI PathCchAddBackslash(WCHAR *path, SIZE_T size); HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **end, SIZE_T *remaining); 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); -- 2.19.1

3 2

[PATCH] ws2_32: Ignore a SO_SNDBUF value of 0 on macOS.
by Hans Leidekker 19 Nov '18

19 Nov '18

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40264 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> --- dlls/ws2_32/socket.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index df068fe852..2ac6b9fec5 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5808,6 +5808,17 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, optlen = sizeof(struct linger); break; + case WS_SO_SNDBUF: + if (!*(const int *)optval) + { + FIXME("SO_SNDBUF ignoring request to disable send buffering\n"); +#ifdef __APPLE__ + return 0; +#endif + } + convert_sockopt(&level, &optname); + break; + case WS_SO_RCVBUF: if (*(const int*)optval < 2048) { @@ -5828,7 +5839,6 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, * however, using it the BSD way fixes bug 8513 and seems to be what * most programmers assume, anyway */ case WS_SO_REUSEADDR: - case WS_SO_SNDBUF: case WS_SO_TYPE: convert_sockopt(&level, &optname); break; -- 2.11.0

1 0

[PATCH] crypt32: Make sure that the provider supports the specified public key algorithm.
by Dmitry Timoshkov 19 Nov '18

19 Nov '18

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/crypt32/cert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c index faf70de607..2d7ef42d3c 100644 --- a/dlls/crypt32/cert.c +++ b/dlls/crypt32/cert.c @@ -1329,7 +1329,7 @@ DWORD WINAPI CertGetPublicKeyLength(DWORD dwCertEncodingType, TRACE("public key algid %#x (%s)\n", info->u.Algid, debugstr_a(pPublicKey->Algorithm.pszObjId)); - ret = CryptImportPublicKeyInfo(I_CryptGetDefaultCryptProv(0), dwCertEncodingType, pPublicKey, &key); + ret = CryptImportPublicKeyInfo(I_CryptGetDefaultCryptProv(info->u.Algid), dwCertEncodingType, pPublicKey, &key); if (ret) { size = sizeof(len); -- 2.17.1

1 0

[PATCH] ws2_32: Ignore a SO_SNDBUF value of 0 on OSX
by Alistair Leslie-Hughes 19 Nov '18

19 Nov '18

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/ws2_32/socket.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index df068fe..ea87a7a 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5770,6 +5770,15 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname, return SOCKET_ERROR; } +#ifdef __APPLE__ + if(level == WS_SOL_SOCKET && optname == WS_SO_SNDBUF && + optval && *(const int*)optval == 0) + { + WARN("Setting SO_SNDBUF to 0: ignored\n"); + return 0; + } +#endif + switch(level) { case WS_SOL_SOCKET: -- 1.9.1

2 2

[PATCH v2 4/4] kernelbase: Implement PathCchRenameExtension.
by Zhiyi Zhang 19 Nov '18

19 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 | 13 +++ dlls/kernelbase/tests/path.c | 80 +++++++++++++++++++ include/pathcch.h | 1 + 5 files changed, 96 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 57e0a67792..0524e7c304 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 @@ -15,7 +15,7 @@ @ stub PathCchRemoveBackslashEx @ stdcall PathCchRemoveExtension(wstr long) kernelbase.PathCchRemoveExtension @ stub PathCchRemoveFileSpec -@ stub PathCchRenameExtension +@ stdcall PathCchRenameExtension(wstr long wstr) kernelbase.PathCchRenameExtension @ stub PathCchSkipRoot @ stub PathCchStripPrefix @ stub PathCchStripToRoot diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index ffe7be20df..286dae0001 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1044,7 +1044,7 @@ # @ stub PathCchRemoveBackslashEx @ stdcall PathCchRemoveExtension(wstr long) # @ stub PathCchRemoveFileSpec -# @ stub PathCchRenameExtension +@ stdcall PathCchRenameExtension(wstr long wstr) # @ stub PathCchSkipRoot # @ stub PathCchStripPrefix # @ stub PathCchStripToRoot diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index be17730e8c..53c169591b 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -159,3 +159,16 @@ HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size) return next == extension ? S_FALSE : S_OK; } + +HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *extension) +{ + HRESULT hr; + + TRACE("%s %lu %s\n", wine_dbgstr_w(path), size, wine_dbgstr_w(extension)); + + hr = PathCchRemoveExtension(path, size); + if (FAILED(hr)) return hr; + + hr = PathCchAddExtension(path, size, extension); + return FAILED(hr) ? hr : S_OK; +} diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 9a9de52829..44353d8686 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -36,6 +36,7 @@ HRESULT (WINAPI *pPathCchAddExtension)(WCHAR *path, SIZE_T size, const WCHAR *ex 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); HRESULT (WINAPI *pPathCchRemoveExtension)(WCHAR *path, SIZE_T size); +HRESULT (WINAPI *pPathCchRenameExtension)(WCHAR *path, SIZE_T size, const WCHAR *extension); static const struct { @@ -526,6 +527,83 @@ static void test_PathCchRemoveExtension(void) } } +struct renameextension_test +{ + const CHAR *path; + const CHAR *extension; + const CHAR *expected; +}; + +static const struct renameextension_test renameextension_tests[] = +{ + {"1.exe", ".txt", "1.txt"}, + {"C:1.exe", ".txt", "C:1.txt"}, + {"C:\\1.exe", ".txt", "C:\\1.txt"}, + {"\\1.exe", ".txt", "\\1.txt"}, + {"\\\\1.exe", ".txt", "\\\\1.txt"}, + {"\\\\?\\C:1.exe", ".txt", "\\\\?\\C:1.txt"}, + {"\\\\?\\C:\\1.exe", ".txt", "\\\\?\\C:\\1.txt"}, + {"\\\\?\\UNC\\1.exe", ".txt", "\\\\?\\UNC\\1.txt"}, + {"\\\\?\\UNC\\192.168.1.1\\1.exe", ".txt", "\\\\?\\UNC\\192.168.1.1\\1.txt"}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\1.exe", ".txt", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\1.txt"}, + {"C:\\1.exe", "", "C:\\1"}, + {"C:\\1.exe", "txt", "C:\\1.txt"} +}; + +static void test_PathCchRenameExtension(void) +{ + WCHAR pathW[PATHCCH_MAX_CCH + 1]; + CHAR pathA[PATHCCH_MAX_CCH + 1]; + WCHAR extensionW[MAX_PATH]; + HRESULT hr; + INT i; + + if (!pPathCchRenameExtension) + { + win_skip("PathCchRenameExtension() is not available.\n"); + return; + } + + /* Invalid arguments */ + MultiByteToWideChar(CP_ACP, 0, "C:\\1.txt", -1, pathW, ARRAY_SIZE(pathW)); + MultiByteToWideChar(CP_ACP, 0, ".exe", -1, extensionW, ARRAY_SIZE(extensionW)); + + hr = pPathCchRenameExtension(NULL, PATHCCH_MAX_CCH, extensionW); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchRenameExtension(pathW, 0, extensionW); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchRenameExtension(pathW, PATHCCH_MAX_CCH, NULL); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + /* Path length */ + hr = pPathCchRenameExtension(pathW, ARRAY_SIZE("C:\\1.exe") - 1, extensionW); + ok(E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchRenameExtension(pathW, PATHCCH_MAX_CCH + 1, extensionW); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchRenameExtension(pathW, PATHCCH_MAX_CCH, extensionW); + ok(hr == S_OK, "expect result %#x, got %#x\n", S_OK, hr); + + for (i = 0; i < ARRAY_SIZE(renameextension_tests); i++) + { + const struct renameextension_test *t = renameextension_tests + i; + MultiByteToWideChar(CP_ACP, 0, t->path, -1, pathW, ARRAY_SIZE(pathW)); + MultiByteToWideChar(CP_ACP, 0, t->extension, -1, extensionW, ARRAY_SIZE(extensionW)); + hr = pPathCchRenameExtension(pathW, PATHCCH_MAX_CCH, extensionW); + ok(hr == S_OK, "path %s extension %s expect result %#x, got %#x\n", t->path, t->extension, S_OK, hr); + if (SUCCEEDED(hr)) + { + WideCharToMultiByte(CP_ACP, 0, pathW, -1, pathA, ARRAY_SIZE(pathA), NULL, NULL); + ok(!lstrcmpA(pathA, t->expected), "path %s extension %s expect output path %s, got %s\n", t->path, + t->extension, t->expected, pathA); + } + } +} + START_TEST(path) { HMODULE hmod = LoadLibraryA("kernelbase.dll"); @@ -536,6 +614,7 @@ START_TEST(path) pPathCchAddExtension = (void *)GetProcAddress(hmod, "PathCchAddExtension"); pPathCchFindExtension = (void *)GetProcAddress(hmod, "PathCchFindExtension"); pPathCchRemoveExtension = (void *)GetProcAddress(hmod, "PathCchRemoveExtension"); + pPathCchRenameExtension = (void *)GetProcAddress(hmod, "PathCchRenameExtension"); test_PathCchCombineEx(); test_PathCchAddBackslash(); @@ -543,4 +622,5 @@ START_TEST(path) test_PathCchAddExtension(); test_PathCchFindExtension(); test_PathCchRemoveExtension(); + test_PathCchRenameExtension(); } diff --git a/include/pathcch.h b/include/pathcch.h index 2f125bb9ed..3057b6c1ec 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -31,3 +31,4 @@ HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extens 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); HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size); +HRESULT WINAPI PathCchRenameExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); -- 2.19.1

1 0

[PATCH v2 3/4] kernelbase: Implement PathCchRemoveExtension.
by Zhiyi Zhang 19 Nov '18

19 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 | 17 ++++ dlls/kernelbase/tests/path.c | 80 +++++++++++++++++++ include/pathcch.h | 1 + 5 files changed, 100 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 fed23cbac1..57e0a67792 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 @@ -13,7 +13,7 @@ @ stub PathCchIsRoot @ stub PathCchRemoveBackslash @ stub PathCchRemoveBackslashEx -@ stub PathCchRemoveExtension +@ stdcall PathCchRemoveExtension(wstr long) kernelbase.PathCchRemoveExtension @ stub PathCchRemoveFileSpec @ stub PathCchRenameExtension @ stub PathCchSkipRoot diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 27d10ce731..ffe7be20df 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1042,7 +1042,7 @@ # @ stub PathCchIsRoot # @ stub PathCchRemoveBackslash # @ stub PathCchRemoveBackslashEx -# @ stub PathCchRemoveExtension +@ stdcall PathCchRemoveExtension(wstr long) # @ stub PathCchRemoveFileSpec # @ stub PathCchRenameExtension # @ stub PathCchSkipRoot diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 8888d0187d..be17730e8c 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -142,3 +142,20 @@ HRESULT WINAPI PathCchFindExtension(const WCHAR *path, SIZE_T size, const WCHAR *extension = lastpoint ? lastpoint : path + length; return S_OK; } + +HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size) +{ + const WCHAR *extension; + WCHAR *next; + + TRACE("%s %lu\n", wine_dbgstr_w(path), size); + + if (!path || !size || size > PATHCCH_MAX_CCH) return E_INVALIDARG; + + PathCchFindExtension(path, size, &extension); + + next = path + (extension - path); + while (*next) *next++ = 0; + + return next == extension ? S_FALSE : S_OK; +} diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 8779251305..9a9de52829 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -35,6 +35,7 @@ HRESULT (WINAPI *pPathCchAddBackslashEx)(WCHAR *out, SIZE_T size, WCHAR **endptr HRESULT (WINAPI *pPathCchAddExtension)(WCHAR *path, SIZE_T size, const WCHAR *extension); 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); +HRESULT (WINAPI *pPathCchRemoveExtension)(WCHAR *path, SIZE_T size); static const struct { @@ -448,6 +449,83 @@ static void test_PathCchFindExtension(void) } } +struct removeextension_test +{ + const CHAR *path; + const CHAR *expected; + HRESULT hr; +}; + +static const struct removeextension_test removeextension_tests[] = +{ + {"1.exe", "1", S_OK}, + {"C:1.exe", "C:1", S_OK}, + {"C:\\1.exe", "C:\\1", S_OK}, + {"\\1.exe", "\\1", S_OK}, + {"\\\\1.exe", "\\\\1", S_OK}, + {"\\\\?\\C:1.exe", "\\\\?\\C:1", S_OK}, + {"\\\\?\\C:\\1.exe", "\\\\?\\C:\\1", S_OK}, + {"\\\\?\\UNC\\1.exe", "\\\\?\\UNC\\1", S_OK}, + {"\\\\?\\UNC\\192.168.1.1\\1.exe", "\\\\?\\UNC\\192.168.1.1\\1", S_OK}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\1.exe", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\1", S_OK}, + + /* Malformed */ + {"", "", S_FALSE}, + {" ", " ", S_FALSE}, + {".", "", S_OK}, + {"..", ".", S_OK}, + {"a", "a", S_FALSE}, + {"a.", "a", S_OK}, + {".a.b.", ".a.b", S_OK}, + {"a. ", "a. ", S_FALSE}, + {"a.\\", "a.\\", S_FALSE}, + {"\\\\?\\UNC\\192.168.1.1", "\\\\?\\UNC\\192.168.1", S_OK}, + {"\\\\?\\UNC\\192.168.1.1\\", "\\\\?\\UNC\\192.168.1.1\\", S_FALSE}, + {"\\\\?\\UNC\\192.168.1.1\\a", "\\\\?\\UNC\\192.168.1.1\\a", S_FALSE} +}; + +static void test_PathCchRemoveExtension(void) +{ + WCHAR pathW[PATHCCH_MAX_CCH] = {0}; + CHAR pathA[PATHCCH_MAX_CCH]; + HRESULT hr; + INT i; + + if (!pPathCchRemoveExtension) + { + win_skip("PathCchRemoveExtension() is not available.\n"); + return; + } + + /* Arguments check */ + hr = pPathCchRemoveExtension(NULL, PATHCCH_MAX_CCH); + ok(hr == E_INVALIDARG, "expect %#x, got %#x\n", S_OK, hr); + + hr = pPathCchRemoveExtension(pathW, 0); + ok(hr == E_INVALIDARG, "expect %#x, got %#x\n", S_OK, hr); + + hr = pPathCchRemoveExtension(pathW, PATHCCH_MAX_CCH + 1); + ok(hr == E_INVALIDARG, "expect %#x, got %#x\n", S_OK, hr); + + hr = pPathCchRemoveExtension(pathW, PATHCCH_MAX_CCH); + ok(hr == S_FALSE, "expect %#x, got %#x\n", S_OK, hr); + + for (i = 0; i < ARRAY_SIZE(removeextension_tests); i++) + { + const struct removeextension_test *t = removeextension_tests + i; + + MultiByteToWideChar(CP_ACP, 0, t->path, -1, pathW, ARRAY_SIZE(pathW)); + hr = pPathCchRemoveExtension(pathW, ARRAY_SIZE(pathW)); + ok(hr == t->hr, "path %s expect result %#x, got %#x\n", t->path, t->hr, hr); + if (SUCCEEDED(hr)) + { + WideCharToMultiByte(CP_ACP, 0, pathW, -1, pathA, ARRAY_SIZE(pathA), NULL, NULL); + ok(!lstrcmpA(pathA, t->expected), "path %s expect stripped path %s, got %s\n", t->path, t->expected, pathA); + } + } +} + START_TEST(path) { HMODULE hmod = LoadLibraryA("kernelbase.dll"); @@ -457,10 +535,12 @@ START_TEST(path) pPathCchAddBackslashEx = (void *)GetProcAddress(hmod, "PathCchAddBackslashEx"); pPathCchAddExtension = (void *)GetProcAddress(hmod, "PathCchAddExtension"); pPathCchFindExtension = (void *)GetProcAddress(hmod, "PathCchFindExtension"); + pPathCchRemoveExtension = (void *)GetProcAddress(hmod, "PathCchRemoveExtension"); test_PathCchCombineEx(); test_PathCchAddBackslash(); test_PathCchAddBackslashEx(); test_PathCchAddExtension(); test_PathCchFindExtension(); + test_PathCchRemoveExtension(); } diff --git a/include/pathcch.h b/include/pathcch.h index 5a189bc0e7..2f125bb9ed 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -30,3 +30,4 @@ HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **end, SIZE HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extension); 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); +HRESULT WINAPI PathCchRemoveExtension(WCHAR *path, SIZE_T size); -- 2.19.1

1 0

[PATCH v2 2/4] kernelbase: Implement PathCchAddExtension.
by Zhiyi Zhang 19 Nov '18

19 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 | 41 +++++++ dlls/kernelbase/tests/path.c | 109 ++++++++++++++++++ include/pathcch.h | 1 + 5 files changed, 153 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 7b812eb49d..fed23cbac1 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 @@ -2,7 +2,7 @@ @ stub PathAllocCombine @ stdcall PathCchAddBackslash(wstr long) kernelbase.PathCchAddBackslash @ stdcall PathCchAddBackslashEx(wstr long ptr ptr) kernelbase.PathCchAddBackslashEx -@ stub PathCchAddExtension +@ stdcall PathCchAddExtension(wstr long wstr) kernelbase.PathCchAddExtension @ stub PathCchAppend @ stub PathCchAppendEx @ stub PathCchCanonicalize diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 2372db821e..27d10ce731 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1031,7 +1031,7 @@ @ stdcall PathCanonicalizeW(ptr wstr) shlwapi.PathCanonicalizeW @ stdcall PathCchAddBackslash(wstr long) @ stdcall PathCchAddBackslashEx(wstr long ptr ptr) -# @ stub PathCchAddExtension +@ stdcall PathCchAddExtension(wstr long wstr) # @ stub PathCchAppend # @ stub PathCchAppendEx # @ stub PathCchCanonicalize diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 0e391ecff0..8888d0187d 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -67,6 +67,47 @@ HRESULT WINAPI PathCchAddBackslashEx(WCHAR *path, SIZE_T size, WCHAR **endptr, S return S_OK; } +HRESULT WINAPI PathCchAddExtension(WCHAR *path, SIZE_T size, const WCHAR *extension) +{ + const WCHAR *existing_extension, *next; + SIZE_T path_length, extension_length, dot_length; + BOOL has_dot; + + TRACE("%s %lu %s\n", wine_dbgstr_w(path), size, wine_dbgstr_w(extension)); + + if (!path || !size || size > PATHCCH_MAX_CCH || !extension) return E_INVALIDARG; + + next = extension; + while (*next) + { + if ((*next == '.' && next > extension) || *next == ' ' || *next == '\\') return E_INVALIDARG; + next++; + } + + has_dot = extension[0] == '.' ? TRUE : FALSE; + + PathCchFindExtension(path, size, &existing_extension); + if (*existing_extension) return S_FALSE; + + path_length = strlenW(path); + dot_length = has_dot ? 0 : 1; + extension_length = strlenW(extension); + + if (path_length + dot_length + extension_length + 1 > size) return HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER); + + /* If extension is empty or only dot, return S_OK with path unchanged */ + if (!extension[0] || (extension[0] == '.' && !extension[1])) return S_OK; + + if (!has_dot) + { + path[path_length] = '.'; + path_length++; + } + + strcpyW(path + path_length, extension); + 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 5be05a0a67..8779251305 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -32,6 +32,7 @@ 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); 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); @@ -247,6 +248,112 @@ static void test_PathCchAddBackslashEx(void) } } +struct addextension_test +{ + const CHAR *path; + const CHAR *extension; + const CHAR *expected; + HRESULT hr; +}; + +static const struct addextension_test addextension_tests[] = +{ + /* Normal */ + {"", ".exe", ".exe", S_OK}, + {"C:\\", "", "C:\\", S_OK}, + {"C:", ".exe", "C:.exe", S_OK}, + {"C:\\", ".exe", "C:\\.exe", S_OK}, + {"\\", ".exe", "\\.exe", S_OK}, + {"\\\\", ".exe", "\\\\.exe", S_OK}, + {"\\\\?\\C:", ".exe", "\\\\?\\C:.exe", S_OK}, + {"\\\\?\\C:\\", ".exe", "\\\\?\\C:\\.exe", S_OK}, + {"\\\\?\\UNC\\", ".exe", "\\\\?\\UNC\\.exe", S_OK}, + {"\\\\?\\UNC\\192.168.1.1\\", ".exe", "\\\\?\\UNC\\192.168.1.1\\.exe", S_OK}, + {"\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\", ".exe", + "\\\\?\\Volume{e51a1864-6f2d-4019-b73d-f4e60e600c26}\\.exe", S_OK}, + {"C:\\", "exe", "C:\\.exe", S_OK}, + {"C:\\", ".", "C:\\", S_OK}, + {"C:\\1.exe", ".txt", "C:\\1.exe", S_FALSE}, + + /* Extension contains invalid characters but valid for PathCchAddExtension */ + {"C:\\", "./", "C:\\./", S_OK}, + {"C:\\", ".?", "C:\\.?", S_OK}, + {"C:\\", ".%", "C:\\.%", S_OK}, + {"C:\\", ".*", "C:\\.*", S_OK}, + {"C:\\", ".:", "C:\\.:", S_OK}, + {"C:\\", ".|", "C:\\.|", S_OK}, + {"C:\\", ".\"", "C:\\.\"", S_OK}, + {"C:\\", ".<", "C:\\.<", S_OK}, + {"C:\\", ".>", "C:\\.>", S_OK}, + + /* Invalid argument for extension */ + {"C:\\", " exe", NULL, E_INVALIDARG}, + {"C:\\", ". exe", NULL, E_INVALIDARG}, + {"C:\\", " ", NULL, E_INVALIDARG}, + {"C:\\", "\\", NULL, E_INVALIDARG}, + {"C:\\", "..", NULL, E_INVALIDARG}, + {"C:\\", ". ", NULL, E_INVALIDARG}, + {"C:\\", ".\\", NULL, E_INVALIDARG}, + {"C:\\", ".a.", NULL, E_INVALIDARG}, + {"C:\\", ".a ", NULL, E_INVALIDARG}, + {"C:\\", ".a\\", NULL, E_INVALIDARG}, + {"C:\\1.exe", " ", NULL, E_INVALIDARG} +}; + +static void test_PathCchAddExtension(void) +{ + WCHAR pathW[PATHCCH_MAX_CCH + 1]; + CHAR pathA[PATHCCH_MAX_CCH + 1]; + WCHAR extensionW[MAX_PATH]; + HRESULT hr; + INT i; + + if (!pPathCchAddExtension) + { + win_skip("PathCchAddExtension() is not available.\n"); + return; + } + + /* Arguments check */ + MultiByteToWideChar(CP_ACP, 0, "C:\\", -1, pathW, ARRAY_SIZE(pathW)); + MultiByteToWideChar(CP_ACP, 0, ".exe", -1, extensionW, ARRAY_SIZE(extensionW)); + + hr = pPathCchAddExtension(NULL, PATHCCH_MAX_CCH, extensionW); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchAddExtension(pathW, 0, extensionW); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchAddExtension(pathW, PATHCCH_MAX_CCH, NULL); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + /* Path length check */ + hr = pPathCchAddExtension(pathW, ARRAY_SIZE("C:\\.exe") - 1, extensionW); + ok(hr == HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), "expect result %#x, got %#x\n", + HRESULT_FROM_WIN32(ERROR_INSUFFICIENT_BUFFER), hr); + + hr = pPathCchAddExtension(pathW, PATHCCH_MAX_CCH + 1, extensionW); + ok(hr == E_INVALIDARG, "expect result %#x, got %#x\n", E_INVALIDARG, hr); + + hr = pPathCchAddExtension(pathW, PATHCCH_MAX_CCH, extensionW); + ok(hr == S_OK, "expect result %#x, got %#x\n", S_OK, hr); + + for (i = 0; i < ARRAY_SIZE(addextension_tests); i++) + { + const struct addextension_test *t = addextension_tests + i; + MultiByteToWideChar(CP_ACP, 0, t->path, -1, pathW, ARRAY_SIZE(pathW)); + MultiByteToWideChar(CP_ACP, 0, t->extension, -1, extensionW, ARRAY_SIZE(extensionW)); + hr = pPathCchAddExtension(pathW, PATHCCH_MAX_CCH, extensionW); + ok(hr == t->hr, "path %s extension %s expect result %#x, got %#x\n", t->path, t->extension, t->hr, hr); + if (SUCCEEDED(hr)) + { + WideCharToMultiByte(CP_ACP, 0, pathW, -1, pathA, ARRAY_SIZE(pathA), NULL, NULL); + ok(!lstrcmpA(pathA, t->expected), "path %s extension %s expect output path %s, got %s\n", t->path, + t->extension, t->expected, pathA); + } + } +} + struct findextension_test { const CHAR *path; @@ -348,10 +455,12 @@ START_TEST(path) pPathCchCombineEx = (void *)GetProcAddress(hmod, "PathCchCombineEx"); pPathCchAddBackslash = (void *)GetProcAddress(hmod, "PathCchAddBackslash"); pPathCchAddBackslashEx = (void *)GetProcAddress(hmod, "PathCchAddBackslashEx"); + pPathCchAddExtension = (void *)GetProcAddress(hmod, "PathCchAddExtension"); pPathCchFindExtension = (void *)GetProcAddress(hmod, "PathCchFindExtension"); test_PathCchCombineEx(); test_PathCchAddBackslash(); test_PathCchAddBackslashEx(); + test_PathCchAddExtension(); test_PathCchFindExtension(); } diff --git a/include/pathcch.h b/include/pathcch.h index 6bb760ccdb..5a189bc0e7 100644 --- a/include/pathcch.h +++ b/include/pathcch.h @@ -27,5 +27,6 @@ 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); 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); -- 2.19.1

1 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel