wine/dlls/shdocvw shdocvw.h oleobject.c client.c
Alexandre Julliard
julliard at wine.codeweavers.com
Tue Nov 22 05:59:57 CST 2005
ChangeSet ID: 21391
CVSROOT: /opt/cvs-commit
Module name: wine
Changes by: julliard at winehq.org 2005/11/22 05:59:57
Modified files:
dlls/shdocvw : shdocvw.h oleobject.c client.c
Log message:
Jacek Caban <jacek at codeweavers.com>
Create window in SetClientSite and return it in
IOleInPlaceSite::GetWindow.
Patch: http://cvs.winehq.org/patch.py?id=21391
Old revision New revision Changes Path
1.31 1.32 +5 -0 wine/dlls/shdocvw/shdocvw.h
1.18 1.19 +92 -4 wine/dlls/shdocvw/oleobject.c
1.3 1.4 +5 -2 wine/dlls/shdocvw/client.c
Index: wine/dlls/shdocvw/shdocvw.h
diff -u -p wine/dlls/shdocvw/shdocvw.h:1.31 wine/dlls/shdocvw/shdocvw.h:1.32
--- wine/dlls/shdocvw/shdocvw.h:1.31 22 Nov 2005 11:59:57 -0000
+++ wine/dlls/shdocvw/shdocvw.h 22 Nov 2005 11:59:57 -0000
@@ -95,6 +95,9 @@ typedef struct {
RECT clip_rect;
OLEINPLACEFRAMEINFO frameinfo;
+ HWND doc_view_hwnd;
+ HWND shell_embedding_hwnd;
+
/* Connection points */
IConnectionPoint *cp_wbe2;
@@ -144,4 +147,6 @@ extern LONG SHDOCVW_refCount;
static inline void SHDOCVW_LockModule(void) { InterlockedIncrement( &SHDOCVW_refCount ); }
static inline void SHDOCVW_UnlockModule(void) { InterlockedDecrement( &SHDOCVW_refCount ); }
+extern HINSTANCE shdocvw_hinstance;
+
#endif /* __WINE_SHDOCVW_H */
Index: wine/dlls/shdocvw/oleobject.c
diff -u -p wine/dlls/shdocvw/oleobject.c:1.18 wine/dlls/shdocvw/oleobject.c:1.19
--- wine/dlls/shdocvw/oleobject.c:1.18 22 Nov 2005 11:59:57 -0000
+++ wine/dlls/shdocvw/oleobject.c 22 Nov 2005 11:59:57 -0000
@@ -29,6 +29,84 @@
WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
+static ATOM doc_view_atom = 0;
+static ATOM shell_embedding_atom = 0;
+
+static LRESULT WINAPI doc_view_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+ return DefWindowProcA(hwnd, msg, wParam, lParam);
+}
+
+static LRESULT WINAPI shell_embedding_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
+{
+ return DefWindowProcA(hwnd, msg, wParam, lParam);
+}
+
+static void create_doc_view_hwnd(WebBrowser *This)
+{
+ static const WCHAR wszShell_DocObject_View[] =
+ {'S','h','e','l','l',' ','D','o','c','O','b','j','e','c','t',' ','V','i','e','w',0};
+
+ if(!doc_view_atom) {
+ static WNDCLASSEXW wndclass = {
+ sizeof(wndclass),
+ CS_PARENTDC,
+ doc_view_proc,
+ 0, 0 /* native uses 4*/, NULL, NULL, NULL,
+ (HBRUSH)COLOR_WINDOWFRAME, NULL,
+ wszShell_DocObject_View,
+ NULL
+ };
+
+ wndclass.hInstance = shdocvw_hinstance;
+
+ doc_view_atom = RegisterClassExW(&wndclass);
+ }
+
+ This->doc_view_hwnd = CreateWindowExW(0, wszShell_DocObject_View, NULL,
+ WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP | WS_MAXIMIZEBOX,
+ 0, 0, 0, 0, This->shell_embedding_hwnd,
+ NULL, shdocvw_hinstance, This);
+}
+
+static void create_shell_embedding_hwnd(WebBrowser *This)
+{
+ IOleInPlaceSite *inplace;
+ HWND parent = NULL;
+ HRESULT hres;
+
+ static const WCHAR wszShellEmbedding[] =
+ {'S','h','e','l','l',' ','E','m','b','e','d','d','i','n','g',0};
+
+ if(!shell_embedding_atom) {
+ static WNDCLASSEXW wndclass = {
+ sizeof(wndclass),
+ CS_DBLCLKS,
+ shell_embedding_proc,
+ 0, 0 /* native uses 8 */, NULL, NULL, NULL,
+ (HBRUSH)COLOR_WINDOWFRAME, NULL,
+ wszShellEmbedding,
+ NULL
+ };
+ wndclass.hInstance = shdocvw_hinstance;
+
+ RegisterClassExW(&wndclass);
+ }
+
+ hres = IOleClientSite_QueryInterface(This->client, &IID_IOleInPlaceSite, (void**)&inplace);
+ if(SUCCEEDED(hres)) {
+ IOleInPlaceSite_GetWindow(inplace, &parent);
+ IOleInPlaceSite_Release(inplace);
+ }
+
+ This->shell_embedding_hwnd = CreateWindowExW(0, wszShellEmbedding, NULL,
+ WS_CHILD | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP | WS_MAXIMIZEBOX,
+ 0, 0, 0, 0, parent,
+ NULL, shdocvw_hinstance, This);
+
+ create_doc_view_hwnd(This);
+}
+
/**********************************************************************
* Implement the IOleObject interface for the WebBrowser control
*/
@@ -62,13 +140,22 @@ static HRESULT WINAPI OleObject_SetClien
if(This->client == pClientSite)
return S_OK;
+ if(This->doc_view_hwnd)
+ DestroyWindow(This->doc_view_hwnd);
+ if(This->shell_embedding_hwnd)
+ DestroyWindow(This->shell_embedding_hwnd);
+
if(This->client)
IOleClientSite_Release(This->client);
- if(pClientSite)
- IOleClientSite_AddRef(pClientSite);
-
This->client = pClientSite;
+ if(!pClientSite)
+ return S_OK;
+
+ IOleClientSite_AddRef(pClientSite);
+
+ create_shell_embedding_hwnd(This);
+
return S_OK;
}
@@ -176,6 +263,7 @@ static HRESULT WINAPI OleObject_DoVerb(I
&This->pos_rect, &This->clip_rect,
&This->frameinfo);
+
IOleInPlaceSite_Release(inplace);
if(This->client) {
@@ -507,7 +595,7 @@ void WebBrowser_OleObject_Init(WebBrowse
void WebBrowser_OleObject_Destroy(WebBrowser *This)
{
if(This->client)
- IOleClientSite_Release(This->client);
+ IOleObject_SetClientSite(OLEOBJ(This), NULL);
if(This->container)
IOleContainer_Release(This->container);
if(This->frame)
Index: wine/dlls/shdocvw/client.c
diff -u -p wine/dlls/shdocvw/client.c:1.3 wine/dlls/shdocvw/client.c:1.4
--- wine/dlls/shdocvw/client.c:1.3 22 Nov 2005 11:59:57 -0000
+++ wine/dlls/shdocvw/client.c 22 Nov 2005 11:59:57 -0000
@@ -151,8 +151,11 @@ static ULONG WINAPI InPlaceSite_Release(
static HRESULT WINAPI InPlaceSite_GetWindow(IOleInPlaceSite *iface, HWND *phwnd)
{
WebBrowser *This = INPLACESITE_THIS(iface);
- FIXME("(%p)->(%p)\n", This, phwnd);
- return E_NOTIMPL;
+
+ TRACE("(%p)->(%p)\n", This, phwnd);
+
+ *phwnd = This->doc_view_hwnd;
+ return S_OK;
}
static HRESULT WINAPI InPlaceSite_ContextSensitiveHelp(IOleInPlaceSite *iface, BOOL fEnterMode)
More information about the wine-cvs
mailing list