June 2020 - Wine-commits - list.winehq.org

Zebediah Figura : strmbase: Avoid leaking the media type on failure in IEnumMediaTypes::Next().
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 07729ea4ef7d53dc39f32d47f7bf9f1b7e3a5f1b URL: https://source.winehq.org/git/wine.git/?a=commit;h=07729ea4ef7d53dc39f32d47… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Jun 6 16:22:44 2020 -0500 strmbase: Avoid leaking the media type on failure in IEnumMediaTypes::Next(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/pin.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c index eab7c0cb2e..f08c6d0186 100644 --- a/dlls/strmbase/pin.c +++ b/dlls/strmbase/pin.c @@ -119,6 +119,7 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count, AM_MEDIA_TYPE **mts, ULONG *ret_count) { struct enum_media_types *enummt = impl_from_IEnumMediaTypes(iface); + AM_MEDIA_TYPE mt; unsigned int i; HRESULT hr; @@ -133,10 +134,14 @@ static HRESULT WINAPI enum_media_types_Next(IEnumMediaTypes *iface, ULONG count, for (i = 0; i < count; ++i) { - if ((mts[i] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)))) - hr = enummt->pin->ops->pin_get_media_type(enummt->pin, enummt->index + i, mts[i]); - else - hr = E_OUTOFMEMORY; + hr = enummt->pin->ops->pin_get_media_type(enummt->pin, enummt->index + i, &mt); + if (hr == S_OK) + { + if ((mts[i] = CoTaskMemAlloc(sizeof(AM_MEDIA_TYPE)))) + *mts[i] = mt; + else + hr = E_OUTOFMEMORY; + } if (FAILED(hr)) { while (i--)

1 0

Zebediah Figura : quartz/tests: Avoid leaking the media type from IPin::ConnectionMediaType() (Valgrind).
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 036fcf96c83cddee001ef1f3358a7fa25d1db839 URL: https://source.winehq.org/git/wine.git/?a=commit;h=036fcf96c83cddee001ef1f3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 7 16:24:44 2020 -0500 quartz/tests: Avoid leaking the media type from IPin::ConnectionMediaType() (Valgrind). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avidec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/quartz/tests/avidec.c b/dlls/quartz/tests/avidec.c index 0e1e92a950..9505bfb591 100644 --- a/dlls/quartz/tests/avidec.c +++ b/dlls/quartz/tests/avidec.c @@ -967,6 +967,7 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); ok(compare_media_types(&testsource.source.pin.mt, &req_mt), "Media types didn't match.\n"); + FreeMediaType(&mt); sink_bih = req_format.bmiHeader; @@ -1072,6 +1073,7 @@ static void test_connect_pin(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(compare_media_types(&mt, &req_mt), "Media types didn't match.\n"); ok(compare_media_types(&testsink.sink.pin.mt, &req_mt), "Media types didn't match.\n"); + FreeMediaType(&mt); hr = IFilterGraph2_Disconnect(graph, source); ok(hr == S_OK, "Got hr %#x.\n", hr);

1 0

Vijay Kiran Kamuju : include: Add wownt16.h.
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 9e87c6826eb5c0fe43e52e5a0631fe7a09c6c55b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e87c6826eb5c0fe43e52e5a… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Jun 7 23:03:22 2020 +0200 include: Add wownt16.h. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/krnl386.exe16/thunk.c | 5 +---- include/Makefile.in | 1 + include/wownt16.h | 27 +++++++++++++++++++++++++++ 3 files changed, 29 insertions(+), 4 deletions(-) diff --git a/dlls/krnl386.exe16/thunk.c b/dlls/krnl386.exe16/thunk.c index 78925f594b..e913a08f88 100644 --- a/dlls/krnl386.exe16/thunk.c +++ b/dlls/krnl386.exe16/thunk.c @@ -29,6 +29,7 @@ #include "winbase.h" #include "winerror.h" #include "winternl.h" +#include "wownt16.h" #include "wownt32.h" #include "wine/winbase16.h" @@ -2402,10 +2403,6 @@ DWORD WINAPI FreeLibrary32W16( DWORD hLibModule ) return (DWORD)retv; } - -#define CPEX_DEST_STDCALL 0x00000000 -#define CPEX_DEST_CDECL 0x80000000 - /********************************************************************** * WOW_CallProc32W */ diff --git a/include/Makefile.in b/include/Makefile.in index a4563920f6..9f70e72b4c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -781,6 +781,7 @@ SOURCES = \ wmsdk.h \ wmsdkidl.idl \ wnaspi32.h \ + wownt16.h \ wownt32.h \ wpcapi.idl \ ws2def.h \ diff --git a/include/wownt16.h b/include/wownt16.h new file mode 100644 index 0000000000..d477623127 --- /dev/null +++ b/include/wownt16.h @@ -0,0 +1,27 @@ +/* + * WOW16 Generic Thunk API + * + * Copyright (C) 2020 Vijay Kiran Kamuju + * + * 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 + */ + +#ifndef _WOWNT16_H_ +#define _WOWNT16_H_ + +#define CPEX_DEST_STDCALL 0x00000000 +#define CPEX_DEST_CDECL 0x80000000 + +#endif /* _WOWNT16_H_ */

1 0

