Piotr Caban : shdocvw: Use IID_IBrowserService2 defined in header.
Alexandre Julliard
julliard at winehq.org
Tue Mar 15 11:33:55 CDT 2011
Module: wine
Branch: master
Commit: f1f645b345f8c47b4669ef5cb82c41847775aca7
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f1f645b345f8c47b4669ef5cb82c41847775aca7
Author: Piotr Caban <piotr at codeweavers.com>
Date: Mon Mar 14 17:50:08 2011 +0100
shdocvw: Use IID_IBrowserService2 defined in header.
---
dlls/shdocvw/tests/webbrowser.c | 3 +--
dlls/shdocvw/webbrowser.c | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/dlls/shdocvw/tests/webbrowser.c b/dlls/shdocvw/tests/webbrowser.c
index 1088065..e54e35d 100644
--- a/dlls/shdocvw/tests/webbrowser.c
+++ b/dlls/shdocvw/tests/webbrowser.c
@@ -36,6 +36,7 @@
#include "olectl.h"
#include "mshtmdid.h"
#include "shobjidl.h"
+#include "shdeprecated.h"
#include "shlguid.h"
#include "exdispid.h"
#include "mimeinfo.h"
@@ -2643,8 +2644,6 @@ static void test_IServiceProvider(IUnknown *unk)
IServiceProvider *servprov = (void*)0xdeadbeef;
HRESULT hres;
IUnknown *ret = NULL;
- static const IID IID_IBrowserService2 =
- {0x68BD21CC,0x438B,0x11d2,{0xA5,0x60,0x00,0xA0,0xC,0x2D,0xBF,0xE8}};
hres = IUnknown_QueryInterface(unk, &IID_IServiceProvider, (void**)&servprov);
ok(hres == S_OK, "QueryInterface returned %08x, expected S_OK\n", hres);
diff --git a/dlls/shdocvw/webbrowser.c b/dlls/shdocvw/webbrowser.c
index a0a8020..5df1f03 100644
--- a/dlls/shdocvw/webbrowser.c
+++ b/dlls/shdocvw/webbrowser.c
@@ -23,6 +23,7 @@
#include "shdocvw.h"
#include "exdispid.h"
#include "mshtml.h"
+#include "shdeprecated.h"
WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
@@ -1140,8 +1141,6 @@ static HRESULT STDMETHODCALLTYPE WBServiceProvider_QueryService(IServiceProvider
REFGUID guidService, REFIID riid, void **ppv)
{
WebBrowser *This = impl_from_IServiceProvider(iface);
- static const IID IID_IBrowserService2 =
- {0x68BD21CC,0x438B,0x11d2,{0xA5,0x60,0x00,0xA0,0xC,0x2D,0xBF,0xE8}};
if(*ppv)
ppv = NULL;
More information about the wine-cvs
mailing list