mirror of
git://source.winehq.org/git/wine.git
synced 2024-11-05 18:01:34 +00:00
c7c217b31c
Sun Apr 12 12:22:23 1997 Andreas Mohr <100.30936@germany.net> * [files/drive.c] Fixed "no free space" problem with partition sizes between 1 and 2 GB (cluster_sectors may not exceed 0x40). * [windows/msgbox.c] [if1632/user.spec] [include/windows.h] Implemented MessageBoxIndirect16, corrected MSGBOXPARAMS16. * [loader/task.c] DOS environment strings may never exceed 127 chars -> truncate Unix environment strings if necessary. Sun Apr 12 02:51:44 1998 Dimitrie O. Paun <dimi@mail.cs.toronto.edu> * [files/*.c] All fprintf statements were converted to appropriate debug messages. * [tools/find_debug_channels] Updated comments at the beginning of the file. Sat Apr 11 15:27:21 1998 Alexandre Julliard <julliard@lrc.epfl.ch> * [loader/module.c] [loader/task.c] [scheduler/process.c] Moved some code around to prepare the ground for CreateProcess(). * [memory/environ.c] [loader/task.c] Moved Win32 environment strings functions to environ.c. Unified Win16 and Win32 environment management. * [scheduler/handle.c] [scheduler/k32obj.c] [scheduler/*.c] Implemented handle inheritance and DuplicateHandle(). * [scheduler/thread.c] Create a 16-bit stack for all threads. * [windows/dialog.c] Implemented DIALOGEX resource format. Fri Apr 10 20:21:51 1998 Marcus Meissner <marcus@mud.de> * [configure.in][include/acconfig.h][*/*][multimedia/*] Cleaned up the OSS detection stuff, added some more checks for headerfiles/functions. Removed a lot of OS specific #ifdefs. Lots of dependend multimedia cleanups. * [loader/pe_image.c] Enhanced comment, added missing reference count increase. * [ole/compobj.c] Replaced broken StringFromGUID2 by working one. * [misc/winsock.c] SO_LINGER uses unsigned 16 bit in Win16 and Win32, but unsigned int (32bit) for UNIX. * [memory/global.c] Allow realloc for lockcount 1 too. Fri Apr 10 15:27:34 1998 Morten Welinder <terra@diku.dk> * [graphics/x11drv/text.c] Handle control characters in trace. Ignore terminating newline. * [multimedia/init.c] (MULTIMEDIA_Init): Correct allocations. * [tools/examine-relay] Tidy up. * [windows/syscolor.c] Change highlight colour from lightblue to lightgray. This looks correct for menus. Fri Apr 10 01:49:58 1998 Douglas Ridgway <ridgway@winehq.com> * [configure.in] [Make.rules.in] Add check for c2man before using it. Fri Apr 10 02:59:21 1998 Douglas Ridgway <ridgway@winehq.com> * [DEVELOPERS-HINTS] Simple description of adding API calls. * [include/wintypes.h] [include/windows.h] Get rid of Winelib16, avoid declaring some illegal functions in Winelib, add prototypes for some enhanced metafile functions, fix GetTextExtentPoint32 declarations. * [relay32/gdi32.spec] [objects/enhmetafile.c] Cosmetic and functional improvements. * [include/wincon.h] [programs/view/*] Fixes, improved compatibility with native compilers. Thu Apr 9 15:48:49 1998 Ulrich Weigand <weigand@informatik.uni-erlangen.de> * [win32/kernel32.c] Implemented FT_Thunk / FT_Prolog / FT_Exit / FT_PrologPrime. Fixed Common32ThkLS thunk function. * [tools/build.c] [relay32/relay386.c] [if1632/relay.c] Changed relay code to allow register functions to modify stack layout. * [memory/selector.c] Implemented AllocMappedBuffer / FreeMappedBuffer. * [relay32/kernel32.spec] [if1632/kernel.spec] [win32/ordinals.c] Added names for undocumented functions. * [loader/module.c] Bugfix: LoadLibrary16 should *not* silently load 32-bit DLL. Thu Apr 9 03:54:58 1998 Jim Peterson <jspeter@birch.ee.vt.edu> * [windows/keyboard.c] Fix an erroneous test in TranslateAccelerator{16,32} for the end of the accelerator table. Thu Apr 8 20:36:28 1998 Uwe Bonnes <bon@elektron.ikp.physik.tu-darmstadt.de> * [misc/crtdll.c] Implement getenv. * [misc/commdlg.c] Make Get[Save/Open]FileName work in most situations. * [misc/lstr.c] Use wvsprintf32A instead of vsprintf in FormatMessage32X * [misc/version] Make NT3.50 a recognised version * [graphics/x11drv/graphics.c] Change the algorithme to draw arcs * [loader/resource.c] Return an empty buffer in LoadString32A if no resource found. * [win32/code_page.c] Try harder to get the right size in MultiByteToWideChar. * [win32/process.c] Call WinExec32 for CreateProcess32A. * [windows/user.c] Install default Int0 Handler in InitApp(). Thu Apr 8 19:29:48 1998 Eric Kohl <ekohl@abo.rhein-zeitung.de> * [misc/imagelist.c] Preliminary fix for drawing selected images. Various improvements. * [controls/progress.c][include/progress.c][include/commctrl.h] Added progress bar messages and styles for IE4.01 (dll version 4.72) compatibility. Fixed led size problem. * [controls/updown.c][include/commctrl.h] Added UDM_GETRANGE32 and UDM_SETRANGE32. * [objects/oembitmaps.c][include/windows.h][include/bitmaps/*] Added Win95 icons and fixed Win95 cursor and restore button bug. Now they should be visible. Sorry!!! * [relay32/comctl32.spec] Added most missing function names. Tue Apr 6 18:48:36 1998 Matthew Becker <mbecker@glasscity.net> * [objects/font.c] [if1632/gdi.spec] GetOutlineTextMetrics: stub * [objects/text.c] GetTextCharset should just call GetTextCharsetInfo. * [misc/mpr.c] [relay32/mpr.spec] WNetCachePassword: stub * [scheduler/thread.c] [relay32/user32.spec] AttachThreadInput: stub Updated documentation. * [objects/palette.c] Updated documentation. Tue Mar 31 17:06:30 1998 James Juran <jrj120@psu.edu> * [*/*.c] Finished fixing USER32 ordinal numbers in function documentation. Mon Mar 30 20:27:38 1998 Morten Welinder <terra@diku.dk> * [misc/debugstr.c] [include/debugstr.h] Moved _dumpstr from relay32/relay386.c. Improved control character handling. * [msdos/int21.c] Implement 215E00 -- get machine name. * [windows/winpos.c] SetWindowPos32: Make an extra sync when mapping managed windows. This makes sure the reconfigure event has been handled. See Mshearts' what's-your-name window. Mon Mar 30 01:13:50 1998 Alexander V. Lukyanov <lav@long.yar.ru> * [Makefile.in] Install includes from TOPSRCDIR.
352 lines
8.9 KiB
C
352 lines
8.9 KiB
C
/*
|
|
* Rectangle-related functions
|
|
*
|
|
* Copyright 1993, 1996 Alexandre Julliard
|
|
*
|
|
*/
|
|
|
|
#include "windows.h"
|
|
|
|
|
|
/***********************************************************************
|
|
* SetRect16 (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;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* SetRect32 (USER32.499)
|
|
*/
|
|
void WINAPI SetRect32( LPRECT32 rect, INT32 left, INT32 top,
|
|
INT32 right, INT32 bottom )
|
|
{
|
|
rect->left = left;
|
|
rect->right = right;
|
|
rect->top = top;
|
|
rect->bottom = bottom;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* SetRectEmpty16 (USER.73)
|
|
*/
|
|
void WINAPI SetRectEmpty16( LPRECT16 rect )
|
|
{
|
|
rect->left = rect->right = rect->top = rect->bottom = 0;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* SetRectEmpty32 (USER32.500)
|
|
*/
|
|
void WINAPI SetRectEmpty32( LPRECT32 rect )
|
|
{
|
|
rect->left = rect->right = rect->top = rect->bottom = 0;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* CopyRect16 (USER.74)
|
|
*/
|
|
BOOL16 WINAPI CopyRect16( RECT16 *dest, const RECT16 *src )
|
|
{
|
|
*dest = *src;
|
|
return TRUE;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* CopyRect32 (USER32.62)
|
|
*/
|
|
BOOL32 WINAPI CopyRect32( RECT32 *dest, const RECT32 *src )
|
|
{
|
|
*dest = *src;
|
|
return TRUE;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* IsRectEmpty16 (USER.75)
|
|
*/
|
|
BOOL16 WINAPI IsRectEmpty16( const RECT16 *rect )
|
|
{
|
|
return ((rect->left == rect->right) || (rect->top == rect->bottom));
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* IsRectEmpty32 (USER32.347)
|
|
*/
|
|
BOOL32 WINAPI IsRectEmpty32( const RECT32 *rect )
|
|
{
|
|
return ((rect->left == rect->right) || (rect->top == rect->bottom));
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* PtInRect16 (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));
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* PtInRect32 (USER32.424)
|
|
*/
|
|
BOOL32 WINAPI PtInRect32( const RECT32 *rect, POINT32 pt )
|
|
{
|
|
return ((pt.x >= rect->left) && (pt.x < rect->right) &&
|
|
(pt.y >= rect->top) && (pt.y < rect->bottom));
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* OffsetRect16 (USER.77)
|
|
*/
|
|
void WINAPI OffsetRect16( LPRECT16 rect, INT16 x, INT16 y )
|
|
{
|
|
rect->left += x;
|
|
rect->right += x;
|
|
rect->top += y;
|
|
rect->bottom += y;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* OffsetRect32 (USER32.406)
|
|
*/
|
|
void WINAPI OffsetRect32( LPRECT32 rect, INT32 x, INT32 y )
|
|
{
|
|
rect->left += x;
|
|
rect->right += x;
|
|
rect->top += y;
|
|
rect->bottom += y;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* InflateRect16 (USER.78)
|
|
*/
|
|
void WINAPI InflateRect16( LPRECT16 rect, INT16 x, INT16 y )
|
|
{
|
|
rect->left -= x;
|
|
rect->top -= y;
|
|
rect->right += x;
|
|
rect->bottom += y;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* InflateRect32 (USER32.321)
|
|
*/
|
|
void WINAPI InflateRect32( LPRECT32 rect, INT32 x, INT32 y )
|
|
{
|
|
rect->left -= x;
|
|
rect->top -= y;
|
|
rect->right += x;
|
|
rect->bottom += y;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* IntersectRect16 (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;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* IntersectRect32 (USER32.327)
|
|
*/
|
|
BOOL32 WINAPI IntersectRect32( LPRECT32 dest, const RECT32 *src1,
|
|
const RECT32 *src2 )
|
|
{
|
|
if (IsRectEmpty32(src1) || IsRectEmpty32(src2) ||
|
|
(src1->left >= src2->right) || (src2->left >= src1->right) ||
|
|
(src1->top >= src2->bottom) || (src2->top >= src1->bottom))
|
|
{
|
|
SetRectEmpty32( 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;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* UnionRect16 (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;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* UnionRect32 (USER32.559)
|
|
*/
|
|
BOOL32 WINAPI UnionRect32( LPRECT32 dest, const RECT32 *src1,
|
|
const RECT32 *src2 )
|
|
{
|
|
if (IsRectEmpty32(src1))
|
|
{
|
|
if (IsRectEmpty32(src2))
|
|
{
|
|
SetRectEmpty32( dest );
|
|
return FALSE;
|
|
}
|
|
else *dest = *src2;
|
|
}
|
|
else
|
|
{
|
|
if (IsRectEmpty32(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;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* EqualRect16 (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));
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* EqualRect32 (USER32.194)
|
|
*/
|
|
BOOL32 WINAPI EqualRect32( const RECT32* rect1, const RECT32* rect2 )
|
|
{
|
|
return ((rect1->left == rect2->left) && (rect1->right == rect2->right) &&
|
|
(rect1->top == rect2->top) && (rect1->bottom == rect2->bottom));
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* SubtractRect16 (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;
|
|
}
|
|
|
|
|
|
/***********************************************************************
|
|
* SubtractRect32 (USER32.536)
|
|
*/
|
|
BOOL32 WINAPI SubtractRect32( LPRECT32 dest, const RECT32 *src1,
|
|
const RECT32 *src2 )
|
|
{
|
|
RECT32 tmp;
|
|
|
|
if (IsRectEmpty32( src1 ))
|
|
{
|
|
SetRectEmpty32( dest );
|
|
return FALSE;
|
|
}
|
|
*dest = *src1;
|
|
if (IntersectRect32( &tmp, src1, src2 ))
|
|
{
|
|
if (EqualRect32( &tmp, dest ))
|
|
{
|
|
SetRectEmpty32( 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;
|
|
}
|