Michael Stefaniuc : kernel32/tests: Remove another identical if/ else branch.

Alexandre Julliard julliard at winehq.org
Wed Aug 10 11:05:57 CDT 2016


Module: wine
Branch: master
Commit: 3bc7549f4272d92c02377d0cbd725bdcaa6ddc36
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=3bc7549f4272d92c02377d0cbd725bdcaa6ddc36

Author: Michael Stefaniuc <mstefani at redhat.de>
Date:   Tue Aug  9 22:31:38 2016 +0200

kernel32/tests: Remove another identical if/else branch.

Signed-off-by: Michael Stefaniuc <mstefani at redhat.de>
Signed-off-by: Sebastian Lackner <sebastian at fds-team.de>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/kernel32/tests/virtual.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c
index 583abf6..40de97a 100644
--- a/dlls/kernel32/tests/virtual.c
+++ b/dlls/kernel32/tests/virtual.c
@@ -2782,10 +2782,7 @@ static void test_atl_thunk_emulation( ULONG dep_flags )
     ret = send_message_excpt( hWnd, WM_USER, 0, 0 );
     ok( ret == 43, "call returned wrong result, expected 43, got %d\n", ret );
     ok( num_guard_page_calls == 0, "expected no STATUS_GUARD_PAGE_VIOLATION exception, got %d exceptions\n", num_guard_page_calls );
-    if ((dep_flags & MEM_EXECUTE_OPTION_DISABLE) && (dep_flags & MEM_EXECUTE_OPTION_DISABLE_THUNK_EMULATION))
-        ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls );
-    else
-        ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls );
+    ok( num_execute_fault_calls == 0, "expected no STATUS_ACCESS_VIOLATION exception, got %d exceptions\n", num_execute_fault_calls );
 
     /* Now a bit more complicated, the page containing the code is protected with
      * PAGE_GUARD memory protection. */




More information about the wine-cvs mailing list