April 2006 - Wine-commits - list.winehq.org

Dmitry Timoshkov : winspool: Add a test for DocumentProperties.
by Alexandre Julliard 18 Apr '06

18 Apr '06

Module: wine Branch: refs/heads/master Commit: b5d677a5b2723959473f2b2d8e259993cfe33591 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b5d677a5b2723959473f2b2… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Apr 18 19:36:58 2006 +0900 winspool: Add a test for DocumentProperties. --- dlls/winspool/tests/info.c | 50 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/winspool/tests/info.c b/dlls/winspool/tests/info.c index cc3969e..1ca00b6 100644 --- a/dlls/winspool/tests/info.c +++ b/dlls/winspool/tests/info.c @@ -25,6 +25,7 @@ #include "winbase.h" #include "winerror.h" #include "wingdi.h" +#include "winuser.h" #include "winreg.h" #include "winspool.h" @@ -1082,6 +1083,54 @@ static void test_GetPrinterDriver(void) ok(ret, "ClosePrinter error %ld\n", GetLastError()); } +static void test_DEVMODE(const DEVMODE *dm, LONG dmSize, LPCSTR exp_prn_name) +{ + ok(!strcmp(exp_prn_name, (LPCSTR)dm->dmDeviceName), "expected %s, got %s\n", exp_prn_name, dm->dmDeviceName); + ok(dm->dmSize + dm->dmDriverExtra == dmSize, "%u != %ld\n", dm->dmSize + dm->dmDriverExtra, dmSize); + trace("dmFields %08lx\n", dm->dmFields); +} + +static void test_DocumentProperties(void) +{ + LPSTR default_printer; + HANDLE hprn; + LONG dm_size, ret; + DEVMODE *dm; + + default_printer = find_default_printer(); + if (!default_printer) + { + trace("There is no default printer installed, skiping the test\n"); + return; + } + + hprn = 0; + ret = OpenPrinter(default_printer, &hprn, NULL); + if (!ret) + { + trace("There is no printers installed, skiping the test\n"); + return; + } + ok(hprn != 0, "wrong hprn %p\n", hprn); + + dm_size = DocumentProperties(0, hprn, NULL, NULL, NULL, 0); + trace("DEVMODE required size %ld\n", dm_size); + ok(dm_size >= sizeof(DEVMODE), "unexpected DocumentProperties ret value %ld\n", dm_size); + + dm = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, dm_size); + + ret = DocumentProperties(0, hprn, NULL, dm, dm, DM_OUT_BUFFER); + ok(ret == IDOK, "DocumentProperties ret value %ld != expected IDOK\n", ret); + + test_DEVMODE(dm, dm_size, default_printer); + + HeapFree(GetProcessHeap(), 0, dm); + + SetLastError(0xdeadbeef); + ret = ClosePrinter(hprn); + ok(ret, "ClosePrinter error %ld\n", GetLastError()); +} + START_TEST(info) { hwinspool = GetModuleHandleA("winspool.drv"); @@ -1092,6 +1141,7 @@ START_TEST(info) test_AddMonitor(); test_DeleteMonitor(); + test_DocumentProperties(); test_EnumMonitors(); test_GetDefaultPrinter(); test_GetPrinterDriverDirectory();

1 0

Alexandre Julliard : explorer: Initial version of dynamic drive support using HAL.
by Alexandre Julliard 18 Apr '06

18 Apr '06

Module: wine Branch: refs/heads/master Commit: 7a324307b3bf882e484c0c0d77de358a9f598afe URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=7a324307b3bf882e484c0c0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 18 16:48:13 2006 +0200 explorer: Initial version of dynamic drive support using HAL. --- programs/explorer/Makefile.in | 4 programs/explorer/desktop.c | 1 programs/explorer/explorer_private.h | 1 programs/explorer/hal.c | 438 ++++++++++++++++++++++++++++++++++ 4 files changed, 443 insertions(+), 1 deletions(-) create mode 100644 programs/explorer/hal.c Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=7a324307b3bf882e484…

1 0

Alexandre Julliard : configure: Added checks for HAL libraries.
by Alexandre Julliard 18 Apr '06

18 Apr '06

Module: wine Branch: refs/heads/master Commit: 0006898912e664ee2fdc896903018ad2b1efeae5 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=0006898912e664ee2fdc896… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 18 16:47:53 2006 +0200 configure: Added checks for HAL libraries. --- configure | 385 +++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 17 ++ include/config.h.in | 15 ++ 3 files changed, 416 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/?p=wine.git;a=commitdiff;h=0006898912e664ee2fd…

1 0

Alexandre Julliard : libwine: Added a couple of missing memory constraints in LDT syscalls.
by Alexandre Julliard 18 Apr '06

18 Apr '06

