December 2019 - Wine-commits

André Hentschel : mapi32: Fix some spec file entries.
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: wine Branch: master Commit: 04aa1a32e64bc7a37e6327d153b4fe8392af582a URL: https://source.winehq.org/git/wine.git/?a=commit;h=04aa1a32e64bc7a37e6327d1… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Dec 15 17:29:28 2019 +0100 mapi32: Fix some spec file entries. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mapi32/mapi32.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/mapi32/mapi32.spec b/dlls/mapi32/mapi32.spec index 0b5acbb737..32d0b7a458 100644 --- a/dlls/mapi32/mapi32.spec +++ b/dlls/mapi32/mapi32.spec @@ -95,7 +95,7 @@ 152 stub OpenTnefStreamEx 153 stub GetTnefStreamCodepage(a)12 154 stub GetTnefStreamCodepage -155 stdcall UlFromSzHex(a)4(ptr) UlFromSzHex +155 stdcall UlFromSzHex(a)4(wstr) UlFromSzHex 156 stub UNKOBJ_ScAllocate(a)12 157 stub UNKOBJ_ScAllocateMore(a)16 158 stub UNKOBJ_Free(a)8 @@ -144,7 +144,7 @@ 204 stub EncodeID(a)12 205 stub FDecodeID(a)12 206 stub CchOfEncoding(a)4 -207 stdcall CbOfEncoded(a)4(ptr) CbOfEncoded +207 stdcall CbOfEncoded(a)4(str) CbOfEncoded 208 stdcall MAPISendDocuments(long str str str long) 209 stdcall MAPILogon(long str str long long ptr) 210 stdcall MAPILogoff(ptr long long long)

1 0

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

16 Dec '19

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

Akihiro Sagawa : kernel32/tests: Refactor MB_ERR_INVALID_CHARS tests.
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: wine Branch: master Commit: 3bb92d777385e229ed813397e2c7b57f7f5415bc URL: https://source.winehq.org/git/wine.git/?a=commit;h=3bb92d777385e229ed813397… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Dec 16 22:39:39 2019 +0900 kernel32/tests: Refactor MB_ERR_INVALID_CHARS tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/codepage.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index 8fcc575a29..dc25c55652 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -1001,7 +1001,7 @@ static void test_utf7_decoding(void) static void test_undefined_byte_char(void) { static const struct tag_testset { - INT codepage; + UINT codepage; LPCSTR str; BOOL is_error; } testset[] = { @@ -1017,6 +1017,7 @@ static void test_undefined_byte_char(void) { 1257, "\xa5", TRUE }, }; INT i, ret; + DWORD err; for (i = 0; i < ARRAY_SIZE(testset); i++) { if (! IsValidCodePage(testset[i].codepage)) @@ -1028,23 +1029,22 @@ static void test_undefined_byte_char(void) SetLastError(0xdeadbeef); ret = MultiByteToWideChar(testset[i].codepage, MB_ERR_INVALID_CHARS, testset[i].str, -1, NULL, 0); + err = GetLastError(); if (testset[i].is_error) { - ok(ret == 0 && GetLastError() == ERROR_NO_UNICODE_TRANSLATION, - "ret is %d, GetLastError is %u (cp %d)\n", - ret, GetLastError(), testset[i].codepage); + ok(err == ERROR_NO_UNICODE_TRANSLATION, "Test %u: err is %u\n", i, err); + ok(ret == 0, "Test %u: ret is %d\n", i, ret); } else { - ok(ret == strlen(testset[i].str)+1 && GetLastError() == 0xdeadbeef, - "ret is %d, GetLastError is %u (cp %d)\n", - ret, GetLastError(), testset[i].codepage); + ok(err == 0xdeadbeef, "Test %u: err is %u\n", i, err); + ok(ret == 2, "Test %u: ret is %d\n", i, ret); } SetLastError(0xdeadbeef); ret = MultiByteToWideChar(testset[i].codepage, 0, testset[i].str, -1, NULL, 0); - ok(ret == strlen(testset[i].str)+1 && GetLastError() == 0xdeadbeef, - "ret is %d, GetLastError is %u (cp %d)\n", - ret, GetLastError(), testset[i].codepage); + err = GetLastError(); + ok(err == 0xdeadbeef, "Test %u: err is %u\n", i, err); + ok(ret == 2, "Test %u: ret is %d\n", i, ret); } }

1 0

