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

[PATCH v3 0/4] MR3439: mf: Implement basic urlmon scheme handler.
by Rémi Bernon Aug. 2, 2023

Aug. 2, 2023

Let The Good Life able to play its intro video, the game creates a source reader from a `http://localhost:6000/<random-hash>` URL. This should also probably work with other games playing streams over http(s). This is a very basic implementation, using urlmon, and it will download the entire stream to a local temporary file before playback. An more optimized implementation would probably use WinHttp and range requests to partially download the requested stream segments, but this can be implemented in a future change. -- v3: mf/scheme_handler: Implement http(s):// scheme handler using urlmon. mf/scheme_handler: Split file scheme handler to scheme_handler.c. mf/tests: Add some network scheme resolver tests. include: Add MF_BYTESTREAM_EFFECTIVE_URL GUID declaration. https://gitlab.winehq.org/wine/wine/-/merge_requests/3439

1 4

Re: [PATCH v2 0/3] MR3472: secur32: Convert "Negotiate" to an LSA package.
by Hans Leidekker (＠hans) Aug. 2, 2023

Aug. 2, 2023

Hans Leidekker (@hans) commented about dlls/secur32/tests/Makefile.in: > TESTDLL = secur32.dll > -IMPORTS = secur32 crypt32 advapi32 ws2_32 > +IMPORTS = secur32 crypt32 advapi32 ws2_32 ntdll This causes a link failure on Windows. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3472#note_41017

1 0

Re: [PATCH v2 0/3] MR3472: secur32: Convert "Negotiate" to an LSA package.
by Hans Leidekker (＠hans) Aug. 2, 2023

Aug. 2, 2023

Hans Leidekker (@hans) commented about dlls/secur32/lsa.c: > DWORD err, i; > HKEY root; > SecureProvider *provider; > + struct lsa_package package; > + NTSTATUS status; > + > + memset(&package, 0, sizeof(package)); > + > + /* "Negotiate" has package id 0, .Net depends on this. */ > + status = nego_SpLsaModeInitialize(SECPKG_INTERFACE_VERSION, &package.lsa_api_version, &package.lsa_api, &package.lsa_table_count); > + if (status == STATUS_SUCCESS) > + { > + status = package.lsa_api->InitializePackage(0, &lsa_dispatch, NULL, NULL, &package.name); > + if (status == STATUS_SUCCESS) > + { Please factor out a function to initialize a package. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3472#note_41016

1 0

[PATCH v4 0/4] MR585: Improve is_gecko_path() for handling non-ASCII characters.
by Jactry Zeng (＠jactry) Aug. 2, 2023

Aug. 2, 2023

This fixes an issue when the path includes non-ASCII characters. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> -- v4: mshtml: Call UrlUnescapeW() with URL_UNESCAPE_AS_UTF8 in is_gecko_path(). shlwapi/tests: Test UrlUnescapeW() with URL_UNESCAPE_AS_UTF8. kernelbase: Implement URL_UNESCAPE_AS_UTF8 for UrlUnescapeW(). shlwapi/tests: Test UrlUnescapeW() with independent data. https://gitlab.winehq.org/wine/wine/-/merge_requests/585

3 10

[PATCH 0/1] MR3479: widl: Add support for default_overload attribute.
by Mohamad Al-Jaf (＠maljaf) Aug. 2, 2023

Aug. 2, 2023

Needed for IDeviceInformationStatics, which is needed by Lenovo Ready For Assistant. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3479

3 6

[PATCH 0/8] MR3474: win32u: Use user message packing for remaining messages.
by Jacek Caban (＠jacek) Aug. 2, 2023

Aug. 2, 2023

Remaining !3388 parts. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3474

3 9

[PATCH 0/1] MR3478: include: Add missing default value in IXAudio2.
by Biswapriyo Nath (＠Biswa96) Aug. 2, 2023

Aug. 2, 2023

This was removed in 14c44d0b0a2fc0ead5bc75615864ff850a44c4d5 commit. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/3478

4 6

[PATCH v7 0/5] MR280: vkd3d-shader: sm1 semantic matching.
by Zebediah Figura (＠zfigura) Aug. 2, 2023

Aug. 2, 2023

This is probably the most ugly and controversial bit of API. I don't really know if this is the right approach to solving this. sm4 registers match by register index, such that shaders can mostly be compiled in isolation. sm1 does not—registers may be specified in any order in the vertex and pixel shaders, and will be matched by usage and usage index. By itself this is not much of a problem. Where it gets hairy is that we want to do some degree of caching, as well as pre-compilation, and avoid recompiling either shader every time it's matched with a new one. Wine currently deals with this problem, for GLSL, by generating a "main" GLSL shader for the vertex shader, and then an extra function setup_vs_output(), and linking the two together every time a new pixel shader is used. This could in theory be used for SPIR-V, but it requires the use of extra, probably external, code to link SPIR-V shaders together, which I do not particularly anticipate being well-received. (I'm not sure how Wine deals with this problem in the ARB backend. It seems to take the pixel shader signature into account when generating the vertex shader— cf. init_output_registers()—but it doesn't take it into account when looking up a vertex shader variant? I didn't look too closely at the code, so maybe I'm missing something.) -- The vkd3d parts of this patch are quite straightforward, and looking at them, I think the design is quite intuitive in isolation. There may be some room for internal refactoring (in particular with an eye to not so much overloading the "register_index" field of struct shader_signature_element) but I'm relatively happy with the way it turned out. In isolation, that is. The Wine part is worse. I've uploaded branches for vkd3d and Wine that use this API, and correctly handle shaders with some nontrivial reordering: https://gitlab.winehq.org/zfigura/vkd3d/-/commits/himavant5 https://gitlab.winehq.org/zfigura/wine/-/commits/himavant_cb The test can be run, as before, like so: make tests/shader_runner.exe && WINE_D3D_CONFIG=renderer=vulkan wine tests/shader_runner.exe ../vkd3d/tests/hlsl/sm1-interstage-interface.shader_test The interesting Wine parts are concentrated in a single patch, 5cfb9d930f11e. The patch takes a few shortcuts, partly because I wanted not to block the vkd3d API design questions, but also because while writing it I came up with a couple of problems that I wasn't sure how to fix. There are two main problems I see: (1) This patch has the user pass the signature from the pixel shader when compiling the vertex shader, and looks up register indices already arbitrarily allocated by the pixel shader. This is problematic when trying to use this signature as a cache key, by virtue of it not being clear (or even defined) which fields are key elements and which aren't. It's also not particularly kind to lookup, on account of not being directly comparable with memcmp(). There are a few options I see: (a) Provide an internal function to compare key elements. This feels... odd, like a very special-purpose function, but perhaps workable. (b) Just make the user deal with it, and assert that all fields are key elements. (c) Use some alternative, perhaps shortened structure as a field of vkd3d_shader_next_stage_info. This has the disadvantage that it is not as simple for a hypothetical user to retrieve from the pixel shader, but we would presumably provide a function to generate one from a shader signature. This would probably also be kinder to cache lookup if it's shorter. (d) Make caching vkd3d's responsibility, to some degree. This seems daunting, but the more we optimize, the more difficult it may be to design API that allows for nice caching. (2) Assuming we use signatures, there is a memory management problem that 5cfb9d930f11e spells out. This is probably a matter of "just fix it", but I suppose another option is to take the GLSL or ARB architecture. -- April is the cruellest month, breeding Lilacs out of the dead land, mixing Memory and desire, stirring Dull roots with spring rain. -- v7: vkd3d-shader: Introduce a function to build a varying map between sm1 stages. vkd3d-shader/spirv: Make output varyings not consumed by the next stage private variables. vkd3d-shader: Implement remapping shader output registers to match the next shader's semantics. vkd3d-shader: Add a separate field for the target location of a signature element. vkd3d-shader/d3dbc: Make sure all inter-stage varyings have a unique register index. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/280

2 6

[PATCH 0/14] MR3477: winedump: Improve regf files handling
by Piotr Caban (＠piotr) Aug. 2, 2023

Aug. 2, 2023

-- https://gitlab.winehq.org/wine/wine/-/merge_requests/3477

3 17

[PATCH v6 0/5] MR280: vkd3d-shader: sm1 semantic matching.
by Zebediah Figura (＠zfigura) Aug. 2, 2023

Aug. 2, 2023

This is probably the most ugly and controversial bit of API. I don't really know if this is the right approach to solving this. sm4 registers match by register index, such that shaders can mostly be compiled in isolation. sm1 does not—registers may be specified in any order in the vertex and pixel shaders, and will be matched by usage and usage index. By itself this is not much of a problem. Where it gets hairy is that we want to do some degree of caching, as well as pre-compilation, and avoid recompiling either shader every time it's matched with a new one. Wine currently deals with this problem, for GLSL, by generating a "main" GLSL shader for the vertex shader, and then an extra function setup_vs_output(), and linking the two together every time a new pixel shader is used. This could in theory be used for SPIR-V, but it requires the use of extra, probably external, code to link SPIR-V shaders together, which I do not particularly anticipate being well-received. (I'm not sure how Wine deals with this problem in the ARB backend. It seems to take the pixel shader signature into account when generating the vertex shader— cf. init_output_registers()—but it doesn't take it into account when looking up a vertex shader variant? I didn't look too closely at the code, so maybe I'm missing something.) -- The vkd3d parts of this patch are quite straightforward, and looking at them, I think the design is quite intuitive in isolation. There may be some room for internal refactoring (in particular with an eye to not so much overloading the "register_index" field of struct shader_signature_element) but I'm relatively happy with the way it turned out. In isolation, that is. The Wine part is worse. I've uploaded branches for vkd3d and Wine that use this API, and correctly handle shaders with some nontrivial reordering: https://gitlab.winehq.org/zfigura/vkd3d/-/commits/himavant5 https://gitlab.winehq.org/zfigura/wine/-/commits/himavant_cb The test can be run, as before, like so: make tests/shader_runner.exe && WINE_D3D_CONFIG=renderer=vulkan wine tests/shader_runner.exe ../vkd3d/tests/hlsl/sm1-interstage-interface.shader_test The interesting Wine parts are concentrated in a single patch, 5cfb9d930f11e. The patch takes a few shortcuts, partly because I wanted not to block the vkd3d API design questions, but also because while writing it I came up with a couple of problems that I wasn't sure how to fix. There are two main problems I see: (1) This patch has the user pass the signature from the pixel shader when compiling the vertex shader, and looks up register indices already arbitrarily allocated by the pixel shader. This is problematic when trying to use this signature as a cache key, by virtue of it not being clear (or even defined) which fields are key elements and which aren't. It's also not particularly kind to lookup, on account of not being directly comparable with memcmp(). There are a few options I see: (a) Provide an internal function to compare key elements. This feels... odd, like a very special-purpose function, but perhaps workable. (b) Just make the user deal with it, and assert that all fields are key elements. (c) Use some alternative, perhaps shortened structure as a field of vkd3d_shader_next_stage_info. This has the disadvantage that it is not as simple for a hypothetical user to retrieve from the pixel shader, but we would presumably provide a function to generate one from a shader signature. This would probably also be kinder to cache lookup if it's shorter. (d) Make caching vkd3d's responsibility, to some degree. This seems daunting, but the more we optimize, the more difficult it may be to design API that allows for nice caching. (2) Assuming we use signatures, there is a memory management problem that 5cfb9d930f11e spells out. This is probably a matter of "just fix it", but I suppose another option is to take the GLSL or ARB architecture. -- April is the cruellest month, breeding Lilacs out of the dead land, mixing Memory and desire, stirring Dull roots with spring rain. -- v6: vkd3d-shader: Introduce a function to build a varying map between sm1 stages. vkd3d-shader/spirv: Make output varyings not consumed by the next stage private variables. vkd3d-shader: Implement remapping shader output registers to match the next shader's semantics. vkd3d-shader: Add a separate field for the target location of a signature element. https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/280

3 7