wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Alexandre Julliard : include: Pass function name directly to the __ASM_STDCALL macro.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 170bd8f361e62b4622fb93898793be896586d8fa URL: https://source.winehq.org/git/wine.git/?a=commit;h=170bd8f361e62b4622fb9389… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 18:13:45 2019 +0200 include: Pass function name directly to the __ASM_STDCALL macro. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/process.c | 2 +- dlls/krnl386.exe16/kernel16_private.h | 6 +++--- dlls/krnl386.exe16/ne_module.c | 8 +++---- dlls/krnl386.exe16/selector.c | 40 +++++++++++++++++------------------ dlls/krnl386.exe16/thunk.c | 2 +- dlls/ntdll/relay.c | 2 +- dlls/ntdll/signal_i386.c | 6 +++--- dlls/winecrt0/exception.c | 2 +- include/wine/asm.h | 12 +++++------ 9 files changed, 40 insertions(+), 40 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=170bd8f361e62b4622fb…

1 0

Alexandre Julliard : include: Use the __thiscall attribute directly for the Mingw build.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 0a79eb3608289b29105a42fa1254e3a8b339289d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a79eb3608289b29105a42fa… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 13:53:33 2019 +0200 include: Use the __thiscall attribute directly for the Mingw build. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcirt/msvcirt.c | 2 +- dlls/msvcp60/main.c | 2 +- dlls/msvcp90/cxx.h | 4 +- dlls/msvcp90/exception.c | 4 +- dlls/msvcp90/misc.c | 2 +- dlls/msvcp90/msvcp_main.c | 2 +- dlls/msvcrt/cpp.c | 4 +- dlls/msvcrt/cxx.h | 4 +- dlls/msvcrt/scheduler.c | 2 +- dlls/riched20/editor.h | 2 +- dlls/riched20/editstr.h | 2 +- dlls/riched20/tests/txtsrv.c | 132 +++++++++++---------------------- dlls/riched20/txthost.c | 2 +- dlls/windowscodecs/wincodecs_private.h | 13 ++-- include/textserv.h | 120 ++++++++++++++++-------------- include/windef.h | 4 + include/wine/asm.h | 9 +-- tools/winebuild/utils.c | 4 +- 18 files changed, 137 insertions(+), 177 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0a79eb3608289b29105a…

1 0

Alexandre Julliard : include: Use the __fastcall attribute directly for the Windows build.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 10584d2057e2a597033babffa35a06669db1f6c4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10584d2057e2a597033babff… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 10:15:26 2019 +0200 include: Use the __fastcall attribute directly for the Windows build. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hal/hal.c | 45 +++++++++++++++++++++++--------------------- dlls/ntdll/rtl.c | 4 ++-- dlls/ntoskrnl.exe/ntoskrnl.c | 20 ++++++++++---------- dlls/ntoskrnl.exe/sync.c | 22 +++++++++++----------- include/ddk/wdm.h | 6 ++++-- include/windef.h | 6 ++++++ include/wine/asm.h | 2 +- include/winnt.h | 1 + 8 files changed, 59 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=10584d2057e2a597033b…

1 0

Alexandre Julliard : winebuild: Support Windows-style name mangling for fastcall functions.
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: e755ea2374e6bdaad344165201c2d2ccb443a07f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e755ea2374e6bdaad3441652… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 10:12:42 2019 +0200 winebuild: Support Windows-style name mangling for fastcall functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/parser.c | 7 ------- tools/winebuild/spec32.c | 3 +++ tools/winebuild/utils.c | 26 ++++++++++++++++++++------ 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c index ea9e939..bec9f52 100644 --- a/tools/winebuild/parser.c +++ b/tools/winebuild/parser.c @@ -374,13 +374,6 @@ static int parse_spec_export( ORDDEF *odp, DLLSPEC *spec ) odp->flags |= FLAG_FORWARD; } } - if ((odp->flags & (FLAG_THISCALL | FLAG_FASTCALL)) && !(odp->flags & FLAG_FORWARD)) - { - char *link_name = strmake( "__%s_%s", (odp->flags & FLAG_THISCALL) ? "thiscall" : "fastcall", - odp->link_name ); - free( odp->link_name ); - odp->link_name = link_name; - } return 1; } diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c index 04af291..68b50f9 100644 --- a/tools/winebuild/spec32.c +++ b/tools/winebuild/spec32.c @@ -970,6 +970,9 @@ void output_def_file( DLLSPEC *spec, int include_stubs ) if (!is_private) total++; if (!include_stubs && odp->type == TYPE_STUB) continue; + if ((odp->flags & FLAG_FASTCALL) && target_platform == PLATFORM_WINDOWS) + name = strmake( "@%s", name ); + output( " %s", name ); switch(odp->type) diff --git a/tools/winebuild/utils.c b/tools/winebuild/utils.c index d4f8845..851a4a7 100644 --- a/tools/winebuild/utils.c +++ b/tools/winebuild/utils.c @@ -893,15 +893,28 @@ const char *get_stub_name( const ORDDEF *odp, const DLLSPEC *spec ) const char *get_link_name( const ORDDEF *odp ) { static char *buffer; + char *ret; - if (!kill_at && target_platform == PLATFORM_WINDOWS && target_cpu == CPU_x86 && - odp->type == TYPE_STDCALL && !(odp->flags & FLAG_THISCALL)) + if (target_cpu != CPU_x86) return odp->link_name; + if (odp->type != TYPE_STDCALL) return odp->link_name; + + if (target_platform == PLATFORM_WINDOWS) { - free( buffer ); - buffer = strmake( "%s@%u", odp->link_name, get_args_size( odp )); - return buffer; + if (odp->flags & FLAG_THISCALL) ret = strmake( "__thiscall_%s", odp->link_name ); + else if (odp->flags & FLAG_FASTCALL) ret = strmake( "@%s@%u", odp->link_name, get_args_size( odp )); + else if (!kill_at) ret = strmake( "%s@%u", odp->link_name, get_args_size( odp )); + else return odp->link_name; } - return odp->link_name; + else + { + if (odp->flags & FLAG_THISCALL) ret = strmake( "__thiscall_%s", odp->link_name ); + else if (odp->flags & FLAG_FASTCALL) ret = strmake( "__fastcall_%s", odp->link_name ); + else return odp->link_name; + } + + free( buffer ); + buffer = ret; + return ret; } /* parse a cpu name and return the corresponding value */ @@ -1036,6 +1049,7 @@ const char *asm_name( const char *sym ) { case PLATFORM_WINDOWS: if (target_cpu != CPU_x86) return sym; + if (sym[0] == '@') return sym; /* fastcall */ /* fall through */ case PLATFORM_APPLE: if (sym[0] == '.' && sym[1] == 'L') return sym;

1 0

Zebediah Figura : setupapi/tests: Add some basic tests for SetupDi{Get, Set}DeviceInstallParams().
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 45d199023f440209c5753e055db233924664df22 URL: https://source.winehq.org/git/wine.git/?a=commit;h=45d199023f440209c5753e05… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 15 22:56:08 2019 -0500 setupapi/tests: Add some basic tests for SetupDi{Get, Set}DeviceInstallParams(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/tests/devinst.c | 72 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) diff --git a/dlls/setupapi/tests/devinst.c b/dlls/setupapi/tests/devinst.c index 2355f30..9107d82 100644 --- a/dlls/setupapi/tests/devinst.c +++ b/dlls/setupapi/tests/devinst.c @@ -1881,6 +1881,77 @@ static void test_device_interface_key(void) SetupDiDestroyDeviceInfoList(set); } +static void test_device_install_params(void) +{ + SP_DEVINFO_DATA device = {sizeof(device)}; + SP_DEVINSTALL_PARAMS_A params; + HDEVINFO set; + BOOL ret; + + set = SetupDiCreateDeviceInfoList(&guid, NULL); + ok(set != INVALID_HANDLE_VALUE, "Failed to create device list, error %#x.\n", GetLastError()); + ret = SetupDiCreateDeviceInfoA(set, "Root\\LEGACY_BOGUS\\0000", &guid, NULL, NULL, 0, &device); + ok(ret, "Failed to create device, error %#x.\n", GetLastError()); + + params.cbSize = sizeof(params) - 1; + SetLastError(0xdeadbeef); + ret = SetupDiGetDeviceInstallParamsA(set, &device, &params); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "Got unexpected error %#x.\n", GetLastError()); + + params.cbSize = sizeof(params) + 1; + SetLastError(0xdeadbeef); + ret = SetupDiGetDeviceInstallParamsA(set, &device, &params); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "Got unexpected error %#x.\n", GetLastError()); + + params.cbSize = sizeof(params) - 1; + SetLastError(0xdeadbeef); + ret = SetupDiSetDeviceInstallParamsA(set, &device, &params); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "Got unexpected error %#x.\n", GetLastError()); + + params.cbSize = sizeof(params) + 1; + SetLastError(0xdeadbeef); + ret = SetupDiSetDeviceInstallParamsA(set, &device, &params); + ok(!ret, "Expected failure.\n"); + ok(GetLastError() == ERROR_INVALID_USER_BUFFER, "Got unexpected error %#x.\n", GetLastError()); + + memset(&params, 0xcc, sizeof(params)); + params.cbSize = sizeof(params); + ret = SetupDiGetDeviceInstallParamsA(set, &device, &params); + ok(ret, "Failed to get device install params, error %#x.\n", GetLastError()); + ok(!params.Flags, "Got flags %#x.\n", params.Flags); + ok(!params.FlagsEx, "Got extended flags %#x.\n", params.FlagsEx); + ok(!params.hwndParent, "Got parent %p.\n", params.hwndParent); + ok(!params.InstallMsgHandler, "Got callback %p.\n", params.InstallMsgHandler); + ok(!params.InstallMsgHandlerContext, "Got callback context %p.\n", params.InstallMsgHandlerContext); + ok(!params.FileQueue, "Got queue %p.\n", params.FileQueue); + ok(!params.ClassInstallReserved, "Got class installer data %#lx.\n", params.ClassInstallReserved); + ok(!params.DriverPath[0], "Got driver path %s.\n", params.DriverPath); + + params.Flags = DI_INF_IS_SORTED; + params.FlagsEx = DI_FLAGSEX_ALLOWEXCLUDEDDRVS; + strcpy(params.DriverPath, "C:\\windows"); + ret = SetupDiSetDeviceInstallParamsA(set, &device, &params); + ok(ret, "Failed to set device install params, error %#x.\n", GetLastError()); + + memset(&params, 0xcc, sizeof(params)); + params.cbSize = sizeof(params); + ret = SetupDiGetDeviceInstallParamsA(set, &device, &params); + ok(ret, "Failed to get device install params, error %#x.\n", GetLastError()); + ok(params.Flags == DI_INF_IS_SORTED, "Got flags %#x.\n", params.Flags); + ok(params.FlagsEx == DI_FLAGSEX_ALLOWEXCLUDEDDRVS, "Got extended flags %#x.\n", params.FlagsEx); + ok(!params.hwndParent, "Got parent %p.\n", params.hwndParent); + ok(!params.InstallMsgHandler, "Got callback %p.\n", params.InstallMsgHandler); + ok(!params.InstallMsgHandlerContext, "Got callback context %p.\n", params.InstallMsgHandlerContext); + ok(!params.FileQueue, "Got queue %p.\n", params.FileQueue); + ok(!params.ClassInstallReserved, "Got class installer data %#lx.\n", params.ClassInstallReserved); + ok(!strcasecmp(params.DriverPath, "C:\\windows"), "Got driver path %s.\n", params.DriverPath); + + SetupDiDestroyDeviceInfoList(set); +} + START_TEST(devinst) { HKEY hkey; @@ -1909,4 +1980,5 @@ START_TEST(devinst) test_get_inf_class(); test_devnode(); test_device_interface_key(); + test_device_install_params(); }

1 0

Zebediah Figura : setupapi: Implement SetupDiSetDeviceInstallParams().
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 14a354e5756c3c25cf6d8402d1458d5182102451 URL: https://source.winehq.org/git/wine.git/?a=commit;h=14a354e5756c3c25cf6d8402… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 15 22:56:07 2019 -0500 setupapi: Implement SetupDiSetDeviceInstallParams(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 48 +++++++++++++++++++++++++++++++++++++----------- 1 file changed, 37 insertions(+), 11 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 8c91960..48b6ca3 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3559,25 +3559,51 @@ BOOL WINAPI SetupDiGetDeviceInstallParamsA(HDEVINFO devinfo, /*********************************************************************** * SetupDiSetDeviceInstallParamsA (SETUPAPI.@) */ -BOOL WINAPI SetupDiSetDeviceInstallParamsA( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PSP_DEVINSTALL_PARAMS_A DeviceInstallParams) +BOOL WINAPI SetupDiSetDeviceInstallParamsA(HDEVINFO devinfo, + SP_DEVINFO_DATA *device_data, SP_DEVINSTALL_PARAMS_A *params) { - FIXME("(%p, %p, %p) stub\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); + SP_DEVINSTALL_PARAMS_W paramsW; - return TRUE; + if (params->cbSize != sizeof(SP_DEVINSTALL_PARAMS_A)) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + paramsW.cbSize = sizeof(paramsW); + paramsW.Flags = params->Flags; + paramsW.FlagsEx = params->FlagsEx; + paramsW.hwndParent = params->hwndParent; + paramsW.InstallMsgHandler = params->InstallMsgHandler; + paramsW.InstallMsgHandlerContext = params->InstallMsgHandlerContext; + paramsW.FileQueue = params->FileQueue; + paramsW.ClassInstallReserved = params->ClassInstallReserved; + paramsW.Reserved = params->Reserved; + MultiByteToWideChar(CP_ACP, 0, params->DriverPath, -1, paramsW.DriverPath, sizeof(paramsW.DriverPath)); + + return SetupDiSetDeviceInstallParamsW(devinfo, device_data, &paramsW); } /*********************************************************************** * SetupDiSetDeviceInstallParamsW (SETUPAPI.@) */ -BOOL WINAPI SetupDiSetDeviceInstallParamsW( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PSP_DEVINSTALL_PARAMS_W DeviceInstallParams) +BOOL WINAPI SetupDiSetDeviceInstallParamsW(HDEVINFO devinfo, + SP_DEVINFO_DATA *device_data, SP_DEVINSTALL_PARAMS_W *params) { - FIXME("(%p, %p, %p) stub\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); + struct device *device; + + TRACE("devinfo %p, device_data %p, params %p.\n", devinfo, device_data, params); + + if (params->cbSize != sizeof(SP_DEVINSTALL_PARAMS_W)) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + device->params = *params; return TRUE; }

1 0

Zebediah Figura : setupapi: Implement SetupDiGetDeviceInstallParams().
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 41701254715b72901aee09595a43698447e29103 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41701254715b72901aee0959… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 15 22:56:06 2019 -0500 setupapi: Implement SetupDiGetDeviceInstallParams(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 62 +++++++++++++++++++++++++++++++++++++------------ 1 file changed, 47 insertions(+), 15 deletions(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 7440465..8c91960 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -118,6 +118,7 @@ struct device DEVINST devnode; struct list entry; BOOL removed; + SP_DEVINSTALL_PARAMS_W params; }; struct device_iface @@ -730,7 +731,7 @@ static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, TRACE("%p, %s, %s, %d\n", set, debugstr_guid(class), debugstr_w(instanceid), phantom); - if (!(device = heap_alloc(sizeof(*device)))) + if (!(device = heap_alloc_zero(sizeof(*device)))) { SetLastError(ERROR_OUTOFMEMORY); return NULL; @@ -752,6 +753,7 @@ static struct device *SETUPDI_CreateDeviceInfo(struct DeviceInfoSet *set, device->devnode = alloc_devnode(device); device->removed = FALSE; list_add_tail(&set->devices, &device->entry); + device->params.cbSize = sizeof(SP_DEVINSTALL_PARAMS_W); if (phantom) RegSetValueExW(device->key, Phantom, 0, REG_DWORD, (const BYTE *)&one, sizeof(one)); @@ -3501,27 +3503,57 @@ BOOL WINAPI SetupDiCallClassInstaller( } /*********************************************************************** - * SetupDiGetDeviceInstallParamsW (SETUPAPI.@) + * SetupDiGetDeviceInstallParamsW (SETUPAPI.@) */ -BOOL WINAPI SetupDiGetDeviceInstallParamsW( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PSP_DEVINSTALL_PARAMS_W DeviceInstallParams) +BOOL WINAPI SetupDiGetDeviceInstallParamsW(HDEVINFO devinfo, + SP_DEVINFO_DATA *device_data, SP_DEVINSTALL_PARAMS_W *params) { - FIXME("%p %p %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); - return FALSE; + struct device *device; + + TRACE("devinfo %p, device_data %p, params %p.\n", devinfo, device_data, params); + + if (params->cbSize != sizeof(SP_DEVINSTALL_PARAMS_W)) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + if (!(device = get_device(devinfo, device_data))) + return FALSE; + + *params = device->params; + + return TRUE; } /*********************************************************************** - * SetupDiGetDeviceInstallParamsA (SETUPAPI.@) + * SetupDiGetDeviceInstallParamsA (SETUPAPI.@) */ -BOOL WINAPI SetupDiGetDeviceInstallParamsA( - HDEVINFO DeviceInfoSet, - PSP_DEVINFO_DATA DeviceInfoData, - PSP_DEVINSTALL_PARAMS_A DeviceInstallParams) +BOOL WINAPI SetupDiGetDeviceInstallParamsA(HDEVINFO devinfo, + SP_DEVINFO_DATA *device_data, SP_DEVINSTALL_PARAMS_A *params) { - FIXME("%p %p %p\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); - return FALSE; + SP_DEVINSTALL_PARAMS_W paramsW; + BOOL ret; + + if (params->cbSize != sizeof(SP_DEVINSTALL_PARAMS_A)) + { + SetLastError(ERROR_INVALID_USER_BUFFER); + return FALSE; + } + + paramsW.cbSize = sizeof(paramsW); + ret = SetupDiGetDeviceInstallParamsW(devinfo, device_data, &paramsW); + params->Flags = paramsW.Flags; + params->FlagsEx = paramsW.FlagsEx; + params->hwndParent = paramsW.hwndParent; + params->InstallMsgHandler = paramsW.InstallMsgHandler; + params->InstallMsgHandlerContext = paramsW.InstallMsgHandlerContext; + params->FileQueue = paramsW.FileQueue; + params->ClassInstallReserved = paramsW.ClassInstallReserved; + params->Reserved = paramsW.Reserved; + WideCharToMultiByte(CP_ACP, 0, paramsW.DriverPath, -1, params->DriverPath, sizeof(params->DriverPath), NULL, NULL); + + return ret; } /***********************************************************************

1 0

Zebediah Figura : strmbase: Get rid of BaseRendererImpl_Release().
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 17ab5f977d2d20488e67f50f66464084ba8a617b URL: https://source.winehq.org/git/wine.git/?a=commit;h=17ab5f977d2d20488e67f50f… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 15 18:17:00 2019 -0500 strmbase: Get rid of BaseRendererImpl_Release(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 11 ----------- include/wine/strmbase.h | 1 - 2 files changed, 12 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index fd6cf52..d263b20 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -301,17 +301,6 @@ void strmbase_renderer_cleanup(BaseRenderer *filter) BaseFilter_Destroy(&filter->filter); } -ULONG WINAPI BaseRendererImpl_Release(IBaseFilter* iface) -{ - BaseRenderer *This = impl_from_IBaseFilter(iface); - ULONG refCount = InterlockedDecrement(&This->filter.refCount); - - if (!refCount) - strmbase_renderer_cleanup(This); - - return refCount; -} - HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSample) { HRESULT hr = S_OK; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index b561c76..18336c0 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -608,7 +608,6 @@ typedef struct BaseRendererFuncTable { } BaseRendererFuncTable; HRESULT WINAPI BaseRendererImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv); -ULONG WINAPI BaseRendererImpl_Release(IBaseFilter * iface); HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSample); HRESULT WINAPI BaseRendererImpl_Stop(IBaseFilter * iface); HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart);

1 0

Zebediah Figura : qedit/nullrenderer: Use strmbase_renderer_cleanup().
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: 3855216cb3830aa4e6d73c66c19fdc330f14c4df URL: https://source.winehq.org/git/wine.git/?a=commit;h=3855216cb3830aa4e6d73c66… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 15 18:16:59 2019 -0500 qedit/nullrenderer: Use strmbase_renderer_cleanup(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/nullrenderer.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index c19a90d..6ba70cb 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -113,11 +113,12 @@ static ULONG WINAPI NullRendererInner_AddRef(IUnknown *iface) static ULONG WINAPI NullRendererInner_Release(IUnknown *iface) { NullRendererImpl *This = impl_from_IUnknown(iface); - ULONG refCount = BaseRendererImpl_Release(&This->renderer.filter.IBaseFilter_iface); + ULONG refCount = InterlockedDecrement(&This->renderer.filter.refCount); if (!refCount) { TRACE("Destroying Null Renderer\n"); + strmbase_renderer_cleanup(&This->renderer); CoTaskMemFree(This); } @@ -234,10 +235,7 @@ HRESULT NullRenderer_create(IUnknown *pUnkOuter, void **ppv) (DWORD_PTR)(__FILE__ ": NullRendererImpl.csFilter"), &RendererFuncTable); if (FAILED(hr)) - { - BaseRendererImpl_Release(&pNullRenderer->renderer.filter.IBaseFilter_iface); CoTaskMemFree(pNullRenderer); - } else *ppv = &pNullRenderer->IUnknown_inner;

1 0

Zebediah Figura : quartz/dsoundrender: Use strmbase_renderer_cleanup().
by Alexandre Julliard 16 May '19

16 May '19

Module: wine Branch: master Commit: cd131ca0262fe6da8a04a58bbd3e8dab6f81fe8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd131ca0262fe6da8a04a58b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 15 18:16:58 2019 -0500 quartz/dsoundrender: Use strmbase_renderer_cleanup(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index f92ab41..b9eb149 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -680,7 +680,7 @@ HRESULT DSoundRender_create(IUnknown * pUnkOuter, LPVOID * ppv) } else { - BaseRendererImpl_Release(&pDSoundRender->renderer.filter.IBaseFilter_iface); + strmbase_renderer_cleanup(&pDSoundRender->renderer); CoTaskMemFree(pDSoundRender); } @@ -725,7 +725,7 @@ static HRESULT WINAPI DSoundRender_QueryInterface(IBaseFilter * iface, REFIID ri static ULONG WINAPI DSoundRender_Release(IBaseFilter * iface) { DSoundRenderImpl *This = impl_from_IBaseFilter(iface); - ULONG refCount = BaseRendererImpl_Release(iface); + ULONG refCount = InterlockedDecrement(&This->renderer.filter.refCount); TRACE("(%p)->() Release from %d\n", This, refCount + 1); @@ -748,6 +748,7 @@ static ULONG WINAPI DSoundRender_Release(IBaseFilter * iface) CloseHandle(This->blocked); TRACE("Destroying Audio Renderer\n"); + strmbase_renderer_cleanup(&This->renderer); CoTaskMemFree(This); return 0;

1 0

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 May 2019