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
ec13e510
Commit
ec13e510
authored
Nov 30, 2009
by
Jacek Caban
Committed by
Alexandre Julliard
Dec 01, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Don't change nsIWineURI in OnStartBinding if it's already marked as document URI.
parent
679591ff
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
18 deletions
+23
-18
nsembed.c
dlls/mshtml/nsembed.c
+23
-18
No files found.
dlls/mshtml/nsembed.c
View file @
ec13e510
...
@@ -1149,6 +1149,7 @@ static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener
...
@@ -1149,6 +1149,7 @@ static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener
nsIWineURI
*
wine_uri
;
nsIWineURI
*
wine_uri
;
nsACString
spec_str
;
nsACString
spec_str
;
const
char
*
spec
;
const
char
*
spec
;
BOOL
is_doc_uri
;
nsresult
nsres
;
nsresult
nsres
;
nsACString_Init
(
&
spec_str
,
NULL
);
nsACString_Init
(
&
spec_str
,
NULL
);
...
@@ -1165,30 +1166,34 @@ static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener
...
@@ -1165,30 +1166,34 @@ static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener
return
NS_ERROR_NOT_IMPLEMENTED
;
return
NS_ERROR_NOT_IMPLEMENTED
;
}
}
nsIWineURI_SetNSContainer
(
wine_uri
,
This
);
nsIWineURI_GetIsDocumentURI
(
wine_uri
,
&
is_doc_uri
);
nsIWineURI_SetIsDocumentURI
(
wine_uri
,
TRUE
);
if
(
This
->
bscallback
)
{
if
(
!
is_doc_uri
)
{
IMoniker
*
mon
=
get_channelbsc_mon
(
This
->
bscallback
);
nsIWineURI_SetNSContainer
(
wine_uri
,
This
);
nsIWineURI_SetIsDocumentURI
(
wine_uri
,
TRUE
);
if
(
mon
)
{
if
(
This
->
bscallback
)
{
LPWSTR
wine_url
;
IMoniker
*
mon
=
get_channelbsc_mon
(
This
->
bscallback
);
HRESULT
hres
;
hres
=
IMoniker_GetDisplayName
(
mon
,
NULL
,
0
,
&
wine_url
);
if
(
mon
)
{
if
(
SUCCEEDED
(
hres
))
{
LPWSTR
wine_url
;
nsIWineURI_SetWineURL
(
wine_uri
,
wine_url
);
HRESULT
hres
;
CoTaskMemFree
(
wine_url
);
}
else
{
hres
=
IMoniker_GetDisplayName
(
mon
,
NULL
,
0
,
&
wine_url
);
WARN
(
"GetDisplayName failed: %08x
\n
"
,
hres
);
if
(
SUCCEEDED
(
hres
))
{
nsIWineURI_SetWineURL
(
wine_uri
,
wine_url
);
CoTaskMemFree
(
wine_url
);
}
else
{
WARN
(
"GetDisplayName failed: %08x
\n
"
,
hres
);
}
IMoniker_Release
(
mon
);
}
}
IMoniker_Release
(
mon
);
*
_retval
=
FALSE
;
}
else
if
(
This
->
doc
)
{
*
_retval
=
translate_url
(
This
->
doc
->
basedoc
.
doc_obj
,
wine_uri
);
}
}
*
_retval
=
FALSE
;
}
else
if
(
This
->
doc
)
{
*
_retval
=
translate_url
(
This
->
doc
->
basedoc
.
doc_obj
,
wine_uri
);
}
}
nsIWineURI_Release
(
wine_uri
);
nsIWineURI_Release
(
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