February 2023 - Wine-Commits

Hans Leidekker : msi: Remove msi_ prefix from static functions.
by Alexandre Julliard Feb. 2, 2023

Feb. 2, 2023

Module: wine Branch: master Commit: 3611398b7575177b91e8162a84ebca977c50c2f5 URL: https://gitlab.winehq.org/wine/wine/-/commit/3611398b7575177b91e8162a84ebca… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 2 15:56:05 2023 +0100 msi: Remove msi_ prefix from static functions. --- dlls/msi/action.c | 87 +++---- dlls/msi/custom.c | 107 ++++---- dlls/msi/database.c | 94 ++++--- dlls/msi/dialog.c | 736 +++++++++++++++++++++++++--------------------------- dlls/msi/files.c | 40 +-- dlls/msi/handle.c | 144 +++++----- dlls/msi/insert.c | 8 +- dlls/msi/media.c | 16 +- dlls/msi/msi.c | 31 ++- dlls/msi/msiquery.c | 20 +- dlls/msi/package.c | 12 +- dlls/msi/patch.c | 16 +- dlls/msi/record.c | 8 +- dlls/msi/registry.c | 65 ++--- dlls/msi/suminfo.c | 8 +- dlls/msi/table.c | 92 ++++--- 16 files changed, 711 insertions(+), 773 deletions(-)

1 0

Fabian Maurer : winedump: Prevent "format overflow" warning.
by Alexandre Julliard Feb. 2, 2023

Feb. 2, 2023

Module: wine Branch: master Commit: fe0bf08ac60c92e285fbb73ed49779bca14dac67 URL: https://gitlab.winehq.org/wine/wine/-/commit/fe0bf08ac60c92e285fbb73ed49779… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Dec 11 20:52:09 2022 +0100 winedump: Prevent "format overflow" warning. Happens on gcc 12.2.0 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- tools/winedump/msc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winedump/msc.c b/tools/winedump/msc.c index 561d3ca98ca..cb5fbb0b9ad 100644 --- a/tools/winedump/msc.c +++ b/tools/winedump/msc.c @@ -461,7 +461,7 @@ static const char* get_callconv(unsigned cc) case CV_CALL_RESERVED: callconv = "reserved"; break; default: { - static char tmp[16]; + static char tmp[20]; sprintf(tmp, "callconv=%x", cc); callconv = tmp; }

1 0

Hans Leidekker : msi: Install and patch global assemblies in InstallFinalize.
by Alexandre Julliard Feb. 2, 2023

Feb. 2, 2023

Module: wine Branch: master Commit: 2c450fd6215c0da4685143f97ece8b6db0f54a0b URL: https://gitlab.winehq.org/wine/wine/-/commit/2c450fd6215c0da4685143f97ece8b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 2 11:06:36 2023 +0100 msi: Install and patch global assemblies in InstallFinalize. Installing global assemblies requires assembly caches to be initialized and this is no longer the case after the PE conversion (builtin fusion no longer loads if the dll is not present on disk). The next patch changes msi to perform late initialization of the assembly caches so that native fusion can be loaded once it's installed by .NET installers. However, there's no guarantee that all necessary files and registry keys are installed before the InstallFiles and PatchFiles actions are executed. Therefore this patch moves the parts of these actions handling global assemblies to InstallFinalize. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51345 --- dlls/msi/action.c | 43 +++++++++++++++++++++++++++++++++++++++-- dlls/msi/assembly.c | 55 ----------------------------------------------------- dlls/msi/files.c | 40 +++++--------------------------------- dlls/msi/msipriv.h | 2 +- 4 files changed, 47 insertions(+), 93 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index d856e94efa7..2bb9604adb8 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2068,8 +2068,7 @@ static UINT calculate_file_cost( MSIPACKAGE *package ) set_target_path( package, file ); - if ((comp->assembly && !comp->assembly->installed) || - msi_get_file_attributes( package, file->TargetPath ) == INVALID_FILE_ATTRIBUTES) + if (msi_get_file_attributes( package, file->TargetPath ) == INVALID_FILE_ATTRIBUTES) { comp->Cost += file->FileSize; continue; @@ -5134,6 +5133,8 @@ static BOOL is_full_uninstall( MSIPACKAGE *package ) static UINT ACTION_InstallFinalize(MSIPACKAGE *package) { UINT rc; + MSIFILE *file; + MSIFILEPATCH *patch; /* first do the same as an InstallExecute */ rc = execute_script(package, SCRIPT_INSTALL); @@ -5145,6 +5146,44 @@ static UINT ACTION_InstallFinalize(MSIPACKAGE *package) if (rc != ERROR_SUCCESS) return rc; + /* install global assemblies */ + LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) + { + MSICOMPONENT *comp = file->Component; + + if (!msi_is_global_assembly( comp ) || (file->state != msifs_missing && file->state != msifs_overwrite)) + continue; + + rc = msi_install_assembly( package, comp ); + if (rc != ERROR_SUCCESS) + { + ERR("Failed to install assembly\n"); + return ERROR_INSTALL_FAILURE; + } + file->state = msifs_installed; + } + + /* patch global assemblies */ + LIST_FOR_EACH_ENTRY( patch, &package->filepatches, MSIFILEPATCH, entry ) + { + MSICOMPONENT *comp = patch->File->Component; + + if (!msi_is_global_assembly( comp ) || !patch->path) continue; + + rc = msi_patch_assembly( package, comp->assembly, patch ); + if (rc && !(patch->Attributes & msidbPatchAttributesNonVital)) + { + ERR("Failed to apply patch to file: %s\n", debugstr_w(patch->File->File)); + return rc; + } + + if ((rc = msi_install_assembly( package, comp ))) + { + ERR("Failed to install patched assembly\n"); + return rc; + } + } + if (is_full_uninstall(package)) rc = ACTION_UnpublishProduct(package); diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index 7f75d225be0..586521342b6 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -219,24 +219,6 @@ done: return display_name; } -static BOOL is_assembly_installed( IAssemblyCache *cache, const WCHAR *display_name ) -{ - HRESULT hr; - ASSEMBLY_INFO info; - - if (!cache) return FALSE; - - memset( &info, 0, sizeof(info) ); - info.cbAssemblyInfo = sizeof(info); - hr = IAssemblyCache_QueryAssemblyInfo( cache, 0, display_name, &info ); - if (hr == S_OK /* sxs version */ || hr == E_NOT_SUFFICIENT_BUFFER) - { - return (info.dwAssemblyFlags == ASSEMBLYINFO_FLAG_INSTALLED); - } - TRACE( "QueryAssemblyInfo returned %#lx\n", hr ); - return FALSE; -} - WCHAR *msi_get_assembly_path( MSIPACKAGE *package, const WCHAR *displayname ) { HRESULT hr; @@ -309,13 +291,6 @@ static const WCHAR *clr_version[] = L"v4.0.30319" }; -static const WCHAR *get_clr_version_str( enum clr_version version ) -{ - if (version >= ARRAY_SIZE( clr_version )) return L"unknown"; - return clr_version[version]; -} - -/* assembly caches must be initialized */ MSIASSEMBLY *msi_load_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) { MSIRECORD *rec; @@ -351,34 +326,6 @@ MSIASSEMBLY *msi_load_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) } TRACE("display name %s\n", debugstr_w(a->display_name)); - if (a->application) - { - /* We can't check the manifest here because the target path may still change. - So we assume that the assembly is not installed and lean on the InstallFiles - action to determine which files need to be installed. - */ - a->installed = FALSE; - } - else - { - if (a->attributes == msidbAssemblyAttributesWin32) - a->installed = is_assembly_installed( package->cache_sxs, a->display_name ); - else - { - UINT i; - for (i = 0; i < CLR_VERSION_MAX; i++) - { - a->clr_version[i] = is_assembly_installed( package->cache_net[i], a->display_name ); - if (a->clr_version[i]) - { - TRACE("runtime version %s\n", debugstr_w(get_clr_version_str( i ))); - a->installed = TRUE; - break; - } - } - } - } - TRACE("assembly is %s\n", a->installed ? "installed" : "not installed"); msiobj_release( &rec->hdr ); return a; } @@ -449,7 +396,6 @@ UINT msi_install_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) return ERROR_FUNCTION_FAILED; } if (feature) feature->Action = INSTALLSTATE_LOCAL; - assembly->installed = TRUE; return ERROR_SUCCESS; } @@ -491,7 +437,6 @@ UINT msi_uninstall_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) } } if (feature) feature->Action = INSTALLSTATE_ABSENT; - assembly->installed = FALSE; return ERROR_SUCCESS; } diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 75075a37b5f..8267691a94d 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -305,7 +305,7 @@ static msi_file_state calculate_install_state( MSIPACKAGE *package, MSIFILE *fil DWORD size; comp->Action = msi_get_component_action( package, comp ); - if (!comp->Enabled || comp->Action != INSTALLSTATE_LOCAL || (comp->assembly && comp->assembly->installed)) + if (!comp->Enabled || comp->Action != INSTALLSTATE_LOCAL) { TRACE("skipping %s (not scheduled for install)\n", debugstr_w(file->File)); return msifs_skipped; @@ -315,8 +315,7 @@ static msi_file_state calculate_install_state( MSIPACKAGE *package, MSIFILE *fil TRACE("skipping %s (obsoleted by patch)\n", debugstr_w(file->File)); return msifs_skipped; } - if ((msi_is_global_assembly( comp ) && !comp->assembly->installed) || - msi_get_file_attributes( package, file->TargetPath ) == INVALID_FILE_ATTRIBUTES) + if (msi_get_file_attributes( package, file->TargetPath ) == INVALID_FILE_ATTRIBUTES) { TRACE("installing %s (missing)\n", debugstr_w(file->File)); return msifs_missing; @@ -650,22 +649,6 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) goto done; } } - LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) - { - MSICOMPONENT *comp = file->Component; - - if (!msi_is_global_assembly( comp ) || comp->assembly->installed || - (file->state != msifs_missing && file->state != msifs_overwrite)) continue; - - rc = msi_install_assembly( package, comp ); - if (rc != ERROR_SUCCESS) - { - ERR("Failed to install assembly\n"); - rc = ERROR_INSTALL_FAILURE; - break; - } - file->state = msifs_installed; - } done: msi_free_media_info(mi); @@ -740,7 +723,7 @@ static UINT patch_file( MSIPACKAGE *package, MSIFILEPATCH *patch ) return r; } -static UINT patch_assembly( MSIPACKAGE *package, MSIASSEMBLY *assembly, MSIFILEPATCH *patch ) +UINT msi_patch_assembly( MSIPACKAGE *package, MSIASSEMBLY *assembly, MSIFILEPATCH *patch ) { UINT r = ERROR_FUNCTION_FAILED; IAssemblyName *name; @@ -851,27 +834,14 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) { MSICOMPONENT *comp = patch->File->Component; - if (!patch->path) continue; - - if (msi_is_global_assembly( comp )) - rc = patch_assembly( package, comp->assembly, patch ); - else - rc = patch_file( package, patch ); + if (msi_is_global_assembly( comp ) || !patch->path) continue; + rc = patch_file( package, patch ); if (rc && !(patch->Attributes & msidbPatchAttributesNonVital)) { ERR("Failed to apply patch to file: %s\n", debugstr_w(patch->File->File)); break; } - - if (msi_is_global_assembly( comp )) - { - if ((rc = msi_install_assembly( package, comp ))) - { - ERR("Failed to install patched assembly\n"); - break; - } - } } done: diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 1db770481ef..902dd01205c 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -515,7 +515,6 @@ typedef struct tagMSIASSEMBLY DWORD attributes; LPWSTR display_name; LPWSTR tempdir; - BOOL installed; BOOL clr_version[CLR_VERSION_MAX]; } MSIASSEMBLY; @@ -806,6 +805,7 @@ extern UINT msi_check_patch_applicable( MSIPACKAGE *package, MSISUMMARYINFO *si extern UINT msi_apply_patches( MSIPACKAGE *package ) DECLSPEC_HIDDEN; extern UINT msi_apply_registered_patch( MSIPACKAGE *package, LPCWSTR patch_code ) DECLSPEC_HIDDEN; extern void msi_free_patchinfo( MSIPATCHINFO *patch ) DECLSPEC_HIDDEN; +extern UINT msi_patch_assembly( MSIPACKAGE *, MSIASSEMBLY *, MSIFILEPATCH * ) DECLSPEC_HIDDEN; /* action internals */ extern UINT MSI_InstallPackage( MSIPACKAGE *, LPCWSTR, LPCWSTR ) DECLSPEC_HIDDEN;

1 0

Kacper Michajłow : include: Add some DXGI_COLOR_SPACE_TYPE enumeration values.
by Alexandre Julliard Feb. 2, 2023

Feb. 2, 2023

Module: wine Branch: master Commit: 6e7a54f7952317b998d76fe9d7969a10e5f886b9 URL: https://gitlab.winehq.org/wine/wine/-/commit/6e7a54f7952317b998d76fe9d7969a… Author: Kacper Michajłow <kasper93(a)gmail.com> Date: Thu Feb 2 09:52:28 2023 +0100 include: Add some DXGI_COLOR_SPACE_TYPE enumeration values. Signed-off-by: Kacper Michajłow <kasper93(a)gmail.com> --- include/dxgicommon.idl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/dxgicommon.idl b/include/dxgicommon.idl index 99ace03c37d..29c8f6af642 100644 --- a/include/dxgicommon.idl +++ b/include/dxgicommon.idl @@ -45,6 +45,11 @@ typedef enum DXGI_COLOR_SPACE_TYPE DXGI_COLOR_SPACE_RGB_FULL_G22_NONE_P2020 = 0x11, DXGI_COLOR_SPACE_YCBCR_STUDIO_GHLG_TOPLEFT_P2020 = 0x12, DXGI_COLOR_SPACE_YCBCR_FULL_GHLG_TOPLEFT_P2020 = 0x13, + DXGI_COLOR_SPACE_RGB_STUDIO_G24_NONE_P709 = 0x14, + DXGI_COLOR_SPACE_RGB_STUDIO_G24_NONE_P2020 = 0x15, + DXGI_COLOR_SPACE_YCBCR_STUDIO_G24_LEFT_P709 = 0x16, + DXGI_COLOR_SPACE_YCBCR_STUDIO_G24_LEFT_P2020 = 0x17, + DXGI_COLOR_SPACE_YCBCR_STUDIO_G24_TOPLEFT_P2020 = 0x18, DXGI_COLOR_SPACE_CUSTOM = 0xffffffff, } DXGI_COLOR_SPACE_TYPE;

1 0

Eric Pouech : winedump: Be stricter about sizes while walking module's list.
by Alexandre Julliard Feb. 2, 2023

Feb. 2, 2023

Module: wine Branch: master Commit: e8777691c8b54f21339fcc268b3a916e8a55fd71 URL: https://gitlab.winehq.org/wine/wine/-/commit/e8777691c8b54f21339fcc268b3a91… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 1 18:30:50 2023 +0100 winedump: Be stricter about sizes while walking module's list. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- tools/winedump/pdb.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 787a62fe624..b13161c6c7a 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -637,6 +637,9 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx /* Read per-module symbol / linenumber tables */ file = (const char*)symbols + sizeof(PDB_SYMBOLS); while (file - (const char*)symbols < sizeof(PDB_SYMBOLS) + symbols->module_size) + while ((file - (const char*)symbols + sizeof(symbols->version) < sizeof(PDB_SYMBOLS) + symbols->module_size) && + (file - (const char*)symbols + + symbols->version < 19970000 ? sizeof(PDB_SYMBOL_FILE) : sizeof(PDB_SYMBOL_FILE_EX)) < sizeof(PDB_SYMBOLS) + symbols->module_size) { int stream_nr, symbol_size, lineno_size, lineno2_size; const char* file_name;

1 0

Eric Pouech : winedump: Properly dump segment map information from PDB/DBI stream.
by Alexandre Julliard Feb. 2, 2023

Feb. 2, 2023

