user32: Get rid of winproc.h and move definitions in user_private.h.

dlls/user32/class.c

@@ -36,7 +36,6 @@
 #include "win.h"
 #include "user_private.h"
 #include "controls.h"
-#include "winproc.h"
 #include "wine/server.h"
 #include "wine/list.h"
 #include "wine/debug.h"

dlls/user32/defdlg.c

@@ -26,7 +26,7 @@
 #include "wine/winuser16.h"
 #include "controls.h"
 #include "win.h"
-#include "winproc.h"
+#include "user_private.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(dialog);

dlls/user32/hook16.c

@@ -30,7 +30,6 @@
 #include "wine/winuser16.h"
 #include "win.h"
 #include "user_private.h"
-#include "winproc.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(hook);

dlls/user32/message.c

@@ -39,7 +39,6 @@
 #include "user_private.h"
 #include "win.h"
 #include "controls.h"
-#include "winproc.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msg);

dlls/user32/msg16.c

@@ -23,7 +23,6 @@
 #include "winerror.h"
 #include "win.h"
 #include "user_private.h"
-#include "winproc.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(msg);

dlls/user32/user_private.h

@@ -225,6 +225,28 @@ extern BOOL USER_IsExitingThread( DWORD tid );
 
 extern BOOL USER_SetWindowPos( WINDOWPOS * winpos );
 
+typedef LRESULT (*winproc_callback_t)( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp,
+                                       LRESULT *result, void *arg );
+typedef LRESULT (*winproc_callback16_t)( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPARAM lp,
+                                         LRESULT *result, void *arg );
+
+extern WNDPROC16 WINPROC_GetProc16( WNDPROC proc, BOOL unicode );
+extern WNDPROC WINPROC_AllocProc16( WNDPROC16 func );
+extern WNDPROC WINPROC_GetProc( WNDPROC proc, BOOL unicode );
+extern WNDPROC WINPROC_AllocProc( WNDPROC funcA, WNDPROC funcW );
+extern BOOL WINPROC_IsUnicode( WNDPROC proc, BOOL def_val );
+
+extern LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg,
+                                     WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg );
+extern LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT16 msg,
+                                        WPARAM16 wParam, LPARAM lParam, LRESULT *result, void *arg );
+extern LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT msg,
+                                        WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg );
+
+extern INT_PTR WINPROC_CallDlgProc16( DLGPROC16 func, HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam );
+extern INT_PTR WINPROC_CallDlgProcA( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam );
+extern INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam );
+
 /* message spy definitions */
 
 #define SPY_DISPATCHMESSAGE16     0x0100

dlls/user32/win.c

@@ -33,7 +33,6 @@
 #include "wine/server.h"
 #include "wine/unicode.h"
 #include "win.h"
-#include "winproc.h"
 #include "user_private.h"
 #include "controls.h"
 #include "winerror.h"

dlls/user32/winproc.c

@@ -33,7 +33,6 @@
 #include "wine/winuser16.h"
 #include "controls.h"
 #include "win.h"
-#include "winproc.h"
 #include "user_private.h"
 #include "dde.h"
 #include "winternl.h"

dlls/user32/winproc.h

-/*
- * Window procedure callbacks definitions
- *
- * Copyright 1996 Alexandre Julliard
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#ifndef __WINE_WINPROC_H
-#define __WINE_WINPROC_H
-
-#include <stdarg.h>
-
-#include "windef.h"
-#include "winbase.h"
-#include "wine/winbase16.h"
-
-typedef LRESULT (*winproc_callback_t)( HWND hwnd, UINT msg, WPARAM wp, LPARAM lp,
-                                       LRESULT *result, void *arg );
-typedef LRESULT (*winproc_callback16_t)( HWND16 hwnd, UINT16 msg, WPARAM16 wp, LPARAM lp,
-                                         LRESULT *result, void *arg );
-
-extern WNDPROC16 WINPROC_GetProc16( WNDPROC proc, BOOL unicode );
-extern WNDPROC WINPROC_AllocProc16( WNDPROC16 func );
-extern WNDPROC WINPROC_GetProc( WNDPROC proc, BOOL unicode );
-extern WNDPROC WINPROC_AllocProc( WNDPROC funcA, WNDPROC funcW );
-extern BOOL WINPROC_IsUnicode( WNDPROC proc, BOOL def_val );
-
-extern LRESULT WINPROC_CallProcAtoW( winproc_callback_t callback, HWND hwnd, UINT msg,
-                                     WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg );
-extern LRESULT WINPROC_CallProc16To32A( winproc_callback_t callback, HWND16 hwnd, UINT16 msg,
-                                        WPARAM16 wParam, LPARAM lParam, LRESULT *result, void *arg );
-extern LRESULT WINPROC_CallProc32ATo16( winproc_callback16_t callback, HWND hwnd, UINT msg,
-                                        WPARAM wParam, LPARAM lParam, LRESULT *result, void *arg );
-
-extern INT_PTR WINPROC_CallDlgProc16( DLGPROC16 func, HWND16 hwnd, UINT16 msg, WPARAM16 wParam, LPARAM lParam );
-extern INT_PTR WINPROC_CallDlgProcA( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam );
-extern INT_PTR WINPROC_CallDlgProcW( DLGPROC func, HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam );
-
-#endif  /* __WINE_WINPROC_H */

dlls/user32/wnd16.c

@@ -21,7 +21,6 @@
 #include "wine/winuser16.h"
 #include "wownt32.h"
 #include "win.h"
-#include "winproc.h"
 #include "user_private.h"
 
 /* handle <--> handle16 conversions */