Akihiro Sagawa : kernelbase: Use translated Unicode default char to check invalid chars.
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: wine Branch: master Commit: a85bc781d380754a576db573959d4c76b5a32e01 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a85bc781d380754a576db573… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Dec 16 22:39:41 2019 +0900 kernelbase: Use translated Unicode default char to check invalid chars. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48288 Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/codepage.c | 3 +++ dlls/kernelbase/locale.c | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/codepage.c b/dlls/kernel32/tests/codepage.c index dc25c55652..2c081586f2 100644 --- a/dlls/kernel32/tests/codepage.c +++ b/dlls/kernel32/tests/codepage.c @@ -1005,12 +1005,15 @@ static void test_undefined_byte_char(void) LPCSTR str; BOOL is_error; } testset[] = { + { 37, "\x6f", FALSE }, { 874, "\xdd", TRUE }, { 932, "\xfe", TRUE }, { 932, "\x80", FALSE }, + { 932, "\x81\x45", FALSE }, { 936, "\xff", TRUE }, { 949, "\xff", TRUE }, { 950, "\xff", TRUE }, + { 1252, "?", FALSE }, { 1252, "\x90", FALSE }, { 1253, "\xaa", TRUE }, { 1255, "\xff", TRUE }, diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index fba15555d2..c250c97968 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -1044,12 +1044,12 @@ static int check_invalid_chars( const CPTABLEINFO *info, const unsigned char *sr { if (srclen == 1) break; /* partial char, error */ if (info->DBCSOffsets[off + src[1]] == info->UniDefaultChar && - ((src[0] << 8) | src[1]) != info->TransDefaultChar) break; + ((src[0] << 8) | src[1]) != info->TransUniDefaultChar) break; src++; srclen--; continue; } - if (info->MultiByteTable[*src] == info->UniDefaultChar && *src != info->TransDefaultChar) + if (info->MultiByteTable[*src] == info->UniDefaultChar && *src != info->TransUniDefaultChar) break; if (is_private_use_area_char( info->MultiByteTable[*src] )) break; } @@ -1058,7 +1058,7 @@ static int check_invalid_chars( const CPTABLEINFO *info, const unsigned char *sr { for ( ; srclen; src++, srclen-- ) { - if (info->MultiByteTable[*src] == info->UniDefaultChar && *src != info->TransDefaultChar) + if (info->MultiByteTable[*src] == info->UniDefaultChar && *src != info->TransUniDefaultChar) break; if (is_private_use_area_char( info->MultiByteTable[*src] )) break; }

1 0

Chip Davis : kernel32: Forward OpenThreadToken() to kernelbase.
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: wine Branch: master Commit: 8834f123290063b1e75d50bdc113498ef8af0d24 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8834f123290063b1e75d50bd… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Mon Dec 16 11:48:59 2019 -0600 kernel32: Forward OpenThreadToken() to kernelbase. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processthreads-l1-1-0.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-1.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec index eb2a4bdd6b..753b20bf90 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec @@ -26,7 +26,7 @@ @ stdcall InitializeProcThreadAttributeList(ptr long long ptr) kernel32.InitializeProcThreadAttributeList @ stdcall OpenProcessToken(long long ptr) advapi32.OpenProcessToken @ stdcall OpenThread(long long long) kernel32.OpenThread -@ stdcall OpenThreadToken(long long long ptr) advapi32.OpenThreadToken +@ stdcall OpenThreadToken(long long long ptr) kernel32.OpenThreadToken @ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId @ stub QueryProcessAffinityUpdateMode @ stdcall QueueUserAPC(ptr long long) kernel32.QueueUserAPC diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec index 708a8eff09..bf78530f29 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -37,7 +37,7 @@ @ stdcall OpenProcess(long long long) kernel32.OpenProcess @ stdcall OpenProcessToken(long long ptr) advapi32.OpenProcessToken @ stdcall OpenThread(long long long) kernel32.OpenThread -@ stdcall OpenThreadToken(long long long ptr) advapi32.OpenThreadToken +@ stdcall OpenThreadToken(long long long ptr) kernel32.OpenThreadToken @ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId @ stub QueryProcessAffinityUpdateMode @ stdcall QueueUserAPC(ptr long long) kernel32.QueueUserAPC diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec index a29ef43566..9a986966d7 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -42,7 +42,7 @@ @ stdcall OpenProcess(long long long) kernel32.OpenProcess @ stdcall OpenProcessToken(long long ptr) advapi32.OpenProcessToken @ stdcall OpenThread(long long long) kernel32.OpenThread -@ stdcall OpenThreadToken(long long long ptr) advapi32.OpenThreadToken +@ stdcall OpenThreadToken(long long long ptr) kernel32.OpenThreadToken @ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId @ stub QueryProcessAffinityUpdateMode @ stdcall QueueUserAPC(ptr long long) kernel32.QueueUserAPC diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 1fcd0c1f61..371e6c5865 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1132,7 +1132,7 @@ @ stdcall OpenSemaphoreA(long long str) @ stdcall -import OpenSemaphoreW(long long wstr) @ stdcall -import OpenThread(long long long) -# @ stub OpenThreadToken +@ stdcall -import OpenThreadToken(long long long ptr) @ stdcall -i386 OpenVxDHandle(long) @ stdcall OpenWaitableTimerA(long long str) @ stdcall -import OpenWaitableTimerW(long long wstr)

1 0

Chip Davis : kernel32: Forward OpenProcessToken() to kernelbase.
by Alexandre Julliard 16 Dec '19

16 Dec '19

Module: wine Branch: master Commit: 27b9f6f6093826683063c16b8fee6ec4db9d987a URL: https://source.winehq.org/git/wine.git/?a=commit;h=27b9f6f6093826683063c16b… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Mon Dec 16 11:49:00 2019 -0600 kernel32: Forward OpenProcessToken() to kernelbase. Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-core-processthreads-l1-1-0.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-1.spec | 2 +- .../api-ms-win-core-processthreads-l1-1-2.spec | 2 +- dlls/kernel32/kernel32.spec | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec index 753b20bf90..edec3d8812 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-0/api-ms-win-core-processthreads-l1-1-0.spec @@ -24,7 +24,7 @@ @ stdcall GetThreadPriority(long) kernel32.GetThreadPriority @ stdcall GetThreadPriorityBoost(long ptr) kernel32.GetThreadPriorityBoost @ stdcall InitializeProcThreadAttributeList(ptr long long ptr) kernel32.InitializeProcThreadAttributeList -@ stdcall OpenProcessToken(long long ptr) advapi32.OpenProcessToken +@ stdcall OpenProcessToken(long long ptr) kernel32.OpenProcessToken @ stdcall OpenThread(long long long) kernel32.OpenThread @ stdcall OpenThreadToken(long long long ptr) kernel32.OpenThreadToken @ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId diff --git a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec index bf78530f29..e4cfec2b64 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-1/api-ms-win-core-processthreads-l1-1-1.spec @@ -35,7 +35,7 @@ @ stdcall InitializeProcThreadAttributeList(ptr long long ptr) kernel32.InitializeProcThreadAttributeList @ stdcall IsProcessorFeaturePresent(long) kernel32.IsProcessorFeaturePresent @ stdcall OpenProcess(long long long) kernel32.OpenProcess -@ stdcall OpenProcessToken(long long ptr) advapi32.OpenProcessToken +@ stdcall OpenProcessToken(long long ptr) kernel32.OpenProcessToken @ stdcall OpenThread(long long long) kernel32.OpenThread @ stdcall OpenThreadToken(long long long ptr) kernel32.OpenThreadToken @ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId diff --git a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec index 9a986966d7..45d52ff171 100644 --- a/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec +++ b/dlls/api-ms-win-core-processthreads-l1-1-2/api-ms-win-core-processthreads-l1-1-2.spec @@ -40,7 +40,7 @@ @ stub IsProcessCritical @ stdcall IsProcessorFeaturePresent(long) kernel32.IsProcessorFeaturePresent @ stdcall OpenProcess(long long long) kernel32.OpenProcess -@ stdcall OpenProcessToken(long long ptr) advapi32.OpenProcessToken +@ stdcall OpenProcessToken(long long ptr) kernel32.OpenProcessToken @ stdcall OpenThread(long long long) kernel32.OpenThread @ stdcall OpenThreadToken(long long long ptr) kernel32.OpenThreadToken @ stdcall ProcessIdToSessionId(long ptr) kernel32.ProcessIdToSessionId diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 371e6c5865..a87747bf61 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1127,7 +1127,7 @@ # @ stub OpenPrivateNamespaceA # @ stub OpenPrivateNamespaceW @ stdcall -import OpenProcess(long long long) -# @ stub OpenProcessToken +@ stdcall -import OpenProcessToken(long long ptr) @ stdcall OpenProfileUserMapping() @ stdcall OpenSemaphoreA(long long str) @ stdcall -import OpenSemaphoreW(long long wstr)

1 0

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

16 Dec '19

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

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

16 Dec '19

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 : qedit/samplegrabber: Clean up the pins in sample_grabber_destroy().
by Alexandre Julliard 16 Dec '19

16 Dec '19

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 : qedit/samplegrabber: Consistently use the "pMemInputPin" member of struct strmbase_source.
by Alexandre Julliard 16 Dec '19

16 Dec '19

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