Module: wine Branch: master Commit: 2fb4de7b5e72e859160e5aceb4443e3d46917c71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fb4de7b5e72e859160e5aceb4...
Author: Jacek Caban jacek@codeweavers.com Date: Thu Feb 2 16:09:52 2017 +0100
mshtml: Renamed unk_imp to outer_unk.
Signed-off-by: Jacek Caban jacek@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org
---
dlls/mshtml/htmldoc.c | 4 ++-- dlls/mshtml/mshtml_private.h | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index b409e7d..f0b203e 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4576,7 +4576,7 @@ static const cpc_entry_t HTMLDocument_cpc[] = { {NULL} };
-static void init_doc(HTMLDocument *doc, IUnknown *unk_impl, IDispatchEx *dispex) +static void init_doc(HTMLDocument *doc, IUnknown *outer, IDispatchEx *dispex) { doc->IHTMLDocument2_iface.lpVtbl = &HTMLDocumentVtbl; doc->IHTMLDocument3_iface.lpVtbl = &HTMLDocument3Vtbl; @@ -4589,7 +4589,7 @@ static void init_doc(HTMLDocument *doc, IUnknown *unk_impl, IDispatchEx *dispex) doc->ISupportErrorInfo_iface.lpVtbl = &SupportErrorInfoVtbl; doc->IProvideClassInfo_iface.lpVtbl = &ProvideClassInfoVtbl;
- doc->unk_impl = unk_impl; + doc->outer_unk = outer; doc->dispex = dispex; doc->task_magic = get_task_target_magic();
diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 5a559ea..a18ddafe 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -577,7 +577,7 @@ struct HTMLDocument { IObjectSafety IObjectSafety_iface; IProvideClassInfo IProvideClassInfo_iface;
- IUnknown *unk_impl; + IUnknown *outer_unk; IDispatchEx *dispex;
HTMLDocumentObj *doc_obj; @@ -593,17 +593,17 @@ struct HTMLDocument {
static inline HRESULT htmldoc_query_interface(HTMLDocument *This, REFIID riid, void **ppv) { - return IUnknown_QueryInterface(This->unk_impl, riid, ppv); + return IUnknown_QueryInterface(This->outer_unk, riid, ppv); }
static inline ULONG htmldoc_addref(HTMLDocument *This) { - return IUnknown_AddRef(This->unk_impl); + return IUnknown_AddRef(This->outer_unk); }
static inline ULONG htmldoc_release(HTMLDocument *This) { - return IUnknown_Release(This->unk_impl); + return IUnknown_Release(This->outer_unk); }
struct HTMLDocumentObj {