wine-commits June 2015

wine-commits@winehq.org

2 participants
610 discussions

Sebastian Lackner : ntdll: NtMapViewOfSection should fail if both addr_ptr and zero_bits is set.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: 7a8470ea945340c523af2d576b37ce168d951a27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a8470ea945340c523af2d576… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 26 07:46:23 2015 +0200 ntdll: NtMapViewOfSection should fail if both addr_ptr and zero_bits is set. --- dlls/kernel32/tests/virtual.c | 24 ++++++++++++------------ dlls/ntdll/virtual.c | 3 +++ 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index 6082740..008376c 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1093,25 +1093,25 @@ static void test_NtMapViewOfSection(void) size = 0; offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 12, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - todo_wine ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); - if (status == STATUS_SUCCESS) - { - status = pNtUnmapViewOfSection( hProcess, ptr2 ); - ok( !status, "NtUnmapViewOfSection failed status %x\n", status ); - } ptr2 = (char *)ptr + 0x1000; size = 0; offset.QuadPart = 0; status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 16, 0, &offset, &size, 1, 0, PAGE_READWRITE ); - todo_wine ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); - if (status == STATUS_SUCCESS) - { - status = pNtUnmapViewOfSection( hProcess, ptr2 ); - ok( !status, "NtUnmapViewOfSection failed status %x\n", status ); - } + + ptr2 = (char *)ptr + 0x1001; + size = 0; + offset.QuadPart = 0; + status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 16, 0, &offset, &size, 1, 0, PAGE_READWRITE ); + ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); + + ptr2 = (char *)ptr + 0x1000; + size = 0; + offset.QuadPart = 1; + status = pNtMapViewOfSection( mapping, hProcess, &ptr2, 16, 0, &offset, &size, 1, 0, PAGE_READWRITE ); + ok( status == STATUS_INVALID_PARAMETER_4, "NtMapViewOfSection returned %x\n", status ); if (sizeof(void *) == sizeof(int) && (!pIsWow64Process || !pIsWow64Process( GetCurrentProcess(), &is_wow64 ) || !is_wow64)) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 72309f6..a010e3b4 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2601,6 +2601,9 @@ NTSTATUS WINAPI NtMapViewOfSection( HANDLE handle, HANDLE process, PVOID *addr_p /* Check parameters */ + if (*addr_ptr && zero_bits) + return STATUS_INVALID_PARAMETER_4; + if ((offset.u.LowPart & mask) || (*addr_ptr && ((UINT_PTR)*addr_ptr & mask))) return STATUS_MAPPED_ALIGNMENT;

1 0

Alistair Leslie-Hughes : d3dcompiler: Share the source with d3dcompiler_47.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: 0a12011ab60d39eb88eb68bc3f8cfce34d6b0743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a12011ab60d39eb88eb68bc3… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 25 19:46:57 2015 +1000 d3dcompiler: Share the source with d3dcompiler_47. --- dlls/d3dcompiler_47/Makefile.in | 20 ++++++++++++++- dlls/d3dcompiler_47/d3dcompiler_47.spec | 24 +++++++++--------- dlls/d3dcompiler_47/d3dcompiler_47_main.c | 42 ------------------------------- 3 files changed, 31 insertions(+), 55 deletions(-) diff --git a/dlls/d3dcompiler_47/Makefile.in b/dlls/d3dcompiler_47/Makefile.in index 9f6ef8f..cb7f557 100644 --- a/dlls/d3dcompiler_47/Makefile.in +++ b/dlls/d3dcompiler_47/Makefile.in @@ -1,6 +1,24 @@ MODULE = d3dcompiler_47.dll +IMPORTS = dxguid uuid +EXTRALIBS = $(LIBWPP) +EXTRADEFS = -DD3D_COMPILER_VERSION=47 +PARENTSRC = ../d3dcompiler_43 C_SRCS = \ - d3dcompiler_47_main.c + asmparser.c \ + blob.c \ + bytecodewriter.c \ + compiler.c \ + main.c \ + reflection.c \ + utils.c + +LEX_SRCS = \ + asmshader.l \ + hlsl.l + +BISON_SRCS = \ + asmshader.y \ + hlsl.y RC_SRCS = version.rc diff --git a/dlls/d3dcompiler_47/d3dcompiler_47.spec b/dlls/d3dcompiler_47/d3dcompiler_47.spec index 08bc418..40ad977 100644 --- a/dlls/d3dcompiler_47/d3dcompiler_47.spec +++ b/dlls/d3dcompiler_47/d3dcompiler_47.spec @@ -1,29 +1,29 @@ -@ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) d3dcompiler_43.D3DAssemble -@ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile +@ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) +@ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) @ stub D3DCompile2 @ stub D3DCompileFromFile @ stub D3DCompressShaders -@ stdcall D3DCreateBlob(long ptr) d3dcompiler_43.D3DCreateBlob +@ stdcall D3DCreateBlob(long ptr) @ stub D3DCreateFunctionLinkingGraph @ stub D3DCreateLinker @ stub D3DDecompressShaders -@ stdcall D3DDisassemble(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble +@ stdcall D3DDisassemble(ptr long long ptr ptr) @ stdcall D3DDisassemble10Effect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect @ stub D3DDisassemble11Trace @ stub D3DDisassembleRegion -@ stdcall D3DGetBlobPart(ptr long long long ptr) d3dcompiler_43.D3DGetBlobPart -@ stdcall D3DGetDebugInfo(ptr long ptr) d3dcompiler_43.D3DGetDebugInfo -@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputAndOutputSignatureBlob -@ stdcall D3DGetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob -@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetOutputSignatureBlob +@ stdcall D3DGetBlobPart(ptr long long long ptr) +@ stdcall D3DGetDebugInfo(ptr long ptr) +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) @ stub D3DGetTraceInstructionOffsets @ stub D3DLoadModule -@ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess +@ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) @ stub D3DReadFileToBlob -@ stdcall D3DReflect(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stdcall D3DReflect(ptr long ptr ptr) @ stub D3DReflectLibrary @ stub D3DReturnFailure1 @ stub D3DSetBlobPart -@ stdcall D3DStripShader(ptr long long ptr) d3dcompiler_43.D3DStripShader +@ stdcall D3DStripShader(ptr long long ptr) @ stub D3DWriteBlobToFile @ stub DebugSetMute diff --git a/dlls/d3dcompiler_47/d3dcompiler_47_main.c b/dlls/d3dcompiler_47/d3dcompiler_47_main.c deleted file mode 100644 index 320a4e0..0000000 --- a/dlls/d3dcompiler_47/d3dcompiler_47_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Direct3D shader compiler main file - * - * Copyright 2015 Alistair Leslie-Hughes - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "config.h" -#include "wine/port.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" - -BOOL WINAPI DllMain(HINSTANCE instdll, DWORD reason, void *reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instdll); - break; - } - - return TRUE; -}

1 0

Alistair Leslie-Hughes : d3dcompiler: Rename d3dcompiler_43_main.c to main.c.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: 80205c0160d574bc190438832c9eb4d777bd8f95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80205c0160d574bc190438832… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 25 19:37:44 2015 +1000 d3dcompiler: Rename d3dcompiler_43_main.c to main.c. --- dlls/d3dcompiler_43/Makefile.in | 2 +- dlls/d3dcompiler_43/{d3dcompiler_43_main.c => main.c} | 0 dlls/d3dcompiler_46/Makefile.in | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dcompiler_43/Makefile.in b/dlls/d3dcompiler_43/Makefile.in index c88069d..e9a927e 100644 --- a/dlls/d3dcompiler_43/Makefile.in +++ b/dlls/d3dcompiler_43/Makefile.in @@ -8,7 +8,7 @@ C_SRCS = \ blob.c \ bytecodewriter.c \ compiler.c \ - d3dcompiler_43_main.c \ + main.c \ reflection.c \ utils.c diff --git a/dlls/d3dcompiler_43/d3dcompiler_43_main.c b/dlls/d3dcompiler_43/main.c similarity index 100% rename from dlls/d3dcompiler_43/d3dcompiler_43_main.c rename to dlls/d3dcompiler_43/main.c diff --git a/dlls/d3dcompiler_46/Makefile.in b/dlls/d3dcompiler_46/Makefile.in index 9edd7b6..e13cbd0 100644 --- a/dlls/d3dcompiler_46/Makefile.in +++ b/dlls/d3dcompiler_46/Makefile.in @@ -9,7 +9,7 @@ C_SRCS = \ blob.c \ bytecodewriter.c \ compiler.c \ - d3dcompiler_43_main.c \ + main.c \ reflection.c \ utils.c

1 0

Alistair Leslie-Hughes : d3dcompiler: Share the source with d3dcompiler_46.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: 8609e2d2722b2a9533df24080026206c75a6af79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8609e2d2722b2a9533df24080… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Wed Jun 24 20:03:03 2015 +1000 d3dcompiler: Share the source with d3dcompiler_46. --- dlls/d3dcompiler_46/Makefile.in | 20 ++++++++++++++- dlls/d3dcompiler_46/d3dcompiler_46.spec | 24 +++++++++--------- dlls/d3dcompiler_46/d3dcompiler_46_main.c | 42 ------------------------------- 3 files changed, 31 insertions(+), 55 deletions(-) diff --git a/dlls/d3dcompiler_46/Makefile.in b/dlls/d3dcompiler_46/Makefile.in index 08c5145..9edd7b6 100644 --- a/dlls/d3dcompiler_46/Makefile.in +++ b/dlls/d3dcompiler_46/Makefile.in @@ -1,6 +1,24 @@ MODULE = d3dcompiler_46.dll +IMPORTS = dxguid uuid +EXTRALIBS = $(LIBWPP) +EXTRADEFS = -DD3D_COMPILER_VERSION=46 +PARENTSRC = ../d3dcompiler_43 C_SRCS = \ - d3dcompiler_46_main.c + asmparser.c \ + blob.c \ + bytecodewriter.c \ + compiler.c \ + d3dcompiler_43_main.c \ + reflection.c \ + utils.c + +LEX_SRCS = \ + asmshader.l \ + hlsl.l + +BISON_SRCS = \ + asmshader.y \ + hlsl.y RC_SRCS = version.rc diff --git a/dlls/d3dcompiler_46/d3dcompiler_46.spec b/dlls/d3dcompiler_46/d3dcompiler_46.spec index 526a997..5811b40 100644 --- a/dlls/d3dcompiler_46/d3dcompiler_46.spec +++ b/dlls/d3dcompiler_46/d3dcompiler_46.spec @@ -1,25 +1,25 @@ -@ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) d3dcompiler_43.D3DAssemble -@ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile +@ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) +@ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) @ stub D3DCompile2 @ stub D3DCompileFromFile @ stub D3DCompressShaders -@ stdcall D3DCreateBlob(long ptr) d3dcompiler_43.D3DCreateBlob +@ stdcall D3DCreateBlob(long ptr) @ stub D3DDecompressShaders -@ stdcall D3DDisassemble(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble +@ stdcall D3DDisassemble(ptr long long ptr ptr) @ stdcall D3DDisassemble10Effect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect @ stub D3DDisassemble11Trace @ stub D3DDisassembleRegion -@ stdcall D3DGetBlobPart(ptr long long long ptr) d3dcompiler_43.D3DGetBlobPart -@ stdcall D3DGetDebugInfo(ptr long ptr) d3dcompiler_43.D3DGetDebugInfo -@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputAndOutputSignatureBlob -@ stdcall D3DGetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob -@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetOutputSignatureBlob +@ stdcall D3DGetBlobPart(ptr long long long ptr) +@ stdcall D3DGetDebugInfo(ptr long ptr) +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) @ stub D3DGetTraceInstructionOffsets -@ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess +@ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) @ stub D3DReadFileToBlob -@ stdcall D3DReflect(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stdcall D3DReflect(ptr long ptr ptr) @ stub D3DReturnFailure1 @ stub D3DSetBlobPart -@ stdcall D3DStripShader(ptr long long ptr) d3dcompiler_43.D3DStripShader +@ stdcall D3DStripShader(ptr long long ptr) @ stub D3DWriteBlobToFile @ stub DebugSetMute diff --git a/dlls/d3dcompiler_46/d3dcompiler_46_main.c b/dlls/d3dcompiler_46/d3dcompiler_46_main.c deleted file mode 100644 index 80da1ff..0000000 --- a/dlls/d3dcompiler_46/d3dcompiler_46_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Direct3D shader compiler main file - * - * Copyright 2015 Alistair Leslie-Hughes - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - */ - -#include "config.h" -#include "wine/port.h" - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" - -BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instance); - break; - } - - return TRUE; -}

1 0

Sebastian Lackner : quartz: Distinguish interface pointer and implementation pointer in multiple interfaces.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: 2e6ff19e0e46572dc17c72cb1dc2ec7bb6ffe4df URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e6ff19e0e46572dc17c72cb1… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 26 05:52:42 2015 +0200 quartz: Distinguish interface pointer and implementation pointer in multiple interfaces. --- dlls/quartz/acmwrapper.c | 2 +- dlls/quartz/avidec.c | 2 +- dlls/quartz/filesource.c | 8 ++++---- dlls/quartz/memallocator.c | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/acmwrapper.c b/dlls/quartz/acmwrapper.c index 5bc0d8f..d9a94a9 100644 --- a/dlls/quartz/acmwrapper.c +++ b/dlls/quartz/acmwrapper.c @@ -394,7 +394,7 @@ HRESULT ACMWrapper_create(IUnknown * pUnkOuter, LPVOID * ppv) if (FAILED(hr)) return hr; - *ppv = This; + *ppv = &This->tf.filter.IBaseFilter_iface; This->lasttime_real = This->lasttime_sent = -1; return hr; diff --git a/dlls/quartz/avidec.c b/dlls/quartz/avidec.c index 5047809..1a58844 100644 --- a/dlls/quartz/avidec.c +++ b/dlls/quartz/avidec.c @@ -416,7 +416,7 @@ HRESULT AVIDec_create(IUnknown * pUnkOuter, LPVOID * ppv) This->pBihIn = NULL; This->pBihOut = NULL; - *ppv = This; + *ppv = &This->tf.filter.IBaseFilter_iface; return hr; } diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 84e4214..877c706 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -452,13 +452,13 @@ static HRESULT WINAPI AsyncReader_QueryInterface(IBaseFilter * iface, REFIID rii *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = This; + *ppv = &This->filter.IBaseFilter_iface; else if (IsEqualIID(riid, &IID_IPersist)) - *ppv = This; + *ppv = &This->filter.IBaseFilter_iface; else if (IsEqualIID(riid, &IID_IMediaFilter)) - *ppv = This; + *ppv = &This->filter.IBaseFilter_iface; else if (IsEqualIID(riid, &IID_IBaseFilter)) - *ppv = This; + *ppv = &This->filter.IBaseFilter_iface; else if (IsEqualIID(riid, &IID_IFileSourceFilter)) *ppv = &This->IFileSourceFilter_iface; else if (IsEqualIID(riid, &IID_IAMFilterMiscFlags)) diff --git a/dlls/quartz/memallocator.c b/dlls/quartz/memallocator.c index f1903f9..f5ee3c2 100644 --- a/dlls/quartz/memallocator.c +++ b/dlls/quartz/memallocator.c @@ -116,9 +116,9 @@ static HRESULT WINAPI BaseMemAllocator_QueryInterface(IMemAllocator * iface, REF *ppv = NULL; if (IsEqualIID(riid, &IID_IUnknown)) - *ppv = This; + *ppv = &This->IMemAllocator_iface; else if (IsEqualIID(riid, &IID_IMemAllocator)) - *ppv = This; + *ppv = &This->IMemAllocator_iface; if (*ppv) {

1 0

Sebastian Lackner : qcap: Distinguish interface pointer and implementation pointer for base filter.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: cf234d66b167879518b20431d5b2b1a892549313 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf234d66b167879518b20431d… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 26 05:52:26 2015 +0200 qcap: Distinguish interface pointer and implementation pointer for base filter. --- dlls/qcap/vfwcapture.c | 38 ++++++++++++++++++++++++-------------- 1 file changed, 24 insertions(+), 14 deletions(-) diff --git a/dlls/qcap/vfwcapture.c b/dlls/qcap/vfwcapture.c index efae931..7804a3d 100644 --- a/dlls/qcap/vfwcapture.c +++ b/dlls/qcap/vfwcapture.c @@ -68,6 +68,16 @@ typedef struct VfwCapture IPin * pOutputPin; } VfwCapture; +static inline VfwCapture *impl_from_BaseFilter(BaseFilter *iface) +{ + return CONTAINING_RECORD(iface, VfwCapture, filter); +} + +static inline VfwCapture *impl_from_IBaseFilter(IBaseFilter *iface) +{ + return CONTAINING_RECORD(iface, VfwCapture, filter.IBaseFilter_iface); +} + static inline VfwCapture *impl_from_IAMStreamConfig(IAMStreamConfig *iface) { return CONTAINING_RECORD(iface, VfwCapture, IAMStreamConfig_iface); @@ -94,7 +104,7 @@ typedef struct VfwPinImpl static IPin* WINAPI VfwCapture_GetPin(BaseFilter *iface, int pos) { - VfwCapture *This = (VfwCapture *)iface; + VfwCapture *This = impl_from_BaseFilter(iface); if (pos >= 1 || pos < 0) return NULL; @@ -148,12 +158,12 @@ IUnknown * WINAPI QCAP_createVFWCaptureFilter(IUnknown *pUnkOuter, HRESULT *phr) ObjectRefCount(TRUE); *phr = S_OK; - return (IUnknown *)pVfwCapture; + return (IUnknown *)&pVfwCapture->filter.IBaseFilter_iface; } static HRESULT WINAPI VfwCapture_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv) { - VfwCapture *This = (VfwCapture *)iface; + VfwCapture *This = impl_from_IBaseFilter(iface); TRACE("(%s, %p)\n", debugstr_guid(riid), ppv); *ppv = NULL; @@ -162,7 +172,7 @@ static HRESULT WINAPI VfwCapture_QueryInterface(IBaseFilter * iface, REFIID riid IsEqualIID(riid, &IID_IMediaFilter) || IsEqualIID(riid, &IID_IBaseFilter)) { - *ppv = This; + *ppv = &This->filter.IBaseFilter_iface; } else if (IsEqualIID(riid, &IID_IAMStreamConfig)) *ppv = &This->IAMStreamConfig_iface; @@ -200,7 +210,7 @@ static HRESULT WINAPI VfwCapture_QueryInterface(IBaseFilter * iface, REFIID riid static ULONG WINAPI VfwCapture_Release(IBaseFilter * iface) { - VfwCapture *This = (VfwCapture *)iface; + VfwCapture *This = impl_from_IBaseFilter(iface); ULONG refCount = InterlockedDecrement(&This->filter.refCount); TRACE("%p->() New refcount: %d\n", This, refCount); @@ -234,7 +244,7 @@ static ULONG WINAPI VfwCapture_Release(IBaseFilter * iface) static HRESULT WINAPI VfwCapture_Stop(IBaseFilter * iface) { - VfwCapture *This = (VfwCapture *)iface; + VfwCapture *This = impl_from_IBaseFilter(iface); TRACE("()\n"); return qcap_driver_stop(This->driver_info, &This->filter.state); @@ -242,7 +252,7 @@ static HRESULT WINAPI VfwCapture_Stop(IBaseFilter * iface) static HRESULT WINAPI VfwCapture_Pause(IBaseFilter * iface) { - VfwCapture *This = (VfwCapture *)iface; + VfwCapture *This = impl_from_IBaseFilter(iface); TRACE("()\n"); return qcap_driver_pause(This->driver_info, &This->filter.state); @@ -250,7 +260,7 @@ static HRESULT WINAPI VfwCapture_Pause(IBaseFilter * iface) static HRESULT WINAPI VfwCapture_Run(IBaseFilter * iface, REFERENCE_TIME tStart) { - VfwCapture *This = (VfwCapture *)iface; + VfwCapture *This = impl_from_IBaseFilter(iface); TRACE("(%x%08x)\n", (ULONG)(tStart >> 32), (ULONG)tStart); return qcap_driver_run(This->driver_info, &This->filter.state); } @@ -306,7 +316,7 @@ static ULONG WINAPI AMStreamConfig_AddRef( IAMStreamConfig * iface ) VfwCapture *This = impl_from_IAMStreamConfig(iface); TRACE("%p --> Forwarding to VfwCapture (%p)\n", iface, This); - return IUnknown_AddRef((IUnknown *)This); + return IUnknown_AddRef(&This->filter.IBaseFilter_iface); } static ULONG WINAPI AMStreamConfig_Release( IAMStreamConfig * iface ) @@ -314,7 +324,7 @@ static ULONG WINAPI AMStreamConfig_Release( IAMStreamConfig * iface ) VfwCapture *This = impl_from_IAMStreamConfig(iface); TRACE("%p --> Forwarding to VfwCapture (%p)\n", iface, This); - return IUnknown_Release((IUnknown *)This); + return IUnknown_Release(&This->filter.IBaseFilter_iface); } static HRESULT WINAPI @@ -417,14 +427,14 @@ static ULONG WINAPI AMVideoProcAmp_AddRef(IAMVideoProcAmp * iface) { VfwCapture *This = impl_from_IAMVideoProcAmp(iface); - return IUnknown_AddRef((IUnknown *)This); + return IUnknown_AddRef(&This->filter.IBaseFilter_iface); } static ULONG WINAPI AMVideoProcAmp_Release(IAMVideoProcAmp * iface) { VfwCapture *This = impl_from_IAMVideoProcAmp(iface); - return IUnknown_Release((IUnknown *)This); + return IUnknown_Release(&This->filter.IBaseFilter_iface); } static HRESULT WINAPI @@ -494,7 +504,7 @@ static ULONG WINAPI PPB_AddRef(IPersistPropertyBag * iface) TRACE("%p --> Forwarding to VfwCapture (%p)\n", iface, This); - return IUnknown_AddRef((IUnknown *)This); + return IUnknown_AddRef(&This->filter.IBaseFilter_iface); } static ULONG WINAPI PPB_Release(IPersistPropertyBag * iface) @@ -503,7 +513,7 @@ static ULONG WINAPI PPB_Release(IPersistPropertyBag * iface) TRACE("%p --> Forwarding to VfwCapture (%p)\n", iface, This); - return IUnknown_Release((IUnknown *)This); + return IUnknown_Release(&This->filter.IBaseFilter_iface); } static HRESULT WINAPI

1 0

Sebastian Lackner : windowscodecs: Distinguish interface pointer and implementation pointer.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: 40e364f0a6877abdb8e0abc9ba88825aefd81495 URL: http://source.winehq.org/git/wine.git/?a=commit;h=40e364f0a6877abdb8e0abc9b… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Jun 26 05:52:08 2015 +0200 windowscodecs: Distinguish interface pointer and implementation pointer. --- dlls/windowscodecs/info.c | 20 ++++++++++---------- dlls/windowscodecs/stream.c | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/windowscodecs/info.c b/dlls/windowscodecs/info.c index 2cb64d4..cf3c38a 100644 --- a/dlls/windowscodecs/info.c +++ b/dlls/windowscodecs/info.c @@ -230,7 +230,7 @@ static HRESULT WINAPI BitmapDecoderInfo_QueryInterface(IWICBitmapDecoderInfo *if IsEqualIID(&IID_IWICBitmapCodecInfo, iid) || IsEqualIID(&IID_IWICBitmapDecoderInfo ,iid)) { - *ppv = This; + *ppv = &This->IWICBitmapDecoderInfo_iface; } else { @@ -671,7 +671,7 @@ static HRESULT BitmapDecoderInfo_Constructor(HKEY classkey, REFCLSID clsid, IWIC This->classkey = classkey; memcpy(&This->clsid, clsid, sizeof(CLSID)); - *ppIInfo = (IWICComponentInfo*)This; + *ppIInfo = (IWICComponentInfo *)&This->IWICBitmapDecoderInfo_iface; return S_OK; } @@ -700,7 +700,7 @@ static HRESULT WINAPI BitmapEncoderInfo_QueryInterface(IWICBitmapEncoderInfo *if IsEqualIID(&IID_IWICBitmapCodecInfo, iid) || IsEqualIID(&IID_IWICBitmapEncoderInfo ,iid)) { - *ppv = This; + *ppv = &This->IWICBitmapEncoderInfo_iface; } else { @@ -962,7 +962,7 @@ static HRESULT BitmapEncoderInfo_Constructor(HKEY classkey, REFCLSID clsid, IWIC This->classkey = classkey; memcpy(&This->clsid, clsid, sizeof(CLSID)); - *ppIInfo = (IWICComponentInfo*)This; + *ppIInfo = (IWICComponentInfo *)&This->IWICBitmapEncoderInfo_iface; return S_OK; } @@ -990,7 +990,7 @@ static HRESULT WINAPI FormatConverterInfo_QueryInterface(IWICFormatConverterInfo IsEqualIID(&IID_IWICComponentInfo, iid) || IsEqualIID(&IID_IWICFormatConverterInfo ,iid)) { - *ppv = This; + *ppv = &This->IWICFormatConverterInfo_iface; } else { @@ -1179,7 +1179,7 @@ static HRESULT FormatConverterInfo_Constructor(HKEY classkey, REFCLSID clsid, IW This->classkey = classkey; memcpy(&This->clsid, clsid, sizeof(CLSID)); - *ppIInfo = (IWICComponentInfo*)This; + *ppIInfo = (IWICComponentInfo *)&This->IWICFormatConverterInfo_iface; return S_OK; } @@ -1208,7 +1208,7 @@ static HRESULT WINAPI PixelFormatInfo_QueryInterface(IWICPixelFormatInfo2 *iface IsEqualIID(&IID_IWICPixelFormatInfo, iid) || IsEqualIID(&IID_IWICPixelFormatInfo2 ,iid)) { - *ppv = This; + *ppv = &This->IWICPixelFormatInfo2_iface; } else { @@ -1473,7 +1473,7 @@ static HRESULT PixelFormatInfo_Constructor(HKEY classkey, REFCLSID clsid, IWICCo This->classkey = classkey; memcpy(&This->clsid, clsid, sizeof(CLSID)); - *ppIInfo = (IWICComponentInfo*)This; + *ppIInfo = (IWICComponentInfo *)&This->IWICPixelFormatInfo2_iface; return S_OK; } @@ -1504,7 +1504,7 @@ static HRESULT WINAPI MetadataReaderInfo_QueryInterface(IWICMetadataReaderInfo * IsEqualIID(&IID_IWICMetadataHandlerInfo, riid) || IsEqualIID(&IID_IWICMetadataReaderInfo, riid)) { - *ppv = This; + *ppv = &This->IWICMetadataReaderInfo_iface; } else { @@ -1912,7 +1912,7 @@ static HRESULT MetadataReaderInfo_Constructor(HKEY classkey, REFCLSID clsid, IWI This->classkey = classkey; This->clsid = *clsid; - *info = (IWICComponentInfo *)This; + *info = (IWICComponentInfo *)&This->IWICMetadataReaderInfo_iface; return S_OK; } diff --git a/dlls/windowscodecs/stream.c b/dlls/windowscodecs/stream.c index f6bfedf..d05e940 100644 --- a/dlls/windowscodecs/stream.c +++ b/dlls/windowscodecs/stream.c @@ -757,7 +757,7 @@ static HRESULT WINAPI IWICStreamImpl_QueryInterface(IWICStream *iface, if (IsEqualIID(&IID_IUnknown, iid) || IsEqualIID(&IID_IStream, iid) || IsEqualIID(&IID_ISequentialStream, iid) || IsEqualIID(&IID_IWICStream, iid)) { - *ppv = This; + *ppv = &This->IWICStream_iface; IUnknown_AddRef((IUnknown*)*ppv); return S_OK; }

1 0

Michael Stefaniuc : dmstyle: IsParamSupported method doesn' t crashes on NULL.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: ed48ffdfae9fd03c1ee76d02d7efb96a88ffb633 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed48ffdfae9fd03c1ee76d02d… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 26 00:27:29 2015 +0200 dmstyle: IsParamSupported method doesn't crashes on NULL. --- dlls/dmstyle/auditiontrack.c | 4 ++++ dlls/dmstyle/chordtrack.c | 4 ++++ dlls/dmstyle/commandtrack.c | 4 ++++ dlls/dmstyle/motiftrack.c | 4 ++++ dlls/dmstyle/mutetrack.c | 4 ++++ dlls/dmstyle/styletrack.c | 4 ++++ dlls/dmstyle/tests/dmstyle.c | 4 ++++ 7 files changed, 28 insertions(+) diff --git a/dlls/dmstyle/auditiontrack.c b/dlls/dmstyle/auditiontrack.c index 4e14db0..f237a72 100644 --- a/dlls/dmstyle/auditiontrack.c +++ b/dlls/dmstyle/auditiontrack.c @@ -144,6 +144,10 @@ static HRESULT WINAPI IDirectMusicAuditionTrack_IDirectMusicTrack_IsParamSupport ICOM_THIS_MULTI(IDirectMusicAuditionTrack, TrackVtbl, iface); TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); + + if (!rguidType) + return E_POINTER; + /* didn't find any params */ TRACE("param unsupported\n"); return DMUS_E_TYPE_UNSUPPORTED; diff --git a/dlls/dmstyle/chordtrack.c b/dlls/dmstyle/chordtrack.c index 5ce3eb1..23fe16b 100644 --- a/dlls/dmstyle/chordtrack.c +++ b/dlls/dmstyle/chordtrack.c @@ -145,6 +145,10 @@ static HRESULT WINAPI IDirectMusicChordTrack_IDirectMusicTrack_IsParamSupported ICOM_THIS_MULTI(IDirectMusicChordTrack, TrackVtbl, iface); TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); + + if (!rguidType) + return E_POINTER; + if (IsEqualGUID (rguidType, &GUID_BandParam) || IsEqualGUID (rguidType, &GUID_ChordParam) || IsEqualGUID (rguidType, &GUID_RhythmParam)) { diff --git a/dlls/dmstyle/commandtrack.c b/dlls/dmstyle/commandtrack.c index 4cf208b..35415fb 100644 --- a/dlls/dmstyle/commandtrack.c +++ b/dlls/dmstyle/commandtrack.c @@ -145,6 +145,10 @@ static HRESULT WINAPI IDirectMusicCommandTrack_IDirectMusicTrack_IsParamSupporte ICOM_THIS_MULTI(IDirectMusicCommandTrack, TrackVtbl, iface); TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); + + if (!rguidType) + return E_POINTER; + if (IsEqualGUID (rguidType, &GUID_CommandParam) || IsEqualGUID (rguidType, &GUID_CommandParam2) || IsEqualGUID (rguidType, &GUID_CommandParamNext)) { diff --git a/dlls/dmstyle/motiftrack.c b/dlls/dmstyle/motiftrack.c index 9a25a05..d0449a7 100644 --- a/dlls/dmstyle/motiftrack.c +++ b/dlls/dmstyle/motiftrack.c @@ -144,6 +144,10 @@ static HRESULT WINAPI IDirectMusicMotifTrack_IDirectMusicTrack_IsParamSupported ICOM_THIS_MULTI(IDirectMusicMotifTrack, TrackVtbl, iface); TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); + + if (!rguidType) + return E_POINTER; + if (IsEqualGUID (rguidType, &GUID_DisableTimeSig) || IsEqualGUID (rguidType, &GUID_EnableTimeSig) || IsEqualGUID (rguidType, &GUID_SeedVariations) diff --git a/dlls/dmstyle/mutetrack.c b/dlls/dmstyle/mutetrack.c index 64390f1..3010ad6 100644 --- a/dlls/dmstyle/mutetrack.c +++ b/dlls/dmstyle/mutetrack.c @@ -144,6 +144,10 @@ static HRESULT WINAPI IDirectMusicMuteTrack_IDirectMusicTrack_IsParamSupported ( ICOM_THIS_MULTI(IDirectMusicMuteTrack, TrackVtbl, iface); TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); + + if (!rguidType) + return E_POINTER; + if (IsEqualGUID (rguidType, &GUID_MuteParam)) { TRACE("param supported\n"); return S_OK; diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index 39e5a70..69c3889 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -145,6 +145,10 @@ static HRESULT WINAPI IDirectMusicStyleTrack_IDirectMusicTrack_IsParamSupported ICOM_THIS_MULTI(IDirectMusicStyleTrack, TrackVtbl, iface); TRACE("(%p, %s)\n", This, debugstr_dmguid(rguidType)); + + if (!rguidType) + return E_POINTER; + if (IsEqualGUID (rguidType, &GUID_DisableTimeSig) || IsEqualGUID (rguidType, &GUID_EnableTimeSig) || IsEqualGUID (rguidType, &GUID_IDirectMusicStyle) diff --git a/dlls/dmstyle/tests/dmstyle.c b/dlls/dmstyle/tests/dmstyle.c index 0a0c5aa..58c229c 100644 --- a/dlls/dmstyle/tests/dmstyle.c +++ b/dlls/dmstyle/tests/dmstyle.c @@ -273,6 +273,10 @@ static void test_track(void) } ok(hr == S_OK, "%s create failed: %08x, expected S_OK\n", class[i].name, hr); + /* IDirectMusicTrack8 */ + hr = IDirectMusicTrack8_IsParamSupported(dmt8, NULL); + ok(hr == E_POINTER, "IDirectMusicTrack8_IsParamSupported failed: %08x\n", hr); + /* IPersistStream */ hr = IDirectMusicTrack8_QueryInterface(dmt8, &IID_IPersistStream, (void**)&ps); ok(hr == S_OK, "QueryInterface for IID_IPersistStream failed: %08x\n", hr);

1 0

Michael Stefaniuc : dmband: Use the generic IPersistStream implementation from dmobject.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: b79f81ad901f2e0c0e281a83aa45ab5db145c70d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b79f81ad901f2e0c0e281a83a… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 26 00:24:39 2015 +0200 dmband: Use the generic IPersistStream implementation from dmobject. --- dlls/dmband/bandtrack.c | 88 ++++++++++++++----------------------------------- dlls/dmband/dmutils.h | 8 ----- 2 files changed, 25 insertions(+), 71 deletions(-) diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 698ea94..3913e14 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -18,6 +18,7 @@ */ #include "dmband_private.h" +#include "dmobject.h" WINE_DEFAULT_DEBUG_CHANNEL(dmband); WINE_DECLARE_DEBUG_CHANNEL(dmfile); @@ -27,9 +28,8 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); */ typedef struct IDirectMusicBandTrack { IDirectMusicTrack8 IDirectMusicTrack8_iface; - const IPersistStreamVtbl *PersistStreamVtbl; + struct dmobject dmobj; /* IPersistStream only */ LONG ref; - DMUS_OBJECTDESC *pDesc; DMUS_IO_BAND_TRACK_HEADER header; struct list Bands; } IDirectMusicBandTrack; @@ -51,7 +51,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 * IsEqualIID(riid, &IID_IDirectMusicTrack8)) *ret_iface = iface; else if (IsEqualIID(riid, &IID_IPersistStream)) - *ret_iface = &This->PersistStreamVtbl; + *ret_iface = &This->dmobj.IPersistStream_iface; else { WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); return E_NOINTERFACE; @@ -278,34 +278,6 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { }; /* IDirectMusicBandTrack IPersistStream part: */ -static HRESULT WINAPI IDirectMusicBandTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicBandTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj); -} - -static ULONG WINAPI IDirectMusicBandTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicBandTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); -} - -static ULONG WINAPI IDirectMusicBandTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicBandTrack, PersistStreamVtbl, iface); - return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface); -} - -static HRESULT WINAPI IDirectMusicBandTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { - ICOM_THIS_MULTI(IDirectMusicBandTrack, PersistStreamVtbl, iface); - TRACE("(%p, %p)\n", This, pClassID); - *pClassID = CLSID_DirectMusicBandTrack; - return S_OK; -} - -static HRESULT WINAPI IDirectMusicBandTrack_IPersistStream_IsDirty (LPPERSISTSTREAM iface) { - ICOM_THIS_MULTI(IDirectMusicBandTrack, PersistStreamVtbl, iface); - FIXME("(%p): stub, always S_FALSE\n", This); - return S_FALSE; -} - static HRESULT load_band(IDirectMusicBandTrack *This, IStream *pClonedStream, IDirectMusicBand **ppBand, DMUS_PRIVATE_BAND_ITEM_HEADER *pHeader) { @@ -494,7 +466,7 @@ static HRESULT parse_bandtrack_form(IDirectMusicBandTrack *This, DMUS_PRIVATE_CH StreamCount += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - hr = IDirectMusicUtils_IPersistStream_ParseDescGeneric(&Chunk, pStm, This->pDesc); + hr = IDirectMusicUtils_IPersistStream_ParseDescGeneric(&Chunk, pStm, &This->dmobj.desc); if (FAILED(hr)) return hr; if (hr == S_FALSE) { @@ -517,8 +489,8 @@ static HRESULT parse_bandtrack_form(IDirectMusicBandTrack *This, DMUS_PRIVATE_CH IStream_Read (pStm, &Chunk, sizeof(FOURCC)+sizeof(DWORD), NULL); ListCount[0] += sizeof(FOURCC) + sizeof(DWORD) + Chunk.dwSize; TRACE_(dmfile)(": %s chunk (size = %d)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize); - - hr = IDirectMusicUtils_IPersistStream_ParseUNFOGeneric(&Chunk, pStm, This->pDesc); + + hr = IDirectMusicUtils_IPersistStream_ParseUNFOGeneric(&Chunk, pStm, &This->dmobj.desc); if (FAILED(hr)) return hr; if (hr == S_FALSE) { @@ -564,10 +536,14 @@ static HRESULT parse_bandtrack_form(IDirectMusicBandTrack *This, DMUS_PRIVATE_CH return S_OK; } +static inline IDirectMusicBandTrack *impl_from_IPersistStream(IPersistStream *iface) +{ + return CONTAINING_RECORD(iface, IDirectMusicBandTrack, dmobj.IPersistStream_iface); +} -static HRESULT WINAPI IDirectMusicBandTrack_IPersistStream_Load (LPPERSISTSTREAM iface, IStream* pStm) { - ICOM_THIS_MULTI(IDirectMusicBandTrack, PersistStreamVtbl, iface); - +static HRESULT WINAPI IPersistStreamImpl_Load(IPersistStream *iface, IStream *pStm) +{ + IDirectMusicBandTrack *This = impl_from_IPersistStream(iface); DMUS_PRIVATE_CHUNK Chunk; LARGE_INTEGER liMove; HRESULT hr; @@ -608,27 +584,15 @@ static HRESULT WINAPI IDirectMusicBandTrack_IPersistStream_Load (LPPERSISTSTREAM return S_OK; } -static HRESULT WINAPI IDirectMusicBandTrack_IPersistStream_Save (LPPERSISTSTREAM iface, IStream* pStm, BOOL fClearDirty) { - ICOM_THIS_MULTI(IDirectMusicBandTrack, PersistStreamVtbl, iface); - FIXME("(%p): Saving not implemented yet\n", This); - return E_NOTIMPL; -} - -static HRESULT WINAPI IDirectMusicBandTrack_IPersistStream_GetSizeMax (LPPERSISTSTREAM iface, ULARGE_INTEGER* pcbSize) { - ICOM_THIS_MULTI(IDirectMusicBandTrack, PersistStreamVtbl, iface); - FIXME("(%p, %p): stub\n", This, pcbSize); - return E_NOTIMPL; -} - -static const IPersistStreamVtbl DirectMusicBandTrack_PerststStream_Vtbl = { - IDirectMusicBandTrack_IPersistStream_QueryInterface, - IDirectMusicBandTrack_IPersistStream_AddRef, - IDirectMusicBandTrack_IPersistStream_Release, - IDirectMusicBandTrack_IPersistStream_GetClassID, - IDirectMusicBandTrack_IPersistStream_IsDirty, - IDirectMusicBandTrack_IPersistStream_Load, - IDirectMusicBandTrack_IPersistStream_Save, - IDirectMusicBandTrack_IPersistStream_GetSizeMax +static const IPersistStreamVtbl persiststream_vtbl = { + dmobj_IPersistStream_QueryInterface, + dmobj_IPersistStream_AddRef, + dmobj_IPersistStream_Release, + dmobj_IPersistStream_GetClassID, + unimpl_IPersistStream_IsDirty, + IPersistStreamImpl_Load, + unimpl_IPersistStream_Save, + unimpl_IPersistStream_GetSizeMax }; /* for ClassFactory */ @@ -643,12 +607,10 @@ HRESULT WINAPI create_dmbandtrack(REFIID lpcGUID, void **ppobj) return E_OUTOFMEMORY; } track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; - track->PersistStreamVtbl = &DirectMusicBandTrack_PerststStream_Vtbl; - track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); - DM_STRUCT_INIT(track->pDesc); - track->pDesc->dwValidData |= DMUS_OBJ_CLASS; - track->pDesc->guidClass = CLSID_DirectMusicBandTrack; track->ref = 1; + dmobject_init(&track->dmobj, &CLSID_DirectMusicBandTrack, + (IUnknown *)&track->IDirectMusicTrack8_iface); + track->dmobj.IPersistStream_iface.lpVtbl = &persiststream_vtbl; list_init (&track->Bands); DMBAND_LockModule(); diff --git a/dlls/dmband/dmutils.h b/dlls/dmband/dmutils.h index 82706d6..bb93e05 100644 --- a/dlls/dmband/dmutils.h +++ b/dlls/dmband/dmutils.h @@ -27,8 +27,6 @@ typedef struct _DMUS_PRIVATE_CHUNK { DWORD dwSize; /* size of the chunk */ } DMUS_PRIVATE_CHUNK, *LPDMUS_PRIVATE_CHUNK; -#define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) - /** * Parsing utilities */ @@ -51,12 +49,6 @@ typedef struct { } guid_info; /* used for initialising structs */ -#define DM_STRUCT_INIT(x) \ - do { \ - memset((x), 0, sizeof(*(x))); \ - (x)->dwSize = sizeof(*x); \ - } while (0) - #define FE(x) { x, #x } #define GE(x) { &x, #x }

1 0

Michael Stefaniuc : dmband: Remove the extraneous IUnknown from DMBandTrack.
by Alexandre Julliard 26 Jun '15

26 Jun '15

Module: wine Branch: master Commit: 1093fa282ee05f29a427cb5ec71563437b769bfd URL: http://source.winehq.org/git/wine.git/?a=commit;h=1093fa282ee05f29a427cb5ec… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jun 26 13:23:39 2015 +0200 dmband: Remove the extraneous IUnknown from DMBandTrack. --- dlls/dmband/bandtrack.c | 123 +++++++++++++++++++----------------------------- 1 file changed, 49 insertions(+), 74 deletions(-) diff --git a/dlls/dmband/bandtrack.c b/dlls/dmband/bandtrack.c index 602418a..698ea94 100644 --- a/dlls/dmband/bandtrack.c +++ b/dlls/dmband/bandtrack.c @@ -26,7 +26,6 @@ WINE_DECLARE_DEBUG_CHANNEL(dmfile); * IDirectMusicBandTrack implementation */ typedef struct IDirectMusicBandTrack { - const IUnknownVtbl *UnknownVtbl; IDirectMusicTrack8 IDirectMusicTrack8_iface; const IPersistStreamVtbl *PersistStreamVtbl; LONG ref; @@ -35,61 +34,6 @@ typedef struct IDirectMusicBandTrack { struct list Bands; } IDirectMusicBandTrack; -static HRESULT WINAPI IDirectMusicBandTrack_IUnknown_QueryInterface (LPUNKNOWN iface, REFIID riid, LPVOID *ppobj) { - ICOM_THIS_MULTI(IDirectMusicBandTrack, UnknownVtbl, iface); - TRACE("(%p, %s, %p)\n", This, debugstr_dmguid(riid), ppobj); - - if (IsEqualIID (riid, &IID_IUnknown)) { - *ppobj = &This->UnknownVtbl; - IUnknown_AddRef (iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IDirectMusicTrack) - || IsEqualIID (riid, &IID_IDirectMusicTrack8)) { - *ppobj = &This->IDirectMusicTrack8_iface; - IUnknown_AddRef (iface); - return S_OK; - } else if (IsEqualIID (riid, &IID_IPersistStream)) { - *ppobj = &This->PersistStreamVtbl; - IUnknown_AddRef (iface); - return S_OK; - } - - WARN("(%p, %s,%p): not found\n", This, debugstr_dmguid(riid), ppobj); - return E_NOINTERFACE; -} - -static ULONG WINAPI IDirectMusicBandTrack_IUnknown_AddRef (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicBandTrack, UnknownVtbl, iface); - ULONG ref = InterlockedIncrement(&This->ref); - - TRACE("(%p) : AddRef from %d\n", This, ref - 1); - - DMBAND_LockModule(); - - return ref; -} - -static ULONG WINAPI IDirectMusicBandTrack_IUnknown_Release (LPUNKNOWN iface) { - ICOM_THIS_MULTI(IDirectMusicBandTrack, UnknownVtbl, iface); - ULONG ref = InterlockedDecrement(&This->ref); - - TRACE("(%p) : ReleaseRef to %d\n", This, ref); - - if (ref == 0) { - HeapFree(GetProcessHeap(), 0, This); - } - - DMBAND_UnlockModule(); - - return ref; -} - -static const IUnknownVtbl DirectMusicBandTrack_Unknown_Vtbl = { - IDirectMusicBandTrack_IUnknown_QueryInterface, - IDirectMusicBandTrack_IUnknown_AddRef, - IDirectMusicBandTrack_IUnknown_Release -}; - /* IDirectMusicBandTrack IDirectMusicTrack8 part: */ static inline IDirectMusicBandTrack *impl_from_IDirectMusicTrack8(IDirectMusicTrack8 *iface) { @@ -97,22 +41,49 @@ static inline IDirectMusicBandTrack *impl_from_IDirectMusicTrack8(IDirectMusicTr } static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, - void **ppobj) + void **ret_iface) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + + *ret_iface = NULL; + + if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_IDirectMusicTrack) || + IsEqualIID(riid, &IID_IDirectMusicTrack8)) + *ret_iface = iface; + else if (IsEqualIID(riid, &IID_IPersistStream)) + *ret_iface = &This->PersistStreamVtbl; + else { + WARN("(%p, %s, %p): not found\n", This, debugstr_dmguid(riid), ret_iface); + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ret_iface); + return S_OK; } static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; } static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface) { IDirectMusicBandTrack *This = impl_from_IDirectMusicTrack8(iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if (!ref) { + HeapFree(GetProcessHeap(), 0, This); + DMBAND_UnlockModule(); + } + + return ref; } static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface, @@ -309,17 +280,17 @@ static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { /* IDirectMusicBandTrack IPersistStream part: */ static HRESULT WINAPI IDirectMusicBandTrack_IPersistStream_QueryInterface (LPPERSISTSTREAM iface, REFIID riid, LPVOID *ppobj) { ICOM_THIS_MULTI(IDirectMusicBandTrack, PersistStreamVtbl, iface); - return IUnknown_QueryInterface ((LPUNKNOWN)&This->UnknownVtbl, riid, ppobj); + return IDirectMusicTrack8_QueryInterface(&This->IDirectMusicTrack8_iface, riid, ppobj); } static ULONG WINAPI IDirectMusicBandTrack_IPersistStream_AddRef (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicBandTrack, PersistStreamVtbl, iface); - return IUnknown_AddRef ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_AddRef(&This->IDirectMusicTrack8_iface); } static ULONG WINAPI IDirectMusicBandTrack_IPersistStream_Release (LPPERSISTSTREAM iface) { ICOM_THIS_MULTI(IDirectMusicBandTrack, PersistStreamVtbl, iface); - return IUnknown_Release ((LPUNKNOWN)&This->UnknownVtbl); + return IDirectMusicTrack8_Release(&This->IDirectMusicTrack8_iface); } static HRESULT WINAPI IDirectMusicBandTrack_IPersistStream_GetClassID (LPPERSISTSTREAM iface, CLSID* pClassID) { @@ -663,22 +634,26 @@ static const IPersistStreamVtbl DirectMusicBandTrack_PerststStream_Vtbl = { /* for ClassFactory */ HRESULT WINAPI create_dmbandtrack(REFIID lpcGUID, void **ppobj) { - IDirectMusicBandTrack* track; - - track = HeapAlloc (GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IDirectMusicBandTrack)); - if (NULL == track) { - *ppobj = NULL; - return E_OUTOFMEMORY; - } - track->UnknownVtbl = &DirectMusicBandTrack_Unknown_Vtbl; + IDirectMusicBandTrack *track; + HRESULT hr; + + track = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*track)); + if (!track) { + *ppobj = NULL; + return E_OUTOFMEMORY; + } track->IDirectMusicTrack8_iface.lpVtbl = &dmtrack8_vtbl; track->PersistStreamVtbl = &DirectMusicBandTrack_PerststStream_Vtbl; track->pDesc = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DMUS_OBJECTDESC)); DM_STRUCT_INIT(track->pDesc); track->pDesc->dwValidData |= DMUS_OBJ_CLASS; track->pDesc->guidClass = CLSID_DirectMusicBandTrack; - track->ref = 0; /* will be inited by QueryInterface */ - list_init (&track->Bands); + track->ref = 1; + list_init (&track->Bands); - return IDirectMusicBandTrack_IUnknown_QueryInterface ((LPUNKNOWN)&track->UnknownVtbl, lpcGUID, ppobj); + DMBAND_LockModule(); + hr = IDirectMusicTrack8_QueryInterface(&track->IDirectMusicTrack8_iface, lpcGUID, ppobj); + IDirectMusicTrack8_Release(&track->IDirectMusicTrack8_iface); + + return hr; }

1 0

← Newer
1
...
7
8
9
10
11
12
13
...
61
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2015