November 2021 - Wine-Commits

Eric Pouech : winedump: Also dump library name for a module.
by Alexandre Julliard Nov. 2, 2021

Nov. 2, 2021

Module: wine Branch: master Commit: 23fe1ad987aa47302f2768c14bf0e1efaf2ac70c URL: https://source.winehq.org/git/wine.git/?a=commit;h=23fe1ad987aa47302f2768c1… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Nov 2 15:32:10 2021 +0100 winedump: Also dump library name for a module. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winedump/pdb.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index bbaf1cb94e8..ed4877cd10a 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -468,18 +468,21 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx { int file_nr, symbol_size, lineno_size, lineno2_size; const char* file_name; - + const char* lib_name; + if (symbols->version < 19970000) { const PDB_SYMBOL_FILE* sym_file = (const PDB_SYMBOL_FILE*) file; file_nr = sym_file->file; file_name = sym_file->filename; + lib_name = file_name + strlen(file_name) + 1; 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" + printf("\t--------symbol file-----------\n"); + printf("\tName: %s\n", file_name); + if (strcmp(file_name, lib_name)) printf("\tLibrary: %s\n", lib_name); + printf("\t\tunknown1: %08x\n" "\t\trange\n" "\t\t\tsegment: %04x\n" "\t\t\tpad1: %04x\n" @@ -514,12 +517,16 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx else { const PDB_SYMBOL_FILE_EX* sym_file = (const PDB_SYMBOL_FILE_EX*) file; + file_nr = sym_file->file; file_name = sym_file->filename; + lib_name = file_name + strlen(file_name) + 1; 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--------symbol file-----------\n"); + printf("\tName: %s\n", file_name); + if (strcmp(file_name, lib_name)) printf("\tLibrary: %s\n", lib_name); printf("\t\tunknown1: %08x\n" "\t\trange\n" "\t\t\tsegment: %04x\n" @@ -581,8 +588,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx free(modimage); } - file_name += strlen(file_name) + 1; - file = (char*)((DWORD_PTR)(file_name + strlen(file_name) + 1 + 3) & ~3); + file = (char*)((DWORD_PTR)(lib_name + strlen(lib_name) + 1 + 3) & ~3); } dump_global_symbol(reader, symbols->global_file); dump_public_symbol(reader, symbols->public_file);

1 0

Eric Pouech : mscvpdb.h: Update symbol header for linetab2's block size.
by Alexandre Julliard Nov. 2, 2021

Nov. 2, 2021

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

Nikolay Sivov : d3d11: Correctly handle optional arguments in OMGetBlendState().
by Alexandre Julliard Nov. 2, 2021

Nov. 2, 2021

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

Alexandre Julliard : dnsapi: Use CRT memory allocation functions.
by Alexandre Julliard Nov. 2, 2021

Nov. 2, 2021

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

Alexandre Julliard : dnsapi: Build the DNS reply records on the PE side.
by Alexandre Julliard Nov. 2, 2021

Nov. 2, 2021

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: Make type_to_str() into a proper debugstr function.
by Alexandre Julliard Nov. 2, 2021

Nov. 2, 2021

Module: wine Branch: master Commit: 87f94202bb391cfcc7e65505cefa92f196e4f09b URL: https://source.winehq.org/git/wine.git/?a=commit;h=87f94202bb391cfcc7e65505… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 2 12:45:10 2021 +0100 dnsapi: Make type_to_str() into a proper debugstr function. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dnsapi/dnsapi.h | 2 +- dlls/dnsapi/libresolv.c | 2 +- dlls/dnsapi/query.c | 8 ++++---- dlls/dnsapi/record.c | 6 +++--- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/dnsapi/dnsapi.h b/dlls/dnsapi/dnsapi.h index c598ade756e..a356d24b1f0 100644 --- a/dlls/dnsapi/dnsapi.h +++ b/dlls/dnsapi/dnsapi.h @@ -119,7 +119,7 @@ static inline char *strdup_ua( const char *src ) return dst; } -extern const char *type_to_str( unsigned short ) DECLSPEC_HIDDEN; +extern const char *debugstr_type( unsigned short ) DECLSPEC_HIDDEN; struct resolv_funcs { diff --git a/dlls/dnsapi/libresolv.c b/dlls/dnsapi/libresolv.c index e5c520a0a32..e72e86ad1b1 100644 --- a/dlls/dnsapi/libresolv.c +++ b/dlls/dnsapi/libresolv.c @@ -109,7 +109,7 @@ static DWORD dnsapi_umbstowcs( const char *src, WCHAR *dst, DWORD dstlen ) } } -static const char *debugstr_type( unsigned short type ) +const char *debugstr_type( unsigned short type ) { const char *str; diff --git a/dlls/dnsapi/query.c b/dlls/dnsapi/query.c index 3155c93b360..3f2e82eb9c1 100644 --- a/dlls/dnsapi/query.c +++ b/dlls/dnsapi/query.c @@ -110,7 +110,7 @@ static const char *debugstr_query_request(const DNS_QUERY_REQUEST *req) return "(null)"; return wine_dbg_sprintf("{%d %s %s %x%08x %p %d %p %p}", req->Version, - debugstr_w(req->QueryName), type_to_str(req->QueryType), + debugstr_w(req->QueryName), debugstr_type(req->QueryType), (UINT32)(req->QueryOptions>>32u), (UINT32)req->QueryOptions, req->pDnsServerList, req->InterfaceIndex, req->pQueryCompletionCallback, req->pQueryContext); } @@ -136,7 +136,7 @@ DNS_STATUS WINAPI DnsQuery_A( PCSTR name, WORD type, DWORD options, PVOID server DNS_RECORDW *resultW; DNS_STATUS status; - TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_a(name), type_to_str( type ), + TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_a(name), debugstr_type( type ), options, servers, result, reserved ); if (!name || !result) @@ -169,7 +169,7 @@ DNS_STATUS WINAPI DnsQuery_UTF8( PCSTR name, WORD type, DWORD options, PVOID ser { DNS_STATUS ret = DNS_ERROR_RCODE_NOT_IMPLEMENTED; - TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_a(name), type_to_str( type ), + TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_a(name), debugstr_type( type ), options, servers, result, reserved ); if (!name || !result) @@ -200,7 +200,7 @@ DNS_STATUS WINAPI DnsQuery_W( PCWSTR name, WORD type, DWORD options, PVOID serve DNS_RECORDA *resultA; DNS_STATUS status; - TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_w(name), type_to_str( type ), + TRACE( "(%s,%s,0x%08x,%p,%p,%p)\n", debugstr_w(name), debugstr_type( type ), options, servers, result, reserved ); if (!name || !result) diff --git a/dlls/dnsapi/record.c b/dlls/dnsapi/record.c index 014d788cf5e..1fdbae523eb 100644 --- a/dlls/dnsapi/record.c +++ b/dlls/dnsapi/record.c @@ -29,7 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(dnsapi); -const char *type_to_str( unsigned short type ) +const char *debugstr_type( unsigned short type ) { switch (type) { @@ -91,7 +91,7 @@ const char *type_to_str( unsigned short type ) X(DNS_TYPE_WINS) X(DNS_TYPE_WINSR) #undef X - default: { static char tmp[7]; sprintf( tmp, "0x%04x", type ); return tmp; } + default: return wine_dbg_sprintf( "0x%04x", type ); } } @@ -339,7 +339,7 @@ BOOL WINAPI DnsRecordCompare( PDNS_RECORD r1, PDNS_RECORD r2 ) break; } default: - FIXME( "unknown type: %s\n", type_to_str( r1->wType ) ); + FIXME( "unknown type: %s\n", debugstr_type( r1->wType ) ); return FALSE; } return TRUE;

1 0

Alexandre Julliard : faudio: Import upstream release 21.11.
by Alexandre Julliard Nov. 2, 2021

Nov. 2, 2021

Module: wine Branch: master Commit: da89825f98e4f0cb3875735345a455512b36b665 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da89825f98e4f0cb38757353… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 2 10:25:12 2021 +0100 faudio: Import upstream release 21.11. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/faudio/include/FAudio.h | 2 +- libs/faudio/src/FACT.c | 17 +++-------------- libs/faudio/src/FAudio.c | 4 +++- libs/faudio/src/FAudioFX_reverb.c | 6 ++++-- libs/faudio/src/FAudio_platform_win32.c | 10 ++++++---- 5 files changed, 17 insertions(+), 22 deletions(-) diff --git a/libs/faudio/include/FAudio.h b/libs/faudio/include/FAudio.h index 046e7f4098c..6f68013d79f 100644 --- a/libs/faudio/include/FAudio.h +++ b/libs/faudio/include/FAudio.h @@ -485,7 +485,7 @@ extern FAudioGUID DATAFORMAT_SUBTYPE_IEEE_FLOAT; #define FAUDIO_ABI_VERSION 0 #define FAUDIO_MAJOR_VERSION 21 -#define FAUDIO_MINOR_VERSION 10 +#define FAUDIO_MINOR_VERSION 11 #define FAUDIO_PATCH_VERSION 0 #define FAUDIO_COMPILED_VERSION ( \ diff --git a/libs/faudio/src/FACT.c b/libs/faudio/src/FACT.c index 5eca83b389f..bca46d38824 100644 --- a/libs/faudio/src/FACT.c +++ b/libs/faudio/src/FACT.c @@ -2415,20 +2415,7 @@ uint32_t FACTCue_Destroy(FACTCue *pCue) FAudio_assert(cue != NULL && "Could not find Cue reference!"); pCue->parentBank->parentEngine->pFree(pCue->variableValues); - if (pCue->notifyOnDestroy || pCue->parentBank->parentEngine->notifications & NOTIFY_CUEDESTROY) - { - note.type = FACTNOTIFICATIONTYPE_CUEDESTROYED; - note.cue.pCue = pCue; - if (pCue->parentBank->parentEngine->notifications & NOTIFY_CUEDESTROY) - { - note.pvContext = pCue->parentBank->parentEngine->cue_context; - } - else - { - note.pvContext = pCue->usercontext; - } - pCue->parentBank->parentEngine->notificationCallback(&note); - } + FACT_INTERNAL_SendCueNotification(pCue, NOTIFY_CUEDESTROY, FACTNOTIFICATIONTYPE_CUEDESTROYED); mutex = pCue->parentBank->parentEngine->apiLock; pCue->parentBank->parentEngine->pFree(pCue); @@ -2679,6 +2666,8 @@ uint32_t FACTCue_Stop(FACTCue *pCue, uint32_t dwFlags) } } + FACT_INTERNAL_SendCueNotification(pCue, NOTIFY_CUESTOP, FACTNOTIFICATIONTYPE_CUESTOP); + FAudio_PlatformUnlockMutex(pCue->parentBank->parentEngine->apiLock); return 0; } diff --git a/libs/faudio/src/FAudio.c b/libs/faudio/src/FAudio.c index 81363b983c7..ff373ef8dbb 100644 --- a/libs/faudio/src/FAudio.c +++ b/libs/faudio/src/FAudio.c @@ -2453,7 +2453,9 @@ uint32_t FAudioSourceVoice_SubmitSourceBuffer( FAudio_assert(voice->type == FAUDIO_VOICE_SOURCE); #ifdef HAVE_WMADEC - FAudio_assert( (voice->src.wmadec != NULL && (pBufferWMA != NULL || voice->src.format->wFormatTag == FAUDIO_FORMAT_XMAUDIO2)) || + FAudio_assert( (voice->src.wmadec != NULL && (pBufferWMA != NULL || + (voice->src.format->wFormatTag == FAUDIO_FORMAT_XMAUDIO2 || + voice->src.format->wFormatTag == FAUDIO_FORMAT_EXTENSIBLE))) || (voice->src.wmadec == NULL && (pBufferWMA == NULL && voice->src.format->wFormatTag != FAUDIO_FORMAT_XMAUDIO2)) ); #endif /* HAVE_WMADEC */ diff --git a/libs/faudio/src/FAudioFX_reverb.c b/libs/faudio/src/FAudioFX_reverb.c index 4d43fa4e76c..79c4151c2d9 100644 --- a/libs/faudio/src/FAudioFX_reverb.c +++ b/libs/faudio/src/FAudioFX_reverb.c @@ -507,7 +507,8 @@ static FAudio_ChannelPositionFlags FAudio_GetChannelPositionFlags(int32_t total_ case 3: return Position_Right | Position_Rear; } - + FAudio_assert(0 && "Unsupported channel count"); + break; case 5: switch (channel) { @@ -522,7 +523,8 @@ static FAudio_ChannelPositionFlags FAudio_GetChannelPositionFlags(int32_t total_ case 4: return Position_Right | Position_Rear; } - + FAudio_assert(0 && "Unsupported channel count"); + break; default: FAudio_assert(0 && "Unsupported channel count"); break; diff --git a/libs/faudio/src/FAudio_platform_win32.c b/libs/faudio/src/FAudio_platform_win32.c index f70e260c542..ccb8d8abbbf 100644 --- a/libs/faudio/src/FAudio_platform_win32.c +++ b/libs/faudio/src/FAudio_platform_win32.c @@ -228,8 +228,8 @@ void FAudio_PlatformInit( FAudio_assert(!FAILED(hr) && "Failed to create audio client!"); IMMDevice_Release(device); - if (flags & FAUDIO_1024_QUANTUM) duration = 21330; - else duration = 30000; + if (flags & FAUDIO_1024_QUANTUM) duration = 213333; + else duration = 100000; hr = IAudioClient_IsFormatSupported( data->client, @@ -250,7 +250,7 @@ void FAudio_PlatformInit( data->client, AUDCLNT_SHAREMODE_SHARED, AUDCLNT_STREAMFLAGS_EVENTCALLBACK, - duration, + duration * 3, 0, &args->format.Format, &GUID_NULL @@ -287,7 +287,8 @@ void FAudio_PlatformInit( args->events[0] = audioEvent; args->events[1] = data->stopEvent; args->audio = audio; - args->updateSize = args->format.Format.nSamplesPerSec / 100; + if (flags & FAUDIO_1024_QUANTUM) args->updateSize = args->format.Format.nSamplesPerSec / (1000.0 / (64.0 / 3.0)); + else args->updateSize = args->format.Format.nSamplesPerSec / 100; data->audioThread = CreateThread(NULL, 0, &FAudio_AudioClientThread, args, 0, NULL); FAudio_assert(!!data->audioThread && "Failed to create audio client thread!"); @@ -622,6 +623,7 @@ static int FAUDIOCALL FAudio_mem_close(void *data) { if (!data) return 0; FAudio_free(data); + return 0; } FAudioIOStream* FAudio_memopen(void *mem, int len)

