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
78a05ca6
Commit
78a05ca6
authored
Mar 26, 2019
by
Jacek Caban
Committed by
Alexandre Julliard
Mar 26, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Introduce map_nsresult and use it in return_nsstr.
Signed-off-by:
Jacek Caban
<
jacek@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
2cd8ff37
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
2 deletions
+23
-2
nsembed.c
dlls/mshtml/nsembed.c
+23
-2
No files found.
dlls/mshtml/nsembed.c
View file @
78a05ca6
...
@@ -848,14 +848,35 @@ void nsAString_Finish(nsAString *str)
...
@@ -848,14 +848,35 @@ void nsAString_Finish(nsAString *str)
NS_StringContainerFinish
(
str
);
NS_StringContainerFinish
(
str
);
}
}
static
HRESULT
map_nsresult
(
nsresult
nsres
)
{
switch
(
nsres
)
{
case
NS_OK
:
return
S_OK
;
case
NS_ERROR_OUT_OF_MEMORY
:
return
E_OUTOFMEMORY
;
case
NS_ERROR_NOT_IMPLEMENTED
:
return
E_NOTIMPL
;
case
NS_NOINTERFACE
:
return
E_NOINTERFACE
;
case
NS_ERROR_INVALID_POINTER
:
return
E_POINTER
;
case
NS_ERROR_INVALID_ARG
:
return
E_INVALIDARG
;
case
NS_ERROR_UNEXPECTED
:
return
E_UNEXPECTED
;
}
return
E_FAIL
;
}
HRESULT
return_nsstr
(
nsresult
nsres
,
nsAString
*
nsstr
,
BSTR
*
p
)
HRESULT
return_nsstr
(
nsresult
nsres
,
nsAString
*
nsstr
,
BSTR
*
p
)
{
{
const
PRUnichar
*
str
;
const
PRUnichar
*
str
;
if
(
NS_FAILED
(
nsres
))
{
if
(
NS_FAILED
(
nsres
))
{
ERR
(
"failed: %08x
\n
"
,
nsres
);
WARN
(
"failed: %08x
\n
"
,
nsres
);
nsAString_Finish
(
nsstr
);
nsAString_Finish
(
nsstr
);
return
E_FAIL
;
return
map_nsresult
(
nsres
)
;
}
}
nsAString_GetData
(
nsstr
,
&
str
);
nsAString_GetData
(
nsstr
,
&
str
);
...
...
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