wine-devel

wine-devel@winehq.org

9 participants
84458 discussions

Re: [PATCH v2 7/7] dinput/tests: Test GetObjectInfo() with three sliders and a proper format.
by Marvin 25 Jul '22

25 Jul '22

1 0

Re: [PATCH v2 6/7] dinput/tests: Assert that we can't get info about the third slider with c_dfDIJoystick2.
by Marvin 25 Jul '22

25 Jul '22

1 0

Re: [PATCH v2 5/7] dinput: Use GUID_Slider type for dials.
by Marvin 25 Jul '22

25 Jul '22

1 0

Re: [PATCH v2 3/7] dinput/tests: Use helper for checking device object instances.
by Marvin 25 Jul '22

25 Jul '22

1 0

Re: [PATCH v4 2/2] mfplat/tests: Merge and reorganize image format tests.
by Marvin 25 Jul '22

25 Jul '22

1 0

Re: [PATCH v4 1/2] mfplat/tests: Mark some tests as broken on Win 8 and 10 v1507.
by Marvin 25 Jul '22

25 Jul '22

1 0

Re: [PATCH v2 09/10] mshtml: Implement ProgressEvent's total prop.
by Marvin 23 Jul '22

23 Jul '22

1 0

Testbot outage
by Jeremy White 23 Jul '22

23 Jul '22

Hi all, We are moving offices. As a result, the WineHQ testnet that powers testbot will be unavailable for some time, starting at 1:30 CDT. It will hopefully just be for the afternoon. Cheers, Jeremy

3 2

Re: [PATCH v2 07/10] mshtml: Implement ProgressEvent's lengthComputable prop.
by Marvin 22 Jul '22

22 Jul '22

1 0

Re: [PATCH v2 1/8] dlls/msvcrt: improve support for template in methods
by Marvin 22 Jul '22

22 Jul '22

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=119463 Your paranoid android. === debian11 (32 bit report) === msvcrt: cpp.c:1310: Test failed: 136: Got name "public: __cdecl foo<double>::operator <int>int(void) __ptr64" cpp.c:1313: Test failed: 136: Expected "public: __cdecl foo<double>::operator<int> int(void) __ptr64" === debian11 (32 bit Arabic:Morocco report) === msvcrt: cpp.c:1310: Test failed: 136: Got name "public: __cdecl foo<double>::operator <int>int(void) __ptr64" cpp.c:1313: Test failed: 136: Expected "public: __cdecl foo<double>::operator<int> int(void) __ptr64" === debian11 (32 bit German report) === msvcrt: cpp.c:1310: Test failed: 136: Got name "public: __cdecl foo<double>::operator <int>int(void) __ptr64" cpp.c:1313: Test failed: 136: Expected "public: __cdecl foo<double>::operator<int> int(void) __ptr64" === debian11 (32 bit French report) === msvcrt: cpp.c:1310: Test failed: 136: Got name "public: __cdecl foo<double>::operator <int>int(void) __ptr64" cpp.c:1313: Test failed: 136: Expected "public: __cdecl foo<double>::operator<int> int(void) __ptr64" === debian11 (32 bit Hebrew:Israel report) === msvcrt: cpp.c:1310: Test failed: 136: Got name "public: __cdecl foo<double>::operator <int>int(void) __ptr64" cpp.c:1313: Test failed: 136: Expected "public: __cdecl foo<double>::operator<int> int(void) __ptr64" === debian11 (32 bit Hindi:India report) === msvcrt: cpp.c:1310: Test failed: 136: Got name "public: __cdecl foo<double>::operator <int>int(void) __ptr64" cpp.c:1313: Test failed: 136: Expected "public: __cdecl foo<double>::operator<int> int(void) __ptr64" === debian11 (32 bit Japanese:Japan report) === msvcrt: cpp.c:1310: Test failed: 136: Got name "public: __cdecl foo<double>::operator <int>int(void) __ptr64" cpp.c:1313: Test failed: 136: Expected "public: __cdecl foo<double>::operator<int> int(void) __ptr64" === debian11 (32 bit Chinese:China report) === msvcrt: cpp.c:1310: Test failed: 136: Got name "public: __cdecl foo<double>::operator <int>int(void) __ptr64" cpp.c:1313: Test failed: 136: Expected "public: __cdecl foo<double>::operator<int> int(void) __ptr64" === debian11 (32 bit WoW report) === msvcrt: cpp.c:1310: Test failed: 136: Got name "public: __cdecl foo<double>::operator <int>int(void) __ptr64" cpp.c:1313: Test failed: 136: Expected "public: __cdecl foo<double>::operator<int> int(void) __ptr64" === debian11 (64 bit WoW report) === msvcrt: cpp.c:1310: Test failed: 136: Got name "public: __cdecl foo<double>::operator <int>int(void) __ptr64" cpp.c:1313: Test failed: 136: Expected "public: __cdecl foo<double>::operator<int> int(void) __ptr64"

1 0

Re: [PATCH 2/8] dinput/test: Print the expected values in check_ macros.
by Marvin 22 Jul '22

22 Jul '22

1 0

Re: [PATCH 2/3] shell32: Add SHBindToFolderIDListParent tests.
by Marvin 22 Jul '22

22 Jul '22

1 0

Re: [PATCH 8/8] dinput/tests: Test GetObjectInfo() with three sliders and a proper format.
by Marvin 22 Jul '22

22 Jul '22

1 0

Re: [PATCH 4/8] dinputs/tests: Use helper for checking device object instances.
by Marvin 22 Jul '22

22 Jul '22

1 0

Re: [PATCH 3/4] ws2_32: Map AFD_POLL_RESET to both POLLHUP and POLLERR.
by Marvin 22 Jul '22

22 Jul '22

1 0

Re: [PATCH v2 6/9] win32u/tests: Add tests for catching exceptions from timer proc.
by Marvin 22 Jul '22

22 Jul '22

1 0

Re: [PATCH v2 3/9] win32u: Avoid using client callbacks for NtUserSendMessage.
by Marvin 22 Jul '22

22 Jul '22

1 0

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

22 Jul '22

1 0

Re: [PATCH 1/1] d3d11: Use CRT allocation functions.
by Marvin 22 Jul '22

22 Jul '22

1 0

Re: [PATCH 3/3] shell32: Reimplement SHBindToParent.
by Marvin 22 Jul '22

22 Jul '22

1 0

Re: [PATCH v4] ntdll: Add RtlGetDeviceFamilyInfoEnum and RtlConvertDeviceFamilyInfoToString
by Kacper Rączy 21 Jul '22

21 Jul '22

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 21 Jul '22

21 Jul '22

1 0

[PATCH 2/2] kernel32: Implement GetFileMUIInfo.
by Dmitry Timoshkov 21 Jul '22

21 Jul '22

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 21 Jul '22

21 Jul '22

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 20 Jul '22

20 Jul '22

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel