Skip to content

W
wine-cw
Commit 96b0b342 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Converted obj_webbrowser.h to IDL and moved the definitions to

exdisp.idl where they belong.
parent b90d6118
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 161 additions and 40 deletions
dlls/shdocvw/shdocvw.h
View file @ 96b0b342
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include "ole2.h" #include "ole2.h"
#include "olectl.h" #include "olectl.h"
#include "shlobj.h" #include "shlobj.h"
#include "wine/obj_webbrowser.h" #include "exdisp.h"
/********************************************************************** /**********************************************************************
* IClassFactory declaration for SHDOCVW.DLL * IClassFactory declaration for SHDOCVW.DLL
......
dlls/shdocvw/webbrowser.c
View file @ 96b0b342
...@@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw); ...@@ -27,7 +27,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(shdocvw);
* Implement the IWebBrowser interface * Implement the IWebBrowser interface
*/ */
static HRESULT WINAPI WB_QueryInterface(LPWEBBROWSER iface, REFIID riid, LPVOID *ppobj) static HRESULT WINAPI WB_QueryInterface(IWebBrowser *iface, REFIID riid, LPVOID *ppobj)
{ {
ICOM_THIS(IWebBrowserImpl, iface); ICOM_THIS(IWebBrowserImpl, iface);
...@@ -35,7 +35,7 @@ static HRESULT WINAPI WB_QueryInterface(LPWEBBROWSER iface, REFIID riid, LPVOID ...@@ -35,7 +35,7 @@ static HRESULT WINAPI WB_QueryInterface(LPWEBBROWSER iface, REFIID riid, LPVOID
return E_NOINTERFACE; return E_NOINTERFACE;
} }
static ULONG WINAPI WB_AddRef(LPWEBBROWSER iface) static ULONG WINAPI WB_AddRef(IWebBrowser *iface)
{ {
ICOM_THIS(IWebBrowserImpl, iface); ICOM_THIS(IWebBrowserImpl, iface);
...@@ -43,7 +43,7 @@ static ULONG WINAPI WB_AddRef(LPWEBBROWSER iface) ...@@ -43,7 +43,7 @@ static ULONG WINAPI WB_AddRef(LPWEBBROWSER iface)
return ++(This->ref); return ++(This->ref);
} }
static ULONG WINAPI WB_Release(LPWEBBROWSER iface) static ULONG WINAPI WB_Release(IWebBrowser *iface)
{ {
ICOM_THIS(IWebBrowserImpl, iface); ICOM_THIS(IWebBrowserImpl, iface);
...@@ -53,20 +53,20 @@ static ULONG WINAPI WB_Release(LPWEBBROWSER iface) ...@@ -53,20 +53,20 @@ static ULONG WINAPI WB_Release(LPWEBBROWSER iface)
} }
/* IDispatch methods */ /* IDispatch methods */
static HRESULT WINAPI WB_GetTypeInfoCount(LPWEBBROWSER iface, UINT *pctinfo) static HRESULT WINAPI WB_GetTypeInfoCount(IWebBrowser *iface, UINT *pctinfo)
{ {
FIXME("stub \n"); FIXME("stub \n");
return S_OK; return S_OK;
} }
static HRESULT WINAPI WB_GetTypeInfo(LPWEBBROWSER iface, UINT iTInfo, LCID lcid, static HRESULT WINAPI WB_GetTypeInfo(IWebBrowser *iface, UINT iTInfo, LCID lcid,
LPTYPEINFO *ppTInfo) LPTYPEINFO *ppTInfo)
{ {
FIXME("stub \n"); FIXME("stub \n");
return S_OK; return S_OK;
} }
static HRESULT WINAPI WB_GetIDsOfNames(LPWEBBROWSER iface, REFIID riid, static HRESULT WINAPI WB_GetIDsOfNames(IWebBrowser *iface, REFIID riid,
LPOLESTR *rgszNames, UINT cNames, LPOLESTR *rgszNames, UINT cNames,
LCID lcid, DISPID *rgDispId) LCID lcid, DISPID *rgDispId)
{ {
...@@ -74,7 +74,7 @@ static HRESULT WINAPI WB_GetIDsOfNames(LPWEBBROWSER iface, REFIID riid, ...@@ -74,7 +74,7 @@ static HRESULT WINAPI WB_GetIDsOfNames(LPWEBBROWSER iface, REFIID riid,
return S_OK; return S_OK;
} }
static HRESULT WINAPI WB_Invoke(LPWEBBROWSER iface, DISPID dispIdMember, static HRESULT WINAPI WB_Invoke(IWebBrowser *iface, DISPID dispIdMember,
REFIID riid, LCID lcid, WORD wFlags, REFIID riid, LCID lcid, WORD wFlags,
DISPPARAMS *pDispParams, VARIANT *pVarResult, DISPPARAMS *pDispParams, VARIANT *pVarResult,
EXCEPINFO *pExepInfo, UINT *puArgErr) EXCEPINFO *pExepInfo, UINT *puArgErr)
...@@ -84,31 +84,31 @@ static HRESULT WINAPI WB_Invoke(LPWEBBROWSER iface, DISPID dispIdMember, ...@@ -84,31 +84,31 @@ static HRESULT WINAPI WB_Invoke(LPWEBBROWSER iface, DISPID dispIdMember,
} }
/* IWebBrowser methods */ /* IWebBrowser methods */
static HRESULT WINAPI WB_GoBack(LPWEBBROWSER iface) static HRESULT WINAPI WB_GoBack(IWebBrowser *iface)
{ {
FIXME("stub \n"); FIXME("stub \n");
return S_OK; return S_OK;
} }
static HRESULT WINAPI WB_GoForward(LPWEBBROWSER iface) static HRESULT WINAPI WB_GoForward(IWebBrowser *iface)
{ {
FIXME("stub \n"); FIXME("stub \n");
return S_OK; return S_OK;
} }
static HRESULT WINAPI WB_GoHome(LPWEBBROWSER iface) static HRESULT WINAPI WB_GoHome(IWebBrowser *iface)
{ {
FIXME("stub \n"); FIXME("stub \n");
return S_OK; return S_OK;
} }
static HRESULT WINAPI WB_GoSearch(LPWEBBROWSER iface) static HRESULT WINAPI WB_GoSearch(IWebBrowser *iface)
{ {
FIXME("stub \n"); FIXME("stub \n");
return S_OK; return S_OK;
} }
static HRESULT WINAPI WB_Navigate(LPWEBBROWSER iface, BSTR URL, static HRESULT WINAPI WB_Navigate(IWebBrowser *iface, BSTR URL,
VARIANT *Flags, VARIANT *TargetFrameName, VARIANT *Flags, VARIANT *TargetFrameName,
VARIANT *PostData, VARIANT *Headers) VARIANT *PostData, VARIANT *Headers)
{ {
...@@ -117,121 +117,121 @@ static HRESULT WINAPI WB_Navigate(LPWEBBROWSER iface, BSTR URL, ...@@ -117,121 +117,121 @@ static HRESULT WINAPI WB_Navigate(LPWEBBROWSER iface, BSTR URL,
return S_OK; return S_OK;
} }
static HRESULT WINAPI WB_Refresh(LPWEBBROWSER iface) static HRESULT WINAPI WB_Refresh(IWebBrowser *iface)
{ {
FIXME("stub \n"); FIXME("stub \n");
return S_OK; return S_OK;
} }
static HRESULT WINAPI WB_Refresh2(LPWEBBROWSER iface, VARIANT *Level) static HRESULT WINAPI WB_Refresh2(IWebBrowser *iface, VARIANT *Level)
{ {
FIXME("stub: %p\n", Level); FIXME("stub: %p\n", Level);
return S_OK; return S_OK;
} }
static HRESULT WINAPI WB_Stop(LPWEBBROWSER iface) static HRESULT WINAPI WB_Stop(IWebBrowser *iface)
{ {
FIXME("stub \n"); FIXME("stub \n");
return S_OK; return S_OK;
} }
static HRESULT WINAPI WB_get_Application(LPWEBBROWSER iface, LPVOID *ppDisp) static HRESULT WINAPI WB_get_Application(IWebBrowser *iface, IDispatch **ppDisp)
{ {
FIXME("stub \n"); FIXME("stub \n");
return S_OK; return S_OK;
} }
static HRESULT WINAPI WB_get_Parent(LPWEBBROWSER iface, LPVOID *ppDisp) static HRESULT WINAPI WB_get_Parent(IWebBrowser *iface, IDispatch **ppDisp)
{ {
FIXME("stub \n"); FIXME("stub \n");
return S_OK; return S_OK;
} }
static HRESULT WINAPI WB_get_Container(LPWEBBROWSER iface, LPVOID *ppDisp) static HRESULT WINAPI WB_get_Container(IWebBrowser *iface, IDispatch **ppDisp)
{ {
FIXME("stub \n"); FIXME("stub \n");
return S_OK; return S_OK;
} }
static HRESULT WINAPI WB_get_Document(LPWEBBROWSER iface, LPVOID *ppDisp) static HRESULT WINAPI WB_get_Document(IWebBrowser *iface, IDispatch **ppDisp)
{ {
FIXME("stub \n"); FIXME("stub \n");
return S_OK; return S_OK;
} }
static HRESULT WINAPI WB_get_TopLevelContainer(LPWEBBROWSER iface, VARIANT *pBool) static HRESULT WINAPI WB_get_TopLevelContainer(IWebBrowser *iface, VARIANT_BOOL *pBool)
{ {
FIXME("stub \n"); FIXME("stub \n");
return S_OK; return S_OK;
} }
static HRESULT WINAPI WB_get_Type(LPWEBBROWSER iface, BSTR *Type) static HRESULT WINAPI WB_get_Type(IWebBrowser *iface, BSTR *Type)
{ {
FIXME("stub \n"); FIXME("stub \n");
return S_OK; return S_OK;
} }
static HRESULT WINAPI WB_get_Left(LPWEBBROWSER iface, long *pl) static HRESULT WINAPI WB_get_Left(IWebBrowser *iface, long *pl)
{ {
FIXME("stub \n"); FIXME("stub \n");
return S_OK; return S_OK;
} }
static HRESULT WINAPI WB_put_Left(LPWEBBROWSER iface, long Left) static HRESULT WINAPI WB_put_Left(IWebBrowser *iface, long Left)
{ {
FIXME("stub \n"); FIXME("stub \n");
return S_OK; return S_OK;
} }
static HRESULT WINAPI WB_get_Top(LPWEBBROWSER iface, long *pl) static HRESULT WINAPI WB_get_Top(IWebBrowser *iface, long *pl)
{ {
FIXME("stub \n"); FIXME("stub \n");
return S_OK; return S_OK;
} }
static HRESULT WINAPI WB_put_Top(LPWEBBROWSER iface, long Top) static HRESULT WINAPI WB_put_Top(IWebBrowser *iface, long Top)
{ {
FIXME("stub \n"); FIXME("stub \n");
return S_OK; return S_OK;
} }
static HRESULT WINAPI WB_get_Width(LPWEBBROWSER iface, long *pl) static HRESULT WINAPI WB_get_Width(IWebBrowser *iface, long *pl)
{ {
FIXME("stub \n"); FIXME("stub \n");
return S_OK; return S_OK;
} }
static HRESULT WINAPI WB_put_Width(LPWEBBROWSER iface, long Width) static HRESULT WINAPI WB_put_Width(IWebBrowser *iface, long Width)
{ {
FIXME("stub \n"); FIXME("stub \n");
return S_OK; return S_OK;
} }
static HRESULT WINAPI WB_get_Height(LPWEBBROWSER iface, long *pl) static HRESULT WINAPI WB_get_Height(IWebBrowser *iface, long *pl)
{ {
FIXME("stub \n"); FIXME("stub \n");
return S_OK; return S_OK;
} }
static HRESULT WINAPI WB_put_Height(LPWEBBROWSER iface, long Height) static HRESULT WINAPI WB_put_Height(IWebBrowser *iface, long Height)
{ {
FIXME("stub \n"); FIXME("stub \n");
return S_OK; return S_OK;
} }
static HRESULT WINAPI WB_get_LocationName(LPWEBBROWSER iface, BSTR *LocationName) static HRESULT WINAPI WB_get_LocationName(IWebBrowser *iface, BSTR *LocationName)
{ {
FIXME("stub \n"); FIXME("stub \n");
return S_OK; return S_OK;
} }
static HRESULT WINAPI WB_get_LocationURL(LPWEBBROWSER iface, BSTR *LocationURL) static HRESULT WINAPI WB_get_LocationURL(IWebBrowser *iface, BSTR *LocationURL)
{ {
FIXME("stub \n"); FIXME("stub \n");
return S_OK; return S_OK;
} }
static HRESULT WINAPI WB_get_Busy(LPWEBBROWSER iface, VARIANT *pBool) static HRESULT WINAPI WB_get_Busy(IWebBrowser *iface, VARIANT_BOOL *pBool)
{ {
FIXME("stub \n"); FIXME("stub \n");
return S_OK; return S_OK;
......
dlls/shlwapi/ordinal.c
View file @ 96b0b342
...@@ -29,18 +29,19 @@ ...@@ -29,18 +29,19 @@
#define NONAMELESSUNION #define NONAMELESSUNION
#define NONAMELESSSTRUCT #define NONAMELESSSTRUCT
#include "docobj.h"
#include "shlguid.h"
#include "windef.h" #include "windef.h"
#include "winnls.h"
#include "winbase.h" #include "winbase.h"
#include "winuser.h"
#include "winnls.h"
#include "ddeml.h" #include "ddeml.h"
#include "docobj.h"
#include "exdisp.h"
#include "shlguid.h"
#include "shlobj.h" #include "shlobj.h"
#include "olectl.h" #include "olectl.h"
#include "shellapi.h" #include "shellapi.h"
#include "commdlg.h" #include "commdlg.h"
#include "wine/unicode.h" #include "wine/unicode.h"
#include "wine/obj_webbrowser.h"
#include "servprov.h" #include "servprov.h"
#include "wingdi.h" #include "wingdi.h"
#include "winreg.h" #include "winreg.h"
......
include/Makefile.in
View file @ 96b0b342
...@@ -7,6 +7,7 @@ MODULE = none ...@@ -7,6 +7,7 @@ MODULE = none
IDL_SRCS = \ IDL_SRCS = \
comcat.idl \ comcat.idl \
docobj.idl \ docobj.idl \
exdisp.idl \
oaidl.idl \ oaidl.idl \
objidl.idl \ objidl.idl \
ocidl.idl \ ocidl.idl \
...@@ -252,7 +253,6 @@ WINE_INCLUDES = \ ...@@ -252,7 +253,6 @@ WINE_INCLUDES = \
obj_shellfolder.h \ obj_shellfolder.h \
obj_shelllink.h \ obj_shelllink.h \
obj_shellview.h \ obj_shellview.h \
obj_webbrowser.h \
unicode.h unicode.h
EXTRASUBDIRS = bitmaps msvcrt msvcrt/sys wine EXTRASUBDIRS = bitmaps msvcrt msvcrt/sys wine
......
include/exdisp.idl 0 → 100644
View file @ 96b0b342
/*
* Defines the COM interfaces and APIs related to the IE Web browser
*
* Copyright (C) 2001 John R. Sheets (for CodeWeavers)
* Copyright (C) 2003 Alexandre Julliard
*
* 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
*/
import "ocidl.idl";
import "docobj.idl";
/*****************************************************************************
* IWebBrowser interface
*/
[
object,
oleautomation,
uuid(eab22ac1-30c1-11cf-a7eb-0000c05bae0b)
]
interface IWebBrowser : IDispatch
{
typedef enum BrowserNavConstants
{
navOpenInNewWindow = 0x1,
navNoHistory = 0x2,
navNoReadFromCache = 0x4,
navNoWriteToCache = 0x8,
navAllowAutosearch = 0x10,
navBrowserBar = 0x20,
navHyperlink = 0x40,
navEnforceRestricted = 0x80
} BrowserNavConstants;
typedef enum RefreshConstants
{
REFRESH_NORMAL = 0,
REFRESH_IFEXPIRED = 1,
REFRESH_COMPLETELY = 3
} RefreshConstants;
HRESULT GoBack();
HRESULT GoForward();
HRESULT GoHome();
HRESULT GoSearch();
HRESULT Navigate(
[in] BSTR URL,
[in] VARIANT *Flags,
[in] VARIANT *TargetFrameName,
[in] VARIANT *PostData,
[in] VARIANT *Headers);
HRESULT Refresh();
HRESULT Refresh2( [in] VARIANT *Level );
HRESULT Stop();
HRESULT get_Application([out] IDispatch** ppDisp);
HRESULT get_Parent([out] IDispatch** ppDisp);
HRESULT get_Container([out] IDispatch** ppDisp);
HRESULT get_Document([out] IDispatch** ppDisp);
HRESULT get_TopLevelContainer([out] VARIANT_BOOL* pBool);
HRESULT get_Type([out] BSTR* Type);
HRESULT get_Left([out] long *pl);
HRESULT put_Left([in] long Left);
HRESULT get_Top([out] long *pl);
HRESULT put_Top([in] long Top);
HRESULT get_Width([out] long *pl);
HRESULT put_Width([in] long Width);
HRESULT get_Height([out] long *pl);
HRESULT put_Height([in] long Height);
HRESULT get_LocationName([out] BSTR *LocationName);
HRESULT get_LocationURL([out] BSTR * LocationURL);
HRESULT get_Busy([out] VARIANT_BOOL *pBool);
}
/*****************************************************************************
* IWebBrowserApp interface
*/
[
object,
oleautomation,
uuid(0002df05-0000-0000-c000-000000000046)
]
interface IWebBrowserApp : IWebBrowser
{
HRESULT Quit();
HRESULT ClientToWindow([in,out] int* pcx, [in,out] int* pcy);
HRESULT PutProperty([in] BSTR szProperty, [in] VARIANT vtValue);
HRESULT GetProperty([in] BSTR szProperty, [out] VARIANT *pvtValue);
HRESULT get_Name([out] BSTR* Name);
HRESULT get_HWND([out] long *pHWND);
HRESULT get_FullName([out] BSTR* FullName);
HRESULT get_Path([out] BSTR* Path);
HRESULT get_Visible([out] VARIANT_BOOL* pBool);
HRESULT put_Visible([in] VARIANT_BOOL Value);
HRESULT get_StatusBar([out] VARIANT_BOOL* pBool);
HRESULT put_StatusBar([in] VARIANT_BOOL Value);
HRESULT get_StatusText([out] BSTR *StatusText);
HRESULT put_StatusText([in] BSTR StatusText);
HRESULT get_ToolBar([out] int * Value);
HRESULT put_ToolBar([in] int Value);
HRESULT get_MenuBar([out] VARIANT_BOOL * Value);
HRESULT put_MenuBar([in] VARIANT_BOOL Value);
HRESULT get_FullScreen([out] VARIANT_BOOL * pbFullScreen);
HRESULT put_FullScreen([in] VARIANT_BOOL bFullScreen);
}
/* FIXME */
cpp_quote("DEFINE_GUID(CLSID_WebBrowser, 0x8856f961, 0x340a, 0x11d0, 0xa9, 0x6b, 0x00, 0xc0, 0x4f, 0xd7, 0x05, 0xa2);")
libs/uuid/uuid.c
View file @ 96b0b342
...@@ -42,6 +42,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); ...@@ -42,6 +42,7 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
#include "ocidl.h" #include "ocidl.h"
#include "docobj.h" #include "docobj.h"
#include "exdisp.h"
#include "shlguid.h" #include "shlguid.h"
#include "shlobj.h" #include "shlobj.h"
...@@ -52,8 +53,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); ...@@ -52,8 +53,6 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0);
/* other GUIDs */ /* other GUIDs */
#include "wine/obj_webbrowser.h"
#include "vfw.h" #include "vfw.h"
#include "uuids.h" #include "uuids.h"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment