December 2019 - Wine-Commits

André Hentschel : kernel32: Fix some spec file entries.
by Alexandre Julliard Dec. 16, 2019

Dec. 16, 2019

Module: wine Branch: master Commit: 9367475f288acdbdf1a0405d06adb5a3dab3f57e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9367475f288acdbdf1a0405d… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 15 15:46:20 2019 +0100 kernel32: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-kernel32-legacy-l1-1-1.spec | 2 +- dlls/kernel32/kernel32.spec | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec index fd1a0bcf0a..4998af04d9 100644 --- a/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec +++ b/dlls/api-ms-win-core-kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec @@ -64,6 +64,6 @@ @ stdcall SetVolumeLabelW(wstr wstr) kernel32.SetVolumeLabelW @ stdcall SetVolumeMountPointW(wstr wstr) kernel32.SetVolumeMountPointW @ stdcall UnregisterWait(long) kernel32.UnregisterWait -@ stdcall VerifyVersionInfoW(long long int64) kernel32.VerifyVersionInfoW +@ stdcall VerifyVersionInfoW(ptr long int64) kernel32.VerifyVersionInfoW @ stdcall WaitForMultipleObjects(long ptr long long) kernel32.WaitForMultipleObjects @ stdcall WTSGetActiveConsoleSessionId() kernel32.WTSGetActiveConsoleSessionId diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index b580021706..1fcd0c1f61 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1558,8 +1558,8 @@ @ stdcall -ret64 VerSetConditionMask(long long long long) ntdll.VerSetConditionMask @ stdcall VerifyConsoleIoHandle(long) # @ stub VerifyScripts -@ stdcall VerifyVersionInfoA(long long int64) -@ stdcall VerifyVersionInfoW(long long int64) +@ stdcall VerifyVersionInfoA(ptr long int64) +@ stdcall VerifyVersionInfoW(ptr long int64) @ stdcall -import VirtualAlloc(ptr long long long) @ stdcall -import VirtualAllocEx(long ptr long long long) @ stdcall -import VirtualAllocExNuma(long ptr long long long long) @@ -1632,7 +1632,7 @@ @ stdcall WritePrivateProfileStructW(wstr wstr ptr long wstr) @ stdcall -import WriteProcessMemory(long ptr ptr long ptr) @ stdcall WriteProfileSectionA(str str) -@ stdcall WriteProfileSectionW(str str) +@ stdcall WriteProfileSectionW(wstr wstr) @ stdcall WriteProfileStringA(str str str) @ stdcall WriteProfileStringW(wstr wstr wstr) @ stdcall WriteTapemark(ptr long long long)

1 0

Alexandre Julliard : api-ms-win-core-localization: Add spec entry for FindNLSString().
by Alexandre Julliard Dec. 16, 2019

Dec. 16, 2019

