From 1c73771f303e50750013b51cc84f40d111b299cd Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Fri, 10 Oct 2003 04:30:54 +0000
Subject: [PATCH] Use the standard DllMain entry point.

---
 dlls/user/Makefile.in | 1 -
 dlls/user/user32.spec | 2 +-
 dlls/user/user_main.c | 4 ++--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/dlls/user/Makefile.in b/dlls/user/Makefile.in
index 30e93a454fd..51b8db27ecd 100644
--- 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
diff --git a/dlls/user/user32.spec b/dlls/user/user32.spec
index a9383085cc0..22c5705db19 100644
--- 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
diff --git a/dlls/user/user_main.c b/dlls/user/user_main.c
index 89953c58058..999c8b10faa 100644
--- 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)