Add trailing '\n's to ok() calls (oleaut32)

Francois Gouget fgouget at free.fr
Mon Jan 26 17:43:37 CST 2004


Changelog:

 * dlls/oleaut32/tests/olefont.c
   dlls/oleaut32/tests/vartype.c

   Add trailing '\n's to ok() calls.


Index: dlls/oleaut32/tests/olefont.c
===================================================================
RCS file: /home/cvs/wine/dlls/oleaut32/tests/olefont.c,v
retrieving revision 1.2
diff -u -r1.2 olefont.c
--- dlls/oleaut32/tests/olefont.c	5 Sep 2003 23:08:33 -0000	1.2
+++ dlls/oleaut32/tests/olefont.c	24 Jan 2004 20:03:43 -0000
@@ -48,12 +48,12 @@
 	hres = OleCreateFontIndirect(NULL, &IID_IFont, &pvObj);
 	font = pvObj;

-	ok(hres == S_OK,"OCFI (NULL,..) does not return 0, but 0x%08lx",hres);
-	ok(font != NULL,"OCFI (NULL,..) does return NULL, insytead of !NULL");
+	ok(hres == S_OK,"OCFI (NULL,..) does not return 0, but 0x%08lx\n",hres);
+	ok(font != NULL,"OCFI (NULL,..) returns NULL, instead of !NULL\n");

 	pvObj = NULL;
 	hres = IFont_QueryInterface( font, &IID_IFont, &pvObj);

-	ok(hres == S_OK,"IFont_QI does not return S_OK, but 0x%08lx", hres);
-	ok(pvObj != NULL,"IFont_QI does return NULL, instead of a ptr");
+	ok(hres == S_OK,"IFont_QI does not return S_OK, but 0x%08lx\n", hres);
+	ok(pvObj != NULL,"IFont_QI does return NULL, instead of a ptr\n");
 }
