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

Ensure that an out-of-process COM object is started only once. 

Allow out-of-process COM objects if request is for
in-or-out-of-process.
This commit is contained in:
Bill Medland 2002-05-29 19:20:32 +00:00 committed by Alexandre Julliard
parent 6a5ba8fba2
commit d36c8e9d0c
2 changed files with 6 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
dlls/ole32/compobj.c
View File

@ -1315,8 +1315,6 @@ HRESULT WINAPI CoGetClassObject(
typedef HRESULT (CALLBACK *DllGetClassObjectFunc)(REFCLSID clsid, typedef HRESULT (CALLBACK *DllGetClassObjectFunc)(REFCLSID clsid,
REFIID iid, LPVOID *ppv); REFIID iid, LPVOID *ppv);
DllGetClassObjectFunc DllGetClassObject; DllGetClassObjectFunc DllGetClassObject;
HKEY key;
char buf[200];
WINE_StringFromCLSID((LPCLSID)rclsid,xclsid); WINE_StringFromCLSID((LPCLSID)rclsid,xclsid);
@ -1351,20 +1349,6 @@ HRESULT WINAPI CoGetClassObject(
return hres; return hres;
} }
if (((CLSCTX_LOCAL_SERVER) & dwClsContext)
&& !((CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER) & dwClsContext))
return create_marshalled_proxy(rclsid,iid,ppv);
/* remote servers not supported yet */
if ( ((CLSCTX_REMOTE_SERVER) & dwClsContext)
&& !((CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER) & dwClsContext)
){
FIXME("CLSCTX_REMOTE_SERVER not supported!\n");
return E_NOINTERFACE;
}
if ((CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER) & dwClsContext) { if ((CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER) & dwClsContext) {
HKEY key; HKEY key;
char buf[200]; char buf[200];
@ -1400,31 +1384,17 @@ HRESULT WINAPI CoGetClassObject(
} }
/* Finally try out of process */ /* Next try out of process */
/* out of process and remote servers not supported yet */
if (CLSCTX_LOCAL_SERVER & dwClsContext) if (CLSCTX_LOCAL_SERVER & dwClsContext)
{ {
memset(ProviderName,0,sizeof(ProviderName)); return create_marshalled_proxy(rclsid,iid,ppv);
sprintf(buf,"CLSID\\%s\\LocalServer32",xclsid);
if (((hres = RegOpenKeyExA(HKEY_CLASSES_ROOT, buf, 0, KEY_READ, &key)) != ERROR_SUCCESS) ||
((hres = RegQueryValueExW(key,NULL,NULL,NULL,(LPBYTE)ProviderName,&ProviderNameLen)),
RegCloseKey (key),
hres != ERROR_SUCCESS))
{
hres = REGDB_E_CLASSNOTREG;
}
else
{
/* CO_E_APPNOTFOUND if no exe */
FIXME("CLSCTX_LOCAL_SERVER %s registered but not yet supported!\n",debugstr_w(ProviderName));
hres = E_ACCESSDENIED;
}
} }
/* Finally try remote */
if (CLSCTX_REMOTE_SERVER & dwClsContext) if (CLSCTX_REMOTE_SERVER & dwClsContext)
{ {
FIXME ("CLSCTX_REMOTE_SERVER not supported\n"); FIXME ("CLSCTX_REMOTE_SERVER not supported\n");
hres = E_ACCESSDENIED; hres = E_NOINTERFACE;
} }
return hres; return hres;

4
dlls/ole32/rpc.c
View File

@ -479,13 +479,13 @@ create_server(REFCLSID rclsid) {
hres = RegOpenKeyExA(HKEY_CLASSES_ROOT, buf, 0, KEY_READ, &key); hres = RegOpenKeyExA(HKEY_CLASSES_ROOT, buf, 0, KEY_READ, &key);
if (hres != ERROR_SUCCESS) if (hres != ERROR_SUCCESS)
return REGDB_E_CLASSNOTREG; return REGDB_E_READREGDB; /* Probably */
memset(dllName,0,sizeof(dllName)); memset(dllName,0,sizeof(dllName));
hres= RegQueryValueExW(key,NULL,NULL,NULL,(LPBYTE)dllName,&dllNameLen); hres= RegQueryValueExW(key,NULL,NULL,NULL,(LPBYTE)dllName,&dllNameLen);
RegCloseKey(key);
if (hres) if (hres)
return REGDB_E_CLASSNOTREG; /* FIXME: check retval */ return REGDB_E_CLASSNOTREG; /* FIXME: check retval */
RegCloseKey(key);
memset(&sinfo,0,sizeof(sinfo)); memset(&sinfo,0,sizeof(sinfo));
sinfo.cb = sizeof(sinfo); sinfo.cb = sizeof(sinfo);
if (!CreateProcessW(NULL,dllName,NULL,NULL,FALSE,0,NULL,NULL,&sinfo,&pinfo)) if (!CreateProcessW(NULL,dllName,NULL,NULL,FALSE,0,NULL,NULL,&sinfo,&pinfo))