From 4da1c096d591b93c3ac44c036293136d2cca5277 Mon Sep 17 00:00:00 2001 From: Daniel Lehman Date: Thu, 19 Aug 2021 09:35:11 -0700 Subject: [PATCH] kernelbase: Handle 2 full paths in PathAllocCombine. Signed-off-by: Daniel Lehman --- dlls/kernelbase/path.c | 7 ++++--- dlls/kernelbase/tests/path.c | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/kernelbase/path.c b/dlls/kernelbase/path.c index 9387705e963..92f85f7b29b 100644 --- a/dlls/kernelbase/path.c +++ b/dlls/kernelbase/path.c @@ -401,7 +401,7 @@ HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD fl { SIZE_T combined_length, length2; WCHAR *combined_path; - BOOL from_path2 = FALSE; + BOOL drive_only = FALSE; HRESULT hr; TRACE("%s %s %#x %p\n", wine_dbgstr_w(path1), wine_dbgstr_w(path2), flags, out); @@ -419,7 +419,8 @@ HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD fl { path1 = path2; path2 = NULL; - from_path2 = TRUE; + drive_only = (is_drive_spec( path1 ) && !path1[2]) || + (is_prefixed_disk( path1 ) && !path1[6]); } length2 = path2 ? lstrlenW(path2) : 0; @@ -435,7 +436,7 @@ HRESULT WINAPI PathAllocCombine(const WCHAR *path1, const WCHAR *path2, DWORD fl lstrcpyW(combined_path, path1); PathCchStripPrefix(combined_path, combined_length); - if (from_path2) PathCchAddBackslashEx(combined_path, combined_length, NULL, NULL); + if (drive_only) PathCchAddBackslashEx(combined_path, combined_length, NULL, NULL); if (path2 && path2[0]) { diff --git a/dlls/kernelbase/tests/path.c b/dlls/kernelbase/tests/path.c index 8d85542612f..bdd68fa9c0a 100644 --- a/dlls/kernelbase/tests/path.c +++ b/dlls/kernelbase/tests/path.c @@ -439,6 +439,7 @@ static const struct combine_test combine_tests[] = {"C:\\a", "", "C:\\a" }, {"\\", "a", "\\a"}, {"\\a", "b", "\\a\\b" }, + {"C:\\a", "C:\\b", "C:\\b" }, /* normal UNC paths */ {"\\\\192.168.1.1\\test", "a", "\\\\192.168.1.1\\test\\a" }, -- 2.27.0