Module: wine Branch: master Commit: cda616d8cafea1f1c64adcba9b93dffe8c6b5202 URL: https://gitlab.winehq.org/wine/wine/-/commit/cda616d8cafea1f1c64adcba9b93df… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 1 18:30:48 2023 +0100 winedump: Properly dump segment map information from PDB/DBI stream. Changing field names to match better their content. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 6 +++--- include/wine/mscvpdb.h | 4 ++-- tools/winedump/pdb.c | 43 +++++++++++++++++++++++++++++++++++++------ 3 files changed, 42 insertions(+), 11 deletions(-) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 5f149e88b94..d4aef183677 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -3271,7 +3271,7 @@ static void pdb_convert_symbols_header(PDB_SYMBOLS* symbols, symbols->version = 0; symbols->module_size = old->module_size; symbols->sectcontrib_size = old->sectcontrib_size; - symbols->hash_size = old->hash_size; + symbols->segmap_size = old->segmap_size; symbols->srcmodule_size = old->srcmodule_size; symbols->pdbimport_size = 0; symbols->global_hash_stream = old->global_hash_stream; @@ -3635,7 +3635,7 @@ static void pdb_process_symbol_imports(const struct process* pcs, imp = (const PDB_SYMBOL_IMPORT*)((const char*)symbols_image + sizeof(PDB_SYMBOLS) + symbols->module_size + symbols->sectcontrib_size + - symbols->hash_size + symbols->srcmodule_size); + symbols->segmap_size + symbols->srcmodule_size); first = imp; last = (const char*)imp + symbols->pdbimport_size; while (imp < (const PDB_SYMBOL_IMPORT*)last) @@ -3746,7 +3746,7 @@ static BOOL pdb_process_internal(const struct process* pcs, case sizeof(PDB_STREAM_INDEXES): psi = (PDB_STREAM_INDEXES*)((const char*)symbols_image + sizeof(PDB_SYMBOLS) + symbols.module_size + symbols.sectcontrib_size + - symbols.hash_size + symbols.srcmodule_size + + symbols.segmap_size + symbols.srcmodule_size + symbols.pdbimport_size + symbols.unknown2_size); pdb_file->fpoext_stream = psi->FPO_EXT; break; diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index efd88608a7f..19fcab33ab9 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -2540,7 +2540,7 @@ typedef struct _PDB_SYMBOLS_OLD unsigned short pad; unsigned int module_size; unsigned int sectcontrib_size; - unsigned int hash_size; + unsigned int segmap_size; unsigned int srcmodule_size; } PDB_SYMBOLS_OLD, *PPDB_SYMBOLS_OLD; @@ -2557,7 +2557,7 @@ typedef struct _PDB_SYMBOLS unsigned short rbldVer; unsigned int module_size; unsigned int sectcontrib_size; - unsigned int hash_size; + unsigned int segmap_size; unsigned int srcmodule_size; unsigned int pdbimport_size; unsigned int resvd0; diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 5dacb948bdf..787a62fe624 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -371,7 +371,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx "\trbldVer: %u\n" "\tmodule_size: %08x\n" "\tsectcontrib_size: %08x\n" - "\thash_size: %08x\n" + "\tsegmap_size: %08x\n" "\tsrc_module_size: %08x\n" "\tpdbimport_size: %08x\n" "\tresvd0: %08x\n" @@ -391,7 +391,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx symbols->rbldVer, symbols->module_size, symbols->sectcontrib_size, - symbols->hash_size, + symbols->segmap_size, symbols->srcmodule_size, symbols->pdbimport_size, symbols->resvd0, @@ -474,7 +474,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx printf("\t----------src module------------\n"); src = (const PDB_SYMBOL_SOURCE*)((const char*)symbols + sizeof(PDB_SYMBOLS) + - symbols->module_size + symbols->sectcontrib_size + symbols->hash_size); + symbols->module_size + symbols->sectcontrib_size + symbols->segmap_size); printf("\tSource Modules\n" "\t\tnModules: %u\n" "\t\tnSrcFiles: %u\n", @@ -521,7 +521,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx printf("\t------------import--------------\n"); imp = (const PDB_SYMBOL_IMPORT*)((const char*)symbols + sizeof(PDB_SYMBOLS) + symbols->module_size + symbols->sectcontrib_size + - symbols->hash_size + symbols->srcmodule_size); + symbols->segmap_size + symbols->srcmodule_size); first = (const char*)imp; last = (const char*)imp + symbols->pdbimport_size; while (imp < (const PDB_SYMBOL_IMPORT*)last) @@ -544,6 +544,37 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx imp = (const PDB_SYMBOL_IMPORT*)(first + ((ptr - first + strlen(ptr) + 1 + 3) & ~3)); } } + if (symbols->segmap_size) + { + const struct OMFSegMap* segmap = (const struct OMFSegMap*)((const BYTE*)symbols + sizeof(PDB_SYMBOLS) + + symbols->module_size + symbols->sectcontrib_size); + const struct OMFSegMapDesc* desc = (const struct OMFSegMapDesc*)(segmap + 1); + + printf("\t--------------segment map----------------\n"); + printf("\tNumber of segments: %x\n", segmap->cSeg); + printf("\tNumber of logical segments: %x\n", segmap->cSegLog); + /* FIXME check mapping old symbols */ + for (; (const BYTE*)(desc + 1) <= ((const BYTE*)(segmap + 1) + symbols->segmap_size); desc++) + { + printf("\t\tSegment descriptor #%tu\n", desc - (const struct OMFSegMapDesc*)(segmap + 1)); + printf("\t\t\tFlags: %04x (%c%c%c%s%s%s%s)\n", + desc->flags, + (desc->flags & 0x01) ? 'R' : '-', + (desc->flags & 0x02) ? 'W' : '-', + (desc->flags & 0x04) ? 'X' : '-', + (desc->flags & 0x08) ? " 32bit-linear" : "", + (desc->flags & 0x100) ? " selector" : "", + (desc->flags & 0x200) ? " absolute" : "", + (desc->flags & 0x400) ? " group" : ""); + printf("\t\t\tOverlay: %04x\n", desc->ovl); + printf("\t\t\tGroup: %04x\n", desc->group); + printf("\t\t\tFrame: %04x\n", desc->frame); + printf("\t\t\tSegment name: %s\n", desc->iSegName == 0xffff ? "none" : pdb_get_string_table_entry(filesimage, desc->iSegName)); + printf("\t\t\tClass name: %s\n", desc->iClassName == 0xffff ? "none" : pdb_get_string_table_entry(filesimage, desc->iClassName)); + printf("\t\t\tOffset: %08x\n", desc->offset); + printf("\t\t\tSize: %04x\n", desc->cbSeg); + } + } if (symbols->stream_index_size) { printf("\t------------stream indexes--------------\n"); @@ -555,7 +586,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx */ memcpy(sidx, (const char*)symbols + sizeof(PDB_SYMBOLS) + symbols->module_size + - symbols->sectcontrib_size + symbols->hash_size + symbols->srcmodule_size + + symbols->sectcontrib_size + symbols->segmap_size + symbols->srcmodule_size + symbols->pdbimport_size + symbols->unknown2_size, sizeof(PDB_STREAM_INDEXES_OLD)); printf("\tFPO: %04x\n" @@ -570,7 +601,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx case sizeof(PDB_STREAM_INDEXES): memcpy(sidx, (const char*)symbols + sizeof(PDB_SYMBOLS) + symbols->module_size + - symbols->sectcontrib_size + symbols->hash_size + symbols->srcmodule_size + + symbols->sectcontrib_size + symbols->segmap_size + symbols->srcmodule_size + symbols->pdbimport_size + symbols->unknown2_size, sizeof(*sidx)); printf("\tFPO: %04x\n"

