[PATCH v3 5/5] kernelbase: Implement PathCchRenameExtension.
Zhiyi Zhang
zzhang at codeweavers.com
Mon Nov 19 08:59:00 CST 2018
Signed-off-by: Zhiyi Zhang <zzhang at 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
More information about the wine-devel
mailing list