[PATCH v5 1/2] winedbg: Don't expect TlsIndex to contain tls indices

[Evan Tang]

From: Evan Tang

It doesn't on Windows and won't soon in wine
---
 programs/winedbg/symbol.c | 58 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 57 insertions(+), 1 deletion(-)

diff --git a/programs/winedbg/symbol.c b/programs/winedbg/symbol.c
index 961dc95585a..5c6bebf47a6 100644
--- a/programs/winedbg/symbol.c
+++ b/programs/winedbg/symbol.c
@@ -61,6 +61,51 @@ static BOOL symbol_get_debug_start(const struct dbg_type* func, ULONG64* start)
     return FALSE;
 }

+static BOOL read_image_directory_data(ULONG64 modbase, WORD dir, void* buffer, size_t* size, BOOL* is_64)
+{
+    IMAGE_DOS_HEADER dos_header;
+    IMAGE_DATA_DIRECTORY entry;
+    DWORD_PTR addr;
+    union { IMAGE_NT_HEADERS32 h32; IMAGE_NT_HEADERS64 h64; } nt_header;
+
+    addr = (DWORD_PTR)modbase;
+    if (!dbg_read_memory((void*)addr, &dos_header, sizeof(dos_header)))
+        return FALSE;
+    if (dos_header.e_magic != IMAGE_DOS_SIGNATURE)
+        return FALSE;
+    addr = (DWORD_PTR)(modbase + dos_header.e_lfanew);
+    if (!dbg_read_memory((void*)addr, &nt_header, sizeof(nt_header)))
+        return FALSE;
+    if (nt_header.h32.Signature != IMAGE_NT_SIGNATURE)
+        return FALSE;
+    if (nt_header.h32.OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR32_MAGIC)
+    {
+        if (dir >= nt_header.h32.OptionalHeader.NumberOfRvaAndSizes)
+            return FALSE;
+        if (!(entry = nt_header.h32.OptionalHeader.DataDirectory[dir]).VirtualAddress)
+            return FALSE;
+        *is_64 = FALSE;
+    }
+    else if (nt_header.h64.OptionalHeader.Magic == IMAGE_NT_OPTIONAL_HDR64_MAGIC)
+    {
+        if (dir >= nt_header.h64.OptionalHeader.NumberOfRvaAndSizes)
+            return FALSE;
+        if (!(entry = nt_header.h64.OptionalHeader.DataDirectory[dir]).VirtualAddress)
+            return FALSE;
+        *is_64 = TRUE;
+    }
+    else
+    {
+        return FALSE;
+    }
+    if (entry.Size < *size)
+        *size = entry.Size;
+    addr = (DWORD_PTR)(modbase + entry.VirtualAddress);
+    if (!dbg_read_memory((void*)addr, buffer, *size))
+        return FALSE;
+    return TRUE;
+}
+
 static BOOL fill_sym_lvalue(const SYMBOL_INFO* sym, ULONG_PTR base,
                             struct dbg_lvalue* lvalue, char* buffer, size_t sz)
 {
@@ -130,6 +175,9 @@ static BOOL fill_sym_lvalue(const SYMBOL_INFO* sym, ULONG_PTR base,
     {
         PROCESS_BASIC_INFORMATION pbi;
         THREAD_BASIC_INFORMATION  tbi;
+        union { IMAGE_TLS_DIRECTORY32 dir32; IMAGE_TLS_DIRECTORY64 dir64; } tls;
+        size_t                    read_size = sizeof(tls);
+        BOOL                      is_dir64;
         DWORD_PTR                 addr;
         PEB                       peb;
         PEB_LDR_DATA              ldr_data;
@@ -159,7 +207,15 @@ static BOOL fill_sym_lvalue(const SYMBOL_INFO* sym, ULONG_PTR base,
                                  &ldr_module, sizeof(ldr_module))) goto tls_error;
             if ((DWORD_PTR)ldr_module.DllBase == sym->ModBase)
             {
-                tlsindex = ldr_module.TlsIndex;
+                if (ldr_module.TlsIndex != -1)
+                    goto tls_error;
+                if (!read_image_directory_data(sym->ModBase, IMAGE_DIRECTORY_ENTRY_TLS, &tls, &read_size, &is_dir64))
+                    goto tls_error;
+                if (read_size < (is_dir64 ? sizeof(IMAGE_TLS_DIRECTORY64) : sizeof(IMAGE_TLS_DIRECTORY32)))
+                    goto tls_error;
+                addr = (DWORD_PTR)(is_dir64 ? tls.dir64.AddressOfIndex : tls.dir32.AddressOfIndex);
+                if (!dbg_read_memory((void*)addr, &tlsindex, sizeof(tlsindex)))
+                    goto tls_error;
                 break;
             }
             current = ldr_module.InLoadOrderLinks.Flink;