Release 960516
Thu May 16 13:35:31 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [*/*.c]
Renamed RECT, POINT and SIZE structures to RECT16, POINT16 and
SIZE16. Implemented Win32 version of most functions that take
these types as parameters.
* [configure]
Patched autoconf to attempt to correctly detect -lnsl and
-lsocket. Please check this out.
* [controls/button.c]
Added support for Win32 BM_* messages.
* [controls/menu.c]
Avoid sending extra WM_MENUSELECT messages. This avoids crashes
with Excel.
* [memory.heap.c] [include/heap.h]
Added support for SEGPTRs in Win32 heaps. Added a few macros to
make using SEGPTRs easier. They are a bit slower than MAKE_SEGPTR,
but they work with Win32.
* [memory/atom.c]
Implemented Win32 atom functions.
* [memory/local.c]
Fixed LocalReAlloc() changes to avoid copying the whole block twice.
* [win32/memory.c]
Use /dev/zero instead of MAP_ANON for VirtualAlloc().
* [windows/class.c]
Properly implemented the Win32 class functions.
* [windows/winproc.c] (New file)
New file handling the message translation between Win16 and Win32.
Mon May 13 18:00:00 1996 Alex Korobka <alex@phm30.pharm.sunysb.edu>
* [windows/mdi.c] [windows/menu.c]
Improved WM_MDICREATE and WM_MDICASCADE handling.
* [windows/event.c] [objects/bitblt.c]
Handle GraphicsExpose event for BitBlt from screen to screen.
* [windows/event.c] [windows/win.c] [windows/nonclient.c]
Bunch of fixes for problems with -managed.
* [windows/win.c] [windows/winpos.c]
Changed conditions for WM_SIZE, WM_MOVE, and WM_GETMINMAXINFO
in CreateWindow.
* [windows/win.c] [windows/queue.c] [misc/user.c]
Do not send WM_PARENTNOTIFY when in AppExit and call WH_SHELL
on window creation/destruction.
* [objects/palette.c]
Crude RealizePalette(). At least something is visible in LviewPro.
Sun May 12 02:05:00 1996 Thomas Sandford <t.d.g.sandford@prds-grn.demon.co.uk>
* [if1632/gdi32.spec]
Added Rectangle (use win16 version).
* [if1632/kernel32.spec]
Added GetWindowsDirectoryA (use win16 GetWindowsDirectory).
* [if1632/user32.spec]
Added GetSubMenu, MoveWindow, SetScrollPos, SetScrollRange (use win16
versions).
Added SetWindowsHookExA (empty stub for now).
* [include/handle32.h]
Changed #include <malloc.h> to #include <stdlib.h> to prevent
hate message from FreeBSD compiler.
* [win32/newfns.c]
Added new function SetWindowsHookEx32A (empty stub for now).
* [win32/user32.c]
Removed redundant debugging printf statement.
Sun May 12 01:24:57 1996 Huw D. M. Davies <h.davies1@physics.oxford.ac.uk>
* [memory/local.c]
Avoid creating adjacent free blocks.
Free the block in LocalReAlloc() before allocating a new one.
Fixed LocalReAlloc() for discarded blocks.
Fri May 10 23:05:12 1996 Jukka Iivonen <iivonen@cc.helsinki.fi>
* [resources/sysres_Fi.rc]
ChooseFont and ChooseColor dialogs updated.
Fri May 10 17:19:33 1996 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [files/drive.c,if1632/kernel.spec]
GetCurrentDirectory(),SetCurrentDirectory() implemented.
* [if1632/advapi32.spec] [if1632/kernel.spec] [if1632/shell.spec]
[include/windows.h] [include/winreg.h] [loader/main.c]
[misc/main.c] [misc/shell.c] [misc/registry.c]
Registry fixes:
- loads win95 registry databases,
- save only updated keys on default,
- now adhers to the new function naming standard,
- minor cleanups.
Tue May 7 22:36:13 1996 Albrecht Kleine <kleine@ak.sax.de>
* [combo.c]
Added WM_COMMAND-handling for interaction between EDIT and COMBOLBOX
and synchronized mine with Greg Kreider's works.
* [commdlg.c]
Bugfix in ChooseFont: font size handling.
diff --git a/misc/rect.c b/misc/rect.c
index 68eb462..61d76c2 100644
--- a/misc/rect.c
+++ b/misc/rect.c
@@ -1,7 +1,7 @@
/*
* Rectangle-related functions
*
- * Copyright 1993 Alexandre Julliard
+ * Copyright 1993, 1996 Alexandre Julliard
*
*/
@@ -9,9 +9,9 @@
/***********************************************************************
- * SetRect (USER.72)
+ * SetRect16 (USER.72)
*/
-void SetRect( LPRECT rect, short left, short top, short right, short bottom )
+void SetRect16(LPRECT16 rect, INT16 left, INT16 top, INT16 right, INT16 bottom)
{
rect->left = left;
rect->right = right;
@@ -21,18 +21,39 @@
/***********************************************************************
- * SetRectEmpty (USER.73)
+ * SetRect32 (USER32.498)
*/
-void SetRectEmpty( LPRECT rect )
+void 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 SetRectEmpty16( LPRECT16 rect )
{
rect->left = rect->right = rect->top = rect->bottom = 0;
}
/***********************************************************************
- * CopyRect (USER.74)
+ * SetRectEmpty32 (USER32.499)
*/
-BOOL CopyRect( LPRECT dest, LPRECT src )
+void SetRectEmpty32( LPRECT32 rect )
+{
+ rect->left = rect->right = rect->top = rect->bottom = 0;
+}
+
+
+/***********************************************************************
+ * CopyRect16 (USER.74)
+ */
+BOOL16 CopyRect16( RECT16 *dest, const RECT16 *src )
{
*dest = *src;
return TRUE;
@@ -40,18 +61,37 @@
/***********************************************************************
- * IsRectEmpty (USER.75)
+ * CopyRect32 (USER32.61)
*/
-BOOL IsRectEmpty( LPRECT rect )
+BOOL32 CopyRect32( RECT32 *dest, const RECT32 *src )
+{
+ *dest = *src;
+ return TRUE;
+}
+
+
+/***********************************************************************
+ * IsRectEmpty16 (USER.75)
+ */
+BOOL16 IsRectEmpty16( const RECT16 *rect )
{
return ((rect->left == rect->right) || (rect->top == rect->bottom));
}
/***********************************************************************
- * PtInRect (USER.76)
+ * IsRectEmpty32 (USER32.346)
*/
-BOOL PtInRect( LPRECT rect, POINT pt )
+BOOL32 IsRectEmpty32( const RECT32 *rect )
+{
+ return ((rect->left == rect->right) || (rect->top == rect->bottom));
+}
+
+
+/***********************************************************************
+ * PtInRect16 (USER.76)
+ */
+BOOL16 PtInRect16( const RECT16 *rect, POINT16 pt )
{
return ((pt.x >= rect->left) && (pt.x < rect->right) &&
(pt.y >= rect->top) && (pt.y < rect->bottom));
@@ -59,9 +99,19 @@
/***********************************************************************
- * OffsetRect (USER.77)
+ * PtInRect32 (USER32.423)
*/
-void OffsetRect( LPRECT rect, short x, short y )
+BOOL32 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 OffsetRect16( LPRECT16 rect, INT16 x, INT16 y )
{
rect->left += x;
rect->right += x;
@@ -71,9 +121,21 @@
/***********************************************************************
- * InflateRect (USER.78)
+ * OffsetRect32 (USER32.405)
*/
-void InflateRect( LPRECT rect, short x, short y )
+void OffsetRect32( LPRECT32 rect, INT32 x, INT32 y )
+{
+ rect->left += x;
+ rect->right += x;
+ rect->top += y;
+ rect->bottom += y;
+}
+
+
+/***********************************************************************
+ * InflateRect16 (USER.78)
+ */
+void InflateRect16( LPRECT16 rect, INT16 x, INT16 y )
{
rect->left -= x;
rect->top -= y;
@@ -83,15 +145,27 @@
/***********************************************************************
- * IntersectRect (USER.79)
+ * InflateRect32 (USER32.320)
*/
-BOOL IntersectRect( LPRECT dest, LPRECT src1, LPRECT src2 )
+void InflateRect32( LPRECT32 rect, INT32 x, INT32 y )
{
- if (IsRectEmpty(src1) || IsRectEmpty(src2) ||
+ rect->left -= x;
+ rect->top -= y;
+ rect->right += x;
+ rect->bottom += y;
+}
+
+
+/***********************************************************************
+ * IntersectRect16 (USER.79)
+ */
+BOOL16 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))
{
- SetRectEmpty( dest );
+ SetRectEmpty16( dest );
return FALSE;
}
dest->left = MAX( src1->left, src2->left );
@@ -103,22 +177,42 @@
/***********************************************************************
- * UnionRect (USER.80)
+ * IntersectRect32 (USER32.326)
*/
-BOOL UnionRect( LPRECT dest, LPRECT src1, LPRECT src2 )
+BOOL32 IntersectRect32( LPRECT32 dest, const RECT32 *src1, const RECT32 *src2 )
{
- if (IsRectEmpty(src1))
+ if (IsRectEmpty32(src1) || IsRectEmpty32(src2) ||
+ (src1->left >= src2->right) || (src2->left >= src1->right) ||
+ (src1->top >= src2->bottom) || (src2->top >= src1->bottom))
{
- if (IsRectEmpty(src2))
+ 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 UnionRect16( LPRECT16 dest, const RECT16 *src1, const RECT16 *src2 )
+{
+ if (IsRectEmpty16(src1))
+ {
+ if (IsRectEmpty16(src2))
{
- SetRectEmpty( dest );
+ SetRectEmpty16( dest );
return FALSE;
}
else *dest = *src2;
}
else
{
- if (IsRectEmpty(src2)) *dest = *src1;
+ if (IsRectEmpty16(src2)) *dest = *src1;
else
{
dest->left = MIN( src1->left, src2->left );
@@ -132,9 +226,38 @@
/***********************************************************************
- * EqualRect (USER.244)
+ * UnionRect32 (USER32.558)
*/
-BOOL EqualRect( const RECT* rect1, const RECT* rect2 )
+BOOL32 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 EqualRect16( const RECT16* rect1, const RECT16* rect2 )
{
return ((rect1->left == rect2->left) && (rect1->right == rect2->right) &&
(rect1->top == rect2->top) && (rect1->bottom == rect2->bottom));
@@ -142,23 +265,33 @@
/***********************************************************************
- * SubtractRect (USER.373)
+ * EqualRect32 (USER32.193)
*/
-BOOL SubtractRect( LPRECT dest, LPRECT src1, LPRECT src2 )
+BOOL32 EqualRect32( const RECT32* rect1, const RECT32* rect2 )
{
- RECT tmp;
+ return ((rect1->left == rect2->left) && (rect1->right == rect2->right) &&
+ (rect1->top == rect2->top) && (rect1->bottom == rect2->bottom));
+}
- if (IsRectEmpty( src1 ))
+
+/***********************************************************************
+ * SubtractRect16 (USER.373)
+ */
+BOOL16 SubtractRect16( LPRECT16 dest, const RECT16 *src1, const RECT16 *src2 )
+{
+ RECT16 tmp;
+
+ if (IsRectEmpty16( src1 ))
{
- SetRectEmpty( dest );
+ SetRectEmpty16( dest );
return FALSE;
}
*dest = *src1;
- if (IntersectRect( &tmp, src1, src2 ))
+ if (IntersectRect16( &tmp, src1, src2 ))
{
- if (EqualRect( &tmp, dest ))
+ if (EqualRect16( &tmp, dest ))
{
- SetRectEmpty( dest );
+ SetRectEmpty16( dest );
return FALSE;
}
if ((tmp.top == dest->top) && (tmp.bottom == dest->bottom))
@@ -175,3 +308,37 @@
return TRUE;
}
+
+/***********************************************************************
+ * SubtractRect32 (USER32.535)
+ */
+BOOL32 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;
+}
