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
e412c8c7
Commit
e412c8c7
authored
12 years ago
by
Erich Hoover
Committed by
Alexandre Julliard
12 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hhctrl.ocx: Fix displaying the first page for some help files.
parent
7cf036a4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
2 deletions
+5
-2
chm.c
dlls/hhctrl.ocx/chm.c
+5
-2
No files found.
dlls/hhctrl.ocx/chm.c
View file @
e412c8c7
...
@@ -251,6 +251,7 @@ BOOL LoadWinTypeFromCHM(HHInfo *info)
...
@@ -251,6 +251,7 @@ BOOL LoadWinTypeFromCHM(HHInfo *info)
HRESULT
hr
;
HRESULT
hr
;
DWORD
cbRead
;
DWORD
cbRead
;
static
const
WCHAR
null
[]
=
{
0
};
static
const
WCHAR
toc_extW
[]
=
{
'h'
,
'h'
,
'c'
,
0
};
static
const
WCHAR
toc_extW
[]
=
{
'h'
,
'h'
,
'c'
,
0
};
static
const
WCHAR
index_extW
[]
=
{
'h'
,
'h'
,
'k'
,
0
};
static
const
WCHAR
index_extW
[]
=
{
'h'
,
'h'
,
'k'
,
0
};
static
const
WCHAR
windowsW
[]
=
{
'#'
,
'W'
,
'I'
,
'N'
,
'D'
,
'O'
,
'W'
,
'S'
,
0
};
static
const
WCHAR
windowsW
[]
=
{
'#'
,
'W'
,
'I'
,
'N'
,
'D'
,
'O'
,
'W'
,
'S'
,
0
};
...
@@ -260,7 +261,6 @@ BOOL LoadWinTypeFromCHM(HHInfo *info)
...
@@ -260,7 +261,6 @@ BOOL LoadWinTypeFromCHM(HHInfo *info)
{
{
/* no defined window types so use (hopefully) sane defaults */
/* no defined window types so use (hopefully) sane defaults */
static
const
WCHAR
defaultwinW
[]
=
{
'd'
,
'e'
,
'f'
,
'a'
,
'u'
,
'l'
,
't'
,
'w'
,
'i'
,
'n'
,
'\0'
};
static
const
WCHAR
defaultwinW
[]
=
{
'd'
,
'e'
,
'f'
,
'a'
,
'u'
,
'l'
,
't'
,
'w'
,
'i'
,
'n'
,
'\0'
};
static
const
WCHAR
null
[]
=
{
0
};
memset
((
void
*
)
&
(
info
->
WinType
),
0
,
sizeof
(
info
->
WinType
));
memset
((
void
*
)
&
(
info
->
WinType
),
0
,
sizeof
(
info
->
WinType
));
info
->
WinType
.
cbStruct
=
sizeof
(
info
->
WinType
);
info
->
WinType
.
cbStruct
=
sizeof
(
info
->
WinType
);
info
->
WinType
.
fUniCodeStrings
=
TRUE
;
info
->
WinType
.
fUniCodeStrings
=
TRUE
;
...
@@ -292,13 +292,16 @@ BOOL LoadWinTypeFromCHM(HHInfo *info)
...
@@ -292,13 +292,16 @@ BOOL LoadWinTypeFromCHM(HHInfo *info)
info
->
WinType
.
pszType
=
info
->
pszType
=
strdupAtoW
(
GetChmString
(
info
->
pCHMInfo
,
(
DWORD_PTR
)
info
->
WinType
.
pszType
));
info
->
WinType
.
pszType
=
info
->
pszType
=
strdupAtoW
(
GetChmString
(
info
->
pCHMInfo
,
(
DWORD_PTR
)
info
->
WinType
.
pszType
));
info
->
WinType
.
pszCaption
=
info
->
pszCaption
=
strdupAtoW
(
GetChmString
(
info
->
pCHMInfo
,
(
DWORD_PTR
)
info
->
WinType
.
pszCaption
));
info
->
WinType
.
pszCaption
=
info
->
pszCaption
=
strdupAtoW
(
GetChmString
(
info
->
pCHMInfo
,
(
DWORD_PTR
)
info
->
WinType
.
pszCaption
));
info
->
WinType
.
pszFile
=
info
->
pszFile
=
strdupAtoW
(
GetChmString
(
info
->
pCHMInfo
,
(
DWORD_PTR
)
info
->
WinType
.
pszFile
));
info
->
WinType
.
pszHome
=
info
->
pszHome
=
strdupAtoW
(
GetChmString
(
info
->
pCHMInfo
,
(
DWORD_PTR
)
info
->
WinType
.
pszHome
));
info
->
WinType
.
pszHome
=
info
->
pszHome
=
strdupAtoW
(
GetChmString
(
info
->
pCHMInfo
,
(
DWORD_PTR
)
info
->
WinType
.
pszHome
));
info
->
WinType
.
pszJump1
=
info
->
pszJump1
=
strdupAtoW
(
GetChmString
(
info
->
pCHMInfo
,
(
DWORD_PTR
)
info
->
WinType
.
pszJump1
));
info
->
WinType
.
pszJump1
=
info
->
pszJump1
=
strdupAtoW
(
GetChmString
(
info
->
pCHMInfo
,
(
DWORD_PTR
)
info
->
WinType
.
pszJump1
));
info
->
WinType
.
pszJump2
=
info
->
pszJump2
=
strdupAtoW
(
GetChmString
(
info
->
pCHMInfo
,
(
DWORD_PTR
)
info
->
WinType
.
pszJump2
));
info
->
WinType
.
pszJump2
=
info
->
pszJump2
=
strdupAtoW
(
GetChmString
(
info
->
pCHMInfo
,
(
DWORD_PTR
)
info
->
WinType
.
pszJump2
));
info
->
WinType
.
pszUrlJump1
=
info
->
pszUrlJump1
=
strdupAtoW
(
GetChmString
(
info
->
pCHMInfo
,
(
DWORD_PTR
)
info
->
WinType
.
pszUrlJump1
));
info
->
WinType
.
pszUrlJump1
=
info
->
pszUrlJump1
=
strdupAtoW
(
GetChmString
(
info
->
pCHMInfo
,
(
DWORD_PTR
)
info
->
WinType
.
pszUrlJump1
));
info
->
WinType
.
pszUrlJump2
=
info
->
pszUrlJump2
=
strdupAtoW
(
GetChmString
(
info
->
pCHMInfo
,
(
DWORD_PTR
)
info
->
WinType
.
pszUrlJump2
));
info
->
WinType
.
pszUrlJump2
=
info
->
pszUrlJump2
=
strdupAtoW
(
GetChmString
(
info
->
pCHMInfo
,
(
DWORD_PTR
)
info
->
WinType
.
pszUrlJump2
));
if
(
info
->
WinType
.
pszFile
)
info
->
WinType
.
pszFile
=
info
->
pszFile
=
strdupAtoW
(
GetChmString
(
info
->
pCHMInfo
,
(
DWORD_PTR
)
info
->
WinType
.
pszFile
));
else
info
->
WinType
.
pszFile
=
strdupW
(
info
->
pCHMInfo
->
defTopic
?
info
->
pCHMInfo
->
defTopic
:
null
);
if
(
info
->
WinType
.
pszToc
)
if
(
info
->
WinType
.
pszToc
)
info
->
WinType
.
pszToc
=
info
->
pszToc
=
strdupAtoW
(
GetChmString
(
info
->
pCHMInfo
,
(
DWORD_PTR
)
info
->
WinType
.
pszToc
));
info
->
WinType
.
pszToc
=
info
->
pszToc
=
strdupAtoW
(
GetChmString
(
info
->
pCHMInfo
,
(
DWORD_PTR
)
info
->
WinType
.
pszToc
));
else
else
...
...
This diff is collapsed.
Click to expand it.
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