Index: dlls/oleaut32/tests/vartype.c
===================================================================
RCS file: /home/cvs/wine/dlls/oleaut32/tests/vartype.c,v
retrieving revision 1.7
diff -u -r1.7 vartype.c
--- dlls/oleaut32/tests/vartype.c	20 Jan 2004 23:38:38 -0000	1.7
+++ dlls/oleaut32/tests/vartype.c	24 Jan 2004 20:03:43 -0000
@@ -55,7 +55,7 @@

 #define _EXPECTRES(res, x, fs) \
   ok((hres == S_OK && out == (CONV_TYPE)(x)) || ((HRESULT)res != S_OK && hres == (HRESULT)res), \
-     "expected " #x ", got " fs "; hres=0x%08lx", out, hres)
+     "expected " #x ", got " fs "; hres=0x%08lx\n", out, hres)
 #define EXPECT(x)       EXPECTRES(S_OK, (x))
 #define EXPECT_OVERFLOW EXPECTRES(DISP_E_OVERFLOW, DISP_E_OVERFLOW)
 #define EXPECT_MISMATCH EXPECTRES(DISP_E_TYPEMISMATCH,DISP_E_TYPEMISMATCH)
@@ -65,7 +65,7 @@
 #define EXPECT_GT       EXPECTRES(VARCMP_GT, VARCMP_GT)
 #define EXPECT_EQ       EXPECTRES(VARCMP_EQ, VARCMP_EQ)
 #define EXPECT_DBL(x)   \
-  ok(hres == S_OK && fabs(out-(x))<1e-14, "expected " #x ", got %16.16g; hres=0x%08lx", out, hres)
+  ok(hres == S_OK && fabs(out-(x))<1e-14, "expected " #x ", got %16.16g; hres=0x%08lx\n", out, hres)

 #define CONVERT(func, val) in = val; hres = p##func(in, &out)
 #define CONVERTRANGE(func,start,end) for (i = start; i < end; i+=1) { CONVERT(func, i); EXPECT(i); };
@@ -2082,17 +2082,17 @@
 #undef EXPECTRES
 #define EXPECTRES(res, x) \
   ok(hres == S_OK || ((HRESULT)res != S_OK && hres == (HRESULT)res), \
-     "expected hres " #x ", got hres=0x%08lx", hres)
+     "expected hres " #x ", got hres=0x%08lx\n", hres)

 #define EXPECTI8(x) \
   ok((hres == S_OK && out == (CONV_TYPE)(x)), \
-     "expected " #x "(%lu,%lu), got (%lu,%lu); hres=0x%08lx", \
+     "expected " #x "(%lu,%lu), got (%lu,%lu); hres=0x%08lx\n", \
       (ULONG)((LONG64)(x) >> 32), (ULONG)((x) & 0xffffffff), \
       (ULONG)(out >> 32), (ULONG)(out & 0xffffffff), hres)

 #define EXPECTI864(x,y) \
   ok(hres == S_OK && (out >> 32) == (CONV_TYPE)(x) && (out & 0xffffffff) == (CONV_TYPE)(y), \
-     "expected " #x "(%lu,%lu), got (%lu,%lu); hres=0x%08lx", \
+     "expected " #x "(%lu,%lu), got (%lu,%lu); hres=0x%08lx\n", \
       (ULONG)(x), (ULONG)(y), \
       (ULONG)(out >> 32), (ULONG)(out & 0xffffffff), hres)

@@ -3378,15 +3378,15 @@
 #undef EXPECTRES
 #define EXPECTRES(res, x) \
   ok(hres == S_OK || ((HRESULT)res != S_OK && hres == (HRESULT)res), \
-     "expected hres " #x ", got hres=0x%08lx", hres)
+     "expected hres " #x ", got hres=0x%08lx\n", hres)

 #define EXPECTCY(x) \
   ok((hres == S_OK && out.int64 == (LONGLONG)(x*CY_MULTIPLIER)), \
-     "expected " #x "*CY_MULTIPLIER, got (%8lx %8lx); hres=0x%08lx", out.s.Hi, out.s.Lo, hres)
+     "expected " #x "*CY_MULTIPLIER, got (%8lx %8lx); hres=0x%08lx\n", out.s.Hi, out.s.Lo, hres)

 #define EXPECTCY64(x,y) \
   ok(hres == S_OK && out.s.Hi == (long)x && out.s.Lo == y, \
-     "expected " #x #y "(%lu,%lu), got (%lu,%lu); hres=0x%08lx", \
+     "expected " #x #y "(%lu,%lu), got (%lu,%lu); hres=0x%08lx\n", \
       (ULONG)(x), (ULONG)(y), out.s.Hi, out.s.Lo, hres)

 static void test_VarCyFromI1(void)
@@ -3877,7 +3877,7 @@
 #undef EXPECTRES
 #define EXPECTRES(res, x) \
   ok(hres == S_OK || ((HRESULT)res != S_OK && hres == (HRESULT)res), \
-     "expected hres " #x ", got hres=0x%08lx", hres)
+     "expected hres " #x ", got hres=0x%08lx\n", hres)

 #define EXPECTDEC(scl, sgn, hi, lo) ok(hres == S_OK && \
   out.u.s.scale == (BYTE)(scl) && out.u.s.sign == (BYTE)(sgn) && \
@@ -4199,7 +4199,7 @@
 #undef _EXPECTRES
 #define _EXPECTRES(res, x, fs) \
   ok((hres == S_OK && out == (CONV_TYPE)(x)) || ((HRESULT)res != S_OK && hres == (HRESULT)res), \
-     "expected " #x ", got " fs "; hres=0x%08lx", out, hres)
+     "expected " #x ", got " fs "; hres=0x%08lx\n", out, hres)
 #undef EXPECTRES
 #define EXPECTRES(res, x) _EXPECTRES(res, x, "%d")
 #undef CONVERTRANGE



-- 
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
                      Computers are like airconditioners
                They stop working properly if you open WINDOWS



More information about the wine-patches mailing list