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

Piotr Caban : libwine: Add helper function to compare character weights.
by Alexandre Julliard May 22, 2019

May 22, 2019

Module: wine Branch: master Commit: ac5ac588f3965e5116c8933ad354fb6bf3502709 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ac5ac588f3965e5116c8933a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 21 17:19:44 2019 +0200 libwine: Add helper function to compare character weights. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/port/sortkey.c | 169 +++++++++++----------------------------------------- 1 file changed, 36 insertions(+), 133 deletions(-) diff --git a/libs/port/sortkey.c b/libs/port/sortkey.c index c61a7e5..7ca1a20 100644 --- a/libs/port/sortkey.c +++ b/libs/port/sortkey.c @@ -153,11 +153,37 @@ int wine_get_sortkey(int flags, const WCHAR *src, int srclen, char *dst, int dst return key_ptr[3] - dst; } -static inline int compare_unicode_weights(int flags, const WCHAR *str1, int len1, - const WCHAR *str2, int len2) +enum weight +{ + UNICODE_WEIGHT, + DIACRITIC_WEIGHT, + CASE_WEIGHT +}; + +static unsigned int get_weight(WCHAR ch, enum weight type) +{ + unsigned int ret; + + ret = collation_table[collation_table[ch >> 8] + (ch & 0xff)]; + if (ret == (unsigned int)-1) + return ch; + + switch(type) + { + case UNICODE_WEIGHT: + return ret >> 16; + case DIACRITIC_WEIGHT: + return (ret >> 8) & 0xff; + case CASE_WEIGHT: + default: + return (ret >> 4) & 0x0f; + } +} + +static inline int compare_weights(int flags, const WCHAR *str1, int len1, + const WCHAR *str2, int len2, enum weight type) { unsigned int ce1, ce2; - int ret; /* 32-bit collation element table format: * unicode weight - high 16 bit, diacritic weight - high 8 bit of low 16 bit, @@ -187,7 +213,7 @@ static inline int compare_unicode_weights(int flags, const WCHAR *str1, int len1 /* hyphen and apostrophe are treated differently depending on * whether SORT_STRINGSORT specified or not */ - if (!(flags & SORT_STRINGSORT)) + if (type == UNICODE_WEIGHT && !(flags & SORT_STRINGSORT)) { if (*str1 == '-' || *str1 == '\'') { @@ -206,133 +232,10 @@ static inline int compare_unicode_weights(int flags, const WCHAR *str1, int len1 } } - ce1 = collation_table[collation_table[*str1 >> 8] + (*str1 & 0xff)]; - ce2 = collation_table[collation_table[*str2 >> 8] + (*str2 & 0xff)]; - - if (ce1 != (unsigned int)-1 && ce2 != (unsigned int)-1) - ret = (ce1 >> 16) - (ce2 >> 16); - else - ret = *str1 - *str2; - - if (ret) return ret; - - str1++; - str2++; - len1--; - len2--; - } - while (len1 && !*str1) - { - str1++; - len1--; - } - while (len2 && !*str2) - { - str2++; - len2--; - } - return len1 - len2; -} - -static inline int compare_diacritic_weights(int flags, const WCHAR *str1, int len1, - const WCHAR *str2, int len2) -{ - unsigned int ce1, ce2; - int ret; - - /* 32-bit collation element table format: - * unicode weight - high 16 bit, diacritic weight - high 8 bit of low 16 bit, - * case weight - high 4 bit of low 8 bit. - */ - while (len1 > 0 && len2 > 0) - { - if (flags & NORM_IGNORESYMBOLS) - { - int skip = 0; - /* FIXME: not tested */ - if (get_char_typeW(*str1) & (C1_PUNCT | C1_SPACE)) - { - str1++; - len1--; - skip = 1; - } - if (get_char_typeW(*str2) & (C1_PUNCT | C1_SPACE)) - { - str2++; - len2--; - skip = 1; - } - if (skip) continue; - } - - ce1 = collation_table[collation_table[*str1 >> 8] + (*str1 & 0xff)]; - ce2 = collation_table[collation_table[*str2 >> 8] + (*str2 & 0xff)]; - - if (ce1 != (unsigned int)-1 && ce2 != (unsigned int)-1) - ret = ((ce1 >> 8) & 0xff) - ((ce2 >> 8) & 0xff); - else - ret = *str1 - *str2; - - if (ret) return ret; - - str1++; - str2++; - len1--; - len2--; - } - while (len1 && !*str1) - { - str1++; - len1--; - } - while (len2 && !*str2) - { - str2++; - len2--; - } - return len1 - len2; -} - -static inline int compare_case_weights(int flags, const WCHAR *str1, int len1, - const WCHAR *str2, int len2) -{ - unsigned int ce1, ce2; - int ret; - - /* 32-bit collation element table format: - * unicode weight - high 16 bit, diacritic weight - high 8 bit of low 16 bit, - * case weight - high 4 bit of low 8 bit. - */ - while (len1 > 0 && len2 > 0) - { - if (flags & NORM_IGNORESYMBOLS) - { - int skip = 0; - /* FIXME: not tested */ - if (get_char_typeW(*str1) & (C1_PUNCT | C1_SPACE)) - { - str1++; - len1--; - skip = 1; - } - if (get_char_typeW(*str2) & (C1_PUNCT | C1_SPACE)) - { - str2++; - len2--; - skip = 1; - } - if (skip) continue; - } - - ce1 = collation_table[collation_table[*str1 >> 8] + (*str1 & 0xff)]; - ce2 = collation_table[collation_table[*str2 >> 8] + (*str2 & 0xff)]; - - if (ce1 != (unsigned int)-1 && ce2 != (unsigned int)-1) - ret = ((ce1 >> 4) & 0x0f) - ((ce2 >> 4) & 0x0f); - else - ret = *str1 - *str2; + ce1 = get_weight(*str1, type); + ce2 = get_weight(*str2, type); - if (ret) return ret; + if (ce1 - ce2) return ce1 - ce2; str1++; str2++; @@ -357,13 +260,13 @@ int wine_compare_string(int flags, const WCHAR *str1, int len1, { int ret; - ret = compare_unicode_weights(flags, str1, len1, str2, len2); + ret = compare_weights(flags, str1, len1, str2, len2, UNICODE_WEIGHT); if (!ret) { if (!(flags & NORM_IGNORENONSPACE)) - ret = compare_diacritic_weights(flags, str1, len1, str2, len2); + ret = compare_weights(flags, str1, len1, str2, len2, DIACRITIC_WEIGHT); if (!ret && !(flags & NORM_IGNORECASE)) - ret = compare_case_weights(flags, str1, len1, str2, len2); + ret = compare_weights(flags, str1, len1, str2, len2, CASE_WEIGHT); } return ret; }

1 0

Gijs Vermeulen : crypt32/tests: Fix some memory leaks (Valgrind).
by Alexandre Julliard May 22, 2019

May 22, 2019

Module: wine Branch: master Commit: 1eca63440d54cbaa0be8616eb0d153205f4909d1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1eca63440d54cbaa0be8616e… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Tue May 21 21:22:30 2019 +0200 crypt32/tests: Fix some memory leaks (Valgrind). Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/cert.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/crypt32/tests/cert.c b/dlls/crypt32/tests/cert.c index e4f4c59..880ae72 100644 --- a/dlls/crypt32/tests/cert.c +++ b/dlls/crypt32/tests/cert.c @@ -1736,6 +1736,7 @@ static void testGetIssuerCert(void) CertFreeCertificateContext(child); CertFreeCertificateContext(cert1); CertFreeCertificateContext(cert2); + CertFreeCertificateContext(cert3); CertCloseStore(store, 0); HeapFree(GetProcessHeap(), 0, certencoded); @@ -1750,6 +1751,7 @@ static void testGetIssuerCert(void) ok(!parent, "Expected NULL\n"); ok(GetLastError() == CRYPT_E_SELF_SIGNED, "Expected CRYPT_E_SELF_SIGNED, got %08X\n", GetLastError()); + CertFreeCertificateContext(cert1); CertCloseStore(store, 0); }

1 0

Alexandre Julliard : make_unicode: Use a two-level table for the kernel32 wctype table.
by Alexandre Julliard May 22, 2019

May 22, 2019

Module: wine Branch: master Commit: bb6bd8a2f1c8e6d30e576d590b669ffd20b32f59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb6bd8a2f1c8e6d30e576d59… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 22 11:27:13 2019 +0200 make_unicode: Use a two-level table for the kernel32 wctype table. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 26 +- dlls/kernel32/wctype.c | 1575 ++++++------------------------------------------ tools/make_unicode | 2 +- 3 files changed, 205 insertions(+), 1398 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bb6bd8a2f1c8e6d30e57…

1 0

Alexandre Julliard : make_unicode: Store the C2_* values directly in the kernel32 wctype table.
by Alexandre Julliard May 22, 2019

May 22, 2019

Module: wine Branch: master Commit: 02a04ba05ebf6f2f5f471ddd6b8c6723b74b32f8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02a04ba05ebf6f2f5f471ddd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 22 11:26:19 2019 +0200 make_unicode: Store the C2_* values directly in the kernel32 wctype table. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/locale.c | 22 +- dlls/kernel32/wctype.c | 804 ++++++++++++++++++++++++------------------------- tools/make_unicode | 29 +- 3 files changed, 431 insertions(+), 424 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02a04ba05ebf6f2f5f47…

1 0

Alexandre Julliard : make_unicode: Generate a separate table for BiDi direction type in usp10.
by Alexandre Julliard May 22, 2019

May 22, 2019

Module: wine Branch: master Commit: 2f6918cbe2e49817511336d0aaddd727c72a8b74 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2f6918cbe2e49817511336d0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 22 15:37:29 2019 +0200 make_unicode: Generate a separate table for BiDi direction type in usp10. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/Makefile.in | 1 + dlls/usp10/bidi.c | 4 +- dlls/usp10/direction.c | 769 +++++++++++++++++++++++++++++++++++++++++++++++++ tools/make_unicode | 26 ++ 4 files changed, 798 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=2f6918cbe2e498175113…

1 0

Dmitry Timoshkov : urlmon: If ProtocolCF_CreateInstance doesn' t support aggregation retry without it.
by Alexandre Julliard May 22, 2019

May 22, 2019

Module: wine Branch: master Commit: 43c1992821b5e1bc9ff51e6b327f29cb7613cf49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=43c1992821b5e1bc9ff51e6b… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed May 22 15:32:12 2019 +0200 urlmon: If ProtocolCF_CreateInstance doesn't support aggregation retry without it. This patch fixes a regression caused by 097811f2513e457ebf4afb1d2d21ab90b8684325. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47190 Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/urlmon/bindprot.c | 23 +++++++++++++++-------- dlls/urlmon/tests/protocol.c | 3 --- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/dlls/urlmon/bindprot.c b/dlls/urlmon/bindprot.c index 42d3d21..e9c97e8 100644 --- a/dlls/urlmon/bindprot.c +++ b/dlls/urlmon/bindprot.c @@ -509,15 +509,19 @@ static HRESULT WINAPI BindProtocol_StartEx(IInternetProtocolEx *iface, IUri *pUr hres = IClassFactory_CreateInstance(cf, (IUnknown*)&This->IInternetBindInfo_iface, &IID_IUnknown, (void**)&protocol_unk); + if(SUCCEEDED(hres)) { + hres = IUnknown_QueryInterface(protocol_unk, &IID_IInternetProtocol, (void**)&protocol); + if(SUCCEEDED(hres)) + This->protocol_unk = protocol_unk; + else + IUnknown_Release(protocol_unk); + } + else if(hres == CLASS_E_NOAGGREGATION) + hres = IClassFactory_CreateInstance(cf, NULL, &IID_IInternetProtocol, (void**)&protocol); + IClassFactory_Release(cf); if(FAILED(hres)) return hres; - - hres = IUnknown_QueryInterface(protocol_unk, &IID_IInternetProtocol, (void**)&protocol); - if(FAILED(hres)) { - IUnknown_Release(protocol_unk); - return hres; - } } StringFromCLSID(&clsid, &clsid_str); @@ -703,8 +707,11 @@ static HRESULT WINAPI ProtocolHandler_Terminate(IInternetProtocol *iface, DWORD if(This->protocol) { IInternetProtocol_Terminate(This->protocol, 0); - IInternetProtocol_Release(This->protocol); - This->protocol = NULL; + + if (This->protocol_unk) { + IInternetProtocol_Release(This->protocol); + This->protocol = NULL; + } } set_binding_sink(This, NULL, NULL); diff --git a/dlls/urlmon/tests/protocol.c b/dlls/urlmon/tests/protocol.c index f161251..85ef7d0 100644 --- a/dlls/urlmon/tests/protocol.c +++ b/dlls/urlmon/tests/protocol.c @@ -3875,9 +3875,7 @@ static void test_CreateBinding(void) trace("Start >\n"); expect_hrResult = S_OK; hres = IInternetProtocol_Start(protocol, test_url, &protocol_sink, &bind_info, 0, 0); -todo_wine_if (no_aggregation) ok(hres == S_OK, "Start failed: %08x\n", hres); - if (hres != S_OK) goto fail; trace("Start <\n"); CHECK_CALLED(QueryService_InternetProtocol); @@ -4025,7 +4023,6 @@ todo_wine_if (no_aggregation) ok(hres == MK_E_SYNTAX, "Start failed: %08x, expected MK_E_SYNTAX\n", hres); CHECK_CALLED(QueryService_InternetProtocol); -fail: IInternetProtocol_Release(protocol); IInternetSession_Release(session);

1 0

Fabian Maurer : gdi32: CreatePolyPolygonRgn() returns an empty region when the area is empty.
by Alexandre Julliard May 22, 2019

May 22, 2019

Module: wine Branch: master Commit: 9bc6f004ceccf3963584a4f7f4681b5c0578c214 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bc6f004ceccf3963584a4f7… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Wed May 22 08:45:10 2019 +0100 gdi32: CreatePolyPolygonRgn() returns an empty region when the area is empty. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46655 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/region.c | 3 +-- dlls/gdi32/tests/clipping.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 2 deletions(-) diff --git a/dlls/gdi32/region.c b/dlls/gdi32/region.c index cad6428..93238b5 100644 --- a/dlls/gdi32/region.c +++ b/dlls/gdi32/region.c @@ -2627,8 +2627,7 @@ HRGN create_polypolygon_region( const POINT *Pts, const INT *Count, INT nbpolygo if (! (pETEs = HeapAlloc( GetProcessHeap(), 0, sizeof(EdgeTableEntry) * total ))) return 0; - if (!(nb_points = REGION_CreateEdgeTable( Count, nbpolygons, Pts, &ET, pETEs, &SLLBlock, clip_rect ))) - goto done; + nb_points = REGION_CreateEdgeTable( Count, nbpolygons, Pts, &ET, pETEs, &SLLBlock, clip_rect ); if (!(obj = alloc_region( nb_points / 2 ))) goto done; diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index 60bd31e..d04ef77 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -533,6 +533,44 @@ static void test_window_dc_clipping(void) DestroyWindow(hwnd); } +static void test_CreatePolyPolygonRgn(void) +{ + HRGN region; + POINT points_zero[] = { {0, 0}, {0, 0}, {0, 0} }; + POINT points_mixed[] = { {0, 0}, {0, 0}, {0, 0}, {6, 6}, {6, 6}, {6, 6} }; + POINT points_six[] = { {6, 6}, {6, 6}, {6, 6} }; + POINT points_line[] = { {1, 0}, {11, 0}, {21, 0}}; + INT counts_single_poly[] = { 3 }; + INT counts_two_poly[] = { 3, 3 }; + int ret; + RECT rect; + + /* When all polygons are just one point or line, return must not be NULL */ + + region = CreatePolyPolygonRgn(points_zero, counts_single_poly, ARRAY_SIZE(counts_single_poly), ALTERNATE); + ok (region != NULL, "region must not be NULL\n"); + ret = GetRgnBox(region, &rect); + ok (ret == NULLREGION, "Expected NULLREGION, got %d\n", ret); + DeleteObject(region); + + region = CreatePolyPolygonRgn(points_six, counts_single_poly, ARRAY_SIZE(counts_single_poly), ALTERNATE); + ok (region != NULL, "region must not be NULL\n"); + ret = GetRgnBox(region, &rect); + ok (ret == NULLREGION, "Expected NULLREGION, got %d\n", ret); + DeleteObject(region); + + region = CreatePolyPolygonRgn(points_line, counts_single_poly, ARRAY_SIZE(counts_single_poly), ALTERNATE); + ok (region != NULL, "region must not be NULL\n"); + ret = GetRgnBox(region, &rect); + ok (ret == NULLREGION, "Expected NULLREGION, got %d\n", ret); + DeleteObject(region); + + region = CreatePolyPolygonRgn(points_mixed, counts_two_poly, ARRAY_SIZE(counts_two_poly), ALTERNATE); + ok (region != NULL, "region must not be NULL\n"); + ret = GetRgnBox(region, &rect); + ok (ret == NULLREGION, "Expected NULLREGION, got %d\n", ret); + DeleteObject(region); +} START_TEST(clipping) { @@ -541,4 +579,5 @@ START_TEST(clipping) test_GetClipRgn(); test_memory_dc_clipping(); test_window_dc_clipping(); + test_CreatePolyPolygonRgn(); }

1 0

Alexandre Julliard : make_unicode: Avoid including wine/ unicode.h in generated files.
by Alexandre Julliard May 22, 2019

May 22, 2019

Module: wine Branch: master Commit: 333e6b3c69369367fbca9953b6224cb740376cf6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=333e6b3c69369367fbca9953… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed May 22 17:34:45 2019 +0200 make_unicode: Avoid including wine/unicode.h in generated files. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/bracket.c | 2 +- dlls/dwrite/linebreak.c | 2 +- dlls/dwrite/mirror.c | 2 +- dlls/dwrite/scripts.c | 2 +- dlls/gdi32/vertical.c | 2 +- dlls/kernel32/nameprep.c | 2 +- dlls/usp10/bracket.c | 2 +- dlls/usp10/indicsyllable.c | 2 +- dlls/usp10/linebreak.c | 2 +- dlls/usp10/mirror.c | 2 +- dlls/usp10/shaping.c | 2 +- dlls/wineps.drv/vertical.c | 2 +- libs/port/casemap.c | 2 +- libs/port/collation.c | 2 +- libs/port/combclass.c | 2 +- libs/port/compose.c | 2 +- libs/port/digitmap.c | 2 +- libs/port/wctype.c | 2 +- tools/make_unicode | 28 ++++++++++++++-------------- 19 files changed, 32 insertions(+), 32 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=333e6b3c69369367fbca…

1 0

Piotr Caban : libwine: Ignore 0 weights as described in Unicode collation algorithm.
by Alexandre Julliard May 22, 2019

May 22, 2019

Module: wine Branch: master Commit: 4a6e69ad3aff6fff2817b05ee2cdcc7e94f960a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4a6e69ad3aff6fff2817b05e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue May 21 17:19:52 2019 +0200 libwine: Ignore 0 weights as described in Unicode collation algorithm. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/locale.c | 8 ++++---- libs/port/sortkey.c | 28 ++++++++++++++++++++++------ 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c index 1c632cc..81e7453 100644 --- a/dlls/kernel32/tests/locale.c +++ b/dlls/kernel32/tests/locale.c @@ -2043,9 +2043,9 @@ static void test_CompareStringW(void) ok(ret == CSTR_GREATER_THAN, "expected CSTR_GREATER_THAN, got %d\n", ret); ret = CompareStringW(CP_ACP, 0, ABC_EE, 4, A_ACUTE_BC, 4); - todo_wine ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); + ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); ret = CompareStringW(CP_ACP, 0, ABC_EE, 4, A_ACUTE_BC_DECOMP, 5); - todo_wine ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); + ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); ret = CompareStringW(CP_ACP, 0, A_ACUTE_BC, 4, A_ACUTE_BC_DECOMP, 5); ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); @@ -2057,9 +2057,9 @@ static void test_CompareStringW(void) ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); ret = CompareStringW(CP_ACP, 0, ABC_EE, 4, A_NULL_BC, 4); - todo_wine ok(ret == CSTR_EQUAL, "expected CSTR_LESS_THAN, got %d\n", ret); + ok(ret == CSTR_EQUAL, "expected CSTR_LESS_THAN, got %d\n", ret); ret = CompareStringW(CP_ACP, NORM_IGNORENONSPACE, ABC_EE, 4, A_NULL_BC, 4); - todo_wine ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); + ok(ret == CSTR_EQUAL, "expected CSTR_EQUAL, got %d\n", ret); ret = CompareStringW(CP_ACP, 0, A_NULL_BC, 4, A_ACUTE_BC, 4); ok(ret == CSTR_LESS_THAN, "expected CSTR_LESS_THAN, got %d\n", ret); diff --git a/libs/port/sortkey.c b/libs/port/sortkey.c index 5d83fcd..f62289b 100644 --- a/libs/port/sortkey.c +++ b/libs/port/sortkey.c @@ -245,22 +245,38 @@ static inline int compare_weights(int flags, const WCHAR *str1, int len1, } ce1 = get_weight(dstr1[dpos1], type); + if (!ce1) + { + inc_str_pos(&str1, &len1, &dpos1, &dlen1); + continue; + } ce2 = get_weight(dstr2[dpos2], type); + if (!ce2) + { + inc_str_pos(&str2, &len2, &dpos2, &dlen2); + continue; + } if (ce1 - ce2) return ce1 - ce2; inc_str_pos(&str1, &len1, &dpos1, &dlen1); inc_str_pos(&str2, &len2, &dpos2, &dlen2); } - while (len1 && !*str1) + while (len1) { - str1++; - len1--; + if (!dlen1) dlen1 = wine_decompose(0, *str1, dstr1, 4); + + ce1 = get_weight(dstr1[dpos1], type); + if (ce1) break; + inc_str_pos(&str1, &len1, &dpos1, &dlen1); } - while (len2 && !*str2) + while (len2) { - str2++; - len2--; + if (!dlen2) dlen2 = wine_decompose(0, *str2, dstr2, 4); + + ce2 = get_weight(dstr2[dpos2], type); + if (ce2) break; + inc_str_pos(&str2, &len2, &dpos2, &dlen2); } return len1 - len2; }

