https://git.reactos.org/?p=reactos.git;a=commitdiff;h=9d1c0efb1fbb75ca946fbe...
commit 9d1c0efb1fbb75ca946fbec580f1e9599f25fc9d Author: Katayama Hirofumi MZ katayama.hirofumi.mz@gmail.com AuthorDate: Sat Jan 18 22:58:05 2025 +0900 Commit: GitHub noreply@github.com CommitDate: Sat Jan 18 22:58:05 2025 +0900
[BROWSEUI_APITEST] Don't hardcode C:\Windows (#7634)
Avoid hardcoding and fix tests. JIRA issue: CORE-13235 - Remove hardcoded "C:\Windows\system32", using GetSystemDirectoryW call in SHExplorerParseCmdLine testcase. --- .../apitests/browseui/SHExplorerParseCmdLine.c | 26 +++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-)
diff --git a/modules/rostests/apitests/browseui/SHExplorerParseCmdLine.c b/modules/rostests/apitests/browseui/SHExplorerParseCmdLine.c index 652c481fbca..85671932743 100644 --- a/modules/rostests/apitests/browseui/SHExplorerParseCmdLine.c +++ b/modules/rostests/apitests/browseui/SHExplorerParseCmdLine.c @@ -260,8 +260,28 @@ _Out_opt_ PUINT PWriteEnd) } }
+static WCHAR s_szSystem32[MAX_PATH]; +static WCHAR s_szDriveCSelectSystem32[MAX_PATH]; +static WCHAR s_szSlashSelectSystem32[MAX_PATH]; +static WCHAR s_szEqualSlashSelectSystem32[MAX_PATH]; + START_TEST(SHExplorerParseCmdLine) { + // "C:\Windows\system32" + GetSystemDirectoryW(s_szSystem32, _countof(s_szSystem32)); + + // "c:\=/select=c:\windows\system32" + StringCchCopyW(s_szDriveCSelectSystem32, _countof(s_szDriveCSelectSystem32), L"c:\=/select="); + StringCchCatW(s_szDriveCSelectSystem32, _countof(s_szDriveCSelectSystem32), s_szSystem32); + + // "/select=c:\windows\system32" + StringCchCopyW(s_szSlashSelectSystem32, _countof(s_szSlashSelectSystem32), L"/select="); + StringCchCatW(s_szSlashSelectSystem32, _countof(s_szSlashSelectSystem32), s_szSystem32); + + // "=/select=c:\windows\system32" + StringCchCopyW(s_szEqualSlashSelectSystem32, _countof(s_szEqualSlashSelectSystem32), L"=/select="); + StringCchCatW(s_szEqualSlashSelectSystem32, _countof(s_szEqualSlashSelectSystem32), s_szSystem32); + static struct { INT TestLine; @@ -390,9 +410,9 @@ START_TEST(SHExplorerParseCmdLine) { __LINE__, L"/select=c:\Program files", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\Program Files" }, { __LINE__, L"=,/select,c:\", TRUE, PIDL_IS_PATH, 0x00000240, NULL, L"C:\" }, { __LINE__, L"/select,c:\,=", TRUE, CSIDL_DRIVES, 0x00000240 }, - { __LINE__, L"c:\=/select=c:\windows\system32", TRUE, PIDL_IS_PATH, 0x00000240, NULL, L"C:\WINDOWS\system32" }, - { __LINE__, L"/select=c:\windows\system32", TRUE, PIDL_IS_PATH, 0x00000200, NULL, L"C:\WINDOWS\system32" }, - { __LINE__, L"=/select=c:\windows\system32", TRUE, PIDL_IS_PATH, 0x00000240, NULL, L"C:\WINDOWS\system32" }, + { __LINE__, s_szDriveCSelectSystem32, TRUE, PIDL_IS_PATH, 0x00000240, NULL, s_szSystem32 }, + { __LINE__, s_szSlashSelectSystem32, TRUE, PIDL_IS_PATH, 0x00000200, NULL, s_szSystem32 }, + { __LINE__, s_szEqualSlashSelectSystem32, TRUE, PIDL_IS_PATH, 0x00000240, NULL, s_szSystem32 }, { __LINE__, L"/e,=", TRUE, CSIDL_DRIVES, 0x00000208 }, { __LINE__, L"/e=", TRUE, CSIDL_DRIVES, 0x00000200 }, { __LINE__, L"/e="", TRUE, CSIDL_DRIVES, 0x00000200 },
-
Katayama Hirofumi MZ