[ros-diffs] [akhaldi] 61208: [TWAIN_32_WINETEST] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Tue Dec  3 11:27:55 2013
New Revision: 61208

URL: http://svn.reactos.org/svn/reactos?rev=61208&view=rev
Log:
[TWAIN_32_WINETEST]
* Sync with Wine 1.7.1.
CORE-7469

Modified:
    trunk/rostests/winetests/twain_32/CMakeLists.txt
    trunk/rostests/winetests/twain_32/dsm.c
    trunk/rostests/winetests/twain_32/testlist.c

Modified: trunk/rostests/winetests/twain_32/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/twain_32/CMakeL…
==============================================================================
--- trunk/rostests/winetests/twain_32/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/winetests/twain_32/CMakeLists.txt	[iso-8859-1] Tue Dec  3 11:27:55
2013
@@ -1,10 +1,5 @@
-
-add_definitions(
-    -D__ROS_LONG64__
-    -D_DLL -D__USE_CRTIMP)
 
 add_executable(twain_32_winetest dsm.c testlist.c)
-target_link_libraries(twain_32_winetest wine)
 set_module_type(twain_32_winetest win32cui)
-add_importlibs(twain_32_winetest user32 gdi32 msvcrt kernel32 ntdll)
+add_importlibs(twain_32_winetest user32 gdi32 msvcrt kernel32)
 add_cd_file(TARGET twain_32_winetest DESTINATION reactos/bin FOR all)

Modified: trunk/rostests/winetests/twain_32/dsm.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/twain_32/dsm.c?…
==============================================================================
--- trunk/rostests/winetests/twain_32/dsm.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/twain_32/dsm.c	[iso-8859-1] Tue Dec  3 11:27:55 2013
@@ -18,7 +18,7 @@
  *
  */
 #include <stdarg.h>
-#include <assert.h>
+
 #include "windef.h"
 #include "winbase.h"
 #include "wingdi.h"
@@ -33,6 +33,7 @@
 static BOOL dsm_RegisterWindowClasses(void)
 {
     WNDCLASSA cls;
+    BOOL rc;
 
     cls.style = 0;
     cls.lpfnWndProc = DefWindowProc;
@@ -44,9 +45,10 @@
     cls.hbrBackground = GetStockObject(WHITE_BRUSH);
     cls.lpszMenuName = NULL;
     cls.lpszClassName = "TWAIN_dsm_class";
-    if (!RegisterClassA(&cls)) return FALSE;
-
-    return TRUE;
+
+    rc = RegisterClassA(&cls);
+    ok(rc, "RegisterClassA failed: le=%u\n", GetLastError());
+    return rc;
 }
 
 
@@ -832,7 +834,11 @@
     HANDLE hwnd;
     HMODULE htwain;
 
-    if (!dsm_RegisterWindowClasses()) assert(0);
+    if (!dsm_RegisterWindowClasses())
+    {
+        skip("Could not register the test class, skipping tests\n");
+        return;
+    }
 
     htwain = LoadLibraryA("twain_32.dll");
     if (! htwain)

Modified: trunk/rostests/winetests/twain_32/testlist.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/twain_32/testli…
==============================================================================
--- trunk/rostests/winetests/twain_32/testlist.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/twain_32/testlist.c	[iso-8859-1] Tue Dec  3 11:27:55 2013
@@ -1,7 +1,4 @@
 /* Automatically generated file; DO NOT EDIT!! */
-
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
 
 #define STANDALONE
 #include "wine/test.h"