February 2021 - Wine-Devel - list.winehq.org

[PATCH 1/2] winevulkan: Handle bitmask types backed by VkFlags64
by Liam Middlebrook Feb. 15, 2021

Feb. 15, 2021

Previously bitmask types were always treated as 32-bit values, now the basetype of each bitmask must be checked. Signed-off-by: Liam Middlebrook <lmiddlebrook(a)nvidia.com> Signed-off-by: Piers Daniell <pdaniell(a)nvidia.com> --- dlls/winevulkan/make_vulkan | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/dlls/winevulkan/make_vulkan b/dlls/winevulkan/make_vulkan index 76eba97180b..f341c3c5ad0 100755 --- a/dlls/winevulkan/make_vulkan +++ b/dlls/winevulkan/make_vulkan @@ -1375,7 +1375,14 @@ class VkParam(object): if self.is_static_array() or self.is_pointer(): self.format_str = "%p" else: - if self.type_info["category"] in ["bitmask", "enum"]: + if self.type_info["category"] in ["bitmask"]: + # Since 1.2.170 bitmasks can be 32 or 64-bit, check the basetype. + if self.type_info["data"].type == "VkFlags64": + self.format_str = "0x%s" + self.format_conv = "wine_dbgstr_longlong({0})" + else: + self.format_str = "%#x" + elif self.type_info["category"] in ["enum"]: self.format_str = "%#x" elif self.is_handle(): # We use uint64_t for non-dispatchable handles as opposed to pointers @@ -1577,7 +1584,13 @@ class VkParam(object): return "str" if self.is_dispatchable() or self.is_pointer() or self.is_static_array(): return "ptr" - if self.type_info["category"] in ["bitmask", "enum"]: + if self.type_info["category"] in ["bitmask"]: + # Since 1.2.170 bitmasks can be 32 or 64-bit, check the basetype. + if self.type_info["data"].type == "VkFlags64": + return "int64" + else: + return "long" + if self.type_info["category"] in ["enum"]: return "long" if self.is_handle() and not self.is_dispatchable(): return "int64" -- 2.30.0

2 2

[PATCH v2] winex11.drv: Stop assuming that GenericEvent has a window.
by Rémi Bernon Feb. 15, 2021

Feb. 15, 2021

It doesn't, and we then lookup HWND from an invalid Window value. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/winex11.drv/event.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index d21d2a7fb1b..99943478729 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -390,6 +390,9 @@ static inline BOOL call_event_handler( Display *display, XEvent *event ) return FALSE; /* no handler, ignore it */ } +#ifdef GenericEvent + if (event->type == GenericEvent) hwnd = 0; else +#endif if (XFindContext( display, event->xany.window, winContext, (char **)&hwnd ) != 0) hwnd = 0; /* not for a registered window */ if (!hwnd && event->xany.window == root_window) hwnd = GetDesktopWindow(); -- 2.30.0

1 0

[PATCH] mfplat/allocator: Handle bind flags and usage attributes.
by Nikolay Sivov Feb. 15, 2021

