Traces vs. '\n'
Francois Gouget
fgouget at free.fr
Thu Jun 15 10:41:17 CDT 2006
Changelog:
* dlls/d3d9/tests/stateblock.c
dlls/riched20/tests/editor.c
dlls/uxtheme/tests/system.c
dlls/wined3d/device.c
programs/cmdlgtst/cmdlgtst.c
Francois Gouget <fgouget at free.fr>
Add trailing '\n's to ok() calls.
Remove spaces before '\n'.
--
Francois Gouget <fgouget at free.fr> http://fgouget.free.fr/
May your Tongue stick to the Roof of your Mouth with the Force of a Thousand Caramels.
-------------- next part --------------
Index: dlls/d3d9/tests/stateblock.c
===================================================================
RCS file: /home/wine/wine/dlls/d3d9/tests/stateblock.c,v
retrieving revision 1.6
diff -u -p -r1.6 stateblock.c
--- dlls/d3d9/tests/stateblock.c 7 Jun 2006 14:14:00 -0000 1.6
+++ dlls/d3d9/tests/stateblock.c 15 Jun 2006 08:35:25 -0000
@@ -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);
Index: dlls/riched20/tests/editor.c
===================================================================
RCS file: /home/wine/wine/dlls/riched20/tests/editor.c,v
retrieving revision 1.17
diff -u -p -r1.17 editor.c
--- dlls/riched20/tests/editor.c 12 Jun 2006 15:03:59 -0000 1.17
+++ dlls/riched20/tests/editor.c 15 Jun 2006 08:35:27 -0000
@@ -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);
}
Index: dlls/uxtheme/tests/system.c
===================================================================
RCS file: /home/wine/wine/dlls/uxtheme/tests/system.c,v
retrieving revision 1.1
diff -u -p -r1.1 system.c
--- dlls/uxtheme/tests/system.c 14 Jun 2006 11:55:38 -0000 1.1
+++ dlls/uxtheme/tests/system.c 15 Jun 2006 08:35:30 -0000
@@ -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());
Index: dlls/wined3d/device.c
===================================================================
RCS file: /home/wine/wine/dlls/wined3d/device.c,v
retrieving revision 1.225
diff -u -p -r1.225 device.c
--- dlls/wined3d/device.c 13 Jun 2006 11:00:32 -0000 1.225
+++ dlls/wined3d/device.c 15 Jun 2006 08:35:30 -0000
@@ -4801,19 +4801,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); \
Index: programs/cmdlgtst/cmdlgtst.c
===================================================================
RCS file: /home/wine/wine/programs/cmdlgtst/cmdlgtst.c,v
retrieving revision 1.19
diff -u -p -r1.19 cmdlgtst.c
--- programs/cmdlgtst/cmdlgtst.c 9 Jun 2006 16:18:09 -0000 1.19
+++ programs/cmdlgtst/cmdlgtst.c 15 Jun 2006 08:35:34 -0000
@@ -469,7 +469,7 @@ static void mw_PrintSetup(HWND hWnd)
#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-patches
mailing list