March 2021 - Wine-devel - list.winehq.org

[PATCH 3/6] mmdevapi: Use nameless unions.
by Jacek Caban 26 Mar '21

26 Mar '21

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mmdevapi/Makefile.in | 1 - dlls/mmdevapi/devenum.c | 52 ++++++++++++++++++------------------ dlls/mmdevapi/spatialaudio.c | 4 +-- 3 files changed, 28 insertions(+), 29 deletions(-)

2 1

[PATCH] atl80/tests: Request an older version of atl80 for compatibility.
by Francois Gouget 26 Mar '21

26 Mar '21

Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- Some TestBot VMs only have version 8.0.50727.762 which is still sufficient for the current tests. Version .42 is the earliest atl80 version supported by the current crop. --- dlls/atl80/tests/atl80.manifest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/atl80/tests/atl80.manifest b/dlls/atl80/tests/atl80.manifest index 712793fcb1b..fa833e28927 100644 --- a/dlls/atl80/tests/atl80.manifest +++ b/dlls/atl80/tests/atl80.manifest @@ -12,7 +12,7 @@ <assemblyIdentity type="win32" name="microsoft.vc80.atl" - version="8.0.50727.4053" + version="8.0.50727.42" processorArchitecture="*" publicKeyToken="1fc8b3b9a1e18e3b" language="*" -- 2.20.1

2 1

[PATCH v2 1/2] reg: Parse 'reg query' command-line arguments in query.c
by Hugh McMaster 26 Mar '21

26 Mar '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- v2: Fix incorrect variable name causing apply failure. programs/reg/query.c | 51 +++++++++++++++++++++++++++++++++++++++++++- programs/reg/reg.c | 16 ++++++-------- programs/reg/reg.h | 3 +-- 3 files changed, 57 insertions(+), 13 deletions(-) diff --git a/programs/reg/query.c b/programs/reg/query.c index 6ab518c91d9..7ae99fad6d5 100644 --- a/programs/reg/query.c +++ b/programs/reg/query.c @@ -298,7 +298,7 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) return 0; } -int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, +static int run_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL recurse) { HKEY key; @@ -325,3 +325,52 @@ int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, return ret; } + +int reg_query(int argc, WCHAR *argvW[]) +{ + HKEY root; + WCHAR *path, *key_name, *value_name = NULL; + BOOL value_empty = FALSE, recurse = FALSE; + int i; + + if (!parse_registry_key(argvW[2], &root, &path, &key_name)) + return 1; + + for (i = 3; i < argc; i++) + { + if (argvW[i][0] == '/' || argvW[i][0] == '-') + { + WCHAR *str = &argvW[i][1]; + + if (!lstrcmpiW(str, L"ve")) + { + value_empty = TRUE; + continue; + } + else if (!str[0] || str[1]) + goto invalid; + + switch (towlower(*str)) + { + case 'v': + if (value_name || !(value_name = argvW[++i])) + goto invalid; + break; + case 's': + recurse = TRUE; + break; + default: + goto invalid; + } + } + } + + if (value_name && value_empty) + goto invalid; + + return run_query(root, path, key_name, value_name, value_empty, recurse); + +invalid: + output_message(STRING_INVALID_CMDLINE); + return 1; +} diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 53f87e1defa..88889205ca7 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -337,7 +337,7 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) static const WCHAR switchVAW[] = {'v','a',0}; static const WCHAR switchVEW[] = {'v','e',0}; WCHAR *key_name, *path, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0'; - BOOL value_empty = FALSE, value_all = FALSE, recurse = FALSE, force = FALSE; + BOOL value_empty = FALSE, value_all = FALSE, force = FALSE; HKEY root; if (argc == 1) @@ -380,6 +380,9 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) if (op == REG_IMPORT) return reg_import(argc, argvW); + if (op == REG_QUERY) + return reg_query(argc, argvW); + if (!parse_registry_key(argvW[2], &root, &path, &key_name)) return 1; @@ -429,12 +432,6 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) } break; case 's': - if (op == REG_QUERY) - { - recurse = TRUE; - break; - } - ptr = argvW[++i]; if (!ptr || lstrlenW(ptr) != 1) { @@ -461,9 +458,8 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) if (op == REG_ADD) ret = reg_add(root, path, value_name, value_empty, type, separator, data, force); - else if (op == REG_DELETE) - ret = reg_delete(root, path, key_name, value_name, value_empty, value_all, force); else - ret = reg_query(root, path, key_name, value_name, value_empty, recurse); + ret = reg_delete(root, path, key_name, value_name, value_empty, value_all, force); + return ret; } diff --git a/programs/reg/reg.h b/programs/reg/reg.h index 89492ae8f74..e1e4804d19d 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -57,7 +57,6 @@ int reg_export(int argc, WCHAR *argvW[]); int reg_import(int argc, WCHAR *argvW[]); /* query.c */ -int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, - BOOL value_empty, BOOL recurse); +int reg_query(int argc, WCHAR *argvW[]); #endif /* __REG_H__ */ -- 2.31.0

1 1

[PATCH 1/2] reg: Parse 'reg query' command-line arguments in query.c
by Hugh McMaster 26 Mar '21

26 Mar '21

Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/reg/query.c | 51 +++++++++++++++++++++++++++++++++++++++++++- programs/reg/reg.c | 16 ++++++-------- programs/reg/reg.h | 3 +-- 3 files changed, 57 insertions(+), 13 deletions(-) diff --git a/programs/reg/query.c b/programs/reg/query.c index 6ab518c91d9..35d26488771 100644 --- a/programs/reg/query.c +++ b/programs/reg/query.c @@ -298,7 +298,7 @@ static int query_all(HKEY key, WCHAR *path, BOOL recurse) return 0; } -int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, +static int run_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, BOOL value_empty, BOOL recurse) { HKEY key; @@ -325,3 +325,52 @@ int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, return ret; } + +int reg_query(int argc, WCHAR *argvW[]) +{ + HKEY root; + WCHAR *path, *key_name, *value_name = NULL; + BOOL value_empty = FALSE, recurse = FALSE; + int i; + + if (!parse_registry_key(argvW[2], &root, &path, &key_name)) + return 1; + + for (i = 3; i < argc; i++) + { + if (argvW[i][0] == '/' || argvW[i][0] == '-') + { + WCHAR *str = &argvW[i][1]; + + if (!lstrcmpiW(str, L"ve")) + { + value_empty = TRUE; + continue; + } + else if (!str[0] || str[1]) + goto invalid; + + switch (towlower(*s)) + { + case 'v': + if (value_name || !(value_name = argvW[++i])) + goto invalid; + break; + case 's': + recurse = TRUE; + break; + default: + goto invalid; + } + } + } + + if (value_name && value_empty) + goto invalid; + + return run_query(root, path, key_name, value_name, value_empty, recurse); + +invalid: + output_message(STRING_INVALID_CMDLINE); + return 1; +} diff --git a/programs/reg/reg.c b/programs/reg/reg.c index 53f87e1defa..88889205ca7 100644 --- a/programs/reg/reg.c +++ b/programs/reg/reg.c @@ -337,7 +337,7 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) static const WCHAR switchVAW[] = {'v','a',0}; static const WCHAR switchVEW[] = {'v','e',0}; WCHAR *key_name, *path, *value_name = NULL, *type = NULL, *data = NULL, separator = '\0'; - BOOL value_empty = FALSE, value_all = FALSE, recurse = FALSE, force = FALSE; + BOOL value_empty = FALSE, value_all = FALSE, force = FALSE; HKEY root; if (argc == 1) @@ -380,6 +380,9 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) if (op == REG_IMPORT) return reg_import(argc, argvW); + if (op == REG_QUERY) + return reg_query(argc, argvW); + if (!parse_registry_key(argvW[2], &root, &path, &key_name)) return 1; @@ -429,12 +432,6 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) } break; case 's': - if (op == REG_QUERY) - { - recurse = TRUE; - break; - } - ptr = argvW[++i]; if (!ptr || lstrlenW(ptr) != 1) { @@ -461,9 +458,8 @@ int __cdecl wmain(int argc, WCHAR *argvW[]) if (op == REG_ADD) ret = reg_add(root, path, value_name, value_empty, type, separator, data, force); - else if (op == REG_DELETE) - ret = reg_delete(root, path, key_name, value_name, value_empty, value_all, force); else - ret = reg_query(root, path, key_name, value_name, value_empty, recurse); + ret = reg_delete(root, path, key_name, value_name, value_empty, value_all, force); + return ret; } diff --git a/programs/reg/reg.h b/programs/reg/reg.h index 89492ae8f74..e1e4804d19d 100644 --- a/programs/reg/reg.h +++ b/programs/reg/reg.h @@ -57,7 +57,6 @@ int reg_export(int argc, WCHAR *argvW[]); int reg_import(int argc, WCHAR *argvW[]); /* query.c */ -int reg_query(HKEY root, WCHAR *path, WCHAR *key_name, WCHAR *value_name, - BOOL value_empty, BOOL recurse); +int reg_query(int argc, WCHAR *argvW[]); #endif /* __REG_H__ */ -- 2.31.0

2 3

[tools] testbot/WineTest: Pass the full path to winetest.exe.
by Francois Gouget 26 Mar '21

26 Mar '21

It is not installed in the wineprefix and thus is not in %PATH%. So Wine needs its full path to find it. Signed-off-by: Francois Gouget <fgouget(a)icodeweavers.com> --- Wine used to be able to find winetest.exe in the build tree but no longer (happened between f69c8f018188 and 12cfe6826773). This lets the TestBot run the tests on Wine VMs again but there is another issue with the WoW64 wineprefix creation. --- testbot/bin/build/WineTest.pl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testbot/bin/build/WineTest.pl b/testbot/bin/build/WineTest.pl index dd41fcf67..498b8afde 100755 --- a/testbot/bin/build/WineTest.pl +++ b/testbot/bin/build/WineTest.pl @@ -86,7 +86,8 @@ sub WineTestSuite($$$$) # there are test failures. my $BaseName = SetupTest("WineTest", $Mission); my $Tag = SanitizeTag("$BaseTag-$BaseName"); - RunWine($Mission, "winetest.exe", + my $WineDir = GetWineDir($Mission); + RunWine($Mission, "$WineDir/programs/winetest/winetest.exe", "-c -o '$DataDir/$BaseName.report' -t $Tag ". ShArgv2Cmd(@$Args)); if (!-f "$DataDir/$BaseName.report") { @@ -96,7 +97,7 @@ sub WineTestSuite($$$$) # Send the report to the website if ((!$NoSubmit and !$Mission->{nosubmit}) and - RunWine($Mission, "winetest.exe", + RunWine($Mission, "$WineDir/programs/winetest/winetest.exe", "-c -s '$DataDir/$BaseName.report'")) { LogMsg "WineTest failed to send the $BaseName report\n"; @@ -142,7 +143,8 @@ sub TestPatch($$) # Run WineTest. Ignore the exit code since it returns non-zero whenever # there are test failures. my $BaseName = SetupTest("the tests", $Mission); - RunWine($Mission, "winetest.exe", + my $WineDir = GetWineDir($Mission); + RunWine($Mission, "$WineDir/programs/winetest/winetest.exe", "-c -o '$DataDir/$BaseName.report' -t do.not.submit ". join(" ", @TestList)); if (!-f "$DataDir/$BaseName.report") -- 2.20.1

1 0

[PATCH 1/5] kernel32: Implement PackageIdFromFullName().
by Paul Gofman 26 Mar '21

26 Mar '21

Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- Forza Horizon 4 depends on successfully getting the path for Microsoft.VCLibs.140.00 x64 package by using GetPackagesByPackageFamily(), PackageIdFromFullName(), GetPackagePath(). Since we provide builtin VC runtime 140 in the default prefix it seems reasonable to add the corresponding package info to registry on prefix creation / update. .../api-ms-win-appmodel-runtime-l1-1-1.spec | 2 +- .../ext-ms-win-kernel32-package-l1-1-1.spec | 2 +- dlls/kernel32/kernel32.spec | 1 + dlls/kernel32/tests/version.c | 173 ++++++++++++++++++ dlls/kernelbase/kernelbase.spec | 2 +- dlls/kernelbase/version.c | 116 ++++++++++++ include/appmodel.h | 31 ++++ 7 files changed, 324 insertions(+), 3 deletions(-) diff --git a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec index 4c00082a151..99d1d9f3835 100644 --- a/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec +++ b/dlls/api-ms-win-appmodel-runtime-l1-1-1/api-ms-win-appmodel-runtime-l1-1-1.spec @@ -22,6 +22,6 @@ @ stub PackageFamilyNameFromFullName @ stub PackageFamilyNameFromId @ stub PackageFullNameFromId -@ stub PackageIdFromFullName +@ stdcall PackageIdFromFullName(wstr long ptr ptr) kernel32.PackageIdFromFullName @ stub PackageNameAndPublisherIdFromFamilyName @ stub ParseApplicationUserModelId diff --git a/dlls/ext-ms-win-kernel32-package-l1-1-1/ext-ms-win-kernel32-package-l1-1-1.spec b/dlls/ext-ms-win-kernel32-package-l1-1-1/ext-ms-win-kernel32-package-l1-1-1.spec index 214cd344716..61fd115cca7 100644 --- a/dlls/ext-ms-win-kernel32-package-l1-1-1/ext-ms-win-kernel32-package-l1-1-1.spec +++ b/dlls/ext-ms-win-kernel32-package-l1-1-1/ext-ms-win-kernel32-package-l1-1-1.spec @@ -18,4 +18,4 @@ @ stub PackageFamilyNameFromFullName @ stub PackageFamilyNameFromId @ stub PackageFullNameFromId -@ stub PackageIdFromFullName +@ stdcall PackageIdFromFullName(wstr long ptr ptr) kernel32.PackageIdFromFullName diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 0312e044a86..230a2a09ea2 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -1152,6 +1152,7 @@ @ stdcall -import PeekConsoleInputW(ptr ptr long ptr) @ stdcall -import PeekNamedPipe(long ptr long ptr ptr ptr) @ stdcall -import PostQueuedCompletionStatus(long long ptr ptr) +@ stdcall -import PackageIdFromFullName(wstr long ptr ptr) @ stdcall PowerClearRequest(long long) @ stdcall PowerCreateRequest(ptr) @ stdcall PowerSetRequest(long long) diff --git a/dlls/kernel32/tests/version.c b/dlls/kernel32/tests/version.c index 861b870b569..835c5398685 100644 --- a/dlls/kernel32/tests/version.c +++ b/dlls/kernel32/tests/version.c @@ -21,9 +21,11 @@ #include "wine/test.h" #include "winbase.h" #include "winternl.h" +#include "appmodel.h" static BOOL (WINAPI * pGetProductInfo)(DWORD, DWORD, DWORD, DWORD, DWORD *); static UINT (WINAPI * pGetSystemFirmwareTable)(DWORD, DWORD, void *, DWORD); +static LONG (WINAPI * pPackageIdFromFullName)(const WCHAR *, UINT32, UINT32 *, BYTE *); static NTSTATUS (WINAPI * pNtQuerySystemInformation)(SYSTEM_INFORMATION_CLASS, void *, ULONG, ULONG *); static NTSTATUS (WINAPI * pRtlGetVersion)(RTL_OSVERSIONINFOEXW *); @@ -43,6 +45,7 @@ static void init_function_pointers(void) GET_PROC(GetProductInfo); GET_PROC(GetSystemFirmwareTable); + GET_PROC(PackageIdFromFullName); hmod = GetModuleHandleA("ntdll.dll"); @@ -746,6 +749,175 @@ static void test_GetSystemFirmwareTable(void) HeapFree(GetProcessHeap(), 0, smbios_table); } +static const struct +{ + UINT32 code; + const WCHAR *name; + BOOL broken; +} +arch_data[] = +{ + {PROCESSOR_ARCHITECTURE_INTEL, L"X86"}, + {PROCESSOR_ARCHITECTURE_ARM, L"Arm"}, + {PROCESSOR_ARCHITECTURE_AMD64, L"X64"}, + {PROCESSOR_ARCHITECTURE_NEUTRAL, L"Neutral"}, + {PROCESSOR_ARCHITECTURE_ARM64, L"Arm64", TRUE /* Before Win10. */}, + {PROCESSOR_ARCHITECTURE_UNKNOWN, L"Unknown", TRUE /* Before Win10 1709. */}, +}; + +static const WCHAR *arch_string_from_code(UINT32 arch) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(arch_data); ++i) + if (arch_data[i].code == arch) + return arch_data[i].name; + + return NULL; +} + +static unsigned int get_package_str_size(const WCHAR *str) +{ + return str ? (lstrlenW(str) + 1) * sizeof(*str) : 0; +} + +static unsigned int get_package_id_size(const PACKAGE_ID *id) +{ + return sizeof(*id) + get_package_str_size(id->name) + + get_package_str_size(id->resourceId) + 14 * sizeof(WCHAR); +} + +static void packagefullname_from_packageid(WCHAR *buffer, size_t count, const PACKAGE_ID *id) +{ + swprintf(buffer, count, L"%s_%u.%u.%u.%u_%s_%s_%s", id->name, id->version.Major, + id->version.Minor, id->version.Build, id->version.Revision, + arch_string_from_code(id->processorArchitecture), id->resourceId, + id->publisherId); +} + +static void test_PackageIdFromFullName(void) +{ + static const PACKAGE_ID test_package_id = + { + 0, PROCESSOR_ARCHITECTURE_INTEL, + {{.Major = 1, .Minor = 2, .Build = 3, .Revision = 4}}, + (WCHAR *)L"TestPackage", NULL, + (WCHAR *)L"TestResourceId", (WCHAR *)L"0abcdefghjkme" + }; + UINT32 size, expected_size; + PACKAGE_ID test_id; + WCHAR fullname[512]; + BYTE id_buffer[512]; + unsigned int i; + PACKAGE_ID *id; + LONG ret; + + if (!pPackageIdFromFullName) + { + win_skip("PackageIdFromFullName not available.\n"); + return; + } + + packagefullname_from_packageid(fullname, ARRAY_SIZE(fullname), &test_package_id); + + id = (PACKAGE_ID *)id_buffer; + + memset(id_buffer, 0xcc, sizeof(id_buffer)); + expected_size = get_package_id_size(&test_package_id); + size = sizeof(id_buffer); + ret = pPackageIdFromFullName(fullname, 0, &size, id_buffer); + ok(ret == ERROR_SUCCESS, "Got unexpected ret %u.\n", ret); + ok(size == expected_size, "Got unexpected length %u, expected %u.\n", size, expected_size); + ok(!lstrcmpW(id->name, test_package_id.name), "Got unexpected name %s.\n", debugstr_w(id->name)); + ok(!lstrcmpW(id->resourceId, test_package_id.resourceId), "Got unexpected resourceId %s.\n", + debugstr_w(id->resourceId)); + ok(!lstrcmpW(id->publisherId, test_package_id.publisherId), "Got unexpected publisherId %s.\n", + debugstr_w(id->publisherId)); + ok(!id->publisher, "Got unexpected publisher %s.\n", debugstr_w(id->publisher)); + ok(id->processorArchitecture == PROCESSOR_ARCHITECTURE_INTEL, "Got unexpected processorArchitecture %u.\n", + id->processorArchitecture); + ok(id->version.Version == 0x0001000200030004, "Got unexpected Version %s.\n", + wine_dbgstr_longlong(id->version.Version)); + ok((BYTE *)id->name == id_buffer + sizeof(*id), "Got unexpected name %p, buffer %p.\n", id->name, id_buffer); + ok((BYTE *)id->resourceId == (BYTE *)id->name + (lstrlenW(id->name) + 1) * 2, + "Got unexpected resourceId %p, buffer %p.\n", id->resourceId, id_buffer); + ok((BYTE *)id->publisherId == (BYTE *)id->resourceId + (lstrlenW(id->resourceId) + 1) * 2, + "Got unexpected publisherId %p, buffer %p.\n", id->resourceId, id_buffer); + + ret = pPackageIdFromFullName(fullname, 0, NULL, id_buffer); + ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %d.\n", ret); + + size = sizeof(id_buffer); + ret = pPackageIdFromFullName(NULL, 0, &size, id_buffer); + ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %d.\n", ret); + ok(size == sizeof(id_buffer), "Got unexpected size %u.\n", size); + + size = sizeof(id_buffer); + ret = pPackageIdFromFullName(fullname, 0, &size, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %d.\n", ret); + ok(size == sizeof(id_buffer), "Got unexpected size %u.\n", size); + + size = expected_size - 1; + ret = pPackageIdFromFullName(fullname, 0, &size, NULL); + ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %d.\n", ret); + ok(size == expected_size - 1, "Got unexpected size %u.\n", size); + + size = expected_size - 1; + ret = pPackageIdFromFullName(fullname, 0, &size, id_buffer); + ok(ret == ERROR_INSUFFICIENT_BUFFER, "Got unexpected ret %d.\n", ret); + ok(size == expected_size, "Got unexpected size %u.\n", size); + + size = 0; + ret = pPackageIdFromFullName(fullname, 0, &size, NULL); + ok(ret == ERROR_INSUFFICIENT_BUFFER, "Got unexpected ret %d.\n", ret); + ok(size == expected_size, "Got unexpected size %u.\n", size); + + for (i = 0; i < ARRAY_SIZE(arch_data); ++i) + { + test_id = test_package_id; + test_id.processorArchitecture = arch_data[i].code; + packagefullname_from_packageid(fullname, ARRAY_SIZE(fullname), &test_id); + size = expected_size; + ret = pPackageIdFromFullName(fullname, 0, &size, id_buffer); + ok(ret == ERROR_SUCCESS || broken(arch_data[i].broken && ret == ERROR_INVALID_PARAMETER), + "Got unexpected ret %u.\n", ret); + if (ret != ERROR_SUCCESS) + continue; + ok(size == expected_size, "Got unexpected length %u, expected %u.\n", size, expected_size); + ok(id->processorArchitecture == arch_data[i].code, "Got unexpected processorArchitecture %u, arch %S.\n", + id->processorArchitecture, arch_data[i].name); + } + + size = sizeof(id_buffer); + ret = pPackageIdFromFullName(L"TestPackage_1.2.3.4_X86_TestResourceId_0abcdefghjkme", 0, &size, id_buffer); + ok(ret == ERROR_SUCCESS, "Got unexpected ret %u.\n", ret); + + size = sizeof(id_buffer); + ret = pPackageIdFromFullName(L"TestPackage_1.2.3.4_X86_TestResourceId_abcdefghjkme", 0, &size, id_buffer); + ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %u.\n", ret); + + size = sizeof(id_buffer); + ret = pPackageIdFromFullName(L"TestPackage_1.2.3.4_X86_TestResourceId_0abcdefghjkmee", 0, &size, id_buffer); + ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %u.\n", ret); + + size = sizeof(id_buffer); + ret = pPackageIdFromFullName(L"TestPackage_1.2.3_X86_TestResourceId_0abcdefghjkme", 0, &size, id_buffer); + ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %u.\n", ret); + + size = sizeof(id_buffer); + ret = pPackageIdFromFullName(L"TestPackage_1.2.3.4_X86_TestResourceId_0abcdefghjkme_", 0, &size, id_buffer); + ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %u.\n", ret); + + size = sizeof(id_buffer); + ret = pPackageIdFromFullName(L"TestPackage_1.2.3.4_X86__0abcdefghjkme", 0, &size, id_buffer); + ok(ret == ERROR_SUCCESS, "Got unexpected ret %u.\n", ret); + ok(!lstrcmpW(id->resourceId, L""), "Got unexpected resourceId %s.\n", debugstr_w(id->resourceId)); + + size = sizeof(id_buffer); + ret = pPackageIdFromFullName(L"TestPackage_1.2.3.4_X86_0abcdefghjkme", 0, &size, id_buffer); + ok(ret == ERROR_INVALID_PARAMETER, "Got unexpected ret %u.\n", ret); +} + START_TEST(version) { init_function_pointers(); @@ -754,4 +926,5 @@ START_TEST(version) test_GetVersionEx(); test_VerifyVersionInfo(); test_GetSystemFirmwareTable(); + test_PackageIdFromFullName(); } diff --git a/dlls/kernelbase/kernelbase.spec b/dlls/kernelbase/kernelbase.spec index 8cb15fff084..615b928bd22 100644 --- a/dlls/kernelbase/kernelbase.spec +++ b/dlls/kernelbase/kernelbase.spec @@ -1014,7 +1014,7 @@ # @ stub PackageFamilyNameFromProductId # @ stub PackageFullNameFromId # @ stub PackageFullNameFromProductId -# @ stub PackageIdFromFullName +@ stdcall PackageIdFromFullName(wstr long ptr ptr) # @ stub PackageIdFromProductId # @ stub PackageNameAndPublisherIdFromFamilyName # @ stub PackageRelativeApplicationIdFromProductId diff --git a/dlls/kernelbase/version.c b/dlls/kernelbase/version.c index d5bfa081939..1ee82ce019a 100644 --- a/dlls/kernelbase/version.c +++ b/dlls/kernelbase/version.c @@ -39,6 +39,7 @@ #include "winnls.h" #include "winternl.h" #include "winerror.h" +#include "appmodel.h" #include "kernelbase.h" #include "wine/debug.h" @@ -1565,3 +1566,118 @@ LONG WINAPI /* DECLSPEC_HOTPATCH */ GetPackageFamilyName( HANDLE process, UINT32 FIXME( "(%p %p %p): stub\n", process, length, name ); return APPMODEL_ERROR_NO_PACKAGE; } + + +static const struct +{ + UINT32 code; + const WCHAR *name; +} +arch_names[] = +{ + {PROCESSOR_ARCHITECTURE_INTEL, L"x86"}, + {PROCESSOR_ARCHITECTURE_ARM, L"arm"}, + {PROCESSOR_ARCHITECTURE_AMD64, L"x64"}, + {PROCESSOR_ARCHITECTURE_NEUTRAL, L"neutral"}, + {PROCESSOR_ARCHITECTURE_ARM64, L"arm64"}, + {PROCESSOR_ARCHITECTURE_UNKNOWN, L"unknown"}, +}; + +UINT32 processor_arch_from_string(const WCHAR *str, unsigned int len) +{ + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(arch_names); ++i) + if (lstrlenW(arch_names[i].name) == len && !wcsnicmp(str, arch_names[i].name, len)) + return arch_names[i].code; + return ~0u; +} + +/*********************************************************************** + * PackageIdFromFullName (kernelbase.@) + */ +LONG WINAPI PackageIdFromFullName(const WCHAR *full_name, UINT32 flags, UINT32 *buffer_length, BYTE *buffer) +{ + const WCHAR *name, *version_str, *arch_str, *resource_id, *publisher_id, *s; + PACKAGE_ID *id = (PACKAGE_ID *)buffer; + UINT32 size, buffer_size, len; + + TRACE("full_name %s, flags %#x, buffer_length %p, buffer %p.\n", + debugstr_w(full_name), flags, buffer_length, buffer); + + if (flags) + FIXME("Flags %#x are not supported.\n", flags); + + if (!full_name || !buffer_length) + return ERROR_INVALID_PARAMETER; + + if (!buffer && *buffer_length) + return ERROR_INVALID_PARAMETER; + + name = full_name; + if (!(version_str = wcschr(name, L'_'))) + return ERROR_INVALID_PARAMETER; + ++version_str; + + if (!(arch_str = wcschr(version_str, L'_'))) + return ERROR_INVALID_PARAMETER; + ++arch_str; + + if (!(resource_id = wcschr(arch_str, L'_'))) + return ERROR_INVALID_PARAMETER; + ++resource_id; + + if (!(publisher_id = wcschr(resource_id, L'_'))) + return ERROR_INVALID_PARAMETER; + ++publisher_id; + + /* Publisher id length should be 13. */ + size = sizeof(*id) + sizeof(WCHAR) * ((version_str - name) + (publisher_id - resource_id) + 13 + 1); + buffer_size = *buffer_length; + *buffer_length = size; + if (buffer_size < size) + return ERROR_INSUFFICIENT_BUFFER; + + memset(id, 0, sizeof(*id)); + if ((id->processorArchitecture = processor_arch_from_string(arch_str, resource_id - arch_str - 1)) == ~0u) + { + FIXME("Unrecognized arch %s.\n", debugstr_w(arch_str)); + return ERROR_INVALID_PARAMETER; + } + buffer += sizeof(*id); + + id->version.u.s.Major = wcstol(version_str, NULL, 10); + if (!(s = wcschr(version_str, L'.'))) + return ERROR_INVALID_PARAMETER; + ++s; + id->version.u.s.Minor = wcstol(s, NULL, 10); + if (!(s = wcschr(s, L'.'))) + return ERROR_INVALID_PARAMETER; + ++s; + id->version.u.s.Build = wcstol(s, NULL, 10); + if (!(s = wcschr(s, L'.'))) + return ERROR_INVALID_PARAMETER; + ++s; + id->version.u.s.Revision = wcstol(s, NULL, 10); + + id->name = (WCHAR *)buffer; + len = version_str - name - 1; + memcpy(id->name, name, sizeof(*id->name) * len); + id->name[len] = 0; + buffer += sizeof(*id->name) * (len + 1); + + id->resourceId = (WCHAR *)buffer; + len = publisher_id - resource_id - 1; + memcpy(id->resourceId, resource_id, sizeof(*id->resourceId) * len); + id->resourceId[len] = 0; + buffer += sizeof(*id->resourceId) * (len + 1); + + id->publisherId = (WCHAR *)buffer; + len = lstrlenW(publisher_id); + if (len != 13) + return ERROR_INVALID_PARAMETER; + memcpy(id->publisherId, publisher_id, sizeof(*id->publisherId) * len); + id->publisherId[len] = 0; + + return ERROR_SUCCESS; +} diff --git a/include/appmodel.h b/include/appmodel.h index 34da979782d..e4288bbfbb0 100644 --- a/include/appmodel.h +++ b/include/appmodel.h @@ -48,10 +48,41 @@ typedef enum AppPolicyWindowingModel AppPolicyWindowingModel_ClassicPhone = 3 } AppPolicyWindowingModel; +typedef struct PACKAGE_VERSION +{ + union + { + UINT64 Version; + struct + { + USHORT Revision; + USHORT Build; + USHORT Minor; + USHORT Major; + } + DUMMYSTRUCTNAME; + } + DUMMYUNIONNAME; +} +PACKAGE_VERSION; + +typedef struct PACKAGE_ID +{ + UINT32 reserved; + UINT32 processorArchitecture; + PACKAGE_VERSION version; + WCHAR *name; + WCHAR *publisher; + WCHAR *resourceId; + WCHAR *publisherId; +} +PACKAGE_ID; + LONG WINAPI AppPolicyGetProcessTerminationMethod(HANDLE token, AppPolicyProcessTerminationMethod *policy); LONG WINAPI AppPolicyGetShowDeveloperDiagnostic(HANDLE token, AppPolicyShowDeveloperDiagnostic *policy); LONG WINAPI AppPolicyGetThreadInitializationType(HANDLE token, AppPolicyThreadInitializationType *policy); LONG WINAPI AppPolicyGetWindowingModel(HANDLE processToken, AppPolicyWindowingModel *policy); +LONG WINAPI PackageIdFromFullName(const WCHAR *full_name, UINT32 flags, UINT32 *buffer_length, BYTE *buffer); #if defined(__cplusplus) } -- 2.30.2