Feb. 15, 2021

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/mfplat/sample.c | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/dlls/mfplat/sample.c b/dlls/mfplat/sample.c index 4ecce4fbe84..0581c6c2484 100644 --- a/dlls/mfplat/sample.c +++ b/dlls/mfplat/sample.c @@ -72,6 +72,8 @@ struct sample_allocator unsigned int height; D3DFORMAT d3d9_format; DXGI_FORMAT dxgi_format; + unsigned int usage; + unsigned int bindflags; unsigned int buffer_count; } frame_desc; @@ -1345,8 +1347,12 @@ static HRESULT sample_allocator_allocate_sample(struct sample_allocator *allocat desc.Format = allocator->frame_desc.dxgi_format; desc.SampleDesc.Count = 1; desc.SampleDesc.Quality = 0; - desc.Usage = 0; - desc.BindFlags = D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET; + desc.Usage = allocator->frame_desc.usage; + desc.BindFlags = allocator->frame_desc.bindflags; + if (desc.Usage == D3D11_USAGE_DYNAMIC) + desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE; + else if (desc.Usage == D3D11_USAGE_STAGING) + desc.CPUAccessFlags = D3D11_CPU_ACCESS_WRITE | D3D11_CPU_ACCESS_READ; if (SUCCEEDED(hr = ID3D11Device_CreateTexture2D(service->d3d11_device, &desc, NULL, &texture))) { @@ -1395,15 +1401,32 @@ static HRESULT sample_allocator_initialize(struct sample_allocator *allocator, u if (sample_count > max_sample_count) return E_INVALIDARG; + allocator->frame_desc.usage = D3D11_USAGE_DEFAULT; + if (attributes) + { + IMFAttributes_GetUINT32(attributes, &MF_SA_BUFFERS_PER_SAMPLE, &allocator->frame_desc.buffer_count); + IMFAttributes_GetUINT32(attributes, &MF_SA_D3D11_USAGE, &allocator->frame_desc.usage); + } + + if (allocator->frame_desc.usage == D3D11_USAGE_IMMUTABLE || allocator->frame_desc.usage > D3D11_USAGE_STAGING) + return E_INVALIDARG; + + if (allocator->frame_desc.usage == D3D11_USAGE_DEFAULT) + allocator->frame_desc.bindflags = D3D11_BIND_SHADER_RESOURCE | D3D11_BIND_RENDER_TARGET; + else if (allocator->frame_desc.usage == D3D11_USAGE_DYNAMIC) + allocator->frame_desc.bindflags = D3D11_BIND_SHADER_RESOURCE; + else + allocator->frame_desc.bindflags = 0; + + if (attributes) + IMFAttributes_GetUINT32(attributes, &MF_SA_D3D11_BINDFLAGS, &allocator->frame_desc.bindflags); + sample_allocator_set_media_type(allocator, media_type); sample_allocator_set_attributes(allocator, attributes); sample_count = max(1, sample_count); max_sample_count = max(1, max_sample_count); - if (attributes) - IMFAttributes_GetUINT32(attributes, &MF_SA_BUFFERS_PER_SAMPLE, &allocator->frame_desc.buffer_count); - allocator->frame_desc.d3d9_format = subtype.Data1; allocator->frame_desc.dxgi_format = MFMapDX9FormatToDXGIFormat(allocator->frame_desc.d3d9_format); allocator->frame_desc.width = frame_size >> 32; -- 2.30.0

1 1

[PATCH] winegstreamer: Do not compare FPS in wg_format_compare().
by Zebediah Figura Feb. 14, 2021

Feb. 14, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50667 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/winegstreamer/wg_parser.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/wg_parser.c b/dlls/winegstreamer/wg_parser.c index 071694f77cc..5c8d5f56d86 100644 --- a/dlls/winegstreamer/wg_parser.c +++ b/dlls/winegstreamer/wg_parser.c @@ -307,10 +307,10 @@ static bool wg_format_compare(const struct wg_format *a, const struct wg_format && a->u.audio.rate == b->u.audio.rate; case WG_MAJOR_TYPE_VIDEO: + /* Do not compare FPS. */ return a->u.video.format == b->u.video.format && a->u.video.width == b->u.video.width - && a->u.video.height == b->u.video.height - && a->u.video.fps_d * b->u.video.fps_n == a->u.video.fps_n * b->u.video.fps_d; + && a->u.video.height == b->u.video.height; } assert(0); -- 2.30.0

1 0

[PATCH] ucrtbase: Set arch for __intrinsic_setjmpex to win64
by André Hentschel Feb. 14, 2021

Feb. 14, 2021

Signed-off-by: André Hentschel <nerv(a)dawncrow.de> --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/ucrtbase/ucrtbase.spec | 2 +- dlls/vcruntime140/vcruntime140.spec | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 136358a174c..46fb3c19f87 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -40,7 +40,7 @@ @ stub __dcrt_initial_narrow_environment @ cdecl __intrinsic_abnormal_termination() ucrtbase.__intrinsic_abnormal_termination @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp -@ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex +@ cdecl -arch=win64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex @ cdecl __processing_throw() ucrtbase.__processing_throw @ stub __report_gsfailure @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 0a8d74521f5..b20559c48aa 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -94,7 +94,7 @@ @ cdecl __initialize_lconv_for_unsigned_char() __lconv_init @ cdecl __intrinsic_abnormal_termination() @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) MSVCRT__setjmp -@ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) __wine_setjmpex +@ cdecl -arch=win64 -norelay __intrinsic_setjmpex(ptr ptr) __wine_setjmpex @ cdecl __isascii(long) @ cdecl __iscsym(long) @ cdecl __iscsymf(long) diff --git a/dlls/vcruntime140/vcruntime140.spec b/dlls/vcruntime140/vcruntime140.spec index f799bcd4db5..b0217ba112e 100644 --- a/dlls/vcruntime140/vcruntime140.spec +++ b/dlls/vcruntime140/vcruntime140.spec @@ -33,7 +33,7 @@ @ cdecl __current_exception() ucrtbase.__current_exception @ cdecl __current_exception_context() ucrtbase.__current_exception_context @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) ucrtbase.__intrinsic_setjmp -@ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex +@ cdecl -arch=win64 -norelay __intrinsic_setjmpex(ptr ptr) ucrtbase.__intrinsic_setjmpex @ cdecl __processing_throw() ucrtbase.__processing_throw @ stub __report_gsfailure @ cdecl __std_exception_copy(ptr ptr) ucrtbase.__std_exception_copy -- 2.25.1

