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
f39d9452
Commit
f39d9452
authored
Sep 16, 2010
by
Jacek Caban
Committed by
Alexandre Julliard
Sep 18, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Use stored nsWineURI object to create moniker in async_open.
parent
af4377f8
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
33 deletions
+4
-33
nsio.c
dlls/mshtml/nsio.c
+4
-33
No files found.
dlls/mshtml/nsio.c
View file @
f39d9452
...
...
@@ -801,37 +801,6 @@ static nsresult NSAPI nsChannel_Open(nsIHttpChannel *iface, nsIInputStream **_re
return
NS_ERROR_NOT_IMPLEMENTED
;
}
static
HRESULT
create_mon_for_nschannel
(
nsChannel
*
channel
,
IMoniker
**
mon
)
{
nsWineURI
*
wine_uri
;
nsresult
nsres
;
HRESULT
hres
;
if
(
!
channel
->
original_uri
)
{
ERR
(
"original_uri == NULL
\n
"
);
return
E_FAIL
;
}
nsres
=
nsIURI_QueryInterface
(
channel
->
original_uri
,
&
IID_nsWineURI
,
(
void
**
)
&
wine_uri
);
if
(
NS_FAILED
(
nsres
))
{
ERR
(
"Could not get nsWineURI: %08x
\n
"
,
nsres
);
return
E_FAIL
;
}
if
(
wine_uri
->
wine_url
)
{
hres
=
CreateURLMoniker
(
NULL
,
wine_uri
->
wine_url
,
mon
);
if
(
FAILED
(
hres
))
WARN
(
"CreateURLMoniker failed: %08x
\n
"
,
hres
);
}
else
{
TRACE
(
"wine_url == NULL
\n
"
);
hres
=
E_FAIL
;
}
nsIURI_Release
(
NSURI
(
wine_uri
));
return
hres
;
}
static
HTMLWindow
*
get_window_from_load_group
(
nsChannel
*
This
)
{
HTMLWindow
*
window
;
...
...
@@ -944,9 +913,11 @@ static nsresult async_open(nsChannel *This, HTMLWindow *window, BOOL is_doc_chan
IMoniker
*
mon
=
NULL
;
HRESULT
hres
;
hres
=
create_mon_for_nschannel
(
This
,
&
mon
);
if
(
FAILED
(
hres
))
hres
=
CreateURLMoniker
(
NULL
,
This
->
uri
->
wine_url
,
&
mon
);
if
(
FAILED
(
hres
))
{
WARN
(
"CreateURLMoniker failed: %08x
\n
"
,
hres
);
return
NS_ERROR_UNEXPECTED
;
}
if
(
is_doc_channel
)
set_current_mon
(
window
,
mon
);
...
...
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