Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 10:35:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

[SHELL32_APITEST] Strengthen ShellExecCmdLine testcase (#3164)

Browse source 
- Add tests for "My Documents" and "Control Panel".
- Add some comments for usability.
CORE-16939
This commit is contained in:
Katayama Hirofumi MZ 2020-09-14 13:25:45 +09:00 committed by GitHub
parent a373198419
commit 78edea8164
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 36 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
modules/rostests/apitests/shell32/ShellExecCmdLine.cpp
View file

@ -13,8 +13,6 @@
#include <debug.h>
#include <stdio.h>
//#define ShellExecCmdLine ShellExecCmdLine
#ifndef SECL_NO_UI
#define SECL_NO_UI 0x2
#define SECL_LOG_USAGE 0x8
@ -23,7 +21,7 @@
#define SECL_RUNAS 0x40
#endif
#ifdef ShellExecCmdLine
#define ShellExecCmdLine proxy_ShellExecCmdLine
#define shell32_hInstance GetModuleHandle(NULL)
#define IDS_FILE_NOT_FOUND (-1)
@ -38,6 +36,7 @@ static __inline void __SHCloneStrW(WCHAR **target, const WCHAR *source)
lstrcpyW(*target, source);
}
// NOTE: You have to sync the following code to dll/win32/shell32/shlexec.cpp.
static LPCWSTR
SplitParams(LPCWSTR psz, LPWSTR pszArg0, size_t cchArg0)
{
@ -236,10 +235,11 @@ HRESULT WINAPI ShellExecCmdLine(
return HRESULT_FROM_WIN32(dwError);
}
#else
#undef ShellExecCmdLine
typedef HRESULT (WINAPI *SHELLEXECCMDLINE)(HWND, LPCWSTR, LPCWSTR, INT, LPVOID, DWORD);
SHELLEXECCMDLINE g_pShellExecCmdLine = NULL;
#endif
typedef struct TEST_ENTRY
{
@ -396,6 +396,12 @@ static const TEST_ENTRY s_entries[] =
{ __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"\"invalid program.exe\"", L"C:\\Program Files" },
{ __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"\"invalid program.exe\" \"Test File.txt\"", NULL },
{ __LINE__, HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), TRUE, L"Notepad", L"\"invalid program.exe\" \"Test File.txt\"", L"." },
// My Documents
{ __LINE__, S_OK, TRUE, NULL, L"::{450d8fba-ad25-11d0-98a8-0800361b1103}", NULL },
{ __LINE__, S_OK, TRUE, NULL, L"shell:::{450d8fba-ad25-11d0-98a8-0800361b1103}", NULL },
// Control Panel
{ __LINE__, S_OK, TRUE, NULL, L"::{5399E694-6CE5-4D6C-8FCE-1D8870FDCBA0}", NULL },
{ __LINE__, S_OK, TRUE, NULL, L"shell:::{5399E694-6CE5-4D6C-8FCE-1D8870FDCBA0}", NULL },
};
static void DoEntry(const TEST_ENTRY *pEntry)
@ -410,13 +416,16 @@ static void DoEntry(const TEST_ENTRY *pEntry)
_SEH2_TRY
{
#ifdef ShellExecCmdLine
hr = ShellExecCmdLine(NULL, pEntry->pwszCommand, pEntry->pwszStartDir,
if (IsReactOS())
{
hr = proxy_ShellExecCmdLine(NULL, pEntry->pwszCommand, pEntry->pwszStartDir,
SW_SHOWNORMAL, NULL, dwSeclFlags);
#else
}
else
{
hr = (*g_pShellExecCmdLine)(NULL, pEntry->pwszCommand, pEntry->pwszStartDir,
SW_SHOWNORMAL, NULL, dwSeclFlags);
#endif
}
}
_SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER)
{
@ -454,8 +463,8 @@ START_TEST(ShellExecCmdLine)
{
using namespace std;
#ifndef ShellExecCmdLine
// CHECKME
if (!IsReactOS())
{
if (!IsWindowsVistaOrGreater())
{
skip("ShellExecCmdLine is not available on this platform\n");
@ -469,7 +478,7 @@ START_TEST(ShellExecCmdLine)
skip("ShellExecCmdLine is not found\n");
return;
}
#endif
}
// s_testfile1
FILE *fp = fopen(s_testfile1, "wb");