#include <ctype.h>
#include <assert.h>
+#define COBJMACROS
+
#include "windef.h"
#include "winbase.h"
#include "winerror.h"
#include "winreg.h"
-#include "wownt32.h"
-#include "shellapi.h"
-#include "wingdi.h"
#include "winuser.h"
-#include "shlobj.h"
#include "shlwapi.h"
#include "ddeml.h"
#include "wine/winbase16.h"
#include "shell32_main.h"
-#include "undocshell.h"
#include "pidl.h"
#include "wine/debug.h"
static const WCHAR wszFolder[] = {'F','o','l','d','e','r',0};
static const WCHAR wszEmpty[] = {0};
+#define SEE_MASK_CLASSALL (SEE_MASK_CLASSNAME | SEE_MASK_CLASSKEY)
+
/***********************************************************************
* SHELL_ArgifyW [Internal]
* %* all following parameters (see batfile)
*
* FIXME: use 'len'
+ * FIXME: Careful of going over string boundaries. No checking is done to 'res'...
*/
static BOOL SHELL_ArgifyW(WCHAR* out, int len, const WCHAR* fmt, const WCHAR* lpFile, LPITEMIDLIST pidl, LPCWSTR args)
{
WCHAR xlpFile[1024];
BOOL done = FALSE;
+ BOOL found_p1 = FALSE;
PWSTR res = out;
PCWSTR cmd;
LPVOID pv;
+ TRACE("%p, %d, %s, %s, %p, %p\n", out, len, debugstr_w(fmt),
+ debugstr_w(lpFile), pidl, args);
+
while (*fmt)
{
- if (*fmt == '%')
- {
- switch (*++fmt)
- {
- case '\0':
- case '%':
- *res++ = '%';
- break;
-
- case '2':
- case '3':
- case '4':
- case '5':
- case '6':
- case '7':
- case '8':
- case '9':
- case '0':
- case '*':
- if (args)
- {
- if (*fmt == '*')
- {
- *res++ = '"';
- while(*args)
- *res++ = *args++;
- *res++ = '"';
- }
- else
- {
- while(*args && !isspace(*args))
- *res++ = *args++;
-
- while(isspace(*args))
- ++args;
- }
- break;
- }
- /* else fall through */
- case '1':
- if (!done || (*fmt == '1'))
- {
- /*FIXME Is the call to SearchPathW() really needed? We already have separated out the parameter string in args. */
- if (SearchPathW(NULL, lpFile, wszExe, sizeof(xlpFile)/sizeof(WCHAR), xlpFile, NULL))
- cmd = xlpFile;
- else
- cmd = lpFile;
-
- /* Add double quotation marks unless we already have them (e.g.: "%1" %* for exefile) */
- if (res==out || res[-1]!='"')
- {
- *res++ = '"';
- strcpyW(res, cmd);
- res += strlenW(cmd);
- *res++ = '"';
- }
- else
- {
- strcpyW(res, cmd);
- res += strlenW(cmd);
- }
- }
- break;
-
- /*
- * IE uses this alot for activating things such as windows media
- * player. This is not verified to be fully correct but it appears
- * to work just fine.
- */
- case 'l':
- case 'L':
+ if (*fmt == '%')
+ {
+ switch (*++fmt)
+ {
+ case '\0':
+ case '%':
+ *res++ = '%';
+ break;
+
+ case '2':
+ case '3':
+ case '4':
+ case '5':
+ case '6':
+ case '7':
+ case '8':
+ case '9':
+ case '0':
+ case '*':
+ if (args)
+ {
+ if (*fmt == '*')
+ {
+ *res++ = '"';
+ while(*args)
+ *res++ = *args++;
+ *res++ = '"';
+ }
+ else
+ {
+ while(*args && !isspace(*args))
+ *res++ = *args++;
+
+ while(isspace(*args))
+ ++args;
+ }
+ break;
+ }
+ /* else fall through */
+ case '1':
+ if (!done || (*fmt == '1'))
+ {
+ /*FIXME Is the call to SearchPathW() really needed? We already have separated out the parameter string in args. */
+ if (SearchPathW(NULL, lpFile, wszExe, sizeof(xlpFile)/sizeof(WCHAR), xlpFile, NULL))
+ cmd = xlpFile;
+ else
+ cmd = lpFile;
+
+ /* Add double quotation marks unless we already have them
+ (e.g.: "file://%1" %* for exefile) or unless the arg is already
+ enclosed in double quotation marks */
+ if ((res == out || *(fmt + 1) != '"') && *cmd != '"')
+ {
+ *res++ = '"';
+ strcpyW(res, cmd);
+ res += strlenW(cmd);
+ *res++ = '"';
+ }
+ else
+ {
+ strcpyW(res, cmd);
+ res += strlenW(cmd);
+ }
+ }
+ found_p1 = TRUE;
+ break;
+
+ /*
+ * IE uses this a lot for activating things such as windows media
+ * player. This is not verified to be fully correct but it appears
+ * to work just fine.
+ */
+ case 'l':
+ case 'L':
if (lpFile) {
strcpyW(res, lpFile);
res += strlenW(lpFile);
}
- break;
+ found_p1 = TRUE;
+ break;
- case 'i':
- case 'I':
+ case 'i':
+ case 'I':
if (pidl) {
HGLOBAL hmem = SHAllocShared(pidl, ILGetSize(pidl), 0);
pv = SHLockShared(hmem, 0);
res += sprintfW(res, wszILPtr, pv);
SHUnlockShared(pv);
}
- break;
+ found_p1 = TRUE;
+ break;
- default: FIXME("Unknown escape sequence %%%c\n", *fmt);
- }
+ default:
+ /*
+ * Check if this is an env-variable here...
+ */
- fmt++;
- done = TRUE;
- }
- else
- *res++ = *fmt++;
+ /* Make sure that we have at least one more %.*/
+ if (strchrW(fmt, '%'))
+ {
+ WCHAR tmpBuffer[1024];
+ PWSTR tmpB = tmpBuffer;
+ WCHAR tmpEnvBuff[MAX_PATH];
+ DWORD envRet;
+
+ while (*fmt != '%')
+ *tmpB++ = *fmt++;
+ *tmpB++ = 0;
+
+ TRACE("Checking %s to be an env-var\n", debugstr_w(tmpBuffer));
+
+ envRet = GetEnvironmentVariableW(tmpBuffer, tmpEnvBuff, MAX_PATH);
+ if (envRet == 0 || envRet > MAX_PATH)
+ strcpyW( res, tmpBuffer );
+ else
+ strcpyW( res, tmpEnvBuff );
+ res += strlenW(res);
+ }
+ done = TRUE;
+ break;
+ }
+ /* Don't skip past terminator (catch a single '%' at the end) */
+ if (*fmt != '\0')
+ {
+ fmt++;
+ }
+ }
+ else
+ *res++ = *fmt++;
}
*res = '\0';
- return done;
+ return found_p1;
}
HRESULT SHELL_GetPathFromIDListForExecuteA(LPCITEMIDLIST pidl, LPSTR pszPath, UINT uOutSize)
return hr;
}
-/*************************************************************************
- * SHELL_ResolveShortCutW [Internal]
- * read shortcut file at 'wcmd'
- */
-static HRESULT SHELL_ResolveShortCutW(LPWSTR wcmd, LPWSTR wargs, LPWSTR wdir, HWND hwnd, LPCWSTR lpVerb, int* pshowcmd, LPITEMIDLIST* ppidl)
-{
- IShellFolder* psf;
-
- HRESULT hr = SHGetDesktopFolder(&psf);
-
- *ppidl = NULL;
-
- if (SUCCEEDED(hr)) {
- LPITEMIDLIST pidl;
- ULONG l;
-
- hr = IShellFolder_ParseDisplayName(psf, 0, 0, wcmd, &l, &pidl, 0);
-
- if (SUCCEEDED(hr)) {
- IShellLinkW* psl;
-
- hr = IShellFolder_GetUIObjectOf(psf, NULL, 1, (LPCITEMIDLIST*)&pidl, &IID_IShellLinkW, NULL, (LPVOID*)&psl);
-
- if (SUCCEEDED(hr)) {
- hr = IShellLinkW_Resolve(psl, hwnd, 0);
-
- if (SUCCEEDED(hr)) {
- hr = IShellLinkW_GetPath(psl, wcmd, MAX_PATH, NULL, SLGP_UNCPRIORITY);
-
- if (SUCCEEDED(hr)) {
- if (!*wcmd) {
- /* We could not translate the PIDL in the shell link into a valid file system path - so return the PIDL instead. */
- hr = IShellLinkW_GetIDList(psl, ppidl);
-
- if (SUCCEEDED(hr) && *ppidl) {
- /* We got a PIDL instead of a file system path - try to translate it. */
- if (SUCCEEDED(SHELL_GetPathFromIDListW(*ppidl, wcmd, MAX_PATH))) {
- SHFree(*ppidl);
- *ppidl = NULL;
- }
- }
- }
-
- if (SUCCEEDED(hr)) {
- /* get command line arguments, working directory and display mode if available */
- IShellLinkW_GetWorkingDirectory(psl, wdir, MAX_PATH);
- IShellLinkW_GetArguments(psl, wargs, MAX_PATH);
- IShellLinkW_GetShowCmd(psl, pshowcmd);
- }
- }
- }
-
- IShellLinkW_Release(psl);
- }
-
- SHFree(pidl);
- }
-
- IShellFolder_Release(psf);
- }
-
- return hr;
-}
-
/*************************************************************************
* SHELL_ExecuteW [Internal]
*
*/
-static UINT SHELL_ExecuteW(const WCHAR *lpCmd, void *env, BOOL shWait,
+static UINT_PTR SHELL_ExecuteW(const WCHAR *lpCmd, WCHAR *env, BOOL shWait,
LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out)
{
STARTUPINFOW startup;
PROCESS_INFORMATION info;
- UINT retval = 31;
+ UINT_PTR retval = 31;
UINT gcdret = 0;
WCHAR curdir[MAX_PATH];
TRACE("Execute %s from directory %s\n", debugstr_w(lpCmd), debugstr_w(psei->lpDirectory));
-
/* ShellExecute specifies the command from psei->lpDirectory
* if present. Not from the current dir as CreateProcess does */
if( psei->lpDirectory && psei->lpDirectory[0] )
if( ( gcdret = GetCurrentDirectoryW( MAX_PATH, curdir)))
if( !SetCurrentDirectoryW( psei->lpDirectory))
ERR("cannot set directory %s\n", debugstr_w(psei->lpDirectory));
-
- ZeroMemory(&startup, sizeof(startup));
+ ZeroMemory(&startup,sizeof(STARTUPINFOW));
startup.cb = sizeof(STARTUPINFOW);
startup.dwFlags = STARTF_USESHOWWINDOW;
startup.wShowWindow = psei->nShow;
-
- if (CreateProcessW(NULL, (LPWSTR)lpCmd, NULL, NULL, FALSE, 0,
+ if (CreateProcessW(NULL, (LPWSTR)lpCmd, NULL, NULL, FALSE, CREATE_UNICODE_ENVIRONMENT,
env, *psei->lpDirectory? psei->lpDirectory: NULL, &startup, &info))
{
/* Give 30 seconds to the app to come up, if desired. Probably only needed
if (WaitForInputIdle( info.hProcess, 30000 ) == WAIT_FAILED)
WARN("WaitForInputIdle failed: Error %ld\n", GetLastError() );
retval = 33;
-
if (psei->fMask & SEE_MASK_NOCLOSEPROCESS)
psei_out->hProcess = info.hProcess;
else
- CloseHandle(info.hProcess);
-
- CloseHandle(info.hThread);
+ CloseHandle( info.hProcess );
+ CloseHandle( info.hThread );
}
else if ((retval = GetLastError()) >= 32)
{
- FIXME("Strange error set by CreateProcess: %d\n", retval);
+ TRACE("CreateProcess returned error %d\n", retval);
retval = ERROR_BAD_FORMAT;
}
TRACE("returning %u\n", retval);
psei_out->hInstApp = (HINSTANCE)retval;
-
- if( gcdret )
+ if( gcdret )
if( !SetCurrentDirectoryW( curdir))
ERR("cannot return to directory %s\n", debugstr_w(curdir));
* On entry: szName is a filename (probably without path separators).
* On exit: if szName found in "App Path", place full path in lpResult, and return true
*/
-static BOOL SHELL_TryAppPathW(LPCWSTR szName, LPWSTR lpResult, void** env)
+static BOOL SHELL_TryAppPathW( LPCWSTR szName, LPWSTR lpResult, WCHAR **env)
{
static const WCHAR wszKeyAppPaths[] = {'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\','W','i','n','d','o','w','s',
'\\','C','u','r','r','e','n','t','V','e','r','s','i','o','n','\\','A','p','p',' ','P','a','t','h','s','\\',0};
static const WCHAR wPath[] = {'P','a','t','h',0};
-
HKEY hkApp = 0;
WCHAR buffer[1024];
LONG len;
* on the operation)
*/
UINT SHELL_FindExecutable(LPCWSTR lpPath, LPCWSTR lpFile, LPCWSTR lpOperation,
- LPWSTR lpResult, int resultLen, LPWSTR key, void **env, LPITEMIDLIST pidl, LPCWSTR args)
+ LPWSTR lpResult, int resultLen, LPWSTR key, WCHAR **env, LPITEMIDLIST pidl, LPCWSTR args)
{
static const WCHAR wWindows[] = {'w','i','n','d','o','w','s',0};
static const WCHAR wPrograms[] = {'p','r','o','g','r','a','m','s',0};
static const WCHAR wExtensions[] = {'e','x','e',' ','p','i','f',' ','b','a','t',' ','c','m','d',' ','c','o','m',0};
-
WCHAR *extension = NULL; /* pointer to file extension */
- WCHAR wtmpext[5]; /* local copy to mung as we please */
WCHAR filetype[256]; /* registry name for this filetype */
LONG filetypelen = sizeof(filetype); /* length of above */
- WCHAR command[256]; /* command from registry */
+ WCHAR command[1024]; /* command from registry */
WCHAR wBuffer[256]; /* Used to GetProfileString */
UINT retval = 31; /* default - 'No association was found' */
WCHAR *tok; /* token pointer */
- WCHAR xlpFile[256]; /* result of SearchPath */
+ WCHAR xlpFile[256]; /* result of SearchPath */
DWORD attribs; /* file attributes */
TRACE("%s\n", (lpFile != NULL) ? debugstr_w(lpFile) : "-");
if (key) *key = '\0';
/* trap NULL parameters on entry */
- if ((lpFile == NULL) || (lpResult == NULL))
+ if ((lpFile == NULL) || (lpResult == NULL) || (lpOperation == NULL))
{
- WARN("(lpFile=%s,lpResult=%s): NULL parameter\n", debugstr_w(lpFile), debugstr_w(lpResult));
+ WARN("(lpFile=%s,lpResult=%s,lpOperation=%s): NULL parameter\n",
+ debugstr_w(lpFile), debugstr_w(lpOperation), debugstr_w(lpResult));
return 2; /* File not found. Close enough, I guess. */
}
attribs = GetFileAttributesW(lpFile);
if (attribs!=INVALID_FILE_ATTRIBUTES && (attribs&FILE_ATTRIBUTE_DIRECTORY))
{
- strcpyW(filetype, wszFolder);
- filetypelen = 6; /* strlen("Folder") */
+ strcpyW(filetype, wszFolder);
+ filetypelen = 6; /* strlen("Folder") */
}
else
{
- /* First thing we need is the file's extension */
- extension = strrchrW(xlpFile, '.'); /* Assume last "." is the one; */
- /* File->Run in progman uses */
- /* .\FILE.EXE :( */
- TRACE("xlpFile=%s,extension=%s\n", debugstr_w(xlpFile), debugstr_w(extension));
+ /* First thing we need is the file's extension */
+ extension = strrchrW(xlpFile, '.'); /* Assume last "." is the one; */
+ /* File->Run in progman uses */
+ /* .\FILE.EXE :( */
+ TRACE("xlpFile=%s,extension=%s\n", debugstr_w(xlpFile), debugstr_w(extension));
- if ((extension == NULL) || (extension == &xlpFile[strlenW(xlpFile)]))
- {
- WARN("Returning 31 - No association\n");
- return 31; /* no association */
- }
- /* Make local copy & lowercase it for reg & 'programs=' lookup */
- lstrcpynW(wtmpext, extension, 5);
- CharLowerW(wtmpext);
- TRACE("%s file\n", debugstr_w(wtmpext));
-
- /* Three places to check: */
- /* 1. win.ini, [windows], programs (NB no leading '.') */
- /* 2. Registry, HKEY_CLASS_ROOT\<filetype>\shell\open\command */
- /* 3. win.ini, [extensions], extension (NB no leading '.' */
- /* All I know of the order is that registry is checked before */
- /* extensions; however, it'd make sense to check the programs */
- /* section first, so that's what happens here. */
-
- /* See if it's a program - if GetProfileString fails, we skip this
- * section. Actually, if GetProfileString fails, we've probably
- * got a lot more to worry about than running a program... */
- if (GetProfileStringW(wWindows, wPrograms, wExtensions, wBuffer, sizeof(wBuffer)/sizeof(WCHAR)) > 0)
- {
- CharLowerW(wBuffer);
- tok = wBuffer;
- while (*tok)
- {
- WCHAR *p = tok;
- while (*p && *p != ' ' && *p != '\t') p++;
- if (*p)
- {
- *p++ = 0;
- while (*p == ' ' || *p == '\t') p++;
- }
+ if (extension == NULL || extension[1]==0)
+ {
+ WARN("Returning 31 - No association\n");
+ return 31; /* no association */
+ }
- if (strcmpW(tok, &wtmpext[1]) == 0) /* have to skip the leading "." */
- {
- strcpyW(lpResult, xlpFile);
- /* Need to perhaps check that the file has a path
- * attached */
- TRACE("found %s\n", debugstr_w(lpResult));
- return 33;
-
- /* Greater than 32 to indicate success FIXME According to the
- * docs, I should be returning a handle for the
- * executable. Does this mean I'm supposed to open the
- * executable file or something? More RTFM, I guess... */
- }
- tok = p;
- }
- }
+ /* Three places to check: */
+ /* 1. win.ini, [windows], programs (NB no leading '.') */
+ /* 2. Registry, HKEY_CLASS_ROOT\<filetype>\shell\open\command */
+ /* 3. win.ini, [extensions], extension (NB no leading '.' */
+ /* All I know of the order is that registry is checked before */
+ /* extensions; however, it'd make sense to check the programs */
+ /* section first, so that's what happens here. */
+
+ /* See if it's a program - if GetProfileString fails, we skip this
+ * section. Actually, if GetProfileString fails, we've probably
+ * got a lot more to worry about than running a program... */
+ if (GetProfileStringW(wWindows, wPrograms, wExtensions, wBuffer, sizeof(wBuffer)/sizeof(WCHAR)) > 0)
+ {
+ CharLowerW(wBuffer);
+ tok = wBuffer;
+ while (*tok)
+ {
+ WCHAR *p = tok;
+ while (*p && *p != ' ' && *p != '\t') p++;
+ if (*p)
+ {
+ *p++ = 0;
+ while (*p == ' ' || *p == '\t') p++;
+ }
- /* Check registry */
- if (RegQueryValueW(HKEY_CLASSES_ROOT, wtmpext, filetype,
- &filetypelen) == ERROR_SUCCESS)
- {
- filetypelen /= sizeof(WCHAR);
- filetype[filetypelen] = '\0';
- TRACE("File type: %s\n", debugstr_w(filetype));
- }
+ if (strcmpiW(tok, &extension[1]) == 0) /* have to skip the leading "." */
+ {
+ strcpyW(lpResult, xlpFile);
+ /* Need to perhaps check that the file has a path
+ * attached */
+ TRACE("found %s\n", debugstr_w(lpResult));
+ return 33;
+
+ /* Greater than 32 to indicate success FIXME According to the
+ * docs, I should be returning a handle for the
+ * executable. Does this mean I'm supposed to open the
+ * executable file or something? More RTFM, I guess... */
+ }
+ tok = p;
+ }
+ }
+
+ /* Check registry */
+ if (RegQueryValueW(HKEY_CLASSES_ROOT, extension, filetype,
+ &filetypelen) == ERROR_SUCCESS)
+ {
+ filetypelen /= sizeof(WCHAR);
+ filetype[filetypelen] = '\0';
+ TRACE("File type: %s\n", debugstr_w(filetype));
+ }
}
if (*filetype)
if (retval > 32)
break;
- }
+ }
RegCloseKey(hkey);
}
}
if (retval > 32)
- {
- SHELL_ArgifyW(lpResult, resultLen, command, xlpFile, pidl, args);
+ {
+ SHELL_ArgifyW(lpResult, resultLen, command, xlpFile, pidl, args);
- /* Remove double quotation marks and command line arguments */
- if (*lpResult == '"')
- {
- WCHAR *p = lpResult;
- while (*(p + 1) != '"')
- {
- *p = *(p + 1);
- p++;
- }
- *p = '\0';
- }
- }
+ /* Remove double quotation marks and command line arguments */
+ if (*lpResult == '"')
+ {
+ WCHAR *p = lpResult;
+ while (*(p + 1) != '"')
+ {
+ *p = *(p + 1);
+ p++;
+ }
+ *p = '\0';
+ }
+ }
}
- else if (extension) /* Check win.ini */
+ else /* Check win.ini */
{
static const WCHAR wExtensions[] = {'e','x','t','e','n','s','i','o','n','s',0};
{
strcpyW(lpResult, command);
tok = strchrW(lpResult, '^'); /* should be ^.extension? */
-
if (tok != NULL)
{
tok[0] = '\0';
strcatW(lpResult, &tok[5]);
}
}
-
retval = 33; /* FIXME - see above */
}
}
/******************************************************************
* dde_cb
*
- * callback for the DDE connection. not really usefull
+ * callback for the DDE connection. not really useful
*/
static HDDEDATA CALLBACK dde_cb(UINT uType, UINT uFmt, HCONV hConv,
- HSZ hsz1, HSZ hsz2,
- HDDEDATA hData, DWORD dwData1, DWORD dwData2)
+ HSZ hsz1, HSZ hsz2, HDDEDATA hData,
+ ULONG_PTR dwData1, ULONG_PTR dwData2)
{
+ TRACE("dde_cb: %04x, %04x, %p, %p, %p, %p, %08lx, %08lx\n",
+ uType, uFmt, hConv, hsz1, hsz2, hData, dwData1, dwData2);
return NULL;
}
* launching an application and trying (#2) to connect to it
*
*/
-static unsigned dde_connect(WCHAR * key, WCHAR* start, WCHAR* ddeexec,
- const WCHAR* lpFile, void *env,
+static unsigned dde_connect(WCHAR* key, WCHAR* start, WCHAR* ddeexec,
+ const WCHAR* lpFile, WCHAR *env,
LPCWSTR szCommandline, LPITEMIDLIST pidl, SHELL_ExecuteW32 execfunc,
- LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out)
+ LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out)
{
static const WCHAR wApplication[] = {'\\','a','p','p','l','i','c','a','t','i','o','n',0};
static const WCHAR wTopic[] = {'\\','t','o','p','i','c',0};
-
- WCHAR* endkey = key + strlenW(key);
- WCHAR app[256], topic[256], ifexec[256];
- WCHAR res[1024];
+ WCHAR * endkey = key + strlenW(key);
+ WCHAR app[256], topic[256], ifexec[256], res[256];
LONG applen, topiclen, ifexeclen;
WCHAR * exec;
DWORD ddeInst = 0;
DWORD tid;
HSZ hszApp, hszTopic;
HCONV hConv;
+ HDDEDATA hDdeData;
unsigned ret = 31;
+ BOOL unicode = !(GetVersion() & 0x80000000);
strcpyW(endkey, wApplication);
applen = sizeof(app);
strcpyW(topic, wSystem);
}
- if (DdeInitializeW(&ddeInst, dde_cb, APPCMD_CLIENTONLY, 0L) != DMLERR_NO_ERROR)
+ if (unicode)
{
- return 2;
+ if (DdeInitializeW(&ddeInst, dde_cb, APPCMD_CLIENTONLY, 0L) != DMLERR_NO_ERROR)
+ return 2;
+ }
+ else
+ {
+ if (DdeInitializeA(&ddeInst, dde_cb, APPCMD_CLIENTONLY, 0L) != DMLERR_NO_ERROR)
+ return 2;
}
- hszApp = DdeCreateStringHandleW(ddeInst, app, CP_WINANSI);
- hszTopic = DdeCreateStringHandleW(ddeInst, topic, CP_WINANSI);
+ hszApp = DdeCreateStringHandleW(ddeInst, app, CP_WINUNICODE);
+ hszTopic = DdeCreateStringHandleW(ddeInst, topic, CP_WINUNICODE);
hConv = DdeConnect(ddeInst, hszApp, hszTopic, NULL);
exec = ddeexec;
SHELL_ArgifyW(res, sizeof(res)/sizeof(WCHAR), exec, lpFile, pidl, szCommandline);
TRACE("%s %s => %s\n", debugstr_w(exec), debugstr_w(lpFile), debugstr_w(res));
- ret = (DdeClientTransaction((LPBYTE)res, (strlenW(res) + 1) * sizeof(WCHAR), hConv, 0L, 0,
- XTYP_EXECUTE, 10000, &tid) != DMLERR_NO_ERROR) ? 31 : 33;
+ /* It's documented in the KB 330337 that IE has a bug and returns
+ * error DMLERR_NOTPROCESSED on XTYP_EXECUTE request.
+ */
+ if (unicode)
+ hDdeData = DdeClientTransaction((LPBYTE)res, (strlenW(res) + 1) * sizeof(WCHAR), hConv, 0L, 0,
+ XTYP_EXECUTE, 10000, &tid);
+ else
+ {
+ DWORD lenA = WideCharToMultiByte(CP_ACP, 0, res, -1, NULL, 0, NULL, NULL);
+ char *resA = HeapAlloc(GetProcessHeap(), 0, lenA);
+ WideCharToMultiByte(CP_ACP, 0, res, -1, resA, lenA, NULL, NULL);
+ hDdeData = DdeClientTransaction( (LPBYTE)resA, lenA, hConv, 0L, 0,
+ XTYP_EXECUTE, 10000, &tid );
+ HeapFree(GetProcessHeap(), 0, resA);
+ }
+ if (hDdeData)
+ DdeFreeDataHandle(hDdeData);
+ else
+ WARN("DdeClientTransaction failed with error %04x\n", DdeGetLastError(ddeInst));
+ ret = 33;
+
DdeDisconnect(hConv);
error:
/*************************************************************************
* execute_from_key [Internal]
*/
-static UINT execute_from_key(LPWSTR key, LPCWSTR lpFile, void *env, LPCWSTR szCommandline,
+static UINT_PTR execute_from_key(LPWSTR key, LPCWSTR lpFile, WCHAR *env, LPCWSTR szCommandline,
SHELL_ExecuteW32 execfunc,
- LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out)
+ LPSHELLEXECUTEINFOW psei, LPSHELLEXECUTEINFOW psei_out)
{
WCHAR cmd[1024];
LONG cmdlen = sizeof(cmd);
- UINT retval = 31;
+ UINT_PTR retval = 31;
cmd[0] = '\0';
{
static const WCHAR wCommand[] = {'c','o','m','m','a','n','d',0};
static const WCHAR wDdeexec[] = {'d','d','e','e','x','e','c',0};
-
LPWSTR tmp;
WCHAR param[256];
LONG paramlen = sizeof(param);
- param[0] = '\0';
+ param[0] = '\0';
/* Get the parameters needed by the application
from the associated ddeexec key */
if (wDirectory) SHFree( wDirectory );
TRACE("returning %s\n", lpResult);
- return (HINSTANCE)retval;
+ return retval;
}
/*************************************************************************
*/
HINSTANCE WINAPI FindExecutableW(LPCWSTR lpFile, LPCWSTR lpDirectory, LPWSTR lpResult)
{
- UINT retval = 31; /* default - 'No association was found' */
+ UINT_PTR retval = 31; /* default - 'No association was found' */
WCHAR old_dir[1024];
TRACE("File %s, Dir %s\n",
return (HINSTANCE)retval;
}
+/* FIXME: is this already implemented somewhere else? */
+static HKEY ShellExecute_GetClassKey( LPSHELLEXECUTEINFOW sei )
+{
+ LPCWSTR ext = NULL, lpClass = NULL;
+ LPWSTR cls = NULL;
+ DWORD type = 0, sz = 0;
+ HKEY hkey = 0;
+ LONG r;
+
+ if (sei->fMask & SEE_MASK_CLASSALL)
+ return sei->hkeyClass;
+
+ if (sei->fMask & SEE_MASK_CLASSNAME)
+ lpClass = sei->lpClass;
+ else
+ {
+ ext = PathFindExtensionW( sei->lpFile );
+ TRACE("ext = %s\n", debugstr_w( ext ) );
+ if (!ext)
+ return hkey;
+
+ r = RegOpenKeyW( HKEY_CLASSES_ROOT, ext, &hkey );
+ if (r != ERROR_SUCCESS )
+ return hkey;
+
+ r = RegQueryValueExW( hkey, NULL, 0, &type, NULL, &sz );
+ if ( r == ERROR_SUCCESS && type == REG_SZ )
+ {
+ sz += sizeof (WCHAR);
+ cls = HeapAlloc( GetProcessHeap(), 0, sz );
+ cls[0] = 0;
+ RegQueryValueExW( hkey, NULL, 0, &type, (LPBYTE) cls, &sz );
+ }
+
+ RegCloseKey( hkey );
+ lpClass = cls;
+ }
+
+ TRACE("class = %s\n", debugstr_w(lpClass) );
+
+ hkey = 0;
+ if ( lpClass )
+ RegOpenKeyW( HKEY_CLASSES_ROOT, lpClass, &hkey );
+
+ HeapFree( GetProcessHeap(), 0, cls );
+
+ return hkey;
+}
+
+static IDataObject *shellex_get_dataobj( LPSHELLEXECUTEINFOW sei )
+{
+ LPCITEMIDLIST pidllast = NULL;
+ IDataObject *dataobj = NULL;
+ IShellFolder *shf = NULL;
+ LPITEMIDLIST pidl = NULL;
+ HRESULT r;
+
+ if (sei->fMask & SEE_MASK_CLASSALL)
+ pidl = sei->lpIDList;
+ else
+ {
+ WCHAR fullpath[MAX_PATH];
+
+ fullpath[0] = 0;
+ r = GetFullPathNameW( sei->lpFile, MAX_PATH, fullpath, NULL );
+ if (!r)
+ goto end;
+
+ pidl = ILCreateFromPathW( fullpath );
+ }
+
+ r = SHBindToParent( pidl, &IID_IShellFolder, (LPVOID*)&shf, &pidllast );
+ if ( FAILED( r ) )
+ goto end;
+
+ IShellFolder_GetUIObjectOf( shf, NULL, 1, &pidllast,
+ &IID_IDataObject, NULL, (LPVOID*) &dataobj );
+
+end:
+ if ( pidl != sei->lpIDList )
+ ILFree( pidl );
+ if ( shf )
+ IShellFolder_Release( shf );
+ return dataobj;
+}
+
+static HRESULT shellex_run_context_menu_default( IShellExtInit *obj,
+ LPSHELLEXECUTEINFOW sei )
+{
+ IContextMenu *cm = NULL;
+ CMINVOKECOMMANDINFOEX ici;
+ MENUITEMINFOW info;
+ WCHAR string[0x80];
+ INT i, n, def = -1;
+ HMENU hmenu = 0;
+ HRESULT r;
+
+ TRACE("%p %p\n", obj, sei );
+
+ r = IShellExtInit_QueryInterface( obj, &IID_IContextMenu, (LPVOID*) &cm );
+ if ( FAILED( r ) )
+ return r;
+
+ hmenu = CreateMenu();
+ if ( !hmenu )
+ goto end;
+
+ /* the number of the last menu added is returned in r */
+ r = IContextMenu_QueryContextMenu( cm, hmenu, 0, 0x20, 0x7fff, CMF_DEFAULTONLY );
+ if ( FAILED( r ) )
+ goto end;
+
+ n = GetMenuItemCount( hmenu );
+ for ( i = 0; i < n; i++ )
+ {
+ memset( &info, 0, sizeof info );
+ info.cbSize = sizeof info;
+ info.fMask = MIIM_FTYPE | MIIM_STRING | MIIM_STATE | MIIM_DATA | MIIM_ID;
+ info.dwTypeData = string;
+ info.cch = sizeof string;
+ string[0] = 0;
+ GetMenuItemInfoW( hmenu, i, TRUE, &info );
+
+ TRACE("menu %d %s %08x %08lx %08x %08x\n", i, debugstr_w(string),
+ info.fState, info.dwItemData, info.fType, info.wID );
+ if ( ( !sei->lpVerb && (info.fState & MFS_DEFAULT) ) ||
+ ( sei->lpVerb && !lstrcmpiW( sei->lpVerb, string ) ) )
+ {
+ def = i;
+ break;
+ }
+ }
+
+ r = E_FAIL;
+ if ( def == -1 )
+ goto end;
+
+ memset( &ici, 0, sizeof ici );
+ ici.cbSize = sizeof ici;
+ ici.fMask = CMIC_MASK_UNICODE;
+ ici.nShow = sei->nShow;
+ ici.lpVerb = MAKEINTRESOURCEA( def );
+ ici.hwnd = sei->hwnd;
+ ici.lpParametersW = sei->lpParameters;
+
+ r = IContextMenu_InvokeCommand( cm, (LPCMINVOKECOMMANDINFO) &ici );
+
+ TRACE("invoke command returned %08lx\n", r );
+
+end:
+ if ( hmenu )
+ DestroyMenu( hmenu );
+ if ( cm )
+ IContextMenu_Release( cm );
+ return r;
+}
+
+static HRESULT shellex_load_object_and_run( HKEY hkey, LPCGUID guid, LPSHELLEXECUTEINFOW sei )
+{
+ IDataObject *dataobj = NULL;
+ IObjectWithSite *ows = NULL;
+ IShellExtInit *obj = NULL;
+ HRESULT r;
+
+ TRACE("%p %s %p\n", hkey, debugstr_guid( guid ), sei );
+
+ r = CoInitialize( NULL );
+ if ( FAILED( r ) )
+ goto end;
+
+ r = CoCreateInstance( guid, NULL, CLSCTX_INPROC_SERVER,
+ &IID_IShellExtInit, (LPVOID*)&obj );
+ if ( FAILED( r ) )
+ {
+ ERR("failed %08lx\n", r );
+ goto end;
+ }
+
+ dataobj = shellex_get_dataobj( sei );
+ if ( !dataobj )
+ {
+ ERR("failed to get data object\n");
+ goto end;
+ }
+
+ r = IShellExtInit_Initialize( obj, NULL, dataobj, hkey );
+ if ( FAILED( r ) )
+ goto end;
+
+ r = IShellExtInit_QueryInterface( obj, &IID_IObjectWithSite, (LPVOID*) &ows );
+ if ( FAILED( r ) )
+ goto end;
+
+ IObjectWithSite_SetSite( ows, NULL );
+
+ r = shellex_run_context_menu_default( obj, sei );
+
+end:
+ if ( ows )
+ IObjectWithSite_Release( ows );
+ if ( dataobj )
+ IDataObject_Release( dataobj );
+ if ( obj )
+ IShellExtInit_Release( obj );
+ CoUninitialize();
+ return r;
+}
+
+
+/*************************************************************************
+ * ShellExecute_FromContextMenu [Internal]
+ */
+static LONG ShellExecute_FromContextMenu( LPSHELLEXECUTEINFOW sei )
+{
+ static const WCHAR szcm[] = { 's','h','e','l','l','e','x','\\',
+ 'C','o','n','t','e','x','t','M','e','n','u','H','a','n','d','l','e','r','s',0 };
+ HKEY hkey, hkeycm = 0;
+ WCHAR szguid[39];
+ HRESULT hr;
+ GUID guid;
+ DWORD i;
+ LONG r;
+
+ TRACE("%s\n", debugstr_w(sei->lpFile) );
+
+ hkey = ShellExecute_GetClassKey( sei );
+ if ( !hkey )
+ return ERROR_FUNCTION_FAILED;
+
+ r = RegOpenKeyW( hkey, szcm, &hkeycm );
+ if ( r == ERROR_SUCCESS )
+ {
+ i = 0;
+ while ( 1 )
+ {
+ r = RegEnumKeyW( hkeycm, i++, szguid, 39 );
+ if ( r != ERROR_SUCCESS )
+ break;
+
+ hr = CLSIDFromString( szguid, &guid );
+ if (SUCCEEDED(hr))
+ {
+ /* stop at the first one that succeeds in running */
+ hr = shellex_load_object_and_run( hkey, &guid, sei );
+ if ( SUCCEEDED( hr ) )
+ break;
+ }
+ }
+ RegCloseKey( hkeycm );
+ }
+
+ if ( hkey != sei->hkeyClass )
+ RegCloseKey( hkey );
+ return r;
+}
+
/*************************************************************************
- * ShellExecuteExW32 [Internal]
+ * SHELL_execute [Internal]
*/
-BOOL WINAPI ShellExecuteExW32 (LPSHELLEXECUTEINFOW psei, SHELL_ExecuteW32 execfunc)
+BOOL SHELL_execute( LPSHELLEXECUTEINFOW sei, SHELL_ExecuteW32 execfunc )
{
static const WCHAR wQuote[] = {'"',0};
static const WCHAR wSpace[] = {' ',0};
static const WCHAR wWww[] = {'w','w','w',0};
static const WCHAR wFile[] = {'f','i','l','e',0};
static const WCHAR wHttp[] = {'h','t','t','p',':','/','/',0};
- static const WCHAR wExtLnk[] = {'.','l','n','k',0};
static const WCHAR wExplorer[] = {'e','x','p','l','o','r','e','r','.','e','x','e',0};
+ static const DWORD unsupportedFlags =
+ SEE_MASK_INVOKEIDLIST | SEE_MASK_ICON | SEE_MASK_HOTKEY |
+ SEE_MASK_CONNECTNETDRV | SEE_MASK_FLAG_DDEWAIT | SEE_MASK_FLAG_NO_UI |
+ SEE_MASK_UNICODE | SEE_MASK_NO_CONSOLE | SEE_MASK_ASYNCOK |
+ SEE_MASK_HMONITOR;
WCHAR wszApplicationName[MAX_PATH+2], wszParameters[1024], wszDir[MAX_PATH];
- SHELLEXECUTEINFOW sei_tmp; /* modifyable copy of SHELLEXECUTEINFO struct */
+ SHELLEXECUTEINFOW sei_tmp; /* modifiable copy of SHELLEXECUTEINFO struct */
WCHAR wfileName[MAX_PATH];
- void *env;
- WCHAR wszProtocol[256];
+ WCHAR *env;
+ WCHAR lpstrProtocol[256];
LPCWSTR lpFile;
- UINT retval = 31;
- WCHAR buffer[1024];
- const WCHAR* ext;
+ UINT_PTR retval = 31;
+ WCHAR wcmd[1024];
+ WCHAR buffer[MAX_PATH];
+ WCHAR target[MAX_PATH];
+ BOOL done;
+ DWORD attribs;
/* make a local copy of the LPSHELLEXECUTEINFO structure and work with this from now on */
- memcpy(&sei_tmp, psei, sizeof(sei_tmp));
+ memcpy(&sei_tmp, sei, sizeof(sei_tmp));
TRACE("mask=0x%08lx hwnd=%p verb=%s file=%s parm=%s dir=%s show=0x%08x class=%s\n",
sei_tmp.fMask, sei_tmp.hwnd, debugstr_w(sei_tmp.lpVerb),
debugstr_w(sei_tmp.lpFile), debugstr_w(sei_tmp.lpParameters),
debugstr_w(sei_tmp.lpDirectory), sei_tmp.nShow,
- (sei_tmp.fMask & SEE_MASK_CLASSNAME) ? debugstr_w(sei_tmp.lpClass) : "not used");
+ ((sei_tmp.fMask & SEE_MASK_CLASSALL) == SEE_MASK_CLASSNAME) ?
+ debugstr_w(sei_tmp.lpClass) : "not used");
- psei->hProcess = NULL;
+ sei->hProcess = NULL;
/* make copies of all path/command strings */
- if (sei_tmp.lpFile)
- strcpyW(wszApplicationName, sei_tmp.lpFile);
+ if (!sei_tmp.lpFile)
+ *wszApplicationName = '\0';
+ else if (*sei_tmp.lpFile == '\"')
+ {
+ UINT l;
+ strcpyW(wszApplicationName, sei_tmp.lpFile+1);
+ l=lstrlenW(wszApplicationName);
+ if (wszApplicationName[l-1] == '\"')
+ wszApplicationName[l-1] = '\0';
+ TRACE("wszApplicationName=%s\n",debugstr_w(wszApplicationName));
+ }
else
- *wszApplicationName = '\0';
+ strcpyW(wszApplicationName, sei_tmp.lpFile);
if (sei_tmp.lpParameters)
strcpyW(wszParameters, sei_tmp.lpParameters);
sei_tmp.lpParameters = wszParameters;
sei_tmp.lpDirectory = wszDir;
- if (sei_tmp.fMask & (SEE_MASK_ICON | SEE_MASK_HOTKEY |
- SEE_MASK_CONNECTNETDRV | SEE_MASK_FLAG_DDEWAIT |
- SEE_MASK_DOENVSUBST | SEE_MASK_FLAG_NO_UI | SEE_MASK_UNICODE |
- SEE_MASK_NO_CONSOLE | SEE_MASK_ASYNCOK | SEE_MASK_HMONITOR ))
+ if (sei_tmp.fMask & unsupportedFlags)
{
- FIXME("flags ignored: 0x%08lx\n", sei_tmp.fMask);
+ FIXME("flags ignored: 0x%08lx\n", sei_tmp.fMask & unsupportedFlags);
}
/* process the IDList */
if (SUCCEEDED(hr))
{
- hr = IShellExecuteHookW_Execute(pSEH, psei);
+ hr = IShellExecuteHookW_Execute(pSEH, &sei_tmp);
IShellExecuteHookW_Release(pSEH);
return TRUE;
}
- /* try to translate PIDL directly into the corresponding file system path */
- if (SUCCEEDED(SHELL_GetPathFromIDListW(sei_tmp.lpIDList, wszApplicationName/*sei_tmp.lpFile*/, sizeof(wszApplicationName)/sizeof(WCHAR))))
- {
- sei_tmp.lpIDList = NULL;
- sei_tmp.fMask &= ~SEE_MASK_INVOKEIDLIST;
- }
-
+ SHGetPathFromIDListW(sei_tmp.lpIDList, wszApplicationName);
TRACE("-- idlist=%p (%s)\n", sei_tmp.lpIDList, debugstr_w(wszApplicationName));
}
- if (sei_tmp.fMask & (SEE_MASK_CLASSNAME | SEE_MASK_CLASSKEY))
+ if ( ERROR_SUCCESS == ShellExecute_FromContextMenu( &sei_tmp ) )
+ {
+ sei->hInstApp = (HINSTANCE) 33;
+ return TRUE;
+ }
+
+ if (sei_tmp.fMask & SEE_MASK_CLASSALL)
{
- /* launch a document by fileclass like 'WordPad.Document.1' */
+ /* launch a document by fileclass like 'WordPad.Document.1' */
/* the Commandline contains 'c:\Path\wordpad.exe "%1"' */
- /* FIXME: wszParameters should not be of a fixed size. Fixed to 1024, MAX_PATH is way too short! */
- HCR_GetExecuteCommandW((sei_tmp.fMask & SEE_MASK_CLASSKEY)? sei_tmp.hkeyClass: NULL,
- (sei_tmp.fMask & SEE_MASK_CLASSNAME)? sei_tmp.lpClass: NULL,
- (sei_tmp.lpVerb)? sei_tmp.lpVerb: wszOpen,
- wszParameters/*sei_tmp.lpParameters*/, sizeof(wszParameters)/sizeof(WCHAR));
+ /* FIXME: szCommandline should not be of a fixed size. Fixed to 1024, MAX_PATH is way too short! */
+ ULONG cmask=(sei_tmp.fMask & SEE_MASK_CLASSALL);
+ HCR_GetExecuteCommandW((cmask == SEE_MASK_CLASSKEY) ? sei_tmp.hkeyClass : NULL,
+ (cmask == SEE_MASK_CLASSNAME) ? sei_tmp.lpClass: NULL,
+ (sei_tmp.lpVerb) ? sei_tmp.lpVerb : wszOpen,
+ wszParameters, sizeof(wszParameters)/sizeof(WCHAR));
/* FIXME: get the extension of lpFile, check if it fits to the lpClass */
- TRACE("SEE_MASK_CLASSNAME->'%s', doc->'%s'\n", debugstr_w(sei_tmp.lpParameters), debugstr_w(sei_tmp.lpFile));
-
- buffer[0] = '\0';
+ TRACE("SEE_MASK_CLASSNAME->'%s', doc->'%s'\n", debugstr_w(wszParameters), debugstr_w(wszApplicationName));
- if (!SHELL_ArgifyW(buffer, sizeof(buffer)/sizeof(WCHAR), sei_tmp.lpParameters, sei_tmp.lpFile, sei_tmp.lpIDList, NULL) && sei_tmp.lpFile[0])
+ wcmd[0] = '\0';
+ done = SHELL_ArgifyW(wcmd, sizeof(wcmd)/sizeof(WCHAR), wszParameters, wszApplicationName, sei_tmp.lpIDList, NULL);
+ if (!done && wszApplicationName[0])
{
- strcatW(buffer, wExtLnk);
- strcatW(buffer, sei_tmp.lpFile);
+ strcatW(wcmd, wSpace);
+ strcatW(wcmd, wszApplicationName);
}
-
- retval = execfunc(buffer, NULL, FALSE, &sei_tmp, psei);
+ retval = execfunc(wcmd, NULL, FALSE, &sei_tmp, sei);
if (retval > 32)
return TRUE;
else
return FALSE;
}
-
- /* resolve shell shortcuts */
- ext = PathFindExtensionW(sei_tmp.lpFile);
-
- if (ext && !strcmpiW(ext, wExtLnk)) /* or check for: shell_attribs & SFGAO_LINK */
- {
- HRESULT hr;
-
- /* expand paths before reading shell link */
- if (ExpandEnvironmentStringsW(sei_tmp.lpFile, buffer, MAX_PATH))
- lstrcpyW(wszApplicationName/*sei_tmp.lpFile*/, buffer);
-
- if (*sei_tmp.lpParameters)
- if (ExpandEnvironmentStringsW(sei_tmp.lpParameters, buffer, MAX_PATH))
- lstrcpyW(wszParameters/*sei_tmp.lpParameters*/, buffer);
-
- hr = SHELL_ResolveShortCutW((LPWSTR)sei_tmp.lpFile, (LPWSTR)sei_tmp.lpParameters, (LPWSTR)sei_tmp.lpDirectory,
- sei_tmp.hwnd, sei_tmp.lpVerb?sei_tmp.lpVerb:wszEmpty, &sei_tmp.nShow, (LPITEMIDLIST*)&sei_tmp.lpIDList);
-
- if (psei->lpIDList)
- psei->fMask |= SEE_MASK_IDLIST; //@@ nicht sei_tmp.fMask ?!
-
- if (SUCCEEDED(hr))
- {
- /* repeat IDList processing if needed */
- if (sei_tmp.fMask & SEE_MASK_IDLIST)
- {
- IShellExecuteHookW* pSEH;
-
- HRESULT hr = SHBindToParent(sei_tmp.lpIDList, &IID_IShellExecuteHookW, (LPVOID*)&pSEH, NULL);
-
- if (SUCCEEDED(hr))
- {
- hr = IShellExecuteHookW_Execute(pSEH, psei);
-
- IShellExecuteHookW_Release(pSEH);
-
- if (hr == S_OK)
- return TRUE;
- }
-
- TRACE("-- idlist=%p (%s)\n", debugstr_w(sei_tmp.lpIDList), debugstr_w(sei_tmp.lpFile));
- }
- }
- }
-
-
/* Has the IDList not yet been translated? */
if (sei_tmp.fMask & SEE_MASK_IDLIST)
{
strcpyW(wszApplicationName, wExplorer);
sei_tmp.fMask &= ~SEE_MASK_INVOKEIDLIST;
- } else if (HCR_GetExecuteCommandW(0, wszFolder, sei_tmp.lpVerb?sei_tmp.lpVerb:wszOpen, buffer, sizeof(buffer))) {
- SHELL_ArgifyW(wszApplicationName, sizeof(wszApplicationName)/sizeof(WCHAR), buffer, NULL, sei_tmp.lpIDList, NULL);
-
+ } else {
+ /* Check if we're executing a directory and if so use the
+ handler for the Folder class */
+ strcpyW(target, buffer);
+ attribs = GetFileAttributesW(buffer);
+ if (attribs != INVALID_FILE_ATTRIBUTES &&
+ 0 != (attribs & FILE_ATTRIBUTE_DIRECTORY) &&
+ HCR_GetExecuteCommandW(0, wszFolder,
+ sei_tmp.lpVerb?sei_tmp.lpVerb:wszOpen,
+ buffer, sizeof(buffer))) {
+ SHELL_ArgifyW(wszApplicationName,
+ sizeof(wszApplicationName)/sizeof(WCHAR),
+ buffer, target, sei_tmp.lpIDList, NULL);
+ }
sei_tmp.fMask &= ~SEE_MASK_INVOKEIDLIST;
}
}
}
-
/* expand environment strings */
-
if (ExpandEnvironmentStringsW(sei_tmp.lpFile, buffer, MAX_PATH))
- lstrcpyW(wszApplicationName/*sei_tmp.lpFile*/, buffer);
+ lstrcpyW(wszApplicationName, buffer);
if (*sei_tmp.lpParameters)
if (ExpandEnvironmentStringsW(sei_tmp.lpParameters, buffer, MAX_PATH))
- lstrcpyW(wszParameters/*sei_tmp.lpParameters*/, buffer);
+ lstrcpyW(wszParameters, buffer);
if (*sei_tmp.lpDirectory)
if (ExpandEnvironmentStringsW(sei_tmp.lpDirectory, buffer, MAX_PATH))
- lstrcpyW(wszDir/*sei_tmp.lpDirectory*/, buffer);
+ lstrcpyW(wszDir, buffer);
/* Else, try to execute the filename */
- TRACE("execute:'%s','%s','%s'\n", debugstr_w(wszApplicationName), debugstr_w(wszCommandline), debugstr_w(wszDir));
-
+ TRACE("execute:%s,%s,%s\n", debugstr_w(wszApplicationName), debugstr_w(wszParameters), debugstr_w(wszDir));
/* separate out command line arguments from executable file name */
if (!*sei_tmp.lpParameters) {
LPWSTR dst = wfileName;
LPWSTR end;
- /* copy the unquoted executabe path to 'wfileName' */
+ /* copy the unquoted executable path to 'wfileName' */
while(*src && *src!='"')
*dst++ = *src++;
LPWSTR beg = wszApplicationName/*sei_tmp.lpFile*/;
for(s=beg; (space=strchrW(s, ' ')); s=space+1) {
int idx = space-sei_tmp.lpFile;
- strncpyW(buffer, sei_tmp.lpFile, idx);
+ memcpy(buffer, sei_tmp.lpFile, idx * sizeof(WCHAR));
buffer[idx] = '\0';
/*FIXME This finds directory paths if the targeted file name contains spaces. */
lpFile = wfileName;
+ strcpyW(wcmd, wszApplicationName);
if (sei_tmp.lpParameters[0]) {
- strcatW(wszApplicationName/*sei_tmp.lpFile*/, wSpace);
- strcatW(wszApplicationName/*sei_tmp.lpFile*/, sei_tmp.lpParameters);
+ strcatW(wcmd, wSpace);
+ strcatW(wcmd, wszParameters);
}
- retval = execfunc(sei_tmp.lpFile, NULL, FALSE, &sei_tmp, psei);
- if (retval > 32)
- {
- /* Now, that we have successfully launched a process, we can free the PIDL.
- It may have been used before for %I command line options. */
- if (sei_tmp.lpIDList!=psei->lpIDList && sei_tmp.lpIDList)
- SHFree(sei_tmp.lpIDList);
+ /* We set the default to open, and that should generally work.
+ But that is not really the way the MS docs say to do it. */
+ if (!sei_tmp.lpVerb)
+ sei_tmp.lpVerb = wszOpen;
- TRACE("execfunc: retval=%d psei->hInstApp=%p\n", retval, psei->hInstApp);
+ retval = execfunc(wcmd, NULL, FALSE, &sei_tmp, sei);
+ if (retval > 32)
return TRUE;
- }
/* Else, try to find the executable */
- buffer[0] = '\0';
- retval = SHELL_FindExecutable(*sei_tmp.lpDirectory? sei_tmp.lpDirectory: NULL, lpFile, sei_tmp.lpVerb, buffer, 1024, wszProtocol, &env, sei_tmp.lpIDList, sei_tmp.lpParameters);
-
+ wcmd[0] = '\0';
+ retval = SHELL_FindExecutable(sei_tmp.lpDirectory, lpFile, sei_tmp.lpVerb, wcmd, 1024, lpstrProtocol, &env, sei_tmp.lpIDList, sei_tmp.lpParameters);
if (retval > 32) /* Found */
{
WCHAR wszQuotedCmd[MAX_PATH+2];
- /* Must quote to handle case where 'buffer' contains spaces,
+ /* Must quote to handle case where cmd contains spaces,
* else security hole if malicious user creates executable file "C:\\Program"
- *
- * FIXME: If we don't have set explicitly command line arguments, we must first
- * split executable path from optional command line arguments. Otherwise we would quote
- * the complete string with executable path _and_ arguments, which is not what we want.
*/
strcpyW(wszQuotedCmd, wQuote);
- strcatW(wszQuotedCmd, buffer);
+ strcatW(wszQuotedCmd, wcmd);
strcatW(wszQuotedCmd, wQuote);
-
- if (*sei_tmp.lpParameters) {
+ if (wszParameters[0]) {
strcatW(wszQuotedCmd, wSpace);
- strcatW(wszQuotedCmd, sei_tmp.lpParameters);
+ strcatW(wszQuotedCmd, wszParameters);
}
-
- TRACE("%s/%s => %s/%s\n", debugstr_w(wszApplicationName), debugstr_w(buffer), debugstr_w(wszQuotedCmd), debugstr_w(wszProtocol));
-
- if (*wszProtocol)
- retval = execute_from_key(wszProtocol, lpFile, env, sei_tmp.lpParameters, execfunc, &sei_tmp, psei);
+ TRACE("%s/%s => %s/%s\n", debugstr_w(wszApplicationName), debugstr_w(sei_tmp.lpVerb), debugstr_w(wszQuotedCmd), debugstr_w(lpstrProtocol));
+ if (*lpstrProtocol)
+ retval = execute_from_key(lpstrProtocol, wszApplicationName, env, sei_tmp.lpParameters, execfunc, &sei_tmp, sei);
else
- retval = execfunc(wszQuotedCmd, env, FALSE, &sei_tmp, psei);
-
- if (env) HeapFree( GetProcessHeap(), 0, env );
+ retval = execfunc(wszQuotedCmd, env, FALSE, &sei_tmp, sei);
+ HeapFree( GetProcessHeap(), 0, env );
}
else if (PathIsURLW((LPWSTR)lpFile)) /* File not found, check for URL */
{
- static const WCHAR wszShell[] = {'\\','s','h','e','l','l','\\',0};
+ static const WCHAR wShell[] = {'\\','s','h','e','l','l','\\',0};
static const WCHAR wCommand[] = {'\\','c','o','m','m','a','n','d',0};
LPWSTR lpstrRes;
INT iSize;
iSize = strlenW(lpFile);
TRACE("Got URL: %s\n", debugstr_w(lpFile));
- /* Looking for ...protocol\shell\<verb>\command */
- strncpyW(wszProtocol, lpFile, iSize);
- wszProtocol[iSize] = '\0';
- strcatW(wszProtocol, wszShell);
- strcatW(wszProtocol, sei_tmp.lpVerb? sei_tmp.lpVerb: wszOpen);
- strcatW(wszProtocol, wCommand);
+ /* Looking for ...protocol\shell\lpOperation\command */
+ memcpy(lpstrProtocol, lpFile, iSize*sizeof(WCHAR));
+ lpstrProtocol[iSize] = '\0';
+ strcatW(lpstrProtocol, wShell);
+ strcatW(lpstrProtocol, sei_tmp.lpVerb? sei_tmp.lpVerb: wszOpen);
+ strcatW(lpstrProtocol, wCommand);
/* Remove File Protocol from lpFile */
/* In the case file://path/file */
lpFile += iSize;
while (*lpFile == ':') lpFile++;
}
-
- retval = execute_from_key(wszProtocol, lpFile, NULL, sei_tmp.lpParameters, execfunc, &sei_tmp, psei);
+ retval = execute_from_key(lpstrProtocol, lpFile, NULL, sei_tmp.lpParameters, execfunc, &sei_tmp, sei);
}
/* Check if file specified is in the form www.??????.*** */
else if (!strncmpiW(lpFile, wWww, 3))
WCHAR lpstrTmpFile[256];
strcpyW(lpstrTmpFile, wHttp);
strcatW(lpstrTmpFile, lpFile);
- retval = (UINT)ShellExecuteW(sei_tmp.hwnd, sei_tmp.lpVerb, lpstrTmpFile, NULL, NULL, 0);
+ retval = (UINT_PTR)ShellExecuteW(sei_tmp.hwnd, sei_tmp.lpVerb, lpstrTmpFile, NULL, NULL, 0);
}
- /* Now we can free the PIDL. It may have been used before for %I command line options. */
- if (sei_tmp.lpIDList!=psei->lpIDList && sei_tmp.lpIDList)
- SHFree(sei_tmp.lpIDList);
-
TRACE("retval %u\n", retval);
if (retval <= 32)
{
- psei->hInstApp = (HINSTANCE)retval;
+ sei->hInstApp = (HINSTANCE)retval;
return FALSE;
}
- psei->hInstApp = (HINSTANCE)33;
+ sei->hInstApp = (HINSTANCE)33;
return TRUE;
}
/*************************************************************************
* ShellExecuteA [SHELL32.290]
*/
-HINSTANCE WINAPI ShellExecuteA(HWND hWnd, LPCSTR lpOperation, LPCSTR lpFile,
- LPCSTR lpParameters, LPCSTR lpDirectory, INT iShowCmd)
+HINSTANCE WINAPI ShellExecuteA(HWND hWnd, LPCSTR lpOperation,LPCSTR lpFile,
+ LPCSTR lpParameters,LPCSTR lpDirectory, INT iShowCmd)
{
SHELLEXECUTEINFOA sei;
- HANDLE hProcess = 0;
- TRACE("\n");
+ TRACE("%p,%s,%s,%s,%s,%d\n",
+ hWnd, debugstr_a(lpOperation), debugstr_a(lpFile),
+ debugstr_a(lpParameters), debugstr_a(lpDirectory), iShowCmd);
+
sei.cbSize = sizeof(sei);
sei.fMask = 0;
sei.hwnd = hWnd;
sei.lpClass = 0;
sei.hkeyClass = 0;
sei.dwHotKey = 0;
- sei.hProcess = hProcess;
+ sei.hProcess = 0;
ShellExecuteExA (&sei);
return sei.hInstApp;
}
-/*************************************************************************
- * ShellExecuteEx [SHELL32.291]
- *
- */
-BOOL WINAPI ShellExecuteExAW (LPVOID sei)
-{
- if (SHELL_OsIsUnicode())
- return ShellExecuteExW32 (sei, SHELL_ExecuteW);
- return ShellExecuteExA (sei);
-}
-
/*************************************************************************
* ShellExecuteExA [SHELL32.292]
*
if (sei->lpDirectory)
seiW.lpDirectory = __SHCloneStrAtoW(&wDirectory, sei->lpDirectory);
- if ((sei->fMask & SEE_MASK_CLASSNAME) && sei->lpClass)
+ if ((sei->fMask & SEE_MASK_CLASSALL) == SEE_MASK_CLASSNAME && sei->lpClass)
seiW.lpClass = __SHCloneStrAtoW(&wClass, sei->lpClass);
else
seiW.lpClass = NULL;
- ret = ShellExecuteExW32 (&seiW, SHELL_ExecuteW);
+ ret = SHELL_execute( &seiW, SHELL_ExecuteW );
sei->hInstApp = seiW.hInstApp;
+ if (sei->fMask & SEE_MASK_NOCLOSEPROCESS)
+ sei->hProcess = seiW.hProcess;
+
if (wVerb) SHFree(wVerb);
if (wFile) SHFree(wFile);
if (wParameters) SHFree(wParameters);
*/
BOOL WINAPI ShellExecuteExW (LPSHELLEXECUTEINFOW sei)
{
- return ShellExecuteExW32 (sei, SHELL_ExecuteW);
+ return SHELL_execute( sei, SHELL_ExecuteW );
}
/*************************************************************************
sei.dwHotKey = 0;
sei.hProcess = 0;
- ShellExecuteExW32 (&sei, SHELL_ExecuteW);
+ SHELL_execute( &sei, SHELL_ExecuteW );
return sei.hInstApp;
}
projects / reactos.git / blobdiff