- Wine-Devel - list.winehq.org

Re: [PATCH 3/4] server: Report the socket error in sock_poll_event() on POLLERR or POLLHUP.
by Marvin July 22, 2022

July 22, 2022

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 full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=119378 Your paranoid android. === build (build log) === error: patch failed: server/sock.c:1090 error: patch failed: server/sock.c:645 error: patch failed: dlls/ws2_32/tests/afd.c:162 error: patch failed: server/sock.c:1145 Task: Patch failed to apply

1 0

Re: [PATCH 1/1] d3d11: Use CRT allocation functions.
by Marvin July 22, 2022

July 22, 2022

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=119444 Your paranoid android. === debian11 (64 bit WoW report) === d3d11: d3d11.c:1567: Test succeeded inside todo block: d3d11.c:1570: Test succeeded inside todo block: Got unexpected hr 0. d3d11.c:1570: Test succeeded inside todo block: d3d11.c:1570: Test succeeded inside todo block: Got unexpected hr 0.

1 0

Re: [PATCH 3/3] shell32: Reimplement SHBindToParent.
by Marvin July 21, 2022

July 21, 2022

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=119430 Your paranoid android. === debian11 (32 bit report) === shell32: shlfolder.c:5549: Test failed: got DEADBEEF === debian11 (32 bit Chinese:China report) === shell32: shlfolder.c:5549: Test failed: got DEADBEEF === debian11 (32 bit WoW report) === shell32: shlfolder.c:5549: Test failed: got DEADBEEF === debian11 (64 bit WoW report) === shell32: shlfolder.c:5549: Test failed: got 00000000DEADBEEF

1 0

Re: [PATCH v4] ntdll: Add RtlGetDeviceFamilyInfoEnum and RtlConvertDeviceFamilyInfoToString
by Kacper Rączy July 21, 2022

July 21, 2022

Is there anything else to be changed there, to get this accepted? BR, Kacper > > Wiadomość napisana przez Kacper rączy <gfw.kra(a)gmail.com> w dniu 06.07.2022, o godz. 14:10: > > >> === debian11 (64 bit WoW report) === >> ntdll: >> env.c:461: Test failed: wrong end ptr 000000000086195C/0000000000861960 > It also fails without the patch on my machine.

1 0

Re: [PATCH 1/3] wined3d: Do not try to unmap already unmapped BOs in wined3d_buffer_update_sub_resource().
by Marvin July 21, 2022

July 21, 2022

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 full results can be found at: https://testbot.winehq.org/JobDetails.pl?Key=119373 Your paranoid android. === debian11 (build log) === WineRunWineTest.pl:error: The previous 1 run(s) terminated abnormally

1 0

[PATCH 2/2] kernel32: Implement GetFileMUIInfo.
by Dmitry Timoshkov July 21, 2022

July 21, 2022

Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/tests/resource.c | 7 ++ dlls/kernelbase/locale.c | 145 ++++++++++++++++++++++++++++++++- 2 files changed, 149 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index 626645a8979..f8a49990e6b 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -617,6 +617,7 @@ static void test_GetFileMUIInfo(void) ret = GetFileMUIInfo(0, path, info, &size); ok(!ret, "GetFileMUIInfo should fail\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %lu\n", GetLastError()); + todo_wine ok(!size, "got %lu\n", size); ok(info->dwSize == sizeof(*info), "got %lu\n", info->dwSize); ok(!info->dwVersion, "got %08lx\n", info->dwVersion); @@ -653,7 +654,9 @@ static void test_GetFileMUIInfo(void) full_size = 0; SetLastError(0xdeadbeef); ret = GetFileMUIInfo(MUI_QUERY_ALL, path, NULL, &full_size); + todo_wine ok(!ret, "GetFileMUIInfo should fail\n"); + todo_wine ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", GetLastError()); memset(buf, 0, sizeof(buf)); @@ -666,7 +669,9 @@ static void test_GetFileMUIInfo(void) ok(!ret, "GetFileMUIInfo should fail\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %lu\n", GetLastError()); ok(info->dwVersion == 0, "got %08lx\n", info->dwVersion); + todo_wine ok(info->dwFileType == 0, "got %08lx\n", info->dwFileType); + todo_wine ok(!memcmp(info->abBuffer, zero, 8), "got %.8s\n", info->abBuffer); memset(buf, 0, sizeof(buf)); @@ -700,8 +705,10 @@ static void test_GetFileMUIInfo(void) ret = GetFileMUIInfo(MUI_QUERY_ALL, path, info, &size); ok(!ret, "GetFileMUIInfo should fail\n"); ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %lu\n", GetLastError()); + todo_wine ok(size == 0, "got %08lx\n", size); ok(info->dwVersion == 0, "got %08lx\n", info->dwVersion); + todo_wine ok(info->dwFileType == 0, "got %08lx\n", info->dwFileType); ok(!memcmp(info->abBuffer, zero, 8), "got %.8s\n", info->abBuffer); diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c index 0c20c858a7a..19c4707cec8 100644 --- a/dlls/kernelbase/locale.c +++ b/dlls/kernelbase/locale.c @@ -5699,15 +5699,154 @@ done: } +typedef struct +{ + DWORD dwSignature; + DWORD dwSize; + DWORD dwVersion; + DWORD unknown1; + DWORD unknown2; + DWORD unknown3; + DWORD dwFileType; + BYTE pServiceChecksum[16]; + BYTE pChecksum[16]; + DWORD unknown4[6]; + DWORD dwTypeNameMainOffset; + DWORD dwTypeNameMainSize; + DWORD dwTypeIDMainOffset; + DWORD dwTypeIDMainSize; + DWORD dwTypeNameMUIOffset; + DWORD dwTypeNameMUISize; + DWORD dwTypeIDMUIOffset; + DWORD dwTypeIDMUISize; + DWORD unknown5; + DWORD unknown6; + DWORD dwLanguageNameOffset; + DWORD dwLanguageNameSize; +} MUI_RC_CONFIG; + /****************************************************************************** * GetFileMUIInfo (kernelbase.@) */ BOOL WINAPI /* DECLSPEC_HOTPATCH */ GetFileMUIInfo( DWORD flags, const WCHAR *path, FILEMUIINFO *info, DWORD *size ) { - FIXME( "stub: %lu, %s, %p, %p\n", flags, debugstr_w(path), info, size ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; + HMODULE module; + HRSRC rsrc; + MUI_RC_CONFIG *rc_cfg; + DWORD rc_size; + + TRACE( "(%08lx,%s,%p,%p)\n", flags, debugstr_w(path), info, size ); + + if (!size) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + if (info) + { + if (*size < sizeof(FILEMUIINFO)) + { + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + + if (*size != info->dwSize || !info->dwVersion) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + } + else if (*size) + { + SetLastError( ERROR_INVALID_PARAMETER ); + return FALSE; + } + + module = LoadLibraryExW( path, 0, LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE ); + if (!module) return FALSE; + + rsrc = FindResourceW( module, MAKEINTRESOURCEW(1), L"MUI" ); + if (!rsrc) + { + FreeLibrary( module ); + return FALSE; + } + + rc_cfg = LockResource( LoadResource( module, rsrc ) ); + + rc_size = sizeof(*info); + if (flags & MUI_QUERY_RESOURCE_TYPES) + { + rc_size += rc_cfg->dwTypeNameMainSize; + rc_size += rc_cfg->dwTypeIDMainSize; + rc_size += rc_cfg->dwTypeNameMUISize; + rc_size += rc_cfg->dwTypeIDMUISize; + } + if (flags & MUI_QUERY_LANGUAGE_NAME) + rc_size += rc_cfg->dwLanguageNameSize; + + if (info) + { + char *p = (char *)(info + 1); + DWORD offset = sizeof(*info); + + memset( (char *)info + 8, 0, *size - 8 ); /* keep original dwSize/dwVersion */ + + if (flags & MUI_QUERY_TYPE) + info->dwFileType = rc_cfg->dwFileType; + + if (flags & MUI_QUERY_CHECKSUM) + { + memcpy( info->pChecksum, rc_cfg->pChecksum, sizeof(info->pChecksum) ); + memcpy( info->pServiceChecksum, rc_cfg->pServiceChecksum, sizeof(info->pServiceChecksum) ); + } + + if (*size < rc_size) + { + FreeLibrary( module ); + SetLastError( ERROR_INSUFFICIENT_BUFFER ); + return FALSE; + } + + if (flags & MUI_QUERY_RESOURCE_TYPES) + { + info->dwTypeNameMainOffset = offset; + memcpy( p, (char *)rc_cfg + rc_cfg->dwTypeNameMainOffset, rc_cfg->dwTypeNameMainSize ); + p += rc_cfg->dwTypeNameMainSize; + offset += rc_cfg->dwTypeNameMainSize; + + info->dwTypeIDMainOffset = offset; + info->dwTypeIDMainSize = rc_cfg->dwTypeIDMainSize / sizeof(DWORD); + memcpy( p, (char *)rc_cfg + rc_cfg->dwTypeIDMainOffset, rc_cfg->dwTypeIDMainSize ); + p += rc_cfg->dwTypeIDMainSize; + offset += rc_cfg->dwTypeIDMainSize; + + info->dwTypeNameMUIOffset = offset; + memcpy( p, (char *)rc_cfg + rc_cfg->dwTypeNameMUIOffset, rc_cfg->dwTypeNameMUISize ); + p += rc_cfg->dwTypeNameMUISize; + offset += rc_cfg->dwTypeNameMUISize; + + info->dwTypeIDMUIOffset = offset; + info->dwTypeIDMUISize = rc_cfg->dwTypeIDMUISize / sizeof(DWORD); + memcpy( p, (char *)rc_cfg + rc_cfg->dwTypeIDMUIOffset, rc_cfg->dwTypeIDMUISize ); + p += rc_cfg->dwTypeIDMUISize; + offset += rc_cfg->dwTypeIDMUISize; + } + + if (flags & MUI_QUERY_LANGUAGE_NAME) + { + info->dwLanguageNameOffset = offset; + memcpy( p, (char *)rc_cfg + rc_cfg->dwLanguageNameOffset, rc_cfg->dwLanguageNameSize ); + } + } + else + *size = rc_size; + + FreeLibrary( module ); + + return TRUE; } -- 2.37.1

1 0

[PATCH 1/2] kernel32/tests: Add some tests for GetFileMUIInfo().
by Dmitry Timoshkov July 21, 2022

July 21, 2022

MUI_RC_CONFIG layout is based on the description from http://hostagebrain.blogspot.com/2015/11/multilingual-user-interface.html Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/kernel32/tests/resource.c | 235 ++++++++++++++++++++++++++++++++- 1 file changed, 234 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/resource.c b/dlls/kernel32/tests/resource.c index 6c5bc99c0c5..626645a8979 100644 --- a/dlls/kernel32/tests/resource.c +++ b/dlls/kernel32/tests/resource.c @@ -2,6 +2,7 @@ * Unit test suite for resource functions. * * Copyright 2006 Mike McCormack + * Copyright 2022 Dmitry Timoshkov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,8 +19,10 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <windows.h> +#include <stdarg.h> #include <stdio.h> +#include <assert.h> +#include <windows.h> #include "wine/test.h" @@ -520,10 +523,240 @@ static void test_internal_structure(void) ok( EndUpdateResourceW( res, TRUE ), "EndUpdateResourceW failed\n"); } +typedef struct +{ + DWORD dwSignature; + DWORD dwSize; + DWORD dwVersion; + DWORD unknown1; + DWORD unknown2; + DWORD unknown3; + DWORD dwFileType; + BYTE pServiceChecksum[16]; + BYTE pChecksum[16]; + DWORD unknown4[6]; + DWORD dwTypeNameMainOffset; + DWORD dwTypeNameMainSize; + DWORD dwTypeIDMainOffset; + DWORD dwTypeIDMainSize; + DWORD dwTypeNameMUIOffset; + DWORD dwTypeNameMUISize; + DWORD dwTypeIDMUIOffset; + DWORD dwTypeIDMUISize; + DWORD unknown5; + DWORD unknown6; + DWORD dwLanguageNameOffset; + DWORD dwLanguageNameSize; +} MUI_RC_CONFIG; + +static void *offset_to_data(void *base, DWORD offset) +{ + return (char *)base + offset; +} + +static void test_GetFileMUIInfo(void) +{ +#define MUI_QUERY_ALL (MUI_QUERY_TYPE | MUI_QUERY_CHECKSUM | MUI_QUERY_LANGUAGE_NAME | MUI_QUERY_RESOURCE_TYPES) + static const BYTE zero[8]; + static const WCHAR path[] = L"urlmon.dll"; + char buf[1024]; + HRSRC rsrc; + MUI_RC_CONFIG *rc_cfg; + char *p1, *p2; + FILEMUIINFO *info = (FILEMUIINFO *)buf; + DWORD size, full_size; + HMODULE module; + int ret; + + module = LoadLibraryExW(path, 0, LOAD_LIBRARY_AS_IMAGE_RESOURCE | LOAD_LIBRARY_AS_DATAFILE); + ok(module != NULL, "LoadLibraryEx error %lu\n", GetLastError()); + rsrc = FindResourceW(module, MAKEINTRESOURCEW(1), L"MUI"); + todo_wine + ok(rsrc != 0, "MUI resource not found\n"); + if (!rsrc) + { + skip("MUI resource not found\n"); + FreeLibrary(module); + return; + } + rc_cfg = LockResource(LoadResource(module, rsrc)); + ok(rc_cfg->dwVersion == MAKELONG(0,1), "got %08lx\n", rc_cfg->dwVersion); + ok(rc_cfg->dwFileType == MUI_FILETYPE_LANGUAGE_NEUTRAL_MAIN, "got %08lx\n", rc_cfg->dwFileType); + + SetLastError(0xdeadbeef); + ret = GetFileMUIInfo(0, path, NULL, NULL); + ok(!ret, "GetFileMUIInfo should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %lu\n", GetLastError()); + + info->dwSize = sizeof(*info); + SetLastError(0xdeadbeef); + ret = GetFileMUIInfo(0, path, info, NULL); + ok(!ret, "GetFileMUIInfo should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %lu\n", GetLastError()); + + size = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetFileMUIInfo(MUI_QUERY_ALL, path, NULL, &size); + ok(!ret, "GetFileMUIInfo should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %lu\n", GetLastError()); + + size = 0; + ret = GetFileMUIInfo(0, path, NULL, &size); + ok(ret, "GetFileMUIInfo error %lu\n", GetLastError()); + ok(size == sizeof(FILEMUIINFO), "got %lu bytes\n", size); + + memset(info, 0, sizeof(*info)); + size = info->dwSize = sizeof(*info) - 1; + SetLastError(0xdeadbeef); + ret = GetFileMUIInfo(0, path, info, &size); + ok(!ret, "GetFileMUIInfo should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", GetLastError()); + + memset(info, 0, sizeof(*info)); + size = info->dwSize = sizeof(*info); + ret = GetFileMUIInfo(0, path, info, &size); + ok(!ret, "GetFileMUIInfo should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %lu\n", GetLastError()); + ok(!size, "got %lu\n", size); + ok(info->dwSize == sizeof(*info), "got %lu\n", info->dwSize); + ok(!info->dwVersion, "got %08lx\n", info->dwVersion); + + memset(info, 0, sizeof(*info)); + size = info->dwSize = sizeof(*info); + info->dwVersion = MUI_FILEINFO_VERSION; + ret = GetFileMUIInfo(0, path, info, &size); + ok(ret, "GetFileMUIInfo error %lu\n", GetLastError()); + + memset(buf, 0, sizeof(buf)); + size = info->dwSize = 1; + info->dwVersion = MUI_FILEINFO_VERSION; + info->dwFileType = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetFileMUIInfo(0, path, info, &size); + ok(!ret, "GetFileMUIInfo should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", GetLastError()); + ok(info->dwVersion == MUI_FILEINFO_VERSION, "got %08lx\n", info->dwVersion); + ok(info->dwFileType == 0xdeadbeef, "got %08lx\n", info->dwFileType); + + memset(buf, 0, sizeof(buf)); + info->dwSize = sizeof(*info); + size = sizeof(*info) + 1; + info->dwVersion = MUI_FILEINFO_VERSION; + info->dwFileType = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetFileMUIInfo(0, path, info, &size); + ok(!ret, "GetFileMUIInfo should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %lu\n", GetLastError()); + ok(info->dwVersion == MUI_FILEINFO_VERSION, "got %08lx\n", info->dwVersion); + ok(info->dwFileType == 0xdeadbeef, "got %08lx\n", info->dwFileType); + + full_size = 0; + SetLastError(0xdeadbeef); + ret = GetFileMUIInfo(MUI_QUERY_ALL, path, NULL, &full_size); + ok(!ret, "GetFileMUIInfo should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", GetLastError()); + + memset(buf, 0, sizeof(buf)); + info->dwSize = size = sizeof(*info); + info->dwVersion = 0; + info->dwFileType = 0xdeadbeef; + memcpy(info->abBuffer, "deadbeef", 8); + SetLastError(0xdeadbeef); + ret = GetFileMUIInfo(MUI_QUERY_ALL, path, info, &size); + ok(!ret, "GetFileMUIInfo should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %lu\n", GetLastError()); + ok(info->dwVersion == 0, "got %08lx\n", info->dwVersion); + ok(info->dwFileType == 0, "got %08lx\n", info->dwFileType); + ok(!memcmp(info->abBuffer, zero, 8), "got %.8s\n", info->abBuffer); + + memset(buf, 0, sizeof(buf)); + info->dwSize = size = sizeof(*info); + info->dwVersion = 0xdeadbeef; + info->dwFileType = 0xdeadbeef; + memcpy(info->abBuffer, "deadbeef", 8); + SetLastError(0xdeadbeef); + ret = GetFileMUIInfo(MUI_QUERY_ALL, path, info, &size); + ok(!ret, "GetFileMUIInfo should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", GetLastError()); + ok(info->dwVersion == 0xdeadbeef, "got %08lx\n", info->dwVersion); + ok(info->dwFileType == MUI_FILETYPE_LANGUAGE_NEUTRAL_MAIN, "got %08lx\n", info->dwFileType); + ok(!memcmp(info->abBuffer, zero, 8), "got %.8s\n", info->abBuffer); + + memset(buf, 0, sizeof(buf)); + info->dwSize = size = sizeof(*info); + info->dwVersion = 0xdeadbeef; + info->dwFileType = 0xdeadbeef; + SetLastError(0xdeadbeef); + ret = GetFileMUIInfo(MUI_QUERY_ALL, path, info, &size); + ok(!ret, "GetFileMUIInfo should fail\n"); + ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "got %lu\n", GetLastError()); + ok(info->dwVersion == 0xdeadbeef, "got %08lx\n", info->dwVersion); + ok(info->dwFileType == MUI_FILETYPE_LANGUAGE_NEUTRAL_MAIN, "got %08lx\n", info->dwFileType); + + memset(buf, 0, sizeof(buf)); + info->dwSize = size = full_size; + info->dwVersion = 0; + info->dwFileType = 0xdeadbeef; + ret = GetFileMUIInfo(MUI_QUERY_ALL, path, info, &size); + ok(!ret, "GetFileMUIInfo should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "got %lu\n", GetLastError()); + ok(size == 0, "got %08lx\n", size); + ok(info->dwVersion == 0, "got %08lx\n", info->dwVersion); + ok(info->dwFileType == 0, "got %08lx\n", info->dwFileType); + ok(!memcmp(info->abBuffer, zero, 8), "got %.8s\n", info->abBuffer); + + memset(buf, 0, sizeof(buf)); + info->dwSize = size = full_size; + info->dwVersion = MUI_FILEINFO_VERSION; + info->dwFileType = 0xdeadbeef; + ret = GetFileMUIInfo(MUI_QUERY_ALL, path, info, &size); + ok(ret || broken(GetLastError() == ERROR_INSUFFICIENT_BUFFER) /* Some Win10 versions */, "GetFileMUIInfo error %lu\n", GetLastError()); + while (!ret) /* Try to recover from Win10 breakage */ + { + size += 2; + assert(size <= sizeof(buf)); + info->dwSize = size; + ret = GetFileMUIInfo(MUI_QUERY_ALL, path, info, &size); + } + ok(info->dwVersion == MUI_FILEINFO_VERSION, "got %08lx\n", info->dwVersion); + ok(info->dwFileType == MUI_FILETYPE_LANGUAGE_NEUTRAL_MAIN, "got %08lx\n", info->dwFileType); + + ok(!memcmp(info->pChecksum, rc_cfg->pChecksum, 16), "Checksum doesn't match\n"); + ok(!memcmp(info->pServiceChecksum, rc_cfg->pServiceChecksum, 16), "ServiceChecksum doesn't match\n"); + + p1 = offset_to_data(rc_cfg, rc_cfg->dwLanguageNameOffset); + p2 = offset_to_data(info, info->dwLanguageNameOffset); + ok(!memcmp(p1, p2, rc_cfg->dwLanguageNameSize), "LanguageName doesn't match\n"); + + p1 = offset_to_data(rc_cfg, rc_cfg->dwTypeNameMainOffset); + p2 = offset_to_data(info, info->dwTypeNameMainOffset); + ok(!memcmp(p1, p2, rc_cfg->dwTypeNameMainSize), "TypeNameMain doesn't match\n"); + + p1 = offset_to_data(rc_cfg, rc_cfg->dwTypeIDMainOffset); + p2 = offset_to_data(info, info->dwTypeIDMainOffset); + ok(rc_cfg->dwTypeIDMainSize == info->dwTypeIDMainSize * sizeof(DWORD), "dwTypeIDMainSize %#08lx != %08lx\n", + rc_cfg->dwTypeIDMainSize, info->dwTypeIDMainSize); + ok(!memcmp(p1, p2, rc_cfg->dwTypeIDMainSize), "TypeIDMain doesn't match\n"); + + p1 = offset_to_data(rc_cfg, rc_cfg->dwTypeIDMUIOffset); + p2 = offset_to_data(info, info->dwTypeIDMUIOffset); + ok(rc_cfg->dwTypeIDMUISize == info->dwTypeIDMUISize * sizeof(DWORD), "dwTypeIDMUISize %#08lx != %08lx\n", + rc_cfg->dwTypeIDMUISize, info->dwTypeIDMUISize); + ok(!memcmp(p1, p2, rc_cfg->dwTypeIDMUISize), "TypeIDMUI doesn't match\n"); + + p1 = offset_to_data(rc_cfg, rc_cfg->dwTypeNameMUIOffset); + p2 = offset_to_data(info, info->dwTypeNameMUIOffset); + ok(!memcmp(p1, p2, rc_cfg->dwTypeNameMUISize), "TypeNameMUI doesn't match\n"); + + FreeLibrary(module); +} + START_TEST(resource) { DWORD i; + test_GetFileMUIInfo(); + DeleteFileA( filename ); update_missing_exe(); -- 2.37.1

1 0

[PATCH vkd3d 1/2] vkd3d: Delay adding a command queue to the blocked list until after the op is written.
by Conor McCarthy July 20, 2022

July 20, 2022

Otherwise the following sequence can occur: 1. A command queue is added to the blocked list during a Wait() call. 2. An unblocking Signal() occurs on the CPU in another thread, flushing the blocked ops, but as no op has been written, the queue is removed from the blocked list. 3. The blocked op is written. 3. Another op is queued and the queue is not re-added to the blocked list because this only happens for the first op. World of Warcraft triggers this issue. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- libs/vkd3d/command.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index d0782e5a..7452128c 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -6812,12 +6812,6 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *if * where multiple queues alias over the same physical queue, so effectively, * we need to manage out-of-order submits ourselves. */ - if (!command_queue->ops_count) - hr = d3d12_device_add_blocked_command_queues(command_queue->device, &command_queue, 1); - - if (FAILED(hr)) - goto done; - if (!(op = d3d12_command_queue_require_space_locked(command_queue))) { hr = E_OUTOFMEMORY; @@ -6829,6 +6823,11 @@ static HRESULT STDMETHODCALLTYPE d3d12_command_queue_Wait(ID3D12CommandQueue *if d3d12_fence_incref(fence); + /* Add the queue to the blocked list after writing the op to ensure the queue isn't + * removed again in another thread because it has no ops. */ + if (command_queue->ops_count == 1) + hr = d3d12_device_add_blocked_command_queues(command_queue->device, &command_queue, 1); + done: vkd3d_mutex_unlock(&command_queue->op_mutex); return hr; -- 2.36.1

3 4

[PATCH vkd3d v2 1/3] tests: Test float4 UAV buffer load store.
by Conor McCarthy July 20, 2022

July 20, 2022

This currently fails if the shader loads from the UAV, because it causes vkd3d-shader to specify the R32ui format instead of Unknown. Signed-off-by: Conor McCarthy <cmccarthy(a)codeweavers.com> --- v2: Make the load/store test independent of the store test. --- tests/d3d12.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index ec5cfb20..57e072e4 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -20947,6 +20947,56 @@ static void test_typed_buffer_uav(void) 0x00000000, 0x0002100a, 0x00004001, 0x00000020, 0x0002400a, 0x0a0000a4, 0x0011e0f2, 0x00000000, 0x00100006, 0x00000000, 0x00004002, 0x3f000000, 0x3f000000, 0x3f000000, 0x3f000000, 0x0100003e, }; + static const DWORD cs_vec4_code[] = + { +#if 0 + RWBuffer<float4> buffer; + + [numthreads(8, 1, 1)] + void main(uint3 group_id : SV_groupID, uint group_index : SV_GroupIndex) + { + uint global_index = 8 * group_id.x + group_index; + buffer[global_index] = float4(0.5f, 0.625f, 0.75f, 1.0f); + } +#endif + 0x43425844, 0x37e9fa91, 0x11ca38f4, 0x9d4a70b7, 0x4fd05c45, 0x00000001, 0x000000e0, 0x00000003, + 0x0000002c, 0x0000003c, 0x0000004c, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x0000008c, 0x00050050, 0x00000023, 0x0100086a, + 0x0400089c, 0x0011e000, 0x00000000, 0x00005555, 0x0200005f, 0x00024000, 0x0200005f, 0x00021012, + 0x02000068, 0x00000001, 0x0400009b, 0x00000008, 0x00000001, 0x00000001, 0x07000023, 0x00100012, + 0x00000000, 0x0002100a, 0x00004001, 0x00000008, 0x0002400a, 0x0a0000a4, 0x0011e0f2, 0x00000000, + 0x00100006, 0x00000000, 0x00004002, 0x3f000000, 0x3f200000, 0x3f400000, 0x3f800000, 0x0100003e, + }; + static const DWORD cs_vec4_load_code[] = + { + /* Compiled with /Od */ +#if 0 + RWBuffer<float4> buffer; + + [numthreads(4, 1, 1)] + void main(uint3 group_id : SV_groupID, uint group_index : SV_GroupIndex) + { + uint global_index = 8 * group_id.x + group_index * 2u; + buffer[global_index] = float4(0.5f, 0.625f, 0.75f, 1.0f); + buffer[global_index + 1] = buffer[global_index]; + } +#endif + 0x43425844, 0x0b7914da, 0x7379094c, 0xa3567660, 0xeb9df127, 0x00000001, 0x000001b0, 0x00000004, + 0x00000030, 0x00000040, 0x00000050, 0x000001a0, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, + 0x4e47534f, 0x00000008, 0x00000000, 0x00000008, 0x58454853, 0x00000148, 0x00050050, 0x00000052, + 0x0100886a, 0x0400089c, 0x0011e000, 0x00000000, 0x00005555, 0x0200005f, 0x00024000, 0x0200005f, + 0x00021012, 0x02000068, 0x00000002, 0x0400009b, 0x00000004, 0x00000001, 0x00000001, 0x05000036, + 0x00100012, 0x00000000, 0x00004001, 0x00000008, 0x07000026, 0x0000d000, 0x00100012, 0x00000000, + 0x0010000a, 0x00000000, 0x0002100a, 0x07000026, 0x0000d000, 0x00100022, 0x00000000, 0x0002400a, + 0x00004001, 0x00000002, 0x0700001e, 0x00100012, 0x00000000, 0x0010001a, 0x00000000, 0x0010000a, + 0x00000000, 0x0a0000a4, 0x0011e0f2, 0x00000000, 0x00100006, 0x00000000, 0x00004002, 0x3f000000, + 0x3f200000, 0x3f400000, 0x3f800000, 0x05000036, 0x00100022, 0x00000000, 0x00004001, 0x00000001, + 0x0700001e, 0x00100022, 0x00000000, 0x0010001a, 0x00000000, 0x0010000a, 0x00000000, 0x890000a3, + 0x80000042, 0x00155543, 0x001000f2, 0x00000001, 0x00100006, 0x00000000, 0x0011ee46, 0x00000000, + 0x070000a4, 0x0011e0f2, 0x00000000, 0x00100556, 0x00000000, 0x00100e46, 0x00000001, 0x0100003e, + 0x30494653, 0x00000008, 0x00000800, 0x00000000, + }; + static const struct vec4 expected = {0.5f, 0.625f, 0.75f, 1.0f}; if (!init_compute_test_context(&context)) return; @@ -21004,6 +21054,48 @@ static void test_typed_buffer_uav(void) check_readback_data_float(&rb.rb, NULL, 0.5f, 0); release_resource_readback(&rb); + reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, resource, 0, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + ID3D12PipelineState_Release(pipeline_state); + pipeline_state = create_compute_pipeline_state(device, root_signature, + shader_bytecode(cs_vec4_code, sizeof(cs_vec4_code))); + + uav_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + uav_desc.Buffer.NumElements = 16; + ID3D12Device_CreateUnorderedAccessView(device, resource, NULL, &uav_desc, cpu_descriptor_handle); + + ID3D12GraphicsCommandList_SetPipelineState(command_list, pipeline_state); + ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, root_signature); + ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, gpu_descriptor_handle); + ID3D12GraphicsCommandList_Dispatch(command_list, 2, 1, 1); + + transition_sub_resource_state(command_list, resource, 0, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + + get_buffer_readback_with_command_list(resource, uav_desc.Format, &rb, queue, command_list); + check_readback_data_vec4(&rb.rb, NULL, &expected, 0); + release_resource_readback(&rb); + + reset_command_list(command_list, context.allocator); + transition_sub_resource_state(command_list, resource, 0, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_UNORDERED_ACCESS); + ID3D12PipelineState_Release(pipeline_state); + pipeline_state = create_compute_pipeline_state(device, root_signature, + shader_bytecode(cs_vec4_load_code, sizeof(cs_vec4_load_code))); + + ID3D12GraphicsCommandList_SetPipelineState(command_list, pipeline_state); + ID3D12GraphicsCommandList_SetComputeRootSignature(command_list, root_signature); + ID3D12GraphicsCommandList_SetComputeRootDescriptorTable(command_list, 0, gpu_descriptor_handle); + ID3D12GraphicsCommandList_Dispatch(command_list, 2, 1, 1); + + transition_sub_resource_state(command_list, resource, 0, + D3D12_RESOURCE_STATE_UNORDERED_ACCESS, D3D12_RESOURCE_STATE_COPY_SOURCE); + + get_buffer_readback_with_command_list(resource, uav_desc.Format, &rb, queue, command_list); + todo check_readback_data_vec4(&rb.rb, NULL, &expected, 0); + release_resource_readback(&rb); + ID3D12Resource_Release(resource); ID3D12RootSignature_Release(root_signature); ID3D12PipelineState_Release(pipeline_state); -- 2.36.1

2 1

How to propagate Linux device ready for read FD state to Wine proxy WDM driver
by Pavel Pisa July 20, 2022

July 20, 2022

Dear wine developers, I monitor from time to time Wine development state. I have significant interrest to use it for our open-source chromatography processing and control system CHROMuLAN http://pikron.com/pages/products/hplc/chromulan.html . It runs well under wine for years except for minor problem with excessive size of new analysis setup dialog, it is old Delphi 6 app. If somebody is willing to look at it I give more information or setup issue. But uLAN driver access is required to control real devices and acquire data http://ulan.sourceforge.net/ Driver is available in source form from 1996 year and it has been developed and is maintained on GNU/Linux system but with CHROMuLAN windows build from the same sources is used from Windows NT 3.5 days. I have idea in 2013 year to try implement proxy driver which allows to access native Linux kernel driver from Windows application. I have found at that time that Wine protocol is able to deliver data between wine server driver and application only for IOCTLs, read and write calls has not been implemented for device driver file handle type and I have documented problem on WineHQ list https://www.winehq.org/pipermail/wine-devel/2013-July/thread.html#100409 But when I looked into latest Wine sources I have noticed, that it should not be problem anymore. So I have cleaned from the dust old experiment and updated it for actual Wine. Linux driver interaction has been separated from WDM proxy part and marked (ul_l_drv.c) #if 0 #pragma makedep unix #endif unix calls conversion has been added (ul_l_exports.c) const unixlib_entry_t __wine_unix_call_funcs[] = and real WDM has been used as base for the proxy driver (ul_drv.c, device.c). Both originally based on some Wine driver to emulate disk and other behavior. The code is available there https://cmp.felk.cvut.cz/~pisa/ulan/wine/ul_drv.sys/ and it works with whole CHROMuLAN system. Yes, there is lot of space for cleanups, service is started in manual mode unconditionally etc.. [System\\CurrentControlSet\\Services\\ul_drv] 1658091793 ... "Start"=dword:00000001 etc... There is one missing feature and it is wait for arrival of the new messages without periodic polling. It is easy on Linux side, select, poll, epoll can be used for ready for read. In Windows world select does not work for device drivers so IOCTL is used which marks IoMarkIrpPending, then user can wait for associated overlapped event for example by WaitForSingleObject. I have implemented logic in Wine proxy driver and IRP is marked by IoMarkIrpPending, cancellation and all other stuff seems to work. But I need somehow bind event on Linux native file descriptor which is maintained in makedep unix with some way to mark corresponding IRP in Windows driver part as complete IoCompleteRequest(old_irp,IO_NO_INCREMENT); What are the options? Should, can I can start service thread in makedep unix part and call IoCompleteRequest from there? In the fact I would prefer even more only register callback in the Wise server main loop which would be called when Linux device file descriptor is ready to read. Is there some example how to do something like that? What are locking requirements and limitations? It is more for curiosity now, we experimental port to FPC/Lazarus which runs on Linux and Windows now, but on the other hand there are still some features missing in that build, Lazarus with Gtk does not implement MDI in really usable form etc... So there is still some potential for this and other applications using uLAN to be run under Wine. Thanks for your time and best wishes, Pavel -- Pavel Pisa phone: +420 603531357 e-mail: pisa(a)cmp.felk.cvut.cz Department of Control Engineering FEE CVUT Karlovo namesti 13, 121 35, Prague 2 university: https://control.fel.cvut.cz/ company: https://www.pikron.com/ personal: https://cmp.felk.cvut.cz/~pisa projects: https://www.openhub.net/accounts/ppisa CAN related:http://canbus.pages.fel.cvut.cz/ RISC-V education: https://comparch.edu.cvut.cz/ Open Technologies Research Education and Exchange Services https://gitlab.fel.cvut.cz/otrees/org/-/wikis/home

2 1