From 4715dbec2418d6b7e8a9e4d0ba0168e89ecc8679 Mon Sep 17 00:00:00 2001
From: Michael Stefaniuc <mstefani@redhat.de>
Date: Thu, 31 Jan 2008 14:35:27 +0100
Subject: [PATCH] user32: Remove duplicated get_hook_proc() function.

---
 dlls/user32/hook.c         |  2 +-
 dlls/user32/message.c      | 19 -------------------
 dlls/user32/user_private.h |  1 +
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/dlls/user32/hook.c b/dlls/user32/hook.c
index ed010a80ef4..4354e055e22 100644
--- a/dlls/user32/hook.c
+++ b/dlls/user32/hook.c
@@ -314,7 +314,7 @@ static LRESULT call_hook_proc( HOOKPROC proc, INT id, INT code, WPARAM wparam, L
  *
  * Retrieve the hook procedure real value for a module-relative proc
  */
-static void *get_hook_proc( void *proc, const WCHAR *module )
+void *get_hook_proc( void *proc, const WCHAR *module )
 {
     HMODULE mod;
 
diff --git a/dlls/user32/message.c b/dlls/user32/message.c
index 67bf10e81e6..eb0168f70ce 100644
--- a/dlls/user32/message.c
+++ b/dlls/user32/message.c
@@ -1986,25 +1986,6 @@ static inline void call_sendmsg_callback( SENDASYNCPROC callback, HWND hwnd, UIN
 }
 
 
-/***********************************************************************
- *		get_hook_proc
- *
- * Retrieve the hook procedure real value for a module-relative proc
- */
-static void *get_hook_proc( void *proc, const WCHAR *module )
-{
-    HMODULE mod;
-
-    if (!(mod = GetModuleHandleW(module)))
-    {
-        TRACE( "loading %s\n", debugstr_w(module) );
-        /* FIXME: the library will never be freed */
-        if (!(mod = LoadLibraryW(module))) return NULL;
-    }
-    return (char *)mod + (ULONG_PTR)proc;
-}
-
-
 /***********************************************************************
  *           peek_message
  *
diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h
index 505c3efc20a..2f6ac685913 100644
--- a/dlls/user32/user_private.h
+++ b/dlls/user32/user_private.h
@@ -235,6 +235,7 @@ extern BOOL CLIPBOARD_ReleaseOwner(void) DECLSPEC_HIDDEN;
 extern BOOL FOCUS_MouseActivate( HWND hwnd ) DECLSPEC_HIDDEN;
 extern BOOL HOOK_IsHooked( INT id ) DECLSPEC_HIDDEN;
 extern void erase_now( HWND hwnd, UINT rdw_flags ) DECLSPEC_HIDDEN;
+extern void *get_hook_proc( void *proc, const WCHAR *module );
 extern LRESULT call_current_hook( HHOOK hhook, INT code, WPARAM wparam, LPARAM lparam ) DECLSPEC_HIDDEN;
 extern BOOL map_wparam_AtoW( UINT message, WPARAM *wparam, enum wm_char_mapping mapping ) DECLSPEC_HIDDEN;
 extern LRESULT MSG_SendInternalMessageTimeout( DWORD dest_pid, DWORD dest_tid,