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

jscript: Added FIXME about IClassFactoryEx.

This commit is contained in:
Jacek Caban 2009-10-02 13:54:51 +02:00 committed by Alexandre Julliard
parent d0e9681969
commit 960d7f9fdb
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
dlls/jscript/activex.c
View File

@ -21,6 +21,7 @@
#include "jscript.h" #include "jscript.h"
#include "objsafe.h" #include "objsafe.h"
#include "mshtmhst.h"
#include "wine/debug.h" #include "wine/debug.h"
@ -59,6 +60,8 @@ static IUnknown *create_activex_object(script_ctx_t *ctx, const WCHAR *progid)
{ {
IInternetHostSecurityManager *secmgr; IInternetHostSecurityManager *secmgr;
struct CONFIRMSAFETY cs; struct CONFIRMSAFETY cs;
IClassFactoryEx *cfex;
IClassFactory *cf;
DWORD policy_size; DWORD policy_size;
BYTE *bpolicy; BYTE *bpolicy;
IUnknown *obj; IUnknown *obj;
@ -82,9 +85,17 @@ static IUnknown *create_activex_object(script_ctx_t *ctx, const WCHAR *progid)
if(FAILED(hres) || policy != URLPOLICY_ALLOW) if(FAILED(hres) || policy != URLPOLICY_ALLOW)
return NULL; return NULL;
/* FIXME: Use IClassFactoryEx */ hres = CoGetClassObject(&guid, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, NULL, &IID_IClassFactory, (void**)&cf);
if(FAILED(hres))
return NULL;
hres = CoCreateInstance(&guid, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, &IID_IUnknown, (void**)&obj); hres = IClassFactory_QueryInterface(cf, &IID_IClassFactoryEx, (void**)&cfex);
if(SUCCEEDED(hres)) {
FIXME("Use IClassFactoryEx\n");
IClassFactoryEx_Release(cfex);
}
hres = IClassFactory_CreateInstance(cf, NULL, &IID_IUnknown, (void**)&obj);
if(FAILED(hres)) if(FAILED(hres))
return NULL; return NULL;

1
dlls/jscript/jscript_main.c
View File

@ -24,6 +24,7 @@
#include "advpub.h" #include "advpub.h"
#include "activaut.h" #include "activaut.h"
#include "objsafe.h" #include "objsafe.h"
#include "mshtmhst.h"
#include "wine/debug.h" #include "wine/debug.h"