Various trace fixes
Francois Gouget
fgouget at free.fr
Thu May 11 17:32:31 CDT 2006
Changelog:
* dlls/d3d9/pixelshader.c
dlls/ddraw/tests/d3d.c
dlls/gdi/tests/bitmap.c
dlls/kernel/tests/toolhelp.c
dlls/msi/tests/msi.c
dlls/ole32/tests/moniker.c
dlls/user/tests/wsprintf.c
dlls/wined3d/baseshader.c
dlls/winspool/info.c
Francois Gouget <fgouget at free.fr>
Add trailing '\n's to trace calls.
Remove spaces before '\n'.
--
Francois Gouget <fgouget at free.fr> http://fgouget.free.fr/
The last time religion ruled, it was called the dark ages.
-------------- next part --------------
Index: dlls/d3d9/pixelshader.c
===================================================================
RCS file: /home/wine/wine/dlls/d3d9/pixelshader.c,v
retrieving revision 1.14
diff -u -p -r1.14 pixelshader.c
--- dlls/d3d9/pixelshader.c 10 Apr 2006 11:31:09 -0000 1.14
+++ dlls/d3d9/pixelshader.c 11 May 2006 20:57:46 -0000
@@ -100,7 +100,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_Crea
IDirect3DPixelShader9Impl *object;
HRESULT hrc = D3D_OK;
- TRACE("(%p) Relay \n", This);
+ TRACE("(%p) Relay\n", This);
if (ppShader == NULL) {
TRACE("(%p) Invalid call\n", This);
Index: dlls/ddraw/tests/d3d.c
===================================================================
RCS file: /home/wine/wine/dlls/ddraw/tests/d3d.c,v
retrieving revision 1.8
diff -u -p -r1.8 d3d.c
--- dlls/ddraw/tests/d3d.c 10 Apr 2006 14:33:57 -0000 1.8
+++ dlls/ddraw/tests/d3d.c 11 May 2006 20:57:47 -0000
@@ -469,13 +469,13 @@ static void ProcessVerticesTest()
/* Play with some matrices. */
rc = IDirect3DDevice7_SetTransform(lpD3DDevice, D3DTRANSFORMSTATE_VIEW, &view);
- ok(rc==D3D_OK, "IDirect3DDevice7_SetTransform failed");
+ ok(rc==D3D_OK, "IDirect3DDevice7_SetTransform failed\n");
rc = IDirect3DDevice7_SetTransform(lpD3DDevice, D3DTRANSFORMSTATE_PROJECTION, &proj);
- ok(rc==D3D_OK, "IDirect3DDevice7_SetTransform failed");
+ ok(rc==D3D_OK, "IDirect3DDevice7_SetTransform failed\n");
rc = IDirect3DDevice7_SetTransform(lpD3DDevice, D3DTRANSFORMSTATE_WORLD, &world);
- ok(rc==D3D_OK, "IDirect3DDevice7_SetTransform failed");
+ ok(rc==D3D_OK, "IDirect3DDevice7_SetTransform failed\n");
rc = IDirect3DVertexBuffer7_ProcessVertices(lpVBufDest1, D3DVOP_TRANSFORM, 0, 4, lpVBufSrc, 0, lpD3DDevice, 0);
ok(rc==D3D_OK , "IDirect3DVertexBuffer::ProcessVertices returned: %lx\n", rc);
@@ -492,7 +492,7 @@ static void ProcessVerticesTest()
vp.dvMinZ = 1.0;
vp.dvMaxZ = 0.0;
rc = IDirect3DDevice7_SetViewport(lpD3DDevice, &vp);
- ok(rc==D3D_OK, "IDirect3DDevice7_SetViewport failed");
+ ok(rc==D3D_OK, "IDirect3DDevice7_SetViewport failed\n");
/* Check the results */
if( !comparefloat(out[0].x, 256.0 ) || /* X coordinate is cut at the surface edges */
Index: dlls/gdi/tests/bitmap.c
===================================================================
RCS file: /home/wine/wine/dlls/gdi/tests/bitmap.c,v
retrieving revision 1.14
diff -u -p -r1.14 bitmap.c
--- dlls/gdi/tests/bitmap.c 7 Apr 2006 18:31:16 -0000 1.14
+++ dlls/gdi/tests/bitmap.c 11 May 2006 20:57:48 -0000
@@ -299,7 +299,7 @@ static void test_dib_info(HBITMAP hbm, c
ok(ret == sizeof(ds), "%d != %d\n", ret, sizeof(ds));
ok(ds.dsBm.bmBits == bits, "wrong bm.bmBits %p != %p\n", ds.dsBm.bmBits, bits);
- ok(ds.dsBmih.biSizeImage == ds.dsBm.bmWidthBytes * ds.dsBm.bmHeight, "%lu != %u",
+ ok(ds.dsBmih.biSizeImage == ds.dsBm.bmWidthBytes * ds.dsBm.bmHeight, "%lu != %u\n",
ds.dsBmih.biSizeImage, ds.dsBm.bmWidthBytes * ds.dsBm.bmHeight);
ok(bmih->biSizeImage == 0, "%lu != 0\n", bmih->biSizeImage);
ds.dsBmih.biSizeImage = 0;
Index: dlls/kernel/tests/toolhelp.c
===================================================================
RCS file: /home/wine/wine/dlls/kernel/tests/toolhelp.c,v
retrieving revision 1.3
diff -u -p -r1.3 toolhelp.c
--- dlls/kernel/tests/toolhelp.c 11 May 2006 10:58:08 -0000 1.3
+++ dlls/kernel/tests/toolhelp.c 11 May 2006 20:57:48 -0000
@@ -242,7 +242,7 @@ static void test_module(DWORD pid, const
{
trace("PID=%lx base=%p size=%lx %s %s\n",
me.th32ProcessID, me.modBaseAddr, me.modBaseSize, me.szExePath, me.szModule);
- ok(me.th32ProcessID == pid, "wrong returned process id");
+ ok(me.th32ProcessID == pid, "wrong returned process id\n");
for (i = 0; i < num_expected; i++)
if (!lstrcmpi(expected[i], me.szModule)) found[i]++;
num++;
Index: dlls/msi/tests/msi.c
===================================================================
RCS file: /home/wine/wine/dlls/msi/tests/msi.c,v
retrieving revision 1.2
diff -u -p -r1.2 msi.c
--- dlls/msi/tests/msi.c 17 Apr 2006 10:56:57 -0000 1.2
+++ dlls/msi/tests/msi.c 11 May 2006 20:57:48 -0000
@@ -72,13 +72,13 @@ static void test_null(void)
UINT r;
r = MsiOpenPackageExW(NULL, 0, &hpkg);
- ok( r == ERROR_INVALID_PARAMETER,"wrong error");
+ ok( r == ERROR_INVALID_PARAMETER,"wrong error\n");
r = MsiQueryProductStateW(NULL);
ok( r == INSTALLSTATE_INVALIDARG, "wrong return\n");
r = MsiEnumFeaturesW(NULL,0,NULL,NULL);
- ok( r == ERROR_INVALID_PARAMETER,"wrong error");
+ ok( r == ERROR_INVALID_PARAMETER,"wrong error\n");
}
START_TEST(msi)
Index: dlls/ole32/tests/moniker.c
===================================================================
RCS file: /home/wine/wine/dlls/ole32/tests/moniker.c,v
retrieving revision 1.20
diff -u -p -r1.20 moniker.c
--- dlls/ole32/tests/moniker.c 10 May 2006 17:58:36 -0000 1.20
+++ dlls/ole32/tests/moniker.c 11 May 2006 20:57:49 -0000
@@ -515,7 +515,7 @@ static void test_class_moniker(void)
ok_ole_success(hr, IMoniker_IsSystemMoniker);
ok(moniker_type == MKSYS_CLASSMONIKER,
- "dwMkSys != MKSYS_CLASSMONIKER, instead was 0x%08lx",
+ "dwMkSys != MKSYS_CLASSMONIKER, instead was 0x%08lx\n",
moniker_type);
hr = CreateBindCtx(0, &bindctx);
@@ -644,7 +644,7 @@ static void test_item_moniker(void)
ok_ole_success(hr, IMoniker_IsSystemMoniker);
ok(moniker_type == MKSYS_ITEMMONIKER,
- "dwMkSys != MKSYS_ITEMMONIKER, instead was 0x%08lx",
+ "dwMkSys != MKSYS_ITEMMONIKER, instead was 0x%08lx\n",
moniker_type);
hr = CreateBindCtx(0, &bindctx);
@@ -702,7 +702,7 @@ static void test_anti_moniker(void)
hr = IMoniker_IsSystemMoniker(moniker, &moniker_type);
ok_ole_success(hr, IMoniker_IsSystemMoniker);
ok(moniker_type == MKSYS_ANTIMONIKER,
- "dwMkSys != MKSYS_ANTIMONIKER, instead was 0x%08lx",
+ "dwMkSys != MKSYS_ANTIMONIKER, instead was 0x%08lx\n",
moniker_type);
hr = IMoniker_Inverse(moniker, &inverse);
@@ -776,7 +776,7 @@ static void test_generic_composite_monik
ok_ole_success(hr, IMoniker_IsSystemMoniker);
ok(moniker_type == MKSYS_GENERICCOMPOSITE,
- "dwMkSys != MKSYS_GENERICCOMPOSITE, instead was 0x%08lx",
+ "dwMkSys != MKSYS_GENERICCOMPOSITE, instead was 0x%08lx\n",
moniker_type);
hr = CreateBindCtx(0, &bindctx);
Index: dlls/user/tests/wsprintf.c
===================================================================
RCS file: /home/wine/wine/dlls/user/tests/wsprintf.c,v
retrieving revision 1.6
diff -u -p -r1.6 wsprintf.c
--- dlls/user/tests/wsprintf.c 8 May 2006 13:03:24 -0000 1.6
+++ dlls/user/tests/wsprintf.c 11 May 2006 20:57:53 -0000
@@ -69,7 +69,7 @@ static void CharUpperTest(void)
break;
}
}
- ok(!failed,"CharUpper failed - 16bit input (0x%0x) returned 32bit result (0x%0x)",i,out);
+ ok(!failed,"CharUpper failed - 16bit input (0x%0x) returned 32bit result (0x%0x)\n",i,out);
}
static void CharLowerTest(void)
@@ -87,7 +87,7 @@ static void CharLowerTest(void)
break;
}
}
- ok(!failed,"CharLower failed - 16bit input (0x%0x) returned 32bit result (0x%0x)",i,out);
+ ok(!failed,"CharLower failed - 16bit input (0x%0x) returned 32bit result (0x%0x)\n",i,out);
}
Index: dlls/wined3d/baseshader.c
===================================================================
RCS file: /home/wine/wine/dlls/wined3d/baseshader.c,v
retrieving revision 1.8
diff -u -p -r1.8 baseshader.c
--- dlls/wined3d/baseshader.c 11 May 2006 10:57:50 -0000 1.8
+++ dlls/wined3d/baseshader.c 11 May 2006 20:57:53 -0000
@@ -379,7 +379,7 @@ void generate_base_shader(
} else {
- TRACE("Found opcode D3D:%s GL:%s, PARAMS:%d, \n",
+ TRACE("Found opcode D3D:%s GL:%s, PARAMS:%d,\n",
curOpcode->name, curOpcode->glname, curOpcode->num_params);
/* Unless we encounter a no-op command, this opcode is unrecognized */
Index: dlls/winspool/info.c
===================================================================
RCS file: /home/wine/wine/dlls/winspool/info.c,v
retrieving revision 1.145
diff -u -p -r1.145 info.c
--- dlls/winspool/info.c 17 Apr 2006 10:56:54 -0000 1.145
+++ dlls/winspool/info.c 11 May 2006 20:57:54 -0000
@@ -1425,7 +1425,7 @@ BOOL WINAPI AddMonitorW(LPWSTR pName, DW
if (!mi2w->pName || (! mi2w->pName[0])) {
- WARN("pName not valid : %s \n", debugstr_w(mi2w->pName));
+ WARN("pName not valid : %s\n", debugstr_w(mi2w->pName));
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}
@@ -1437,7 +1437,7 @@ BOOL WINAPI AddMonitorW(LPWSTR pName, DW
}
if (!mi2w->pDLLName || (! mi2w->pDLLName[0])) {
- WARN("pDLLName not valid : %s \n", debugstr_w(mi2w->pDLLName));
+ WARN("pDLLName not valid : %s\n", debugstr_w(mi2w->pDLLName));
SetLastError(ERROR_INVALID_PARAMETER);
return FALSE;
}
More information about the wine-patches
mailing list