February 2023 - Wine-commits

Hans Leidekker : msi: Perform late initialization of the assembly caches.
by Alexandre Julliard 02 Feb '23

02 Feb '23

Module: wine Branch: master Commit: d9d700f3328f00ec419571df0e02cef208fa1e7b URL: https://gitlab.winehq.org/wine/wine/-/commit/d9d700f3328f00ec419571df0e02ce… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 2 12:05:20 2023 +0100 msi: Perform late initialization of the assembly caches. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51345 --- dlls/msi/assembly.c | 42 ++++++++++++++++++++++-------------------- dlls/msi/msipriv.h | 1 - dlls/msi/package.c | 7 ------- 3 files changed, 22 insertions(+), 28 deletions(-) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index 586521342b6..47e8071502c 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -30,55 +30,52 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); -static BOOL load_fusion_dlls( MSIPACKAGE *package ) +static void load_fusion_dlls( MSIPACKAGE *package ) { HRESULT (WINAPI *pLoadLibraryShim)( const WCHAR *, const WCHAR *, void *, HMODULE * ); WCHAR path[MAX_PATH]; DWORD len = GetSystemDirectoryW( path, MAX_PATH ); lstrcpyW( path + len, L"\\mscoree.dll" ); - if (package->hmscoree || !(package->hmscoree = LoadLibraryW( path ))) return TRUE; + if (!package->hmscoree && !(package->hmscoree = LoadLibraryW( path ))) return; if (!(pLoadLibraryShim = (void *)GetProcAddress( package->hmscoree, "LoadLibraryShim" ))) { FreeLibrary( package->hmscoree ); package->hmscoree = NULL; - return TRUE; + return; } - pLoadLibraryShim( L"fusion.dll", L"v1.0.3705", NULL, &package->hfusion10 ); - pLoadLibraryShim( L"fusion.dll", L"v1.1.4322", NULL, &package->hfusion11 ); - pLoadLibraryShim( L"fusion.dll", L"v2.0.50727", NULL, &package->hfusion20 ); - pLoadLibraryShim( L"fusion.dll", L"v4.0.30319", NULL, &package->hfusion40 ); - - return TRUE; + if (!package->hfusion10) pLoadLibraryShim( L"fusion.dll", L"v1.0.3705", NULL, &package->hfusion10 ); + if (!package->hfusion11) pLoadLibraryShim( L"fusion.dll", L"v1.1.4322", NULL, &package->hfusion11 ); + if (!package->hfusion20) pLoadLibraryShim( L"fusion.dll", L"v2.0.50727", NULL, &package->hfusion20 ); + if (!package->hfusion40) pLoadLibraryShim( L"fusion.dll", L"v4.0.30319", NULL, &package->hfusion40 ); } -BOOL msi_init_assembly_caches( MSIPACKAGE *package ) +static BOOL init_assembly_caches( MSIPACKAGE *package ) { HRESULT (WINAPI *pCreateAssemblyCache)( IAssemblyCache **, DWORD ); - if (package->cache_sxs) return TRUE; - if (CreateAssemblyCache( &package->cache_sxs, 0 ) != S_OK) return FALSE; + if (!package->cache_sxs && CreateAssemblyCache( &package->cache_sxs, 0 ) != S_OK) return FALSE; - if (!load_fusion_dlls( package )) return FALSE; + load_fusion_dlls( package ); package->pGetFileVersion = (void *)GetProcAddress( package->hmscoree, "GetFileVersion" ); /* missing from v1.0.3705 */ - if (package->hfusion10) + if (package->hfusion10 && !package->cache_net[CLR_VERSION_V10]) { pCreateAssemblyCache = (void *)GetProcAddress( package->hfusion10, "CreateAssemblyCache" ); pCreateAssemblyCache( &package->cache_net[CLR_VERSION_V10], 0 ); } - if (package->hfusion11) + if (package->hfusion11 && !package->cache_net[CLR_VERSION_V11]) { pCreateAssemblyCache = (void *)GetProcAddress( package->hfusion11, "CreateAssemblyCache" ); pCreateAssemblyCache( &package->cache_net[CLR_VERSION_V11], 0 ); } - if (package->hfusion20) + if (package->hfusion20 && !package->cache_net[CLR_VERSION_V20]) { pCreateAssemblyCache = (void *)GetProcAddress( package->hfusion20, "CreateAssemblyCache" ); pCreateAssemblyCache( &package->cache_net[CLR_VERSION_V20], 0 ); } - if (package->hfusion40) + if (package->hfusion40 && !package->cache_net[CLR_VERSION_V40]) { pCreateAssemblyCache = (void *)GetProcAddress( package->hfusion40, "CreateAssemblyCache" ); pCreateAssemblyCache( &package->cache_net[CLR_VERSION_V40], 0 ); @@ -223,9 +220,9 @@ WCHAR *msi_get_assembly_path( MSIPACKAGE *package, const WCHAR *displayname ) { HRESULT hr; ASSEMBLY_INFO info; - IAssemblyCache *cache = package->cache_net[CLR_VERSION_V40]; + IAssemblyCache *cache; - if (!cache) return NULL; + if (!init_assembly_caches( package ) || !(cache = package->cache_net[CLR_VERSION_V40])) return NULL; memset( &info, 0, sizeof(info) ); info.cbAssemblyInfo = sizeof(info); @@ -252,7 +249,8 @@ IAssemblyEnum *msi_create_assembly_enum( MSIPACKAGE *package, const WCHAR *displ WCHAR *str; DWORD len = 0; - if (!package->pCreateAssemblyNameObject || !package->pCreateAssemblyEnum) return NULL; + if (!init_assembly_caches( package ) || !package->pCreateAssemblyNameObject || !package->pCreateAssemblyEnum) + return NULL; hr = package->pCreateAssemblyNameObject( &name, displayname, CANOF_PARSE_DISPLAY_NAME, NULL ); if (FAILED( hr )) return NULL; @@ -363,6 +361,8 @@ UINT msi_install_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) MSIASSEMBLY *assembly = comp->assembly; MSIFEATURE *feature = NULL; + if (!init_assembly_caches( package )) return ERROR_FUNCTION_FAILED; + if (comp->assembly->feature) feature = msi_get_loaded_feature( package, comp->assembly->feature ); @@ -406,6 +406,8 @@ UINT msi_uninstall_assembly( MSIPACKAGE *package, MSICOMPONENT *comp ) MSIASSEMBLY *assembly = comp->assembly; MSIFEATURE *feature = NULL; + if (!init_assembly_caches( package )) return ERROR_FUNCTION_FAILED; + if (comp->assembly->feature) feature = msi_get_loaded_feature( package, comp->assembly->feature ); diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 902dd01205c..92c406b8ec5 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1052,7 +1052,6 @@ extern UINT msi_set_sourcedir_props(MSIPACKAGE *package, BOOL replace) DECLSPEC_ extern MSIASSEMBLY *msi_load_assembly(MSIPACKAGE *, MSICOMPONENT *) DECLSPEC_HIDDEN; extern UINT msi_install_assembly(MSIPACKAGE *, MSICOMPONENT *) DECLSPEC_HIDDEN; extern UINT msi_uninstall_assembly(MSIPACKAGE *, MSICOMPONENT *) DECLSPEC_HIDDEN; -extern BOOL msi_init_assembly_caches(MSIPACKAGE *) DECLSPEC_HIDDEN; extern void msi_destroy_assembly_caches(MSIPACKAGE *) DECLSPEC_HIDDEN; extern BOOL msi_is_global_assembly(MSICOMPONENT *) DECLSPEC_HIDDEN; extern IAssemblyEnum *msi_create_assembly_enum(MSIPACKAGE *, const WCHAR *) DECLSPEC_HIDDEN; diff --git a/dlls/msi/package.c b/dlls/msi/package.c index bfbbaadae1b..f09d0c6fc92 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1502,13 +1502,6 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, DWORD dwOptions, MSIPACKAGE **pPackage) package->log_file = CreateFileW( gszLogFile, GENERIC_WRITE, FILE_SHARE_WRITE, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL ); - if (!msi_init_assembly_caches( package )) - { - ERR("can't initialize assembly caches\n"); - msiobj_release( &package->hdr ); - return ERROR_FUNCTION_FAILED; - } - /* FIXME: when should these messages be sent? */ data_row = MSI_CreateRecord(3); if (!data_row)

