December 2010 - Wine-Commits

Hans Leidekker : rpcrt4: Add a stub implementation of RpcMgmtSetAuthorizationFn.
by Alexandre Julliard Dec. 15, 2010

Dec. 15, 2010

Module: wine Branch: master Commit: 215b69e36bf36fd98c436190b3d5a4ee0f77d1bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=215b69e36bf36fd98c436190b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 15 09:08:42 2010 +0100 rpcrt4: Add a stub implementation of RpcMgmtSetAuthorizationFn. --- dlls/rpcrt4/rpc_server.c | 9 +++++++++ dlls/rpcrt4/rpcrt4.spec | 2 +- include/rpcdce.h | 4 ++++ 3 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/rpcrt4/rpc_server.c b/dlls/rpcrt4/rpc_server.c index 8e7fe0e..9fd4cf6 100644 --- a/dlls/rpcrt4/rpc_server.c +++ b/dlls/rpcrt4/rpc_server.c @@ -1622,6 +1622,15 @@ RPC_STATUS WINAPI RpcMgmtIsServerListening(RPC_BINDING_HANDLE Binding) } /*********************************************************************** + * RpcMgmtSetAuthorizationFn (RPCRT4.@) + */ +RPC_STATUS WINAPI RpcMgmtSetAuthorizationFn(RPC_MGMT_AUTHORIZATION_FN fn) +{ + FIXME("(%p): stub\n", fn); + return RPC_S_OK; +} + +/*********************************************************************** * RpcMgmtSetServerStackSize (RPCRT4.@) */ RPC_STATUS WINAPI RpcMgmtSetServerStackSize(ULONG ThreadStackSize) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index e0c6c11..aa6fef9 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -402,7 +402,7 @@ @ stub RpcMgmtInqServerPrincNameW @ stdcall RpcMgmtInqStats(ptr ptr) @ stdcall RpcMgmtIsServerListening(ptr) -@ stub RpcMgmtSetAuthorizationFn +@ stdcall RpcMgmtSetAuthorizationFn(ptr) @ stdcall RpcMgmtSetCancelTimeout(long) @ stdcall RpcMgmtSetComTimeout(ptr long) @ stdcall RpcMgmtSetServerStackSize(long) diff --git a/include/rpcdce.h b/include/rpcdce.h index dc2c8de..9507a82 100644 --- a/include/rpcdce.h +++ b/include/rpcdce.h @@ -393,6 +393,10 @@ RPCRTAPI RPC_STATUS RPC_ENTRY RPCRTAPI RPC_STATUS RPC_ENTRY RpcMgmtEnableIdleCleanup( void ); +typedef int (__RPC_API *RPC_MGMT_AUTHORIZATION_FN)( RPC_BINDING_HANDLE, ULONG, RPC_STATUS * ); + +RPCRTAPI RPC_STATUS RPC_ENTRY RpcMgmtSetAuthorizationFn( RPC_MGMT_AUTHORIZATION_FN ); + RPCRTAPI RPC_STATUS RPC_ENTRY RpcMgmtSetCancelTimeout(LONG); RPCRTAPI RPC_STATUS RPC_ENTRY

1 0

Hans Leidekker : msi: Support MSIRUNMODE_LOGENABLED in MsiGetMode.
by Alexandre Julliard Dec. 15, 2010

Dec. 15, 2010

Module: wine Branch: master Commit: 942e2b2ac96767b14b33224a085078134ac8995b URL: http://source.winehq.org/git/wine.git/?a=commit;h=942e2b2ac96767b14b33224a0… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Dec 15 09:05:07 2010 +0100 msi: Support MSIRUNMODE_LOGENABLED in MsiGetMode. --- dlls/msi/install.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/msi/install.c b/dlls/msi/install.c index a470523..e2fe863 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -716,6 +716,10 @@ BOOL WINAPI MsiGetMode(MSIHANDLE hInstall, MSIRUNMODE iRunMode) r = package->need_reboot; break; + case MSIRUNMODE_LOGENABLED: + r = (package->log_file != INVALID_HANDLE_VALUE); + break; + default: FIXME("unimplemented run mode: %d\n", iRunMode); r = TRUE;

1 0

Jacek Caban : mshtml: Added IOleContainer stub implementation.
by Alexandre Julliard Dec. 15, 2010

