Skip to content

W
wine-cw
Commit 390c2730 authored by Michael Stefaniuc's avatar Michael Stefaniuc Committed by Alexandre Julliard
Browse files
Options

ieframe/tests: Use todo_wine_if().

Signed-off-by: 's avatarMichael Stefaniuc <mstefani@redhat.de> Signed-off-by: 's avatarJacek Caban <jacek@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 53165034
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 30 deletions
dlls/ieframe/tests/webbrowser.c
View file @ 390c2730
......@@ -914,12 +914,7 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe
if (V_I4(pDispParams->rgvarg+1) == CSC_NAVIGATEFORWARD)
{
if(nav_forward_todo) {
if(V_BOOL(pDispParams->rgvarg))
todo_wine CHECK_EXPECT2(Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_TRUE);
else
todo_wine CHECK_EXPECT2(Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE);
}else {
todo_wine_if(nav_forward_todo) {
if(V_BOOL(pDispParams->rgvarg))
CHECK_EXPECT2(Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_TRUE);
else
......@@ -928,12 +923,7 @@ static HRESULT WINAPI WebBrowserEvents2_Invoke(IDispatch *iface, DISPID dispIdMe
}
else if (V_I4(pDispParams->rgvarg+1) == CSC_NAVIGATEBACK)
{
if(nav_back_todo) {
if(V_BOOL(pDispParams->rgvarg))
todo_wine CHECK_EXPECT2(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_TRUE);
else
todo_wine CHECK_EXPECT2(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE);
}else {
todo_wine_if(nav_back_todo) {
if(V_BOOL(pDispParams->rgvarg))
CHECK_EXPECT2(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_TRUE);
else
......@@ -3028,12 +3018,7 @@ static void test_download(DWORD flags)
CLEAR_CALLED(EnableModeless_FALSE); /* IE 8 */
if(!(flags & DWL_REFRESH)) {
if(nav_back_todo) {
if(flags & (DWL_FROM_GOFORWARD|DWL_BACK_ENABLE))
todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_TRUE);
else
todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE);
}else {
todo_wine_if(nav_back_todo) {
if(flags & (DWL_FROM_GOFORWARD|DWL_BACK_ENABLE))
CHECK_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_TRUE);
else
......@@ -3238,24 +3223,14 @@ static void test_go_back(IWebBrowser2 *wb, const char *back_url, int back_enable
CHECK_CALLED(Invoke_BEFORENAVIGATE2);
nav_forward_todo = FALSE;
if(nav_back_todo) {
if(back_enable)
todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_TRUE);
else
todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE);
}else {
todo_wine_if(nav_back_todo) {
if(back_enable)
CHECK_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_TRUE);
else
CHECK_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEBACK_FALSE);
}
if(forward_todo) {
if(forward_enable)
todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_TRUE);
else
todo_wine CHECK_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_FALSE);
}else {
todo_wine_if(forward_todo) {
if(forward_enable)
CHECK_CALLED(Invoke_COMMANDSTATECHANGE_NAVIGATEFORWARD_TRUE);
else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment