[ros-diffs] [akhaldi] 66874: [IMAGEHLP_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

[akhaldi]

Author: akhaldi
Date: Wed Mar 25 11:57:51 2015
New Revision: 66874

URL: http://svn.reactos.org/svn/reactos?rev=66874&view=rev
Log:
[IMAGEHLP_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

Modified:
    trunk/rostests/winetests/imagehlp/image.c

Modified: trunk/rostests/winetests/imagehlp/image.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/imagehlp/image.c?rev=66874&r1=66873&r2=66874&view=diff
==============================================================================
--- trunk/rostests/winetests/imagehlp/image.c   [iso-8859-1] (original)
+++ trunk/rostests/winetests/imagehlp/image.c   [iso-8859-1] Wed Mar 25 
11:57:51 2015
@@ -390,10 +390,10 @@
     SetLastError(0xdeadbeef);
     ret = pBindImageEx(BIND_NO_BOUND_IMPORTS | BIND_NO_UPDATE | 
BIND_ALL_IMAGES, "nonexistent.dll", 0, 0,
                        testing_status_routine);
-    todo_wine ok(!ret && ((GetLastError() == ERROR_FILE_NOT_FOUND) ||
-                 (GetLastError() == ERROR_INVALID_PARAMETER)),
-                 "expected ERROR_FILE_NOT_FOUND or ERROR_INVALID_PARAMETER, 
got %d\n",
-                 GetLastError());
+    ok(!ret && ((GetLastError() == ERROR_FILE_NOT_FOUND) ||
+       (GetLastError() == ERROR_INVALID_PARAMETER)),
+       "expected ERROR_FILE_NOT_FOUND or ERROR_INVALID_PARAMETER, got %d\n",
+       GetLastError());
 
     file = create_temp_file(temp_file);
     if (file == INVALID_HANDLE_VALUE)
@@ -415,14 +415,14 @@
                        testing_status_routine);
     ok(ret, "BindImageEx failed: %d\n", GetLastError());
 
-    todo_wine ok(status_routine_called[BindImportModule] == 1,
-                 "StatusRoutine was called %d times\n", 
status_routine_called[BindImportModule]);
-
-    todo_wine ok((status_routine_called[BindImportProcedure] == 1)
+    ok(status_routine_called[BindImportModule] == 1,
+       "StatusRoutine was called %d times\n", 
status_routine_called[BindImportModule]);
+
+    ok((status_routine_called[BindImportProcedure] == 1)
 #if defined(_WIN64)
-                 || broken(status_routine_called[BindImportProcedure] == 0) /* 
< Win8 */
+       || broken(status_routine_called[BindImportProcedure] == 0) /* < Win8 */
 #endif
-                 , "StatusRoutine was called %d times\n", 
status_routine_called[BindImportProcedure]);
+       , "StatusRoutine was called %d times\n", 
status_routine_called[BindImportProcedure]);
 
     DeleteFileA(temp_file);
 }