mirror of
https://github.com/reactos/reactos.git
synced 2024-12-31 19:42:51 +00:00
some fixes
svn path=/trunk/; revision=7201
This commit is contained in:
parent
a0f8c6d8ff
commit
da73036e85
2 changed files with 17 additions and 16 deletions
|
@ -5,19 +5,19 @@
|
||||||
#define SWP_NOCLIENTMOVE 0x0800
|
#define SWP_NOCLIENTMOVE 0x0800
|
||||||
#define SWP_NOCLIENTSIZE 0x1000
|
#define SWP_NOCLIENTSIZE 0x1000
|
||||||
|
|
||||||
LRESULT STDCALL
|
LRESULT FASTCALL
|
||||||
WinPosGetNonClientSize(HWND Wnd, RECT* WindowRect, RECT* ClientRect);
|
WinPosGetNonClientSize(HWND Wnd, RECT* WindowRect, RECT* ClientRect);
|
||||||
UINT STDCALL
|
UINT FASTCALL
|
||||||
WinPosGetMinMaxInfo(PWINDOW_OBJECT Window, POINT* MaxSize, POINT* MaxPos,
|
WinPosGetMinMaxInfo(PWINDOW_OBJECT Window, POINT* MaxSize, POINT* MaxPos,
|
||||||
POINT* MinTrack, POINT* MaxTrack);
|
POINT* MinTrack, POINT* MaxTrack);
|
||||||
UINT STDCALL
|
UINT FASTCALL
|
||||||
WinPosMinMaximize(PWINDOW_OBJECT WindowObject, UINT ShowFlag, RECT* NewPos);
|
WinPosMinMaximize(PWINDOW_OBJECT WindowObject, UINT ShowFlag, RECT* NewPos);
|
||||||
BOOLEAN STDCALL
|
BOOLEAN FASTCALL
|
||||||
WinPosSetWindowPos(HWND Wnd, HWND WndInsertAfter, INT x, INT y, INT cx,
|
WinPosSetWindowPos(HWND Wnd, HWND WndInsertAfter, INT x, INT y, INT cx,
|
||||||
INT cy, UINT flags);
|
INT cy, UINT flags);
|
||||||
BOOLEAN FASTCALL
|
BOOLEAN FASTCALL
|
||||||
WinPosShowWindow(HWND Wnd, INT Cmd);
|
WinPosShowWindow(HWND Wnd, INT Cmd);
|
||||||
USHORT STDCALL
|
USHORT FASTCALL
|
||||||
WinPosWindowFromPoint(PWINDOW_OBJECT ScopeWin, POINT WinPoint,
|
WinPosWindowFromPoint(PWINDOW_OBJECT ScopeWin, POINT WinPoint,
|
||||||
PWINDOW_OBJECT* Window);
|
PWINDOW_OBJECT* Window);
|
||||||
VOID FASTCALL WinPosActivateOtherWindow(PWINDOW_OBJECT Window);
|
VOID FASTCALL WinPosActivateOtherWindow(PWINDOW_OBJECT Window);
|
||||||
|
|
|
@ -16,7 +16,7 @@
|
||||||
* along with this program; if not, write to the Free Software
|
* along with this program; if not, write to the Free Software
|
||||||
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
||||||
*/
|
*/
|
||||||
/* $Id: winpos.c,v 1.65 2003/12/23 20:40:00 weiden Exp $
|
/* $Id: winpos.c,v 1.66 2003/12/23 21:13:00 weiden Exp $
|
||||||
*
|
*
|
||||||
* COPYRIGHT: See COPYING in the top level directory
|
* COPYRIGHT: See COPYING in the top level directory
|
||||||
* PROJECT: ReactOS kernel
|
* PROJECT: ReactOS kernel
|
||||||
|
@ -183,6 +183,7 @@ WinPosInitInternalPos(PWINDOW_OBJECT WindowObject, POINT pt, PRECT RestoreRect)
|
||||||
WindowObject->InternalPos = ExAllocatePool(NonPagedPool, sizeof(INTERNALPOS));
|
WindowObject->InternalPos = ExAllocatePool(NonPagedPool, sizeof(INTERNALPOS));
|
||||||
if(!WindowObject->InternalPos)
|
if(!WindowObject->InternalPos)
|
||||||
{
|
{
|
||||||
|
DPRINT1("Failed to allocate INTERNALPOS structure for window 0x%x\n", WindowObject->Self);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
WindowObject->InternalPos->IconTitle = 0;
|
WindowObject->InternalPos->IconTitle = 0;
|
||||||
|
@ -226,7 +227,7 @@ WinPosInitInternalPos(PWINDOW_OBJECT WindowObject, POINT pt, PRECT RestoreRect)
|
||||||
return(WindowObject->InternalPos);
|
return(WindowObject->InternalPos);
|
||||||
}
|
}
|
||||||
|
|
||||||
UINT STDCALL
|
UINT FASTCALL
|
||||||
WinPosMinMaximize(PWINDOW_OBJECT WindowObject, UINT ShowFlag, RECT* NewPos)
|
WinPosMinMaximize(PWINDOW_OBJECT WindowObject, UINT ShowFlag, RECT* NewPos)
|
||||||
{
|
{
|
||||||
POINT Size;
|
POINT Size;
|
||||||
|
@ -312,7 +313,7 @@ WinPosMinMaximize(PWINDOW_OBJECT WindowObject, UINT ShowFlag, RECT* NewPos)
|
||||||
{
|
{
|
||||||
if (!(WindowObject->Style & WS_MAXIMIZE))
|
if (!(WindowObject->Style & WS_MAXIMIZE))
|
||||||
{
|
{
|
||||||
return(-1);
|
return 0;
|
||||||
}
|
}
|
||||||
WindowObject->Style &= ~WS_MAXIMIZE;
|
WindowObject->Style &= ~WS_MAXIMIZE;
|
||||||
*NewPos = InternalPos->NormalRect;
|
*NewPos = InternalPos->NormalRect;
|
||||||
|
@ -330,7 +331,7 @@ WinPosMinMaximize(PWINDOW_OBJECT WindowObject, UINT ShowFlag, RECT* NewPos)
|
||||||
return(SwpFlags);
|
return(SwpFlags);
|
||||||
}
|
}
|
||||||
|
|
||||||
UINT STDCALL
|
UINT FASTCALL
|
||||||
WinPosGetMinMaxInfo(PWINDOW_OBJECT Window, POINT* MaxSize, POINT* MaxPos,
|
WinPosGetMinMaxInfo(PWINDOW_OBJECT Window, POINT* MaxSize, POINT* MaxPos,
|
||||||
POINT* MinTrack, POINT* MaxTrack)
|
POINT* MinTrack, POINT* MaxTrack)
|
||||||
{
|
{
|
||||||
|
@ -424,7 +425,7 @@ WinPosChangeActiveWindow(HWND hWnd, BOOL MouseMsg)
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
LONG STATIC STDCALL
|
LONG STATIC FASTCALL
|
||||||
WinPosDoNCCALCSize(PWINDOW_OBJECT Window, PWINDOWPOS WinPos,
|
WinPosDoNCCALCSize(PWINDOW_OBJECT Window, PWINDOWPOS WinPos,
|
||||||
RECT* WindowRect, RECT* ClientRect)
|
RECT* WindowRect, RECT* ClientRect)
|
||||||
{
|
{
|
||||||
|
@ -494,7 +495,7 @@ WinPosDoNCCALCSize(PWINDOW_OBJECT Window, PWINDOWPOS WinPos,
|
||||||
return wvrFlags;
|
return wvrFlags;
|
||||||
}
|
}
|
||||||
|
|
||||||
BOOL STDCALL
|
BOOL FASTCALL
|
||||||
WinPosDoWinPosChanging(PWINDOW_OBJECT WindowObject,
|
WinPosDoWinPosChanging(PWINDOW_OBJECT WindowObject,
|
||||||
PWINDOWPOS WinPos,
|
PWINDOWPOS WinPos,
|
||||||
PRECT WindowRect,
|
PRECT WindowRect,
|
||||||
|
@ -617,7 +618,7 @@ WinPosDoOwnedPopups(HWND hWnd, HWND hWndInsertAfter)
|
||||||
* Update WindowRect and ClientRect of Window and all of its children
|
* Update WindowRect and ClientRect of Window and all of its children
|
||||||
* We keep both WindowRect and ClientRect in screen coordinates internally
|
* We keep both WindowRect and ClientRect in screen coordinates internally
|
||||||
*/
|
*/
|
||||||
static VOID
|
VOID STATIC FASTCALL
|
||||||
WinPosInternalMoveWindow(PWINDOW_OBJECT Window, INT MoveX, INT MoveY)
|
WinPosInternalMoveWindow(PWINDOW_OBJECT Window, INT MoveX, INT MoveY)
|
||||||
{
|
{
|
||||||
PWINDOW_OBJECT Child;
|
PWINDOW_OBJECT Child;
|
||||||
|
@ -744,7 +745,7 @@ WinPosFixupFlags(WINDOWPOS *WinPos, PWINDOW_OBJECT Window)
|
||||||
}
|
}
|
||||||
|
|
||||||
/* x and y are always screen relative */
|
/* x and y are always screen relative */
|
||||||
BOOLEAN STDCALL
|
BOOLEAN FASTCALL
|
||||||
WinPosSetWindowPos(HWND Wnd, HWND WndInsertAfter, INT x, INT y, INT cx,
|
WinPosSetWindowPos(HWND Wnd, HWND WndInsertAfter, INT x, INT y, INT cx,
|
||||||
INT cy, UINT flags)
|
INT cy, UINT flags)
|
||||||
{
|
{
|
||||||
|
@ -1077,7 +1078,7 @@ WinPosSetWindowPos(HWND Wnd, HWND WndInsertAfter, INT x, INT y, INT cx,
|
||||||
return TRUE;
|
return TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
LRESULT STDCALL
|
LRESULT FASTCALL
|
||||||
WinPosGetNonClientSize(HWND Wnd, RECT* WindowRect, RECT* ClientRect)
|
WinPosGetNonClientSize(HWND Wnd, RECT* WindowRect, RECT* ClientRect)
|
||||||
{
|
{
|
||||||
*ClientRect = *WindowRect;
|
*ClientRect = *WindowRect;
|
||||||
|
@ -1273,7 +1274,7 @@ WinPosPtInWindow(PWINDOW_OBJECT Window, POINT Point)
|
||||||
Point.y < Window->WindowRect.bottom);
|
Point.y < Window->WindowRect.bottom);
|
||||||
}
|
}
|
||||||
|
|
||||||
USHORT STATIC STDCALL
|
USHORT STATIC FASTCALL
|
||||||
WinPosSearchChildren(PWINDOW_OBJECT ScopeWin, POINT Point,
|
WinPosSearchChildren(PWINDOW_OBJECT ScopeWin, POINT Point,
|
||||||
PWINDOW_OBJECT* Window)
|
PWINDOW_OBJECT* Window)
|
||||||
{
|
{
|
||||||
|
@ -1324,7 +1325,7 @@ WinPosSearchChildren(PWINDOW_OBJECT ScopeWin, POINT Point,
|
||||||
return(0);
|
return(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
USHORT STDCALL
|
USHORT FASTCALL
|
||||||
WinPosWindowFromPoint(PWINDOW_OBJECT ScopeWin, POINT WinPoint,
|
WinPosWindowFromPoint(PWINDOW_OBJECT ScopeWin, POINT WinPoint,
|
||||||
PWINDOW_OBJECT* Window)
|
PWINDOW_OBJECT* Window)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue