Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
dc3818e7
Commit
dc3818e7
authored
Dec 01, 2009
by
Jacek Caban
Committed by
Alexandre Julliard
Dec 02, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Don't wrap URIs related to Gecko special URIs.
parent
d97b4d26
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
23 deletions
+10
-23
nsio.c
dlls/mshtml/nsio.c
+10
-23
No files found.
dlls/mshtml/nsio.c
View file @
dc3818e7
...
...
@@ -844,7 +844,7 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen
}
if
(
!
window
)
{
TRACE
(
"window = NULL
\n
"
);
ERR
(
"window = NULL
\n
"
);
return
This
->
channel
?
nsIChannel_AsyncOpen
(
This
->
channel
,
aListener
,
aContext
)
:
NS_ERROR_UNEXPECTED
;
...
...
@@ -2627,38 +2627,25 @@ static nsresult NSAPI nsIOService_NewURI(nsIIOService *iface, const nsACString *
}
if
(
aBaseURI
)
{
nsACString
base_uri_str
;
const
char
*
base_uri
=
NULL
;
PARSEDURLA
parsed_url
=
{
sizeof
(
PARSEDURLA
)};
nsACString_Init
(
&
base_uri_str
,
NULL
);
nsres
=
nsIURI_GetSpec
(
aBaseURI
,
&
base_uri_str
);
nsres
=
nsIURI_QueryInterface
(
aBaseURI
,
&
IID_nsIWineURI
,
(
void
**
)
&
base_wine_uri
);
if
(
NS_SUCCEEDED
(
nsres
))
{
nsACString_GetData
(
&
base_uri_str
,
&
base_uri
);
TRACE
(
"base_uri=%s
\n
"
,
debugstr_a
(
base_uri
));
nsIWineURI_GetWineURL
(
base_wine_uri
,
&
base_wine_url
);
nsIWineURI_GetWindow
(
base_wine_uri
,
&
window
);
TRACE
(
"base url: %s window: %p
\n
"
,
debugstr_w
(
base_wine_url
),
window
);
}
else
if
(
FAILED
(
ParseURLA
(
spec
,
&
parsed_url
)))
{
TRACE
(
"not wraping
\n
"
);
return
nsIIOService_NewURI
(
nsio
,
aSpec
,
aOriginCharset
,
aBaseURI
,
_retval
);
}
else
{
ERR
(
"GetSpec failed
: %08x
\n
"
,
nsres
);
WARN
(
"Could not get base nsIWineURI
: %08x
\n
"
,
nsres
);
}
nsACString_Finish
(
&
base_uri_str
);
}
nsres
=
nsIIOService_NewURI
(
nsio
,
aSpec
,
aOriginCharset
,
aBaseURI
,
&
uri
);
if
(
NS_FAILED
(
nsres
))
TRACE
(
"NewURI failed: %08x
\n
"
,
nsres
);
if
(
aBaseURI
)
{
nsres
=
nsIURI_QueryInterface
(
aBaseURI
,
&
IID_nsIWineURI
,
(
void
**
)
&
base_wine_uri
);
if
(
NS_SUCCEEDED
(
nsres
))
{
nsIWineURI_GetWindow
(
base_wine_uri
,
&
window
);
nsIWineURI_GetWineURL
(
base_wine_uri
,
&
base_wine_url
);
}
else
{
TRACE
(
"Could not get base nsIWineURI: %08x
\n
"
,
nsres
);
}
}
TRACE
(
"window = %p
\n
"
,
window
);
nsres
=
create_uri
(
uri
,
window
,
NULL
,
&
wine_uri
);
*
_retval
=
(
nsIURI
*
)
wine_uri
;
...
...
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