Skip to content

W
wine-cw
Commit 6de70abd authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Moved 16-bit rectangle functions to user16.c.

parent f51736cb
Hide whitespace changes
Inline Side-by-side
Showing with 174 additions and 175 deletions
dlls/user/user16.c
View file @ 6de70abd
/*
* Misc 16-bit USER functions
*
* Copyright 1993, 1996 Alexandre Julliard
* Copyright 2002 Patrik Stridvall
*
* This library is free software; you can redistribute it and/or
......@@ -178,6 +179,133 @@ INT16 WINAPI ShowCursor16(BOOL16 bShow)
/***********************************************************************
* SetRect (USER.72)
*/
void WINAPI SetRect16( LPRECT16 rect, INT16 left, INT16 top, INT16 right, INT16 bottom )
{
rect->left = left;
rect->right = right;
rect->top = top;
rect->bottom = bottom;
}
/***********************************************************************
* SetRectEmpty (USER.73)
*/
void WINAPI SetRectEmpty16( LPRECT16 rect )
{
rect->left = rect->right = rect->top = rect->bottom = 0;
}
/***********************************************************************
* CopyRect (USER.74)
*/
BOOL16 WINAPI CopyRect16( RECT16 *dest, const RECT16 *src )
{
*dest = *src;
return TRUE;
}
/***********************************************************************
* IsRectEmpty (USER.75)
*
* Bug compat: Windows checks for 0 or negative width/height.
*/
BOOL16 WINAPI IsRectEmpty16( const RECT16 *rect )
{
return ((rect->left >= rect->right) || (rect->top >= rect->bottom));
}
/***********************************************************************
* PtInRect (USER.76)
*/
BOOL16 WINAPI PtInRect16( const RECT16 *rect, POINT16 pt )
{
return ((pt.x >= rect->left) && (pt.x < rect->right) &&
(pt.y >= rect->top) && (pt.y < rect->bottom));
}
/***********************************************************************
* OffsetRect (USER.77)
*/
void WINAPI OffsetRect16( LPRECT16 rect, INT16 x, INT16 y )
{
rect->left += x;
rect->right += x;
rect->top += y;
rect->bottom += y;
}
/***********************************************************************
* InflateRect (USER.78)
*/
void WINAPI InflateRect16( LPRECT16 rect, INT16 x, INT16 y )
{
rect->left -= x;
rect->top -= y;
rect->right += x;
rect->bottom += y;
}
/***********************************************************************
* IntersectRect (USER.79)
*/
BOOL16 WINAPI IntersectRect16( LPRECT16 dest, const RECT16 *src1,
const RECT16 *src2 )
{
if (IsRectEmpty16(src1) || IsRectEmpty16(src2) ||
(src1->left >= src2->right) || (src2->left >= src1->right) ||
(src1->top >= src2->bottom) || (src2->top >= src1->bottom))
{
SetRectEmpty16( dest );
return FALSE;
}
dest->left = max( src1->left, src2->left );
dest->right = min( src1->right, src2->right );
dest->top = max( src1->top, src2->top );
dest->bottom = min( src1->bottom, src2->bottom );
return TRUE;
}
/***********************************************************************
* UnionRect (USER.80)
*/
BOOL16 WINAPI UnionRect16( LPRECT16 dest, const RECT16 *src1,
const RECT16 *src2 )
{
if (IsRectEmpty16(src1))
{
if (IsRectEmpty16(src2))
{
SetRectEmpty16( dest );
return FALSE;
}
else *dest = *src2;
}
else
{
if (IsRectEmpty16(src2)) *dest = *src1;
else
{
dest->left = min( src1->left, src2->left );
dest->right = max( src1->right, src2->right );
dest->top = min( src1->top, src2->top );
dest->bottom = max( src1->bottom, src2->bottom );
}
}
return TRUE;
}
/***********************************************************************
* FillRect (USER.81)
* NOTE
* The Win16 variant doesn't support special color brushes like
......@@ -618,6 +746,16 @@ WORD WINAPI GetSystemDebugState16(void)
/***********************************************************************
* EqualRect (USER.244)
*/
BOOL16 WINAPI EqualRect16( const RECT16* rect1, const RECT16* rect2 )
{
return ((rect1->left == rect2->left) && (rect1->right == rect2->right) &&
(rect1->top == rect2->top) && (rect1->bottom == rect2->bottom));
}
/***********************************************************************
* ExitWindowsExec (USER.246)
*/
BOOL16 WINAPI ExitWindowsExec16( LPCSTR lpszExe, LPCSTR lpszParams )
......@@ -821,6 +959,42 @@ BOOL16 WINAPI DCHook16( HDC16 hdc, WORD code, DWORD data, LPARAM lParam )
}
/***********************************************************************
* SubtractRect (USER.373)
*/
BOOL16 WINAPI SubtractRect16( LPRECT16 dest, const RECT16 *src1,
const RECT16 *src2 )
{
RECT16 tmp;
if (IsRectEmpty16( src1 ))
{
SetRectEmpty16( dest );
return FALSE;
}
*dest = *src1;
if (IntersectRect16( &tmp, src1, src2 ))
{
if (EqualRect16( &tmp, dest ))
{
SetRectEmpty16( dest );
return FALSE;
}
if ((tmp.top == dest->top) && (tmp.bottom == dest->bottom))
{
if (tmp.left == dest->left) dest->left = tmp.right;
else if (tmp.right == dest->right) dest->right = tmp.left;
}
else if ((tmp.left == dest->left) && (tmp.right == dest->right))
{
if (tmp.top == dest->top) dest->top = tmp.bottom;
else if (tmp.bottom == dest->bottom) dest->bottom = tmp.top;
}
}
return TRUE;
}
/**********************************************************************
* SetMenuContextHelpId (USER.384)
*/
......
windows/rect.c
View file @ 6de70abd
......@@ -23,23 +23,9 @@
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "wine/winuser16.h"
#include "winuser.h"
/***********************************************************************
* SetRect (USER.72)
*/
void WINAPI SetRect16( LPRECT16 rect, INT16 left, INT16 top,
INT16 right, INT16 bottom )
{
rect->left = left;
rect->right = right;
rect->top = top;
rect->bottom = bottom;
}
/***********************************************************************
* SetRect (USER32.@)
*/
BOOL WINAPI SetRect( LPRECT rect, INT left, INT top,
......@@ -55,15 +41,6 @@ BOOL WINAPI SetRect( LPRECT rect, INT left, INT top,
/***********************************************************************
* SetRectEmpty (USER.73)
*/
void WINAPI SetRectEmpty16( LPRECT16 rect )
{
rect->left = rect->right = rect->top = rect->bottom = 0;
}
/***********************************************************************
* SetRectEmpty (USER32.@)
*/
BOOL WINAPI SetRectEmpty( LPRECT rect )
......@@ -75,16 +52,6 @@ BOOL WINAPI SetRectEmpty( LPRECT rect )
/***********************************************************************
* CopyRect (USER.74)
*/
BOOL16 WINAPI CopyRect16( RECT16 *dest, const RECT16 *src )
{
*dest = *src;
return TRUE;
}
/***********************************************************************
* CopyRect (USER32.@)
*/
BOOL WINAPI CopyRect( RECT *dest, const RECT *src )
......@@ -97,17 +64,6 @@ BOOL WINAPI CopyRect( RECT *dest, const RECT *src )
/***********************************************************************
* IsRectEmpty (USER.75)
*
* Bug compat: Windows checks for 0 or negative width/height.
*/
BOOL16 WINAPI IsRectEmpty16( const RECT16 *rect )
{
return ((rect->left >= rect->right) || (rect->top >= rect->bottom));
}
/***********************************************************************
* IsRectEmpty (USER32.@)
*
* Bug compat: Windows checks for 0 or negative width/height.
......@@ -120,16 +76,6 @@ BOOL WINAPI IsRectEmpty( const RECT *rect )
/***********************************************************************
* PtInRect (USER.76)
*/
BOOL16 WINAPI PtInRect16( const RECT16 *rect, POINT16 pt )
{
return ((pt.x >= rect->left) && (pt.x < rect->right) &&
(pt.y >= rect->top) && (pt.y < rect->bottom));
}
/***********************************************************************
* PtInRect (USER32.@)
*/
BOOL WINAPI PtInRect( const RECT *rect, POINT pt )
......@@ -141,18 +87,6 @@ BOOL WINAPI PtInRect( const RECT *rect, POINT pt )
/***********************************************************************
* OffsetRect (USER.77)
*/
void WINAPI OffsetRect16( LPRECT16 rect, INT16 x, INT16 y )
{
rect->left += x;
rect->right += x;
rect->top += y;
rect->bottom += y;
}
/***********************************************************************
* OffsetRect (USER32.@)
*/
BOOL WINAPI OffsetRect( LPRECT rect, INT x, INT y )
......@@ -167,18 +101,6 @@ BOOL WINAPI OffsetRect( LPRECT rect, INT x, INT y )
/***********************************************************************
* InflateRect (USER.78)
*/
void WINAPI InflateRect16( LPRECT16 rect, INT16 x, INT16 y )
{
rect->left -= x;
rect->top -= y;
rect->right += x;
rect->bottom += y;
}
/***********************************************************************
* InflateRect (USER32.@)
*/
BOOL WINAPI InflateRect( LPRECT rect, INT x, INT y )
......@@ -193,27 +115,6 @@ BOOL WINAPI InflateRect( LPRECT rect, INT x, INT y )
/***********************************************************************
* IntersectRect (USER.79)
*/
BOOL16 WINAPI IntersectRect16( LPRECT16 dest, const RECT16 *src1,
const RECT16 *src2 )
{
if (IsRectEmpty16(src1) || IsRectEmpty16(src2) ||
(src1->left >= src2->right) || (src2->left >= src1->right) ||
(src1->top >= src2->bottom) || (src2->top >= src1->bottom))
{
SetRectEmpty16( dest );
return FALSE;
}
dest->left = max( src1->left, src2->left );
dest->right = min( src1->right, src2->right );
dest->top = max( src1->top, src2->top );
dest->bottom = min( src1->bottom, src2->bottom );
return TRUE;
}
/***********************************************************************
* IntersectRect (USER32.@)
*/
BOOL WINAPI IntersectRect( LPRECT dest, const RECT *src1,
......@@ -236,36 +137,6 @@ BOOL WINAPI IntersectRect( LPRECT dest, const RECT *src1,
/***********************************************************************
* UnionRect (USER.80)
*/
BOOL16 WINAPI UnionRect16( LPRECT16 dest, const RECT16 *src1,
const RECT16 *src2 )
{
if (IsRectEmpty16(src1))
{
if (IsRectEmpty16(src2))
{
SetRectEmpty16( dest );
return FALSE;
}
else *dest = *src2;
}
else
{
if (IsRectEmpty16(src2)) *dest = *src1;
else
{
dest->left = min( src1->left, src2->left );
dest->right = max( src1->right, src2->right );
dest->top = min( src1->top, src2->top );
dest->bottom = max( src1->bottom, src2->bottom );
}
}
return TRUE;
}
/***********************************************************************
* UnionRect (USER32.@)
*/
BOOL WINAPI UnionRect( LPRECT dest, const RECT *src1,
......@@ -297,16 +168,6 @@ BOOL WINAPI UnionRect( LPRECT dest, const RECT *src1,
/***********************************************************************
* EqualRect (USER.244)
*/
BOOL16 WINAPI EqualRect16( const RECT16* rect1, const RECT16* rect2 )
{
return ((rect1->left == rect2->left) && (rect1->right == rect2->right) &&
(rect1->top == rect2->top) && (rect1->bottom == rect2->bottom));
}
/***********************************************************************
* EqualRect (USER32.@)
*/
BOOL WINAPI EqualRect( const RECT* rect1, const RECT* rect2 )
......@@ -318,42 +179,6 @@ BOOL WINAPI EqualRect( const RECT* rect1, const RECT* rect2 )
/***********************************************************************
* SubtractRect (USER.373)
*/
BOOL16 WINAPI SubtractRect16( LPRECT16 dest, const RECT16 *src1,
const RECT16 *src2 )
{
RECT16 tmp;
if (IsRectEmpty16( src1 ))
{
SetRectEmpty16( dest );
return FALSE;
}
*dest = *src1;
if (IntersectRect16( &tmp, src1, src2 ))
{
if (EqualRect16( &tmp, dest ))
{
SetRectEmpty16( dest );
return FALSE;
}
if ((tmp.top == dest->top) && (tmp.bottom == dest->bottom))
{
if (tmp.left == dest->left) dest->left = tmp.right;
else if (tmp.right == dest->right) dest->right = tmp.left;
}
else if ((tmp.left == dest->left) && (tmp.right == dest->right))
{
if (tmp.top == dest->top) dest->top = tmp.bottom;
else if (tmp.bottom == dest->bottom) dest->bottom = tmp.top;
}
}
return TRUE;
}
/***********************************************************************
* SubtractRect (USER32.@)
*/
BOOL WINAPI SubtractRect( LPRECT dest, const RECT *src1,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment