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
2461466b
Commit
2461466b
authored
Aug 18, 2012
by
Marcus Meissner
Committed by
Alexandre Julliard
Aug 20, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hhctrl.ocx: Initialize ret on some error paths (Coverity).
parent
f51b6e78
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
4 deletions
+2
-4
chm.c
dlls/hhctrl.ocx/chm.c
+2
-4
No files found.
dlls/hhctrl.ocx/chm.c
View file @
2461466b
...
...
@@ -326,7 +326,7 @@ BOOL LoadWinTypeFromCHM(HHInfo *info)
HH_WINTYPEW
wintype
;
HRESULT
hr
;
DWORD
cbRead
;
BOOL
ret
;
BOOL
ret
=
FALSE
;
static
const
WCHAR
null
[]
=
{
0
};
static
const
WCHAR
toc_extW
[]
=
{
'h'
,
'h'
,
'c'
,
0
};
...
...
@@ -357,8 +357,6 @@ BOOL LoadWinTypeFromCHM(HHInfo *info)
pszJump2
=
ConvertChmString
(
info
,
&
wintype
.
pszJump2
);
pszUrlJump1
=
ConvertChmString
(
info
,
&
wintype
.
pszUrlJump1
);
pszUrlJump2
=
ConvertChmString
(
info
,
&
wintype
.
pszUrlJump2
);
ret
=
SUCCEEDED
(
hr
);
}
else
{
...
...
@@ -378,7 +376,6 @@ BOOL LoadWinTypeFromCHM(HHInfo *info)
wintype
.
dwExStyles
=
0
;
wintype
.
nShowState
=
SW_SHOW
;
wintype
.
curNavType
=
HHWIN_NAVTYPE_TOC
;
ret
=
TRUE
;
}
/* merge the new data with any pre-existing HH_WINTYPE structure */
...
...
@@ -400,6 +397,7 @@ BOOL LoadWinTypeFromCHM(HHInfo *info)
heap_free
(
pszJump2
);
heap_free
(
pszUrlJump1
);
heap_free
(
pszUrlJump2
);
ret
=
TRUE
;
done:
if
(
pStream
)
...
...
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