August 2021 - Wine-Commits - list.winehq.org

Eric Pouech : dbghelp: Fix two internal buffer allocations.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: 85557f361b43ce0341a7b589ac08dd31c8b5039d URL: https://source.winehq.org/git/wine.git/?a=commit;h=85557f361b43ce0341a7b589… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Aug 30 09:24:17 2021 +0200 dbghelp: Fix two internal buffer allocations. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/symbol.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 3fc3438eeba..8189f6a175e 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -1170,8 +1170,7 @@ struct sym_enumW PSYM_ENUMERATESYMBOLS_CALLBACKW cb; void* ctx; PSYMBOL_INFOW sym_info; - char buffer[sizeof(SYMBOL_INFOW) + MAX_SYM_NAME]; - + char buffer[sizeof(SYMBOL_INFOW) + MAX_SYM_NAME * sizeof(WCHAR)]; }; static BOOL CALLBACK sym_enumW(PSYMBOL_INFO si, ULONG size, PVOID ctx) @@ -1438,7 +1437,7 @@ BOOL WINAPI SymFromNameW(HANDLE process, const WCHAR *name, SYMBOL_INFOW *symbol TRACE("(%p, %s, %p)\n", process, debugstr_w(name), symbol); - len = sizeof(*si) + symbol->MaxNameLen * sizeof(WCHAR); + len = sizeof(*si) + symbol->MaxNameLen; if (!(si = HeapAlloc(GetProcessHeap(), 0, len))) return FALSE; len = WideCharToMultiByte(CP_ACP, 0, name, -1, NULL, 0, NULL, NULL);

1 0

Jacek Caban : gdi32: Move a few font functions to text.c.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: 23345fe0557bdd6e6f6bc129529ca5f6e24baaa6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=23345fe0557bdd6e6f6bc129… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Aug 30 13:54:09 2021 +0200 gdi32: Move a few font functions to text.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 62 ------------------------------------------------------- dlls/gdi32/text.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 62 deletions(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index e5aae614f3b..0be27eb0978 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -5518,16 +5518,6 @@ done: } -/*********************************************************************** - * GetAspectRatioFilterEx (GDI32.@) - */ -BOOL WINAPI GetAspectRatioFilterEx( HDC hdc, LPSIZE pAspectRatio ) -{ - FIXME("(%p, %p): -- Empty Stub !\n", hdc, pAspectRatio); - return FALSE; -} - - /****************************************************************************** * NtGdiGetCharABCWidthsW (win32u.@) * @@ -6682,58 +6672,6 @@ BOOL WINAPI GetFontResourceInfoW( LPCWSTR str, LPDWORD size, PVOID buffer, DWORD return FALSE; } -/*********************************************************************** - * GetTextCharset (GDI32.@) - */ -UINT WINAPI GetTextCharset(HDC hdc) -{ - /* MSDN docs say this is equivalent */ - return NtGdiGetTextCharsetInfo( hdc, NULL, 0 ); -} - -/*********************************************************************** - * GdiGetCharDimensions (GDI32.@) - * - * Gets the average width of the characters in the English alphabet. - * - * PARAMS - * hdc [I] Handle to the device context to measure on. - * lptm [O] Pointer to memory to store the text metrics into. - * height [O] On exit, the maximum height of characters in the English alphabet. - * - * RETURNS - * The average width of characters in the English alphabet. - * - * NOTES - * This function is used by the dialog manager to get the size of a dialog - * unit. It should also be used by other pieces of code that need to know - * the size of a dialog unit in logical units without having access to the - * window handle of the dialog. - * Windows caches the font metrics from this function, but we don't and - * there doesn't appear to be an immediate advantage to do so. - * - * SEE ALSO - * GetTextExtentPointW, GetTextMetricsW, MapDialogRect. - */ -LONG WINAPI GdiGetCharDimensions(HDC hdc, LPTEXTMETRICW lptm, LONG *height) -{ - SIZE sz; - - if(lptm && !GetTextMetricsW(hdc, lptm)) return 0; - - if(!GetTextExtentPointW(hdc, L"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", 52, &sz)) - return 0; - - if (height) *height = sz.cy; - return (sz.cx / 26 + 1) / 2; -} - -BOOL WINAPI EnableEUDC(BOOL fEnableEUDC) -{ - FIXME("(%d): stub\n", fEnableEUDC); - return FALSE; -} - /*********************************************************************** * GetFontUnicodeRanges (GDI32.@) * diff --git a/dlls/gdi32/text.c b/dlls/gdi32/text.c index 149b7f081ed..98840af111d 100644 --- a/dlls/gdi32/text.c +++ b/dlls/gdi32/text.c @@ -1914,3 +1914,57 @@ DWORD WINAPI GetGlyphIndicesA( HDC hdc, const char *str, INT count, WORD *indice HeapFree( GetProcessHeap(), 0, strW ); return ret; } + +/*********************************************************************** + * GetAspectRatioFilterEx (GDI32.@) + */ +BOOL WINAPI GetAspectRatioFilterEx( HDC hdc, SIZE *aspect_ratio ) +{ + FIXME( "(%p, %p): stub\n", hdc, aspect_ratio ); + return FALSE; +} + +/*********************************************************************** + * GetTextCharset (GDI32.@) + */ +UINT WINAPI GetTextCharset( HDC hdc ) +{ + /* MSDN docs say this is equivalent */ + return NtGdiGetTextCharsetInfo( hdc, NULL, 0 ); +} + +/*********************************************************************** + * GdiGetCharDimensions (GDI32.@) + * + * Gets the average width of the characters in the English alphabet. + * + * NOTES + * This function is used by the dialog manager to get the size of a dialog + * unit. It should also be used by other pieces of code that need to know + * the size of a dialog unit in logical units without having access to the + * window handle of the dialog. + * Windows caches the font metrics from this function, but we don't and + * there doesn't appear to be an immediate advantage to do so. + */ +LONG WINAPI GdiGetCharDimensions( HDC hdc, TEXTMETRICW *metric, LONG *height ) +{ + SIZE sz; + + if (metric && !GetTextMetricsW( hdc, metric )) return 0; + + if (!GetTextExtentPointW( hdc, L"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ", + 52, &sz )) + return 0; + + if (height) *height = sz.cy; + return (sz.cx / 26 + 1) / 2; +} + +/*********************************************************************** + * EnableEUDC (GDI32.@) + */ +BOOL WINAPI EnableEUDC( BOOL enable ) +{ + FIXME( "(%d): stub\n", enable ); + return FALSE; +}