1 0

Hans Leidekker : msi: Remove msi_ prefix from static functions.
by Alexandre Julliard 02 Feb '23

02 Feb '23

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

Hans Leidekker : msi: Get rid of unnecessary typedefs.
by Alexandre Julliard 02 Feb '23

02 Feb '23

Module: wine Branch: master Commit: 258012742512a4072265fcc47826c52319bd37ab URL: https://gitlab.winehq.org/wine/wine/-/commit/258012742512a4072265fcc47826c5… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Mon Jan 2 17:43:50 2023 +0100 msi: Get rid of unnecessary typedefs. --- dlls/msi/action.c | 38 ++++----- dlls/msi/alter.c | 22 ++--- dlls/msi/appsearch.c | 38 ++++----- dlls/msi/automation.c | 194 +++++++++++++++++++++--------------------- dlls/msi/create.c | 20 ++--- dlls/msi/custom.c | 10 +-- dlls/msi/database.c | 52 ++++++------ dlls/msi/delete.c | 22 ++--- dlls/msi/dialog.c | 227 ++++++++++++++++++++++++-------------------------- dlls/msi/distinct.c | 40 ++++----- dlls/msi/drop.c | 14 ++-- dlls/msi/files.c | 24 +++--- dlls/msi/font.c | 39 +++++---- dlls/msi/format.c | 94 ++++++++++----------- dlls/msi/insert.c | 26 +++--- dlls/msi/msi.c | 12 +-- dlls/msi/msi_main.c | 17 ++-- dlls/msi/package.c | 6 +- dlls/msi/query.h | 3 +- dlls/msi/script.c | 39 ++++----- dlls/msi/select.c | 35 ++++---- dlls/msi/source.c | 23 +++-- dlls/msi/storages.c | 36 ++++---- dlls/msi/streams.c | 32 +++---- dlls/msi/suminfo.c | 53 ++++++------ dlls/msi/table.c | 186 +++++++++++++++++++++-------------------- dlls/msi/tokenize.c | 12 +-- dlls/msi/update.c | 20 ++--- dlls/msi/where.c | 83 +++++++++--------- 29 files changed, 709 insertions(+), 708 deletions(-)

