[ros-diffs] [tkreuzer] 70453: [CRT_APITEST] - Disable a check for crtdll - Fix an MSVC warning

Author: tkreuzer
Date: Mon Dec 28 11:01:03 2015
New Revision: 70453

URL: http://svn.reactos.org/svn/reactos?rev=70453&view=rev
Log:
[CRT_APITEST]
- Disable a check for crtdll
- Fix an MSVC warning

Modified:
    trunk/rostests/apitests/crt/sprintf.c
    trunk/rostests/apitests/crt/strlen.c

Modified: trunk/rostests/apitests/crt/sprintf.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/sprintf.c?re…
==============================================================================
--- trunk/rostests/apitests/crt/sprintf.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/crt/sprintf.c	[iso-8859-1] Mon Dec 28 11:01:03 2015
@@ -14,7 +14,9 @@
 #include <ndk/mmfuncs.h>
 #include <ndk/rtlfuncs.h>
 
-#ifdef __GNUC__
+#ifdef _MSC_VER
+#pragma warning(disable:4778) // unterminated format string '%'
+#else
 #pragma GCC diagnostic ignored "-Wformat"
 #pragma GCC diagnostic ignored "-Wformat-zero-length"
 #pragma GCC diagnostic ignored "-Wnonnull"
@@ -177,7 +179,7 @@
     Length = sprintf(Buffer, "%.4s", "hello");
     ok_str(Buffer, "hell");
     ok_int(Length, 4);
-    
+
     StartSeh()
         Length = sprintf(Buffer, "%.*s", -1, "hello");
 #ifdef TEST_USER32

Modified: trunk/rostests/apitests/crt/strlen.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/crt/strlen.c?rev…
==============================================================================
--- trunk/rostests/apitests/crt/strlen.c	[iso-8859-1] (original)
+++ trunk/rostests/apitests/crt/strlen.c	[iso-8859-1] Mon Dec 28 11:01:03 2015
@@ -52,11 +52,14 @@
     ok((eflags & EFLAGS_DF) != 0, "Direction flag in ELFAGS was
changed.");
 
     /* Only test this for the exported versions, intrinsics might do it
-       differently. It's up to us to not do fishy stuff! */
+       differently. It's up to us to not do fishy stuff! Also crtdll does
+       not do it like this. */
+#ifndef TEST_CRTDLL
     if (pstrlen == strlen)
     {
         ok(len == 8, "Should not have gone backwards (got len %i)", (int)len);
     }
+#endif // TEST_CRTDLL
 #endif
 }