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

Dropped superflous Remote_CoGetClassObject() (entirely contained in 

create_marshalled_proxy()).
This commit is contained in:
Marcus Meissner 2002-05-29 19:05:14 +00:00 committed by Alexandre Julliard
parent 4664903d1e
commit e656fc1cd6
1 changed files with 3 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
dlls/ole32/compobj.c
View File

@ -1293,42 +1293,6 @@ end:
return hr; return hr;
} }
static HRESULT WINAPI Remote_CoGetClassObject(
REFCLSID rclsid, DWORD dwClsContext, COSERVERINFO *pServerInfo,
REFIID iid, LPVOID *ppv
) {
HKEY key;
char buf[200];
HRESULT hres = E_UNEXPECTED;
char xclsid[80];
WCHAR dllName[MAX_PATH+1];
DWORD dllNameLen = sizeof(dllName);
STARTUPINFOW sinfo;
PROCESS_INFORMATION pinfo;
WINE_StringFromCLSID((LPCLSID)rclsid,xclsid);
sprintf(buf,"CLSID\\%s\\LocalServer32",xclsid);
hres = RegOpenKeyExA(HKEY_CLASSES_ROOT, buf, 0, KEY_READ, &key);
if (hres != ERROR_SUCCESS)
return REGDB_E_CLASSNOTREG;
memset(dllName,0,sizeof(dllName));
hres= RegQueryValueExW(key,NULL,NULL,NULL,(LPBYTE)dllName,&dllNameLen);
if (hres)
return REGDB_E_CLASSNOTREG; /* FIXME: check retval */
RegCloseKey(key);
TRACE("found LocalServer32 exe %s\n", debugstr_w(dllName));
memset(&sinfo,0,sizeof(sinfo));
sinfo.cb = sizeof(sinfo);
if (!CreateProcessW(NULL,dllName,NULL,NULL,FALSE,0,NULL,NULL,&sinfo,&pinfo))
return E_FAIL;
return create_marshalled_proxy(rclsid,iid,ppv);
}
/*********************************************************************** /***********************************************************************
* CoGetClassObject [COMPOBJ.7] * CoGetClassObject [COMPOBJ.7]
* CoGetClassObject [OLE32.16] * CoGetClassObject [OLE32.16]
@ -1389,7 +1353,9 @@ HRESULT WINAPI CoGetClassObject(
if (((CLSCTX_LOCAL_SERVER) & dwClsContext) if (((CLSCTX_LOCAL_SERVER) & dwClsContext)
&& !((CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER) & dwClsContext)) && !((CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER) & dwClsContext))
return Remote_CoGetClassObject(rclsid,dwClsContext,pServerInfo,iid,ppv); return create_marshalled_proxy(rclsid,iid,ppv);
/* remote servers not supported yet */ /* remote servers not supported yet */
if ( ((CLSCTX_REMOTE_SERVER) & dwClsContext) if ( ((CLSCTX_REMOTE_SERVER) & dwClsContext)