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
af5ce0d2
Commit
af5ce0d2
authored
Apr 01, 2009
by
Ge van Geldorp
Committed by
Alexandre Julliard
Apr 01, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml/tests: Fix tests on Windows.
parent
8edf353b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
23 additions
and
5 deletions
+23
-5
htmldoc.c
dlls/mshtml/tests/htmldoc.c
+23
-5
No files found.
dlls/mshtml/tests/htmldoc.c
View file @
af5ce0d2
...
...
@@ -103,6 +103,7 @@ DEFINE_EXPECT(Exec_SETDOWNLOADSTATE_1);
DEFINE_EXPECT
(
Exec_ShellDocView_37
);
DEFINE_EXPECT
(
Exec_ShellDocView_84
);
DEFINE_EXPECT
(
Exec_ShellDocView_103
);
DEFINE_EXPECT
(
Exec_ShellDocView_105
);
DEFINE_EXPECT
(
Exec_UPDATECOMMANDS
);
DEFINE_EXPECT
(
Exec_SETTITLE
);
DEFINE_EXPECT
(
Exec_HTTPEQUIV
);
...
...
@@ -149,7 +150,7 @@ static BOOL expect_LockContainer_fLock;
static
BOOL
expect_InPlaceUIWindow_SetActiveObject_active
=
TRUE
;
static
BOOL
ipsex
;
static
BOOL
set_clientsite
=
FALSE
,
container_locked
=
FALSE
;
static
BOOL
readystate_set_loading
=
FALSE
,
load_from_stream
;
static
BOOL
readystate_set_loading
=
FALSE
,
readystate_set_interactive
=
FALSE
,
load_from_stream
;
static
BOOL
editmode
=
FALSE
,
show_failed
;
static
int
stream_read
,
protocol_read
;
static
enum
load_state_t
{
...
...
@@ -648,9 +649,15 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D
switch
(
dispID
)
{
case
DISPID_READYSTATE
:
CHECK_EXPECT2
(
OnChanged_READYSTATE
);
test_MSHTML_QueryStatus
(
NULL
,
OLECMDF_SUPPORTED
|
(
editmode
&&
(
load_state
==
LD_INTERACTIVE
||
load_state
==
LD_COMPLETE
)
?
OLECMDF_ENABLED
:
0
));
if
(
readystate_set_interactive
)
{
readystate_set_interactive
=
FALSE
;
load_state
=
LD_INTERACTIVE
;
}
else
test_MSHTML_QueryStatus
(
NULL
,
OLECMDF_SUPPORTED
|
(
editmode
&&
(
load_state
==
LD_INTERACTIVE
||
load_state
==
LD_COMPLETE
)
?
OLECMDF_ENABLED
:
0
));
if
(
readystate_set_loading
)
{
readystate_set_loading
=
FALSE
;
...
...
@@ -663,7 +670,7 @@ static HRESULT WINAPI PropertyNotifySink_OnChanged(IPropertyNotifySink *iface, D
CHECK_EXPECT
(
OnChanged_1005
);
if
(
!
editmode
)
test_readyState
(
NULL
);
load_state
=
LD_INTERACTIVE
;
readystate_set_interactive
=
(
load_state
!=
LD_INTERACTIVE
)
;
return
S_OK
;
}
...
...
@@ -2138,6 +2145,7 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID
break
;
case
1
:
CHECK_EXPECT
(
Exec_SETDOWNLOADSTATE_1
);
readystate_set_interactive
=
(
load_state
!=
LD_INTERACTIVE
);
break
;
default:
ok
(
0
,
"unexpevted V_I4(pvaIn)=%d
\n
"
,
V_I4
(
pvaIn
));
...
...
@@ -2206,6 +2214,14 @@ static HRESULT WINAPI OleCommandTarget_Exec(IOleCommandTarget *iface, const GUID
return
E_NOTIMPL
;
case
105
:
CHECK_EXPECT2
(
Exec_ShellDocView_105
);
ok
(
pvaIn
!=
NULL
,
"pvaIn == NULL
\n
"
);
ok
(
pvaOut
==
NULL
,
"pvaOut != NULL
\n
"
);
return
E_NOTIMPL
;
default:
ok
(
0
,
"unexpected command %d
\n
"
,
nCmdID
);
return
E_FAIL
;
...
...
@@ -2750,6 +2766,7 @@ static void test_download(BOOL verb_done, BOOL css_dwl, BOOL css_try_dwl)
SET_EXPECT
(
Exec_SETPROGRESSPOS
);
SET_EXPECT
(
Exec_SETDOWNLOADSTATE_0
);
SET_EXPECT
(
Exec_ShellDocView_103
);
SET_EXPECT
(
Exec_ShellDocView_105
);
SET_EXPECT
(
Exec_MSHTML_PARSECOMPLETE
);
SET_EXPECT
(
Exec_HTTPEQUIV_DONE
);
SET_EXPECT
(
SetStatusText
);
...
...
@@ -2802,6 +2819,7 @@ static void test_download(BOOL verb_done, BOOL css_dwl, BOOL css_try_dwl)
CHECK_CALLED
(
Exec_SETPROGRESSPOS
);
CHECK_CALLED
(
Exec_SETDOWNLOADSTATE_0
);
SET_CALLED
(
Exec_ShellDocView_103
);
SET_CALLED
(
Exec_ShellDocView_105
);
CHECK_CALLED
(
Exec_MSHTML_PARSECOMPLETE
);
CHECK_CALLED
(
Exec_HTTPEQUIV_DONE
);
SET_CALLED
(
SetStatusText
);
...
...
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