February 2024 - Wine-commits

Evan Tang : tests/shader-runner: Support testing for integer pixel data.
by Alexandre Julliard 01 Feb '24

01 Feb '24

Module: vkd3d Branch: master Commit: 13ac795061ea147a66e0d328ad8261685ccdb7e6 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/13ac795061ea147a66e0d328ad826… Author: Evan Tang <etang(a)codeweavers.com> Date: Fri Oct 13 16:27:44 2023 -0500 tests/shader-runner: Support testing for integer pixel data. Modified by Conor McCarthy to use read_uint() and read_uint4(). --- tests/d3d12.c | 5 --- tests/d3d12_test_utils.h | 48 ---------------------------- tests/shader_runner.c | 62 +++++++++++++++++++++++++++++------- tests/utils.h | 82 ++++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 133 insertions(+), 64 deletions(-)

1 0

Conor McCarthy : tests/shader-runner: Add an asuint() test to the 64-bit cast tests.
by Alexandre Julliard 01 Feb '24

01 Feb '24

Module: vkd3d Branch: master Commit: 254e812b12574337c21957532d628bc0d24c0b50 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/254e812b12574337c21957532d628… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Tue Jan 23 13:47:01 2024 +1000 tests/shader-runner: Add an asuint() test to the 64-bit cast tests. --- tests/hlsl/cast-64-bit.shader_test | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/tests/hlsl/cast-64-bit.shader_test b/tests/hlsl/cast-64-bit.shader_test index aa558ec9..efdf9263 100644 --- a/tests/hlsl/cast-64-bit.shader_test +++ b/tests/hlsl/cast-64-bit.shader_test @@ -19,6 +19,23 @@ todo(sm<6) draw quad probe all rgba (-4.5, 8.5, 2.0, 2.0) +[pixel shader todo] +uniform double2 d; + +uint4 main() : sv_target +{ + uint4 result; + asuint(d.x, result.x, result.y); + asuint(d.y, result.z, result.w); + return result; +} + +[test] +uniform 0 double2 -4.5 8.500003814697266 +todo draw quad +probe all rgbaui (0, 0xc0120000, 0x80000000, 0x40210000) + + [require] shader model >= 6.0 int64

1 0

Conor McCarthy : vkd3d-shader/dxil: Implement DX intrinsic SplitDouble.
by Alexandre Julliard 01 Feb '24

01 Feb '24

Module: vkd3d Branch: master Commit: e6d52861e9d42e09814827c5401f237dd6de7451 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/e6d52861e9d42e09814827c5401f2… Author: Conor McCarthy <cmccarthy(a)codeweavers.com> Date: Wed Jan 24 14:03:30 2024 +1000 vkd3d-shader/dxil: Implement DX intrinsic SplitDouble. --- libs/vkd3d-shader/dxil.c | 26 ++++++++++++++++++++++++++ tests/hlsl/cast-64-bit.shader_test | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/dxil.c b/libs/vkd3d-shader/dxil.c index 0358dbb6..e315eabf 100644 --- a/libs/vkd3d-shader/dxil.c +++ b/libs/vkd3d-shader/dxil.c @@ -367,6 +367,7 @@ enum dx_intrinsic_opcode DX_DERIV_COARSEY = 84, DX_DERIV_FINEX = 85, DX_DERIV_FINEY = 86, + DX_SPLIT_DOUBLE = 102, DX_LEGACY_F32TOF16 = 130, DX_LEGACY_F16TOF32 = 131, DX_RAW_BUFFER_LOAD = 139, @@ -1732,6 +1733,11 @@ static bool sm6_type_is_f16_f32(const struct sm6_type *type) return type->class == TYPE_CLASS_FLOAT && (type->u.width == 16 || type->u.width == 32); } +static bool sm6_type_is_double(const struct sm6_type *type) +{ + return type->class == TYPE_CLASS_FLOAT && type->u.width == 64; +} + static inline bool sm6_type_is_floating_point(const struct sm6_type *type) { return type->class == TYPE_CLASS_FLOAT; @@ -3880,6 +3886,19 @@ static void sm6_parser_emit_dx_sincos(struct sm6_parser *sm6, enum dx_intrinsic_ dst->u.reg = dst_params[index].reg; } +static void sm6_parser_emit_dx_split_double(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, + const struct sm6_value **operands, struct function_emission_state *state) +{ + struct vkd3d_shader_instruction *ins = state->ins; + struct vkd3d_shader_src_param *src_param; + + vsir_instruction_init(ins, &sm6->p.location, VKD3DSIH_MOV); + src_param = instruction_src_params_alloc(ins, 1, sm6); + src_param_init_from_value(src_param, operands[0]); + + instruction_dst_param_init_ssa_vector(ins, 2, sm6); +} + static void sm6_parser_emit_dx_store_output(struct sm6_parser *sm6, enum dx_intrinsic_opcode op, const struct sm6_value **operands, struct function_emission_state *state) { @@ -3950,9 +3969,11 @@ struct sm6_dx_opcode_info i -> int32 m -> int16/32/64 f -> float + d -> double e -> half/float g -> half/float/double H -> handle + S -> splitdouble v -> void o -> overloaded R -> matches the return type @@ -3993,6 +4014,7 @@ static const struct sm6_dx_opcode_info sm6_dx_op_table[] = [DX_ROUND_Z ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_RSQRT ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_SIN ] = {"g", "R", sm6_parser_emit_dx_sincos}, + [DX_SPLIT_DOUBLE ] = {"S", "d", sm6_parser_emit_dx_split_double}, [DX_SQRT ] = {"g", "R", sm6_parser_emit_dx_unary}, [DX_STORE_OUTPUT ] = {"v", "ii8o", sm6_parser_emit_dx_store_output}, [DX_TAN ] = {"g", "R", sm6_parser_emit_dx_unary}, @@ -4029,12 +4051,16 @@ static bool sm6_parser_validate_operand_type(struct sm6_parser *sm6, const struc return sm6_type_is_i16_i32_i64(type); case 'f': return sm6_type_is_float(type); + case 'd': + return sm6_type_is_double(type); case 'e': return sm6_type_is_f16_f32(type); case 'g': return sm6_type_is_floating_point(type); case 'H': return (is_return || sm6_value_is_handle(value)) && type == sm6->handle_type; + case 'S': + return sm6_type_is_struct(type) && !strcmp(type->u.struc->name, "dx.types.splitdouble"); case 'v': return !type; case 'o': diff --git a/tests/hlsl/cast-64-bit.shader_test b/tests/hlsl/cast-64-bit.shader_test index efdf9263..1e33d811 100644 --- a/tests/hlsl/cast-64-bit.shader_test +++ b/tests/hlsl/cast-64-bit.shader_test @@ -32,7 +32,7 @@ uint4 main() : sv_target [test] uniform 0 double2 -4.5 8.500003814697266 -todo draw quad +todo(sm<6) draw quad probe all rgbaui (0, 0xc0120000, 0x80000000, 0x40210000)

1 0

Paul Gofman : ntdll/tests: Fix test_user_shared_data() for a more generic set of present features.
by Alexandre Julliard 01 Feb '24

01 Feb '24

Module: wine Branch: master Commit: f8ee879002d61fee4758de1f3a83a46eed15a199 URL: https://gitlab.winehq.org/wine/wine/-/commit/f8ee879002d61fee4758de1f3a83a4… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Thu Feb 1 12:28:14 2024 -0600 ntdll/tests: Fix test_user_shared_data() for a more generic set of present features. --- dlls/ntdll/tests/virtual.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 011d3f1692f..3628cec89e8 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -2007,18 +2007,19 @@ static void test_user_shared_data(void) return; } - trace("XState EnabledFeatures %s.\n", wine_dbgstr_longlong(xstate.EnabledFeatures)); + trace("XState EnabledFeatures %#I64x, EnabledSupervisorFeatures %#I64x, EnabledVolatileFeatures %I64x.\n", + xstate.EnabledFeatures, xstate.EnabledSupervisorFeatures, xstate.EnabledVolatileFeatures); feature_mask = pRtlGetEnabledExtendedFeatures(0); ok(!feature_mask, "Got unexpected feature_mask %s.\n", wine_dbgstr_longlong(feature_mask)); feature_mask = pRtlGetEnabledExtendedFeatures(~(ULONG64)0); - ok(feature_mask == xstate.EnabledFeatures, "Got unexpected feature_mask %s.\n", + ok(feature_mask == (xstate.EnabledFeatures | xstate.EnabledSupervisorFeatures), "Got unexpected feature_mask %s.\n", wine_dbgstr_longlong(feature_mask)); feature_mask = pGetEnabledXStateFeatures(); - ok(feature_mask == xstate.EnabledFeatures, "Got unexpected feature_mask %s.\n", + ok(feature_mask == (xstate.EnabledFeatures | xstate.EnabledSupervisorFeatures), "Got unexpected feature_mask %s.\n", wine_dbgstr_longlong(feature_mask)); ok((xstate.EnabledFeatures & SUPPORTED_XSTATE_FEATURES) == SUPPORTED_XSTATE_FEATURES, "Got unexpected EnabledFeatures %s.\n", wine_dbgstr_longlong(xstate.EnabledFeatures)); - ok((xstate.EnabledVolatileFeatures & SUPPORTED_XSTATE_FEATURES) == xstate.EnabledFeatures, + ok((xstate.EnabledVolatileFeatures & SUPPORTED_XSTATE_FEATURES) == (xstate.EnabledFeatures & SUPPORTED_XSTATE_FEATURES), "Got unexpected EnabledVolatileFeatures %s.\n", wine_dbgstr_longlong(xstate.EnabledVolatileFeatures)); ok(xstate.Size >= 512 + sizeof(XSTATE), "Got unexpected Size %lu.\n", xstate.Size); if (xstate.CompactionEnabled)

1 0

Eric Pouech : dbghelp/tests: Use Unicode encoding for generated PDB filenames.
by Alexandre Julliard 01 Feb '24

01 Feb '24

Module: wine Branch: master Commit: 27003f8329d7dc46c3194b70dd9b16790d78a63e URL: https://gitlab.winehq.org/wine/wine/-/commit/27003f8329d7dc46c3194b70dd9b16… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jan 29 17:24:38 2024 +0100 dbghelp/tests: Use Unicode encoding for generated PDB filenames. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/tests/path.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/dbghelp/tests/path.c b/dlls/dbghelp/tests/path.c index 756eb862df9..4092fb5b2ab 100644 --- a/dlls/dbghelp/tests/path.c +++ b/dlls/dbghelp/tests/path.c @@ -503,7 +503,7 @@ static void pdb_write(HANDLE hfile, struct pdb_file* pdb) SetEndOfFile(hfile); } -static BOOL create_test_pdb_ds(const char* pdb_name, const GUID* guid, DWORD age) +static BOOL create_test_pdb_ds(const WCHAR* pdb_name, const GUID* guid, DWORD age) { struct PDB_DS_ROOT root = { @@ -660,8 +660,8 @@ static BOOL create_test_pdb_ds(const char* pdb_name, const GUID* guid, DWORD age stream = pdb_add_stream(&pdb, &pddt.sections_stream, &ro_section, sizeof(ro_section)); - hfile = CreateFileA(pdb_name, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, 0); - ok(hfile != INVALID_HANDLE_VALUE, "failed to create %s err %lu\n", pdb_name, GetLastError()); + hfile = CreateFileW(pdb_name, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "failed to create %ls err %lu\n", pdb_name, GetLastError()); if (hfile == INVALID_HANDLE_VALUE) return FALSE; pdb_write(hfile, &pdb); @@ -803,8 +803,8 @@ static void test_srvgetindexes_pe(void) static void test_srvgetindexes_pdb(void) { unsigned int i; - char filename[128]; - SYMSRV_INDEX_INFO ssii; + WCHAR filename[128]; + SYMSRV_INDEX_INFOW ssii; BOOL ret; static struct @@ -822,12 +822,12 @@ static void test_srvgetindexes_pdb(void) winetest_push_context("pdb#%02u", i); /* create dll */ - snprintf(filename, ARRAYSIZE(filename), "winetest%02u.pdb", i); + swprintf(filename, ARRAY_SIZE(filename), L"winetest%02u.pdb", i); create_test_pdb_ds(filename, indexes[i].guid, 240 + i); memset(&ssii, 0x45, sizeof(ssii)); ssii.sizeofstruct = sizeof(ssii); - ret = SymSrvGetFileIndexInfo(filename, &ssii, 0); + ret = SymSrvGetFileIndexInfoW(filename, &ssii, 0); ok(ret, "SymSrvGetFileIndexInfo failed: %lu\n", GetLastError()); ok(ssii.age == 240 + i, "Mismatch in age: %lx\n", ssii.age); @@ -839,11 +839,11 @@ static void test_srvgetindexes_pdb(void) ok(ssii.size == 0, "Mismatch in size: %lx\n", ssii.size); ok(!ssii.stripped, "Mismatch in stripped: %x\n", ssii.stripped); ok(ssii.timestamp == 0, "Mismatch in timestamp: %lx\n", ssii.timestamp); - ok(!strcmp(ssii.file, filename), "Mismatch in file: %s\n", ssii.file); - ok(!ssii.pdbfile[0], "Mismatch in pdbfile: %s\n", ssii.pdbfile); - ok(!ssii.dbgfile[0], "Mismatch in dbgfile: %s\n", ssii.dbgfile); + ok(!wcscmp(ssii.file, filename), "Mismatch in file: %ls\n", ssii.file); + ok(!ssii.pdbfile[0], "Mismatch in pdbfile: %ls\n", ssii.pdbfile); + ok(!ssii.dbgfile[0], "Mismatch in dbgfile: %ls\n", ssii.dbgfile); - DeleteFileA(filename); + DeleteFileW(filename); winetest_pop_context(); } }

1 0

Eric Pouech : dbghelp/tests: Test SymSrvGetFileIndexInfo() on .dbg files.
by Alexandre Julliard 01 Feb '24

01 Feb '24

Module: wine Branch: master Commit: 34128f1ae71a0a3860f5cc037f028147556559cc URL: https://gitlab.winehq.org/wine/wine/-/commit/34128f1ae71a0a3860f5cc037f0281… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Mon Jan 29 17:17:45 2024 +0100 dbghelp/tests: Test SymSrvGetFileIndexInfo() on .dbg files. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/tests/path.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/dbghelp/tests/path.c b/dlls/dbghelp/tests/path.c index 4092fb5b2ab..e1539bad966 100644 --- a/dlls/dbghelp/tests/path.c +++ b/dlls/dbghelp/tests/path.c @@ -671,6 +671,34 @@ static BOOL create_test_pdb_ds(const WCHAR* pdb_name, const GUID* guid, DWORD ag return TRUE; } +static BOOL create_test_dbg(const WCHAR* dbg_name, WORD machine, DWORD timestamp, DWORD size) +{ + HANDLE hfile; + + /* minimalistic .dbg made of a header and a DEBUG_DIRECTORY without any data */ + const IMAGE_SEPARATE_DEBUG_HEADER header = {.Signature = 0x4944 /* DI */, + .Flags = 0, .Machine = machine, .Characteristics = 0x010E, .TimeDateStamp = timestamp, + .CheckSum = 0, .ImageBase = 0x00040000, .SizeOfImage = size, .NumberOfSections = 0, + .ExportedNamesSize = 0, .DebugDirectorySize = sizeof(IMAGE_DEBUG_DIRECTORY)}; + const IMAGE_DEBUG_DIRECTORY debug_dir = {.Characteristics = 0, .TimeDateStamp = timestamp + 1, + .MajorVersion = 0, .MinorVersion = 0, .Type = IMAGE_DEBUG_TYPE_CODEVIEW, + .SizeOfData = 0, .AddressOfRawData = 0, + .PointerToRawData = sizeof(header) + header.NumberOfSections * sizeof(IMAGE_SECTION_HEADER) + + header.DebugDirectorySize}; + + hfile = CreateFileW(dbg_name, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_ALWAYS, 0, 0); + ok(hfile != INVALID_HANDLE_VALUE, "failed to create %ls err %lu\n", dbg_name, GetLastError()); + if (hfile == INVALID_HANDLE_VALUE) return FALSE; + + check_write_file(hfile, &header, sizeof(header)); + /* FIXME: 0 sections... as header.NumberOfSections */ + check_write_file(hfile, &debug_dir, sizeof(debug_dir)); + ok(SetFilePointer(hfile, 0, NULL, FILE_CURRENT) == debug_dir.PointerToRawData, "mismatch\n"); + + CloseHandle(hfile); + return TRUE; +} + /* ============================================== * the tests * ============================================== @@ -848,6 +876,58 @@ static void test_srvgetindexes_pdb(void) } } +static void test_srvgetindexes_dbg(void) +{ + unsigned int i; + WCHAR filename[128]; + SYMSRV_INDEX_INFOW ssii; + BOOL ret; + + static struct + { + /* input parameters */ + WORD machine; + DWORD timestamp; + DWORD imagesize; + } + indexes[] = + { + {IMAGE_FILE_MACHINE_I386, 0x1234, 0x00560000}, + {IMAGE_FILE_MACHINE_AMD64, 0x1235, 0x00570000}, + }; + for (i = 0; i < ARRAY_SIZE(indexes); i++) + { + winetest_push_context("dbg#%02u", i); + + /* create dll */ + swprintf(filename, ARRAY_SIZE(filename), L"winetest%02u.dbg", i); + ret = create_test_dbg(filename, indexes[i].machine, indexes[i].timestamp, indexes[i].imagesize); + ok(ret, "Couldn't create dbg file %ls\n", filename); + + memset(&ssii, 0x45, sizeof(ssii)); + ssii.sizeofstruct = sizeof(ssii); + ret = SymSrvGetFileIndexInfoW(filename, &ssii, 0); + todo_wine + ok(ret, "SymSrvGetFileIndexInfo failed: %lu\n", GetLastError()); + + if (ret){ + ok(ssii.age == 0, "Mismatch in age: %lx\n", ssii.age); + ok(!memcmp(&ssii.guid, &null_guid, sizeof(GUID)), + "Mismatch in guid: guid=%s\n", wine_dbgstr_guid(&ssii.guid)); + + ok(ssii.sig == 0, "Mismatch in sig: %lx\n", ssii.sig); + ok(ssii.size == indexes[i].imagesize, "Mismatch in size: %lx\n", ssii.size); + ok(!ssii.stripped, "Mismatch in stripped: %x\n", ssii.stripped); + ok(ssii.timestamp == indexes[i].timestamp, "Mismatch in timestamp: %lx\n", ssii.timestamp); + ok(!wcscmp(ssii.file, filename), "Mismatch in file: %ls\n", ssii.file); + ok(!ssii.pdbfile[0], "Mismatch in pdbfile: %ls\n", ssii.pdbfile); + ok(!ssii.dbgfile[0], "Mismatch in dbgfile: %ls\n", ssii.dbgfile); + } + DeleteFileW(filename); + winetest_pop_context(); + } +} + START_TEST(path) { /* cleanup env variables that affect dbghelp's behavior */ @@ -856,4 +936,5 @@ START_TEST(path) test_srvgetindexes_pe(); test_srvgetindexes_pdb(); + test_srvgetindexes_dbg(); }

1 0

Eric Pouech : dbghelp: Implement SymSrvGetFileIndexInfo() for .dbg files.
by Alexandre Julliard 01 Feb '24

01 Feb '24

Module: wine Branch: master Commit: 767fc14ef758fdc7e9d4fddedf10dd9c5f71866c URL: https://gitlab.winehq.org/wine/wine/-/commit/767fc14ef758fdc7e9d4fddedf10dd… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Wed Jan 31 18:03:13 2024 +0100 dbghelp: Implement SymSrvGetFileIndexInfo() for .dbg files. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/msc.c | 33 +++++++++++++++++++++++++++++++++ dlls/dbghelp/path.c | 2 ++ dlls/dbghelp/tests/path.c | 4 +--- 4 files changed, 37 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index acba5faca37..4f14433c7c4 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -767,6 +767,7 @@ struct pdb_cmd_pair { extern BOOL pdb_virtual_unwind(struct cpu_stack_walk *csw, DWORD_PTR ip, union ctx *context, struct pdb_cmd_pair *cpair); extern DWORD pdb_get_file_indexinfo(void* image, DWORD size, SYMSRV_INDEX_INFOW* info); +extern DWORD dbg_get_file_indexinfo(void* image, DWORD size, SYMSRV_INDEX_INFOW* info); /* path.c */ extern BOOL path_find_symbol_file(const struct process* pcs, const struct module* module, diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index a62667ea8c3..0440530f6cf 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -4573,3 +4573,36 @@ DWORD msc_get_file_indexinfo(void* image, const IMAGE_DEBUG_DIRECTORY* debug_dir } return info->stripped && !num_misc_records ? ERROR_BAD_EXE_FORMAT : ERROR_SUCCESS; } + +DWORD dbg_get_file_indexinfo(void* image, DWORD size, SYMSRV_INDEX_INFOW* info) +{ + const IMAGE_SEPARATE_DEBUG_HEADER *header; + DWORD num_directories; + + if (size < sizeof(*header)) return ERROR_BAD_EXE_FORMAT; + header = image; + if (header->Signature != 0x4944 /* DI */ || + size < sizeof(*header) + header->NumberOfSections * sizeof(IMAGE_SECTION_HEADER) + header->ExportedNamesSize + header->DebugDirectorySize) + return ERROR_BAD_EXE_FORMAT; + + /* header is followed by: + * - header->NumberOfSections of IMAGE_SECTION_HEADER + * - header->ExportedNameSize + * - then num_directories of IMAGE_DEBUG_DIRECTORY + */ + num_directories = header->DebugDirectorySize / sizeof(IMAGE_DEBUG_DIRECTORY); + + if (!num_directories) return ERROR_BAD_EXE_FORMAT; + + info->age = 0; + memset(&info->guid, 0, sizeof(info->guid)); + info->sig = 0; + info->dbgfile[0] = L'\0'; + info->pdbfile[0] = L'\0'; + info->size = header->SizeOfImage; + /* seems to use header's timestamp, not debug_directory one */ + info->timestamp = header->TimeDateStamp; + info->stripped = FALSE; /* FIXME */ + + return ERROR_SUCCESS; +} diff --git a/dlls/dbghelp/path.c b/dlls/dbghelp/path.c index 2437a7b6131..ec182c969d3 100644 --- a/dlls/dbghelp/path.c +++ b/dlls/dbghelp/path.c @@ -860,6 +860,8 @@ BOOL WINAPI SymSrvGetFileIndexInfoW(const WCHAR *file, SYMSRV_INDEX_INFOW* info, ret = pe_get_file_indexinfo(image, fsize, info); if (ret == ERROR_BAD_FORMAT) ret = pdb_get_file_indexinfo(image, fsize, info); + if (ret == ERROR_BAD_FORMAT) + ret = dbg_get_file_indexinfo(image, fsize, info); } else ret = ERROR_FILE_NOT_FOUND; diff --git a/dlls/dbghelp/tests/path.c b/dlls/dbghelp/tests/path.c index e1539bad966..fb7c103d845 100644 --- a/dlls/dbghelp/tests/path.c +++ b/dlls/dbghelp/tests/path.c @@ -907,10 +907,8 @@ static void test_srvgetindexes_dbg(void) memset(&ssii, 0x45, sizeof(ssii)); ssii.sizeofstruct = sizeof(ssii); ret = SymSrvGetFileIndexInfoW(filename, &ssii, 0); - todo_wine ok(ret, "SymSrvGetFileIndexInfo failed: %lu\n", GetLastError()); - if (ret){ ok(ssii.age == 0, "Mismatch in age: %lx\n", ssii.age); ok(!memcmp(&ssii.guid, &null_guid, sizeof(GUID)), "Mismatch in guid: guid=%s\n", wine_dbgstr_guid(&ssii.guid)); @@ -922,7 +920,7 @@ static void test_srvgetindexes_dbg(void) ok(!wcscmp(ssii.file, filename), "Mismatch in file: %ls\n", ssii.file); ok(!ssii.pdbfile[0], "Mismatch in pdbfile: %ls\n", ssii.pdbfile); ok(!ssii.dbgfile[0], "Mismatch in dbgfile: %ls\n", ssii.dbgfile); - } + DeleteFileW(filename); winetest_pop_context(); }

1 0

Eric Pouech : dbghelp: Implement SymSrvGetFileIndexInfo() for PDB/JG files.
by Alexandre Julliard 01 Feb '24

01 Feb '24

Module: wine Branch: master Commit: 9bca18e7960c4f9eee9270b9563591fec9634dfd URL: https://gitlab.winehq.org/wine/wine/-/commit/9bca18e7960c4f9eee9270b9563591… Author: Eric Pouech <epouech(a)codeweavers.com> Date: Thu Feb 1 09:00:47 2024 +0100 dbghelp: Implement SymSrvGetFileIndexInfo() for PDB/JG files. Signed-off-by: Eric Pouech <epouech(a)codeweavers.com> --- dlls/dbghelp/msc.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 0440530f6cf..26e921f7a0f 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -3615,8 +3615,47 @@ DWORD pdb_get_file_indexinfo(void* image, DWORD size, SYMSRV_INDEX_INFOW* info) if (!memcmp(image, PDB_JG_IDENT, sizeof(PDB_JG_IDENT))) { - FIXME("Unsupported for PDB files in JG format\n"); - return ERROR_FILE_CORRUPT; + const struct PDB_JG_HEADER* pdb = (const struct PDB_JG_HEADER*)image; + struct PDB_JG_TOC* jg_toc; + struct PDB_JG_ROOT* root; + DWORD ec = ERROR_SUCCESS; + + jg_toc = pdb_jg_read(pdb, pdb->toc_block, pdb->toc.size); + root = pdb_read_jg_stream(pdb, jg_toc, 1); + if (!root) + { + ERR("-Unable to get root from .PDB\n"); + pdb_free(jg_toc); + return ERROR_FILE_CORRUPT; + } + switch (root->Version) + { + case 19950623: /* VC 4.0 */ + case 19950814: + case 19960307: /* VC 5.0 */ + case 19970604: /* VC 6.0 */ + break; + default: + ERR("-Unknown root block version %d\n", root->Version); + ec = ERROR_FILE_CORRUPT; + } + if (ec == ERROR_SUCCESS) + { + info->dbgfile[0] = '\0'; + memset(&info->guid, 0, sizeof(GUID)); + info->guid.Data1 = root->TimeDateStamp; + info->pdbfile[0] = '\0'; + info->age = root->Age; + info->sig = root->TimeDateStamp; + info->size = 0; + info->stripped = FALSE; + info->timestamp = 0; + } + + pdb_free(jg_toc); + pdb_free(root); + + return ec; } if (!memcmp(image, PDB_DS_IDENT, sizeof(PDB_DS_IDENT))) {

1 0

Piotr Caban : jsproxy: Don't ignore hostname and url length in InternetGetProxyInfo.
by Alexandre Julliard 01 Feb '24

01 Feb '24

Module: wine Branch: master Commit: 53faf7bda8f88d386a572db3b505cae0af8057fc URL: https://gitlab.winehq.org/wine/wine/-/commit/53faf7bda8f88d386a572db3b505ca… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Feb 1 16:20:23 2024 +0100 jsproxy: Don't ignore hostname and url length in InternetGetProxyInfo. --- dlls/jsproxy/main.c | 9 ++------- dlls/jsproxy/tests/jsproxy.c | 12 +++++++++++- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/jsproxy/main.c b/dlls/jsproxy/main.c index 4e69210dce3..9506b7153cf 100644 --- a/dlls/jsproxy/main.c +++ b/dlls/jsproxy/main.c @@ -576,13 +576,8 @@ BOOL WINAPI InternetGetProxyInfo( LPCSTR url, DWORD len_url, LPCSTR hostname, DW SetLastError( ERROR_CAN_NOT_COMPLETE ); goto done; } - if (hostname && len_hostname < strlen( hostname )) - { - SetLastError( ERROR_INSUFFICIENT_BUFFER ); - goto done; - } - if (!(urlW = strdupAW( url, -1 ))) goto done; - if (hostname && !(hostnameW = strdupAW( hostname, -1 ))) goto done; + if (!(urlW = strdupAW( url, len_url ))) goto done; + if (hostname && !(hostnameW = strdupAW( hostname, len_hostname ))) goto done; TRACE( "%s\n", debugstr_w(global_script->text) ); ret = run_script( global_script->text, urlW, hostnameW, proxy, len_proxy ); diff --git a/dlls/jsproxy/tests/jsproxy.c b/dlls/jsproxy/tests/jsproxy.c index 505d1a9398a..901ffdf910e 100644 --- a/dlls/jsproxy/tests/jsproxy.c +++ b/dlls/jsproxy/tests/jsproxy.c @@ -104,7 +104,9 @@ static void test_InternetInitializeAutoProxyDll(void) static void test_InternetGetProxyInfo(void) { const char url[] = "http://localhost"; - char script[] = "function FindProxyForURL(url, host) { return \"DIRECT\"; }"; + char script[] = "function FindProxyForURL(url, host) { " + "if (url.substring(0, 4) === 'test') return url + ' ' + host; " + "return \"DIRECT\"; }"; char *proxy, host[] = "localhost"; AUTO_PROXY_SCRIPT_BUFFER buf; DWORD len, err; @@ -159,6 +161,14 @@ static void test_InternetGetProxyInfo(void) ok( len == strlen("DIRECT") + 1, "got %lu\n", len ); GlobalFree( proxy ); + len = 0; + proxy = NULL; + ret = pInternetGetProxyInfo( "testa", 4, host, 4, &proxy, &len); + ok( ret, "got %lu\n", GetLastError() ); + ok( !strcmp( proxy, "test loca" ), "got \"%s\"\n", proxy ); + ok( len == 10, "got %lu\n", len ); + GlobalFree( proxy ); + ret = pInternetDeInitializeAutoProxyDll( NULL, 0 ); ok( ret, "got %lu\n", GetLastError() ); }

1 0

Daniel Lehman : ucrtbase/tests: Add sprintf tests.
by Alexandre Julliard 01 Feb '24

01 Feb '24

Module: wine Branch: master Commit: 9c136a470c6a8969ee57d383233d596f2a91db62 URL: https://gitlab.winehq.org/wine/wine/-/commit/9c136a470c6a8969ee57d383233d59… Author: Daniel Lehman <dlehman25(a)gmail.com> Date: Tue Jan 30 22:43:31 2024 -0800 ucrtbase/tests: Add sprintf tests. --- dlls/ucrtbase/tests/printf.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/dlls/ucrtbase/tests/printf.c b/dlls/ucrtbase/tests/printf.c index 9a8bbbcff98..75bd7830869 100644 --- a/dlls/ucrtbase/tests/printf.c +++ b/dlls/ucrtbase/tests/printf.c @@ -815,11 +815,30 @@ static void test_printf_fp(void) { "%#.20g", -765, { "-765.00000000000000000" }}, { "%.30f", 1.0/3.0, { "0.333333333333333314829616256247" }}, { "%.30lf", sqrt(2), { "1.414213562373095145474621858739" }}, + { "%f", 3.141592653590000, { "3.141593" }}, + { "%.10f", 3.141592653590000, { "3.1415926536" }}, + { "%.11f", 3.141592653590000, { "3.14159265359" }}, + { "%.15f", 3.141592653590000, { "3.141592653590000" }}, + { "%.15f", M_PI, { "3.141592653589793" }}, + { "%.13f", 37.866261574537077, { "37.8662615745371" }}, + { "%.14f", 37.866261574537077, { "37.86626157453708" }}, + { "%.15f", 37.866261574537077, { "37.866261574537077" }}, { "%.0g", 9.8949714229143402e-05, { "0.0001" }}, { "%.0f", 0.5, { "1", NULL, NULL, NULL, "0" }, {NULL, NULL, NULL, NULL, "1" }}, { "%.0f", 1.5, { "2" }}, { "%.0f", 2.5, { "3", NULL, NULL, NULL, "2" }, {NULL, NULL, NULL, NULL, "3" }}, { "%g", 9.999999999999999e-5, { "0.0001" }}, + + { "%g", 0.0005, { "0.0005" }}, + { "%g", 0.00005, { "5e-05", NULL, "5e-005" }}, + { "%g", 0.000005, { "5e-06", NULL, "5e-006" }}, + { "%g", 999999999999999.0, { "1e+15", NULL, "1e+015" }}, + { "%g", 1000000000000000.0, { "1e+15", NULL, "1e+015" }}, + { "%.15g", 0.0005, { "0.0005" }}, + { "%.15g", 0.00005, { "5e-05", NULL, "5e-005" }}, + { "%.15g", 0.000005, { "5e-06", NULL, "5e-006" }}, + { "%.15g", 999999999999999.0, { "999999999999999" }}, + { "%.15g", 1000000000000000.0, { "1e+15", NULL, "1e+015" }}, }; const char *res = NULL;

1 0