1 0

Zebediah Figura : qcap/avimux: Use BaseFilter_Destroy().
by Alexandre Julliard May 22, 2019

May 22, 2019

Module: wine Branch: master Commit: f96c2bd64feeb615b1e38ba7983705b81cc359a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f96c2bd64feeb615b1e38ba7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 22 00:02:16 2019 -0500 qcap/avimux: Use BaseFilter_Destroy(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/avimux.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/qcap/avimux.c b/dlls/qcap/avimux.c index 3a269a3..ff45fb0 100644 --- a/dlls/qcap/avimux.c +++ b/dlls/qcap/avimux.c @@ -175,7 +175,7 @@ static HRESULT WINAPI AviMux_QueryInterface(IBaseFilter *iface, REFIID riid, voi static ULONG WINAPI AviMux_Release(IBaseFilter *iface) { AviMux *This = impl_from_IBaseFilter(iface); - ULONG ref = BaseFilterImpl_Release(iface); + ULONG ref = InterlockedDecrement(&This->filter.refCount); TRACE("(%p) new refcount: %u\n", This, ref); @@ -192,6 +192,7 @@ static ULONG WINAPI AviMux_Release(IBaseFilter *iface) } HeapFree(GetProcessHeap(), 0, This->idx1); + strmbase_filter_cleanup(&This->filter); HeapFree(GetProcessHeap(), 0, This); ObjectRefCount(FALSE); } @@ -2364,7 +2365,7 @@ IUnknown* WINAPI QCAP_createAVIMux(IUnknown *pUnkOuter, HRESULT *phr) hr = BaseOutputPin_Construct(&AviMuxOut_PinVtbl, sizeof(AviMuxOut), &info, &AviMuxOut_BaseOutputFuncTable, &avimux->filter.csFilter, (IPin**)&avimux->out); if(FAILED(hr)) { - BaseFilterImpl_Release(&avimux->filter.IBaseFilter_iface); + strmbase_filter_cleanup(&avimux->filter); HeapFree(GetProcessHeap(), 0, avimux); *phr = hr; return NULL; @@ -2377,7 +2378,7 @@ IUnknown* WINAPI QCAP_createAVIMux(IUnknown *pUnkOuter, HRESULT *phr) hr = create_input_pin(avimux); if(FAILED(hr)) { BaseOutputPinImpl_Release(&avimux->out->pin.pin.IPin_iface); - BaseFilterImpl_Release(&avimux->filter.IBaseFilter_iface); + strmbase_filter_cleanup(&avimux->filter); HeapFree(GetProcessHeap(), 0, avimux); *phr = hr; return NULL;

1 0