lywsvip/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2026-05-31 08:17:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

[SHELL32_APITEST] Several fixes (#8266)

Browse Source 
Fix the shell32 apitests so that they pass on Windows Server 2003 - Windows 10. Many of these fixes are for Vista+, but the most important fixes are for ShellExecCmdLine and FindExecutable which had issues closing windows after tests and deleting test files. Failing to delete these files breaks the other test (i.e. running ShellExecCmdLine would break FindExecutable and vis-versa.)
This commit is contained in:
Carl J. Bialorucki
2025-07-29 14:06:13 -06:00
committed by GitHub
parent c9842e5aad
commit b86422cd4b
20 changed files with 524 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
modules/rostests/apitests/shell32/FindExecutable.cpp
View File

@@ -38,7 +38,7 @@ static const TEST_ENTRY s_entries[] =
{
{ __LINE__, 0xBEEFCAFE, "notepad", DIR_0, s_sys_notepad },
{ __LINE__, 0xBEEFCAFE, "notepad", DIR_1, s_sys_notepad },
{ __LINE__, 0xBEEFCAFE, "notepad", DIR_2, s_sys_notepad },
// { __LINE__, 0xBEEFCAFE, "notepad", DIR_2, "notepad.exe" }, // Results vary between Windows versions
{ __LINE__, 0xBEEFCAFE, "notepad", DIR_3, s_win_notepad },
{ __LINE__, 0xBEEFCAFE, "notepad", DIR_4, s_sys_notepad },
{ __LINE__, SE_ERR_FNF, " notepad", DIR_0, "" },
@@ -53,12 +53,12 @@ static const TEST_ENTRY s_entries[] =
{ __LINE__, SE_ERR_FNF, "notepad ", DIR_4, "" },
{ __LINE__, 0xBEEFCAFE, "\"notepad\"", DIR_0, s_sys_notepad },
{ __LINE__, 0xBEEFCAFE, "\"notepad\"", DIR_1, s_sys_notepad },
{ __LINE__, 0xBEEFCAFE, "\"notepad\"", DIR_2, s_sys_notepad },
// { __LINE__, 0xBEEFCAFE, "\"notepad\"", DIR_2, "notepad.exe" }, // Results vary between Windows versions
{ __LINE__, 0xBEEFCAFE, "\"notepad\"", DIR_3, s_win_notepad },
{ __LINE__, 0xBEEFCAFE, "\"notepad\"", DIR_4, s_sys_notepad },
{ __LINE__, 0xBEEFCAFE, "notepad.exe", DIR_0, s_sys_notepad },
{ __LINE__, 0xBEEFCAFE, "notepad.exe", DIR_1, s_sys_notepad },
{ __LINE__, 0xBEEFCAFE, "notepad.exe", DIR_2, s_sys_notepad },
// { __LINE__, 0xBEEFCAFE, "notepad.exe", DIR_2, "notepad.exe" }, // Results vary between Windows versions
{ __LINE__, 0xBEEFCAFE, "notepad.exe", DIR_3, s_win_notepad },
{ __LINE__, 0xBEEFCAFE, "notepad.exe", DIR_4, s_sys_notepad },
{ __LINE__, SE_ERR_FNF, "notepad.bat", DIR_0, "" },
@@ -88,7 +88,7 @@ static const TEST_ENTRY s_entries[] =
{ __LINE__, 0xBEEFCAFE, s_win_notepad, DIR_4, s_win_notepad },
{ __LINE__, 0xBEEFCAFE, "test program", DIR_0, s_sys_test_exe },
{ __LINE__, 0xBEEFCAFE, "test program", DIR_1, s_sys_test_exe },
{ __LINE__, 0xBEEFCAFE, "test program", DIR_2, s_sys_test_exe },
// { __LINE__, 0xBEEFCAFE, "test program", DIR_2, "test program.exe" }, // Results vary between Windows versions
{ __LINE__, 0xBEEFCAFE, "test program", DIR_3, s_win_test_exe },
{ __LINE__, 0xBEEFCAFE, "test program", DIR_4, s_sys_test_exe },
{ __LINE__, SE_ERR_FNF, " test program", DIR_0, "" },
@@ -103,17 +103,17 @@ static const TEST_ENTRY s_entries[] =
{ __LINE__, SE_ERR_FNF, "test program ", DIR_4, "" },
{ __LINE__, 0xBEEFCAFE, "\"test program\"", DIR_0, s_sys_test_exe },
{ __LINE__, 0xBEEFCAFE, "\"test program\"", DIR_1, s_sys_test_exe },
{ __LINE__, 0xBEEFCAFE, "\"test program\"", DIR_2, s_sys_test_exe },
// { __LINE__, 0xBEEFCAFE, "\"test program\"", DIR_2, "test program.exe" }, // Results vary between Windows versions
{ __LINE__, 0xBEEFCAFE, "\"test program\"", DIR_3, s_win_test_exe },
{ __LINE__, 0xBEEFCAFE, "\"test program\"", DIR_4, s_sys_test_exe },
{ __LINE__, 0xBEEFCAFE, "test program.exe", DIR_0, s_sys_test_exe },
{ __LINE__, 0xBEEFCAFE, "test program.exe", DIR_1, s_sys_test_exe },
{ __LINE__, 0xBEEFCAFE, "test program.exe", DIR_2, s_sys_test_exe },
// { __LINE__, 0xBEEFCAFE, "test program.exe", DIR_2, "TESTPR~1.EXE" }, // Results vary between Windows versions
{ __LINE__, 0xBEEFCAFE, "test program.exe", DIR_3, s_win_test_exe },
{ __LINE__, 0xBEEFCAFE, "test program.exe", DIR_4, s_sys_test_exe },
{ __LINE__, 0xBEEFCAFE, "\"test program.exe\"", DIR_0, s_sys_test_exe },
{ __LINE__, 0xBEEFCAFE, "\"test program.exe\"", DIR_1, s_sys_test_exe },
{ __LINE__, 0xBEEFCAFE, "\"test program.exe\"", DIR_2, s_sys_test_exe },
// { __LINE__, 0xBEEFCAFE, "\"test program.exe\"", DIR_2, "test program.exe" }, // Results vary between Windows versions
{ __LINE__, 0xBEEFCAFE, "\"test program.exe\"", DIR_3, s_win_test_exe },
{ __LINE__, 0xBEEFCAFE, "\"test program.exe\"", DIR_4, s_sys_test_exe },
{ __LINE__, SE_ERR_NOASSOC, "\"test program.exe \"", DIR_0, "" },
@@ -128,7 +128,7 @@ static const TEST_ENTRY s_entries[] =
{ __LINE__, SE_ERR_FNF, "\" test program.exe\"", DIR_4, "" },
{ __LINE__, 0xBEEFCAFE, "test program.bat", DIR_0, s_sys_bat_file },
{ __LINE__, 0xBEEFCAFE, "test program.bat", DIR_1, s_sys_bat_file },
{ __LINE__, 0xBEEFCAFE, "test program.bat", DIR_2, s_sys_bat_file },
// { __LINE__, 0xBEEFCAFE, "test program.bat", DIR_2, "TESTPR~1.BAT" }, // Results vary between Windows versions
{ __LINE__, 0xBEEFCAFE, "test program.bat", DIR_3, s_win_bat_file },
{ __LINE__, 0xBEEFCAFE, "test program.bat", DIR_4, s_sys_bat_file },
{ __LINE__, SE_ERR_FNF, " test program.bat ", DIR_0, "" },
@@ -138,12 +138,12 @@ static const TEST_ENTRY s_entries[] =
{ __LINE__, SE_ERR_FNF, " test program.bat ", DIR_4, "" },
{ __LINE__, 0xBEEFCAFE, "\"test program.bat\"", DIR_0, s_sys_bat_file },
{ __LINE__, 0xBEEFCAFE, "\"test program.bat\"", DIR_1, s_sys_bat_file },
{ __LINE__, 0xBEEFCAFE, "\"test program.bat\"", DIR_2, s_sys_bat_file },
// { __LINE__, 0xBEEFCAFE, "\"test program.bat\"", DIR_2, "test program.bat" }, // Results vary between Windows versions
{ __LINE__, 0xBEEFCAFE, "\"test program.bat\"", DIR_3, s_win_bat_file },
{ __LINE__, 0xBEEFCAFE, "\"test program.bat\"", DIR_4, s_sys_bat_file },
{ __LINE__, 0xBEEFCAFE, "test file.txt", DIR_0, s_sys_notepad },
{ __LINE__, 0xBEEFCAFE, "test file.txt", DIR_1, s_sys_notepad },
{ __LINE__, 0xBEEFCAFE, "test file.txt", DIR_2, s_sys_notepad },
// { __LINE__, SE_ERR_NOASSOC, "test file.txt", DIR_2, "" }, // Results vary between Windows versions
{ __LINE__, 0xBEEFCAFE, "test file.txt", DIR_3, s_sys_notepad },
{ __LINE__, 0xBEEFCAFE, "test file.txt", DIR_4, s_sys_notepad },
{ __LINE__, SE_ERR_FNF, "invalid file.txt", DIR_0, "" },
@@ -196,19 +196,22 @@ START_TEST(FindExecutable)
GetWindowsDirectoryA(s_win_test_exe, _countof(s_win_test_exe));
PathAppendA(s_win_test_exe, "test program.exe");
SetFileAttributesA(s_win_test_exe, FILE_ATTRIBUTE_NORMAL); // If the file exists, strip the readonly flag
BOOL ret = CopyFileA(s_win_notepad, s_win_test_exe, FALSE);
if (!ret)
{
skip("Please retry with admin rights\n");
skip("Cannot copy test files to the system root directory. (Error: %lu)\n", GetLastError());
return;
}
GetSystemDirectoryA(s_sys_test_exe, _countof(s_sys_test_exe));
PathAppendA(s_sys_test_exe, "test program.exe");
SetFileAttributesA(s_sys_test_exe, FILE_ATTRIBUTE_NORMAL); // If the file exists, strip the readonly flag
ret = CopyFileA(s_win_notepad, s_sys_test_exe, FALSE);
if (!ret)
{
skip("Please retry with admin rights\n");
skip("Cannot copy test files to the system directory. (Error: %lu)\n", GetLastError());
DeleteFileA(s_win_test_exe);
return;
}
@@ -237,7 +240,13 @@ START_TEST(FindExecutable)
DoTestEntry(&s_entries[iTest]);
}
/* Cleanup:
* s_win_test_exe and s_sys_test_exe inherit the readonly flag,
* so we need to reset it before we can successfully delete it.
*/
SetFileAttributesA(s_win_test_exe, FILE_ATTRIBUTE_NORMAL);
DeleteFileA(s_win_test_exe);
SetFileAttributesA(s_sys_test_exe, FILE_ATTRIBUTE_NORMAL);
DeleteFileA(s_sys_test_exe);
DeleteFileA(s_win_bat_file);
DeleteFileA(s_sys_bat_file);