2 9

[tools] testbot: Increase the Windows executable build timeout.
by Francois Gouget 26 Mar '21

26 Mar '21

Even without the configure step a build can take a bit more than 6 minutes. So increase the timeout to 8 minutes to have some margin. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/lib/WineTestBot/Config.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index fe4a27cd6..089d792c5 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -117,7 +117,7 @@ $ReconfigBuildTimeout = 60; # Exe build timeouts (in seconds) # - For a full build -$ExeBuildTimeout = 6 * 60; +$ExeBuildTimeout = 8 * 60; # - For a single module $ExeModuleTimeout = 30; -- 2.20.1

1 0

[PATCH 6/6] riched20: Remove the windows from the editor structure.
by Huw Davies 26 Mar '21

26 Mar '21

This in turn allows removal of the editor from the host. Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/editor.c | 2 -- dlls/riched20/editor.h | 2 +- dlls/riched20/editstr.h | 1 - dlls/riched20/txthost.c | 7 +------ dlls/riched20/txtsrv.c | 6 ++---- 5 files changed, 4 insertions(+), 14 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index 4ac78f3d3cb..28b5cb1512d 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -2933,8 +2933,6 @@ ME_TextEditor *ME_MakeEditor(ITextHost *texthost, BOOL bEmulateVersion10) LONG selbarwidth; HRESULT hr; - ed->hWnd = NULL; - ed->hwndParent = NULL; ed->sizeWindow.cx = ed->sizeWindow.cy = 0; if (ITextHost_QueryInterface( texthost, &IID_ITextHost2, (void **)&ed->texthost ) == S_OK) { diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index e923f35ed94..7a79df83c99 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -395,7 +395,7 @@ BOOL ME_Redo(ME_TextEditor *editor) DECLSPEC_HIDDEN; void ME_EmptyUndoStack(ME_TextEditor *editor) DECLSPEC_HIDDEN; /* txtsrv.c */ -HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown **unk, BOOL emulate_10, ME_TextEditor **editor ) DECLSPEC_HIDDEN; +HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown **unk, BOOL emulate_10 ) DECLSPEC_HIDDEN; #ifdef __ASM_USE_THISCALL_WRAPPER extern const struct ITextServicesVtbl text_services_stdcall_vtbl DECLSPEC_HIDDEN; #define TXTSERV_VTABLE(This) (&text_services_stdcall_vtbl) diff --git a/dlls/riched20/editstr.h b/dlls/riched20/editstr.h index ffafa794015..86b3f0196c7 100644 --- a/dlls/riched20/editstr.h +++ b/dlls/riched20/editstr.h @@ -377,7 +377,6 @@ typedef struct tagME_InStream ME_InStream; typedef struct tagME_TextEditor { - HWND hWnd, hwndParent; ITextHost2 *texthost; IUnknown *reOle; unsigned int bEmulateVersion10 : 1; diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index c220fe5ec57..a7b91716dab 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -36,7 +36,6 @@ struct host ITextHost2 ITextHost_iface; LONG ref; ITextServices *text_srv; - ME_TextEditor *editor; /* to be removed */ HWND window, parent; unsigned int emulate_10 : 1; unsigned int dialog_mode : 1; @@ -112,7 +111,6 @@ struct host *host_create( HWND hwnd, CREATESTRUCTW *cs, BOOL emulate_10 ) texthost->para_fmt.wAlignment = PFA_RIGHT; if (cs->style & ES_CENTER) texthost->para_fmt.wAlignment = PFA_CENTER; - texthost->editor = NULL; host_init_props( texthost ); texthost->event_mask = 0; texthost->use_set_rect = 0; @@ -871,7 +869,7 @@ static BOOL create_windowed_editor( HWND hwnd, CREATESTRUCTW *create, BOOL emula if (!host) return FALSE; - hr = create_text_services( NULL, (ITextHost *)&host->ITextHost_iface, &unk, emulate_10, &host->editor ); + hr = create_text_services( NULL, (ITextHost *)&host->ITextHost_iface, &unk, emulate_10 ); if (FAILED( hr )) { ITextHost2_Release( &host->ITextHost_iface ); @@ -880,9 +878,6 @@ static BOOL create_windowed_editor( HWND hwnd, CREATESTRUCTW *create, BOOL emula IUnknown_QueryInterface( unk, &IID_ITextServices, (void **)&host->text_srv ); IUnknown_Release( unk ); - host->editor->hWnd = hwnd; /* FIXME: Remove editor's dependence on hWnd */ - host->editor->hwndParent = create->hwndParent; - SetWindowLongPtrW( hwnd, 0, (LONG_PTR)host ); return TRUE; diff --git a/dlls/riched20/txtsrv.c b/dlls/riched20/txtsrv.c index 4cd19a0d24b..7a979971a0a 100644 --- a/dlls/riched20/txtsrv.c +++ b/dlls/riched20/txtsrv.c @@ -581,8 +581,7 @@ static const ITextServicesVtbl textservices_vtbl = THISCALL(fnTextSrv_TxGetCachedSize) }; -HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown **unk, BOOL emulate_10, - ME_TextEditor **editor ) +HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown **unk, BOOL emulate_10 ) { struct text_services *services; @@ -595,7 +594,6 @@ HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown ** services->IUnknown_inner.lpVtbl = &textservices_inner_vtbl; services->ITextServices_iface.lpVtbl = &textservices_vtbl; services->editor = ME_MakeEditor( text_host, emulate_10 ); - if (editor) *editor = services->editor; /* To be removed */ if (outer) services->outer_unk = outer; else services->outer_unk = &services->IUnknown_inner; @@ -609,5 +607,5 @@ HRESULT create_text_services( IUnknown *outer, ITextHost *text_host, IUnknown ** */ HRESULT WINAPI CreateTextServices( IUnknown *outer, ITextHost *text_host, IUnknown **unk ) { - return create_text_services( outer, text_host, unk, FALSE, NULL ); + return create_text_services( outer, text_host, unk, FALSE ); } -- 2.23.0

