Module: wine Branch: refs/heads/master Commit: fa31cfb0b31c19839bd13b05a9d2d2e7a6b9b3b7 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=fa31cfb0b31c19839bd13b05...
Author: Jacek Caban jacek@codeweavers.com Date: Wed Feb 8 12:36:03 2006 +0100
shdocvw: Remove IQuickActivate interface implementation that is not implemented in Windows as well.
---
dlls/shdocvw/Makefile.in | 1 dlls/shdocvw/misc.c | 98 ------------------------------------------- dlls/shdocvw/shdocvw.h | 3 - dlls/shdocvw/shdocvw_main.c | 8 ++++ dlls/shdocvw/webbrowser.c | 4 -- 5 files changed, 8 insertions(+), 106 deletions(-) delete mode 100644 dlls/shdocvw/misc.c
diff --git a/dlls/shdocvw/Makefile.in b/dlls/shdocvw/Makefile.in index 46b358b..40c50a6 100644 --- a/dlls/shdocvw/Makefile.in +++ b/dlls/shdocvw/Makefile.in @@ -16,7 +16,6 @@ C_SRCS = \ events.c \ factory.c \ frame.c \ - misc.c \ oleobject.c \ persist.c \ regsvr.c \ diff --git a/dlls/shdocvw/misc.c b/dlls/shdocvw/misc.c deleted file mode 100644 index 2be6270..0000000 --- a/dlls/shdocvw/misc.c +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Implementation of miscellaneous interfaces for WebBrowser control: - * - * - IQuickActivate - * - * Copyright 2001 John R. Sheets (for CodeWeavers) - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - -#include "wine/debug.h" -#include "shdocvw.h" - -WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); - -/********************************************************************** - * Implement the IQuickActivate interface - */ - -#define QUICKACT_THIS(iface) DEFINE_THIS(WebBrowser, QuickActivate, iface) - -static HRESULT WINAPI QuickActivate_QueryInterface(IQuickActivate *iface, - REFIID riid, LPVOID *ppobj) -{ - WebBrowser *This = QUICKACT_THIS(iface); - return IWebBrowser_QueryInterface(WEBBROWSER(This), riid, ppobj); -} - -static ULONG WINAPI QuickActivate_AddRef(IQuickActivate *iface) -{ - WebBrowser *This = QUICKACT_THIS(iface); - return IWebBrowser_AddRef(WEBBROWSER(This)); -} - -static ULONG WINAPI QuickActivate_Release(IQuickActivate *iface) -{ - WebBrowser *This = QUICKACT_THIS(iface); - return IWebBrowser_Release(WEBBROWSER(This)); -} - -static HRESULT WINAPI QuickActivate_QuickActivate(IQuickActivate *iface, - QACONTAINER *pQaContainer, QACONTROL *pQaControl) -{ - WebBrowser *This = QUICKACT_THIS(iface); - FIXME("(%p)->(%p %p)\n", This, pQaContainer, pQaControl); - return E_NOTIMPL; -} - -static HRESULT WINAPI QuickActivate_SetContentExtent(IQuickActivate *iface, LPSIZEL pSizel) -{ - WebBrowser *This = QUICKACT_THIS(iface); - FIXME("(%p)->(%p)\n", This, pSizel); - return E_NOTIMPL; -} - -static HRESULT WINAPI QuickActivate_GetContentExtent(IQuickActivate *iface, LPSIZEL pSizel) -{ - WebBrowser *This = QUICKACT_THIS(iface); - FIXME("(%p)->(%p)\n", This, pSizel); - return E_NOTIMPL; -} - -#undef QUICKACT_THIS - -static const IQuickActivateVtbl QuickActivateVtbl = -{ - QuickActivate_QueryInterface, - QuickActivate_AddRef, - QuickActivate_Release, - QuickActivate_QuickActivate, - QuickActivate_SetContentExtent, - QuickActivate_GetContentExtent -}; - -void WebBrowser_Misc_Init(WebBrowser *This) -{ - This->lpQuickActivateVtbl = &QuickActivateVtbl; -} - -/********************************************************************** - * OpenURL (SHDOCVW.@) - */ -void WINAPI OpenURL(HWND hWnd, HINSTANCE hInst, LPCSTR lpcstrUrl, int nShowCmd) -{ - FIXME("%p %p %s %d\n", hWnd, hInst, debugstr_a(lpcstrUrl), nShowCmd); -} diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index ba10279..a103615 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -72,7 +72,6 @@ typedef struct { const IPersistStorageVtbl *lpPersistStorageVtbl; const IPersistStreamInitVtbl *lpPersistStreamInitVtbl; const IProvideClassInfo2Vtbl *lpProvideClassInfoVtbl; - const IQuickActivateVtbl *lpQuickActivateVtbl; const IConnectionPointContainerVtbl *lpConnectionPointContainerVtbl; const IViewObject2Vtbl *lpViewObjectVtbl; const IOleInPlaceActiveObjectVtbl *lpOleInPlaceActiveObjectVtbl; @@ -130,7 +129,6 @@ typedef struct { #define PERSTORAGE(x) ((IPersistStorage*) &(x)->lpPersistStorageVtbl) #define PERSTRINIT(x) ((IPersistStreamInit*) &(x)->lpPersistStreamInitVtbl) #define CLASSINFO(x) ((IProvideClassInfo2*) &(x)->lpProvideClassInfoVtbl) -#define QUICKACT(x) ((IQuickActivate*) &(x)->lpQuickActivateVtbl) #define CONPTCONT(x) ((IConnectionPointContainer*) &(x)->lpConnectionPointContainerVtbl) #define VIEWOBJ(x) ((IViewObject*) &(x)->lpViewObjectVtbl); #define VIEWOBJ2(x) ((IViewObject2*) &(x)->lpViewObjectVtbl); @@ -151,7 +149,6 @@ void WebBrowser_OleObject_Init(WebBrowse void WebBrowser_ViewObject_Init(WebBrowser*); void WebBrowser_Persist_Init(WebBrowser*); void WebBrowser_ClassInfo_Init(WebBrowser*); -void WebBrowser_Misc_Init(WebBrowser*); void WebBrowser_Events_Init(WebBrowser*);
void WebBrowser_ClientSite_Init(WebBrowser*); diff --git a/dlls/shdocvw/shdocvw_main.c b/dlls/shdocvw/shdocvw_main.c index 4df0ead..f01a36f 100644 --- a/dlls/shdocvw/shdocvw_main.c +++ b/dlls/shdocvw/shdocvw_main.c @@ -589,3 +589,11 @@ DWORD WINAPI SetQueryNetSessionCount(DWO FIXME("(%lu), stub!\n", arg); return 0; } + +/********************************************************************** + * OpenURL (SHDOCVW.@) + */ +void WINAPI OpenURL(HWND hWnd, HINSTANCE hInst, LPCSTR lpcstrUrl, int nShowCmd) +{ + FIXME("%p %p %s %d\n", hWnd, hInst, debugstr_a(lpcstrUrl), nShowCmd); +} diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c index 1c435bd..836a164 100644 --- a/dlls/shdocvw/webbrowser.c +++ b/dlls/shdocvw/webbrowser.c @@ -82,9 +82,6 @@ static HRESULT WINAPI WebBrowser_QueryIn }else if(IsEqualGUID(&IID_IProvideClassInfo2, riid)) { TRACE("(%p)->(IID_IProvideClassInfo2 %p)\n", This, ppv); *ppv = CLASSINFO(This); - }else if(IsEqualGUID(&IID_IQuickActivate, riid)) { - TRACE("(%p)->(IID_IQuickActivate %p)\n", This, ppv); - *ppv = QUICKACT(This); }else if(IsEqualGUID(&IID_IConnectionPointContainer, riid)) { TRACE("(%p)->(IID_IConnectionPointContainer %p)\n", This, ppv); *ppv = CONPTCONT(This); @@ -806,7 +803,6 @@ HRESULT WebBrowser_Create(IUnknown *pOut WebBrowser_ViewObject_Init(ret); WebBrowser_Persist_Init(ret); WebBrowser_ClassInfo_Init(ret); - WebBrowser_Misc_Init(ret); WebBrowser_Events_Init(ret); WebBrowser_ClientSite_Init(ret); WebBrowser_DocHost_Init(ret);