wine/dlls/shdocvw client.c

[Alexandre Julliard]

ChangeSet ID:	21582
CVSROOT:	/opt/cvs-commit
Module name:	wine
Changes by:	[e-mail]	2005/12/01 05:58:27

Modified files:
    dlls/shdocvw   : client.c

Log message:
    Jacek Caban 
    Return S_OK in [On|Can]InPlaceActivate.
    Handle IOleDocumentSite in QueryInterface.

Patch: http://cvs.winehq.org/patch.py?id=21582

Old revision  New revision  Changes     Path
 1.6           1.7           +14 -4      wine/dlls/shdocvw/client.c

Index: wine/dlls/shdocvw/client.c
diff -u -p wine/dlls/shdocvw/client.c:1.6 wine/dlls/shdocvw/client.c:1.7
--- wine/dlls/shdocvw/client.c:1.6	1 Dec 2005 11:58:27 -0000
+++ wine/dlls/shdocvw/client.c	1 Dec 2005 11:58:27 -0000
@@ -47,6 +47,9 @@ static HRESULT WINAPI ClientSite_QueryIn
     }else if(IsEqualGUID(&IID_IDocHostUIHandler2, riid)) {
         TRACE("(%p)->(IID_IDocHostUIHandler2 %p)\n", This, ppv);
         *ppv = DOCHOSTUI2(This);
+    }else if(IsEqualGUID(&IID_IOleDocumentSite, riid)) {
+        TRACE("(%p)->(IID_IOleDocumentSite %p)\n", This, ppv);
+        *ppv = DOCSITE(This);
     }

if(*ppv) {
@@ -168,15 +171,21 @@ static HRESULT WINAPI InPlaceSite_Contex
 static HRESULT WINAPI InPlaceSite_CanInPlaceActivate(IOleInPlaceSite *iface)
 {
     WebBrowser *This = INPLACESITE_THIS(iface);
-    FIXME("(%p)\n", This);
-    return E_NOTIMPL;
+
+    TRACE("(%p)\n", This);
+
+    /* Nothing to do here */
+    return S_OK;
 }

static HRESULT WINAPI InPlaceSite_OnInPlaceActivate(IOleInPlaceSite *iface)
 {
     WebBrowser *This = INPLACESITE_THIS(iface);
-    FIXME("(%p)\n", This);
-    return E_NOTIMPL;
+
+    TRACE("(%p)\n", This);
+
+    /* Nothing to do here */
+    return S_OK;
 }

static HRESULT WINAPI InPlaceSite_OnUIActivate(IOleInPlaceSite *iface)
@@ -197,6 +206,7 @@ static HRESULT WINAPI InPlaceSite_GetWin

*ppFrame = INPLACEFRAME(This);
     *ppDoc = NULL;
+
     GetClientRect(This->doc_view_hwnd, lprcPosRect);
     memcpy(lprcClipRect, lprcPosRect, sizeof(RECT));