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

Alexandre Julliard julliard at wine.codeweavers.com
Fri Jun 16 08:18:15 CDT 2006


Module: wine
Branch: refs/heads/master
Commit: 9eb81363ad54839556cc12f78d78d1ada00ff8df
URL:    http://source.winehq.org/git/?p=wine.git;a=commit;h=9eb81363ad54839556cc12f78d78d1ada00ff8df

Author: Francois Gouget <fgouget at free.fr>
Date:   Thu Jun 15 17:41:17 2006 +0200

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

---

 dlls/d3d9/tests/stateblock.c |    2 +-
 dlls/riched20/tests/editor.c |    2 +-
 dlls/uxtheme/tests/system.c  |    2 +-
 dlls/wined3d/device.c        |    6 +++---
 programs/cmdlgtst/cmdlgtst.c |   12 ++++++------
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/dlls/d3d9/tests/stateblock.c b/dlls/d3d9/tests/stateblock.c
index 8744c5d..178edf5 100644
--- a/dlls/d3d9/tests/stateblock.c
+++ b/dlls/d3d9/tests/stateblock.c
@@ -154,7 +154,7 @@ static void test_missing_light_recording
     hret = IDirect3DDevice9_GetLightEnable(device_ptr, 0, &result_light_enable);
     ok(hret == D3D_OK, "GetLightEnable returned: hret 0x%lx. Expected hret 0x%lx. Aborting.\n", hret, D3D_OK);
     if (hret != D3D_OK) goto cleanup;
-    ok(result_light_enable == 0, "Light enabled status was %u, instead of 0", result_light_enable);
+    ok(result_light_enable == 0, "Light enabled status was %u, instead of 0\n", result_light_enable);
 
     hret = IDirect3DDevice9_GetLight(device_ptr, 0, &result_light);
     ok(hret == D3D_OK, "GetLight returned: hret 0x%lx. Expected hret 0x%lx. Aborting.\n", hret, D3D_OK);
diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c
index c2e3e04..c71ca7f 100644
--- a/dlls/riched20/tests/editor.c
+++ b/dlls/riched20/tests/editor.c
@@ -806,7 +806,7 @@ static void test_EM_SETUNDOLIMIT()
   SendMessage(hwndRichEdit,EM_EMPTYUNDOBUFFER, 0,0); 
   result = SendMessage(hwndRichEdit, EM_SETUNDOLIMIT, -1, 0);
   ok (result == 100, 
-      "EM_SETUNDOLIMIT returned %d when set to -1, instead of 100",result);
+      "EM_SETUNDOLIMIT returned %d when set to -1, instead of 100\n",result);
       
   DestroyWindow(hwndRichEdit);
 }
diff --git a/dlls/uxtheme/tests/system.c b/dlls/uxtheme/tests/system.c
index fe93660..fb0e9a2 100644
--- a/dlls/uxtheme/tests/system.c
+++ b/dlls/uxtheme/tests/system.c
@@ -189,7 +189,7 @@ static void test_CloseThemeData(void)
 
     SetLastError(0xdeadbeef);
     hRes = pCloseThemeData(NULL);
-    ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08lx", hRes);
+    ok( hRes == E_HANDLE, "Expected E_HANDLE, got 0x%08lx\n", hRes);
     ok( GetLastError() == 0xdeadbeef,
         "Expected 0xdeadbeef, got 0x%08lx\n",
         GetLastError());
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c
index 745eeb8..70b5e23 100644
--- a/dlls/wined3d/device.c
+++ b/dlls/wined3d/device.c
@@ -4906,19 +4906,19 @@ process_vertices_strided(IWineD3DDeviceI
                                  D3DTS_WORLDMATRIX(0),
                                  &world_mat);
 
-    TRACE("View mat: \n");
+    TRACE("View mat:\n");
     TRACE("%f %f %f %f\n", view_mat.u.s._11, view_mat.u.s._12, view_mat.u.s._13, view_mat.u.s._14); \
     TRACE("%f %f %f %f\n", view_mat.u.s._21, view_mat.u.s._22, view_mat.u.s._23, view_mat.u.s._24); \
     TRACE("%f %f %f %f\n", view_mat.u.s._31, view_mat.u.s._32, view_mat.u.s._33, view_mat.u.s._34); \
     TRACE("%f %f %f %f\n", view_mat.u.s._41, view_mat.u.s._42, view_mat.u.s._43, view_mat.u.s._44); \
 
-    TRACE("Proj mat: \n");
+    TRACE("Proj mat:\n");
     TRACE("%f %f %f %f\n", proj_mat.u.s._11, proj_mat.u.s._12, proj_mat.u.s._13, proj_mat.u.s._14); \
     TRACE("%f %f %f %f\n", proj_mat.u.s._21, proj_mat.u.s._22, proj_mat.u.s._23, proj_mat.u.s._24); \
     TRACE("%f %f %f %f\n", proj_mat.u.s._31, proj_mat.u.s._32, proj_mat.u.s._33, proj_mat.u.s._34); \
     TRACE("%f %f %f %f\n", proj_mat.u.s._41, proj_mat.u.s._42, proj_mat.u.s._43, proj_mat.u.s._44); \
 
-    TRACE("World mat: \n");
+    TRACE("World mat:\n");
     TRACE("%f %f %f %f\n", world_mat.u.s._11, world_mat.u.s._12, world_mat.u.s._13, world_mat.u.s._14); \
     TRACE("%f %f %f %f\n", world_mat.u.s._21, world_mat.u.s._22, world_mat.u.s._23, world_mat.u.s._24); \
     TRACE("%f %f %f %f\n", world_mat.u.s._31, world_mat.u.s._32, world_mat.u.s._33, world_mat.u.s._34); \
diff --git a/programs/cmdlgtst/cmdlgtst.c b/programs/cmdlgtst/cmdlgtst.c
index a8ce9ee..e4697ad 100644
--- a/programs/cmdlgtst/cmdlgtst.c
+++ b/programs/cmdlgtst/cmdlgtst.c
@@ -469,7 +469,7 @@ #endif
 
 #define OF(fn, fi, fl)  \
 		if(dm->dmFields & fl){ \
-			WINE_TRACE("        %s  =%hd \n", (fn), dm->fi); \
+			WINE_TRACE("        %s  =%hd\n", (fn), dm->fi); \
 		} else \
 			WINE_TRACE("        %s NOT SET!\n", fn);
 
@@ -488,11 +488,11 @@ static void mw_PageSetup(HWND hWnd)
 		dm = GlobalLock(psd.hDevMode);
 		if(dm) {
 			WINE_TRACE("dm != NULL\nDEVMODEA struct:\n");
-			WINE_TRACE("    dmDeviceName    ='%s'  \n", 	dm->dmDeviceName);
-			WINE_TRACE("    dmSpecVersion   =%#x \n",	dm->dmSpecVersion);
-			WINE_TRACE("    dmDriverVersion =%#x \n",	dm->dmDriverVersion);
-			WINE_TRACE("    dmSize          =%#x \n", 	dm->dmSize);	
-			WINE_TRACE("    dmDriverExtra   =%#x \n",	dm->dmDriverExtra);
+			WINE_TRACE("    dmDeviceName    ='%s'\n", 	dm->dmDeviceName);
+			WINE_TRACE("    dmSpecVersion   =%#x\n",	dm->dmSpecVersion);
+			WINE_TRACE("    dmDriverVersion =%#x\n",	dm->dmDriverVersion);
+			WINE_TRACE("    dmSize          =%#x\n", 	dm->dmSize);	
+			WINE_TRACE("    dmDriverExtra   =%#x\n",	dm->dmDriverExtra);
 			WINE_TRACE("    dmFields        =%#lx\n", 	dm->dmFields);
 			OF("dmOrientation",	u1.s1.dmOrientation,	DM_ORIENTATION)
 			OF("dmPaperSize",	u1.s1.dmPaperSize,	DM_PAPERSIZE);




More information about the wine-cvs mailing list