February 2021 - Wine-Commits

Hans Leidekker : wbemprox: Fix Windows 8/8.1 caption.
by Alexandre Julliard Feb. 3, 2021

Feb. 3, 2021

Module: wine Branch: master Commit: bdba6037d01acce3cd1ea299a8859f3b99d4f520 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bdba6037d01acce3cd1ea299… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Feb 3 10:32:32 2021 +0100 wbemprox: Fix Windows 8/8.1 caption. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50610 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wbemprox/builtin.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wbemprox/builtin.c b/dlls/wbemprox/builtin.c index f1cf75ab380..b86326327fb 100644 --- a/dlls/wbemprox/builtin.c +++ b/dlls/wbemprox/builtin.c @@ -3436,8 +3436,8 @@ static WCHAR *get_oscaption( OSVERSIONINFOEXW *ver ) if (!(ret = heap_alloc( len * sizeof(WCHAR) + sizeof(win2003W) ))) return NULL; memcpy( ret, windowsW, sizeof(windowsW) ); if (ver->dwMajorVersion == 10 && ver->dwMinorVersion == 0) memcpy( ret + len, win10W, sizeof(win10W) ); - else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 3) memcpy( ret + len, win8W, sizeof(win8W) ); - else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 2) memcpy( ret + len, win81W, sizeof(win81W) ); + else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 3) memcpy( ret + len, win81W, sizeof(win81W) ); + else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 2) memcpy( ret + len, win8W, sizeof(win8W) ); else if (ver->dwMajorVersion == 6 && ver->dwMinorVersion == 1) { if (ver->wProductType == VER_NT_WORKSTATION) memcpy( ret + len, win7W, sizeof(win7W) );

1 0

Zebediah Figura : ntdll/tests: Add more tests for RtlDosPathNameToNtPathName_U().
by Alexandre Julliard Feb. 3, 2021

Feb. 3, 2021

Module: wine Branch: master Commit: f2f69a8799cd4dd6ab6c61845cd17d0df656e6fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2f69a8799cd4dd6ab6c6184… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 2 18:17:13 2021 -0600 ntdll/tests: Add more tests for RtlDosPathNameToNtPathName_U(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/path.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 6b3be9e9541..5342d101b4f 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -436,6 +436,18 @@ static void test_RtlDosPathNameToNtPathName_U(void) {L"c:/", L"\\??\\c:\\", -1}, {L"c:/foo", L"\\??\\c:\\foo", 7}, {L"c:/foo.", L"\\??\\c:\\foo", 7}, + {L"c:/foo ", L"\\??\\c:\\foo", 7}, + {L"c:/foo . .", L"\\??\\c:\\foo", 7}, + {L"c:/foo.a", L"\\??\\c:\\foo.a", 7}, + {L"c:/foo a", L"\\??\\c:\\foo a", 7}, + {L"c:/foo*", L"\\??\\c:\\foo*", 7}, + {L"c:/foo*a", L"\\??\\c:\\foo*a", 7}, + {L"c:/foo?", L"\\??\\c:\\foo?", 7}, + {L"c:/foo?a", L"\\??\\c:\\foo?a", 7}, + {L"c:/foo<", L"\\??\\c:\\foo<", 7}, + {L"c:/foo<a", L"\\??\\c:\\foo<a", 7}, + {L"c:/foo>", L"\\??\\c:\\foo>", 7}, + {L"c:/foo>a", L"\\??\\c:\\foo>a", 7}, {L"c:/foo/", L"\\??\\c:\\foo\\", -1}, {L"c:/foo//", L"\\??\\c:\\foo\\", -1}, {L"C:/foo", L"\\??\\C:\\foo", 7}, @@ -477,6 +489,7 @@ static void test_RtlDosPathNameToNtPathName_U(void) {L"//./foo/bar", L"\\??\\foo\\bar", 8}, {L"//./foo/.", L"\\??\\foo", 4}, {L"//./foo/..", L"\\??\\", -1}, + {L"//./foo. . ", L"\\??\\foo", 4}, {L"//?", L"\\??\\", -1}, {L"//?/", L"\\??\\", -1}, @@ -486,6 +499,7 @@ static void test_RtlDosPathNameToNtPathName_U(void) {L"//?/foo/bar", L"\\??\\foo\\bar", 8}, {L"//?/foo/.", L"\\??\\foo", 4}, {L"//?/foo/..", L"\\??\\", -1}, + {L"//?/foo. . ", L"\\??\\foo", 4}, {L"\\\\.", L"\\??\\", -1}, {L"\\\\.\\", L"\\??\\", -1}, @@ -495,6 +509,7 @@ static void test_RtlDosPathNameToNtPathName_U(void) {L"\\\\.\\foo/bar", L"\\??\\foo\\bar", 8}, {L"\\\\.\\foo/.", L"\\??\\foo", 4}, {L"\\\\.\\foo/..", L"\\??\\", -1}, + {L"\\\\.\\foo. . ", L"\\??\\foo", 4}, {L"\\\\?", L"\\??\\", -1}, {L"\\\\?\\", L"\\??\\", -1}, @@ -511,6 +526,7 @@ static void test_RtlDosPathNameToNtPathName_U(void) {L"\\\\?\\foo\\bar",L"\\??\\foo\\bar", 8}, {L"\\\\?\\foo\\.", L"\\??\\foo\\.", 8}, {L"\\\\?\\foo\\..", L"\\??\\foo\\..", 8}, + {L"\\\\?\\foo. . ", L"\\??\\foo. . ", 4}, {L"\\??", L"\\??\\C:\\??", 7}, {L"\\??\\", L"\\??\\C:\\??\\", -1}, @@ -527,6 +543,7 @@ static void test_RtlDosPathNameToNtPathName_U(void) {L"\\??\\foo\\bar", L"\\??\\foo\\bar", 8}, {L"\\??\\foo\\.", L"\\??\\foo\\.", 8}, {L"\\??\\foo\\..", L"\\??\\foo\\..", 8}, + {L"\\??\\foo. . ", L"\\??\\foo. . ", 4}, {L"CONIN$", L"\\??\\CONIN$", -1, L"\\??\\C:\\windows\\CONIN$" /* winxp */ }, {L"CONOUT$", L"\\??\\CONOUT$", -1, L"\\??\\C:\\windows\\CONOUT$" /* winxp */ },

1 0

Zebediah Figura : winegstreamer: Move the "caps" field to struct wg_parser_stream.
by Alexandre Julliard Feb. 3, 2021

Feb. 3, 2021

Module: wine Branch: master Commit: 7fe5f2755d6348296d6f984b3855ea0e5b469e94 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7fe5f2755d6348296d6f984b… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 2 18:11:21 2021 -0600 winegstreamer: Move the "caps" field to struct wg_parser_stream. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 30 ++++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 728977f2bb5..8d08ff370f4 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -79,6 +79,7 @@ struct wg_parser_stream GstPad *their_src, *post_sink, *post_src, *my_sink; GstElement *flip; GstSegment *segment; + GstCaps *caps; }; struct parser @@ -140,7 +141,6 @@ struct parser_source struct wg_parser_stream *wg_stream; - GstCaps *caps; SourceSeeking seek; CRITICAL_SECTION flushing_cs; @@ -829,7 +829,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) gst_event_parse_caps(event, &caps); pthread_mutex_lock(&parser->mutex); - gst_caps_replace(&pin->caps, caps); + gst_caps_replace(&stream->caps, caps); pthread_mutex_unlock(&parser->mutex); pthread_cond_signal(&parser->init_cond); break; @@ -1638,7 +1638,7 @@ static HRESULT GST_Connect(struct parser *This, IPin *pConnectPin) pin->seek.llDuration = pin->seek.llStop = query_duration(stream->their_src); pin->seek.llCurrent = 0; - while (!pin->caps && !parser->error) + while (!stream->caps && !parser->error) pthread_cond_wait(&parser->init_cond, &parser->mutex); if (parser->error) { @@ -1932,7 +1932,8 @@ static HRESULT decodebin_parser_source_query_accept(struct parser_source *pin, c static HRESULT decodebin_parser_source_get_media_type(struct parser_source *pin, unsigned int index, AM_MEDIA_TYPE *mt) { - const GstCaps *caps = pin->caps; + struct wg_parser_stream *stream = pin->wg_stream; + const GstCaps *caps = stream->caps; const GstStructure *structure; const char *type; @@ -2684,10 +2685,11 @@ static BOOL wave_parser_init_gst(struct parser *filter) static HRESULT wave_parser_source_query_accept(struct parser_source *pin, const AM_MEDIA_TYPE *mt) { + struct wg_parser_stream *stream = pin->wg_stream; AM_MEDIA_TYPE pad_mt; HRESULT hr; - if (!amt_from_gst_caps(pin->caps, &pad_mt)) + if (!amt_from_gst_caps(stream->caps, &pad_mt)) return E_OUTOFMEMORY; hr = compare_media_types(mt, &pad_mt) ? S_OK : S_FALSE; FreeMediaType(&pad_mt); @@ -2697,9 +2699,11 @@ static HRESULT wave_parser_source_query_accept(struct parser_source *pin, const static HRESULT wave_parser_source_get_media_type(struct parser_source *pin, unsigned int index, AM_MEDIA_TYPE *mt) { + struct wg_parser_stream *stream = pin->wg_stream; + if (index > 0) return VFW_S_NO_MORE_ITEMS; - if (!amt_from_gst_caps(pin->caps, mt)) + if (!amt_from_gst_caps(stream->caps, mt)) return E_OUTOFMEMORY; return S_OK; } @@ -2802,10 +2806,11 @@ static BOOL avi_splitter_init_gst(struct parser *filter) static HRESULT avi_splitter_source_query_accept(struct parser_source *pin, const AM_MEDIA_TYPE *mt) { + struct wg_parser_stream *stream = pin->wg_stream; AM_MEDIA_TYPE pad_mt; HRESULT hr; - if (!amt_from_gst_caps(pin->caps, &pad_mt)) + if (!amt_from_gst_caps(stream->caps, &pad_mt)) return E_OUTOFMEMORY; hr = compare_media_types(mt, &pad_mt) ? S_OK : S_FALSE; FreeMediaType(&pad_mt); @@ -2815,9 +2820,11 @@ static HRESULT avi_splitter_source_query_accept(struct parser_source *pin, const static HRESULT avi_splitter_source_get_media_type(struct parser_source *pin, unsigned int index, AM_MEDIA_TYPE *mt) { + struct wg_parser_stream *stream = pin->wg_stream; + if (index > 0) return VFW_S_NO_MORE_ITEMS; - if (!amt_from_gst_caps(pin->caps, mt)) + if (!amt_from_gst_caps(stream->caps, mt)) return E_OUTOFMEMORY; return S_OK; } @@ -2930,10 +2937,11 @@ static BOOL mpeg_splitter_init_gst(struct parser *filter) static HRESULT mpeg_splitter_source_query_accept(struct parser_source *pin, const AM_MEDIA_TYPE *mt) { + struct wg_parser_stream *stream = pin->wg_stream; AM_MEDIA_TYPE pad_mt; HRESULT hr; - if (!amt_from_gst_caps(pin->caps, &pad_mt)) + if (!amt_from_gst_caps(stream->caps, &pad_mt)) return E_OUTOFMEMORY; hr = compare_media_types(mt, &pad_mt) ? S_OK : S_FALSE; FreeMediaType(&pad_mt); @@ -2943,9 +2951,11 @@ static HRESULT mpeg_splitter_source_query_accept(struct parser_source *pin, cons static HRESULT mpeg_splitter_source_get_media_type(struct parser_source *pin, unsigned int index, AM_MEDIA_TYPE *mt) { + struct wg_parser_stream *stream = pin->wg_stream; + if (index > 0) return VFW_S_NO_MORE_ITEMS; - if (!amt_from_gst_caps(pin->caps, mt)) + if (!amt_from_gst_caps(stream->caps, mt)) return E_OUTOFMEMORY; return S_OK; }

1 0

Zebediah Figura : kernel32/tests: Correctly check for failure from FindFirstFile().
by Alexandre Julliard Feb. 3, 2021

Feb. 3, 2021

Module: wine Branch: master Commit: f349e567ea5ea6428de3ed49d07d3021cebcfb68 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f349e567ea5ea6428de3ed49… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 2 18:17:11 2021 -0600 kernel32/tests: Correctly check for failure from FindFirstFile(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 2814ab194b2..6d2a216e39c 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2928,7 +2928,7 @@ static void test_FindFirstFile_wildcards(void) {0, "*.. ", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, {1, "*. .", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, {1, "* ..", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, - {1, " *..", ", '.aaa'"}, + {0, " *..", ""}, {0, "..* ", ", '.', '..', '..a', '..a.a'"}, {1, "?", ", '.', '..', 'a'"}, {1, "?.", ", '.', '..', 'a'"}, @@ -2954,23 +2954,26 @@ static void test_FindFirstFile_wildcards(void) correct[0] = incorrect[0] = 0; handle = FindFirstFileA(tests[i].pattern, &find_data); - if (handle) do { - char* ptr; - char quoted[16]; + if (handle != INVALID_HANDLE_VALUE) + { + do { + char *ptr; + char quoted[16]; - sprintf( quoted, ", '%.10s'", find_data.cFileName ); + sprintf(quoted, ", '%.10s'", find_data.cFileName); - if ((ptr = strstr(missing, quoted))) - { - int len = strlen(quoted); - while ((ptr[0] = ptr[len]) != 0) - ++ptr; - strcat(correct, quoted); - } - else - strcat(incorrect, quoted); - } while (FindNextFileA(handle, &find_data)); - FindClose(handle); + if ((ptr = strstr(missing, quoted))) + { + int len = strlen(quoted); + while ((ptr[0] = ptr[len]) != 0) + ++ptr; + strcat(correct, quoted); + } + else + strcat(incorrect, quoted); + } while (FindNextFileA(handle, &find_data)); + FindClose(handle); + } todo_wine_if (tests[i].todo) ok(missing[0] == 0 && incorrect[0] == 0,

1 0

Zebediah Figura : ntdll: Treat '>' the same as '?' in match_filename().
by Alexandre Julliard Feb. 3, 2021

Feb. 3, 2021

Module: wine Branch: master Commit: 690a0699189b26d4821d614dfa9704f49cf610a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=690a0699189b26d4821d614d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 2 18:17:15 2021 -0600 ntdll: Treat '>' the same as '?' in match_filename(). They differ in strange ways, as the tests show, but the basic behaviour of '>' is similar to '?'. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=22635 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/file.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index a4c6bf4a137..d6533fedfdd 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -1342,6 +1342,7 @@ static BOOLEAN match_filename( const WCHAR *name, int length, const UNICODE_STRI next_to_retry = name; break; case '?': + case '>': mask++; name++; break;

1 0

Zebediah Figura : winegstreamer: Move the "mutex" field to struct wg_parser.
by Alexandre Julliard Feb. 3, 2021

Feb. 3, 2021

Module: wine Branch: master Commit: 84b64da8fc40afbd8d4468fa7e7a1f8d00c6dd50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=84b64da8fc40afbd8d4468fa… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 2 18:11:17 2021 -0600 winegstreamer: Move the "mutex" field to struct wg_parser. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 143 +++++++++++++++++++----------------------- 1 file changed, 65 insertions(+), 78 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=84b64da8fc40afbd8d44…

1 0

Zebediah Figura : ntdll/tests: Check the alternate NT path only if it is present.
by Alexandre Julliard Feb. 3, 2021

Feb. 3, 2021

Module: wine Branch: master Commit: 32854b7ee38bbf16d27b253dbafcd50a5027d525 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32854b7ee38bbf16d27b253d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 2 18:17:12 2021 -0600 ntdll/tests: Check the alternate NT path only if it is present. Makes adding new tests a bit easier... Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/path.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index a91038bab7b..6b3be9e9541 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -580,8 +580,10 @@ static void test_RtlDosPathNameToNtPathName_U(void) continue; } - ok(!wcscmp(nameW.Buffer, tests[i].nt) || broken(!wcscmp(nameW.Buffer, tests[i].alt_nt)), "%s: Expected %s, got %s.\n", - debugstr_w(tests[i].dos), debugstr_w(tests[i].nt), debugstr_w(nameW.Buffer)); + ok(!wcscmp(nameW.Buffer, tests[i].nt) + || (tests[i].alt_nt && broken(!wcscmp(nameW.Buffer, tests[i].alt_nt))), + "%s: Expected %s, got %s.\n", debugstr_w(tests[i].dos), + debugstr_w(tests[i].nt), debugstr_w(nameW.Buffer)); if (!wcscmp(nameW.Buffer, tests[i].nt)) {

1 0

Alexandre Julliard : gdi32: Cache the codepage tables also for OpenType names mapping.
by Alexandre Julliard Feb. 3, 2021

Feb. 3, 2021

Module: wine Branch: master Commit: 9581b2df8c9c9ce1688b0d111d0206564b9fcd8b URL: https://source.winehq.org/git/wine.git/?a=commit;h=9581b2df8c9c9ce1688b0d11… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 20:55:06 2021 +0100 gdi32: Cache the codepage tables also for OpenType names mapping. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index b3fc565afe8..fae4aa94a78 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -714,21 +714,27 @@ static const LANGID mac_langid_table[] = MAKELANGID(LANG_AZERI,SUBLANG_AZERI_LATIN), /* TT_MAC_LANGID_AZERBAIJANI_ROMAN_SCRIPT */ }; -static CPTABLEINFO *get_mac_code_page( const FT_SfntName *name ) +static CPTABLEINFO *get_cptable( WORD cp ) { static CPTABLEINFO tables[100]; - int id = name->encoding_id; + unsigned int i; USHORT *ptr; SIZE_T size; + for (i = 0; i < ARRAY_SIZE(tables) && tables[i].CodePage; i++) + if (tables[i].CodePage == cp) return &tables[i]; + if (NtGetNlsSectionPtr( 11, cp, NULL, (void **)&ptr, &size )) return NULL; + if (i == ARRAY_SIZE(tables)) ERR( "too many code pages\n" ); + RtlInitCodePageTable( ptr, &tables[i] ); + return &tables[i]; +} + +static CPTABLEINFO *get_mac_code_page( const FT_SfntName *name ) +{ + int id = name->encoding_id; + if (name->encoding_id == TT_MAC_ID_SIMPLIFIED_CHINESE) id = 8; /* special case */ - if (id >= ARRAY_SIZE(tables)) return NULL; - if (!tables[id].CodePage) - { - if (NtGetNlsSectionPtr( 11, 10000 + id, NULL, (void **)&ptr, &size )) return NULL; - RtlInitCodePageTable( ptr, &tables[id] ); - } - return &tables[id]; + return get_cptable( 10000 + id ); } static int match_name_table_language( const FT_SfntName *name, LANGID lang ) @@ -1144,9 +1150,6 @@ static BOOL search_face_name_callback( LANGID langid, struct opentype_name *name static WCHAR *decode_opentype_name( struct opentype_name *name ) { - CPTABLEINFO codepage_info; - USHORT *codepage_ptr; - SIZE_T codepage_size; WCHAR buffer[512]; DWORD len; @@ -1158,11 +1161,10 @@ static WCHAR *decode_opentype_name( struct opentype_name *name ) } else { - NtGetNlsSectionPtr( 11, name->codepage, NULL, (void **)&codepage_ptr, &codepage_size ); - RtlInitCodePageTable( codepage_ptr, &codepage_info ); - RtlCustomCPToUnicodeN( &codepage_info, buffer, sizeof(buffer), &len, name->bytes, name->length ); + CPTABLEINFO *cptable = get_cptable( name->codepage ); + if (!cptable) return NULL; + RtlCustomCPToUnicodeN( cptable, buffer, sizeof(buffer), &len, name->bytes, name->length ); len /= sizeof(WCHAR); - NtUnmapViewOfSection( GetCurrentProcess(), codepage_ptr ); } buffer[ARRAY_SIZE(buffer) - 1] = 0;

1 0

Alexandre Julliard : gdiplus/tests: Regenerate ttf files with the official fontforge version.
by Alexandre Julliard Feb. 3, 2021

Feb. 3, 2021

Module: wine Branch: master Commit: 0ec38429f35ba3fdc3510f46550ea384b423fdef URL: https://source.winehq.org/git/wine.git/?a=commit;h=0ec38429f35ba3fdc3510f46… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Feb 3 20:44:03 2021 +0100 gdiplus/tests: Regenerate ttf files with the official fontforge version. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/wine_testfont0.sfd | 2 +- dlls/gdiplus/tests/wine_testfont0.ttf | Bin 1688 -> 1656 bytes 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdiplus/tests/wine_testfont0.sfd b/dlls/gdiplus/tests/wine_testfont0.sfd index ba99b9f99b4..c71f717c4a6 100644 --- a/dlls/gdiplus/tests/wine_testfont0.sfd +++ b/dlls/gdiplus/tests/wine_testfont0.sfd @@ -1,4 +1,4 @@ -SplineFontDB: 3.2 +SplineFontDB: 3.0 FontName: winegdiptestfont0 FullName: Wine GDI+ Test Font 0 FamilyName: winegdiptestfont diff --git a/dlls/gdiplus/tests/wine_testfont0.ttf b/dlls/gdiplus/tests/wine_testfont0.ttf index 227c2251432..fb899cb342f 100644 Binary files a/dlls/gdiplus/tests/wine_testfont0.ttf and b/dlls/gdiplus/tests/wine_testfont0.ttf differ

1 0

Zebediah Figura : kernel32/tests: Add some more tests for wildcards.
by Alexandre Julliard Feb. 3, 2021

Feb. 3, 2021

Module: wine Branch: master Commit: f73dc32e6e9acc51e636abb744629d4dc3ef4af8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f73dc32e6e9acc51e636abb7… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue Feb 2 18:17:14 2021 -0600 kernel32/tests: Add some more tests for wildcards. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/file.c | 33 ++++++++++++++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 6d2a216e39c..6ea9dffde5c 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -2930,13 +2930,44 @@ static void test_FindFirstFile_wildcards(void) {1, "* ..", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, {0, " *..", ""}, {0, "..* ", ", '.', '..', '..a', '..a.a'"}, + + {1, "<.<.<", ", '..a', '..a.a', '.a..a', '.a.a', 'a..a', 'a.a.a'"}, + {1, "<.<.", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a..a', 'a.a', 'a.a.a'"}, + {1, ".<.<", ", '..a', '..a.a', '.a..a', '.a.a'"}, + {1, "<.<", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a..a', 'a.a', 'a.a.a'"}, + {1, ".<", ", '.', '..', '.a', '.aaa'"}, + {1, "<.", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, + {1, "<", ", '.', '..', '..a', '.a', '.aaa', 'a', 'aa', 'aaa', 'aaaa'"}, + {1, "<..<", ", '..a', '.a..a', 'a..a'"}, + {1, "<..", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, + {1, ".<.", ", '.', '..', '.a', '.aaa'"}, + {1, "..<", ", '..a'"}, + {1, "<<", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, + {1, "<<.", ", '.', '..', '..a', '..a.a', '.a', '.a..a', '.a.a', '.aaa', 'a', 'a..a', 'a.a', 'a.a.a', 'aa', 'aaa', 'aaaa'"}, + {1, "<. ", ", '.', '..', '..a', '.a', '.aaa', 'a', 'aa', 'aaa', 'aaaa'"}, + {1, "< .", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, + {1, "< . ", ", '.', '..', '..a', '.a', '.aaa', 'a', 'aa', 'aaa', 'aaaa'"}, + {1, "<.. ", ", '.', '..', '..a', '.a', '.aaa', 'a', 'aa', 'aaa', 'aaaa'"}, + {1, "<. .", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, + {1, "< ..", ", '.', '..', 'a', '.a', '..a', 'aa', 'aaa', 'aaaa', '.aaa'"}, + {0, " <..", ""}, + {1, "..< ", ", '..a'"}, + {1, "?", ", '.', '..', 'a'"}, {1, "?.", ", '.', '..', 'a'"}, {1, "?. ", ", '.', '..', 'a'"}, {1, "??.", ", '.', '..', 'a', 'aa'"}, {1, "??. ", ", '.', '..', 'a', 'aa'"}, {1, "???.", ", '.', '..', 'a', 'aa', 'aaa'"}, - {1, "?.??.", ", '.', '..', '.a', 'a', 'a.a'"} + {1, "?.??.", ", '.', '..', '.a', 'a', 'a.a'"}, + + {1, ">", ", '.', '..', 'a'"}, + {1, ">.", ", '.', '..', 'a'"}, + {1, ">. ", ", '.', '..', 'a'"}, + {1, ">>.", ", '.', '..', 'a', 'aa'"}, + {1, ">>. ", ", '.', '..', 'a', 'aa'"}, + {1, ">>>.", ", '.', '..', 'a', 'aa', 'aaa'"}, + {1, ">.>>.", ", '.', '..', '.a', 'a.a'"}, }; CreateDirectoryA("test-dir", NULL);

1 0