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

[PATCH v6 1/1] d3drm: Pass all D3DRM_LOAD* flags directly through to CreateEnumObject() in IDirect3DRMMeshBuilder3::Load().

by Alistair Leslie-Hughes

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/d3drm/meshbuilder.c | 25 +++++++++---------------- 1 file changed, 9 insertions(+), 16 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index 1f783baf1fe..2867ea14ebe 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -1462,8 +1462,10 @@ end: static HRESULT WINAPI d3drm_mesh_builder3_Load(IDirect3DRMMeshBuilder3 *iface, void *filename, void *name, D3DRMLOADOPTIONS loadflags, D3DRMLOADTEXTURE3CALLBACK cb, void *arg) { + static const DWORD supported_flags = D3DRMLOAD_FROMFILE | D3DRMLOAD_FROMRESOURCE + | D3DRMLOAD_FROMMEMORY | D3DRMLOAD_FROMSTREAM | D3DRMLOAD_FROMURL; struct d3drm_mesh_builder *mesh_builder = impl_from_IDirect3DRMMeshBuilder3(iface); - DXFILELOADOPTIONS load_options; + DXFILELOADOPTIONS load_options = loadflags & supported_flags; IDirectXFile *dxfile = NULL; IDirectXFileEnumObject *enum_object = NULL; IDirectXFileData *data = NULL; @@ -1476,22 +1478,10 @@ static HRESULT WINAPI d3drm_mesh_builder3_Load(IDirect3DRMMeshBuilder3 *iface, v TRACE("iface %p, filename %p, name %p, loadflags %#lx, cb %p, arg %p.\n", iface, filename, name, loadflags, cb, arg); - clean_mesh_builder_data(mesh_builder); + if (loadflags & ~supported_flags) + FIXME("Ignoring flags %#lx.\n", loadflags & ~supported_flags); - if (loadflags == D3DRMLOAD_FROMMEMORY) - { - load_options = DXFILELOAD_FROMMEMORY; - } - else if (loadflags == D3DRMLOAD_FROMFILE) - { - load_options = DXFILELOAD_FROMFILE; - TRACE("Loading from file %s\n", debugstr_a(filename)); - } - else - { - FIXME("Load options %ld not supported yet\n", loadflags); - return E_NOTIMPL; - } + clean_mesh_builder_data(mesh_builder); hr = DirectXFileCreate(&dxfile); if (hr != DXFILE_OK) @@ -1503,7 +1493,10 @@ static HRESULT WINAPI d3drm_mesh_builder3_Load(IDirect3DRMMeshBuilder3 *iface, v hr = IDirectXFile_CreateEnumObject(dxfile, filename, load_options, &enum_object); if (hr != DXFILE_OK) + { + WARN("Failed to create object, load flags %#lx.\n", loadflags); goto end; + } hr = IDirectXFileEnumObject_GetNextDataObject(enum_object, &data); if (hr != DXFILE_OK) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/167

June 15, 2022

[PATCH v6 0/1] MR167: d3drm: IDirect3DRMMeshBuilder3::Load support loading from resource

by Alistair Leslie-Hughes (＠alesliehughes)

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> -- v6: d3drm: Pass all D3DRM_LOAD* flags directly through to CreateEnumObject() in IDirect3DRMMeshBuilder3::Load(). https://gitlab.winehq.org/wine/wine/-/merge_requests/167

June 15, 2022

[PATCH 1/1] ntdll: Do not open directory file when setting the same directory path.

by Paul Gofman

From: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ntdll/path.c | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/dlls/ntdll/path.c b/dlls/ntdll/path.c index cccd000a6c6..519263c2c6a 100644 --- a/dlls/ntdll/path.c +++ b/dlls/ntdll/path.c @@ -905,13 +905,13 @@ ULONG WINAPI RtlGetCurrentDirectory_U(ULONG buflen, LPWSTR buf) NTSTATUS WINAPI RtlSetCurrentDirectory_U(const UNICODE_STRING* dir) { FILE_FS_DEVICE_INFORMATION device_info; + ULONG size, compare_size; OBJECT_ATTRIBUTES attr; UNICODE_STRING newdir; IO_STATUS_BLOCK io; CURDIR *curdir; HANDLE handle; NTSTATUS nts; - ULONG size; PWSTR ptr; newdir.Buffer = NULL; @@ -929,6 +929,22 @@ NTSTATUS WINAPI RtlSetCurrentDirectory_U(const UNICODE_STRING* dir) goto out; } + size = newdir.Length / sizeof(WCHAR); + ptr = newdir.Buffer; + ptr += 4; /* skip \??\ prefix */ + size -= 4; + + if (size && ptr[size - 1] == '\\') compare_size = size - 1; + else compare_size = size; + + if (curdir->DosPath.Length == (compare_size + 1) * sizeof(WCHAR) + && !memcmp( curdir->DosPath.Buffer, ptr, compare_size * sizeof(WCHAR) )) + { + TRACE( "dir %s is the same as current.\n", debugstr_us(dir) ); + nts = STATUS_SUCCESS; + goto out; + } + attr.Length = sizeof(attr); attr.RootDirectory = 0; attr.Attributes = OBJ_CASE_INSENSITIVE; @@ -953,10 +969,6 @@ NTSTATUS WINAPI RtlSetCurrentDirectory_U(const UNICODE_STRING* dir) curdir->Handle = handle; /* append trailing \ if missing */ - size = newdir.Length / sizeof(WCHAR); - ptr = newdir.Buffer; - ptr += 4; /* skip \??\ prefix */ - size -= 4; if (size && ptr[size - 1] != '\\') ptr[size++] = '\\'; /* convert \??\UNC\ path to \\ prefix */ -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/256

June 15, 2022

[PATCH 0/1] MR256: ntdll: Do not open directory file when setting the same directory path.

by Paul Gofman (＠gofman)

Fixes The Rising of The Shield Hero: Relieve the Animation hangs on start (and maybe something else with ENIGMA protector). The protector implements virtual file system which hotpatches a lot of file related functions, in particular, NtOpenFile(). When NtOpenFile() is called from RtlSetCurrentDirectory_U() with peb lock held the hotpatcher takes its own lock and that can deadlock with other threads performing file / path operations ending up in get_full_path_helper() which also takes PEB lock. Once the hotpatcher is initialized the game only sets "." or the same full path as current and may do that rather often. It seems that reopening the file handle for the same directory is redundant anyway, so probably makes sense to just avoid that part. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/256

June 15, 2022

Re: [PATCH 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=117086 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.

June 15, 2022

Re: [PATCH 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=117082 Your paranoid android. === build (build log) === WineRunBuild.pl:error: The build timed out

June 15, 2022

[PATCH 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 15, 2022

[PATCH 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..794a612821f 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) + 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 15, 2022

[PATCH 3/5] wined3d: Report WINED3D_FORMAT_CAP_BLIT for formats supporting VK_FORMAT_FEATURE_TRANSFER_SRC or VK_FORMAT_FEATURE_TRANSFER_DST.

by Zebediah Figura

From: Zebediah Figura <zfigura(a)codeweavers.com> Vulkan 1.0 implementations without KHR_maintenance1 will still be broken. In order to work around this we would have to try creating textures with TRANSFER_* usage. This does not seem worthwhile. --- dlls/wined3d/utils.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 7761576c058..06c95135678 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4397,6 +4397,11 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, { caps |= WINED3D_FORMAT_CAP_UNORDERED_ACCESS; } + if ((texture_flags & VK_FORMAT_FEATURE_TRANSFER_SRC_BIT) + && (texture_flags & VK_FORMAT_FEATURE_TRANSFER_DST_BIT)) + { + caps |= WINED3D_FORMAT_CAP_BLIT; + } if (!(~caps & (WINED3D_FORMAT_CAP_RENDERTARGET | WINED3D_FORMAT_CAP_FILTERING))) caps |= WINED3D_FORMAT_CAP_GEN_MIPMAP; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/255

June 15, 2022

[PATCH 2/5] wined3d: Add Vulkan format information for WINED3DFMT_B5G6R5_UNORM.

by Zebediah Figura

From: Zebediah Figura <zfigura(a)codeweavers.com> --- dlls/wined3d/utils.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 381c1ae7bc6..7761576c058 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -4300,6 +4300,7 @@ static void init_vulkan_format_info(struct wined3d_format_vk *format, {WINED3DFMT_B8G8R8A8_UNORM_SRGB, VK_FORMAT_B8G8R8A8_SRGB, }, {WINED3DFMT_B8G8R8X8_UNORM, VK_FORMAT_B8G8R8A8_UNORM, "XYZ1"}, {WINED3DFMT_B8G8R8X8_UNORM_SRGB, VK_FORMAT_B8G8R8A8_SRGB, "XYZ1"}, + {WINED3DFMT_B5G6R5_UNORM, VK_FORMAT_R5G6B5_UNORM_PACK16, }, {WINED3DFMT_BC1_UNORM, VK_FORMAT_BC1_RGBA_UNORM_BLOCK, }, {WINED3DFMT_BC1_UNORM_SRGB, VK_FORMAT_BC1_RGBA_SRGB_BLOCK, }, {WINED3DFMT_BC2_UNORM, VK_FORMAT_BC2_UNORM_BLOCK, }, -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/255

June 15, 2022