Module: wine Branch: master Commit: ba87de8313827392f155883da8943cbe9579e1ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba87de8313827392f155883da8...
Author: Jacek Caban jacek@codeweavers.com Date: Mon Nov 9 17:53:11 2015 +0100
ieframe: Don't use WINAPI in internal functions.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/ieframe/dochost.c | 2 +- dlls/ieframe/frame.c | 2 +- dlls/ieframe/ieframe.h | 6 +++--- dlls/ieframe/iexplore.c | 12 ++++++------ dlls/ieframe/navigate.c | 2 +- dlls/ieframe/webbrowser.c | 12 ++++++------ 6 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/dlls/ieframe/dochost.c b/dlls/ieframe/dochost.c index 7ebd304..8f3b088 100644 --- a/dlls/ieframe/dochost.c +++ b/dlls/ieframe/dochost.c @@ -500,7 +500,7 @@ void create_doc_view_hwnd(DocHost *This) doc_view_atom = RegisterClassExW(&wndclass); }
- This->container_vtbl->GetDocObjRect(This, &rect); + This->container_vtbl->get_docobj_rect(This, &rect); This->hwnd = CreateWindowExW(0, wszShell_DocObject_View, wszShell_DocObject_View, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP, diff --git a/dlls/ieframe/frame.c b/dlls/ieframe/frame.c index d394d74..d86c271 100644 --- a/dlls/ieframe/frame.c +++ b/dlls/ieframe/frame.c @@ -141,7 +141,7 @@ static HRESULT WINAPI InPlaceFrame_SetStatusText(IOleInPlaceFrame *iface, { DocHost *This = impl_from_IOleInPlaceFrame(iface); TRACE("(%p)->(%s)\n", This, debugstr_w(pszStatusText)); - return This->container_vtbl->SetStatusText(This, pszStatusText); + return This->container_vtbl->set_status_text(This, pszStatusText); }
static HRESULT WINAPI InPlaceFrame_EnableModeless(IOleInPlaceFrame *iface, BOOL fEnable) diff --git a/dlls/ieframe/ieframe.h b/dlls/ieframe/ieframe.h index 4baca9c..ae36c65 100644 --- a/dlls/ieframe/ieframe.h +++ b/dlls/ieframe/ieframe.h @@ -103,10 +103,10 @@ typedef struct _IDocHostContainerVtbl { ULONG (*addref)(DocHost*); ULONG (*release)(DocHost*); - void (WINAPI* GetDocObjRect)(DocHost*,RECT*); - HRESULT (WINAPI* SetStatusText)(DocHost*,LPCWSTR); + void (*get_docobj_rect)(DocHost*,RECT*); + HRESULT (*set_status_text)(DocHost*,const WCHAR*); void (*on_command_state_change)(DocHost*,LONG,BOOL); - void (WINAPI* SetURL)(DocHost*,LPCWSTR); + void (*set_url)(DocHost*,const WCHAR*); } IDocHostContainerVtbl;
struct DocHost { diff --git a/dlls/ieframe/iexplore.c b/dlls/ieframe/iexplore.c index 5793dd8..07061fd 100644 --- a/dlls/ieframe/iexplore.c +++ b/dlls/ieframe/iexplore.c @@ -754,13 +754,13 @@ static ULONG IEDocHost_release(DocHost *iface) return IWebBrowser2_Release(&This->IWebBrowser2_iface); }
-static void WINAPI DocHostContainer_GetDocObjRect(DocHost* This, RECT* rc) +static void DocHostContainer_get_docobj_rect(DocHost *This, RECT *rc) { GetClientRect(This->frame_hwnd, rc); adjust_ie_docobj_rect(This->frame_hwnd, rc); }
-static HRESULT WINAPI DocHostContainer_SetStatusText(DocHost *iface, LPCWSTR text) +static HRESULT DocHostContainer_set_status_text(DocHost *iface, const WCHAR *text) { InternetExplorer *This = impl_from_DocHost(iface); return update_ie_statustext(This, text); @@ -780,7 +780,7 @@ static void DocHostContainer_on_command_state_change(DocHost *iface, LONG comman } }
-static void WINAPI DocHostContainer_SetURL(DocHost* iface, LPCWSTR url) +static void DocHostContainer_set_url(DocHost* iface, const WCHAR *url) { InternetExplorer *This = impl_from_DocHost(iface);
@@ -791,10 +791,10 @@ static void WINAPI DocHostContainer_SetURL(DocHost* iface, LPCWSTR url) static const IDocHostContainerVtbl DocHostContainerVtbl = { IEDocHost_addref, IEDocHost_release, - DocHostContainer_GetDocObjRect, - DocHostContainer_SetStatusText, + DocHostContainer_get_docobj_rect, + DocHostContainer_set_status_text, DocHostContainer_on_command_state_change, - DocHostContainer_SetURL + DocHostContainer_set_url };
static HRESULT create_ie(InternetExplorer **ret_obj) diff --git a/dlls/ieframe/navigate.c b/dlls/ieframe/navigate.c index 256fd18..1b42fa5 100644 --- a/dlls/ieframe/navigate.c +++ b/dlls/ieframe/navigate.c @@ -142,7 +142,7 @@ HRESULT set_dochost_url(DocHost *This, const WCHAR *url) heap_free(This->url); This->url = new_url;
- This->container_vtbl->SetURL(This, This->url); + This->container_vtbl->set_url(This, This->url); return S_OK; }
diff --git a/dlls/ieframe/webbrowser.c b/dlls/ieframe/webbrowser.c index 3926cbb..0378d6b 100644 --- a/dlls/ieframe/webbrowser.c +++ b/dlls/ieframe/webbrowser.c @@ -1194,12 +1194,12 @@ static ULONG WebBrowser_release(DocHost *iface) return IWebBrowser2_Release(&This->IWebBrowser2_iface); }
-static void WINAPI DocHostContainer_GetDocObjRect(DocHost* This, RECT* rc) +static void DocHostContainer_get_docobj_rect(DocHost *This, RECT *rc) { GetClientRect(This->frame_hwnd, rc); }
-static HRESULT WINAPI DocHostContainer_SetStatusText(DocHost* This, LPCWSTR text) +static HRESULT DocHostContainer_set_status_text(DocHost *This, const WCHAR *text) { return E_NOTIMPL; } @@ -1208,17 +1208,17 @@ static void DocHostContainer_on_command_state_change(DocHost *This, LONG command { }
-static void WINAPI DocHostContainer_SetURL(DocHost* This, LPCWSTR url) +static void DocHostContainer_set_url(DocHost *This, const WCHAR *url) { }
static const IDocHostContainerVtbl DocHostContainerVtbl = { WebBrowser_addref, WebBrowser_release, - DocHostContainer_GetDocObjRect, - DocHostContainer_SetStatusText, + DocHostContainer_get_docobj_rect, + DocHostContainer_set_status_text, DocHostContainer_on_command_state_change, - DocHostContainer_SetURL + DocHostContainer_set_url };
static HRESULT create_webbrowser(int version, IUnknown *outer, REFIID riid, void **ppv)