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

shdocvw: Added WebBrowser::Invoke implementation.

Browse Source
This commit is contained in:
Jacek Caban 2006-07-31 13:27:22 +02:00 committed by Alexandre Julliard
parent 3d1627f673
commit d4da27aec3
3 changed files with 39 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dlls/shdocvw/shdocvw.h
View File

@ -212,6 +212,7 @@ extern void register_iewindow_class(void);
extern void unregister_iewindow_class(void); extern void unregister_iewindow_class(void);
HRESULT register_class_object(BOOL); HRESULT register_class_object(BOOL);
HRESULT get_typeinfo(ITypeInfo**);
/* memory allocation functions */ /* memory allocation functions */

26
dlls/shdocvw/shdocvw_main.c
View File

@ -40,6 +40,30 @@ LONG SHDOCVW_refCount = 0;
HINSTANCE shdocvw_hinstance = 0; HINSTANCE shdocvw_hinstance = 0;
static HMODULE SHDOCVW_hshell32 = 0; static HMODULE SHDOCVW_hshell32 = 0;
static ITypeInfo *wb_typeinfo = NULL;
HRESULT get_typeinfo(ITypeInfo **typeinfo)
{
ITypeLib *typelib;
HRESULT hres;
if(wb_typeinfo) {
*typeinfo = wb_typeinfo;
return S_OK;
}
hres = LoadRegTypeLib(&LIBID_SHDocVw, 1, 1, LOCALE_SYSTEM_DEFAULT, &typelib);
if(FAILED(hres)) {
ERR("LoadRegTypeLib failed: %08lx\n", hres);
return hres;
}
hres = ITypeLib_GetTypeInfoOfGuid(typelib, &IID_IWebBrowser2, &wb_typeinfo);
ITypeLib_Release(typelib);
*typeinfo = wb_typeinfo;
return hres;
}
/************************************************************************* /*************************************************************************
* SHDOCVW DllMain * SHDOCVW DllMain
@ -56,6 +80,8 @@ BOOL WINAPI DllMain(HINSTANCE hinst, DWORD fdwReason, LPVOID fImpLoad)
case DLL_PROCESS_DETACH: case DLL_PROCESS_DETACH:
if (SHDOCVW_hshell32) FreeLibrary(SHDOCVW_hshell32); if (SHDOCVW_hshell32) FreeLibrary(SHDOCVW_hshell32);
unregister_iewindow_class(); unregister_iewindow_class();
if(wb_typeinfo)
ITypeInfo_Release(wb_typeinfo);
break; break;
} }
return TRUE; return TRUE;

15
dlls/shdocvw/webbrowser.c
View File

@ -172,9 +172,18 @@ static HRESULT WINAPI WebBrowser_Invoke(IWebBrowser2 *iface, DISPID dispIdMember
EXCEPINFO *pExepInfo, UINT *puArgErr) EXCEPINFO *pExepInfo, UINT *puArgErr)
{ {
WebBrowser *This = WEBBROWSER_THIS(iface); WebBrowser *This = WEBBROWSER_THIS(iface);
FIXME("(%p)->(%ld %s %ld %08x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid), ITypeInfo *typeinfo;
HRESULT hres;
TRACE("(%p)->(%ld %s %ld %08x %p %p %p %p)\n", This, dispIdMember, debugstr_guid(riid),
lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr); lcid, wFlags, pDispParams, pVarResult, pExepInfo, puArgErr);
return E_NOTIMPL;
hres = get_typeinfo(&typeinfo);
if(FAILED(hres))
return hres;
return ITypeInfo_Invoke(typeinfo, WEBBROWSER2(This), dispIdMember, wFlags, pDispParams,
pVarResult, pExepInfo, puArgErr);
} }
/* IWebBrowser methods */ /* IWebBrowser methods */
@ -923,7 +932,7 @@ static HRESULT WebBrowser_Create(INT version, IUnknown *pOuter, REFIID riid, voi
WebBrowser *ret; WebBrowser *ret;
HRESULT hres; HRESULT hres;
TRACE("(%p %s %p)\n", pOuter, debugstr_guid(riid), ppv); TRACE("(%p %s %p) version=%d\n", pOuter, debugstr_guid(riid), ppv, version);
ret = shdocvw_alloc(sizeof(WebBrowser)); ret = shdocvw_alloc(sizeof(WebBrowser));