- Wine-Commits - list.winehq.org

Francisco Casas : tests/shader-runner: Change probe directive syntax on shader_test files.
by Alexandre Julliard Feb. 19, 2024

Feb. 19, 2024

Module: vkd3d Branch: master Commit: 4fe9ab0a902d6c773148627c0defa4a476aca396 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4fe9ab0a902d6c773148627c0defa… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Jan 24 16:35:39 2024 -0300 tests/shader-runner: Change probe directive syntax on shader_test files. For consistency with the previous commit. --- tests/hlsl/matrix-semantics.shader_test | 30 +++++++++++++++--------------- tests/hlsl/multiple-rt.shader_test | 4 ++-- tests/hlsl/uav-rwbuffer.shader_test | 2 +- tests/shader_runner.c | 17 ++++++----------- 4 files changed, 24 insertions(+), 29 deletions(-) diff --git a/tests/hlsl/matrix-semantics.shader_test b/tests/hlsl/matrix-semantics.shader_test index ec2d191b..476b56bf 100644 --- a/tests/hlsl/matrix-semantics.shader_test +++ b/tests/hlsl/matrix-semantics.shader_test @@ -45,10 +45,10 @@ row_major float4x1 main() : sv_target [test] todo(sm>=6) draw quad -probe render target 0 all r (1.0) -probe render target 1 all r (2.0) -probe render target 2 all r (3.0) -probe render target 3 all r (4.0) +probe rtv 0 all r (1.0) +probe rtv 1 all r (2.0) +probe rtv 2 all r (3.0) +probe rtv 3 all r (4.0) [pixel shader fail(sm>=6)] float1x4 main() : sv_target @@ -58,10 +58,10 @@ float1x4 main() : sv_target [test] todo(sm>=6) draw quad -probe render target 0 all r (1.0) -probe render target 1 all r (2.0) -probe render target 2 all r (3.0) -probe render target 3 all r (4.0) +probe rtv 0 all r (1.0) +probe rtv 1 all r (2.0) +probe rtv 2 all r (3.0) +probe rtv 3 all r (4.0) [pixel shader fail] void main(out float1x2 x : sv_target0, out float1x2 y : sv_target1) @@ -79,10 +79,10 @@ void main(out float1x2 x : sv_target0, out float1x2 y : sv_target2) [test] todo(sm>=6) draw quad -probe render target 0 all r (1.0) -probe render target 1 all r (2.0) -probe render target 2 all r (5.0) -probe render target 3 all r (6.0) +probe rtv 0 all r (1.0) +probe rtv 1 all r (2.0) +probe rtv 2 all r (5.0) +probe rtv 3 all r (6.0) [rtv 0] format r32g32b32a32 float @@ -97,6 +97,6 @@ void main(out row_major float1x4 x : sv_target0, out float1x2 y : sv_target1) [test] todo(sm>=6) draw quad -probe render target 0 all rgba (1.0, 2.0, 3.0, 4.0) -probe render target 1 all r (5.0) -probe render target 2 all r (6.0) +probe rtv 0 all rgba (1.0, 2.0, 3.0, 4.0) +probe rtv 1 all r (5.0) +probe rtv 2 all r (6.0) diff --git a/tests/hlsl/multiple-rt.shader_test b/tests/hlsl/multiple-rt.shader_test index 85bfd269..23c661b3 100644 --- a/tests/hlsl/multiple-rt.shader_test +++ b/tests/hlsl/multiple-rt.shader_test @@ -15,5 +15,5 @@ void main(out float4 o0 : sv_target0, out float4 o1 : sv_target1) [test] draw quad -probe render target 0 all rgba (0.1, 0.2, 0.3, 0.4) -probe render target 1 all rgba (0.5, 0.6, 0.7, 0.8) +probe rtv 0 all rgba (0.1, 0.2, 0.3, 0.4) +probe rtv 1 all rgba (0.5, 0.6, 0.7, 0.8) diff --git a/tests/hlsl/uav-rwbuffer.shader_test b/tests/hlsl/uav-rwbuffer.shader_test index bbc48ee8..ec8937b3 100644 --- a/tests/hlsl/uav-rwbuffer.shader_test +++ b/tests/hlsl/uav-rwbuffer.shader_test @@ -179,4 +179,4 @@ float4 main() : sv_target1 [test] todo(sm>=6) draw quad -probe buffer uav 2 (0, 0) rgba (11.1, 12.2, 13.3, 14.4) +probe uav 2 (0) rgba (11.1, 12.2, 13.3, 14.4) diff --git a/tests/shader_runner.c b/tests/shader_runner.c index b20bf9a2..3fa00101 100644 --- a/tests/shader_runner.c +++ b/tests/shader_runner.c @@ -842,17 +842,7 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) resource = shader_runner_get_resource(runner, RESOURCE_TYPE_UAV, slot); } - else if (match_string(line, "buffer uav", &line)) - { - slot = strtoul(line, &rest, 10); - - if (rest == line) - fatal_error("Malformed buffer UAV index '%s'.\n", line); - line = rest; - - resource = shader_runner_get_resource(runner, RESOURCE_TYPE_UAV, slot); - } - else if (match_string(line, "render target", &line)) + else if (match_string(line, "rtv", &line)) { slot = strtoul(line, &rest, 10); @@ -883,6 +873,11 @@ static void parse_test_directive(struct shader_runner *runner, const char *line) set_rect(&rect, left, top, left + 1, top + 1); line += len; } + else if (sscanf(line, " ( %u )%n", &left, &len) == 1) + { + set_rect(&rect, left, 0, left + 1, 1); + line += len; + } else { fatal_error("Malformed probe arguments '%s'.\n", line);

1 0

Francisco Casas : tests/shader-runner: Support SRV buffers.
by Alexandre Julliard Feb. 19, 2024

Feb. 19, 2024

Module: vkd3d Branch: master Commit: 4d855611b758294f9a6745cc7a907982808f013f URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/4d855611b758294f9a6745cc7a907… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Tue Jan 23 20:26:11 2024 -0300 tests/shader-runner: Support SRV buffers. --- Makefile.am | 1 + tests/hlsl/srv-buffers.shader_test | 189 +++++++++++++++++++++++++++++++++++++ tests/shader_runner.c | 14 +++ tests/shader_runner_d3d11.c | 23 ++++- tests/shader_runner_d3d12.c | 43 +++++++-- tests/shader_runner_d3d9.c | 8 ++ tests/shader_runner_gl.c | 24 +++-- tests/shader_runner_vulkan.c | 26 +++-- 8 files changed, 300 insertions(+), 28 deletions(-)

1 0

Francisco Casas : tests/shader-runner: Separate resource_type into type and dimension.
by Alexandre Julliard Feb. 19, 2024

Feb. 19, 2024

Module: vkd3d Branch: master Commit: 22a0f14a2f4f89797e9cf25e018f2bd51eff7fcb URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/22a0f14a2f4f89797e9cf25e018f2… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Mon Jan 22 20:20:18 2024 -0300 tests/shader-runner: Separate resource_type into type and dimension. If in the same shader_test file we have both a [buffer uav n] and a [uav n] with the same slot "n", we want the last one to override the first one instead of passing both resources to the backends. Same for [buffer srv n] and [texture n] after we introduce SRV buffers. --- tests/shader_runner.c | 13 ++- tests/shader_runner.h | 9 +- tests/shader_runner_d3d11.c | 190 ++++++++++++++++++---------------- tests/shader_runner_d3d12.c | 65 ++++++------ tests/shader_runner_d3d9.c | 2 - tests/shader_runner_gl.c | 123 ++++++++++++---------- tests/shader_runner_vulkan.c | 238 +++++++++++++++++++++++-------------------- 7 files changed, 351 insertions(+), 289 deletions(-)

1 0

Francisco Casas : vkd3d-shader/hlsl: Record valid methods in object_methods[].
by Alexandre Julliard Feb. 19, 2024

Feb. 19, 2024

Module: vkd3d Branch: master Commit: e1c759e1c9d7c275677fe7155fd548410b85ac9d URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e1c759e1c9d7c275677fe7155fd54… Author: Francisco Casas <fcasas(a)codeweavers.com> Date: Wed Jan 31 20:08:00 2024 -0300 vkd3d-shader/hlsl: Record valid methods in object_methods[]. Also, call hlsl_sampler_dim_count() and hlsl_offset_dim_count() after type checking, to avoid reaching unreacheable cases. --- libs/vkd3d-shader/hlsl.h | 7 ++-- libs/vkd3d-shader/hlsl.y | 105 +++++++++++++++++++++-------------------------- 2 files changed, 50 insertions(+), 62 deletions(-)

1 0

Daniel Lehman : msvcrt: Use string sort for strncoll/wcsncoll.
by Alexandre Julliard Feb. 19, 2024

Feb. 19, 2024

Module: wine Branch: master Commit: 588db48be52972bc02370bdf379e777ab22e5126 URL: https://gitlab.winehq.org/wine/wine/-/commit/588db48be52972bc02370bdf379e77… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Wed Feb 14 21:56:38 2024 -0800 msvcrt: Use string sort for strncoll/wcsncoll. --- dlls/msvcrt/string.c | 2 +- dlls/msvcrt/tests/string.c | 6 ++++++ dlls/msvcrt/wcs.c | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index ad57ecc8cda..e6323da3b01 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1213,7 +1213,7 @@ int CDECL _strncoll_l( const char* str1, const char* str2, size_t count, _locale if(!locinfo->lc_handle[LC_COLLATE]) return strncmp(str1, str2, count); - return CompareStringA(locinfo->lc_handle[LC_COLLATE], 0, + return CompareStringA(locinfo->lc_handle[LC_COLLATE], SORT_STRINGSORT, str1, strnlen(str1, count), str2, strnlen(str2, count))-CSTR_EQUAL; } diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 34338fd4a39..3c43d2a78b4 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -4154,6 +4154,9 @@ static void test__tcsncoll(void) { "English", "ABCe", "ABCf", 3, 0 }, { "English", "abcd", "ABCD", 10, -1 }, + { "English", "AB D", "AB-D", 4, 1 }, + { "English", "AB D", "AB'D", 4, 1 }, + { "C", "ABCD", "ABCD", 4, 0 }, { "C", "ABCD", "ABCD", 10, 0 }, @@ -4165,6 +4168,9 @@ static void test__tcsncoll(void) { "C", "ABCe", "ABCf", 3, 0 }, { "C", "abcd", "ABCD", 10, 1 }, + + { "C", "AB D", "AB-D", 4, -1 }, + { "C", "AB D", "AB'D", 4, -1 }, }; WCHAR str1W[16]; WCHAR str2W[16]; diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 60a15dfc29c..af684e6be2e 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -538,7 +538,7 @@ int CDECL _wcsncoll_l(const wchar_t* str1, const wchar_t* str2, if(!locinfo->lc_handle[LC_COLLATE]) return wcsncmp(str1, str2, count); - return CompareStringW(locinfo->lc_handle[LC_COLLATE], 0, + return CompareStringW(locinfo->lc_handle[LC_COLLATE], SORT_STRINGSORT, str1, wcsnlen(str1, count), str2, wcsnlen(str2, count))-CSTR_EQUAL; }

1 0

Daniel Lehman : msvcrt/tests: Include locale in ok message.
by Alexandre Julliard Feb. 19, 2024

Feb. 19, 2024

Module: wine Branch: master Commit: 6a6263c8bd0a3bc6f48b1c8e039ef0eb42030da9 URL: https://gitlab.winehq.org/wine/wine/-/commit/6a6263c8bd0a3bc6f48b1c8e039ef0… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Sun Feb 18 08:56:05 2024 -0800 msvcrt/tests: Include locale in ok message. --- dlls/msvcrt/tests/string.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/msvcrt/tests/string.c b/dlls/msvcrt/tests/string.c index 3c43d2a78b4..a14e95704f3 100644 --- a/dlls/msvcrt/tests/string.c +++ b/dlls/msvcrt/tests/string.c @@ -4197,11 +4197,14 @@ static void test__tcsncoll(void) ret = _strncoll(str1, str2, tests[i].count); if (!tests[i].exp) - ok(!ret, "expected 0, got %d for %s, %s, %d\n", ret, str1, str2, (int)tests[i].count); + ok(!ret, "expected 0, got %d for %s, %s, %d for locale %s\n", + ret, str1, str2, (int)tests[i].count, tests[i].locale); else if (tests[i].exp < 0) - ok(ret < 0, "expected < 0, got %d for %s, %s, %d\n", ret, str1, str2, (int)tests[i].count); + ok(ret < 0, "expected < 0, got %d for %s, %s, %d for locale %s\n", + ret, str1, str2, (int)tests[i].count, tests[i].locale); else - ok(ret > 0, "expected > 0, got %d for %s, %s, %d\n", ret, str1, str2, (int)tests[i].count); + ok(ret > 0, "expected > 0, got %d for %s, %s, %d for locale %s\n", + ret, str1, str2, (int)tests[i].count, tests[i].locale); memset(str1W, 0xee, sizeof(str1W)); len = mbstowcs(str1W, str1, ARRAY_SIZE(str1W)); @@ -4213,11 +4216,14 @@ static void test__tcsncoll(void) ret = _wcsncoll(str1W, str2W, tests[i].count); if (!tests[i].exp) - ok(!ret, "expected 0, got %d for %s, %s, %d\n", ret, str1, str2, (int)tests[i].count); + ok(!ret, "expected 0, got %d for %s, %s, %d for locale %s\n", + ret, str1, str2, (int)tests[i].count, tests[i].locale); else if (tests[i].exp < 0) - ok(ret < 0, "expected < 0, got %d for %s, %s, %d\n", ret, str1, str2, (int)tests[i].count); + ok(ret < 0, "expected < 0, got %d for %s, %s, %d for locale %s\n", + ret, str1, str2, (int)tests[i].count, tests[i].locale); else - ok(ret > 0, "expected > 0, got %d for %s, %s, %d\n", ret, str1, str2, (int)tests[i].count); + ok(ret > 0, "expected > 0, got %d for %s, %s, %d for locale %s\n", + ret, str1, str2, (int)tests[i].count, tests[i].locale); } }

1 0

Vijay Kiran Kamuju : include: Add msdelta header file.
by Alexandre Julliard Feb. 19, 2024

Feb. 19, 2024

Module: wine Branch: master Commit: 08803bd13627fdb7a11dc92833ea2696669cbc0c URL: https://gitlab.winehq.org/wine/wine/-/commit/08803bd13627fdb7a11dc92833ea26… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Mon Dec 11 12:15:53 2023 +0100 include: Add msdelta header file. --- include/Makefile.in | 1 + include/msdelta.h | 169 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 170 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 077cb9eaccf..3e05d259328 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -470,6 +470,7 @@ SOURCES = \ msdaguid.h \ msdasc.idl \ msdasql.h \ + msdelta.h \ mshtmcid.h \ mshtmdid.h \ mshtmhst.idl \ diff --git a/include/msdelta.h b/include/msdelta.h new file mode 100644 index 00000000000..aa7161c6b0a --- /dev/null +++ b/include/msdelta.h @@ -0,0 +1,169 @@ +/* + * Copyright 2024 Vijay Kiran Kamuju + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef _MSDELTA_H_ +#define _MSDELTA_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <windows.h> +#include <wincrypt.h> + +typedef __int64 DELTA_FILE_TYPE; +typedef __int64 DELTA_FLAG_TYPE; + +#define DELTA_FILE_SIZE_LIMIT (32*1024*1024) +#define DELTA_OPTIONS_SIZE_LIMIT (128*1024*1024) +#define DELTA_MAX_HASH_SIZE 32 + +#define DELTA_FILE_TYPE_RAW ((DELTA_FILE_TYPE)0x00000001) +#define DELTA_FILE_TYPE_I386 ((DELTA_FILE_TYPE)0x00000002) +#define DELTA_FILE_TYPE_IA64 ((DELTA_FILE_TYPE)0x00000004) +#define DELTA_FILE_TYPE_AMD64 ((DELTA_FILE_TYPE)0x00000008) +#define DELTA_FILE_TYPE_CLI_I386 ((DELTA_FILE_TYPE)0x00000010) +#define DELTA_FILE_TYPE_CLI_AMD64 ((DELTA_FILE_TYPE)0x00000020) +#define DELTA_FILE_TYPE_CLI_ARM ((DELTA_FILE_TYPE)0x00000040) +#define DELTA_FILE_TYPE_CLI_ARM64 ((DELTA_FILE_TYPE)0x00000080) + +#define DELTA_FILE_TYPE_SET_RAW_ONLY (DELTA_FILE_TYPE_RAW) +#define DELTA_FILE_TYPE_SET_EXECUTABLES_1 (DELTA_FILE_TYPE_RAW|DELTA_FILE_TYPE_I386| \ + DELTA_FILE_TYPE_IA64|DELTA_FILE_TYPE_AMD64) +#define DELTA_FILE_TYPE_SET_EXECUTABLES (DELTA_FILE_TYPE_SET_EXECUTABLES_1) +#define DELTA_FILE_TYPE_SET_EXECUTABLES_2 (DELTA_FILE_TYPE_RAW|DELTA_FILE_TYPE_CLI_I386| \ + DELTA_FILE_TYPE_IA64|DELTA_FILE_TYPE_CLI_AMD64| \ + DELTA_FILE_TYPE_CLI_ARM) +#define DELTA_FILE_TYPE_SET_EXECUTABLES_3 (DELTA_FILE_TYPE_RAW|DELTA_FILE_TYPE_CLI_I386| \ + DELTA_FILE_TYPE_IA64|DELTA_FILE_TYPE_CLI_AMD64| \ + DELTA_FILE_TYPE_CLI_ARM|DELTA_FILE_TYPE_CLI_ARM64) +#define DELTA_FILE_TYPE_SET_EXECUTABLES_LATEST (DELTA_FILE_TYPE_SET_EXECUTABLES_3) + +#define DELTA_FLAG_NONE ((DELTA_FLAG_TYPE)0x00000000) +#define DELTA_APPLY_FLAG_ALLOW_PA19 ((DELTA_FLAG_TYPE)0x00000001) +#define DELTA_FLAG_E8 ((DELTA_FLAG_TYPE)0x00000001) +#define DELTA_FLAG_MARK ((DELTA_FLAG_TYPE)0x00000002) +#define DELTA_FLAG_IMPORTS ((DELTA_FLAG_TYPE)0x00000004) +#define DELTA_FLAG_EXPORTS ((DELTA_FLAG_TYPE)0x00000008) +#define DELTA_FLAG_RESOURCES ((DELTA_FLAG_TYPE)0x00000010) +#define DELTA_FLAG_RELOCS ((DELTA_FLAG_TYPE)0x00000020) +#define DELTA_FLAG_I386_SMASHLOCK ((DELTA_FLAG_TYPE)0x00000040) +#define DELTA_FLAG_I386_JMPS ((DELTA_FLAG_TYPE)0x00000080) +#define DELTA_FLAG_I386_CALLS ((DELTA_FLAG_TYPE)0x00000100) +#define DELTA_FLAG_AMD64_DISASM ((DELTA_FLAG_TYPE)0x00000200) +#define DELTA_FLAG_AMD64_PDATA ((DELTA_FLAG_TYPE)0x00000400) +#define DELTA_FLAG_IA64_DISASM ((DELTA_FLAG_TYPE)0x00000800) +#define DELTA_FLAG_IA64_PDATA ((DELTA_FLAG_TYPE)0x00001000) +#define DELTA_FLAG_UNBIND ((DELTA_FLAG_TYPE)0x00002000) +#define DELTA_FLAG_CLI_DISASM ((DELTA_FLAG_TYPE)0x00004000) +#define DELTA_FLAG_CLI_METADATA ((DELTA_FLAG_TYPE)0x00008000) +#define DELTA_FLAG_CLI_HEADERS ((DELTA_FLAG_TYPE)0x00010000) +#define DELTA_FLAG_IGNORE_FILE_SIZE_LIMIT ((DELTA_FLAG_TYPE)0x00020000) +#define DELTA_FLAG_IGNORE_OPTIONS_SIZE_LIMIT ((DELTA_FLAG_TYPE)0x00040000) +#define DELTA_FLAG_ARM_DISASM ((DELTA_FLAG_TYPE)0x00080000) +#define DELTA_FLAG_ARM_PDATA ((DELTA_FLAG_TYPE)0x00100000) +#define DELTA_FLAG_CLI4_METADATA ((DELTA_FLAG_TYPE)0x00200000) +#define DELTA_FLAG_CLI4_DISASM ((DELTA_FLAG_TYPE)0x00400000) +#define DELTA_FLAG_ARM64_DISASM ((DELTA_FLAG_TYPE)0x00800000) +#define DELTA_FLAG_ARM64_PDATA ((DELTA_FLAG_TYPE)0x01000000) + +#define DELTA_DEFAULT_FLAGS_RAW (DELTA_FLAG_NONE) +#define DELTA_DEFAULT_FLAGS_I386 (DELTA_FLAG_MARK|DELTA_FLAG_IMPORTS| \ + DELTA_FLAG_EXPORTS|DELTA_FLAG_RESOURCES| \ + DELTA_FLAG_RELOCS|DELTA_FLAG_I386_SMASHLOCK| \ + DELTA_FLAG_I386_JMPS|DELTA_FLAG_I386_CALLS| \ + DELTA_FLAG_UNBIND|DELTA_FLAG_CLI_DISASM| \ + DELTA_FLAG_CLI_METADATA) +#define DELTA_DEFAULT_FLAGS_IA64 (DELTA_FLAG_MARK|DELTA_FLAG_IMPORTS| \ + DELTA_FLAG_EXPORTS|DELTA_FLAG_RESOURCES| \ + DELTA_FLAG_RELOCS|DELTA_FLAG_IA64_DISASM| \ + DELTA_FLAG_IA64_PDATA| DELTA_FLAG_UNBIND| \ + DELTA_FLAG_CLI_DISASM|DELTA_FLAG_CLI_METADATA) +#define DELTA_DEFAULT_FLAGS_AMD64 (DELTA_FLAG_MARK|DELTA_FLAG_IMPORTS| \ + DELTA_FLAG_EXPORTS|DELTA_FLAG_RESOURCES| \ + DELTA_FLAG_RELOCS|DELTA_FLAG_AMD64_DISASM| \ + DELTA_FLAG_AMD64_PDATA| DELTA_FLAG_UNBIND| \ + DELTA_FLAG_CLI_DISASM|DELTA_FLAG_CLI_METADATA) +#define DELTA_CLI4_FLAGS_I386 (DELTA_FLAG_MARK|DELTA_FLAG_IMPORTS| \ + DELTA_FLAG_EXPORTS|DELTA_FLAG_RESOURCES| \ + DELTA_FLAG_RELOCS|DELTA_FLAG_I386_SMASHLOCK| \ + DELTA_FLAG_I386_JMPS|DELTA_FLAG_I386_CALLS| \ + DELTA_FLAG_UNBIND|DELTA_FLAG_CLI4_DISASM| \ + DELTA_FLAG_CLI4_METADATA) +#define DELTA_CLI4_FLAGS_AMD64 (DELTA_FLAG_MARK|DELTA_FLAG_IMPORTS| \ + DELTA_FLAG_EXPORTS|DELTA_FLAG_RESOURCES| \ + DELTA_FLAG_RELOCS|DELTA_FLAG_AMD64_DISASM| \ + DELTA_FLAG_AMD64_PDATA| DELTA_FLAG_UNBIND| \ + DELTA_FLAG_CLI4_DISASM|DELTA_FLAG_CLI4_METADATA) +#define DELTA_CLI4_FLAGS_ARM (DELTA_FLAG_MARK|DELTA_FLAG_IMPORTS| \ + DELTA_FLAG_EXPORTS|DELTA_FLAG_RESOURCES| \ + DELTA_FLAG_RELOCS|DELTA_FLAG_ARM_DISASM| \ + DELTA_FLAG_ARM_PDATA| DELTA_FLAG_UNBIND| \ + DELTA_FLAG_CLI4_DISASM|DELTA_FLAG_CLI4_METADATA) +#define DELTA_CLI4_FLAGS_ARM64 (DELTA_FLAG_MARK|DELTA_FLAG_IMPORTS| \ + DELTA_FLAG_EXPORTS|DELTA_FLAG_RESOURCES| \ + DELTA_FLAG_RELOCS|DELTA_FLAG_ARM64_DISASM| \ + DELTA_FLAG_ARM64_PDATA| DELTA_FLAG_UNBIND| \ + DELTA_FLAG_CLI4_DISASM|DELTA_FLAG_CLI4_METADATA) + +typedef struct _DELTA_INPUT +{ + union { + LPCVOID lpcStart; + LPVOID lpStart; + }; + SIZE_T uSize; + BOOL Editable; +} DELTA_INPUT; +typedef DELTA_INPUT *LPDELTA_INPUT; +typedef const DELTA_INPUT *LPCDELTA_INPUT; + +typedef struct _DELTA_OUTPUT +{ + LPVOID lpStart; + SIZE_T uSize; +} DELTA_OUTPUT; +typedef DELTA_OUTPUT *LPDELTA_OUTPUT; +typedef const DELTA_OUTPUT *LPCDELTA_OUTPUT; + +typedef struct _DELTA_HASH +{ + DWORD HashSize; + UCHAR HashValue[DELTA_MAX_HASH_SIZE]; +} DELTA_HASH; +typedef DELTA_HASH *LPDELTA_HASH; +typedef const DELTA_HASH *LPCDELTA_HASH; + +typedef struct _DELTA_HEADER_INFO +{ + DELTA_FILE_TYPE FileTypeSet; + DELTA_FILE_TYPE FileType; + DELTA_FLAG_TYPE Flags; + SIZE_T TargetSize; + FILETIME TargetFileTime; + ALG_ID TargetHashAlgId; + DELTA_HASH TargetHash; +} DELTA_HEADER_INFO; +typedef DELTA_HEADER_INFO *LPDELTA_HEADER_INFO; +typedef const DELTA_HEADER_INFO *LPCDELTA_HEADER_INFO; + +#ifdef __cplusplus +} +#endif + +#endif /* _MSDELTA_H_ */

1 0

Eric Pouech : dbghelp: Implement SymFromIndex().
by Alexandre Julliard Feb. 19, 2024

Feb. 19, 2024

Module: wine Branch: master Commit: 65109c725dbed4fa29cf90f5a8729071335c65d2 URL: https://gitlab.winehq.org/wine/wine/-/commit/65109c725dbed4fa29cf90f5a87290… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Dec 14 14:15:14 2023 +0100 dbghelp: Implement SymFromIndex(). Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/symbol.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 68ab81816cd..8ddbc0b1f24 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -2614,10 +2614,16 @@ BOOL WINAPI SymGetLineFromNameW64(HANDLE hProcess, PCWSTR ModuleName, PCWSTR Fil */ BOOL WINAPI SymFromIndex(HANDLE hProcess, ULONG64 BaseOfDll, DWORD index, PSYMBOL_INFO symbol) { - FIXME("hProcess = %p, BaseOfDll = %I64x, index = %ld, symbol = %p\n", + struct module_pair pair; + struct symt* sym; + + TRACE("hProcess = %p, BaseOfDll = %I64x, index = %ld, symbol = %p\n", hProcess, BaseOfDll, index, symbol); - return FALSE; + if (!module_init_pair(&pair, hProcess, BaseOfDll)) return FALSE; + if ((sym = symt_index2ptr(pair.effective, index)) == NULL) return FALSE; + symt_fill_sym_info(&pair, NULL, sym, symbol); + return TRUE; } /****************************************************************** @@ -2626,10 +2632,21 @@ BOOL WINAPI SymFromIndex(HANDLE hProcess, ULONG64 BaseOfDll, DWORD index, PSYMBO */ BOOL WINAPI SymFromIndexW(HANDLE hProcess, ULONG64 BaseOfDll, DWORD index, PSYMBOL_INFOW symbol) { - FIXME("hProcess = %p, BaseOfDll = %I64x, index = %ld, symbol = %p\n", + PSYMBOL_INFO si; + BOOL ret; + + TRACE("hProcess = %p, BaseOfDll = %I64x, index = %ld, symbol = %p\n", hProcess, BaseOfDll, index, symbol); - return FALSE; + si = HeapAlloc(GetProcessHeap(), 0, sizeof(*si) + symbol->MaxNameLen * sizeof(WCHAR)); + if (!si) return FALSE; + + si->SizeOfStruct = sizeof(*si); + si->MaxNameLen = symbol->MaxNameLen; + if ((ret = SymFromIndex(hProcess, BaseOfDll, index, si))) + copy_symbolW(symbol, si); + HeapFree(GetProcessHeap(), 0, si); + return ret; } /******************************************************************

1 0

Zebediah Figura : shell32: Separate a get_filetype() helper.
by Alexandre Julliard Feb. 19, 2024

Feb. 19, 2024

Module: wine Branch: master Commit: d1eed1c7022deb4a772ce0b411c84bba69a439d5 URL: https://gitlab.winehq.org/wine/wine/-/commit/d1eed1c7022deb4a772ce0b411c84b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 16 23:53:36 2024 -0600 shell32: Separate a get_filetype() helper. --- dlls/shell32/shlview_cmenu.c | 65 +++++++++++++++++++++++--------------------- 1 file changed, 34 insertions(+), 31 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 181ff36787e..38b63f74205 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -634,6 +634,39 @@ error: free(props); } +static void get_filetype(LPCITEMIDLIST pidl, WCHAR filetype[MAX_PATH]) +{ + if (_ILIsValue(pidl)) + { + char ext[64], filetypeA[64]; + + if (_ILGetExtension(pidl, ext, 64)) + { + HCR_MapTypeToValueA(ext, filetypeA, 64, TRUE); + MultiByteToWideChar(CP_ACP, 0, filetypeA, -1, filetype, MAX_PATH); + } + else + { + filetype[0] = 0; + } + } + else if (_ILIsFolder(pidl)) + { + wcscpy(filetype, L"Folder"); + } + else if (_ILIsSpecialFolder(pidl)) + { + GUID *guid = _ILGetGUIDPointer(pidl); + + wcscpy(filetype, L"CLSID\\"); + StringFromGUID2(guid, &filetype[6], MAX_PATH - 6); + } + else + { + FIXME("Unknown pidl type.\n"); + } +} + #define MAX_PROP_PAGES 99 static void DoOpenProperties(ContextMenu *This, HWND hwnd) @@ -661,37 +694,7 @@ static void DoOpenProperties(ContextMenu *This, HWND hwnd) _ILSimpleGetTextW(This->apidl[0], (LPVOID)wszFilename, MAX_PATH); psh.pszCaption = (LPCWSTR)wszFilename; - /* Find out where to look for the shell extensions */ - if (_ILIsValue(This->apidl[0])) - { - char sTemp[64]; - sTemp[0] = 0; - if (_ILGetExtension(This->apidl[0], sTemp, 64)) - { - HCR_MapTypeToValueA(sTemp, sTemp, 64, TRUE); - MultiByteToWideChar(CP_ACP, 0, sTemp, -1, wszFiletype, MAX_PATH); - } - else - { - wszFiletype[0] = 0; - } - } - else if (_ILIsFolder(This->apidl[0])) - { - lstrcpynW(wszFiletype, L"Folder", 64); - } - else if (_ILIsSpecialFolder(This->apidl[0])) - { - LPGUID folderGUID; - folderGUID = _ILGetGUIDPointer(This->apidl[0]); - lstrcpyW(wszFiletype, L"CLSID\\"); - StringFromGUID2(folderGUID, &wszFiletype[6], MAX_PATH - 6); - } - else - { - FIXME("Requested properties for unknown type.\n"); - return; - } + get_filetype(This->apidl[0], wszFiletype); /* Get a suitable DataObject for accessing the files */ SHGetDesktopFolder(&lpDesktopSF);

1 0

Zebediah Figura : shell32: Do not set the default menu item from ShellView_DoContextMenu().
by Alexandre Julliard Feb. 19, 2024

Feb. 19, 2024

Module: wine Branch: master Commit: 6fd349c6e0262d0b4c5739c90883131c1b145818 URL: https://gitlab.winehq.org/wine/wine/-/commit/6fd349c6e0262d0b4c5739c9088313… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Feb 16 22:02:54 2024 -0600 shell32: Do not set the default menu item from ShellView_DoContextMenu(). This was added in f045c9df8130db17e4d379b56744f21f9a1491f8, with no explanation. It does not affect any behaviour in Wine, since FWF_DESKTOP is never set. It does not make sense, since "open" is already usually the default action on Windows, and it's not obvious why FWF_DESKTOP would affect this. It also leans on IContextMenu implementation details. --- dlls/shell32/shlview.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c index abe13981df1..9c699ecda08 100644 --- a/dlls/shell32/shlview.c +++ b/dlls/shell32/shlview.c @@ -1039,9 +1039,6 @@ static void ShellView_DoContextMenu(IShellViewImpl * This, WORD x, WORD y, BOOL /* let the ContextMenu merge its items in */ if (SUCCEEDED(IContextMenu_QueryContextMenu( pContextMenu, hMenu, 0, FCIDM_SHVIEWFIRST, FCIDM_SHVIEWLAST, wFlags ))) { - if (This->FolderSettings.fFlags & FWF_DESKTOP) - SetMenuDefaultItem(hMenu, FCIDM_SHVIEW_OPEN, MF_BYCOMMAND); - if( bDefault ) { TRACE("-- get menu default command\n");

1 0