system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-30 05:31:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

winedbg: Correctly read LDT entries for wow64 debuggee.

Browse source 
This mostly matters for Mac as segment CS is handled as a real LDT
entry.

Signed-off-by: Eric Pouech <epouech@codeweavers.com>
This commit is contained in:
Eric Pouech 2023-10-13 09:58:23 +02:00 committed by Alexandre Julliard
parent 91ba80df26
commit 44ab120661
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
programs/winedbg/be_i386.c
View file

@ -40,7 +40,12 @@ static ADDRESS_MODE get_selector_type(HANDLE hThread, const WOW64_CONTEXT *ctx,
/* null or system selector */
if (!(sel & 4) || ((sel >> 3) < first_ldt_entry)) return AddrModeFlat;
if (dbg_curr_process->process_io->get_selector(hThread, sel, &le))
return le.HighWord.Bits.Default_Big ? AddrMode1632 : AddrMode1616;
{
ULONG base = (le.HighWord.Bits.BaseHi << 24) + (le.HighWord.Bits.BaseMid << 16) + le.BaseLow;
if (le.HighWord.Bits.Default_Big)
return base == 0 ? AddrModeFlat : AddrMode1632;
return AddrMode1616;
}
/* selector doesn't exist */
return -1;
}

10
programs/winedbg/tgt_active.c
View file

@ -1067,7 +1067,17 @@ static BOOL tgt_process_active_write(HANDLE hProcess, void* addr,
static BOOL tgt_process_active_get_selector(HANDLE hThread, DWORD sel, LDT_ENTRY* le)
{
#ifdef _WIN64
THREAD_DESCRIPTOR_INFORMATION desc = { .Selector = sel };
ULONG retlen;
if (RtlWow64GetThreadSelectorEntry( hThread, &desc, sizeof(desc), &retlen ))
return FALSE;
*le = desc.Entry;
return TRUE;
#else
return GetThreadSelectorEntry( hThread, sel, le );
#endif
}
static struct be_process_io be_process_active_io =