1 0

[PATCH 1/2] quartz/tests: Add tests for IMediaEventEx::SetNotifyFlags.
by Anton Baskanov Feb. 14, 2021

Feb. 14, 2021

Signed-off-by: Anton Baskanov <baskanov(a)gmail.com> --- dlls/quartz/tests/filtergraph.c | 134 ++++++++++++++++++++++++++++++++ 1 file changed, 134 insertions(+) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index e4b72958e10..c65d60d840d 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -5148,6 +5148,139 @@ static void test_autoplug_uyvy(void) ok(source_pin.ref == 1, "Got outstanding refcount %d.\n", source_pin.ref); } +static void test_set_notify_flags(void) +{ + static const WNDCLASSA class = + { + .lpfnWndProc = DefWindowProcA, + .lpszClassName = "quartz_test_window", + }; + IFilterGraph2 *graph = create_graph(); + IMediaEventSink *media_event_sink; + IMediaControl *media_control; + IMediaEventEx *media_event; + struct testfilter filter; + LONG_PTR param1, param2; + HANDLE event; + HWND window; + HRESULT hr; + ULONG ref; + LONG code; + MSG msg; + + RegisterClassA(&class); + window = CreateWindowA("quartz_test_window", NULL, WS_OVERLAPPEDWINDOW, + 50, 50, 150, 150, NULL, NULL, NULL, NULL); + ok(!!window, "Failed to create window.\n"); + + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaEventEx, (void **)&media_event); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IFilterGraph2_QueryInterface(graph, &IID_IMediaEventSink, (void **)&media_event_sink); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + testfilter_init(&filter, NULL, 0); + filter.IAMFilterMiscFlags_iface.lpVtbl = &testmiscflags_vtbl; + filter.misc_flags = AM_FILTER_MISC_FLAGS_IS_RENDERER; + + hr = IFilterGraph2_AddFilter(graph, &filter.IBaseFilter_iface, NULL); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaEventEx_GetEventHandle(media_event, (OAEVENT *)&event); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaEventEx_SetNotifyWindow(media_event, (OAHWND)window, WM_USER, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Run(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(WaitForSingleObject(event, 0) == 0, "Event should be signaled.\n"); + + while (PeekMessageA(&msg, window, WM_USER, WM_USER, PM_REMOVE)); + + hr = IMediaEventEx_SetNotifyFlags(media_event, AM_MEDIAEVENT_NONOTIFY); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + todo_wine ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + + hr = IMediaEventEx_GetEvent(media_event, &code, &param1, &param2, 50); + todo_wine ok(hr == E_ABORT, "Got hr %#x.\n", hr); + + hr = IMediaEventSink_Notify(media_event_sink, EC_STATUS, (LONG_PTR)"a", (LONG_PTR)"b"); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + todo_wine ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + + ok(!PeekMessageA(&msg, window, WM_USER, WM_USER, PM_REMOVE), "Window should not be notified.\n"); + + hr = IMediaEventEx_GetEvent(media_event, &code, &param1, &param2, 50); + todo_wine ok(hr == E_ABORT, "Got hr %#x.\n", hr); + + hr = IMediaEventSink_Notify(media_event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(WaitForSingleObject(event, 0) == 0, "Event should be signaled.\n"); + + hr = IMediaControl_Stop(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(WaitForSingleObject(event, 0) == 0, "Event should be signaled.\n"); + + hr = IMediaControl_Pause(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(WaitForSingleObject(event, 0) == 0, "Event should be signaled.\n"); + + hr = IMediaControl_Run(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + todo_wine ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + + hr = IMediaEventSink_Notify(media_event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + ok(WaitForSingleObject(event, 0) == 0, "Event should be signaled.\n"); + + hr = IMediaEventEx_GetEvent(media_event, &code, &param1, &param2, 50); + todo_wine ok(hr == E_ABORT, "Got hr %#x.\n", hr); + + todo_wine ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + + hr = IMediaEventEx_SetNotifyFlags(media_event, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMediaControl_Run(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaEventSink_Notify(media_event_sink, EC_COMPLETE, S_OK, + (LONG_PTR)&filter.IBaseFilter_iface); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaEventEx_SetNotifyFlags(media_event, AM_MEDIAEVENT_NONOTIFY); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + todo_wine ok(WaitForSingleObject(event, 0) == WAIT_TIMEOUT, "Event should not be signaled.\n"); + + hr = IMediaControl_Stop(media_control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + IMediaControl_Release(media_control); + IMediaEventEx_Release(media_event); + IMediaEventSink_Release(media_event_sink); + ref = IFilterGraph2_Release(graph); + ok(!ref, "Got outstanding refcount %d.\n", ref); + ok(filter.ref == 1, "Got outstanding refcount %d.\n", filter.ref); + + DestroyWindow(window); + UnregisterClassA("quartz_test_window", GetModuleHandleA(NULL)); +} + START_TEST(filtergraph) { CoInitializeEx(NULL, COINIT_MULTITHREADED); @@ -5172,6 +5305,7 @@ START_TEST(filtergraph) test_add_source_filter(); test_window_threading(); test_autoplug_uyvy(); + test_set_notify_flags(); CoUninitialize(); test_render_with_multithread(); -- 2.25.1

2 3

[PATCH] winealsa: Add card number to duplicate device descriptions.
by dpkingston Feb. 14, 2021

Feb. 14, 2021

Devices with the same device description cannot be distinguished. Add card number to the description of second and subsequent instances of devices with the same description. This mimics Windows behavior. Signed-off-by: Doug Kingston <dpk(a)google.com> --- dlls/winealsa.drv/mmdevdrv.c | 43 ++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/dlls/winealsa.drv/mmdevdrv.c b/dlls/winealsa.drv/mmdevdrv.c index 318350471db..a26d09a0bd7 100644 --- a/dlls/winealsa.drv/mmdevdrv.c +++ b/dlls/winealsa.drv/mmdevdrv.c @@ -22,6 +22,8 @@ #include "config.h" #include <stdarg.h> +#define _GNU_SOURCE +#include <stdio.h> #include <math.h> #include "windef.h" @@ -521,6 +523,36 @@ static void get_reg_devices(EDataFlow flow, snd_pcm_stream_t stream, WCHAR ***id } } +struct card_type { + struct list entry; + int first_card_number; + char string[1]; +}; + +static struct list card_types = LIST_INIT(card_types); + +static BOOL need_card_number(int card, const char *string) +{ + struct card_type *cptr; + + LIST_FOR_EACH_ENTRY(cptr, &card_types, struct card_type, entry) + { + if(!strcmp(string, cptr->string)) + return card != cptr->first_card_number; + } + + /* this is the first instance of string */ + cptr = HeapAlloc(GetProcessHeap(), 0, sizeof(struct card_type) + strlen(string)); + if(!cptr) + /* Default to displaying card number if we can't track cards */ + return TRUE; + + cptr->first_card_number = card; + strcpy(cptr->string, string); + list_add_head(&card_types, &cptr->entry); + return FALSE; +} + static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, UINT *num) { @@ -564,6 +596,17 @@ static HRESULT alsa_enum_devices(EDataFlow flow, WCHAR ***ids, GUID **guids, cardpath, err, snd_strerror(err)); alsa_get_card_devices(flow, stream, ids, guids, num, ctl, card, nameW); }else{ + if(need_card_number(card, cardname)){ + char *cardnameN; + /* + * For identical instances, second and subsequent instances get + * instance number prefix to distinguish them (like Windows). + */ + if(asprintf(&cardnameN, "%u-%s", card, cardname) > 0){ + free(cardname); + cardname = cardnameN; + } + } len = MultiByteToWideChar(CP_UNIXCP, 0, cardname, -1, NULL, 0); cardnameW = HeapAlloc(GetProcessHeap(), 0, len * sizeof(WCHAR)); -- 2.24.3 (Apple Git-128)

1 0

[PATCH v7 6/6] kernelbase: Reimplement GetVolumeInformation on top of GetVolumeInformationByHandle.
by Erich E. Hoover Feb. 13, 2021

Feb. 13, 2021

This patch removes the volume querying information duplication in kernelbase by re-implementing GetVolumeInformation using GetVolumeInformationByHandle (itself implemented with NtQueryVolumeInformationFile). v7: Fix Root_Slash to always use the correct drive letter and don't use FILE_LIST_DIRECTORY v6: No change v5: Rebase against 1b1b6c5f7d28768feb853eefd015aa714b819ed4 v4: Reordered (no content change) v3: No change v2: Reordered (no content change) Best, Erich

3 4

[PATCH v7 5/6] mountmgr.sys: Add support for volume information queries.
by Erich E. Hoover Feb. 13, 2021

Feb. 13, 2021

This patch allows the mountmgr to handle the volume information request IRP, allowing volume information to be queried from the mountmgr by ntdll. v7: No change v6: Have harddisk_query_volume return the same status as the IoStatus. v5: No change v4: Reordered (no content change) v3: Use SystemBuffer instead of UserBuffer (see 8e98dcd42e13bfeb5a2397ff9bf1c7f63c224e23) v2: Per Zeb's request, now storing the volume with the disk_device so that the lookup doesn't require a search. Best, Erich

2 1

[PATCH v7 4/6] ntoskrnl.exe: Implement volume information queries for device files.
by Erich E. Hoover Feb. 13, 2021

Feb. 13, 2021

This patch implements volume information queries for device files, which allows NtQueryVolumeInformationFile to issue IRP_MJ_QUERY_VOLUME_INFORMATION to return volume information from a driver. The patch also now includes a simple test that issues FileFsVolumeInformation (for systems that support unsigned drivers). v7: match dispatch_read behavior (no input buffer), fix missing const, and remove incorrect FIXME v6: No change v5: No change v4: Split out content from server/device.c and dlls/ntoskrnl.exe/ntoskrnl.c, fixed copy-paste error identified by Zeb, and added tests Best, Erich

2 1