Module: wine Branch: refs/heads/master Commit: a8569bf7e0b52db40212e639e5d231dd786d06c4 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=a8569bf7e0b52db40212e63… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Apr 18 16:47:26 2006 +0200 libwine: Added a couple of missing memory constraints in LDT syscalls. --- libs/wine/ldt.c | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/libs/wine/ldt.c b/libs/wine/ldt.c index 6038c6f..9cb5ecf 100644 --- a/libs/wine/ldt.c +++ b/libs/wine/ldt.c @@ -80,7 +80,8 @@ static inline int modify_ldt( int func, : "0" (SYS_modify_ldt), "r" (func), "c" (ptr), - "d" (count) ); + "d" (count), + "m" (*ptr) ); if (res >= 0) return res; errno = -res; return -1; @@ -90,11 +91,11 @@ static inline int set_thread_area( struc { int res; __asm__ __volatile__( "pushl %%ebx\n\t" - "movl %2,%%ebx\n\t" + "movl %3,%%ebx\n\t" "int $0x80\n\t" "popl %%ebx" - : "=a" (res) - : "0" (243) /* SYS_set_thread_area */, "q" (ptr) ); + : "=a" (res), "=m" (*ptr) + : "0" (243) /* SYS_set_thread_area */, "q" (ptr), "m" (*ptr) ); if (res >= 0) return res; errno = -res; return -1;

1 0

Jacek Caban : shdocvw: Use DocHost, not WebBrowser, in Shell DocObject View window.
by Alexandre Julliard 18 Apr '06

18 Apr '06

Module: wine Branch: refs/heads/master Commit: 00e3ac5b31dd0a9e5e2c8cd208216a62eba5b2db URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=00e3ac5b31dd0a9e5e2c8cd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 18 00:42:45 2006 +0200 shdocvw: Use DocHost, not WebBrowser, in Shell DocObject View window. --- dlls/shdocvw/dochost.c | 32 ++++++++++++++++---------------- dlls/shdocvw/navigate.c | 6 +++--- dlls/shdocvw/shdocvw.h | 6 +++--- dlls/shdocvw/webbrowser.c | 10 +++++----- 4 files changed, 27 insertions(+), 27 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 9b8da44..dbebc77 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -25,7 +25,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); static ATOM doc_view_atom = 0; -static void navigate_complete(WebBrowser *This) +static void navigate_complete(DocHost *This) { IDispatch *disp = NULL; DISPPARAMS dispparams; @@ -33,7 +33,7 @@ static void navigate_complete(WebBrowser VARIANT url; HRESULT hres; - hres = IUnknown_QueryInterface(This->doc_host.document, &IID_IDispatch, (void**)&disp); + hres = IUnknown_QueryInterface(This->document, &IID_IDispatch, (void**)&disp); if(FAILED(hres)) FIXME("Could not get IDispatch interface\n"); @@ -51,26 +51,26 @@ static void navigate_complete(WebBrowser V_VT(&url) = VT_BSTR; V_BSTR(&url) = This->url; - call_sink(This->doc_host.cp_wbe2, DISPID_NAVIGATECOMPLETE2, &dispparams); - call_sink(This->doc_host.cp_wbe2, DISPID_DOCUMENTCOMPLETE, &dispparams); + call_sink(This->cp_wbe2, DISPID_NAVIGATECOMPLETE2, &dispparams); + call_sink(This->cp_wbe2, DISPID_DOCUMENTCOMPLETE, &dispparams); if(disp) IDispatch_Release(disp); } -static LRESULT navigate2(WebBrowser *This) +static LRESULT navigate2(DocHost *This) { IHlinkTarget *hlink; HRESULT hres; TRACE("(%p)\n", This); - if(!This->doc_host.document) { + if(!This->document) { WARN("document == NULL\n"); return 0; } - hres = IUnknown_QueryInterface(This->doc_host.document, &IID_IHlinkTarget, (void**)&hlink); + hres = IUnknown_QueryInterface(This->document, &IID_IHlinkTarget, (void**)&hlink); if(FAILED(hres)) { FIXME("Could not get IHlinkTarget interface\n"); return 0; @@ -88,26 +88,26 @@ static LRESULT navigate2(WebBrowser *Thi return 0; } -static LRESULT resize_document(WebBrowser *This, LONG width, LONG height) +static LRESULT resize_document(DocHost *This, LONG width, LONG height) { RECT rect = {0, 0, width, height}; TRACE("(%p)->(%ld %ld)\n", This, width, height); - if(This->doc_host.view) - IOleDocumentView_SetRect(This->doc_host.view, &rect); + if(This->view) + IOleDocumentView_SetRect(This->view, &rect); return 0; } static LRESULT WINAPI doc_view_proc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { - WebBrowser *This; + DocHost *This; static const WCHAR wszTHIS[] = {'T','H','I','S',0}; if(msg == WM_CREATE) { - This = *(WebBrowser**)lParam; + This = *(DocHost**)lParam; SetPropW(hwnd, wszTHIS, This); }else { This = GetPropW(hwnd, wszTHIS); @@ -123,7 +123,7 @@ static LRESULT WINAPI doc_view_proc(HWND return DefWindowProcW(hwnd, msg, wParam, lParam); } -void create_doc_view_hwnd(WebBrowser *This) +void create_doc_view_hwnd(DocHost *This) { RECT rect; @@ -146,11 +146,11 @@ void create_doc_view_hwnd(WebBrowser *Th doc_view_atom = RegisterClassExW(&wndclass); } - GetClientRect(This->shell_embedding_hwnd, &rect); - This->doc_host.hwnd = CreateWindowExW(0, wszShell_DocObject_View, + GetClientRect(This->frame_hwnd, &rect); /* FIXME */ + This->hwnd = CreateWindowExW(0, wszShell_DocObject_View, wszShell_DocObject_View, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP, - rect.left, rect.top, rect.right, rect.bottom, This->shell_embedding_hwnd, + rect.left, rect.top, rect.right, rect.bottom, This->frame_hwnd, NULL, shdocvw_hinstance, This); } diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 0b8445e..a506e2e 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -456,8 +456,8 @@ HRESULT navigate_url(WebBrowser *This, L return hres; } - IMoniker_GetDisplayName(mon, NULL, NULL, &This->url); - TRACE("navigating to %s\n", debugstr_w(This->url)); + IMoniker_GetDisplayName(mon, NULL, NULL, &This->doc_host.url); + TRACE("navigating to %s\n", debugstr_w(This->doc_host.url)); callback = create_callback(This, post_data, post_data_len, (LPWSTR)headers, &cancel); CreateAsyncBindCtx(0, callback, 0, &bindctx); @@ -517,7 +517,7 @@ HRESULT navigate_hlink(WebBrowser *This, return S_OK; } - This->url = url; + This->doc_host.url = url; return navigate(This, mon, bindctx, callback); } diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 28e3a0f..bb15549 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -74,6 +74,8 @@ typedef struct { HWND hwnd; HWND frame_hwnd; + LPOLESTR url; + /* Connection points */ ConnectionPoint *cp_wbe2; @@ -103,8 +105,6 @@ typedef struct WebBrowser { IOleContainer *container; IOleInPlaceSite *inplace; - LPOLESTR url; - /* window context */ HWND iphwnd; @@ -166,7 +166,7 @@ void DocHost_Events_Release(DocHost*); HRESULT WebBrowser_Create(IUnknown*,REFIID,void**); -void create_doc_view_hwnd(WebBrowser *This); +void create_doc_view_hwnd(DocHost*); void deactivate_document(DocHost*); void call_sink(ConnectionPoint*,DISPID,DISPPARAMS*); HRESULT navigate_url(WebBrowser*,LPCWSTR,PBYTE,ULONG,LPWSTR); diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index a29ebed..6dda296 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -132,7 +132,7 @@ static ULONG WINAPI WebBrowser_Release(I WebBrowser_OleObject_Destroy(This); - SysFreeString(This->url); + SysFreeString(This->doc_host.url); HeapFree(GetProcessHeap(), 0, This); SHDOCVW_UnlockModule(); } @@ -411,13 +411,13 @@ static HRESULT WINAPI WebBrowser_get_Loc FIXME("(%p)->(%p)\n", This, LocationURL); - if(!This->url) { + if(!This->doc_host.url) { static const WCHAR null_char = 0; *LocationURL = SysAllocString(&null_char); return S_FALSE; } - *LocationURL = SysAllocString(This->url); + *LocationURL = SysAllocString(This->doc_host.url); return S_OK; } @@ -613,7 +613,7 @@ static HRESULT WINAPI WebBrowser_Navigat } if(!This->doc_host.hwnd) - create_doc_view_hwnd(This); + create_doc_view_hwnd(&This->doc_host); hres = navigate_url(This, V_BSTR(URL), post_data, post_data_len, headers); @@ -844,7 +844,7 @@ HRESULT WebBrowser_Create(IUnknown *pOut ret->lpWebBrowser2Vtbl = &WebBrowser2Vtbl; ret->ref = 0; - ret->url = NULL; + ret->doc_host.url = NULL; ret->doc_host.disp = (IDispatch*)WEBBROWSER2(ret); DocHost_Init(&ret->doc_host);

1 0

Jacek Caban : shdocvw: Use DocHost, not WebBrowser, in navigate_url.
by Alexandre Julliard 18 Apr '06

18 Apr '06

Module: wine Branch: refs/heads/master Commit: 470e987d2f05a8bd0d33e17be6c37ca730c4bf84 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=470e987d2f05a8bd0d33e17… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 18 00:44:17 2006 +0200 shdocvw: Use DocHost, not WebBrowser, in navigate_url. --- dlls/shdocvw/navigate.c | 38 +++++++++++++++++++------------------- dlls/shdocvw/shdocvw.h | 6 ++---- dlls/shdocvw/webbrowser.c | 2 +- 3 files changed, 22 insertions(+), 24 deletions(-) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index a506e2e..1b6ba87 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -288,7 +288,7 @@ static const IHttpNegotiateVtbl HttpNego HttpNegotiate_OnResponse }; -static IBindStatusCallback *create_callback(WebBrowser *This, PBYTE post_data, +static IBindStatusCallback *create_callback(DocHost *This, PBYTE post_data, ULONG post_data_len, LPWSTR headers, VARIANT_BOOL *cancel) { BindStatusCallback *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(BindStatusCallback)); @@ -315,7 +315,7 @@ static IBindStatusCallback *create_callb return BINDSC(ret); } -static void on_before_navigate2(WebBrowser *This, LPWSTR url, PBYTE post_data, ULONG post_data_len, +static void on_before_navigate2(DocHost *This, LPWSTR url, PBYTE post_data, ULONG post_data_len, LPWSTR headers, VARIANT_BOOL *cancel) { VARIANT var_url, var_flags, var_frame_name, var_post_data, var_post_data2, var_headers; @@ -369,16 +369,16 @@ static void on_before_navigate2(WebBrows V_BSTR(&var_url) = SysAllocString(url); V_VT(params+6) = (VT_DISPATCH); - V_DISPATCH(params+6) = (IDispatch*)WEBBROWSER2(This); + V_DISPATCH(params+6) = This->disp; - call_sink(This->doc_host.cp_wbe2, DISPID_BEFORENAVIGATE2, &dispparams); + call_sink(This->cp_wbe2, DISPID_BEFORENAVIGATE2, &dispparams); SysFreeString(V_BSTR(&var_url)); if(post_data_len) SafeArrayDestroy(V_ARRAY(&var_post_data)); } -static HRESULT navigate(WebBrowser *This, IMoniker *mon, IBindCtx *bindctx, +static HRESULT navigate(DocHost *This, IMoniker *mon, IBindCtx *bindctx, IBindStatusCallback *callback) { IOleObject *oleobj; @@ -392,7 +392,7 @@ static HRESULT navigate(WebBrowser *This } IBindCtx_RegisterObjectParam(bindctx, (LPOLESTR)SZ_HTML_CLIENTSITE_OBJECTPARAM, - (IUnknown*)CLIENTSITE(&This->doc_host)); + (IUnknown*)CLIENTSITE(This)); /* * FIXME: @@ -400,19 +400,19 @@ static HRESULT navigate(WebBrowser *This * This should be fixed when mshtml.dll and urlmon.dll will be good enough. */ - if(This->doc_host.document) - deactivate_document(&This->doc_host); + if(This->document) + deactivate_document(This); hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, - &IID_IUnknown, (void**)&This->doc_host.document); + &IID_IUnknown, (void**)&This->document); if(FAILED(hres)) { ERR("Could not create HTMLDocument: %08lx\n", hres); return hres; } - hres = IUnknown_QueryInterface(This->doc_host.document, &IID_IPersistMoniker, (void**)&persist); + hres = IUnknown_QueryInterface(This->document, &IID_IPersistMoniker, (void**)&persist); if(FAILED(hres)) return hres; @@ -428,20 +428,20 @@ static HRESULT navigate(WebBrowser *This return hres; } - hres = IUnknown_QueryInterface(This->doc_host.document, &IID_IOleObject, (void**)&oleobj); + hres = IUnknown_QueryInterface(This->document, &IID_IOleObject, (void**)&oleobj); if(FAILED(hres)) return hres; - hres = IOleObject_SetClientSite(oleobj, CLIENTSITE(&This->doc_host)); + hres = IOleObject_SetClientSite(oleobj, CLIENTSITE(This)); IOleObject_Release(oleobj); - PostMessageW(This->doc_host.hwnd, WB_WM_NAVIGATE2, 0, 0); + PostMessageW(This->hwnd, WB_WM_NAVIGATE2, 0, 0); return hres; } -HRESULT navigate_url(WebBrowser *This, LPCWSTR url, PBYTE post_data, ULONG post_data_len, +HRESULT navigate_url(DocHost *This, LPCWSTR url, PBYTE post_data, ULONG post_data_len, LPWSTR headers) { IBindStatusCallback *callback; @@ -456,8 +456,8 @@ HRESULT navigate_url(WebBrowser *This, L return hres; } - IMoniker_GetDisplayName(mon, NULL, NULL, &This->doc_host.url); - TRACE("navigating to %s\n", debugstr_w(This->doc_host.url)); + IMoniker_GetDisplayName(mon, NULL, NULL, &This->url); + TRACE("navigating to %s\n", debugstr_w(This->url)); callback = create_callback(This, post_data, post_data_len, (LPWSTR)headers, &cancel); CreateAsyncBindCtx(0, callback, 0, &bindctx); @@ -469,7 +469,7 @@ HRESULT navigate_url(WebBrowser *This, L return hres; } -HRESULT navigate_hlink(WebBrowser *This, IMoniker *mon, IBindCtx *bindctx, +HRESULT navigate_hlink(DocHost *This, IMoniker *mon, IBindCtx *bindctx, IBindStatusCallback *callback) { IHttpNegotiate *http_negotiate; @@ -517,7 +517,7 @@ HRESULT navigate_hlink(WebBrowser *This, return S_OK; } - This->doc_host.url = url; + This->url = url; return navigate(This, mon, bindctx, callback); } @@ -586,7 +586,7 @@ static HRESULT WINAPI HlinkFrame_Navigat return E_NOTIMPL; } - return navigate_hlink(This, mon, pbc, pibsc); + return navigate_hlink(&This->doc_host, mon, pbc, pibsc); } static HRESULT WINAPI HlinkFrame_OnNavigate(IHlinkFrame *iface, DWORD grfHLNF, diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index bb15549..9228478 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -51,8 +51,6 @@ extern HRESULT SHDOCVW_GetShellInstanceO typedef struct ConnectionPoint ConnectionPoint; -struct WebBrowser; - typedef struct { const IOleClientSiteVtbl *lpOleClientSiteVtbl; const IOleInPlaceSiteVtbl *lpOleInPlaceSiteVtbl; @@ -83,7 +81,7 @@ typedef struct { ConnectionPoint *cp_pns; } DocHost; -typedef struct WebBrowser { +typedef struct { /* Interfaces available via WebBrowser object */ const IWebBrowser2Vtbl *lpWebBrowser2Vtbl; @@ -169,7 +167,7 @@ HRESULT WebBrowser_Create(IUnknown*,REFI void create_doc_view_hwnd(DocHost*); void deactivate_document(DocHost*); void call_sink(ConnectionPoint*,DISPID,DISPPARAMS*); -HRESULT navigate_url(WebBrowser*,LPCWSTR,PBYTE,ULONG,LPWSTR); +HRESULT navigate_url(DocHost*,LPCWSTR,PBYTE,ULONG,LPWSTR); #define WB_WM_NAVIGATE2 (WM_USER+100) diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 6dda296..cb2d284 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -615,7 +615,7 @@ static HRESULT WINAPI WebBrowser_Navigat if(!This->doc_host.hwnd) create_doc_view_hwnd(&This->doc_host); - hres = navigate_url(This, V_BSTR(URL), post_data, post_data_len, headers); + hres = navigate_url(&This->doc_host, V_BSTR(URL), post_data, post_data_len, headers); if(post_data) SafeArrayUnaccessData(V_ARRAY(PostData));

1 0

Jacek Caban : shdocvw: Move connection points to DocHost object.
by Alexandre Julliard 18 Apr '06

18 Apr '06

Module: wine Branch: refs/heads/master Commit: 61560b8715127a93fd0a26337e256c4061f3ccf6 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=61560b8715127a93fd0a263… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 18 00:41:43 2006 +0200 shdocvw: Move connection points to DocHost object. --- dlls/shdocvw/client.c | 6 +++--- dlls/shdocvw/dochost.c | 11 +++++++++-- dlls/shdocvw/events.c | 41 +++++++++++++++++++++++++---------------- dlls/shdocvw/navigate.c | 2 +- dlls/shdocvw/shdocvw.h | 22 ++++++++++++---------- dlls/shdocvw/webbrowser.c | 4 ++-- 6 files changed, 52 insertions(+), 34 deletions(-) diff --git a/dlls/shdocvw/client.c b/dlls/shdocvw/client.c index d6cd7ed..41cc176 100644 --- a/dlls/shdocvw/client.c +++ b/dlls/shdocvw/client.c @@ -475,8 +475,8 @@ void DocHost_ClientSite_Init(DocHost *Th This->view = NULL; } -void WebBrowser_ClientSite_Destroy(WebBrowser *This) +void DocHost_ClientSite_Release(DocHost *This) { - if(This->doc_host.view) - IOleDocumentView_Release(This->doc_host.view); + if(This->view) + IOleDocumentView_Release(This->view); } diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 5432fc3..9b8da44 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -51,8 +51,8 @@ static void navigate_complete(WebBrowser V_VT(&url) = VT_BSTR; V_BSTR(&url) = This->url; - call_sink(This->cp_wbe2, DISPID_NAVIGATECOMPLETE2, &dispparams); - call_sink(This->cp_wbe2, DISPID_DOCUMENTCOMPLETE, &dispparams); + call_sink(This->doc_host.cp_wbe2, DISPID_NAVIGATECOMPLETE2, &dispparams); + call_sink(This->doc_host.cp_wbe2, DISPID_DOCUMENTCOMPLETE, &dispparams); if(disp) IDispatch_Release(disp); @@ -491,4 +491,11 @@ void DocHost_Init(DocHost *This) DocHost_ClientSite_Init(This); DocHost_Frame_Init(This); + DocHost_Events_Init(This); +} + +void DocHost_Release(DocHost *This) +{ + DocHost_ClientSite_Release(This); + DocHost_Events_Release(This); } diff --git a/dlls/shdocvw/events.c b/dlls/shdocvw/events.c index f48f066..e6541f9 100644 --- a/dlls/shdocvw/events.c +++ b/dlls/shdocvw/events.c @@ -30,7 +30,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); struct ConnectionPoint { const IConnectionPointVtbl *lpConnectionPointVtbl; - WebBrowser *webbrowser; + DocHost *doc_host; + IConnectionPointContainer *container; IDispatch **sinks; DWORD sinks_size; @@ -87,13 +88,13 @@ static HRESULT WINAPI ConnectionPointCon if(IsEqualGUID(&DIID_DWebBrowserEvents2, riid)) { TRACE("(%p)->(DIID_DWebBrowserEvents2 %p)\n", This, ppCP); - *ppCP = CONPOINT(This->cp_wbe2); + *ppCP = CONPOINT(This->doc_host.cp_wbe2); }else if(IsEqualGUID(&DIID_DWebBrowserEvents, riid)) { TRACE("(%p)->(DIID_DWebBrowserEvents %p)\n", This, ppCP); - *ppCP = CONPOINT(This->cp_wbe); + *ppCP = CONPOINT(This->doc_host.cp_wbe); }else if(IsEqualGUID(&IID_IPropertyNotifySink, riid)) { TRACE("(%p)->(IID_IPropertyNotifySink %p)\n", This, ppCP); - *ppCP = CONPOINT(This->cp_pns); + *ppCP = CONPOINT(This->doc_host.cp_pns); } if(*ppCP) { @@ -139,7 +140,7 @@ static HRESULT WINAPI ConnectionPoint_Qu } if(*ppv) { - IWebBrowser2_AddRef(WEBBROWSER(This->webbrowser)); + IOleClientSite_AddRef(CLIENTSITE(This->doc_host)); return S_OK; } @@ -150,13 +151,13 @@ static HRESULT WINAPI ConnectionPoint_Qu static ULONG WINAPI ConnectionPoint_AddRef(IConnectionPoint *iface) { ConnectionPoint *This = CONPOINT_THIS(iface); - return IWebBrowser2_AddRef(WEBBROWSER(This->webbrowser)); + return IOleClientSite_AddRef(CLIENTSITE(This->doc_host)); } static ULONG WINAPI ConnectionPoint_Release(IConnectionPoint *iface) { ConnectionPoint *This = CONPOINT_THIS(iface); - return IWebBrowser2_Release(WEBBROWSER(This->webbrowser)); + return IOleClientSite_Release(CLIENTSITE(This->doc_host)); } static HRESULT WINAPI ConnectionPoint_GetConnectionInterface(IConnectionPoint *iface, IID *pIID) @@ -176,8 +177,8 @@ static HRESULT WINAPI ConnectionPoint_Ge TRACE("(%p)->(%p)\n", This, ppCPC); - *ppCPC = CONPTCONT(This->webbrowser); - IConnectionPointContainer_AddRef(CONPTCONT(This->webbrowser)); + *ppCPC = This->container; + IConnectionPointContainer_AddRef(This->container); return S_OK; } @@ -267,15 +268,16 @@ void call_sink(ConnectionPoint *This, DI } } -static void ConnectionPoint_Create(WebBrowser *wb, REFIID riid, ConnectionPoint **cp) +static void ConnectionPoint_Create(DocHost *doc_host, REFIID riid, ConnectionPoint **cp) { ConnectionPoint *ret = HeapAlloc(GetProcessHeap(), 0, sizeof(ConnectionPoint)); ret->lpConnectionPointVtbl = &ConnectionPointVtbl; - ret->webbrowser = wb; + ret->doc_host = doc_host; ret->sinks = NULL; ret->sinks_size = 0; + ret->container = NULL; memcpy(&ret->iid, riid, sizeof(IID)); @@ -295,18 +297,25 @@ static void ConnectionPoint_Destroy(Conn HeapFree(GetProcessHeap(), 0, This); } -void WebBrowser_Events_Init(WebBrowser *This) +void DocHost_Events_Init(DocHost *This) { - This->lpConnectionPointContainerVtbl = &ConnectionPointContainerVtbl; - ConnectionPoint_Create(This, &DIID_DWebBrowserEvents2, &This->cp_wbe2); - ConnectionPoint_Create(This, &DIID_DWebBrowserEvents, &This->cp_wbe); + ConnectionPoint_Create(This, &DIID_DWebBrowserEvents, &This->cp_wbe); ConnectionPoint_Create(This, &IID_IPropertyNotifySink, &This->cp_pns); } -void WebBrowser_Events_Destroy(WebBrowser *This) +void DocHost_Events_Release(DocHost *This) { ConnectionPoint_Destroy(This->cp_wbe2); ConnectionPoint_Destroy(This->cp_wbe); ConnectionPoint_Destroy(This->cp_pns); } + +void WebBrowser_Events_Init(WebBrowser *This) +{ + This->lpConnectionPointContainerVtbl = &ConnectionPointContainerVtbl; + + This->doc_host.cp_wbe2->container = CONPTCONT(This); + This->doc_host.cp_wbe->container = CONPTCONT(This); + This->doc_host.cp_pns->container = CONPTCONT(This); +} diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index 294efcc..0b8445e 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -371,7 +371,7 @@ static void on_before_navigate2(WebBrows V_VT(params+6) = (VT_DISPATCH); V_DISPATCH(params+6) = (IDispatch*)WEBBROWSER2(This); - call_sink(This->cp_wbe2, DISPID_BEFORENAVIGATE2, &dispparams); + call_sink(This->doc_host.cp_wbe2, DISPID_BEFORENAVIGATE2, &dispparams); SysFreeString(V_BSTR(&var_url)); if(post_data_len) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index f719271..28e3a0f 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -73,6 +73,12 @@ typedef struct { HWND hwnd; HWND frame_hwnd; + + /* Connection points */ + + ConnectionPoint *cp_wbe2; + ConnectionPoint *cp_wbe; + ConnectionPoint *cp_pns; } DocHost; typedef struct WebBrowser { @@ -111,12 +117,6 @@ typedef struct WebBrowser { HWND shell_embedding_hwnd; - /* Connection points */ - - ConnectionPoint *cp_wbe2; - ConnectionPoint *cp_wbe; - ConnectionPoint *cp_pns; - DocHost doc_host; } WebBrowser; @@ -153,14 +153,16 @@ void WebBrowser_ClassInfo_Init(WebBrowse void WebBrowser_Events_Init(WebBrowser*); void WebBrowser_HlinkFrame_Init(WebBrowser*); +void WebBrowser_OleObject_Destroy(WebBrowser*); + void DocHost_Init(DocHost*); void DocHost_ClientSite_Init(DocHost*); - +void DocHost_Events_Init(DocHost*); void DocHost_Frame_Init(DocHost*); -void WebBrowser_OleObject_Destroy(WebBrowser*); -void WebBrowser_Events_Destroy(WebBrowser*); -void WebBrowser_ClientSite_Destroy(WebBrowser*); +void DocHost_Release(DocHost*); +void DocHost_ClientSite_Release(DocHost*); +void DocHost_Events_Release(DocHost*); HRESULT WebBrowser_Create(IUnknown*,REFIID,void**); diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index f1862dd..a29ebed 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -128,9 +128,9 @@ static ULONG WINAPI WebBrowser_Release(I if(This->doc_host.document) IUnknown_Release(This->doc_host.document); + DocHost_Release(&This->doc_host); + WebBrowser_OleObject_Destroy(This); - WebBrowser_Events_Destroy(This); - WebBrowser_ClientSite_Destroy(This); SysFreeString(This->url); HeapFree(GetProcessHeap(), 0, This);

1 0

Jacek Caban : shdocvw: Use Dochost, not WebBrowser, in deactivate_document.
by Alexandre Julliard 18 Apr '06

18 Apr '06

Module: wine Branch: refs/heads/master Commit: 22b6d5485c524ae7fa313fd2b9b491c131f4ad99 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=22b6d5485c524ae7fa313fd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 18 00:39:15 2006 +0200 shdocvw: Use Dochost, not WebBrowser, in deactivate_document. --- dlls/shdocvw/dochost.c | 30 +++++++++++++++--------------- dlls/shdocvw/navigate.c | 2 +- dlls/shdocvw/oleobject.c | 2 +- dlls/shdocvw/shdocvw.h | 2 +- 4 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index fd3ca2c..5432fc3 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -154,36 +154,36 @@ void create_doc_view_hwnd(WebBrowser *Th NULL, shdocvw_hinstance, This); } -void deactivate_document(WebBrowser *This) +void deactivate_document(DocHost *This) { IOleInPlaceObjectWindowless *winobj; IOleObject *oleobj = NULL; IHlinkTarget *hlink = NULL; HRESULT hres; - if(This->doc_host.view) - IOleDocumentView_UIActivate(This->doc_host.view, FALSE); + if(This->view) + IOleDocumentView_UIActivate(This->view, FALSE); - hres = IUnknown_QueryInterface(This->doc_host.document, &IID_IOleInPlaceObjectWindowless, + hres = IUnknown_QueryInterface(This->document, &IID_IOleInPlaceObjectWindowless, (void**)&winobj); if(SUCCEEDED(hres)) { IOleInPlaceObjectWindowless_InPlaceDeactivate(winobj); IOleInPlaceObjectWindowless_Release(winobj); } - if(This->doc_host.view) { - IOleDocumentView_Show(This->doc_host.view, FALSE); - IOleDocumentView_CloseView(This->doc_host.view, 0); - IOleDocumentView_SetInPlaceSite(This->doc_host.view, NULL); - IOleDocumentView_Release(This->doc_host.view); - This->doc_host.view = NULL; + if(This->view) { + IOleDocumentView_Show(This->view, FALSE); + IOleDocumentView_CloseView(This->view, 0); + IOleDocumentView_SetInPlaceSite(This->view, NULL); + IOleDocumentView_Release(This->view); + This->view = NULL; } - hres = IUnknown_QueryInterface(This->doc_host.document, &IID_IOleObject, (void**)&oleobj); + hres = IUnknown_QueryInterface(This->document, &IID_IOleObject, (void**)&oleobj); if(SUCCEEDED(hres)) IOleObject_Close(oleobj, OLECLOSE_NOSAVE); - hres = IUnknown_QueryInterface(This->doc_host.document, &IID_IHlinkTarget, (void**)&hlink); + hres = IUnknown_QueryInterface(This->document, &IID_IHlinkTarget, (void**)&hlink); if(SUCCEEDED(hres)) { IHlinkTarget_SetBrowseContext(hlink, NULL); IHlinkTarget_Release(hlink); @@ -194,7 +194,7 @@ void deactivate_document(WebBrowser *Thi IOleObject_GetClientSite(oleobj, &client_site); if(client_site) { - if(client_site == CLIENTSITE(&This->doc_host)) + if(client_site == CLIENTSITE(This)) IOleObject_SetClientSite(oleobj, NULL); IOleClientSite_Release(client_site); } @@ -202,8 +202,8 @@ void deactivate_document(WebBrowser *Thi IOleObject_Release(oleobj); } - IUnknown_Release(This->doc_host.document); - This->doc_host.document = NULL; + IUnknown_Release(This->document); + This->document = NULL; } #define OLECMD_THIS(iface) DEFINE_THIS(DocHost, OleCommandTarget, iface) diff --git a/dlls/shdocvw/navigate.c b/dlls/shdocvw/navigate.c index e41a5db..294efcc 100644 --- a/dlls/shdocvw/navigate.c +++ b/dlls/shdocvw/navigate.c @@ -401,7 +401,7 @@ static HRESULT navigate(WebBrowser *This */ if(This->doc_host.document) - deactivate_document(This); + deactivate_document(&This->doc_host); hres = CoCreateInstance(&CLSID_HTMLDocument, NULL, CLSCTX_INPROC_SERVER|CLSCTX_INPROC_HANDLER, diff --git a/dlls/shdocvw/oleobject.c b/dlls/shdocvw/oleobject.c index 4092172..e3cfa4a 100644 --- a/dlls/shdocvw/oleobject.c +++ b/dlls/shdocvw/oleobject.c @@ -154,7 +154,7 @@ static HRESULT WINAPI OleObject_SetClien if(!pClientSite) { if(This->doc_host.document) - deactivate_document(This); + deactivate_document(&This->doc_host); This->client = NULL; return S_OK; } diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 09724aa..f719271 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -165,7 +165,7 @@ void WebBrowser_ClientSite_Destroy(WebBr HRESULT WebBrowser_Create(IUnknown*,REFIID,void**); void create_doc_view_hwnd(WebBrowser *This); -void deactivate_document(WebBrowser*); +void deactivate_document(DocHost*); void call_sink(ConnectionPoint*,DISPID,DISPPARAMS*); HRESULT navigate_url(WebBrowser*,LPCWSTR,PBYTE,ULONG,LPWSTR);

1 0

Jacek Caban : shdocvw: Get rid of WebBrowser dependency in DocHost object.
by Alexandre Julliard 18 Apr '06

18 Apr '06

Module: wine Branch: refs/heads/master Commit: 6470c5ca0a6c76fbeb1db263f5166da4d333ba67 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=6470c5ca0a6c76fbeb1db26… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 18 00:38:06 2006 +0200 shdocvw: Get rid of WebBrowser dependency in DocHost object. --- dlls/shdocvw/client.c | 16 +++++++--------- dlls/shdocvw/dochost.c | 17 ++++++++++------- dlls/shdocvw/frame.c | 4 ++-- dlls/shdocvw/shdocvw.h | 8 +++----- dlls/shdocvw/webbrowser.c | 4 +--- 5 files changed, 23 insertions(+), 26 deletions(-) diff --git a/dlls/shdocvw/client.c b/dlls/shdocvw/client.c index 7e1cb89..d6cd7ed 100644 --- a/dlls/shdocvw/client.c +++ b/dlls/shdocvw/client.c @@ -464,17 +464,15 @@ static const IServiceProviderVtbl Servic ClServiceProvider_QueryService }; -void WebBrowser_ClientSite_Init(WebBrowser *This) +void DocHost_ClientSite_Init(DocHost *This) { - This->doc_host.lpOleClientSiteVtbl = &OleClientSiteVtbl; - This->doc_host.lpOleInPlaceSiteVtbl = &OleInPlaceSiteVtbl; - This->doc_host.lpOleDocumentSiteVtbl = &OleDocumentSiteVtbl; - This->doc_host.lpDispatchVtbl = &DispatchVtbl; - This->doc_host.lpServiceProviderVtbl = &ServiceProviderVtbl; + This->lpOleClientSiteVtbl = &OleClientSiteVtbl; + This->lpOleInPlaceSiteVtbl = &OleInPlaceSiteVtbl; + This->lpOleDocumentSiteVtbl = &OleDocumentSiteVtbl; + This->lpDispatchVtbl = &DispatchVtbl; + This->lpServiceProviderVtbl = &ServiceProviderVtbl; - This->doc_host.view = NULL; - - This->doc_host.wb = This; + This->view = NULL; } void WebBrowser_ClientSite_Destroy(WebBrowser *This) diff --git a/dlls/shdocvw/dochost.c b/dlls/shdocvw/dochost.c index 58d21fe..fd3ca2c 100644 --- a/dlls/shdocvw/dochost.c +++ b/dlls/shdocvw/dochost.c @@ -478,14 +478,17 @@ static const IDocHostUIHandler2Vtbl DocH DocHostUIHandler_GetOverrideKeyPath }; -void WebBrowser_DocHost_Init(WebBrowser *This) +void DocHost_Init(DocHost *This) { - This->doc_host.lpDocHostUIHandlerVtbl = &DocHostUIHandler2Vtbl; - This->doc_host.lpOleCommandTargetVtbl = &OleCommandTargetVtbl; + This->lpDocHostUIHandlerVtbl = &DocHostUIHandler2Vtbl; + This->lpOleCommandTargetVtbl = &OleCommandTargetVtbl; - This->doc_host.document = NULL; - This->doc_host.hostui = NULL; + This->document = NULL; + This->hostui = NULL; - This->doc_host.hwnd = NULL; - This->doc_host.frame_hwnd = NULL; + This->hwnd = NULL; + This->frame_hwnd = NULL; + + DocHost_ClientSite_Init(This); + DocHost_Frame_Init(This); } diff --git a/dlls/shdocvw/frame.c b/dlls/shdocvw/frame.c index e1439d9..ad48b8f 100644 --- a/dlls/shdocvw/frame.c +++ b/dlls/shdocvw/frame.c @@ -174,7 +174,7 @@ static const IOleInPlaceFrameVtbl OleInP InPlaceFrame_TranslateAccelerator }; -void WebBrowser_Frame_Init(WebBrowser *This) +void DocHost_Frame_Init(DocHost *This) { - This->doc_host.lpOleInPlaceFrameVtbl = &OleInPlaceFrameVtbl; + This->lpOleInPlaceFrameVtbl = &OleInPlaceFrameVtbl; } diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index d0579e4..09724aa 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -73,8 +73,6 @@ typedef struct { HWND hwnd; HWND frame_hwnd; - - struct WebBrowser *wb; /* FIXME */ } DocHost; typedef struct WebBrowser { @@ -155,10 +153,10 @@ void WebBrowser_ClassInfo_Init(WebBrowse void WebBrowser_Events_Init(WebBrowser*); void WebBrowser_HlinkFrame_Init(WebBrowser*); -void WebBrowser_ClientSite_Init(WebBrowser*); -void WebBrowser_DocHost_Init(WebBrowser*); +void DocHost_Init(DocHost*); +void DocHost_ClientSite_Init(DocHost*); -void WebBrowser_Frame_Init(WebBrowser*); +void DocHost_Frame_Init(DocHost*); void WebBrowser_OleObject_Destroy(WebBrowser*); void WebBrowser_Events_Destroy(WebBrowser*); diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 01e0a28..f1862dd 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -847,15 +847,13 @@ HRESULT WebBrowser_Create(IUnknown *pOut ret->url = NULL; ret->doc_host.disp = (IDispatch*)WEBBROWSER2(ret); + DocHost_Init(&ret->doc_host); WebBrowser_OleObject_Init(ret); WebBrowser_ViewObject_Init(ret); WebBrowser_Persist_Init(ret); WebBrowser_ClassInfo_Init(ret); WebBrowser_Events_Init(ret); - WebBrowser_ClientSite_Init(ret); - WebBrowser_DocHost_Init(ret); - WebBrowser_Frame_Init(ret); WebBrowser_HlinkFrame_Init(ret); hres = IWebBrowser_QueryInterface(WEBBROWSER(ret), riid, ppv);

1 0

Jacek Caban : shdocvw: Move IServiceProvider to DocHost object.
by Alexandre Julliard 18 Apr '06

18 Apr '06

Module: wine Branch: refs/heads/master Commit: 3a9aeace0f1307b8c71b540cfa4c6530362671af URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=3a9aeace0f1307b8c71b540… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Apr 18 00:35:16 2006 +0200 shdocvw: Move IServiceProvider to DocHost object. --- dlls/shdocvw/client.c | 22 +++++++++++----------- dlls/shdocvw/shdocvw.h | 7 ++----- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/shdocvw/client.c b/dlls/shdocvw/client.c index 1e7fc7c..9082e12 100644 --- a/dlls/shdocvw/client.c +++ b/dlls/shdocvw/client.c @@ -58,7 +58,7 @@ static HRESULT WINAPI ClientSite_QueryIn *ppv = CLDISP(This); }else if(IsEqualGUID(&IID_IServiceProvider, riid)) { TRACE("(%p)->(IID_IServiceProvider %p)\n", This, ppv); - *ppv = CLSERVPROV(This->wb); + *ppv = SERVPROV(This); } if(*ppv) { @@ -419,35 +419,35 @@ static const IDispatchVtbl DispatchVtbl ClDispatch_Invoke }; -#define SERVPROV_THIS(iface) DEFINE_THIS(WebBrowser, ClServiceProvider, iface) +#define SERVPROV_THIS(iface) DEFINE_THIS(DocHost, ServiceProvider, iface) static HRESULT WINAPI ClServiceProvider_QueryInterface(IServiceProvider *iface, REFIID riid, void **ppv) { - WebBrowser *This = SERVPROV_THIS(iface); - return IOleClientSite_QueryInterface(CLIENTSITE(&This->doc_host), riid, ppv); + DocHost *This = SERVPROV_THIS(iface); + return IOleClientSite_QueryInterface(CLIENTSITE(This), riid, ppv); } static ULONG WINAPI ClServiceProvider_AddRef(IServiceProvider *iface) { - WebBrowser *This = SERVPROV_THIS(iface); - return IOleClientSite_AddRef(CLIENTSITE(&This->doc_host)); + DocHost *This = SERVPROV_THIS(iface); + return IOleClientSite_AddRef(CLIENTSITE(This)); } static ULONG WINAPI ClServiceProvider_Release(IServiceProvider *iface) { - WebBrowser *This = SERVPROV_THIS(iface); - return IOleClientSite_Release(CLIENTSITE(&This->doc_host)); + DocHost *This = SERVPROV_THIS(iface); + return IOleClientSite_Release(CLIENTSITE(This)); } static HRESULT WINAPI ClServiceProvider_QueryService(IServiceProvider *iface, REFGUID guidService, REFIID riid, void **ppv) { - WebBrowser *This = SERVPROV_THIS(iface); + DocHost *This = SERVPROV_THIS(iface); if(IsEqualGUID(&IID_IHlinkFrame, guidService)) { TRACE("(%p)->(IID_IHlinkFrame %s %p)\n", This, debugstr_guid(riid), ppv); - return IWebBrowser2_QueryInterface(WEBBROWSER(This), riid, ppv); + return IDispatch_QueryInterface(This->disp, riid, ppv); } FIXME("(%p)->(%s %s %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); @@ -470,7 +470,7 @@ void WebBrowser_ClientSite_Init(WebBrows This->doc_host.lpOleInPlaceSiteVtbl = &OleInPlaceSiteVtbl; This->doc_host.lpOleDocumentSiteVtbl = &OleDocumentSiteVtbl; This->doc_host.lpDispatchVtbl = &DispatchVtbl; - This->lpClServiceProviderVtbl = &ServiceProviderVtbl; + This->doc_host.lpServiceProviderVtbl = &ServiceProviderVtbl; This->doc_host.view = NULL; diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 64a31f1..658a33a 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -60,6 +60,7 @@ typedef struct { const IOleDocumentSiteVtbl *lpOleDocumentSiteVtbl; const IOleCommandTargetVtbl *lpOleCommandTargetVtbl; const IDispatchVtbl *lpDispatchVtbl; + const IServiceProviderVtbl *lpServiceProviderVtbl; IDispatch *disp; @@ -89,10 +90,6 @@ typedef struct WebBrowser { const IOleCommandTargetVtbl *lpWBOleCommandTargetVtbl; const IHlinkFrameVtbl *lpHlinkFrameVtbl; - /* Interfaces available for embeded document */ - - const IServiceProviderVtbl *lpClServiceProviderVtbl; - /* Interfaces of InPlaceFrame object */ const IOleInPlaceFrameVtbl *lpOleInPlaceFrameVtbl; @@ -148,7 +145,7 @@ typedef struct WebBrowser { #define DOCSITE(x) ((IOleDocumentSite*) &(x)->lpOleDocumentSiteVtbl) #define CLOLECMD(x) ((IOleCommandTarget*) &(x)->lpOleCommandTargetVtbl) #define CLDISP(x) ((IDispatch*) &(x)->lpDispatchVtbl) -#define CLSERVPROV(x) ((IServiceProvider*) &(x)->lpClServiceProviderVtbl) +#define SERVPROV(x) ((IServiceProvider*) &(x)->lpServiceProviderVtbl) #define INPLACEFRAME(x) ((IOleInPlaceFrame*) &(x)->lpOleInPlaceFrameVtbl)

1 0