1 0

Fabian Maurer : winedump: Prevent "format overflow" warning.
by Alexandre Julliard 02 Feb '23

02 Feb '23

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

Fabian Maurer : dwrite/tests: Prevent "misleading indentation" warnings.
by Alexandre Julliard 02 Feb '23

02 Feb '23

Module: wine Branch: master Commit: 2d6fdf7c8e85b5c92f7ab5569002d0d9245501e9 URL: https://gitlab.winehq.org/wine/wine/-/commit/2d6fdf7c8e85b5c92f7ab5569002d0… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sun Dec 11 21:03:17 2022 +0100 dwrite/tests: Prevent "misleading indentation" warnings. Happens on gcc 12.2.0 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/dwrite/tests/layout.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/tests/layout.c b/dlls/dwrite/tests/layout.c index f9f4f46f584..c8c706a7395 100644 --- a/dlls/dwrite/tests/layout.c +++ b/dlls/dwrite/tests/layout.c @@ -5309,12 +5309,12 @@ static void test_system_fallback(void) if (!font) continue; get_font_name(font, name, ARRAY_SIZE(name)); - todo_wine + todo_wine ok(!wcscmp(name, tests[i].name), "%u: unexpected name %s.\n", i, wine_dbgstr_w(name)); hr = IDWriteFont_HasCharacter(font, g_source[0], &exists); ok(hr == S_OK, "Unexpected hr %#lx.\n", hr); - todo_wine + todo_wine ok(exists, "%s missing character %#x\n", wine_dbgstr_w(name), g_source[0]); IDWriteFont_Release(font);

1 0

Brendan Shanks : ntdll: Add stub for NtQueryInformationProcess(ProcessCycleTime).
by Alexandre Julliard 02 Feb '23

02 Feb '23

Module: wine Branch: master Commit: c0ffd587b56555f3d857db3d75fc37e814bde210 URL: https://gitlab.winehq.org/wine/wine/-/commit/c0ffd587b56555f3d857db3d75fc37… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Fri Jan 13 12:42:27 2023 -0800 ntdll: Add stub for NtQueryInformationProcess(ProcessCycleTime). --- dlls/kernel32/tests/process.c | 3 ++- dlls/ntdll/unix/process.c | 19 +++++++++++++++++++ dlls/wow64/process.c | 1 + include/winternl.h | 5 +++++ 4 files changed, 27 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index 5ac6ed57bbe..1e30ba73bbf 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -3710,7 +3710,7 @@ static void test_process_info(HANDLE hproc) 0 /* FIXME: sizeof(?) ProcessTlsInformation */, sizeof(ULONG) /* ProcessCookie */, sizeof(SECTION_IMAGE_INFORMATION) /* ProcessImageInformation */, - 0 /* FIXME: sizeof(PROCESS_CYCLE_TIME_INFORMATION) ProcessCycleTime */, + sizeof(PROCESS_CYCLE_TIME_INFORMATION) /* ProcessCycleTime */, sizeof(ULONG) /* ProcessPagePriority */, 40 /* ProcessInstrumentationCallback */, 0 /* FIXME: sizeof(PROCESS_STACK_ALLOCATION_INFORMATION) ProcessThreadStackAllocation */, @@ -3780,6 +3780,7 @@ static void test_process_info(HANDLE hproc) case ProcessHandleCount: case ProcessImageFileName: case ProcessImageInformation: + case ProcessCycleTime: case ProcessPagePriority: case ProcessImageFileNameWin32: ok(status == STATUS_SUCCESS, "for info %lu expected STATUS_SUCCESS, got %08lx (ret_len %lu)\n", i, status, ret_len); diff --git a/dlls/ntdll/unix/process.c b/dlls/ntdll/unix/process.c index 4b9c42467e7..9f2c5ffb29c 100644 --- a/dlls/ntdll/unix/process.c +++ b/dlls/ntdll/unix/process.c @@ -1506,6 +1506,25 @@ NTSTATUS WINAPI NtQueryInformationProcess( HANDLE handle, PROCESSINFOCLASS class else ret = STATUS_INFO_LENGTH_MISMATCH; break; + case ProcessCycleTime: + len = sizeof(PROCESS_CYCLE_TIME_INFORMATION); + if (size == len) + { + if (!info) ret = STATUS_ACCESS_VIOLATION; + else + { + PROCESS_CYCLE_TIME_INFORMATION cycles; + + FIXME( "ProcessCycleTime (%p,%p,0x%08x,%p) stub\n", handle, info, (int)size, ret_len ); + cycles.AccumulatedCycles = 0; + cycles.CurrentCycleCount = 0; + + memcpy(info, &cycles, sizeof(PROCESS_CYCLE_TIME_INFORMATION)); + } + } + else ret = STATUS_INFO_LENGTH_MISMATCH; + break; + case ProcessWineLdtCopy: if (handle == NtCurrentProcess()) { diff --git a/dlls/wow64/process.c b/dlls/wow64/process.c index 97dbfdef761..c51da4004c1 100644 --- a/dlls/wow64/process.c +++ b/dlls/wow64/process.c @@ -774,6 +774,7 @@ NTSTATUS WINAPI wow64_NtQueryInformationProcess( UINT *args ) case ProcessDebugFlags: /* ULONG */ case ProcessExecuteFlags: /* ULONG */ case ProcessCookie: /* ULONG */ + case ProcessCycleTime: /* PROCESS_CYCLE_TIME_INFORMATION */ /* FIXME: check buffer alignment */ return NtQueryInformationProcess( handle, class, ptr, len, retlen ); diff --git a/include/winternl.h b/include/winternl.h index de5630ecf49..87d390308af 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -2272,6 +2272,11 @@ typedef struct _PROCESS_PRIORITY_CLASS { UCHAR PriorityClass; } PROCESS_PRIORITY_CLASS, *PPROCESS_PRIORITY_CLASS; +typedef struct _PROCESS_CYCLE_TIME_INFORMATION { + ULONGLONG AccumulatedCycles; + ULONGLONG CurrentCycleCount; +} PROCESS_CYCLE_TIME_INFORMATION, *PPROCESS_CYCLE_TIME_INFORMATION; + typedef struct _PROCESS_STACK_ALLOCATION_INFORMATION { SIZE_T ReserveSize;

1 0

Brendan Shanks : kernelbase: Implement and add tests for QueryProcessCycleTime.
by Alexandre Julliard 02 Feb '23

02 Feb '23

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: Introduce a helper to print PE section's characteristics.
by Alexandre Julliard 02 Feb '23

02 Feb '23

