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

sti: Standardize COM aggregation in StillImage. 

Signed-off-by: Michael Stefaniuc <mstefani@redhat.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Stefaniuc 2016-09-08 13:22:11 +02:00 committed by Alexandre Julliard
parent 5b622cfd84
commit 4f114ad623
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/sti/sti.c
View File

@ -44,9 +44,9 @@ static const WCHAR registeredAppsLaunchPath[] = {
typedef struct _stillimage typedef struct _stillimage
{ {
IUnknown IUnknown_inner;
IStillImageW IStillImageW_iface; IStillImageW IStillImageW_iface;
IUnknown IUnknown_iface; IUnknown *outer_unk;
IUnknown *pUnkOuter;
LONG ref; LONG ref;
} stillimage; } stillimage;
@ -59,19 +59,19 @@ static HRESULT WINAPI stillimagew_QueryInterface(IStillImageW *iface, REFIID rii
{ {
stillimage *This = impl_from_IStillImageW(iface); stillimage *This = impl_from_IStillImageW(iface);
TRACE("(%p %s %p)\n", This, debugstr_guid(riid), ppvObject); TRACE("(%p %s %p)\n", This, debugstr_guid(riid), ppvObject);
return IUnknown_QueryInterface(This->pUnkOuter, riid, ppvObject); return IUnknown_QueryInterface(This->outer_unk, riid, ppvObject);
} }
static ULONG WINAPI stillimagew_AddRef(IStillImageW *iface) static ULONG WINAPI stillimagew_AddRef(IStillImageW *iface)
{ {
stillimage *This = impl_from_IStillImageW(iface); stillimage *This = impl_from_IStillImageW(iface);
return IUnknown_AddRef(This->pUnkOuter); return IUnknown_AddRef(This->outer_unk);
} }
static ULONG WINAPI stillimagew_Release(IStillImageW *iface) static ULONG WINAPI stillimagew_Release(IStillImageW *iface)
{ {
stillimage *This = impl_from_IStillImageW(iface); stillimage *This = impl_from_IStillImageW(iface);
return IUnknown_Release(This->pUnkOuter); return IUnknown_Release(This->outer_unk);
} }
static HRESULT WINAPI stillimagew_Initialize(IStillImageW *iface, HINSTANCE hinst, DWORD dwVersion) static HRESULT WINAPI stillimagew_Initialize(IStillImageW *iface, HINSTANCE hinst, DWORD dwVersion)
@ -261,7 +261,7 @@ static const struct IStillImageWVtbl stillimagew_vtbl =
static inline stillimage *impl_from_IUnknown(IUnknown *iface) static inline stillimage *impl_from_IUnknown(IUnknown *iface)
{ {
return CONTAINING_RECORD(iface, stillimage, IUnknown_iface); return CONTAINING_RECORD(iface, stillimage, IUnknown_inner);
} }
static HRESULT WINAPI Internal_QueryInterface(IUnknown *iface, REFIID riid, void **ppvObject) static HRESULT WINAPI Internal_QueryInterface(IUnknown *iface, REFIID riid, void **ppvObject)
@ -335,18 +335,18 @@ HRESULT WINAPI StiCreateInstanceW(HINSTANCE hinst, DWORD dwVer, PSTIW *ppSti, LP
if (This) if (This)
{ {
This->IStillImageW_iface.lpVtbl = &stillimagew_vtbl; This->IStillImageW_iface.lpVtbl = &stillimagew_vtbl;
This->IUnknown_iface.lpVtbl = &internal_unk_vtbl; This->IUnknown_inner.lpVtbl = &internal_unk_vtbl;
if (pUnkOuter) if (pUnkOuter)
This->pUnkOuter = pUnkOuter; This->outer_unk = pUnkOuter;
else else
This->pUnkOuter = &This->IUnknown_iface; This->outer_unk = &This->IUnknown_inner;
This->ref = 1; This->ref = 1;
hr = IStillImage_Initialize(&This->IStillImageW_iface, hinst, dwVer); hr = IStillImage_Initialize(&This->IStillImageW_iface, hinst, dwVer);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
if (pUnkOuter) if (pUnkOuter)
*ppSti = (IStillImageW*) &This->IUnknown_iface; *ppSti = (IStillImageW*) &This->IUnknown_inner;
else else
*ppSti = &This->IStillImageW_iface; *ppSti = &This->IStillImageW_iface;
} }