Jacek Caban : shdocvw: Register InternetExplorer class factory in
IEWinMain .
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Apr 20 04:39:58 CDT 2006
Module: wine
Branch: refs/heads/master
Commit: 4a8397a5933b5a09cbda45aa8c8a76b93760bc05
URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=4a8397a5933b5a09cbda45aa8c8a76b93760bc05
Author: Jacek Caban <jacek at codeweavers.com>
Date: Wed Apr 19 20:37:57 2006 +0200
shdocvw: Register InternetExplorer class factory in IEWinMain.
Based on a patch by Mike McCormack.
---
dlls/shdocvw/factory.c | 25 +++++++++++++++++++++++++
dlls/shdocvw/iexplore.c | 11 ++++++++++-
dlls/shdocvw/shdocvw.h | 2 ++
3 files changed, 37 insertions(+), 1 deletions(-)
diff --git a/dlls/shdocvw/factory.c b/dlls/shdocvw/factory.c
index 2fa096e..b42c7d6 100644
--- a/dlls/shdocvw/factory.c
+++ b/dlls/shdocvw/factory.c
@@ -138,3 +138,28 @@ HRESULT WINAPI DllGetClassObject(REFCLSI
/* As a last resort, figure if the CLSID belongs to a 'Shell Instance Object' */
return SHDOCVW_GetShellInstanceObjectClassObject(rclsid, riid, ppv);
}
+
+HRESULT register_class_object(BOOL do_reg)
+{
+ HRESULT hres;
+
+ static DWORD cookie;
+ static IClassFactoryImpl IEClassFactory = {&WBCF_Vtbl, InternetExplorer_Create};
+
+ if(do_reg) {
+ hres = CoRegisterClassObject(&CLSID_InternetExplorer, (IUnknown*)FACTORY(&IEClassFactory),
+ CLSCTX_SERVER, REGCLS_MULTIPLEUSE|REGCLS_SUSPENDED, &cookie);
+ if (FAILED(hres)) {
+ ERR("failed to register object %08lx\n", hres);
+ return hres;
+ }
+
+ hres = CoResumeClassObjects();
+ if(SUCCEEDED(hres))
+ return hres;
+
+ ERR("failed to resume object %08lx\n", hres);
+ }
+
+ return CoRevokeClassObject(cookie);
+}
diff --git a/dlls/shdocvw/iexplore.c b/dlls/shdocvw/iexplore.c
index 62bc81c..20ef796 100644
--- a/dlls/shdocvw/iexplore.c
+++ b/dlls/shdocvw/iexplore.c
@@ -590,11 +590,18 @@ DWORD WINAPI IEWinMain(LPSTR szCommandLi
{
LPWSTR url;
DWORD len;
+ HRESULT hres;
FIXME("%s %d\n", debugstr_a(szCommandLine), nShowWindow);
CoInitialize(NULL);
+ hres = register_class_object(TRUE);
+ if(FAILED(hres)) {
+ CoUninitialize();
+ ExitProcess(1);
+ }
+
/* FIXME: parse the command line properly, handle -Embedding */
len = MultiByteToWideChar(CP_ACP, 0, szCommandLine, -1, NULL, 0);
@@ -605,7 +612,9 @@ DWORD WINAPI IEWinMain(LPSTR szCommandLi
HeapFree(GetProcessHeap(), 0, url);
- CoUninitialize();
+ register_class_object(FALSE);
+
+ CoUninitialize();
ExitProcess(0);
return 0;
diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h
index 3e6900c..585cb1b 100644
--- a/dlls/shdocvw/shdocvw.h
+++ b/dlls/shdocvw/shdocvw.h
@@ -200,4 +200,6 @@ extern void register_iewindow_class(void
extern void unregister_iewindow_class(void);
extern BOOL create_ie_window(LPCWSTR url);
+HRESULT register_class_object(BOOL);
+
#endif /* __WINE_SHDOCVW_H */
More information about the wine-cvs
mailing list