[akhaldi] 60295: [MSCMS_WINETEST] * Sync with Wine 1.7.1. CORE-7469

Author: akhaldi
Date: Sat Sep 21 20:44:00 2013
New Revision: 60295

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

Modified:
    trunk/rostests/winetests/mscms/CMakeLists.txt
    trunk/rostests/winetests/mscms/profile.c
    trunk/rostests/winetests/mscms/testlist.c

Modified: trunk/rostests/winetests/mscms/CMakeLists.txt
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mscms/CMakeLists...
==============================================================================
--- trunk/rostests/winetests/mscms/CMakeLists.txt	[iso-8859-1] (original)
+++ trunk/rostests/winetests/mscms/CMakeLists.txt	[iso-8859-1] Sat Sep 21 20:44:00 2013
@@ -1,10 +1,5 @@
-
-add_definitions(
-    -D__ROS_LONG64__
-    -D_DLL -D__USE_CRTIMP)

add_executable(mscms_winetest profile.c testlist.c)
-target_link_libraries(mscms_winetest wine)
 set_module_type(mscms_winetest win32cui)
-add_importlibs(mscms_winetest advapi32 msvcrt kernel32 ntdll)
+add_importlibs(mscms_winetest msvcrt kernel32)
 add_cd_file(TARGET mscms_winetest DESTINATION reactos/bin FOR all)

Modified: trunk/rostests/winetests/mscms/profile.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mscms/profile.c?...
==============================================================================
--- trunk/rostests/winetests/mscms/profile.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/mscms/profile.c	[iso-8859-1] Sat Sep 21 20:44:00 2013
@@ -254,17 +254,16 @@
         ok( !ret, "GetColorProfileElement() succeeded (%d)\n", GetLastError() );

size = 0;
-
         ret = pGetColorProfileElement( handle, tag, 0, &size, NULL, &ref );
-        ok( !ret && size > 0, "GetColorProfileElement() succeeded (%d)\n", GetLastError() );
+        ok( !ret, "GetColorProfileElement() succeeded\n" );
+        ok( size > 0, "wrong size\n" );
+
+        /* Functional checks */

size = sizeof(buffer);
-
-        /* Functional checks */
-
         ret = pGetColorProfileElement( handle, tag, 0, &size, buffer, &ref );
-        ok( ret && size > 0, "GetColorProfileElement() failed (%d)\n", GetLastError() );
-
+        ok( ret, "GetColorProfileElement() failed %u\n", GetLastError() );
+        ok( size > 0, "wrong size\n" );
         ok( !memcmp( buffer, expect, sizeof(expect) ), "Unexpected tag data\n" );

pCloseColorProfile( handle );
@@ -1054,18 +1053,16 @@
         /* Functional checks */

size = sizeof(data);
-
         ret = pSetColorProfileElement( handle, tag, 0, &size, data );
-        ok( ret, "SetColorProfileElement() failed (%d)\n", GetLastError() );
+        ok( ret, "SetColorProfileElement() failed %u\n", GetLastError() );

size = sizeof(buffer);
-
         ret = pGetColorProfileElement( handle, tag, 0, &size, buffer, &ref );
-        ok( ret && size > 0, "GetColorProfileElement() failed (%d)\n", GetLastError() );
+        ok( ret, "GetColorProfileElement() failed %u\n", GetLastError() );
+        ok( size > 0, "wrong size\n" );

ok( !memcmp( data, buffer, sizeof(data) ),
-            "Unexpected tag data, expected %s, got %s (%d)\n",
-            data, buffer, GetLastError() );
+            "Unexpected tag data, expected %s, got %s (%u)\n", data, buffer, GetLastError() );

pCloseColorProfile( handle );
     }

Modified: trunk/rostests/winetests/mscms/testlist.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/mscms/testlist.c...
==============================================================================
--- trunk/rostests/winetests/mscms/testlist.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/mscms/testlist.c	[iso-8859-1] Sat Sep 21 20:44:00 2013
@@ -1,10 +1,7 @@
 /* Automatically generated file; DO NOT EDIT!! */

-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
 #define STANDALONE
-#include "wine/test.h"
+#include <wine/test.h>

extern void func_profile(void);