Module: wine Branch: master Commit: 97d2e9d90230b06b9dfca11c151d7728bb012bb0 URL: https://gitlab.winehq.org/wine/wine/-/commit/97d2e9d90230b06b9dfca11c151d77… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Wed Feb 1 18:30:42 2023 +0100 winedump: Introduce a helper to print PE section's characteristics. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> --- tools/winedump/pe.c | 136 ++++++++++++++++++++++++---------------------- tools/winedump/winedump.h | 1 + 2 files changed, 72 insertions(+), 65 deletions(-) diff --git a/tools/winedump/pe.c b/tools/winedump/pe.c index 7ec378a19b8..ed30d54cece 100644 --- a/tools/winedump/pe.c +++ b/tools/winedump/pe.c @@ -381,27 +381,9 @@ static void dump_pe_header(void) dump_optional_header((const IMAGE_OPTIONAL_HEADER32*)&PE_nt_headers->OptionalHeader, PE_nt_headers->FileHeader.SizeOfOptionalHeader); } -void dump_section(const IMAGE_SECTION_HEADER *sectHead, const char* strtable) +void dump_section_characteristics(DWORD characteristics, const char* sep) { - unsigned offset; - - /* long section name ? */ - if (strtable && sectHead->Name[0] == '/' && - ((offset = atoi((const char*)sectHead->Name + 1)) < *(const DWORD*)strtable)) - printf(" %.8s (%s)", sectHead->Name, strtable + offset); - else - printf(" %-8.8s", sectHead->Name); - printf(" VirtSize: 0x%08x VirtAddr: 0x%08x\n", - (UINT)sectHead->Misc.VirtualSize, (UINT)sectHead->VirtualAddress); - printf(" raw data offs: 0x%08x raw data size: 0x%08x\n", - (UINT)sectHead->PointerToRawData, (UINT)sectHead->SizeOfRawData); - printf(" relocation offs: 0x%08x relocations: 0x%08x\n", - (UINT)sectHead->PointerToRelocations, (UINT)sectHead->NumberOfRelocations); - printf(" line # offs: %-8u line #'s: %-8u\n", - (UINT)sectHead->PointerToLinenumbers, (UINT)sectHead->NumberOfLinenumbers); - printf(" characteristics: 0x%08x\n", (UINT)sectHead->Characteristics); - printf(" "); -#define X(b,s) if (sectHead->Characteristics & b) printf(" " s) +#define X(b,s) if (characteristics & b) printf("%s%s", sep, s) /* #define IMAGE_SCN_TYPE_REG 0x00000000 - Reserved */ /* #define IMAGE_SCN_TYPE_DSECT 0x00000001 - Reserved */ /* #define IMAGE_SCN_TYPE_NOLOAD 0x00000002 - Reserved */ @@ -409,57 +391,81 @@ void dump_section(const IMAGE_SECTION_HEADER *sectHead, const char* strtable) /* #define IMAGE_SCN_TYPE_NO_PAD 0x00000008 - Reserved */ /* #define IMAGE_SCN_TYPE_COPY 0x00000010 - Reserved */ - X(IMAGE_SCN_CNT_CODE, "CODE"); - X(IMAGE_SCN_CNT_INITIALIZED_DATA, "INITIALIZED_DATA"); - X(IMAGE_SCN_CNT_UNINITIALIZED_DATA, "UNINITIALIZED_DATA"); + X(IMAGE_SCN_CNT_CODE, "CODE"); + X(IMAGE_SCN_CNT_INITIALIZED_DATA, "INITIALIZED_DATA"); + X(IMAGE_SCN_CNT_UNINITIALIZED_DATA, "UNINITIALIZED_DATA"); - X(IMAGE_SCN_LNK_OTHER, "LNK_OTHER"); - X(IMAGE_SCN_LNK_INFO, "LNK_INFO"); + X(IMAGE_SCN_LNK_OTHER, "LNK_OTHER"); + X(IMAGE_SCN_LNK_INFO, "LNK_INFO"); /* #define IMAGE_SCN_TYPE_OVER 0x00000400 - Reserved */ - X(IMAGE_SCN_LNK_REMOVE, "LNK_REMOVE"); - X(IMAGE_SCN_LNK_COMDAT, "LNK_COMDAT"); - -/* 0x00002000 - Reserved */ -/* #define IMAGE_SCN_MEM_PROTECTED 0x00004000 - Obsolete */ - X(IMAGE_SCN_MEM_FARDATA, "MEM_FARDATA"); - -/* #define IMAGE_SCN_MEM_SYSHEAP 0x00010000 - Obsolete */ - X(IMAGE_SCN_MEM_PURGEABLE, "MEM_PURGEABLE"); - X(IMAGE_SCN_MEM_16BIT, "MEM_16BIT"); - X(IMAGE_SCN_MEM_LOCKED, "MEM_LOCKED"); - X(IMAGE_SCN_MEM_PRELOAD, "MEM_PRELOAD"); - - switch (sectHead->Characteristics & IMAGE_SCN_ALIGN_MASK) - { -#define X2(b,s) case b: printf(" " s); break - X2(IMAGE_SCN_ALIGN_1BYTES, "ALIGN_1BYTES"); - X2(IMAGE_SCN_ALIGN_2BYTES, "ALIGN_2BYTES"); - X2(IMAGE_SCN_ALIGN_4BYTES, "ALIGN_4BYTES"); - X2(IMAGE_SCN_ALIGN_8BYTES, "ALIGN_8BYTES"); - X2(IMAGE_SCN_ALIGN_16BYTES, "ALIGN_16BYTES"); - X2(IMAGE_SCN_ALIGN_32BYTES, "ALIGN_32BYTES"); - X2(IMAGE_SCN_ALIGN_64BYTES, "ALIGN_64BYTES"); - X2(IMAGE_SCN_ALIGN_128BYTES, "ALIGN_128BYTES"); - X2(IMAGE_SCN_ALIGN_256BYTES, "ALIGN_256BYTES"); - X2(IMAGE_SCN_ALIGN_512BYTES, "ALIGN_512BYTES"); - X2(IMAGE_SCN_ALIGN_1024BYTES, "ALIGN_1024BYTES"); - X2(IMAGE_SCN_ALIGN_2048BYTES, "ALIGN_2048BYTES"); - X2(IMAGE_SCN_ALIGN_4096BYTES, "ALIGN_4096BYTES"); - X2(IMAGE_SCN_ALIGN_8192BYTES, "ALIGN_8192BYTES"); + X(IMAGE_SCN_LNK_REMOVE, "LNK_REMOVE"); + X(IMAGE_SCN_LNK_COMDAT, "LNK_COMDAT"); + +/* 0x00002000 - Reserved */ +/* #define IMAGE_SCN_MEM_PROTECTED 0x00004000 - Obsolete */ + X(IMAGE_SCN_MEM_FARDATA, "MEM_FARDATA"); + +/* #define IMAGE_SCN_MEM_SYSHEAP 0x00010000 - Obsolete */ + X(IMAGE_SCN_MEM_PURGEABLE, "MEM_PURGEABLE"); + X(IMAGE_SCN_MEM_16BIT, "MEM_16BIT"); + X(IMAGE_SCN_MEM_LOCKED, "MEM_LOCKED"); + X(IMAGE_SCN_MEM_PRELOAD, "MEM_PRELOAD"); + + switch (characteristics & IMAGE_SCN_ALIGN_MASK) + { +#define X2(b,s) case b: printf("%s%s", sep, s); break + X2(IMAGE_SCN_ALIGN_1BYTES, "ALIGN_1BYTES"); + X2(IMAGE_SCN_ALIGN_2BYTES, "ALIGN_2BYTES"); + X2(IMAGE_SCN_ALIGN_4BYTES, "ALIGN_4BYTES"); + X2(IMAGE_SCN_ALIGN_8BYTES, "ALIGN_8BYTES"); + X2(IMAGE_SCN_ALIGN_16BYTES, "ALIGN_16BYTES"); + X2(IMAGE_SCN_ALIGN_32BYTES, "ALIGN_32BYTES"); + X2(IMAGE_SCN_ALIGN_64BYTES, "ALIGN_64BYTES"); + X2(IMAGE_SCN_ALIGN_128BYTES, "ALIGN_128BYTES"); + X2(IMAGE_SCN_ALIGN_256BYTES, "ALIGN_256BYTES"); + X2(IMAGE_SCN_ALIGN_512BYTES, "ALIGN_512BYTES"); + X2(IMAGE_SCN_ALIGN_1024BYTES, "ALIGN_1024BYTES"); + X2(IMAGE_SCN_ALIGN_2048BYTES, "ALIGN_2048BYTES"); + X2(IMAGE_SCN_ALIGN_4096BYTES, "ALIGN_4096BYTES"); + X2(IMAGE_SCN_ALIGN_8192BYTES, "ALIGN_8192BYTES"); #undef X2 - } + } - X(IMAGE_SCN_LNK_NRELOC_OVFL, "LNK_NRELOC_OVFL"); + X(IMAGE_SCN_LNK_NRELOC_OVFL, "LNK_NRELOC_OVFL"); - X(IMAGE_SCN_MEM_DISCARDABLE, "MEM_DISCARDABLE"); - X(IMAGE_SCN_MEM_NOT_CACHED, "MEM_NOT_CACHED"); - X(IMAGE_SCN_MEM_NOT_PAGED, "MEM_NOT_PAGED"); - X(IMAGE_SCN_MEM_SHARED, "MEM_SHARED"); - X(IMAGE_SCN_MEM_EXECUTE, "MEM_EXECUTE"); - X(IMAGE_SCN_MEM_READ, "MEM_READ"); - X(IMAGE_SCN_MEM_WRITE, "MEM_WRITE"); + X(IMAGE_SCN_MEM_DISCARDABLE, "MEM_DISCARDABLE"); + X(IMAGE_SCN_MEM_NOT_CACHED, "MEM_NOT_CACHED"); + X(IMAGE_SCN_MEM_NOT_PAGED, "MEM_NOT_PAGED"); + X(IMAGE_SCN_MEM_SHARED, "MEM_SHARED"); + X(IMAGE_SCN_MEM_EXECUTE, "MEM_EXECUTE"); + X(IMAGE_SCN_MEM_READ, "MEM_READ"); + X(IMAGE_SCN_MEM_WRITE, "MEM_WRITE"); #undef X - printf("\n\n"); +} + +void dump_section(const IMAGE_SECTION_HEADER *sectHead, const char* strtable) +{ + unsigned offset; + + /* long section name ? */ + if (strtable && sectHead->Name[0] == '/' && + ((offset = atoi((const char*)sectHead->Name + 1)) < *(const DWORD*)strtable)) + printf(" %.8s (%s)", sectHead->Name, strtable + offset); + else + printf(" %-8.8s", sectHead->Name); + printf(" VirtSize: 0x%08x VirtAddr: 0x%08x\n", + (UINT)sectHead->Misc.VirtualSize, (UINT)sectHead->VirtualAddress); + printf(" raw data offs: 0x%08x raw data size: 0x%08x\n", + (UINT)sectHead->PointerToRawData, (UINT)sectHead->SizeOfRawData); + printf(" relocation offs: 0x%08x relocations: 0x%08x\n", + (UINT)sectHead->PointerToRelocations, (UINT)sectHead->NumberOfRelocations); + printf(" line # offs: %-8u line #'s: %-8u\n", + (UINT)sectHead->PointerToLinenumbers, (UINT)sectHead->NumberOfLinenumbers); + printf(" characteristics: 0x%08x\n", (UINT)sectHead->Characteristics); + printf(" "); + dump_section_characteristics(sectHead->Characteristics, " "); + + printf("\n\n"); } static void dump_sections(const void *base, const void* addr, unsigned num_sect) diff --git a/tools/winedump/winedump.h b/tools/winedump/winedump.h index caa47392144..84694f21b0b 100644 --- a/tools/winedump/winedump.h +++ b/tools/winedump/winedump.h @@ -233,6 +233,7 @@ void print_fake_dll(void); void dump_file_header(const IMAGE_FILE_HEADER *); void dump_optional_header(const IMAGE_OPTIONAL_HEADER32 *, UINT); void dump_section(const IMAGE_SECTION_HEADER *, const char* strtable); +void dump_section_characteristics(DWORD characteristics, const char* sep); enum FileSig get_kind_exec(void); void dos_dump( void );

1 0

Eric Pouech : winedump: Correctly dump PDB_STREAM_INDEX.segment.
by Alexandre Julliard 02 Feb '23

02 Feb '23

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

Eric Pouech : winedump: Explain a bit more errors on hash header.
by Alexandre Julliard 02 Feb '23

02 Feb '23

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