ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

We shouldn't pass the application name into CreateProcess because the 

value stored in the registry could include arguments.
This commit is contained in:
Robert Shearman 2005-11-08 10:56:02 +00:00 committed by Alexandre Julliard
parent f4e290ff46
commit 65581b8489
1 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/ole32/rpc.c
View File

@ -623,10 +623,9 @@ static HRESULT create_server(REFCLSID rclsid)
static const WCHAR embedding[] = { ' ', '-','E','m','b','e','d','d','i','n','g',0 }; static const WCHAR embedding[] = { ' ', '-','E','m','b','e','d','d','i','n','g',0 };
HKEY hkeyclsid; HKEY hkeyclsid;
HKEY key; HKEY key;
HRESULT hres = E_UNEXPECTED; HRESULT hres;
WCHAR exe[MAX_PATH+1];
DWORD exelen = sizeof(exe);
WCHAR command[MAX_PATH+sizeof(embedding)/sizeof(WCHAR)]; WCHAR command[MAX_PATH+sizeof(embedding)/sizeof(WCHAR)];
DWORD size = MAX_PATH+1 * sizeof(WCHAR);
STARTUPINFOW sinfo; STARTUPINFOW sinfo;
PROCESS_INFORMATION pinfo; PROCESS_INFORMATION pinfo;
@ -637,14 +636,14 @@ static HRESULT create_server(REFCLSID rclsid)
} }
hres = RegOpenKeyExW(hkeyclsid, wszLocalServer32, 0, KEY_READ, &key); hres = RegOpenKeyExW(hkeyclsid, wszLocalServer32, 0, KEY_READ, &key);
RegCloseKey(hkeyclsid);
if (hres != ERROR_SUCCESS) { if (hres != ERROR_SUCCESS) {
WARN("class %s not registered as LocalServer32\n", debugstr_guid(rclsid)); WARN("class %s not registered as LocalServer32\n", debugstr_guid(rclsid));
return REGDB_E_READREGDB; /* Probably */ return REGDB_E_READREGDB; /* Probably */
} }
memset(exe,0,sizeof(exe)); hres = RegQueryValueExW(key, NULL, NULL, NULL, (LPBYTE)command, &size);
hres= RegQueryValueExW(key, NULL, NULL, NULL, (LPBYTE)exe, &exelen);
RegCloseKey(key); RegCloseKey(key);
if (hres) { if (hres) {
WARN("No default value for LocalServer32 key\n"); WARN("No default value for LocalServer32 key\n");
@ -654,17 +653,16 @@ static HRESULT create_server(REFCLSID rclsid)
memset(&sinfo,0,sizeof(sinfo)); memset(&sinfo,0,sizeof(sinfo));
sinfo.cb = sizeof(sinfo); sinfo.cb = sizeof(sinfo);
/* EXE servers are started with the -Embedding switch. MSDN also claims /Embedding is used, /* EXE servers are started with the -Embedding switch. */
* 9x does -Embedding, perhaps an 9x/NT difference?
*/
strcpyW(command, exe);
strcatW(command, embedding); strcatW(command, embedding);
TRACE("activating local server %s for %s\n", debugstr_w(command), debugstr_guid(rclsid)); TRACE("activating local server %s for %s\n", debugstr_w(command), debugstr_guid(rclsid));
if (!CreateProcessW(exe, command, NULL, NULL, FALSE, 0, NULL, NULL, &sinfo, &pinfo)) { /* FIXME: Win2003 supports a ServerExecutable value that is passed into
WARN("failed to run local server %s\n", debugstr_w(exe)); * CreateProcess */
if (!CreateProcessW(NULL, command, NULL, NULL, FALSE, 0, NULL, NULL, &sinfo, &pinfo)) {
WARN("failed to run local server %s\n", debugstr_w(command));
return HRESULT_FROM_WIN32(GetLastError()); return HRESULT_FROM_WIN32(GetLastError());
} }
CloseHandle(pinfo.hProcess); CloseHandle(pinfo.hProcess);