June 2022 - Wine-Devel - list.winehq.org

[PATCH v2 0/1] MR254: winex11.drv: Change order register_extension for WGL_ARB_pixel_format_float.

by Sebastián Aedo

Some processes use very naive string matching when detecting extensions, for example, Cossacks III checks if the extension is "contained" in the current extension is checking, causing that `WGL_ARB_pixel_format` is contained in `WGL_ARB_pixel_format_float`, but it ends up with the flag deactivated because they aren't the same. This makes it consistent with the behavior on winemac.drv/opengl.c too. -- v2: winex11.drv: Change order register_extension for WGL_ARB_pixel_format_float. https://gitlab.winehq.org/wine/wine/-/merge_requests/254

June 16, 2022

Re: [PATCH v5 0/1] MR134: ntdll: Don't hard-code the battery and AC adapter names on Linux - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/134

June 16, 2022

Re: [PATCH v7 0/1] MR167: d3drm: IDirect3DRMMeshBuilder3::Load support loading from resource - approved

by Alexandre Julliard (＠julliard)

This merge request was approved by Alexandre Julliard. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/167

June 16, 2022

Re: Having problems (re-)building i686 wine staging rpm's on fedora

by Hin-Tak Leung

I downloaded the official fedora build log from koji, fedora's build farm, and compared it with mine, and found the answer: I needed to do "dnf erase mingw32-libtiff mingw32-libjpeg-turbo". It seems that the present of the causes wine's build system to assume mingw32 libtiff and mingw32 libjpeg are present, but they are actually not useable on fedora. However I don't understand why the mingw64* packages don't cause problems... Hmm, maybe I do, wine doesn't use the mingw64 packages as much - it is not symmetrical, win32 and wow64 is not symmetrical. brief investigation seems to suggest the mingw32-pkg-config values from those are a bit funny. But I think it is a job for the fedora wine maintainers to try to get the fedora mingw32 packages to build nice with wine... # grep 'not found' kojipkgs.fedoraproject.org/packages/wine/7.10/2.fc36/data/logs/x86_64/build… checking for -lnetapi... not found configure: FAudio 64-bit MinGW development files not found (or too old); using bundled version. configure: libjpeg 64-bit MinGW development files not found; using bundled version. configure: libmpg123 64-bit MinGW development files not found (or too old); using bundled version. configure: libtiff 64-bit MinGW development files not found; using bundled version. configure: libvkd3d 64-bit MinGW development files not found; using bundled version. configure: libcapi20 64-bit development files not found, ISDN won't be supported. configure: libnetapi not found, Samba NetAPI won't be supported. # grep 'not found' kojipkgs.fedoraproject.org/packages/wine/7.10/2.fc36/data/logs/i686/build.l… checking for -lnetapi... not found configure: FAudio MinGW development files not found (or too old); using bundled version. configure: libjpeg MinGW development files not found; using bundled version. configure: libmpg123 MinGW development files not found (or too old); using bundled version. configure: libtiff MinGW development files not found; using bundled version. configure: libvkd3d MinGW development files not found; using bundled version. configure: libcapi20 development files not found, ISDN won't be supported. configure: libnetapi not found, Samba NetAPI won't be supported. mine have somewhat fewer 'not found'. In particular, I have the libcapi20 dev files so I have the ISDN support. # grep 'not found' mine/wine-7.10.spec.diff-log checking for -lnetapi... not found configure: FAudio 64-bit MinGW development files not found (or too old); using bundled version. configure: libmpg123 64-bit MinGW development files not found (or too old); using bundled version. configure: libvkd3d 64-bit MinGW development files not found; using bundled version. configure: libnetapi not found, Samba NetAPI won't be supported. # grep 'not found' mine/wine-7.10.spec.diff-log-4 checking for -lnetapi... not found configure: FAudio 32-bit MinGW development files not found (or too old); using bundled version. configure: liblcms2 32-bit MinGW development files not found; using bundled version. configure: libmpg123 32-bit MinGW development files not found (or too old); using bundled version. configure: libpng 32-bit MinGW development files not found; using bundled version. configure: libvkd3d 32-bit MinGW development files not found; using bundled version. configure: zlib 32-bit MinGW development files not found; using bundled version. configure: libnetapi not found, Samba NetAPI won't be supported. On Sunday, 12 June 2022, 00:35:22 BST, Hin-Tak Leung <htl10(a)users.sourceforge.net> wrote: Due to having a few modifications considered unsuitable for upstreaming, I have been grabbing the official fedora rpm's since at least wine-1.9.20 / 2016 , patching the spec file, adding my patches, plus a "Epoch: 100" line, so it blocks auto--upgrades, until I rebuild it myself every two or three wine releases. This has worked well for 6+ years, until 7.3+ . I last built 7.2 staging with (rpmbuild -bb wine.spec && rpmbuild --target=i686 -bb wine.spec) 2>&1 | tee build-log . Fedora's koji build farm only have 7.3, 7.5, 7.9, and 7.10. I tried 7.10 and the x86_64 part finished (*see notes below), but the i686 part just wouldn't go ahead, due to some PE-related collisions. I back-tracked, and found the failure was between 7.3 and 7.5. === i686-w64-mingw32-gcc -c -o dlls/windowscodecs/libjpeg.cross.o dlls/windowscodecs/libjpeg.c -Idlls/windowscodecs -Iinclude -Iinclude/msvcrt \ -I/usr/include -I./libs/png -D__WINESRC__ -D_UCRT -D__WINE_PE_BUILD -Wall -fno-strict-aliasing \ -Wdeclaration-after-statement -Wempty-body -Wignored-qualifiers -Winit-self \ -Wno-packed-not-aligned -Wshift-overflow=2 -Wstrict-prototypes -Wtype-limits \ -Wunused-but-set-parameter -Wvla -Wwrite-strings -Wpointer-arith -Wlogical-op -Wabsolute-value \ -fno-omit-frame-pointer -gdwarf-4 -g -O2 In file included from include/objbase.h:20, from dlls/windowscodecs/libjpeg.c:31: include/rpcndr.h:73:23: error: conflicting types for 'boolean'; have 'unsigned char' 73 | typedef unsigned char boolean; | ^~~~~~~ In file included from /usr/include/jpeglib.h:31, from dlls/windowscodecs/libjpeg.c:24: /usr/include/jmorecfg.h:207:13: note: previous declaration of 'boolean' with type 'boolean' {aka 'int'} 207 | typedef int boolean; | ^~~~~~~ dlls/windowscodecs/libjpeg.c: In function 'jpeg_decoder_initialize': dlls/windowscodecs/libjpeg.c:180:40: warning: assignment to 'boolean (*)(struct jpeg_decompress_struct *)' {aka 'int (*)(struct jpeg_decompress_struct *)'} from incompatible pointer type 'boolean (*)(struct jpeg_decompress_struct *)' {aka 'unsigned char (*)(struct jpeg_decompress_struct *)'} [-Wincompatible-pointer-types] 180 | This->source_mgr.fill_input_buffer = source_mgr_fill_input_buffer; | ^ dlls/windowscodecs/libjpeg.c: In function 'jpeg_encoder_initialize': dlls/windowscodecs/libjpeg.c:466:40: warning: assignment to 'boolean (*)(struct jpeg_compress_struct *)' {aka 'int (*)(struct jpeg_compress_struct *)'} from incompatible pointer type 'boolean (*)(struct jpeg_compress_struct *)' {aka 'unsigned char (*)(struct jpeg_compress_struct *)'} [-Wincompatible-pointer-types] 466 | This->dest_mgr.empty_output_buffer = dest_mgr_empty_output_buffer; | ^ make: *** [Makefile:127914: dlls/windowscodecs/libjpeg.cross.o] Error 1 === I tried setting PNG_PE_CFLAGS, ZLIB_PE_CFLAGS, LCMS2_PE_CFLAGS, JPEG_PE_CFLAGS, JPEG_PE_LIBS etc explicitly, and sometimes it get worse. Anyway, I have tried some many things that I thought it might be worth reaching out to the people who maintain the fedora rpm's as well as well wine-devel. A few questions/thoughts: - it seems that the build system is getting confused occasionally about say, native headers vs mingw headers like jpeg-devel; at some point, I got a error saying I was trying to build one of the unixlib.c's with mingw headers, for example. But I see for example that in the generated Makefile for dlls/windowscodecs/ , It is feeding *PE_FLAGS to unixlib.c (plus the PE stub), and I explicitly put -I...mingw32/include to *PE_FLAGS. That seems wrong. - I don't understand why --target=x86_64 rebuild works, built --target=i686 rebuild fails with the above error. My list of mingw32-* packages and mingw64-* packages are almost identical, I think, and certainly regarding libjpeg (zlib/png dependencies) . I have the 29MB combined x86-64 and i686 build-log of 7.3, plus the 15MB x86-64 and ~3MB i686 failure of each of 7.5/7.9/7.10 ; but it is kind of difficult to see what to check. Any hints on what to look at at config.log would be useful. *note rpmbuild detects isdn4k-utils on my system so I needed to add these two lines +%{_libdir}/wine/%{winesodir}/capi2032.so +%{_libdir}/wine/%{winepedir}/capi2032.dll to my modified spec. I suppose I should formalize this part of my diff with one furthe line of BuildRequires: isdn4k-utils-devel as a reminder to myself.