2 1

[PATCH 5/6] riched20: Retrieve the window from the host.
by Huw Davies 26 Mar '21

26 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/richole.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index b8b081fc916..b652d5a753a 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -1195,20 +1195,19 @@ static ULONG STDMETHODCALLTYPE IOleInPlaceSite_fnRelease(IOleInPlaceSite *iface) return IOleClientSite_Release(&This->IOleClientSite_iface); } -static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnGetWindow(IOleInPlaceSite *iface, HWND *phwnd) +static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnGetWindow( IOleInPlaceSite *iface, HWND *window ) { IOleClientSiteImpl *This = impl_from_IOleInPlaceSite(iface); - TRACE("(%p)->(%p)\n", This, phwnd); + TRACE( "(%p)->(%p)\n", This, window ); if (!This->child.reole) return CO_E_RELEASED; - if (!phwnd) - return E_INVALIDARG; + if (!window) return E_INVALIDARG; - *phwnd = This->child.reole->editor->hWnd; - return S_OK; + if (!This->child.reole->editor->have_texthost2) return E_NOTIMPL; + return ITextHost2_TxGetWindow( This->child.reole->editor->texthost, window ); } static HRESULT STDMETHODCALLTYPE IOleInPlaceSite_fnContextSensitiveHelp(IOleInPlaceSite *iface, BOOL fEnterMode) -- 2.23.0

