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
979b42d7
Commit
979b42d7
authored
Mar 23, 2008
by
Jacek Caban
Committed by
Alexandre Julliard
Mar 24, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Don't access BSCallback directly in nsembed.c.
parent
f792ada4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
10 deletions
+24
-10
mshtml_private.h
dlls/mshtml/mshtml_private.h
+1
-0
navigate.c
dlls/mshtml/navigate.c
+7
-0
nsembed.c
dlls/mshtml/nsembed.c
+16
-10
No files found.
dlls/mshtml/mshtml_private.h
View file @
979b42d7
...
...
@@ -435,6 +435,7 @@ void set_document_bscallback(HTMLDocument*,BSCallback*);
void
set_current_mon
(
HTMLDocument
*
,
IMoniker
*
);
void
channelbsc_set_channel
(
BSCallback
*
,
nsChannel
*
,
nsIStreamListener
*
,
nsISupports
*
);
IMoniker
*
get_channelbsc_mon
(
BSCallback
*
);
IHTMLSelectionObject
*
HTMLSelectionObject_Create
(
HTMLDocument
*
,
nsISelection
*
);
IHTMLTxtRange
*
HTMLTxtRange_Create
(
HTMLDocument
*
,
nsIDOMRange
*
);
...
...
dlls/mshtml/navigate.c
View file @
979b42d7
...
...
@@ -866,6 +866,13 @@ HRESULT start_binding(HTMLDocument *doc, BSCallback *bscallback, IBindCtx *bctx)
return
S_OK
;
}
IMoniker
*
get_channelbsc_mon
(
BSCallback
*
This
)
{
if
(
This
->
mon
)
IMoniker_AddRef
(
This
->
mon
);
return
This
->
mon
;
}
void
set_document_bscallback
(
HTMLDocument
*
doc
,
BSCallback
*
callback
)
{
BSCallback
*
iter
;
...
...
dlls/mshtml/nsembed.c
View file @
979b42d7
...
...
@@ -1138,16 +1138,22 @@ static nsresult NSAPI nsURIContentListener_OnStartURIOpen(nsIURIContentListener
nsIWineURI_SetNSContainer
(
wine_uri
,
This
);
nsIWineURI_SetIsDocumentURI
(
wine_uri
,
TRUE
);
if
(
This
->
bscallback
&&
This
->
bscallback
->
mon
)
{
LPWSTR
wine_url
;
HRESULT
hres
;
hres
=
IMoniker_GetDisplayName
(
This
->
bscallback
->
mon
,
NULL
,
0
,
&
wine_url
);
if
(
SUCCEEDED
(
hres
))
{
nsIWineURI_SetWineURL
(
wine_uri
,
wine_url
);
CoTaskMemFree
(
wine_url
);
}
else
{
WARN
(
"GetDisplayName failed: %08x
\n
"
,
hres
);
if
(
This
->
bscallback
)
{
IMoniker
*
mon
=
get_channelbsc_mon
(
This
->
bscallback
);
if
(
mon
)
{
LPWSTR
wine_url
;
HRESULT
hres
;
hres
=
IMoniker_GetDisplayName
(
mon
,
NULL
,
0
,
&
wine_url
);
if
(
SUCCEEDED
(
hres
))
{
nsIWineURI_SetWineURL
(
wine_uri
,
wine_url
);
CoTaskMemFree
(
wine_url
);
}
else
{
WARN
(
"GetDisplayName failed: %08x
\n
"
,
hres
);
}
IMoniker_Release
(
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