Michael Stefaniuc : urlmon: Use the standard field name for an inner IUnknown.
Alexandre Julliard
julliard at winehq.org
Tue Jun 4 16:28:12 CDT 2019
Module: wine
Branch: master
Commit: 15619c773ef6b3e6a53c43abd8a7d87053f0b245
URL: https://source.winehq.org/git/wine.git/?a=commit;h=15619c773ef6b3e6a53c43abd8a7d87053f0b245
Author: Michael Stefaniuc <mstefani at winehq.org>
Date: Mon Jun 3 21:50:16 2019 +0200
urlmon: Use the standard field name for an inner IUnknown.
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>
Signed-off-by: Jacek Caban <jacek at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/urlmon/file.c | 12 ++++++------
dlls/urlmon/ftp.c | 12 ++++++------
dlls/urlmon/http.c | 12 ++++++------
dlls/urlmon/mk.c | 12 ++++++------
4 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/dlls/urlmon/file.c b/dlls/urlmon/file.c
index cc1ba81..e703e72 100644
--- a/dlls/urlmon/file.c
+++ b/dlls/urlmon/file.c
@@ -25,7 +25,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
typedef struct {
- IUnknown IUnknown_outer;
+ IUnknown IUnknown_inner;
IInternetProtocolEx IInternetProtocolEx_iface;
IInternetPriority IInternetPriority_iface;
@@ -40,7 +40,7 @@ typedef struct {
static inline FileProtocol *impl_from_IUnknown(IUnknown *iface)
{
- return CONTAINING_RECORD(iface, FileProtocol, IUnknown_outer);
+ return CONTAINING_RECORD(iface, FileProtocol, IUnknown_inner);
}
static inline FileProtocol *impl_from_IInternetProtocolEx(IInternetProtocolEx *iface)
@@ -60,7 +60,7 @@ static HRESULT WINAPI FileProtocolUnk_QueryInterface(IUnknown *iface, REFIID rii
*ppv = NULL;
if(IsEqualGUID(&IID_IUnknown, riid)) {
TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv);
- *ppv = &This->IUnknown_outer;
+ *ppv = &This->IUnknown_inner;
}else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) {
TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv);
*ppv = &This->IInternetProtocolEx_iface;
@@ -428,14 +428,14 @@ HRESULT FileProtocol_Construct(IUnknown *outer, LPVOID *ppobj)
ret = heap_alloc(sizeof(FileProtocol));
- ret->IUnknown_outer.lpVtbl = &FileProtocolUnkVtbl;
+ ret->IUnknown_inner.lpVtbl = &FileProtocolUnkVtbl;
ret->IInternetProtocolEx_iface.lpVtbl = &FileProtocolExVtbl;
ret->IInternetPriority_iface.lpVtbl = &FilePriorityVtbl;
ret->file = INVALID_HANDLE_VALUE;
ret->priority = 0;
ret->ref = 1;
- ret->outer = outer ? outer : &ret->IUnknown_outer;
+ ret->outer = outer ? outer : &ret->IUnknown_inner;
- *ppobj = &ret->IUnknown_outer;
+ *ppobj = &ret->IUnknown_inner;
return S_OK;
}
diff --git a/dlls/urlmon/ftp.c b/dlls/urlmon/ftp.c
index 75704ce..8e6ec4e 100644
--- a/dlls/urlmon/ftp.c
+++ b/dlls/urlmon/ftp.c
@@ -28,7 +28,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
typedef struct {
Protocol base;
- IUnknown IUnknown_outer;
+ IUnknown IUnknown_inner;
IInternetProtocolEx IInternetProtocolEx_iface;
IInternetPriority IInternetPriority_iface;
IWinInetHttpInfo IWinInetHttpInfo_iface;
@@ -39,7 +39,7 @@ typedef struct {
static inline FtpProtocol *impl_from_IUnknown(IUnknown *iface)
{
- return CONTAINING_RECORD(iface, FtpProtocol, IUnknown_outer);
+ return CONTAINING_RECORD(iface, FtpProtocol, IUnknown_inner);
}
static inline FtpProtocol *impl_from_IInternetProtocolEx(IInternetProtocolEx *iface)
@@ -131,7 +131,7 @@ static HRESULT WINAPI FtpProtocolUnk_QueryInterface(IUnknown *iface, REFIID riid
if(IsEqualGUID(&IID_IUnknown, riid)) {
TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv);
- *ppv = &This->IUnknown_outer;
+ *ppv = &This->IUnknown_inner;
}else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) {
TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv);
*ppv = &This->IInternetProtocolEx_iface;
@@ -462,13 +462,13 @@ HRESULT FtpProtocol_Construct(IUnknown *outer, void **ppv)
ret = heap_alloc_zero(sizeof(FtpProtocol));
ret->base.vtbl = &AsyncProtocolVtbl;
- ret->IUnknown_outer.lpVtbl = &FtpProtocolUnkVtbl;
+ ret->IUnknown_inner.lpVtbl = &FtpProtocolUnkVtbl;
ret->IInternetProtocolEx_iface.lpVtbl = &FtpProtocolVtbl;
ret->IInternetPriority_iface.lpVtbl = &FtpPriorityVtbl;
ret->IWinInetHttpInfo_iface.lpVtbl = &WinInetHttpInfoVtbl;
ret->ref = 1;
- ret->outer = outer ? outer : &ret->IUnknown_outer;
+ ret->outer = outer ? outer : &ret->IUnknown_inner;
- *ppv = &ret->IUnknown_outer;
+ *ppv = &ret->IUnknown_inner;
return S_OK;
}
diff --git a/dlls/urlmon/http.c b/dlls/urlmon/http.c
index 1762787..ad1d0d8 100644
--- a/dlls/urlmon/http.c
+++ b/dlls/urlmon/http.c
@@ -32,7 +32,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
typedef struct {
Protocol base;
- IUnknown IUnknown_outer;
+ IUnknown IUnknown_inner;
IInternetProtocolEx IInternetProtocolEx_iface;
IInternetPriority IInternetPriority_iface;
IWinInetHttpInfo IWinInetHttpInfo_iface;
@@ -47,7 +47,7 @@ typedef struct {
static inline HttpProtocol *impl_from_IUnknown(IUnknown *iface)
{
- return CONTAINING_RECORD(iface, HttpProtocol, IUnknown_outer);
+ return CONTAINING_RECORD(iface, HttpProtocol, IUnknown_inner);
}
static inline HttpProtocol *impl_from_IInternetProtocolEx(IInternetProtocolEx *iface)
@@ -637,7 +637,7 @@ static HRESULT WINAPI HttpProtocolUnk_QueryInterface(IUnknown *iface, REFIID rii
if(IsEqualGUID(&IID_IUnknown, riid)) {
TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv);
- *ppv = &This->IUnknown_outer;
+ *ppv = &This->IUnknown_inner;
}else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) {
TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv);
*ppv = &This->IInternetProtocolEx_iface;
@@ -967,16 +967,16 @@ static HRESULT create_http_protocol(BOOL https, IUnknown *outer, void **ppobj)
return E_OUTOFMEMORY;
ret->base.vtbl = &AsyncProtocolVtbl;
- ret->IUnknown_outer.lpVtbl = &HttpProtocolUnkVtbl;
+ ret->IUnknown_inner.lpVtbl = &HttpProtocolUnkVtbl;
ret->IInternetProtocolEx_iface.lpVtbl = &HttpProtocolVtbl;
ret->IInternetPriority_iface.lpVtbl = &HttpPriorityVtbl;
ret->IWinInetHttpInfo_iface.lpVtbl = &WinInetHttpInfoVtbl;
ret->https = https;
ret->ref = 1;
- ret->outer = outer ? outer : &ret->IUnknown_outer;
+ ret->outer = outer ? outer : &ret->IUnknown_inner;
- *ppobj = &ret->IUnknown_outer;
+ *ppobj = &ret->IUnknown_inner;
URLMON_LockModule();
return S_OK;
diff --git a/dlls/urlmon/mk.c b/dlls/urlmon/mk.c
index d73a00c..7af8f0c 100644
--- a/dlls/urlmon/mk.c
+++ b/dlls/urlmon/mk.c
@@ -25,7 +25,7 @@
WINE_DEFAULT_DEBUG_CHANNEL(urlmon);
typedef struct {
- IUnknown IUnknown_outer;
+ IUnknown IUnknown_inner;
IInternetProtocolEx IInternetProtocolEx_iface;
LONG ref;
@@ -36,7 +36,7 @@ typedef struct {
static inline MkProtocol *impl_from_IUnknown(IUnknown *iface)
{
- return CONTAINING_RECORD(iface, MkProtocol, IUnknown_outer);
+ return CONTAINING_RECORD(iface, MkProtocol, IUnknown_inner);
}
static inline MkProtocol *impl_from_IInternetProtocolEx(IInternetProtocolEx *iface)
@@ -50,7 +50,7 @@ static HRESULT WINAPI MkProtocolUnk_QueryInterface(IUnknown *iface, REFIID riid,
if(IsEqualGUID(&IID_IUnknown, riid)) {
TRACE("(%p)->(IID_IUnknown %p)\n", This, ppv);
- *ppv = &This->IUnknown_outer;
+ *ppv = &This->IUnknown_inner;
}else if(IsEqualGUID(&IID_IInternetProtocolRoot, riid)) {
TRACE("(%p)->(IID_IInternetProtocolRoot %p)\n", This, ppv);
*ppv = &This->IInternetProtocolEx_iface;
@@ -372,15 +372,15 @@ HRESULT MkProtocol_Construct(IUnknown *outer, void **ppv)
ret = heap_alloc(sizeof(MkProtocol));
- ret->IUnknown_outer.lpVtbl = &MkProtocolUnkVtbl;
+ ret->IUnknown_inner.lpVtbl = &MkProtocolUnkVtbl;
ret->IInternetProtocolEx_iface.lpVtbl = &MkProtocolVtbl;
ret->ref = 1;
- ret->outer = outer ? outer : &ret->IUnknown_outer;
+ ret->outer = outer ? outer : &ret->IUnknown_inner;
ret->stream = NULL;
/* NOTE:
* Native returns NULL ppobj and S_OK in CreateInstance if called with IID_IUnknown riid and no outer.
*/
- *ppv = &ret->IUnknown_outer;
+ *ppv = &ret->IUnknown_inner;
return S_OK;
}
More information about the wine-cvs
mailing list