2 1

[PATCH 4/6] riched20: Remove accesses to the editor in TxNotify.
by Huw Davies 26 Mar '21

26 Mar '21

Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/riched20/txthost.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index 0618d6031ef..c220fe5ec57 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -467,12 +467,11 @@ DEFINE_THISCALL_WRAPPER(ITextHostImpl_TxNotify,12) DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxNotify( ITextHost2 *iface, DWORD iNotify, void *pv ) { struct host *host = impl_from_ITextHost( iface ); - HWND hwnd = host->window; UINT id; - if (!host->editor || !host->editor->hwndParent) return S_OK; + if (!host->parent) return S_OK; - id = GetWindowLongW(hwnd, GWLP_ID); + id = GetWindowLongW( host->window, GWLP_ID ); switch (iNotify) { @@ -490,16 +489,16 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxNotify( ITextHost2 *iface, DW if (!info) return E_FAIL; - info->hwndFrom = hwnd; + info->hwndFrom = host->window; info->idFrom = id; info->code = iNotify; - SendMessageW( host->editor->hwndParent, WM_NOTIFY, id, (LPARAM)info ); + SendMessageW( host->parent, WM_NOTIFY, id, (LPARAM)info ); break; } case EN_UPDATE: /* Only sent when the window is visible. */ - if (!IsWindowVisible(hwnd)) + if (!IsWindowVisible( host->window )) break; /* Fall through */ case EN_CHANGE: @@ -509,7 +508,7 @@ DECLSPEC_HIDDEN HRESULT __thiscall ITextHostImpl_TxNotify( ITextHost2 *iface, DW case EN_MAXTEXT: case EN_SETFOCUS: case EN_VSCROLL: - SendMessageW( host->editor->hwndParent, WM_COMMAND, MAKEWPARAM( id, iNotify ), (LPARAM)hwnd ); + SendMessageW( host->parent, WM_COMMAND, MAKEWPARAM( id, iNotify ), (LPARAM)host->window ); break; case EN_MSGFILTER: -- 2.23.0

2 1