Module: wine Branch: refs/heads/master Commit: f7c24f37ad62c2cf970debf3d2b1ed337114d35f URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=f7c24f37ad62c2cf970debf3...
Author: Francois Gouget fgouget@free.fr Date: Fri May 12 00:32:31 2006 +0200
Various trace fixes.
Add trailing '\n's to trace calls. Remove spaces before '\n'.
---
dlls/d3d9/pixelshader.c | 2 +- dlls/ddraw/tests/d3d.c | 8 ++++---- dlls/gdi/tests/bitmap.c | 2 +- dlls/kernel/tests/toolhelp.c | 2 +- dlls/msi/tests/msi.c | 4 ++-- dlls/ole32/tests/moniker.c | 8 ++++---- dlls/wined3d/baseshader.c | 2 +- dlls/winspool/info.c | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dlls/d3d9/pixelshader.c b/dlls/d3d9/pixelshader.c index 6c9b75c..7fed701 100644 --- a/dlls/d3d9/pixelshader.c +++ b/dlls/d3d9/pixelshader.c @@ -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); diff --git a/dlls/ddraw/tests/d3d.c b/dlls/ddraw/tests/d3d.c index a176c2b..7ad03d7 100644 --- a/dlls/ddraw/tests/d3d.c +++ b/dlls/ddraw/tests/d3d.c @@ -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 */ diff --git a/dlls/gdi/tests/bitmap.c b/dlls/gdi/tests/bitmap.c index 3c410a0..ff16f8d 100644 --- a/dlls/gdi/tests/bitmap.c +++ b/dlls/gdi/tests/bitmap.c @@ -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; diff --git a/dlls/kernel/tests/toolhelp.c b/dlls/kernel/tests/toolhelp.c index 2b4a150..47695de 100644 --- a/dlls/kernel/tests/toolhelp.c +++ b/dlls/kernel/tests/toolhelp.c @@ -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++; diff --git a/dlls/msi/tests/msi.c b/dlls/msi/tests/msi.c index e6fd855..7b18053 100644 --- a/dlls/msi/tests/msi.c +++ b/dlls/msi/tests/msi.c @@ -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) diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 9ca5ab8..ba21173 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -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); diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index acc402b..c9c65d9 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -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 */ diff --git a/dlls/winspool/info.c b/dlls/winspool/info.c index 0288269..df22eae 100644 --- a/dlls/winspool/info.c +++ b/dlls/winspool/info.c @@ -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; }