1993-09-04 12:09:32 +02:00
|
|
|
/*
|
1998-01-18 19:01:49 +01:00
|
|
|
* GDI region objects. Shamelessly ripped out from the X11 distribution
|
|
|
|
* Thanks for the nice licence.
|
1993-09-04 12:09:32 +02:00
|
|
|
*
|
1995-01-24 17:21:01 +01:00
|
|
|
* Copyright 1993, 1994, 1995 Alexandre Julliard
|
1998-01-18 19:01:49 +01:00
|
|
|
* Modifications and additions: Copyright 1998 Huw Davies
|
1999-03-28 11:37:57 +02:00
|
|
|
* 1999 Alex Korobka
|
1997-06-16 19:43:53 +02:00
|
|
|
*
|
2002-03-10 00:29:33 +01:00
|
|
|
* 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
|
2006-05-18 14:49:52 +02:00
|
|
|
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
|
1995-01-24 17:21:01 +01:00
|
|
|
*/
|
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
/************************************************************************
|
|
|
|
|
|
|
|
Copyright (c) 1987, 1988 X Consortium
|
|
|
|
|
|
|
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
of this software and associated documentation files (the "Software"), to deal
|
|
|
|
in the Software without restriction, including without limitation the rights
|
|
|
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
copies of the Software, and to permit persons to whom the Software is
|
|
|
|
furnished to do so, subject to the following conditions:
|
|
|
|
|
|
|
|
The above copyright notice and this permission notice shall be included in
|
|
|
|
all copies or substantial portions of the Software.
|
|
|
|
|
|
|
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
|
|
X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
|
|
|
|
AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
|
|
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
|
|
|
|
|
|
|
Except as contained in this notice, the name of the X Consortium shall not be
|
|
|
|
used in advertising or otherwise to promote the sale, use or other dealings
|
|
|
|
in this Software without prior written authorization from the X Consortium.
|
|
|
|
|
|
|
|
|
|
|
|
Copyright 1987, 1988 by Digital Equipment Corporation, Maynard, Massachusetts.
|
|
|
|
|
|
|
|
All Rights Reserved
|
|
|
|
|
2002-06-01 01:06:46 +02:00
|
|
|
Permission to use, copy, modify, and distribute this software and its
|
|
|
|
documentation for any purpose and without fee is hereby granted,
|
1998-01-18 19:01:49 +01:00
|
|
|
provided that the above copyright notice appear in all copies and that
|
2002-06-01 01:06:46 +02:00
|
|
|
both that copyright notice and this permission notice appear in
|
1998-01-18 19:01:49 +01:00
|
|
|
supporting documentation, and that the name of Digital not be
|
|
|
|
used in advertising or publicity pertaining to distribution of the
|
2002-06-01 01:06:46 +02:00
|
|
|
software without specific, written prior permission.
|
1998-01-18 19:01:49 +01:00
|
|
|
|
|
|
|
DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
|
|
|
|
ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
|
|
|
|
DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
|
|
|
|
ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
|
|
|
|
WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
|
|
|
|
ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
|
|
|
|
SOFTWARE.
|
|
|
|
|
|
|
|
************************************************************************/
|
|
|
|
/*
|
|
|
|
* The functions in this file implement the Region abstraction, similar to one
|
|
|
|
* used in the X11 sample server. A Region is simply an area, as the name
|
|
|
|
* implies, and is implemented as a "y-x-banded" array of rectangles. To
|
|
|
|
* explain: Each Region is made up of a certain number of rectangles sorted
|
|
|
|
* by y coordinate first, and then by x coordinate.
|
|
|
|
*
|
|
|
|
* Furthermore, the rectangles are banded such that every rectangle with a
|
|
|
|
* given upper-left y coordinate (y1) will have the same lower-right y
|
|
|
|
* coordinate (y2) and vice versa. If a rectangle has scanlines in a band, it
|
|
|
|
* will span the entire vertical distance of the band. This means that some
|
|
|
|
* areas that could be merged into a taller rectangle will be represented as
|
|
|
|
* several shorter rectangles to account for shorter rectangles to its left
|
|
|
|
* or right but within its "vertical scope".
|
|
|
|
*
|
|
|
|
* An added constraint on the rectangles is that they must cover as much
|
|
|
|
* horizontal area as possible. E.g. no two rectangles in a band are allowed
|
|
|
|
* to touch.
|
|
|
|
*
|
|
|
|
* Whenever possible, bands will be merged together to cover a greater vertical
|
|
|
|
* distance (and thus reduce the number of rectangles). Two bands can be merged
|
|
|
|
* only if the bottom of one touches the top of the other and they have
|
|
|
|
* rectangles in the same places (of the same width, of course). This maintains
|
|
|
|
* the y-x-banding that's so nice to have...
|
|
|
|
*/
|
|
|
|
|
2003-09-06 01:08:26 +02:00
|
|
|
#include <stdarg.h>
|
1999-02-28 13:27:56 +01:00
|
|
|
#include <stdlib.h>
|
|
|
|
#include <string.h>
|
2000-02-10 20:03:02 +01:00
|
|
|
#include "windef.h"
|
2003-09-06 01:08:26 +02:00
|
|
|
#include "winbase.h"
|
2000-02-10 20:03:02 +01:00
|
|
|
#include "wingdi.h"
|
2004-01-15 01:35:38 +01:00
|
|
|
#include "gdi_private.h"
|
2002-05-31 20:43:22 +02:00
|
|
|
#include "wine/debug.h"
|
1998-01-18 19:01:49 +01:00
|
|
|
|
2002-03-10 00:29:33 +01:00
|
|
|
WINE_DEFAULT_DEBUG_CHANNEL(region);
|
1999-04-19 16:56:29 +02:00
|
|
|
|
2002-05-26 00:16:12 +02:00
|
|
|
/* GDI logical region object */
|
2002-05-31 20:43:22 +02:00
|
|
|
typedef struct
|
2002-05-26 00:16:12 +02:00
|
|
|
{
|
|
|
|
GDIOBJHDR header;
|
2009-01-29 16:38:53 +01:00
|
|
|
WINEREGION rgn;
|
2002-05-26 00:16:12 +02:00
|
|
|
} RGNOBJ;
|
|
|
|
|
|
|
|
|
2007-09-27 20:14:13 +02:00
|
|
|
static HGDIOBJ REGION_SelectObject( HGDIOBJ handle, HDC hdc );
|
2009-01-27 16:19:37 +01:00
|
|
|
static BOOL REGION_DeleteObject( HGDIOBJ handle );
|
2002-05-31 20:43:22 +02:00
|
|
|
|
|
|
|
static const struct gdi_obj_funcs region_funcs =
|
|
|
|
{
|
|
|
|
REGION_SelectObject, /* pSelectObject */
|
|
|
|
NULL, /* pGetObjectA */
|
|
|
|
NULL, /* pGetObjectW */
|
|
|
|
NULL, /* pUnrealizeObject */
|
|
|
|
REGION_DeleteObject /* pDeleteObject */
|
|
|
|
};
|
|
|
|
|
2000-02-16 23:47:24 +01:00
|
|
|
/* 1 if two RECTs overlap.
|
|
|
|
* 0 if two RECTs do not overlap.
|
|
|
|
*/
|
|
|
|
#define EXTENTCHECK(r1, r2) \
|
|
|
|
((r1)->right > (r2)->left && \
|
|
|
|
(r1)->left < (r2)->right && \
|
|
|
|
(r1)->bottom > (r2)->top && \
|
|
|
|
(r1)->top < (r2)->bottom)
|
|
|
|
|
2001-04-23 20:11:41 +02:00
|
|
|
|
2009-01-29 17:44:58 +01:00
|
|
|
static BOOL add_rect( WINEREGION *reg, INT left, INT top, INT right, INT bottom )
|
|
|
|
{
|
|
|
|
RECT *rect;
|
|
|
|
if (reg->numRects >= reg->size)
|
|
|
|
{
|
|
|
|
RECT *newrects = HeapReAlloc( GetProcessHeap(), 0, reg->rects, 2 * sizeof(RECT) * reg->size );
|
|
|
|
if (!newrects) return FALSE;
|
|
|
|
reg->rects = newrects;
|
2001-04-23 20:11:41 +02:00
|
|
|
reg->size *= 2;
|
|
|
|
}
|
2009-01-29 17:44:58 +01:00
|
|
|
rect = reg->rects + reg->numRects++;
|
|
|
|
rect->left = left;
|
|
|
|
rect->top = top;
|
|
|
|
rect->right = right;
|
|
|
|
rect->bottom = bottom;
|
|
|
|
return TRUE;
|
2001-04-23 20:11:41 +02:00
|
|
|
}
|
|
|
|
|
2009-01-29 17:44:58 +01:00
|
|
|
#define EMPTY_REGION(pReg) do { \
|
2000-02-16 23:47:24 +01:00
|
|
|
(pReg)->numRects = 0; \
|
|
|
|
(pReg)->extents.left = (pReg)->extents.top = 0; \
|
|
|
|
(pReg)->extents.right = (pReg)->extents.bottom = 0; \
|
2009-01-29 17:44:58 +01:00
|
|
|
} while(0)
|
2000-02-16 23:47:24 +01:00
|
|
|
|
|
|
|
#define INRECT(r, x, y) \
|
|
|
|
( ( ((r).right > x)) && \
|
|
|
|
( ((r).left <= x)) && \
|
|
|
|
( ((r).bottom > y)) && \
|
|
|
|
( ((r).top <= y)) )
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* number of points to buffer before sending them off
|
|
|
|
* to scanlines() : Must be an even number
|
|
|
|
*/
|
|
|
|
#define NUMPTSTOBUFFER 200
|
|
|
|
|
|
|
|
/*
|
|
|
|
* used to allocate buffers for points and link
|
|
|
|
* the buffers together
|
|
|
|
*/
|
|
|
|
|
|
|
|
typedef struct _POINTBLOCK {
|
|
|
|
POINT pts[NUMPTSTOBUFFER];
|
|
|
|
struct _POINTBLOCK *next;
|
|
|
|
} POINTBLOCK;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This file contains a few macros to help track
|
|
|
|
* the edge of a filled object. The object is assumed
|
|
|
|
* to be filled in scanline order, and thus the
|
|
|
|
* algorithm used is an extension of Bresenham's line
|
|
|
|
* drawing algorithm which assumes that y is always the
|
|
|
|
* major axis.
|
|
|
|
* Since these pieces of code are the same for any filled shape,
|
|
|
|
* it is more convenient to gather the library in one
|
|
|
|
* place, but since these pieces of code are also in
|
|
|
|
* the inner loops of output primitives, procedure call
|
|
|
|
* overhead is out of the question.
|
|
|
|
* See the author for a derivation if needed.
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* In scan converting polygons, we want to choose those pixels
|
|
|
|
* which are inside the polygon. Thus, we add .5 to the starting
|
|
|
|
* x coordinate for both left and right edges. Now we choose the
|
|
|
|
* first pixel which is inside the pgon for the left edge and the
|
|
|
|
* first pixel which is outside the pgon for the right edge.
|
|
|
|
* Draw the left pixel, but not the right.
|
|
|
|
*
|
|
|
|
* How to add .5 to the starting x coordinate:
|
|
|
|
* If the edge is moving to the right, then subtract dy from the
|
|
|
|
* error term from the general form of the algorithm.
|
|
|
|
* If the edge is moving to the left, then add dy to the error term.
|
|
|
|
*
|
|
|
|
* The reason for the difference between edges moving to the left
|
|
|
|
* and edges moving to the right is simple: If an edge is moving
|
|
|
|
* to the right, then we want the algorithm to flip immediately.
|
|
|
|
* If it is moving to the left, then we don't want it to flip until
|
|
|
|
* we traverse an entire pixel.
|
|
|
|
*/
|
|
|
|
#define BRESINITPGON(dy, x1, x2, xStart, d, m, m1, incr1, incr2) { \
|
|
|
|
int dx; /* local storage */ \
|
|
|
|
\
|
|
|
|
/* \
|
|
|
|
* if the edge is horizontal, then it is ignored \
|
|
|
|
* and assumed not to be processed. Otherwise, do this stuff. \
|
|
|
|
*/ \
|
|
|
|
if ((dy) != 0) { \
|
|
|
|
xStart = (x1); \
|
|
|
|
dx = (x2) - xStart; \
|
|
|
|
if (dx < 0) { \
|
|
|
|
m = dx / (dy); \
|
|
|
|
m1 = m - 1; \
|
|
|
|
incr1 = -2 * dx + 2 * (dy) * m1; \
|
|
|
|
incr2 = -2 * dx + 2 * (dy) * m; \
|
|
|
|
d = 2 * m * (dy) - 2 * dx - 2 * (dy); \
|
|
|
|
} else { \
|
|
|
|
m = dx / (dy); \
|
|
|
|
m1 = m + 1; \
|
|
|
|
incr1 = 2 * dx - 2 * (dy) * m1; \
|
|
|
|
incr2 = 2 * dx - 2 * (dy) * m; \
|
|
|
|
d = -2 * m * (dy) + 2 * dx; \
|
|
|
|
} \
|
|
|
|
} \
|
|
|
|
}
|
|
|
|
|
|
|
|
#define BRESINCRPGON(d, minval, m, m1, incr1, incr2) { \
|
|
|
|
if (m1 > 0) { \
|
|
|
|
if (d > 0) { \
|
|
|
|
minval += m1; \
|
|
|
|
d += incr1; \
|
|
|
|
} \
|
|
|
|
else { \
|
|
|
|
minval += m; \
|
|
|
|
d += incr2; \
|
|
|
|
} \
|
|
|
|
} else {\
|
|
|
|
if (d >= 0) { \
|
|
|
|
minval += m1; \
|
|
|
|
d += incr1; \
|
|
|
|
} \
|
|
|
|
else { \
|
|
|
|
minval += m; \
|
|
|
|
d += incr2; \
|
|
|
|
} \
|
|
|
|
} \
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This structure contains all of the information needed
|
|
|
|
* to run the bresenham algorithm.
|
|
|
|
* The variables may be hardcoded into the declarations
|
|
|
|
* instead of using this structure to make use of
|
|
|
|
* register declarations.
|
|
|
|
*/
|
|
|
|
typedef struct {
|
|
|
|
INT minor_axis; /* minor axis */
|
|
|
|
INT d; /* decision variable */
|
|
|
|
INT m, m1; /* slope and slope+1 */
|
|
|
|
INT incr1, incr2; /* error increments */
|
|
|
|
} BRESINFO;
|
|
|
|
|
|
|
|
|
|
|
|
#define BRESINITPGONSTRUCT(dmaj, min1, min2, bres) \
|
|
|
|
BRESINITPGON(dmaj, min1, min2, bres.minor_axis, bres.d, \
|
|
|
|
bres.m, bres.m1, bres.incr1, bres.incr2)
|
|
|
|
|
|
|
|
#define BRESINCRPGONSTRUCT(bres) \
|
|
|
|
BRESINCRPGON(bres.d, bres.minor_axis, bres.m, bres.m1, bres.incr1, bres.incr2)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* These are the data structures needed to scan
|
|
|
|
* convert regions. Two different scan conversion
|
|
|
|
* methods are available -- the even-odd method, and
|
|
|
|
* the winding number method.
|
|
|
|
* The even-odd rule states that a point is inside
|
|
|
|
* the polygon if a ray drawn from that point in any
|
|
|
|
* direction will pass through an odd number of
|
|
|
|
* path segments.
|
|
|
|
* By the winding number rule, a point is decided
|
|
|
|
* to be inside the polygon if a ray drawn from that
|
|
|
|
* point in any direction passes through a different
|
|
|
|
* number of clockwise and counter-clockwise path
|
|
|
|
* segments.
|
|
|
|
*
|
|
|
|
* These data structures are adapted somewhat from
|
|
|
|
* the algorithm in (Foley/Van Dam) for scan converting
|
|
|
|
* polygons.
|
|
|
|
* The basic algorithm is to start at the top (smallest y)
|
|
|
|
* of the polygon, stepping down to the bottom of
|
|
|
|
* the polygon by incrementing the y coordinate. We
|
|
|
|
* keep a list of edges which the current scanline crosses,
|
|
|
|
* sorted by x. This list is called the Active Edge Table (AET)
|
2002-06-01 01:06:46 +02:00
|
|
|
* As we change the y-coordinate, we update each entry in
|
2000-02-16 23:47:24 +01:00
|
|
|
* in the active edge table to reflect the edges new xcoord.
|
|
|
|
* This list must be sorted at each scanline in case
|
|
|
|
* two edges intersect.
|
|
|
|
* We also keep a data structure known as the Edge Table (ET),
|
|
|
|
* which keeps track of all the edges which the current
|
|
|
|
* scanline has not yet reached. The ET is basically a
|
|
|
|
* list of ScanLineList structures containing a list of
|
|
|
|
* edges which are entered at a given scanline. There is one
|
|
|
|
* ScanLineList per scanline at which an edge is entered.
|
|
|
|
* When we enter a new edge, we move it from the ET to the AET.
|
|
|
|
*
|
|
|
|
* From the AET, we can implement the even-odd rule as in
|
|
|
|
* (Foley/Van Dam).
|
|
|
|
* The winding number rule is a little trickier. We also
|
|
|
|
* keep the EdgeTableEntries in the AET linked by the
|
|
|
|
* nextWETE (winding EdgeTableEntry) link. This allows
|
|
|
|
* the edges to be linked just as before for updating
|
|
|
|
* purposes, but only uses the edges linked by the nextWETE
|
|
|
|
* link as edges representing spans of the polygon to
|
|
|
|
* drawn (as with the even-odd rule).
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* for the winding number rule
|
|
|
|
*/
|
|
|
|
#define CLOCKWISE 1
|
2002-06-01 01:06:46 +02:00
|
|
|
#define COUNTERCLOCKWISE -1
|
2000-02-16 23:47:24 +01:00
|
|
|
|
|
|
|
typedef struct _EdgeTableEntry {
|
|
|
|
INT ymax; /* ycoord at which we exit this edge. */
|
|
|
|
BRESINFO bres; /* Bresenham info to run the edge */
|
|
|
|
struct _EdgeTableEntry *next; /* next in the list */
|
|
|
|
struct _EdgeTableEntry *back; /* for insertion sort */
|
|
|
|
struct _EdgeTableEntry *nextWETE; /* for winding num rule */
|
|
|
|
int ClockWise; /* flag for winding number rule */
|
|
|
|
} EdgeTableEntry;
|
|
|
|
|
|
|
|
|
|
|
|
typedef struct _ScanLineList{
|
|
|
|
INT scanline; /* the scanline represented */
|
|
|
|
EdgeTableEntry *edgelist; /* header node */
|
|
|
|
struct _ScanLineList *next; /* next in the list */
|
|
|
|
} ScanLineList;
|
|
|
|
|
|
|
|
|
|
|
|
typedef struct {
|
|
|
|
INT ymax; /* ymax for the polygon */
|
|
|
|
INT ymin; /* ymin for the polygon */
|
|
|
|
ScanLineList scanlines; /* header node */
|
|
|
|
} EdgeTable;
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Here is a struct to help with storage allocation
|
|
|
|
* so we can allocate a big chunk at a time, and then take
|
|
|
|
* pieces from this heap when we need to.
|
|
|
|
*/
|
|
|
|
#define SLLSPERBLOCK 25
|
|
|
|
|
|
|
|
typedef struct _ScanLineListBlock {
|
|
|
|
ScanLineList SLLs[SLLSPERBLOCK];
|
|
|
|
struct _ScanLineListBlock *next;
|
|
|
|
} ScanLineListBlock;
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
*
|
|
|
|
* a few macros for the inner loops of the fill code where
|
|
|
|
* performance considerations don't allow a procedure call.
|
|
|
|
*
|
|
|
|
* Evaluate the given edge at the given scanline.
|
|
|
|
* If the edge has expired, then we leave it and fix up
|
|
|
|
* the active edge table; otherwise, we increment the
|
|
|
|
* x value to be ready for the next scanline.
|
|
|
|
* The winding number rule is in effect, so we must notify
|
|
|
|
* the caller when the edge has been removed so he
|
|
|
|
* can reorder the Winding Active Edge Table.
|
|
|
|
*/
|
|
|
|
#define EVALUATEEDGEWINDING(pAET, pPrevAET, y, fixWAET) { \
|
|
|
|
if (pAET->ymax == y) { /* leaving this edge */ \
|
|
|
|
pPrevAET->next = pAET->next; \
|
|
|
|
pAET = pPrevAET->next; \
|
|
|
|
fixWAET = 1; \
|
|
|
|
if (pAET) \
|
|
|
|
pAET->back = pPrevAET; \
|
|
|
|
} \
|
|
|
|
else { \
|
|
|
|
BRESINCRPGONSTRUCT(pAET->bres); \
|
|
|
|
pPrevAET = pAET; \
|
|
|
|
pAET = pAET->next; \
|
|
|
|
} \
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Evaluate the given edge at the given scanline.
|
|
|
|
* If the edge has expired, then we leave it and fix up
|
|
|
|
* the active edge table; otherwise, we increment the
|
|
|
|
* x value to be ready for the next scanline.
|
|
|
|
* The even-odd rule is in effect.
|
|
|
|
*/
|
|
|
|
#define EVALUATEEDGEEVENODD(pAET, pPrevAET, y) { \
|
|
|
|
if (pAET->ymax == y) { /* leaving this edge */ \
|
|
|
|
pPrevAET->next = pAET->next; \
|
|
|
|
pAET = pPrevAET->next; \
|
|
|
|
if (pAET) \
|
|
|
|
pAET->back = pPrevAET; \
|
|
|
|
} \
|
|
|
|
else { \
|
|
|
|
BRESINCRPGONSTRUCT(pAET->bres); \
|
|
|
|
pPrevAET = pAET; \
|
|
|
|
pAET = pAET->next; \
|
|
|
|
} \
|
|
|
|
}
|
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
/* Note the parameter order is different from the X11 equivalents */
|
|
|
|
|
2009-01-29 18:18:53 +01:00
|
|
|
static BOOL REGION_CopyRegion(WINEREGION *d, WINEREGION *s);
|
|
|
|
static BOOL REGION_OffsetRegion(WINEREGION *d, WINEREGION *s, INT x, INT y);
|
|
|
|
static BOOL REGION_IntersectRegion(WINEREGION *d, WINEREGION *s1, WINEREGION *s2);
|
|
|
|
static BOOL REGION_UnionRegion(WINEREGION *d, WINEREGION *s1, WINEREGION *s2);
|
|
|
|
static BOOL REGION_SubtractRegion(WINEREGION *d, WINEREGION *s1, WINEREGION *s2);
|
|
|
|
static BOOL REGION_XorRegion(WINEREGION *d, WINEREGION *s1, WINEREGION *s2);
|
|
|
|
static BOOL REGION_UnionRectWithRegion(const RECT *rect, WINEREGION *rgn);
|
1998-01-18 19:01:49 +01:00
|
|
|
|
1999-03-28 11:37:57 +02:00
|
|
|
#define RGN_DEFAULT_RECTS 2
|
1998-01-18 19:01:49 +01:00
|
|
|
|
2002-05-26 00:16:12 +02:00
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* get_region_type
|
|
|
|
*/
|
2007-03-20 18:42:59 +01:00
|
|
|
static inline INT get_region_type( const RGNOBJ *obj )
|
2002-05-26 00:16:12 +02:00
|
|
|
{
|
2009-01-29 16:38:53 +01:00
|
|
|
switch(obj->rgn.numRects)
|
2002-05-26 00:16:12 +02:00
|
|
|
{
|
|
|
|
case 0: return NULLREGION;
|
|
|
|
case 1: return SIMPLEREGION;
|
|
|
|
default: return COMPLEXREGION;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
/***********************************************************************
|
|
|
|
* REGION_DumpRegion
|
|
|
|
* Outputs the contents of a WINEREGION
|
|
|
|
*/
|
|
|
|
static void REGION_DumpRegion(WINEREGION *pReg)
|
|
|
|
{
|
1999-02-26 12:11:13 +01:00
|
|
|
RECT *pRect, *pRectEnd = pReg->rects + pReg->numRects;
|
1998-01-18 19:01:49 +01:00
|
|
|
|
2006-10-12 22:56:56 +02:00
|
|
|
TRACE("Region %p: %d,%d - %d,%d %d rects\n", pReg,
|
1998-01-18 19:01:49 +01:00
|
|
|
pReg->extents.left, pReg->extents.top,
|
|
|
|
pReg->extents.right, pReg->extents.bottom, pReg->numRects);
|
|
|
|
for(pRect = pReg->rects; pRect < pRectEnd; pRect++)
|
2006-10-12 22:56:56 +02:00
|
|
|
TRACE("\t%d,%d - %d,%d\n", pRect->left, pRect->top,
|
1998-01-18 19:01:49 +01:00
|
|
|
pRect->right, pRect->bottom);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
1999-03-28 11:37:57 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
/***********************************************************************
|
2009-01-29 16:38:53 +01:00
|
|
|
* init_region
|
|
|
|
*
|
|
|
|
* Initialize a new empty region.
|
1998-01-18 19:01:49 +01:00
|
|
|
*/
|
2009-01-29 16:38:53 +01:00
|
|
|
static BOOL init_region( WINEREGION *pReg, INT n )
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
2009-01-29 16:38:53 +01:00
|
|
|
if (!(pReg->rects = HeapAlloc(GetProcessHeap(), 0, n * sizeof( RECT )))) return FALSE;
|
|
|
|
pReg->size = n;
|
|
|
|
EMPTY_REGION(pReg);
|
|
|
|
return TRUE;
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
2009-01-29 16:38:53 +01:00
|
|
|
* destroy_region
|
1998-01-18 19:01:49 +01:00
|
|
|
*/
|
2009-01-29 16:38:53 +01:00
|
|
|
static void destroy_region( WINEREGION *pReg )
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
2000-02-16 23:47:24 +01:00
|
|
|
HeapFree( GetProcessHeap(), 0, pReg->rects );
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
1993-09-04 12:09:32 +02:00
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* REGION_DeleteObject
|
|
|
|
*/
|
2009-01-27 16:19:37 +01:00
|
|
|
static BOOL REGION_DeleteObject( HGDIOBJ handle )
|
1993-09-04 12:09:32 +02:00
|
|
|
{
|
2009-01-28 18:45:21 +01:00
|
|
|
RGNOBJ *rgn = free_gdi_handle( handle );
|
2002-05-31 20:43:22 +02:00
|
|
|
|
2009-01-27 16:19:37 +01:00
|
|
|
if (!rgn) return FALSE;
|
2009-01-29 16:38:53 +01:00
|
|
|
HeapFree( GetProcessHeap(), 0, rgn->rgn.rects );
|
2009-01-28 18:45:21 +01:00
|
|
|
HeapFree( GetProcessHeap(), 0, rgn );
|
|
|
|
return TRUE;
|
2002-05-31 20:43:22 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* REGION_SelectObject
|
|
|
|
*/
|
2007-09-27 20:14:13 +02:00
|
|
|
static HGDIOBJ REGION_SelectObject( HGDIOBJ handle, HDC hdc )
|
2002-05-31 20:43:22 +02:00
|
|
|
{
|
2007-05-30 10:51:47 +02:00
|
|
|
return ULongToHandle(SelectClipRgn( hdc, handle ));
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
|
|
|
|
1996-11-02 15:24:07 +01:00
|
|
|
|
2005-02-14 12:52:12 +01:00
|
|
|
/***********************************************************************
|
|
|
|
* REGION_OffsetRegion
|
|
|
|
* Offset a WINEREGION by x,y
|
|
|
|
*/
|
2009-01-29 18:18:53 +01:00
|
|
|
static BOOL REGION_OffsetRegion( WINEREGION *rgn, WINEREGION *srcrgn, INT x, INT y )
|
2005-02-14 12:52:12 +01:00
|
|
|
{
|
|
|
|
if( rgn != srcrgn)
|
2009-01-29 18:18:53 +01:00
|
|
|
{
|
|
|
|
if (!REGION_CopyRegion( rgn, srcrgn)) return FALSE;
|
|
|
|
}
|
2005-02-14 12:52:12 +01:00
|
|
|
if(x || y) {
|
|
|
|
int nbox = rgn->numRects;
|
|
|
|
RECT *pbox = rgn->rects;
|
|
|
|
|
|
|
|
if(nbox) {
|
|
|
|
while(nbox--) {
|
|
|
|
pbox->left += x;
|
|
|
|
pbox->right += x;
|
|
|
|
pbox->top += y;
|
|
|
|
pbox->bottom += y;
|
|
|
|
pbox++;
|
|
|
|
}
|
|
|
|
rgn->extents.left += x;
|
|
|
|
rgn->extents.right += x;
|
|
|
|
rgn->extents.top += y;
|
|
|
|
rgn->extents.bottom += y;
|
|
|
|
}
|
|
|
|
}
|
2009-01-29 18:18:53 +01:00
|
|
|
return TRUE;
|
2005-02-14 12:52:12 +01:00
|
|
|
}
|
|
|
|
|
1996-11-02 15:24:07 +01:00
|
|
|
/***********************************************************************
|
2001-02-15 00:11:17 +01:00
|
|
|
* OffsetRgn (GDI32.@)
|
2004-04-05 22:13:38 +02:00
|
|
|
*
|
|
|
|
* Moves a region by the specified X- and Y-axis offsets.
|
|
|
|
*
|
|
|
|
* PARAMS
|
|
|
|
* hrgn [I] Region to offset.
|
|
|
|
* x [I] Offset right if positive or left if negative.
|
|
|
|
* y [I] Offset down if positive or up if negative.
|
|
|
|
*
|
|
|
|
* RETURNS
|
|
|
|
* Success:
|
|
|
|
* NULLREGION - The new region is empty.
|
|
|
|
* SIMPLEREGION - The new region can be represented by one rectangle.
|
|
|
|
* COMPLEXREGION - The new region can only be represented by more than
|
|
|
|
* one rectangle.
|
|
|
|
* Failure: ERROR
|
1996-11-02 15:24:07 +01:00
|
|
|
*/
|
1999-02-26 12:11:13 +01:00
|
|
|
INT WINAPI OffsetRgn( HRGN hrgn, INT x, INT y )
|
1993-09-04 12:09:32 +02:00
|
|
|
{
|
2009-01-28 16:20:56 +01:00
|
|
|
RGNOBJ * obj = GDI_GetObjPtr( hrgn, OBJ_REGION );
|
2000-04-18 13:54:29 +02:00
|
|
|
INT ret;
|
Release 971116
Sun Nov 16 07:42:44 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c] [windows/clipboard.c] [windows/nonclient.c]
Bug fixes.
* [misc/shell.c] [resources/*]
New "About" dialog.
Sat Nov 15 17:30:18 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [configure.in] [Makefile.in]
Replaced --with-library option by --disable-emulator. The default
is now to build both the library and the emulator.
Renamed --with options to --enable to follow autoconf guidelines.
* [loader/main.c] [miscemu/main.c] (New file)
Split initialization in WinelibInit/EmulatorInit.
* [loader/*.c]
Removed all remaining #ifdef's WINELIB.
* [controls/widgets.c] [windows/mdi.c]
Converted MDIClientWndProc to 32-bit.
* [debugger/break.c] [if1632/signal.c] [include/selectors.h]
[scheduler/thread.c]
Code and data selector values are now computed at run-time.
* [library/libres.c]
Moved to loader/ directory.
* [misc/main.c] [misc/version.c] (New file)
Moved all version stuff to version.c. Cleaned up a bit.
* [msdos/dpmi.c]
Update the REALMODECALL structure on return from real-mode
interrupt.
* [windows/event.c] [windows/keyboard.c]
Changed the way event coordinates are determined. Don't rely on
the ConfigureNotify event values. This should fix all problems
with cursor position in -desktop and -managed modes.
Sat Nov 15 16:09:36 1997 Slaven Rezic <eserte@cs.tu-berlin.de>
* [controls/button.c]
(BUTTON_CheckAutoRadioButton): Prevent possible endless loop.
Wed Nov 12 03:42:45 1997 Chris Faherty <chrisf@america.com>
* [misc/ver.c]
Changed VerInstall32A to assume srcdir as destination if destdir
is blank. This was causing alot of DLL installation into SYSTEM
directory to fail.
* [loader/ne_image.c]
NE_LoadSegment buffer[100] was too small and getting overruns.
Changed it to buffer[200].
Sat Nov 8 06:09:57 1997 Len White <phreak@cgocable.net>
* [misc/ddeml.c] [include/ddeml.h] [if1632/ddeml.spec]
Added stub functions DdeConnectList(), DdeQueryNextServer(),
DdeDisconnectList(), DdeSetUserHandle(), DdeAbandonTransaction(),
DdePostAdvise(), DdeCreateDataHandle(), DdeAddData(), DdeGetData(),
DdeAccessData(), DdeUnaccessData(), DdeEnableCallback(),
DdeCmpStringHandles().
Fri Nov 7 19:44:26 1997 Olaf Flebbe <o.flebbe@science-computing.de>
* [files/directory.c]
Fix typo in directory.c [broke loading of cdplayer on nt40]
* [misc/main.c]
Implemented -winver nt40.
* [loader/resource.c] [user32.spec]
Stubs for CopyAcceleratorTable, Destroy AcceleratorTable.
Thu Nov 6 22:37:04 1997 Morten Welinder <welinder@rentec.com>
* [files/drive.c]
(GetDiskFreeSpace32A): Cap at 2GB.
* [include/windows.h]
Prototype DrawIconEx and CreateDIBSection32.
Define OBM_RADIOCHECK.
Add DI_* macros.
* [objects/dib.c] [if1632/gdi.spec]
CreateDIBSection is a WINAPI. Renamed to CreateDIBSection32.
Implement CreateDIBSection16.
* [if1632/user.spec] [if1632/user32.spec]
Add DrawIconEx.
* [objects/cursoricon.c]
(CopyIcon32): Fix bogus implementation.
* [objects/bitmap.c]
(CopyBitmap32): New function.
(CopyImage32): Do bitmaps.
* [graphics/x11drv/text.c]
(X11DRV_ExtTextOut): Change ascent and descent default to avoid
zero-thinkness overstrike line.
* [include/debugstr.h] [misc/debugstr.c]
New files.
* [msdos/dpmi.c]
Don't prototype do_mscdex. In INT_Int31Handler, handle real-mode
int 0x21, ah=0x52.
* [msdos/int2f.c]
Add dummys for 0x1681 and 0x1682.
* [misc/registry.c]
Fix memory leaks in RegDeleteKey32W.
* [objects/text.c]
In TEXT_NextLine, fix another off-by-one bug.
* [include/bitmaps/obm_radiocheck]
New file. (It a small circle used to radio-button menu items
when selected.)
* [objects/oembitmap.c]
Add obm_radiocheck.
* [include/windows.h] [if1632/user32.spec] [controls/menu.c]
[if1632/user.spec]
Define CheckMenuRadioItem{16,32}. Define GetMenuItemRect{16,32}.
Wed Nov 5 11:30:14 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [misc/main.c]
Auto adjust versions depending on binary.
Tue Nov 4 15:21:00 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [controls/listbox.c]
Paint full background in listbox items with tab stops enabled.
* [if1632/thunk.c]
Copy some more message parameter structures (DRAWITEMSTRUCT16,
COMPAREITEMSTRUCT16) to the stack segment to fix broken programs
that need this.
* [windows/dce.c]
Only clip sibling windows when the parent has the WS_CLIPSIBLINGS
style set.
* [windows/focus.c]
Make order of events in FOCUS_SwitchFocus() reflect API docs.
* [windows/defdlg.c]
Fix problem with loss of focus in some dialogs.
* [win32/code_page.c]
Fix return value for MultiByteToWideChar().
* [BUGS]
BCW now works.
1997-11-16 18:38:29 +01:00
|
|
|
|
2002-11-22 23:16:53 +01:00
|
|
|
TRACE("%p %d,%d\n", hrgn, x, y);
|
2000-04-18 13:54:29 +02:00
|
|
|
|
|
|
|
if (!obj)
|
|
|
|
return ERROR;
|
|
|
|
|
2009-01-29 16:38:53 +01:00
|
|
|
REGION_OffsetRegion( &obj->rgn, &obj->rgn, x, y);
|
2002-06-01 01:06:46 +02:00
|
|
|
|
2002-05-26 00:16:12 +02:00
|
|
|
ret = get_region_type( obj );
|
2000-08-19 23:38:55 +02:00
|
|
|
GDI_ReleaseObj( hrgn );
|
2000-04-18 13:54:29 +02:00
|
|
|
return ret;
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
2001-02-15 00:11:17 +01:00
|
|
|
* GetRgnBox (GDI32.@)
|
2004-04-05 22:13:38 +02:00
|
|
|
*
|
|
|
|
* Retrieves the bounding rectangle of the region. The bounding rectangle
|
|
|
|
* is the smallest rectangle that contains the entire region.
|
|
|
|
*
|
|
|
|
* PARAMS
|
|
|
|
* hrgn [I] Region to retrieve bounding rectangle from.
|
|
|
|
* rect [O] Rectangle that will receive the coordinates of the bounding
|
|
|
|
* rectangle.
|
|
|
|
*
|
|
|
|
* RETURNS
|
|
|
|
* NULLREGION - The new region is empty.
|
|
|
|
* SIMPLEREGION - The new region can be represented by one rectangle.
|
|
|
|
* COMPLEXREGION - The new region can only be represented by more than
|
|
|
|
* one rectangle.
|
1993-09-04 12:09:32 +02:00
|
|
|
*/
|
1999-02-26 12:11:13 +01:00
|
|
|
INT WINAPI GetRgnBox( HRGN hrgn, LPRECT rect )
|
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.
1996-05-16 20:21:06 +02:00
|
|
|
{
|
2009-01-28 16:20:56 +01:00
|
|
|
RGNOBJ * obj = GDI_GetObjPtr( hrgn, OBJ_REGION );
|
1998-01-18 19:01:49 +01:00
|
|
|
if (obj)
|
|
|
|
{
|
1999-02-26 12:11:13 +01:00
|
|
|
INT ret;
|
2009-01-29 16:38:53 +01:00
|
|
|
rect->left = obj->rgn.extents.left;
|
|
|
|
rect->top = obj->rgn.extents.top;
|
|
|
|
rect->right = obj->rgn.extents.right;
|
|
|
|
rect->bottom = obj->rgn.extents.bottom;
|
2006-10-12 22:56:56 +02:00
|
|
|
TRACE("%p (%d,%d-%d,%d)\n", hrgn,
|
2003-05-19 21:03:19 +02:00
|
|
|
rect->left, rect->top, rect->right, rect->bottom);
|
2002-05-26 00:16:12 +02:00
|
|
|
ret = get_region_type( obj );
|
2000-08-19 23:38:55 +02:00
|
|
|
GDI_ReleaseObj(hrgn);
|
1998-01-18 19:01:49 +01:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
return ERROR;
|
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.
1996-05-16 20:21:06 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1996-11-02 15:24:07 +01:00
|
|
|
/***********************************************************************
|
2001-02-15 00:11:17 +01:00
|
|
|
* CreateRectRgn (GDI32.@)
|
2004-04-05 22:13:38 +02:00
|
|
|
*
|
|
|
|
* Creates a simple rectangular region.
|
|
|
|
*
|
|
|
|
* PARAMS
|
|
|
|
* left [I] Left coordinate of rectangle.
|
|
|
|
* top [I] Top coordinate of rectangle.
|
|
|
|
* right [I] Right coordinate of rectangle.
|
|
|
|
* bottom [I] Bottom coordinate of rectangle.
|
|
|
|
*
|
|
|
|
* RETURNS
|
|
|
|
* Success: Handle to region.
|
|
|
|
* Failure: NULL.
|
1996-11-02 15:24:07 +01:00
|
|
|
*/
|
1999-02-26 12:11:13 +01:00
|
|
|
HRGN WINAPI CreateRectRgn(INT left, INT top, INT right, INT bottom)
|
1996-11-02 15:24:07 +01:00
|
|
|
{
|
1999-02-26 12:11:13 +01:00
|
|
|
HRGN hrgn;
|
2009-01-29 17:32:06 +01:00
|
|
|
RGNOBJ *obj;
|
1995-01-24 17:21:01 +01:00
|
|
|
|
2009-01-29 17:32:06 +01:00
|
|
|
if (!(obj = HeapAlloc( GetProcessHeap(), 0, sizeof(*obj) ))) return 0;
|
1999-03-28 11:37:57 +02:00
|
|
|
|
2009-01-29 17:32:06 +01:00
|
|
|
/* Allocate 2 rects by default to reduce the number of reallocs */
|
|
|
|
if (!init_region( &obj->rgn, RGN_DEFAULT_RECTS ))
|
|
|
|
{
|
|
|
|
HeapFree( GetProcessHeap(), 0, obj );
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
if (!(hrgn = alloc_gdi_handle( &obj->header, OBJ_REGION, ®ion_funcs )))
|
|
|
|
{
|
|
|
|
HeapFree( GetProcessHeap(), 0, obj->rgn.rects );
|
|
|
|
HeapFree( GetProcessHeap(), 0, obj );
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
TRACE( "%d,%d-%d,%d returning %p\n", left, top, right, bottom, hrgn );
|
1999-02-26 12:11:13 +01:00
|
|
|
SetRectRgn(hrgn, left, top, right, bottom);
|
1995-01-24 17:21:01 +01:00
|
|
|
return hrgn;
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
|
|
|
|
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.
1996-05-16 20:21:06 +02:00
|
|
|
|
|
|
|
/***********************************************************************
|
2001-02-15 00:11:17 +01:00
|
|
|
* CreateRectRgnIndirect (GDI32.@)
|
2004-04-05 22:13:38 +02:00
|
|
|
*
|
|
|
|
* Creates a simple rectangular region.
|
|
|
|
*
|
|
|
|
* PARAMS
|
|
|
|
* rect [I] Coordinates of rectangular region.
|
|
|
|
*
|
|
|
|
* RETURNS
|
|
|
|
* Success: Handle to region.
|
|
|
|
* Failure: NULL.
|
1993-09-04 12:09:32 +02:00
|
|
|
*/
|
1999-02-26 12:11:13 +01:00
|
|
|
HRGN WINAPI CreateRectRgnIndirect( const RECT* rect )
|
1993-09-04 12:09:32 +02:00
|
|
|
{
|
1999-02-26 12:11:13 +01:00
|
|
|
return CreateRectRgn( rect->left, rect->top, rect->right, rect->bottom );
|
1995-01-24 17:21:01 +01:00
|
|
|
}
|
1993-09-04 12:09:32 +02:00
|
|
|
|
|
|
|
|
1997-03-05 09:22:35 +01:00
|
|
|
/***********************************************************************
|
2001-02-15 00:11:17 +01:00
|
|
|
* SetRectRgn (GDI32.@)
|
1998-10-28 10:24:02 +01:00
|
|
|
*
|
2004-04-05 22:13:38 +02:00
|
|
|
* Sets a region to a simple rectangular region.
|
|
|
|
*
|
|
|
|
* PARAMS
|
|
|
|
* hrgn [I] Region to convert.
|
|
|
|
* left [I] Left coordinate of rectangle.
|
|
|
|
* top [I] Top coordinate of rectangle.
|
|
|
|
* right [I] Right coordinate of rectangle.
|
|
|
|
* bottom [I] Bottom coordinate of rectangle.
|
|
|
|
*
|
|
|
|
* RETURNS
|
|
|
|
* Success: Non-zero.
|
|
|
|
* Failure: Zero.
|
|
|
|
*
|
|
|
|
* NOTES
|
|
|
|
* Allows either or both left and top to be greater than right or bottom.
|
1997-03-05 09:22:35 +01:00
|
|
|
*/
|
1999-05-08 14:45:18 +02:00
|
|
|
BOOL WINAPI SetRectRgn( HRGN hrgn, INT left, INT top,
|
1999-02-26 12:11:13 +01:00
|
|
|
INT right, INT bottom )
|
1995-01-24 17:21:01 +01:00
|
|
|
{
|
|
|
|
RGNOBJ * obj;
|
|
|
|
|
2002-11-22 23:16:53 +01:00
|
|
|
TRACE("%p %d,%d-%d,%d\n", hrgn, left, top, right, bottom );
|
2002-06-01 01:06:46 +02:00
|
|
|
|
2009-01-28 16:20:56 +01:00
|
|
|
if (!(obj = GDI_GetObjPtr( hrgn, OBJ_REGION ))) return FALSE;
|
1998-10-28 10:24:02 +01:00
|
|
|
|
1999-02-26 12:11:13 +01:00
|
|
|
if (left > right) { INT tmp = left; left = right; right = tmp; }
|
|
|
|
if (top > bottom) { INT tmp = top; top = bottom; bottom = tmp; }
|
1998-10-28 10:24:02 +01:00
|
|
|
|
|
|
|
if((left != right) && (top != bottom))
|
1993-09-04 12:09:32 +02:00
|
|
|
{
|
2009-01-29 16:38:53 +01:00
|
|
|
obj->rgn.rects->left = obj->rgn.extents.left = left;
|
|
|
|
obj->rgn.rects->top = obj->rgn.extents.top = top;
|
|
|
|
obj->rgn.rects->right = obj->rgn.extents.right = right;
|
|
|
|
obj->rgn.rects->bottom = obj->rgn.extents.bottom = bottom;
|
|
|
|
obj->rgn.numRects = 1;
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
1998-01-18 19:01:49 +01:00
|
|
|
else
|
2009-01-29 16:38:53 +01:00
|
|
|
EMPTY_REGION(&obj->rgn);
|
1998-01-18 19:01:49 +01:00
|
|
|
|
2000-08-19 23:38:55 +02:00
|
|
|
GDI_ReleaseObj( hrgn );
|
1999-05-08 14:45:18 +02:00
|
|
|
return TRUE;
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1996-11-02 15:24:07 +01:00
|
|
|
/***********************************************************************
|
2001-02-15 00:11:17 +01:00
|
|
|
* CreateRoundRectRgn (GDI32.@)
|
2004-04-05 22:13:38 +02:00
|
|
|
*
|
|
|
|
* Creates a rectangular region with rounded corners.
|
|
|
|
*
|
|
|
|
* PARAMS
|
|
|
|
* left [I] Left coordinate of rectangle.
|
|
|
|
* top [I] Top coordinate of rectangle.
|
|
|
|
* right [I] Right coordinate of rectangle.
|
|
|
|
* bottom [I] Bottom coordinate of rectangle.
|
|
|
|
* ellipse_width [I] Width of the ellipse at each corner.
|
|
|
|
* ellipse_height [I] Height of the ellipse at each corner.
|
|
|
|
*
|
|
|
|
* RETURNS
|
|
|
|
* Success: Handle to region.
|
|
|
|
* Failure: NULL.
|
|
|
|
*
|
|
|
|
* NOTES
|
|
|
|
* If ellipse_width or ellipse_height is less than 2 logical units then
|
|
|
|
* it is treated as though CreateRectRgn() was called instead.
|
1996-11-02 15:24:07 +01:00
|
|
|
*/
|
1999-02-26 12:11:13 +01:00
|
|
|
HRGN WINAPI CreateRoundRectRgn( INT left, INT top,
|
|
|
|
INT right, INT bottom,
|
|
|
|
INT ellipse_width, INT ellipse_height )
|
1993-09-04 12:09:32 +02:00
|
|
|
{
|
1995-01-24 17:21:01 +01:00
|
|
|
RGNOBJ * obj;
|
2009-01-29 18:18:53 +01:00
|
|
|
HRGN hrgn = 0;
|
1995-01-24 17:21:01 +01:00
|
|
|
int asq, bsq, d, xd, yd;
|
1999-02-26 12:11:13 +01:00
|
|
|
RECT rect;
|
1993-09-04 12:09:32 +02:00
|
|
|
|
1998-10-28 10:24:02 +01:00
|
|
|
/* Make the dimensions sensible */
|
|
|
|
|
1999-02-26 12:11:13 +01:00
|
|
|
if (left > right) { INT tmp = left; left = right; right = tmp; }
|
|
|
|
if (top > bottom) { INT tmp = top; top = bottom; bottom = tmp; }
|
1998-10-28 10:24:02 +01:00
|
|
|
|
|
|
|
ellipse_width = abs(ellipse_width);
|
|
|
|
ellipse_height = abs(ellipse_height);
|
|
|
|
|
2000-10-25 23:20:25 +02:00
|
|
|
/* Check parameters */
|
|
|
|
|
|
|
|
if (ellipse_width > right-left) ellipse_width = right-left;
|
|
|
|
if (ellipse_height > bottom-top) ellipse_height = bottom-top;
|
|
|
|
|
|
|
|
/* Check if we can do a normal rectangle instead */
|
|
|
|
|
|
|
|
if ((ellipse_width < 2) || (ellipse_height < 2))
|
|
|
|
return CreateRectRgn( left, top, right, bottom );
|
|
|
|
|
1993-09-04 12:09:32 +02:00
|
|
|
/* Create region */
|
|
|
|
|
1999-03-28 11:37:57 +02:00
|
|
|
d = (ellipse_height < 128) ? ((3 * ellipse_height) >> 2) : 64;
|
2009-01-29 17:32:06 +01:00
|
|
|
if (!(obj = HeapAlloc( GetProcessHeap(), 0, sizeof(*obj) ))) return 0;
|
|
|
|
if (!init_region( &obj->rgn, d ))
|
|
|
|
{
|
|
|
|
HeapFree( GetProcessHeap(), 0, obj );
|
|
|
|
return 0;
|
|
|
|
}
|
1995-01-24 17:21:01 +01:00
|
|
|
|
|
|
|
/* Ellipse algorithm, based on an article by K. Porter */
|
|
|
|
/* in DDJ Graphics Programming Column, 8/89 */
|
|
|
|
|
|
|
|
asq = ellipse_width * ellipse_width / 4; /* a^2 */
|
|
|
|
bsq = ellipse_height * ellipse_height / 4; /* b^2 */
|
|
|
|
d = bsq - asq * ellipse_height / 2 + asq / 4; /* b^2 - a^2b + a^2/4 */
|
|
|
|
xd = 0;
|
|
|
|
yd = asq * ellipse_height; /* 2a^2b */
|
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
rect.left = left + ellipse_width / 2;
|
1998-10-28 10:24:02 +01:00
|
|
|
rect.right = right - ellipse_width / 2;
|
1995-01-24 17:21:01 +01:00
|
|
|
|
|
|
|
/* Loop to draw first half of quadrant */
|
|
|
|
|
|
|
|
while (xd < yd)
|
1993-09-04 12:09:32 +02:00
|
|
|
{
|
1998-01-18 19:01:49 +01:00
|
|
|
if (d > 0) /* if nearest pixel is toward the center */
|
|
|
|
{
|
|
|
|
/* move toward center */
|
|
|
|
rect.top = top++;
|
|
|
|
rect.bottom = rect.top + 1;
|
2009-01-29 18:18:53 +01:00
|
|
|
if (!REGION_UnionRectWithRegion( &rect, &obj->rgn )) goto done;
|
1998-01-18 19:01:49 +01:00
|
|
|
rect.top = --bottom;
|
|
|
|
rect.bottom = rect.top + 1;
|
2009-01-29 18:18:53 +01:00
|
|
|
if (!REGION_UnionRectWithRegion( &rect, &obj->rgn )) goto done;
|
1998-01-18 19:01:49 +01:00
|
|
|
yd -= 2*asq;
|
|
|
|
d -= yd;
|
|
|
|
}
|
|
|
|
rect.left--; /* next horiz point */
|
|
|
|
rect.right++;
|
|
|
|
xd += 2*bsq;
|
|
|
|
d += bsq + xd;
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
|
|
|
|
1995-01-24 17:21:01 +01:00
|
|
|
/* Loop to draw second half of quadrant */
|
|
|
|
|
|
|
|
d += (3 * (asq-bsq) / 2 - (xd+yd)) / 2;
|
|
|
|
while (yd >= 0)
|
1993-09-04 12:09:32 +02:00
|
|
|
{
|
1998-01-18 19:01:49 +01:00
|
|
|
/* next vertical point */
|
|
|
|
rect.top = top++;
|
|
|
|
rect.bottom = rect.top + 1;
|
2009-01-29 18:18:53 +01:00
|
|
|
if (!REGION_UnionRectWithRegion( &rect, &obj->rgn )) goto done;
|
1998-01-18 19:01:49 +01:00
|
|
|
rect.top = --bottom;
|
|
|
|
rect.bottom = rect.top + 1;
|
2009-01-29 18:18:53 +01:00
|
|
|
if (!REGION_UnionRectWithRegion( &rect, &obj->rgn )) goto done;
|
1998-01-18 19:01:49 +01:00
|
|
|
if (d < 0) /* if nearest pixel is outside ellipse */
|
|
|
|
{
|
|
|
|
rect.left--; /* move away from center */
|
|
|
|
rect.right++;
|
|
|
|
xd += 2*bsq;
|
|
|
|
d += xd;
|
|
|
|
}
|
|
|
|
yd -= 2*asq;
|
|
|
|
d += asq - yd;
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
|
|
|
|
1995-01-24 17:21:01 +01:00
|
|
|
/* Add the inside rectangle */
|
1993-09-04 12:09:32 +02:00
|
|
|
|
1995-01-24 17:21:01 +01:00
|
|
|
if (top <= bottom)
|
|
|
|
{
|
1998-01-18 19:01:49 +01:00
|
|
|
rect.top = top;
|
|
|
|
rect.bottom = bottom;
|
2009-01-29 18:18:53 +01:00
|
|
|
if (!REGION_UnionRectWithRegion( &rect, &obj->rgn )) goto done;
|
1995-01-24 17:21:01 +01:00
|
|
|
}
|
2009-01-29 17:32:06 +01:00
|
|
|
|
|
|
|
hrgn = alloc_gdi_handle( &obj->header, OBJ_REGION, ®ion_funcs );
|
|
|
|
|
|
|
|
TRACE("(%d,%d-%d,%d %dx%d): ret=%p\n",
|
|
|
|
left, top, right, bottom, ellipse_width, ellipse_height, hrgn );
|
2009-01-29 18:18:53 +01:00
|
|
|
done:
|
2009-01-29 17:32:06 +01:00
|
|
|
if (!hrgn)
|
|
|
|
{
|
|
|
|
HeapFree( GetProcessHeap(), 0, obj->rgn.rects );
|
|
|
|
HeapFree( GetProcessHeap(), 0, obj );
|
|
|
|
}
|
1995-01-24 17:21:01 +01:00
|
|
|
return hrgn;
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
1996-11-02 15:24:07 +01:00
|
|
|
/***********************************************************************
|
2001-02-15 00:11:17 +01:00
|
|
|
* CreateEllipticRgn (GDI32.@)
|
2004-04-05 22:13:38 +02:00
|
|
|
*
|
|
|
|
* Creates an elliptical region.
|
|
|
|
*
|
|
|
|
* PARAMS
|
|
|
|
* left [I] Left coordinate of bounding rectangle.
|
|
|
|
* top [I] Top coordinate of bounding rectangle.
|
|
|
|
* right [I] Right coordinate of bounding rectangle.
|
|
|
|
* bottom [I] Bottom coordinate of bounding rectangle.
|
|
|
|
*
|
|
|
|
* RETURNS
|
|
|
|
* Success: Handle to region.
|
|
|
|
* Failure: NULL.
|
|
|
|
*
|
|
|
|
* NOTES
|
|
|
|
* This is a special case of CreateRoundRectRgn() where the width of the
|
2007-10-23 15:30:30 +02:00
|
|
|
* ellipse at each corner is equal to the width the rectangle and
|
2004-04-05 22:13:38 +02:00
|
|
|
* the same for the height.
|
1993-09-04 12:09:32 +02:00
|
|
|
*/
|
1999-02-26 12:11:13 +01:00
|
|
|
HRGN WINAPI CreateEllipticRgn( INT left, INT top,
|
|
|
|
INT right, INT bottom )
|
1993-09-04 12:09:32 +02:00
|
|
|
{
|
1999-02-26 12:11:13 +01:00
|
|
|
return CreateRoundRectRgn( left, top, right, bottom,
|
1998-01-18 19:01:49 +01:00
|
|
|
right-left, bottom-top );
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
2001-02-15 00:11:17 +01:00
|
|
|
* CreateEllipticRgnIndirect (GDI32.@)
|
2004-04-05 22:13:38 +02:00
|
|
|
*
|
|
|
|
* Creates an elliptical region.
|
|
|
|
*
|
|
|
|
* PARAMS
|
|
|
|
* rect [I] Pointer to bounding rectangle of the ellipse.
|
|
|
|
*
|
|
|
|
* RETURNS
|
|
|
|
* Success: Handle to region.
|
|
|
|
* Failure: NULL.
|
|
|
|
*
|
|
|
|
* NOTES
|
|
|
|
* This is a special case of CreateRoundRectRgn() where the width of the
|
2007-10-23 15:30:30 +02:00
|
|
|
* ellipse at each corner is equal to the width the rectangle and
|
2004-04-05 22:13:38 +02:00
|
|
|
* the same for the height.
|
1993-09-04 12:09:32 +02:00
|
|
|
*/
|
1999-02-26 12:11:13 +01:00
|
|
|
HRGN WINAPI CreateEllipticRgnIndirect( const RECT *rect )
|
1993-09-04 12:09:32 +02:00
|
|
|
{
|
1999-02-26 12:11:13 +01:00
|
|
|
return CreateRoundRectRgn( rect->left, rect->top, rect->right,
|
1998-01-18 19:01:49 +01:00
|
|
|
rect->bottom, rect->right - rect->left,
|
|
|
|
rect->bottom - rect->top );
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
|
|
|
|
2011-04-15 14:14:34 +02:00
|
|
|
/*********************************************************************
|
|
|
|
* get_wine_region
|
|
|
|
*
|
|
|
|
* Return the region data without making a copy. The caller
|
|
|
|
* must not alter anything and must call GDI_ReleaseObj() when
|
|
|
|
* they have finished with the data.
|
|
|
|
*/
|
|
|
|
const WINEREGION *get_wine_region(HRGN rgn)
|
|
|
|
{
|
|
|
|
RGNOBJ *obj = GDI_GetObjPtr( rgn, OBJ_REGION );
|
|
|
|
if(!obj) return NULL;
|
|
|
|
return &obj->rgn;
|
|
|
|
}
|
|
|
|
|
1993-09-04 12:09:32 +02:00
|
|
|
/***********************************************************************
|
2001-02-15 00:11:17 +01:00
|
|
|
* GetRegionData (GDI32.@)
|
2002-06-01 01:06:46 +02:00
|
|
|
*
|
2004-04-05 22:13:38 +02:00
|
|
|
* Retrieves the data that specifies the region.
|
2000-09-29 02:25:18 +02:00
|
|
|
*
|
2004-04-05 22:13:38 +02:00
|
|
|
* PARAMS
|
|
|
|
* hrgn [I] Region to retrieve the region data from.
|
|
|
|
* count [I] The size of the buffer pointed to by rgndata in bytes.
|
|
|
|
* rgndata [I] The buffer to receive data about the region.
|
2000-09-29 02:25:18 +02:00
|
|
|
*
|
2004-04-05 22:13:38 +02:00
|
|
|
* RETURNS
|
|
|
|
* Success: If rgndata is NULL then the required number of bytes. Otherwise,
|
|
|
|
* the number of bytes copied to the output buffer.
|
|
|
|
* Failure: 0.
|
|
|
|
*
|
|
|
|
* NOTES
|
|
|
|
* The format of the Buffer member of RGNDATA is determined by the iType
|
|
|
|
* member of the region data header.
|
|
|
|
* Currently this is always RDH_RECTANGLES, which specifies that the format
|
|
|
|
* is the array of RECT's that specify the region. The length of the array
|
|
|
|
* is specified by the nCount member of the region data header.
|
1993-09-04 12:09:32 +02:00
|
|
|
*/
|
1999-02-26 12:11:13 +01:00
|
|
|
DWORD WINAPI GetRegionData(HRGN hrgn, DWORD count, LPRGNDATA rgndata)
|
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.
1996-05-16 20:21:06 +02:00
|
|
|
{
|
1998-01-18 19:01:49 +01:00
|
|
|
DWORD size;
|
2009-01-28 16:20:56 +01:00
|
|
|
RGNOBJ *obj = GDI_GetObjPtr( hrgn, OBJ_REGION );
|
2002-06-01 01:06:46 +02:00
|
|
|
|
2006-10-12 22:56:56 +02:00
|
|
|
TRACE(" %p count = %d, rgndata = %p\n", hrgn, count, rgndata);
|
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.
1996-05-16 20:21:06 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
if(!obj) return 0;
|
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.
1996-05-16 20:21:06 +02:00
|
|
|
|
2009-01-29 16:38:53 +01:00
|
|
|
size = obj->rgn.numRects * sizeof(RECT);
|
1998-01-18 19:01:49 +01:00
|
|
|
if(count < (size + sizeof(RGNDATAHEADER)) || rgndata == NULL)
|
|
|
|
{
|
2000-08-19 23:38:55 +02:00
|
|
|
GDI_ReleaseObj( hrgn );
|
2000-10-12 22:39:31 +02:00
|
|
|
if (rgndata) /* buffer is too small, signal it by return 0 */
|
2000-09-29 02:25:18 +02:00
|
|
|
return 0;
|
2000-10-12 22:39:31 +02:00
|
|
|
else /* user requested buffer size with rgndata NULL */
|
|
|
|
return size + sizeof(RGNDATAHEADER);
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
Release 970112
Sat Jan 11 18:17:59 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [controls/menu.c]
Updated to new Win32 types.
* [controls/listbox.c]
Fixed Winfile extended selection bug.
* [files/directory.c]
Changed DIR_SearchPath to return both long and short file names.
* [files/dos_fs.c]
Implemented VFAT ioctl to retrieve the original short filenames
from a VFAT filesystem (Linux only for now).
Replaced DOSFS_GetUnixFileName()/DOSFS_GetDosTrueName() by
DOS_GetFullName().
Properly implemented GetShortPathName() and GetFullPathName().
Made all functions re-entrant.
* [files/file.c] [misc/main.c]
Replaced -allowreadonly option by -failreadonly. The default is
now to report success when opening a read-only file for writing.
* [objects/metafile.c]
Fixed bug in DIB bitmaps pointer calculation.
* [scheduler/process.c]
Implemented environment strings and Get/SetStdHandle with process
environment block.
* [tools/build.c]
Rewrote BuildContext32() to avoid instructions that may not be
supported by all assemblers.
Fri Jan 10 17:11:09 1997 David Faure <david.faure@ifhamy.insa-lyon.fr>
* [windows/event.c]
Created table keyc2vkey, which associate a vkey(+extended bit) to
any keycode. Changed EVENT_event_to_vkey to use this table to
return the correct vkey. Changed EVENT_ToAscii to get the keycode
from this table too. Assigned OEM specific vkeys arbitrarily.
Fri Jan 10 09:26:17 1997 John Harvey <john@division.co.uk>
* [misc/winsock.c] [misc/winsoc_async.c]
Fixed svr4 header files.
Changed bzero() to memset().
* [tools/fnt2bdf.c]
Removed bcopy() and used memcpy() instead.
* [debugger/msc.c]
Include string.h instead of strings.h
* [debugger/stabs.c]
Include string.h instead of strings.h.
Define __ELF__ for svr4 systems.
* [loader/signal.c]
Use wait() instead of wait4() which doesnt exist on Unixware.
* [memory/global.c]
Use sysconf() instead of getpagesize() for svr4 systems.
Thu Jan 9 21:07:20 1997 Robert Pouliot <krynos@clic.net>
* [Make.rules.in] [Makefile.in] [make_os2.sh] [rc/Makefile.in]
[tools/Makefile.in] [documentation/wine_os2.txt]
Patches for OS/2 support. Note that it doesn't compile yet.
Tue Jan 7 20:03:53 1997 Eric Youngdale <eric@sub2304.jic.com>
* [debugger/*]
Many more debugger improvements (see debugger/README for details).
Tue Jan 7 15:12:21 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [windows/graphics.c] [objects/text.c] [graphics/x11drv/*]
[graphics/metafiledrv/*]
Moved some device dependent code into the resp. subdirs.
* [include/gdi.h] [include/metafiledrv.h] [include/x11drv.h]
Prototypes added,
DC_FUNCTIONS: GetPixel added, some unnecessary functions removed.
* [objects/region.c]
CreatePolyPolygonRgn32 added.
* [files/dos_fs.c]
QueryDosDevice added.
* [misc/lstr.c]
FormatMessage: broken heap management fixed.
* [scheduler/process.c] [scheduler/thread.c]
Get/SetThreadPriority/PriorityClass added.
Mon Jan 6 21:55:30 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [misc/keyboard.c]
ToAscii : Use EVENT_ToAscii instead.
* [windows/event.c]
keypad_key : Do not convert XK_Mode_switch to VK_MENU; recognize
keypad cursor keys.
EVENT_event_to_vkey : New function, to transform a X keycode
into a MSwin vkey + extended bit.
EVENT_ToAscii : New function, to transform a vkey + extended bit
(+ key state table) into ascii char(s), using XLookupString, and
recognizing dead chars.
EVENT_key : Transform AltGr into Ctrl+Alt sequence; call
EVENT_event_to_vkey for keycode to vkey conversion; fixed
previous, context and extended bits.
* [windows/keyboard.c]
Include stddebug.h, to get -debugmsg messages.
GetKeyState : Handle VK_MBUTTON case.
GetKeyboardState, SetKeyboardState : Debugging messages added.
* [windows/message.c]
TranslateMessage : Handle dead chars.
Mon Jan 6 20:10:11 1997 Dominik Strasser <bm424953@muenchen.org>
* [if1632/crtdll.spec] [misc/crtdll.c]
C++ functions new/delete/set_new_handler implemented.
Mon Jan 6 15:48:15 1997 Frans van Dorsselaer <dorssel@rulhmpc49.LeidenUniv.nl>
* [controls/edit.c] [include/windows.h]
Moved the edit control to 32 bits.
Included new (win95) message definitions in windows.h
Implemented EM_SCROLLCARET, EM_SETMARGINS, EM_GETMARGINS,
EM_GETLIMITTEXT, EM_POSFROMCHAR, EM_CHARFROMPOS.
Broke EM_SETWORDBREAKPROC (internal wordwrap still works).
Fixed some bugs, introduced a couple of others.
Text buffer is now initially in 32-bit heap.
* [controls/EDIT.TODO] [controls/combo.c] [controls/widgets.c]
[if1632/wprocs.spec] [library/miscstubs.c] [windows/defdlg.c]
[misc/commdlg.c]
Updated to work with 32-bit edit control.
Sat Jan 4 22:07:27 1997 O.Flebbe <O.Flebbe@science-computing.uni-tuebingen.de>
* [loader/pe_image.c]
Use mmap rather then malloc. Better workaround for clean
segments.
1997-01-12 19:32:19 +01:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
rgndata->rdh.dwSize = sizeof(RGNDATAHEADER);
|
|
|
|
rgndata->rdh.iType = RDH_RECTANGLES;
|
2009-01-29 16:38:53 +01:00
|
|
|
rgndata->rdh.nCount = obj->rgn.numRects;
|
1998-01-18 19:01:49 +01:00
|
|
|
rgndata->rdh.nRgnSize = size;
|
2009-01-29 16:38:53 +01:00
|
|
|
rgndata->rdh.rcBound.left = obj->rgn.extents.left;
|
|
|
|
rgndata->rdh.rcBound.top = obj->rgn.extents.top;
|
|
|
|
rgndata->rdh.rcBound.right = obj->rgn.extents.right;
|
|
|
|
rgndata->rdh.rcBound.bottom = obj->rgn.extents.bottom;
|
Release 970112
Sat Jan 11 18:17:59 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [controls/menu.c]
Updated to new Win32 types.
* [controls/listbox.c]
Fixed Winfile extended selection bug.
* [files/directory.c]
Changed DIR_SearchPath to return both long and short file names.
* [files/dos_fs.c]
Implemented VFAT ioctl to retrieve the original short filenames
from a VFAT filesystem (Linux only for now).
Replaced DOSFS_GetUnixFileName()/DOSFS_GetDosTrueName() by
DOS_GetFullName().
Properly implemented GetShortPathName() and GetFullPathName().
Made all functions re-entrant.
* [files/file.c] [misc/main.c]
Replaced -allowreadonly option by -failreadonly. The default is
now to report success when opening a read-only file for writing.
* [objects/metafile.c]
Fixed bug in DIB bitmaps pointer calculation.
* [scheduler/process.c]
Implemented environment strings and Get/SetStdHandle with process
environment block.
* [tools/build.c]
Rewrote BuildContext32() to avoid instructions that may not be
supported by all assemblers.
Fri Jan 10 17:11:09 1997 David Faure <david.faure@ifhamy.insa-lyon.fr>
* [windows/event.c]
Created table keyc2vkey, which associate a vkey(+extended bit) to
any keycode. Changed EVENT_event_to_vkey to use this table to
return the correct vkey. Changed EVENT_ToAscii to get the keycode
from this table too. Assigned OEM specific vkeys arbitrarily.
Fri Jan 10 09:26:17 1997 John Harvey <john@division.co.uk>
* [misc/winsock.c] [misc/winsoc_async.c]
Fixed svr4 header files.
Changed bzero() to memset().
* [tools/fnt2bdf.c]
Removed bcopy() and used memcpy() instead.
* [debugger/msc.c]
Include string.h instead of strings.h
* [debugger/stabs.c]
Include string.h instead of strings.h.
Define __ELF__ for svr4 systems.
* [loader/signal.c]
Use wait() instead of wait4() which doesnt exist on Unixware.
* [memory/global.c]
Use sysconf() instead of getpagesize() for svr4 systems.
Thu Jan 9 21:07:20 1997 Robert Pouliot <krynos@clic.net>
* [Make.rules.in] [Makefile.in] [make_os2.sh] [rc/Makefile.in]
[tools/Makefile.in] [documentation/wine_os2.txt]
Patches for OS/2 support. Note that it doesn't compile yet.
Tue Jan 7 20:03:53 1997 Eric Youngdale <eric@sub2304.jic.com>
* [debugger/*]
Many more debugger improvements (see debugger/README for details).
Tue Jan 7 15:12:21 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [windows/graphics.c] [objects/text.c] [graphics/x11drv/*]
[graphics/metafiledrv/*]
Moved some device dependent code into the resp. subdirs.
* [include/gdi.h] [include/metafiledrv.h] [include/x11drv.h]
Prototypes added,
DC_FUNCTIONS: GetPixel added, some unnecessary functions removed.
* [objects/region.c]
CreatePolyPolygonRgn32 added.
* [files/dos_fs.c]
QueryDosDevice added.
* [misc/lstr.c]
FormatMessage: broken heap management fixed.
* [scheduler/process.c] [scheduler/thread.c]
Get/SetThreadPriority/PriorityClass added.
Mon Jan 6 21:55:30 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [misc/keyboard.c]
ToAscii : Use EVENT_ToAscii instead.
* [windows/event.c]
keypad_key : Do not convert XK_Mode_switch to VK_MENU; recognize
keypad cursor keys.
EVENT_event_to_vkey : New function, to transform a X keycode
into a MSwin vkey + extended bit.
EVENT_ToAscii : New function, to transform a vkey + extended bit
(+ key state table) into ascii char(s), using XLookupString, and
recognizing dead chars.
EVENT_key : Transform AltGr into Ctrl+Alt sequence; call
EVENT_event_to_vkey for keycode to vkey conversion; fixed
previous, context and extended bits.
* [windows/keyboard.c]
Include stddebug.h, to get -debugmsg messages.
GetKeyState : Handle VK_MBUTTON case.
GetKeyboardState, SetKeyboardState : Debugging messages added.
* [windows/message.c]
TranslateMessage : Handle dead chars.
Mon Jan 6 20:10:11 1997 Dominik Strasser <bm424953@muenchen.org>
* [if1632/crtdll.spec] [misc/crtdll.c]
C++ functions new/delete/set_new_handler implemented.
Mon Jan 6 15:48:15 1997 Frans van Dorsselaer <dorssel@rulhmpc49.LeidenUniv.nl>
* [controls/edit.c] [include/windows.h]
Moved the edit control to 32 bits.
Included new (win95) message definitions in windows.h
Implemented EM_SCROLLCARET, EM_SETMARGINS, EM_GETMARGINS,
EM_GETLIMITTEXT, EM_POSFROMCHAR, EM_CHARFROMPOS.
Broke EM_SETWORDBREAKPROC (internal wordwrap still works).
Fixed some bugs, introduced a couple of others.
Text buffer is now initially in 32-bit heap.
* [controls/EDIT.TODO] [controls/combo.c] [controls/widgets.c]
[if1632/wprocs.spec] [library/miscstubs.c] [windows/defdlg.c]
[misc/commdlg.c]
Updated to work with 32-bit edit control.
Sat Jan 4 22:07:27 1997 O.Flebbe <O.Flebbe@science-computing.uni-tuebingen.de>
* [loader/pe_image.c]
Use mmap rather then malloc. Better workaround for clean
segments.
1997-01-12 19:32:19 +01:00
|
|
|
|
2009-01-29 16:38:53 +01:00
|
|
|
memcpy( rgndata->Buffer, obj->rgn.rects, size );
|
Release 970112
Sat Jan 11 18:17:59 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [controls/menu.c]
Updated to new Win32 types.
* [controls/listbox.c]
Fixed Winfile extended selection bug.
* [files/directory.c]
Changed DIR_SearchPath to return both long and short file names.
* [files/dos_fs.c]
Implemented VFAT ioctl to retrieve the original short filenames
from a VFAT filesystem (Linux only for now).
Replaced DOSFS_GetUnixFileName()/DOSFS_GetDosTrueName() by
DOS_GetFullName().
Properly implemented GetShortPathName() and GetFullPathName().
Made all functions re-entrant.
* [files/file.c] [misc/main.c]
Replaced -allowreadonly option by -failreadonly. The default is
now to report success when opening a read-only file for writing.
* [objects/metafile.c]
Fixed bug in DIB bitmaps pointer calculation.
* [scheduler/process.c]
Implemented environment strings and Get/SetStdHandle with process
environment block.
* [tools/build.c]
Rewrote BuildContext32() to avoid instructions that may not be
supported by all assemblers.
Fri Jan 10 17:11:09 1997 David Faure <david.faure@ifhamy.insa-lyon.fr>
* [windows/event.c]
Created table keyc2vkey, which associate a vkey(+extended bit) to
any keycode. Changed EVENT_event_to_vkey to use this table to
return the correct vkey. Changed EVENT_ToAscii to get the keycode
from this table too. Assigned OEM specific vkeys arbitrarily.
Fri Jan 10 09:26:17 1997 John Harvey <john@division.co.uk>
* [misc/winsock.c] [misc/winsoc_async.c]
Fixed svr4 header files.
Changed bzero() to memset().
* [tools/fnt2bdf.c]
Removed bcopy() and used memcpy() instead.
* [debugger/msc.c]
Include string.h instead of strings.h
* [debugger/stabs.c]
Include string.h instead of strings.h.
Define __ELF__ for svr4 systems.
* [loader/signal.c]
Use wait() instead of wait4() which doesnt exist on Unixware.
* [memory/global.c]
Use sysconf() instead of getpagesize() for svr4 systems.
Thu Jan 9 21:07:20 1997 Robert Pouliot <krynos@clic.net>
* [Make.rules.in] [Makefile.in] [make_os2.sh] [rc/Makefile.in]
[tools/Makefile.in] [documentation/wine_os2.txt]
Patches for OS/2 support. Note that it doesn't compile yet.
Tue Jan 7 20:03:53 1997 Eric Youngdale <eric@sub2304.jic.com>
* [debugger/*]
Many more debugger improvements (see debugger/README for details).
Tue Jan 7 15:12:21 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [windows/graphics.c] [objects/text.c] [graphics/x11drv/*]
[graphics/metafiledrv/*]
Moved some device dependent code into the resp. subdirs.
* [include/gdi.h] [include/metafiledrv.h] [include/x11drv.h]
Prototypes added,
DC_FUNCTIONS: GetPixel added, some unnecessary functions removed.
* [objects/region.c]
CreatePolyPolygonRgn32 added.
* [files/dos_fs.c]
QueryDosDevice added.
* [misc/lstr.c]
FormatMessage: broken heap management fixed.
* [scheduler/process.c] [scheduler/thread.c]
Get/SetThreadPriority/PriorityClass added.
Mon Jan 6 21:55:30 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [misc/keyboard.c]
ToAscii : Use EVENT_ToAscii instead.
* [windows/event.c]
keypad_key : Do not convert XK_Mode_switch to VK_MENU; recognize
keypad cursor keys.
EVENT_event_to_vkey : New function, to transform a X keycode
into a MSwin vkey + extended bit.
EVENT_ToAscii : New function, to transform a vkey + extended bit
(+ key state table) into ascii char(s), using XLookupString, and
recognizing dead chars.
EVENT_key : Transform AltGr into Ctrl+Alt sequence; call
EVENT_event_to_vkey for keycode to vkey conversion; fixed
previous, context and extended bits.
* [windows/keyboard.c]
Include stddebug.h, to get -debugmsg messages.
GetKeyState : Handle VK_MBUTTON case.
GetKeyboardState, SetKeyboardState : Debugging messages added.
* [windows/message.c]
TranslateMessage : Handle dead chars.
Mon Jan 6 20:10:11 1997 Dominik Strasser <bm424953@muenchen.org>
* [if1632/crtdll.spec] [misc/crtdll.c]
C++ functions new/delete/set_new_handler implemented.
Mon Jan 6 15:48:15 1997 Frans van Dorsselaer <dorssel@rulhmpc49.LeidenUniv.nl>
* [controls/edit.c] [include/windows.h]
Moved the edit control to 32 bits.
Included new (win95) message definitions in windows.h
Implemented EM_SCROLLCARET, EM_SETMARGINS, EM_GETMARGINS,
EM_GETLIMITTEXT, EM_POSFROMCHAR, EM_CHARFROMPOS.
Broke EM_SETWORDBREAKPROC (internal wordwrap still works).
Fixed some bugs, introduced a couple of others.
Text buffer is now initially in 32-bit heap.
* [controls/EDIT.TODO] [controls/combo.c] [controls/widgets.c]
[if1632/wprocs.spec] [library/miscstubs.c] [windows/defdlg.c]
[misc/commdlg.c]
Updated to work with 32-bit edit control.
Sat Jan 4 22:07:27 1997 O.Flebbe <O.Flebbe@science-computing.uni-tuebingen.de>
* [loader/pe_image.c]
Use mmap rather then malloc. Better workaround for clean
segments.
1997-01-12 19:32:19 +01:00
|
|
|
|
2000-08-19 23:38:55 +02:00
|
|
|
GDI_ReleaseObj( hrgn );
|
2000-09-29 02:25:18 +02:00
|
|
|
return size + sizeof(RGNDATAHEADER);
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
Release 970112
Sat Jan 11 18:17:59 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [controls/menu.c]
Updated to new Win32 types.
* [controls/listbox.c]
Fixed Winfile extended selection bug.
* [files/directory.c]
Changed DIR_SearchPath to return both long and short file names.
* [files/dos_fs.c]
Implemented VFAT ioctl to retrieve the original short filenames
from a VFAT filesystem (Linux only for now).
Replaced DOSFS_GetUnixFileName()/DOSFS_GetDosTrueName() by
DOS_GetFullName().
Properly implemented GetShortPathName() and GetFullPathName().
Made all functions re-entrant.
* [files/file.c] [misc/main.c]
Replaced -allowreadonly option by -failreadonly. The default is
now to report success when opening a read-only file for writing.
* [objects/metafile.c]
Fixed bug in DIB bitmaps pointer calculation.
* [scheduler/process.c]
Implemented environment strings and Get/SetStdHandle with process
environment block.
* [tools/build.c]
Rewrote BuildContext32() to avoid instructions that may not be
supported by all assemblers.
Fri Jan 10 17:11:09 1997 David Faure <david.faure@ifhamy.insa-lyon.fr>
* [windows/event.c]
Created table keyc2vkey, which associate a vkey(+extended bit) to
any keycode. Changed EVENT_event_to_vkey to use this table to
return the correct vkey. Changed EVENT_ToAscii to get the keycode
from this table too. Assigned OEM specific vkeys arbitrarily.
Fri Jan 10 09:26:17 1997 John Harvey <john@division.co.uk>
* [misc/winsock.c] [misc/winsoc_async.c]
Fixed svr4 header files.
Changed bzero() to memset().
* [tools/fnt2bdf.c]
Removed bcopy() and used memcpy() instead.
* [debugger/msc.c]
Include string.h instead of strings.h
* [debugger/stabs.c]
Include string.h instead of strings.h.
Define __ELF__ for svr4 systems.
* [loader/signal.c]
Use wait() instead of wait4() which doesnt exist on Unixware.
* [memory/global.c]
Use sysconf() instead of getpagesize() for svr4 systems.
Thu Jan 9 21:07:20 1997 Robert Pouliot <krynos@clic.net>
* [Make.rules.in] [Makefile.in] [make_os2.sh] [rc/Makefile.in]
[tools/Makefile.in] [documentation/wine_os2.txt]
Patches for OS/2 support. Note that it doesn't compile yet.
Tue Jan 7 20:03:53 1997 Eric Youngdale <eric@sub2304.jic.com>
* [debugger/*]
Many more debugger improvements (see debugger/README for details).
Tue Jan 7 15:12:21 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [windows/graphics.c] [objects/text.c] [graphics/x11drv/*]
[graphics/metafiledrv/*]
Moved some device dependent code into the resp. subdirs.
* [include/gdi.h] [include/metafiledrv.h] [include/x11drv.h]
Prototypes added,
DC_FUNCTIONS: GetPixel added, some unnecessary functions removed.
* [objects/region.c]
CreatePolyPolygonRgn32 added.
* [files/dos_fs.c]
QueryDosDevice added.
* [misc/lstr.c]
FormatMessage: broken heap management fixed.
* [scheduler/process.c] [scheduler/thread.c]
Get/SetThreadPriority/PriorityClass added.
Mon Jan 6 21:55:30 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [misc/keyboard.c]
ToAscii : Use EVENT_ToAscii instead.
* [windows/event.c]
keypad_key : Do not convert XK_Mode_switch to VK_MENU; recognize
keypad cursor keys.
EVENT_event_to_vkey : New function, to transform a X keycode
into a MSwin vkey + extended bit.
EVENT_ToAscii : New function, to transform a vkey + extended bit
(+ key state table) into ascii char(s), using XLookupString, and
recognizing dead chars.
EVENT_key : Transform AltGr into Ctrl+Alt sequence; call
EVENT_event_to_vkey for keycode to vkey conversion; fixed
previous, context and extended bits.
* [windows/keyboard.c]
Include stddebug.h, to get -debugmsg messages.
GetKeyState : Handle VK_MBUTTON case.
GetKeyboardState, SetKeyboardState : Debugging messages added.
* [windows/message.c]
TranslateMessage : Handle dead chars.
Mon Jan 6 20:10:11 1997 Dominik Strasser <bm424953@muenchen.org>
* [if1632/crtdll.spec] [misc/crtdll.c]
C++ functions new/delete/set_new_handler implemented.
Mon Jan 6 15:48:15 1997 Frans van Dorsselaer <dorssel@rulhmpc49.LeidenUniv.nl>
* [controls/edit.c] [include/windows.h]
Moved the edit control to 32 bits.
Included new (win95) message definitions in windows.h
Implemented EM_SCROLLCARET, EM_SETMARGINS, EM_GETMARGINS,
EM_GETLIMITTEXT, EM_POSFROMCHAR, EM_CHARFROMPOS.
Broke EM_SETWORDBREAKPROC (internal wordwrap still works).
Fixed some bugs, introduced a couple of others.
Text buffer is now initially in 32-bit heap.
* [controls/EDIT.TODO] [controls/combo.c] [controls/widgets.c]
[if1632/wprocs.spec] [library/miscstubs.c] [windows/defdlg.c]
[misc/commdlg.c]
Updated to work with 32-bit edit control.
Sat Jan 4 22:07:27 1997 O.Flebbe <O.Flebbe@science-computing.uni-tuebingen.de>
* [loader/pe_image.c]
Use mmap rather then malloc. Better workaround for clean
segments.
1997-01-12 19:32:19 +01:00
|
|
|
|
1998-11-22 17:54:26 +01:00
|
|
|
|
2008-04-18 15:42:43 +02:00
|
|
|
static void translate( POINT *pt, UINT count, const XFORM *xform )
|
|
|
|
{
|
|
|
|
while (count--)
|
|
|
|
{
|
2008-05-22 17:43:01 +02:00
|
|
|
double x = pt->x;
|
|
|
|
double y = pt->y;
|
2008-04-18 15:42:43 +02:00
|
|
|
pt->x = floor( x * xform->eM11 + y * xform->eM21 + xform->eDx + 0.5 );
|
|
|
|
pt->y = floor( x * xform->eM12 + y * xform->eM22 + xform->eDy + 0.5 );
|
|
|
|
pt++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
Release 970112
Sat Jan 11 18:17:59 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [controls/menu.c]
Updated to new Win32 types.
* [controls/listbox.c]
Fixed Winfile extended selection bug.
* [files/directory.c]
Changed DIR_SearchPath to return both long and short file names.
* [files/dos_fs.c]
Implemented VFAT ioctl to retrieve the original short filenames
from a VFAT filesystem (Linux only for now).
Replaced DOSFS_GetUnixFileName()/DOSFS_GetDosTrueName() by
DOS_GetFullName().
Properly implemented GetShortPathName() and GetFullPathName().
Made all functions re-entrant.
* [files/file.c] [misc/main.c]
Replaced -allowreadonly option by -failreadonly. The default is
now to report success when opening a read-only file for writing.
* [objects/metafile.c]
Fixed bug in DIB bitmaps pointer calculation.
* [scheduler/process.c]
Implemented environment strings and Get/SetStdHandle with process
environment block.
* [tools/build.c]
Rewrote BuildContext32() to avoid instructions that may not be
supported by all assemblers.
Fri Jan 10 17:11:09 1997 David Faure <david.faure@ifhamy.insa-lyon.fr>
* [windows/event.c]
Created table keyc2vkey, which associate a vkey(+extended bit) to
any keycode. Changed EVENT_event_to_vkey to use this table to
return the correct vkey. Changed EVENT_ToAscii to get the keycode
from this table too. Assigned OEM specific vkeys arbitrarily.
Fri Jan 10 09:26:17 1997 John Harvey <john@division.co.uk>
* [misc/winsock.c] [misc/winsoc_async.c]
Fixed svr4 header files.
Changed bzero() to memset().
* [tools/fnt2bdf.c]
Removed bcopy() and used memcpy() instead.
* [debugger/msc.c]
Include string.h instead of strings.h
* [debugger/stabs.c]
Include string.h instead of strings.h.
Define __ELF__ for svr4 systems.
* [loader/signal.c]
Use wait() instead of wait4() which doesnt exist on Unixware.
* [memory/global.c]
Use sysconf() instead of getpagesize() for svr4 systems.
Thu Jan 9 21:07:20 1997 Robert Pouliot <krynos@clic.net>
* [Make.rules.in] [Makefile.in] [make_os2.sh] [rc/Makefile.in]
[tools/Makefile.in] [documentation/wine_os2.txt]
Patches for OS/2 support. Note that it doesn't compile yet.
Tue Jan 7 20:03:53 1997 Eric Youngdale <eric@sub2304.jic.com>
* [debugger/*]
Many more debugger improvements (see debugger/README for details).
Tue Jan 7 15:12:21 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [windows/graphics.c] [objects/text.c] [graphics/x11drv/*]
[graphics/metafiledrv/*]
Moved some device dependent code into the resp. subdirs.
* [include/gdi.h] [include/metafiledrv.h] [include/x11drv.h]
Prototypes added,
DC_FUNCTIONS: GetPixel added, some unnecessary functions removed.
* [objects/region.c]
CreatePolyPolygonRgn32 added.
* [files/dos_fs.c]
QueryDosDevice added.
* [misc/lstr.c]
FormatMessage: broken heap management fixed.
* [scheduler/process.c] [scheduler/thread.c]
Get/SetThreadPriority/PriorityClass added.
Mon Jan 6 21:55:30 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [misc/keyboard.c]
ToAscii : Use EVENT_ToAscii instead.
* [windows/event.c]
keypad_key : Do not convert XK_Mode_switch to VK_MENU; recognize
keypad cursor keys.
EVENT_event_to_vkey : New function, to transform a X keycode
into a MSwin vkey + extended bit.
EVENT_ToAscii : New function, to transform a vkey + extended bit
(+ key state table) into ascii char(s), using XLookupString, and
recognizing dead chars.
EVENT_key : Transform AltGr into Ctrl+Alt sequence; call
EVENT_event_to_vkey for keycode to vkey conversion; fixed
previous, context and extended bits.
* [windows/keyboard.c]
Include stddebug.h, to get -debugmsg messages.
GetKeyState : Handle VK_MBUTTON case.
GetKeyboardState, SetKeyboardState : Debugging messages added.
* [windows/message.c]
TranslateMessage : Handle dead chars.
Mon Jan 6 20:10:11 1997 Dominik Strasser <bm424953@muenchen.org>
* [if1632/crtdll.spec] [misc/crtdll.c]
C++ functions new/delete/set_new_handler implemented.
Mon Jan 6 15:48:15 1997 Frans van Dorsselaer <dorssel@rulhmpc49.LeidenUniv.nl>
* [controls/edit.c] [include/windows.h]
Moved the edit control to 32 bits.
Included new (win95) message definitions in windows.h
Implemented EM_SCROLLCARET, EM_SETMARGINS, EM_GETMARGINS,
EM_GETLIMITTEXT, EM_POSFROMCHAR, EM_CHARFROMPOS.
Broke EM_SETWORDBREAKPROC (internal wordwrap still works).
Fixed some bugs, introduced a couple of others.
Text buffer is now initially in 32-bit heap.
* [controls/EDIT.TODO] [controls/combo.c] [controls/widgets.c]
[if1632/wprocs.spec] [library/miscstubs.c] [windows/defdlg.c]
[misc/commdlg.c]
Updated to work with 32-bit edit control.
Sat Jan 4 22:07:27 1997 O.Flebbe <O.Flebbe@science-computing.uni-tuebingen.de>
* [loader/pe_image.c]
Use mmap rather then malloc. Better workaround for clean
segments.
1997-01-12 19:32:19 +01:00
|
|
|
/***********************************************************************
|
2001-02-15 00:11:17 +01:00
|
|
|
* ExtCreateRegion (GDI32.@)
|
2002-06-01 01:06:46 +02:00
|
|
|
*
|
2004-04-05 22:13:38 +02:00
|
|
|
* Creates a region as specified by the transformation data and region data.
|
|
|
|
*
|
|
|
|
* PARAMS
|
|
|
|
* lpXform [I] World-space to logical-space transformation data.
|
|
|
|
* dwCount [I] Size of the data pointed to by rgndata, in bytes.
|
2008-03-25 18:35:45 +01:00
|
|
|
* rgndata [I] Data that specifies the region.
|
2004-04-05 22:13:38 +02:00
|
|
|
*
|
|
|
|
* RETURNS
|
|
|
|
* Success: Handle to region.
|
|
|
|
* Failure: NULL.
|
|
|
|
*
|
|
|
|
* NOTES
|
|
|
|
* See GetRegionData().
|
Release 970112
Sat Jan 11 18:17:59 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [controls/menu.c]
Updated to new Win32 types.
* [controls/listbox.c]
Fixed Winfile extended selection bug.
* [files/directory.c]
Changed DIR_SearchPath to return both long and short file names.
* [files/dos_fs.c]
Implemented VFAT ioctl to retrieve the original short filenames
from a VFAT filesystem (Linux only for now).
Replaced DOSFS_GetUnixFileName()/DOSFS_GetDosTrueName() by
DOS_GetFullName().
Properly implemented GetShortPathName() and GetFullPathName().
Made all functions re-entrant.
* [files/file.c] [misc/main.c]
Replaced -allowreadonly option by -failreadonly. The default is
now to report success when opening a read-only file for writing.
* [objects/metafile.c]
Fixed bug in DIB bitmaps pointer calculation.
* [scheduler/process.c]
Implemented environment strings and Get/SetStdHandle with process
environment block.
* [tools/build.c]
Rewrote BuildContext32() to avoid instructions that may not be
supported by all assemblers.
Fri Jan 10 17:11:09 1997 David Faure <david.faure@ifhamy.insa-lyon.fr>
* [windows/event.c]
Created table keyc2vkey, which associate a vkey(+extended bit) to
any keycode. Changed EVENT_event_to_vkey to use this table to
return the correct vkey. Changed EVENT_ToAscii to get the keycode
from this table too. Assigned OEM specific vkeys arbitrarily.
Fri Jan 10 09:26:17 1997 John Harvey <john@division.co.uk>
* [misc/winsock.c] [misc/winsoc_async.c]
Fixed svr4 header files.
Changed bzero() to memset().
* [tools/fnt2bdf.c]
Removed bcopy() and used memcpy() instead.
* [debugger/msc.c]
Include string.h instead of strings.h
* [debugger/stabs.c]
Include string.h instead of strings.h.
Define __ELF__ for svr4 systems.
* [loader/signal.c]
Use wait() instead of wait4() which doesnt exist on Unixware.
* [memory/global.c]
Use sysconf() instead of getpagesize() for svr4 systems.
Thu Jan 9 21:07:20 1997 Robert Pouliot <krynos@clic.net>
* [Make.rules.in] [Makefile.in] [make_os2.sh] [rc/Makefile.in]
[tools/Makefile.in] [documentation/wine_os2.txt]
Patches for OS/2 support. Note that it doesn't compile yet.
Tue Jan 7 20:03:53 1997 Eric Youngdale <eric@sub2304.jic.com>
* [debugger/*]
Many more debugger improvements (see debugger/README for details).
Tue Jan 7 15:12:21 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [windows/graphics.c] [objects/text.c] [graphics/x11drv/*]
[graphics/metafiledrv/*]
Moved some device dependent code into the resp. subdirs.
* [include/gdi.h] [include/metafiledrv.h] [include/x11drv.h]
Prototypes added,
DC_FUNCTIONS: GetPixel added, some unnecessary functions removed.
* [objects/region.c]
CreatePolyPolygonRgn32 added.
* [files/dos_fs.c]
QueryDosDevice added.
* [misc/lstr.c]
FormatMessage: broken heap management fixed.
* [scheduler/process.c] [scheduler/thread.c]
Get/SetThreadPriority/PriorityClass added.
Mon Jan 6 21:55:30 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [misc/keyboard.c]
ToAscii : Use EVENT_ToAscii instead.
* [windows/event.c]
keypad_key : Do not convert XK_Mode_switch to VK_MENU; recognize
keypad cursor keys.
EVENT_event_to_vkey : New function, to transform a X keycode
into a MSwin vkey + extended bit.
EVENT_ToAscii : New function, to transform a vkey + extended bit
(+ key state table) into ascii char(s), using XLookupString, and
recognizing dead chars.
EVENT_key : Transform AltGr into Ctrl+Alt sequence; call
EVENT_event_to_vkey for keycode to vkey conversion; fixed
previous, context and extended bits.
* [windows/keyboard.c]
Include stddebug.h, to get -debugmsg messages.
GetKeyState : Handle VK_MBUTTON case.
GetKeyboardState, SetKeyboardState : Debugging messages added.
* [windows/message.c]
TranslateMessage : Handle dead chars.
Mon Jan 6 20:10:11 1997 Dominik Strasser <bm424953@muenchen.org>
* [if1632/crtdll.spec] [misc/crtdll.c]
C++ functions new/delete/set_new_handler implemented.
Mon Jan 6 15:48:15 1997 Frans van Dorsselaer <dorssel@rulhmpc49.LeidenUniv.nl>
* [controls/edit.c] [include/windows.h]
Moved the edit control to 32 bits.
Included new (win95) message definitions in windows.h
Implemented EM_SCROLLCARET, EM_SETMARGINS, EM_GETMARGINS,
EM_GETLIMITTEXT, EM_POSFROMCHAR, EM_CHARFROMPOS.
Broke EM_SETWORDBREAKPROC (internal wordwrap still works).
Fixed some bugs, introduced a couple of others.
Text buffer is now initially in 32-bit heap.
* [controls/EDIT.TODO] [controls/combo.c] [controls/widgets.c]
[if1632/wprocs.spec] [library/miscstubs.c] [windows/defdlg.c]
[misc/commdlg.c]
Updated to work with 32-bit edit control.
Sat Jan 4 22:07:27 1997 O.Flebbe <O.Flebbe@science-computing.uni-tuebingen.de>
* [loader/pe_image.c]
Use mmap rather then malloc. Better workaround for clean
segments.
1997-01-12 19:32:19 +01:00
|
|
|
*/
|
1999-02-26 12:11:13 +01:00
|
|
|
HRGN WINAPI ExtCreateRegion( const XFORM* lpXform, DWORD dwCount, const RGNDATA* rgndata)
|
1993-09-04 12:09:32 +02:00
|
|
|
{
|
2009-01-29 18:18:53 +01:00
|
|
|
HRGN hrgn = 0;
|
2009-01-29 17:32:06 +01:00
|
|
|
RGNOBJ *obj;
|
1999-03-28 11:37:57 +02:00
|
|
|
|
2008-04-18 15:42:43 +02:00
|
|
|
if (!rgndata)
|
|
|
|
{
|
|
|
|
SetLastError( ERROR_INVALID_PARAMETER );
|
|
|
|
return 0;
|
|
|
|
}
|
2002-06-01 01:06:46 +02:00
|
|
|
|
2008-04-18 15:42:43 +02:00
|
|
|
if (rgndata->rdh.dwSize < sizeof(RGNDATAHEADER))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* XP doesn't care about the type */
|
1999-03-28 11:37:57 +02:00
|
|
|
if( rgndata->rdh.iType != RDH_RECTANGLES )
|
2008-04-18 15:42:43 +02:00
|
|
|
WARN("(Unsupported region data type: %u)\n", rgndata->rdh.iType);
|
|
|
|
|
|
|
|
if (lpXform)
|
1993-09-04 12:09:32 +02:00
|
|
|
{
|
2010-03-27 11:56:11 +01:00
|
|
|
const RECT *pCurRect, *pEndRect;
|
1999-03-28 11:37:57 +02:00
|
|
|
|
2008-04-18 15:42:43 +02:00
|
|
|
hrgn = CreateRectRgn( 0, 0, 0, 0 );
|
|
|
|
|
2010-03-27 11:56:11 +01:00
|
|
|
pEndRect = (const RECT *)rgndata->Buffer + rgndata->rdh.nCount;
|
|
|
|
for (pCurRect = (const RECT *)rgndata->Buffer; pCurRect < pEndRect; pCurRect++)
|
2008-04-18 15:42:43 +02:00
|
|
|
{
|
|
|
|
static const INT count = 4;
|
|
|
|
HRGN poly_hrgn;
|
|
|
|
POINT pt[4];
|
|
|
|
|
|
|
|
pt[0].x = pCurRect->left;
|
|
|
|
pt[0].y = pCurRect->top;
|
|
|
|
pt[1].x = pCurRect->right;
|
|
|
|
pt[1].y = pCurRect->top;
|
|
|
|
pt[2].x = pCurRect->right;
|
|
|
|
pt[2].y = pCurRect->bottom;
|
|
|
|
pt[3].x = pCurRect->left;
|
|
|
|
pt[3].y = pCurRect->bottom;
|
|
|
|
|
|
|
|
translate( pt, 4, lpXform );
|
|
|
|
poly_hrgn = CreatePolyPolygonRgn( pt, &count, 1, WINDING );
|
|
|
|
CombineRgn( hrgn, hrgn, poly_hrgn, RGN_OR );
|
|
|
|
DeleteObject( poly_hrgn );
|
|
|
|
}
|
|
|
|
return hrgn;
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
1994-09-16 11:24:37 +02:00
|
|
|
|
2009-01-29 17:32:06 +01:00
|
|
|
if (!(obj = HeapAlloc( GetProcessHeap(), 0, sizeof(*obj) ))) return 0;
|
|
|
|
|
|
|
|
if (init_region( &obj->rgn, rgndata->rdh.nCount ))
|
1999-03-28 11:37:57 +02:00
|
|
|
{
|
2010-03-27 11:56:11 +01:00
|
|
|
const RECT *pCurRect, *pEndRect;
|
1999-03-28 11:37:57 +02:00
|
|
|
|
2010-03-27 11:56:11 +01:00
|
|
|
pEndRect = (const RECT *)rgndata->Buffer + rgndata->rdh.nCount;
|
|
|
|
for(pCurRect = (const RECT *)rgndata->Buffer; pCurRect < pEndRect; pCurRect++)
|
2009-01-29 17:32:06 +01:00
|
|
|
{
|
|
|
|
if (pCurRect->left < pCurRect->right && pCurRect->top < pCurRect->bottom)
|
2009-01-29 18:18:53 +01:00
|
|
|
{
|
|
|
|
if (!REGION_UnionRectWithRegion( pCurRect, &obj->rgn )) goto done;
|
|
|
|
}
|
2000-08-19 23:38:55 +02:00
|
|
|
}
|
2009-01-29 17:32:06 +01:00
|
|
|
hrgn = alloc_gdi_handle( &obj->header, OBJ_REGION, ®ion_funcs );
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
HeapFree( GetProcessHeap(), 0, obj );
|
|
|
|
return 0;
|
1999-03-28 11:37:57 +02:00
|
|
|
}
|
2008-04-18 15:42:43 +02:00
|
|
|
|
2009-01-29 18:18:53 +01:00
|
|
|
done:
|
2009-01-29 17:32:06 +01:00
|
|
|
if (!hrgn)
|
|
|
|
{
|
|
|
|
HeapFree( GetProcessHeap(), 0, obj->rgn.rects );
|
|
|
|
HeapFree( GetProcessHeap(), 0, obj );
|
|
|
|
}
|
|
|
|
TRACE("%p %d %p returning %p\n", lpXform, dwCount, rgndata, hrgn );
|
|
|
|
return hrgn;
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
|
|
|
|
1996-11-02 15:24:07 +01:00
|
|
|
|
|
|
|
/***********************************************************************
|
2001-02-15 00:11:17 +01:00
|
|
|
* PtInRegion (GDI32.@)
|
2004-04-05 22:13:38 +02:00
|
|
|
*
|
|
|
|
* Tests whether the specified point is inside a region.
|
|
|
|
*
|
|
|
|
* PARAMS
|
|
|
|
* hrgn [I] Region to test.
|
|
|
|
* x [I] X-coordinate of point to test.
|
|
|
|
* y [I] Y-coordinate of point to test.
|
|
|
|
*
|
|
|
|
* RETURNS
|
|
|
|
* Non-zero if the point is inside the region or zero otherwise.
|
1993-09-04 12:09:32 +02:00
|
|
|
*/
|
1999-02-26 12:11:13 +01:00
|
|
|
BOOL WINAPI PtInRegion( HRGN hrgn, INT x, INT y )
|
1993-09-04 12:09:32 +02:00
|
|
|
{
|
|
|
|
RGNOBJ * obj;
|
2000-08-19 23:38:55 +02:00
|
|
|
BOOL ret = FALSE;
|
2002-06-01 01:06:46 +02:00
|
|
|
|
2009-01-28 16:20:56 +01:00
|
|
|
if ((obj = GDI_GetObjPtr( hrgn, OBJ_REGION )))
|
Release 971116
Sun Nov 16 07:42:44 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c] [windows/clipboard.c] [windows/nonclient.c]
Bug fixes.
* [misc/shell.c] [resources/*]
New "About" dialog.
Sat Nov 15 17:30:18 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [configure.in] [Makefile.in]
Replaced --with-library option by --disable-emulator. The default
is now to build both the library and the emulator.
Renamed --with options to --enable to follow autoconf guidelines.
* [loader/main.c] [miscemu/main.c] (New file)
Split initialization in WinelibInit/EmulatorInit.
* [loader/*.c]
Removed all remaining #ifdef's WINELIB.
* [controls/widgets.c] [windows/mdi.c]
Converted MDIClientWndProc to 32-bit.
* [debugger/break.c] [if1632/signal.c] [include/selectors.h]
[scheduler/thread.c]
Code and data selector values are now computed at run-time.
* [library/libres.c]
Moved to loader/ directory.
* [misc/main.c] [misc/version.c] (New file)
Moved all version stuff to version.c. Cleaned up a bit.
* [msdos/dpmi.c]
Update the REALMODECALL structure on return from real-mode
interrupt.
* [windows/event.c] [windows/keyboard.c]
Changed the way event coordinates are determined. Don't rely on
the ConfigureNotify event values. This should fix all problems
with cursor position in -desktop and -managed modes.
Sat Nov 15 16:09:36 1997 Slaven Rezic <eserte@cs.tu-berlin.de>
* [controls/button.c]
(BUTTON_CheckAutoRadioButton): Prevent possible endless loop.
Wed Nov 12 03:42:45 1997 Chris Faherty <chrisf@america.com>
* [misc/ver.c]
Changed VerInstall32A to assume srcdir as destination if destdir
is blank. This was causing alot of DLL installation into SYSTEM
directory to fail.
* [loader/ne_image.c]
NE_LoadSegment buffer[100] was too small and getting overruns.
Changed it to buffer[200].
Sat Nov 8 06:09:57 1997 Len White <phreak@cgocable.net>
* [misc/ddeml.c] [include/ddeml.h] [if1632/ddeml.spec]
Added stub functions DdeConnectList(), DdeQueryNextServer(),
DdeDisconnectList(), DdeSetUserHandle(), DdeAbandonTransaction(),
DdePostAdvise(), DdeCreateDataHandle(), DdeAddData(), DdeGetData(),
DdeAccessData(), DdeUnaccessData(), DdeEnableCallback(),
DdeCmpStringHandles().
Fri Nov 7 19:44:26 1997 Olaf Flebbe <o.flebbe@science-computing.de>
* [files/directory.c]
Fix typo in directory.c [broke loading of cdplayer on nt40]
* [misc/main.c]
Implemented -winver nt40.
* [loader/resource.c] [user32.spec]
Stubs for CopyAcceleratorTable, Destroy AcceleratorTable.
Thu Nov 6 22:37:04 1997 Morten Welinder <welinder@rentec.com>
* [files/drive.c]
(GetDiskFreeSpace32A): Cap at 2GB.
* [include/windows.h]
Prototype DrawIconEx and CreateDIBSection32.
Define OBM_RADIOCHECK.
Add DI_* macros.
* [objects/dib.c] [if1632/gdi.spec]
CreateDIBSection is a WINAPI. Renamed to CreateDIBSection32.
Implement CreateDIBSection16.
* [if1632/user.spec] [if1632/user32.spec]
Add DrawIconEx.
* [objects/cursoricon.c]
(CopyIcon32): Fix bogus implementation.
* [objects/bitmap.c]
(CopyBitmap32): New function.
(CopyImage32): Do bitmaps.
* [graphics/x11drv/text.c]
(X11DRV_ExtTextOut): Change ascent and descent default to avoid
zero-thinkness overstrike line.
* [include/debugstr.h] [misc/debugstr.c]
New files.
* [msdos/dpmi.c]
Don't prototype do_mscdex. In INT_Int31Handler, handle real-mode
int 0x21, ah=0x52.
* [msdos/int2f.c]
Add dummys for 0x1681 and 0x1682.
* [misc/registry.c]
Fix memory leaks in RegDeleteKey32W.
* [objects/text.c]
In TEXT_NextLine, fix another off-by-one bug.
* [include/bitmaps/obm_radiocheck]
New file. (It a small circle used to radio-button menu items
when selected.)
* [objects/oembitmap.c]
Add obm_radiocheck.
* [include/windows.h] [if1632/user32.spec] [controls/menu.c]
[if1632/user.spec]
Define CheckMenuRadioItem{16,32}. Define GetMenuItemRect{16,32}.
Wed Nov 5 11:30:14 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [misc/main.c]
Auto adjust versions depending on binary.
Tue Nov 4 15:21:00 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [controls/listbox.c]
Paint full background in listbox items with tab stops enabled.
* [if1632/thunk.c]
Copy some more message parameter structures (DRAWITEMSTRUCT16,
COMPAREITEMSTRUCT16) to the stack segment to fix broken programs
that need this.
* [windows/dce.c]
Only clip sibling windows when the parent has the WS_CLIPSIBLINGS
style set.
* [windows/focus.c]
Make order of events in FOCUS_SwitchFocus() reflect API docs.
* [windows/defdlg.c]
Fix problem with loss of focus in some dialogs.
* [win32/code_page.c]
Fix return value for MultiByteToWideChar().
* [BUGS]
BCW now works.
1997-11-16 18:38:29 +01:00
|
|
|
{
|
1998-01-18 19:01:49 +01:00
|
|
|
int i;
|
|
|
|
|
2009-01-29 16:38:53 +01:00
|
|
|
if (obj->rgn.numRects > 0 && INRECT(obj->rgn.extents, x, y))
|
|
|
|
for (i = 0; i < obj->rgn.numRects; i++)
|
|
|
|
if (INRECT (obj->rgn.rects[i], x, y))
|
2000-08-19 23:38:55 +02:00
|
|
|
{
|
1998-01-18 19:01:49 +01:00
|
|
|
ret = TRUE;
|
2000-08-19 23:38:55 +02:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
GDI_ReleaseObj( hrgn );
|
Release 971116
Sun Nov 16 07:42:44 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c] [windows/clipboard.c] [windows/nonclient.c]
Bug fixes.
* [misc/shell.c] [resources/*]
New "About" dialog.
Sat Nov 15 17:30:18 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [configure.in] [Makefile.in]
Replaced --with-library option by --disable-emulator. The default
is now to build both the library and the emulator.
Renamed --with options to --enable to follow autoconf guidelines.
* [loader/main.c] [miscemu/main.c] (New file)
Split initialization in WinelibInit/EmulatorInit.
* [loader/*.c]
Removed all remaining #ifdef's WINELIB.
* [controls/widgets.c] [windows/mdi.c]
Converted MDIClientWndProc to 32-bit.
* [debugger/break.c] [if1632/signal.c] [include/selectors.h]
[scheduler/thread.c]
Code and data selector values are now computed at run-time.
* [library/libres.c]
Moved to loader/ directory.
* [misc/main.c] [misc/version.c] (New file)
Moved all version stuff to version.c. Cleaned up a bit.
* [msdos/dpmi.c]
Update the REALMODECALL structure on return from real-mode
interrupt.
* [windows/event.c] [windows/keyboard.c]
Changed the way event coordinates are determined. Don't rely on
the ConfigureNotify event values. This should fix all problems
with cursor position in -desktop and -managed modes.
Sat Nov 15 16:09:36 1997 Slaven Rezic <eserte@cs.tu-berlin.de>
* [controls/button.c]
(BUTTON_CheckAutoRadioButton): Prevent possible endless loop.
Wed Nov 12 03:42:45 1997 Chris Faherty <chrisf@america.com>
* [misc/ver.c]
Changed VerInstall32A to assume srcdir as destination if destdir
is blank. This was causing alot of DLL installation into SYSTEM
directory to fail.
* [loader/ne_image.c]
NE_LoadSegment buffer[100] was too small and getting overruns.
Changed it to buffer[200].
Sat Nov 8 06:09:57 1997 Len White <phreak@cgocable.net>
* [misc/ddeml.c] [include/ddeml.h] [if1632/ddeml.spec]
Added stub functions DdeConnectList(), DdeQueryNextServer(),
DdeDisconnectList(), DdeSetUserHandle(), DdeAbandonTransaction(),
DdePostAdvise(), DdeCreateDataHandle(), DdeAddData(), DdeGetData(),
DdeAccessData(), DdeUnaccessData(), DdeEnableCallback(),
DdeCmpStringHandles().
Fri Nov 7 19:44:26 1997 Olaf Flebbe <o.flebbe@science-computing.de>
* [files/directory.c]
Fix typo in directory.c [broke loading of cdplayer on nt40]
* [misc/main.c]
Implemented -winver nt40.
* [loader/resource.c] [user32.spec]
Stubs for CopyAcceleratorTable, Destroy AcceleratorTable.
Thu Nov 6 22:37:04 1997 Morten Welinder <welinder@rentec.com>
* [files/drive.c]
(GetDiskFreeSpace32A): Cap at 2GB.
* [include/windows.h]
Prototype DrawIconEx and CreateDIBSection32.
Define OBM_RADIOCHECK.
Add DI_* macros.
* [objects/dib.c] [if1632/gdi.spec]
CreateDIBSection is a WINAPI. Renamed to CreateDIBSection32.
Implement CreateDIBSection16.
* [if1632/user.spec] [if1632/user32.spec]
Add DrawIconEx.
* [objects/cursoricon.c]
(CopyIcon32): Fix bogus implementation.
* [objects/bitmap.c]
(CopyBitmap32): New function.
(CopyImage32): Do bitmaps.
* [graphics/x11drv/text.c]
(X11DRV_ExtTextOut): Change ascent and descent default to avoid
zero-thinkness overstrike line.
* [include/debugstr.h] [misc/debugstr.c]
New files.
* [msdos/dpmi.c]
Don't prototype do_mscdex. In INT_Int31Handler, handle real-mode
int 0x21, ah=0x52.
* [msdos/int2f.c]
Add dummys for 0x1681 and 0x1682.
* [misc/registry.c]
Fix memory leaks in RegDeleteKey32W.
* [objects/text.c]
In TEXT_NextLine, fix another off-by-one bug.
* [include/bitmaps/obm_radiocheck]
New file. (It a small circle used to radio-button menu items
when selected.)
* [objects/oembitmap.c]
Add obm_radiocheck.
* [include/windows.h] [if1632/user32.spec] [controls/menu.c]
[if1632/user.spec]
Define CheckMenuRadioItem{16,32}. Define GetMenuItemRect{16,32}.
Wed Nov 5 11:30:14 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [misc/main.c]
Auto adjust versions depending on binary.
Tue Nov 4 15:21:00 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [controls/listbox.c]
Paint full background in listbox items with tab stops enabled.
* [if1632/thunk.c]
Copy some more message parameter structures (DRAWITEMSTRUCT16,
COMPAREITEMSTRUCT16) to the stack segment to fix broken programs
that need this.
* [windows/dce.c]
Only clip sibling windows when the parent has the WS_CLIPSIBLINGS
style set.
* [windows/focus.c]
Make order of events in FOCUS_SwitchFocus() reflect API docs.
* [windows/defdlg.c]
Fix problem with loss of focus in some dialogs.
* [win32/code_page.c]
Fix return value for MultiByteToWideChar().
* [BUGS]
BCW now works.
1997-11-16 18:38:29 +01:00
|
|
|
}
|
2000-08-19 23:38:55 +02:00
|
|
|
return ret;
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
|
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.
1996-05-16 20:21:06 +02:00
|
|
|
/***********************************************************************
|
2001-02-15 00:11:17 +01:00
|
|
|
* RectInRegion (GDI32.@)
|
1998-01-18 19:01:49 +01:00
|
|
|
*
|
2004-04-05 22:13:38 +02:00
|
|
|
* Tests if a rectangle is at least partly inside the specified region.
|
|
|
|
*
|
|
|
|
* PARAMS
|
|
|
|
* hrgn [I] Region to test.
|
|
|
|
* rect [I] Rectangle to test.
|
|
|
|
*
|
|
|
|
* RETURNS
|
|
|
|
* Non-zero if the rectangle is partially inside the region or
|
|
|
|
* zero otherwise.
|
1993-09-04 12:09:32 +02:00
|
|
|
*/
|
1999-02-26 12:11:13 +01:00
|
|
|
BOOL WINAPI RectInRegion( HRGN hrgn, const RECT *rect )
|
1993-09-04 12:09:32 +02:00
|
|
|
{
|
|
|
|
RGNOBJ * obj;
|
2000-08-19 23:38:55 +02:00
|
|
|
BOOL ret = FALSE;
|
2009-06-06 19:56:58 +02:00
|
|
|
RECT rc;
|
|
|
|
|
|
|
|
/* swap the coordinates to make right >= left and bottom >= top */
|
|
|
|
/* (region building rectangles are normalized the same way) */
|
|
|
|
if( rect->top > rect->bottom) {
|
|
|
|
rc.top = rect->bottom;
|
|
|
|
rc.bottom = rect->top;
|
|
|
|
} else {
|
|
|
|
rc.top = rect->top;
|
|
|
|
rc.bottom = rect->bottom;
|
|
|
|
}
|
|
|
|
if( rect->right < rect->left) {
|
|
|
|
rc.right = rect->left;
|
|
|
|
rc.left = rect->right;
|
|
|
|
} else {
|
|
|
|
rc.right = rect->right;
|
|
|
|
rc.left = rect->left;
|
|
|
|
}
|
2002-06-01 01:06:46 +02:00
|
|
|
|
2009-01-28 16:20:56 +01:00
|
|
|
if ((obj = GDI_GetObjPtr( hrgn, OBJ_REGION )))
|
Release 971116
Sun Nov 16 07:42:44 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c] [windows/clipboard.c] [windows/nonclient.c]
Bug fixes.
* [misc/shell.c] [resources/*]
New "About" dialog.
Sat Nov 15 17:30:18 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [configure.in] [Makefile.in]
Replaced --with-library option by --disable-emulator. The default
is now to build both the library and the emulator.
Renamed --with options to --enable to follow autoconf guidelines.
* [loader/main.c] [miscemu/main.c] (New file)
Split initialization in WinelibInit/EmulatorInit.
* [loader/*.c]
Removed all remaining #ifdef's WINELIB.
* [controls/widgets.c] [windows/mdi.c]
Converted MDIClientWndProc to 32-bit.
* [debugger/break.c] [if1632/signal.c] [include/selectors.h]
[scheduler/thread.c]
Code and data selector values are now computed at run-time.
* [library/libres.c]
Moved to loader/ directory.
* [misc/main.c] [misc/version.c] (New file)
Moved all version stuff to version.c. Cleaned up a bit.
* [msdos/dpmi.c]
Update the REALMODECALL structure on return from real-mode
interrupt.
* [windows/event.c] [windows/keyboard.c]
Changed the way event coordinates are determined. Don't rely on
the ConfigureNotify event values. This should fix all problems
with cursor position in -desktop and -managed modes.
Sat Nov 15 16:09:36 1997 Slaven Rezic <eserte@cs.tu-berlin.de>
* [controls/button.c]
(BUTTON_CheckAutoRadioButton): Prevent possible endless loop.
Wed Nov 12 03:42:45 1997 Chris Faherty <chrisf@america.com>
* [misc/ver.c]
Changed VerInstall32A to assume srcdir as destination if destdir
is blank. This was causing alot of DLL installation into SYSTEM
directory to fail.
* [loader/ne_image.c]
NE_LoadSegment buffer[100] was too small and getting overruns.
Changed it to buffer[200].
Sat Nov 8 06:09:57 1997 Len White <phreak@cgocable.net>
* [misc/ddeml.c] [include/ddeml.h] [if1632/ddeml.spec]
Added stub functions DdeConnectList(), DdeQueryNextServer(),
DdeDisconnectList(), DdeSetUserHandle(), DdeAbandonTransaction(),
DdePostAdvise(), DdeCreateDataHandle(), DdeAddData(), DdeGetData(),
DdeAccessData(), DdeUnaccessData(), DdeEnableCallback(),
DdeCmpStringHandles().
Fri Nov 7 19:44:26 1997 Olaf Flebbe <o.flebbe@science-computing.de>
* [files/directory.c]
Fix typo in directory.c [broke loading of cdplayer on nt40]
* [misc/main.c]
Implemented -winver nt40.
* [loader/resource.c] [user32.spec]
Stubs for CopyAcceleratorTable, Destroy AcceleratorTable.
Thu Nov 6 22:37:04 1997 Morten Welinder <welinder@rentec.com>
* [files/drive.c]
(GetDiskFreeSpace32A): Cap at 2GB.
* [include/windows.h]
Prototype DrawIconEx and CreateDIBSection32.
Define OBM_RADIOCHECK.
Add DI_* macros.
* [objects/dib.c] [if1632/gdi.spec]
CreateDIBSection is a WINAPI. Renamed to CreateDIBSection32.
Implement CreateDIBSection16.
* [if1632/user.spec] [if1632/user32.spec]
Add DrawIconEx.
* [objects/cursoricon.c]
(CopyIcon32): Fix bogus implementation.
* [objects/bitmap.c]
(CopyBitmap32): New function.
(CopyImage32): Do bitmaps.
* [graphics/x11drv/text.c]
(X11DRV_ExtTextOut): Change ascent and descent default to avoid
zero-thinkness overstrike line.
* [include/debugstr.h] [misc/debugstr.c]
New files.
* [msdos/dpmi.c]
Don't prototype do_mscdex. In INT_Int31Handler, handle real-mode
int 0x21, ah=0x52.
* [msdos/int2f.c]
Add dummys for 0x1681 and 0x1682.
* [misc/registry.c]
Fix memory leaks in RegDeleteKey32W.
* [objects/text.c]
In TEXT_NextLine, fix another off-by-one bug.
* [include/bitmaps/obm_radiocheck]
New file. (It a small circle used to radio-button menu items
when selected.)
* [objects/oembitmap.c]
Add obm_radiocheck.
* [include/windows.h] [if1632/user32.spec] [controls/menu.c]
[if1632/user.spec]
Define CheckMenuRadioItem{16,32}. Define GetMenuItemRect{16,32}.
Wed Nov 5 11:30:14 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [misc/main.c]
Auto adjust versions depending on binary.
Tue Nov 4 15:21:00 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [controls/listbox.c]
Paint full background in listbox items with tab stops enabled.
* [if1632/thunk.c]
Copy some more message parameter structures (DRAWITEMSTRUCT16,
COMPAREITEMSTRUCT16) to the stack segment to fix broken programs
that need this.
* [windows/dce.c]
Only clip sibling windows when the parent has the WS_CLIPSIBLINGS
style set.
* [windows/focus.c]
Make order of events in FOCUS_SwitchFocus() reflect API docs.
* [windows/defdlg.c]
Fix problem with loss of focus in some dialogs.
* [win32/code_page.c]
Fix return value for MultiByteToWideChar().
* [BUGS]
BCW now works.
1997-11-16 18:38:29 +01:00
|
|
|
{
|
1999-02-26 12:11:13 +01:00
|
|
|
RECT *pCurRect, *pRectEnd;
|
2002-06-01 01:06:46 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
/* this is (just) a useful optimization */
|
2009-06-06 19:56:58 +02:00
|
|
|
if ((obj->rgn.numRects > 0) && EXTENTCHECK(&obj->rgn.extents, &rc))
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
2009-01-29 16:38:53 +01:00
|
|
|
for (pCurRect = obj->rgn.rects, pRectEnd = pCurRect +
|
|
|
|
obj->rgn.numRects; pCurRect < pRectEnd; pCurRect++)
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
2009-06-06 19:56:58 +02:00
|
|
|
if (pCurRect->bottom <= rc.top)
|
1998-01-18 19:01:49 +01:00
|
|
|
continue; /* not far enough down yet */
|
|
|
|
|
2009-06-06 19:56:58 +02:00
|
|
|
if (pCurRect->top >= rc.bottom)
|
2000-08-19 23:38:55 +02:00
|
|
|
break; /* too far down */
|
1998-01-18 19:01:49 +01:00
|
|
|
|
2009-06-06 19:56:58 +02:00
|
|
|
if (pCurRect->right <= rc.left)
|
1998-01-18 19:01:49 +01:00
|
|
|
continue; /* not far enough over yet */
|
|
|
|
|
2009-06-06 19:56:58 +02:00
|
|
|
if (pCurRect->left >= rc.right) {
|
1998-10-21 16:23:38 +02:00
|
|
|
continue;
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
ret = TRUE;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
2000-08-19 23:38:55 +02:00
|
|
|
GDI_ReleaseObj(hrgn);
|
Release 971116
Sun Nov 16 07:42:44 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c] [windows/clipboard.c] [windows/nonclient.c]
Bug fixes.
* [misc/shell.c] [resources/*]
New "About" dialog.
Sat Nov 15 17:30:18 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [configure.in] [Makefile.in]
Replaced --with-library option by --disable-emulator. The default
is now to build both the library and the emulator.
Renamed --with options to --enable to follow autoconf guidelines.
* [loader/main.c] [miscemu/main.c] (New file)
Split initialization in WinelibInit/EmulatorInit.
* [loader/*.c]
Removed all remaining #ifdef's WINELIB.
* [controls/widgets.c] [windows/mdi.c]
Converted MDIClientWndProc to 32-bit.
* [debugger/break.c] [if1632/signal.c] [include/selectors.h]
[scheduler/thread.c]
Code and data selector values are now computed at run-time.
* [library/libres.c]
Moved to loader/ directory.
* [misc/main.c] [misc/version.c] (New file)
Moved all version stuff to version.c. Cleaned up a bit.
* [msdos/dpmi.c]
Update the REALMODECALL structure on return from real-mode
interrupt.
* [windows/event.c] [windows/keyboard.c]
Changed the way event coordinates are determined. Don't rely on
the ConfigureNotify event values. This should fix all problems
with cursor position in -desktop and -managed modes.
Sat Nov 15 16:09:36 1997 Slaven Rezic <eserte@cs.tu-berlin.de>
* [controls/button.c]
(BUTTON_CheckAutoRadioButton): Prevent possible endless loop.
Wed Nov 12 03:42:45 1997 Chris Faherty <chrisf@america.com>
* [misc/ver.c]
Changed VerInstall32A to assume srcdir as destination if destdir
is blank. This was causing alot of DLL installation into SYSTEM
directory to fail.
* [loader/ne_image.c]
NE_LoadSegment buffer[100] was too small and getting overruns.
Changed it to buffer[200].
Sat Nov 8 06:09:57 1997 Len White <phreak@cgocable.net>
* [misc/ddeml.c] [include/ddeml.h] [if1632/ddeml.spec]
Added stub functions DdeConnectList(), DdeQueryNextServer(),
DdeDisconnectList(), DdeSetUserHandle(), DdeAbandonTransaction(),
DdePostAdvise(), DdeCreateDataHandle(), DdeAddData(), DdeGetData(),
DdeAccessData(), DdeUnaccessData(), DdeEnableCallback(),
DdeCmpStringHandles().
Fri Nov 7 19:44:26 1997 Olaf Flebbe <o.flebbe@science-computing.de>
* [files/directory.c]
Fix typo in directory.c [broke loading of cdplayer on nt40]
* [misc/main.c]
Implemented -winver nt40.
* [loader/resource.c] [user32.spec]
Stubs for CopyAcceleratorTable, Destroy AcceleratorTable.
Thu Nov 6 22:37:04 1997 Morten Welinder <welinder@rentec.com>
* [files/drive.c]
(GetDiskFreeSpace32A): Cap at 2GB.
* [include/windows.h]
Prototype DrawIconEx and CreateDIBSection32.
Define OBM_RADIOCHECK.
Add DI_* macros.
* [objects/dib.c] [if1632/gdi.spec]
CreateDIBSection is a WINAPI. Renamed to CreateDIBSection32.
Implement CreateDIBSection16.
* [if1632/user.spec] [if1632/user32.spec]
Add DrawIconEx.
* [objects/cursoricon.c]
(CopyIcon32): Fix bogus implementation.
* [objects/bitmap.c]
(CopyBitmap32): New function.
(CopyImage32): Do bitmaps.
* [graphics/x11drv/text.c]
(X11DRV_ExtTextOut): Change ascent and descent default to avoid
zero-thinkness overstrike line.
* [include/debugstr.h] [misc/debugstr.c]
New files.
* [msdos/dpmi.c]
Don't prototype do_mscdex. In INT_Int31Handler, handle real-mode
int 0x21, ah=0x52.
* [msdos/int2f.c]
Add dummys for 0x1681 and 0x1682.
* [misc/registry.c]
Fix memory leaks in RegDeleteKey32W.
* [objects/text.c]
In TEXT_NextLine, fix another off-by-one bug.
* [include/bitmaps/obm_radiocheck]
New file. (It a small circle used to radio-button menu items
when selected.)
* [objects/oembitmap.c]
Add obm_radiocheck.
* [include/windows.h] [if1632/user32.spec] [controls/menu.c]
[if1632/user.spec]
Define CheckMenuRadioItem{16,32}. Define GetMenuItemRect{16,32}.
Wed Nov 5 11:30:14 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [misc/main.c]
Auto adjust versions depending on binary.
Tue Nov 4 15:21:00 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [controls/listbox.c]
Paint full background in listbox items with tab stops enabled.
* [if1632/thunk.c]
Copy some more message parameter structures (DRAWITEMSTRUCT16,
COMPAREITEMSTRUCT16) to the stack segment to fix broken programs
that need this.
* [windows/dce.c]
Only clip sibling windows when the parent has the WS_CLIPSIBLINGS
style set.
* [windows/focus.c]
Make order of events in FOCUS_SwitchFocus() reflect API docs.
* [windows/defdlg.c]
Fix problem with loss of focus in some dialogs.
* [win32/code_page.c]
Fix return value for MultiByteToWideChar().
* [BUGS]
BCW now works.
1997-11-16 18:38:29 +01:00
|
|
|
}
|
2000-08-19 23:38:55 +02:00
|
|
|
return ret;
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
|
|
|
|
1996-11-02 15:24:07 +01:00
|
|
|
/***********************************************************************
|
2001-02-15 00:11:17 +01:00
|
|
|
* EqualRgn (GDI32.@)
|
2004-04-05 22:13:38 +02:00
|
|
|
*
|
|
|
|
* Tests whether one region is identical to another.
|
|
|
|
*
|
|
|
|
* PARAMS
|
|
|
|
* hrgn1 [I] The first region to compare.
|
|
|
|
* hrgn2 [I] The second region to compare.
|
|
|
|
*
|
|
|
|
* RETURNS
|
|
|
|
* Non-zero if both regions are identical or zero otherwise.
|
1996-11-02 15:24:07 +01:00
|
|
|
*/
|
1999-02-26 12:11:13 +01:00
|
|
|
BOOL WINAPI EqualRgn( HRGN hrgn1, HRGN hrgn2 )
|
1993-09-04 12:09:32 +02:00
|
|
|
{
|
|
|
|
RGNOBJ *obj1, *obj2;
|
1999-02-26 12:11:13 +01:00
|
|
|
BOOL ret = FALSE;
|
1997-08-24 18:00:30 +02:00
|
|
|
|
2009-01-28 16:20:56 +01:00
|
|
|
if ((obj1 = GDI_GetObjPtr( hrgn1, OBJ_REGION )))
|
1997-08-24 18:00:30 +02:00
|
|
|
{
|
2009-01-28 16:20:56 +01:00
|
|
|
if ((obj2 = GDI_GetObjPtr( hrgn2, OBJ_REGION )))
|
Release 971116
Sun Nov 16 07:42:44 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c] [windows/clipboard.c] [windows/nonclient.c]
Bug fixes.
* [misc/shell.c] [resources/*]
New "About" dialog.
Sat Nov 15 17:30:18 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [configure.in] [Makefile.in]
Replaced --with-library option by --disable-emulator. The default
is now to build both the library and the emulator.
Renamed --with options to --enable to follow autoconf guidelines.
* [loader/main.c] [miscemu/main.c] (New file)
Split initialization in WinelibInit/EmulatorInit.
* [loader/*.c]
Removed all remaining #ifdef's WINELIB.
* [controls/widgets.c] [windows/mdi.c]
Converted MDIClientWndProc to 32-bit.
* [debugger/break.c] [if1632/signal.c] [include/selectors.h]
[scheduler/thread.c]
Code and data selector values are now computed at run-time.
* [library/libres.c]
Moved to loader/ directory.
* [misc/main.c] [misc/version.c] (New file)
Moved all version stuff to version.c. Cleaned up a bit.
* [msdos/dpmi.c]
Update the REALMODECALL structure on return from real-mode
interrupt.
* [windows/event.c] [windows/keyboard.c]
Changed the way event coordinates are determined. Don't rely on
the ConfigureNotify event values. This should fix all problems
with cursor position in -desktop and -managed modes.
Sat Nov 15 16:09:36 1997 Slaven Rezic <eserte@cs.tu-berlin.de>
* [controls/button.c]
(BUTTON_CheckAutoRadioButton): Prevent possible endless loop.
Wed Nov 12 03:42:45 1997 Chris Faherty <chrisf@america.com>
* [misc/ver.c]
Changed VerInstall32A to assume srcdir as destination if destdir
is blank. This was causing alot of DLL installation into SYSTEM
directory to fail.
* [loader/ne_image.c]
NE_LoadSegment buffer[100] was too small and getting overruns.
Changed it to buffer[200].
Sat Nov 8 06:09:57 1997 Len White <phreak@cgocable.net>
* [misc/ddeml.c] [include/ddeml.h] [if1632/ddeml.spec]
Added stub functions DdeConnectList(), DdeQueryNextServer(),
DdeDisconnectList(), DdeSetUserHandle(), DdeAbandonTransaction(),
DdePostAdvise(), DdeCreateDataHandle(), DdeAddData(), DdeGetData(),
DdeAccessData(), DdeUnaccessData(), DdeEnableCallback(),
DdeCmpStringHandles().
Fri Nov 7 19:44:26 1997 Olaf Flebbe <o.flebbe@science-computing.de>
* [files/directory.c]
Fix typo in directory.c [broke loading of cdplayer on nt40]
* [misc/main.c]
Implemented -winver nt40.
* [loader/resource.c] [user32.spec]
Stubs for CopyAcceleratorTable, Destroy AcceleratorTable.
Thu Nov 6 22:37:04 1997 Morten Welinder <welinder@rentec.com>
* [files/drive.c]
(GetDiskFreeSpace32A): Cap at 2GB.
* [include/windows.h]
Prototype DrawIconEx and CreateDIBSection32.
Define OBM_RADIOCHECK.
Add DI_* macros.
* [objects/dib.c] [if1632/gdi.spec]
CreateDIBSection is a WINAPI. Renamed to CreateDIBSection32.
Implement CreateDIBSection16.
* [if1632/user.spec] [if1632/user32.spec]
Add DrawIconEx.
* [objects/cursoricon.c]
(CopyIcon32): Fix bogus implementation.
* [objects/bitmap.c]
(CopyBitmap32): New function.
(CopyImage32): Do bitmaps.
* [graphics/x11drv/text.c]
(X11DRV_ExtTextOut): Change ascent and descent default to avoid
zero-thinkness overstrike line.
* [include/debugstr.h] [misc/debugstr.c]
New files.
* [msdos/dpmi.c]
Don't prototype do_mscdex. In INT_Int31Handler, handle real-mode
int 0x21, ah=0x52.
* [msdos/int2f.c]
Add dummys for 0x1681 and 0x1682.
* [misc/registry.c]
Fix memory leaks in RegDeleteKey32W.
* [objects/text.c]
In TEXT_NextLine, fix another off-by-one bug.
* [include/bitmaps/obm_radiocheck]
New file. (It a small circle used to radio-button menu items
when selected.)
* [objects/oembitmap.c]
Add obm_radiocheck.
* [include/windows.h] [if1632/user32.spec] [controls/menu.c]
[if1632/user.spec]
Define CheckMenuRadioItem{16,32}. Define GetMenuItemRect{16,32}.
Wed Nov 5 11:30:14 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [misc/main.c]
Auto adjust versions depending on binary.
Tue Nov 4 15:21:00 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [controls/listbox.c]
Paint full background in listbox items with tab stops enabled.
* [if1632/thunk.c]
Copy some more message parameter structures (DRAWITEMSTRUCT16,
COMPAREITEMSTRUCT16) to the stack segment to fix broken programs
that need this.
* [windows/dce.c]
Only clip sibling windows when the parent has the WS_CLIPSIBLINGS
style set.
* [windows/focus.c]
Make order of events in FOCUS_SwitchFocus() reflect API docs.
* [windows/defdlg.c]
Fix problem with loss of focus in some dialogs.
* [win32/code_page.c]
Fix return value for MultiByteToWideChar().
* [BUGS]
BCW now works.
1997-11-16 18:38:29 +01:00
|
|
|
{
|
1998-01-18 19:01:49 +01:00
|
|
|
int i;
|
|
|
|
|
2009-01-29 16:38:53 +01:00
|
|
|
if ( obj1->rgn.numRects != obj2->rgn.numRects ) goto done;
|
|
|
|
if ( obj1->rgn.numRects == 0 )
|
2000-03-18 23:12:33 +01:00
|
|
|
{
|
|
|
|
ret = TRUE;
|
|
|
|
goto done;
|
2002-06-01 01:06:46 +02:00
|
|
|
|
2000-03-18 23:12:33 +01:00
|
|
|
}
|
2009-01-29 16:38:53 +01:00
|
|
|
if (obj1->rgn.extents.left != obj2->rgn.extents.left) goto done;
|
|
|
|
if (obj1->rgn.extents.right != obj2->rgn.extents.right) goto done;
|
|
|
|
if (obj1->rgn.extents.top != obj2->rgn.extents.top) goto done;
|
|
|
|
if (obj1->rgn.extents.bottom != obj2->rgn.extents.bottom) goto done;
|
|
|
|
for( i = 0; i < obj1->rgn.numRects; i++ )
|
2000-03-18 23:12:33 +01:00
|
|
|
{
|
2009-01-29 16:38:53 +01:00
|
|
|
if (obj1->rgn.rects[i].left != obj2->rgn.rects[i].left) goto done;
|
|
|
|
if (obj1->rgn.rects[i].right != obj2->rgn.rects[i].right) goto done;
|
|
|
|
if (obj1->rgn.rects[i].top != obj2->rgn.rects[i].top) goto done;
|
|
|
|
if (obj1->rgn.rects[i].bottom != obj2->rgn.rects[i].bottom) goto done;
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
2000-03-18 23:12:33 +01:00
|
|
|
ret = TRUE;
|
|
|
|
done:
|
2000-08-19 23:38:55 +02:00
|
|
|
GDI_ReleaseObj(hrgn2);
|
Release 971116
Sun Nov 16 07:42:44 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c] [windows/clipboard.c] [windows/nonclient.c]
Bug fixes.
* [misc/shell.c] [resources/*]
New "About" dialog.
Sat Nov 15 17:30:18 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [configure.in] [Makefile.in]
Replaced --with-library option by --disable-emulator. The default
is now to build both the library and the emulator.
Renamed --with options to --enable to follow autoconf guidelines.
* [loader/main.c] [miscemu/main.c] (New file)
Split initialization in WinelibInit/EmulatorInit.
* [loader/*.c]
Removed all remaining #ifdef's WINELIB.
* [controls/widgets.c] [windows/mdi.c]
Converted MDIClientWndProc to 32-bit.
* [debugger/break.c] [if1632/signal.c] [include/selectors.h]
[scheduler/thread.c]
Code and data selector values are now computed at run-time.
* [library/libres.c]
Moved to loader/ directory.
* [misc/main.c] [misc/version.c] (New file)
Moved all version stuff to version.c. Cleaned up a bit.
* [msdos/dpmi.c]
Update the REALMODECALL structure on return from real-mode
interrupt.
* [windows/event.c] [windows/keyboard.c]
Changed the way event coordinates are determined. Don't rely on
the ConfigureNotify event values. This should fix all problems
with cursor position in -desktop and -managed modes.
Sat Nov 15 16:09:36 1997 Slaven Rezic <eserte@cs.tu-berlin.de>
* [controls/button.c]
(BUTTON_CheckAutoRadioButton): Prevent possible endless loop.
Wed Nov 12 03:42:45 1997 Chris Faherty <chrisf@america.com>
* [misc/ver.c]
Changed VerInstall32A to assume srcdir as destination if destdir
is blank. This was causing alot of DLL installation into SYSTEM
directory to fail.
* [loader/ne_image.c]
NE_LoadSegment buffer[100] was too small and getting overruns.
Changed it to buffer[200].
Sat Nov 8 06:09:57 1997 Len White <phreak@cgocable.net>
* [misc/ddeml.c] [include/ddeml.h] [if1632/ddeml.spec]
Added stub functions DdeConnectList(), DdeQueryNextServer(),
DdeDisconnectList(), DdeSetUserHandle(), DdeAbandonTransaction(),
DdePostAdvise(), DdeCreateDataHandle(), DdeAddData(), DdeGetData(),
DdeAccessData(), DdeUnaccessData(), DdeEnableCallback(),
DdeCmpStringHandles().
Fri Nov 7 19:44:26 1997 Olaf Flebbe <o.flebbe@science-computing.de>
* [files/directory.c]
Fix typo in directory.c [broke loading of cdplayer on nt40]
* [misc/main.c]
Implemented -winver nt40.
* [loader/resource.c] [user32.spec]
Stubs for CopyAcceleratorTable, Destroy AcceleratorTable.
Thu Nov 6 22:37:04 1997 Morten Welinder <welinder@rentec.com>
* [files/drive.c]
(GetDiskFreeSpace32A): Cap at 2GB.
* [include/windows.h]
Prototype DrawIconEx and CreateDIBSection32.
Define OBM_RADIOCHECK.
Add DI_* macros.
* [objects/dib.c] [if1632/gdi.spec]
CreateDIBSection is a WINAPI. Renamed to CreateDIBSection32.
Implement CreateDIBSection16.
* [if1632/user.spec] [if1632/user32.spec]
Add DrawIconEx.
* [objects/cursoricon.c]
(CopyIcon32): Fix bogus implementation.
* [objects/bitmap.c]
(CopyBitmap32): New function.
(CopyImage32): Do bitmaps.
* [graphics/x11drv/text.c]
(X11DRV_ExtTextOut): Change ascent and descent default to avoid
zero-thinkness overstrike line.
* [include/debugstr.h] [misc/debugstr.c]
New files.
* [msdos/dpmi.c]
Don't prototype do_mscdex. In INT_Int31Handler, handle real-mode
int 0x21, ah=0x52.
* [msdos/int2f.c]
Add dummys for 0x1681 and 0x1682.
* [misc/registry.c]
Fix memory leaks in RegDeleteKey32W.
* [objects/text.c]
In TEXT_NextLine, fix another off-by-one bug.
* [include/bitmaps/obm_radiocheck]
New file. (It a small circle used to radio-button menu items
when selected.)
* [objects/oembitmap.c]
Add obm_radiocheck.
* [include/windows.h] [if1632/user32.spec] [controls/menu.c]
[if1632/user.spec]
Define CheckMenuRadioItem{16,32}. Define GetMenuItemRect{16,32}.
Wed Nov 5 11:30:14 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [misc/main.c]
Auto adjust versions depending on binary.
Tue Nov 4 15:21:00 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [controls/listbox.c]
Paint full background in listbox items with tab stops enabled.
* [if1632/thunk.c]
Copy some more message parameter structures (DRAWITEMSTRUCT16,
COMPAREITEMSTRUCT16) to the stack segment to fix broken programs
that need this.
* [windows/dce.c]
Only clip sibling windows when the parent has the WS_CLIPSIBLINGS
style set.
* [windows/focus.c]
Make order of events in FOCUS_SwitchFocus() reflect API docs.
* [windows/defdlg.c]
Fix problem with loss of focus in some dialogs.
* [win32/code_page.c]
Fix return value for MultiByteToWideChar().
* [BUGS]
BCW now works.
1997-11-16 18:38:29 +01:00
|
|
|
}
|
2000-08-19 23:38:55 +02:00
|
|
|
GDI_ReleaseObj(hrgn1);
|
1997-08-24 18:00:30 +02:00
|
|
|
}
|
Release 971116
Sun Nov 16 07:42:44 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c] [windows/clipboard.c] [windows/nonclient.c]
Bug fixes.
* [misc/shell.c] [resources/*]
New "About" dialog.
Sat Nov 15 17:30:18 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [configure.in] [Makefile.in]
Replaced --with-library option by --disable-emulator. The default
is now to build both the library and the emulator.
Renamed --with options to --enable to follow autoconf guidelines.
* [loader/main.c] [miscemu/main.c] (New file)
Split initialization in WinelibInit/EmulatorInit.
* [loader/*.c]
Removed all remaining #ifdef's WINELIB.
* [controls/widgets.c] [windows/mdi.c]
Converted MDIClientWndProc to 32-bit.
* [debugger/break.c] [if1632/signal.c] [include/selectors.h]
[scheduler/thread.c]
Code and data selector values are now computed at run-time.
* [library/libres.c]
Moved to loader/ directory.
* [misc/main.c] [misc/version.c] (New file)
Moved all version stuff to version.c. Cleaned up a bit.
* [msdos/dpmi.c]
Update the REALMODECALL structure on return from real-mode
interrupt.
* [windows/event.c] [windows/keyboard.c]
Changed the way event coordinates are determined. Don't rely on
the ConfigureNotify event values. This should fix all problems
with cursor position in -desktop and -managed modes.
Sat Nov 15 16:09:36 1997 Slaven Rezic <eserte@cs.tu-berlin.de>
* [controls/button.c]
(BUTTON_CheckAutoRadioButton): Prevent possible endless loop.
Wed Nov 12 03:42:45 1997 Chris Faherty <chrisf@america.com>
* [misc/ver.c]
Changed VerInstall32A to assume srcdir as destination if destdir
is blank. This was causing alot of DLL installation into SYSTEM
directory to fail.
* [loader/ne_image.c]
NE_LoadSegment buffer[100] was too small and getting overruns.
Changed it to buffer[200].
Sat Nov 8 06:09:57 1997 Len White <phreak@cgocable.net>
* [misc/ddeml.c] [include/ddeml.h] [if1632/ddeml.spec]
Added stub functions DdeConnectList(), DdeQueryNextServer(),
DdeDisconnectList(), DdeSetUserHandle(), DdeAbandonTransaction(),
DdePostAdvise(), DdeCreateDataHandle(), DdeAddData(), DdeGetData(),
DdeAccessData(), DdeUnaccessData(), DdeEnableCallback(),
DdeCmpStringHandles().
Fri Nov 7 19:44:26 1997 Olaf Flebbe <o.flebbe@science-computing.de>
* [files/directory.c]
Fix typo in directory.c [broke loading of cdplayer on nt40]
* [misc/main.c]
Implemented -winver nt40.
* [loader/resource.c] [user32.spec]
Stubs for CopyAcceleratorTable, Destroy AcceleratorTable.
Thu Nov 6 22:37:04 1997 Morten Welinder <welinder@rentec.com>
* [files/drive.c]
(GetDiskFreeSpace32A): Cap at 2GB.
* [include/windows.h]
Prototype DrawIconEx and CreateDIBSection32.
Define OBM_RADIOCHECK.
Add DI_* macros.
* [objects/dib.c] [if1632/gdi.spec]
CreateDIBSection is a WINAPI. Renamed to CreateDIBSection32.
Implement CreateDIBSection16.
* [if1632/user.spec] [if1632/user32.spec]
Add DrawIconEx.
* [objects/cursoricon.c]
(CopyIcon32): Fix bogus implementation.
* [objects/bitmap.c]
(CopyBitmap32): New function.
(CopyImage32): Do bitmaps.
* [graphics/x11drv/text.c]
(X11DRV_ExtTextOut): Change ascent and descent default to avoid
zero-thinkness overstrike line.
* [include/debugstr.h] [misc/debugstr.c]
New files.
* [msdos/dpmi.c]
Don't prototype do_mscdex. In INT_Int31Handler, handle real-mode
int 0x21, ah=0x52.
* [msdos/int2f.c]
Add dummys for 0x1681 and 0x1682.
* [misc/registry.c]
Fix memory leaks in RegDeleteKey32W.
* [objects/text.c]
In TEXT_NextLine, fix another off-by-one bug.
* [include/bitmaps/obm_radiocheck]
New file. (It a small circle used to radio-button menu items
when selected.)
* [objects/oembitmap.c]
Add obm_radiocheck.
* [include/windows.h] [if1632/user32.spec] [controls/menu.c]
[if1632/user.spec]
Define CheckMenuRadioItem{16,32}. Define GetMenuItemRect{16,32}.
Wed Nov 5 11:30:14 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [misc/main.c]
Auto adjust versions depending on binary.
Tue Nov 4 15:21:00 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [controls/listbox.c]
Paint full background in listbox items with tab stops enabled.
* [if1632/thunk.c]
Copy some more message parameter structures (DRAWITEMSTRUCT16,
COMPAREITEMSTRUCT16) to the stack segment to fix broken programs
that need this.
* [windows/dce.c]
Only clip sibling windows when the parent has the WS_CLIPSIBLINGS
style set.
* [windows/focus.c]
Make order of events in FOCUS_SwitchFocus() reflect API docs.
* [windows/defdlg.c]
Fix problem with loss of focus in some dialogs.
* [win32/code_page.c]
Fix return value for MultiByteToWideChar().
* [BUGS]
BCW now works.
1997-11-16 18:38:29 +01:00
|
|
|
return ret;
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
2002-05-26 00:16:12 +02:00
|
|
|
|
Release 971101
Thu Oct 30 21:52:23 1997 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [windows/nonclient.c]
Changed NC_TrackSysMenu to give the same behaviour as MS-Windows,
i.e. system menu already appears when mouse button is depressed.
Changed NC_HandleNCLButtonDblClk so that double clicks on scroll
bar arrows are handled the same way as single clicks.
* [windows/winpos.c]
Fixed SetWindowPos32 to clear WIN_NO_REDRAW when SWP_SHOWWINDOW is
set; this is the way MS-Windows behaves.
Thu Oct 30 21:08:57 1997 Morten Welinder <terra@diku.dk>
* [controls/status.c]
In SW_SetText, fix condition, I hope.
* [controls/menu.c]
(GetMenuState32): Don't mask return value. Print more debug info.
(MENU_MenuBarCalcSize): Be more careful when printing debug
information.
(MENU_SetItemData): Empty strings are separators.
* [graphics/x11drv/text.c]
Don't prototype CLIPPING_IntersectClipRect.
* [include/dc.h]
Prototype CLIPPING_IntersectClipRect.
* [objects/font.c]
Remove non-portable (and faulty) smartness in FONT_TextMetric*to*.
In CreateFont32W and CreateFont16, handle null font name.
* [objects/text.c]
(TEXT_NextLine): Fix end-of-line bug.
* [if1632/shell32.spec]
Activate existing implementation of ExtractIconA.
* [misc/shell.c]
For Control_RunDLL, add types for parameters.
Thu Oct 30 14:54:11 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [controls/static.c] [include/windows.h] [misc/spy.c]
Added some win32 defines to static controls, basic SS_BITMAP style
handling implemented. [please add more, I am lacking knowledge and
time]
* [controls/status.c]
part_num 255 seems to indicate whole statusline (win95 cdplayer.exe)
* [if1632/thunk.c] [tools/build.c]
Support lret and 0x66 lret calls for CallTo16_regs
(needed for KERNEL32_45)
Fixed KERNEL32_45, QT_Thunk (should work now).
* [if1632/relay.c][if1632/builtin.c][tools/build.c][if1632/*32.spec]
Added string dumping to relay debugging for win32 apifuncs.
* [misc/ver.c]
Fixed and cleaned up VerQueryValue*.
* [multimedia/*.c][include/mmsystem.h][if1632/mmsystem.spec]
[if1632/winmm.spec]
Win32 support for lowlevel multimedia functions.
Added some mixer* lowlevel functions.
Some small fixes in the audio lowlevel queue handling, code
reformatting/cleanups.
* [debugger/hash.c]
Don't show difference between 16bit symbols if they are in
different segments.
* [objects/cursoricon.c]
Added GetIconInfo (partial) and CreateIconIndirect.
* [windows/mdi.c]
Fixed some "bad class" problems and crashes in MDICreateChild,
which happen in Win32 (jwp32.exe).
Wed Oct 29 00:57:27 1997 Bruce Milner <Bruce.Milner@genetics.utah.edu>
* [if1632/winaspi.spec] [misc/aspi.c] [include/aspi.c]
[documentation/aspi] [include/callback.h]
Added support for 16 bit ASPI calls to linux generic SCSI.
The support is not complete, but appears to run my Mustek
scanner from within ipplus.exe.
Mon Oct 27 00:59:41 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c]
DC reuse framework.
Sun Oct 26 18:41:21 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/x11drv/xfont.c]
Substituted fonts are removed from the alias table. References to
the old name are also updated.
* [controls/combo.c]
LB_SELECTSTRING32 not CB_SELECTSTRING32 should be sent to
ComboLBox.
Sun Oct 26 14:25:00 1997 Nikita V. Youshchenko <yoush@cs.msu.su>
* [include/drive.h] [files/drive.c] [msdos/int21.c]
Partially implemented DOS drive mapping (int21 AX=440F).
Sat Oct 25 13:03:29 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/debug.l]
Support '.' in identifiers. Use "x . y" to access structure
fields.
* [debugger/hash.c] [loader/pe_image.c]
Load entry points of Win32 modules only when entering the
debugger.
* [debugger/break.c]
New function DEBUG_AddModuleBreakpoint() to set a breakpoint at
the start of every module.
* [files/file.c]
FILE_mmap() can now fake mmap() for unaligned offsets or broken
filesystems.
* [include/callback.h] [misc/callback.c] [if1632/thunk.c]
Use a table of callbacks instead of macros to differentiate
between emulator and Winelib.
* [loader/task.c]
Initialize current directory from cwd, not from module path.
* [tools/build.c]
Read CallTo16 prototypes directly from thunk.c source file.
* [windows/winproc.c] [windows/mdi.c]
Added translation for WM_MDIACTIVATE and WM_MDIGETACTIVE.
Fri Oct 24 21:41:25 1997 Uwe Bonnes <bon@elektron.ikp.tu-darmstadt.de>
* [files/drive.c]
Allow arguments like "a" for the drive related apis.
* [memory/global.c]
Keep the calculation for dwMemoryLoad in range.
* [misc/crtdll.c]
Make CRTDLL_getcwd use GetCurrentDirectory32A and alloc
its memory if requested.
Implemented CRTDLL_rename and CRTDLL_stat needed for
lcc-win32:wedit.exe.
Implemented CRTDLL__fullpath.
* [misc/comm.c]
High speed modes for the 16-bit mode Comm functions.
* [misc/cpu.c]
As applications may treat lpMaximumApplicationAddress as long,
use a valid long number.
* [misc/main.c]
In SystemParametersInfo16 ignore SPI_GETHIGHCONTRAST too.
* [misc/ole2nls.c]
Implement LCMAP_UPPERCASE for LCMapString32.
* [misc/wsprintf]
Made WPRINTF_ParseFormatA understand %ws.
* [win32/file.c]
Ignore FILE_ATTRIBUTE_NORMAL.
Stub for ReadFileEx.
Fri Oct 24 15:36:02 1997 Doug Ridgway <ridgway@routh.ucsd.edu>
* [memory/local.c]
Local heap exhaustion message now prints which builtin heap filled.
Fri Oct 24 00:46:34 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [windows/dialog.c]
Reversed CreateFont16/32W typo.
Thu Oct 23 23:44:20 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [if1632/user.spec]
Fixed argument list for ChangeClipboardChain.
* [windows/mdi.c]
Pass correct hInstance to CreateWindow16() in MDICreateChild().
Mon Oct 20 11:51:24 1997 Carsten Fallesen <cf@it.dtu.dk>
* [objects/metafile.c]
Added support for META_SETTEXTCHAREXTRA.
* [objects/region.c]
Fixed crash in XPolygonRegion if there is only one point in
in the region.
* [if1632/gdi32.spec][include/gdi.h][include/windows.h]
[objects/gdiobj.c]
Completed OBJ_XXX defines in gdi.h, removed OBJ_XXX in gdiobj.c
and included gdi.h instead. Implemented GetObjectType32().
Thu Oct 16 17:21:32 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [documentation/wine.texinfo]
Fixed WIN32 and Makefiles entries of Reference manual node, that
made makeinfo dump core.
Mon Oct 13 17:15:57 1997 Robert Wilhelm <robert@physiol.med.tu-muenchen.de>
* [if1632/crtdll.spec]
Added missing math functions y0(), y1(), y2(), floor(), frexp(),
ldexp(), modf().
1997-11-01 20:08:16 +01:00
|
|
|
/***********************************************************************
|
1998-01-18 19:01:49 +01:00
|
|
|
* REGION_UnionRectWithRegion
|
|
|
|
* Adds a rectangle to a WINEREGION
|
Release 971101
Thu Oct 30 21:52:23 1997 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [windows/nonclient.c]
Changed NC_TrackSysMenu to give the same behaviour as MS-Windows,
i.e. system menu already appears when mouse button is depressed.
Changed NC_HandleNCLButtonDblClk so that double clicks on scroll
bar arrows are handled the same way as single clicks.
* [windows/winpos.c]
Fixed SetWindowPos32 to clear WIN_NO_REDRAW when SWP_SHOWWINDOW is
set; this is the way MS-Windows behaves.
Thu Oct 30 21:08:57 1997 Morten Welinder <terra@diku.dk>
* [controls/status.c]
In SW_SetText, fix condition, I hope.
* [controls/menu.c]
(GetMenuState32): Don't mask return value. Print more debug info.
(MENU_MenuBarCalcSize): Be more careful when printing debug
information.
(MENU_SetItemData): Empty strings are separators.
* [graphics/x11drv/text.c]
Don't prototype CLIPPING_IntersectClipRect.
* [include/dc.h]
Prototype CLIPPING_IntersectClipRect.
* [objects/font.c]
Remove non-portable (and faulty) smartness in FONT_TextMetric*to*.
In CreateFont32W and CreateFont16, handle null font name.
* [objects/text.c]
(TEXT_NextLine): Fix end-of-line bug.
* [if1632/shell32.spec]
Activate existing implementation of ExtractIconA.
* [misc/shell.c]
For Control_RunDLL, add types for parameters.
Thu Oct 30 14:54:11 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [controls/static.c] [include/windows.h] [misc/spy.c]
Added some win32 defines to static controls, basic SS_BITMAP style
handling implemented. [please add more, I am lacking knowledge and
time]
* [controls/status.c]
part_num 255 seems to indicate whole statusline (win95 cdplayer.exe)
* [if1632/thunk.c] [tools/build.c]
Support lret and 0x66 lret calls for CallTo16_regs
(needed for KERNEL32_45)
Fixed KERNEL32_45, QT_Thunk (should work now).
* [if1632/relay.c][if1632/builtin.c][tools/build.c][if1632/*32.spec]
Added string dumping to relay debugging for win32 apifuncs.
* [misc/ver.c]
Fixed and cleaned up VerQueryValue*.
* [multimedia/*.c][include/mmsystem.h][if1632/mmsystem.spec]
[if1632/winmm.spec]
Win32 support for lowlevel multimedia functions.
Added some mixer* lowlevel functions.
Some small fixes in the audio lowlevel queue handling, code
reformatting/cleanups.
* [debugger/hash.c]
Don't show difference between 16bit symbols if they are in
different segments.
* [objects/cursoricon.c]
Added GetIconInfo (partial) and CreateIconIndirect.
* [windows/mdi.c]
Fixed some "bad class" problems and crashes in MDICreateChild,
which happen in Win32 (jwp32.exe).
Wed Oct 29 00:57:27 1997 Bruce Milner <Bruce.Milner@genetics.utah.edu>
* [if1632/winaspi.spec] [misc/aspi.c] [include/aspi.c]
[documentation/aspi] [include/callback.h]
Added support for 16 bit ASPI calls to linux generic SCSI.
The support is not complete, but appears to run my Mustek
scanner from within ipplus.exe.
Mon Oct 27 00:59:41 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c]
DC reuse framework.
Sun Oct 26 18:41:21 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/x11drv/xfont.c]
Substituted fonts are removed from the alias table. References to
the old name are also updated.
* [controls/combo.c]
LB_SELECTSTRING32 not CB_SELECTSTRING32 should be sent to
ComboLBox.
Sun Oct 26 14:25:00 1997 Nikita V. Youshchenko <yoush@cs.msu.su>
* [include/drive.h] [files/drive.c] [msdos/int21.c]
Partially implemented DOS drive mapping (int21 AX=440F).
Sat Oct 25 13:03:29 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/debug.l]
Support '.' in identifiers. Use "x . y" to access structure
fields.
* [debugger/hash.c] [loader/pe_image.c]
Load entry points of Win32 modules only when entering the
debugger.
* [debugger/break.c]
New function DEBUG_AddModuleBreakpoint() to set a breakpoint at
the start of every module.
* [files/file.c]
FILE_mmap() can now fake mmap() for unaligned offsets or broken
filesystems.
* [include/callback.h] [misc/callback.c] [if1632/thunk.c]
Use a table of callbacks instead of macros to differentiate
between emulator and Winelib.
* [loader/task.c]
Initialize current directory from cwd, not from module path.
* [tools/build.c]
Read CallTo16 prototypes directly from thunk.c source file.
* [windows/winproc.c] [windows/mdi.c]
Added translation for WM_MDIACTIVATE and WM_MDIGETACTIVE.
Fri Oct 24 21:41:25 1997 Uwe Bonnes <bon@elektron.ikp.tu-darmstadt.de>
* [files/drive.c]
Allow arguments like "a" for the drive related apis.
* [memory/global.c]
Keep the calculation for dwMemoryLoad in range.
* [misc/crtdll.c]
Make CRTDLL_getcwd use GetCurrentDirectory32A and alloc
its memory if requested.
Implemented CRTDLL_rename and CRTDLL_stat needed for
lcc-win32:wedit.exe.
Implemented CRTDLL__fullpath.
* [misc/comm.c]
High speed modes for the 16-bit mode Comm functions.
* [misc/cpu.c]
As applications may treat lpMaximumApplicationAddress as long,
use a valid long number.
* [misc/main.c]
In SystemParametersInfo16 ignore SPI_GETHIGHCONTRAST too.
* [misc/ole2nls.c]
Implement LCMAP_UPPERCASE for LCMapString32.
* [misc/wsprintf]
Made WPRINTF_ParseFormatA understand %ws.
* [win32/file.c]
Ignore FILE_ATTRIBUTE_NORMAL.
Stub for ReadFileEx.
Fri Oct 24 15:36:02 1997 Doug Ridgway <ridgway@routh.ucsd.edu>
* [memory/local.c]
Local heap exhaustion message now prints which builtin heap filled.
Fri Oct 24 00:46:34 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [windows/dialog.c]
Reversed CreateFont16/32W typo.
Thu Oct 23 23:44:20 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [if1632/user.spec]
Fixed argument list for ChangeClipboardChain.
* [windows/mdi.c]
Pass correct hInstance to CreateWindow16() in MDICreateChild().
Mon Oct 20 11:51:24 1997 Carsten Fallesen <cf@it.dtu.dk>
* [objects/metafile.c]
Added support for META_SETTEXTCHAREXTRA.
* [objects/region.c]
Fixed crash in XPolygonRegion if there is only one point in
in the region.
* [if1632/gdi32.spec][include/gdi.h][include/windows.h]
[objects/gdiobj.c]
Completed OBJ_XXX defines in gdi.h, removed OBJ_XXX in gdiobj.c
and included gdi.h instead. Implemented GetObjectType32().
Thu Oct 16 17:21:32 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [documentation/wine.texinfo]
Fixed WIN32 and Makefiles entries of Reference manual node, that
made makeinfo dump core.
Mon Oct 13 17:15:57 1997 Robert Wilhelm <robert@physiol.med.tu-muenchen.de>
* [if1632/crtdll.spec]
Added missing math functions y0(), y1(), y2(), floor(), frexp(),
ldexp(), modf().
1997-11-01 20:08:16 +01:00
|
|
|
*/
|
2009-01-29 18:18:53 +01:00
|
|
|
static BOOL REGION_UnionRectWithRegion(const RECT *rect, WINEREGION *rgn)
|
Release 971101
Thu Oct 30 21:52:23 1997 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [windows/nonclient.c]
Changed NC_TrackSysMenu to give the same behaviour as MS-Windows,
i.e. system menu already appears when mouse button is depressed.
Changed NC_HandleNCLButtonDblClk so that double clicks on scroll
bar arrows are handled the same way as single clicks.
* [windows/winpos.c]
Fixed SetWindowPos32 to clear WIN_NO_REDRAW when SWP_SHOWWINDOW is
set; this is the way MS-Windows behaves.
Thu Oct 30 21:08:57 1997 Morten Welinder <terra@diku.dk>
* [controls/status.c]
In SW_SetText, fix condition, I hope.
* [controls/menu.c]
(GetMenuState32): Don't mask return value. Print more debug info.
(MENU_MenuBarCalcSize): Be more careful when printing debug
information.
(MENU_SetItemData): Empty strings are separators.
* [graphics/x11drv/text.c]
Don't prototype CLIPPING_IntersectClipRect.
* [include/dc.h]
Prototype CLIPPING_IntersectClipRect.
* [objects/font.c]
Remove non-portable (and faulty) smartness in FONT_TextMetric*to*.
In CreateFont32W and CreateFont16, handle null font name.
* [objects/text.c]
(TEXT_NextLine): Fix end-of-line bug.
* [if1632/shell32.spec]
Activate existing implementation of ExtractIconA.
* [misc/shell.c]
For Control_RunDLL, add types for parameters.
Thu Oct 30 14:54:11 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [controls/static.c] [include/windows.h] [misc/spy.c]
Added some win32 defines to static controls, basic SS_BITMAP style
handling implemented. [please add more, I am lacking knowledge and
time]
* [controls/status.c]
part_num 255 seems to indicate whole statusline (win95 cdplayer.exe)
* [if1632/thunk.c] [tools/build.c]
Support lret and 0x66 lret calls for CallTo16_regs
(needed for KERNEL32_45)
Fixed KERNEL32_45, QT_Thunk (should work now).
* [if1632/relay.c][if1632/builtin.c][tools/build.c][if1632/*32.spec]
Added string dumping to relay debugging for win32 apifuncs.
* [misc/ver.c]
Fixed and cleaned up VerQueryValue*.
* [multimedia/*.c][include/mmsystem.h][if1632/mmsystem.spec]
[if1632/winmm.spec]
Win32 support for lowlevel multimedia functions.
Added some mixer* lowlevel functions.
Some small fixes in the audio lowlevel queue handling, code
reformatting/cleanups.
* [debugger/hash.c]
Don't show difference between 16bit symbols if they are in
different segments.
* [objects/cursoricon.c]
Added GetIconInfo (partial) and CreateIconIndirect.
* [windows/mdi.c]
Fixed some "bad class" problems and crashes in MDICreateChild,
which happen in Win32 (jwp32.exe).
Wed Oct 29 00:57:27 1997 Bruce Milner <Bruce.Milner@genetics.utah.edu>
* [if1632/winaspi.spec] [misc/aspi.c] [include/aspi.c]
[documentation/aspi] [include/callback.h]
Added support for 16 bit ASPI calls to linux generic SCSI.
The support is not complete, but appears to run my Mustek
scanner from within ipplus.exe.
Mon Oct 27 00:59:41 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c]
DC reuse framework.
Sun Oct 26 18:41:21 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/x11drv/xfont.c]
Substituted fonts are removed from the alias table. References to
the old name are also updated.
* [controls/combo.c]
LB_SELECTSTRING32 not CB_SELECTSTRING32 should be sent to
ComboLBox.
Sun Oct 26 14:25:00 1997 Nikita V. Youshchenko <yoush@cs.msu.su>
* [include/drive.h] [files/drive.c] [msdos/int21.c]
Partially implemented DOS drive mapping (int21 AX=440F).
Sat Oct 25 13:03:29 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/debug.l]
Support '.' in identifiers. Use "x . y" to access structure
fields.
* [debugger/hash.c] [loader/pe_image.c]
Load entry points of Win32 modules only when entering the
debugger.
* [debugger/break.c]
New function DEBUG_AddModuleBreakpoint() to set a breakpoint at
the start of every module.
* [files/file.c]
FILE_mmap() can now fake mmap() for unaligned offsets or broken
filesystems.
* [include/callback.h] [misc/callback.c] [if1632/thunk.c]
Use a table of callbacks instead of macros to differentiate
between emulator and Winelib.
* [loader/task.c]
Initialize current directory from cwd, not from module path.
* [tools/build.c]
Read CallTo16 prototypes directly from thunk.c source file.
* [windows/winproc.c] [windows/mdi.c]
Added translation for WM_MDIACTIVATE and WM_MDIGETACTIVE.
Fri Oct 24 21:41:25 1997 Uwe Bonnes <bon@elektron.ikp.tu-darmstadt.de>
* [files/drive.c]
Allow arguments like "a" for the drive related apis.
* [memory/global.c]
Keep the calculation for dwMemoryLoad in range.
* [misc/crtdll.c]
Make CRTDLL_getcwd use GetCurrentDirectory32A and alloc
its memory if requested.
Implemented CRTDLL_rename and CRTDLL_stat needed for
lcc-win32:wedit.exe.
Implemented CRTDLL__fullpath.
* [misc/comm.c]
High speed modes for the 16-bit mode Comm functions.
* [misc/cpu.c]
As applications may treat lpMaximumApplicationAddress as long,
use a valid long number.
* [misc/main.c]
In SystemParametersInfo16 ignore SPI_GETHIGHCONTRAST too.
* [misc/ole2nls.c]
Implement LCMAP_UPPERCASE for LCMapString32.
* [misc/wsprintf]
Made WPRINTF_ParseFormatA understand %ws.
* [win32/file.c]
Ignore FILE_ATTRIBUTE_NORMAL.
Stub for ReadFileEx.
Fri Oct 24 15:36:02 1997 Doug Ridgway <ridgway@routh.ucsd.edu>
* [memory/local.c]
Local heap exhaustion message now prints which builtin heap filled.
Fri Oct 24 00:46:34 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [windows/dialog.c]
Reversed CreateFont16/32W typo.
Thu Oct 23 23:44:20 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [if1632/user.spec]
Fixed argument list for ChangeClipboardChain.
* [windows/mdi.c]
Pass correct hInstance to CreateWindow16() in MDICreateChild().
Mon Oct 20 11:51:24 1997 Carsten Fallesen <cf@it.dtu.dk>
* [objects/metafile.c]
Added support for META_SETTEXTCHAREXTRA.
* [objects/region.c]
Fixed crash in XPolygonRegion if there is only one point in
in the region.
* [if1632/gdi32.spec][include/gdi.h][include/windows.h]
[objects/gdiobj.c]
Completed OBJ_XXX defines in gdi.h, removed OBJ_XXX in gdiobj.c
and included gdi.h instead. Implemented GetObjectType32().
Thu Oct 16 17:21:32 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [documentation/wine.texinfo]
Fixed WIN32 and Makefiles entries of Reference manual node, that
made makeinfo dump core.
Mon Oct 13 17:15:57 1997 Robert Wilhelm <robert@physiol.med.tu-muenchen.de>
* [if1632/crtdll.spec]
Added missing math functions y0(), y1(), y2(), floor(), frexp(),
ldexp(), modf().
1997-11-01 20:08:16 +01:00
|
|
|
{
|
1998-01-18 19:01:49 +01:00
|
|
|
WINEREGION region;
|
|
|
|
|
|
|
|
region.rects = ®ion.extents;
|
|
|
|
region.numRects = 1;
|
|
|
|
region.size = 1;
|
2000-03-18 23:12:33 +01:00
|
|
|
region.extents = *rect;
|
2009-01-29 18:18:53 +01:00
|
|
|
return REGION_UnionRegion(rgn, rgn, ®ion);
|
Release 971101
Thu Oct 30 21:52:23 1997 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [windows/nonclient.c]
Changed NC_TrackSysMenu to give the same behaviour as MS-Windows,
i.e. system menu already appears when mouse button is depressed.
Changed NC_HandleNCLButtonDblClk so that double clicks on scroll
bar arrows are handled the same way as single clicks.
* [windows/winpos.c]
Fixed SetWindowPos32 to clear WIN_NO_REDRAW when SWP_SHOWWINDOW is
set; this is the way MS-Windows behaves.
Thu Oct 30 21:08:57 1997 Morten Welinder <terra@diku.dk>
* [controls/status.c]
In SW_SetText, fix condition, I hope.
* [controls/menu.c]
(GetMenuState32): Don't mask return value. Print more debug info.
(MENU_MenuBarCalcSize): Be more careful when printing debug
information.
(MENU_SetItemData): Empty strings are separators.
* [graphics/x11drv/text.c]
Don't prototype CLIPPING_IntersectClipRect.
* [include/dc.h]
Prototype CLIPPING_IntersectClipRect.
* [objects/font.c]
Remove non-portable (and faulty) smartness in FONT_TextMetric*to*.
In CreateFont32W and CreateFont16, handle null font name.
* [objects/text.c]
(TEXT_NextLine): Fix end-of-line bug.
* [if1632/shell32.spec]
Activate existing implementation of ExtractIconA.
* [misc/shell.c]
For Control_RunDLL, add types for parameters.
Thu Oct 30 14:54:11 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [controls/static.c] [include/windows.h] [misc/spy.c]
Added some win32 defines to static controls, basic SS_BITMAP style
handling implemented. [please add more, I am lacking knowledge and
time]
* [controls/status.c]
part_num 255 seems to indicate whole statusline (win95 cdplayer.exe)
* [if1632/thunk.c] [tools/build.c]
Support lret and 0x66 lret calls for CallTo16_regs
(needed for KERNEL32_45)
Fixed KERNEL32_45, QT_Thunk (should work now).
* [if1632/relay.c][if1632/builtin.c][tools/build.c][if1632/*32.spec]
Added string dumping to relay debugging for win32 apifuncs.
* [misc/ver.c]
Fixed and cleaned up VerQueryValue*.
* [multimedia/*.c][include/mmsystem.h][if1632/mmsystem.spec]
[if1632/winmm.spec]
Win32 support for lowlevel multimedia functions.
Added some mixer* lowlevel functions.
Some small fixes in the audio lowlevel queue handling, code
reformatting/cleanups.
* [debugger/hash.c]
Don't show difference between 16bit symbols if they are in
different segments.
* [objects/cursoricon.c]
Added GetIconInfo (partial) and CreateIconIndirect.
* [windows/mdi.c]
Fixed some "bad class" problems and crashes in MDICreateChild,
which happen in Win32 (jwp32.exe).
Wed Oct 29 00:57:27 1997 Bruce Milner <Bruce.Milner@genetics.utah.edu>
* [if1632/winaspi.spec] [misc/aspi.c] [include/aspi.c]
[documentation/aspi] [include/callback.h]
Added support for 16 bit ASPI calls to linux generic SCSI.
The support is not complete, but appears to run my Mustek
scanner from within ipplus.exe.
Mon Oct 27 00:59:41 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c]
DC reuse framework.
Sun Oct 26 18:41:21 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/x11drv/xfont.c]
Substituted fonts are removed from the alias table. References to
the old name are also updated.
* [controls/combo.c]
LB_SELECTSTRING32 not CB_SELECTSTRING32 should be sent to
ComboLBox.
Sun Oct 26 14:25:00 1997 Nikita V. Youshchenko <yoush@cs.msu.su>
* [include/drive.h] [files/drive.c] [msdos/int21.c]
Partially implemented DOS drive mapping (int21 AX=440F).
Sat Oct 25 13:03:29 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/debug.l]
Support '.' in identifiers. Use "x . y" to access structure
fields.
* [debugger/hash.c] [loader/pe_image.c]
Load entry points of Win32 modules only when entering the
debugger.
* [debugger/break.c]
New function DEBUG_AddModuleBreakpoint() to set a breakpoint at
the start of every module.
* [files/file.c]
FILE_mmap() can now fake mmap() for unaligned offsets or broken
filesystems.
* [include/callback.h] [misc/callback.c] [if1632/thunk.c]
Use a table of callbacks instead of macros to differentiate
between emulator and Winelib.
* [loader/task.c]
Initialize current directory from cwd, not from module path.
* [tools/build.c]
Read CallTo16 prototypes directly from thunk.c source file.
* [windows/winproc.c] [windows/mdi.c]
Added translation for WM_MDIACTIVATE and WM_MDIGETACTIVE.
Fri Oct 24 21:41:25 1997 Uwe Bonnes <bon@elektron.ikp.tu-darmstadt.de>
* [files/drive.c]
Allow arguments like "a" for the drive related apis.
* [memory/global.c]
Keep the calculation for dwMemoryLoad in range.
* [misc/crtdll.c]
Make CRTDLL_getcwd use GetCurrentDirectory32A and alloc
its memory if requested.
Implemented CRTDLL_rename and CRTDLL_stat needed for
lcc-win32:wedit.exe.
Implemented CRTDLL__fullpath.
* [misc/comm.c]
High speed modes for the 16-bit mode Comm functions.
* [misc/cpu.c]
As applications may treat lpMaximumApplicationAddress as long,
use a valid long number.
* [misc/main.c]
In SystemParametersInfo16 ignore SPI_GETHIGHCONTRAST too.
* [misc/ole2nls.c]
Implement LCMAP_UPPERCASE for LCMapString32.
* [misc/wsprintf]
Made WPRINTF_ParseFormatA understand %ws.
* [win32/file.c]
Ignore FILE_ATTRIBUTE_NORMAL.
Stub for ReadFileEx.
Fri Oct 24 15:36:02 1997 Doug Ridgway <ridgway@routh.ucsd.edu>
* [memory/local.c]
Local heap exhaustion message now prints which builtin heap filled.
Fri Oct 24 00:46:34 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [windows/dialog.c]
Reversed CreateFont16/32W typo.
Thu Oct 23 23:44:20 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [if1632/user.spec]
Fixed argument list for ChangeClipboardChain.
* [windows/mdi.c]
Pass correct hInstance to CreateWindow16() in MDICreateChild().
Mon Oct 20 11:51:24 1997 Carsten Fallesen <cf@it.dtu.dk>
* [objects/metafile.c]
Added support for META_SETTEXTCHAREXTRA.
* [objects/region.c]
Fixed crash in XPolygonRegion if there is only one point in
in the region.
* [if1632/gdi32.spec][include/gdi.h][include/windows.h]
[objects/gdiobj.c]
Completed OBJ_XXX defines in gdi.h, removed OBJ_XXX in gdiobj.c
and included gdi.h instead. Implemented GetObjectType32().
Thu Oct 16 17:21:32 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [documentation/wine.texinfo]
Fixed WIN32 and Makefiles entries of Reference manual node, that
made makeinfo dump core.
Mon Oct 13 17:15:57 1997 Robert Wilhelm <robert@physiol.med.tu-muenchen.de>
* [if1632/crtdll.spec]
Added missing math functions y0(), y1(), y2(), floor(), frexp(),
ldexp(), modf().
1997-11-01 20:08:16 +01:00
|
|
|
}
|
|
|
|
|
1996-08-11 17:49:51 +02:00
|
|
|
|
Release 950727
Sat Jul 22 22:39:09 IDT 1995 Michael Veksler <e1678223@tochnapc2.technion.ac.il>
* [ipc/*]
New directory. This directory contains the new inter-wine
communications support. It enables DDE protocols between two wine
instances. Currently it is limited to DDE, but can be enhanced to
support OLE between 2 different wine instances. This is very
important for libwine.a DDE/OLE support.
* [tools/ipcl]
A script to delete garbage IPC handles (shared memory, semaphores
and message queues). The current inter-wine communication is not
perfect, and sometimes leaves garbage behind.
* [if1632/relay.c] [include/atom.h] [include/global.h]
[loader/selector.c] [loader/task.c] [loader/module.c]
[loader/signal.c] [memory/global.c] [misc/atom.c]
[windows/class.c] [windows/message.c] [windows/win.c]
[Imakefile]
Hooks for inter-wine DDE support, current Global.*Atom functions
renamed to Local.*Atom since Global.*Atom are used for Inter-Wine
DDE communication. (The first call to these functions sets up the
IPC structures - which otherwise cause unneeded overhead.
Mon Jul 17 19:55:21 1995 Alexandre Julliard <julliard@sunsite.unc.edu>
* [controls/menu.c]
Don't crash if a NULL string is passed to menu functions.
* [memory/selector.c]
We now use a bit in ldt_flags_copy to indicate free LDT entries.
Fixed a bug in SELECTOR_ReallocBlock that could cause it to
overwrite valid LDT entries when growing a block.
* [miscemu/instr.c]
Emulate int xx instruction by storing the interrupt vector in
CS:IP and returning directly. This allows a program to install an
interrupt vector.
* [windows/win.c]
Added function WIN_GetTopParent to get the top-level parent of a
window.
Sun Jul 16 18:17:17 1995 Gregory Trubetskoy <grisha@mira.com>
* [loader/resource.c]
Added LoadIconHandler. It doesn't do anything yet, but now you
can use borland help files with winhelp.exe.
Sun Jul 16 11:58:45 1995 Anand Kumria <akumria@ozemail.com.au>
* [misc/main.c]
Fixed to return 386 Enhanced mode correctly. Also return the same
type of CPU, for both Enhanced and Standard mode, namely a 386.
Sun Jul 16 00:02:04 1995 Martin von Loewis <loewis@informatik.hu-berlin.de>
* [Configure] [include/options.h] [include/wineopts.h]
[misc/main.c][misc/spy.c]
Removed support of spy file. Redirected spy messages to stddeb.
Removed -spy option. Added -debugmsg +spy option.
* [debugger/dbg.y][debugger/debug.l]
Enabled segmented addresses (seg:offs) for break and x commands.
* [if1632/gdi.spec] [objects/region.c] [windows/graphics.c]
[include/region.h]
FrameRgn, REGION_FrameRgn: New functions
* [if1632/kernel.spec]
IsWinOldApTask: Return false
* [if1632/mouse.spec]
CplApplet: Removed
* [if1632/user.spec] [windows/win.c]
ShowOwnedPopups: New function
* [if1632/winsock.spec] [misc/winsocket.c]
inet_addr, select: New prototypes in relay code
Fixed memory layout for netdb functions (getXbyY).
WINSOCK_ioctlsocket: Translated FIONREAD, FIONBIO, and FIOASYNC
* [objects/clipping.c]
RectVisible: Fixed call to LPToDP
* [rc/winerc.c]
main: Removed extra argument to getopt for Linux.
Tue Jul 11 00:14:41 1995 Bernd Schmidt <crux@pool.informatik.rwth-aachen.de>
* [controls/listbox.c]
Yet another fix for ListBoxDirectory().
* [loader/module.c] [if1632/kernel.spec]
Make GetModuleHandle() accept instance handles as parameter.
* [if1632/relay.c] [loader/task.c]
Put a magic cookie at the bottom of the 32 bit stack, and check on
each return from a 32 bit function whether it's still there. Complain
if it's not.
* [if1632/user.spec]
Wrong entry for CloseDriver().
* [misc/dos_fs.c] [loader/task.c] [include/dos_fs.h] [misc/file.c]
[miscemu/int21.c]
Large parts of dos_fs.c simplified. Changed it to use one
current drive/directory per task, which is set to the module path on
task creation.
Prevent CorelPaint from closing stdin.
open() with O_CREAT set must be passed three parameters.
DOS FindFirst()/FindNext() could crash when FA_LABEL was set. Fixed,
it's in DOS_readdir() now.
* [misc/profile.c]
Some badly written software (Lotus Freelance Graphics) passes a bogus
size parameter that caused Wine to write off the end of a segment.
Fixed. (It's probably too paranoid now.)
* [multimedia/mmsystem.c] [multimedia/time.c] [multimedia/joystick.c]
[multimedia/Imakefile] [if1632/winprocs.spec]
16 bit entry point for MMSysTimeCallback.
Split off time.c and joystick.c from mmsystem.c.
* [objects/dib.c]
GetDIBits(): call XGetImage() via CallTo32_LargeStack.
* [windows/cursor.c]
DestroyCursor(): do nothing for builtin cursors.
* [windows/mdi.c]
Half of WM_MDISETMENU implemented.
* [windows/win.c]
EnumWindows() and EnumTaskWindows() never enumerated any windows.
Fixed.
* [windows/*.c]
Fixed GetParent() to return correct values for owned windows.
* [windows/message.c]
Don't try to activate disabled top-level windows.
* [windows/nonclient.c]
Work around a bug in gcc-2.7.0.
* [tools/build.c] [include/stackframe.h] [memory/global.c]
[loader/task.c] [memory/selector.c]
Some Visual Basic programs (and possibly others, too) expect ES to be
preserved by a call to an API function, so we have to save it.
In GlobalFree() and FreeSelector(), we must clear CURRENT_STACK16->es
to prevent segfaults if ES contained the selector to be freed.
Sun Jul 9 20:21:20 1995 Jon Tombs <jon@gtex02.us.es>
* [*/*]
Added missing prototypes to header files and relevant includes
to reduce compile time warnings.
Sun Jul 9 18:32:56 1995 Michael Patra <micky@marie.physik.tu-berlin.de>
* [configure.in] [include/config.h] [*/Makefile.in]
New configuration scheme based on autoconf.
Sat Jul 8 14:12:45 1995 Morten Welinder <terra+@cs.cmu.edu>
* [miscemu/ioports.c]
Revamp to have only one in- and one out- variant, both really
implemented.
* [miscemu/instr.c]
INSTR_EmulateInstruction: Use new ioport interface. Implement
string io. Correct instruction pointer for 32-bit code.
* [include/miscemu.h]
Update port function prototypes.
* [include/registers.h]
Defined FS and GS.
Sat Jul 8 13:38:54 1995 Hans de Graaff <graaff@twi72.twi.tudelft.nl>
* [misc/dos_fs.c]
ChopOffSlash(): A path consisting off a single slash is left
intact, and multiple slashes are all removed.
1995-07-29 15:09:43 +02:00
|
|
|
/***********************************************************************
|
|
|
|
* REGION_CreateFrameRgn
|
|
|
|
*
|
1998-01-18 19:01:49 +01:00
|
|
|
* Create a region that is a frame around another region.
|
2005-02-14 12:52:12 +01:00
|
|
|
* Compute the intersection of the region moved in all 4 directions
|
|
|
|
* ( +x, -x, +y, -y) and subtract from the original.
|
2005-03-02 14:53:50 +01:00
|
|
|
* The result looks slightly better than in Windows :)
|
Release 950727
Sat Jul 22 22:39:09 IDT 1995 Michael Veksler <e1678223@tochnapc2.technion.ac.il>
* [ipc/*]
New directory. This directory contains the new inter-wine
communications support. It enables DDE protocols between two wine
instances. Currently it is limited to DDE, but can be enhanced to
support OLE between 2 different wine instances. This is very
important for libwine.a DDE/OLE support.
* [tools/ipcl]
A script to delete garbage IPC handles (shared memory, semaphores
and message queues). The current inter-wine communication is not
perfect, and sometimes leaves garbage behind.
* [if1632/relay.c] [include/atom.h] [include/global.h]
[loader/selector.c] [loader/task.c] [loader/module.c]
[loader/signal.c] [memory/global.c] [misc/atom.c]
[windows/class.c] [windows/message.c] [windows/win.c]
[Imakefile]
Hooks for inter-wine DDE support, current Global.*Atom functions
renamed to Local.*Atom since Global.*Atom are used for Inter-Wine
DDE communication. (The first call to these functions sets up the
IPC structures - which otherwise cause unneeded overhead.
Mon Jul 17 19:55:21 1995 Alexandre Julliard <julliard@sunsite.unc.edu>
* [controls/menu.c]
Don't crash if a NULL string is passed to menu functions.
* [memory/selector.c]
We now use a bit in ldt_flags_copy to indicate free LDT entries.
Fixed a bug in SELECTOR_ReallocBlock that could cause it to
overwrite valid LDT entries when growing a block.
* [miscemu/instr.c]
Emulate int xx instruction by storing the interrupt vector in
CS:IP and returning directly. This allows a program to install an
interrupt vector.
* [windows/win.c]
Added function WIN_GetTopParent to get the top-level parent of a
window.
Sun Jul 16 18:17:17 1995 Gregory Trubetskoy <grisha@mira.com>
* [loader/resource.c]
Added LoadIconHandler. It doesn't do anything yet, but now you
can use borland help files with winhelp.exe.
Sun Jul 16 11:58:45 1995 Anand Kumria <akumria@ozemail.com.au>
* [misc/main.c]
Fixed to return 386 Enhanced mode correctly. Also return the same
type of CPU, for both Enhanced and Standard mode, namely a 386.
Sun Jul 16 00:02:04 1995 Martin von Loewis <loewis@informatik.hu-berlin.de>
* [Configure] [include/options.h] [include/wineopts.h]
[misc/main.c][misc/spy.c]
Removed support of spy file. Redirected spy messages to stddeb.
Removed -spy option. Added -debugmsg +spy option.
* [debugger/dbg.y][debugger/debug.l]
Enabled segmented addresses (seg:offs) for break and x commands.
* [if1632/gdi.spec] [objects/region.c] [windows/graphics.c]
[include/region.h]
FrameRgn, REGION_FrameRgn: New functions
* [if1632/kernel.spec]
IsWinOldApTask: Return false
* [if1632/mouse.spec]
CplApplet: Removed
* [if1632/user.spec] [windows/win.c]
ShowOwnedPopups: New function
* [if1632/winsock.spec] [misc/winsocket.c]
inet_addr, select: New prototypes in relay code
Fixed memory layout for netdb functions (getXbyY).
WINSOCK_ioctlsocket: Translated FIONREAD, FIONBIO, and FIOASYNC
* [objects/clipping.c]
RectVisible: Fixed call to LPToDP
* [rc/winerc.c]
main: Removed extra argument to getopt for Linux.
Tue Jul 11 00:14:41 1995 Bernd Schmidt <crux@pool.informatik.rwth-aachen.de>
* [controls/listbox.c]
Yet another fix for ListBoxDirectory().
* [loader/module.c] [if1632/kernel.spec]
Make GetModuleHandle() accept instance handles as parameter.
* [if1632/relay.c] [loader/task.c]
Put a magic cookie at the bottom of the 32 bit stack, and check on
each return from a 32 bit function whether it's still there. Complain
if it's not.
* [if1632/user.spec]
Wrong entry for CloseDriver().
* [misc/dos_fs.c] [loader/task.c] [include/dos_fs.h] [misc/file.c]
[miscemu/int21.c]
Large parts of dos_fs.c simplified. Changed it to use one
current drive/directory per task, which is set to the module path on
task creation.
Prevent CorelPaint from closing stdin.
open() with O_CREAT set must be passed three parameters.
DOS FindFirst()/FindNext() could crash when FA_LABEL was set. Fixed,
it's in DOS_readdir() now.
* [misc/profile.c]
Some badly written software (Lotus Freelance Graphics) passes a bogus
size parameter that caused Wine to write off the end of a segment.
Fixed. (It's probably too paranoid now.)
* [multimedia/mmsystem.c] [multimedia/time.c] [multimedia/joystick.c]
[multimedia/Imakefile] [if1632/winprocs.spec]
16 bit entry point for MMSysTimeCallback.
Split off time.c and joystick.c from mmsystem.c.
* [objects/dib.c]
GetDIBits(): call XGetImage() via CallTo32_LargeStack.
* [windows/cursor.c]
DestroyCursor(): do nothing for builtin cursors.
* [windows/mdi.c]
Half of WM_MDISETMENU implemented.
* [windows/win.c]
EnumWindows() and EnumTaskWindows() never enumerated any windows.
Fixed.
* [windows/*.c]
Fixed GetParent() to return correct values for owned windows.
* [windows/message.c]
Don't try to activate disabled top-level windows.
* [windows/nonclient.c]
Work around a bug in gcc-2.7.0.
* [tools/build.c] [include/stackframe.h] [memory/global.c]
[loader/task.c] [memory/selector.c]
Some Visual Basic programs (and possibly others, too) expect ES to be
preserved by a call to an API function, so we have to save it.
In GlobalFree() and FreeSelector(), we must clear CURRENT_STACK16->es
to prevent segfaults if ES contained the selector to be freed.
Sun Jul 9 20:21:20 1995 Jon Tombs <jon@gtex02.us.es>
* [*/*]
Added missing prototypes to header files and relevant includes
to reduce compile time warnings.
Sun Jul 9 18:32:56 1995 Michael Patra <micky@marie.physik.tu-berlin.de>
* [configure.in] [include/config.h] [*/Makefile.in]
New configuration scheme based on autoconf.
Sat Jul 8 14:12:45 1995 Morten Welinder <terra+@cs.cmu.edu>
* [miscemu/ioports.c]
Revamp to have only one in- and one out- variant, both really
implemented.
* [miscemu/instr.c]
INSTR_EmulateInstruction: Use new ioport interface. Implement
string io. Correct instruction pointer for 32-bit code.
* [include/miscemu.h]
Update port function prototypes.
* [include/registers.h]
Defined FS and GS.
Sat Jul 8 13:38:54 1995 Hans de Graaff <graaff@twi72.twi.tudelft.nl>
* [misc/dos_fs.c]
ChopOffSlash(): A path consisting off a single slash is left
intact, and multiple slashes are all removed.
1995-07-29 15:09:43 +02:00
|
|
|
*/
|
1999-02-26 12:11:13 +01:00
|
|
|
BOOL REGION_FrameRgn( HRGN hDest, HRGN hSrc, INT x, INT y )
|
Release 950727
Sat Jul 22 22:39:09 IDT 1995 Michael Veksler <e1678223@tochnapc2.technion.ac.il>
* [ipc/*]
New directory. This directory contains the new inter-wine
communications support. It enables DDE protocols between two wine
instances. Currently it is limited to DDE, but can be enhanced to
support OLE between 2 different wine instances. This is very
important for libwine.a DDE/OLE support.
* [tools/ipcl]
A script to delete garbage IPC handles (shared memory, semaphores
and message queues). The current inter-wine communication is not
perfect, and sometimes leaves garbage behind.
* [if1632/relay.c] [include/atom.h] [include/global.h]
[loader/selector.c] [loader/task.c] [loader/module.c]
[loader/signal.c] [memory/global.c] [misc/atom.c]
[windows/class.c] [windows/message.c] [windows/win.c]
[Imakefile]
Hooks for inter-wine DDE support, current Global.*Atom functions
renamed to Local.*Atom since Global.*Atom are used for Inter-Wine
DDE communication. (The first call to these functions sets up the
IPC structures - which otherwise cause unneeded overhead.
Mon Jul 17 19:55:21 1995 Alexandre Julliard <julliard@sunsite.unc.edu>
* [controls/menu.c]
Don't crash if a NULL string is passed to menu functions.
* [memory/selector.c]
We now use a bit in ldt_flags_copy to indicate free LDT entries.
Fixed a bug in SELECTOR_ReallocBlock that could cause it to
overwrite valid LDT entries when growing a block.
* [miscemu/instr.c]
Emulate int xx instruction by storing the interrupt vector in
CS:IP and returning directly. This allows a program to install an
interrupt vector.
* [windows/win.c]
Added function WIN_GetTopParent to get the top-level parent of a
window.
Sun Jul 16 18:17:17 1995 Gregory Trubetskoy <grisha@mira.com>
* [loader/resource.c]
Added LoadIconHandler. It doesn't do anything yet, but now you
can use borland help files with winhelp.exe.
Sun Jul 16 11:58:45 1995 Anand Kumria <akumria@ozemail.com.au>
* [misc/main.c]
Fixed to return 386 Enhanced mode correctly. Also return the same
type of CPU, for both Enhanced and Standard mode, namely a 386.
Sun Jul 16 00:02:04 1995 Martin von Loewis <loewis@informatik.hu-berlin.de>
* [Configure] [include/options.h] [include/wineopts.h]
[misc/main.c][misc/spy.c]
Removed support of spy file. Redirected spy messages to stddeb.
Removed -spy option. Added -debugmsg +spy option.
* [debugger/dbg.y][debugger/debug.l]
Enabled segmented addresses (seg:offs) for break and x commands.
* [if1632/gdi.spec] [objects/region.c] [windows/graphics.c]
[include/region.h]
FrameRgn, REGION_FrameRgn: New functions
* [if1632/kernel.spec]
IsWinOldApTask: Return false
* [if1632/mouse.spec]
CplApplet: Removed
* [if1632/user.spec] [windows/win.c]
ShowOwnedPopups: New function
* [if1632/winsock.spec] [misc/winsocket.c]
inet_addr, select: New prototypes in relay code
Fixed memory layout for netdb functions (getXbyY).
WINSOCK_ioctlsocket: Translated FIONREAD, FIONBIO, and FIOASYNC
* [objects/clipping.c]
RectVisible: Fixed call to LPToDP
* [rc/winerc.c]
main: Removed extra argument to getopt for Linux.
Tue Jul 11 00:14:41 1995 Bernd Schmidt <crux@pool.informatik.rwth-aachen.de>
* [controls/listbox.c]
Yet another fix for ListBoxDirectory().
* [loader/module.c] [if1632/kernel.spec]
Make GetModuleHandle() accept instance handles as parameter.
* [if1632/relay.c] [loader/task.c]
Put a magic cookie at the bottom of the 32 bit stack, and check on
each return from a 32 bit function whether it's still there. Complain
if it's not.
* [if1632/user.spec]
Wrong entry for CloseDriver().
* [misc/dos_fs.c] [loader/task.c] [include/dos_fs.h] [misc/file.c]
[miscemu/int21.c]
Large parts of dos_fs.c simplified. Changed it to use one
current drive/directory per task, which is set to the module path on
task creation.
Prevent CorelPaint from closing stdin.
open() with O_CREAT set must be passed three parameters.
DOS FindFirst()/FindNext() could crash when FA_LABEL was set. Fixed,
it's in DOS_readdir() now.
* [misc/profile.c]
Some badly written software (Lotus Freelance Graphics) passes a bogus
size parameter that caused Wine to write off the end of a segment.
Fixed. (It's probably too paranoid now.)
* [multimedia/mmsystem.c] [multimedia/time.c] [multimedia/joystick.c]
[multimedia/Imakefile] [if1632/winprocs.spec]
16 bit entry point for MMSysTimeCallback.
Split off time.c and joystick.c from mmsystem.c.
* [objects/dib.c]
GetDIBits(): call XGetImage() via CallTo32_LargeStack.
* [windows/cursor.c]
DestroyCursor(): do nothing for builtin cursors.
* [windows/mdi.c]
Half of WM_MDISETMENU implemented.
* [windows/win.c]
EnumWindows() and EnumTaskWindows() never enumerated any windows.
Fixed.
* [windows/*.c]
Fixed GetParent() to return correct values for owned windows.
* [windows/message.c]
Don't try to activate disabled top-level windows.
* [windows/nonclient.c]
Work around a bug in gcc-2.7.0.
* [tools/build.c] [include/stackframe.h] [memory/global.c]
[loader/task.c] [memory/selector.c]
Some Visual Basic programs (and possibly others, too) expect ES to be
preserved by a call to an API function, so we have to save it.
In GlobalFree() and FreeSelector(), we must clear CURRENT_STACK16->es
to prevent segfaults if ES contained the selector to be freed.
Sun Jul 9 20:21:20 1995 Jon Tombs <jon@gtex02.us.es>
* [*/*]
Added missing prototypes to header files and relevant includes
to reduce compile time warnings.
Sun Jul 9 18:32:56 1995 Michael Patra <micky@marie.physik.tu-berlin.de>
* [configure.in] [include/config.h] [*/Makefile.in]
New configuration scheme based on autoconf.
Sat Jul 8 14:12:45 1995 Morten Welinder <terra+@cs.cmu.edu>
* [miscemu/ioports.c]
Revamp to have only one in- and one out- variant, both really
implemented.
* [miscemu/instr.c]
INSTR_EmulateInstruction: Use new ioport interface. Implement
string io. Correct instruction pointer for 32-bit code.
* [include/miscemu.h]
Update port function prototypes.
* [include/registers.h]
Defined FS and GS.
Sat Jul 8 13:38:54 1995 Hans de Graaff <graaff@twi72.twi.tudelft.nl>
* [misc/dos_fs.c]
ChopOffSlash(): A path consisting off a single slash is left
intact, and multiple slashes are all removed.
1995-07-29 15:09:43 +02:00
|
|
|
{
|
2009-01-29 18:18:53 +01:00
|
|
|
WINEREGION tmprgn;
|
2009-01-29 16:38:53 +01:00
|
|
|
BOOL bRet = FALSE;
|
|
|
|
RGNOBJ* destObj = NULL;
|
2009-01-28 16:20:56 +01:00
|
|
|
RGNOBJ *srcObj = GDI_GetObjPtr( hSrc, OBJ_REGION );
|
Release 950727
Sat Jul 22 22:39:09 IDT 1995 Michael Veksler <e1678223@tochnapc2.technion.ac.il>
* [ipc/*]
New directory. This directory contains the new inter-wine
communications support. It enables DDE protocols between two wine
instances. Currently it is limited to DDE, but can be enhanced to
support OLE between 2 different wine instances. This is very
important for libwine.a DDE/OLE support.
* [tools/ipcl]
A script to delete garbage IPC handles (shared memory, semaphores
and message queues). The current inter-wine communication is not
perfect, and sometimes leaves garbage behind.
* [if1632/relay.c] [include/atom.h] [include/global.h]
[loader/selector.c] [loader/task.c] [loader/module.c]
[loader/signal.c] [memory/global.c] [misc/atom.c]
[windows/class.c] [windows/message.c] [windows/win.c]
[Imakefile]
Hooks for inter-wine DDE support, current Global.*Atom functions
renamed to Local.*Atom since Global.*Atom are used for Inter-Wine
DDE communication. (The first call to these functions sets up the
IPC structures - which otherwise cause unneeded overhead.
Mon Jul 17 19:55:21 1995 Alexandre Julliard <julliard@sunsite.unc.edu>
* [controls/menu.c]
Don't crash if a NULL string is passed to menu functions.
* [memory/selector.c]
We now use a bit in ldt_flags_copy to indicate free LDT entries.
Fixed a bug in SELECTOR_ReallocBlock that could cause it to
overwrite valid LDT entries when growing a block.
* [miscemu/instr.c]
Emulate int xx instruction by storing the interrupt vector in
CS:IP and returning directly. This allows a program to install an
interrupt vector.
* [windows/win.c]
Added function WIN_GetTopParent to get the top-level parent of a
window.
Sun Jul 16 18:17:17 1995 Gregory Trubetskoy <grisha@mira.com>
* [loader/resource.c]
Added LoadIconHandler. It doesn't do anything yet, but now you
can use borland help files with winhelp.exe.
Sun Jul 16 11:58:45 1995 Anand Kumria <akumria@ozemail.com.au>
* [misc/main.c]
Fixed to return 386 Enhanced mode correctly. Also return the same
type of CPU, for both Enhanced and Standard mode, namely a 386.
Sun Jul 16 00:02:04 1995 Martin von Loewis <loewis@informatik.hu-berlin.de>
* [Configure] [include/options.h] [include/wineopts.h]
[misc/main.c][misc/spy.c]
Removed support of spy file. Redirected spy messages to stddeb.
Removed -spy option. Added -debugmsg +spy option.
* [debugger/dbg.y][debugger/debug.l]
Enabled segmented addresses (seg:offs) for break and x commands.
* [if1632/gdi.spec] [objects/region.c] [windows/graphics.c]
[include/region.h]
FrameRgn, REGION_FrameRgn: New functions
* [if1632/kernel.spec]
IsWinOldApTask: Return false
* [if1632/mouse.spec]
CplApplet: Removed
* [if1632/user.spec] [windows/win.c]
ShowOwnedPopups: New function
* [if1632/winsock.spec] [misc/winsocket.c]
inet_addr, select: New prototypes in relay code
Fixed memory layout for netdb functions (getXbyY).
WINSOCK_ioctlsocket: Translated FIONREAD, FIONBIO, and FIOASYNC
* [objects/clipping.c]
RectVisible: Fixed call to LPToDP
* [rc/winerc.c]
main: Removed extra argument to getopt for Linux.
Tue Jul 11 00:14:41 1995 Bernd Schmidt <crux@pool.informatik.rwth-aachen.de>
* [controls/listbox.c]
Yet another fix for ListBoxDirectory().
* [loader/module.c] [if1632/kernel.spec]
Make GetModuleHandle() accept instance handles as parameter.
* [if1632/relay.c] [loader/task.c]
Put a magic cookie at the bottom of the 32 bit stack, and check on
each return from a 32 bit function whether it's still there. Complain
if it's not.
* [if1632/user.spec]
Wrong entry for CloseDriver().
* [misc/dos_fs.c] [loader/task.c] [include/dos_fs.h] [misc/file.c]
[miscemu/int21.c]
Large parts of dos_fs.c simplified. Changed it to use one
current drive/directory per task, which is set to the module path on
task creation.
Prevent CorelPaint from closing stdin.
open() with O_CREAT set must be passed three parameters.
DOS FindFirst()/FindNext() could crash when FA_LABEL was set. Fixed,
it's in DOS_readdir() now.
* [misc/profile.c]
Some badly written software (Lotus Freelance Graphics) passes a bogus
size parameter that caused Wine to write off the end of a segment.
Fixed. (It's probably too paranoid now.)
* [multimedia/mmsystem.c] [multimedia/time.c] [multimedia/joystick.c]
[multimedia/Imakefile] [if1632/winprocs.spec]
16 bit entry point for MMSysTimeCallback.
Split off time.c and joystick.c from mmsystem.c.
* [objects/dib.c]
GetDIBits(): call XGetImage() via CallTo32_LargeStack.
* [windows/cursor.c]
DestroyCursor(): do nothing for builtin cursors.
* [windows/mdi.c]
Half of WM_MDISETMENU implemented.
* [windows/win.c]
EnumWindows() and EnumTaskWindows() never enumerated any windows.
Fixed.
* [windows/*.c]
Fixed GetParent() to return correct values for owned windows.
* [windows/message.c]
Don't try to activate disabled top-level windows.
* [windows/nonclient.c]
Work around a bug in gcc-2.7.0.
* [tools/build.c] [include/stackframe.h] [memory/global.c]
[loader/task.c] [memory/selector.c]
Some Visual Basic programs (and possibly others, too) expect ES to be
preserved by a call to an API function, so we have to save it.
In GlobalFree() and FreeSelector(), we must clear CURRENT_STACK16->es
to prevent segfaults if ES contained the selector to be freed.
Sun Jul 9 20:21:20 1995 Jon Tombs <jon@gtex02.us.es>
* [*/*]
Added missing prototypes to header files and relevant includes
to reduce compile time warnings.
Sun Jul 9 18:32:56 1995 Michael Patra <micky@marie.physik.tu-berlin.de>
* [configure.in] [include/config.h] [*/Makefile.in]
New configuration scheme based on autoconf.
Sat Jul 8 14:12:45 1995 Morten Welinder <terra+@cs.cmu.edu>
* [miscemu/ioports.c]
Revamp to have only one in- and one out- variant, both really
implemented.
* [miscemu/instr.c]
INSTR_EmulateInstruction: Use new ioport interface. Implement
string io. Correct instruction pointer for 32-bit code.
* [include/miscemu.h]
Update port function prototypes.
* [include/registers.h]
Defined FS and GS.
Sat Jul 8 13:38:54 1995 Hans de Graaff <graaff@twi72.twi.tudelft.nl>
* [misc/dos_fs.c]
ChopOffSlash(): A path consisting off a single slash is left
intact, and multiple slashes are all removed.
1995-07-29 15:09:43 +02:00
|
|
|
|
2009-01-29 18:18:53 +01:00
|
|
|
tmprgn.rects = NULL;
|
2000-08-19 23:38:55 +02:00
|
|
|
if (!srcObj) return FALSE;
|
2009-01-29 16:38:53 +01:00
|
|
|
if (srcObj->rgn.numRects != 0)
|
1997-08-24 18:00:30 +02:00
|
|
|
{
|
2009-01-29 16:38:53 +01:00
|
|
|
if (!(destObj = GDI_GetObjPtr( hDest, OBJ_REGION ))) goto done;
|
|
|
|
if (!init_region( &tmprgn, srcObj->rgn.numRects )) goto done;
|
|
|
|
|
2009-01-29 18:18:53 +01:00
|
|
|
if (!REGION_OffsetRegion( &destObj->rgn, &srcObj->rgn, -x, 0)) goto done;
|
|
|
|
if (!REGION_OffsetRegion( &tmprgn, &srcObj->rgn, x, 0)) goto done;
|
|
|
|
if (!REGION_IntersectRegion( &destObj->rgn, &destObj->rgn, &tmprgn )) goto done;
|
|
|
|
if (!REGION_OffsetRegion( &tmprgn, &srcObj->rgn, 0, -y)) goto done;
|
|
|
|
if (!REGION_IntersectRegion( &destObj->rgn, &destObj->rgn, &tmprgn )) goto done;
|
|
|
|
if (!REGION_OffsetRegion( &tmprgn, &srcObj->rgn, 0, y)) goto done;
|
|
|
|
if (!REGION_IntersectRegion( &destObj->rgn, &destObj->rgn, &tmprgn )) goto done;
|
|
|
|
if (!REGION_SubtractRegion( &destObj->rgn, &srcObj->rgn, &destObj->rgn )) goto done;
|
Release 971101
Thu Oct 30 21:52:23 1997 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [windows/nonclient.c]
Changed NC_TrackSysMenu to give the same behaviour as MS-Windows,
i.e. system menu already appears when mouse button is depressed.
Changed NC_HandleNCLButtonDblClk so that double clicks on scroll
bar arrows are handled the same way as single clicks.
* [windows/winpos.c]
Fixed SetWindowPos32 to clear WIN_NO_REDRAW when SWP_SHOWWINDOW is
set; this is the way MS-Windows behaves.
Thu Oct 30 21:08:57 1997 Morten Welinder <terra@diku.dk>
* [controls/status.c]
In SW_SetText, fix condition, I hope.
* [controls/menu.c]
(GetMenuState32): Don't mask return value. Print more debug info.
(MENU_MenuBarCalcSize): Be more careful when printing debug
information.
(MENU_SetItemData): Empty strings are separators.
* [graphics/x11drv/text.c]
Don't prototype CLIPPING_IntersectClipRect.
* [include/dc.h]
Prototype CLIPPING_IntersectClipRect.
* [objects/font.c]
Remove non-portable (and faulty) smartness in FONT_TextMetric*to*.
In CreateFont32W and CreateFont16, handle null font name.
* [objects/text.c]
(TEXT_NextLine): Fix end-of-line bug.
* [if1632/shell32.spec]
Activate existing implementation of ExtractIconA.
* [misc/shell.c]
For Control_RunDLL, add types for parameters.
Thu Oct 30 14:54:11 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [controls/static.c] [include/windows.h] [misc/spy.c]
Added some win32 defines to static controls, basic SS_BITMAP style
handling implemented. [please add more, I am lacking knowledge and
time]
* [controls/status.c]
part_num 255 seems to indicate whole statusline (win95 cdplayer.exe)
* [if1632/thunk.c] [tools/build.c]
Support lret and 0x66 lret calls for CallTo16_regs
(needed for KERNEL32_45)
Fixed KERNEL32_45, QT_Thunk (should work now).
* [if1632/relay.c][if1632/builtin.c][tools/build.c][if1632/*32.spec]
Added string dumping to relay debugging for win32 apifuncs.
* [misc/ver.c]
Fixed and cleaned up VerQueryValue*.
* [multimedia/*.c][include/mmsystem.h][if1632/mmsystem.spec]
[if1632/winmm.spec]
Win32 support for lowlevel multimedia functions.
Added some mixer* lowlevel functions.
Some small fixes in the audio lowlevel queue handling, code
reformatting/cleanups.
* [debugger/hash.c]
Don't show difference between 16bit symbols if they are in
different segments.
* [objects/cursoricon.c]
Added GetIconInfo (partial) and CreateIconIndirect.
* [windows/mdi.c]
Fixed some "bad class" problems and crashes in MDICreateChild,
which happen in Win32 (jwp32.exe).
Wed Oct 29 00:57:27 1997 Bruce Milner <Bruce.Milner@genetics.utah.edu>
* [if1632/winaspi.spec] [misc/aspi.c] [include/aspi.c]
[documentation/aspi] [include/callback.h]
Added support for 16 bit ASPI calls to linux generic SCSI.
The support is not complete, but appears to run my Mustek
scanner from within ipplus.exe.
Mon Oct 27 00:59:41 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c]
DC reuse framework.
Sun Oct 26 18:41:21 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/x11drv/xfont.c]
Substituted fonts are removed from the alias table. References to
the old name are also updated.
* [controls/combo.c]
LB_SELECTSTRING32 not CB_SELECTSTRING32 should be sent to
ComboLBox.
Sun Oct 26 14:25:00 1997 Nikita V. Youshchenko <yoush@cs.msu.su>
* [include/drive.h] [files/drive.c] [msdos/int21.c]
Partially implemented DOS drive mapping (int21 AX=440F).
Sat Oct 25 13:03:29 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/debug.l]
Support '.' in identifiers. Use "x . y" to access structure
fields.
* [debugger/hash.c] [loader/pe_image.c]
Load entry points of Win32 modules only when entering the
debugger.
* [debugger/break.c]
New function DEBUG_AddModuleBreakpoint() to set a breakpoint at
the start of every module.
* [files/file.c]
FILE_mmap() can now fake mmap() for unaligned offsets or broken
filesystems.
* [include/callback.h] [misc/callback.c] [if1632/thunk.c]
Use a table of callbacks instead of macros to differentiate
between emulator and Winelib.
* [loader/task.c]
Initialize current directory from cwd, not from module path.
* [tools/build.c]
Read CallTo16 prototypes directly from thunk.c source file.
* [windows/winproc.c] [windows/mdi.c]
Added translation for WM_MDIACTIVATE and WM_MDIGETACTIVE.
Fri Oct 24 21:41:25 1997 Uwe Bonnes <bon@elektron.ikp.tu-darmstadt.de>
* [files/drive.c]
Allow arguments like "a" for the drive related apis.
* [memory/global.c]
Keep the calculation for dwMemoryLoad in range.
* [misc/crtdll.c]
Make CRTDLL_getcwd use GetCurrentDirectory32A and alloc
its memory if requested.
Implemented CRTDLL_rename and CRTDLL_stat needed for
lcc-win32:wedit.exe.
Implemented CRTDLL__fullpath.
* [misc/comm.c]
High speed modes for the 16-bit mode Comm functions.
* [misc/cpu.c]
As applications may treat lpMaximumApplicationAddress as long,
use a valid long number.
* [misc/main.c]
In SystemParametersInfo16 ignore SPI_GETHIGHCONTRAST too.
* [misc/ole2nls.c]
Implement LCMAP_UPPERCASE for LCMapString32.
* [misc/wsprintf]
Made WPRINTF_ParseFormatA understand %ws.
* [win32/file.c]
Ignore FILE_ATTRIBUTE_NORMAL.
Stub for ReadFileEx.
Fri Oct 24 15:36:02 1997 Doug Ridgway <ridgway@routh.ucsd.edu>
* [memory/local.c]
Local heap exhaustion message now prints which builtin heap filled.
Fri Oct 24 00:46:34 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [windows/dialog.c]
Reversed CreateFont16/32W typo.
Thu Oct 23 23:44:20 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [if1632/user.spec]
Fixed argument list for ChangeClipboardChain.
* [windows/mdi.c]
Pass correct hInstance to CreateWindow16() in MDICreateChild().
Mon Oct 20 11:51:24 1997 Carsten Fallesen <cf@it.dtu.dk>
* [objects/metafile.c]
Added support for META_SETTEXTCHAREXTRA.
* [objects/region.c]
Fixed crash in XPolygonRegion if there is only one point in
in the region.
* [if1632/gdi32.spec][include/gdi.h][include/windows.h]
[objects/gdiobj.c]
Completed OBJ_XXX defines in gdi.h, removed OBJ_XXX in gdiobj.c
and included gdi.h instead. Implemented GetObjectType32().
Thu Oct 16 17:21:32 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [documentation/wine.texinfo]
Fixed WIN32 and Makefiles entries of Reference manual node, that
made makeinfo dump core.
Mon Oct 13 17:15:57 1997 Robert Wilhelm <robert@physiol.med.tu-muenchen.de>
* [if1632/crtdll.spec]
Added missing math functions y0(), y1(), y2(), floor(), frexp(),
ldexp(), modf().
1997-11-01 20:08:16 +01:00
|
|
|
bRet = TRUE;
|
1997-08-24 18:00:30 +02:00
|
|
|
}
|
2009-01-29 16:38:53 +01:00
|
|
|
done:
|
2009-01-29 18:18:53 +01:00
|
|
|
HeapFree( GetProcessHeap(), 0, tmprgn.rects );
|
2009-01-29 16:38:53 +01:00
|
|
|
if (destObj) GDI_ReleaseObj ( hDest );
|
2000-08-19 23:38:55 +02:00
|
|
|
GDI_ReleaseObj( hSrc );
|
Release 971101
Thu Oct 30 21:52:23 1997 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [windows/nonclient.c]
Changed NC_TrackSysMenu to give the same behaviour as MS-Windows,
i.e. system menu already appears when mouse button is depressed.
Changed NC_HandleNCLButtonDblClk so that double clicks on scroll
bar arrows are handled the same way as single clicks.
* [windows/winpos.c]
Fixed SetWindowPos32 to clear WIN_NO_REDRAW when SWP_SHOWWINDOW is
set; this is the way MS-Windows behaves.
Thu Oct 30 21:08:57 1997 Morten Welinder <terra@diku.dk>
* [controls/status.c]
In SW_SetText, fix condition, I hope.
* [controls/menu.c]
(GetMenuState32): Don't mask return value. Print more debug info.
(MENU_MenuBarCalcSize): Be more careful when printing debug
information.
(MENU_SetItemData): Empty strings are separators.
* [graphics/x11drv/text.c]
Don't prototype CLIPPING_IntersectClipRect.
* [include/dc.h]
Prototype CLIPPING_IntersectClipRect.
* [objects/font.c]
Remove non-portable (and faulty) smartness in FONT_TextMetric*to*.
In CreateFont32W and CreateFont16, handle null font name.
* [objects/text.c]
(TEXT_NextLine): Fix end-of-line bug.
* [if1632/shell32.spec]
Activate existing implementation of ExtractIconA.
* [misc/shell.c]
For Control_RunDLL, add types for parameters.
Thu Oct 30 14:54:11 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [controls/static.c] [include/windows.h] [misc/spy.c]
Added some win32 defines to static controls, basic SS_BITMAP style
handling implemented. [please add more, I am lacking knowledge and
time]
* [controls/status.c]
part_num 255 seems to indicate whole statusline (win95 cdplayer.exe)
* [if1632/thunk.c] [tools/build.c]
Support lret and 0x66 lret calls for CallTo16_regs
(needed for KERNEL32_45)
Fixed KERNEL32_45, QT_Thunk (should work now).
* [if1632/relay.c][if1632/builtin.c][tools/build.c][if1632/*32.spec]
Added string dumping to relay debugging for win32 apifuncs.
* [misc/ver.c]
Fixed and cleaned up VerQueryValue*.
* [multimedia/*.c][include/mmsystem.h][if1632/mmsystem.spec]
[if1632/winmm.spec]
Win32 support for lowlevel multimedia functions.
Added some mixer* lowlevel functions.
Some small fixes in the audio lowlevel queue handling, code
reformatting/cleanups.
* [debugger/hash.c]
Don't show difference between 16bit symbols if they are in
different segments.
* [objects/cursoricon.c]
Added GetIconInfo (partial) and CreateIconIndirect.
* [windows/mdi.c]
Fixed some "bad class" problems and crashes in MDICreateChild,
which happen in Win32 (jwp32.exe).
Wed Oct 29 00:57:27 1997 Bruce Milner <Bruce.Milner@genetics.utah.edu>
* [if1632/winaspi.spec] [misc/aspi.c] [include/aspi.c]
[documentation/aspi] [include/callback.h]
Added support for 16 bit ASPI calls to linux generic SCSI.
The support is not complete, but appears to run my Mustek
scanner from within ipplus.exe.
Mon Oct 27 00:59:41 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c]
DC reuse framework.
Sun Oct 26 18:41:21 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/x11drv/xfont.c]
Substituted fonts are removed from the alias table. References to
the old name are also updated.
* [controls/combo.c]
LB_SELECTSTRING32 not CB_SELECTSTRING32 should be sent to
ComboLBox.
Sun Oct 26 14:25:00 1997 Nikita V. Youshchenko <yoush@cs.msu.su>
* [include/drive.h] [files/drive.c] [msdos/int21.c]
Partially implemented DOS drive mapping (int21 AX=440F).
Sat Oct 25 13:03:29 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/debug.l]
Support '.' in identifiers. Use "x . y" to access structure
fields.
* [debugger/hash.c] [loader/pe_image.c]
Load entry points of Win32 modules only when entering the
debugger.
* [debugger/break.c]
New function DEBUG_AddModuleBreakpoint() to set a breakpoint at
the start of every module.
* [files/file.c]
FILE_mmap() can now fake mmap() for unaligned offsets or broken
filesystems.
* [include/callback.h] [misc/callback.c] [if1632/thunk.c]
Use a table of callbacks instead of macros to differentiate
between emulator and Winelib.
* [loader/task.c]
Initialize current directory from cwd, not from module path.
* [tools/build.c]
Read CallTo16 prototypes directly from thunk.c source file.
* [windows/winproc.c] [windows/mdi.c]
Added translation for WM_MDIACTIVATE and WM_MDIGETACTIVE.
Fri Oct 24 21:41:25 1997 Uwe Bonnes <bon@elektron.ikp.tu-darmstadt.de>
* [files/drive.c]
Allow arguments like "a" for the drive related apis.
* [memory/global.c]
Keep the calculation for dwMemoryLoad in range.
* [misc/crtdll.c]
Make CRTDLL_getcwd use GetCurrentDirectory32A and alloc
its memory if requested.
Implemented CRTDLL_rename and CRTDLL_stat needed for
lcc-win32:wedit.exe.
Implemented CRTDLL__fullpath.
* [misc/comm.c]
High speed modes for the 16-bit mode Comm functions.
* [misc/cpu.c]
As applications may treat lpMaximumApplicationAddress as long,
use a valid long number.
* [misc/main.c]
In SystemParametersInfo16 ignore SPI_GETHIGHCONTRAST too.
* [misc/ole2nls.c]
Implement LCMAP_UPPERCASE for LCMapString32.
* [misc/wsprintf]
Made WPRINTF_ParseFormatA understand %ws.
* [win32/file.c]
Ignore FILE_ATTRIBUTE_NORMAL.
Stub for ReadFileEx.
Fri Oct 24 15:36:02 1997 Doug Ridgway <ridgway@routh.ucsd.edu>
* [memory/local.c]
Local heap exhaustion message now prints which builtin heap filled.
Fri Oct 24 00:46:34 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [windows/dialog.c]
Reversed CreateFont16/32W typo.
Thu Oct 23 23:44:20 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [if1632/user.spec]
Fixed argument list for ChangeClipboardChain.
* [windows/mdi.c]
Pass correct hInstance to CreateWindow16() in MDICreateChild().
Mon Oct 20 11:51:24 1997 Carsten Fallesen <cf@it.dtu.dk>
* [objects/metafile.c]
Added support for META_SETTEXTCHAREXTRA.
* [objects/region.c]
Fixed crash in XPolygonRegion if there is only one point in
in the region.
* [if1632/gdi32.spec][include/gdi.h][include/windows.h]
[objects/gdiobj.c]
Completed OBJ_XXX defines in gdi.h, removed OBJ_XXX in gdiobj.c
and included gdi.h instead. Implemented GetObjectType32().
Thu Oct 16 17:21:32 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [documentation/wine.texinfo]
Fixed WIN32 and Makefiles entries of Reference manual node, that
made makeinfo dump core.
Mon Oct 13 17:15:57 1997 Robert Wilhelm <robert@physiol.med.tu-muenchen.de>
* [if1632/crtdll.spec]
Added missing math functions y0(), y1(), y2(), floor(), frexp(),
ldexp(), modf().
1997-11-01 20:08:16 +01:00
|
|
|
return bRet;
|
Release 950727
Sat Jul 22 22:39:09 IDT 1995 Michael Veksler <e1678223@tochnapc2.technion.ac.il>
* [ipc/*]
New directory. This directory contains the new inter-wine
communications support. It enables DDE protocols between two wine
instances. Currently it is limited to DDE, but can be enhanced to
support OLE between 2 different wine instances. This is very
important for libwine.a DDE/OLE support.
* [tools/ipcl]
A script to delete garbage IPC handles (shared memory, semaphores
and message queues). The current inter-wine communication is not
perfect, and sometimes leaves garbage behind.
* [if1632/relay.c] [include/atom.h] [include/global.h]
[loader/selector.c] [loader/task.c] [loader/module.c]
[loader/signal.c] [memory/global.c] [misc/atom.c]
[windows/class.c] [windows/message.c] [windows/win.c]
[Imakefile]
Hooks for inter-wine DDE support, current Global.*Atom functions
renamed to Local.*Atom since Global.*Atom are used for Inter-Wine
DDE communication. (The first call to these functions sets up the
IPC structures - which otherwise cause unneeded overhead.
Mon Jul 17 19:55:21 1995 Alexandre Julliard <julliard@sunsite.unc.edu>
* [controls/menu.c]
Don't crash if a NULL string is passed to menu functions.
* [memory/selector.c]
We now use a bit in ldt_flags_copy to indicate free LDT entries.
Fixed a bug in SELECTOR_ReallocBlock that could cause it to
overwrite valid LDT entries when growing a block.
* [miscemu/instr.c]
Emulate int xx instruction by storing the interrupt vector in
CS:IP and returning directly. This allows a program to install an
interrupt vector.
* [windows/win.c]
Added function WIN_GetTopParent to get the top-level parent of a
window.
Sun Jul 16 18:17:17 1995 Gregory Trubetskoy <grisha@mira.com>
* [loader/resource.c]
Added LoadIconHandler. It doesn't do anything yet, but now you
can use borland help files with winhelp.exe.
Sun Jul 16 11:58:45 1995 Anand Kumria <akumria@ozemail.com.au>
* [misc/main.c]
Fixed to return 386 Enhanced mode correctly. Also return the same
type of CPU, for both Enhanced and Standard mode, namely a 386.
Sun Jul 16 00:02:04 1995 Martin von Loewis <loewis@informatik.hu-berlin.de>
* [Configure] [include/options.h] [include/wineopts.h]
[misc/main.c][misc/spy.c]
Removed support of spy file. Redirected spy messages to stddeb.
Removed -spy option. Added -debugmsg +spy option.
* [debugger/dbg.y][debugger/debug.l]
Enabled segmented addresses (seg:offs) for break and x commands.
* [if1632/gdi.spec] [objects/region.c] [windows/graphics.c]
[include/region.h]
FrameRgn, REGION_FrameRgn: New functions
* [if1632/kernel.spec]
IsWinOldApTask: Return false
* [if1632/mouse.spec]
CplApplet: Removed
* [if1632/user.spec] [windows/win.c]
ShowOwnedPopups: New function
* [if1632/winsock.spec] [misc/winsocket.c]
inet_addr, select: New prototypes in relay code
Fixed memory layout for netdb functions (getXbyY).
WINSOCK_ioctlsocket: Translated FIONREAD, FIONBIO, and FIOASYNC
* [objects/clipping.c]
RectVisible: Fixed call to LPToDP
* [rc/winerc.c]
main: Removed extra argument to getopt for Linux.
Tue Jul 11 00:14:41 1995 Bernd Schmidt <crux@pool.informatik.rwth-aachen.de>
* [controls/listbox.c]
Yet another fix for ListBoxDirectory().
* [loader/module.c] [if1632/kernel.spec]
Make GetModuleHandle() accept instance handles as parameter.
* [if1632/relay.c] [loader/task.c]
Put a magic cookie at the bottom of the 32 bit stack, and check on
each return from a 32 bit function whether it's still there. Complain
if it's not.
* [if1632/user.spec]
Wrong entry for CloseDriver().
* [misc/dos_fs.c] [loader/task.c] [include/dos_fs.h] [misc/file.c]
[miscemu/int21.c]
Large parts of dos_fs.c simplified. Changed it to use one
current drive/directory per task, which is set to the module path on
task creation.
Prevent CorelPaint from closing stdin.
open() with O_CREAT set must be passed three parameters.
DOS FindFirst()/FindNext() could crash when FA_LABEL was set. Fixed,
it's in DOS_readdir() now.
* [misc/profile.c]
Some badly written software (Lotus Freelance Graphics) passes a bogus
size parameter that caused Wine to write off the end of a segment.
Fixed. (It's probably too paranoid now.)
* [multimedia/mmsystem.c] [multimedia/time.c] [multimedia/joystick.c]
[multimedia/Imakefile] [if1632/winprocs.spec]
16 bit entry point for MMSysTimeCallback.
Split off time.c and joystick.c from mmsystem.c.
* [objects/dib.c]
GetDIBits(): call XGetImage() via CallTo32_LargeStack.
* [windows/cursor.c]
DestroyCursor(): do nothing for builtin cursors.
* [windows/mdi.c]
Half of WM_MDISETMENU implemented.
* [windows/win.c]
EnumWindows() and EnumTaskWindows() never enumerated any windows.
Fixed.
* [windows/*.c]
Fixed GetParent() to return correct values for owned windows.
* [windows/message.c]
Don't try to activate disabled top-level windows.
* [windows/nonclient.c]
Work around a bug in gcc-2.7.0.
* [tools/build.c] [include/stackframe.h] [memory/global.c]
[loader/task.c] [memory/selector.c]
Some Visual Basic programs (and possibly others, too) expect ES to be
preserved by a call to an API function, so we have to save it.
In GlobalFree() and FreeSelector(), we must clear CURRENT_STACK16->es
to prevent segfaults if ES contained the selector to be freed.
Sun Jul 9 20:21:20 1995 Jon Tombs <jon@gtex02.us.es>
* [*/*]
Added missing prototypes to header files and relevant includes
to reduce compile time warnings.
Sun Jul 9 18:32:56 1995 Michael Patra <micky@marie.physik.tu-berlin.de>
* [configure.in] [include/config.h] [*/Makefile.in]
New configuration scheme based on autoconf.
Sat Jul 8 14:12:45 1995 Morten Welinder <terra+@cs.cmu.edu>
* [miscemu/ioports.c]
Revamp to have only one in- and one out- variant, both really
implemented.
* [miscemu/instr.c]
INSTR_EmulateInstruction: Use new ioport interface. Implement
string io. Correct instruction pointer for 32-bit code.
* [include/miscemu.h]
Update port function prototypes.
* [include/registers.h]
Defined FS and GS.
Sat Jul 8 13:38:54 1995 Hans de Graaff <graaff@twi72.twi.tudelft.nl>
* [misc/dos_fs.c]
ChopOffSlash(): A path consisting off a single slash is left
intact, and multiple slashes are all removed.
1995-07-29 15:09:43 +02:00
|
|
|
}
|
1994-10-17 19:12:41 +01:00
|
|
|
|
1996-11-02 15:24:07 +01:00
|
|
|
|
1993-09-04 12:09:32 +02:00
|
|
|
/***********************************************************************
|
2001-02-15 00:11:17 +01:00
|
|
|
* CombineRgn (GDI32.@)
|
Release 960309
Fri Mar 8 19:07:18 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [configure.in]
Quote '[' and ']' in the test program for the strength-reduce
bug. This should work much better...
* [files/file.c]
Augmented DOS_FILE structure. Most internal functions now return a
DOS_FILE* instead of a Unix handle.
Added a local file array to replace the PDB list upon startup, to
allow using file I/O functions before the first task is created.
Added FILE_SetDateTime() and FILE_Sync() functions.
* [loader/module.c]
Use the DOS file I/O functions in MODULE_LoadExeHeader().
* [objects/bitblt.c]
Use visible region instead of GC clip region to clip source
area. This fixes the card drawing bug in freecell.
* [objects/region.c]
Fixed CombineRgn() to allow src and dest regions to be the same.
Fri Mar 8 16:32:23 1996 Frans van Dorsselaer <dorssel@rulhm1.leidenuniv.nl>
* [controls/EDIT.TODO]
Updated so it reflects the current status.
* [controls/edit.c]
Implemented internal EDIT_WordBreakProc().
Implemented ES_READONLY.
Implemented WM_LBUTTONDBLCLK to select whole words.
Fixed a lot of types in the function definitions.
Wed Mar 6 19:55:00 1996 Alex Korobka <alex@phm30.pharm.sunysb.edu>
* [debugger/info.c]
Added "walk window" command to walk window list.
* [windows/mdi.c]
Added proper(?) WM_MDISETMENU message handling.
Wed Mar 6 09:27:12 1996 Martin von Loewis <loewis@informatik.hu-berlin.de>
* [if1632/callback.c][if1632/relay32.c]
RELAY32_CallWindowProcConvStruct: new function.
* [win32/struct32.c][win32/Makefile.in][win32/param.c][win32/user32.c]
struct32.c: new file. Moved all structure conversions into that file
PARAM32_POINT32to16,MSG16to32,USER32_RECT32to16:
renamed to STRUCT32_POINT32to16, ...
WIN32_POINT,WIN32_MSG,WIN32_RECT,WIN32_PAINTSTRUCT: renamed to
POINT32, ...
New conversion functions for NCCALCSIZE_PARAMS, WINDOWPOS,
CREATESTRUCT.
* [include/windows.h][misc/exec.c]
WINHELP, MULTIKEYHELP, HELPWININFO: new structures
WinHelp: Reimplemented. Thanks to Peter Balch
(100710.2566@compuserve.com) for his valuable research.
* [win32/winprocs.c]
WIN32_CallWindowProcTo16: new function, call in
USER32_DefWindowProcA,...
Mon Mar 4 23:22:40 1996 Jim Peterson <jspeter@birch.ee.vt.edu>
* [include/wintypes.h]
Added "#define __export".
* [objects/bitblt.c]
Put in a few hacks to make bitblt-ing work when upside-down and/or
mirrored. BITBLT_StretchImage should really be checked over
thoroughly.
* [programs/progman/main.c]
Added "#include <resource.h>" for definition of HAVE_WINE_CONSTRUCTOR.
* [rc/parser.h] [rc/parser.l] [rc/parser.y] [rc/winerc.c]
Eliminated shift/reduce conflict in style definition.
Added crude error message support: "stdin:%d: parse error before '%s'".
Implemented string table support to the best of my ability (it works
with LoadString() calls).
* [windows/nonclient.c]
Fixed bug in NC_DoSizeMove() that made system menu pop up when title
bar of non-iconized window was clicked (checked for iconization).
Mon Mar 04 20:55:19 1996 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [if1632/lzexpand.spec] [if1632/relay.c]
[include/lzexpand.h][misc/lzexpand.c]
LZEXPAND.DLL added.
Sun Mar 03 18:10:22 1996 Albrecht Kleine <kleine@ak.sax.de>
* [windows/win.c]
Prevent usage of invalid HWNDs in WIN_EnumChildWin(),
this prevents too early termination of EnumChildWindows().
1996-03-09 17:12:43 +01:00
|
|
|
*
|
2008-03-25 18:35:45 +01:00
|
|
|
* Combines two regions with the specified operation and stores the result
|
2004-04-05 22:13:38 +02:00
|
|
|
* in the specified destination region.
|
|
|
|
*
|
|
|
|
* PARAMS
|
|
|
|
* hDest [I] The region that receives the combined result.
|
|
|
|
* hSrc1 [I] The first source region.
|
|
|
|
* hSrc2 [I] The second source region.
|
|
|
|
* mode [I] The way in which the source regions will be combined. See notes.
|
|
|
|
*
|
|
|
|
* RETURNS
|
|
|
|
* Success:
|
|
|
|
* NULLREGION - The new region is empty.
|
|
|
|
* SIMPLEREGION - The new region can be represented by one rectangle.
|
|
|
|
* COMPLEXREGION - The new region can only be represented by more than
|
|
|
|
* one rectangle.
|
|
|
|
* Failure: ERROR
|
|
|
|
*
|
|
|
|
* NOTES
|
|
|
|
* The two source regions can be the same region.
|
|
|
|
* The mode can be one of the following:
|
|
|
|
*| RGN_AND - Intersection of the regions
|
|
|
|
*| RGN_OR - Union of the regions
|
|
|
|
*| RGN_XOR - Unions of the regions minus any intersection.
|
|
|
|
*| RGN_DIFF - Difference (subtraction) of the regions.
|
1993-09-04 12:09:32 +02:00
|
|
|
*/
|
1999-02-26 12:11:13 +01:00
|
|
|
INT WINAPI CombineRgn(HRGN hDest, HRGN hSrc1, HRGN hSrc2, INT mode)
|
1993-09-04 12:09:32 +02:00
|
|
|
{
|
2009-01-28 16:20:56 +01:00
|
|
|
RGNOBJ *destObj = GDI_GetObjPtr( hDest, OBJ_REGION );
|
1999-02-26 12:11:13 +01:00
|
|
|
INT result = ERROR;
|
Release 960309
Fri Mar 8 19:07:18 1996 Alexandre Julliard <julliard@lrc.epfl.ch>
* [configure.in]
Quote '[' and ']' in the test program for the strength-reduce
bug. This should work much better...
* [files/file.c]
Augmented DOS_FILE structure. Most internal functions now return a
DOS_FILE* instead of a Unix handle.
Added a local file array to replace the PDB list upon startup, to
allow using file I/O functions before the first task is created.
Added FILE_SetDateTime() and FILE_Sync() functions.
* [loader/module.c]
Use the DOS file I/O functions in MODULE_LoadExeHeader().
* [objects/bitblt.c]
Use visible region instead of GC clip region to clip source
area. This fixes the card drawing bug in freecell.
* [objects/region.c]
Fixed CombineRgn() to allow src and dest regions to be the same.
Fri Mar 8 16:32:23 1996 Frans van Dorsselaer <dorssel@rulhm1.leidenuniv.nl>
* [controls/EDIT.TODO]
Updated so it reflects the current status.
* [controls/edit.c]
Implemented internal EDIT_WordBreakProc().
Implemented ES_READONLY.
Implemented WM_LBUTTONDBLCLK to select whole words.
Fixed a lot of types in the function definitions.
Wed Mar 6 19:55:00 1996 Alex Korobka <alex@phm30.pharm.sunysb.edu>
* [debugger/info.c]
Added "walk window" command to walk window list.
* [windows/mdi.c]
Added proper(?) WM_MDISETMENU message handling.
Wed Mar 6 09:27:12 1996 Martin von Loewis <loewis@informatik.hu-berlin.de>
* [if1632/callback.c][if1632/relay32.c]
RELAY32_CallWindowProcConvStruct: new function.
* [win32/struct32.c][win32/Makefile.in][win32/param.c][win32/user32.c]
struct32.c: new file. Moved all structure conversions into that file
PARAM32_POINT32to16,MSG16to32,USER32_RECT32to16:
renamed to STRUCT32_POINT32to16, ...
WIN32_POINT,WIN32_MSG,WIN32_RECT,WIN32_PAINTSTRUCT: renamed to
POINT32, ...
New conversion functions for NCCALCSIZE_PARAMS, WINDOWPOS,
CREATESTRUCT.
* [include/windows.h][misc/exec.c]
WINHELP, MULTIKEYHELP, HELPWININFO: new structures
WinHelp: Reimplemented. Thanks to Peter Balch
(100710.2566@compuserve.com) for his valuable research.
* [win32/winprocs.c]
WIN32_CallWindowProcTo16: new function, call in
USER32_DefWindowProcA,...
Mon Mar 4 23:22:40 1996 Jim Peterson <jspeter@birch.ee.vt.edu>
* [include/wintypes.h]
Added "#define __export".
* [objects/bitblt.c]
Put in a few hacks to make bitblt-ing work when upside-down and/or
mirrored. BITBLT_StretchImage should really be checked over
thoroughly.
* [programs/progman/main.c]
Added "#include <resource.h>" for definition of HAVE_WINE_CONSTRUCTOR.
* [rc/parser.h] [rc/parser.l] [rc/parser.y] [rc/winerc.c]
Eliminated shift/reduce conflict in style definition.
Added crude error message support: "stdin:%d: parse error before '%s'".
Implemented string table support to the best of my ability (it works
with LoadString() calls).
* [windows/nonclient.c]
Fixed bug in NC_DoSizeMove() that made system menu pop up when title
bar of non-iconized window was clicked (checked for iconization).
Mon Mar 04 20:55:19 1996 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [if1632/lzexpand.spec] [if1632/relay.c]
[include/lzexpand.h][misc/lzexpand.c]
LZEXPAND.DLL added.
Sun Mar 03 18:10:22 1996 Albrecht Kleine <kleine@ak.sax.de>
* [windows/win.c]
Prevent usage of invalid HWNDs in WIN_EnumChildWin(),
this prevents too early termination of EnumChildWindows().
1996-03-09 17:12:43 +01:00
|
|
|
|
2002-11-22 23:16:53 +01:00
|
|
|
TRACE(" %p,%p -> %p mode=%x\n", hSrc1, hSrc2, hDest, mode );
|
Release 971101
Thu Oct 30 21:52:23 1997 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [windows/nonclient.c]
Changed NC_TrackSysMenu to give the same behaviour as MS-Windows,
i.e. system menu already appears when mouse button is depressed.
Changed NC_HandleNCLButtonDblClk so that double clicks on scroll
bar arrows are handled the same way as single clicks.
* [windows/winpos.c]
Fixed SetWindowPos32 to clear WIN_NO_REDRAW when SWP_SHOWWINDOW is
set; this is the way MS-Windows behaves.
Thu Oct 30 21:08:57 1997 Morten Welinder <terra@diku.dk>
* [controls/status.c]
In SW_SetText, fix condition, I hope.
* [controls/menu.c]
(GetMenuState32): Don't mask return value. Print more debug info.
(MENU_MenuBarCalcSize): Be more careful when printing debug
information.
(MENU_SetItemData): Empty strings are separators.
* [graphics/x11drv/text.c]
Don't prototype CLIPPING_IntersectClipRect.
* [include/dc.h]
Prototype CLIPPING_IntersectClipRect.
* [objects/font.c]
Remove non-portable (and faulty) smartness in FONT_TextMetric*to*.
In CreateFont32W and CreateFont16, handle null font name.
* [objects/text.c]
(TEXT_NextLine): Fix end-of-line bug.
* [if1632/shell32.spec]
Activate existing implementation of ExtractIconA.
* [misc/shell.c]
For Control_RunDLL, add types for parameters.
Thu Oct 30 14:54:11 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [controls/static.c] [include/windows.h] [misc/spy.c]
Added some win32 defines to static controls, basic SS_BITMAP style
handling implemented. [please add more, I am lacking knowledge and
time]
* [controls/status.c]
part_num 255 seems to indicate whole statusline (win95 cdplayer.exe)
* [if1632/thunk.c] [tools/build.c]
Support lret and 0x66 lret calls for CallTo16_regs
(needed for KERNEL32_45)
Fixed KERNEL32_45, QT_Thunk (should work now).
* [if1632/relay.c][if1632/builtin.c][tools/build.c][if1632/*32.spec]
Added string dumping to relay debugging for win32 apifuncs.
* [misc/ver.c]
Fixed and cleaned up VerQueryValue*.
* [multimedia/*.c][include/mmsystem.h][if1632/mmsystem.spec]
[if1632/winmm.spec]
Win32 support for lowlevel multimedia functions.
Added some mixer* lowlevel functions.
Some small fixes in the audio lowlevel queue handling, code
reformatting/cleanups.
* [debugger/hash.c]
Don't show difference between 16bit symbols if they are in
different segments.
* [objects/cursoricon.c]
Added GetIconInfo (partial) and CreateIconIndirect.
* [windows/mdi.c]
Fixed some "bad class" problems and crashes in MDICreateChild,
which happen in Win32 (jwp32.exe).
Wed Oct 29 00:57:27 1997 Bruce Milner <Bruce.Milner@genetics.utah.edu>
* [if1632/winaspi.spec] [misc/aspi.c] [include/aspi.c]
[documentation/aspi] [include/callback.h]
Added support for 16 bit ASPI calls to linux generic SCSI.
The support is not complete, but appears to run my Mustek
scanner from within ipplus.exe.
Mon Oct 27 00:59:41 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c]
DC reuse framework.
Sun Oct 26 18:41:21 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/x11drv/xfont.c]
Substituted fonts are removed from the alias table. References to
the old name are also updated.
* [controls/combo.c]
LB_SELECTSTRING32 not CB_SELECTSTRING32 should be sent to
ComboLBox.
Sun Oct 26 14:25:00 1997 Nikita V. Youshchenko <yoush@cs.msu.su>
* [include/drive.h] [files/drive.c] [msdos/int21.c]
Partially implemented DOS drive mapping (int21 AX=440F).
Sat Oct 25 13:03:29 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/debug.l]
Support '.' in identifiers. Use "x . y" to access structure
fields.
* [debugger/hash.c] [loader/pe_image.c]
Load entry points of Win32 modules only when entering the
debugger.
* [debugger/break.c]
New function DEBUG_AddModuleBreakpoint() to set a breakpoint at
the start of every module.
* [files/file.c]
FILE_mmap() can now fake mmap() for unaligned offsets or broken
filesystems.
* [include/callback.h] [misc/callback.c] [if1632/thunk.c]
Use a table of callbacks instead of macros to differentiate
between emulator and Winelib.
* [loader/task.c]
Initialize current directory from cwd, not from module path.
* [tools/build.c]
Read CallTo16 prototypes directly from thunk.c source file.
* [windows/winproc.c] [windows/mdi.c]
Added translation for WM_MDIACTIVATE and WM_MDIGETACTIVE.
Fri Oct 24 21:41:25 1997 Uwe Bonnes <bon@elektron.ikp.tu-darmstadt.de>
* [files/drive.c]
Allow arguments like "a" for the drive related apis.
* [memory/global.c]
Keep the calculation for dwMemoryLoad in range.
* [misc/crtdll.c]
Make CRTDLL_getcwd use GetCurrentDirectory32A and alloc
its memory if requested.
Implemented CRTDLL_rename and CRTDLL_stat needed for
lcc-win32:wedit.exe.
Implemented CRTDLL__fullpath.
* [misc/comm.c]
High speed modes for the 16-bit mode Comm functions.
* [misc/cpu.c]
As applications may treat lpMaximumApplicationAddress as long,
use a valid long number.
* [misc/main.c]
In SystemParametersInfo16 ignore SPI_GETHIGHCONTRAST too.
* [misc/ole2nls.c]
Implement LCMAP_UPPERCASE for LCMapString32.
* [misc/wsprintf]
Made WPRINTF_ParseFormatA understand %ws.
* [win32/file.c]
Ignore FILE_ATTRIBUTE_NORMAL.
Stub for ReadFileEx.
Fri Oct 24 15:36:02 1997 Doug Ridgway <ridgway@routh.ucsd.edu>
* [memory/local.c]
Local heap exhaustion message now prints which builtin heap filled.
Fri Oct 24 00:46:34 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [windows/dialog.c]
Reversed CreateFont16/32W typo.
Thu Oct 23 23:44:20 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [if1632/user.spec]
Fixed argument list for ChangeClipboardChain.
* [windows/mdi.c]
Pass correct hInstance to CreateWindow16() in MDICreateChild().
Mon Oct 20 11:51:24 1997 Carsten Fallesen <cf@it.dtu.dk>
* [objects/metafile.c]
Added support for META_SETTEXTCHAREXTRA.
* [objects/region.c]
Fixed crash in XPolygonRegion if there is only one point in
in the region.
* [if1632/gdi32.spec][include/gdi.h][include/windows.h]
[objects/gdiobj.c]
Completed OBJ_XXX defines in gdi.h, removed OBJ_XXX in gdiobj.c
and included gdi.h instead. Implemented GetObjectType32().
Thu Oct 16 17:21:32 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [documentation/wine.texinfo]
Fixed WIN32 and Makefiles entries of Reference manual node, that
made makeinfo dump core.
Mon Oct 13 17:15:57 1997 Robert Wilhelm <robert@physiol.med.tu-muenchen.de>
* [if1632/crtdll.spec]
Added missing math functions y0(), y1(), y2(), floor(), frexp(),
ldexp(), modf().
1997-11-01 20:08:16 +01:00
|
|
|
if (destObj)
|
1997-08-24 18:00:30 +02:00
|
|
|
{
|
2009-01-28 16:20:56 +01:00
|
|
|
RGNOBJ *src1Obj = GDI_GetObjPtr( hSrc1, OBJ_REGION );
|
1994-10-17 19:12:41 +01:00
|
|
|
|
Release 971101
Thu Oct 30 21:52:23 1997 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [windows/nonclient.c]
Changed NC_TrackSysMenu to give the same behaviour as MS-Windows,
i.e. system menu already appears when mouse button is depressed.
Changed NC_HandleNCLButtonDblClk so that double clicks on scroll
bar arrows are handled the same way as single clicks.
* [windows/winpos.c]
Fixed SetWindowPos32 to clear WIN_NO_REDRAW when SWP_SHOWWINDOW is
set; this is the way MS-Windows behaves.
Thu Oct 30 21:08:57 1997 Morten Welinder <terra@diku.dk>
* [controls/status.c]
In SW_SetText, fix condition, I hope.
* [controls/menu.c]
(GetMenuState32): Don't mask return value. Print more debug info.
(MENU_MenuBarCalcSize): Be more careful when printing debug
information.
(MENU_SetItemData): Empty strings are separators.
* [graphics/x11drv/text.c]
Don't prototype CLIPPING_IntersectClipRect.
* [include/dc.h]
Prototype CLIPPING_IntersectClipRect.
* [objects/font.c]
Remove non-portable (and faulty) smartness in FONT_TextMetric*to*.
In CreateFont32W and CreateFont16, handle null font name.
* [objects/text.c]
(TEXT_NextLine): Fix end-of-line bug.
* [if1632/shell32.spec]
Activate existing implementation of ExtractIconA.
* [misc/shell.c]
For Control_RunDLL, add types for parameters.
Thu Oct 30 14:54:11 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [controls/static.c] [include/windows.h] [misc/spy.c]
Added some win32 defines to static controls, basic SS_BITMAP style
handling implemented. [please add more, I am lacking knowledge and
time]
* [controls/status.c]
part_num 255 seems to indicate whole statusline (win95 cdplayer.exe)
* [if1632/thunk.c] [tools/build.c]
Support lret and 0x66 lret calls for CallTo16_regs
(needed for KERNEL32_45)
Fixed KERNEL32_45, QT_Thunk (should work now).
* [if1632/relay.c][if1632/builtin.c][tools/build.c][if1632/*32.spec]
Added string dumping to relay debugging for win32 apifuncs.
* [misc/ver.c]
Fixed and cleaned up VerQueryValue*.
* [multimedia/*.c][include/mmsystem.h][if1632/mmsystem.spec]
[if1632/winmm.spec]
Win32 support for lowlevel multimedia functions.
Added some mixer* lowlevel functions.
Some small fixes in the audio lowlevel queue handling, code
reformatting/cleanups.
* [debugger/hash.c]
Don't show difference between 16bit symbols if they are in
different segments.
* [objects/cursoricon.c]
Added GetIconInfo (partial) and CreateIconIndirect.
* [windows/mdi.c]
Fixed some "bad class" problems and crashes in MDICreateChild,
which happen in Win32 (jwp32.exe).
Wed Oct 29 00:57:27 1997 Bruce Milner <Bruce.Milner@genetics.utah.edu>
* [if1632/winaspi.spec] [misc/aspi.c] [include/aspi.c]
[documentation/aspi] [include/callback.h]
Added support for 16 bit ASPI calls to linux generic SCSI.
The support is not complete, but appears to run my Mustek
scanner from within ipplus.exe.
Mon Oct 27 00:59:41 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c]
DC reuse framework.
Sun Oct 26 18:41:21 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/x11drv/xfont.c]
Substituted fonts are removed from the alias table. References to
the old name are also updated.
* [controls/combo.c]
LB_SELECTSTRING32 not CB_SELECTSTRING32 should be sent to
ComboLBox.
Sun Oct 26 14:25:00 1997 Nikita V. Youshchenko <yoush@cs.msu.su>
* [include/drive.h] [files/drive.c] [msdos/int21.c]
Partially implemented DOS drive mapping (int21 AX=440F).
Sat Oct 25 13:03:29 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/debug.l]
Support '.' in identifiers. Use "x . y" to access structure
fields.
* [debugger/hash.c] [loader/pe_image.c]
Load entry points of Win32 modules only when entering the
debugger.
* [debugger/break.c]
New function DEBUG_AddModuleBreakpoint() to set a breakpoint at
the start of every module.
* [files/file.c]
FILE_mmap() can now fake mmap() for unaligned offsets or broken
filesystems.
* [include/callback.h] [misc/callback.c] [if1632/thunk.c]
Use a table of callbacks instead of macros to differentiate
between emulator and Winelib.
* [loader/task.c]
Initialize current directory from cwd, not from module path.
* [tools/build.c]
Read CallTo16 prototypes directly from thunk.c source file.
* [windows/winproc.c] [windows/mdi.c]
Added translation for WM_MDIACTIVATE and WM_MDIGETACTIVE.
Fri Oct 24 21:41:25 1997 Uwe Bonnes <bon@elektron.ikp.tu-darmstadt.de>
* [files/drive.c]
Allow arguments like "a" for the drive related apis.
* [memory/global.c]
Keep the calculation for dwMemoryLoad in range.
* [misc/crtdll.c]
Make CRTDLL_getcwd use GetCurrentDirectory32A and alloc
its memory if requested.
Implemented CRTDLL_rename and CRTDLL_stat needed for
lcc-win32:wedit.exe.
Implemented CRTDLL__fullpath.
* [misc/comm.c]
High speed modes for the 16-bit mode Comm functions.
* [misc/cpu.c]
As applications may treat lpMaximumApplicationAddress as long,
use a valid long number.
* [misc/main.c]
In SystemParametersInfo16 ignore SPI_GETHIGHCONTRAST too.
* [misc/ole2nls.c]
Implement LCMAP_UPPERCASE for LCMapString32.
* [misc/wsprintf]
Made WPRINTF_ParseFormatA understand %ws.
* [win32/file.c]
Ignore FILE_ATTRIBUTE_NORMAL.
Stub for ReadFileEx.
Fri Oct 24 15:36:02 1997 Doug Ridgway <ridgway@routh.ucsd.edu>
* [memory/local.c]
Local heap exhaustion message now prints which builtin heap filled.
Fri Oct 24 00:46:34 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [windows/dialog.c]
Reversed CreateFont16/32W typo.
Thu Oct 23 23:44:20 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [if1632/user.spec]
Fixed argument list for ChangeClipboardChain.
* [windows/mdi.c]
Pass correct hInstance to CreateWindow16() in MDICreateChild().
Mon Oct 20 11:51:24 1997 Carsten Fallesen <cf@it.dtu.dk>
* [objects/metafile.c]
Added support for META_SETTEXTCHAREXTRA.
* [objects/region.c]
Fixed crash in XPolygonRegion if there is only one point in
in the region.
* [if1632/gdi32.spec][include/gdi.h][include/windows.h]
[objects/gdiobj.c]
Completed OBJ_XXX defines in gdi.h, removed OBJ_XXX in gdiobj.c
and included gdi.h instead. Implemented GetObjectType32().
Thu Oct 16 17:21:32 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [documentation/wine.texinfo]
Fixed WIN32 and Makefiles entries of Reference manual node, that
made makeinfo dump core.
Mon Oct 13 17:15:57 1997 Robert Wilhelm <robert@physiol.med.tu-muenchen.de>
* [if1632/crtdll.spec]
Added missing math functions y0(), y1(), y2(), floor(), frexp(),
ldexp(), modf().
1997-11-01 20:08:16 +01:00
|
|
|
if (src1Obj)
|
|
|
|
{
|
2001-06-06 23:06:27 +02:00
|
|
|
TRACE("dump src1Obj:\n");
|
2002-06-01 01:06:46 +02:00
|
|
|
if(TRACE_ON(region))
|
2009-01-29 16:38:53 +01:00
|
|
|
REGION_DumpRegion(&src1Obj->rgn);
|
Release 971101
Thu Oct 30 21:52:23 1997 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [windows/nonclient.c]
Changed NC_TrackSysMenu to give the same behaviour as MS-Windows,
i.e. system menu already appears when mouse button is depressed.
Changed NC_HandleNCLButtonDblClk so that double clicks on scroll
bar arrows are handled the same way as single clicks.
* [windows/winpos.c]
Fixed SetWindowPos32 to clear WIN_NO_REDRAW when SWP_SHOWWINDOW is
set; this is the way MS-Windows behaves.
Thu Oct 30 21:08:57 1997 Morten Welinder <terra@diku.dk>
* [controls/status.c]
In SW_SetText, fix condition, I hope.
* [controls/menu.c]
(GetMenuState32): Don't mask return value. Print more debug info.
(MENU_MenuBarCalcSize): Be more careful when printing debug
information.
(MENU_SetItemData): Empty strings are separators.
* [graphics/x11drv/text.c]
Don't prototype CLIPPING_IntersectClipRect.
* [include/dc.h]
Prototype CLIPPING_IntersectClipRect.
* [objects/font.c]
Remove non-portable (and faulty) smartness in FONT_TextMetric*to*.
In CreateFont32W and CreateFont16, handle null font name.
* [objects/text.c]
(TEXT_NextLine): Fix end-of-line bug.
* [if1632/shell32.spec]
Activate existing implementation of ExtractIconA.
* [misc/shell.c]
For Control_RunDLL, add types for parameters.
Thu Oct 30 14:54:11 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [controls/static.c] [include/windows.h] [misc/spy.c]
Added some win32 defines to static controls, basic SS_BITMAP style
handling implemented. [please add more, I am lacking knowledge and
time]
* [controls/status.c]
part_num 255 seems to indicate whole statusline (win95 cdplayer.exe)
* [if1632/thunk.c] [tools/build.c]
Support lret and 0x66 lret calls for CallTo16_regs
(needed for KERNEL32_45)
Fixed KERNEL32_45, QT_Thunk (should work now).
* [if1632/relay.c][if1632/builtin.c][tools/build.c][if1632/*32.spec]
Added string dumping to relay debugging for win32 apifuncs.
* [misc/ver.c]
Fixed and cleaned up VerQueryValue*.
* [multimedia/*.c][include/mmsystem.h][if1632/mmsystem.spec]
[if1632/winmm.spec]
Win32 support for lowlevel multimedia functions.
Added some mixer* lowlevel functions.
Some small fixes in the audio lowlevel queue handling, code
reformatting/cleanups.
* [debugger/hash.c]
Don't show difference between 16bit symbols if they are in
different segments.
* [objects/cursoricon.c]
Added GetIconInfo (partial) and CreateIconIndirect.
* [windows/mdi.c]
Fixed some "bad class" problems and crashes in MDICreateChild,
which happen in Win32 (jwp32.exe).
Wed Oct 29 00:57:27 1997 Bruce Milner <Bruce.Milner@genetics.utah.edu>
* [if1632/winaspi.spec] [misc/aspi.c] [include/aspi.c]
[documentation/aspi] [include/callback.h]
Added support for 16 bit ASPI calls to linux generic SCSI.
The support is not complete, but appears to run my Mustek
scanner from within ipplus.exe.
Mon Oct 27 00:59:41 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c]
DC reuse framework.
Sun Oct 26 18:41:21 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/x11drv/xfont.c]
Substituted fonts are removed from the alias table. References to
the old name are also updated.
* [controls/combo.c]
LB_SELECTSTRING32 not CB_SELECTSTRING32 should be sent to
ComboLBox.
Sun Oct 26 14:25:00 1997 Nikita V. Youshchenko <yoush@cs.msu.su>
* [include/drive.h] [files/drive.c] [msdos/int21.c]
Partially implemented DOS drive mapping (int21 AX=440F).
Sat Oct 25 13:03:29 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/debug.l]
Support '.' in identifiers. Use "x . y" to access structure
fields.
* [debugger/hash.c] [loader/pe_image.c]
Load entry points of Win32 modules only when entering the
debugger.
* [debugger/break.c]
New function DEBUG_AddModuleBreakpoint() to set a breakpoint at
the start of every module.
* [files/file.c]
FILE_mmap() can now fake mmap() for unaligned offsets or broken
filesystems.
* [include/callback.h] [misc/callback.c] [if1632/thunk.c]
Use a table of callbacks instead of macros to differentiate
between emulator and Winelib.
* [loader/task.c]
Initialize current directory from cwd, not from module path.
* [tools/build.c]
Read CallTo16 prototypes directly from thunk.c source file.
* [windows/winproc.c] [windows/mdi.c]
Added translation for WM_MDIACTIVATE and WM_MDIGETACTIVE.
Fri Oct 24 21:41:25 1997 Uwe Bonnes <bon@elektron.ikp.tu-darmstadt.de>
* [files/drive.c]
Allow arguments like "a" for the drive related apis.
* [memory/global.c]
Keep the calculation for dwMemoryLoad in range.
* [misc/crtdll.c]
Make CRTDLL_getcwd use GetCurrentDirectory32A and alloc
its memory if requested.
Implemented CRTDLL_rename and CRTDLL_stat needed for
lcc-win32:wedit.exe.
Implemented CRTDLL__fullpath.
* [misc/comm.c]
High speed modes for the 16-bit mode Comm functions.
* [misc/cpu.c]
As applications may treat lpMaximumApplicationAddress as long,
use a valid long number.
* [misc/main.c]
In SystemParametersInfo16 ignore SPI_GETHIGHCONTRAST too.
* [misc/ole2nls.c]
Implement LCMAP_UPPERCASE for LCMapString32.
* [misc/wsprintf]
Made WPRINTF_ParseFormatA understand %ws.
* [win32/file.c]
Ignore FILE_ATTRIBUTE_NORMAL.
Stub for ReadFileEx.
Fri Oct 24 15:36:02 1997 Doug Ridgway <ridgway@routh.ucsd.edu>
* [memory/local.c]
Local heap exhaustion message now prints which builtin heap filled.
Fri Oct 24 00:46:34 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [windows/dialog.c]
Reversed CreateFont16/32W typo.
Thu Oct 23 23:44:20 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [if1632/user.spec]
Fixed argument list for ChangeClipboardChain.
* [windows/mdi.c]
Pass correct hInstance to CreateWindow16() in MDICreateChild().
Mon Oct 20 11:51:24 1997 Carsten Fallesen <cf@it.dtu.dk>
* [objects/metafile.c]
Added support for META_SETTEXTCHAREXTRA.
* [objects/region.c]
Fixed crash in XPolygonRegion if there is only one point in
in the region.
* [if1632/gdi32.spec][include/gdi.h][include/windows.h]
[objects/gdiobj.c]
Completed OBJ_XXX defines in gdi.h, removed OBJ_XXX in gdiobj.c
and included gdi.h instead. Implemented GetObjectType32().
Thu Oct 16 17:21:32 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [documentation/wine.texinfo]
Fixed WIN32 and Makefiles entries of Reference manual node, that
made makeinfo dump core.
Mon Oct 13 17:15:57 1997 Robert Wilhelm <robert@physiol.med.tu-muenchen.de>
* [if1632/crtdll.spec]
Added missing math functions y0(), y1(), y2(), floor(), frexp(),
ldexp(), modf().
1997-11-01 20:08:16 +01:00
|
|
|
if (mode == RGN_COPY)
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
2009-01-29 18:18:53 +01:00
|
|
|
if (REGION_CopyRegion( &destObj->rgn, &src1Obj->rgn ))
|
|
|
|
result = get_region_type( destObj );
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
Release 971101
Thu Oct 30 21:52:23 1997 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [windows/nonclient.c]
Changed NC_TrackSysMenu to give the same behaviour as MS-Windows,
i.e. system menu already appears when mouse button is depressed.
Changed NC_HandleNCLButtonDblClk so that double clicks on scroll
bar arrows are handled the same way as single clicks.
* [windows/winpos.c]
Fixed SetWindowPos32 to clear WIN_NO_REDRAW when SWP_SHOWWINDOW is
set; this is the way MS-Windows behaves.
Thu Oct 30 21:08:57 1997 Morten Welinder <terra@diku.dk>
* [controls/status.c]
In SW_SetText, fix condition, I hope.
* [controls/menu.c]
(GetMenuState32): Don't mask return value. Print more debug info.
(MENU_MenuBarCalcSize): Be more careful when printing debug
information.
(MENU_SetItemData): Empty strings are separators.
* [graphics/x11drv/text.c]
Don't prototype CLIPPING_IntersectClipRect.
* [include/dc.h]
Prototype CLIPPING_IntersectClipRect.
* [objects/font.c]
Remove non-portable (and faulty) smartness in FONT_TextMetric*to*.
In CreateFont32W and CreateFont16, handle null font name.
* [objects/text.c]
(TEXT_NextLine): Fix end-of-line bug.
* [if1632/shell32.spec]
Activate existing implementation of ExtractIconA.
* [misc/shell.c]
For Control_RunDLL, add types for parameters.
Thu Oct 30 14:54:11 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [controls/static.c] [include/windows.h] [misc/spy.c]
Added some win32 defines to static controls, basic SS_BITMAP style
handling implemented. [please add more, I am lacking knowledge and
time]
* [controls/status.c]
part_num 255 seems to indicate whole statusline (win95 cdplayer.exe)
* [if1632/thunk.c] [tools/build.c]
Support lret and 0x66 lret calls for CallTo16_regs
(needed for KERNEL32_45)
Fixed KERNEL32_45, QT_Thunk (should work now).
* [if1632/relay.c][if1632/builtin.c][tools/build.c][if1632/*32.spec]
Added string dumping to relay debugging for win32 apifuncs.
* [misc/ver.c]
Fixed and cleaned up VerQueryValue*.
* [multimedia/*.c][include/mmsystem.h][if1632/mmsystem.spec]
[if1632/winmm.spec]
Win32 support for lowlevel multimedia functions.
Added some mixer* lowlevel functions.
Some small fixes in the audio lowlevel queue handling, code
reformatting/cleanups.
* [debugger/hash.c]
Don't show difference between 16bit symbols if they are in
different segments.
* [objects/cursoricon.c]
Added GetIconInfo (partial) and CreateIconIndirect.
* [windows/mdi.c]
Fixed some "bad class" problems and crashes in MDICreateChild,
which happen in Win32 (jwp32.exe).
Wed Oct 29 00:57:27 1997 Bruce Milner <Bruce.Milner@genetics.utah.edu>
* [if1632/winaspi.spec] [misc/aspi.c] [include/aspi.c]
[documentation/aspi] [include/callback.h]
Added support for 16 bit ASPI calls to linux generic SCSI.
The support is not complete, but appears to run my Mustek
scanner from within ipplus.exe.
Mon Oct 27 00:59:41 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c]
DC reuse framework.
Sun Oct 26 18:41:21 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/x11drv/xfont.c]
Substituted fonts are removed from the alias table. References to
the old name are also updated.
* [controls/combo.c]
LB_SELECTSTRING32 not CB_SELECTSTRING32 should be sent to
ComboLBox.
Sun Oct 26 14:25:00 1997 Nikita V. Youshchenko <yoush@cs.msu.su>
* [include/drive.h] [files/drive.c] [msdos/int21.c]
Partially implemented DOS drive mapping (int21 AX=440F).
Sat Oct 25 13:03:29 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/debug.l]
Support '.' in identifiers. Use "x . y" to access structure
fields.
* [debugger/hash.c] [loader/pe_image.c]
Load entry points of Win32 modules only when entering the
debugger.
* [debugger/break.c]
New function DEBUG_AddModuleBreakpoint() to set a breakpoint at
the start of every module.
* [files/file.c]
FILE_mmap() can now fake mmap() for unaligned offsets or broken
filesystems.
* [include/callback.h] [misc/callback.c] [if1632/thunk.c]
Use a table of callbacks instead of macros to differentiate
between emulator and Winelib.
* [loader/task.c]
Initialize current directory from cwd, not from module path.
* [tools/build.c]
Read CallTo16 prototypes directly from thunk.c source file.
* [windows/winproc.c] [windows/mdi.c]
Added translation for WM_MDIACTIVATE and WM_MDIGETACTIVE.
Fri Oct 24 21:41:25 1997 Uwe Bonnes <bon@elektron.ikp.tu-darmstadt.de>
* [files/drive.c]
Allow arguments like "a" for the drive related apis.
* [memory/global.c]
Keep the calculation for dwMemoryLoad in range.
* [misc/crtdll.c]
Make CRTDLL_getcwd use GetCurrentDirectory32A and alloc
its memory if requested.
Implemented CRTDLL_rename and CRTDLL_stat needed for
lcc-win32:wedit.exe.
Implemented CRTDLL__fullpath.
* [misc/comm.c]
High speed modes for the 16-bit mode Comm functions.
* [misc/cpu.c]
As applications may treat lpMaximumApplicationAddress as long,
use a valid long number.
* [misc/main.c]
In SystemParametersInfo16 ignore SPI_GETHIGHCONTRAST too.
* [misc/ole2nls.c]
Implement LCMAP_UPPERCASE for LCMapString32.
* [misc/wsprintf]
Made WPRINTF_ParseFormatA understand %ws.
* [win32/file.c]
Ignore FILE_ATTRIBUTE_NORMAL.
Stub for ReadFileEx.
Fri Oct 24 15:36:02 1997 Doug Ridgway <ridgway@routh.ucsd.edu>
* [memory/local.c]
Local heap exhaustion message now prints which builtin heap filled.
Fri Oct 24 00:46:34 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [windows/dialog.c]
Reversed CreateFont16/32W typo.
Thu Oct 23 23:44:20 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [if1632/user.spec]
Fixed argument list for ChangeClipboardChain.
* [windows/mdi.c]
Pass correct hInstance to CreateWindow16() in MDICreateChild().
Mon Oct 20 11:51:24 1997 Carsten Fallesen <cf@it.dtu.dk>
* [objects/metafile.c]
Added support for META_SETTEXTCHAREXTRA.
* [objects/region.c]
Fixed crash in XPolygonRegion if there is only one point in
in the region.
* [if1632/gdi32.spec][include/gdi.h][include/windows.h]
[objects/gdiobj.c]
Completed OBJ_XXX defines in gdi.h, removed OBJ_XXX in gdiobj.c
and included gdi.h instead. Implemented GetObjectType32().
Thu Oct 16 17:21:32 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [documentation/wine.texinfo]
Fixed WIN32 and Makefiles entries of Reference manual node, that
made makeinfo dump core.
Mon Oct 13 17:15:57 1997 Robert Wilhelm <robert@physiol.med.tu-muenchen.de>
* [if1632/crtdll.spec]
Added missing math functions y0(), y1(), y2(), floor(), frexp(),
ldexp(), modf().
1997-11-01 20:08:16 +01:00
|
|
|
else
|
1997-08-24 18:00:30 +02:00
|
|
|
{
|
2009-01-28 16:20:56 +01:00
|
|
|
RGNOBJ *src2Obj = GDI_GetObjPtr( hSrc2, OBJ_REGION );
|
Release 971101
Thu Oct 30 21:52:23 1997 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [windows/nonclient.c]
Changed NC_TrackSysMenu to give the same behaviour as MS-Windows,
i.e. system menu already appears when mouse button is depressed.
Changed NC_HandleNCLButtonDblClk so that double clicks on scroll
bar arrows are handled the same way as single clicks.
* [windows/winpos.c]
Fixed SetWindowPos32 to clear WIN_NO_REDRAW when SWP_SHOWWINDOW is
set; this is the way MS-Windows behaves.
Thu Oct 30 21:08:57 1997 Morten Welinder <terra@diku.dk>
* [controls/status.c]
In SW_SetText, fix condition, I hope.
* [controls/menu.c]
(GetMenuState32): Don't mask return value. Print more debug info.
(MENU_MenuBarCalcSize): Be more careful when printing debug
information.
(MENU_SetItemData): Empty strings are separators.
* [graphics/x11drv/text.c]
Don't prototype CLIPPING_IntersectClipRect.
* [include/dc.h]
Prototype CLIPPING_IntersectClipRect.
* [objects/font.c]
Remove non-portable (and faulty) smartness in FONT_TextMetric*to*.
In CreateFont32W and CreateFont16, handle null font name.
* [objects/text.c]
(TEXT_NextLine): Fix end-of-line bug.
* [if1632/shell32.spec]
Activate existing implementation of ExtractIconA.
* [misc/shell.c]
For Control_RunDLL, add types for parameters.
Thu Oct 30 14:54:11 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [controls/static.c] [include/windows.h] [misc/spy.c]
Added some win32 defines to static controls, basic SS_BITMAP style
handling implemented. [please add more, I am lacking knowledge and
time]
* [controls/status.c]
part_num 255 seems to indicate whole statusline (win95 cdplayer.exe)
* [if1632/thunk.c] [tools/build.c]
Support lret and 0x66 lret calls for CallTo16_regs
(needed for KERNEL32_45)
Fixed KERNEL32_45, QT_Thunk (should work now).
* [if1632/relay.c][if1632/builtin.c][tools/build.c][if1632/*32.spec]
Added string dumping to relay debugging for win32 apifuncs.
* [misc/ver.c]
Fixed and cleaned up VerQueryValue*.
* [multimedia/*.c][include/mmsystem.h][if1632/mmsystem.spec]
[if1632/winmm.spec]
Win32 support for lowlevel multimedia functions.
Added some mixer* lowlevel functions.
Some small fixes in the audio lowlevel queue handling, code
reformatting/cleanups.
* [debugger/hash.c]
Don't show difference between 16bit symbols if they are in
different segments.
* [objects/cursoricon.c]
Added GetIconInfo (partial) and CreateIconIndirect.
* [windows/mdi.c]
Fixed some "bad class" problems and crashes in MDICreateChild,
which happen in Win32 (jwp32.exe).
Wed Oct 29 00:57:27 1997 Bruce Milner <Bruce.Milner@genetics.utah.edu>
* [if1632/winaspi.spec] [misc/aspi.c] [include/aspi.c]
[documentation/aspi] [include/callback.h]
Added support for 16 bit ASPI calls to linux generic SCSI.
The support is not complete, but appears to run my Mustek
scanner from within ipplus.exe.
Mon Oct 27 00:59:41 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c]
DC reuse framework.
Sun Oct 26 18:41:21 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/x11drv/xfont.c]
Substituted fonts are removed from the alias table. References to
the old name are also updated.
* [controls/combo.c]
LB_SELECTSTRING32 not CB_SELECTSTRING32 should be sent to
ComboLBox.
Sun Oct 26 14:25:00 1997 Nikita V. Youshchenko <yoush@cs.msu.su>
* [include/drive.h] [files/drive.c] [msdos/int21.c]
Partially implemented DOS drive mapping (int21 AX=440F).
Sat Oct 25 13:03:29 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/debug.l]
Support '.' in identifiers. Use "x . y" to access structure
fields.
* [debugger/hash.c] [loader/pe_image.c]
Load entry points of Win32 modules only when entering the
debugger.
* [debugger/break.c]
New function DEBUG_AddModuleBreakpoint() to set a breakpoint at
the start of every module.
* [files/file.c]
FILE_mmap() can now fake mmap() for unaligned offsets or broken
filesystems.
* [include/callback.h] [misc/callback.c] [if1632/thunk.c]
Use a table of callbacks instead of macros to differentiate
between emulator and Winelib.
* [loader/task.c]
Initialize current directory from cwd, not from module path.
* [tools/build.c]
Read CallTo16 prototypes directly from thunk.c source file.
* [windows/winproc.c] [windows/mdi.c]
Added translation for WM_MDIACTIVATE and WM_MDIGETACTIVE.
Fri Oct 24 21:41:25 1997 Uwe Bonnes <bon@elektron.ikp.tu-darmstadt.de>
* [files/drive.c]
Allow arguments like "a" for the drive related apis.
* [memory/global.c]
Keep the calculation for dwMemoryLoad in range.
* [misc/crtdll.c]
Make CRTDLL_getcwd use GetCurrentDirectory32A and alloc
its memory if requested.
Implemented CRTDLL_rename and CRTDLL_stat needed for
lcc-win32:wedit.exe.
Implemented CRTDLL__fullpath.
* [misc/comm.c]
High speed modes for the 16-bit mode Comm functions.
* [misc/cpu.c]
As applications may treat lpMaximumApplicationAddress as long,
use a valid long number.
* [misc/main.c]
In SystemParametersInfo16 ignore SPI_GETHIGHCONTRAST too.
* [misc/ole2nls.c]
Implement LCMAP_UPPERCASE for LCMapString32.
* [misc/wsprintf]
Made WPRINTF_ParseFormatA understand %ws.
* [win32/file.c]
Ignore FILE_ATTRIBUTE_NORMAL.
Stub for ReadFileEx.
Fri Oct 24 15:36:02 1997 Doug Ridgway <ridgway@routh.ucsd.edu>
* [memory/local.c]
Local heap exhaustion message now prints which builtin heap filled.
Fri Oct 24 00:46:34 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [windows/dialog.c]
Reversed CreateFont16/32W typo.
Thu Oct 23 23:44:20 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [if1632/user.spec]
Fixed argument list for ChangeClipboardChain.
* [windows/mdi.c]
Pass correct hInstance to CreateWindow16() in MDICreateChild().
Mon Oct 20 11:51:24 1997 Carsten Fallesen <cf@it.dtu.dk>
* [objects/metafile.c]
Added support for META_SETTEXTCHAREXTRA.
* [objects/region.c]
Fixed crash in XPolygonRegion if there is only one point in
in the region.
* [if1632/gdi32.spec][include/gdi.h][include/windows.h]
[objects/gdiobj.c]
Completed OBJ_XXX defines in gdi.h, removed OBJ_XXX in gdiobj.c
and included gdi.h instead. Implemented GetObjectType32().
Thu Oct 16 17:21:32 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [documentation/wine.texinfo]
Fixed WIN32 and Makefiles entries of Reference manual node, that
made makeinfo dump core.
Mon Oct 13 17:15:57 1997 Robert Wilhelm <robert@physiol.med.tu-muenchen.de>
* [if1632/crtdll.spec]
Added missing math functions y0(), y1(), y2(), floor(), frexp(),
ldexp(), modf().
1997-11-01 20:08:16 +01:00
|
|
|
|
|
|
|
if (src2Obj)
|
|
|
|
{
|
2001-06-06 23:06:27 +02:00
|
|
|
TRACE("dump src2Obj:\n");
|
2002-06-01 01:06:46 +02:00
|
|
|
if(TRACE_ON(region))
|
2009-01-29 16:38:53 +01:00
|
|
|
REGION_DumpRegion(&src2Obj->rgn);
|
1998-01-18 19:01:49 +01:00
|
|
|
switch (mode)
|
Release 971101
Thu Oct 30 21:52:23 1997 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [windows/nonclient.c]
Changed NC_TrackSysMenu to give the same behaviour as MS-Windows,
i.e. system menu already appears when mouse button is depressed.
Changed NC_HandleNCLButtonDblClk so that double clicks on scroll
bar arrows are handled the same way as single clicks.
* [windows/winpos.c]
Fixed SetWindowPos32 to clear WIN_NO_REDRAW when SWP_SHOWWINDOW is
set; this is the way MS-Windows behaves.
Thu Oct 30 21:08:57 1997 Morten Welinder <terra@diku.dk>
* [controls/status.c]
In SW_SetText, fix condition, I hope.
* [controls/menu.c]
(GetMenuState32): Don't mask return value. Print more debug info.
(MENU_MenuBarCalcSize): Be more careful when printing debug
information.
(MENU_SetItemData): Empty strings are separators.
* [graphics/x11drv/text.c]
Don't prototype CLIPPING_IntersectClipRect.
* [include/dc.h]
Prototype CLIPPING_IntersectClipRect.
* [objects/font.c]
Remove non-portable (and faulty) smartness in FONT_TextMetric*to*.
In CreateFont32W and CreateFont16, handle null font name.
* [objects/text.c]
(TEXT_NextLine): Fix end-of-line bug.
* [if1632/shell32.spec]
Activate existing implementation of ExtractIconA.
* [misc/shell.c]
For Control_RunDLL, add types for parameters.
Thu Oct 30 14:54:11 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [controls/static.c] [include/windows.h] [misc/spy.c]
Added some win32 defines to static controls, basic SS_BITMAP style
handling implemented. [please add more, I am lacking knowledge and
time]
* [controls/status.c]
part_num 255 seems to indicate whole statusline (win95 cdplayer.exe)
* [if1632/thunk.c] [tools/build.c]
Support lret and 0x66 lret calls for CallTo16_regs
(needed for KERNEL32_45)
Fixed KERNEL32_45, QT_Thunk (should work now).
* [if1632/relay.c][if1632/builtin.c][tools/build.c][if1632/*32.spec]
Added string dumping to relay debugging for win32 apifuncs.
* [misc/ver.c]
Fixed and cleaned up VerQueryValue*.
* [multimedia/*.c][include/mmsystem.h][if1632/mmsystem.spec]
[if1632/winmm.spec]
Win32 support for lowlevel multimedia functions.
Added some mixer* lowlevel functions.
Some small fixes in the audio lowlevel queue handling, code
reformatting/cleanups.
* [debugger/hash.c]
Don't show difference between 16bit symbols if they are in
different segments.
* [objects/cursoricon.c]
Added GetIconInfo (partial) and CreateIconIndirect.
* [windows/mdi.c]
Fixed some "bad class" problems and crashes in MDICreateChild,
which happen in Win32 (jwp32.exe).
Wed Oct 29 00:57:27 1997 Bruce Milner <Bruce.Milner@genetics.utah.edu>
* [if1632/winaspi.spec] [misc/aspi.c] [include/aspi.c]
[documentation/aspi] [include/callback.h]
Added support for 16 bit ASPI calls to linux generic SCSI.
The support is not complete, but appears to run my Mustek
scanner from within ipplus.exe.
Mon Oct 27 00:59:41 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c]
DC reuse framework.
Sun Oct 26 18:41:21 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/x11drv/xfont.c]
Substituted fonts are removed from the alias table. References to
the old name are also updated.
* [controls/combo.c]
LB_SELECTSTRING32 not CB_SELECTSTRING32 should be sent to
ComboLBox.
Sun Oct 26 14:25:00 1997 Nikita V. Youshchenko <yoush@cs.msu.su>
* [include/drive.h] [files/drive.c] [msdos/int21.c]
Partially implemented DOS drive mapping (int21 AX=440F).
Sat Oct 25 13:03:29 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/debug.l]
Support '.' in identifiers. Use "x . y" to access structure
fields.
* [debugger/hash.c] [loader/pe_image.c]
Load entry points of Win32 modules only when entering the
debugger.
* [debugger/break.c]
New function DEBUG_AddModuleBreakpoint() to set a breakpoint at
the start of every module.
* [files/file.c]
FILE_mmap() can now fake mmap() for unaligned offsets or broken
filesystems.
* [include/callback.h] [misc/callback.c] [if1632/thunk.c]
Use a table of callbacks instead of macros to differentiate
between emulator and Winelib.
* [loader/task.c]
Initialize current directory from cwd, not from module path.
* [tools/build.c]
Read CallTo16 prototypes directly from thunk.c source file.
* [windows/winproc.c] [windows/mdi.c]
Added translation for WM_MDIACTIVATE and WM_MDIGETACTIVE.
Fri Oct 24 21:41:25 1997 Uwe Bonnes <bon@elektron.ikp.tu-darmstadt.de>
* [files/drive.c]
Allow arguments like "a" for the drive related apis.
* [memory/global.c]
Keep the calculation for dwMemoryLoad in range.
* [misc/crtdll.c]
Make CRTDLL_getcwd use GetCurrentDirectory32A and alloc
its memory if requested.
Implemented CRTDLL_rename and CRTDLL_stat needed for
lcc-win32:wedit.exe.
Implemented CRTDLL__fullpath.
* [misc/comm.c]
High speed modes for the 16-bit mode Comm functions.
* [misc/cpu.c]
As applications may treat lpMaximumApplicationAddress as long,
use a valid long number.
* [misc/main.c]
In SystemParametersInfo16 ignore SPI_GETHIGHCONTRAST too.
* [misc/ole2nls.c]
Implement LCMAP_UPPERCASE for LCMapString32.
* [misc/wsprintf]
Made WPRINTF_ParseFormatA understand %ws.
* [win32/file.c]
Ignore FILE_ATTRIBUTE_NORMAL.
Stub for ReadFileEx.
Fri Oct 24 15:36:02 1997 Doug Ridgway <ridgway@routh.ucsd.edu>
* [memory/local.c]
Local heap exhaustion message now prints which builtin heap filled.
Fri Oct 24 00:46:34 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [windows/dialog.c]
Reversed CreateFont16/32W typo.
Thu Oct 23 23:44:20 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [if1632/user.spec]
Fixed argument list for ChangeClipboardChain.
* [windows/mdi.c]
Pass correct hInstance to CreateWindow16() in MDICreateChild().
Mon Oct 20 11:51:24 1997 Carsten Fallesen <cf@it.dtu.dk>
* [objects/metafile.c]
Added support for META_SETTEXTCHAREXTRA.
* [objects/region.c]
Fixed crash in XPolygonRegion if there is only one point in
in the region.
* [if1632/gdi32.spec][include/gdi.h][include/windows.h]
[objects/gdiobj.c]
Completed OBJ_XXX defines in gdi.h, removed OBJ_XXX in gdiobj.c
and included gdi.h instead. Implemented GetObjectType32().
Thu Oct 16 17:21:32 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [documentation/wine.texinfo]
Fixed WIN32 and Makefiles entries of Reference manual node, that
made makeinfo dump core.
Mon Oct 13 17:15:57 1997 Robert Wilhelm <robert@physiol.med.tu-muenchen.de>
* [if1632/crtdll.spec]
Added missing math functions y0(), y1(), y2(), floor(), frexp(),
ldexp(), modf().
1997-11-01 20:08:16 +01:00
|
|
|
{
|
1998-01-18 19:01:49 +01:00
|
|
|
case RGN_AND:
|
2009-01-29 18:18:53 +01:00
|
|
|
if (REGION_IntersectRegion( &destObj->rgn, &src1Obj->rgn, &src2Obj->rgn ))
|
|
|
|
result = get_region_type( destObj );
|
1998-01-18 19:01:49 +01:00
|
|
|
break;
|
|
|
|
case RGN_OR:
|
2009-01-29 18:18:53 +01:00
|
|
|
if (REGION_UnionRegion( &destObj->rgn, &src1Obj->rgn, &src2Obj->rgn ))
|
|
|
|
result = get_region_type( destObj );
|
1998-01-18 19:01:49 +01:00
|
|
|
break;
|
|
|
|
case RGN_XOR:
|
2009-01-29 18:18:53 +01:00
|
|
|
if (REGION_XorRegion( &destObj->rgn, &src1Obj->rgn, &src2Obj->rgn ))
|
|
|
|
result = get_region_type( destObj );
|
1998-01-18 19:01:49 +01:00
|
|
|
break;
|
|
|
|
case RGN_DIFF:
|
2009-01-29 18:18:53 +01:00
|
|
|
if (REGION_SubtractRegion( &destObj->rgn, &src1Obj->rgn, &src2Obj->rgn ))
|
|
|
|
result = get_region_type( destObj );
|
1998-01-18 19:01:49 +01:00
|
|
|
break;
|
Release 971101
Thu Oct 30 21:52:23 1997 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [windows/nonclient.c]
Changed NC_TrackSysMenu to give the same behaviour as MS-Windows,
i.e. system menu already appears when mouse button is depressed.
Changed NC_HandleNCLButtonDblClk so that double clicks on scroll
bar arrows are handled the same way as single clicks.
* [windows/winpos.c]
Fixed SetWindowPos32 to clear WIN_NO_REDRAW when SWP_SHOWWINDOW is
set; this is the way MS-Windows behaves.
Thu Oct 30 21:08:57 1997 Morten Welinder <terra@diku.dk>
* [controls/status.c]
In SW_SetText, fix condition, I hope.
* [controls/menu.c]
(GetMenuState32): Don't mask return value. Print more debug info.
(MENU_MenuBarCalcSize): Be more careful when printing debug
information.
(MENU_SetItemData): Empty strings are separators.
* [graphics/x11drv/text.c]
Don't prototype CLIPPING_IntersectClipRect.
* [include/dc.h]
Prototype CLIPPING_IntersectClipRect.
* [objects/font.c]
Remove non-portable (and faulty) smartness in FONT_TextMetric*to*.
In CreateFont32W and CreateFont16, handle null font name.
* [objects/text.c]
(TEXT_NextLine): Fix end-of-line bug.
* [if1632/shell32.spec]
Activate existing implementation of ExtractIconA.
* [misc/shell.c]
For Control_RunDLL, add types for parameters.
Thu Oct 30 14:54:11 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [controls/static.c] [include/windows.h] [misc/spy.c]
Added some win32 defines to static controls, basic SS_BITMAP style
handling implemented. [please add more, I am lacking knowledge and
time]
* [controls/status.c]
part_num 255 seems to indicate whole statusline (win95 cdplayer.exe)
* [if1632/thunk.c] [tools/build.c]
Support lret and 0x66 lret calls for CallTo16_regs
(needed for KERNEL32_45)
Fixed KERNEL32_45, QT_Thunk (should work now).
* [if1632/relay.c][if1632/builtin.c][tools/build.c][if1632/*32.spec]
Added string dumping to relay debugging for win32 apifuncs.
* [misc/ver.c]
Fixed and cleaned up VerQueryValue*.
* [multimedia/*.c][include/mmsystem.h][if1632/mmsystem.spec]
[if1632/winmm.spec]
Win32 support for lowlevel multimedia functions.
Added some mixer* lowlevel functions.
Some small fixes in the audio lowlevel queue handling, code
reformatting/cleanups.
* [debugger/hash.c]
Don't show difference between 16bit symbols if they are in
different segments.
* [objects/cursoricon.c]
Added GetIconInfo (partial) and CreateIconIndirect.
* [windows/mdi.c]
Fixed some "bad class" problems and crashes in MDICreateChild,
which happen in Win32 (jwp32.exe).
Wed Oct 29 00:57:27 1997 Bruce Milner <Bruce.Milner@genetics.utah.edu>
* [if1632/winaspi.spec] [misc/aspi.c] [include/aspi.c]
[documentation/aspi] [include/callback.h]
Added support for 16 bit ASPI calls to linux generic SCSI.
The support is not complete, but appears to run my Mustek
scanner from within ipplus.exe.
Mon Oct 27 00:59:41 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c]
DC reuse framework.
Sun Oct 26 18:41:21 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/x11drv/xfont.c]
Substituted fonts are removed from the alias table. References to
the old name are also updated.
* [controls/combo.c]
LB_SELECTSTRING32 not CB_SELECTSTRING32 should be sent to
ComboLBox.
Sun Oct 26 14:25:00 1997 Nikita V. Youshchenko <yoush@cs.msu.su>
* [include/drive.h] [files/drive.c] [msdos/int21.c]
Partially implemented DOS drive mapping (int21 AX=440F).
Sat Oct 25 13:03:29 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/debug.l]
Support '.' in identifiers. Use "x . y" to access structure
fields.
* [debugger/hash.c] [loader/pe_image.c]
Load entry points of Win32 modules only when entering the
debugger.
* [debugger/break.c]
New function DEBUG_AddModuleBreakpoint() to set a breakpoint at
the start of every module.
* [files/file.c]
FILE_mmap() can now fake mmap() for unaligned offsets or broken
filesystems.
* [include/callback.h] [misc/callback.c] [if1632/thunk.c]
Use a table of callbacks instead of macros to differentiate
between emulator and Winelib.
* [loader/task.c]
Initialize current directory from cwd, not from module path.
* [tools/build.c]
Read CallTo16 prototypes directly from thunk.c source file.
* [windows/winproc.c] [windows/mdi.c]
Added translation for WM_MDIACTIVATE and WM_MDIGETACTIVE.
Fri Oct 24 21:41:25 1997 Uwe Bonnes <bon@elektron.ikp.tu-darmstadt.de>
* [files/drive.c]
Allow arguments like "a" for the drive related apis.
* [memory/global.c]
Keep the calculation for dwMemoryLoad in range.
* [misc/crtdll.c]
Make CRTDLL_getcwd use GetCurrentDirectory32A and alloc
its memory if requested.
Implemented CRTDLL_rename and CRTDLL_stat needed for
lcc-win32:wedit.exe.
Implemented CRTDLL__fullpath.
* [misc/comm.c]
High speed modes for the 16-bit mode Comm functions.
* [misc/cpu.c]
As applications may treat lpMaximumApplicationAddress as long,
use a valid long number.
* [misc/main.c]
In SystemParametersInfo16 ignore SPI_GETHIGHCONTRAST too.
* [misc/ole2nls.c]
Implement LCMAP_UPPERCASE for LCMapString32.
* [misc/wsprintf]
Made WPRINTF_ParseFormatA understand %ws.
* [win32/file.c]
Ignore FILE_ATTRIBUTE_NORMAL.
Stub for ReadFileEx.
Fri Oct 24 15:36:02 1997 Doug Ridgway <ridgway@routh.ucsd.edu>
* [memory/local.c]
Local heap exhaustion message now prints which builtin heap filled.
Fri Oct 24 00:46:34 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [windows/dialog.c]
Reversed CreateFont16/32W typo.
Thu Oct 23 23:44:20 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [if1632/user.spec]
Fixed argument list for ChangeClipboardChain.
* [windows/mdi.c]
Pass correct hInstance to CreateWindow16() in MDICreateChild().
Mon Oct 20 11:51:24 1997 Carsten Fallesen <cf@it.dtu.dk>
* [objects/metafile.c]
Added support for META_SETTEXTCHAREXTRA.
* [objects/region.c]
Fixed crash in XPolygonRegion if there is only one point in
in the region.
* [if1632/gdi32.spec][include/gdi.h][include/windows.h]
[objects/gdiobj.c]
Completed OBJ_XXX defines in gdi.h, removed OBJ_XXX in gdiobj.c
and included gdi.h instead. Implemented GetObjectType32().
Thu Oct 16 17:21:32 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [documentation/wine.texinfo]
Fixed WIN32 and Makefiles entries of Reference manual node, that
made makeinfo dump core.
Mon Oct 13 17:15:57 1997 Robert Wilhelm <robert@physiol.med.tu-muenchen.de>
* [if1632/crtdll.spec]
Added missing math functions y0(), y1(), y2(), floor(), frexp(),
ldexp(), modf().
1997-11-01 20:08:16 +01:00
|
|
|
}
|
2000-08-19 23:38:55 +02:00
|
|
|
GDI_ReleaseObj( hSrc2 );
|
Release 971101
Thu Oct 30 21:52:23 1997 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [windows/nonclient.c]
Changed NC_TrackSysMenu to give the same behaviour as MS-Windows,
i.e. system menu already appears when mouse button is depressed.
Changed NC_HandleNCLButtonDblClk so that double clicks on scroll
bar arrows are handled the same way as single clicks.
* [windows/winpos.c]
Fixed SetWindowPos32 to clear WIN_NO_REDRAW when SWP_SHOWWINDOW is
set; this is the way MS-Windows behaves.
Thu Oct 30 21:08:57 1997 Morten Welinder <terra@diku.dk>
* [controls/status.c]
In SW_SetText, fix condition, I hope.
* [controls/menu.c]
(GetMenuState32): Don't mask return value. Print more debug info.
(MENU_MenuBarCalcSize): Be more careful when printing debug
information.
(MENU_SetItemData): Empty strings are separators.
* [graphics/x11drv/text.c]
Don't prototype CLIPPING_IntersectClipRect.
* [include/dc.h]
Prototype CLIPPING_IntersectClipRect.
* [objects/font.c]
Remove non-portable (and faulty) smartness in FONT_TextMetric*to*.
In CreateFont32W and CreateFont16, handle null font name.
* [objects/text.c]
(TEXT_NextLine): Fix end-of-line bug.
* [if1632/shell32.spec]
Activate existing implementation of ExtractIconA.
* [misc/shell.c]
For Control_RunDLL, add types for parameters.
Thu Oct 30 14:54:11 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [controls/static.c] [include/windows.h] [misc/spy.c]
Added some win32 defines to static controls, basic SS_BITMAP style
handling implemented. [please add more, I am lacking knowledge and
time]
* [controls/status.c]
part_num 255 seems to indicate whole statusline (win95 cdplayer.exe)
* [if1632/thunk.c] [tools/build.c]
Support lret and 0x66 lret calls for CallTo16_regs
(needed for KERNEL32_45)
Fixed KERNEL32_45, QT_Thunk (should work now).
* [if1632/relay.c][if1632/builtin.c][tools/build.c][if1632/*32.spec]
Added string dumping to relay debugging for win32 apifuncs.
* [misc/ver.c]
Fixed and cleaned up VerQueryValue*.
* [multimedia/*.c][include/mmsystem.h][if1632/mmsystem.spec]
[if1632/winmm.spec]
Win32 support for lowlevel multimedia functions.
Added some mixer* lowlevel functions.
Some small fixes in the audio lowlevel queue handling, code
reformatting/cleanups.
* [debugger/hash.c]
Don't show difference between 16bit symbols if they are in
different segments.
* [objects/cursoricon.c]
Added GetIconInfo (partial) and CreateIconIndirect.
* [windows/mdi.c]
Fixed some "bad class" problems and crashes in MDICreateChild,
which happen in Win32 (jwp32.exe).
Wed Oct 29 00:57:27 1997 Bruce Milner <Bruce.Milner@genetics.utah.edu>
* [if1632/winaspi.spec] [misc/aspi.c] [include/aspi.c]
[documentation/aspi] [include/callback.h]
Added support for 16 bit ASPI calls to linux generic SCSI.
The support is not complete, but appears to run my Mustek
scanner from within ipplus.exe.
Mon Oct 27 00:59:41 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c]
DC reuse framework.
Sun Oct 26 18:41:21 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/x11drv/xfont.c]
Substituted fonts are removed from the alias table. References to
the old name are also updated.
* [controls/combo.c]
LB_SELECTSTRING32 not CB_SELECTSTRING32 should be sent to
ComboLBox.
Sun Oct 26 14:25:00 1997 Nikita V. Youshchenko <yoush@cs.msu.su>
* [include/drive.h] [files/drive.c] [msdos/int21.c]
Partially implemented DOS drive mapping (int21 AX=440F).
Sat Oct 25 13:03:29 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/debug.l]
Support '.' in identifiers. Use "x . y" to access structure
fields.
* [debugger/hash.c] [loader/pe_image.c]
Load entry points of Win32 modules only when entering the
debugger.
* [debugger/break.c]
New function DEBUG_AddModuleBreakpoint() to set a breakpoint at
the start of every module.
* [files/file.c]
FILE_mmap() can now fake mmap() for unaligned offsets or broken
filesystems.
* [include/callback.h] [misc/callback.c] [if1632/thunk.c]
Use a table of callbacks instead of macros to differentiate
between emulator and Winelib.
* [loader/task.c]
Initialize current directory from cwd, not from module path.
* [tools/build.c]
Read CallTo16 prototypes directly from thunk.c source file.
* [windows/winproc.c] [windows/mdi.c]
Added translation for WM_MDIACTIVATE and WM_MDIGETACTIVE.
Fri Oct 24 21:41:25 1997 Uwe Bonnes <bon@elektron.ikp.tu-darmstadt.de>
* [files/drive.c]
Allow arguments like "a" for the drive related apis.
* [memory/global.c]
Keep the calculation for dwMemoryLoad in range.
* [misc/crtdll.c]
Make CRTDLL_getcwd use GetCurrentDirectory32A and alloc
its memory if requested.
Implemented CRTDLL_rename and CRTDLL_stat needed for
lcc-win32:wedit.exe.
Implemented CRTDLL__fullpath.
* [misc/comm.c]
High speed modes for the 16-bit mode Comm functions.
* [misc/cpu.c]
As applications may treat lpMaximumApplicationAddress as long,
use a valid long number.
* [misc/main.c]
In SystemParametersInfo16 ignore SPI_GETHIGHCONTRAST too.
* [misc/ole2nls.c]
Implement LCMAP_UPPERCASE for LCMapString32.
* [misc/wsprintf]
Made WPRINTF_ParseFormatA understand %ws.
* [win32/file.c]
Ignore FILE_ATTRIBUTE_NORMAL.
Stub for ReadFileEx.
Fri Oct 24 15:36:02 1997 Doug Ridgway <ridgway@routh.ucsd.edu>
* [memory/local.c]
Local heap exhaustion message now prints which builtin heap filled.
Fri Oct 24 00:46:34 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [windows/dialog.c]
Reversed CreateFont16/32W typo.
Thu Oct 23 23:44:20 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [if1632/user.spec]
Fixed argument list for ChangeClipboardChain.
* [windows/mdi.c]
Pass correct hInstance to CreateWindow16() in MDICreateChild().
Mon Oct 20 11:51:24 1997 Carsten Fallesen <cf@it.dtu.dk>
* [objects/metafile.c]
Added support for META_SETTEXTCHAREXTRA.
* [objects/region.c]
Fixed crash in XPolygonRegion if there is only one point in
in the region.
* [if1632/gdi32.spec][include/gdi.h][include/windows.h]
[objects/gdiobj.c]
Completed OBJ_XXX defines in gdi.h, removed OBJ_XXX in gdiobj.c
and included gdi.h instead. Implemented GetObjectType32().
Thu Oct 16 17:21:32 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [documentation/wine.texinfo]
Fixed WIN32 and Makefiles entries of Reference manual node, that
made makeinfo dump core.
Mon Oct 13 17:15:57 1997 Robert Wilhelm <robert@physiol.med.tu-muenchen.de>
* [if1632/crtdll.spec]
Added missing math functions y0(), y1(), y2(), floor(), frexp(),
ldexp(), modf().
1997-11-01 20:08:16 +01:00
|
|
|
}
|
1997-08-24 18:00:30 +02:00
|
|
|
}
|
2000-08-19 23:38:55 +02:00
|
|
|
GDI_ReleaseObj( hSrc1 );
|
Release 971101
Thu Oct 30 21:52:23 1997 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [windows/nonclient.c]
Changed NC_TrackSysMenu to give the same behaviour as MS-Windows,
i.e. system menu already appears when mouse button is depressed.
Changed NC_HandleNCLButtonDblClk so that double clicks on scroll
bar arrows are handled the same way as single clicks.
* [windows/winpos.c]
Fixed SetWindowPos32 to clear WIN_NO_REDRAW when SWP_SHOWWINDOW is
set; this is the way MS-Windows behaves.
Thu Oct 30 21:08:57 1997 Morten Welinder <terra@diku.dk>
* [controls/status.c]
In SW_SetText, fix condition, I hope.
* [controls/menu.c]
(GetMenuState32): Don't mask return value. Print more debug info.
(MENU_MenuBarCalcSize): Be more careful when printing debug
information.
(MENU_SetItemData): Empty strings are separators.
* [graphics/x11drv/text.c]
Don't prototype CLIPPING_IntersectClipRect.
* [include/dc.h]
Prototype CLIPPING_IntersectClipRect.
* [objects/font.c]
Remove non-portable (and faulty) smartness in FONT_TextMetric*to*.
In CreateFont32W and CreateFont16, handle null font name.
* [objects/text.c]
(TEXT_NextLine): Fix end-of-line bug.
* [if1632/shell32.spec]
Activate existing implementation of ExtractIconA.
* [misc/shell.c]
For Control_RunDLL, add types for parameters.
Thu Oct 30 14:54:11 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [controls/static.c] [include/windows.h] [misc/spy.c]
Added some win32 defines to static controls, basic SS_BITMAP style
handling implemented. [please add more, I am lacking knowledge and
time]
* [controls/status.c]
part_num 255 seems to indicate whole statusline (win95 cdplayer.exe)
* [if1632/thunk.c] [tools/build.c]
Support lret and 0x66 lret calls for CallTo16_regs
(needed for KERNEL32_45)
Fixed KERNEL32_45, QT_Thunk (should work now).
* [if1632/relay.c][if1632/builtin.c][tools/build.c][if1632/*32.spec]
Added string dumping to relay debugging for win32 apifuncs.
* [misc/ver.c]
Fixed and cleaned up VerQueryValue*.
* [multimedia/*.c][include/mmsystem.h][if1632/mmsystem.spec]
[if1632/winmm.spec]
Win32 support for lowlevel multimedia functions.
Added some mixer* lowlevel functions.
Some small fixes in the audio lowlevel queue handling, code
reformatting/cleanups.
* [debugger/hash.c]
Don't show difference between 16bit symbols if they are in
different segments.
* [objects/cursoricon.c]
Added GetIconInfo (partial) and CreateIconIndirect.
* [windows/mdi.c]
Fixed some "bad class" problems and crashes in MDICreateChild,
which happen in Win32 (jwp32.exe).
Wed Oct 29 00:57:27 1997 Bruce Milner <Bruce.Milner@genetics.utah.edu>
* [if1632/winaspi.spec] [misc/aspi.c] [include/aspi.c]
[documentation/aspi] [include/callback.h]
Added support for 16 bit ASPI calls to linux generic SCSI.
The support is not complete, but appears to run my Mustek
scanner from within ipplus.exe.
Mon Oct 27 00:59:41 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c]
DC reuse framework.
Sun Oct 26 18:41:21 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/x11drv/xfont.c]
Substituted fonts are removed from the alias table. References to
the old name are also updated.
* [controls/combo.c]
LB_SELECTSTRING32 not CB_SELECTSTRING32 should be sent to
ComboLBox.
Sun Oct 26 14:25:00 1997 Nikita V. Youshchenko <yoush@cs.msu.su>
* [include/drive.h] [files/drive.c] [msdos/int21.c]
Partially implemented DOS drive mapping (int21 AX=440F).
Sat Oct 25 13:03:29 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/debug.l]
Support '.' in identifiers. Use "x . y" to access structure
fields.
* [debugger/hash.c] [loader/pe_image.c]
Load entry points of Win32 modules only when entering the
debugger.
* [debugger/break.c]
New function DEBUG_AddModuleBreakpoint() to set a breakpoint at
the start of every module.
* [files/file.c]
FILE_mmap() can now fake mmap() for unaligned offsets or broken
filesystems.
* [include/callback.h] [misc/callback.c] [if1632/thunk.c]
Use a table of callbacks instead of macros to differentiate
between emulator and Winelib.
* [loader/task.c]
Initialize current directory from cwd, not from module path.
* [tools/build.c]
Read CallTo16 prototypes directly from thunk.c source file.
* [windows/winproc.c] [windows/mdi.c]
Added translation for WM_MDIACTIVATE and WM_MDIGETACTIVE.
Fri Oct 24 21:41:25 1997 Uwe Bonnes <bon@elektron.ikp.tu-darmstadt.de>
* [files/drive.c]
Allow arguments like "a" for the drive related apis.
* [memory/global.c]
Keep the calculation for dwMemoryLoad in range.
* [misc/crtdll.c]
Make CRTDLL_getcwd use GetCurrentDirectory32A and alloc
its memory if requested.
Implemented CRTDLL_rename and CRTDLL_stat needed for
lcc-win32:wedit.exe.
Implemented CRTDLL__fullpath.
* [misc/comm.c]
High speed modes for the 16-bit mode Comm functions.
* [misc/cpu.c]
As applications may treat lpMaximumApplicationAddress as long,
use a valid long number.
* [misc/main.c]
In SystemParametersInfo16 ignore SPI_GETHIGHCONTRAST too.
* [misc/ole2nls.c]
Implement LCMAP_UPPERCASE for LCMapString32.
* [misc/wsprintf]
Made WPRINTF_ParseFormatA understand %ws.
* [win32/file.c]
Ignore FILE_ATTRIBUTE_NORMAL.
Stub for ReadFileEx.
Fri Oct 24 15:36:02 1997 Doug Ridgway <ridgway@routh.ucsd.edu>
* [memory/local.c]
Local heap exhaustion message now prints which builtin heap filled.
Fri Oct 24 00:46:34 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [windows/dialog.c]
Reversed CreateFont16/32W typo.
Thu Oct 23 23:44:20 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [if1632/user.spec]
Fixed argument list for ChangeClipboardChain.
* [windows/mdi.c]
Pass correct hInstance to CreateWindow16() in MDICreateChild().
Mon Oct 20 11:51:24 1997 Carsten Fallesen <cf@it.dtu.dk>
* [objects/metafile.c]
Added support for META_SETTEXTCHAREXTRA.
* [objects/region.c]
Fixed crash in XPolygonRegion if there is only one point in
in the region.
* [if1632/gdi32.spec][include/gdi.h][include/windows.h]
[objects/gdiobj.c]
Completed OBJ_XXX defines in gdi.h, removed OBJ_XXX in gdiobj.c
and included gdi.h instead. Implemented GetObjectType32().
Thu Oct 16 17:21:32 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [documentation/wine.texinfo]
Fixed WIN32 and Makefiles entries of Reference manual node, that
made makeinfo dump core.
Mon Oct 13 17:15:57 1997 Robert Wilhelm <robert@physiol.med.tu-muenchen.de>
* [if1632/crtdll.spec]
Added missing math functions y0(), y1(), y2(), floor(), frexp(),
ldexp(), modf().
1997-11-01 20:08:16 +01:00
|
|
|
}
|
2001-06-06 23:06:27 +02:00
|
|
|
TRACE("dump destObj:\n");
|
2002-06-01 01:06:46 +02:00
|
|
|
if(TRACE_ON(region))
|
2009-01-29 16:38:53 +01:00
|
|
|
REGION_DumpRegion(&destObj->rgn);
|
1998-01-18 19:01:49 +01:00
|
|
|
|
2000-08-19 23:38:55 +02:00
|
|
|
GDI_ReleaseObj( hDest );
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
Release 971101
Thu Oct 30 21:52:23 1997 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [windows/nonclient.c]
Changed NC_TrackSysMenu to give the same behaviour as MS-Windows,
i.e. system menu already appears when mouse button is depressed.
Changed NC_HandleNCLButtonDblClk so that double clicks on scroll
bar arrows are handled the same way as single clicks.
* [windows/winpos.c]
Fixed SetWindowPos32 to clear WIN_NO_REDRAW when SWP_SHOWWINDOW is
set; this is the way MS-Windows behaves.
Thu Oct 30 21:08:57 1997 Morten Welinder <terra@diku.dk>
* [controls/status.c]
In SW_SetText, fix condition, I hope.
* [controls/menu.c]
(GetMenuState32): Don't mask return value. Print more debug info.
(MENU_MenuBarCalcSize): Be more careful when printing debug
information.
(MENU_SetItemData): Empty strings are separators.
* [graphics/x11drv/text.c]
Don't prototype CLIPPING_IntersectClipRect.
* [include/dc.h]
Prototype CLIPPING_IntersectClipRect.
* [objects/font.c]
Remove non-portable (and faulty) smartness in FONT_TextMetric*to*.
In CreateFont32W and CreateFont16, handle null font name.
* [objects/text.c]
(TEXT_NextLine): Fix end-of-line bug.
* [if1632/shell32.spec]
Activate existing implementation of ExtractIconA.
* [misc/shell.c]
For Control_RunDLL, add types for parameters.
Thu Oct 30 14:54:11 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [controls/static.c] [include/windows.h] [misc/spy.c]
Added some win32 defines to static controls, basic SS_BITMAP style
handling implemented. [please add more, I am lacking knowledge and
time]
* [controls/status.c]
part_num 255 seems to indicate whole statusline (win95 cdplayer.exe)
* [if1632/thunk.c] [tools/build.c]
Support lret and 0x66 lret calls for CallTo16_regs
(needed for KERNEL32_45)
Fixed KERNEL32_45, QT_Thunk (should work now).
* [if1632/relay.c][if1632/builtin.c][tools/build.c][if1632/*32.spec]
Added string dumping to relay debugging for win32 apifuncs.
* [misc/ver.c]
Fixed and cleaned up VerQueryValue*.
* [multimedia/*.c][include/mmsystem.h][if1632/mmsystem.spec]
[if1632/winmm.spec]
Win32 support for lowlevel multimedia functions.
Added some mixer* lowlevel functions.
Some small fixes in the audio lowlevel queue handling, code
reformatting/cleanups.
* [debugger/hash.c]
Don't show difference between 16bit symbols if they are in
different segments.
* [objects/cursoricon.c]
Added GetIconInfo (partial) and CreateIconIndirect.
* [windows/mdi.c]
Fixed some "bad class" problems and crashes in MDICreateChild,
which happen in Win32 (jwp32.exe).
Wed Oct 29 00:57:27 1997 Bruce Milner <Bruce.Milner@genetics.utah.edu>
* [if1632/winaspi.spec] [misc/aspi.c] [include/aspi.c]
[documentation/aspi] [include/callback.h]
Added support for 16 bit ASPI calls to linux generic SCSI.
The support is not complete, but appears to run my Mustek
scanner from within ipplus.exe.
Mon Oct 27 00:59:41 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c]
DC reuse framework.
Sun Oct 26 18:41:21 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/x11drv/xfont.c]
Substituted fonts are removed from the alias table. References to
the old name are also updated.
* [controls/combo.c]
LB_SELECTSTRING32 not CB_SELECTSTRING32 should be sent to
ComboLBox.
Sun Oct 26 14:25:00 1997 Nikita V. Youshchenko <yoush@cs.msu.su>
* [include/drive.h] [files/drive.c] [msdos/int21.c]
Partially implemented DOS drive mapping (int21 AX=440F).
Sat Oct 25 13:03:29 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/debug.l]
Support '.' in identifiers. Use "x . y" to access structure
fields.
* [debugger/hash.c] [loader/pe_image.c]
Load entry points of Win32 modules only when entering the
debugger.
* [debugger/break.c]
New function DEBUG_AddModuleBreakpoint() to set a breakpoint at
the start of every module.
* [files/file.c]
FILE_mmap() can now fake mmap() for unaligned offsets or broken
filesystems.
* [include/callback.h] [misc/callback.c] [if1632/thunk.c]
Use a table of callbacks instead of macros to differentiate
between emulator and Winelib.
* [loader/task.c]
Initialize current directory from cwd, not from module path.
* [tools/build.c]
Read CallTo16 prototypes directly from thunk.c source file.
* [windows/winproc.c] [windows/mdi.c]
Added translation for WM_MDIACTIVATE and WM_MDIGETACTIVE.
Fri Oct 24 21:41:25 1997 Uwe Bonnes <bon@elektron.ikp.tu-darmstadt.de>
* [files/drive.c]
Allow arguments like "a" for the drive related apis.
* [memory/global.c]
Keep the calculation for dwMemoryLoad in range.
* [misc/crtdll.c]
Make CRTDLL_getcwd use GetCurrentDirectory32A and alloc
its memory if requested.
Implemented CRTDLL_rename and CRTDLL_stat needed for
lcc-win32:wedit.exe.
Implemented CRTDLL__fullpath.
* [misc/comm.c]
High speed modes for the 16-bit mode Comm functions.
* [misc/cpu.c]
As applications may treat lpMaximumApplicationAddress as long,
use a valid long number.
* [misc/main.c]
In SystemParametersInfo16 ignore SPI_GETHIGHCONTRAST too.
* [misc/ole2nls.c]
Implement LCMAP_UPPERCASE for LCMapString32.
* [misc/wsprintf]
Made WPRINTF_ParseFormatA understand %ws.
* [win32/file.c]
Ignore FILE_ATTRIBUTE_NORMAL.
Stub for ReadFileEx.
Fri Oct 24 15:36:02 1997 Doug Ridgway <ridgway@routh.ucsd.edu>
* [memory/local.c]
Local heap exhaustion message now prints which builtin heap filled.
Fri Oct 24 00:46:34 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [windows/dialog.c]
Reversed CreateFont16/32W typo.
Thu Oct 23 23:44:20 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [if1632/user.spec]
Fixed argument list for ChangeClipboardChain.
* [windows/mdi.c]
Pass correct hInstance to CreateWindow16() in MDICreateChild().
Mon Oct 20 11:51:24 1997 Carsten Fallesen <cf@it.dtu.dk>
* [objects/metafile.c]
Added support for META_SETTEXTCHAREXTRA.
* [objects/region.c]
Fixed crash in XPolygonRegion if there is only one point in
in the region.
* [if1632/gdi32.spec][include/gdi.h][include/windows.h]
[objects/gdiobj.c]
Completed OBJ_XXX defines in gdi.h, removed OBJ_XXX in gdiobj.c
and included gdi.h instead. Implemented GetObjectType32().
Thu Oct 16 17:21:32 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [documentation/wine.texinfo]
Fixed WIN32 and Makefiles entries of Reference manual node, that
made makeinfo dump core.
Mon Oct 13 17:15:57 1997 Robert Wilhelm <robert@physiol.med.tu-muenchen.de>
* [if1632/crtdll.spec]
Added missing math functions y0(), y1(), y2(), floor(), frexp(),
ldexp(), modf().
1997-11-01 20:08:16 +01:00
|
|
|
return result;
|
1993-09-04 12:09:32 +02:00
|
|
|
}
|
Release 971101
Thu Oct 30 21:52:23 1997 Martin Boehme <boehme@informatik.mu-luebeck.de>
* [windows/nonclient.c]
Changed NC_TrackSysMenu to give the same behaviour as MS-Windows,
i.e. system menu already appears when mouse button is depressed.
Changed NC_HandleNCLButtonDblClk so that double clicks on scroll
bar arrows are handled the same way as single clicks.
* [windows/winpos.c]
Fixed SetWindowPos32 to clear WIN_NO_REDRAW when SWP_SHOWWINDOW is
set; this is the way MS-Windows behaves.
Thu Oct 30 21:08:57 1997 Morten Welinder <terra@diku.dk>
* [controls/status.c]
In SW_SetText, fix condition, I hope.
* [controls/menu.c]
(GetMenuState32): Don't mask return value. Print more debug info.
(MENU_MenuBarCalcSize): Be more careful when printing debug
information.
(MENU_SetItemData): Empty strings are separators.
* [graphics/x11drv/text.c]
Don't prototype CLIPPING_IntersectClipRect.
* [include/dc.h]
Prototype CLIPPING_IntersectClipRect.
* [objects/font.c]
Remove non-portable (and faulty) smartness in FONT_TextMetric*to*.
In CreateFont32W and CreateFont16, handle null font name.
* [objects/text.c]
(TEXT_NextLine): Fix end-of-line bug.
* [if1632/shell32.spec]
Activate existing implementation of ExtractIconA.
* [misc/shell.c]
For Control_RunDLL, add types for parameters.
Thu Oct 30 14:54:11 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [controls/static.c] [include/windows.h] [misc/spy.c]
Added some win32 defines to static controls, basic SS_BITMAP style
handling implemented. [please add more, I am lacking knowledge and
time]
* [controls/status.c]
part_num 255 seems to indicate whole statusline (win95 cdplayer.exe)
* [if1632/thunk.c] [tools/build.c]
Support lret and 0x66 lret calls for CallTo16_regs
(needed for KERNEL32_45)
Fixed KERNEL32_45, QT_Thunk (should work now).
* [if1632/relay.c][if1632/builtin.c][tools/build.c][if1632/*32.spec]
Added string dumping to relay debugging for win32 apifuncs.
* [misc/ver.c]
Fixed and cleaned up VerQueryValue*.
* [multimedia/*.c][include/mmsystem.h][if1632/mmsystem.spec]
[if1632/winmm.spec]
Win32 support for lowlevel multimedia functions.
Added some mixer* lowlevel functions.
Some small fixes in the audio lowlevel queue handling, code
reformatting/cleanups.
* [debugger/hash.c]
Don't show difference between 16bit symbols if they are in
different segments.
* [objects/cursoricon.c]
Added GetIconInfo (partial) and CreateIconIndirect.
* [windows/mdi.c]
Fixed some "bad class" problems and crashes in MDICreateChild,
which happen in Win32 (jwp32.exe).
Wed Oct 29 00:57:27 1997 Bruce Milner <Bruce.Milner@genetics.utah.edu>
* [if1632/winaspi.spec] [misc/aspi.c] [include/aspi.c]
[documentation/aspi] [include/callback.h]
Added support for 16 bit ASPI calls to linux generic SCSI.
The support is not complete, but appears to run my Mustek
scanner from within ipplus.exe.
Mon Oct 27 00:59:41 1997 Alex Korobka <alex@trantor.pharm.sunysb.edu>
* [windows/dce.c]
DC reuse framework.
Sun Oct 26 18:41:21 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [graphics/x11drv/xfont.c]
Substituted fonts are removed from the alias table. References to
the old name are also updated.
* [controls/combo.c]
LB_SELECTSTRING32 not CB_SELECTSTRING32 should be sent to
ComboLBox.
Sun Oct 26 14:25:00 1997 Nikita V. Youshchenko <yoush@cs.msu.su>
* [include/drive.h] [files/drive.c] [msdos/int21.c]
Partially implemented DOS drive mapping (int21 AX=440F).
Sat Oct 25 13:03:29 1997 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/debug.l]
Support '.' in identifiers. Use "x . y" to access structure
fields.
* [debugger/hash.c] [loader/pe_image.c]
Load entry points of Win32 modules only when entering the
debugger.
* [debugger/break.c]
New function DEBUG_AddModuleBreakpoint() to set a breakpoint at
the start of every module.
* [files/file.c]
FILE_mmap() can now fake mmap() for unaligned offsets or broken
filesystems.
* [include/callback.h] [misc/callback.c] [if1632/thunk.c]
Use a table of callbacks instead of macros to differentiate
between emulator and Winelib.
* [loader/task.c]
Initialize current directory from cwd, not from module path.
* [tools/build.c]
Read CallTo16 prototypes directly from thunk.c source file.
* [windows/winproc.c] [windows/mdi.c]
Added translation for WM_MDIACTIVATE and WM_MDIGETACTIVE.
Fri Oct 24 21:41:25 1997 Uwe Bonnes <bon@elektron.ikp.tu-darmstadt.de>
* [files/drive.c]
Allow arguments like "a" for the drive related apis.
* [memory/global.c]
Keep the calculation for dwMemoryLoad in range.
* [misc/crtdll.c]
Make CRTDLL_getcwd use GetCurrentDirectory32A and alloc
its memory if requested.
Implemented CRTDLL_rename and CRTDLL_stat needed for
lcc-win32:wedit.exe.
Implemented CRTDLL__fullpath.
* [misc/comm.c]
High speed modes for the 16-bit mode Comm functions.
* [misc/cpu.c]
As applications may treat lpMaximumApplicationAddress as long,
use a valid long number.
* [misc/main.c]
In SystemParametersInfo16 ignore SPI_GETHIGHCONTRAST too.
* [misc/ole2nls.c]
Implement LCMAP_UPPERCASE for LCMapString32.
* [misc/wsprintf]
Made WPRINTF_ParseFormatA understand %ws.
* [win32/file.c]
Ignore FILE_ATTRIBUTE_NORMAL.
Stub for ReadFileEx.
Fri Oct 24 15:36:02 1997 Doug Ridgway <ridgway@routh.ucsd.edu>
* [memory/local.c]
Local heap exhaustion message now prints which builtin heap filled.
Fri Oct 24 00:46:34 1997 Huw D M Davies <h.davies1@physics.oxford.ac.uk>
* [windows/dialog.c]
Reversed CreateFont16/32W typo.
Thu Oct 23 23:44:20 1997 Kristian Nielsen <kristian.nielsen@risoe.dk>
* [if1632/user.spec]
Fixed argument list for ChangeClipboardChain.
* [windows/mdi.c]
Pass correct hInstance to CreateWindow16() in MDICreateChild().
Mon Oct 20 11:51:24 1997 Carsten Fallesen <cf@it.dtu.dk>
* [objects/metafile.c]
Added support for META_SETTEXTCHAREXTRA.
* [objects/region.c]
Fixed crash in XPolygonRegion if there is only one point in
in the region.
* [if1632/gdi32.spec][include/gdi.h][include/windows.h]
[objects/gdiobj.c]
Completed OBJ_XXX defines in gdi.h, removed OBJ_XXX in gdiobj.c
and included gdi.h instead. Implemented GetObjectType32().
Thu Oct 16 17:21:32 1997 Philippe De Muyter <phdm@info.ucl.ac.be>
* [documentation/wine.texinfo]
Fixed WIN32 and Makefiles entries of Reference manual node, that
made makeinfo dump core.
Mon Oct 13 17:15:57 1997 Robert Wilhelm <robert@physiol.med.tu-muenchen.de>
* [if1632/crtdll.spec]
Added missing math functions y0(), y1(), y2(), floor(), frexp(),
ldexp(), modf().
1997-11-01 20:08:16 +01:00
|
|
|
|
Release 980104
Sat Jan 3 17:15:56 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/db_disasm.c]
Added cpuid and cmpxchg instructions.
* [if1632/builtin.c] [relay32/builtin32.c]
Fixed broken -dll option with Win32 DLLs.
* [include/heap.h]
Added SYSTEM_LOCK/SYSTEM_UNLOCK macros.
* [configure.in] [misc/lstr.c]
Added check for wctype.h.
Commented out --enable-ipc option (IPC code has been broken for a
long time anyway).
* [scheduler/critsection.c] [scheduler/event.c]
[scheduler/mutex.c] [scheduler/semaphore.c]
Implemented Win32 synchronization objects.
* [scheduler/synchro.c]
Implemented WaitForMultipleObjects and related functions.
* [scheduler/thread.c]
If possible, use clone() in CreateThread().
* [scheduler/thread.c] [scheduler/process.c]
Made thread and process waitable objects.
Thread and process id values are now different from the pointers
they represent.
* [win32/k32obj.c]
Moved to scheduler directory.
Added function table for waiting operations on objects.
* [files/file.c] [memory/virtual.c]
Added new K32OBJ function table.
Sun Jan 1 16:48:23 1997 Andreas Mohr <100.30936@germany.net>
* [files/file.c]
Fixed my patch for GetTempFileName16() as needed.
It was ...Name32A() that didn't work properly, not ...Name16().
* [graphics/x11drv/brush.c]
Fixed a BadMatch error.
* [msdos/int21.c]
Fixed INT21_FindNextFCB() to get correct volume labels e.g.
in "file open" dialog.
* [multimedia/joystick.c] [relay32/winmm.spec]
Stub JoyGetPosEx().
* [scheduler/process.c] [relay32/kernel32.spec]
Implemented RegisterServiceProcess().
Wed Dec 31 11:14:43 1997 Lawson Whitney <lawson_whitney@juno.com>
* [if1632/kernel.spec] [if1632/relay.c]
Define CallProcEx32w - Thanks to Marcus Meissner for his excellent
CallProc32W.
* [loader/module.c]
Take a shot at defining FreeLibrary32W.
Sun Dec 28 12:44:04 1997 Kai Morich <kai.morich@rhein-neckar.netsurf.de>
* [controls/menu.c]
Menu modification from WM_INITMENUPOPUP message fixed.
Menu items now can have different wID and hSubMenu (Win95 behavior).
* [misc/cpu.c]
Improved IsProcessorFeaturePresent.
Sun Dec 28 03:21:08 1997 Ove Kaaven <ovek@main.arcticnet.no>
* [include/winsock.h] [misc/winsock.c]
Fixed WS_SOL_SOCKET for setsockopt(), and made select() return
empty fd_sets if timeout.
* [objects/palette.c]
AnimatePalette() bailed out if entire palette is animated. Fixed.
* [objects/dib.c]
Added some code to SetDIBitsToDevice() and its helpers to fix
some offseting problems.
* [objects/cursoricon.c]
Made CreateCursor32() convert the instance handle properly. Made
DestroyCursor() return correct success status.
Wed Dec 24 17:56:34 1997 Dimitrie O. Paun <dimi@cs.toronto.edu>
* [windows/syscolor.c]
Added definition of GetSysColorPen16/32. This function does not
exist in the Win32 API but is a very close (and natural) relative
to GetSysColorBrush function. Moreover, it is *very* much used
within Wine since there are a lot of places where we need to draw
lines with the standard colors.
* [controls/button.c] [controls/combo.c] [controls/icontitle.c]
[controls/menu.c] [controls/progress.c] [controls/scroll.c]
[controls/updown.c] [graphics/painting.c] [misc/tweak.c]
[windows/defwnd.c] [windows/graphics.c] [windows/nonclient.c]
Replaced references to sysColorObjects with the appropriate
call to GetSysColorBrush32/GetSysColorPen32. There is no need to
expose the implementation of these functions, even within Wine.
This makes the code easier to understand, debug, maintain.
* [controls/uitools.c]
Modified most of the functions in this file to use the now
standard pens (i.e. GetSysColorPen32). These functions made
*heavy* use of standard pens so I expect a lot less
CreatePen/DeleteObject calls can do only good...:)
Plus some minor modifications (*no* functional changes though).
* [controls/updown.c]
Used the new DrawFrameControl32 function to paint the control.
I also deleted UDDOWN_DrawArrow since it was no longer required.
Tue Dec 23 00:03:33 1997 Steinar Hamre <steinarh@stud.fim.ntnu.no>
* [configure.in]
Added check for -lw.
* [include/wintypes.h] [tools/build.c]
Changes to make the assembly understandable for even sun as.
".ascii" -> ".string", "call %foo" -> "call *%foo",
"pushw/popw %[cdes]s" written out to ".byte 0x66\npushl/popl %[cdes]s".
* [memory/ldt.c]
#ifdef added so <sys/seg.h> will not be included on Solaris.
Mon Dec 22 18:55:19 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [configure.in]
Added XF86DGA check.
* [multimedia/dsound.c][relay32/dsound.spec][include/dsound.h]
Started DirectSound. Only stubs for now.
* [graphics/ddraw.c][include/ddraw.h][relay32/ddraw.spec]
Started to implement DirectDraw. Mostly stubs, some
testcases work. Requires the XF86DGA extension to XFree86.
(check demo/blizdemo.exe from the Diablo CD-ROM).
* [files/drive.c]
Return correct "CDFS" fsname so Diablo is a bit happier.
Sun Dec 21 21:45:48 1997 Kevin Cozens <kcozens@interlog.com>
* [misc/registry.c]
Fixed bugs in the routines which read the Windows '95 registry
files. Added extra information regarding the format of the Windows
'95 registry files.
1998-01-04 18:49:09 +01:00
|
|
|
/***********************************************************************
|
1998-01-18 19:01:49 +01:00
|
|
|
* REGION_SetExtents
|
|
|
|
* Re-calculate the extents of a region
|
Release 980104
Sat Jan 3 17:15:56 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/db_disasm.c]
Added cpuid and cmpxchg instructions.
* [if1632/builtin.c] [relay32/builtin32.c]
Fixed broken -dll option with Win32 DLLs.
* [include/heap.h]
Added SYSTEM_LOCK/SYSTEM_UNLOCK macros.
* [configure.in] [misc/lstr.c]
Added check for wctype.h.
Commented out --enable-ipc option (IPC code has been broken for a
long time anyway).
* [scheduler/critsection.c] [scheduler/event.c]
[scheduler/mutex.c] [scheduler/semaphore.c]
Implemented Win32 synchronization objects.
* [scheduler/synchro.c]
Implemented WaitForMultipleObjects and related functions.
* [scheduler/thread.c]
If possible, use clone() in CreateThread().
* [scheduler/thread.c] [scheduler/process.c]
Made thread and process waitable objects.
Thread and process id values are now different from the pointers
they represent.
* [win32/k32obj.c]
Moved to scheduler directory.
Added function table for waiting operations on objects.
* [files/file.c] [memory/virtual.c]
Added new K32OBJ function table.
Sun Jan 1 16:48:23 1997 Andreas Mohr <100.30936@germany.net>
* [files/file.c]
Fixed my patch for GetTempFileName16() as needed.
It was ...Name32A() that didn't work properly, not ...Name16().
* [graphics/x11drv/brush.c]
Fixed a BadMatch error.
* [msdos/int21.c]
Fixed INT21_FindNextFCB() to get correct volume labels e.g.
in "file open" dialog.
* [multimedia/joystick.c] [relay32/winmm.spec]
Stub JoyGetPosEx().
* [scheduler/process.c] [relay32/kernel32.spec]
Implemented RegisterServiceProcess().
Wed Dec 31 11:14:43 1997 Lawson Whitney <lawson_whitney@juno.com>
* [if1632/kernel.spec] [if1632/relay.c]
Define CallProcEx32w - Thanks to Marcus Meissner for his excellent
CallProc32W.
* [loader/module.c]
Take a shot at defining FreeLibrary32W.
Sun Dec 28 12:44:04 1997 Kai Morich <kai.morich@rhein-neckar.netsurf.de>
* [controls/menu.c]
Menu modification from WM_INITMENUPOPUP message fixed.
Menu items now can have different wID and hSubMenu (Win95 behavior).
* [misc/cpu.c]
Improved IsProcessorFeaturePresent.
Sun Dec 28 03:21:08 1997 Ove Kaaven <ovek@main.arcticnet.no>
* [include/winsock.h] [misc/winsock.c]
Fixed WS_SOL_SOCKET for setsockopt(), and made select() return
empty fd_sets if timeout.
* [objects/palette.c]
AnimatePalette() bailed out if entire palette is animated. Fixed.
* [objects/dib.c]
Added some code to SetDIBitsToDevice() and its helpers to fix
some offseting problems.
* [objects/cursoricon.c]
Made CreateCursor32() convert the instance handle properly. Made
DestroyCursor() return correct success status.
Wed Dec 24 17:56:34 1997 Dimitrie O. Paun <dimi@cs.toronto.edu>
* [windows/syscolor.c]
Added definition of GetSysColorPen16/32. This function does not
exist in the Win32 API but is a very close (and natural) relative
to GetSysColorBrush function. Moreover, it is *very* much used
within Wine since there are a lot of places where we need to draw
lines with the standard colors.
* [controls/button.c] [controls/combo.c] [controls/icontitle.c]
[controls/menu.c] [controls/progress.c] [controls/scroll.c]
[controls/updown.c] [graphics/painting.c] [misc/tweak.c]
[windows/defwnd.c] [windows/graphics.c] [windows/nonclient.c]
Replaced references to sysColorObjects with the appropriate
call to GetSysColorBrush32/GetSysColorPen32. There is no need to
expose the implementation of these functions, even within Wine.
This makes the code easier to understand, debug, maintain.
* [controls/uitools.c]
Modified most of the functions in this file to use the now
standard pens (i.e. GetSysColorPen32). These functions made
*heavy* use of standard pens so I expect a lot less
CreatePen/DeleteObject calls can do only good...:)
Plus some minor modifications (*no* functional changes though).
* [controls/updown.c]
Used the new DrawFrameControl32 function to paint the control.
I also deleted UDDOWN_DrawArrow since it was no longer required.
Tue Dec 23 00:03:33 1997 Steinar Hamre <steinarh@stud.fim.ntnu.no>
* [configure.in]
Added check for -lw.
* [include/wintypes.h] [tools/build.c]
Changes to make the assembly understandable for even sun as.
".ascii" -> ".string", "call %foo" -> "call *%foo",
"pushw/popw %[cdes]s" written out to ".byte 0x66\npushl/popl %[cdes]s".
* [memory/ldt.c]
#ifdef added so <sys/seg.h> will not be included on Solaris.
Mon Dec 22 18:55:19 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [configure.in]
Added XF86DGA check.
* [multimedia/dsound.c][relay32/dsound.spec][include/dsound.h]
Started DirectSound. Only stubs for now.
* [graphics/ddraw.c][include/ddraw.h][relay32/ddraw.spec]
Started to implement DirectDraw. Mostly stubs, some
testcases work. Requires the XF86DGA extension to XFree86.
(check demo/blizdemo.exe from the Diablo CD-ROM).
* [files/drive.c]
Return correct "CDFS" fsname so Diablo is a bit happier.
Sun Dec 21 21:45:48 1997 Kevin Cozens <kcozens@interlog.com>
* [misc/registry.c]
Fixed bugs in the routines which read the Windows '95 registry
files. Added extra information regarding the format of the Windows
'95 registry files.
1998-01-04 18:49:09 +01:00
|
|
|
*/
|
1998-01-18 19:01:49 +01:00
|
|
|
static void REGION_SetExtents (WINEREGION *pReg)
|
|
|
|
{
|
1999-02-26 12:11:13 +01:00
|
|
|
RECT *pRect, *pRectEnd, *pExtents;
|
1998-01-18 19:01:49 +01:00
|
|
|
|
|
|
|
if (pReg->numRects == 0)
|
|
|
|
{
|
|
|
|
pReg->extents.left = 0;
|
|
|
|
pReg->extents.top = 0;
|
|
|
|
pReg->extents.right = 0;
|
|
|
|
pReg->extents.bottom = 0;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
pExtents = &pReg->extents;
|
|
|
|
pRect = pReg->rects;
|
|
|
|
pRectEnd = &pRect[pReg->numRects - 1];
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Since pRect is the first rectangle in the region, it must have the
|
|
|
|
* smallest top and since pRectEnd is the last rectangle in the region,
|
|
|
|
* it must have the largest bottom, because of banding. Initialize left and
|
|
|
|
* right from pRect and pRectEnd, resp., as good things to initialize them
|
|
|
|
* to...
|
|
|
|
*/
|
|
|
|
pExtents->left = pRect->left;
|
|
|
|
pExtents->top = pRect->top;
|
|
|
|
pExtents->right = pRectEnd->right;
|
|
|
|
pExtents->bottom = pRectEnd->bottom;
|
|
|
|
|
|
|
|
while (pRect <= pRectEnd)
|
|
|
|
{
|
|
|
|
if (pRect->left < pExtents->left)
|
|
|
|
pExtents->left = pRect->left;
|
|
|
|
if (pRect->right > pExtents->right)
|
|
|
|
pExtents->right = pRect->right;
|
|
|
|
pRect++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* REGION_CopyRegion
|
|
|
|
*/
|
2009-01-29 18:18:53 +01:00
|
|
|
static BOOL REGION_CopyRegion(WINEREGION *dst, WINEREGION *src)
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
|
|
|
if (dst != src) /* don't want to copy to itself */
|
2002-06-01 01:06:46 +02:00
|
|
|
{
|
1998-01-18 19:01:49 +01:00
|
|
|
if (dst->size < src->numRects)
|
|
|
|
{
|
2009-01-29 18:18:53 +01:00
|
|
|
RECT *rects = HeapReAlloc( GetProcessHeap(), 0, dst->rects, src->numRects * sizeof(RECT) );
|
|
|
|
if (!rects) return FALSE;
|
|
|
|
dst->rects = rects;
|
1998-01-18 19:01:49 +01:00
|
|
|
dst->size = src->numRects;
|
|
|
|
}
|
|
|
|
dst->numRects = src->numRects;
|
|
|
|
dst->extents.left = src->extents.left;
|
|
|
|
dst->extents.top = src->extents.top;
|
|
|
|
dst->extents.right = src->extents.right;
|
|
|
|
dst->extents.bottom = src->extents.bottom;
|
2009-01-26 11:01:12 +01:00
|
|
|
memcpy(dst->rects, src->rects, src->numRects * sizeof(RECT));
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
2009-01-29 18:18:53 +01:00
|
|
|
return TRUE;
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
|
|
|
|
2010-07-29 13:36:43 +02:00
|
|
|
/***********************************************************************
|
|
|
|
* REGION_MirrorRegion
|
|
|
|
*/
|
|
|
|
static BOOL REGION_MirrorRegion( WINEREGION *dst, WINEREGION *src, int width )
|
|
|
|
{
|
|
|
|
int i, start, end;
|
|
|
|
RECT extents;
|
|
|
|
RECT *rects = HeapAlloc( GetProcessHeap(), 0, src->numRects * sizeof(RECT) );
|
|
|
|
|
|
|
|
if (!rects) return FALSE;
|
|
|
|
|
|
|
|
extents.left = width - src->extents.right;
|
|
|
|
extents.right = width - src->extents.left;
|
|
|
|
extents.top = src->extents.top;
|
|
|
|
extents.bottom = src->extents.bottom;
|
|
|
|
|
|
|
|
for (start = 0; start < src->numRects; start = end)
|
|
|
|
{
|
|
|
|
/* find the end of the current band */
|
|
|
|
for (end = start + 1; end < src->numRects; end++)
|
|
|
|
if (src->rects[end].top != src->rects[end - 1].top) break;
|
|
|
|
|
|
|
|
for (i = 0; i < end - start; i++)
|
|
|
|
{
|
|
|
|
rects[start + i].left = width - src->rects[end - i - 1].right;
|
|
|
|
rects[start + i].right = width - src->rects[end - i - 1].left;
|
|
|
|
rects[start + i].top = src->rects[end - i - 1].top;
|
|
|
|
rects[start + i].bottom = src->rects[end - i - 1].bottom;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
HeapFree( GetProcessHeap(), 0, dst->rects );
|
|
|
|
dst->rects = rects;
|
|
|
|
dst->size = src->numRects;
|
|
|
|
dst->numRects = src->numRects;
|
|
|
|
dst->extents = extents;
|
|
|
|
return TRUE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* mirror_region
|
|
|
|
*/
|
|
|
|
INT mirror_region( HRGN dst, HRGN src, INT width )
|
|
|
|
{
|
|
|
|
RGNOBJ *src_rgn, *dst_rgn;
|
|
|
|
INT ret = ERROR;
|
|
|
|
|
|
|
|
if (!(src_rgn = GDI_GetObjPtr( src, OBJ_REGION ))) return ERROR;
|
|
|
|
if ((dst_rgn = GDI_GetObjPtr( dst, OBJ_REGION )))
|
|
|
|
{
|
|
|
|
if (REGION_MirrorRegion( &dst_rgn->rgn, &src_rgn->rgn, width )) ret = get_region_type( dst_rgn );
|
|
|
|
GDI_ReleaseObj( dst_rgn );
|
|
|
|
}
|
|
|
|
GDI_ReleaseObj( src_rgn );
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2010-09-27 20:45:56 +02:00
|
|
|
/***********************************************************************
|
|
|
|
* MirrorRgn (GDI32.@)
|
|
|
|
*/
|
|
|
|
BOOL WINAPI MirrorRgn( HWND hwnd, HRGN hrgn )
|
|
|
|
{
|
|
|
|
static const WCHAR user32W[] = {'u','s','e','r','3','2','.','d','l','l',0};
|
|
|
|
static BOOL (WINAPI *pGetWindowRect)( HWND hwnd, LPRECT rect );
|
|
|
|
RECT rect;
|
|
|
|
|
|
|
|
/* yes, a HWND in gdi32, don't ask */
|
|
|
|
if (!pGetWindowRect)
|
|
|
|
{
|
|
|
|
HMODULE user32 = GetModuleHandleW(user32W);
|
|
|
|
if (!user32) return FALSE;
|
|
|
|
if (!(pGetWindowRect = (void *)GetProcAddress( user32, "GetWindowRect" ))) return FALSE;
|
|
|
|
}
|
|
|
|
pGetWindowRect( hwnd, &rect );
|
|
|
|
return mirror_region( hrgn, hrgn, rect.right - rect.left ) != ERROR;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
/***********************************************************************
|
|
|
|
* REGION_Coalesce
|
|
|
|
*
|
|
|
|
* Attempt to merge the rects in the current band with those in the
|
|
|
|
* previous one. Used only by REGION_RegionOp.
|
|
|
|
*
|
|
|
|
* Results:
|
|
|
|
* The new index for the previous band.
|
|
|
|
*
|
|
|
|
* Side Effects:
|
|
|
|
* If coalescing takes place:
|
|
|
|
* - rectangles in the previous band will have their bottom fields
|
|
|
|
* altered.
|
|
|
|
* - pReg->numRects will be decreased.
|
|
|
|
*
|
|
|
|
*/
|
1999-02-26 12:11:13 +01:00
|
|
|
static INT REGION_Coalesce (
|
1998-03-15 21:29:56 +01:00
|
|
|
WINEREGION *pReg, /* Region to coalesce */
|
1999-02-26 12:11:13 +01:00
|
|
|
INT prevStart, /* Index of start of previous band */
|
|
|
|
INT curStart /* Index of start of current band */
|
1998-03-15 21:29:56 +01:00
|
|
|
) {
|
1999-02-26 12:11:13 +01:00
|
|
|
RECT *pPrevRect; /* Current rect in previous band */
|
|
|
|
RECT *pCurRect; /* Current rect in current band */
|
|
|
|
RECT *pRegEnd; /* End of region */
|
|
|
|
INT curNumRects; /* Number of rectangles in current band */
|
|
|
|
INT prevNumRects; /* Number of rectangles in previous band */
|
|
|
|
INT bandtop; /* top coordinate for current band */
|
1998-01-18 19:01:49 +01:00
|
|
|
|
|
|
|
pRegEnd = &pReg->rects[pReg->numRects];
|
|
|
|
|
|
|
|
pPrevRect = &pReg->rects[prevStart];
|
|
|
|
prevNumRects = curStart - prevStart;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Figure out how many rectangles are in the current band. Have to do
|
|
|
|
* this because multiple bands could have been added in REGION_RegionOp
|
|
|
|
* at the end when one region has been exhausted.
|
|
|
|
*/
|
|
|
|
pCurRect = &pReg->rects[curStart];
|
|
|
|
bandtop = pCurRect->top;
|
|
|
|
for (curNumRects = 0;
|
|
|
|
(pCurRect != pRegEnd) && (pCurRect->top == bandtop);
|
|
|
|
curNumRects++)
|
|
|
|
{
|
|
|
|
pCurRect++;
|
|
|
|
}
|
2002-06-01 01:06:46 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
if (pCurRect != pRegEnd)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* If more than one band was added, we have to find the start
|
|
|
|
* of the last band added so the next coalescing job can start
|
|
|
|
* at the right place... (given when multiple bands are added,
|
|
|
|
* this may be pointless -- see above).
|
|
|
|
*/
|
|
|
|
pRegEnd--;
|
|
|
|
while (pRegEnd[-1].top == pRegEnd->top)
|
|
|
|
{
|
|
|
|
pRegEnd--;
|
|
|
|
}
|
|
|
|
curStart = pRegEnd - pReg->rects;
|
|
|
|
pRegEnd = pReg->rects + pReg->numRects;
|
|
|
|
}
|
2002-06-01 01:06:46 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
if ((curNumRects == prevNumRects) && (curNumRects != 0)) {
|
|
|
|
pCurRect -= curNumRects;
|
|
|
|
/*
|
|
|
|
* The bands may only be coalesced if the bottom of the previous
|
|
|
|
* matches the top scanline of the current.
|
|
|
|
*/
|
|
|
|
if (pPrevRect->bottom == pCurRect->top)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Make sure the bands have rects in the same places. This
|
|
|
|
* assumes that rects have been added in such a way that they
|
|
|
|
* cover the most area possible. I.e. two rects in a band must
|
|
|
|
* have some horizontal space between them.
|
|
|
|
*/
|
|
|
|
do
|
|
|
|
{
|
|
|
|
if ((pPrevRect->left != pCurRect->left) ||
|
|
|
|
(pPrevRect->right != pCurRect->right))
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* The bands don't line up so they can't be coalesced.
|
|
|
|
*/
|
|
|
|
return (curStart);
|
|
|
|
}
|
|
|
|
pPrevRect++;
|
|
|
|
pCurRect++;
|
|
|
|
prevNumRects -= 1;
|
|
|
|
} while (prevNumRects != 0);
|
|
|
|
|
|
|
|
pReg->numRects -= curNumRects;
|
|
|
|
pCurRect -= curNumRects;
|
|
|
|
pPrevRect -= curNumRects;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The bands may be merged, so set the bottom of each rect
|
|
|
|
* in the previous band to that of the corresponding rect in
|
|
|
|
* the current band.
|
|
|
|
*/
|
|
|
|
do
|
|
|
|
{
|
|
|
|
pPrevRect->bottom = pCurRect->bottom;
|
|
|
|
pPrevRect++;
|
|
|
|
pCurRect++;
|
|
|
|
curNumRects -= 1;
|
|
|
|
} while (curNumRects != 0);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If only one band was added to the region, we have to backup
|
|
|
|
* curStart to the start of the previous band.
|
|
|
|
*
|
|
|
|
* If more than one band was added to the region, copy the
|
|
|
|
* other bands down. The assumption here is that the other bands
|
|
|
|
* came from the same region as the current one and no further
|
|
|
|
* coalescing can be done on them since it's all been done
|
|
|
|
* already... curStart is already in the right place.
|
|
|
|
*/
|
|
|
|
if (pCurRect == pRegEnd)
|
|
|
|
{
|
|
|
|
curStart = prevStart;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
do
|
|
|
|
{
|
|
|
|
*pPrevRect++ = *pCurRect++;
|
|
|
|
} while (pCurRect != pRegEnd);
|
|
|
|
}
|
2002-06-01 01:06:46 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return (curStart);
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* REGION_RegionOp
|
|
|
|
*
|
|
|
|
* Apply an operation to two regions. Called by REGION_Union,
|
|
|
|
* REGION_Inverse, REGION_Subtract, REGION_Intersect...
|
|
|
|
*
|
|
|
|
* Results:
|
|
|
|
* None.
|
|
|
|
*
|
|
|
|
* Side Effects:
|
|
|
|
* The new region is overwritten.
|
|
|
|
*
|
|
|
|
* Notes:
|
|
|
|
* The idea behind this function is to view the two regions as sets.
|
|
|
|
* Together they cover a rectangle of area that this function divides
|
|
|
|
* into horizontal bands where points are covered only by one region
|
|
|
|
* or by both. For the first case, the nonOverlapFunc is called with
|
|
|
|
* each the band and the band's upper and lower extents. For the
|
|
|
|
* second, the overlapFunc is called to process the entire band. It
|
|
|
|
* is responsible for clipping the rectangles in the band, though
|
|
|
|
* this function provides the boundaries.
|
|
|
|
* At the end of each band, the new region is coalesced, if possible,
|
|
|
|
* to reduce the number of rectangles in the region.
|
|
|
|
*
|
|
|
|
*/
|
2009-01-29 18:18:53 +01:00
|
|
|
static BOOL REGION_RegionOp(
|
|
|
|
WINEREGION *destReg, /* Place to store result */
|
1998-03-15 21:29:56 +01:00
|
|
|
WINEREGION *reg1, /* First region in operation */
|
|
|
|
WINEREGION *reg2, /* 2nd region in operation */
|
2009-01-29 18:18:53 +01:00
|
|
|
BOOL (*overlapFunc)(WINEREGION*, RECT*, RECT*, RECT*, RECT*, INT, INT), /* Function to call for over-lapping bands */
|
|
|
|
BOOL (*nonOverlap1Func)(WINEREGION*, RECT*, RECT*, INT, INT), /* Function to call for non-overlapping bands in region 1 */
|
|
|
|
BOOL (*nonOverlap2Func)(WINEREGION*, RECT*, RECT*, INT, INT) /* Function to call for non-overlapping bands in region 2 */
|
1998-03-15 21:29:56 +01:00
|
|
|
) {
|
2009-01-29 18:18:53 +01:00
|
|
|
WINEREGION newReg;
|
1999-02-26 12:11:13 +01:00
|
|
|
RECT *r1; /* Pointer into first region */
|
|
|
|
RECT *r2; /* Pointer into 2d region */
|
|
|
|
RECT *r1End; /* End of 1st region */
|
|
|
|
RECT *r2End; /* End of 2d region */
|
|
|
|
INT ybot; /* Bottom of intersection */
|
|
|
|
INT ytop; /* Top of intersection */
|
|
|
|
INT prevBand; /* Index of start of
|
1998-01-18 19:01:49 +01:00
|
|
|
* previous band in newReg */
|
1999-02-26 12:11:13 +01:00
|
|
|
INT curBand; /* Index of start of current
|
1998-01-18 19:01:49 +01:00
|
|
|
* band in newReg */
|
1999-02-26 12:11:13 +01:00
|
|
|
RECT *r1BandEnd; /* End of current band in r1 */
|
|
|
|
RECT *r2BandEnd; /* End of current band in r2 */
|
|
|
|
INT top; /* Top of non-overlapping band */
|
|
|
|
INT bot; /* Bottom of non-overlapping band */
|
2002-06-01 01:06:46 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
/*
|
|
|
|
* Initialization:
|
|
|
|
* set r1, r2, r1End and r2End appropriately, preserve the important
|
|
|
|
* parts of the destination region until the end in case it's one of
|
|
|
|
* the two source regions, then mark the "new" region empty, allocating
|
|
|
|
* another array of rectangles for it to use.
|
|
|
|
*/
|
|
|
|
r1 = reg1->rects;
|
|
|
|
r2 = reg2->rects;
|
|
|
|
r1End = r1 + reg1->numRects;
|
|
|
|
r2End = r2 + reg2->numRects;
|
2002-06-01 01:06:46 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
/*
|
|
|
|
* Allocate a reasonable number of rectangles for the new region. The idea
|
|
|
|
* is to allocate enough so the individual functions don't need to
|
|
|
|
* reallocate and copy the array, which is time consuming, yet we don't
|
|
|
|
* have to worry about using too much memory. I hope to be able to
|
|
|
|
* nuke the Xrealloc() at the end of this function eventually.
|
|
|
|
*/
|
2009-01-29 18:18:53 +01:00
|
|
|
if (!init_region( &newReg, max(reg1->numRects,reg2->numRects) * 2 )) return FALSE;
|
2002-06-01 01:06:46 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
/*
|
|
|
|
* Initialize ybot and ytop.
|
|
|
|
* In the upcoming loop, ybot and ytop serve different functions depending
|
|
|
|
* on whether the band being handled is an overlapping or non-overlapping
|
|
|
|
* band.
|
|
|
|
* In the case of a non-overlapping band (only one of the regions
|
|
|
|
* has points in the band), ybot is the bottom of the most recent
|
|
|
|
* intersection and thus clips the top of the rectangles in that band.
|
|
|
|
* ytop is the top of the next intersection between the two regions and
|
|
|
|
* serves to clip the bottom of the rectangles in the current band.
|
|
|
|
* For an overlapping band (where the two regions intersect), ytop clips
|
|
|
|
* the top of the rectangles of both regions and ybot clips the bottoms.
|
|
|
|
*/
|
|
|
|
if (reg1->extents.top < reg2->extents.top)
|
|
|
|
ybot = reg1->extents.top;
|
|
|
|
else
|
|
|
|
ybot = reg2->extents.top;
|
2002-06-01 01:06:46 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
/*
|
|
|
|
* prevBand serves to mark the start of the previous band so rectangles
|
|
|
|
* can be coalesced into larger rectangles. qv. miCoalesce, above.
|
|
|
|
* In the beginning, there is no previous band, so prevBand == curBand
|
|
|
|
* (curBand is set later on, of course, but the first band will always
|
|
|
|
* start at index 0). prevBand and curBand must be indices because of
|
|
|
|
* the possible expansion, and resultant moving, of the new region's
|
|
|
|
* array of rectangles.
|
|
|
|
*/
|
|
|
|
prevBand = 0;
|
2002-06-01 01:06:46 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
do
|
|
|
|
{
|
2009-01-29 18:18:53 +01:00
|
|
|
curBand = newReg.numRects;
|
1998-01-18 19:01:49 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* This algorithm proceeds one source-band (as opposed to a
|
|
|
|
* destination band, which is determined by where the two regions
|
|
|
|
* intersect) at a time. r1BandEnd and r2BandEnd serve to mark the
|
|
|
|
* rectangle after the last one in the current band for their
|
|
|
|
* respective regions.
|
|
|
|
*/
|
|
|
|
r1BandEnd = r1;
|
|
|
|
while ((r1BandEnd != r1End) && (r1BandEnd->top == r1->top))
|
|
|
|
{
|
|
|
|
r1BandEnd++;
|
|
|
|
}
|
2002-06-01 01:06:46 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
r2BandEnd = r2;
|
|
|
|
while ((r2BandEnd != r2End) && (r2BandEnd->top == r2->top))
|
|
|
|
{
|
|
|
|
r2BandEnd++;
|
|
|
|
}
|
2002-06-01 01:06:46 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
/*
|
|
|
|
* First handle the band that doesn't intersect, if any.
|
|
|
|
*
|
|
|
|
* Note that attention is restricted to one band in the
|
|
|
|
* non-intersecting region at once, so if a region has n
|
|
|
|
* bands between the current position and the next place it overlaps
|
|
|
|
* the other, this entire loop will be passed through n times.
|
|
|
|
*/
|
|
|
|
if (r1->top < r2->top)
|
|
|
|
{
|
2000-03-25 22:44:35 +01:00
|
|
|
top = max(r1->top,ybot);
|
|
|
|
bot = min(r1->bottom,r2->top);
|
1998-01-18 19:01:49 +01:00
|
|
|
|
2007-12-19 00:26:12 +01:00
|
|
|
if ((top != bot) && (nonOverlap1Func != NULL))
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
2009-01-29 18:18:53 +01:00
|
|
|
if (!nonOverlap1Func(&newReg, r1, r1BandEnd, top, bot)) return FALSE;
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
ytop = r2->top;
|
|
|
|
}
|
|
|
|
else if (r2->top < r1->top)
|
|
|
|
{
|
2000-03-25 22:44:35 +01:00
|
|
|
top = max(r2->top,ybot);
|
|
|
|
bot = min(r2->bottom,r1->top);
|
1998-01-18 19:01:49 +01:00
|
|
|
|
2007-12-19 00:26:12 +01:00
|
|
|
if ((top != bot) && (nonOverlap2Func != NULL))
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
2009-01-29 18:18:53 +01:00
|
|
|
if (!nonOverlap2Func(&newReg, r2, r2BandEnd, top, bot)) return FALSE;
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
ytop = r1->top;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
ytop = r1->top;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If any rectangles got added to the region, try and coalesce them
|
|
|
|
* with rectangles from the previous band. Note we could just do
|
|
|
|
* this test in miCoalesce, but some machines incur a not
|
|
|
|
* inconsiderable cost for function calls, so...
|
|
|
|
*/
|
2009-01-29 18:18:53 +01:00
|
|
|
if (newReg.numRects != curBand)
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
2009-01-29 18:18:53 +01:00
|
|
|
prevBand = REGION_Coalesce (&newReg, prevBand, curBand);
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Now see if we've hit an intersecting band. The two bands only
|
|
|
|
* intersect if ybot > ytop
|
|
|
|
*/
|
2000-03-25 22:44:35 +01:00
|
|
|
ybot = min(r1->bottom, r2->bottom);
|
2009-01-29 18:18:53 +01:00
|
|
|
curBand = newReg.numRects;
|
1998-01-18 19:01:49 +01:00
|
|
|
if (ybot > ytop)
|
|
|
|
{
|
2009-01-29 18:18:53 +01:00
|
|
|
if (!overlapFunc(&newReg, r1, r1BandEnd, r2, r2BandEnd, ytop, ybot)) return FALSE;
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
2002-06-01 01:06:46 +02:00
|
|
|
|
2009-01-29 18:18:53 +01:00
|
|
|
if (newReg.numRects != curBand)
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
2009-01-29 18:18:53 +01:00
|
|
|
prevBand = REGION_Coalesce (&newReg, prevBand, curBand);
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If we've finished with a band (bottom == ybot) we skip forward
|
|
|
|
* in the region to the next band.
|
|
|
|
*/
|
|
|
|
if (r1->bottom == ybot)
|
|
|
|
{
|
|
|
|
r1 = r1BandEnd;
|
|
|
|
}
|
|
|
|
if (r2->bottom == ybot)
|
|
|
|
{
|
|
|
|
r2 = r2BandEnd;
|
|
|
|
}
|
|
|
|
} while ((r1 != r1End) && (r2 != r2End));
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Deal with whichever region still has rectangles left.
|
|
|
|
*/
|
2009-01-29 18:18:53 +01:00
|
|
|
curBand = newReg.numRects;
|
1998-01-18 19:01:49 +01:00
|
|
|
if (r1 != r1End)
|
|
|
|
{
|
2007-12-19 00:26:12 +01:00
|
|
|
if (nonOverlap1Func != NULL)
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
|
|
|
do
|
|
|
|
{
|
|
|
|
r1BandEnd = r1;
|
|
|
|
while ((r1BandEnd < r1End) && (r1BandEnd->top == r1->top))
|
|
|
|
{
|
|
|
|
r1BandEnd++;
|
|
|
|
}
|
2009-01-29 18:18:53 +01:00
|
|
|
if (!nonOverlap1Func(&newReg, r1, r1BandEnd, max(r1->top,ybot), r1->bottom))
|
|
|
|
return FALSE;
|
1998-01-18 19:01:49 +01:00
|
|
|
r1 = r1BandEnd;
|
|
|
|
} while (r1 != r1End);
|
|
|
|
}
|
|
|
|
}
|
2007-12-19 00:26:12 +01:00
|
|
|
else if ((r2 != r2End) && (nonOverlap2Func != NULL))
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
|
|
|
do
|
|
|
|
{
|
|
|
|
r2BandEnd = r2;
|
|
|
|
while ((r2BandEnd < r2End) && (r2BandEnd->top == r2->top))
|
|
|
|
{
|
|
|
|
r2BandEnd++;
|
|
|
|
}
|
2009-01-29 18:18:53 +01:00
|
|
|
if (!nonOverlap2Func(&newReg, r2, r2BandEnd, max(r2->top,ybot), r2->bottom))
|
|
|
|
return FALSE;
|
1998-01-18 19:01:49 +01:00
|
|
|
r2 = r2BandEnd;
|
|
|
|
} while (r2 != r2End);
|
|
|
|
}
|
|
|
|
|
2009-01-29 18:18:53 +01:00
|
|
|
if (newReg.numRects != curBand)
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
2009-01-29 18:18:53 +01:00
|
|
|
REGION_Coalesce (&newReg, prevBand, curBand);
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* A bit of cleanup. To keep regions from growing without bound,
|
|
|
|
* we shrink the array of rectangles to match the new number of
|
|
|
|
* rectangles in the region. This never goes to 0, however...
|
|
|
|
*
|
|
|
|
* Only do this stuff if the number of rectangles allocated is more than
|
|
|
|
* twice the number of rectangles in the region (a simple optimization...).
|
|
|
|
*/
|
2009-01-29 18:18:53 +01:00
|
|
|
if ((newReg.numRects < (newReg.size >> 1)) && (newReg.numRects > 2))
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
2009-01-29 18:18:53 +01:00
|
|
|
RECT *new_rects = HeapReAlloc( GetProcessHeap(), 0, newReg.rects, newReg.numRects * sizeof(RECT) );
|
|
|
|
if (new_rects)
|
|
|
|
{
|
|
|
|
newReg.rects = new_rects;
|
|
|
|
newReg.size = newReg.numRects;
|
|
|
|
}
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
2009-01-29 18:18:53 +01:00
|
|
|
HeapFree( GetProcessHeap(), 0, destReg->rects );
|
|
|
|
destReg->rects = newReg.rects;
|
|
|
|
destReg->size = newReg.size;
|
|
|
|
destReg->numRects = newReg.numRects;
|
|
|
|
return TRUE;
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* Region Intersection
|
|
|
|
***********************************************************************/
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* REGION_IntersectO
|
|
|
|
*
|
|
|
|
* Handle an overlapping band for REGION_Intersect.
|
|
|
|
*
|
|
|
|
* Results:
|
|
|
|
* None.
|
|
|
|
*
|
|
|
|
* Side Effects:
|
|
|
|
* Rectangles may be added to the region.
|
|
|
|
*
|
|
|
|
*/
|
2009-01-29 18:18:53 +01:00
|
|
|
static BOOL REGION_IntersectO(WINEREGION *pReg, RECT *r1, RECT *r1End,
|
|
|
|
RECT *r2, RECT *r2End, INT top, INT bottom)
|
1998-01-18 19:01:49 +01:00
|
|
|
|
|
|
|
{
|
1999-02-26 12:11:13 +01:00
|
|
|
INT left, right;
|
1998-01-18 19:01:49 +01:00
|
|
|
|
|
|
|
while ((r1 != r1End) && (r2 != r2End))
|
|
|
|
{
|
2000-03-25 22:44:35 +01:00
|
|
|
left = max(r1->left, r2->left);
|
|
|
|
right = min(r1->right, r2->right);
|
1998-01-18 19:01:49 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* If there's any overlap between the two rectangles, add that
|
|
|
|
* overlap to the new region.
|
|
|
|
* There's no need to check for subsumption because the only way
|
|
|
|
* such a need could arise is if some region has two rectangles
|
|
|
|
* right next to each other. Since that should never happen...
|
|
|
|
*/
|
|
|
|
if (left < right)
|
2009-01-29 18:18:53 +01:00
|
|
|
{
|
|
|
|
if (!add_rect( pReg, left, top, right, bottom )) return FALSE;
|
|
|
|
}
|
1998-01-18 19:01:49 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Need to advance the pointers. Shift the one that extends
|
|
|
|
* to the right the least, since the other still has a chance to
|
|
|
|
* overlap with that region's next rectangle, if you see what I mean.
|
|
|
|
*/
|
|
|
|
if (r1->right < r2->right)
|
|
|
|
{
|
|
|
|
r1++;
|
|
|
|
}
|
|
|
|
else if (r2->right < r1->right)
|
|
|
|
{
|
|
|
|
r2++;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
r1++;
|
|
|
|
r2++;
|
|
|
|
}
|
|
|
|
}
|
2009-01-29 18:18:53 +01:00
|
|
|
return TRUE;
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* REGION_IntersectRegion
|
|
|
|
*/
|
2009-01-29 18:18:53 +01:00
|
|
|
static BOOL REGION_IntersectRegion(WINEREGION *newReg, WINEREGION *reg1,
|
1998-01-18 19:01:49 +01:00
|
|
|
WINEREGION *reg2)
|
|
|
|
{
|
|
|
|
/* check for trivial reject */
|
|
|
|
if ( (!(reg1->numRects)) || (!(reg2->numRects)) ||
|
|
|
|
(!EXTENTCHECK(®1->extents, ®2->extents)))
|
|
|
|
newReg->numRects = 0;
|
|
|
|
else
|
2009-01-29 18:18:53 +01:00
|
|
|
if (!REGION_RegionOp (newReg, reg1, reg2, REGION_IntersectO, NULL, NULL)) return FALSE;
|
2002-06-01 01:06:46 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
/*
|
|
|
|
* Can't alter newReg's extents before we call miRegionOp because
|
|
|
|
* it might be one of the source regions and miRegionOp depends
|
|
|
|
* on the extents of those regions being the same. Besides, this
|
|
|
|
* way there's no checking against rectangles that will be nuked
|
|
|
|
* due to coalescing, so we have to examine fewer rectangles.
|
|
|
|
*/
|
|
|
|
REGION_SetExtents(newReg);
|
2009-01-29 18:18:53 +01:00
|
|
|
return TRUE;
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* Region Union
|
|
|
|
***********************************************************************/
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* REGION_UnionNonO
|
|
|
|
*
|
|
|
|
* Handle a non-overlapping band for the union operation. Just
|
|
|
|
* Adds the rectangles into the region. Doesn't have to check for
|
|
|
|
* subsumption or anything.
|
|
|
|
*
|
|
|
|
* Results:
|
|
|
|
* None.
|
|
|
|
*
|
|
|
|
* Side Effects:
|
|
|
|
* pReg->numRects is incremented and the final rectangles overwritten
|
|
|
|
* with the rectangles we're passed.
|
|
|
|
*
|
|
|
|
*/
|
2009-01-29 18:18:53 +01:00
|
|
|
static BOOL REGION_UnionNonO(WINEREGION *pReg, RECT *r, RECT *rEnd, INT top, INT bottom)
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
|
|
|
while (r != rEnd)
|
|
|
|
{
|
2009-01-29 18:18:53 +01:00
|
|
|
if (!add_rect( pReg, r->left, top, r->right, bottom )) return FALSE;
|
1998-01-18 19:01:49 +01:00
|
|
|
r++;
|
|
|
|
}
|
2009-01-29 18:18:53 +01:00
|
|
|
return TRUE;
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* REGION_UnionO
|
|
|
|
*
|
|
|
|
* Handle an overlapping band for the union operation. Picks the
|
|
|
|
* left-most rectangle each time and merges it into the region.
|
|
|
|
*
|
|
|
|
* Results:
|
|
|
|
* None.
|
|
|
|
*
|
|
|
|
* Side Effects:
|
|
|
|
* Rectangles are overwritten in pReg->rects and pReg->numRects will
|
|
|
|
* be changed.
|
|
|
|
*
|
|
|
|
*/
|
2009-01-29 18:18:53 +01:00
|
|
|
static BOOL REGION_UnionO (WINEREGION *pReg, RECT *r1, RECT *r1End,
|
1999-02-26 12:11:13 +01:00
|
|
|
RECT *r2, RECT *r2End, INT top, INT bottom)
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
|
|
|
#define MERGERECT(r) \
|
|
|
|
if ((pReg->numRects != 0) && \
|
2009-01-29 17:44:58 +01:00
|
|
|
(pReg->rects[pReg->numRects-1].top == top) && \
|
|
|
|
(pReg->rects[pReg->numRects-1].bottom == bottom) && \
|
|
|
|
(pReg->rects[pReg->numRects-1].right >= r->left)) \
|
1998-01-18 19:01:49 +01:00
|
|
|
{ \
|
2009-01-29 17:44:58 +01:00
|
|
|
if (pReg->rects[pReg->numRects-1].right < r->right) \
|
|
|
|
pReg->rects[pReg->numRects-1].right = r->right; \
|
1998-01-18 19:01:49 +01:00
|
|
|
} \
|
|
|
|
else \
|
2009-01-29 18:18:53 +01:00
|
|
|
{ \
|
|
|
|
if (!add_rect( pReg, r->left, top, r->right, bottom )) return FALSE; \
|
|
|
|
} \
|
1998-01-18 19:01:49 +01:00
|
|
|
r++;
|
2002-06-01 01:06:46 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
while ((r1 != r1End) && (r2 != r2End))
|
|
|
|
{
|
|
|
|
if (r1->left < r2->left)
|
|
|
|
{
|
|
|
|
MERGERECT(r1);
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
MERGERECT(r2);
|
|
|
|
}
|
|
|
|
}
|
2002-06-01 01:06:46 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
if (r1 != r1End)
|
|
|
|
{
|
|
|
|
do
|
|
|
|
{
|
|
|
|
MERGERECT(r1);
|
|
|
|
} while (r1 != r1End);
|
|
|
|
}
|
|
|
|
else while (r2 != r2End)
|
|
|
|
{
|
|
|
|
MERGERECT(r2);
|
|
|
|
}
|
2009-01-29 18:18:53 +01:00
|
|
|
return TRUE;
|
2009-01-29 17:44:58 +01:00
|
|
|
#undef MERGERECT
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* REGION_UnionRegion
|
|
|
|
*/
|
2009-01-29 18:18:53 +01:00
|
|
|
static BOOL REGION_UnionRegion(WINEREGION *newReg, WINEREGION *reg1, WINEREGION *reg2)
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
2009-01-29 18:18:53 +01:00
|
|
|
BOOL ret = TRUE;
|
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
/* checks all the simple cases */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Region 1 and 2 are the same or region 1 is empty
|
|
|
|
*/
|
|
|
|
if ( (reg1 == reg2) || (!(reg1->numRects)) )
|
|
|
|
{
|
|
|
|
if (newReg != reg2)
|
2009-01-29 18:18:53 +01:00
|
|
|
ret = REGION_CopyRegion(newReg, reg2);
|
|
|
|
return ret;
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* if nothing to union (region 2 empty)
|
|
|
|
*/
|
|
|
|
if (!(reg2->numRects))
|
|
|
|
{
|
|
|
|
if (newReg != reg1)
|
2009-01-29 18:18:53 +01:00
|
|
|
ret = REGION_CopyRegion(newReg, reg1);
|
|
|
|
return ret;
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Region 1 completely subsumes region 2
|
|
|
|
*/
|
2002-06-01 01:06:46 +02:00
|
|
|
if ((reg1->numRects == 1) &&
|
1998-01-18 19:01:49 +01:00
|
|
|
(reg1->extents.left <= reg2->extents.left) &&
|
|
|
|
(reg1->extents.top <= reg2->extents.top) &&
|
|
|
|
(reg1->extents.right >= reg2->extents.right) &&
|
|
|
|
(reg1->extents.bottom >= reg2->extents.bottom))
|
|
|
|
{
|
|
|
|
if (newReg != reg1)
|
2009-01-29 18:18:53 +01:00
|
|
|
ret = REGION_CopyRegion(newReg, reg1);
|
|
|
|
return ret;
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Region 2 completely subsumes region 1
|
|
|
|
*/
|
2002-06-01 01:06:46 +02:00
|
|
|
if ((reg2->numRects == 1) &&
|
1998-01-18 19:01:49 +01:00
|
|
|
(reg2->extents.left <= reg1->extents.left) &&
|
|
|
|
(reg2->extents.top <= reg1->extents.top) &&
|
|
|
|
(reg2->extents.right >= reg1->extents.right) &&
|
|
|
|
(reg2->extents.bottom >= reg1->extents.bottom))
|
|
|
|
{
|
|
|
|
if (newReg != reg2)
|
2009-01-29 18:18:53 +01:00
|
|
|
ret = REGION_CopyRegion(newReg, reg2);
|
|
|
|
return ret;
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
|
|
|
|
2009-01-29 18:18:53 +01:00
|
|
|
if ((ret = REGION_RegionOp (newReg, reg1, reg2, REGION_UnionO, REGION_UnionNonO, REGION_UnionNonO)))
|
|
|
|
{
|
|
|
|
newReg->extents.left = min(reg1->extents.left, reg2->extents.left);
|
|
|
|
newReg->extents.top = min(reg1->extents.top, reg2->extents.top);
|
|
|
|
newReg->extents.right = max(reg1->extents.right, reg2->extents.right);
|
|
|
|
newReg->extents.bottom = max(reg1->extents.bottom, reg2->extents.bottom);
|
|
|
|
}
|
|
|
|
return ret;
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* Region Subtraction
|
|
|
|
***********************************************************************/
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* REGION_SubtractNonO1
|
|
|
|
*
|
|
|
|
* Deal with non-overlapping band for subtraction. Any parts from
|
|
|
|
* region 2 we discard. Anything from region 1 we add to the region.
|
|
|
|
*
|
|
|
|
* Results:
|
|
|
|
* None.
|
|
|
|
*
|
|
|
|
* Side Effects:
|
|
|
|
* pReg may be affected.
|
|
|
|
*
|
|
|
|
*/
|
2009-01-29 18:18:53 +01:00
|
|
|
static BOOL REGION_SubtractNonO1 (WINEREGION *pReg, RECT *r, RECT *rEnd, INT top, INT bottom)
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
|
|
|
while (r != rEnd)
|
|
|
|
{
|
2009-01-29 18:18:53 +01:00
|
|
|
if (!add_rect( pReg, r->left, top, r->right, bottom )) return FALSE;
|
1998-01-18 19:01:49 +01:00
|
|
|
r++;
|
|
|
|
}
|
2009-01-29 18:18:53 +01:00
|
|
|
return TRUE;
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* REGION_SubtractO
|
|
|
|
*
|
|
|
|
* Overlapping band subtraction. x1 is the left-most point not yet
|
|
|
|
* checked.
|
|
|
|
*
|
|
|
|
* Results:
|
|
|
|
* None.
|
|
|
|
*
|
|
|
|
* Side Effects:
|
|
|
|
* pReg may have rectangles added to it.
|
|
|
|
*
|
|
|
|
*/
|
2009-01-29 18:18:53 +01:00
|
|
|
static BOOL REGION_SubtractO (WINEREGION *pReg, RECT *r1, RECT *r1End,
|
|
|
|
RECT *r2, RECT *r2End, INT top, INT bottom)
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
2009-01-29 18:18:53 +01:00
|
|
|
INT left = r1->left;
|
1998-01-18 19:01:49 +01:00
|
|
|
|
|
|
|
while ((r1 != r1End) && (r2 != r2End))
|
|
|
|
{
|
|
|
|
if (r2->right <= left)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Subtrahend missed the boat: go to next subtrahend.
|
|
|
|
*/
|
|
|
|
r2++;
|
|
|
|
}
|
|
|
|
else if (r2->left <= left)
|
|
|
|
{
|
|
|
|
/*
|
2005-03-02 14:53:50 +01:00
|
|
|
* Subtrahend precedes minuend: nuke left edge of minuend.
|
1998-01-18 19:01:49 +01:00
|
|
|
*/
|
|
|
|
left = r2->right;
|
|
|
|
if (left >= r1->right)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Minuend completely covered: advance to next minuend and
|
|
|
|
* reset left fence to edge of new minuend.
|
|
|
|
*/
|
|
|
|
r1++;
|
|
|
|
if (r1 != r1End)
|
|
|
|
left = r1->left;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Subtrahend now used up since it doesn't extend beyond
|
|
|
|
* minuend
|
|
|
|
*/
|
|
|
|
r2++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else if (r2->left < r1->right)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Left part of subtrahend covers part of minuend: add uncovered
|
|
|
|
* part of minuend to region and skip to next subtrahend.
|
|
|
|
*/
|
2009-01-29 18:18:53 +01:00
|
|
|
if (!add_rect( pReg, left, top, r2->left, bottom )) return FALSE;
|
1998-01-18 19:01:49 +01:00
|
|
|
left = r2->right;
|
|
|
|
if (left >= r1->right)
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Minuend used up: advance to new...
|
|
|
|
*/
|
|
|
|
r1++;
|
|
|
|
if (r1 != r1End)
|
|
|
|
left = r1->left;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Subtrahend used up
|
|
|
|
*/
|
|
|
|
r2++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
/*
|
|
|
|
* Minuend used up: add any remaining piece before advancing.
|
|
|
|
*/
|
|
|
|
if (r1->right > left)
|
|
|
|
{
|
2009-01-29 18:18:53 +01:00
|
|
|
if (!add_rect( pReg, left, top, r1->right, bottom )) return FALSE;
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
|
|
|
r1++;
|
2009-11-28 08:39:28 +01:00
|
|
|
if (r1 != r1End)
|
|
|
|
left = r1->left;
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Add remaining minuend rectangles to region.
|
|
|
|
*/
|
|
|
|
while (r1 != r1End)
|
|
|
|
{
|
2009-01-29 18:18:53 +01:00
|
|
|
if (!add_rect( pReg, left, top, r1->right, bottom )) return FALSE;
|
1998-01-18 19:01:49 +01:00
|
|
|
r1++;
|
|
|
|
if (r1 != r1End)
|
|
|
|
{
|
|
|
|
left = r1->left;
|
|
|
|
}
|
|
|
|
}
|
2009-01-29 18:18:53 +01:00
|
|
|
return TRUE;
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
2002-06-01 01:06:46 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
/***********************************************************************
|
|
|
|
* REGION_SubtractRegion
|
|
|
|
*
|
|
|
|
* Subtract regS from regM and leave the result in regD.
|
|
|
|
* S stands for subtrahend, M for minuend and D for difference.
|
|
|
|
*
|
|
|
|
* Results:
|
|
|
|
* TRUE.
|
|
|
|
*
|
|
|
|
* Side Effects:
|
|
|
|
* regD is overwritten.
|
|
|
|
*
|
|
|
|
*/
|
2009-01-29 18:18:53 +01:00
|
|
|
static BOOL REGION_SubtractRegion(WINEREGION *regD, WINEREGION *regM, WINEREGION *regS )
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
|
|
|
/* check for trivial reject */
|
|
|
|
if ( (!(regM->numRects)) || (!(regS->numRects)) ||
|
|
|
|
(!EXTENTCHECK(®M->extents, ®S->extents)) )
|
2009-01-29 18:18:53 +01:00
|
|
|
return REGION_CopyRegion(regD, regM);
|
2002-06-01 01:06:46 +02:00
|
|
|
|
2009-01-29 18:18:53 +01:00
|
|
|
if (!REGION_RegionOp (regD, regM, regS, REGION_SubtractO, REGION_SubtractNonO1, NULL))
|
|
|
|
return FALSE;
|
1998-01-18 19:01:49 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Can't alter newReg's extents before we call miRegionOp because
|
|
|
|
* it might be one of the source regions and miRegionOp depends
|
|
|
|
* on the extents of those regions being the unaltered. Besides, this
|
|
|
|
* way there's no checking against rectangles that will be nuked
|
|
|
|
* due to coalescing, so we have to examine fewer rectangles.
|
|
|
|
*/
|
|
|
|
REGION_SetExtents (regD);
|
2009-01-29 18:18:53 +01:00
|
|
|
return TRUE;
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* REGION_XorRegion
|
|
|
|
*/
|
2009-01-29 18:18:53 +01:00
|
|
|
static BOOL REGION_XorRegion(WINEREGION *dr, WINEREGION *sra, WINEREGION *srb)
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
2009-01-29 16:38:53 +01:00
|
|
|
WINEREGION tra, trb;
|
2009-01-29 18:18:53 +01:00
|
|
|
BOOL ret;
|
1998-01-18 19:01:49 +01:00
|
|
|
|
2009-01-29 18:18:53 +01:00
|
|
|
if (!init_region( &tra, sra->numRects + 1 )) return FALSE;
|
|
|
|
if ((ret = init_region( &trb, srb->numRects + 1 )))
|
2009-01-29 16:38:53 +01:00
|
|
|
{
|
2009-01-29 18:18:53 +01:00
|
|
|
ret = REGION_SubtractRegion(&tra,sra,srb) &&
|
|
|
|
REGION_SubtractRegion(&trb,srb,sra) &&
|
|
|
|
REGION_UnionRegion(dr,&tra,&trb);
|
2009-01-29 16:38:53 +01:00
|
|
|
destroy_region(&trb);
|
|
|
|
}
|
|
|
|
destroy_region(&tra);
|
2009-01-29 18:18:53 +01:00
|
|
|
return ret;
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/**************************************************************************
|
|
|
|
*
|
|
|
|
* Poly Regions
|
2002-06-01 01:06:46 +02:00
|
|
|
*
|
1998-01-18 19:01:49 +01:00
|
|
|
*************************************************************************/
|
|
|
|
|
|
|
|
#define LARGE_COORDINATE 0x7fffffff /* FIXME */
|
|
|
|
#define SMALL_COORDINATE 0x80000000
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* REGION_InsertEdgeInET
|
|
|
|
*
|
|
|
|
* Insert the given edge into the edge table.
|
|
|
|
* First we must find the correct bucket in the
|
|
|
|
* Edge table, then find the right slot in the
|
|
|
|
* bucket. Finally, we can insert it.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
static void REGION_InsertEdgeInET(EdgeTable *ET, EdgeTableEntry *ETE,
|
1999-02-26 12:11:13 +01:00
|
|
|
INT scanline, ScanLineListBlock **SLLBlock, INT *iSLLBlock)
|
1998-01-18 19:01:49 +01:00
|
|
|
|
|
|
|
{
|
|
|
|
EdgeTableEntry *start, *prev;
|
|
|
|
ScanLineList *pSLL, *pPrevSLL;
|
|
|
|
ScanLineListBlock *tmpSLLBlock;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* find the right bucket to put the edge into
|
|
|
|
*/
|
|
|
|
pPrevSLL = &ET->scanlines;
|
|
|
|
pSLL = pPrevSLL->next;
|
2002-06-01 01:06:46 +02:00
|
|
|
while (pSLL && (pSLL->scanline < scanline))
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
|
|
|
pPrevSLL = pSLL;
|
|
|
|
pSLL = pSLL->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* reassign pSLL (pointer to ScanLineList) if necessary
|
|
|
|
*/
|
2002-06-01 01:06:46 +02:00
|
|
|
if ((!pSLL) || (pSLL->scanline > scanline))
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
2002-06-01 01:06:46 +02:00
|
|
|
if (*iSLLBlock > SLLSPERBLOCK-1)
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
2000-02-16 23:47:24 +01:00
|
|
|
tmpSLLBlock = HeapAlloc( GetProcessHeap(), 0, sizeof(ScanLineListBlock));
|
1998-01-18 19:01:49 +01:00
|
|
|
if(!tmpSLLBlock)
|
|
|
|
{
|
1999-05-23 12:25:25 +02:00
|
|
|
WARN("Can't alloc SLLB\n");
|
1998-01-18 19:01:49 +01:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
(*SLLBlock)->next = tmpSLLBlock;
|
2008-10-31 12:43:52 +01:00
|
|
|
tmpSLLBlock->next = NULL;
|
1998-01-18 19:01:49 +01:00
|
|
|
*SLLBlock = tmpSLLBlock;
|
|
|
|
*iSLLBlock = 0;
|
|
|
|
}
|
|
|
|
pSLL = &((*SLLBlock)->SLLs[(*iSLLBlock)++]);
|
|
|
|
|
|
|
|
pSLL->next = pPrevSLL->next;
|
2008-10-31 12:43:52 +01:00
|
|
|
pSLL->edgelist = NULL;
|
1998-01-18 19:01:49 +01:00
|
|
|
pPrevSLL->next = pSLL;
|
|
|
|
}
|
|
|
|
pSLL->scanline = scanline;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* now insert the edge in the right bucket
|
|
|
|
*/
|
2008-10-31 12:43:52 +01:00
|
|
|
prev = NULL;
|
1998-01-18 19:01:49 +01:00
|
|
|
start = pSLL->edgelist;
|
2002-06-01 01:06:46 +02:00
|
|
|
while (start && (start->bres.minor_axis < ETE->bres.minor_axis))
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
|
|
|
prev = start;
|
|
|
|
start = start->next;
|
|
|
|
}
|
|
|
|
ETE->next = start;
|
|
|
|
|
|
|
|
if (prev)
|
|
|
|
prev->next = ETE;
|
|
|
|
else
|
|
|
|
pSLL->edgelist = ETE;
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* REGION_CreateEdgeTable
|
|
|
|
*
|
|
|
|
* This routine creates the edge table for
|
2002-06-01 01:06:46 +02:00
|
|
|
* scan converting polygons.
|
1998-01-18 19:01:49 +01:00
|
|
|
* The Edge Table (ET) looks like:
|
|
|
|
*
|
|
|
|
* EdgeTable
|
|
|
|
* --------
|
|
|
|
* | ymax | ScanLineLists
|
|
|
|
* |scanline|-->------------>-------------->...
|
|
|
|
* -------- |scanline| |scanline|
|
|
|
|
* |edgelist| |edgelist|
|
|
|
|
* --------- ---------
|
|
|
|
* | |
|
|
|
|
* | |
|
|
|
|
* V V
|
|
|
|
* list of ETEs list of ETEs
|
|
|
|
*
|
|
|
|
* where ETE is an EdgeTableEntry data structure,
|
|
|
|
* and there is one ScanLineList per scanline at
|
|
|
|
* which an edge is initially entered.
|
|
|
|
*
|
|
|
|
*/
|
2002-06-01 01:06:46 +02:00
|
|
|
static void REGION_CreateETandAET(const INT *Count, INT nbpolygons,
|
1999-02-26 12:11:13 +01:00
|
|
|
const POINT *pts, EdgeTable *ET, EdgeTableEntry *AET,
|
1998-01-18 19:01:49 +01:00
|
|
|
EdgeTableEntry *pETEs, ScanLineListBlock *pSLLBlock)
|
|
|
|
{
|
1999-02-26 12:11:13 +01:00
|
|
|
const POINT *top, *bottom;
|
|
|
|
const POINT *PrevPt, *CurrPt, *EndPt;
|
|
|
|
INT poly, count;
|
1998-01-18 19:01:49 +01:00
|
|
|
int iSLLBlock = 0;
|
|
|
|
int dy;
|
|
|
|
|
2002-06-01 01:06:46 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
/*
|
|
|
|
* initialize the Active Edge Table
|
|
|
|
*/
|
2008-10-31 12:43:52 +01:00
|
|
|
AET->next = NULL;
|
|
|
|
AET->back = NULL;
|
|
|
|
AET->nextWETE = NULL;
|
1998-01-18 19:01:49 +01:00
|
|
|
AET->bres.minor_axis = SMALL_COORDINATE;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* initialize the Edge Table.
|
|
|
|
*/
|
2008-10-31 12:43:52 +01:00
|
|
|
ET->scanlines.next = NULL;
|
1998-01-18 19:01:49 +01:00
|
|
|
ET->ymax = SMALL_COORDINATE;
|
|
|
|
ET->ymin = LARGE_COORDINATE;
|
2008-10-31 12:43:52 +01:00
|
|
|
pSLLBlock->next = NULL;
|
1998-01-18 19:01:49 +01:00
|
|
|
|
|
|
|
EndPt = pts - 1;
|
|
|
|
for(poly = 0; poly < nbpolygons; poly++)
|
|
|
|
{
|
|
|
|
count = Count[poly];
|
|
|
|
EndPt += count;
|
|
|
|
if(count < 2)
|
|
|
|
continue;
|
2002-06-01 01:06:46 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
PrevPt = EndPt;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* for each vertex in the array of points.
|
|
|
|
* In this loop we are dealing with two vertices at
|
|
|
|
* a time -- these make up one edge of the polygon.
|
|
|
|
*/
|
2002-06-01 01:06:46 +02:00
|
|
|
while (count--)
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
|
|
|
CurrPt = pts++;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* find out which point is above and which is below.
|
|
|
|
*/
|
2002-06-01 01:06:46 +02:00
|
|
|
if (PrevPt->y > CurrPt->y)
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
|
|
|
bottom = PrevPt, top = CurrPt;
|
|
|
|
pETEs->ClockWise = 0;
|
|
|
|
}
|
2002-06-01 01:06:46 +02:00
|
|
|
else
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
|
|
|
bottom = CurrPt, top = PrevPt;
|
|
|
|
pETEs->ClockWise = 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* don't add horizontal edges to the Edge table.
|
|
|
|
*/
|
2002-06-01 01:06:46 +02:00
|
|
|
if (bottom->y != top->y)
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
|
|
|
pETEs->ymax = bottom->y-1;
|
|
|
|
/* -1 so we don't get last scanline */
|
|
|
|
|
|
|
|
/*
|
|
|
|
* initialize integer edge algorithm
|
|
|
|
*/
|
|
|
|
dy = bottom->y - top->y;
|
|
|
|
BRESINITPGONSTRUCT(dy, top->x, bottom->x, pETEs->bres);
|
|
|
|
|
2002-06-01 01:06:46 +02:00
|
|
|
REGION_InsertEdgeInET(ET, pETEs, top->y, &pSLLBlock,
|
1998-01-18 19:01:49 +01:00
|
|
|
&iSLLBlock);
|
|
|
|
|
|
|
|
if (PrevPt->y > ET->ymax)
|
|
|
|
ET->ymax = PrevPt->y;
|
|
|
|
if (PrevPt->y < ET->ymin)
|
|
|
|
ET->ymin = PrevPt->y;
|
|
|
|
pETEs++;
|
|
|
|
}
|
|
|
|
|
|
|
|
PrevPt = CurrPt;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* REGION_loadAET
|
|
|
|
*
|
|
|
|
* This routine moves EdgeTableEntries from the
|
|
|
|
* EdgeTable into the Active Edge Table,
|
|
|
|
* leaving them sorted by smaller x coordinate.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
static void REGION_loadAET(EdgeTableEntry *AET, EdgeTableEntry *ETEs)
|
|
|
|
{
|
|
|
|
EdgeTableEntry *pPrevAET;
|
|
|
|
EdgeTableEntry *tmp;
|
|
|
|
|
|
|
|
pPrevAET = AET;
|
|
|
|
AET = AET->next;
|
2002-06-01 01:06:46 +02:00
|
|
|
while (ETEs)
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
2002-06-01 01:06:46 +02:00
|
|
|
while (AET && (AET->bres.minor_axis < ETEs->bres.minor_axis))
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
|
|
|
pPrevAET = AET;
|
|
|
|
AET = AET->next;
|
|
|
|
}
|
|
|
|
tmp = ETEs->next;
|
|
|
|
ETEs->next = AET;
|
|
|
|
if (AET)
|
|
|
|
AET->back = ETEs;
|
|
|
|
ETEs->back = pPrevAET;
|
|
|
|
pPrevAET->next = ETEs;
|
|
|
|
pPrevAET = ETEs;
|
|
|
|
|
|
|
|
ETEs = tmp;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* REGION_computeWAET
|
|
|
|
*
|
|
|
|
* This routine links the AET by the
|
|
|
|
* nextWETE (winding EdgeTableEntry) link for
|
2002-06-01 01:06:46 +02:00
|
|
|
* use by the winding number rule. The final
|
1998-01-18 19:01:49 +01:00
|
|
|
* Active Edge Table (AET) might look something
|
|
|
|
* like:
|
|
|
|
*
|
|
|
|
* AET
|
|
|
|
* ---------- --------- ---------
|
2002-06-01 01:06:46 +02:00
|
|
|
* |ymax | |ymax | |ymax |
|
1998-01-18 19:01:49 +01:00
|
|
|
* | ... | |... | |... |
|
|
|
|
* |next |->|next |->|next |->...
|
|
|
|
* |nextWETE| |nextWETE| |nextWETE|
|
|
|
|
* --------- --------- ^--------
|
|
|
|
* | | |
|
|
|
|
* V-------------------> V---> ...
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
static void REGION_computeWAET(EdgeTableEntry *AET)
|
|
|
|
{
|
|
|
|
register EdgeTableEntry *pWETE;
|
|
|
|
register int inside = 1;
|
|
|
|
register int isInside = 0;
|
|
|
|
|
2008-10-31 12:43:52 +01:00
|
|
|
AET->nextWETE = NULL;
|
1998-01-18 19:01:49 +01:00
|
|
|
pWETE = AET;
|
|
|
|
AET = AET->next;
|
2002-06-01 01:06:46 +02:00
|
|
|
while (AET)
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
|
|
|
if (AET->ClockWise)
|
|
|
|
isInside++;
|
|
|
|
else
|
|
|
|
isInside--;
|
|
|
|
|
|
|
|
if ((!inside && !isInside) ||
|
2002-06-01 01:06:46 +02:00
|
|
|
( inside && isInside))
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
|
|
|
pWETE->nextWETE = AET;
|
|
|
|
pWETE = AET;
|
|
|
|
inside = !inside;
|
|
|
|
}
|
|
|
|
AET = AET->next;
|
|
|
|
}
|
2008-10-31 12:43:52 +01:00
|
|
|
pWETE->nextWETE = NULL;
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* REGION_InsertionSort
|
|
|
|
*
|
|
|
|
* Just a simple insertion sort using
|
|
|
|
* pointers and back pointers to sort the Active
|
|
|
|
* Edge Table.
|
|
|
|
*
|
|
|
|
*/
|
1999-02-26 12:11:13 +01:00
|
|
|
static BOOL REGION_InsertionSort(EdgeTableEntry *AET)
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
|
|
|
EdgeTableEntry *pETEchase;
|
|
|
|
EdgeTableEntry *pETEinsert;
|
|
|
|
EdgeTableEntry *pETEchaseBackTMP;
|
1999-02-26 12:11:13 +01:00
|
|
|
BOOL changed = FALSE;
|
1998-01-18 19:01:49 +01:00
|
|
|
|
|
|
|
AET = AET->next;
|
2002-06-01 01:06:46 +02:00
|
|
|
while (AET)
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
|
|
|
pETEinsert = AET;
|
|
|
|
pETEchase = AET;
|
|
|
|
while (pETEchase->back->bres.minor_axis > AET->bres.minor_axis)
|
|
|
|
pETEchase = pETEchase->back;
|
|
|
|
|
|
|
|
AET = AET->next;
|
2002-06-01 01:06:46 +02:00
|
|
|
if (pETEchase != pETEinsert)
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
|
|
|
pETEchaseBackTMP = pETEchase->back;
|
|
|
|
pETEinsert->back->next = AET;
|
|
|
|
if (AET)
|
|
|
|
AET->back = pETEinsert->back;
|
|
|
|
pETEinsert->next = pETEchase;
|
|
|
|
pETEchase->back->next = pETEinsert;
|
|
|
|
pETEchase->back = pETEinsert;
|
|
|
|
pETEinsert->back = pETEchaseBackTMP;
|
|
|
|
changed = TRUE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return changed;
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* REGION_FreeStorage
|
|
|
|
*
|
|
|
|
* Clean up our act.
|
|
|
|
*/
|
|
|
|
static void REGION_FreeStorage(ScanLineListBlock *pSLLBlock)
|
|
|
|
{
|
|
|
|
ScanLineListBlock *tmpSLLBlock;
|
|
|
|
|
2002-06-01 01:06:46 +02:00
|
|
|
while (pSLLBlock)
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
|
|
|
tmpSLLBlock = pSLLBlock->next;
|
2000-02-16 23:47:24 +01:00
|
|
|
HeapFree( GetProcessHeap(), 0, pSLLBlock );
|
1998-01-18 19:01:49 +01:00
|
|
|
pSLLBlock = tmpSLLBlock;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
|
|
|
* REGION_PtsToRegion
|
|
|
|
*
|
|
|
|
* Create an array of rectangles from a list of points.
|
|
|
|
*/
|
2009-01-29 17:32:06 +01:00
|
|
|
static BOOL REGION_PtsToRegion(int numFullPtBlocks, int iCurPtBlock,
|
|
|
|
POINTBLOCK *FirstPtBlock, WINEREGION *reg)
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
1999-02-26 12:11:13 +01:00
|
|
|
RECT *rects;
|
|
|
|
POINT *pts;
|
1998-01-18 19:01:49 +01:00
|
|
|
POINTBLOCK *CurPtBlock;
|
|
|
|
int i;
|
1999-02-26 12:11:13 +01:00
|
|
|
RECT *extents;
|
|
|
|
INT numRects;
|
2002-06-01 01:06:46 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
extents = ®->extents;
|
2002-06-01 01:06:46 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
numRects = ((numFullPtBlocks * NUMPTSTOBUFFER) + iCurPtBlock) >> 1;
|
2009-01-29 17:32:06 +01:00
|
|
|
if (!init_region( reg, numRects )) return FALSE;
|
2002-06-01 01:06:46 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
reg->size = numRects;
|
|
|
|
CurPtBlock = FirstPtBlock;
|
|
|
|
rects = reg->rects - 1;
|
|
|
|
numRects = 0;
|
|
|
|
extents->left = LARGE_COORDINATE, extents->right = SMALL_COORDINATE;
|
2002-06-01 01:06:46 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
for ( ; numFullPtBlocks >= 0; numFullPtBlocks--) {
|
|
|
|
/* the loop uses 2 points per iteration */
|
|
|
|
i = NUMPTSTOBUFFER >> 1;
|
|
|
|
if (!numFullPtBlocks)
|
|
|
|
i = iCurPtBlock >> 1;
|
|
|
|
for (pts = CurPtBlock->pts; i--; pts += 2) {
|
|
|
|
if (pts->x == pts[1].x)
|
|
|
|
continue;
|
|
|
|
if (numRects && pts->x == rects->left && pts->y == rects->bottom &&
|
|
|
|
pts[1].x == rects->right &&
|
|
|
|
(numRects == 1 || rects[-1].top != rects->top) &&
|
|
|
|
(i && pts[2].y > pts[1].y)) {
|
|
|
|
rects->bottom = pts[1].y + 1;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
numRects++;
|
|
|
|
rects++;
|
|
|
|
rects->left = pts->x; rects->top = pts->y;
|
|
|
|
rects->right = pts[1].x; rects->bottom = pts[1].y + 1;
|
|
|
|
if (rects->left < extents->left)
|
|
|
|
extents->left = rects->left;
|
|
|
|
if (rects->right > extents->right)
|
|
|
|
extents->right = rects->right;
|
|
|
|
}
|
|
|
|
CurPtBlock = CurPtBlock->next;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (numRects) {
|
|
|
|
extents->top = reg->rects->top;
|
|
|
|
extents->bottom = rects->bottom;
|
|
|
|
} else {
|
|
|
|
extents->left = 0;
|
|
|
|
extents->top = 0;
|
|
|
|
extents->right = 0;
|
|
|
|
extents->bottom = 0;
|
|
|
|
}
|
|
|
|
reg->numRects = numRects;
|
2002-06-01 01:06:46 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
return(TRUE);
|
|
|
|
}
|
|
|
|
|
|
|
|
/***********************************************************************
|
2001-02-15 00:11:17 +01:00
|
|
|
* CreatePolyPolygonRgn (GDI32.@)
|
1998-01-18 19:01:49 +01:00
|
|
|
*/
|
2002-06-01 01:06:46 +02:00
|
|
|
HRGN WINAPI CreatePolyPolygonRgn(const POINT *Pts, const INT *Count,
|
1999-02-26 12:11:13 +01:00
|
|
|
INT nbpolygons, INT mode)
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
2009-01-29 17:32:06 +01:00
|
|
|
HRGN hrgn = 0;
|
1998-01-18 19:01:49 +01:00
|
|
|
RGNOBJ *obj;
|
2009-01-29 16:38:53 +01:00
|
|
|
EdgeTableEntry *pAET; /* Active Edge Table */
|
|
|
|
INT y; /* current scanline */
|
|
|
|
int iPts = 0; /* number of pts in buffer */
|
|
|
|
EdgeTableEntry *pWETE; /* Winding Edge Table Entry*/
|
|
|
|
ScanLineList *pSLL; /* current scanLineList */
|
|
|
|
POINT *pts; /* output buffer */
|
1998-01-18 19:01:49 +01:00
|
|
|
EdgeTableEntry *pPrevAET; /* ptr to previous AET */
|
|
|
|
EdgeTable ET; /* header node for ET */
|
|
|
|
EdgeTableEntry AET; /* header node for AET */
|
|
|
|
EdgeTableEntry *pETEs; /* EdgeTableEntries pool */
|
|
|
|
ScanLineListBlock SLLBlock; /* header for scanlinelist */
|
|
|
|
int fixWAET = FALSE;
|
|
|
|
POINTBLOCK FirstPtBlock, *curPtBlock; /* PtBlock buffers */
|
|
|
|
POINTBLOCK *tmpPtBlock;
|
|
|
|
int numFullPtBlocks = 0;
|
1999-02-26 12:11:13 +01:00
|
|
|
INT poly, total;
|
1998-01-18 19:01:49 +01:00
|
|
|
|
2008-04-18 15:42:43 +02:00
|
|
|
TRACE("%p, count %d, polygons %d, mode %d\n", Pts, *Count, nbpolygons, mode);
|
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
/* special case a rectangle */
|
|
|
|
|
|
|
|
if (((nbpolygons == 1) && ((*Count == 4) ||
|
|
|
|
((*Count == 5) && (Pts[4].x == Pts[0].x) && (Pts[4].y == Pts[0].y)))) &&
|
|
|
|
(((Pts[0].y == Pts[1].y) &&
|
|
|
|
(Pts[1].x == Pts[2].x) &&
|
|
|
|
(Pts[2].y == Pts[3].y) &&
|
|
|
|
(Pts[3].x == Pts[0].x)) ||
|
|
|
|
((Pts[0].x == Pts[1].x) &&
|
|
|
|
(Pts[1].y == Pts[2].y) &&
|
|
|
|
(Pts[2].x == Pts[3].x) &&
|
|
|
|
(Pts[3].y == Pts[0].y))))
|
2009-01-29 17:32:06 +01:00
|
|
|
return CreateRectRgn( min(Pts[0].x, Pts[2].x), min(Pts[0].y, Pts[2].y),
|
|
|
|
max(Pts[0].x, Pts[2].x), max(Pts[0].y, Pts[2].y) );
|
2002-06-01 01:06:46 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
for(poly = total = 0; poly < nbpolygons; poly++)
|
|
|
|
total += Count[poly];
|
2000-02-16 23:47:24 +01:00
|
|
|
if (! (pETEs = HeapAlloc( GetProcessHeap(), 0, sizeof(EdgeTableEntry) * total )))
|
1998-01-18 19:01:49 +01:00
|
|
|
return 0;
|
2009-01-29 17:32:06 +01:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
pts = FirstPtBlock.pts;
|
|
|
|
REGION_CreateETandAET(Count, nbpolygons, Pts, &ET, &AET, pETEs, &SLLBlock);
|
|
|
|
pSLL = ET.scanlines.next;
|
|
|
|
curPtBlock = &FirstPtBlock;
|
2002-06-01 01:06:46 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
if (mode != WINDING) {
|
|
|
|
/*
|
|
|
|
* for each scanline
|
|
|
|
*/
|
|
|
|
for (y = ET.ymin; y < ET.ymax; y++) {
|
|
|
|
/*
|
|
|
|
* Add a new edge to the active edge table when we
|
|
|
|
* get to the next edge.
|
|
|
|
*/
|
|
|
|
if (pSLL != NULL && y == pSLL->scanline) {
|
|
|
|
REGION_loadAET(&AET, pSLL->edgelist);
|
|
|
|
pSLL = pSLL->next;
|
|
|
|
}
|
|
|
|
pPrevAET = &AET;
|
|
|
|
pAET = AET.next;
|
2002-06-01 01:06:46 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
/*
|
|
|
|
* for each active edge
|
|
|
|
*/
|
|
|
|
while (pAET) {
|
|
|
|
pts->x = pAET->bres.minor_axis, pts->y = y;
|
|
|
|
pts++, iPts++;
|
2002-06-01 01:06:46 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
/*
|
|
|
|
* send out the buffer
|
|
|
|
*/
|
|
|
|
if (iPts == NUMPTSTOBUFFER) {
|
2000-02-16 23:47:24 +01:00
|
|
|
tmpPtBlock = HeapAlloc( GetProcessHeap(), 0, sizeof(POINTBLOCK));
|
2009-01-29 17:32:06 +01:00
|
|
|
if(!tmpPtBlock) goto done;
|
1998-01-18 19:01:49 +01:00
|
|
|
curPtBlock->next = tmpPtBlock;
|
|
|
|
curPtBlock = tmpPtBlock;
|
|
|
|
pts = curPtBlock->pts;
|
|
|
|
numFullPtBlocks++;
|
|
|
|
iPts = 0;
|
|
|
|
}
|
|
|
|
EVALUATEEDGEEVENODD(pAET, pPrevAET, y);
|
|
|
|
}
|
|
|
|
REGION_InsertionSort(&AET);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
/*
|
|
|
|
* for each scanline
|
|
|
|
*/
|
|
|
|
for (y = ET.ymin; y < ET.ymax; y++) {
|
|
|
|
/*
|
|
|
|
* Add a new edge to the active edge table when we
|
|
|
|
* get to the next edge.
|
|
|
|
*/
|
|
|
|
if (pSLL != NULL && y == pSLL->scanline) {
|
|
|
|
REGION_loadAET(&AET, pSLL->edgelist);
|
|
|
|
REGION_computeWAET(&AET);
|
|
|
|
pSLL = pSLL->next;
|
|
|
|
}
|
|
|
|
pPrevAET = &AET;
|
|
|
|
pAET = AET.next;
|
|
|
|
pWETE = pAET;
|
2002-06-01 01:06:46 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
/*
|
|
|
|
* for each active edge
|
|
|
|
*/
|
|
|
|
while (pAET) {
|
|
|
|
/*
|
|
|
|
* add to the buffer only those edges that
|
|
|
|
* are in the Winding active edge table.
|
|
|
|
*/
|
|
|
|
if (pWETE == pAET) {
|
|
|
|
pts->x = pAET->bres.minor_axis, pts->y = y;
|
|
|
|
pts++, iPts++;
|
2002-06-01 01:06:46 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
/*
|
|
|
|
* send out the buffer
|
|
|
|
*/
|
|
|
|
if (iPts == NUMPTSTOBUFFER) {
|
2000-02-16 23:47:24 +01:00
|
|
|
tmpPtBlock = HeapAlloc( GetProcessHeap(), 0,
|
1998-01-18 19:01:49 +01:00
|
|
|
sizeof(POINTBLOCK) );
|
2009-01-29 17:32:06 +01:00
|
|
|
if(!tmpPtBlock) goto done;
|
1998-01-18 19:01:49 +01:00
|
|
|
curPtBlock->next = tmpPtBlock;
|
|
|
|
curPtBlock = tmpPtBlock;
|
|
|
|
pts = curPtBlock->pts;
|
2009-01-29 17:32:06 +01:00
|
|
|
numFullPtBlocks++;
|
|
|
|
iPts = 0;
|
1998-01-18 19:01:49 +01:00
|
|
|
}
|
|
|
|
pWETE = pWETE->nextWETE;
|
|
|
|
}
|
|
|
|
EVALUATEEDGEWINDING(pAET, pPrevAET, y, fixWAET);
|
|
|
|
}
|
2002-06-01 01:06:46 +02:00
|
|
|
|
1998-01-18 19:01:49 +01:00
|
|
|
/*
|
|
|
|
* recompute the winding active edge table if
|
|
|
|
* we just resorted or have exited an edge.
|
|
|
|
*/
|
|
|
|
if (REGION_InsertionSort(&AET) || fixWAET) {
|
|
|
|
REGION_computeWAET(&AET);
|
|
|
|
fixWAET = FALSE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2000-02-25 21:42:11 +01:00
|
|
|
|
2009-01-29 17:32:06 +01:00
|
|
|
if (!(obj = HeapAlloc( GetProcessHeap(), 0, sizeof(*obj) ))) goto done;
|
|
|
|
|
|
|
|
if (!REGION_PtsToRegion(numFullPtBlocks, iPts, &FirstPtBlock, &obj->rgn))
|
|
|
|
{
|
|
|
|
HeapFree( GetProcessHeap(), 0, obj );
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
if (!(hrgn = alloc_gdi_handle( &obj->header, OBJ_REGION, ®ion_funcs )))
|
|
|
|
{
|
|
|
|
HeapFree( GetProcessHeap(), 0, obj->rgn.rects );
|
|
|
|
HeapFree( GetProcessHeap(), 0, obj );
|
|
|
|
}
|
|
|
|
|
|
|
|
done:
|
|
|
|
REGION_FreeStorage(SLLBlock.next);
|
1998-01-18 19:01:49 +01:00
|
|
|
for (curPtBlock = FirstPtBlock.next; --numFullPtBlocks >= 0;) {
|
|
|
|
tmpPtBlock = curPtBlock->next;
|
2000-02-16 23:47:24 +01:00
|
|
|
HeapFree( GetProcessHeap(), 0, curPtBlock );
|
1998-01-18 19:01:49 +01:00
|
|
|
curPtBlock = tmpPtBlock;
|
|
|
|
}
|
2000-02-16 23:47:24 +01:00
|
|
|
HeapFree( GetProcessHeap(), 0, pETEs );
|
1998-01-18 19:01:49 +01:00
|
|
|
return hrgn;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/***********************************************************************
|
2001-02-15 00:11:17 +01:00
|
|
|
* CreatePolygonRgn (GDI32.@)
|
1998-01-18 19:01:49 +01:00
|
|
|
*/
|
1999-02-26 12:11:13 +01:00
|
|
|
HRGN WINAPI CreatePolygonRgn( const POINT *points, INT count,
|
|
|
|
INT mode )
|
1998-01-18 19:01:49 +01:00
|
|
|
{
|
1999-02-26 12:11:13 +01:00
|
|
|
return CreatePolyPolygonRgn( points, &count, 1, mode );
|
Release 980104
Sat Jan 3 17:15:56 1998 Alexandre Julliard <julliard@lrc.epfl.ch>
* [debugger/db_disasm.c]
Added cpuid and cmpxchg instructions.
* [if1632/builtin.c] [relay32/builtin32.c]
Fixed broken -dll option with Win32 DLLs.
* [include/heap.h]
Added SYSTEM_LOCK/SYSTEM_UNLOCK macros.
* [configure.in] [misc/lstr.c]
Added check for wctype.h.
Commented out --enable-ipc option (IPC code has been broken for a
long time anyway).
* [scheduler/critsection.c] [scheduler/event.c]
[scheduler/mutex.c] [scheduler/semaphore.c]
Implemented Win32 synchronization objects.
* [scheduler/synchro.c]
Implemented WaitForMultipleObjects and related functions.
* [scheduler/thread.c]
If possible, use clone() in CreateThread().
* [scheduler/thread.c] [scheduler/process.c]
Made thread and process waitable objects.
Thread and process id values are now different from the pointers
they represent.
* [win32/k32obj.c]
Moved to scheduler directory.
Added function table for waiting operations on objects.
* [files/file.c] [memory/virtual.c]
Added new K32OBJ function table.
Sun Jan 1 16:48:23 1997 Andreas Mohr <100.30936@germany.net>
* [files/file.c]
Fixed my patch for GetTempFileName16() as needed.
It was ...Name32A() that didn't work properly, not ...Name16().
* [graphics/x11drv/brush.c]
Fixed a BadMatch error.
* [msdos/int21.c]
Fixed INT21_FindNextFCB() to get correct volume labels e.g.
in "file open" dialog.
* [multimedia/joystick.c] [relay32/winmm.spec]
Stub JoyGetPosEx().
* [scheduler/process.c] [relay32/kernel32.spec]
Implemented RegisterServiceProcess().
Wed Dec 31 11:14:43 1997 Lawson Whitney <lawson_whitney@juno.com>
* [if1632/kernel.spec] [if1632/relay.c]
Define CallProcEx32w - Thanks to Marcus Meissner for his excellent
CallProc32W.
* [loader/module.c]
Take a shot at defining FreeLibrary32W.
Sun Dec 28 12:44:04 1997 Kai Morich <kai.morich@rhein-neckar.netsurf.de>
* [controls/menu.c]
Menu modification from WM_INITMENUPOPUP message fixed.
Menu items now can have different wID and hSubMenu (Win95 behavior).
* [misc/cpu.c]
Improved IsProcessorFeaturePresent.
Sun Dec 28 03:21:08 1997 Ove Kaaven <ovek@main.arcticnet.no>
* [include/winsock.h] [misc/winsock.c]
Fixed WS_SOL_SOCKET for setsockopt(), and made select() return
empty fd_sets if timeout.
* [objects/palette.c]
AnimatePalette() bailed out if entire palette is animated. Fixed.
* [objects/dib.c]
Added some code to SetDIBitsToDevice() and its helpers to fix
some offseting problems.
* [objects/cursoricon.c]
Made CreateCursor32() convert the instance handle properly. Made
DestroyCursor() return correct success status.
Wed Dec 24 17:56:34 1997 Dimitrie O. Paun <dimi@cs.toronto.edu>
* [windows/syscolor.c]
Added definition of GetSysColorPen16/32. This function does not
exist in the Win32 API but is a very close (and natural) relative
to GetSysColorBrush function. Moreover, it is *very* much used
within Wine since there are a lot of places where we need to draw
lines with the standard colors.
* [controls/button.c] [controls/combo.c] [controls/icontitle.c]
[controls/menu.c] [controls/progress.c] [controls/scroll.c]
[controls/updown.c] [graphics/painting.c] [misc/tweak.c]
[windows/defwnd.c] [windows/graphics.c] [windows/nonclient.c]
Replaced references to sysColorObjects with the appropriate
call to GetSysColorBrush32/GetSysColorPen32. There is no need to
expose the implementation of these functions, even within Wine.
This makes the code easier to understand, debug, maintain.
* [controls/uitools.c]
Modified most of the functions in this file to use the now
standard pens (i.e. GetSysColorPen32). These functions made
*heavy* use of standard pens so I expect a lot less
CreatePen/DeleteObject calls can do only good...:)
Plus some minor modifications (*no* functional changes though).
* [controls/updown.c]
Used the new DrawFrameControl32 function to paint the control.
I also deleted UDDOWN_DrawArrow since it was no longer required.
Tue Dec 23 00:03:33 1997 Steinar Hamre <steinarh@stud.fim.ntnu.no>
* [configure.in]
Added check for -lw.
* [include/wintypes.h] [tools/build.c]
Changes to make the assembly understandable for even sun as.
".ascii" -> ".string", "call %foo" -> "call *%foo",
"pushw/popw %[cdes]s" written out to ".byte 0x66\npushl/popl %[cdes]s".
* [memory/ldt.c]
#ifdef added so <sys/seg.h> will not be included on Solaris.
Mon Dec 22 18:55:19 1997 Marcus Meissner <msmeissn@cip.informatik.uni-erlangen.de>
* [configure.in]
Added XF86DGA check.
* [multimedia/dsound.c][relay32/dsound.spec][include/dsound.h]
Started DirectSound. Only stubs for now.
* [graphics/ddraw.c][include/ddraw.h][relay32/ddraw.spec]
Started to implement DirectDraw. Mostly stubs, some
testcases work. Requires the XF86DGA extension to XFree86.
(check demo/blizdemo.exe from the Diablo CD-ROM).
* [files/drive.c]
Return correct "CDFS" fsname so Diablo is a bit happier.
Sun Dec 21 21:45:48 1997 Kevin Cozens <kcozens@interlog.com>
* [misc/registry.c]
Fixed bugs in the routines which read the Windows '95 registry
files. Added extra information regarding the format of the Windows
'95 registry files.
1998-01-04 18:49:09 +01:00
|
|
|
}
|