June 16, 2022

Re: [PATCH 0/7] MR212: d3d11: Create dxgi resource objects for textures and buffers.

by Henri Verbeet

On Thu, 16 Jun 2022 at 20:38, Zebediah Figura <zfigura(a)codeweavers.com> wrote: > On 6/16/22 05:01, Henri Verbeet wrote: > > Right, that probably makes sense, although the implications for > > objects currently referenced by the command stream probably deserve a > > look. > > Hmm, I don't see what you mean? Since the only parent op is currently > the destruction callback, it can't be called until all references have > been dropped, and it'd definitely be an error to call > wined3d_resource_set_parent_ops() without holding a reference to the > resource. Oh, I just meant I'm waving my hand at that part and haven't thought that part through; it may very well be fine.

June 16, 2022

Re: [PATCH v2 5/5] d3d11: Check for WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING with WINED3D_RTYPE_TEXTURE_2D.

by Marvin

Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=117127 Your paranoid android. === w7u_2qxl (32 bit report) === d3d11: d3d11.c:20775: Test failed: Format 0x55 - blendable not supported, feature_level 0xb000, format support 0. d3d11.c:20775: Test failed: Format 0x55 - blendable not supported, feature_level 0xa100, format support 0. d3d11.c:20775: Test failed: Format 0x55 - blendable not supported, feature_level 0xa000, format support 0. d3d11.c:20775: Test failed: Format 0x31 - blendable not supported, feature_level 0x9300, format support 0. d3d11.c:20775: Test failed: Format 0x3d - blendable not supported, feature_level 0x9300, format support 0x213e0. d3d11.c:20775: Test failed: Format 0x41 - blendable not supported, feature_level 0x9300, format support 0x201e0. d3d11.c:20775: Test failed: Format 0x31 - blendable not supported, feature_level 0x9200, format support 0. d3d11.c:20775: Test failed: Format 0x3d - blendable not supported, feature_level 0x9200, format support 0x213e0. d3d11.c:20775: Test failed: Format 0x41 - blendable not supported, feature_level 0x9200, format support 0x201e0. d3d11.c:20775: Test failed: Format 0x31 - blendable not supported, feature_level 0x9100, format support 0. d3d11.c:20775: Test failed: Format 0x3d - blendable not supported, feature_level 0x9100, format support 0x213e0. d3d11.c:20775: Test failed: Format 0x41 - blendable not supported, feature_level 0x9100, format support 0. === w7u_adm (32 bit report) === d3d11: d3d11.c:20775: Test failed: Format 0x55 - blendable not supported, feature_level 0xb000, format support 0. d3d11.c:20775: Test failed: Format 0x55 - blendable not supported, feature_level 0xa100, format support 0. d3d11.c:20775: Test failed: Format 0x55 - blendable not supported, feature_level 0xa000, format support 0. d3d11.c:20775: Test failed: Format 0x31 - blendable not supported, feature_level 0x9300, format support 0. d3d11.c:20775: Test failed: Format 0x3d - blendable not supported, feature_level 0x9300, format support 0x213e0. d3d11.c:20775: Test failed: Format 0x41 - blendable not supported, feature_level 0x9300, format support 0x201e0. d3d11.c:20775: Test failed: Format 0x31 - blendable not supported, feature_level 0x9200, format support 0. d3d11.c:20775: Test failed: Format 0x3d - blendable not supported, feature_level 0x9200, format support 0x213e0. d3d11.c:20775: Test failed: Format 0x41 - blendable not supported, feature_level 0x9200, format support 0x201e0. d3d11.c:20775: Test failed: Format 0x31 - blendable not supported, feature_level 0x9100, format support 0. d3d11.c:20775: Test failed: Format 0x3d - blendable not supported, feature_level 0x9100, format support 0x213e0. d3d11.c:20775: Test failed: Format 0x41 - blendable not supported, feature_level 0x9100, format support 0. === w7u_el (32 bit report) === d3d11: d3d11.c:20775: Test failed: Format 0x55 - blendable not supported, feature_level 0xb000, format support 0. d3d11.c:20775: Test failed: Format 0x55 - blendable not supported, feature_level 0xa100, format support 0. d3d11.c:20775: Test failed: Format 0x55 - blendable not supported, feature_level 0xa000, format support 0. d3d11.c:20775: Test failed: Format 0x31 - blendable not supported, feature_level 0x9300, format support 0. d3d11.c:20775: Test failed: Format 0x3d - blendable not supported, feature_level 0x9300, format support 0x213e0. d3d11.c:20775: Test failed: Format 0x41 - blendable not supported, feature_level 0x9300, format support 0x201e0. d3d11.c:20775: Test failed: Format 0x31 - blendable not supported, feature_level 0x9200, format support 0. d3d11.c:20775: Test failed: Format 0x3d - blendable not supported, feature_level 0x9200, format support 0x213e0. d3d11.c:20775: Test failed: Format 0x41 - blendable not supported, feature_level 0x9200, format support 0x201e0. d3d11.c:20775: Test failed: Format 0x31 - blendable not supported, feature_level 0x9100, format support 0. d3d11.c:20775: Test failed: Format 0x3d - blendable not supported, feature_level 0x9100, format support 0x213e0. d3d11.c:20775: Test failed: Format 0x41 - blendable not supported, feature_level 0x9100, format support 0. === w1064_tsign (32 bit report) === d3d11: d3d11.c:5908: Test failed: Got unexpected query result 0x0000000000000000. === w10pro64 (32 bit report) === d3d11: d3d11.c:5908: Test failed: Got unexpected query result 0x0000000000000000.

June 16, 2022

[PATCH] po: Update Finnish translation.

by Lauri Kenttä

Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> --- po/fi.po | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/po/fi.po b/po/fi.po index 79d5cd82706..9db084ccc45 100644 --- a/po/fi.po +++ b/po/fi.po @@ -3984,10 +3984,8 @@ msgid "Cannot modify non-writable property '|'" msgstr "Kirjoitussuojattua ominaisuutta '|' ei voi muokata" #: dlls/jscript/jscript.rc:79 -#, fuzzy -#| msgid "'this' is not a Map object" msgid "'this' is not a | object" -msgstr "'this' ei ole Map-objekti" +msgstr "'this' ei ole |-objekti" #: dlls/jscript/jscript.rc:80 msgid "Property cannot have both accessors and a value" -- 2.36.1

June 16, 2022

Re: [PATCH v2 1/5] d3d11/tests: Add tests for D3D11_FORMAT_SUPPORT_BLENDABLE.

by Marvin

Hi, It looks like your patch introduced the new failures shown below. Please investigate and fix them before resubmitting your patch. If they are not new, fixing them anyway would help a lot. Otherwise please ask for the known failures list to be updated. The tests also ran into some preexisting test failures. If you know how to fix them that would be helpful. See the TestBot job for the details: The full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=117123 Your paranoid android. === build (build log) === WineRunBuild.pl:error: The build timed out

