ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ieframe: Don't use WINAPI in internal functions. 

Signed-off-by: Jacek Caban <jacek@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Jacek Caban 2015-11-09 17:53:11 +01:00 committed by Alexandre Julliard
parent abe564ad3b
commit ba87de8313
6 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dlls/ieframe/dochost.c
View File

@ -500,7 +500,7 @@ void create_doc_view_hwnd(DocHost *This)
doc_view_atom = RegisterClassExW(&wndclass); 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, This->hwnd = CreateWindowExW(0, wszShell_DocObject_View,
wszShell_DocObject_View, wszShell_DocObject_View,
WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP, WS_CHILD | WS_VISIBLE | WS_CLIPSIBLINGS | WS_CLIPCHILDREN | WS_TABSTOP,

2
dlls/ieframe/frame.c
View File

@ -141,7 +141,7 @@ static HRESULT WINAPI InPlaceFrame_SetStatusText(IOleInPlaceFrame *iface,
{ {
DocHost *This = impl_from_IOleInPlaceFrame(iface); DocHost *This = impl_from_IOleInPlaceFrame(iface);
TRACE("(%p)->(%s)\n", This, debugstr_w(pszStatusText)); 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) static HRESULT WINAPI InPlaceFrame_EnableModeless(IOleInPlaceFrame *iface, BOOL fEnable)

6
dlls/ieframe/ieframe.h
View File

@ -103,10 +103,10 @@ typedef struct _IDocHostContainerVtbl
{ {
ULONG (*addref)(DocHost*); ULONG (*addref)(DocHost*);
ULONG (*release)(DocHost*); ULONG (*release)(DocHost*);
void (WINAPI* GetDocObjRect)(DocHost*,RECT*); void (*get_docobj_rect)(DocHost*,RECT*);
HRESULT (WINAPI* SetStatusText)(DocHost*,LPCWSTR); HRESULT (*set_status_text)(DocHost*,const WCHAR*);
void (*on_command_state_change)(DocHost*,LONG,BOOL); void (*on_command_state_change)(DocHost*,LONG,BOOL);
void (WINAPI* SetURL)(DocHost*,LPCWSTR); void (*set_url)(DocHost*,const WCHAR*);
} IDocHostContainerVtbl; } IDocHostContainerVtbl;
struct DocHost { struct DocHost {

12
dlls/ieframe/iexplore.c
View File

@ -754,13 +754,13 @@ static ULONG IEDocHost_release(DocHost *iface)
return IWebBrowser2_Release(&This->IWebBrowser2_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); GetClientRect(This->frame_hwnd, rc);
adjust_ie_docobj_rect(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); InternetExplorer *This = impl_from_DocHost(iface);
return update_ie_statustext(This, text); 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); InternetExplorer *This = impl_from_DocHost(iface);
@ -791,10 +791,10 @@ static void WINAPI DocHostContainer_SetURL(DocHost* iface, LPCWSTR url)
static const IDocHostContainerVtbl DocHostContainerVtbl = { static const IDocHostContainerVtbl DocHostContainerVtbl = {
IEDocHost_addref, IEDocHost_addref,
IEDocHost_release, IEDocHost_release,
DocHostContainer_GetDocObjRect, DocHostContainer_get_docobj_rect,
DocHostContainer_SetStatusText, DocHostContainer_set_status_text,
DocHostContainer_on_command_state_change, DocHostContainer_on_command_state_change,
DocHostContainer_SetURL DocHostContainer_set_url
}; };
static HRESULT create_ie(InternetExplorer **ret_obj) static HRESULT create_ie(InternetExplorer **ret_obj)

2
dlls/ieframe/navigate.c
View File

@ -142,7 +142,7 @@ HRESULT set_dochost_url(DocHost *This, const WCHAR *url)
heap_free(This->url); heap_free(This->url);
This->url = new_url; This->url = new_url;
This->container_vtbl->SetURL(This, This->url); This->container_vtbl->set_url(This, This->url);
return S_OK; return S_OK;
} }

12
dlls/ieframe/webbrowser.c
View File

@ -1194,12 +1194,12 @@ static ULONG WebBrowser_release(DocHost *iface)
return IWebBrowser2_Release(&This->IWebBrowser2_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); 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; 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 = { static const IDocHostContainerVtbl DocHostContainerVtbl = {
WebBrowser_addref, WebBrowser_addref,
WebBrowser_release, WebBrowser_release,
DocHostContainer_GetDocObjRect, DocHostContainer_get_docobj_rect,
DocHostContainer_SetStatusText, DocHostContainer_set_status_text,
DocHostContainer_on_command_state_change, DocHostContainer_on_command_state_change,
DocHostContainer_SetURL DocHostContainer_set_url
}; };
static HRESULT create_webbrowser(int version, IUnknown *outer, REFIID riid, void **ppv) static HRESULT create_webbrowser(int version, IUnknown *outer, REFIID riid, void **ppv)