Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
2a9d63f8
Commit
2a9d63f8
authored
Nov 18, 2011
by
Jacek Caban
Committed by
Alexandre Julliard
Nov 18, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mshtml: Use CLEAR_CALLED instead of SET_CALLED in some places.
parent
0574a30f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
23 deletions
+20
-23
htmldoc.c
dlls/mshtml/tests/htmldoc.c
+20
-23
No files found.
dlls/mshtml/tests/htmldoc.c
View file @
2a9d63f8
...
@@ -4753,7 +4753,7 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon)
...
@@ -4753,7 +4753,7 @@ static void test_Load(IPersistMoniker *persist, IMoniker *mon)
}
}
CHECK_CALLED
(
OnChanged_READYSTATE
);
CHECK_CALLED
(
OnChanged_READYSTATE
);
CHECK_CALLED
(
Invoke_OnReadyStateChange_Loading
);
CHECK_CALLED
(
Invoke_OnReadyStateChange_Loading
);
SET
_CALLED
(
IsSystemMoniker
);
/* IE7 */
CLEAR
_CALLED
(
IsSystemMoniker
);
/* IE7 */
SET_CALLED
(
Exec_ShellDocView_84
);
SET_CALLED
(
Exec_ShellDocView_84
);
if
(
mon
==
&
Moniker
)
if
(
mon
==
&
Moniker
)
CHECK_CALLED
(
BindToStorage
);
CHECK_CALLED
(
BindToStorage
);
...
@@ -4890,7 +4890,7 @@ static void test_download(DWORD flags)
...
@@ -4890,7 +4890,7 @@ static void test_download(DWORD flags)
if
(
is_js
)
if
(
is_js
)
CHECK_CALLED
(
GetExternal
);
CHECK_CALLED
(
GetExternal
);
CHECK_CALLED
(
OnViewChange
);
CHECK_CALLED
(
OnViewChange
);
SET
_CALLED
(
GetDropTarget
);
CLEAR
_CALLED
(
GetDropTarget
);
if
(
flags
&
DWL_TRYCSS
)
if
(
flags
&
DWL_TRYCSS
)
SET_CALLED
(
Exec_ShellDocView_84
);
SET_CALLED
(
Exec_ShellDocView_84
);
if
(
flags
&
DWL_CSS
)
{
if
(
flags
&
DWL_CSS
)
{
...
@@ -4919,33 +4919,30 @@ static void test_download(DWORD flags)
...
@@ -4919,33 +4919,30 @@ static void test_download(DWORD flags)
if
(
flags
&
DWL_HTTP
)
{
if
(
flags
&
DWL_HTTP
)
{
todo_wine
CHECK_CALLED
(
OnChanged_1012
);
todo_wine
CHECK_CALLED
(
OnChanged_1012
);
todo_wine
CHECK_CALLED
(
Exec_HTTPEQUIV
);
todo_wine
CHECK_CALLED
(
Exec_HTTPEQUIV
);
if
(
support_wbapp
)
todo_wine
CHECK_CALLED
(
Exec_SETTITLE
);
CHECK_CALLED
(
Exec_SETTITLE
);
else
todo_wine
CHECK_CALLED
(
Exec_SETTITLE
);
}
}
if
(
!
is_js
)
{
if
(
!
is_js
)
{
CHECK_CALLED
(
OnChanged_1005
);
CHECK_CALLED
(
OnChanged_1005
);
CHECK_CALLED
(
OnChanged_READYSTATE
);
CHECK_CALLED
(
OnChanged_READYSTATE
);
CHECK_CALLED
(
Exec_SETPROGRESSPOS
);
CHECK_CALLED
(
Exec_SETPROGRESSPOS
);
}
else
{
}
else
{
SET
_CALLED
(
OnChanged_READYSTATE
);
/* sometimes called */
CLEAR
_CALLED
(
OnChanged_READYSTATE
);
/* sometimes called */
todo_wine
CHECK_CALLED
(
Exec_SETPROGRESSPOS
);
todo_wine
CHECK_CALLED
(
Exec_SETPROGRESSPOS
);
}
}
if
(
!
(
flags
&
DWL_EMPTY
))
if
(
!
(
flags
&
DWL_EMPTY
))
CHECK_CALLED
(
Exec_SETDOWNLOADSTATE_0
);
CHECK_CALLED
(
Exec_SETDOWNLOADSTATE_0
);
SET
_CALLED
(
Exec_ShellDocView_103
);
CLEAR
_CALLED
(
Exec_ShellDocView_103
);
SET
_CALLED
(
Exec_ShellDocView_105
);
CLEAR
_CALLED
(
Exec_ShellDocView_105
);
SET
_CALLED
(
Exec_ShellDocView_140
);
CLEAR
_CALLED
(
Exec_ShellDocView_140
);
if
(
!
is_js
)
{
if
(
!
is_js
)
{
CHECK_CALLED
(
Exec_MSHTML_PARSECOMPLETE
);
CHECK_CALLED
(
Exec_MSHTML_PARSECOMPLETE
);
CHECK_CALLED
(
Exec_HTTPEQUIV_DONE
);
CHECK_CALLED
(
Exec_HTTPEQUIV_DONE
);
}
}
SET_CALLED
(
SetStatusText
);
SET_CALLED
(
SetStatusText
);
if
(
nav_url
||
support_wbapp
)
{
/* avoiding race, FIXME: find better way */
if
(
nav_url
||
support_wbapp
)
{
/* avoiding race, FIXME: find better way */
SET
_CALLED
(
UpdateUI
);
CLEAR
_CALLED
(
UpdateUI
);
SET
_CALLED
(
Exec_UPDATECOMMANDS
);
CLEAR
_CALLED
(
Exec_UPDATECOMMANDS
);
SET
_CALLED
(
Exec_SETTITLE
);
CLEAR
_CALLED
(
Exec_SETTITLE
);
todo_wine
CHECK_CALLED_BROKEN
(
UpdateBackForwardState
);
todo_wine
CHECK_CALLED_BROKEN
(
UpdateBackForwardState
);
}
}
if
(
!
is_js
)
{
if
(
!
is_js
)
{
...
@@ -5076,20 +5073,20 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace, const char *hre
...
@@ -5076,20 +5073,20 @@ static void test_put_href(IHTMLDocument2 *doc, BOOL use_replace, const char *hre
CHECK_CALLED
(
Navigate
);
CHECK_CALLED
(
Navigate
);
}
}
}
else
{
}
else
{
SET
_CALLED
(
TranslateUrl
);
CLEAR
_CALLED
(
TranslateUrl
);
if
(
support_wbapp
)
{
if
(
support_wbapp
)
{
SET
_CALLED
(
FireBeforeNavigate2
);
CLEAR
_CALLED
(
FireBeforeNavigate2
);
SET_CALLED
(
Exec_ShellDocView_67
);
SET_CALLED
(
Exec_ShellDocView_67
);
if
(
!
is_hash
)
{
if
(
!
is_hash
)
{
SET
_CALLED
(
Invoke_AMBIENT_SILENT
);
CLEAR
_CALLED
(
Invoke_AMBIENT_SILENT
);
SET
_CALLED
(
Invoke_AMBIENT_OFFLINEIFNOTCONNECTED
);
CLEAR
_CALLED
(
Invoke_AMBIENT_OFFLINEIFNOTCONNECTED
);
SET
_CALLED
(
Exec_ShellDocView_63
);
CLEAR
_CALLED
(
Exec_ShellDocView_63
);
}
else
{
}
else
{
SET
_CALLED
(
FireNavigateComplete2
);
CLEAR
_CALLED
(
FireNavigateComplete2
);
SET
_CALLED
(
FireDocumentComplete
);
CLEAR
_CALLED
(
FireDocumentComplete
);
}
}
}
else
{
}
else
{
SET
_CALLED
(
Navigate
);
CLEAR
_CALLED
(
Navigate
);
}
}
}
}
...
@@ -5493,7 +5490,7 @@ static void test_exec_editmode(IUnknown *unk, BOOL loaded)
...
@@ -5493,7 +5490,7 @@ static void test_exec_editmode(IUnknown *unk, BOOL loaded)
CHECK_CALLED
(
Invoke_AMBIENT_OFFLINEIFNOTCONNECTED
);
CHECK_CALLED
(
Invoke_AMBIENT_OFFLINEIFNOTCONNECTED
);
CHECK_CALLED
(
OnChanged_READYSTATE
);
CHECK_CALLED
(
OnChanged_READYSTATE
);
CHECK_CALLED
(
Invoke_OnReadyStateChange_Loading
);
CHECK_CALLED
(
Invoke_OnReadyStateChange_Loading
);
SET
_CALLED
(
IsSystemMoniker
);
/* IE7 */
CLEAR
_CALLED
(
IsSystemMoniker
);
/* IE7 */
SET_CALLED
(
Exec_ShellDocView_84
);
SET_CALLED
(
Exec_ShellDocView_84
);
if
(
loaded
)
if
(
loaded
)
CHECK_CALLED
(
BindToStorage
);
CHECK_CALLED
(
BindToStorage
);
...
@@ -6788,7 +6785,7 @@ static void test_editing_mode(BOOL do_load)
...
@@ -6788,7 +6785,7 @@ static void test_editing_mode(BOOL do_load)
SET_EXPECT
(
SetStatusText
);
/* ignore race in native mshtml */
SET_EXPECT
(
SetStatusText
);
/* ignore race in native mshtml */
test_timer
(
EXPECT_UPDATEUI
);
test_timer
(
EXPECT_UPDATEUI
);
SET
_CALLED
(
SetStatusText
);
CLEAR
_CALLED
(
SetStatusText
);
test_MSHTML_QueryStatus
(
doc
,
OLECMDF_SUPPORTED
|
OLECMDF_ENABLED
);
test_MSHTML_QueryStatus
(
doc
,
OLECMDF_SUPPORTED
|
OLECMDF_ENABLED
);
...
...
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