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
67c8d4b4
Commit
67c8d4b4
authored
Nov 01, 2009
by
Jacek Caban
Committed by
Alexandre Julliard
Nov 03, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Moved readystate changes to separated function.
parent
dca24983
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
6 deletions
+11
-6
mshtml_private.h
dlls/mshtml/mshtml_private.h
+1
-0
persist.c
dlls/mshtml/persist.c
+8
-2
task.c
dlls/mshtml/task.c
+2
-4
No files found.
dlls/mshtml/mshtml_private.h
View file @
67c8d4b4
...
...
@@ -684,6 +684,7 @@ void channelbsc_set_channel(nsChannelBSC*,nsChannel*,nsIStreamListener*,nsISuppo
IMoniker
*
get_channelbsc_mon
(
nsChannelBSC
*
);
void
parse_complete
(
HTMLDocumentObj
*
);
void
set_ready_state
(
HTMLWindow
*
,
READYSTATE
);
HRESULT
HTMLSelectionObject_Create
(
HTMLDocumentNode
*
,
nsISelection
*
,
IHTMLSelectionObject
**
);
HRESULT
HTMLTxtRange_Create
(
HTMLDocumentNode
*
,
nsIDOMRange
*
,
IHTMLTxtRange
**
);
...
...
dlls/mshtml/persist.c
View file @
67c8d4b4
...
...
@@ -190,8 +190,7 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO
}
}
This
->
doc_obj
->
readystate
=
READYSTATE_LOADING
;
call_property_onchanged
(
&
This
->
cp_propnotif
,
DISPID_READYSTATE
);
set_ready_state
(
This
->
window
,
READYSTATE_LOADING
);
update_doc
(
This
,
UPDATE_TITLE
);
HTMLDocument_LockContainer
(
This
->
doc_obj
,
TRUE
);
...
...
@@ -274,6 +273,13 @@ static HRESULT set_moniker(HTMLDocument *This, IMoniker *mon, IBindCtx *pibc, BO
return
S_OK
;
}
void
set_ready_state
(
HTMLWindow
*
window
,
READYSTATE
readystate
)
{
window
->
doc_obj
->
readystate
=
readystate
;
if
(
window
->
doc_obj
->
basedoc
.
window
==
window
)
call_property_onchanged
(
&
window
->
doc_obj
->
basedoc
.
cp_propnotif
,
DISPID_READYSTATE
);
}
static
HRESULT
get_doc_string
(
HTMLDocumentNode
*
This
,
char
**
str
)
{
nsIDOMNode
*
nsnode
;
...
...
dlls/mshtml/task.c
View file @
67c8d4b4
...
...
@@ -237,8 +237,7 @@ void parse_complete(HTMLDocumentObj *doc)
/* FIXME: IE7 calls EnableModelless(TRUE), EnableModelless(FALSE) and sets interactive state here */
doc
->
readystate
=
READYSTATE_INTERACTIVE
;
call_property_onchanged
(
&
doc
->
basedoc
.
cp_propnotif
,
DISPID_READYSTATE
);
set_ready_state
(
doc
->
basedoc
.
window
,
READYSTATE_INTERACTIVE
);
if
(
doc
->
client
)
IOleClientSite_QueryInterface
(
doc
->
client
,
&
IID_IOleCommandTarget
,
(
void
**
)
&
olecmd
);
...
...
@@ -263,8 +262,7 @@ void parse_complete(HTMLDocumentObj *doc)
IOleCommandTarget_Release
(
olecmd
);
}
doc
->
readystate
=
READYSTATE_COMPLETE
;
call_property_onchanged
(
&
doc
->
basedoc
.
cp_propnotif
,
DISPID_READYSTATE
);
set_ready_state
(
doc
->
basedoc
.
window
,
READYSTATE_COMPLETE
);
if
(
doc
->
frame
)
{
static
const
WCHAR
wszDone
[]
=
{
'D'
,
'o'
,
'n'
,
'e'
,
0
};
...
...
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