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

[PATCH] winevulkan: Enable VK_EXT_validation_features and VK_EXT_validation_flags.

by Georg Lehmann

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", -- 2.29.2

Oct. 31, 2020

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

by Will Mainio

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

Oct. 31, 2020

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

by Will Mainio

Signed-off-by: Will Mainio <will.mainio(a)fastmail.com> --- dlls/msvcrt/tests/scanf.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/msvcrt/tests/scanf.c b/dlls/msvcrt/tests/scanf.c index 57d9cc0ba12..1499e571db2 100644 --- a/dlls/msvcrt/tests/scanf.c +++ b/dlls/msvcrt/tests/scanf.c @@ -186,6 +186,22 @@ 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); + + ret = p_sscanf("-4123","%[1-2-4]s",buffer); + ok( ret == 1, "Error with format \"%s\"\n","%[1-2-4]s"); + ok( strncmp("-412",buffer,strlen(buffer)) == 0, "Error with \"-412\" \"%s\"\n",buffer); + + ret = p_sscanf("-456123","%[1-2-45-6]s",buffer); + ok( ret == 1, "Error with format \"%s\"\n","%[1-2-45-6]s"); + ok( strncmp("-45612",buffer,strlen(buffer)) == 0, "Error with \"-45612\" \"%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

Oct. 31, 2020

[PATCH v3 1/2] msvcrt: Fix scanf with dashes in scanset.

by Will Mainio

Signed-off-by: Will Mainio <will.mainio(a)fastmail.com> --- dlls/msvcrt/scanf.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 3b4686c1107..44cb0faa87e 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -615,6 +615,7 @@ _FUNCTION_ { _CHAR_ *sptr = str; RTL_BITMAP bitMask; ULONG *Mask; + VOID *scansetLastRangeEnd; int invert = 0; /* Set if we are NOT to find the chars */ #ifdef SECURE unsigned size = suppress ? UINT_MAX : va_arg(ap, unsigned); @@ -636,15 +637,17 @@ _FUNCTION_ { RtlSetBits(&bitMask, ']', 1); format++; } + scansetLastRangeEnd = (VOID *)(format - 1); while(*format && (*format != ']')) { /* According to msdn: * "Note that %[a-z] and %[z-a] are interpreted as equivalent to %[abcde...z]." */ - if((*format == '-') && (*(format + 1) != ']')) { + if((*format == '-') && ((VOID *)(format - 1) > scansetLastRangeEnd) && (*(format + 1) != ']')) { if ((*(format - 1)) < *(format + 1)) RtlSetBits(&bitMask, *(format - 1) +1 , *(format + 1) - *(format - 1)); else RtlSetBits(&bitMask, *(format + 1) , *(format - 1) - *(format + 1)); format++; + scansetLastRangeEnd = (VOID *)format; } else RtlSetBits(&bitMask, *format, 1); format++; -- 2.28.0

Oct. 31, 2020

Announcing GSoC 2021 with a few changes

by André Hentschel

Hi! So next years GSoC will be different and I hope it might be good for Wine. We had some years with less students and especially less good proposals. What changes [1]: The project size is cut in half, instead of 350 hours per project it'll be 175 hours, thus the student stipend is also cut in half. 2 ealuations instead of 3, but students are not required to pass the first one, they can fail it and still can try to pass the second one. The coding period will be 10 weeks and mentors can agree with students on how to spread the work time across those weeks. This should help with finals or other commitments. Eligibility: "we will be allowing students who are 18 years old AND currently enrolled (or accepted into) a post-secondary academic program as of May 17, 2021 or have graduated from a post-secondary academic program between December 1, 2020 and May 17, 2021 to apply to the GSoC program. What this means is that now the program will be open to folks participating in a variety of different academic programs, not just accredited university programs. This includes licensed coding camps, community colleges, and many other programs that may not be accredited yet but are post-secondary academic programs." Program timeline: [2] Marketing material: [3] FAQs: [4] short videos with tips for mentors and students: [5] What that means is that I ask everyone to go over our ideas list and adjust to the reduced project size. I realize that this might kick out quite some projects, but I also think it can attract more good students. If you are a student reading this, feel free to start discussing your idea on the wine-devel mailing list [6] or the #winehackers IRC channel at freenode.net [7] [1] https://opensource.googleblog.com/2020/10/google-summer-of-code-2021-is-bri… [2] https://developers.google.com/open-source/gsoc/timeline [3] https://developers.google.com/open-source/gsoc/resources/marketing [4] https://developers.google.com/open-source/gsoc/faq [5] https://developers.google.com/open-source/gsoc/videos [6] https://www.winehq.org/forums [7] irc://irc.freenode.net/#winehackers

Oct. 31, 2020

Re: [PATCH 3/3] msado15: Implement ADORecordsetConstruction get/put Rowset

by Alistair Leslie-Hughes

On 30/10/20 8:09 pm, Hans Leidekker wrote: > On Fri, 2020-10-30 at 18:50 +1100, Alistair Leslie-Hughes wrote: >> static HRESULT WINAPI rsconstruction_put_Rowset(ADORecordsetConstruction *iface, IUnknown *row_set) >> { >> struct recordset *recordset = impl_from_ADORecordsetConstruction( iface ); >> - FIXME("%p, %p\n", recordset, row_set); >> - return E_NOTIMPL; >> + >> + TRACE("%p, %p\n", recordset, row_set); >> + >> + if (recordset->row_set) IUnknown_Release(recordset->row_set); >> + recordset->row_set = row_set; >> + if (recordset->row_set) IUnknown_AddRef(recordset->row_set); >> + >> + return S_OK; >> } > > This is supposed to turn the row_set into a Recordset object but > you only store a reference. This could use some tests around > the interaction between these objects. > Based off this one, it appears the pointer is stored. How that point is used internally is another issue. I suspect that when set, the rowset point is used to get/set data. https://docs.microsoft.com/en-us/archive/msdn-magazine/2000/july/house-of-c… I'll attempt to add tests to illustrate how the objects relate. Regards Alistair.

Oct. 31, 2020

Re: [PATCH] po: Update Lithuanian translation

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=81288 Your paranoid android. === debiant (build log) === error: patch failed: po/lt.po:5 Task: Patch failed to apply === debiant (build log) === error: patch failed: po/lt.po:5 Task: Patch failed to apply

Oct. 30, 2020

[PATCH] po: Update Lithuanian translation

by Aurimas Fišeras

Oct. 30, 2020

Re: [PATCH] quartz: Implement IVMRAspectRatioControl9.

by Marvin

Hi, While running your changed tests, I think I found new failures. Being a bot and all I'm not very good at pattern recognition, so I might be wrong, but could you please double-check? Full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=81287 Your paranoid android. === w10pro64 (32 bit report) === quartz: vmr9.c:1446: Test failed: Got hr 0x1. === w10pro64_2scr (32 bit report) === quartz: vmr9.c:1436: Test failed: Thread should block in Receive(). === w10pro64_2scr (64 bit report) === quartz: vmr9.c:1204: Test failed: Got hr 0x40237. vmr9.c:1210: Test failed: Got hr 0x1. === w10pro64_he (64 bit report) === quartz: vmr9.c:1446: Test failed: Got hr 0x1.

Oct. 30, 2020

[PATCH] quartz: Implement IVMRAspectRatioControl9.

by Gijs Vermeulen

Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/quartz/tests/vmr9.c | 23 +++++++++++++-- dlls/quartz/vmr9.c | 60 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index df18bd5f2d5..7b470c6e534 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -242,7 +242,7 @@ static void test_common_interfaces(IBaseFilter *filter) check_interface(filter, &IID_IQualityControl, TRUE); todo_wine check_interface(filter, &IID_IQualProp, TRUE); check_interface(filter, &IID_IUnknown, TRUE); - todo_wine check_interface(filter, &IID_IVMRAspectRatioControl9, TRUE); + check_interface(filter, &IID_IVMRAspectRatioControl9, TRUE); todo_wine check_interface(filter, &IID_IVMRDeinterlaceControl9, TRUE); check_interface(filter, &IID_IVMRFilterConfig9, TRUE); check_interface(filter, &IID_IVMRMixerBitmap9, TRUE); @@ -3851,6 +3851,7 @@ static void test_windowless_size(void) }; IBaseFilter *filter = create_vmr9(VMR9Mode_Windowless); LONG width, height, aspect_width, aspect_height; + IVMRAspectRatioControl9 *aspect_ratio_control; IVMRWindowlessControl9 *windowless_control; IFilterGraph2 *graph = create_graph(); VMR9AspectRatioMode aspect_mode; @@ -3864,6 +3865,7 @@ static void test_windowless_size(void) IPin *pin; IBaseFilter_QueryInterface(filter, &IID_IVMRWindowlessControl9, (void **)&windowless_control); + IBaseFilter_QueryInterface(filter, &IID_IVMRAspectRatioControl9, (void **)&aspect_ratio_control); IBaseFilter_FindPin(filter, L"VMR Input0", &pin); IPin_QueryInterface(pin, &IID_IMemInputPin, (void **)&input); testfilter_init(&source); @@ -3902,6 +3904,11 @@ static void test_windowless_size(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(aspect_mode == VMR9ARMode_None, "Got mode %u.\n", aspect_mode); + aspect_mode = 0xdeadbeef; + hr = IVMRAspectRatioControl9_GetAspectRatioMode(aspect_ratio_control, &aspect_mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(aspect_mode == VMR9ARMode_None, "Got mode %u.\n", aspect_mode); + width = height = 0xdeadbeef; hr = IVMRWindowlessControl9_GetNativeVideoSize(windowless_control, &width, &height, NULL, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -3956,7 +3963,7 @@ static void test_windowless_size(void) SetRect(&expect, 0, 0, 640, 480); ok(EqualRect(&src, &expect), "Got window rect %s.\n", wine_dbgstr_rect(&src)); - hr = IVMRWindowlessControl9_SetAspectRatioMode(windowless_control, VMR9ARMode_LetterBox); + hr = IVMRAspectRatioControl9_SetAspectRatioMode(aspect_ratio_control, VMR9ARMode_LetterBox); ok(hr == S_OK, "Got hr %#x.\n", hr); aspect_mode = 0xdeadbeef; @@ -3964,6 +3971,17 @@ static void test_windowless_size(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(aspect_mode == VMR9ARMode_LetterBox, "Got mode %u.\n", aspect_mode); + hr = IVMRWindowlessControl9_SetAspectRatioMode(windowless_control, VMR9ARMode_None); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + aspect_mode = 0xdeadbeef; + hr = IVMRAspectRatioControl9_GetAspectRatioMode(aspect_ratio_control, &aspect_mode); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(aspect_mode == VMR9ARMode_None, "Got mode %u.\n", aspect_mode); + + hr = IVMRWindowlessControl9_SetAspectRatioMode(windowless_control, VMR9ARMode_LetterBox); + ok(hr == S_OK, "Got hr %#x.\n", hr); + memset(&src, 0xcc, sizeof(src)); memset(&dst, 0xcc, sizeof(dst)); hr = IVMRWindowlessControl9_GetVideoPosition(windowless_control, &src, &dst); @@ -3993,6 +4011,7 @@ out: IMemInputPin_Release(input); IPin_Release(pin); IVMRWindowlessControl9_Release(windowless_control); + IVMRAspectRatioControl9_Release(aspect_ratio_control); ref = IBaseFilter_Release(filter); ok(!ref, "Got outstanding refcount %d.\n", ref); DestroyWindow(window); diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index a24dbc62977..3ddef8dbed5 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -60,6 +60,7 @@ struct quartz_vmr IAMCertifiedOutputProtection IAMCertifiedOutputProtection_iface; IAMFilterMiscFlags IAMFilterMiscFlags_iface; + IVMRAspectRatioControl9 IVMRAspectRatioControl9_iface; IVMRFilterConfig IVMRFilterConfig_iface; IVMRFilterConfig9 IVMRFilterConfig9_iface; IVMRMixerBitmap9 IVMRMixerBitmap9_iface; @@ -603,6 +604,8 @@ static HRESULT vmr_query_interface(struct strmbase_renderer *iface, REFIID iid, *out = &filter->IAMCertifiedOutputProtection_iface; else if (IsEqualGUID(iid, &IID_IAMFilterMiscFlags)) *out = &filter->IAMFilterMiscFlags_iface; + else if (IsEqualGUID(iid, &IID_IVMRAspectRatioControl9) && is_vmr9(filter)) + *out = &filter->IVMRAspectRatioControl9_iface; else if (IsEqualGUID(iid, &IID_IVMRFilterConfig) && !is_vmr9(filter)) *out = &filter->IVMRFilterConfig_iface; else if (IsEqualGUID(iid, &IID_IVMRFilterConfig9) && is_vmr9(filter)) @@ -2396,6 +2399,62 @@ static const IVMRMixerBitmap9Vtbl mixer_bitmap9_vtbl = mixer_bitmap9_GetAlphaBitmapParameters, }; +static inline struct quartz_vmr *impl_from_IVMRAspectRatioControl9(IVMRAspectRatioControl9 *iface) +{ + return CONTAINING_RECORD(iface, struct quartz_vmr, IVMRAspectRatioControl9_iface); +} + +static HRESULT WINAPI aspect_ratio_control9_QueryInterface(IVMRAspectRatioControl9 *iface, REFIID iid, void **out) +{ + struct quartz_vmr *filter = impl_from_IVMRAspectRatioControl9(iface); + return IUnknown_QueryInterface(filter->renderer.filter.outer_unk, iid, out); +} + +static ULONG WINAPI aspect_ratio_control9_AddRef(IVMRAspectRatioControl9 *iface) +{ + struct quartz_vmr *filter = impl_from_IVMRAspectRatioControl9(iface); + return IUnknown_AddRef(filter->renderer.filter.outer_unk); +} + +static ULONG WINAPI aspect_ratio_control9_Release(IVMRAspectRatioControl9 *iface) +{ + struct quartz_vmr *filter = impl_from_IVMRAspectRatioControl9(iface); + return IUnknown_Release(filter->renderer.filter.outer_unk); +} + +static HRESULT WINAPI aspect_ratio_control9_GetAspectRatioMode(IVMRAspectRatioControl9 *iface, DWORD *mode) +{ + struct quartz_vmr *filter = impl_from_IVMRAspectRatioControl9(iface); + + TRACE("filter %p, mode %p.\n", filter, mode); + + EnterCriticalSection(&filter->renderer.filter.csFilter); + *mode = filter->aspect_mode; + LeaveCriticalSection(&filter->renderer.filter.csFilter); + return S_OK; +} + +static HRESULT WINAPI aspect_ratio_control9_SetAspectRatioMode(IVMRAspectRatioControl9 *iface, DWORD mode) +{ + struct quartz_vmr *filter = impl_from_IVMRAspectRatioControl9(iface); + + TRACE("filter %p, mode %u.\n", filter, mode); + + EnterCriticalSection(&filter->renderer.filter.csFilter); + filter->aspect_mode = mode; + LeaveCriticalSection(&filter->renderer.filter.csFilter); + return S_OK; +} + +static const IVMRAspectRatioControl9Vtbl aspect_ratio_control9_vtbl = +{ + aspect_ratio_control9_QueryInterface, + aspect_ratio_control9_AddRef, + aspect_ratio_control9_Release, + aspect_ratio_control9_GetAspectRatioMode, + aspect_ratio_control9_SetAspectRatioMode, +}; + static inline struct quartz_vmr *impl_from_IOverlay(IOverlay *iface) { return CONTAINING_RECORD(iface, struct quartz_vmr, IOverlay_iface); @@ -2522,6 +2581,7 @@ static HRESULT vmr_create(IUnknown *outer, IUnknown **out, const CLSID *clsid) strmbase_renderer_init(&object->renderer, outer, clsid, L"VMR Input0", &renderer_ops); object->IAMCertifiedOutputProtection_iface.lpVtbl = &IAMCertifiedOutputProtection_Vtbl; object->IAMFilterMiscFlags_iface.lpVtbl = &IAMFilterMiscFlags_Vtbl; + object->IVMRAspectRatioControl9_iface.lpVtbl = &aspect_ratio_control9_vtbl; object->IVMRFilterConfig_iface.lpVtbl = &VMR7_FilterConfig_Vtbl; object->IVMRFilterConfig9_iface.lpVtbl = &VMR9_FilterConfig_Vtbl; object->IVMRMixerBitmap9_iface.lpVtbl = &mixer_bitmap9_vtbl; -- 2.29.2

Oct. 30, 2020