Module: wine Branch: master Commit: d00d54ebeb71ddaec5213954397ff96a4406f4d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d00d54ebeb71ddaec521395439...
Author: Alexandre Julliard julliard@winehq.org Date: Tue Aug 7 21:01:55 2007 +0200
user32: Get rid of winproc.h and move definitions in user_private.h.
---
dlls/user32/class.c | 1 - dlls/user32/defdlg.c | 2 +- dlls/user32/hook16.c | 1 - dlls/user32/message.c | 1 - dlls/user32/msg16.c | 1 - dlls/user32/user_private.h | 22 ++++++++++++++++++ dlls/user32/win.c | 1 - dlls/user32/winproc.c | 1 - dlls/user32/winproc.h | 52 -------------------------------------------- dlls/user32/wnd16.c | 1 - 10 files changed, 23 insertions(+), 60 deletions(-)
diff --git a/dlls/user32/class.c b/dlls/user32/class.c index 4f6c7b5..51801bc 100644 --- a/dlls/user32/class.c +++ b/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" diff --git a/dlls/user32/defdlg.c b/dlls/user32/defdlg.c index 794ae0e..911e0ce 100644 --- a/dlls/user32/defdlg.c +++ b/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); diff --git a/dlls/user32/hook16.c b/dlls/user32/hook16.c index f44ba12..436a168 100644 --- a/dlls/user32/hook16.c +++ b/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); diff --git a/dlls/user32/message.c b/dlls/user32/message.c index a665b12..2c0f6fb 100644 --- a/dlls/user32/message.c +++ b/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); diff --git a/dlls/user32/msg16.c b/dlls/user32/msg16.c index ffc01e2..ec42ae9 100644 --- a/dlls/user32/msg16.c +++ b/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); diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 67be8f5..692eca9 100644 --- a/dlls/user32/user_private.h +++ b/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 diff --git a/dlls/user32/win.c b/dlls/user32/win.c index d9b3a2e..0ef021a 100644 --- a/dlls/user32/win.c +++ b/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" diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 27b31a1..50b5858 100644 --- a/dlls/user32/winproc.c +++ b/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" diff --git a/dlls/user32/winproc.h b/dlls/user32/winproc.h deleted file mode 100644 index 69b6d76..0000000 --- a/dlls/user32/winproc.h +++ /dev/null @@ -1,52 +0,0 @@ -/* - * 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 */ diff --git a/dlls/user32/wnd16.c b/dlls/user32/wnd16.c index f29124c..0b0d0c1 100644 --- a/dlls/user32/wnd16.c +++ b/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 */