Use the standard DllMain entry point.

1c73771f · Alexandre Julliard · 313661d1 · 1c73771f · 1c73771f · 1c73771f
Commit 1c73771f authored Oct 10, 2003 by Alexandre Julliard
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

Makefile.in dlls/user/Makefile.in +0 -1

user32.spec dlls/user/user32.spec +1 -1

user_main.c dlls/user/user_main.c +2 -2

No files found.
--- a/dlls/user/Makefile.in
+++ b/dlls/user/Makefile.in
@@ -7,7 +7,6 @@ MODULE    = user32.dll
 IMPORTS   = gdi32 advapi32 kernel32 ntdll
 ALTNAMES  = user.exe ddeml.dll display.drv keyboard.drv mouse.drv
 EXTRALIBS = $(LIBUNICODE)
-DLLMAIN   = UserClientDllInitialize@12
 LDDLLFLAGS = @LDDLLFLAGS@
 SYMBOLFILE = $(MODULE).tmp.o

--- a/dlls/user/user32.spec
+++ b/dlls/user/user32.spec
@@ -599,7 +599,7 @@
 @ stdcall UnregisterHotKey(long long)
 @ stub UpdatePerUserSystemParameters
 @ stdcall UpdateWindow(long)
-@ stdcall UserClientDllInitialize(long long ptr)
+@ stdcall UserClientDllInitialize(long long ptr) DllMain
 # @ stub UserIsSystemResumeAutomatic
 # @ stub UserSetDeviceHoldState
 @ stub UserHandleGrantAccess

--- a/dlls/user/user_main.c
+++ b/dlls/user/user_main.c
@@ -291,9 +291,9 @@ static void thread_detach(void)
 /***********************************************************************
 *           UserClientDllInitialize  (USER32.@)
 *
- * USER dll initialisation routine
+ * USER dll initialisation routine (exported as UserClientDllInitialize for compatibility).
 */
-BOOL WINAPI UserClientDllInitialize( HINSTANCE inst, DWORD reason, LPVOID reserved )
+BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved )
 {
    BOOL ret = TRUE;
    switch(reason)