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
Releases
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
Johnny Cai
wine
Commits
5b7f03cf
Commit
5b7f03cf
authored
21 years ago
by
Pavel Roskin
Committed by
Alexandre Julliard
21 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Ignore window caption from PROPSHEETHEADER in wizards. Update window
caption when changing pages.
parent
4020a21f
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/comctl32/propsheet.c
+22
-9
22 additions, 9 deletions
dlls/comctl32/propsheet.c
with
22 additions
and
9 deletions
dlls/comctl32/propsheet.c
+
22
−
9
View file @
5b7f03cf
...
...
@@ -305,12 +305,17 @@ static BOOL PROPSHEET_CollectSheetInfoA(LPCPROPSHEETHEADERA lppsh,
PROPSHEET_UnImplementedFlags
(
lppsh
->
dwFlags
);
if
(
HIWORD
(
lppsh
->
pszCaption
))
if
(
lppsh
->
dwFlags
&
INTRNL_ANY_WIZARD
)
psInfo
->
ppshheader
.
pszCaption
=
NULL
;
else
{
int
len
=
strlen
(
lppsh
->
pszCaption
);
psInfo
->
ppshheader
.
pszCaption
=
HeapAlloc
(
GetProcessHeap
(),
0
,
(
len
+
1
)
*
sizeof
(
WCHAR
)
);
MultiByteToWideChar
(
CP_ACP
,
0
,
lppsh
->
pszCaption
,
-
1
,
(
LPWSTR
)
psInfo
->
ppshheader
.
pszCaption
,
len
+
1
);
/* strcpy( (char *)psInfo->ppshheader.pszCaption, lppsh->pszCaption ); */
if
(
HIWORD
(
lppsh
->
pszCaption
))
{
int
len
=
strlen
(
lppsh
->
pszCaption
);
psInfo
->
ppshheader
.
pszCaption
=
HeapAlloc
(
GetProcessHeap
(),
0
,
(
len
+
1
)
*
sizeof
(
WCHAR
)
);
MultiByteToWideChar
(
CP_ACP
,
0
,
lppsh
->
pszCaption
,
-
1
,
(
LPWSTR
)
psInfo
->
ppshheader
.
pszCaption
,
len
+
1
);
/* strcpy( (char *)psInfo->ppshheader.pszCaption, lppsh->pszCaption ); */
}
}
psInfo
->
nPages
=
lppsh
->
nPages
;
...
...
@@ -355,11 +360,16 @@ static BOOL PROPSHEET_CollectSheetInfoW(LPCPROPSHEETHEADERW lppsh,
PROPSHEET_UnImplementedFlags
(
lppsh
->
dwFlags
);
if
(
HIWORD
(
lppsh
->
pszCaption
))
if
(
lppsh
->
dwFlags
&
INTRNL_ANY_WIZARD
)
psInfo
->
ppshheader
.
pszCaption
=
NULL
;
else
{
int
len
=
strlenW
(
lppsh
->
pszCaption
);
psInfo
->
ppshheader
.
pszCaption
=
HeapAlloc
(
GetProcessHeap
(),
0
,
(
len
+
1
)
*
sizeof
(
WCHAR
)
);
strcpyW
(
(
WCHAR
*
)
psInfo
->
ppshheader
.
pszCaption
,
lppsh
->
pszCaption
);
if
(
!
(
lppsh
->
dwFlags
&
INTRNL_ANY_WIZARD
)
&&
HIWORD
(
lppsh
->
pszCaption
))
{
int
len
=
strlenW
(
lppsh
->
pszCaption
);
psInfo
->
ppshheader
.
pszCaption
=
HeapAlloc
(
GetProcessHeap
(),
0
,
(
len
+
1
)
*
sizeof
(
WCHAR
)
);
strcpyW
(
(
WCHAR
*
)
psInfo
->
ppshheader
.
pszCaption
,
lppsh
->
pszCaption
);
}
}
psInfo
->
nPages
=
lppsh
->
nPages
;
...
...
@@ -1554,6 +1564,9 @@ static BOOL PROPSHEET_ShowPage(HWND hwndDlg, int index, PropSheetInfo * psInfo)
PROPSHEET_CreatePage
(
hwndDlg
,
index
,
psInfo
,
ppshpage
);
}
PROPSHEET_SetTitleW
(
hwndDlg
,
psInfo
->
ppshheader
.
dwFlags
,
psInfo
->
proppage
[
index
].
pszText
);
if
(
psInfo
->
active_page
!=
-
1
)
ShowWindow
(
psInfo
->
proppage
[
psInfo
->
active_page
].
hwndPage
,
SW_HIDE
);
...
...
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