June 16, 2022

[PATCH v2 5/5] d3d11: Check for WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING with WINED3D_RTYPE_TEXTURE_2D.

by Zebediah Figura

From: Zebediah Figura <zfigura(a)codeweavers.com> This fixes rendering in Raft. --- dlls/d3d11/device.c | 2 +- dlls/d3d11/tests/d3d11.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e93cdf74518..d510cebb110 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3886,7 +3886,7 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CheckFormatSupport(ID3D11Device2 * {WINED3D_RTYPE_NONE, WINED3D_BIND_UNORDERED_ACCESS, 0, D3D11_FORMAT_SUPPORT_TYPED_UNORDERED_ACCESS_VIEW}, {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, WINED3DUSAGE_QUERY_WRAPANDMIP, D3D11_FORMAT_SUPPORT_MIP}, {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_SHADER_RESOURCE, WINED3DUSAGE_QUERY_GENMIPMAP, D3D11_FORMAT_SUPPORT_MIP_AUTOGEN}, - {WINED3D_RTYPE_NONE, WINED3D_BIND_RENDER_TARGET, WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING, D3D11_FORMAT_SUPPORT_BLENDABLE}, + {WINED3D_RTYPE_TEXTURE_2D, WINED3D_BIND_RENDER_TARGET, WINED3DUSAGE_QUERY_POSTPIXELSHADER_BLENDING, D3D11_FORMAT_SUPPORT_BLENDABLE}, }; HRESULT hr; diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 2a2a3d714b8..6d836c8d892 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -20771,7 +20771,7 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE if (formats[i].fl_required <= feature_level) { - todo_wine_if (feature_flag == D3D11_FORMAT_SUPPORT_DISPLAY || feature_flag == D3D11_FORMAT_SUPPORT_BLENDABLE) + todo_wine_if (feature_flag == D3D11_FORMAT_SUPPORT_DISPLAY) ok(supported, "Format %#x - %s not supported, feature_level %#x, format support %#x.\n", format, feature_name, feature_level, format_support[format]); continue; @@ -20785,7 +20785,7 @@ static void check_format_support(const unsigned int *format_support, D3D_FEATURE continue; } - todo_wine_if (feature_flag != D3D11_FORMAT_SUPPORT_DISPLAY && feature_flag != D3D11_FORMAT_SUPPORT_BLENDABLE) + todo_wine_if (feature_flag != D3D11_FORMAT_SUPPORT_DISPLAY) ok(!supported, "Format %#x - %s supported, feature level %#x, format support %#x.\n", format, feature_name, feature_level, format_support[format]); } -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/255

June 16, 2022

[PATCH v2 4/5] wined3d: Retrieve caps from both WINED3D_GL_RES_TYPE_TEX_2D and WINED3D_GL_RES_TYPE_RB for 2D textures in wined3d_check_device_format().

by Zebediah Figura

From: Zebediah Figura <zfigura(a)codeweavers.com> WINED3D_GL_RES_TYPE_RB is not used by the Vulkan backend. We could alternatively solve this by filling WINED3D_GL_RES_TYPE_RB for the Vulkan backend, but this makes less sense. Checking both formats is more in line with what is done elsewhere, e.g. wined3d_check_surface_format(). --- dlls/wined3d/directx.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 925b2df0401..92ebbc2ba23 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1971,6 +1971,7 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, allowed_bind_flags = WINED3D_BIND_RENDER_TARGET | WINED3D_BIND_DEPTH_STENCIL | WINED3D_BIND_UNORDERED_ACCESS; + gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_2D; if (!(bind_flags & WINED3D_BIND_SHADER_RESOURCE)) { if (!wined3d_check_surface_format(format)) @@ -1978,8 +1979,6 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, TRACE("%s is not supported for plain surfaces.\n", debug_d3dformat(format->id)); return WINED3DERR_NOTAVAILABLE; } - - gl_type = gl_type_end = WINED3D_GL_RES_TYPE_RB; break; } allowed_usage |= WINED3DUSAGE_DYNAMIC @@ -1993,7 +1992,6 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, | WINED3DUSAGE_QUERY_VERTEXTEXTURE | WINED3DUSAGE_QUERY_WRAPANDMIP; allowed_bind_flags |= WINED3D_BIND_SHADER_RESOURCE; - gl_type = gl_type_end = WINED3D_GL_RES_TYPE_TEX_2D; if (usage & WINED3DUSAGE_LEGACY_CUBEMAP) { allowed_usage &= ~WINED3DUSAGE_QUERY_LEGACYBUMPMAP; @@ -2092,6 +2090,11 @@ HRESULT CDECL wined3d_check_device_format(const struct wined3d *wined3d, for (; gl_type <= gl_type_end; ++gl_type) { + unsigned int caps = format->caps[gl_type]; + + if (gl_type == WINED3D_GL_RES_TYPE_TEX_2D && !(bind_flags & WINED3D_BIND_SHADER_RESOURCE)) + caps |= format->caps[WINED3D_GL_RES_TYPE_RB]; + if ((format->caps[gl_type] & format_caps) != format_caps) { TRACE("Requested format caps %#x, but format %s only has %#x.\n", -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/255

June 16, 2022