1 0

Alexandre Julliard : ntdll: Declare the syscall functions array explicitly.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: ea6308e364b669adfcb8b1e448c8b08d715bcf6d URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea6308e364b669adfcb8b1e4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 30 12:38:31 2021 +0200 ntdll: Declare the syscall functions array explicitly. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 244 ++++++++++++++++++++++++++++++++++++++++++++++- include/winternl.h | 1 + tools/winebuild/import.c | 14 +-- 3 files changed, 242 insertions(+), 17 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 266d53f0eca..b15824346b7 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -116,13 +116,248 @@ SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock = NULL; static NTSTATUS (CDECL *p__wine_set_unix_funcs)( int version, const struct unix_funcs *funcs ); static void *p__wine_syscall_dispatcher; -extern SYSTEM_SERVICE_TABLE __wine_syscall_table DECLSPEC_HIDDEN; +static void * const syscalls[] = +{ + NtAcceptConnectPort, + NtAccessCheck, + NtAccessCheckAndAuditAlarm, + NtAddAtom, + NtAdjustGroupsToken, + NtAdjustPrivilegesToken, + NtAlertResumeThread, + NtAlertThread, + NtAllocateLocallyUniqueId, + NtAllocateUuids, + NtAllocateVirtualMemory, + NtAllocateVirtualMemoryEx, + NtAreMappedFilesTheSame, + NtAssignProcessToJobObject, + NtCallbackReturn, + NtCancelIoFile, + NtCancelIoFileEx, + NtCancelTimer, + NtClearEvent, + NtClearPowerRequest, + NtClose, + NtCompleteConnectPort, + NtConnectPort, + NtContinue, + NtCreateDebugObject, + NtCreateDirectoryObject, + NtCreateEvent, + NtCreateFile, + NtCreateIoCompletion, + NtCreateJobObject, + NtCreateKey, + NtCreateKeyTransacted, + NtCreateKeyedEvent, + NtCreateLowBoxToken, + NtCreateMailslotFile, + NtCreateMutant, + NtCreateNamedPipeFile, + NtCreatePagingFile, + NtCreatePort, + NtCreatePowerRequest, + NtCreateSection, + NtCreateSemaphore, + NtCreateSymbolicLinkObject, + NtCreateThread, + NtCreateThreadEx, + NtCreateTimer, + NtCreateUserProcess, + NtDebugActiveProcess, + NtDebugContinue, + NtDelayExecution, + NtDeleteAtom, + NtDeleteFile, + NtDeleteKey, + NtDeleteValueKey, + NtDeviceIoControlFile, + NtDisplayString, + NtDuplicateObject, + NtDuplicateToken, + NtEnumerateKey, + NtEnumerateValueKey, + NtFilterToken, + NtFindAtom, + NtFlushBuffersFile, + NtFlushInstructionCache, + NtFlushKey, + NtFlushProcessWriteBuffers, + NtFlushVirtualMemory, + NtFreeVirtualMemory, + NtFsControlFile, + NtGetContextThread, + NtGetCurrentProcessorNumber, + NtGetNextThread, + NtGetNlsSectionPtr, + NtGetWriteWatch, + NtImpersonateAnonymousToken, + NtInitiatePowerAction , + NtIsProcessInJob, + NtListenPort, + NtLoadDriver, + NtLoadKey, + NtLoadKey2, + NtLockFile, + NtLockVirtualMemory, + NtMakeTemporaryObject, + NtMapViewOfSection, + NtNotifyChangeDirectoryFile, + NtNotifyChangeKey, + NtNotifyChangeMultipleKeys, + NtOpenDirectoryObject, + NtOpenEvent, + NtOpenFile, + NtOpenIoCompletion, + NtOpenJobObject, + NtOpenKey, + NtOpenKeyEx, + NtOpenKeyTransacted, + NtOpenKeyTransactedEx, + NtOpenKeyedEvent, + NtOpenMutant, + NtOpenProcess, + NtOpenProcessToken, + NtOpenProcessTokenEx, + NtOpenSection, + NtOpenSemaphore, + NtOpenSymbolicLinkObject , + NtOpenThread, + NtOpenThreadToken, + NtOpenThreadTokenEx, + NtOpenTimer, + NtPowerInformation, + NtPrivilegeCheck, + NtProtectVirtualMemory, + NtPulseEvent, + NtQueryAttributesFile, + NtQueryDefaultLocale, + NtQueryDefaultUILanguage, + NtQueryDirectoryFile, + NtQueryDirectoryObject, + NtQueryEaFile, + NtQueryEvent, + NtQueryFullAttributesFile, + NtQueryInformationAtom, + NtQueryInformationFile, + NtQueryInformationJobObject, + NtQueryInformationProcess, + NtQueryInformationThread, + NtQueryInformationToken, + NtQueryInstallUILanguage, + NtQueryIoCompletion, + NtQueryKey, + NtQueryLicenseValue, + NtQueryMultipleValueKey, + NtQueryMutant, + NtQueryObject, + NtQueryPerformanceCounter, + NtQuerySection, + NtQuerySecurityObject, + NtQuerySemaphore , + NtQuerySymbolicLinkObject, + NtQuerySystemEnvironmentValue, + NtQuerySystemEnvironmentValueEx, + NtQuerySystemInformation, + NtQuerySystemInformationEx, + NtQuerySystemTime, + NtQueryTimer, + NtQueryTimerResolution, + NtQueryValueKey, + NtQueryVirtualMemory, + NtQueryVolumeInformationFile, + NtQueueApcThread, + NtRaiseException, + NtRaiseHardError, + NtReadFile, + NtReadFileScatter, + NtReadVirtualMemory, + NtRegisterThreadTerminatePort, + NtReleaseKeyedEvent, + NtReleaseMutant, + NtReleaseSemaphore, + NtRemoveIoCompletion, + NtRemoveIoCompletionEx, + NtRemoveProcessDebug, + NtRenameKey, + NtReplaceKey, + NtReplyWaitReceivePort, + NtRequestWaitReplyPort, + NtResetEvent, + NtResetWriteWatch, + NtRestoreKey, + NtResumeProcess, + NtResumeThread, + NtSaveKey, + NtSecureConnectPort, + NtSetContextThread, + NtSetDefaultLocale, + NtSetDefaultUILanguage, + NtSetEaFile, + NtSetEvent, + NtSetInformationDebugObject, + NtSetInformationFile, + NtSetInformationJobObject, + NtSetInformationKey, + NtSetInformationObject, + NtSetInformationProcess, + NtSetInformationThread, + NtSetInformationToken, + NtSetIntervalProfile, + NtSetIoCompletion, + NtSetLdtEntries, + NtSetPowerRequest, + NtSetSecurityObject, + NtSetSystemInformation, + NtSetSystemTime, + NtSetThreadExecutionState, + NtSetTimer, + NtSetTimerResolution, + NtSetValueKey, + NtSetVolumeInformationFile, + NtShutdownSystem, + NtSignalAndWaitForSingleObject, + NtSuspendProcess, + NtSuspendThread, + NtSystemDebugControl, + NtTerminateJobObject, + NtTerminateProcess, + NtTerminateThread, + NtTestAlert, + NtTraceControl, + NtUnloadDriver, + NtUnloadKey, + NtUnlockFile, + NtUnlockVirtualMemory, + NtUnmapViewOfSection, + NtWaitForDebugEvent, + NtWaitForKeyedEvent, + NtWaitForMultipleObjects, + NtWaitForSingleObject, +#ifndef _WIN64 + NtWow64AllocateVirtualMemory64, + NtWow64GetNativeSystemInformation, + NtWow64ReadVirtualMemory64, + NtWow64WriteVirtualMemory64, +#endif + NtWriteFile, + NtWriteFileGather, + NtWriteVirtualMemory, + NtYieldExecution, + __wine_dbg_write, + __wine_unix_call, + wine_nt_to_unix_file_name, + wine_server_call, + wine_server_fd_to_handle, + wine_server_handle_to_fd, + wine_unix_to_nt_file_name, +}; -static BYTE syscall_args[4096]; +static BYTE syscall_args[ARRAY_SIZE(syscalls)]; SYSTEM_SERVICE_TABLE KeServiceDescriptorTable[4]; - #ifdef __GNUC__ static void fatal_error( const char *err, ... ) __attribute__((noreturn, format(printf,1,2))); #endif @@ -1947,7 +2182,7 @@ static struct unix_funcs unix_funcs = */ static void start_main_thread(void) { - SYSTEM_SERVICE_TABLE syscall_table = __wine_syscall_table; + SYSTEM_SERVICE_TABLE syscall_table = { (ULONG_PTR *)syscalls, NULL, ARRAY_SIZE(syscalls), syscall_args }; NTSTATUS status; TEB *teb = virtual_alloc_first_teb(); @@ -1970,7 +2205,6 @@ static void start_main_thread(void) NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); load_ntdll(); if (main_image_info.Machine != current_machine) load_wow64_ntdll( main_image_info.Machine ); - syscall_table.ArgumentTable = syscall_args; ntdll_init_syscalls( 0, &syscall_table, p__wine_syscall_dispatcher ); status = p__wine_set_unix_funcs( NTDLL_UNIXLIB_VERSION, &unix_funcs ); if (status == STATUS_REVISION_MISMATCH) diff --git a/include/winternl.h b/include/winternl.h index ec2c95e99bc..fea9e9df117 100644 --- a/include/winternl.h +++ b/include/winternl.h @@ -3847,6 +3847,7 @@ NTSYSAPI NTSTATUS WINAPI NtCreateJobObject(PHANDLE,ACCESS_MASK,const OBJECT_ATT NTSYSAPI NTSTATUS WINAPI NtCreateKey(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG,const UNICODE_STRING*,ULONG,PULONG); NTSYSAPI NTSTATUS WINAPI NtCreateKeyTransacted(PHANDLE,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG,const UNICODE_STRING*,ULONG,HANDLE,ULONG*); NTSYSAPI NTSTATUS WINAPI NtCreateKeyedEvent(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*,ULONG); +NTSYSAPI NTSTATUS WINAPI NtCreateLowBoxToken(HANDLE*,HANDLE,ACCESS_MASK,OBJECT_ATTRIBUTES*,SID*,ULONG,SID_AND_ATTRIBUTES*,ULONG,HANDLE*); NTSYSAPI NTSTATUS WINAPI NtCreateMailslotFile(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,ULONG,ULONG,ULONG,PLARGE_INTEGER); NTSYSAPI NTSTATUS WINAPI NtCreateMutant(HANDLE*,ACCESS_MASK,const OBJECT_ATTRIBUTES*,BOOLEAN); NTSYSAPI NTSTATUS WINAPI NtCreateNamedPipeFile(PHANDLE,ULONG,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,ULONG,PLARGE_INTEGER); diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index d9d6fcae0c6..fcd27117780 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1426,6 +1426,8 @@ void output_syscalls( DLLSPEC *spec ) int i, count; ORDDEF **syscalls = NULL; + if (unix_lib) return; + for (i = count = 0; i < spec->nb_entry_points; i++) { ORDDEF *odp = &spec->entry_points[i]; @@ -1439,18 +1441,6 @@ void output_syscalls( DLLSPEC *spec ) output( "\n/* system calls */\n\n" ); output( "\t.text\n" ); - if (unix_lib) - { - output( "\t.data\n" ); - output( "\t.align %d\n", get_alignment( get_ptr_size() ) ); - output( "%s\n", asm_globl("__wine_syscall_table") ); - output( "\t%s .Lsyscall_table, 0, %u, 0\n", get_asm_ptr_keyword(), count ); - output( ".Lsyscall_table:\n" ); - for (i = 0; i < count; i++) - output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name( get_link_name( syscalls[i] ))); - return; - } - for (i = 0; i < count; i++) { ORDDEF *odp = syscalls[i];

1 0

Alexandre Julliard : ntdll: Store the syscall argument table on the PE side.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: 7ae1c396acd3649b2482f20992cc2c65159fbd05 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7ae1c396acd3649b2482f209… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 30 12:27:08 2021 +0200 ntdll: Store the syscall argument table on the PE side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 21 +++++++++++++++++++-- tools/winebuild/import.c | 7 +++---- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index 53df7c87878..266d53f0eca 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -118,6 +118,8 @@ static void *p__wine_syscall_dispatcher; extern SYSTEM_SERVICE_TABLE __wine_syscall_table DECLSPEC_HIDDEN; +static BYTE syscall_args[4096]; + SYSTEM_SERVICE_TABLE KeServiceDescriptorTable[4]; @@ -1148,8 +1150,21 @@ static NTSTATUS CDECL init_unix_lib( void *module, DWORD reason, const void *ptr */ NTSTATUS ntdll_init_syscalls( ULONG id, SYSTEM_SERVICE_TABLE *table, void **dispatcher ) { + struct syscall_info + { + void *dispatcher; + USHORT limit; + BYTE args[1]; + } *info = (struct syscall_info *)dispatcher; + if (id > 3) return STATUS_INVALID_PARAMETER; - *dispatcher = __wine_syscall_dispatcher; + if (info->limit != table->ServiceLimit) + { + ERR( "syscall count mismatch %u / %lu\n", info->limit, table->ServiceLimit ); + NtTerminateProcess( GetCurrentProcess(), STATUS_INVALID_PARAMETER ); + } + info->dispatcher = __wine_syscall_dispatcher; + memcpy( table->ArgumentTable, info->args, table->ServiceLimit ); KeServiceDescriptorTable[id] = *table; return STATUS_SUCCESS; } @@ -1932,6 +1947,7 @@ static struct unix_funcs unix_funcs = */ static void start_main_thread(void) { + SYSTEM_SERVICE_TABLE syscall_table = __wine_syscall_table; NTSTATUS status; TEB *teb = virtual_alloc_first_teb(); @@ -1954,7 +1970,8 @@ static void start_main_thread(void) NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); load_ntdll(); if (main_image_info.Machine != current_machine) load_wow64_ntdll( main_image_info.Machine ); - ntdll_init_syscalls( 0, &__wine_syscall_table, p__wine_syscall_dispatcher ); + syscall_table.ArgumentTable = syscall_args; + ntdll_init_syscalls( 0, &syscall_table, p__wine_syscall_dispatcher ); status = p__wine_set_unix_funcs( NTDLL_UNIXLIB_VERSION, &unix_funcs ); if (status == STATUS_REVISION_MISMATCH) { diff --git a/tools/winebuild/import.c b/tools/winebuild/import.c index 84738fc9135..d9d6fcae0c6 100644 --- a/tools/winebuild/import.c +++ b/tools/winebuild/import.c @@ -1444,13 +1444,10 @@ void output_syscalls( DLLSPEC *spec ) output( "\t.data\n" ); output( "\t.align %d\n", get_alignment( get_ptr_size() ) ); output( "%s\n", asm_globl("__wine_syscall_table") ); - output( "\t%s .Lsyscall_table, 0, %u, .Lsyscall_args\n", get_asm_ptr_keyword(), count ); + output( "\t%s .Lsyscall_table, 0, %u, 0\n", get_asm_ptr_keyword(), count ); output( ".Lsyscall_table:\n" ); for (i = 0; i < count; i++) output( "\t%s %s\n", get_asm_ptr_keyword(), asm_name( get_link_name( syscalls[i] ))); - output( ".Lsyscall_args:\n" ); - for (i = 0; i < count; i++) - output( "\t.byte %u\n", get_args_size( syscalls[i] )); return; } @@ -1574,6 +1571,8 @@ void output_syscalls( DLLSPEC *spec ) output( "\t.align %d\n", get_alignment( get_ptr_size() ) ); output( "%s\n", asm_globl("__wine_syscall_dispatcher") ); output( "\t%s 0\n", get_asm_ptr_keyword() ); + output( "\t.short %u\n", count ); + for (i = 0; i < count; i++) output( "\t.byte %u\n", get_args_size( syscalls[i] )); }

1 0

Alexandre Julliard : ntdll: Add a helper function to set a syscall table.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: d017c704f0131110f96b65e0edac0adf62be1d55 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d017c704f0131110f96b65e0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Aug 30 12:20:03 2021 +0200 ntdll: Add a helper function to set a syscall table. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 32 +++++++++++++++++++++----------- dlls/ntdll/unix/unix_private.h | 1 + include/wine/unixlib.h | 3 +-- 3 files changed, 23 insertions(+), 13 deletions(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index bdd54314540..53df7c87878 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -114,6 +114,7 @@ void (WINAPI *p__wine_ctrl_routine)(void*); SYSTEM_DLL_INIT_BLOCK *pLdrSystemDllInitBlock = NULL; static NTSTATUS (CDECL *p__wine_set_unix_funcs)( int version, const struct unix_funcs *funcs ); +static void *p__wine_syscall_dispatcher; extern SYSTEM_SERVICE_TABLE __wine_syscall_table DECLSPEC_HIDDEN; @@ -825,8 +826,6 @@ static NTSTATUS fixup_ntdll_imports( const char *name, HMODULE module ) static void load_ntdll_functions( HMODULE module ) { - void **ptr; - ntdll_exports = get_module_data_dir( module, IMAGE_FILE_EXPORT_DIRECTORY, NULL ); assert( ntdll_exports ); @@ -844,16 +843,15 @@ static void load_ntdll_functions( HMODULE module ) GET_FUNC( RtlUserThreadStart ); GET_FUNC( __wine_ctrl_routine ); GET_FUNC( __wine_set_unix_funcs ); -#undef GET_FUNC -#define SET_PTR(name,val) \ - if ((ptr = (void *)find_named_export( module, ntdll_exports, #name ))) *ptr = val; \ - else ERR( "%s not found\n", #name ) - - SET_PTR( __wine_syscall_dispatcher, __wine_syscall_dispatcher ); + GET_FUNC( __wine_syscall_dispatcher ); #ifdef __i386__ - SET_PTR( __wine_ldt_copy, &__wine_ldt_copy ); + { + void **p__wine_ldt_copy; + GET_FUNC( __wine_ldt_copy ); + *p__wine_ldt_copy = &__wine_ldt_copy; + } #endif -#undef SET_PTR +#undef GET_FUNC } static void load_ntdll_wow64_functions( HMODULE module ) @@ -1145,6 +1143,18 @@ static NTSTATUS CDECL init_unix_lib( void *module, DWORD reason, const void *ptr } +/*********************************************************************** + * ntdll_init_syscalls + */ +NTSTATUS ntdll_init_syscalls( ULONG id, SYSTEM_SERVICE_TABLE *table, void **dispatcher ) +{ + if (id > 3) return STATUS_INVALID_PARAMETER; + *dispatcher = __wine_syscall_dispatcher; + KeServiceDescriptorTable[id] = *table; + return STATUS_SUCCESS; +} + + /*********************************************************************** * __wine_unix_call */ @@ -1944,7 +1954,7 @@ static void start_main_thread(void) NtCreateKeyedEvent( &keyed_event, GENERIC_READ | GENERIC_WRITE, NULL, 0 ); load_ntdll(); if (main_image_info.Machine != current_machine) load_wow64_ntdll( main_image_info.Machine ); - KeServiceDescriptorTable[0] = __wine_syscall_table; + ntdll_init_syscalls( 0, &__wine_syscall_table, p__wine_syscall_dispatcher ); status = p__wine_set_unix_funcs( NTDLL_UNIXLIB_VERSION, &unix_funcs ); if (status == STATUS_REVISION_MISMATCH) { diff --git a/dlls/ntdll/unix/unix_private.h b/dlls/ntdll/unix/unix_private.h index 731b12d332c..b2bcd423d4b 100644 --- a/dlls/ntdll/unix/unix_private.h +++ b/dlls/ntdll/unix/unix_private.h @@ -250,6 +250,7 @@ extern void signal_init_process(void) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN signal_start_thread( PRTL_THREAD_START_ROUTINE entry, void *arg, BOOL suspend, TEB *teb ) DECLSPEC_HIDDEN; extern void DECLSPEC_NORETURN signal_exit_thread( int status, void (*func)(int), TEB *teb ) DECLSPEC_HIDDEN; +extern SYSTEM_SERVICE_TABLE KeServiceDescriptorTable[4] DECLSPEC_HIDDEN; extern void __wine_syscall_dispatcher(void) DECLSPEC_HIDDEN; extern void WINAPI DECLSPEC_NORETURN __wine_syscall_dispatcher_return( void *frame, ULONG_PTR retval ) DECLSPEC_HIDDEN; extern NTSTATUS signal_set_full_context( CONTEXT *context ) DECLSPEC_HIDDEN; diff --git a/include/wine/unixlib.h b/include/wine/unixlib.h index 1f5308cb434..072401a0714 100644 --- a/include/wine/unixlib.h +++ b/include/wine/unixlib.h @@ -26,10 +26,9 @@ typedef UINT64 unixlib_handle_t; extern NTSTATUS WINAPI __wine_unix_call( unixlib_handle_t handle, unsigned int code, void *args ); -extern SYSTEM_SERVICE_TABLE KeServiceDescriptorTable[4]; - /* some useful helpers from ntdll */ extern DWORD ntdll_umbstowcs( const char *src, DWORD srclen, WCHAR *dst, DWORD dstlen ); extern int ntdll_wcstoumbs( const WCHAR *src, DWORD srclen, char *dst, DWORD dstlen, BOOL strict ); +extern NTSTATUS ntdll_init_syscalls( ULONG id, SYSTEM_SERVICE_TABLE *table, void **dispatcher ); #endif /* __WINE_WINE_UNIXLIB_H */

1 0

Eric Pouech : dbghelp: Added missing break statement.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: 35963580973b28ca80ece57f79dec1b2e1404d20 URL: https://source.winehq.org/git/wine.git/?a=commit;h=35963580973b28ca80ece57f… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Aug 30 09:28:20 2021 +0200 dbghelp: Added missing break statement. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/msc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 6886c613b1b..18535b9d151 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -1850,6 +1850,7 @@ static BOOL codeview_snarf(const struct msc_debug_info* msc_dbg, const BYTE* roo compiland = symt_new_compiland(msc_dbg->module, 0 /* FIXME */, source_new(msc_dbg->module, NULL, sym->objname_v3.name)); + break; case S_OBJNAME_ST: TRACE("S-ObjName-V1 %s\n", terminate_string(&sym->objname_v1.p_name));

1 0

Eric Pouech : dbghelp: Return a lexical parent for enums (as we do for UDTs).
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: 29fedfb5d401a6f76cfb70bd17d74d27d61a26c7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=29fedfb5d401a6f76cfb70bd… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Aug 30 09:28:13 2021 +0200 dbghelp: Return a lexical parent for enums (as we do for UDTs). Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/type.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 08fa8bad95e..0fa3b669467 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -717,6 +717,7 @@ BOOL symt_get_info(struct module* module, const struct symt* type, X(DWORD) = symt_ptr2index(module, ((const struct symt_function_arg_type*)type)->container); break; case SymTagUDT: + case SymTagEnum: X(DWORD) = symt_ptr2index(module, &module->top->symt); break; default:

1 0

Eric Pouech : dbghelp: Introduce internal type (symt_module) to match SymTagExe.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: 1fa162008677db5357266b41d641d0a135ee7a49 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1fa162008677db5357266b41… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Aug 30 09:24:29 2021 +0200 dbghelp: Introduce internal type (symt_module) to match SymTagExe. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 9 +++++++++ dlls/dbghelp/module.c | 3 +++ dlls/dbghelp/symbol.c | 13 +++++++++++++ dlls/dbghelp/type.c | 9 +++++++++ 4 files changed, 34 insertions(+) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index daf35fd655a..763d04a16a3 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -161,6 +161,12 @@ struct symt_block struct vector vchildren; /* sub-blocks & local variables */ }; +struct symt_module /* in fact any of .exe, .dll... */ +{ + struct symt symt; /* module */ + struct module* module; +}; + struct symt_compiland { struct symt symt; @@ -375,6 +381,7 @@ struct module unsigned sorttab_size; struct symt_ht** addr_sorttab; struct hash_table ht_symbols; + struct symt_module* top; /* types */ struct hash_table ht_types; @@ -708,6 +715,8 @@ extern void copy_symbolW(SYMBOL_INFOW* siw, const SYMBOL_INFO* si) DECLS extern void symbol_setname(SYMBOL_INFO* si, const char* name) DECLSPEC_HIDDEN; extern struct symt_ht* symt_find_nearest(struct module* module, DWORD_PTR addr) DECLSPEC_HIDDEN; +extern struct symt_module* + symt_new_module(struct module* module) DECLSPEC_HIDDEN; extern struct symt_compiland* symt_new_compiland(struct module* module, ULONG_PTR address, unsigned src_idx) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c index 0a4d3c0b145..c278a627d37 100644 --- a/dlls/dbghelp/module.c +++ b/dlls/dbghelp/module.c @@ -233,6 +233,9 @@ struct module* module_new(struct process* pcs, const WCHAR* name, module->sources = 0; wine_rb_init(&module->sources_offsets_tree, source_rb_compare); + /* add top level symbol */ + module->top = symt_new_module(module); + return module; } diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 8189f6a175e..286dc17310c 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -183,6 +183,19 @@ static WCHAR* file_regex(const char* srcfile) return mask; } +struct symt_module* symt_new_module(struct module* module) +{ + struct symt_module* sym; + + TRACE_(dbghelp_symt)("Adding toplevel exe symbol %s\n", debugstr_w(module->module.ModuleName)); + if ((sym = pool_alloc(&module->pool, sizeof(*sym)))) + { + sym->symt.tag = SymTagExe; + sym->module = module; + } + return sym; +} + struct symt_compiland* symt_new_compiland(struct module* module, ULONG_PTR address, unsigned src_idx) { diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 7506d1ab574..10a2ff7a718 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -752,6 +752,15 @@ BOOL symt_get_info(struct module* module, const struct symt* type, break; case TI_GET_SYMNAME: + if (type->tag == SymTagExe) + { + DWORD len = (lstrlenW(module->modulename) + 1) * sizeof(WCHAR); + WCHAR* wname = HeapAlloc(GetProcessHeap(), 0, len); + if (!wname) return FALSE; + memcpy(wname, module->modulename, len); + X(WCHAR*) = wname; + } + else { const char* name = symt_get_name(type); if (!name) return FALSE;

1 0

Eric Pouech : dbghelp: Correctly store and report bitfield information.
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: 3ed209e0d9ee30c89d88475d9ba7eab9c86c4cdd URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ed209e0d9ee30c89d88475d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Aug 30 09:24:23 2021 +0200 dbghelp: Correctly store and report bitfield information. Bitfield information must be stored relative to first byte of underlying integral type. We were storing the information always relative to the first containing byte. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 5 +++-- dlls/dbghelp/dwarf.c | 2 +- dlls/dbghelp/msc.c | 7 +++---- dlls/dbghelp/stabs.c | 12 ++---------- dlls/dbghelp/type.c | 15 ++++++++------- 5 files changed, 17 insertions(+), 24 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 035d5b2b495..daf35fd655a 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -194,7 +194,8 @@ struct symt_data struct { LONG_PTR offset; - ULONG_PTR length; + ULONG_PTR bit_length; + ULONG_PTR bit_offset; } member; /* DataIsConstant */ VARIANT value; @@ -793,7 +794,7 @@ extern BOOL symt_add_udt_element(struct module* module, struct symt_udt* udt_type, const char* name, struct symt* elt_type, unsigned offset, - unsigned size) DECLSPEC_HIDDEN; + unsigned bit_offset, unsigned bit_size) DECLSPEC_HIDDEN; extern struct symt_enum* symt_new_enum(struct module* module, const char* typename, struct symt* basetype) DECLSPEC_HIDDEN; diff --git a/dlls/dbghelp/dwarf.c b/dlls/dbghelp/dwarf.c index ad9f5ec4fdf..375a0d6d728 100644 --- a/dlls/dbghelp/dwarf.c +++ b/dlls/dbghelp/dwarf.c @@ -1422,7 +1422,7 @@ static void dwarf2_parse_udt_member(dwarf2_parse_context_t* ctx, } else bit_offset.u.uvalue = 0; symt_add_udt_element(ctx->module, parent, name.u.string, elt_type, - (loc.offset << 3) + bit_offset.u.uvalue, + loc.offset, bit_offset.u.uvalue, bit_size.u.uvalue); if (dwarf2_get_di_children(ctx, di)) FIXME("Unsupported children\n"); diff --git a/dlls/dbghelp/msc.c b/dlls/dbghelp/msc.c index 72b03960803..6886c613b1b 100644 --- a/dlls/dbghelp/msc.c +++ b/dlls/dbghelp/msc.c @@ -736,13 +736,13 @@ static void codeview_add_udt_element(struct codeview_type_parse* ctp, case LF_BITFIELD_V1: symt_add_udt_element(ctp->module, symt, name, codeview_fetch_type(ctp, cv_type->bitfield_v1.type, FALSE), - (value << 3) + cv_type->bitfield_v1.bitoff, + value, cv_type->bitfield_v1.bitoff, cv_type->bitfield_v1.nbits); return; case LF_BITFIELD_V2: symt_add_udt_element(ctp->module, symt, name, codeview_fetch_type(ctp, cv_type->bitfield_v2.type, FALSE), - (value << 3) + cv_type->bitfield_v2.bitoff, + value, cv_type->bitfield_v2.bitoff, cv_type->bitfield_v2.nbits); return; } @@ -753,8 +753,7 @@ static void codeview_add_udt_element(struct codeview_type_parse* ctp, { DWORD64 elem_size = 0; symt_get_info(ctp->module, subtype, TI_GET_LENGTH, &elem_size); - symt_add_udt_element(ctp->module, symt, name, subtype, - value << 3, (DWORD)elem_size << 3); + symt_add_udt_element(ctp->module, symt, name, subtype, value, 0, 0); } } diff --git a/dlls/dbghelp/stabs.c b/dlls/dbghelp/stabs.c index 517299897c4..f51ba962186 100644 --- a/dlls/dbghelp/stabs.c +++ b/dlls/dbghelp/stabs.c @@ -615,19 +615,11 @@ static inline int stabs_pts_read_aggregate(struct ParseTypedefData* ptd, if (doadd && adt) { char tmp[256]; - DWORD64 size; strcpy(tmp, "__inherited_class_"); strcat(tmp, symt_get_name(adt)); - /* FIXME: TI_GET_LENGTH will not always work, especially when adt - * has just been seen as a forward definition and not the real stuff - * yet. - * As we don't use much the size of members in structs, this may not - * be much of a problem - */ - symt_get_info(ptd->module, adt, TI_GET_LENGTH, &size); - symt_add_udt_element(ptd->module, sdt, tmp, adt, ofs, (DWORD)size * 8); + symt_add_udt_element(ptd->module, sdt, tmp, adt, ofs, 0, 0); } PTS_ABORTIF(ptd, *ptd->ptr++ != ';'); } @@ -701,7 +693,7 @@ static inline int stabs_pts_read_aggregate(struct ParseTypedefData* ptd, PTS_ABORTIF(ptd, stabs_pts_read_number(ptd, &sz) == -1); PTS_ABORTIF(ptd, *ptd->ptr++ != ';'); - if (doadd) symt_add_udt_element(ptd->module, sdt, ptd->buf + idx, adt, ofs, sz); + if (doadd) symt_add_udt_element(ptd->module, sdt, ptd->buf + idx, adt, ofs, 0, 0); break; case ':': { diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 4621c3f3638..7506d1ab574 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -261,7 +261,7 @@ BOOL symt_set_udt_size(struct module* module, struct symt_udt* udt, unsigned siz */ BOOL symt_add_udt_element(struct module* module, struct symt_udt* udt_type, const char* name, struct symt* elt_type, - unsigned offset, unsigned size) + unsigned offset, unsigned bit_offset, unsigned bit_size) { struct symt_data* m; struct symt** p; @@ -292,7 +292,8 @@ BOOL symt_add_udt_element(struct module* module, struct symt_udt* udt_type, m->container = &udt_type->symt; m->type = elt_type; m->u.member.offset = offset; - m->u.member.length = ((offset & 7) || (size & 7)) ? size : 0; + m->u.member.bit_offset = bit_offset; + m->u.member.bit_length = bit_size; p = vector_add(&udt_type->vchildren, &module->pool); *p = &m->symt; @@ -580,8 +581,8 @@ BOOL symt_get_info(struct module* module, const struct symt* type, case TI_GET_BITPOSITION: if (type->tag == SymTagData && ((const struct symt_data*)type)->kind == DataIsMember && - ((const struct symt_data*)type)->u.member.length != 0) - X(DWORD) = ((const struct symt_data*)type)->u.member.offset & 7; + ((const struct symt_data*)type)->u.member.bit_length != 0) + X(DWORD) = ((const struct symt_data*)type)->u.member.bit_offset; else return FALSE; break; @@ -657,9 +658,9 @@ BOOL symt_get_info(struct module* module, const struct symt* type, break; case SymTagData: if (((const struct symt_data*)type)->kind != DataIsMember || - !((const struct symt_data*)type)->u.member.length) + !((const struct symt_data*)type)->u.member.bit_length) return FALSE; - X(DWORD64) = ((const struct symt_data*)type)->u.member.length; + X(DWORD64) = ((const struct symt_data*)type)->u.member.bit_length; break; case SymTagArrayType: if (!symt_get_info(module, ((const struct symt_array*)type)->base_type, @@ -735,7 +736,7 @@ BOOL symt_get_info(struct module* module, const struct symt* type, X(ULONG) = ((const struct symt_data*)type)->u.var.offset; break; case DataIsMember: - X(ULONG) = ((const struct symt_data*)type)->u.member.offset >> 3; + X(ULONG) = ((const struct symt_data*)type)->u.member.offset; break; default: FIXME("Unknown kind (%u) for get-offset\n",

1 0

Eric Pouech : dbghelp: Fix NameLen usage in SYMBOL_INFO(W).
by Alexandre Julliard Aug. 30, 2021

Aug. 30, 2021

Module: wine Branch: master Commit: d268cb028a808219eb9322b7274e345fb1ff0bfa URL: https://source.winehq.org/git/wine.git/?a=commit;h=d268cb028a808219eb9322b7… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Mon Aug 30 09:24:04 2021 +0200 dbghelp: Fix NameLen usage in SYMBOL_INFO(W). SYMBOL_INFO.NameLen should be the actual length of the symbol, not the length of the (potentially truncated) string returned in SYMBOL_INFO.Name. Add an helper (symbol_setname) to set those fields properly. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dbghelp/dbghelp_private.h | 1 + dlls/dbghelp/symbol.c | 47 +++++++++++++++++++++++++++++++----------- dlls/dbghelp/type.c | 11 +--------- 3 files changed, 37 insertions(+), 22 deletions(-) diff --git a/dlls/dbghelp/dbghelp_private.h b/dlls/dbghelp/dbghelp_private.h index 3415fc1557c..035d5b2b495 100644 --- a/dlls/dbghelp/dbghelp_private.h +++ b/dlls/dbghelp/dbghelp_private.h @@ -704,6 +704,7 @@ extern WCHAR* symt_get_nameW(const struct symt* sym) DECLSPEC_HIDDEN; extern BOOL symt_get_address(const struct symt* type, ULONG64* addr) DECLSPEC_HIDDEN; extern int __cdecl symt_cmp_addr(const void* p1, const void* p2) DECLSPEC_HIDDEN; extern void copy_symbolW(SYMBOL_INFOW* siw, const SYMBOL_INFO* si) DECLSPEC_HIDDEN; +extern void symbol_setname(SYMBOL_INFO* si, const char* name) DECLSPEC_HIDDEN; extern struct symt_ht* symt_find_nearest(struct module* module, DWORD_PTR addr) DECLSPEC_HIDDEN; extern struct symt_compiland* diff --git a/dlls/dbghelp/symbol.c b/dlls/dbghelp/symbol.c index 570e2adb8b6..3fc3438eeba 100644 --- a/dlls/dbghelp/symbol.c +++ b/dlls/dbghelp/symbol.c @@ -35,6 +35,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(dbghelp); WINE_DECLARE_DEBUG_CHANNEL(dbghelp_symt); +extern char * CDECL __unDName(char *buffer, const char *mangled, int len, + void * (CDECL *pfn_alloc)(size_t), void (CDECL *pfn_free)(void *), unsigned short flags); + static const WCHAR starW[] = {'*','\0'}; static inline int cmp_addr(ULONG64 a1, ULONG64 a2) @@ -561,6 +564,7 @@ static void symt_fill_sym_info(struct module_pair* pair, { const char* name; DWORD64 size; + char* tmp; if (!symt_get_info(pair->effective, sym, TI_GET_TYPE, &sym_info->TypeIndex)) sym_info->TypeIndex = 0; @@ -697,17 +701,16 @@ static void symt_fill_sym_info(struct module_pair* pair, sym_info->Scope = 0; /* FIXME */ sym_info->Tag = sym->tag; name = symt_get_name(sym); - if (sym_info->MaxNameLen) + if (sym_info->MaxNameLen && + sym->tag == SymTagPublicSymbol && (dbghelp_options & SYMOPT_UNDNAME) && + (tmp = __unDName(NULL, name, 0, malloc, free, UNDNAME_NAME_ONLY)) != NULL) { - if (sym->tag != SymTagPublicSymbol || !(dbghelp_options & SYMOPT_UNDNAME) || - ((sym_info->NameLen = UnDecorateSymbolName(name, sym_info->Name, - sym_info->MaxNameLen, UNDNAME_NAME_ONLY)) == 0)) - { - sym_info->NameLen = min(strlen(name), sym_info->MaxNameLen - 1); - memcpy(sym_info->Name, name, sym_info->NameLen); - sym_info->Name[sym_info->NameLen] = '\0'; - } + symbol_setname(sym_info, tmp); + free(tmp); } + else + symbol_setname(sym_info, name); + TRACE_(dbghelp_symt)("%p => %s %u %s\n", sym, sym_info->Name, sym_info->Size, wine_dbgstr_longlong(sym_info->Address)); @@ -992,6 +995,29 @@ static BOOL symt_enum_locals(struct process* pcs, const WCHAR* mask, return FALSE; } +/********************************************************** + * symbol_setname + * + * Properly sets Name and NameLen in SYMBOL_INFO + * according to MaxNameLen value + */ +void symbol_setname(SYMBOL_INFO* sym_info, const char* name) +{ + SIZE_T len = 0; + if (name) + { + sym_info->NameLen = strlen(name); + if (sym_info->MaxNameLen) + { + len = min(sym_info->NameLen, sym_info->MaxNameLen - 1); + memcpy(sym_info->Name, name, len); + } + } + else + sym_info->NameLen = 0; + sym_info->Name[len] = '\0'; +} + /****************************************************************** * copy_symbolW * @@ -1811,9 +1837,6 @@ BOOL WINAPI SymUnDName64(PIMAGEHLP_SYMBOL64 sym, PSTR UnDecName, DWORD UnDecName UNDNAME_COMPLETE) != 0; } -extern char * CDECL __unDName(char *buffer, const char *mangled, int len, - void * (CDECL *pfn_alloc)(size_t), void (CDECL *pfn_free)(void *), unsigned short flags); - /*********************************************************************** * UnDecorateSymbolName (DBGHELP.@) */ diff --git a/dlls/dbghelp/type.c b/dlls/dbghelp/type.c index 374b69aeb08..1a76ec70bbb 100644 --- a/dlls/dbghelp/type.c +++ b/dlls/dbghelp/type.c @@ -450,7 +450,6 @@ BOOL WINAPI SymEnumTypes(HANDLE hProcess, ULONG64 BaseOfDll, struct module_pair pair; char buffer[sizeof(SYMBOL_INFO) + 256]; SYMBOL_INFO* sym_info = (SYMBOL_INFO*)buffer; - const char* tmp; struct symt* type; DWORD64 size; unsigned int i; @@ -480,15 +479,7 @@ BOOL WINAPI SymEnumTypes(HANDLE hProcess, ULONG64 BaseOfDll, sym_info->Register = 0; /* FIXME */ sym_info->Scope = 0; /* FIXME */ sym_info->Tag = type->tag; - tmp = symt_get_name(type); - if (tmp) - { - sym_info->NameLen = min(strlen(tmp),sym_info->MaxNameLen-1); - memcpy(sym_info->Name, tmp, sym_info->NameLen); - sym_info->Name[sym_info->NameLen] = '\0'; - } - else - sym_info->Name[sym_info->NameLen = 0] = '\0'; + symbol_setname(sym_info, symt_get_name(type)); if (!EnumSymbolsCallback(sym_info, sym_info->Size, UserContext)) break; } return TRUE;

1 0