From bc48afdcdf9027e9da71ac56c082bae8e06f34dd Mon Sep 17 00:00:00 2001
From: Jason Green <jason@jave01.(none)>
Date: Tue, 20 Nov 2007 15:26:35 -0500
Subject: [PATCH] Return TRUE in SymInitializeW if process is already initialized and add a number of TRACEs

---
 dlls/dbghelp/dbghelp.c |   58 ++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 51 insertions(+), 7 deletions(-)

diff --git a/dlls/dbghelp/dbghelp.c b/dlls/dbghelp/dbghelp.c
index 7ecc3c9..b8af91c 100644
--- a/dlls/dbghelp/dbghelp.c
+++ b/dlls/dbghelp/dbghelp.c
@@ -85,7 +85,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
     return TRUE;
 }
 
-static struct process* process_first /* = NULL */;
+static struct process* process_first = NULL;
 
 /******************************************************************
  *		process_find_by_handle
@@ -216,11 +216,17 @@ static BOOL WINAPI process_invade_cb(PCSTR name, ULONG base, ULONG size, PVOID u
     char        tmp[MAX_PATH];
     HANDLE      hProcess = (HANDLE)user;
 
-    if (!GetModuleFileNameExA(hProcess, (HMODULE)base, 
-                              tmp, sizeof(tmp)))
+
+    TRACE("found module %s {base = 0x%08x, size = 0x%08x, user = %p}\n", debugstr_a(name), base, size, user);
+
+    if (!GetModuleFileNameExA(hProcess, (HMODULE)base, tmp, sizeof(tmp))){
+        WARN("could not find the full path name of the module.  Using the base name of %s instead\n", debugstr_a(name));
         lstrcpynA(tmp, name, sizeof(tmp));
+    }
 
+    TRACE("loading the module %s {base = 0x%08x}\n", debugstr_a(name), base);
     SymLoadModule(hProcess, 0, tmp, name, base, size);
+    TRACE("done loading the module\n");
     return TRUE;
 }
 
@@ -268,8 +274,14 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP
 
     TRACE("(%p %s %u)\n", hProcess, debugstr_w(UserSearchPath), fInvadeProcess);
 
-    if (process_find_by_handle(hProcess))
-        FIXME("what to do ??\n");
+    if (process_find_by_handle(hProcess)){
+        WARN("the symbols for this process have already been initialized!\n");
+
+        /* MSDN says to only call this function once unless SymCleanup() has been called since the last call.
+           It also says to call SymRefreshModuleList() instead if you just want the module list refreshed.
+           Native still returns TRUE even if the process has already been initialized. */
+        return TRUE;
+    }
 
     pcs = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pcs));
     if (!pcs) return FALSE;
@@ -312,24 +324,39 @@ BOOL WINAPI SymInitializeW(HANDLE hProcess, PCWSTR UserSearchPath, BOOL fInvadeP
         }
     }
 
+    TRACE("got search path %s\n", debugstr_w(pcs->search_path));
     pcs->lmodules = NULL;
     pcs->dbg_hdr_addr = 0;
     pcs->next = process_first;
     process_first = pcs;
     
+
+    TRACE("checking if the process is live\n");
     if (check_live_target(pcs))
     {
-        if (fInvadeProcess)
-            EnumerateLoadedModules(hProcess, process_invade_cb, (void*)hProcess);
+        TRACE("we've got a live process\n");
+
+        if (fInvadeProcess){
+            TRACE("invading the process %p\n", pcs->handle);
+
+            EnumerateLoadedModules(hProcess, process_invade_cb, hProcess);
+
+            TRACE("done enumerating the modules\n");
+        }
+
+        TRACE("syncronizing module list\n");
         elf_synchronize_module_list(pcs);
     }
     else if (fInvadeProcess)
     {
+        WARN("process has already died.  Cleaning up...\n");
         SymCleanup(hProcess);
         SetLastError(ERROR_INVALID_PARAMETER);
+        WARN("done cleaning up\n");
         return FALSE;
     }
 
+    TRACE("done!\n");
     return TRUE;
 }
 
@@ -343,6 +370,9 @@ BOOL WINAPI SymInitialize(HANDLE hProcess, PCSTR UserSearchPath, BOOL fInvadePro
     WCHAR*              sp = NULL;
     BOOL                ret;
 
+    TRACE("initializing the process %p {userSearchPath = %s, invadeProcess = %s}\n",
+           hProcess, debugstr_a(UserSearchPath), fInvadeProcess ? "TRUE" : "FALSE");
+
     if (UserSearchPath)
     {
         unsigned len;
@@ -354,6 +384,8 @@ BOOL WINAPI SymInitialize(HANDLE hProcess, PCSTR UserSearchPath, BOOL fInvadePro
 
     ret = SymInitializeW(hProcess, sp, fInvadeProcess);
     HeapFree(GetProcessHeap(), 0, sp);
+
+    TRACE("done symbol initialization\n");
     return ret;
 }
 
@@ -366,19 +398,26 @@ BOOL WINAPI SymCleanup(HANDLE hProcess)
     struct process**    ppcs;
     struct process*     next;
 
+
+    TRACE("cleaning up the symbols for the process %p\n", hProcess);
+
     for (ppcs = &process_first; *ppcs; ppcs = &(*ppcs)->next)
     {
         if ((*ppcs)->handle == hProcess)
         {
+            TRACE("found process.  Removing modules\n");
             while ((*ppcs)->lmodules) module_remove(*ppcs, (*ppcs)->lmodules);
 
             HeapFree(GetProcessHeap(), 0, (*ppcs)->search_path);
             next = (*ppcs)->next;
             HeapFree(GetProcessHeap(), 0, *ppcs);
             *ppcs = next;
+            TRACE("done\n");
             return TRUE;
         }
     }
+
+    ERR("this process has not had SymInitialize() called for it!\n");
     return FALSE;
 }
 
@@ -390,8 +429,12 @@ DWORD WINAPI SymSetOptions(DWORD opts)
 {
     struct process* pcs;
 
+
+    TRACE("setting current options to 0x%08x\n", opts);
+
     for (pcs = process_first; pcs; pcs = pcs->next)
     {
+        TRACE("setting options for process %p (handle = %p)\n", pcs, pcs->handle);
         pcs_callback(pcs, CBA_SET_OPTIONS, &opts);
     }
     return dbghelp_options = opts;
@@ -403,6 +446,7 @@ DWORD WINAPI SymSetOptions(DWORD opts)
  */
 DWORD WINAPI SymGetOptions(void)
 {
+    TRACE("current options = 0x%08x\n", dbghelp_options);
     return dbghelp_options;
 }
 
-- 
1.4.4.2