Dec. 15, 2010

Module: wine Branch: master Commit: dc25bca4edb303f7f903f51773871709e1c704e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc25bca4edb303f7f903f5177… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 15 00:42:32 2010 +0100 mshtml: Added IOleContainer stub implementation. --- dlls/mshtml/htmldoc.c | 3 ++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/oleobj.c | 55 ++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/tests/dom.c | 3 ++ 4 files changed, 62 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 7cfa273..3c4b03c 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -1818,6 +1818,9 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) }else if(IsEqualGUID(&IID_IObjectWithSite, riid)) { TRACE("(%p)->(IID_IObjectWithSite %p)\n", This, ppv); *ppv = OBJSITE(This); + }else if(IsEqualGUID(&IID_IOleContainer, riid)) { + TRACE("(%p)->(IID_IOleContainer %p)\n", This, ppv); + *ppv = &This->IOleContainer_iface; }else { return FALSE; } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 269962f..833caf0 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -365,6 +365,7 @@ struct HTMLDocument { const IDispatchExVtbl *lpIDispatchExVtbl; const ISupportErrorInfoVtbl *lpSupportErrorInfoVtbl; const IObjectWithSiteVtbl *lpObjectWithSiteVtbl; + IOleContainer IOleContainer_iface; IUnknown *unk_impl; IDispatchEx *dispex; diff --git a/dlls/mshtml/oleobj.c b/dlls/mshtml/oleobj.c index 419d9aa..173a6cf 100644 --- a/dlls/mshtml/oleobj.c +++ b/dlls/mshtml/oleobj.c @@ -797,6 +797,60 @@ static const IObjectWithSiteVtbl ObjectWithSiteVtbl = { ObjectWithSite_GetSite }; +static inline HTMLDocument *impl_from_IOleContainer(IOleContainer *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IOleContainer_iface); +} + +static HRESULT WINAPI OleContainer_QueryInterface(IOleContainer *iface, REFIID riid, void **ppv) +{ + HTMLDocument *This = impl_from_IOleContainer(iface); + return IHTMLDocument2_QueryInterface(HTMLDOC(This), riid, ppv); +} + +static ULONG WINAPI OleContainer_AddRef(IOleContainer *iface) +{ + HTMLDocument *This = impl_from_IOleContainer(iface); + return IHTMLDocument2_AddRef(HTMLDOC(This)); +} + +static ULONG WINAPI OleContainer_Release(IOleContainer *iface) +{ + HTMLDocument *This = impl_from_IOleContainer(iface); + return IHTMLDocument2_Release(HTMLDOC(This)); +} + +static HRESULT WINAPI OleContainer_ParseDisplayName(IOleContainer *iface, IBindCtx *pbc, LPOLESTR pszDisplayName, + ULONG *pchEaten, IMoniker **ppmkOut) +{ + HTMLDocument *This = impl_from_IOleContainer(iface); + FIXME("(%p)->(%p %s %p %p)\n", This, pbc, debugstr_w(pszDisplayName), pchEaten, ppmkOut); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleContainer_EnumObjects(IOleContainer *iface, DWORD grfFlags, IEnumUnknown **ppenum) +{ + HTMLDocument *This = impl_from_IOleContainer(iface); + FIXME("(%p)->(%x %p)\n", This, grfFlags, ppenum); + return E_NOTIMPL; +} + +static HRESULT WINAPI OleContainer_LockContainer(IOleContainer *iface, BOOL fLock) +{ + HTMLDocument *This = impl_from_IOleContainer(iface); + FIXME("(%p)->(%x)\n", This, fLock); + return E_NOTIMPL; +} + +static const IOleContainerVtbl OleContainerVtbl = { + OleContainer_QueryInterface, + OleContainer_AddRef, + OleContainer_Release, + OleContainer_ParseDisplayName, + OleContainer_EnumObjects, + OleContainer_LockContainer +}; + void HTMLDocument_LockContainer(HTMLDocumentObj *This, BOOL fLock) { IOleContainer *container; @@ -819,4 +873,5 @@ void HTMLDocument_OleObj_Init(HTMLDocument *This) This->lpOleDocumentVtbl = &OleDocumentVtbl; This->lpOleControlVtbl = &OleControlVtbl; This->lpObjectWithSiteVtbl = &ObjectWithSiteVtbl; + This->IOleContainer_iface.lpVtbl = &OleContainerVtbl; } diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index e3b932c..19b7d14 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -125,6 +125,7 @@ static const IID * const doc_node_iids[] = { &IID_IDispatchEx, &IID_IConnectionPointContainer, &IID_IInternetHostSecurityManager, + &IID_IOleContainer, NULL }; @@ -137,6 +138,7 @@ static const IID * const doc_obj_iids[] = { &IID_IDispatchEx, &IID_IConnectionPointContainer, &IID_ICustomDoc, + &IID_IOleContainer, NULL }; @@ -267,6 +269,7 @@ static const IID * const window_iids[] = { &IID_IHTMLWindow2, &IID_IHTMLWindow3, &IID_IDispatchEx, + &IID_IServiceProvider, NULL };

1 0

André Hentschel : gphoto2.ds: Fix German translation.
by Alexandre Julliard Dec. 15, 2010

Dec. 15, 2010

Module: wine Branch: master Commit: 05061e26e765f1cbc595f33ab28ac058a0fcdea9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=05061e26e765f1cbc595f33ab… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Dec 14 19:45:58 2010 +0100 gphoto2.ds: Fix German translation. --- dlls/gphoto2.ds/gphoto2_De.rc | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/gphoto2.ds/gphoto2_De.rc b/dlls/gphoto2.ds/gphoto2_De.rc index 77ea6fc..55cf692 100644 --- a/dlls/gphoto2.ds/gphoto2_De.rc +++ b/dlls/gphoto2.ds/gphoto2_De.rc @@ -41,10 +41,10 @@ END IDD_DIALOG1 DIALOG 0, 0, 186, 46 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND -CAPTION "Übertragung" +CAPTION "Übertrage" FONT 8, "MS Sans Serif" BEGIN - LTEXT "Übertrage... Bitte Warten",IDC_STATIC,5,19,176,8, SS_CENTER + LTEXT "Übertrage... Bitte warten",IDC_STATIC,5,19,176,8, SS_CENTER END IDD_CONNECTING DIALOG 0, 0, 280, 116 @@ -53,6 +53,6 @@ CAPTION "Verbinde mit Kamera" FONT 8, "MS Sans Serif" BEGIN CONTROL "",IDC_BITMAP,"Static",SS_BITMAP|SS_CENTERIMAGE,4,4,110,110 - LTEXT "Verbinde mit Kamera... Bitte Warten",IDC_STATIC,128,58, + LTEXT "Verbinde mit Kamera... Bitte warten",IDC_STATIC,128,58, 116,8 END

1 0

Jacek Caban : mshtml: Added OnUIActivation implementation.
by Alexandre Julliard Dec. 15, 2010

Dec. 15, 2010

Module: wine Branch: master Commit: 14f2d1b19ce1d8ba96782ef2f65b791a04758fde URL: http://source.winehq.org/git/wine.git/?a=commit;h=14f2d1b19ce1d8ba96782ef2f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 15 00:42:11 2010 +0100 mshtml: Added OnUIActivation implementation. --- dlls/mshtml/pluginhost.c | 37 ++++++++++++++++++++++++++++++++-- dlls/mshtml/pluginhost.h | 2 + dlls/mshtml/tests/activex.c | 45 +++++++++++++++++++++++++++++++++++++++++- 3 files changed, 79 insertions(+), 5 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 8f280c5..9ab0983 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -651,8 +651,36 @@ static HRESULT WINAPI PHInPlaceSite_OnInPlaceActivate(IOleInPlaceSiteEx *iface) static HRESULT WINAPI PHInPlaceSite_OnUIActivate(IOleInPlaceSiteEx *iface) { PluginHost *This = impl_from_IOleInPlaceSiteEx(iface); - FIXME("(%p)\n", This); - return E_NOTIMPL; + DISPPARAMS args = {NULL, NULL, 0, 0}; + IDispatch *disp; + ULONG err = 0; + VARIANT res; + HRESULT hres; + + TRACE("(%p)\n", This); + + if(!This->plugin_unk) { + ERR("No plugin object\n"); + return E_UNEXPECTED; + } + + This->ui_active = TRUE; + + hres = IUnknown_QueryInterface(This->plugin_unk, &IID_IDispatch, (void**)&disp); + if(FAILED(hres)) { + FIXME("Could not get IDispatch iface: %08x\n", hres); + return hres; + } + + V_VT(&res) = VT_EMPTY; + hres = IDispatch_Invoke(disp, DISPID_ENABLED, &IID_NULL, 0/*FIXME*/, DISPATCH_PROPERTYGET, &args, &res, NULL, &err); + IDispatch_Release(disp); + if(SUCCEEDED(hres)) { + FIXME("Got enabled %s\n", debugstr_variant(&res)); + VariantClear(&res); + } + + return S_OK; } static HRESULT WINAPI PHInPlaceSite_GetWindowContext(IOleInPlaceSiteEx *iface, @@ -1024,8 +1052,11 @@ void detach_plugin_host(PluginHost *host) if(!host->doc) return; - if(host->ip_object) + if(host->ip_object) { + if(host->ui_active) + IOleInPlaceObject_UIDeactivate(host->ip_object); IOleInPlaceObject_InPlaceDeactivate(host->ip_object); + } if(host->plugin_unk) { IOleObject *ole_obj; diff --git a/dlls/mshtml/pluginhost.h b/dlls/mshtml/pluginhost.h index c547946..65ccb60 100644 --- a/dlls/mshtml/pluginhost.h +++ b/dlls/mshtml/pluginhost.h @@ -33,8 +33,10 @@ typedef struct { IUnknown *plugin_unk; IOleInPlaceObject *ip_object; CLSID clsid; + HWND hwnd; RECT rect; + BOOL ui_active; HTMLDocumentNode *doc; struct list entry; diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index aab13d5..a89d7e7 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -63,6 +63,8 @@ DEFINE_EXPECT(QuickActivate); DEFINE_EXPECT(IPersistPropertyBag_InitNew); DEFINE_EXPECT(IPersistPropertyBag_Load); DEFINE_EXPECT(Invoke_READYSTATE); +DEFINE_EXPECT(Invoke_ENABLED); +DEFINE_EXPECT(Invoke_VALID); DEFINE_EXPECT(DoVerb); DEFINE_EXPECT(SetExtent); DEFINE_EXPECT(GetExtent); @@ -72,6 +74,7 @@ DEFINE_EXPECT(Close); DEFINE_EXPECT(InPlaceObject_GetWindow); DEFINE_EXPECT(SetObjectRects); DEFINE_EXPECT(InPlaceDeactivate); +DEFINE_EXPECT(UIDeactivate); static HWND container_hwnd, plugin_hwnd; @@ -572,6 +575,18 @@ static HRESULT WINAPI Dispatch_Invoke(IDispatch *iface, DISPID dispIdMember, REF V_VT(pVarResult) = VT_I4; V_I4(pVarResult) = plugin_readystate; return S_OK; + case DISPID_ENABLED: + CHECK_EXPECT2(Invoke_ENABLED); + ok(wFlags == DISPATCH_PROPERTYGET, "wFlags = %x\n", wFlags); + ok(!pDispParams->cArgs, "pDispParams->cArgs = %d\n", pDispParams->cArgs); + ok(!pDispParams->rgvarg, "pDispParams->rgvarg != NULL\n"); + return DISP_E_MEMBERNOTFOUND; + case DISPID_VALID: + CHECK_EXPECT(Invoke_VALID); + ok(wFlags == DISPATCH_PROPERTYGET, "wFlags = %x\n", wFlags); + ok(!pDispParams->cArgs, "pDispParams->cArgs = %d\n", pDispParams->cArgs); + ok(!pDispParams->rgvarg, "pDispParams->rgvarg != NULL\n"); + return DISP_E_MEMBERNOTFOUND; default: ok(0, "unexpected call %d\n", dispIdMember); } @@ -1003,8 +1018,8 @@ static HRESULT WINAPI OleInPlaceObject_InPlaceDeactivate(IOleInPlaceObjectWindow static HRESULT WINAPI OleInPlaceObject_UIDeactivate(IOleInPlaceObjectWindowless *iface) { - ok(0, "unexpected call\n"); - return E_NOTIMPL; + CHECK_EXPECT2(UIDeactivate); + return S_OK; } static HRESULT WINAPI OleInPlaceObject_SetObjectRects(IOleInPlaceObjectWindowless *iface, @@ -1149,6 +1164,22 @@ static const IClassFactoryVtbl ClassFactoryVtbl = { static IClassFactory activex_cf = { &ClassFactoryVtbl }; +static void test_ui_activate(void) +{ + IOleInPlaceSite *ip_site; + HRESULT hres; + + hres = IOleClientSite_QueryInterface(client_site, &IID_IOleInPlaceSite, (void**)&ip_site); + ok(hres == S_OK, "Could not get IOleInPlaceSite iface: %08x\n", hres); + + SET_EXPECT(Invoke_ENABLED); + hres = IOleInPlaceSite_OnUIActivate(ip_site); + ok(hres == S_OK, "OnUIActivate failed: %08x\n", hres); + CHECK_CALLED(Invoke_ENABLED); + + IOleInPlaceSite_Release(ip_site); +} + static HRESULT cs_qi(REFIID,void **); static IOleDocumentView *view; @@ -1747,10 +1778,20 @@ static void test_object_ax(void) CHECK_CALLED(InPlaceObject_GetWindow); CHECK_CALLED(SetObjectRects); + test_ui_activate(); + + SET_EXPECT(UIDeactivate); + SET_EXPECT(Invoke_ENABLED); + SET_EXPECT(Invoke_VALID); SET_EXPECT(InPlaceDeactivate); SET_EXPECT(Close); SET_EXPECT(SetClientSite_NULL); release_doc(doc); + CHECK_CALLED(UIDeactivate); + todo_wine + CHECK_CALLED(Invoke_ENABLED); + todo_wine + CHECK_CALLED(Invoke_VALID); CHECK_CALLED(InPlaceDeactivate); CHECK_CALLED(Close); CHECK_CALLED(SetClientSite_NULL);

1 0

Jacek Caban : mshtml: Fixed tests on some IE6 installations.
by Alexandre Julliard Dec. 15, 2010

Dec. 15, 2010

Module: wine Branch: master Commit: 0b5edecc8bc730a1be3d542b1a2ad32dd0bf1082 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b5edecc8bc730a1be3d542b1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 15 00:43:03 2010 +0100 mshtml: Fixed tests on some IE6 installations. --- dlls/mshtml/tests/activex.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index f163c6c..64b72c6 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -178,7 +178,7 @@ static void set_plugin_readystate(READYSTATE state) IPropertyNotifySink_Release(prop_notif); } -static void test_mon_displayname(IMoniker *mon, const char *exname) +static void test_mon_displayname(IMoniker *mon, const char *exname, const char *broken_name) { LPOLESTR display_name; DWORD mksys; @@ -186,7 +186,8 @@ static void test_mon_displayname(IMoniker *mon, const char *exname) hres = IMoniker_GetDisplayName(mon, NULL, NULL, &display_name); ok(hres == S_OK, "GetDisplayName failed: %08x\n", hres); - ok(!strcmp_wa(display_name, exname), "display_name = %s\n", wine_dbgstr_w(display_name)); + ok(!strcmp_wa(display_name, exname) || broken(broken_name && !strcmp_wa(display_name, broken_name)), + "display_name = %s\n", wine_dbgstr_w(display_name)); CoTaskMemFree(display_name); hres = IMoniker_IsSystemMoniker(mon, &mksys); @@ -486,7 +487,7 @@ static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *face, IProper hres = IBindHost_CreateMoniker(bind_host, test_swfW, NULL, &mon, 0); ok(hres == S_OK, "CreateMoniker failed: %08x\n", hres); ok(mon != NULL, "mon == NULL\n"); - test_mon_displayname(mon, "about:test.swf"); + test_mon_displayname(mon, "about:test.swf", "about:blanktest.swf"); IMoniker_Release(mon); IBindHost_Release(bind_host); @@ -495,7 +496,7 @@ static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *face, IProper hres = IOleClientSite_GetMoniker(client_site, OLEGETMONIKER_ONLYIFTHERE, OLEWHICHMK_CONTAINER, &mon); ok(hres == S_OK, "GetMoniker failed: %08x\n", hres); ok(mon != NULL, "mon == NULL\n"); - test_mon_displayname(mon, "about:blank"); + test_mon_displayname(mon, "about:blank", NULL); IMoniker_Release(mon); set_plugin_readystate(READYSTATE_COMPLETE);

1 0

Jacek Caban : mshtml: Added PluginHost::GetContainer implementation.
by Alexandre Julliard Dec. 15, 2010

Dec. 15, 2010

Module: wine Branch: master Commit: 94b591cdf226693de946971d76d7273951966fd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=94b591cdf226693de946971d7… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 15 00:42:44 2010 +0100 mshtml: Added PluginHost::GetContainer implementation. --- dlls/mshtml/pluginhost.c | 13 +++++++++++-- dlls/mshtml/tests/activex.c | 27 +++++++++++++++++++++++++++ 2 files changed, 38 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index 9ab0983..f037eca 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -364,8 +364,17 @@ static HRESULT WINAPI PHClientSite_GetMoniker(IOleClientSite *iface, DWORD dwAss static HRESULT WINAPI PHClientSite_GetContainer(IOleClientSite *iface, IOleContainer **ppContainer) { PluginHost *This = impl_from_IOleClientSite(iface); - FIXME("(%p)->(%p)\n", This, ppContainer); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, ppContainer); + + if(!This->doc) { + ERR("Called on detached object\n"); + return E_UNEXPECTED; + } + + *ppContainer = &This->doc->basedoc.IOleContainer_iface; + IOleContainer_AddRef(*ppContainer); + return S_OK; } static HRESULT WINAPI PHClientSite_ShowObject(IOleClientSite *iface) diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index a89d7e7..1036577 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -1164,6 +1164,32 @@ static const IClassFactoryVtbl ClassFactoryVtbl = { static IClassFactory activex_cf = { &ClassFactoryVtbl }; +static void test_container(IHTMLDocument2 *doc_obj) +{ + IHTMLWindow2 *parent_window; + IOleContainer *container; + IHTMLDocument2 *doc; + HRESULT hres; + + container = NULL; + hres = IOleClientSite_GetContainer(client_site, &container); + ok(hres == S_OK, "GetContainer failed: %08x\n", hres); + ok(container != NULL, "container == NULL\n"); + + hres = IHTMLDocument2_get_parentWindow(doc_obj, &parent_window); + ok(hres == S_OK, "get_parentWindow failed: %08x\n", hres); + ok(parent_window != NULL, "parentWindow == NULL\n"); + + hres = IHTMLWindow2_get_document(parent_window, &doc); + ok(hres == S_OK, "get_document failed: %08x\n", hres); + ok(doc != NULL, "doc == NULL\n"); + ok(iface_cmp((IUnknown*)doc, (IUnknown*)container), "container != doc\n"); + IHTMLDocument2_Release(doc); + + IHTMLWindow2_Release(parent_window); + IOleContainer_Release(container); +} + static void test_ui_activate(void) { IOleInPlaceSite *ip_site; @@ -1779,6 +1805,7 @@ static void test_object_ax(void) CHECK_CALLED(SetObjectRects); test_ui_activate(); + test_container(notif_doc); SET_EXPECT(UIDeactivate); SET_EXPECT(Invoke_ENABLED);

1 0

Jacek Caban : mshtml: Forward PluginHost' s QueryService calls to window object.
by Alexandre Julliard Dec. 15, 2010

Dec. 15, 2010

Module: wine Branch: master Commit: 79f400c06234c0ba454f24b0ea7b4ba24a7dfed8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=79f400c06234c0ba454f24b0e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 15 00:42:53 2010 +0100 mshtml: Forward PluginHost's QueryService calls to window object. --- dlls/mshtml/pluginhost.c | 10 +++++- dlls/mshtml/tests/activex.c | 68 +++++++++++++++++++++++++++++++++++++++++- 2 files changed, 74 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/pluginhost.c b/dlls/mshtml/pluginhost.c index f037eca..1f5ca00 100644 --- a/dlls/mshtml/pluginhost.c +++ b/dlls/mshtml/pluginhost.c @@ -1020,8 +1020,14 @@ static HRESULT WINAPI PHServiceProvider_QueryService(IServiceProvider *iface, RE return IOleClientSite_QueryInterface(&This->IOleClientSite_iface, riid, ppv); } - FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); - return E_NOINTERFACE; + TRACE("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); + + if(!This->doc || !This->doc->basedoc.window) { + *ppv = NULL; + return E_NOINTERFACE; + } + + return IServiceProvider_QueryService(SERVPROV(This->doc->basedoc.window), guidService, riid, ppv); } static const IServiceProviderVtbl ServiceProviderVtbl = { diff --git a/dlls/mshtml/tests/activex.c b/dlls/mshtml/tests/activex.c index 1036577..f163c6c 100644 --- a/dlls/mshtml/tests/activex.c +++ b/dlls/mshtml/tests/activex.c @@ -29,7 +29,10 @@ #include "mshtml.h" #include "docobj.h" #include "hlink.h" +#include "dispex.h" #include "mshtmhst.h" +#include "activscp.h" +#include "objsafe.h" #include "mshtml_test.h" #define DEFINE_EXPECT(func) \ @@ -75,6 +78,7 @@ DEFINE_EXPECT(InPlaceObject_GetWindow); DEFINE_EXPECT(SetObjectRects); DEFINE_EXPECT(InPlaceDeactivate); DEFINE_EXPECT(UIDeactivate); +DEFINE_EXPECT(QueryService_TestActiveX); static HWND container_hwnd, plugin_hwnd; @@ -471,7 +475,7 @@ static HRESULT WINAPI PersistPropertyBag_Load(IPersistPropertyBag *face, IProper hres = IOleClientSite_QueryInterface(client_site, &IID_IServiceProvider, (void**)&sp); ok(hres == S_OK, "Could not get IServiceProvider iface: %08x\n", hres); - hres = IServiceProvider_QueryService(sp, &IID_IBindHost, &SID_SBindHost, (void**)&bind_host2); + hres = IServiceProvider_QueryService(sp, &SID_SBindHost, &IID_IBindHost, (void**)&bind_host2); ok(hres == S_OK, "QueryService(SID_SBindHost) failed: %08x\n", hres); IServiceProvider_Release(sp); @@ -1166,9 +1170,11 @@ static IClassFactory activex_cf = { &ClassFactoryVtbl }; static void test_container(IHTMLDocument2 *doc_obj) { - IHTMLWindow2 *parent_window; + IHTMLWindow2 *parent_window, *html_window; + IServiceProvider *serv_prov; IOleContainer *container; IHTMLDocument2 *doc; + IUnknown *unk; HRESULT hres; container = NULL; @@ -1186,6 +1192,23 @@ static void test_container(IHTMLDocument2 *doc_obj) ok(iface_cmp((IUnknown*)doc, (IUnknown*)container), "container != doc\n"); IHTMLDocument2_Release(doc); + hres = IOleClientSite_QueryInterface(client_site, &IID_IServiceProvider, (void**)&serv_prov); + ok(hres == S_OK, "Could not get IServiceProvider iface: %08x\n", hres); + + hres = IServiceProvider_QueryService(serv_prov, &IID_IHTMLWindow2, &IID_IHTMLWindow2, (void**)&html_window); + ok(hres == S_OK, "Could not get IHTMLWindow2 service: %08x\n", hres); + todo_wine + ok(!iface_cmp((IUnknown*)html_window, (IUnknown*)parent_window), "html_window != parent_window\n"); + IHTMLWindow2_Release(html_window); + + SET_EXPECT(QueryService_TestActiveX); + hres = IServiceProvider_QueryService(serv_prov, &CLSID_TestActiveX, &IID_IUnknown, (void**)&unk); + ok(hres == S_OK, "QueryService(CLSID_TestActiveX) failed: %08x\n", hres); + ok(unk == (IUnknown*)&OleObject, "unexpected unk %p\n", unk); + CHECK_CALLED(QueryService_TestActiveX); + + IServiceProvider_Release(serv_prov); + IHTMLWindow2_Release(parent_window); IOleContainer_Release(container); } @@ -1567,6 +1590,45 @@ static const IOleDocumentSiteVtbl DocumentSiteVtbl = { static IOleDocumentSite DocumentSite = { &DocumentSiteVtbl }; +static HRESULT WINAPI ServiceProvider_QueryInterface(IServiceProvider *iface, + REFIID riid, void **ppv) +{ + return cs_qi(riid, ppv); +} + +static ULONG WINAPI ServiceProvider_AddRef(IServiceProvider *iface) +{ + return 2; +} + +static ULONG WINAPI ServiceProvider_Release(IServiceProvider *iface) +{ + return 1; +} + +static HRESULT WINAPI ServiceProvider_QueryService(IServiceProvider *iface, REFGUID guidService, + REFIID riid, void **ppv) +{ + if(IsEqualGUID(&CLSID_TestActiveX, guidService)) { + CHECK_EXPECT(QueryService_TestActiveX); + ok(IsEqualGUID(&IID_IUnknown, riid), "unexpected riid %s\n", debugstr_guid(riid)); + *ppv = &OleObject; + return S_OK; + } + + *ppv = NULL; + return E_NOINTERFACE; +} + +static const IServiceProviderVtbl ServiceProviderVtbl = { + ServiceProvider_QueryInterface, + ServiceProvider_AddRef, + ServiceProvider_Release, + ServiceProvider_QueryService +}; + +static IServiceProvider ServiceProvider = { &ServiceProviderVtbl }; + static HRESULT cs_qi(REFIID riid, void **ppv) { *ppv = NULL; @@ -1577,6 +1639,8 @@ static HRESULT cs_qi(REFIID riid, void **ppv) *ppv = &DocumentSite; else if(IsEqualGUID(&IID_IOleWindow, riid) || IsEqualGUID(&IID_IOleInPlaceSite, riid)) *ppv = &InPlaceSite; + else if(IsEqualGUID(riid, &IID_IServiceProvider)) + *ppv = &ServiceProvider; return *ppv ? S_OK : E_NOINTERFACE; }

1 0

Henri Verbeet : wined3d: Store an IWineD3DBaseShaderImpl pointer in wined3d_shader_context.
by Alexandre Julliard Dec. 15, 2010

Dec. 15, 2010

Module: wine Branch: master Commit: bd2e7aedcf51b7dc48b5d1fd2d0f140d94b676af URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd2e7aedcf51b7dc48b5d1fd2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 14 18:31:01 2010 +0100 wined3d: Store an IWineD3DBaseShaderImpl pointer in wined3d_shader_context. --- dlls/wined3d/arb_program_shader.c | 18 +++++++++--------- dlls/wined3d/glsl_shader.c | 24 ++++++++++++------------ dlls/wined3d/shader.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 23 insertions(+), 23 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd2e7aedcf51b7dc48b5d…

1 0

Henri Verbeet : wined3d: Pass implementation pointers to get_glsl_program_entry().
by Alexandre Julliard Dec. 15, 2010

Dec. 15, 2010

Module: wine Branch: master Commit: c492ec196e4e8984ffc0068fb244315dec3756ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=c492ec196e4e8984ffc0068fb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Dec 14 18:30:58 2010 +0100 wined3d: Pass implementation pointers to get_glsl_program_entry(). --- dlls/wined3d/glsl_shader.c | 12 ++++++------ 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e6d1b86..6062231 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3703,13 +3703,14 @@ static void add_glsl_program_entry(struct shader_glsl_priv *priv, struct glsl_sh } static struct glsl_shader_prog_link *get_glsl_program_entry(struct shader_glsl_priv *priv, - IWineD3DVertexShader *vshader, IWineD3DPixelShader *pshader, struct vs_compile_args *vs_args, - struct ps_compile_args *ps_args) { + IWineD3DVertexShaderImpl *vshader, IWineD3DPixelShaderImpl *pshader, + struct vs_compile_args *vs_args, struct ps_compile_args *ps_args) +{ struct wine_rb_entry *entry; glsl_program_key_t key; - key.vshader = (IWineD3DVertexShaderImpl *)vshader; - key.pshader = (IWineD3DPixelShaderImpl *)pshader; + key.vshader = vshader; + key.pshader = pshader; key.vs_args = *vs_args; key.ps_args = *ps_args; @@ -4302,8 +4303,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, if (vshader) find_vs_compile_args(state, vshader, &vs_compile_args); if (pshader) find_ps_compile_args(state, pshader, &ps_compile_args); - entry = get_glsl_program_entry(priv, (IWineD3DVertexShader *)vshader, (IWineD3DPixelShader *)pshader, - &vs_compile_args, &ps_compile_args); + entry = get_glsl_program_entry(priv, vshader, pshader, &vs_compile_args, &ps_compile_args); if (entry) { priv->glsl_program = entry;

1 0