Module: wine Branch: refs/heads/master Commit: b2686ad2dd4aed8b2392ee2a3c2b608a492a0f26 URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=b2686ad2dd4aed8b2392ee2a...
Author: Dmitry Timoshkov dmitry@codeweavers.com Date: Thu Jun 29 17:11:55 2006 +0900
include: Move appropriate parts of winpos.h to winuser.h and win.h, remove winpos.h afterwards.
---
dlls/user/defwnd.c | 1 - dlls/user/dialog.c | 1 - dlls/user/message.c | 1 - dlls/user/nonclient.c | 1 - dlls/user/win.c | 1 - dlls/user/winpos.c | 1 - dlls/winex11.drv/window.c | 1 - dlls/winex11.drv/winpos.c | 1 - include/win.h | 9 +++++++++ include/winpos.h | 44 -------------------------------------------- include/winuser.h | 5 +++++ 11 files changed, 14 insertions(+), 52 deletions(-) delete mode 100644 include/winpos.h
diff --git a/dlls/user/defwnd.c b/dlls/user/defwnd.c index da38c63..c4339eb 100644 --- a/dlls/user/defwnd.c +++ b/dlls/user/defwnd.c @@ -33,7 +33,6 @@ #include "imm.h" #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 --git a/dlls/user/dialog.c b/dlls/user/dialog.c index baf72a6..6eaa942 100644 --- a/dlls/user/dialog.c +++ b/dlls/user/dialog.c @@ -38,7 +38,6 @@ #include "wine/winuser16.h" #include "wine/unicode.h" #include "controls.h" #include "win.h" -#include "winpos.h" #include "user_private.h" #include "wine/debug.h"
diff --git a/dlls/user/message.c b/dlls/user/message.c index fde5fba..fd84ef0 100644 --- a/dlls/user/message.c +++ b/dlls/user/message.c @@ -38,7 +38,6 @@ #include "wine/unicode.h" #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 --git a/dlls/user/nonclient.c b/dlls/user/nonclient.c index 2f095ca..00c2913 100644 --- a/dlls/user/nonclient.c +++ b/dlls/user/nonclient.c @@ -30,7 +30,6 @@ #include "wownt32.h" #include "win.h" #include "user_private.h" #include "controls.h" -#include "winpos.h" #include "shellapi.h" #include "wine/debug.h"
diff --git a/dlls/user/win.c b/dlls/user/win.c index 593fef1..fa2af00 100644 --- a/dlls/user/win.c +++ b/dlls/user/win.c @@ -36,7 +36,6 @@ #include "win.h" #include "winproc.h" #include "user_private.h" #include "controls.h" -#include "winpos.h" #include "winerror.h" #include "wine/debug.h"
diff --git a/dlls/user/winpos.c b/dlls/user/winpos.c index 0c23507..a3b7648 100644 --- a/dlls/user/winpos.c +++ b/dlls/user/winpos.c @@ -36,7 +36,6 @@ #include "wine/server.h" #include "controls.h" #include "user_private.h" #include "win.h" -#include "winpos.h" #include "wine/debug.h"
WINE_DEFAULT_DEBUG_CHANNEL(win); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 6d7c595..2bc90a7 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -43,7 +43,6 @@ #include "x11drv.h" #include "wine/debug.h" #include "wine/server.h" #include "win.h" -#include "winpos.h" #include "mwm.h"
WINE_DEFAULT_DEBUG_CHANNEL(x11drv); diff --git a/dlls/winex11.drv/winpos.c b/dlls/winex11.drv/winpos.c index 80626b4..e17180a 100644 --- a/dlls/winex11.drv/winpos.c +++ b/dlls/winex11.drv/winpos.c @@ -38,7 +38,6 @@ #include "wine/wingdi16.h"
#include "x11drv.h" #include "win.h" -#include "winpos.h"
#include "wine/server.h" #include "wine/debug.h" diff --git a/include/win.h b/include/win.h index 85c6e7e..bc7a4cb 100644 --- a/include/win.h +++ b/include/win.h @@ -106,4 +106,13 @@ #define WND_DESKTOP ((WND *)2) /*
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 --git a/include/winpos.h b/include/winpos.h deleted file mode 100644 index ea3008f..0000000 --- a/include/winpos.h +++ /dev/null @@ -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 */ diff --git a/include/winuser.h b/include/winuser.h index e6c5a28..cd83c5a 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -3155,6 +3155,11 @@ #define SWP_NOSENDCHANGING 0x0400 #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)