wine-commits February 2020

wine-commits@winehq.org

2 participants
874 discussions

Alexandre Julliard : kernel32/tests: Optionally test the entire NormalizationTest.txt file.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: 269c372c098020b7b97fd38c82a406025a6fe1e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=269c372c098020b7b97fd38c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 4 14:31:45 2020 +0100 kernel32/tests: Optionally test the entire NormalizationTest.txt file. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 115 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 113 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 76a993e6c3..36822d5acc 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -5862,6 +5862,36 @@ static void test_SetThreadUILanguage(void) "expected %d got %d\n", MAKELANGID(LANG_DUTCH, SUBLANG_DUTCH_BELGIAN), res); } +static int put_utf16( WCHAR *str, unsigned int c ) +{ + if (c < 0x10000) + { + *str = c; + return 1; + } + c -= 0x10000; + str[0] = 0xd800 | (c >> 10); + str[1] = 0xdc00 | (c & 0x3ff); + return 2; +} + +/* read a Unicode string from NormalizationTest.txt format; helper for test_NormalizeString */ +static int read_str( char *str, WCHAR res[32] ) +{ + int pos = 0; + char *end; + + while (*str && pos < 31) + { + unsigned int c = strtoul( str, &end, 16 ); + pos += put_utf16( res + pos, c ); + while (*end == ' ') end++; + str = end; + } + res[pos] = 0; + return pos; +} + static void test_NormalizeString(void) { /* part 0: specific cases */ @@ -6010,8 +6040,10 @@ static void test_NormalizeString(void) const struct test_data_normal *ptest = test_arr; const int norm_forms[] = { NormalizationC, NormalizationD, NormalizationKC, NormalizationKD }; WCHAR dst[256]; + BOOLEAN ret; NTSTATUS status; int dstlen, str_cmp, i, j; + FILE *f; if (!pNormalizeString) { @@ -6057,8 +6089,6 @@ static void test_NormalizeString(void) if (pRtlNormalizeString) { - BOOLEAN ret = FALSE; - dstlen = 0; status = pRtlNormalizeString( norm_forms[i], ptest->str, lstrlenW(ptest->str), NULL, &dstlen ); ok( !status, "%s:%d: failed %x\n", wine_dbgstr_w(ptest->str), i, status ); @@ -6072,6 +6102,7 @@ static void test_NormalizeString(void) str_cmp = wcsncmp( ptest->expected[i], dst, dstlen ); ok( str_cmp == 0, "%s:%d: string incorrect got %s expect %s\n", wine_dbgstr_w(ptest->str), i, wine_dbgstr_w(dst), wine_dbgstr_w(ptest->expected[i]) ); + ret = FALSE; status = pRtlIsNormalizedString( norm_forms[i], dst, dstlen, &ret ); todo_wine ok( !status, "%s:%d: failed %x\n", wine_dbgstr_w(ptest->str), i, status ); todo_wine ok( ret, "%s:%d: not normalized\n", wine_dbgstr_w(ptest->str), i ); @@ -6258,6 +6289,86 @@ static void test_NormalizeString(void) todo_wine ok( dstlen == 3, "%d: wrong len %d\n", i, dstlen ); } } + + /* optionally run the full test file from Unicode.org + * available at http://www.unicode.org/Public/UCD/latest/ucd/NormalizationTest.txt + */ + if ((f = fopen( "NormalizationTest.txt", "r" ))) + { + char *p, buffer[1024]; + WCHAR str[3], srcW[32], dstW[32], resW[4][32]; + int i, line = 0, part = 0, ch; + char tested[0x110000 / 8]; + + while (fgets( buffer, sizeof(buffer), f )) + { + line++; + if ((p = strchr( buffer, '#' ))) *p = 0; + if (!strncmp( buffer, "@Part", 5 )) + { + part = atoi( buffer + 5 ); + continue; + } + if (!(p = strtok( buffer, ";" ))) continue; + read_str( p, srcW ); + for (i = 0; i < 4; i++) + { + p = strtok( NULL, ";" ); + read_str( p, &resW[i][0] ); + } + if (part == 1) + { + ch = srcW[0]; + if (ch >= 0xd800 && ch <= 0xdbff) + ch = 0x10000 + ((srcW[0] & 0x3ff) << 10) + (srcW[1] & 0x3ff); + tested[ch / 8] |= 1 << (ch % 8); + } + for (i = 0; i < 4; i++) + { + memset( dstW, 0xcc, sizeof(dstW) ); + dstlen = pNormalizeString( norm_forms[i], srcW, -1, dstW, ARRAY_SIZE(dstW) ); + ok( !wcscmp( dstW, resW[i] ), + "line %u form %u: wrong result %s for %s expected %s\n", line, i, + wine_dbgstr_w( dstW ), wine_dbgstr_w( srcW ), wine_dbgstr_w( resW[i] )); + } + } + fclose( f ); + + /* test chars that are not in the @Part1 list */ + for (ch = 0; ch < 0x110000; ch++) + { + if (tested[ch / 8] & (1 << (ch % 8))) continue; + str[put_utf16( str, ch )] = 0; + for (i = 0; i < 4; i++) + { + memset( dstW, 0xcc, sizeof(dstW) ); + SetLastError( 0xdeadbeef ); + dstlen = pNormalizeString( norm_forms[i], str, -1, dstW, ARRAY_SIZE(dstW) ); + if ((ch >= 0xd800 && ch <= 0xdfff) || + (ch >= 0xfdd0 && ch <= 0xfdef) || + ((ch & 0xffff) >= 0xfffe)) + { + ok( dstlen <= 0, "char %04x form %u: wrong result %d %s expected error\n", + ch, i, dstlen, wine_dbgstr_w( dstW )); + ok( GetLastError() == ERROR_NO_UNICODE_TRANSLATION, + "char %04x form %u: error %u\n", str[0], i, GetLastError() ); + status = pRtlIsNormalizedString( norm_forms[i], str, -1, &ret ); + ok( status == STATUS_NO_UNICODE_TRANSLATION, + "char %04x form %u: failed %x\n", ch, i, status ); + } + else + { + ok( !wcscmp( dstW, str ), + "char %04x form %u: wrong result %s expected unchanged\n", + ch, i, wine_dbgstr_w( dstW )); + ret = FALSE; + status = pRtlIsNormalizedString( norm_forms[i], str, -1, &ret ); + ok( !status, "char %04x form %u: failed %x\n", ch, i, status ); + ok( ret, "char %04x form %u: not normalized\n", ch, i ); + } + } + } + } } static void test_SpecialCasing(void)

1 0

Alexandre Julliard : unicode: Move the combining class table to ntdll.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: 6346809302e5b8bd990d4b09d74c90e7d18741fd URL: https://source.winehq.org/git/wine.git/?a=commit;h=6346809302e5b8bd990d4b09… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 4 16:29:34 2020 +0100 unicode: Move the combining class table to ntdll. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/Makefile.in | 1 + {libs/port => dlls/ntdll}/combclass.c | 0 libs/port/Makefile.in | 1 - tools/make_unicode | 2 +- 4 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/Makefile.in b/dlls/ntdll/Makefile.in index 491cf5a707..94348d56a6 100644 --- a/dlls/ntdll/Makefile.in +++ b/dlls/ntdll/Makefile.in @@ -10,6 +10,7 @@ C_SRCS = \ actctx.c \ atom.c \ cdrom.c \ + combclass.c \ critsection.c \ crypt.c \ debugbuffer.c \ diff --git a/libs/port/combclass.c b/dlls/ntdll/combclass.c similarity index 100% rename from libs/port/combclass.c rename to dlls/ntdll/combclass.c diff --git a/libs/port/Makefile.in b/libs/port/Makefile.in index f9e45035bd..3b70f82d6f 100644 --- a/libs/port/Makefile.in +++ b/libs/port/Makefile.in @@ -76,7 +76,6 @@ C_SRCS = \ c_950.c \ casemap.c \ collation.c \ - combclass.c \ compose.c \ cpsymbol.c \ cptable.c \ diff --git a/tools/make_unicode b/tools/make_unicode index c500e68ee9..3f1d3e55a9 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -2757,7 +2757,7 @@ dump_bidi_dir_table( "dlls/dwrite/direction.c" ); dump_string_type_table( "dlls/kernelbase/wctype.c" ); dump_digit_folding( "libs/port/digitmap.c", 1 ); dump_digit_folding( "dlls/kernelbase/digitmap.c", 0 ); -dump_combining_class( "libs/port/combclass.c" ); +dump_combining_class( "dlls/ntdll/combclass.c" ); dump_mirroring( "dlls/usp10/mirror.c" ); dump_mirroring( "dlls/dwrite/mirror.c" ); dump_bracket( "dlls/usp10/bracket.c" );

1 0

Alexandre Julliard : unicode: Expand surrogates in decomposition tables.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: 0576fa43c414f866e1e91dae89bd2b096d7bf2a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0576fa43c414f866e1e91dae… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 4 14:36:21 2020 +0100 unicode: Expand surrogates in decomposition tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/decompose.c | 96 ++--- libs/port/decompose.c | 914 ++++++++++++++++++++++---------------------- tools/make_unicode | 15 +- 3 files changed, 518 insertions(+), 507 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0576fa43c414f866e1e9…

1 0

Alexandre Julliard : unicode: Avoid copying the decomposition data when not necessary.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: cd8eaef47e00aacecbf8c6d3a61c971724cbebf4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd8eaef47e00aacecbf8c6d3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 4 10:52:04 2020 +0100 unicode: Avoid copying the decomposition data when not necessary. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/decompose.c | 16 +---------- dlls/kernelbase/locale.c | 67 +++++++++++++++++++++++++++++---------------- dlls/ntdll/locale.c | 40 +++++++++++++++++++-------- include/wine/unicode.h | 3 -- libs/port/decompose.c | 21 ++------------ libs/port/mbtowc.c | 53 +++++++++++++++++++++++------------ libs/port/sortkey.c | 30 ++++++++++++-------- tools/make_unicode | 51 ++++------------------------------ 8 files changed, 135 insertions(+), 146 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cd8eaef47e00aacecbf8…

1 0

Alexandre Julliard : unicode: Store recursive decompositions directly in the tables.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: a646e4e6f2a0bde517e71b40c936806652421626 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a646e4e6f2a0bde517e71b40… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 4 10:14:28 2020 +0100 unicode: Store recursive decompositions directly in the tables. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/decompose.c | 1112 ++++++------ libs/port/decompose.c | 3894 ++++++++++++++++++++++++++----------------- tools/make_unicode | 113 +- 3 files changed, 2992 insertions(+), 2127 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a646e4e6f2a0bde517e7…

1 0

Alexandre Julliard : unicode: Store variable-length sequences also for the main decomposition table.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: dba4bd756a2f1b4cc08d1b39b0cc04fe8aea3c7b URL: https://source.winehq.org/git/wine.git/?a=commit;h=dba4bd756a2f1b4cc08d1b39… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Feb 4 10:10:53 2020 +0100 unicode: Store variable-length sequences also for the main decomposition table. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernelbase/decompose.c | 1589 +++++++++++++++++++++--------------------- libs/port/decompose.c | 1606 +++++++++++++++++++++---------------------- tools/make_unicode | 148 +--- 3 files changed, 1624 insertions(+), 1719 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dba4bd756a2f1b4cc08d…

1 0

Puetz Kevin A : atlbase.h: Fix some declarations on win64.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: 3043ab3e62772ddef8e4e27674bf4178e0ee50c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3043ab3e62772ddef8e4e276… Author: Puetz Kevin A <PuetzKevinA(a)JohnDeere.com> Date: Mon Feb 3 22:06:49 2020 +0100 atlbase.h: Fix some declarations on win64. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/atl/atl.c | 2 +- dlls/atl/tests/module.c | 25 ++++++++++++++----------- include/atlbase.h | 8 ++++---- 3 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/atl/atl.c b/dlls/atl/atl.c index 8829987c6a..358986d7a4 100644 --- a/dlls/atl/atl.c +++ b/dlls/atl/atl.c @@ -213,7 +213,7 @@ HRESULT WINAPI AtlInternalQueryInterface(void* this, const _ATL_INTMAP_ENTRY* pE while (pEntries[i].pFunc != 0) { - TRACE("Trying entry %i (%s %i %p)\n",i,debugstr_guid(pEntries[i].piid), + TRACE("Trying entry %i (%s %lx %p)\n",i,debugstr_guid(pEntries[i].piid), pEntries[i].dw, pEntries[i].pFunc); if (!pEntries[i].piid || IsEqualGUID(iid,pEntries[i].piid)) diff --git a/dlls/atl/tests/module.c b/dlls/atl/tests/module.c index 192b23ef1e..6250f9b2cb 100644 --- a/dlls/atl/tests/module.c +++ b/dlls/atl/tests/module.c @@ -113,9 +113,9 @@ static void test_winmodule(void) ok(winmod.m_pCreateWndList == create_data+1, "winmod.m_pCreateWndList != create_data\n"); } -static DWORD cb_val; +static DWORD_PTR cb_val; -static void WINAPI term_callback(DWORD dw) +static void WINAPI term_callback(DWORD_PTR dw) { cb_val = dw; } @@ -123,33 +123,36 @@ static void WINAPI term_callback(DWORD dw) static void test_term(void) { _ATL_MODULEW test; + ULONG_PTR ex; HRESULT hres; + ex = (ULONG_PTR)-37; + test.cbSize = sizeof(_ATL_MODULEW); hres = AtlModuleInit(&test, NULL, NULL); - ok (hres == S_OK, "AtlModuleInit failed (0x%x).\n", (int)hres); + ok (hres == S_OK, "AtlModuleInit failed (0x%x).\n", hres); - hres = AtlModuleAddTermFunc(&test, term_callback, 0x22); - ok (hres == S_OK, "AtlModuleAddTermFunc failed (0x%x).\n", (int)hres); + hres = AtlModuleAddTermFunc(&test, term_callback, ex); + ok (hres == S_OK, "AtlModuleAddTermFunc failed (0x%x).\n", hres); cb_val = 0xdeadbeef; hres = AtlModuleTerm(&test); - ok (hres == S_OK, "AtlModuleTerm failed (0x%x).\n", (int)hres); - ok (cb_val == 0x22, "wrong callback value (0x%x).\n", (int)cb_val); + ok (hres == S_OK, "AtlModuleTerm failed (0x%x).\n", hres); + ok (cb_val == ex, "wrong callback value (0x%lx).\n", cb_val); test.cbSize = FIELD_OFFSET(_ATL_MODULEW, dwAtlBuildVer); hres = AtlModuleInit(&test, NULL, NULL); - ok (hres == S_OK, "AtlModuleInit failed (0x%x).\n", (int)hres); + ok (hres == S_OK, "AtlModuleInit failed (0x%x).\n", hres); hres = AtlModuleAddTermFunc(&test, term_callback, 0x23); - ok (hres == S_OK, "AtlModuleAddTermFunc failed (0x%x).\n", (int)hres); + ok (hres == S_OK, "AtlModuleAddTermFunc failed (0x%x).\n", hres); cb_val = 0xdeadbeef; hres = AtlModuleTerm(&test); - ok (hres == S_OK, "AtlModuleTerm failed (0x%x).\n", (int)hres); - ok (cb_val == 0xdeadbeef, "wrong callback value (0x%x).\n", (int)cb_val); + ok (hres == S_OK, "AtlModuleTerm failed (0x%x).\n", hres); + ok (cb_val == 0xdeadbeef, "wrong callback value (0x%lx).\n", cb_val); } START_TEST(module) diff --git a/include/atlbase.h b/include/atlbase.h index b8c4f65651..ebf1674805 100644 --- a/include/atlbase.h +++ b/include/atlbase.h @@ -37,12 +37,12 @@ #endif typedef HRESULT (WINAPI _ATL_CREATORFUNC)(void* pv, REFIID riid, LPVOID* ppv); -typedef HRESULT (WINAPI _ATL_CREATORARGFUNC)(void* pv, REFIID riid, LPVOID* ppv, DWORD dw); -typedef HRESULT (WINAPI _ATL_MODULEFUNC)(DWORD dw); +typedef HRESULT (WINAPI _ATL_CREATORARGFUNC)(void* pv, REFIID riid, LPVOID* ppv, DWORD_PTR dw); +typedef HRESULT (WINAPI _ATL_MODULEFUNC)(DWORD_PTR dw); typedef LPCSTR (WINAPI _ATL_DESCRIPTIONFUNCA)(void); typedef LPCWSTR (WINAPI _ATL_DESCRIPTIONFUNCW)(void); typedef const struct _ATL_CATMAP_ENTRY* (_ATL_CATMAPFUNC)(void); -typedef void (WINAPI _ATL_TERMFUNC)(DWORD dw); +typedef void (WINAPI _ATL_TERMFUNC)(DWORD_PTR dw); typedef CRITICAL_SECTION CComCriticalSection; @@ -234,7 +234,7 @@ typedef _ATL_MODULEW _ATL_WIN_MODULE; typedef struct _ATL_INTMAP_ENTRY_TAG { const IID* piid; - DWORD dw; + DWORD_PTR dw; _ATL_CREATORARGFUNC* pFunc; } _ATL_INTMAP_ENTRY;

1 0

Zebediah Figura : quartz/filesource: Accept any non-null subtype.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: 76b6bcbf9857c63b5955f458c8a63ed314cfce8e URL: https://source.winehq.org/git/wine.git/?a=commit;h=76b6bcbf9857c63b5955f458… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 3 14:15:51 2020 -0600 quartz/filesource: Accept any non-null subtype. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filesource.c | 3 ++- dlls/quartz/tests/filesource.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/filesource.c b/dlls/quartz/filesource.c index 2b7e9d58b1..4855f9834c 100644 --- a/dlls/quartz/filesource.c +++ b/dlls/quartz/filesource.c @@ -591,7 +591,8 @@ static HRESULT source_query_accept(struct strmbase_pin *iface, const AM_MEDIA_TY AsyncReader *filter = impl_from_strmbase_pin(iface); if (IsEqualGUID(&mt->majortype, &filter->mt.majortype) - && IsEqualGUID(&mt->subtype, &filter->mt.subtype)) + && (!IsEqualGUID(&mt->subtype, &GUID_NULL) + || IsEqualGUID(&filter->mt.subtype, &GUID_NULL))) return S_OK; return S_FALSE; diff --git a/dlls/quartz/tests/filesource.c b/dlls/quartz/tests/filesource.c index 16322902f5..6fe19bf2c9 100644 --- a/dlls/quartz/tests/filesource.c +++ b/dlls/quartz/tests/filesource.c @@ -389,7 +389,7 @@ static void test_file_source_filter(void) mt.formattype = FORMAT_VideoInfo; mt.subtype = MEDIASUBTYPE_RGB32; hr = IPin_QueryAccept(pin, &mt); - todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); mt.majortype = MEDIATYPE_Video; hr = IPin_QueryAccept(pin, &mt);

1 0

Zebediah Figura : quartz/tests: Add some tests for file source pin connection.
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: f31815f760153a8785b6f1a3bde6160dec77e5aa URL: https://source.winehq.org/git/wine.git/?a=commit;h=f31815f760153a8785b6f1a3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 3 14:15:50 2020 -0600 quartz/tests: Add some tests for file source pin connection. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filesource.c | 306 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 305 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f31815f760153a8785b6…

1 0

Zebediah Figura : quartz/tests: Use BaseOutputPinImpl_AttemptConnection().
by Alexandre Julliard 04 Feb '20

04 Feb '20

Module: wine Branch: master Commit: b9a5b7a3b7c4b7e0ac78b6c36a74cb1cd90a4bc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9a5b7a3b7c4b7e0ac78b6c3… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Mon Feb 3 14:15:49 2020 -0600 quartz/tests: Use BaseOutputPinImpl_AttemptConnection(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/videorenderer.c | 23 +++++------------------ dlls/quartz/tests/vmr7.c | 23 +++++------------------ dlls/quartz/tests/vmr9.c | 24 +++++------------------- 3 files changed, 15 insertions(+), 55 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index f75cf2919a..4e26a18f83 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -522,31 +522,18 @@ static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDI return S_OK; } -static HRESULT WINAPI testsource_AttemptConnection(struct strmbase_source *iface, - IPin *peer, const AM_MEDIA_TYPE *mt) +static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, + IMemInputPin *peer, IMemAllocator **allocator) { - HRESULT hr; - - iface->pin.peer = peer; - IPin_AddRef(peer); - CopyMediaType(&iface->pin.mt, mt); - - if (FAILED(hr = IPin_ReceiveConnection(peer, &iface->pin.IPin_iface, mt))) - { - ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - IPin_Release(peer); - iface->pin.peer = NULL; - FreeMediaType(&iface->pin.mt); - } - - return hr; + return S_OK; } static const struct strmbase_source_ops testsource_ops = { .base.pin_query_accept = testsource_query_accept, .base.pin_get_media_type = strmbase_pin_get_media_type, - .pfnAttemptConnection = testsource_AttemptConnection, + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideAllocator = testsource_DecideAllocator, }; static void testfilter_init(struct testfilter *filter) diff --git a/dlls/quartz/tests/vmr7.c b/dlls/quartz/tests/vmr7.c index 8a17bdcd19..bb793741e9 100644 --- a/dlls/quartz/tests/vmr7.c +++ b/dlls/quartz/tests/vmr7.c @@ -872,31 +872,18 @@ static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDI return S_OK; } -static HRESULT WINAPI testsource_AttemptConnection(struct strmbase_source *iface, - IPin *peer, const AM_MEDIA_TYPE *mt) +static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, + IMemInputPin *peer, IMemAllocator **allocator) { - HRESULT hr; - - iface->pin.peer = peer; - IPin_AddRef(peer); - CopyMediaType(&iface->pin.mt, mt); - - if (FAILED(hr = IPin_ReceiveConnection(peer, &iface->pin.IPin_iface, mt))) - { - ok(hr == VFW_E_TYPE_NOT_ACCEPTED, "Got hr %#x.\n", hr); - IPin_Release(peer); - iface->pin.peer = NULL; - FreeMediaType(&iface->pin.mt); - } - - return hr; + return S_OK; } static const struct strmbase_source_ops testsource_ops = { .base.pin_query_accept = testsource_query_accept, .base.pin_get_media_type = strmbase_pin_get_media_type, - .pfnAttemptConnection = testsource_AttemptConnection, + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideAllocator = testsource_DecideAllocator, }; static void testfilter_init(struct testfilter *filter) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index ed3f7cd38b..a800aaeb70 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -876,32 +876,18 @@ static HRESULT testsource_query_accept(struct strmbase_pin *iface, const AM_MEDI return S_OK; } -static HRESULT WINAPI testsource_AttemptConnection(struct strmbase_source *iface, - IPin *peer, const AM_MEDIA_TYPE *mt) +static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, + IMemInputPin *peer, IMemAllocator **allocator) { - HRESULT hr; - - iface->pin.peer = peer; - IPin_AddRef(peer); - CopyMediaType(&iface->pin.mt, mt); - - if (FAILED(hr = IPin_ReceiveConnection(peer, &iface->pin.IPin_iface, mt))) - { - todo_wine_if (((VIDEOINFOHEADER *)mt->pbFormat)->bmiHeader.biBitCount == 24) - ok(hr == VFW_E_TYPE_NOT_ACCEPTED || hr == E_FAIL, "Got hr %#x.\n", hr); - IPin_Release(peer); - iface->pin.peer = NULL; - FreeMediaType(&iface->pin.mt); - } - - return hr; + return S_OK; } static const struct strmbase_source_ops testsource_ops = { .base.pin_query_accept = testsource_query_accept, .base.pin_get_media_type = strmbase_pin_get_media_type, - .pfnAttemptConnection = testsource_AttemptConnection, + .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, + .pfnDecideAllocator = testsource_DecideAllocator, }; static void testfilter_init(struct testfilter *filter)

1 0

← Newer
1
...
75
76
77
78
79
80
81
...
88
Older →

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 February 2020