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
47ef2acc
Commit
47ef2acc
authored
Sep 28, 2008
by
Jacek Caban
Committed by
Alexandre Julliard
Sep 30, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Fixed tests on IE7.
parent
d83fc43e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
4 deletions
+32
-4
task.c
dlls/mshtml/task.c
+2
-0
htmldoc.c
dlls/mshtml/tests/htmldoc.c
+30
-4
No files found.
dlls/mshtml/task.c
View file @
47ef2acc
...
...
@@ -261,6 +261,8 @@ static void set_parsecomplete(HTMLDocument *doc)
call_property_onchanged
(
&
doc
->
cp_propnotif
,
1005
);
call_explorer_69
(
doc
);
/* FIXME: IE7 calls EnableModelless(TRUE), EnableModelless(FALSE) and sets interactive state here */
doc
->
readystate
=
READYSTATE_INTERACTIVE
;
call_property_onchanged
(
&
doc
->
cp_propnotif
,
DISPID_READYSTATE
);
...
...
dlls/mshtml/tests/htmldoc.c
View file @
47ef2acc
...
...
@@ -139,6 +139,10 @@ DEFINE_EXPECT(RequestUIActivate);
DEFINE_EXPECT
(
InPlaceFrame_SetBorderSpace
);
DEFINE_EXPECT
(
InPlaceUIWindow_SetActiveObject
);
DEFINE_EXPECT
(
GetExternal
);
DEFINE_EXPECT
(
EnableModeless_TRUE
);
DEFINE_EXPECT
(
EnableModeless_FALSE
);
DEFINE_EXPECT
(
Frame_EnableModeless_TRUE
);
DEFINE_EXPECT
(
Frame_EnableModeless_FALSE
);
static
IUnknown
*
doc_unk
;
static
BOOL
expect_LockContainer_fLock
;
...
...
@@ -652,11 +656,13 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D
readystate_set_loading
=
FALSE
;
load_state
=
LD_LOADING
;
}
test_readyState
(
NULL
);
if
(
!
editmode
||
load_state
!=
LD_LOADING
||
!
called_Exec_Explorer_69
)
test_readyState
(
NULL
);
return
S_OK
;
case
1005
:
CHECK_EXPECT
(
OnChanged_1005
);
test_readyState
(
NULL
);
if
(
!
editmode
)
test_readyState
(
NULL
);
load_state
=
LD_INTERACTIVE
;
return
S_OK
;
}
...
...
@@ -1309,7 +1315,10 @@ static HRESULT WINAPI InPlaceFrame_SetStatusText(IOleInPlaceFrame *iface, LPCOLE
static
HRESULT
WINAPI
InPlaceFrame_EnableModeless
(
IOleInPlaceFrame
*
iface
,
BOOL
fEnable
)
{
ok
(
0
,
"unexpected call
\n
"
);
if
(
fEnable
)
CHECK_EXPECT
(
Frame_EnableModeless_TRUE
);
else
CHECK_EXPECT
(
Frame_EnableModeless_FALSE
);
return
E_NOTIMPL
;
}
...
...
@@ -1931,7 +1940,10 @@ static HRESULT WINAPI DocHostUIHandler_UpdateUI(IDocHostUIHandler2 *iface)
static
HRESULT
WINAPI
DocHostUIHandler_EnableModeless
(
IDocHostUIHandler2
*
iface
,
BOOL
fEnable
)
{
ok
(
0
,
"unexpected call
\n
"
);
if
(
fEnable
)
CHECK_EXPECT
(
EnableModeless_TRUE
);
else
CHECK_EXPECT
(
EnableModeless_FALSE
);
return
E_NOTIMPL
;
}
...
...
@@ -2734,6 +2746,10 @@ static void test_download(BOOL verb_done, BOOL css_dwl, BOOL css_try_dwl)
SET_EXPECT
(
UnlockRequest
);
}
SET_EXPECT
(
Exec_Explorer_69
);
SET_EXPECT
(
EnableModeless_TRUE
);
/* IE7 */
SET_EXPECT
(
Frame_EnableModeless_TRUE
);
/* IE7 */
SET_EXPECT
(
EnableModeless_FALSE
);
/* IE7 */
SET_EXPECT
(
Frame_EnableModeless_FALSE
);
/* IE7 */
SET_EXPECT
(
OnChanged_1005
);
SET_EXPECT
(
OnChanged_READYSTATE
);
SET_EXPECT
(
Exec_SETPROGRESSPOS
);
...
...
@@ -2741,6 +2757,7 @@ static void test_download(BOOL verb_done, BOOL css_dwl, BOOL css_try_dwl)
SET_EXPECT
(
Exec_ShellDocView_103
);
SET_EXPECT
(
Exec_MSHTML_PARSECOMPLETE
);
SET_EXPECT
(
Exec_HTTPEQUIV_DONE
);
SET_EXPECT
(
SetStatusText
);
expect_status_text
=
(
LPWSTR
)
0xdeadbeef
;
/* TODO */
while
(
!
called_Exec_HTTPEQUIV_DONE
&&
GetMessage
(
&
msg
,
NULL
,
0
,
0
))
{
...
...
@@ -2781,6 +2798,10 @@ static void test_download(BOOL verb_done, BOOL css_dwl, BOOL css_try_dwl)
}
}
SET_CALLED
(
Exec_Explorer_69
);
SET_CALLED
(
EnableModeless_TRUE
);
/* IE7 */
SET_CALLED
(
Frame_EnableModeless_TRUE
);
/* IE7 */
SET_CALLED
(
EnableModeless_FALSE
);
/* IE7 */
SET_CALLED
(
Frame_EnableModeless_FALSE
);
/* IE7 */
CHECK_CALLED
(
OnChanged_1005
);
CHECK_CALLED
(
OnChanged_READYSTATE
);
CHECK_CALLED
(
Exec_SETPROGRESSPOS
);
...
...
@@ -2788,6 +2809,7 @@ static void test_download(BOOL verb_done, BOOL css_dwl, BOOL css_try_dwl)
SET_CALLED
(
Exec_ShellDocView_103
);
CHECK_CALLED
(
Exec_MSHTML_PARSECOMPLETE
);
CHECK_CALLED
(
Exec_HTTPEQUIV_DONE
);
SET_CALLED
(
SetStatusText
);
load_state
=
LD_COMPLETE
;
...
...
@@ -4030,7 +4052,11 @@ static void test_editing_mode(BOOL do_load)
test_MSHTML_QueryStatus
(
unk
,
OLECMDF_SUPPORTED
);
test_download
(
TRUE
,
do_load
,
do_load
);
SET_EXPECT
(
SetStatusText
);
/* ignore race in native mshtml */
test_timer
(
EXPECT_UPDATEUI
);
SET_CALLED
(
SetStatusText
);
test_MSHTML_QueryStatus
(
unk
,
OLECMDF_SUPPORTED
|
OLECMDF_ENABLED
);
if
(
!
do_load
)
{
...
...
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