1 0

Eric Pouech : winedump: Dump correctly ranges part of DBI stream.
by Alexandre Julliard Feb. 2, 2023

Feb. 2, 2023

Module: wine Branch: master Commit: cf71edaa4ef0c44ac854700d297eabf194d24cc6 URL: https://gitlab.winehq.org/wine/wine/-/commit/cf71edaa4ef0c44ac854700d297eab… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 1 18:30:47 2023 +0100 winedump: Dump correctly ranges part of DBI stream. The ranges describe for a PE image all the contributions of each compilation unit towards the various sections. Renaming offset_size into ranges_size which is closer to its actual content. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- dlls/dbghelp/msc.c | 8 ++-- include/wine/mscvpdb.h | 4 +- tools/winedump/pdb.c | 111 ++++++++++++++++++++++++++++++++++++------------- 3 files changed, 89 insertions(+), 34 deletions(-)

1 0

Brendan Shanks : kernelbase: Implement and add tests for QueryProcessCycleTime.
by Alexandre Julliard Feb. 2, 2023

Feb. 2, 2023

Module: wine Branch: master Commit: edc479eea9dff2cf3f035addfb16c0350cd0bb21 URL: https://gitlab.winehq.org/wine/wine/-/commit/edc479eea9dff2cf3f035addfb16c0… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Jan 13 14:49:29 2023 -0800 kernelbase: Implement and add tests for QueryProcessCycleTime. --- dlls/kernelbase/process.c | 11 +++++++---- dlls/kernelbase/tests/process.c | 16 ++++++++++++++++ include/winbase.h | 1 + 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dlls/kernelbase/process.c b/dlls/kernelbase/process.c index 39de15066d4..837bdfd5e87 100644 --- a/dlls/kernelbase/process.c +++ b/dlls/kernelbase/process.c @@ -1074,10 +1074,13 @@ BOOL WINAPI DECLSPEC_HOTPATCH ProcessIdToSessionId( DWORD pid, DWORD *id ) */ BOOL WINAPI DECLSPEC_HOTPATCH QueryProcessCycleTime( HANDLE process, ULONG64 *cycle ) { - static int once; - if (!once++) FIXME( "(%p,%p): stub!\n", process, cycle ); - SetLastError( ERROR_CALL_NOT_IMPLEMENTED ); - return FALSE; + PROCESS_CYCLE_TIME_INFORMATION time; + + if (!set_ntstatus( NtQueryInformationProcess( process, ProcessCycleTime, &time, sizeof(time), NULL ) )) + return FALSE; + + *cycle = time.AccumulatedCycles; + return TRUE; } diff --git a/dlls/kernelbase/tests/process.c b/dlls/kernelbase/tests/process.c index ed213f1f7b6..b8c3bbb7276 100644 --- a/dlls/kernelbase/tests/process.c +++ b/dlls/kernelbase/tests/process.c @@ -421,6 +421,21 @@ static void test_MapViewOfFileFromApp(void) ok(ret, "Failed to delete a test file.\n"); } +static void test_QueryProcessCycleTime(void) +{ + ULONG64 cycles1, cycles2; + BOOL ret; + + ret = QueryProcessCycleTime( GetCurrentProcess(), &cycles1 ); + ok( ret, "QueryProcessCycleTime failed, error %lu.\n", GetLastError() ); + + ret = QueryProcessCycleTime( GetCurrentProcess(), &cycles2 ); + ok( ret, "QueryProcessCycleTime failed, error %lu.\n", GetLastError() ); + + todo_wine + ok( cycles2 > cycles1, "CPU cycles used by process should be increasing.\n" ); +} + static void init_funcs(void) { HMODULE hmod = GetModuleHandleA("kernelbase.dll"); @@ -453,4 +468,5 @@ START_TEST(process) test_OpenFileMappingFromApp(); test_CreateFileMappingFromApp(); test_MapViewOfFileFromApp(); + test_QueryProcessCycleTime(); } diff --git a/include/winbase.h b/include/winbase.h index 45492782cd5..8826251914d 100644 --- a/include/winbase.h +++ b/include/winbase.h @@ -2605,6 +2605,7 @@ WINBASEAPI BOOL WINAPI QueryInformationJobObject(HANDLE,JOBOBJECTINFOCLAS WINBASEAPI BOOL WINAPI QueryMemoryResourceNotification(HANDLE,PBOOL); WINBASEAPI BOOL WINAPI QueryPerformanceCounter(LARGE_INTEGER*); WINBASEAPI BOOL WINAPI QueryPerformanceFrequency(LARGE_INTEGER*); +WINBASEAPI BOOL WINAPI QueryProcessCycleTime(HANDLE,PULONG64); WINBASEAPI BOOL WINAPI QueryThreadCycleTime(HANDLE,PULONG64); WINBASEAPI BOOL WINAPI QueryUmsThreadInformation(PUMS_CONTEXT,UMS_THREAD_INFO_CLASS,PVOID,ULONG,PULONG); WINBASEAPI DWORD WINAPI QueueUserAPC(PAPCFUNC,HANDLE,ULONG_PTR);

