November 2020 - Wine-Devel - list.winehq.org

Re: [PATCH 1/5] winegstreamer: Implement IMFMediaSource::GetCharacteristics.

by Nikolay Sivov

On 11/2/20 7:26 PM, Derek Lesho wrote: > Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> > --- > dlls/winegstreamer/media_source.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c > index dbc656a24da..913b1cc9e93 100644 > --- a/dlls/winegstreamer/media_source.c > +++ b/dlls/winegstreamer/media_source.c > @@ -1032,12 +1032,14 @@ static HRESULT WINAPI media_source_GetCharacteristics(IMFMediaSource *iface, DWO > { > struct media_source *source = impl_from_IMFMediaSource(iface); > > - FIXME("(%p)->(%p): stub\n", source, characteristics); > + TRACE("(%p)->(%p)\n", source, characteristics); > > if (source->state == SOURCE_SHUTDOWN) > return MF_E_SHUTDOWN; > > - return E_NOTIMPL; > + *characteristics = MFMEDIASOURCE_CAN_SEEK; > + > + return S_OK; > } > > static HRESULT WINAPI media_source_CreatePresentationDescriptor(IMFMediaSource *iface, IMFPresentationDescriptor **descriptor) I think if the choice is between 0 and CAN_SEEK, it should consider MFBYTESTREAM_IS_SEEKABLE. Unless of course if winegstreamer code currently won't work for non-seekable bytestreams at all.

Nov. 2, 2020

[PATCH 5/5] winegstreamer: Add IMFSeekInfo::GetNearestKeyFrames stub.

by Derek Lesho

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 111 ++++++++++++++++++++++++++++++ 1 file changed, 111 insertions(+) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 62cee6880fd..ffc36de115b 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -91,6 +91,8 @@ struct source_async_command struct media_source { IMFMediaSource IMFMediaSource_iface; + IMFGetService IMFGetService_iface; + IMFSeekInfo IMFSeekInfo_iface; IMFAsyncCallback async_commands_callback; LONG ref; DWORD async_commands_queue; @@ -123,6 +125,16 @@ static inline struct media_source *impl_from_IMFMediaSource(IMFMediaSource *ifac return CONTAINING_RECORD(iface, struct media_source, IMFMediaSource_iface); } +static inline struct media_source *impl_from_IMFGetService(IMFGetService *iface) +{ + return CONTAINING_RECORD(iface, struct media_source, IMFGetService_iface); +} + +static inline struct media_source *impl_from_IMFSeekInfo(IMFSeekInfo *iface) +{ + return CONTAINING_RECORD(iface, struct media_source, IMFSeekInfo_iface); +} + static inline struct media_source *impl_from_async_commands_callback_IMFAsyncCallback(IMFAsyncCallback *iface) { return CONTAINING_RECORD(iface, struct media_source, async_commands_callback); @@ -956,6 +968,10 @@ static HRESULT WINAPI media_source_QueryInterface(IMFMediaSource *iface, REFIID { *out = &source->IMFMediaSource_iface; } + else if(IsEqualIID(riid, &IID_IMFGetService)) + { + *out = &source->IMFGetService_iface; + } else { FIXME("(%s, %p)\n", debugstr_guid(riid), out); @@ -1185,6 +1201,99 @@ static const IMFMediaSourceVtbl IMFMediaSource_vtbl = media_source_Shutdown, }; +static HRESULT WINAPI source_get_service_QueryInterface(IMFGetService *iface, REFIID riid, void **obj) +{ + struct media_source *source = impl_from_IMFGetService(iface); + return IMFMediaSource_QueryInterface(&source->IMFMediaSource_iface, riid, obj); +} + +static ULONG WINAPI source_get_service_AddRef(IMFGetService *iface) +{ + struct media_source *source = impl_from_IMFGetService(iface); + return IMFMediaSource_AddRef(&source->IMFMediaSource_iface); +} + +static ULONG WINAPI source_get_service_Release(IMFGetService *iface) +{ + struct media_source *source = impl_from_IMFGetService(iface); + return IMFMediaSource_Release(&source->IMFMediaSource_iface); +} + +static HRESULT WINAPI source_get_service_GetService(IMFGetService *iface, REFGUID service, REFIID riid, void **obj) +{ + struct media_source *source = impl_from_IMFGetService(iface); + + TRACE("(%p)->(%s, %s, %p)\n", source, debugstr_guid(service), debugstr_guid(riid), obj); + + if (source->state == SOURCE_SHUTDOWN) + return MF_E_SHUTDOWN; + + *obj = NULL; + + if (IsEqualIID(service, &MF_SCRUBBING_SERVICE)) + { + if (IsEqualIID(riid, &IID_IMFSeekInfo)) + { + *obj = &source->IMFSeekInfo_iface; + } + } + + if (*obj) + IUnknown_AddRef((IUnknown*) *obj); + + return *obj ? S_OK : E_NOINTERFACE; +} + +static const IMFGetServiceVtbl IMFGetService_vtbl = +{ + source_get_service_QueryInterface, + source_get_service_AddRef, + source_get_service_Release, + source_get_service_GetService, +}; + +static HRESULT WINAPI source_seek_info_QueryInterface(IMFSeekInfo *iface, REFIID riid, void **obj) +{ + struct media_source *source = impl_from_IMFSeekInfo(iface); + return IMFMediaSource_QueryInterface(&source->IMFMediaSource_iface, riid, obj); +} + +static ULONG WINAPI source_seek_info_AddRef(IMFSeekInfo *iface) +{ + struct media_source *source = impl_from_IMFSeekInfo(iface); + return IMFMediaSource_AddRef(&source->IMFMediaSource_iface); +} + +static ULONG WINAPI source_seek_info_Release(IMFSeekInfo *iface) +{ + struct media_source *source = impl_from_IMFSeekInfo(iface); + return IMFMediaSource_Release(&source->IMFMediaSource_iface); +} + +static HRESULT WINAPI source_seek_info_GetNearestKeyFrames(IMFSeekInfo *iface, const GUID *format, + const PROPVARIANT *position, PROPVARIANT *prev_frame, PROPVARIANT *next_frame) +{ + struct media_source *source = impl_from_IMFSeekInfo(iface); + + FIXME("(%p)->(%s, %p, %p, %p) - semi-stub\n", source, debugstr_guid(format), position, prev_frame, next_frame); + + if (source->state == SOURCE_SHUTDOWN) + return MF_E_SHUTDOWN; + + PropVariantCopy(prev_frame, position); + PropVariantCopy(next_frame, position); + + return S_OK; +} + +static const IMFSeekInfoVtbl IMFSeekInfo_vtbl = +{ + source_seek_info_QueryInterface, + source_seek_info_AddRef, + source_seek_info_Release, + source_seek_info_GetNearestKeyFrames, +}; + static void stream_added(GstElement *element, GstPad *pad, gpointer user) { struct media_source *source = user; @@ -1247,6 +1356,8 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ return E_OUTOFMEMORY; object->IMFMediaSource_iface.lpVtbl = &IMFMediaSource_vtbl; + object->IMFGetService_iface.lpVtbl = &IMFGetService_vtbl; + object->IMFSeekInfo_iface.lpVtbl = &IMFSeekInfo_vtbl; object->async_commands_callback.lpVtbl = &source_async_commands_callback_vtbl; object->ref = 1; object->byte_stream = bytestream; -- 2.28.0

Nov. 2, 2020

[PATCH 4/5] winegstreamer: Set MF_PD_MIME_TYPE on source's presentation descriptor.

by Derek Lesho

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index b7f3e6c2946..62cee6880fd 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1237,6 +1237,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ struct media_source *object = heap_alloc_zero(sizeof(*object)); IMFStreamDescriptor **descriptors = NULL; + IMFAttributes *byte_stream_attributes; gint64 total_pres_time = 0; unsigned int i; HRESULT hr; @@ -1370,6 +1371,18 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ if (object->stream_count) IMFPresentationDescriptor_SetUINT64(object->pres_desc, &MF_PD_DURATION, total_pres_time / 100); + if (SUCCEEDED(IMFByteStream_QueryInterface(object->byte_stream, &IID_IMFAttributes, (void **)&byte_stream_attributes))) + { + WCHAR *mimeW = NULL; + DWORD length; + if (SUCCEEDED(IMFAttributes_GetAllocatedString(byte_stream_attributes, &MF_BYTESTREAM_CONTENT_TYPE, &mimeW, &length))) + { + IMFPresentationDescriptor_SetString(object->pres_desc, &MF_PD_MIME_TYPE, mimeW); + CoTaskMemFree(mimeW); + } + IMFAttributes_Release(byte_stream_attributes); + } + object->state = SOURCE_STOPPED; *out_media_source = object; -- 2.28.0

Nov. 2, 2020

[PATCH 3/5] winegstreamer: Set MF_PD_DURATION on source's presentation descriptor.

by Derek Lesho

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 41a738525ca..b7f3e6c2946 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1237,6 +1237,7 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ struct media_source *object = heap_alloc_zero(sizeof(*object)); IMFStreamDescriptor **descriptors = NULL; + gint64 total_pres_time = 0; unsigned int i; HRESULT hr; int ret; @@ -1347,6 +1348,28 @@ static HRESULT media_source_constructor(IMFByteStream *bytestream, struct media_ heap_free(descriptors); descriptors = NULL; + for (unsigned int i = 0; i < object->stream_count; i++) + { + GstQuery *query = gst_query_new_duration(GST_FORMAT_TIME); + if (gst_pad_query(object->streams[i]->their_src, query)) + { + gint64 stream_pres_time; + gst_query_parse_duration(query, NULL, &stream_pres_time); + + TRACE("Stream %u has duration %llu\n", i, (unsigned long long int) stream_pres_time); + + if (stream_pres_time > total_pres_time) + total_pres_time = stream_pres_time; + } + else + { + WARN("Unable to get presentation time of stream %u\n", i); + } + } + + if (object->stream_count) + IMFPresentationDescriptor_SetUINT64(object->pres_desc, &MF_PD_DURATION, total_pres_time / 100); + object->state = SOURCE_STOPPED; *out_media_source = object; -- 2.28.0

Nov. 2, 2020

[PATCH 2/5] winegstreamer: Implement IMFMedisStream::GetMediaSource.

by Derek Lesho

--- dlls/winegstreamer/media_source.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 913b1cc9e93..41a738525ca 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -681,12 +681,15 @@ static HRESULT WINAPI media_stream_GetMediaSource(IMFMediaStream *iface, IMFMedi { struct media_stream *stream = impl_from_IMFMediaStream(iface); - FIXME("stub (%p)->(%p)\n", stream, source); + TRACE("(%p)->(%p)\n", stream, source); if (stream->state == STREAM_SHUTDOWN) return MF_E_SHUTDOWN; - return E_NOTIMPL; + IMFMediaSource_AddRef(&stream->parent_source->IMFMediaSource_iface); + *source = &stream->parent_source->IMFMediaSource_iface; + + return S_OK; } static HRESULT WINAPI media_stream_GetStreamDescriptor(IMFMediaStream* iface, IMFStreamDescriptor **descriptor) -- 2.28.0

Nov. 2, 2020

[PATCH 1/5] winegstreamer: Implement IMFMediaSource::GetCharacteristics.

by Derek Lesho

Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index dbc656a24da..913b1cc9e93 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -1032,12 +1032,14 @@ static HRESULT WINAPI media_source_GetCharacteristics(IMFMediaSource *iface, DWO { struct media_source *source = impl_from_IMFMediaSource(iface); - FIXME("(%p)->(%p): stub\n", source, characteristics); + TRACE("(%p)->(%p)\n", source, characteristics); if (source->state == SOURCE_SHUTDOWN) return MF_E_SHUTDOWN; - return E_NOTIMPL; + *characteristics = MFMEDIASOURCE_CAN_SEEK; + + return S_OK; } static HRESULT WINAPI media_source_CreatePresentationDescriptor(IMFMediaSource *iface, IMFPresentationDescriptor **descriptor) -- 2.28.0

Nov. 2, 2020

[PATCH] kernelbase: Add rudimentary mui resource support to loader.c

by Craig Schulstad

Signed-off-by: Craig Schulstad <craigaschulstad(a)gmail.com> --- dlls/kernelbase/loader.c | 169 +++++++++++++++++++++++++++++++++++++-- 1 file changed, 164 insertions(+), 5 deletions(-) diff --git a/dlls/kernelbase/loader.c b/dlls/kernelbase/loader.c index fc9b0ce0083..0fbe9bcd9e8 100644 --- a/dlls/kernelbase/loader.c +++ b/dlls/kernelbase/loader.c @@ -48,6 +48,9 @@ struct exclusive_datafile }; static struct list exclusive_datafile_list = LIST_INIT( exclusive_datafile_list ); +static WCHAR mui_locale[LOCALE_NAME_MAX_LENGTH]; +static BOOL locale_found = 0; +static BOOL recursion_flag = 0; /*********************************************************************** * Modules @@ -1011,11 +1014,122 @@ BOOL WINAPI DECLSPEC_HOTPATCH EnumResourceTypesExW( HMODULE module, ENUMRESTYPEP return ret; } +/***********************************************************************/ +/* get_mui - Acquire an MUI module for the associated resource */ +/***********************************************************************/ + +HMODULE get_mui(HMODULE module) + +{ + + HMODULE mui_module = NULL; + + WCHAR module_name[MAX_PATH], mui_name[MAX_PATH]; + + INT i, j, k, l; + + /* Initialize the work strings */ + + for (i = 0; i < MAX_PATH; i++) { + module_name[i] = 0; + mui_name[i] = 0; + } + + /* Note - the reference to the Windows file name for an "MUI" file has a structure such as */ + /* "C:\Program Files\Application Directory\xx-XX\Application.exe.mui"; however, in testing */ + /* out the usage of the "GetModuleFileNameW" function, it was determined that it works with */ + /* a relative Linux file structure such as "xx-XX/Application.exe.mui". */ + + /* Acquire the base resource file name */ + + if (!(GetModuleFileNameW(module, module_name, MAX_PATH))) return module; + + /* Stay with the original module reference if this file is not an executable file. */ + + if (!(wcsstr(module_name, L".exe"))) return module; + + /* Acquire the locale name using LCIDToLocaleName. Since this function utilizes the FindResourceExW function, this */ + /* sets up a recursive call to this function. In order to avoid a stack overflow condition that would be caused by */ + /* repeated calls, a flag will be set on to return back to the FindResourceExW function without again calling the */ + /* locale acquisition function. */ + + if (!(locale_found)) { + + if (recursion_flag) return module; + + recursion_flag = 1; + + LCIDToLocaleName( GetUserDefaultLCID(), mui_locale, LOCALE_NAME_MAX_LENGTH, 0 ); + + recursion_flag = 0; + + locale_found = 1; + + } + + /* Locate the position of the final backslash in the retrieved executable file. */ + + j = 0; + + for (i = 0; i < MAX_PATH; i++) { + + if (module_name[i] == 0) break; + + if (module_name[i] == '\\') j = i; + } + + /* Set up the work index that will be used to extract just the executable file from the fully qualified file name. */ + + k = 0; + + for (i = 0; i < MAX_PATH; i++) { + + if (module_name[i] == 0) break; + + /* If work index "j" has been set to -1, then the file portion of the qualified name has been reached and will */ + /* be copied to the "MUI" file reference. */ + + if (j < 0) { + mui_name[k] = module_name[i]; + k++; + } + + /* When the position of the final backslash has been reached, add the locale name as the folder/directory */ + /* containing the "MUI" file and reset work index "j" to -1. */ + + if (i >= j && j > 0) { + for (l = 0; l < 5; l++) { + mui_name[k] = mui_locale[l]; + k++; + } + mui_name[k] = '/'; + k++; + j = -1; + } + } + + /* Finally, append the literal ".mui" onto the file reference. */ + + wcscat(mui_name, L".mui"); + + /* Now, see if there is an associated "MUI" file and if so use its handle for the module handle. */ + + mui_module = LoadLibraryExW(mui_name, 0, 0); + + if (mui_module) { + return mui_module; + } else { + return module; + } + +} + +/***********************************************************************/ +/* get_res_handle - Isolated call of the LdrFindResource function */ +/***********************************************************************/ + +HRSRC get_res_handle(HMODULE module, LPCWSTR type, LPCWSTR name, WORD lang) -/********************************************************************** - * FindResourceExW (kernelbase.@) - */ -HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LPCWSTR name, WORD lang ) { NTSTATUS status; UNICODE_STRING nameW, typeW; @@ -1024,7 +1138,6 @@ HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LP TRACE( "%p %s %s %04x\n", module, debugstr_w(type), debugstr_w(name), lang ); - if (!module) module = GetModuleHandleW( 0 ); nameW.Buffer = typeW.Buffer = NULL; __TRY @@ -1046,7 +1159,41 @@ HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LP if (!IS_INTRESOURCE(nameW.Buffer)) HeapFree( GetProcessHeap(), 0, nameW.Buffer ); if (!IS_INTRESOURCE(typeW.Buffer)) HeapFree( GetProcessHeap(), 0, typeW.Buffer ); + return (HRSRC)entry; + +} + +/********************************************************************** + * FindResourceExW (kernelbase.@) + */ +HRSRC WINAPI DECLSPEC_HOTPATCH FindResourceExW( HMODULE module, LPCWSTR type, LPCWSTR name, WORD lang ) +{ + + HRSRC rsrc; + + TRACE( "%p %s %s %04x\n", module, debugstr_w(type), debugstr_w(name), lang ); + + if (!module) module = GetModuleHandleW( 0 ); + + rsrc = get_res_handle(module, type, name, lang); + + if (rsrc) { + + return rsrc; + + } else { + + /* If a resource retrieval failed using the initial module value, attempt to */ + /* locate an associated MUI file and retry the resource retrieval. */ + + module = get_mui(module); + + rsrc = get_res_handle(module, type, name, lang); + + return rsrc; + + } } @@ -1074,11 +1221,23 @@ BOOL WINAPI DECLSPEC_HOTPATCH FreeResource( HGLOBAL handle ) HGLOBAL WINAPI DECLSPEC_HOTPATCH LoadResource( HINSTANCE module, HRSRC rsrc ) { void *ret; + HMODULE mui_module = NULL; TRACE( "%p %p\n", module, rsrc ); if (!rsrc) return 0; if (!module) module = GetModuleHandleW( 0 ); + + + /* Only check for an MUI reference if the resource handle value is less than the module value, */ + /* or if an MUI reference was found and the MUI reference and handle value are larger than the */ + /* module value for the executable file. That is a signal that the resource handle is to be */ + /* associated with the MUI file instead of the executable file. */ + + mui_module = get_mui(module); + + if (((HMODULE)rsrc < module) || ((mui_module > module) && ((HMODULE)rsrc > mui_module))) module = mui_module; + if (!set_ntstatus( LdrAccessResource( module, (IMAGE_RESOURCE_DATA_ENTRY *)rsrc, &ret, NULL ))) return 0; return ret; -- 2.17.1

Nov. 2, 2020

Re: [PATCH] winevulkan: Enable VK_EXT_validation_features and VK_EXT_validation_flags.

by Liam Middlebrook

I think this makes sense. Looking back through history in Git it appears that these lines were introduced when the list was inverted from explicitly supporting, to explicitly forbidding, extensions. It's probably the case that there wasn't explicitly a reason to forbid these extensions, but rather a lack of motivation to support them. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> On 10/31/20 1:12 PM, Georg Lehmann wrote: > I don't see a reason why this should be explicitly unsupported. > We can pass it through to the host validation layers. > > Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> > --- > dlls/winevulkan/make_vulkan | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan > index 72b0adf0c97..2ef44338d40 100755 > --- a/dlls/winevulkan/make_vulkan > +++ b/dlls/winevulkan/make_vulkan > @@ -86,8 +86,6 @@ EXT_BLOCK_SIZE = 1000 > > UNSUPPORTED_EXTENSIONS = [ > # Instance extensions > - "VK_EXT_validation_features", > - "VK_EXT_validation_flags", > "VK_KHR_display", # Needs WSI work. > "VK_KHR_surface_protected_capabilities", > >

Nov. 2, 2020

Re: [PATCH 1/2] msvcrt/tests: Add scanf tests for leading and trailing dash in scanset.

by Piotr Caban

Hi Will, I have sent simplified version of your patch as v4. Thanks, Piotr On 10/31/20 7:13 PM, Will Mainio wrote: > Never mind that, it was simple enough for me to implement. > I submitted a v3 that can handle dashes in any location. > > Cheers > > On Fri, Oct 30, 2020, at 6:54 PM, Will Mainio wrote: >> Hi Piotr, >> >> unfortunately I am not very familiar with C so I can't implement that >> but I can add tests with dashes in various locations. >> Should that go into a v3 or into a separate patch? >> >> Cheers >> >> On Fri, Oct 30, 2020, at 1:45 PM, Piotr Caban wrote: >>> Hi Will, >>> >>> There are more problems with current implementation. The '-' character >>> can be also added to the set if it's not defining a range even if it's >>> not the first or last character. You can see it running following test: >>> sscanf("123", "%[1-2-4]s", buf); >>> This format will look for 1-2 range, '-' character and '4' (not for 1-2 >>> range and 2-4 range). >>> >>> Thanks, >>> Piotr >>> >>> On 10/30/20 1:23 PM, Will Mainio wrote: >>>> Hi Gijs, >>>> >>>> I will reorder the patches and submit a v2. Thanks for the heads up. >>>> >>>> Cheers >>>> >>>> On Fri, Oct 30, 2020, at 1:00 PM, Gijs Vermeulen wrote: >>>>> Hi Will, >>>>> >>>>> You will either need to reorder your patches or add todo_wine to the ok()'s that are supposed to fail and remove them in your second patch. >>>>> >>>>> Kind regards, >>>>> Gijs >>>>> >>>>> >>>>> On Fri, Oct 30, 2020, 12:39 Will Mainio <will.mainio(a)fastmail.com> wrote: >>>>>> Signed-off-by: Will Mainio <will.mainio(a)fastmail.com> >>>>>> --- >>>>>> dlls/msvcrt/tests/scanf.c | 8 ++++++++ >>>>>> 1 file changed, 8 insertions(+) >>>>>> >>>>>> diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c >>>>>> index 57d9cc0ba12..4b878e6d64e 100644 >>>>>> --- a/dlls/msvcrt/tests/scanf.c >>>>>> +++ b/dlls/msvcrt/tests/scanf.c >>>>>> @@ -186,6 +186,14 @@ static void test_sscanf( void ) >>>>>> ok( ret == 1, "Error with format \"%s\"\n","%*[a-cd-dg-e]%c"); >>>>>> ok( buffer[0] == 'h', "Error with \"abcefgdh\" \"%c\"\n", buffer[0]); >>>>>> >>>>>> + ret = p_sscanf("-123","%[-0-9]s",buffer); >>>>>> + ok( ret == 1, "Error with format \"%s\"\n","%[-0-9]s"); >>>>>> + ok( strncmp("-123",buffer,strlen(buffer)) == 0, "Error with \"-123\" \"%s\"\n",buffer); >>>>>> + >>>>>> + ret = p_sscanf("-321","%[0-9-]s",buffer); >>>>>> + ok( ret == 1, "Error with format \"%s\"\n","%[0-9-]s"); >>>>>> + ok( strncmp("-321",buffer,strlen(buffer)) == 0, "Error with \"-321\" \"%s\"\n",buffer); >>>>>> + >>>>>> buffer1[0] = 'b'; >>>>>> ret = p_sscanf("a","%s%s", buffer, buffer1); >>>>>> ok( ret == 1, "expected 1, got %u\n", ret); >>>>>> -- >>>>>> 2.28.0 >>>>>> >>>>>> >>>> >>> >>> >> >>

Nov. 2, 2020

[PATCH 2/2 v4] msvcrt/tests: Add scanf tests for dashes in scanset.

by Piotr Caban

From: Will Mainio <will.mainio(a)fastmail.com> Signed-off-by: Will Mainio <will.mainio(a)fastmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/msvcrt/tests/scanf.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)

Nov. 2, 2020