From: Rémi Bernon rbernon@codeweavers.com
--- dlls/ntdll/unix/virtual.c | 36 ++++++++++++- loader/main.c | 107 +++++++++++++++++++++++++++++++++++++- 2 files changed, 141 insertions(+), 2 deletions(-)
diff --git a/dlls/ntdll/unix/virtual.c b/dlls/ntdll/unix/virtual.c index 2c2000751e5..87d7b6e2f05 100644 --- a/dlls/ntdll/unix/virtual.c +++ b/dlls/ntdll/unix/virtual.c @@ -2673,6 +2673,35 @@ static IMAGE_BASE_RELOCATION *process_relocation_block( char *page, IMAGE_BASE_R }
+static void notify_gdb_dll_loaded( void *module, const WCHAR *filename, INT_PTR offset ) +{ + UNICODE_STRING redir, nt_name; + OBJECT_ATTRIBUTES attr; + char *unix_path = NULL; + + RtlInitUnicodeString( &nt_name, filename ); + InitializeObjectAttributes( &attr, &nt_name, OBJ_CASE_INSENSITIVE, 0, 0 ); + get_redirect( &attr, &redir ); + + if (!nt_to_unix_file_name( &attr, &unix_path, FILE_OPEN )) + { + static void (*wine_gdb_dll_loaded)( const void *module, const char *unix_path, INT_PTR offset ); + if (!wine_gdb_dll_loaded) wine_gdb_dll_loaded = dlsym( RTLD_DEFAULT, "wine_gdb_dll_loaded" ); + if (wine_gdb_dll_loaded) wine_gdb_dll_loaded( module, unix_path, offset ); + } + + free( redir.Buffer ); + free( unix_path ); +} + +static void notify_gdb_dll_unload( void *module ) +{ + static void (*wine_gdb_dll_unload)( const void *module ); + if (!wine_gdb_dll_unload) wine_gdb_dll_unload = dlsym( RTLD_DEFAULT, "wine_gdb_dll_unload" ); + if (wine_gdb_dll_unload) wine_gdb_dll_unload( module ); +} + + /*********************************************************************** * map_image_into_view * @@ -2898,6 +2927,7 @@ static NTSTATUS map_image_into_view( struct file_view *view, const WCHAR *filena #ifdef VALGRIND_LOAD_PDB_DEBUGINFO VALGRIND_LOAD_PDB_DEBUGINFO(fd, ptr, total_size, ptr - (char *)wine_server_get_ptr( image_info->base )); #endif + notify_gdb_dll_loaded( ptr, filename, ptr - (char *)wine_server_get_ptr( image_info->base ) ); return STATUS_SUCCESS; }
@@ -5587,7 +5617,11 @@ static NTSTATUS unmap_view_of_section( HANDLE process, PVOID addr, ULONG flags ) SERVER_END_REQ; if (!status) { - if (view->protect & SEC_IMAGE) release_builtin_module( view->base ); + if (view->protect & SEC_IMAGE) + { + notify_gdb_dll_unload( view->base ); + release_builtin_module( view->base ); + } if (flags & MEM_PRESERVE_PLACEHOLDER) free_pages_preserve_placeholder( view, view->base, view->size ); else delete_view( view ); } diff --git a/loader/main.c b/loader/main.c index 135aeb5b8c8..9c364008cc6 100644 --- a/loader/main.c +++ b/loader/main.c @@ -20,6 +20,13 @@
#include "config.h"
+#include <stdarg.h> +#include <stddef.h> + +#include "windef.h" +#include "winbase.h" +#include "winnt.h" + #include <fcntl.h> #include <pthread.h> #include <stdio.h> @@ -40,6 +47,8 @@ # include <sys/link.h> #endif
+#include "wine/list.h" + #include "main.h"
extern char **environ; @@ -50,18 +59,43 @@ void (*wine_rtld_init)( struct link_map *map ) = NULL;
#ifdef __linux__
+struct link_map_entry +{ + struct link_map map; + const void *module; + struct list entry; +}; + static pthread_mutex_t link_map_lock; static struct link_map so_link_map = {0}; +static struct list pe_map_entries = LIST_INIT( pe_map_entries ); + +static char *link_realpath( const char *path ) +{ + char *real; + if (!path) return NULL; + if (!(real = realpath( path, NULL ))) return strdup( path ); + return real; +}
static void sync_wine_link_map(void) { static struct r_debug *_r_debug; struct link_map *next = &so_link_map, *last = NULL, **rtld_map, **wine_map; + struct link_map_entry *pe_entry = NULL; + struct list *ptr;
if (!_r_debug) _r_debug = dlsym( RTLD_NEXT, "_r_debug" ); rtld_map = &_r_debug->r_map; wine_map = &next;
+ /* detach the PE link map */ + if ((ptr = list_head( &pe_map_entries ))) + { + pe_entry = LIST_ENTRY( ptr, struct link_map_entry, entry ); + if (pe_entry->map.l_prev) pe_entry->map.l_prev->l_next = NULL; + } + while (*rtld_map) { if (!*wine_map) @@ -73,7 +107,7 @@ static void sync_wine_link_map(void) last = *wine_map; free( (*wine_map)->l_name ); (*wine_map)->l_addr = (*rtld_map)->l_addr; - (*wine_map)->l_name = strdup( (*rtld_map)->l_name ); + (*wine_map)->l_name = link_realpath( (*rtld_map)->l_name ); (*wine_map)->l_ld = (*rtld_map)->l_ld; rtld_map = &(*rtld_map)->l_next; wine_map = &(*wine_map)->l_next; @@ -92,6 +126,77 @@ static void sync_wine_link_map(void) free( tmp->l_name ); free( tmp ); } + + if (pe_entry) + { + /* attach PE link map back */ + pe_entry->map.l_prev = last; + last->l_next = &pe_entry->map; + } +} + +static void add_dll_to_pe_link_map( const void *module, const char *unix_path, INT_PTR offset ) +{ + struct link_map_entry *entry, *last_entry; + struct list *ptr; + + if (!(entry = calloc( 1, sizeof(*entry) ))) return; + + entry->module = module; + entry->map.l_addr = offset; + entry->map.l_name = link_realpath( unix_path ); + + if ((ptr = list_tail( &pe_map_entries ))) + { + last_entry = LIST_ENTRY( ptr, struct link_map_entry, entry ); + entry->map.l_prev = &last_entry->map; + last_entry->map.l_next = &entry->map; + } + + list_add_tail( &pe_map_entries, &entry->entry ); +} + +void wine_gdb_dll_loaded( const void *module, const char *unix_path, INT_PTR offset ) +{ + struct link_map_entry *entry; + + pthread_mutex_lock( &link_map_lock ); + + LIST_FOR_EACH_ENTRY( entry, &pe_map_entries, struct link_map_entry, entry ) + if (entry->module == module) break; + + if (&entry->entry == &pe_map_entries) + add_dll_to_pe_link_map( module, unix_path, offset ); + else + entry->map.l_addr = offset; + + pthread_mutex_unlock( &link_map_lock ); +} + +void wine_gdb_dll_unload( const void *module ) +{ + struct link_map *prev, *next; + struct link_map_entry *entry; + + pthread_mutex_lock( &link_map_lock ); + + LIST_FOR_EACH_ENTRY( entry, &pe_map_entries, struct link_map_entry, entry ) + if (entry->module == module) break; + + if (&entry->entry == &pe_map_entries) + { + pthread_mutex_unlock( &link_map_lock ); + return; + } + + list_remove( &entry->entry ); + if ((prev = entry->map.l_prev)) prev->l_next = entry->map.l_next; + if ((next = entry->map.l_next)) next->l_prev = entry->map.l_prev; + + pthread_mutex_unlock( &link_map_lock ); + + free( entry->map.l_name ); + free( entry ); }
void *dlopen( const char *file, int mode )