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
4ecf80fd
Commit
4ecf80fd
authored
Mar 13, 2010
by
Jacek Caban
Committed by
Alexandre Julliard
Mar 15, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
shdocvw: Separate document state from control state.
parent
fab93047
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
15 additions
and
6 deletions
+15
-6
dochost.c
dlls/shdocvw/dochost.c
+12
-5
navigate.c
dlls/shdocvw/navigate.c
+1
-1
shdocvw.h
dlls/shdocvw/shdocvw.h
+2
-0
No files found.
dlls/shdocvw/dochost.c
View file @
4ecf80fd
...
...
@@ -159,16 +159,23 @@ static void advise_prop_notif(DocHost *This, BOOL set)
This
->
is_prop_notif
=
set
;
}
void
set_doc_state
(
DocHost
*
This
,
READYSTATE
doc_state
)
{
This
->
doc_state
=
doc_state
;
if
(
doc_state
>
This
->
ready_state
)
This
->
ready_state
=
doc_state
;
}
static
void
update_ready_state
(
DocHost
*
This
,
READYSTATE
ready_state
)
{
if
(
ready_state
>
READYSTATE_LOADING
&&
This
->
ready_state
<=
READYSTATE_LOADING
)
{
if
(
ready_state
>
READYSTATE_LOADING
&&
This
->
doc_state
<=
READYSTATE_LOADING
)
notif_complete
(
This
,
DISPID_NAVIGATECOMPLETE2
);
This
->
ready_state
=
ready_state
;
}
if
(
ready_state
==
READYSTATE_COMPLETE
&&
This
->
ready
_state
<
READYSTATE_COMPLETE
)
{
This
->
ready_state
=
READYSTATE_COMPLETE
;
if
(
ready_state
==
READYSTATE_COMPLETE
&&
This
->
doc
_state
<
READYSTATE_COMPLETE
)
{
set_doc_state
(
This
,
READYSTATE_COMPLETE
)
;
notif_complete
(
This
,
DISPID_DOCUMENTCOMPLETE
);
}
else
{
set_doc_state
(
This
,
ready_state
);
}
}
...
...
dlls/shdocvw/navigate.c
View file @
4ecf80fd
...
...
@@ -549,7 +549,7 @@ static HRESULT navigate_bsc(DocHost *This, BindStatusCallback *bsc, IMoniker *mo
VARIANT_BOOL
cancel
=
VARIANT_FALSE
;
HRESULT
hres
;
This
->
ready_state
=
READYSTATE_LOADING
;
set_doc_state
(
This
,
READYSTATE_LOADING
)
;
on_before_navigate2
(
This
,
bsc
->
url
,
bsc
->
post_data
,
bsc
->
post_data_len
,
bsc
->
headers
,
&
cancel
);
if
(
cancel
)
{
...
...
dlls/shdocvw/shdocvw.h
View file @
4ecf80fd
...
...
@@ -104,6 +104,7 @@ struct DocHost {
VARIANT_BOOL
busy
;
READYSTATE
ready_state
;
READYSTATE
doc_state
;
DWORD
prop_notif_cookie
;
BOOL
is_prop_notif
;
...
...
@@ -223,6 +224,7 @@ HRESULT dochost_object_available(DocHost*,IUnknown*);
void
call_sink
(
ConnectionPoint
*
,
DISPID
,
DISPPARAMS
*
);
HRESULT
navigate_url
(
DocHost
*
,
LPCWSTR
,
const
VARIANT
*
,
const
VARIANT
*
,
VARIANT
*
,
VARIANT
*
);
HRESULT
go_home
(
DocHost
*
);
void
set_doc_state
(
DocHost
*
,
READYSTATE
);
#define WM_DOCHOSTTASK (WM_USER+0x300)
void
push_dochost_task
(
DocHost
*
,
task_header_t
*
,
task_proc_t
,
BOOL
);
...
...
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