August 2023 - Wine-gitlab - list.winehq.org

[PATCH v3 0/5] MR304: vkd3d-shader: Extend vkd3d_shader_scan_descriptor_info, part 2/2.
by Zebediah Figura (＠zfigura) 22 Aug '23

22 Aug '23

This adds all of the information used by the spirv backend to declare descriptor variables. Most of these are added to the internal vkd3d_shader_scan_descriptor_info1 structure, but patch 5/5 adds a flag to enum vkd3d_shader_descriptor_info_flag, which is public API. The ultimate goal here is to declare SPIR-V descriptor variables from the scanned descriptor information, thereby avoiding the need to synthesize DCL instructions for frontends that don't have them (specifically sm1, but it may be that sm6 would benefit from this as well). That work is visible here: https://gitlab.winehq.org/zfigura/vkd3d/-/tree/himavant5 -- This is a follow-up to the already-approved 295, which I am submitting now so that we're not blocked on Alexandre's vacation. -- v3: vkd3d-shader: Add a flag marking raw buffers to struct vkd3d_shader_descriptor_info. vkd3d-shader: Add structure stride to struct vkd3d_shader_descriptor_info1. vkd3d-shader: Add constant buffer size to struct vkd3d_shader_descriptor_info1. vkd3d-shader: Add sample count to struct vkd3d_shader_descriptor_info1. vkd3d-shader: Set descriptor flags in the caller to vkd3d_shader_scan_add_descriptor(). https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/304

3 7

[PATCH v7 0/1] MR279: vkd3d: Implement ID3D12Device1.
by Conor McCarthy (＠cmccarthy) 22 Aug '23

22 Aug '23

-- v7: vkd3d: Implement ID3D12Device1 with stubs. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/279

3 2

Re: [PATCH v4 0/4] MR3439: mf: Implement basic urlmon scheme handler.
by Nikolay Sivov (＠nsivov) 22 Aug '23

22 Aug '23

Nikolay Sivov (@nsivov) commented about dlls/mf/scheme_handler.c: > IMFSourceResolver *resolver; > struct list results; > CRITICAL_SECTION cs; > + resolve_cb resolve; > }; I'd rather we call it closer to what it does, for example create_stream(). -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3439#note_43001

1 0

Re: [PATCH v4 0/4] MR3439: mf: Implement basic urlmon scheme handler.
by Nikolay Sivov (＠nsivov) 22 Aug '23

22 Aug '23

Nikolay Sivov (@nsivov) commented about dlls/mf/scheme_handler.c: > + if (FAILED(IMFByteStream_QueryInterface(*out, &IID_IMFAttributes, (void **)&attributes))) > + WARN("Failed to get IMFAttributes interface\n"); > + else > + { > + if (FAILED(IMFAttributes_DeleteItem(attributes, &MF_BYTESTREAM_ORIGIN_NAME))) > + WARN("Failed to delete MF_BYTESTREAM_ORIGIN_NAME attribute\n"); > + if (FAILED(IMFAttributes_SetString(attributes, &MF_BYTESTREAM_EFFECTIVE_URL, url))) > + WARN("Failed to set MF_BYTESTREAM_EFFECTIVE_URL attribute\n"); > + if (FAILED(IMFAttributes_SetString(attributes, &MF_BYTESTREAM_CONTENT_TYPE, L"application/octet-stream"))) > + WARN("Failed to set MF_BYTESTREAM_CONTENT_TYPE attribute\n"); > + IMFAttributes_Release(attributes); > + } > + } > + > + IStream_Release(stream); > + return hr; Just release ulrmon stream right away, and return if mf stream creation failed. IMFAttributes are probably always available if you're going to use MFCreateMFByteStreamOnStream(). I don't see any value in these warnings. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3439#note_43002

1 0

Re: [PATCH v4 0/4] MR3439: mf: Implement basic urlmon scheme handler.
by Nikolay Sivov (＠nsivov) 22 Aug '23

22 Aug '23

Nikolay Sivov (@nsivov) commented about dlls/mf/Makefile.in: > MODULE = mf.dll > IMPORTLIB = mf > -IMPORTS = advapi32 mfplat ole32 uuid mfuuid strmiids > +IMPORTS = advapi32 mfplat ole32 uuid mfuuid strmiids urlmon > DELAYIMPORTS = evr user32 Maybe add it to delayimports? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3439#note_43000

1 0

Re: [PATCH v4 0/4] MR3439: mf: Implement basic urlmon scheme handler.
by Nikolay Sivov (＠nsivov) 22 Aug '23

22 Aug '23

Nikolay Sivov (@nsivov) commented about dlls/mf/tests/mf.c: > + static const WCHAR *urls[] = > + { > + L"http://test.winehq.org/tests/test.mp3", > + L"https://test.winehq.org/tests/test.mp3", > + L"httpd://test.winehq.org/tests/test.mp3", > + L"httpsd://test.winehq.org/tests/test.mp3", > + L"mms://test.winehq.org/tests/test.mp3", > + }; > + static const WCHAR *expect_urls[] = > + { > + /* Win10 */ L"http://test.winehq.org:80/tests/test.mp3", /* Win8 */ L"http://test.winehq.org/tests/test.mp3", > + /* Win10 */ L"https://test.winehq.org:443/tests/test.mp3", /* Win8 */ L"https://test.winehq.org/tests/test.mp3", > + /* Win10 */ L"http://test.winehq.org:80/tests/test.mp3", /* Win8 */ L"http://test.winehq.org/tests/test.mp3", > + /* Win10 */ L"https://test.winehq.org:443/tests/test.mp3", /* Win8 */ L"https://test.winehq.org/tests/test.mp3", > + /* Win10 */ L"http://test.winehq.org:80/tests/test.mp3", /* Win8 */ L"http://test.winehq.org/tests/test.mp3", > + }; Is it important to match those exactly? Maybe test for "http://test.winehq.org" part only? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3439#note_42998

1 0

Re: [PATCH v4 0/4] MR3439: mf: Implement basic urlmon scheme handler.
by Nikolay Sivov (＠nsivov) 22 Aug '23

22 Aug '23

Nikolay Sivov (@nsivov) commented about dlls/mf/tests/mf.c: > + hr = IMFAttributes_GetItem(attributes, &MF_BYTESTREAM_CONTENT_TYPE, NULL); > + todo_wine > + ok(hr == S_OK, "got hr %#lx\n", hr); > + hr = IMFAttributes_GetItem(attributes, &MF_BYTESTREAM_LAST_MODIFIED_TIME, NULL); > + todo_wine > + ok(hr == S_OK, "got hr %#lx\n", hr); > + IMFAttributes_Release(attributes); > + > + hr = IUnknown_QueryInterface(object, &IID_IMFByteStream, (void **)&byte_stream); > + ok(hr == S_OK, "got hr %#lx\n", hr); > + hr = IMFByteStream_GetCapabilities(byte_stream, &caps); > + ok(hr == S_OK, "got hr %#lx\n", hr); > + todo_wine > + ok(caps == (expect_caps | MFBYTESTREAM_IS_PARTIALLY_DOWNLOADED) > + || caps == (expect_caps | MFBYTESTREAM_DOES_NOT_USE_NETWORK), > + "got caps %#lx\n", caps); How useful is this? Maybe checking for expect_caps mask only? -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3439#note_42999

1 0

[PATCH v2 0/2] MR308: vkd3d-shader/hlsl: Initialize all constant values in hlsl_fold_constant_swizzles().
by Francisco Casas (＠fcasas) 22 Aug '23

22 Aug '23

Even though the uninitialized values shouldn't be used in the output binary program, they still show up in it, and affect the checksum, so we better make them zeroes. This error was reported by valgrind: ``` libtool --mode=execute valgrind --track-origins=yes vkd3d-build/tests/shader_runner vkd3d/tests/hlsl/static-initializer.shader_test ``` ``` ==46180== Conditional jump or move depends on uninitialised value(s) ==46180== at 0x48D98C7: parse_dxbc.isra.0 (dxbc.c:182) ==46180== by 0x48DA044: vkd3d_shader_parse_dxbc (dxbc.c:308) ==46180== by 0x488D1B6: vkd3d_shader_parse_dxbc_source_type (vkd3d_shader_utils.h:37) ==46180== by 0x488D1B6: create_shader_stage.isra.0 (state.c:1988) ==46180== by 0x48926B6: d3d12_pipeline_state_init_graphics (state.c:3084) ==46180== by 0x4893A96: d3d12_pipeline_state_create_graphics (state.c:3280) ==46180== by 0x4878498: d3d12_device_CreateGraphicsPipelineState (device.c:2619) ==46180== by 0x1FFEFFECC7: ??? ==46180== by 0xE8: ??? ==46180== by 0x47: ??? ==46180== by 0x61: ??? ==46180== by 0x660066000000023: ??? ==46180== by 0x661066100000044: ??? ==46180== Uninitialised value was created by a stack allocation ==46180== at 0x48F3FF0: hlsl_fold_constant_swizzles (hlsl_constant_ops.c:1010) ``` Thank you valgrind! :smile: -- v2: vkd3d-shader/hlsl: Initialize unused constant components to zero. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/308

5 7

[PATCH v2 0/4] MR3617: oleaut32: Use CRT allocation functions.
by Alex Henrie (＠alexhenrie) 22 Aug '23

22 Aug '23

-- v2: oleaut32: Use CRT allocation functions in typelib.c. oleaut32: Use CRT allocation functions in olepicture.c. oleaut32: Use CRT allocation functions in hash.c. oleaut32: Use CRT allocation functions in connpt.c. https://gitlab.winehq.org/wine/wine/-/merge_requests/3617

4 6

[PATCH v3 0/9] MR3605: include: Add WinRT IPackageManager / IPackage3 definitions.
by Rémi Bernon 22 Aug '23

22 Aug '23

-- v3: include: Add Windows.ApplicationModel.IPackage3 interface definition. include: Add Windows.ApplicationModel.Core.AppListEntry runtimeclass definition. widl: Guard against re-import of the main input file. https://gitlab.winehq.org/wine/wine/-/merge_requests/3605

1 9