Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 16:43:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

[STI] Sync with Wine Staging 1.9.23. CORE-12409

Browse source 
svn path=/trunk/; revision=73292
This commit is contained in:
Amine Khaldi 2016-11-17 23:08:33 +00:00
parent 06ccd81758
commit 32cb9ee335
2 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

20
reactos/dll/win32/sti/sti.c
View file

@ -34,9 +34,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;
@ -49,19 +49,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)
@ -251,7 +251,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)
@ -325,18 +325,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;
} }

2
reactos/media/doc/README.WINE
View file

@ -180,7 +180,7 @@ reactos/dll/win32/snmpapi # Synced to WineStaging-1.9.11
reactos/dll/win32/softpub # Synced to WineStaging-1.9.11 reactos/dll/win32/softpub # Synced to WineStaging-1.9.11
reactos/dll/win32/stdole2.tlb # Synced to WineStaging-1.9.11 reactos/dll/win32/stdole2.tlb # Synced to WineStaging-1.9.11
reactos/dll/win32/stdole32.tlb # Synced to WineStaging-1.9.11 reactos/dll/win32/stdole32.tlb # Synced to WineStaging-1.9.11
reactos/dll/win32/sti # Synced to WineStaging-1.9.11 reactos/dll/win32/sti # Synced to WineStaging-1.9.23
reactos/dll/win32/sxs # Synced to WineStaging-1.9.11 reactos/dll/win32/sxs # Synced to WineStaging-1.9.11
reactos/dll/win32/t2embed # Synced to WineStaging-1.9.11 reactos/dll/win32/t2embed # Synced to WineStaging-1.9.11
reactos/dll/win32/tapi32 # Synced to WineStaging-1.9.11 reactos/dll/win32/tapi32 # Synced to WineStaging-1.9.11