[PATCH v2 1/3] winedbg: Simplify fetching module name.

[Eric Pouech]

From: Eric Pouech

Always using GetMappedFileNameW for active targets:
- as it doesn't depend on information from debug event that
  are not always present (pointer to module name, or file handle),
- it only uses a single server call (pointer to module name requires two).
- and stop using GetModuleFileNameExW which implementation walks
  the module list in debuggee process, hence request time grows linearly
  with number of loaded modules.
Keep fallback to indirection in debuggee address space for non active
targets.

This reduces significantly attachment time in auto mode.

Signed-off-by: Eric Pouech 
---
 programs/winedbg/tgt_active.c | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/programs/winedbg/tgt_active.c b/programs/winedbg/tgt_active.c
index a919f70a486..85fcc430014 100644
--- a/programs/winedbg/tgt_active.c
+++ b/programs/winedbg/tgt_active.c
@@ -315,20 +315,21 @@ static DWORD dbg_handle_exception(const EXCEPTION_RECORD* rec, BOOL first_chance

static BOOL tgt_process_active_close_process(struct dbg_process* pcs, BOOL kill);

-void fetch_module_name(void* name_addr, void* mod_addr, WCHAR* buffer, size_t bufsz)
+void fetch_module_name(void *name_addr, void* mod_addr, WCHAR* buffer, size_t bufsz)
 {
-    memory_get_string_indirect(dbg_curr_process, name_addr, TRUE, buffer, bufsz);
-    if (!buffer[0] && !GetModuleFileNameExW(dbg_curr_process->handle, mod_addr, buffer, bufsz))
+    DWORD len;
+    if (dbg_curr_process->active_debuggee && (len = GetMappedFileNameW( dbg_curr_process->handle, mod_addr, buffer, bufsz )))
     {
-        if (GetMappedFileNameW( dbg_curr_process->handle, mod_addr, buffer, bufsz ))
-        {
-            /* FIXME: proper NT->Dos conversion */
-            static const WCHAR nt_prefixW[] = {'\','?','?','\'};
+        /* FIXME: proper NT->Dos conversion */
+        static const WCHAR nt_prefixW[] = {'\','?','?','\'};

-            if (!wcsncmp( buffer, nt_prefixW, 4 ))
-                memmove( buffer, buffer + 4, (lstrlenW(buffer + 4) + 1) * sizeof(WCHAR) );
-        }
-        else
+        if (!wcsncmp( buffer, nt_prefixW, 4 ))
+            memmove( buffer, buffer + 4, (len - 4 + 1) * sizeof(WCHAR) );
+    }
+    else
+    {
+        memory_get_string_indirect(dbg_curr_process, name_addr, TRUE, buffer, bufsz);
+        if (!buffer[0])
             swprintf(buffer, bufsz, L"DLL_%08lx", (ULONG_PTR)mod_addr);
     }
 }