Zebediah Figura : quartz: Free type libraries on process detach (Valgrind).
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 4beda167575f24eaed7da4ee3cbbc92f6bea6339 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4beda167575f24eaed7da4ee… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 7 17:23:29 2020 -0500 quartz: Free type libraries on process detach (Valgrind). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/main.c | 5 ++++- dlls/strmbase/dispatch.c | 13 +++++++++++++ include/wine/strmbase.h | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 4acb4f1a79..303cc30a93 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -31,8 +31,11 @@ LONG object_locks = 0; BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { - if (reason == DLL_PROCESS_DETACH) + if (reason == DLL_PROCESS_DETACH && !reserved) + { video_window_unregister_class(); + strmbase_release_typelibs(); + } return QUARTZ_DllMain(instance, reason, reserved); } diff --git a/dlls/strmbase/dispatch.c b/dlls/strmbase/dispatch.c index 25573fa1a2..de817f20c0 100644 --- a/dlls/strmbase/dispatch.c +++ b/dlls/strmbase/dispatch.c @@ -68,3 +68,16 @@ HRESULT strmbase_get_typeinfo(enum strmbase_type_id tid, ITypeInfo **ret) ITypeInfo_AddRef(*ret = control_typeinfo[tid]); return S_OK; } + +void strmbase_release_typelibs(void) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(control_typeinfo); ++i) + { + if (control_typeinfo[i]) + ITypeInfo_Release(control_typeinfo[i]); + } + if (control_typelib) + ITypeLib_Release(control_typelib); +} diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 6789957e50..02a5469de1 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -252,6 +252,7 @@ enum strmbase_type_id }; HRESULT strmbase_get_typeinfo(enum strmbase_type_id tid, ITypeInfo **typeinfo); +void strmbase_release_typelibs(void); struct strmbase_passthrough {

1 0

Zebediah Figura : qedit: Free type libraries on process detach (Valgrind).
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 0e6fc4d81cceb46af52e0b83122ce5f6dd1b6961 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e6fc4d81cceb46af52e0b83… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 7 17:23:30 2020 -0500 qedit: Free type libraries on process detach (Valgrind). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/main.c | 21 ++++++++++++--------- dlls/qedit/mediadet.c | 1 - dlls/qedit/qedit_private.h | 1 + dlls/qedit/samplegrabber.c | 1 - 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/qedit/main.c b/dlls/qedit/main.c index f4d1bbb061..a4a4f5ec38 100644 --- a/dlls/qedit/main.c +++ b/dlls/qedit/main.c @@ -23,15 +23,18 @@ WINE_DEFAULT_DEBUG_CHANNEL(qedit); -static HINSTANCE instance; +static HINSTANCE qedit_instance; -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) +BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) { - switch(fdwReason) { - case DLL_PROCESS_ATTACH: - instance = hInstDLL; - DisableThreadLibraryCalls(hInstDLL); - break; + if (reason == DLL_PROCESS_ATTACH) + { + qedit_instance = instance; + DisableThreadLibraryCalls(instance); + } + else if (reason == DLL_PROCESS_DETACH && !reserved) + { + strmbase_release_typelibs(); } return TRUE; } @@ -243,7 +246,7 @@ HRESULT WINAPI DllRegisterServer(void) IFilterMapper2 *mapper; HRESULT hr; - if (FAILED(hr = __wine_register_resources( instance ))) + if (FAILED(hr = __wine_register_resources(qedit_instance))) return hr; if (FAILED(hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, @@ -267,7 +270,7 @@ HRESULT WINAPI DllUnregisterServer(void) IFilterMapper2 *mapper; HRESULT hr; - if (FAILED(hr = __wine_unregister_resources( instance ))) + if (FAILED(hr = __wine_unregister_resources(qedit_instance))) return hr; if (FAILED(hr = CoCreateInstance(&CLSID_FilterMapper2, NULL, CLSCTX_INPROC_SERVER, diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index d32679b6bb..e1defaa9a6 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -28,7 +28,6 @@ #include "ole2.h" #include "qedit_private.h" -#include "wine/strmbase.h" #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(qedit); diff --git a/dlls/qedit/qedit_private.h b/dlls/qedit/qedit_private.h index 7011c9f70d..0c0655084d 100644 --- a/dlls/qedit/qedit_private.h +++ b/dlls/qedit/qedit_private.h @@ -32,6 +32,7 @@ #include "winuser.h" #include "dshow.h" #include "qedit.h" +#include "wine/strmbase.h" HRESULT timeline_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; HRESULT media_detector_create(IUnknown *outer, IUnknown **out) DECLSPEC_HIDDEN; diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index bd8480df48..1619111f95 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -29,7 +29,6 @@ #include "qedit_private.h" #include "wine/debug.h" -#include "wine/strmbase.h" WINE_DEFAULT_DEBUG_CHANNEL(qedit);

1 0

Zebediah Figura : qasf: Free type libraries on process detach (Valgrind).
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: b6c96cf763b2994b9b71d8a53988749d7dea1914 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b6c96cf763b2994b9b71d8a5… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 7 17:23:31 2020 -0500 qasf: Free type libraries on process detach (Valgrind). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qasf/qasf_main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/qasf/qasf_main.c b/dlls/qasf/qasf_main.c index 2e65b693fa..ac671d3919 100644 --- a/dlls/qasf/qasf_main.c +++ b/dlls/qasf/qasf_main.c @@ -108,6 +108,10 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved) DisableThreadLibraryCalls(instance); qasf_instance = instance; } + else if (reason == DLL_PROCESS_DETACH && !reserved) + { + strmbase_release_typelibs(); + } return TRUE; }

1 0

Zebediah Figura : evr: Free type libraries on process detach (Valgrind).
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 17529582402ebe27ef975fc7dcb8353f4f95e629 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17529582402ebe27ef975fc7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 7 17:23:32 2020 -0500 evr: Free type libraries on process detach (Valgrind). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.c | 1 - dlls/evr/evr_private.h | 1 + dlls/evr/main.c | 19 +++++++++---------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index 911075de33..001839026b 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -24,7 +24,6 @@ #include "evr_private.h" #include "d3d9.h" -#include "wine/strmbase.h" #include "initguid.h" #include "dxva2api.h" diff --git a/dlls/evr/evr_private.h b/dlls/evr/evr_private.h index 65dcbb7a9b..ad47bd28b7 100644 --- a/dlls/evr/evr_private.h +++ b/dlls/evr/evr_private.h @@ -21,6 +21,7 @@ #include "dshow.h" #include "evr.h" +#include "wine/strmbase.h" HRESULT evr_filter_create(IUnknown *outer_unk, void **ppv) DECLSPEC_HIDDEN; diff --git a/dlls/evr/main.c b/dlls/evr/main.c index 000ed7c55b..921e63535f 100644 --- a/dlls/evr/main.c +++ b/dlls/evr/main.c @@ -36,18 +36,17 @@ static HINSTANCE instance_evr; BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved) { - TRACE("(%p, %d, %p)\n", instance, reason, reserved); - - switch (reason) + if (reason == DLL_WINE_PREATTACH) + return FALSE; /* prefer native version */ + else if (reason == DLL_PROCESS_ATTACH) { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - instance_evr = instance; - DisableThreadLibraryCalls(instance); - break; + instance_evr = instance; + DisableThreadLibraryCalls(instance); + } + else if (reason == DLL_PROCESS_DETACH && !reserved) + { + strmbase_release_typelibs(); } - return TRUE; }

1 0

Alexandre Julliard : itss: Fix potentially uninitialized variable compiler warnings.
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: b3af0870417bf2d561b26bb08915e322e26eac62 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b3af0870417bf2d561b26bb0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 8 14:16:58 2020 +0200 itss: Fix potentially uninitialized variable compiler warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/itss/chm_lib.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/dlls/itss/chm_lib.c b/dlls/itss/chm_lib.c index 671fa8e3db..be04ae5673 100644 --- a/dlls/itss/chm_lib.c +++ b/dlls/itss/chm_lib.c @@ -807,21 +807,16 @@ struct chmFile *chm_openW(const WCHAR *filename) { newHandle->compression_enabled = 0; } - - newHandle->window_size = ctlData.windowSize; - newHandle->reset_interval = ctlData.resetInterval; - + else + { + newHandle->window_size = ctlData.windowSize; + newHandle->reset_interval = ctlData.resetInterval; /* Jed, Mon Jun 28: Experimentally, it appears that the reset block count */ /* must be multiplied by this formerly unknown ctrl data field in */ /* order to decompress some files. */ -#if 0 - newHandle->reset_blkcount = newHandle->reset_interval / - (newHandle->window_size / 2); -#else - newHandle->reset_blkcount = newHandle->reset_interval / - (newHandle->window_size / 2) * - ctlData.windowsPerReset; -#endif + newHandle->reset_blkcount = newHandle->reset_interval / (newHandle->window_size / 2) * + ctlData.windowsPerReset; + } } return newHandle;

1 0

Alexandre Julliard : mciseq: Fix potentially uninitialized variable compiler warnings.
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 69952b6fabadc5644168a6175ee14fbf358eacff URL: https://source.winehq.org/git/wine.git/?a=commit;h=69952b6fabadc5644168a617… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 8 14:17:23 2020 +0200 mciseq: Fix potentially uninitialized variable compiler warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mciseq/mcimidi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index c6bc860b1e..8c52730b15 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -230,6 +230,7 @@ static WORD MIDI_mciReadVaryLen(WINE_MCIMIDI* wmm, LPDWORD lpdw) do { if (MIDI_mciReadByte(wmm, &byte) != 0) { + *lpdw = 0; return 0; } value = (value << 7) + (byte & 0x7F);

1 0

Alexandre Julliard : riched20: Fix potentially uninitialized variable compiler warnings.
by Alexandre Julliard 08 Jun '20

08 Jun '20

Module: wine Branch: master Commit: 0c5ebf42310ecf98a353331fdf01f0faca9da3bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c5ebf42310ecf98a353331f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 8 14:17:29 2020 +0200 riched20: Fix potentially uninitialized variable compiler warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index c4a6902733..abc4592087 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -1143,6 +1143,8 @@ static HRESULT insert_static_object(ME_TextEditor *editor, HENHMETAFILE hemf, HB stgm.u.hBitmap = hbmp; fm.cfFormat = CF_BITMAP; } + else return E_FAIL; + stgm.pUnkForRelease = NULL; fm.ptd = NULL;

1 0