Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
d54db191
Commit
d54db191
authored
Mar 29, 2005
by
Alexandre Julliard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moved rectangle functions to uitools.c and removed rect.c.
parent
d4193bbd
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
186 additions
and
216 deletions
+186
-216
Makefile.in
dlls/user/Makefile.in
+0
-1
uitools.c
dlls/user/uitools.c
+186
-0
rect.c
windows/rect.c
+0
-215
No files found.
dlls/user/Makefile.in
View file @
d54db191
...
@@ -28,7 +28,6 @@ C_SRCS = \
...
@@ -28,7 +28,6 @@ C_SRCS = \
$(TOPOBJDIR)
/windows/multimon.c
\
$(TOPOBJDIR)
/windows/multimon.c
\
$(TOPOBJDIR)
/windows/nonclient.c
\
$(TOPOBJDIR)
/windows/nonclient.c
\
$(TOPOBJDIR)
/windows/queue.c
\
$(TOPOBJDIR)
/windows/queue.c
\
$(TOPOBJDIR)
/windows/rect.c
\
$(TOPOBJDIR)
/windows/scroll.c
\
$(TOPOBJDIR)
/windows/scroll.c
\
$(TOPOBJDIR)
/windows/spy.c
\
$(TOPOBJDIR)
/windows/spy.c
\
$(TOPOBJDIR)
/windows/syscolor.c
\
$(TOPOBJDIR)
/windows/syscolor.c
\
...
...
dlls/user/uitools.c
View file @
d54db191
...
@@ -1415,6 +1415,192 @@ BOOL WINAPI DrawFrameControl( HDC hdc, LPRECT rc, UINT uType,
...
@@ -1415,6 +1415,192 @@ BOOL WINAPI DrawFrameControl( HDC hdc, LPRECT rc, UINT uType,
/***********************************************************************
/***********************************************************************
* SetRect (USER32.@)
*/
BOOL
WINAPI
SetRect
(
LPRECT
rect
,
INT
left
,
INT
top
,
INT
right
,
INT
bottom
)
{
if
(
!
rect
)
return
FALSE
;
rect
->
left
=
left
;
rect
->
right
=
right
;
rect
->
top
=
top
;
rect
->
bottom
=
bottom
;
return
TRUE
;
}
/***********************************************************************
* SetRectEmpty (USER32.@)
*/
BOOL
WINAPI
SetRectEmpty
(
LPRECT
rect
)
{
if
(
!
rect
)
return
FALSE
;
rect
->
left
=
rect
->
right
=
rect
->
top
=
rect
->
bottom
=
0
;
return
TRUE
;
}
/***********************************************************************
* CopyRect (USER32.@)
*/
BOOL
WINAPI
CopyRect
(
RECT
*
dest
,
const
RECT
*
src
)
{
if
(
!
dest
||
!
src
)
return
FALSE
;
*
dest
=
*
src
;
return
TRUE
;
}
/***********************************************************************
* IsRectEmpty (USER32.@)
*
* Bug compat: Windows checks for 0 or negative width/height.
*/
BOOL
WINAPI
IsRectEmpty
(
const
RECT
*
rect
)
{
if
(
!
rect
)
return
TRUE
;
return
((
rect
->
left
>=
rect
->
right
)
||
(
rect
->
top
>=
rect
->
bottom
));
}
/***********************************************************************
* PtInRect (USER32.@)
*/
BOOL
WINAPI
PtInRect
(
const
RECT
*
rect
,
POINT
pt
)
{
if
(
!
rect
)
return
FALSE
;
return
((
pt
.
x
>=
rect
->
left
)
&&
(
pt
.
x
<
rect
->
right
)
&&
(
pt
.
y
>=
rect
->
top
)
&&
(
pt
.
y
<
rect
->
bottom
));
}
/***********************************************************************
* OffsetRect (USER32.@)
*/
BOOL
WINAPI
OffsetRect
(
LPRECT
rect
,
INT
x
,
INT
y
)
{
if
(
!
rect
)
return
FALSE
;
rect
->
left
+=
x
;
rect
->
right
+=
x
;
rect
->
top
+=
y
;
rect
->
bottom
+=
y
;
return
TRUE
;
}
/***********************************************************************
* InflateRect (USER32.@)
*/
BOOL
WINAPI
InflateRect
(
LPRECT
rect
,
INT
x
,
INT
y
)
{
if
(
!
rect
)
return
FALSE
;
rect
->
left
-=
x
;
rect
->
top
-=
y
;
rect
->
right
+=
x
;
rect
->
bottom
+=
y
;
return
TRUE
;
}
/***********************************************************************
* IntersectRect (USER32.@)
*/
BOOL
WINAPI
IntersectRect
(
LPRECT
dest
,
const
RECT
*
src1
,
const
RECT
*
src2
)
{
if
(
!
dest
||
!
src1
||
!
src2
)
return
FALSE
;
if
(
IsRectEmpty
(
src1
)
||
IsRectEmpty
(
src2
)
||
(
src1
->
left
>=
src2
->
right
)
||
(
src2
->
left
>=
src1
->
right
)
||
(
src1
->
top
>=
src2
->
bottom
)
||
(
src2
->
top
>=
src1
->
bottom
))
{
SetRectEmpty
(
dest
);
return
FALSE
;
}
dest
->
left
=
max
(
src1
->
left
,
src2
->
left
);
dest
->
right
=
min
(
src1
->
right
,
src2
->
right
);
dest
->
top
=
max
(
src1
->
top
,
src2
->
top
);
dest
->
bottom
=
min
(
src1
->
bottom
,
src2
->
bottom
);
return
TRUE
;
}
/***********************************************************************
* UnionRect (USER32.@)
*/
BOOL
WINAPI
UnionRect
(
LPRECT
dest
,
const
RECT
*
src1
,
const
RECT
*
src2
)
{
if
(
!
dest
)
return
FALSE
;
if
(
IsRectEmpty
(
src1
))
{
if
(
IsRectEmpty
(
src2
))
{
SetRectEmpty
(
dest
);
return
FALSE
;
}
else
*
dest
=
*
src2
;
}
else
{
if
(
IsRectEmpty
(
src2
))
*
dest
=
*
src1
;
else
{
dest
->
left
=
min
(
src1
->
left
,
src2
->
left
);
dest
->
right
=
max
(
src1
->
right
,
src2
->
right
);
dest
->
top
=
min
(
src1
->
top
,
src2
->
top
);
dest
->
bottom
=
max
(
src1
->
bottom
,
src2
->
bottom
);
}
}
return
TRUE
;
}
/***********************************************************************
* EqualRect (USER32.@)
*/
BOOL
WINAPI
EqualRect
(
const
RECT
*
rect1
,
const
RECT
*
rect2
)
{
if
(
!
rect1
||
!
rect2
)
return
FALSE
;
return
((
rect1
->
left
==
rect2
->
left
)
&&
(
rect1
->
right
==
rect2
->
right
)
&&
(
rect1
->
top
==
rect2
->
top
)
&&
(
rect1
->
bottom
==
rect2
->
bottom
));
}
/***********************************************************************
* SubtractRect (USER32.@)
*/
BOOL
WINAPI
SubtractRect
(
LPRECT
dest
,
const
RECT
*
src1
,
const
RECT
*
src2
)
{
RECT
tmp
;
if
(
!
dest
)
return
FALSE
;
if
(
IsRectEmpty
(
src1
))
{
SetRectEmpty
(
dest
);
return
FALSE
;
}
*
dest
=
*
src1
;
if
(
IntersectRect
(
&
tmp
,
src1
,
src2
))
{
if
(
EqualRect
(
&
tmp
,
dest
))
{
SetRectEmpty
(
dest
);
return
FALSE
;
}
if
((
tmp
.
top
==
dest
->
top
)
&&
(
tmp
.
bottom
==
dest
->
bottom
))
{
if
(
tmp
.
left
==
dest
->
left
)
dest
->
left
=
tmp
.
right
;
else
if
(
tmp
.
right
==
dest
->
right
)
dest
->
right
=
tmp
.
left
;
}
else
if
((
tmp
.
left
==
dest
->
left
)
&&
(
tmp
.
right
==
dest
->
right
))
{
if
(
tmp
.
top
==
dest
->
top
)
dest
->
top
=
tmp
.
bottom
;
else
if
(
tmp
.
bottom
==
dest
->
bottom
)
dest
->
bottom
=
tmp
.
top
;
}
}
return
TRUE
;
}
/***********************************************************************
* FillRect (USER32.@)
* FillRect (USER32.@)
*/
*/
INT
WINAPI
FillRect
(
HDC
hdc
,
const
RECT
*
rect
,
HBRUSH
hbrush
)
INT
WINAPI
FillRect
(
HDC
hdc
,
const
RECT
*
rect
,
HBRUSH
hbrush
)
...
...
windows/rect.c
deleted
100644 → 0
View file @
d4193bbd
/*
* Rectangle-related functions
*
* Copyright 1993, 1996 Alexandre Julliard
*
* 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
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include <stdarg.h>
#include "windef.h"
#include "winbase.h"
#include "wingdi.h"
#include "winuser.h"
/***********************************************************************
* SetRect (USER32.@)
*/
BOOL
WINAPI
SetRect
(
LPRECT
rect
,
INT
left
,
INT
top
,
INT
right
,
INT
bottom
)
{
if
(
!
rect
)
return
FALSE
;
rect
->
left
=
left
;
rect
->
right
=
right
;
rect
->
top
=
top
;
rect
->
bottom
=
bottom
;
return
TRUE
;
}
/***********************************************************************
* SetRectEmpty (USER32.@)
*/
BOOL
WINAPI
SetRectEmpty
(
LPRECT
rect
)
{
if
(
!
rect
)
return
FALSE
;
rect
->
left
=
rect
->
right
=
rect
->
top
=
rect
->
bottom
=
0
;
return
TRUE
;
}
/***********************************************************************
* CopyRect (USER32.@)
*/
BOOL
WINAPI
CopyRect
(
RECT
*
dest
,
const
RECT
*
src
)
{
if
(
!
dest
||
!
src
)
return
FALSE
;
*
dest
=
*
src
;
return
TRUE
;
}
/***********************************************************************
* IsRectEmpty (USER32.@)
*
* Bug compat: Windows checks for 0 or negative width/height.
*/
BOOL
WINAPI
IsRectEmpty
(
const
RECT
*
rect
)
{
if
(
!
rect
)
return
TRUE
;
return
((
rect
->
left
>=
rect
->
right
)
||
(
rect
->
top
>=
rect
->
bottom
));
}
/***********************************************************************
* PtInRect (USER32.@)
*/
BOOL
WINAPI
PtInRect
(
const
RECT
*
rect
,
POINT
pt
)
{
if
(
!
rect
)
return
FALSE
;
return
((
pt
.
x
>=
rect
->
left
)
&&
(
pt
.
x
<
rect
->
right
)
&&
(
pt
.
y
>=
rect
->
top
)
&&
(
pt
.
y
<
rect
->
bottom
));
}
/***********************************************************************
* OffsetRect (USER32.@)
*/
BOOL
WINAPI
OffsetRect
(
LPRECT
rect
,
INT
x
,
INT
y
)
{
if
(
!
rect
)
return
FALSE
;
rect
->
left
+=
x
;
rect
->
right
+=
x
;
rect
->
top
+=
y
;
rect
->
bottom
+=
y
;
return
TRUE
;
}
/***********************************************************************
* InflateRect (USER32.@)
*/
BOOL
WINAPI
InflateRect
(
LPRECT
rect
,
INT
x
,
INT
y
)
{
if
(
!
rect
)
return
FALSE
;
rect
->
left
-=
x
;
rect
->
top
-=
y
;
rect
->
right
+=
x
;
rect
->
bottom
+=
y
;
return
TRUE
;
}
/***********************************************************************
* IntersectRect (USER32.@)
*/
BOOL
WINAPI
IntersectRect
(
LPRECT
dest
,
const
RECT
*
src1
,
const
RECT
*
src2
)
{
if
(
!
dest
||
!
src1
||
!
src2
)
return
FALSE
;
if
(
IsRectEmpty
(
src1
)
||
IsRectEmpty
(
src2
)
||
(
src1
->
left
>=
src2
->
right
)
||
(
src2
->
left
>=
src1
->
right
)
||
(
src1
->
top
>=
src2
->
bottom
)
||
(
src2
->
top
>=
src1
->
bottom
))
{
SetRectEmpty
(
dest
);
return
FALSE
;
}
dest
->
left
=
max
(
src1
->
left
,
src2
->
left
);
dest
->
right
=
min
(
src1
->
right
,
src2
->
right
);
dest
->
top
=
max
(
src1
->
top
,
src2
->
top
);
dest
->
bottom
=
min
(
src1
->
bottom
,
src2
->
bottom
);
return
TRUE
;
}
/***********************************************************************
* UnionRect (USER32.@)
*/
BOOL
WINAPI
UnionRect
(
LPRECT
dest
,
const
RECT
*
src1
,
const
RECT
*
src2
)
{
if
(
!
dest
)
return
FALSE
;
if
(
IsRectEmpty
(
src1
))
{
if
(
IsRectEmpty
(
src2
))
{
SetRectEmpty
(
dest
);
return
FALSE
;
}
else
*
dest
=
*
src2
;
}
else
{
if
(
IsRectEmpty
(
src2
))
*
dest
=
*
src1
;
else
{
dest
->
left
=
min
(
src1
->
left
,
src2
->
left
);
dest
->
right
=
max
(
src1
->
right
,
src2
->
right
);
dest
->
top
=
min
(
src1
->
top
,
src2
->
top
);
dest
->
bottom
=
max
(
src1
->
bottom
,
src2
->
bottom
);
}
}
return
TRUE
;
}
/***********************************************************************
* EqualRect (USER32.@)
*/
BOOL
WINAPI
EqualRect
(
const
RECT
*
rect1
,
const
RECT
*
rect2
)
{
if
(
!
rect1
||
!
rect2
)
return
FALSE
;
return
((
rect1
->
left
==
rect2
->
left
)
&&
(
rect1
->
right
==
rect2
->
right
)
&&
(
rect1
->
top
==
rect2
->
top
)
&&
(
rect1
->
bottom
==
rect2
->
bottom
));
}
/***********************************************************************
* SubtractRect (USER32.@)
*/
BOOL
WINAPI
SubtractRect
(
LPRECT
dest
,
const
RECT
*
src1
,
const
RECT
*
src2
)
{
RECT
tmp
;
if
(
!
dest
)
return
FALSE
;
if
(
IsRectEmpty
(
src1
))
{
SetRectEmpty
(
dest
);
return
FALSE
;
}
*
dest
=
*
src1
;
if
(
IntersectRect
(
&
tmp
,
src1
,
src2
))
{
if
(
EqualRect
(
&
tmp
,
dest
))
{
SetRectEmpty
(
dest
);
return
FALSE
;
}
if
((
tmp
.
top
==
dest
->
top
)
&&
(
tmp
.
bottom
==
dest
->
bottom
))
{
if
(
tmp
.
left
==
dest
->
left
)
dest
->
left
=
tmp
.
right
;
else
if
(
tmp
.
right
==
dest
->
right
)
dest
->
right
=
tmp
.
left
;
}
else
if
((
tmp
.
left
==
dest
->
left
)
&&
(
tmp
.
right
==
dest
->
right
))
{
if
(
tmp
.
top
==
dest
->
top
)
dest
->
top
=
tmp
.
bottom
;
else
if
(
tmp
.
bottom
==
dest
->
bottom
)
dest
->
bottom
=
tmp
.
top
;
}
}
return
TRUE
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment