May 2019 - Wine-Commits - list.winehq.org

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

May 16, 2019

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

Alexandre Julliard : vcruntime140: Use the standard -mno-cygwin build flag.
by Alexandre Julliard May 16, 2019

May 16, 2019

Module: wine Branch: master Commit: 62bce89cbacd0cfd0cc55c34f748da7ba74372a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=62bce89cbacd0cfd0cc55c34… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 14:54:11 2019 +0200 vcruntime140: Use the standard -mno-cygwin build flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/vcruntime140/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/vcruntime140/Makefile.in b/dlls/vcruntime140/Makefile.in index 828330a..e319edb 100644 --- a/dlls/vcruntime140/Makefile.in +++ b/dlls/vcruntime140/Makefile.in @@ -1,5 +1,7 @@ MODULE = vcruntime140.dll IMPORTS = ucrtbase +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ misc.c

1 0

Alexandre Julliard : msvcp140: Use the standard -mno-cygwin build flag.
by Alexandre Julliard May 16, 2019

May 16, 2019

Module: wine Branch: master Commit: ba788f74f95990a9b1745772f0c09ad3b46d9fe3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba788f74f95990a9b1745772… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 14:53:26 2019 +0200 msvcp140: Use the standard -mno-cygwin build flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcp140/Makefile.in b/dlls/msvcp140/Makefile.in index 616ac79..ff67090 100644 --- a/dlls/msvcp140/Makefile.in +++ b/dlls/msvcp140/Makefile.in @@ -3,6 +3,8 @@ IMPORTS = ucrtbase EXTRADEFS = -D_MSVCP_VER=140 PARENTSRC = ../msvcp90 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ exception.c \ ios.c \

1 0

Alexandre Julliard : msvcp120: Use the standard -mno-cygwin build flag.
by Alexandre Julliard May 16, 2019

May 16, 2019

Module: wine Branch: master Commit: 8dc868a054c932aa0aff2d857e7673a9e5b5b498 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8dc868a054c932aa0aff2d85… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 14:52:22 2019 +0200 msvcp120: Use the standard -mno-cygwin build flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp120/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcp120/Makefile.in b/dlls/msvcp120/Makefile.in index 6002175..2a77859 100644 --- a/dlls/msvcp120/Makefile.in +++ b/dlls/msvcp120/Makefile.in @@ -3,6 +3,8 @@ IMPORTS = msvcr120 EXTRADEFS = -D_MSVCP_VER=120 PARENTSRC = ../msvcp90 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ exception.c \ ios.c \

1 0

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

May 16, 2019

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

May 16, 2019

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

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

May 16, 2019

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

Alexandre Julliard : msvcp110: Use the standard -mno-cygwin build flag.
by Alexandre Julliard May 16, 2019

May 16, 2019

Module: wine Branch: master Commit: 9a1bf8c4f3586c6a20b46fab70b9f256c62c5535 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a1bf8c4f3586c6a20b46fab… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 16 14:52:18 2019 +0200 msvcp110: Use the standard -mno-cygwin build flag. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/Makefile.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/msvcp110/Makefile.in b/dlls/msvcp110/Makefile.in index 61de670..6b1998a 100644 --- a/dlls/msvcp110/Makefile.in +++ b/dlls/msvcp110/Makefile.in @@ -3,6 +3,8 @@ IMPORTS = msvcr110 EXTRADEFS = -D_MSVCP_VER=110 PARENTSRC = ../msvcp90 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ exception.c \ ios.c \

1 0

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

May 16, 2019

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/vmr9: Use strmbase_renderer_cleanup().
by Alexandre Julliard May 16, 2019

May 16, 2019

Module: wine Branch: master Commit: 44dbf4afbfe5d5d2f3e73022a225f7c4e546a559 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44dbf4afbfe5d5d2f3e73022… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 15 18:16:57 2019 -0500 quartz/vmr9: 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/vmr9.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 2a39d11..3d22f12 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -826,7 +826,7 @@ static ULONG WINAPI VMR9Inner_AddRef(IUnknown * iface) static ULONG WINAPI VMR9Inner_Release(IUnknown * iface) { struct quartz_vmr *This = impl_from_inner_IUnknown(iface); - ULONG refCount = BaseRendererImpl_Release(&This->renderer.filter.IBaseFilter_iface); + ULONG refCount = InterlockedDecrement(&This->renderer.filter.refCount); TRACE("(%p/%p)->() Release from %d\n", This, iface, refCount + 1); @@ -848,6 +848,7 @@ static ULONG WINAPI VMR9Inner_Release(IUnknown * iface) } FreeLibrary(This->hD3d9); + strmbase_renderer_cleanup(&This->renderer); CoTaskMemFree(This); } return refCount; @@ -2442,7 +2443,7 @@ static HRESULT vmr_create(IUnknown *outer_unk, LPVOID *ppv, const CLSID *clsid) return hr; fail: - BaseRendererImpl_Release(&pVMR->renderer.filter.IBaseFilter_iface); + strmbase_renderer_cleanup(&pVMR->renderer); FreeLibrary(pVMR->hD3d9); CoTaskMemFree(pVMR); return hr;

1 0