Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
6b72f169
Commit
6b72f169
authored
Oct 11, 2009
by
Nikolay Sivov
Committed by
Alexandre Julliard
Oct 12, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
comctl32/monthcal: Handle over/underflow while navigation with month menu.
parent
18857222
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
12 deletions
+28
-12
monthcal.c
dlls/comctl32/monthcal.c
+28
-12
No files found.
dlls/comctl32/monthcal.c
View file @
6b72f169
...
...
@@ -248,26 +248,41 @@ static LONG MONTHCAL_CompareSystemTime(const SYSTEMTIME *first, const SYSTEMTIME
*
* [I] infoPtr : valid pointer to control data
* [I] date : pointer to valid date data to check
* [I] fix : make date fit valid range
*
* RETURN VALUE
*
* TRUE - date whithin largest and configured range
* FALSE - date is outside largest or configured range
*/
static
BOOL
MONTHCAL_IsDateInValidRange
(
const
MONTHCAL_INFO
*
infoPtr
,
const
SYSTEMTIME
*
date
)
static
BOOL
MONTHCAL_IsDateInValidRange
(
const
MONTHCAL_INFO
*
infoPtr
,
SYSTEMTIME
*
date
,
BOOL
fix
)
{
if
((
MONTHCAL_CompareSystemTime
(
date
,
&
max_allowed_date
)
==
1
)
||
(
MONTHCAL_CompareSystemTime
(
date
,
&
min_allowed_date
)
==
-
1
))
return
FALSE
;
const
SYSTEMTIME
*
fix_st
=
NULL
;
if
(
infoPtr
->
rangeValid
&
GDTR_MAX
)
{
if
((
MONTHCAL_CompareSystemTime
(
date
,
&
infoPtr
->
maxDate
)
==
1
))
return
FALSE
;
if
(
MONTHCAL_CompareSystemTime
(
date
,
&
max_allowed_date
)
==
1
)
{
fix_st
=
&
max_allowed_date
;
}
else
if
(
MONTHCAL_CompareSystemTime
(
date
,
&
min_allowed_date
)
==
-
1
)
{
fix_st
=
&
min_allowed_date
;
}
else
if
(
infoPtr
->
rangeValid
&
GDTR_MAX
)
{
if
((
MONTHCAL_CompareSystemTime
(
date
,
&
infoPtr
->
maxDate
)
==
1
))
{
fix_st
=
&
infoPtr
->
maxDate
;
}
}
else
if
(
infoPtr
->
rangeValid
&
GDTR_MIN
)
{
if
((
MONTHCAL_CompareSystemTime
(
date
,
&
infoPtr
->
minDate
)
==
-
1
))
{
fix_st
=
&
infoPtr
->
minDate
;
}
}
if
(
infoPtr
->
rangeValid
&
GDTR_MIN
)
{
if
((
MONTHCAL_CompareSystemTime
(
date
,
&
infoPtr
->
minDate
)
==
-
1
))
return
FALSE
;
if
(
fix
&&
fix_st
)
{
date
->
wYear
=
fix_st
->
wYear
;
date
->
wMonth
=
fix_st
->
wMonth
;
}
return
TRUE
;
return
fix_st
?
FALSE
:
TRUE
;
}
/* Checks passed range width with configured maximum selection count
...
...
@@ -1369,7 +1384,7 @@ MONTHCAL_GetCurSel(const MONTHCAL_INFO *infoPtr, SYSTEMTIME *curSel)
/* FIXME: if the specified date is not visible, make it visible */
static
LRESULT
MONTHCAL_SetCurSel
(
MONTHCAL_INFO
*
infoPtr
,
const
SYSTEMTIME
*
curSel
)
MONTHCAL_SetCurSel
(
MONTHCAL_INFO
*
infoPtr
,
SYSTEMTIME
*
curSel
)
{
TRACE
(
"%p
\n
"
,
curSel
);
if
(
!
curSel
)
return
FALSE
;
...
...
@@ -1379,7 +1394,7 @@ MONTHCAL_SetCurSel(MONTHCAL_INFO *infoPtr, const SYSTEMTIME *curSel)
/* exit earlier if selection equals current */
if
(
MONTHCAL_IsDateEqual
(
&
infoPtr
->
curSel
,
curSel
))
return
TRUE
;
if
(
!
MONTHCAL_IsDateInValidRange
(
infoPtr
,
curSel
))
return
FALSE
;
if
(
!
MONTHCAL_IsDateInValidRange
(
infoPtr
,
curSel
,
FALSE
))
return
FALSE
;
infoPtr
->
minSel
=
*
curSel
;
infoPtr
->
maxSel
=
*
curSel
;
...
...
@@ -1686,7 +1701,7 @@ static void MONTHCAL_GoToNextMonth(MONTHCAL_INFO *infoPtr)
MONTHCAL_GetNextMonth
(
&
next
);
if
(
!
MONTHCAL_IsDateInValidRange
(
infoPtr
,
&
next
))
return
;
if
(
!
MONTHCAL_IsDateInValidRange
(
infoPtr
,
&
next
,
FALSE
))
return
;
infoPtr
->
curSel
=
next
;
...
...
@@ -1702,7 +1717,7 @@ static void MONTHCAL_GoToPrevMonth(MONTHCAL_INFO *infoPtr)
MONTHCAL_GetPrevMonth
(
&
prev
);
if
(
!
MONTHCAL_IsDateInValidRange
(
infoPtr
,
&
prev
))
return
;
if
(
!
MONTHCAL_IsDateInValidRange
(
infoPtr
,
&
prev
,
FALSE
))
return
;
infoPtr
->
curSel
=
prev
;
...
...
@@ -1879,6 +1894,7 @@ MONTHCAL_LButtonDown(MONTHCAL_INFO *infoPtr, LPARAM lParam)
if
((
i
>
0
)
&&
(
i
<
13
)
&&
infoPtr
->
curSel
.
wMonth
!=
i
)
{
infoPtr
->
curSel
.
wMonth
=
i
;
MONTHCAL_IsDateInValidRange
(
infoPtr
,
&
infoPtr
->
curSel
,
TRUE
);
InvalidateRect
(
infoPtr
->
hwndSelf
,
NULL
,
FALSE
);
}
return
0
;
...
...
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