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
54d2a447
Commit
54d2a447
authored
Jun 11, 2007
by
Jacek Caban
Committed by
Alexandre Julliard
Jun 11, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Store current moniker in HTMLDocument.
parent
8d4c839a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
0 deletions
+23
-0
htmldoc.c
dlls/mshtml/htmldoc.c
+1
-0
mshtml_private.h
dlls/mshtml/mshtml_private.h
+2
-0
nsio.c
dlls/mshtml/nsio.c
+8
-0
persist.c
dlls/mshtml/persist.c
+12
-0
No files found.
dlls/mshtml/htmldoc.c
View file @
54d2a447
...
...
@@ -159,6 +159,7 @@ static ULONG WINAPI HTMLDocument_Release(IHTMLDocument2 *iface)
IOleDocumentView_SetInPlaceSite
(
DOCVIEW
(
This
),
NULL
);
set_document_bscallback
(
This
,
NULL
);
set_current_mon
(
This
,
NULL
);
if
(
This
->
tooltips_hwnd
)
DestroyWindow
(
This
->
tooltips_hwnd
);
...
...
dlls/mshtml/mshtml_private.h
View file @
54d2a447
...
...
@@ -101,6 +101,7 @@ struct HTMLDocument {
IOleInPlaceFrame
*
frame
;
BSCallback
*
bscallback
;
IMoniker
*
mon
;
HWND
hwnd
;
HWND
tooltips_hwnd
;
...
...
@@ -353,6 +354,7 @@ BSCallback *create_bscallback(IMoniker*);
HRESULT
start_binding
(
BSCallback
*
);
HRESULT
load_stream
(
BSCallback
*
,
IStream
*
);
void
set_document_bscallback
(
HTMLDocument
*
,
BSCallback
*
);
void
set_current_mon
(
HTMLDocument
*
,
IMoniker
*
);
IHlink
*
Hlink_Create
(
void
);
IHTMLSelectionObject
*
HTMLSelectionObject_Create
(
nsISelection
*
);
...
...
dlls/mshtml/nsio.c
View file @
54d2a447
...
...
@@ -690,6 +690,11 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen
return
This
->
channel
?
nsIChannel_AsyncOpen
(
This
->
channel
,
aListener
,
aContext
)
:
NS_ERROR_UNEXPECTED
;
hres
=
create_mon_for_nschannel
(
This
,
&
mon
);
if
(
FAILED
(
hres
))
return
NS_ERROR_UNEXPECTED
;
set_current_mon
(
container
->
doc
,
mon
);
}
}
...
...
@@ -715,6 +720,9 @@ static nsresult NSAPI nsChannel_AsyncOpen(nsIHttpChannel *iface, nsIStreamListen
nsres
=
nsIChannel_AsyncOpen
(
This
->
channel
,
aListener
,
aContext
);
if
(
mon
)
IMoniker_Release
(
mon
);
if
(
NS_FAILED
(
nsres
)
&&
(
This
->
load_flags
&
LOAD_INITIAL_DOCUMENT_URI
))
return
WINE_NS_LOAD_FROM_MONIKER
;
return
nsres
;
...
...
dlls/mshtml/persist.c
View file @
54d2a447
...
...
@@ -113,6 +113,15 @@ static nsIInputStream *get_post_data_stream(IBindCtx *bctx)
return
ret
;
}
void
set_current_mon
(
HTMLDocument
*
This
,
IMoniker
*
mon
)
{
if
(
This
->
mon
)
IMoniker_Release
(
This
->
mon
);
if
(
mon
)
IMoniker_AddRef
(
mon
);
This
->
mon
=
mon
;
}
static
HRESULT
set_moniker
(
HTMLDocument
*
This
,
IMoniker
*
mon
,
IBindCtx
*
pibc
,
BOOL
*
bind_complete
)
{
BSCallback
*
bscallback
;
...
...
@@ -165,6 +174,8 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO
TRACE
(
"got url: %s
\n
"
,
debugstr_w
(
url
));
set_current_mon
(
This
,
mon
);
if
(
This
->
client
)
{
VARIANT
silent
,
offline
;
IOleCommandTarget
*
cmdtrg
=
NULL
;
...
...
@@ -655,4 +666,5 @@ void HTMLDocument_Persist_Init(HTMLDocument *This)
This
->
lpPersistStreamInitVtbl
=
&
PersistStreamInitVtbl
;
This
->
bscallback
=
NULL
;
This
->
mon
=
NULL
;
}
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