1 0

Eric Pouech : dbghelp/pdb: Convert to new debug subsection definitions (in linetab2).
by Alexandre Julliard Nov. 2, 2021

Nov. 2, 2021

Module: wine Branch: master Commit: fbc65b802bfa2910d5e0b1cbf215627f5bcb7415 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fbc65b802bfa2910d5e0b1cb… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Nov 2 15:32:37 2021 +0100 dbghelp/pdb: Convert to new debug subsection definitions (in linetab2). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 107 +++++++++++++++++++++++++++---------------------- include/wine/mscvpdb.h | 51 ----------------------- 2 files changed, 59 insertions(+), 99 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 4aaee196370..b4487d583cb 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1465,70 +1465,81 @@ static void codeview_snarf_linetab2(const struct msc_debug_info* msc_dbg, const { unsigned i; DWORD_PTR addr; - const struct codeview_linetab2* lt2; - const struct codeview_linetab2* lt2_files = NULL; - const struct codeview_lt2blk_lines* lines_blk; - const struct codeview_linetab2_file*fd; + const struct CV_DebugSSubsectionHeader_t* hdr; + const struct CV_DebugSSubsectionHeader_t* hdr_next; + const struct CV_DebugSSubsectionHeader_t* hdr_files = NULL; + const struct CV_DebugSLinesHeader_t* lines_hdr; + const struct CV_DebugSLinesFileBlockHeader_t* files_hdr; + const struct CV_Line_t* lines; + const struct CV_Checksum_t* chksms; unsigned source; struct symt_function* func; - /* locate LT2_FILES_BLOCK (if any) */ - lt2 = (const struct codeview_linetab2*)linetab; - while ((const BYTE*)(lt2 + 1) < linetab + size) + /* locate DEBUG_S_FILECHKSMS (if any) */ + hdr = (const struct CV_DebugSSubsectionHeader_t*)linetab; + while (CV_IS_INSIDE(hdr, linetab + size)) { - if (lt2->header == LT2_FILES_BLOCK) + if (hdr->type == DEBUG_S_FILECHKSMS) { - lt2_files = lt2; + hdr_files = hdr; break; } - lt2 = codeview_linetab2_next_block(lt2); + hdr = CV_RECORD_GAP(hdr, hdr->cbLen); } - if (!lt2_files) + if (!hdr_files) { - TRACE("No LT2_FILES_BLOCK found\n"); + TRACE("No DEBUG_S_FILECHKSMS found\n"); return; } - lt2 = (const struct codeview_linetab2*)linetab; - while ((const BYTE*)(lt2 + 1) < linetab + size) - { - /* FIXME: should also check that whole lines_blk fits in linetab + size */ - switch (lt2->header) - { - case LT2_LINES_BLOCK: - /* Skip blocks that are too small - Intel C Compiler generates these. */ - if (lt2->size_of_block < sizeof (struct codeview_lt2blk_lines)) break; - lines_blk = (const struct codeview_lt2blk_lines*)lt2; - /* FIXME: should check that file_offset is within the LT2_FILES_BLOCK we've seen */ - addr = codeview_get_address(msc_dbg, lines_blk->seg, lines_blk->start); - TRACE("block from %04x:%08x #%x (%x lines)\n", - lines_blk->seg, lines_blk->start, lines_blk->size, lines_blk->nlines); - fd = (const struct codeview_linetab2_file*)((const char*)lt2_files + 8 + lines_blk->file_offset); - /* FIXME: should check that string is within strimage + strsize */ - source = source_new(msc_dbg->module, NULL, strimage + fd->offset); - func = (struct symt_function*)symt_find_nearest(msc_dbg->module, addr); - /* FIXME: at least labels support line numbers */ - if (!symt_check_tag(&func->symt, SymTagFunction) && !symt_check_tag(&func->symt, SymTagInlineSite)) + hdr = (const struct CV_DebugSSubsectionHeader_t*)linetab; + while (CV_IS_INSIDE(hdr, linetab + size)) + { + hdr_next = CV_RECORD_GAP(hdr, hdr->cbLen); + if (!(hdr->type & DEBUG_S_IGNORE)) + { + /* FIXME: should also check that whole lines_blk fits in linetab + size */ + switch (hdr->type) { - WARN("--not a func at %04x:%08x %lx tag=%d\n", - lines_blk->seg, lines_blk->start, addr, func ? func->symt.tag : -1); + case DEBUG_S_LINES: + lines_hdr = CV_RECORD_AFTER(hdr); + files_hdr = CV_RECORD_AFTER(lines_hdr); + /* Skip blocks that are too small - Intel C Compiler generates these. */ + if (!CV_IS_INSIDE(files_hdr, hdr_next)) break; + addr = codeview_get_address(msc_dbg, lines_hdr->segCon, lines_hdr->offCon); + TRACE("block from %04x:%08x #%x\n", + lines_hdr->segCon, lines_hdr->offCon, lines_hdr->cbCon); + chksms = CV_RECORD_GAP(hdr_files, files_hdr->offFile); + if (!CV_IS_INSIDE(chksms, CV_RECORD_GAP(hdr_files, hdr_files->cbLen))) + { + WARN("Corrupt PDB file: offset in CHKSMS subsection is invalid\n"); + break; + } + source = source_new(msc_dbg->module, NULL, + (chksms->strOffset < strsize) ? strimage + chksms->strOffset : "<<stroutofbounds>>"); + func = (struct symt_function*)symt_find_nearest(msc_dbg->module, addr); + /* FIXME: at least labels support line numbers */ + if (!symt_check_tag(&func->symt, SymTagFunction) && !symt_check_tag(&func->symt, SymTagInlineSite)) + { + WARN("--not a func at %04x:%08x %Ix tag=%d\n", + lines_hdr->segCon, lines_hdr->offCon, addr, func ? func->symt.tag : -1); + break; + } + lines = CV_RECORD_AFTER(files_hdr); + for (i = 0; i < files_hdr->nLines; i++) + { + symt_add_func_line(msc_dbg->module, func, source, + lines[i].linenumStart, + func->address + lines[i].offset); + } + break; + case DEBUG_S_FILECHKSMS: /* skip */ + break; + default: break; } - for (i = 0; i < lines_blk->nlines; i++) - { - symt_add_func_line(msc_dbg->module, func, source, - lines_blk->l[i].lineno ^ 0x80000000, - func->address + lines_blk->l[i].offset); - } - break; - case LT2_FILES_BLOCK: /* skip */ - break; - default: - TRACE("Block end %x\n", lt2->header); - lt2 = (const struct codeview_linetab2*)((const char*)linetab + size); - continue; } - lt2 = codeview_linetab2_next_block(lt2); + hdr = hdr_next; } } diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 733b4ab5336..dcd0e4db303 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -2279,57 +2279,6 @@ struct startend unsigned int end; }; -#define LT2_LINES_BLOCK 0x000000f2 -#define LT2_FILES_BLOCK 0x000000f4 - -/* there's a new line tab structure from MS Studio 2005 and after - * it's made of a list of codeview_linetab2 blocks. - * We've only seen (so far) list with a single LT2_FILES_BLOCK and several - * LT2_LINES_BLOCK. The LT2_FILES block has been encountered either as first - * or last block of the list. - * A LT2_FILES contains one or several codeview_linetab2_file:s - */ - -struct codeview_linetab2 -{ - DWORD header; - DWORD size_of_block; -}; - -static inline const struct codeview_linetab2* codeview_linetab2_next_block(const struct codeview_linetab2* lt2) -{ - return (const struct codeview_linetab2*)((const char*)(lt2 + 1) + lt2->size_of_block); -} - -struct codeview_linetab2_file -{ - DWORD offset; /* offset in string table for filename */ - WORD unk; /* always 0x0110... type of following information ??? */ - BYTE md5[16]; /* MD5 signature of file (signature on file's content or name ???) */ - WORD pad0; /* always 0 */ -}; - -struct codeview_lt2blk_files -{ - struct codeview_linetab2 lt2; /* LT2_FILES */ - struct codeview_linetab2_file file[1]; -}; - -struct codeview_lt2blk_lines -{ - struct codeview_linetab2 lt2; /* LT2_LINE_BLOCK */ - DWORD start; /* start address of function with line numbers */ - DWORD seg; /* segment of function with line numbers */ - DWORD size; /* size of function with line numbers */ - DWORD file_offset; /* offset for accessing corresponding codeview_linetab2_file */ - DWORD nlines; /* number of lines in this block */ - DWORD size_lines; /* number of bytes following for line number information */ - struct { - DWORD offset; /* offset (from <seg>:<start>) for line number */ - DWORD lineno; /* the line number (OR:ed with 0x80000000 why ???) */ - } l[1]; /* actually array of <nlines> */ -}; - /* ======================================== * * PDB file information * ======================================== */

1 0

Eric Pouech : include: Added OMAP related definitions.
by Alexandre Julliard Nov. 2, 2021

Nov. 2, 2021

Module: wine Branch: master Commit: 59a187ec8dd2b56aaee179a7bc1dbd7e278fca19 URL: https://source.winehq.org/git/wine.git/?a=commit;h=59a187ec8dd2b56aaee179a7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Tue Nov 2 15:32:50 2021 +0100 include: Added OMAP related definitions. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/dbghelp.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/dbghelp.h b/include/dbghelp.h index 4dad9cd45e9..248b3ab418d 100644 --- a/include/dbghelp.h +++ b/include/dbghelp.h @@ -1128,6 +1128,14 @@ BOOL WINAPI SymAddSymbolW(HANDLE, ULONG64, PCWSTR, DWORD64, DWORD, DWORD); BOOL WINAPI SymDeleteSymbol(HANDLE, ULONG64, PCSTR, DWORD64, DWORD); BOOL WINAPI SymDeleteSymbolW(HANDLE, ULONG64, PCWSTR, DWORD64, DWORD); +typedef struct _OMAP +{ + ULONG rva; + ULONG rvaTo; +} OMAP, *POMAP; + +BOOL WINAPI SymGetOmaps(HANDLE, DWORD64, POMAP*, PDWORD64, POMAP*, PDWORD64); + /************************* * Source Files * *************************/

1 0

Eric Pouech : winedump: Dump index leaves (TPI).
by Alexandre Julliard Nov. 2, 2021

Nov. 2, 2021

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