Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
d6493200
Commit
d6493200
authored
15 years ago
by
Alexandre Julliard
Browse files
Options
Downloads
Patches
Plain Diff
comctl32/tests: Fix the property sheet tests on older Windows versions.
parent
576a3983
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/comctl32/tests/propsheet.c
+17
-8
17 additions, 8 deletions
dlls/comctl32/tests/propsheet.c
with
17 additions
and
8 deletions
dlls/comctl32/tests/propsheet.c
+
17
−
8
View file @
d6493200
...
...
@@ -203,7 +203,7 @@ static void test_disableowner(void)
DestroyWindow
(
parent
);
}
static
LRESULT
CALLBACK
nav_page_proc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wparam
,
LPARAM
lparam
)
static
INT_PTR
CALLBACK
nav_page_proc
(
HWND
hwnd
,
UINT
msg
,
WPARAM
wparam
,
LPARAM
lparam
)
{
switch
(
msg
){
case
WM_NOTIFY
:
...
...
@@ -212,7 +212,7 @@ static LRESULT CALLBACK nav_page_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM
switch
(
hdr
->
code
){
case
PSN_SETACTIVE
:
active_page
=
PropSheet_HwndToIndex
(
hdr
->
hwndFrom
,
hwnd
);
b
re
ak
;
re
turn
TRUE
;
case
PSN_KILLACTIVE
:
/* prevent navigation away from the fourth page */
if
(
active_page
==
3
){
...
...
@@ -223,7 +223,7 @@ static LRESULT CALLBACK nav_page_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM
break
;
}
}
return
DefWindowProc
(
hwnd
,
msg
,
wparam
,
lparam
)
;
return
FALSE
;
}
static
void
test_wiznavigation
(
void
)
...
...
@@ -234,6 +234,7 @@ static void test_wiznavigation(void)
HWND
hdlg
,
control
;
LONG_PTR
controlID
;
LRESULT
defidres
;
BOOL
hwndtoindex_supported
=
TRUE
;
const
INT
nextID
=
12324
;
const
INT
backID
=
12323
;
...
...
@@ -282,7 +283,9 @@ static void test_wiznavigation(void)
/* simulate pressing the Next button */
SendMessage
(
hdlg
,
PSM_PRESSBUTTON
,
PSBTN_NEXT
,
0
);
ok
(
active_page
==
1
,
"Active page should be 1 after pressing Next. Is: %d
\n
"
,
active_page
);
if
(
!
active_page
)
hwndtoindex_supported
=
FALSE
;
if
(
hwndtoindex_supported
)
ok
(
active_page
==
1
,
"Active page should be 1 after pressing Next. Is: %d
\n
"
,
active_page
);
control
=
GetFocus
();
controlID
=
GetWindowLongPtr
(
control
,
GWLP_ID
);
...
...
@@ -296,7 +299,8 @@ static void test_wiznavigation(void)
/* press next again */
SendMessage
(
hdlg
,
PSM_PRESSBUTTON
,
PSBTN_NEXT
,
0
);
ok
(
active_page
==
2
,
"Active page should be 2 after pressing Next. Is: %d
\n
"
,
active_page
);
if
(
hwndtoindex_supported
)
ok
(
active_page
==
2
,
"Active page should be 2 after pressing Next. Is: %d
\n
"
,
active_page
);
control
=
GetFocus
();
controlID
=
GetWindowLongPtr
(
control
,
GWLP_ID
);
...
...
@@ -304,7 +308,8 @@ static void test_wiznavigation(void)
/* back button */
SendMessage
(
hdlg
,
PSM_PRESSBUTTON
,
PSBTN_BACK
,
0
);
ok
(
active_page
==
1
,
"Active page should be 1 after pressing Back. Is: %d
\n
"
,
active_page
);
if
(
hwndtoindex_supported
)
ok
(
active_page
==
1
,
"Active page should be 1 after pressing Back. Is: %d
\n
"
,
active_page
);
control
=
GetFocus
();
controlID
=
GetWindowLongPtr
(
control
,
GWLP_ID
);
...
...
@@ -315,9 +320,13 @@ static void test_wiznavigation(void)
/* press next twice */
SendMessage
(
hdlg
,
PSM_PRESSBUTTON
,
PSBTN_NEXT
,
0
);
ok
(
active_page
==
2
,
"Active page should be 2 after pressing Next. Is: %d
\n
"
,
active_page
);
if
(
hwndtoindex_supported
)
ok
(
active_page
==
2
,
"Active page should be 2 after pressing Next. Is: %d
\n
"
,
active_page
);
SendMessage
(
hdlg
,
PSM_PRESSBUTTON
,
PSBTN_NEXT
,
0
);
ok
(
active_page
==
3
,
"Active page should be 3 after pressing Next. Is: %d
\n
"
,
active_page
);
if
(
hwndtoindex_supported
)
ok
(
active_page
==
3
,
"Active page should be 3 after pressing Next. Is: %d
\n
"
,
active_page
);
else
active_page
=
3
;
control
=
GetFocus
();
controlID
=
GetWindowLongPtr
(
control
,
GWLP_ID
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment