February 2021 - Wine-commits

Zebediah Figura : winegstreamer: Move the "mutex" field to struct wg_parser.
by Alexandre Julliard 03 Feb '21

03 Feb '21

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 : winegstreamer: Move the "segment" field of struct parser_source to a new "wg_parser_stream" object.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: 457f3a96c27d45253d7d1cbc54889cd2f32d93f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=457f3a96c27d45253d7d1cbc… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 2 18:11:18 2021 -0600 winegstreamer: Move the "segment" field of struct parser_source to a new "wg_parser_stream" object. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/gstdemux.c | 36 ++++++++++++++++++++++++++++-------- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 9f733396d92..b8038af0524 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -74,6 +74,11 @@ struct wg_parser bool flushing, sink_connected; }; +struct wg_parser_stream +{ + GstSegment *segment; +}; + struct parser { struct strmbase_filter filter; @@ -131,9 +136,10 @@ struct parser_source struct strmbase_source pin; IQualityControl IQualityControl_iface; + struct wg_parser_stream *wg_stream; + GstPad *their_src, *post_sink, *post_src, *my_sink; GstElement *flip; - GstSegment *segment; GstCaps *caps; SourceSeeking seek; @@ -733,6 +739,7 @@ static GstFlowReturn queue_stream_event(struct parser_source *pin, const struct static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) { struct parser_source *pin = gst_pad_get_element_private(pad); + struct wg_parser_stream *stream = pin->wg_stream; struct parser *filter = impl_from_strmbase_filter(pin->pin.pin.filter); struct wg_parser *parser = filter->wg_parser; @@ -754,7 +761,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) break; } - gst_segment_copy_into(segment, pin->segment); + gst_segment_copy_into(segment, stream->segment); stream_event.type = PARSER_EVENT_SEGMENT; stream_event.u.segment.position = segment->position / 100; @@ -807,7 +814,7 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) break; case GST_EVENT_FLUSH_STOP: - gst_segment_init(pin->segment, GST_FORMAT_TIME); + gst_segment_init(stream->segment, GST_FORMAT_TIME); if (pin->pin.pin.peer) { pthread_mutex_lock(&parser->mutex); @@ -913,6 +920,7 @@ static GstFlowReturn got_data_sink(GstPad *pad, GstObject *parent, GstBuffer *bu static HRESULT send_sample(struct parser_source *pin, IMediaSample *sample, GstBuffer *buf, GstMapInfo *info, gsize offset, gsize size, DWORD bytes_per_second) { + struct wg_parser_stream *stream = pin->wg_stream; HRESULT hr; BYTE *ptr = NULL; @@ -931,7 +939,7 @@ static HRESULT send_sample(struct parser_source *pin, IMediaSample *sample, GstClockTime ptsStart = buf->pts; if (offset > 0) ptsStart = buf->pts + gst_util_uint64_scale(offset, GST_SECOND, bytes_per_second); - rtStart = gst_segment_to_running_time(pin->segment, GST_FORMAT_TIME, ptsStart); + rtStart = gst_segment_to_running_time(stream->segment, GST_FORMAT_TIME, ptsStart); if (rtStart >= 0) rtStart /= 100; @@ -944,7 +952,7 @@ static HRESULT send_sample(struct parser_source *pin, IMediaSample *sample, ptsStop = buf->pts + gst_util_uint64_scale(offset + size, GST_SECOND, bytes_per_second); tStart = ptsStart / 100; tStop = ptsStop / 100; - rtStop = gst_segment_to_running_time(pin->segment, GST_FORMAT_TIME, ptsStop); + rtStop = gst_segment_to_running_time(stream->segment, GST_FORMAT_TIME, ptsStop); if (rtStop >= 0) rtStop /= 100; TRACE("Current time on %p: %i to %i ms\n", pin, (int)(rtStart / 10000), (int)(rtStop / 10000)); @@ -2426,6 +2434,8 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, static void free_source_pin(struct parser_source *pin) { + struct wg_parser_stream *stream = pin->wg_stream; + if (pin->pin.pin.peer) { if (SUCCEEDED(IMemAllocator_Decommit(pin->pin.pAllocator))) @@ -2448,11 +2458,13 @@ static void free_source_pin(struct parser_source *pin) gst_object_unref(pin->their_src); } gst_object_unref(pin->my_sink); - gst_segment_free(pin->segment); + gst_segment_free(stream->segment); pthread_cond_destroy(&pin->event_cond); pthread_cond_destroy(&pin->event_empty_cond); + free(stream); + pin->flushing_cs.DebugInfo->Spare[0] = 0; DeleteCriticalSection(&pin->flushing_cs); @@ -2474,6 +2486,7 @@ static const struct strmbase_source_ops source_ops = static struct parser_source *create_pin(struct parser *filter, const WCHAR *name) { struct parser_source *pin, **new_array; + struct wg_parser_stream *stream; char pad_name[19]; if (!(new_array = heap_realloc(filter->sources, (filter->source_count + 1) * sizeof(*new_array)))) @@ -2483,9 +2496,16 @@ static struct parser_source *create_pin(struct parser *filter, const WCHAR *name if (!(pin = heap_alloc_zero(sizeof(*pin)))) return NULL; + if (!(stream = calloc(1, sizeof(*stream)))) + { + heap_free(pin); + return NULL; + } + pin->wg_stream = stream; + strmbase_source_init(&pin->pin, &filter->filter, name, &source_ops); - pin->segment = gst_segment_new(); - gst_segment_init(pin->segment, GST_FORMAT_TIME); + stream->segment = gst_segment_new(); + gst_segment_init(stream->segment, GST_FORMAT_TIME); pin->IQualityControl_iface.lpVtbl = &GSTOutPin_QualityControl_Vtbl; strmbase_seeking_init(&pin->seek, &GST_Seeking_Vtbl, GST_ChangeStop, GST_ChangeCurrent, GST_ChangeRate);

1 0

Zebediah Figura : winegstreamer: Move the GstPad fields to struct wg_parser_stream.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: b00e25a2e8334e43f9380c7cba5539270cc1b233 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b00e25a2e8334e43f9380c7c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 2 18:11:19 2021 -0600 winegstreamer: Move the GstPad fields 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 | 115 +++++++++++++++++++++++------------------- 1 file changed, 63 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b00e25a2e8334e43f938…

1 0

Zebediah Figura : winegstreamer: Move the "flip" field to struct wg_parser_stream.
by Alexandre Julliard 03 Feb '21

03 Feb '21

Module: wine Branch: master Commit: c6d85fc2178094840a5ea2cd4823c7b68e48e473 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c6d85fc2178094840a5ea2cd… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 2 18:11:20 2021 -0600 winegstreamer: Move the "flip" 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index 5277a9fa3b9..728977f2bb5 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -77,6 +77,7 @@ struct wg_parser struct wg_parser_stream { GstPad *their_src, *post_sink, *post_src, *my_sink; + GstElement *flip; GstSegment *segment; }; @@ -139,7 +140,6 @@ struct parser_source struct wg_parser_stream *wg_stream; - GstElement *flip; GstCaps *caps; SourceSeeking seek; @@ -1335,7 +1335,7 @@ static void init_new_decoded_pad(GstElement *bin, GstPad *pad, struct parser *Th stream->post_sink = gst_element_get_static_pad(deinterlace, "sink"); stream->post_src = gst_element_get_static_pad(vconv2, "src"); - pin->flip = flip; + stream->flip = flip; } else if (!strcmp(typename, "audio/x-raw")) { @@ -2417,7 +2417,7 @@ static HRESULT WINAPI GSTOutPin_DecideBufferSize(struct strmbase_source *iface, VIDEOINFOHEADER *format = (VIDEOINFOHEADER *)pin->pin.pin.mt.pbFormat; buffer_size = format->bmiHeader.biSizeImage; - gst_util_set_object_arg(G_OBJECT(pin->flip), "method", + gst_util_set_object_arg(G_OBJECT(stream->flip), "method", (format->bmiHeader.biCompression == BI_RGB || format->bmiHeader.biCompression == BI_BITFIELDS) ? "vertical-flip" : "none"); }

1 0

Zebediah Figura : winegstreamer: Move the "caps" field to struct wg_parser_stream.
by Alexandre Julliard 03 Feb '21

03 Feb '21

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 03 Feb '21

03 Feb '21

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/tests: Check the alternate NT path only if it is present.
by Alexandre Julliard 03 Feb '21

03 Feb '21

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

Zebediah Figura : ntdll/tests: Add more tests for RtlDosPathNameToNtPathName_U().
by Alexandre Julliard 03 Feb '21

03 Feb '21

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 : kernel32/tests: Add some more tests for wildcards.
by Alexandre Julliard 03 Feb '21

03 Feb '21

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

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

03 Feb '21

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