commit 60d40cd2469f487f838cfec0d640b1d601075307
author Alexandre Julliard <julliard@winehq.org> Fri Feb 28 21:52:08 2003 +0000
committer Alexandre Julliard <julliard@winehq.org> Fri Feb 28 21:52:08 2003 +0000
tree c90992303e8e3b06baa920d92b7923190eb786f6
parent a3c5ad4e77e1498e919eb84c8248bb801914594c

Only do the unload_dll server call at the time we actually unload the
dll.

loader/module.c

diff --git a/loader/module.c b/loader/module.c
index b7e2ab4..771b098 100644
--- a/loader/module.c
+++ b/loader/module.c
@@ -1420,6 +1420,13 @@
                     TRACE_(loaddll)("Unloaded module '%s' : %s\n", wm->filename,
                                     wm->dlhandle ? "builtin" : "native" );
 
+                SERVER_START_REQ( unload_dll )
+                {
+                    req->base = (void *)wm->module;
+                    wine_server_call( req );
+                }
+                SERVER_END_REQ;
+
                 if (wm->dlhandle) wine_dll_unload( wm->dlhandle );
                 else UnmapViewOfFile( (LPVOID)wm->module );
                 FreeLibrary16(wm->hDummyMod);
@@ -1515,12 +1522,6 @@
     if ( free_lib_count <= 1 )
     {
         MODULE_DllProcessDetach( FALSE, NULL );
-        SERVER_START_REQ( unload_dll )
-        {
-            req->base = (void *)wm->module;
-            wine_server_call( req );
-        }
-        SERVER_END_REQ;
         MODULE_FlushModrefs();
     }