November 2021 - Wine-commits

Alexandre Julliard : dnsapi: Build the DNS reply records on the PE side.
by Alexandre Julliard 02 Nov '21

02 Nov '21

Module: wine Branch: master Commit: d193c164b78a77570960a6fea589a3ccb3f080b6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d193c164b78a77570960a6fe… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 2 12:50:46 2021 +0100 dnsapi: Build the DNS reply records on the PE side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/dnsapi.h | 2 +- dlls/dnsapi/libresolv.c | 555 +----------------------------------------------- dlls/dnsapi/query.c | 26 ++- include/windns.h | 48 ++++- 4 files changed, 76 insertions(+), 555 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=d193c164b78a77570960…

1 0

Alexandre Julliard : dnsapi: Convert the Unix library to the __wine_unix_call interface.
by Alexandre Julliard 02 Nov '21

02 Nov '21

Module: wine Branch: master Commit: da65aa5b747dc0dce707cf958a81be6f1fdd9b77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da65aa5b747dc0dce707cf95… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 2 16:54:28 2021 +0100 dnsapi: Convert the Unix library to the __wine_unix_call interface. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/Makefile.in | 1 + dlls/dnsapi/dnsapi.h | 46 +++++++++++++++--- dlls/dnsapi/libresolv.c | 125 +++++++++++++++--------------------------------- dlls/dnsapi/main.c | 6 ++- dlls/dnsapi/query.c | 32 +++++++++---- 5 files changed, 106 insertions(+), 104 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=da65aa5b747dc0dce707…

1 0

Alexandre Julliard : dnsapi: Use CRT memory allocation functions.
by Alexandre Julliard 02 Nov '21

02 Nov '21

Module: wine Branch: master Commit: bf1486afaac30f41f300b7e9856026075609af20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bf1486afaac30f41f300b7e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 2 16:59:59 2021 +0100 dnsapi: Use CRT memory allocation functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/dnsapi.h | 20 ++++----- dlls/dnsapi/name.c | 8 ++-- dlls/dnsapi/query.c | 12 +++--- dlls/dnsapi/record.c | 119 +++++++++++++++++++++++---------------------------- 4 files changed, 74 insertions(+), 85 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bf1486afaac30f41f300…

1 0

Paul Gofman : kernel32: Correctly restore protection in set_entry_point().
by Alexandre Julliard 02 Nov '21

02 Nov '21

Module: wine Branch: master Commit: 3be3f0c0f89f98c8a6bf9da770f8683670351127 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3be3f0c0f89f98c8a6bf9da7… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Tue Nov 2 15:29:57 2021 +0300 kernel32: Correctly restore protection in set_entry_point(). Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/kernel_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/kernel_main.c b/dlls/kernel32/kernel_main.c index 89394e16430..4467af739e0 100644 --- a/dlls/kernel32/kernel_main.c +++ b/dlls/kernel32/kernel_main.c @@ -65,7 +65,7 @@ static void set_entry_point( HMODULE module, const char *name, DWORD rva ) TRACE( "setting %s at %p to %08x\n", name, &functions[ordinal], rva ); VirtualProtect( functions + ordinal, sizeof(*functions), PAGE_READWRITE, &oldprot ); functions[ordinal] = rva; - VirtualProtect( functions + ordinal, sizeof(*functions), oldprot, NULL ); + VirtualProtect( functions + ordinal, sizeof(*functions), oldprot, &oldprot ); return; } if (res > 0) max = pos - 1;

1 0

Nikolay Sivov : d3d11: Correctly handle optional arguments in OMGetBlendState().
by Alexandre Julliard 02 Nov '21

02 Nov '21

Module: wine Branch: master Commit: f266c87bc948c7b44b4196a31a2cff627a8ea970 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f266c87bc948c7b44b4196a3… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Nov 1 17:45:34 2021 +0300 d3d11: Correctly handle optional arguments in OMGetBlendState(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/d3d10core.c | 14 ++++++++++++++ dlls/d3d11/device.c | 37 ++++++++++++++++++++++++++----------- dlls/d3d11/tests/d3d11.c | 14 ++++++++++++++ 3 files changed, 54 insertions(+), 11 deletions(-) diff --git a/dlls/d3d10core/tests/d3d10core.c b/dlls/d3d10core/tests/d3d10core.c index 6ec398269fa..b8338152bb7 100644 --- a/dlls/d3d10core/tests/d3d10core.c +++ b/dlls/d3d10core/tests/d3d10core.c @@ -5533,6 +5533,20 @@ float4 main(float4 color : COLOR) : SV_TARGET blend_factor[2] = 0.3f; blend_factor[3] = 0.4f; ID3D10Device_OMSetBlendState(device, blend_state, blend_factor, D3D10_DEFAULT_SAMPLE_MASK); + /* OMGetBlendState() arguments are optional */ + ID3D10Device_OMGetBlendState(device, NULL, NULL, NULL); + ID3D10Device_OMGetBlendState(device, &tmp_blend_state, NULL, NULL); + ID3D10BlendState_Release(tmp_blend_state); + sample_mask = 0; + ID3D10Device_OMGetBlendState(device, NULL, NULL, &sample_mask); + ok(sample_mask == D3D10_DEFAULT_SAMPLE_MASK, "Unexpected sample mask %#x.\n", sample_mask); + memset(tmp_blend_factor, 0, sizeof(tmp_blend_factor)); + ID3D10Device_OMGetBlendState(device, NULL, tmp_blend_factor, NULL); + ok(tmp_blend_factor[0] == 0.1f && tmp_blend_factor[1] == 0.2f + && tmp_blend_factor[2] == 0.3f && tmp_blend_factor[3] == 0.4f, + "Got unexpected blend factor {%.8e, %.8e, %.8e, %.8e}.\n", + tmp_blend_factor[0], tmp_blend_factor[1], tmp_blend_factor[2], tmp_blend_factor[3]); + ID3D10Device_OMGetBlendState(device, &tmp_blend_state, tmp_blend_factor, &sample_mask); ok(tmp_blend_factor[0] == 0.1f && tmp_blend_factor[1] == 0.2f && tmp_blend_factor[2] == 0.3f && tmp_blend_factor[3] == 0.4f, diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 8d88ee26222..417638bf314 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2190,20 +2190,26 @@ static void STDMETHODCALLTYPE d3d11_device_context_OMGetBlendState(ID3D11DeviceC struct d3d11_device_context *context = impl_from_ID3D11DeviceContext1(iface); struct wined3d_blend_state *wined3d_state; struct d3d_blend_state *blend_state_impl; + unsigned int tmp_sample_mask; + float tmp_blend_factor[4]; TRACE("iface %p, blend_state %p, blend_factor %p, sample_mask %p.\n", iface, blend_state, blend_factor, sample_mask); wined3d_mutex_lock(); - if ((wined3d_state = wined3d_device_context_get_blend_state(context->wined3d_context, - (struct wined3d_color *)blend_factor, sample_mask))) + if (!blend_factor) blend_factor = tmp_blend_factor; + if (!sample_mask) sample_mask = &tmp_sample_mask; + wined3d_state = wined3d_device_context_get_blend_state(context->wined3d_context, + (struct wined3d_color *)blend_factor, sample_mask); + if (blend_state) { - blend_state_impl = wined3d_blend_state_get_parent(wined3d_state); - ID3D11BlendState_AddRef(*blend_state = &blend_state_impl->ID3D11BlendState_iface); - } - else - { - *blend_state = NULL; + if (wined3d_state) + { + blend_state_impl = wined3d_blend_state_get_parent(wined3d_state); + ID3D11BlendState_AddRef(*blend_state = &blend_state_impl->ID3D11BlendState_iface); + } + else + *blend_state = NULL; } wined3d_mutex_unlock(); } @@ -5541,10 +5547,19 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetBlendState(ID3D10Device1 *iface, d3d11_device_context_OMGetBlendState(&device->immediate_context.ID3D11DeviceContext1_iface, &d3d11_blend_state, blend_factor, sample_mask); + if (blend_state) + { + if (d3d11_blend_state) + { + *blend_state = (ID3D10BlendState *)&impl_from_ID3D11BlendState(d3d11_blend_state)->ID3D10BlendState1_iface; + ID3D10BlendState_AddRef(*blend_state); + } + else + *blend_state = NULL; + } + if (d3d11_blend_state) - *blend_state = (ID3D10BlendState *)&impl_from_ID3D11BlendState(d3d11_blend_state)->ID3D10BlendState1_iface; - else - *blend_state = NULL; + ID3D11BlendState_Release(d3d11_blend_state); } static void STDMETHODCALLTYPE d3d10_device_OMGetDepthStencilState(ID3D10Device1 *iface, diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 553caa10e46..2ed9aed490e 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -12608,6 +12608,20 @@ static void test_clear_state(void) ID3D11DeviceContext_OMGetDepthStencilState(context, &tmp_ds_state, NULL); ok(tmp_ds_state == ds_state, "Got unexpected depth stencil state %p, expected %p.\n", tmp_ds_state, ds_state); ID3D11DepthStencilState_Release(tmp_ds_state); + /* OMGetBlendState() arguments are optional */ + ID3D11DeviceContext_OMGetBlendState(context, NULL, NULL, NULL); + ID3D11DeviceContext_OMGetBlendState(context, &tmp_blend_state, NULL, NULL); + ok(tmp_blend_state == blend_state, "Got unexpected blend state %p, expected %p.\n", tmp_blend_state, blend_state); + ID3D11BlendState_Release(tmp_blend_state); + sample_mask = 0; + ID3D11DeviceContext_OMGetBlendState(context, NULL, NULL, &sample_mask); + ok(sample_mask == 0xff00ff00, "Got unexpected sample mask %#x.\n", sample_mask); + memset(blend_factor, 0, sizeof(blend_factor)); + ID3D11DeviceContext_OMGetBlendState(context, NULL, blend_factor, NULL); + ok(blend_factor[0] == 0.1f && blend_factor[1] == 0.2f + && blend_factor[2] == 0.3f && blend_factor[3] == 0.4f, + "Got unexpected blend factor {%.8e, %.8e, %.8e, %.8e}.\n", + blend_factor[0], blend_factor[1], blend_factor[2], blend_factor[3]); ID3D11DeviceContext_OMGetRenderTargets(context, D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT, tmp_rtv, &tmp_dsv); for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT - 1; ++i)

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.2.197.
by Alexandre Julliard 02 Nov '21

02 Nov '21

Module: wine Branch: master Commit: 03fb6c14c94f2da0a7124d6e12dd57417a28b48a URL: https://source.winehq.org/git/wine.git/?a=commit;h=03fb6c14c94f2da0a7124d6e… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Tue Nov 2 11:59:57 2021 +0100 winevulkan: Update to VK spec version 1.2.197. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winevulkan/loader_thunks.c | 12 + dlls/winevulkan/loader_thunks.h | 2 + dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 104 ++++ dlls/winevulkan/vulkan_thunks.h | 40 ++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 1076 ++++++++++++++++++++++----------------- 7 files changed, 759 insertions(+), 479 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=03fb6c14c94f2da0a712…

1 0

Eric Pouech : mscvpdb.h: Update symbol header for linetab2's block size.
by Alexandre Julliard 02 Nov '21

02 Nov '21

Module: wine Branch: master Commit: f0b8518333bd58aacb13c975f50b77c134c770f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f0b8518333bd58aacb13c975… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Nov 2 15:31:16 2021 +0100 mscvpdb.h: Update symbol header for linetab2's block size. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 7 ++++--- include/wine/mscvpdb.h | 4 ++-- tools/winedump/pdb.c | 24 ++++++++++++------------ 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index a1f009cf678..4aaee196370 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -2424,6 +2424,7 @@ static void pdb_convert_symbol_file(const PDB_SYMBOLS* symbols, sfile->range.index = sym_file->range.index; sfile->symbol_size = sym_file->symbol_size; sfile->lineno_size = sym_file->lineno_size; + sfile->lineno2_size = sym_file->lineno2_size; *size = sizeof(PDB_SYMBOL_FILE) - 1; } else @@ -2818,14 +2819,14 @@ static BOOL pdb_process_internal(const struct process* pcs, codeview_snarf(msc_dbg, modimage, sizeof(DWORD), sfile.symbol_size, TRUE); + if (sfile.lineno_size && sfile.lineno2_size) FIXME("Both line info present... only supporting first\n"); if (sfile.lineno_size) codeview_snarf_linetab(msc_dbg, modimage + sfile.symbol_size, sfile.lineno_size, pdb_file->kind == PDB_JG); - if (files_image) - codeview_snarf_linetab2(msc_dbg, modimage + sfile.symbol_size + sfile.lineno_size, - pdb_get_file_size(pdb_file, sfile.file) - sfile.symbol_size - sfile.lineno_size, + else if (sfile.lineno2_size && files_image) + codeview_snarf_linetab2(msc_dbg, modimage + sfile.symbol_size, sfile.lineno2_size, files_image + 12, files_size); pdb_free(modimage); diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 1ede937abc4..53eeec96916 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -2343,7 +2343,7 @@ typedef struct _PDB_SYMBOL_FILE WORD file; DWORD symbol_size; DWORD lineno_size; - DWORD unknown2; + DWORD lineno2_size; DWORD nSrcFiles; DWORD attribute; CHAR filename[1]; @@ -2357,7 +2357,7 @@ typedef struct _PDB_SYMBOL_FILE_EX WORD file; DWORD symbol_size; DWORD lineno_size; - DWORD unknown2; + DWORD lineno2_size; DWORD nSrcFiles; DWORD attribute; DWORD reserved[2]; diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 71a2bc49cc8..bbaf1cb94e8 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -466,7 +466,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx file = (const char*)symbols + sizeof(PDB_SYMBOLS); while (file - (const char*)symbols < sizeof(PDB_SYMBOLS) + symbols->module_size) { - int file_nr, symbol_size, lineno_size; + int file_nr, symbol_size, lineno_size, lineno2_size; const char* file_name; if (symbols->version < 19970000) @@ -476,6 +476,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx file_name = sym_file->filename; symbol_size = sym_file->symbol_size; lineno_size = sym_file->lineno_size; + lineno2_size = sym_file->lineno2_size; printf("\t--------symbol file----------- %s\n", file_name); printf("\tgot symbol_file\n" "\t\tunknown1: %08x\n" @@ -491,7 +492,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx "\t\tfile: %04x\n" "\t\tsymb size: %08x\n" "\t\tline size: %08x\n" - "\t\tunknown2: %08x\n" + "\t\tline2 size: %08x\n" "\t\tnSrcFiles: %08x\n" "\t\tattribute: %08x\n", sym_file->unknown1, @@ -506,7 +507,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx sym_file->file, sym_file->symbol_size, sym_file->lineno_size, - sym_file->unknown2, + sym_file->lineno2_size, sym_file->nSrcFiles, sym_file->attribute); } @@ -517,6 +518,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx file_name = sym_file->filename; symbol_size = sym_file->symbol_size; lineno_size = sym_file->lineno_size; + lineno2_size = sym_file->lineno2_size; printf("\t--------symbol file----------- %s\n", file_name); printf("\t\tunknown1: %08x\n" "\t\trange\n" @@ -533,7 +535,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx "\t\tfile: %04x\n" "\t\tsymb size: %08x\n" "\t\tline size: %08x\n" - "\t\tunknown2: %08x\n" + "\t\tline2 size: %08x\n" "\t\tnSrcFiles: %08x\n" "\t\tattribute: %08x\n" "\t\treserved/0: %08x\n" @@ -552,7 +554,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx sym_file->file, sym_file->symbol_size, sym_file->lineno_size, - sym_file->unknown2, + sym_file->lineno2_size, sym_file->nSrcFiles, sym_file->attribute, sym_file->reserved[0], @@ -569,15 +571,13 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx /* line number info */ if (lineno_size) codeview_dump_linetab((const char*)modimage + symbol_size, TRUE, " "); - /* anyway, lineno_size doesn't see to really be the size of the line number information, and - * it's not clear yet when to call for linetab2... - */ - codeview_dump_linetab2((const char*)modimage + symbol_size + lineno_size, - total_size - (symbol_size + lineno_size), - filesimage ? filesimage + 12 : NULL, filessize, " "); + else if (lineno2_size) /* actually, only one of the 2 lineno should be present */ + codeview_dump_linetab2((const char*)modimage + symbol_size, lineno2_size, + filesimage ? filesimage + 12 : NULL, filessize, " "); /* what's that part ??? */ if (0) - dump_data(modimage + symbol_size + lineno_size, total_size - (symbol_size + lineno_size), " "); + dump_data(modimage + symbol_size + lineno_size + lineno2_size, + total_size - (symbol_size + lineno_size + lineno2_size), " "); free(modimage); }

1 0

Eric Pouech : winedump: Add some missing next record computation for type leaf.
by Alexandre Julliard 02 Nov '21

02 Nov '21

Module: wine Branch: master Commit: 1131b3268551058e19f073e48bd06d9c67df591c URL: https://source.winehq.org/git/wine.git/?a=commit;h=1131b3268551058e19f073e4… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Nov 2 15:31:30 2021 +0100 winedump: Add some missing next record computation for type leaf. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/msc.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 12d1a9e62ab..18c591f44ef 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -675,12 +675,14 @@ static void do_field(const unsigned char* start, const unsigned char* end) printf("\t\tFriend function V1: '%s' type:%x\n", p_string(&fieldtype->friendfcn_v1.p_name), fieldtype->friendfcn_v1.type); + ptr += 2 + 2 + (1 + fieldtype->stmember_v2.p_name.namelen); break; case LF_FRIENDFCN_V2: printf("\t\tFriend function V2: '%s' type:%x\n", p_string(&fieldtype->friendfcn_v2.p_name), fieldtype->friendfcn_v2.type); + ptr += 2 + 2 + 4 + (1 + fieldtype->stmember_v2.p_name.namelen); break; #if 0 @@ -735,10 +737,12 @@ static void do_field(const unsigned char* start, const unsigned char* end) case LF_FRIENDCLS_V1: printf("\t\tFriend class V1: type:%x\n", fieldtype->friendcls_v1.type); + ptr += 2 + 2; break; case LF_FRIENDCLS_V2: printf("\t\tFriend class V2: type:%x\n", fieldtype->friendcls_v2.type); + ptr += 2 + 2 + 4; break; case LF_NESTTYPE_V1: @@ -777,11 +781,13 @@ static void do_field(const unsigned char* start, const unsigned char* end) case LF_VFUNCOFF_V1: printf("\t\tVirtual function table offset V1: type:%x offset:%x\n", fieldtype->vfuncoff_v1.type, fieldtype->vfuncoff_v1.offset); + ptr += 2 + 2 + 4; break; case LF_VFUNCOFF_V2: printf("\t\tVirtual function table offset V2: type:%x offset:%x\n", fieldtype->vfuncoff_v2.type, fieldtype->vfuncoff_v2.offset); + ptr += 2 + 2 + 4 + 4; break; default:

1 0

Eric Pouech : mscvpdb.h: Add definition for friend function v3.
by Alexandre Julliard 02 Nov '21

02 Nov '21

Module: wine Branch: master Commit: fd959ef0603b0667213e14d3dad45f6375f54328 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fd959ef0603b0667213e14d3… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Nov 2 15:31:43 2021 +0100 mscvpdb.h: Add definition for friend function v3. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/mscvpdb.h | 9 +++++++++ tools/winedump/msc.c | 3 +-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 53eeec96916..ca5422c3a65 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -566,6 +566,14 @@ union codeview_fieldtype struct p_string p_name; } friendfcn_v2; + struct + { + unsigned short int id; + short int _pad0; + cv_typ_t type; + char name[1]; + } friendfcn_v3; + struct { unsigned short int id; @@ -1266,6 +1274,7 @@ union codeview_fieldtype #define LF_STRUCTURE_V3 0x1505 #define LF_UNION_V3 0x1506 #define LF_ENUM_V3 0x1507 +#define LF_FRIENDFCN_V3 0x150c #define LF_MEMBER_V3 0x150d #define LF_STMEMBER_V3 0x150e #define LF_METHOD_V3 0x150f diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 18c591f44ef..dca8bcf9560 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -685,13 +685,12 @@ static void do_field(const unsigned char* start, const unsigned char* end) ptr += 2 + 2 + 4 + (1 + fieldtype->stmember_v2.p_name.namelen); break; -#if 0 case LF_FRIENDFCN_V3: printf("\t\tFriend function V3: '%s' type:%x\n", fieldtype->friendfcn_v3.name, fieldtype->friendfcn_v3.type); + ptr += 2 + 2 + 4 + (strlen(fieldtype->stmember_v3.name) + 1); break; -#endif case LF_BCLASS_V1: leaf_len = numeric_leaf(&value, &fieldtype->bclass_v1.offset);

1 0

Eric Pouech : winedump: Dump index leaves (TPI).
by Alexandre Julliard 02 Nov '21

02 Nov '21

Module: wine Branch: master Commit: f64c6e611b712b1e841594c2053712a12aec4618 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f64c6e611b712b1e841594c2… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Nov 2 15:31:57 2021 +0100 winedump: Dump index leaves (TPI). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/msc.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index dca8bcf9560..d537764b442 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -789,6 +789,16 @@ static void do_field(const unsigned char* start, const unsigned char* end) ptr += 2 + 2 + 4 + 4; break; + case LF_INDEX_V1: + printf("\t\tIndex V1: index:%x\n", fieldtype->index_v1.ref); + ptr += 2 + 2; + break; + + case LF_INDEX_V2: + printf("\t\tIndex V2: index:%x\n", fieldtype->index_v2.ref); + ptr += 2 + 2 + 4; + break; + default: printf(">>> Unsupported field-id %x\n", fieldtype->generic.id); dump_data((const void*)fieldtype, 0x30, "\t");

1 0