Module: wine Branch: master Commit: 6233add31021c3da7e9f9584471757068eb1b574 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6233add31021c3da7e9f9584… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 16 12:30:29 2019 +0100 api-ms-win-core-localization: Add spec entry for FindNLSString(). Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-localization-l1-1-0.spec | 2 +- .../api-ms-win-core-localization-l1-2-0.spec | 2 +- .../api-ms-win-core-localization-l1-2-1.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec b/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec index 90f68c52cd..81db61b945 100644 --- a/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec +++ b/dlls/api-ms-win-core-localization-l1-1-0/api-ms-win-core-localization-l1-1-0.spec @@ -1,5 +1,5 @@ @ stdcall ConvertDefaultLocale(long) kernel32.ConvertDefaultLocale -@ stub FindNLSString +@ stdcall FindNLSString(long long wstr long wstr long ptr) kernel32.FindNLSString @ stdcall FindNLSStringEx(wstr long wstr long wstr long ptr ptr ptr long) kernel32.FindNLSStringEx @ stdcall GetACP() kernel32.GetACP @ stub GetCPFileNameFromRegistry diff --git a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec index 16584834a9..94971021d8 100644 --- a/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec +++ b/dlls/api-ms-win-core-localization-l1-2-0/api-ms-win-core-localization-l1-2-0.spec @@ -2,7 +2,7 @@ @ stdcall EnumSystemGeoID(long long ptr) kernel32.EnumSystemGeoID @ stdcall EnumSystemLocalesA(ptr long) kernel32.EnumSystemLocalesA @ stdcall EnumSystemLocalesW(ptr long) kernel32.EnumSystemLocalesW -@ stub FindNLSString +@ stdcall FindNLSString(long long wstr long wstr long ptr) kernel32.FindNLSString @ stdcall FindNLSStringEx(wstr long wstr long wstr long ptr ptr ptr long) kernel32.FindNLSStringEx @ stdcall FormatMessageA(long ptr long long ptr long ptr) kernel32.FormatMessageA @ stdcall FormatMessageW(long ptr long long ptr long ptr) kernel32.FormatMessageW diff --git a/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec index da8825b8ba..9b5f70eb21 100644 --- a/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec +++ b/dlls/api-ms-win-core-localization-l1-2-1/api-ms-win-core-localization-l1-2-1.spec @@ -3,7 +3,7 @@ @ stdcall EnumSystemLocalesA(ptr long) kernel32.EnumSystemLocalesA @ stdcall EnumSystemLocalesEx(ptr long long ptr) kernel32.EnumSystemLocalesEx @ stdcall EnumSystemLocalesW(ptr long) kernel32.EnumSystemLocalesW -@ stub FindNLSString +@ stdcall FindNLSString(long long wstr long wstr long ptr) kernel32.FindNLSString @ stdcall FindNLSStringEx(wstr long wstr long wstr long ptr ptr ptr long) kernel32.FindNLSStringEx @ stdcall FormatMessageA(long ptr long long ptr long ptr) kernel32.FormatMessageA @ stdcall FormatMessageW(long ptr long long ptr long ptr) kernel32.FormatMessageW

1 0

Michael Stefaniuc : dmime/tests: Use wide-char string literals.
by Alexandre Julliard Dec. 16, 2019

Dec. 16, 2019

Module: wine Branch: master Commit: 604b874b20b625a9ee127d86e4a69b5725ed50e1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=604b874b20b625a9ee127d86… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Mon Dec 16 20:49:39 2019 +0100 dmime/tests: Use wide-char string literals. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/dmime.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/dmime/tests/dmime.c b/dlls/dmime/tests/dmime.c index 5bb3a8b5b3..99295f391b 100644 --- a/dlls/dmime/tests/dmime.c +++ b/dlls/dmime/tests/dmime.c @@ -956,8 +956,6 @@ static void test_parsedescriptor(void) HRESULT hr; DWORD valid; unsigned int i; - const WCHAR s_unam[] = {'U','N','A','M','\0'}; - const WCHAR s_inam[] = {'I','\0'}; /* fourcc ~0 will be replaced later on */ FOURCC alldesc[] = { @@ -1092,7 +1090,7 @@ static void test_parsedescriptor(void) "Got version %u.%u, expected 5.8\n", desc.vVersion.dwVersionMS, desc.vVersion.dwVersionLS); if (forms[i].form != mmioFOURCC('W','A','V','E')) - ok(!memcmp(desc.wszName, s_unam, sizeof(s_unam)), "Got name '%s', expected 'UNAM'\n", + ok(!lstrcmpW(desc.wszName, L"UNAM"), "Got name '%s', expected 'UNAM'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream); @@ -1130,7 +1128,7 @@ static void test_parsedescriptor(void) valid |= DMUS_OBJ_NAME; ok(desc.dwValidData == valid, "Got valid data %#x, expected %#x\n", desc.dwValidData, valid); if (forms[i].form == mmioFOURCC('W','A','V','E')) - ok(!memcmp(desc.wszName, s_inam, sizeof(s_inam)), "Got name '%s', expected 'I'\n", + ok(!lstrcmpW(desc.wszName, L"I"), "Got name '%s', expected 'I'\n", wine_dbgstr_w(desc.wszName)); IStream_Release(stream);

1 0

Jacek Caban : jscript/tests: Allow GetTypeInfo calls.
by Alexandre Julliard Dec. 16, 2019

Dec. 16, 2019

Module: wine Branch: master Commit: 5bcc65d330a50cada8e07b338dbfcf3209c01fd1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5bcc65d330a50cada8e07b33… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 16 20:22:24 2019 +0100 jscript/tests: Allow GetTypeInfo calls. It's called by some win10 versions. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/tests/activex.c | 4 +--- dlls/jscript/tests/caller.c | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/tests/activex.c b/dlls/jscript/tests/activex.c index 636dd81e19..161e1138ff 100644 --- a/dlls/jscript/tests/activex.c +++ b/dlls/jscript/tests/activex.c @@ -221,10 +221,8 @@ static HRESULT WINAPI DispatchEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pcti return E_NOTIMPL; } -static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) +static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - ok(0, "unexpected call\n"); return E_NOTIMPL; } diff --git a/dlls/jscript/tests/caller.c b/dlls/jscript/tests/caller.c index dc97fb7268..336c397be9 100644 --- a/dlls/jscript/tests/caller.c +++ b/dlls/jscript/tests/caller.c @@ -275,10 +275,8 @@ static HRESULT WINAPI DispatchEx_GetTypeInfoCount(IDispatchEx *iface, UINT *pcti return E_NOTIMPL; } -static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, - LCID lcid, ITypeInfo **ppTInfo) +static HRESULT WINAPI DispatchEx_GetTypeInfo(IDispatchEx *iface, UINT iTInfo, LCID lcid, ITypeInfo **ppTInfo) { - ok(0, "unexpected call\n"); return E_NOTIMPL; }

1 0

Alexandre Julliard : libport: Fix the Cygwin build.
by Alexandre Julliard Dec. 16, 2019

Dec. 16, 2019

Module: wine Branch: master Commit: 802803a028ba754267f7be2ea677a7186ac871b9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=802803a028ba754267f7be2e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Dec 16 11:59:46 2019 +0100 libport: Fix the Cygwin build. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47959 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 +- configure.ac | 2 +- include/wine/port.h | 2 +- libs/port/spawn.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/configure b/configure index 0450cb04fb..61327c673d 100755 --- a/configure +++ b/configure @@ -17442,7 +17442,7 @@ fi ;; MSVCRTFLAGS="" case $host_os in - cygwin*|mingw32*) ;; + mingw32*) ;; *) { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -fno-builtin" >&5 $as_echo_n "checking whether the compiler supports -fno-builtin... " >&6; } if ${ac_cv_cflags__fno_builtin+:} false; then : diff --git a/configure.ac b/configure.ac index 2117e500f9..8a121bce01 100644 --- a/configure.ac +++ b/configure.ac @@ -2054,7 +2054,7 @@ char*f(const char *h,char n) {return strchr(h,n);}]])],[ac_cv_c_logicalop_noisy= dnl Disable gcc builtins except for Mingw AC_SUBST(MSVCRTFLAGS,"") case $host_os in - cygwin*|mingw32*) ;; + mingw32*) ;; *) WINE_TRY_CFLAGS([-fno-builtin],[MSVCRTFLAGS="$MSVCRTFLAGS -fno-builtin"]) WINE_TRY_CFLAGS([-fshort-wchar],[MSVCRTFLAGS="$MSVCRTFLAGS -fshort-wchar"]) ;; esac diff --git a/include/wine/port.h b/include/wine/port.h index 264f282837..feb0558655 100644 --- a/include/wine/port.h +++ b/include/wine/port.h @@ -47,7 +47,7 @@ * Hard-coded values for the Windows platform */ -#ifdef _WIN32 +#if defined(_WIN32) && !defined(__CYGWIN__) #include <direct.h> #include <io.h> diff --git a/libs/port/spawn.c b/libs/port/spawn.c index 9292005ead..e19aa615a5 100644 --- a/libs/port/spawn.c +++ b/libs/port/spawn.c @@ -21,7 +21,7 @@ #include "config.h" #include "wine/port.h" -#if !defined(HAVE__SPAWNVP) && !defined(_WIN32) +#if !defined(HAVE__SPAWNVP) && (!defined(_WIN32) || defined(__CYGWIN__)) #include <errno.h> #include <signal.h>

1 0

André Hentschel : rpcrt4: Fix RpcNetworkIsProtseqValid[AW] spec file entries.
by Alexandre Julliard Dec. 16, 2019

Dec. 16, 2019

Module: wine Branch: master Commit: 6127c688eaa68b6adcc06f44bf41cb6f0c608d77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6127c688eaa68b6adcc06f44… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 15 17:29:45 2019 +0100 rpcrt4: Fix RpcNetworkIsProtseqValid[AW] spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/rpcrt4.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/rpcrt4/rpcrt4.spec b/dlls/rpcrt4/rpcrt4.spec index 6d7d0fbf7a..5d558bff75 100644 --- a/dlls/rpcrt4/rpcrt4.spec +++ b/dlls/rpcrt4/rpcrt4.spec @@ -413,8 +413,8 @@ @ stdcall RpcMgmtWaitServerListen() @ stdcall RpcNetworkInqProtseqsA(ptr) @ stdcall RpcNetworkInqProtseqsW(ptr) -@ stdcall RpcNetworkIsProtseqValidA(ptr) -@ stdcall RpcNetworkIsProtseqValidW(ptr) +@ stdcall RpcNetworkIsProtseqValidA(str) +@ stdcall RpcNetworkIsProtseqValidW(wstr) @ stub RpcNsBindingInqEntryNameA @ stub RpcNsBindingInqEntryNameW @ stub RpcObjectInqType

1 0

Zebediah Figura : qedit/samplegrabber: Consistently use the "pMemInputPin" member of struct strmbase_source.
by Alexandre Julliard Dec. 16, 2019

Dec. 16, 2019

Module: wine Branch: master Commit: 835631c3cc53a74eac00e6fb1dad971445774e1f URL: https://source.winehq.org/git/wine.git/?a=commit;h=835631c3cc53a74eac00e6fb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Dec 15 18:21:15 2019 -0600 qedit/samplegrabber: Consistently use the "pMemInputPin" member of struct strmbase_source. Fixes a regression introduced by 2c8e152ff06ae3e460276401b4b6bdaa1ffc676d. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index fb6c0b71e4..87e30c5608 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -41,7 +41,6 @@ typedef struct _SG_Impl { struct strmbase_source source; /* IMediaSeeking and IMediaPosition are implemented by ISeekingPassThru */ IUnknown *seekthru_unk; - IMemInputPin *memOutput; struct strmbase_sink sink; AM_MEDIA_TYPE mtype; @@ -85,8 +84,6 @@ static void SampleGrabber_cleanup(SG_Impl *This) WARN("(%p) still joined to filter graph %p\n", This, This->filter.filterInfo.pGraph); if (This->allocator) IMemAllocator_Release(This->allocator); - if (This->memOutput) - IMemInputPin_Release(This->memOutput); if (This->grabberIface) ISampleGrabberCB_Release(This->grabberIface); CoTaskMemFree(This->mtype.pbFormat); @@ -398,7 +395,7 @@ SampleGrabber_IMemInputPin_GetAllocatorRequirements(IMemInputPin *iface, ALLOCAT FIXME("(%p)->(%p): semi-stub\n", This, props); if (!props) return E_POINTER; - return This->memOutput ? IMemInputPin_GetAllocatorRequirements(This->memOutput, props) : E_NOTIMPL; + return This->source.pMemInputPin ? IMemInputPin_GetAllocatorRequirements(This->source.pMemInputPin, props) : E_NOTIMPL; } /* IMemInputPin */ @@ -407,13 +404,13 @@ SampleGrabber_IMemInputPin_Receive(IMemInputPin *iface, IMediaSample *sample) { SG_Impl *This = impl_from_IMemInputPin(iface); HRESULT hr; - TRACE("(%p)->(%p) output = %p, grabber = %p\n", This, sample, This->memOutput, This->grabberIface); + TRACE("(%p)->(%p) output = %p, grabber = %p\n", This, sample, This->source.pMemInputPin, This->grabberIface); if (!sample) return E_POINTER; if (This->oneShot == OneShot_Past) return S_FALSE; SampleGrabber_callback(This, sample); - hr = This->memOutput ? IMemInputPin_Receive(This->memOutput, sample) : S_OK; + hr = This->source.pMemInputPin ? IMemInputPin_Receive(This->source.pMemInputPin, sample) : S_OK; if (This->oneShot == OneShot_Wait) { This->oneShot = OneShot_Past; hr = S_FALSE; @@ -429,14 +426,14 @@ SampleGrabber_IMemInputPin_ReceiveMultiple(IMemInputPin *iface, IMediaSample **s { SG_Impl *This = impl_from_IMemInputPin(iface); LONG idx; - TRACE("(%p)->(%p, %u, %p) output = %p, grabber = %p\n", This, samples, nSamples, nProcessed, This->memOutput, This->grabberIface); + TRACE("(%p)->(%p, %u, %p) output = %p, grabber = %p\n", This, samples, nSamples, nProcessed, This->source.pMemInputPin, This->grabberIface); if (!samples || !nProcessed) return E_POINTER; if ((This->filter.state != State_Running) || (This->oneShot == OneShot_Past)) return S_FALSE; for (idx = 0; idx < nSamples; idx++) SampleGrabber_callback(This, samples[idx]); - return This->memOutput ? IMemInputPin_ReceiveMultiple(This->memOutput, samples, nSamples, nProcessed) : S_OK; + return This->source.pMemInputPin ? IMemInputPin_ReceiveMultiple(This->source.pMemInputPin, samples, nSamples, nProcessed) : S_OK; } /* IMemInputPin */ @@ -445,7 +442,7 @@ SampleGrabber_IMemInputPin_ReceiveCanBlock(IMemInputPin *iface) { SG_Impl *This = impl_from_IMemInputPin(iface); TRACE("(%p)\n", This); - return This->memOutput ? IMemInputPin_ReceiveCanBlock(This->memOutput) : S_OK; + return This->source.pMemInputPin ? IMemInputPin_ReceiveCanBlock(This->source.pMemInputPin) : S_OK; } static const ISampleGrabberVtbl ISampleGrabber_VTable = @@ -650,7 +647,6 @@ HRESULT SampleGrabber_create(IUnknown *outer, void **out) obj->mtype.subtype = MEDIASUBTYPE_None; obj->mtype.formattype = FORMAT_None; obj->allocator = NULL; - obj->memOutput = NULL; obj->grabberIface = NULL; obj->grabberMethod = -1; obj->oneShot = OneShot_None;

1 0

Zebediah Figura : qedit/samplegrabber: Clean up the pins in sample_grabber_destroy().
by Alexandre Julliard Dec. 16, 2019

Dec. 16, 2019

Module: wine Branch: master Commit: e71b03aaf2fe4fe58b34c88110d6e47751f63aee URL: https://source.winehq.org/git/wine.git/?a=commit;h=e71b03aaf2fe4fe58b34c881… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Dec 15 18:21:14 2019 -0600 qedit/samplegrabber: Clean up the pins in sample_grabber_destroy(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qedit/samplegrabber.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/qedit/samplegrabber.c b/dlls/qedit/samplegrabber.c index bbd43e79bf..fb6c0b71e4 100644 --- a/dlls/qedit/samplegrabber.c +++ b/dlls/qedit/samplegrabber.c @@ -111,6 +111,8 @@ static void sample_grabber_destroy(struct strmbase_filter *iface) SG_Impl *filter = impl_from_strmbase_filter(iface); SampleGrabber_cleanup(filter); + strmbase_sink_cleanup(&filter->sink); + strmbase_source_cleanup(&filter->source); strmbase_filter_cleanup(&filter->filter); CoTaskMemFree(filter); }

1 0

Zebediah Figura : winegstreamer: Clear the "reader" and "allocator" fields if connection fails.
by Alexandre Julliard Dec. 16, 2019

Dec. 16, 2019

Module: wine Branch: master Commit: 15e3adab4c6005ac39d43e0655e53a11558720db URL: https://source.winehq.org/git/wine.git/?a=commit;h=15e3adab4c6005ac39d43e06… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Dec 15 17:29:12 2019 -0600 winegstreamer: Clear the "reader" and "allocator" fields if connection fails. This fixes a regression introduced by dafe81dfcb2b8896024e9d071e4bf4553e4a4018. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 3945d9da8f..869a15b619 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -1393,6 +1393,8 @@ static HRESULT gstdemux_sink_connect(struct strmbase_sink *iface, IPin *peer, co if (FAILED(hr = IMemAllocator_Commit(filter->alloc))) { WARN("Failed to commit allocator, hr %#x.\n", hr); + IMemAllocator_Release(filter->alloc); + filter->alloc = NULL; goto err; } @@ -1400,6 +1402,7 @@ static HRESULT gstdemux_sink_connect(struct strmbase_sink *iface, IPin *peer, co err: GST_RemoveOutputPins(filter); IAsyncReader_Release(filter->reader); + filter->reader = NULL; return hr; }

1 0

Zebediah Figura : ntdll: Return -1 from Unix code page conversion functions if an error was encountered.
by Alexandre Julliard Dec. 16, 2019

Dec. 16, 2019

Module: wine Branch: master Commit: 18c3c2c78b245352bc9e297bb59f905352242af1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=18c3c2c78b245352bc9e297b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Dec 15 14:03:02 2019 -0600 ntdll: Return -1 from Unix code page conversion functions if an error was encountered. If 0 is returned, the caller has no way of determining this. This fixes a test failure in kernel32:change introduced by f46fa9c92. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/locale.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/locale.c b/dlls/ntdll/locale.c index 4c95169366..d9e4e8086e 100644 --- a/dlls/ntdll/locale.c +++ b/dlls/ntdll/locale.c @@ -643,7 +643,7 @@ int ntdll_umbstowcs( DWORD flags, const char *src, int srclen, WCHAR *dst, int d if (!dstlen) dst = NULL; status = RtlUTF8ToUnicodeN( dst, dstlen * sizeof(WCHAR), &reslen, src, srclen ); - if (status && status != STATUS_SOME_NOT_MAPPED) return 0; + if (status && status != STATUS_SOME_NOT_MAPPED) return -1; reslen /= sizeof(WCHAR); #ifdef __APPLE__ /* work around broken Mac OS X filesystem that enforces decomposed Unicode */ if (reslen && dst) RtlNormalizeString( NormalizationC, dst, reslen, dst, (int *)&reslen ); @@ -666,7 +666,7 @@ int ntdll_wcstoumbs( DWORD flags, const WCHAR *src, int srclen, char *dst, int d if (used) *used = 0; /* all chars are valid for UTF-8 */ if (!dstlen) dst = NULL; status = RtlUnicodeToUTF8N( dst, dstlen, &reslen, src, srclen * sizeof(WCHAR) ); - if (status && status != STATUS_SOME_NOT_MAPPED) return 0; + if (status && status != STATUS_SOME_NOT_MAPPED) return -1; return reslen; }

1 0