Move appropriate parts of winpos.h to winuser.h and win.h, remove winpos.h afterwards

[Dmitry Timoshkov]

Hello,

once this patch is applied include/winpos.h can be deleted.

Changelog:
    Move appropriate parts of winpos.h to winuser.h and win.h, remove
    winpos.h afterwards.

diff -up cvs/hq/wine/dlls/user/defwnd.c wine/dlls/user/defwnd.c
--- cvs/hq/wine/dlls/user/defwnd.c	2006-06-06 17:37:59.000000000 +0900
+++ wine/dlls/user/defwnd.c	2006-06-29 16:03:08.000000000 +0900
@@ -33,7 +33,6 @@
 #include "win.h"
 #include "user_private.h"
 #include "controls.h"
-#include "winpos.h"
 #include "wine/unicode.h"
 #include "wine/winuser16.h"
 #include "wine/server.h"
diff -up cvs/hq/wine/dlls/user/dialog.c wine/dlls/user/dialog.c
--- cvs/hq/wine/dlls/user/dialog.c	2006-05-24 13:16:26.000000000 +0900
+++ wine/dlls/user/dialog.c	2006-06-29 16:03:18.000000000 +0900
@@ -38,7 +38,6 @@
 #include "wine/unicode.h"
 #include "controls.h"
 #include "win.h"
-#include "winpos.h"
 #include "user_private.h"
 #include "wine/debug.h"
 
diff -up cvs/hq/wine/dlls/user/message.c wine/dlls/user/message.c
--- cvs/hq/wine/dlls/user/message.c	2006-06-15 14:13:52.000000000 +0900
+++ wine/dlls/user/message.c	2006-06-29 16:02:53.000000000 +0900
@@ -38,7 +38,6 @@
 #include "wine/server.h"
 #include "user_private.h"
 #include "win.h"
-#include "winpos.h"
 #include "controls.h"
 #include "winproc.h"
 #include "wine/debug.h"
diff -up cvs/hq/wine/dlls/user/nonclient.c wine/dlls/user/nonclient.c
--- cvs/hq/wine/dlls/user/nonclient.c	2006-05-24 13:16:27.000000000 +0900
+++ wine/dlls/user/nonclient.c	2006-06-29 16:03:33.000000000 +0900
@@ -30,7 +30,6 @@
 #include "win.h"
 #include "user_private.h"
 #include "controls.h"
-#include "winpos.h"
 #include "shellapi.h"
 #include "wine/debug.h"
 
diff -up cvs/hq/wine/dlls/user/win.c wine/dlls/user/win.c
--- cvs/hq/wine/dlls/user/win.c	2006-06-10 18:45:29.000000000 +0900
+++ wine/dlls/user/win.c	2006-06-29 16:03:50.000000000 +0900
@@ -36,7 +36,6 @@
 #include "winproc.h"
 #include "user_private.h"
 #include "controls.h"
-#include "winpos.h"
 #include "winerror.h"
 #include "wine/debug.h"
 
diff -up cvs/hq/wine/dlls/user/winpos.c wine/dlls/user/winpos.c
--- cvs/hq/wine/dlls/user/winpos.c	2006-06-06 17:37:59.000000000 +0900
+++ wine/dlls/user/winpos.c	2006-06-29 16:04:01.000000000 +0900
@@ -36,7 +36,6 @@
 #include "controls.h"
 #include "user_private.h"
 #include "win.h"
-#include "winpos.h"
 #include "wine/debug.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(win);
diff -up cvs/hq/wine/dlls/winex11.drv/window.c wine/dlls/winex11.drv/window.c
--- cvs/hq/wine/dlls/winex11.drv/window.c	2006-06-28 17:11:02.000000000 +0900
+++ wine/dlls/winex11.drv/window.c	2006-06-29 16:04:31.000000000 +0900
@@ -43,7 +43,6 @@
 #include "wine/debug.h"
 #include "wine/server.h"
 #include "win.h"
-#include "winpos.h"
 #include "mwm.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(x11drv);
diff -up cvs/hq/wine/dlls/winex11.drv/winpos.c wine/dlls/winex11.drv/winpos.c
--- cvs/hq/wine/dlls/winex11.drv/winpos.c	2006-06-24 13:27:12.000000000 +0900
+++ wine/dlls/winex11.drv/winpos.c	2006-06-29 16:04:40.000000000 +0900
@@ -38,7 +38,6 @@
 
 #include "x11drv.h"
 #include "win.h"
-#include "winpos.h"
 
 #include "wine/server.h"
 #include "wine/debug.h"
diff -up cvs/hq/wine/include/win.h wine/include/win.h
--- cvs/hq/wine/include/win.h	2006-05-24 13:16:56.000000000 +0900
+++ wine/include/win.h	2006-06-29 16:06:44.000000000 +0900
@@ -105,5 +105,13 @@ inline static void WIN_ReleasePtr( WND *
 #define WND_DESKTOP       ((WND *)2)  /* returned by WIN_GetPtr on the desktop window */
 
 extern LRESULT HOOK_CallHooks( INT id, INT code, WPARAM wparam, LPARAM lparam, BOOL unicode );
+extern BOOL WINPOS_RedrawIconTitle( HWND hWnd );
+extern BOOL WINPOS_ShowIconTitle( HWND hwnd, BOOL bShow );
+extern void WINPOS_GetMinMaxInfo( HWND hwnd, POINT *maxSize, POINT *maxPos, POINT *minTrack,
+                                  POINT *maxTrack );
+extern LONG WINPOS_HandleWindowPosChanging(HWND hwnd, WINDOWPOS *winpos);
+extern HWND WINPOS_WindowFromPoint( HWND hwndScope, POINT pt, INT *hittest );
+extern void WINPOS_CheckInternalPos( HWND hwnd );
+extern void WINPOS_ActivateOtherWindow( HWND hwnd );
 
 #endif  /* __WINE_WIN_H */
diff -up cvs/hq/wine/include/winuser.h wine/include/winuser.h
--- cvs/hq/wine/include/winuser.h	2006-06-15 14:13:53.000000000 +0900
+++ wine/include/winuser.h	2006-06-29 16:05:47.000000000 +0900
@@ -3155,6 +3155,11 @@ typedef struct {
 #define SWP_DEFERERASE      0x2000
 #define SWP_ASYNCWINDOWPOS  0x4000
 
+/* undocumented SWP flags - from SDK 3.1 */
+#define SWP_NOCLIENTSIZE    0x0800
+#define SWP_NOCLIENTMOVE    0x1000
+#define SWP_STATECHANGED    0x8000
+
 #define HWND_DESKTOP        ((HWND)0)
 #define HWND_BROADCAST      ((HWND)0xffff)