include: Move appropriate parts of winpos.h to winuser.h and win.h,

remove winpos.h afterwards.

dlls/user/defwnd.c

@@ -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"

dlls/user/dialog.c

@@ -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"
 

dlls/user/message.c

@@ -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"

dlls/user/nonclient.c

@@ -30,7 +30,6 @@
 #include "win.h"
 #include "user_private.h"
 #include "controls.h"
-#include "winpos.h"
 #include "shellapi.h"
 #include "wine/debug.h"
 

dlls/user/win.c

@@ -36,7 +36,6 @@
 #include "winproc.h"
 #include "user_private.h"
 #include "controls.h"
-#include "winpos.h"
 #include "winerror.h"
 #include "wine/debug.h"
 

dlls/user/winpos.c

@@ -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);

dlls/winex11.drv/window.c

@@ -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);

dlls/winex11.drv/winpos.c

@@ -38,7 +38,6 @@
 
 #include "x11drv.h"
 #include "win.h"
-#include "winpos.h"
 
 #include "wine/server.h"
 #include "wine/debug.h"

include/win.h

@@ -106,4 +106,13 @@ inline static void WIN_ReleasePtr( WND *ptr )
 
 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 */

include/winpos.h

@@ -1,44 +0,0 @@
-/*
- * *DeferWindowPos() structure and definitions
- *
- * Copyright 1994 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_WINPOS_H
-#define __WINE_WINPOS_H
-
-#include <stdarg.h>
-#include <windef.h>
-#include <winbase.h>
-#include <wingdi.h>
-#include <winuser.h>
-
-/* undocumented SWP flags - from SDK 3.1 */
-#define SWP_NOCLIENTSIZE	0x0800
-#define SWP_NOCLIENTMOVE	0x1000
-#define SWP_STATECHANGED        0x8000
-
-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_WINPOS_H */

include/winuser.h

@@ -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)