1 0

Eric Pouech : winedump: Explain a bit more errors on hash header.
by Alexandre Julliard Feb. 2, 2023

Feb. 2, 2023

Module: wine Branch: master Commit: a0d4a58a340e74b09577395359cb0ac4fb6dd023 URL: https://gitlab.winehq.org/wine/wine/-/commit/a0d4a58a340e74b09577395359cb0a… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 1 18:30:45 2023 +0100 winedump: Explain a bit more errors on hash header. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- tools/winedump/pdb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index e98776c67b9..5ab1b515691 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -249,7 +249,10 @@ static void dump_dbi_hash_table(const BYTE* root, unsigned size, const char* nam sizeof(DBI_HASH_HEADER) + hdr->hash_records_size + DBI_BITMAP_HASH_SIZE > size || (size - (sizeof(DBI_HASH_HEADER) + hdr->hash_records_size + DBI_BITMAP_HASH_SIZE)) % sizeof(unsigned)) { - printf("%s\t\tIncorrect hash structure\n", pfx); + if (size >= sizeof(DBI_HASH_HEADER) && !hdr->hash_records_size) + printf("%s\t\tEmpty hash structure\n", pfx); + else + printf("%s\t\tIncorrect hash structure\n", pfx); } else {

1 0

Eric Pouech : winedump: Correctly dump PDB_STREAM_INDEX.segment.
by Alexandre Julliard Feb. 2, 2023

Feb. 2, 2023

Module: wine Branch: master Commit: 4fc2c3319efa763d2865527ba48b617e4ca58adb URL: https://gitlab.winehq.org/wine/wine/-/commit/4fc2c3319efa763d2865527ba48b61… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 1 18:30:44 2023 +0100 winedump: Correctly dump PDB_STREAM_INDEX.segment. This stream actually contains PE IMAGE_SECTION_HEADER. So reflect the content by renaming segment into section, and use some helpers from the PE side. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- include/wine/mscvpdb.h | 4 ++-- tools/winedump/pdb.c | 51 ++++++++++++++++++++++++++------------------------ 2 files changed, 29 insertions(+), 26 deletions(-) diff --git a/include/wine/mscvpdb.h b/include/wine/mscvpdb.h index 7aff95c3e76..9563a70e1ce 100644 --- a/include/wine/mscvpdb.h +++ b/include/wine/mscvpdb.h @@ -2575,7 +2575,7 @@ typedef struct unsigned short unk1; unsigned short unk2; unsigned short unk3; - unsigned short segments; + unsigned short sections_stream; } PDB_STREAM_INDEXES_OLD; typedef struct @@ -2585,7 +2585,7 @@ typedef struct unsigned short unk1; unsigned short unk2; unsigned short unk3; - unsigned short segments; + unsigned short sections_stream; unsigned short unk4; unsigned short unk5; unsigned short unk6; diff --git a/tools/winedump/pdb.c b/tools/winedump/pdb.c index 31f4fd3bc46..e98776c67b9 100644 --- a/tools/winedump/pdb.c +++ b/tools/winedump/pdb.c @@ -336,7 +336,7 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx PDB_STRING_TABLE* filesimage; char tcver[32]; - sidx->FPO = sidx->unk0 = sidx->unk1 = sidx->unk2 = sidx->unk3 = sidx->segments = + sidx->FPO = sidx->unk0 = sidx->unk1 = sidx->unk2 = sidx->unk3 = sidx->sections_stream = sidx->unk4 = sidx->unk5 = sidx->unk6 = sidx->FPO_EXT = sidx->unk7 = -1; symbols = reader->read_stream(reader, 3); @@ -509,9 +509,9 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx "\t?: %04x\n" "\t?: %04x\n" "\t?: %04x\n" - "\tSegments: %04x\n", + "\tSections stream: %04x\n", sidx->FPO, sidx->unk0, sidx->unk1, sidx->unk2, sidx->unk3, - sidx->segments); + sidx->sections_stream); break; case sizeof(PDB_STREAM_INDEXES): memcpy(sidx, @@ -524,14 +524,14 @@ static void pdb_dump_symbols(struct pdb_reader* reader, PDB_STREAM_INDEXES* sidx "\t?: %04x\n" "\t?: %04x\n" "\t?: %04x\n" - "\tSegments: %04x\n" + "\tSection stream: %04x\n" "\t?: %04x\n" "\t?: %04x\n" "\t?: %04x\n" "\tFPO-ext: %04x\n" "\t?: %04x\n", sidx->FPO, sidx->unk0, sidx->unk1, sidx->unk2, sidx->unk3, - sidx->segments, sidx->unk4, sidx->unk5, sidx->unk6, sidx->FPO_EXT, + sidx->sections_stream, sidx->unk4, sidx->unk5, sidx->unk6, sidx->FPO_EXT, sidx->unk7); break; default: @@ -957,33 +957,36 @@ static void pdb_dump_fpo_ext(struct pdb_reader* reader, unsigned stream_idx) free(strbase); } -static void pdb_dump_segments(struct pdb_reader* reader, unsigned stream_idx) +static void pdb_dump_sections(struct pdb_reader* reader, unsigned stream_idx) { - const char* segs; - DWORD size; - const char* ptr; + const char* segs; + DWORD size; + const IMAGE_SECTION_HEADER* sect_hdr; if (stream_idx == (WORD)-1) return; segs = reader->read_stream(reader, stream_idx); if (segs) { + printf("Sections:\n"); size = pdb_get_stream_size(reader, stream_idx); - for (ptr = segs; ptr < segs + size; ) + for (sect_hdr = (const IMAGE_SECTION_HEADER*)segs; (const char*)sect_hdr < segs + size; sect_hdr++) { - printf("Segment %s\n", ptr); - ptr += (strlen(ptr) + 1 + 3) & ~3; - printf("\tdword[0]: %08x\n", *(UINT *)ptr); ptr += 4; - printf("\tdword[1]: %08x\n", *(UINT *)ptr); ptr += 4; - printf("\tdword[2]: %08x\n", *(UINT *)ptr); ptr += 4; - printf("\tdword[3]: %08x\n", *(UINT *)ptr); ptr += 4; - printf("\tdword[4]: %08x\n", *(UINT *)ptr); ptr += 4; - printf("\tdword[5]: %08x\n", *(UINT *)ptr); ptr += 4; - printf("\tdword[6]: %08x\n", *(UINT *)ptr); ptr += 4; - printf("\tdword[7]: %08x\n", *(UINT *)ptr); ptr += 4; + printf("\tSection: %-8.8s\n", sect_hdr->Name); + printf("\t\tVirtual size: %08x\n", (unsigned)sect_hdr->Misc.VirtualSize); + printf("\t\tVirtualAddress: %08x\n", (unsigned)sect_hdr->VirtualAddress); + printf("\t\tSizeOfRawData: %08x\n", (unsigned)sect_hdr->SizeOfRawData); + printf("\t\tPointerToRawData: %08x\n", (unsigned)sect_hdr->PointerToRawData); + printf("\t\tPointerToRelocations: %08x\n", (unsigned)sect_hdr->PointerToRelocations); + printf("\t\tPointerToLinenumbers: %08x\n", (unsigned)sect_hdr->PointerToLinenumbers); + printf("\t\tNumberOfRelocations: %u\n", (unsigned)sect_hdr->NumberOfRelocations); + printf("\t\tNumberOfLinenumbers: %u\n", (unsigned)sect_hdr->NumberOfLinenumbers); + printf("\t\tCharacteristics: %08x", (unsigned)sect_hdr->Characteristics); + dump_section_characteristics(sect_hdr->Characteristics, " "); + printf("\n"); } free((char*)segs); - } else printf("nosdfsdffd\n"); + } } static const char pdb2[] = "Microsoft C/C++ program database 2.00"; @@ -1071,7 +1074,7 @@ static void pdb_jg_dump(void) pdb_dump_types(&reader, 4, "IPI"); pdb_dump_symbols(&reader, &sidx); pdb_dump_fpo(&reader, sidx.FPO); - pdb_dump_segments(&reader, sidx.segments); + pdb_dump_sections(&reader, sidx.sections_stream); } else printf("-Unable to get root\n"); @@ -1161,7 +1164,7 @@ static void pdb_ds_dump(void) * - global and public streams: from symbol stream header * those streams get their indexes out of the PDB_STREAM_INDEXES object * - FPO data - * - segments + * - sections * - extended FPO data */ mark_stream_been_read(&reader, 0); /* mark stream #0 as read */ @@ -1219,7 +1222,7 @@ static void pdb_ds_dump(void) pdb_dump_symbols(&reader, &sidx); pdb_dump_fpo(&reader, sidx.FPO); pdb_dump_fpo_ext(&reader, sidx.FPO_EXT); - pdb_dump_segments(&reader, sidx.segments); + pdb_dump_sections(&reader, sidx.sections_stream); } else printf("-Unable to get root\n");

1 0