* win32-low.c (handle_load_dll): Don't use toolhelp when waiting.

2 files changed, 16 insertions, 3 deletions

diff --git a/gdb/gdbserver/ChangeLog b/gdb/gdbserver/ChangeLog
index 9698a28c8ff..2313e28216b 100644
--- a/gdb/gdbserver/ChangeLog
+++ b/gdb/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2007-09-03  Pedro Alves  <pedro_alves@portugalmail.pt>
+
+	* win32-low.c (handle_load_dll): Don't use toolhelp when waiting.
+
 2007-08-23  Joel Brobecker  <brobecker@adacore.com>
 
 	* configure.ac: Switch license to GPLv3.
diff --git a/gdb/gdbserver/win32-low.c b/gdb/gdbserver/win32-low.c
index 42cbb90fc4f..755f816a506 100644
--- a/gdb/gdbserver/win32-low.c
+++ b/gdb/gdbserver/win32-low.c
@@ -1066,9 +1066,18 @@ handle_load_dll (void)
 
   dll_buf[0] = dll_buf[sizeof (dll_buf) - 1] = '\0';
 
-  if (!psapi_get_dll_name ((DWORD) (event->lpBaseOfDll), dll_buf)
-      && !toolhelp_get_dll_name ((DWORD) (event->lpBaseOfDll), dll_buf))
-    dll_buf[0] = dll_buf[sizeof (dll_buf) - 1] = '\0';
+  /* Windows does not report the image name of the dlls in the debug
+     event on attaches.  We resort to iterating over the list of
+     loaded dlls looking for a match by image base.  */
+  if (!psapi_get_dll_name ((DWORD) event->lpBaseOfDll, dll_buf))
+    {
+      if (!server_waiting)
+	/* On some versions of Windows and Windows CE, we can't create
+	   toolhelp snapshots while the inferior is stopped in a
+	   LOAD_DLL_DEBUG_EVENT due to a dll load, but we can while
+	   Windows is reporting the already loaded dlls.  */
+	toolhelp_get_dll_name ((DWORD) event->lpBaseOfDll, dll_buf);
+    }
 
   dll_name = dll_buf;