Remove spaces before '\n' in traces (#2)
Francois Gouget
fgouget at free.fr
Wed Nov 9 11:57:58 CST 2005
Spaces printed before a '\n' are not going to be visible anyway
(unless they cause a line wrap) so we might as well not print them in
the first place.
Changelog:
* dlls/d3d8/cubetexture.c
dlls/d3d8/device.c
dlls/d3d8/directx.c
dlls/d3d8/shader.c
dlls/d3d8/stateblock.c
dlls/d3d8/texture.c
dlls/d3d9/device.c
dlls/d3d9/directx.c
dlls/d3d9/vertexshader.c
dlls/ddraw/ddraw_main.c
dlls/ddraw/device_main.c
dlls/ddraw/device_opengl.c
dlls/ddraw/executebuffer.c
dlls/ddraw/light.c
dlls/ddraw/opengl_utils.c
dlls/ddraw/surface_main.c
dlls/ddraw/vertexbuffer.c
dlls/dinput/device.c
dlls/dinput/mouse.c
dlls/dmime/segtriggertrack.c
dlls/dmscript/script.c
dlls/dmstyle/styletrack.c
dlls/dplayx/dplay.c
dlls/dpnet/address.c
dlls/dsound/dsound_main.c
dlls/dxdiagn/provider.c
Francois Gouget <fgouget at free.fr>
Remove spaces before '\n' in traces
--
Francois Gouget fgouget at free.fr http://fgouget.free.fr/
A black hole is just God dividing by zero.
-------------- next part --------------
Index: dlls/d3d8/cubetexture.c
===================================================================
RCS file: /var/cvs/wine/dlls/d3d8/cubetexture.c,v
retrieving revision 1.20
diff -u -p -r1.20 cubetexture.c
--- dlls/d3d8/cubetexture.c 27 May 2005 20:17:37 -0000 1.20
+++ dlls/d3d8/cubetexture.c 9 Nov 2005 16:21:10 -0000
@@ -236,7 +236,7 @@ HRESULT WINAPI IDirect3DCubeText
if (Level < This->levels) {
*ppCubeMapSurface = (LPDIRECT3DSURFACE8) This->surfaces[FaceType][Level];
IDirect3DSurface8Impl_AddRef((LPDIRECT3DSURFACE8) *ppCubeMapSurface);
- TRACE("(%p) -> faceType(%d) level(%d) returning surface@%p \n", This, FaceType, Level, This->surfaces[FaceType][Level]);
+ TRACE("(%p) -> faceType(%d) level(%d) returning surface@%p\n", This, FaceType, Level, This->surfaces[FaceType][Level]);
} else {
FIXME("(%p) level(%d) overflow Levels(%d)\n", This, Level, This->levels);
return D3DERR_INVALIDCALL;
Index: dlls/d3d8/device.c
===================================================================
RCS file: /var/cvs/wine/dlls/d3d8/device.c,v
retrieving revision 1.132
diff -u -p -r1.132 device.c
--- dlls/d3d8/device.c 3 Nov 2005 09:54:31 -0000 1.132
+++ dlls/d3d8/device.c 9 Nov 2005 16:21:11 -0000
@@ -3916,7 +3916,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_Dr
pIB = This->StateBlock->pIndexData;
This->StateBlock->streamIsUP = FALSE;
- TRACE("(%p) : Type=(%d,%s), min=%d, CountV=%d, startIdx=%d, countP=%d \n", This,
+ TRACE("(%p) : Type=(%d,%s), min=%d, CountV=%d, startIdx=%d, countP=%d\n", This,
PrimitiveType, debug_d3dprimitivetype(PrimitiveType),
minIndex, NumVertices, startIndex, primCount);
Index: dlls/d3d8/directx.c
===================================================================
RCS file: /var/cvs/wine/dlls/d3d8/directx.c,v
retrieving revision 1.94
diff -u -p -r1.94 directx.c
--- dlls/d3d8/directx.c 29 Aug 2005 09:32:44 -0000 1.94
+++ dlls/d3d8/directx.c 9 Nov 2005 16:21:11 -0000
@@ -195,7 +195,7 @@ HRESULT WINAPI IDirect3D8Impl_GetDevic
HRESULT hrc = D3D_OK;
WINED3DCAPS *pWineCaps;
- TRACE("(%p) Relay %d %u %p \n", This, Adapter, DeviceType, pCaps);
+ TRACE("(%p) Relay %d %u %p\n", This, Adapter, DeviceType, pCaps);
if(NULL == pCaps){
return D3DERR_INVALIDCALL;
Index: dlls/d3d8/shader.c
===================================================================
RCS file: /var/cvs/wine/dlls/d3d8/shader.c,v
retrieving revision 1.35
diff -u -p -r1.35 shader.c
--- dlls/d3d8/shader.c 26 Sep 2005 09:52:56 -0000 1.35
+++ dlls/d3d8/shader.c 9 Nov 2005 15:59:59 -0000
@@ -294,10 +294,10 @@ void vshader_m4x4(D3DSHADERVECTOR* d, D3
d->y = mat[1][0] * s0->x + mat[1][1] * s0->y + mat[1][2] * s0->z + mat[1][3] * s0->w;
d->z = mat[2][0] * s0->x + mat[2][1] * s0->y + mat[2][2] * s0->z + mat[2][3] * s0->w;
d->w = mat[3][0] * s0->x + mat[3][1] * s0->y + mat[3][2] * s0->z + mat[3][3] * s0->w;
- VSTRACE(("executing m4x4(1): mat=(%f, %f, %f, %f) s0=(%f) d=(%f) \n", mat[0][0], mat[0][1], mat[0][2], mat[0][3], s0->x, d->x));
- VSTRACE(("executing m4x4(2): mat=(%f, %f, %f, %f) (%f) (%f) \n", mat[1][0], mat[1][1], mat[1][2], mat[1][3], s0->y, d->y));
- VSTRACE(("executing m4x4(3): mat=(%f, %f, %f, %f) X (%f) = (%f) \n", mat[2][0], mat[2][1], mat[2][2], mat[2][3], s0->z, d->z));
- VSTRACE(("executing m4x4(4): mat=(%f, %f, %f, %f) (%f) (%f) \n", mat[3][0], mat[3][1], mat[3][2], mat[3][3], s0->w, d->w));
+ VSTRACE(("executing m4x4(1): mat=(%f, %f, %f, %f) s0=(%f) d=(%f)\n", mat[0][0], mat[0][1], mat[0][2], mat[0][3], s0->x, d->x));
+ VSTRACE(("executing m4x4(2): mat=(%f, %f, %f, %f) (%f) (%f)\n", mat[1][0], mat[1][1], mat[1][2], mat[1][3], s0->y, d->y));
+ VSTRACE(("executing m4x4(3): mat=(%f, %f, %f, %f) X (%f) = (%f)\n", mat[2][0], mat[2][1], mat[2][2], mat[2][3], s0->z, d->z));
+ VSTRACE(("executing m4x4(4): mat=(%f, %f, %f, %f) (%f) (%f)\n", mat[3][0], mat[3][1], mat[3][2], mat[3][3], s0->w, d->w));
}
void vshader_m4x3(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0, D3DMATRIX43 mat) {
@@ -305,10 +305,10 @@ void vshader_m4x3(D3DSHADERVECTOR* d, D3
d->y = mat[1][0] * s0->x + mat[1][1] * s0->y + mat[1][2] * s0->z + mat[1][3] * s0->w;
d->z = mat[2][0] * s0->x + mat[2][1] * s0->y + mat[2][2] * s0->z + mat[2][3] * s0->w;
d->w = 1.0f;
- VSTRACE(("executing m4x3(1): mat=(%f, %f, %f, %f) s0=(%f) d=(%f) \n", mat[0][0], mat[0][1], mat[0][2], mat[0][3], s0->x, d->x));
- VSTRACE(("executing m4x3(2): mat=(%f, %f, %f, %f) (%f) (%f) \n", mat[1][0], mat[1][1], mat[1][2], mat[1][3], s0->y, d->y));
- VSTRACE(("executing m4x3(3): mat=(%f, %f, %f, %f) X (%f) = (%f) \n", mat[2][0], mat[2][1], mat[2][2], mat[2][3], s0->z, d->z));
- VSTRACE(("executing m4x3(4): (%f) (%f) \n", s0->w, d->w));
+ VSTRACE(("executing m4x3(1): mat=(%f, %f, %f, %f) s0=(%f) d=(%f)\n", mat[0][0], mat[0][1], mat[0][2], mat[0][3], s0->x, d->x));
+ VSTRACE(("executing m4x3(2): mat=(%f, %f, %f, %f) (%f) (%f)\n", mat[1][0], mat[1][1], mat[1][2], mat[1][3], s0->y, d->y));
+ VSTRACE(("executing m4x3(3): mat=(%f, %f, %f, %f) X (%f) = (%f)\n", mat[2][0], mat[2][1], mat[2][2], mat[2][3], s0->z, d->z));
+ VSTRACE(("executing m4x3(4): (%f) (%f)\n", s0->w, d->w));
}
void vshader_m3x4(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0, D3DMATRIX34 mat) {
Index: dlls/d3d8/stateblock.c
===================================================================
RCS file: /var/cvs/wine/dlls/d3d8/stateblock.c,v
retrieving revision 1.18
diff -u -p -r1.18 stateblock.c
--- dlls/d3d8/stateblock.c 23 Dec 2004 18:33:45 -0000 1.18
+++ dlls/d3d8/stateblock.c 9 Nov 2005 16:21:11 -0000
@@ -569,7 +569,7 @@ HRESULT WINAPI IDirect3DDeviceImpl_Captu
LPDIRECT3DDEVICE8 iface = (LPDIRECT3DDEVICE8) This;
PLIGHTINFOEL *tmp;
- TRACE("(%p) : Updating state block %p ------------------v \n", This, updateBlock);
+ TRACE("(%p) : Updating state block %p ------------------v\n", This, updateBlock);
/* If not recorded, then update can just recapture */
if (updateBlock->blockType != D3DSBT_RECORDED) {
Index: dlls/d3d8/texture.c
===================================================================
RCS file: /var/cvs/wine/dlls/d3d8/texture.c,v
retrieving revision 1.21
diff -u -p -r1.21 texture.c
--- dlls/d3d8/texture.c 27 May 2005 20:17:36 -0000 1.21
+++ dlls/d3d8/texture.c 9 Nov 2005 16:21:11 -0000
@@ -158,7 +158,7 @@ void WINAPI IDirect3DTexture8
}
D3DRESOURCETYPE WINAPI IDirect3DTexture8Impl_GetType(LPDIRECT3DTEXTURE8 iface) {
IDirect3DTexture8Impl *This = (IDirect3DTexture8Impl *)iface;
- TRACE("(%p) : is %d \n", This, This->ResourceType);
+ TRACE("(%p) : is %d\n", This, This->ResourceType);
return This->ResourceType;
}
Index: dlls/d3d9/device.c
===================================================================
RCS file: /var/cvs/wine/dlls/d3d9/device.c,v
retrieving revision 1.31
diff -u -p -r1.31 device.c
--- dlls/d3d9/device.c 23 Aug 2005 09:34:57 -0000 1.31
+++ dlls/d3d9/device.c 9 Nov 2005 16:33:45 -0000
@@ -113,7 +113,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_Ge
HRESULT hrc = D3D_OK;
WINED3DCAPS *pWineCaps;
- TRACE("(%p) : Relay pCaps %p \n", This, pCaps);
+ TRACE("(%p) : Relay pCaps %p\n", This, pCaps);
if(NULL == pCaps){
return D3DERR_INVALIDCALL;
}
@@ -240,13 +240,13 @@ HRESULT WINAPI IDirect3DDevice9Impl_Cre
IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface;
TRACE("(%p) Relay\n", This);
if(MultisampleQuality < 0) {
- FIXME("MultisampleQuality out of range %ld, substituting 0 \n", MultisampleQuality);
+ FIXME("MultisampleQuality out of range %ld, substituting 0\n", MultisampleQuality);
/*FIXME: Find out what windows does with a MultisampleQuality < 0 */
MultisampleQuality=0;
}
if(MultisampleQuality > 0){
- FIXME("MultisampleQuality set to %ld, bstituting 0 \n" , MultisampleQuality);
+ FIXME("MultisampleQuality set to %ld, bstituting 0\n", MultisampleQuality);
/*
MultisampleQuality
[in] Quality level. The valid range is between zero and one less than the level returned by pQualityLevels used by IDirect3D9::CheckDeviceMultiSampleType. Passing a larger value returns the error D3DERR_INVALIDCALL. The MultisampleQuality values of paired render targets, depth stencil surfaces, and the MultiSample type must all match.
@@ -569,7 +569,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_Ge
IWineD3DBaseTexture_GetParent(retTexture, (IUnknown **)ppTexture);
IWineD3DBaseTexture_Release(retTexture);
}else{
- FIXME("Call to get texture (%ld) failed (%p) \n", Stage, retTexture);
+ FIXME("Call to get texture (%ld) failed (%p)\n", Stage, retTexture);
*ppTexture = NULL;
}
return rc;
Index: dlls/d3d9/directx.c
===================================================================
RCS file: /var/cvs/wine/dlls/d3d9/directx.c,v
retrieving revision 1.23
diff -u -p -r1.23 directx.c
--- dlls/d3d9/directx.c 23 Aug 2005 09:34:57 -0000 1.23
+++ dlls/d3d9/directx.c 9 Nov 2005 16:21:11 -0000
@@ -153,7 +153,7 @@ HRESULT WINAPI IDirect3D9Impl_GetDevic
HRESULT hrc = D3D_OK;
WINED3DCAPS *pWineCaps;
- TRACE("(%p) Relay %d %u %p \n", This, Adapter, DeviceType, pCaps);
+ TRACE("(%p) Relay %d %u %p\n", This, Adapter, DeviceType, pCaps);
if(NULL == pCaps){
return D3DERR_INVALIDCALL;
@@ -271,7 +271,7 @@ HRESULT WINAPI IDirect3D9Impl_CreateDe
IDirect3DDevice9Impl *object = NULL;
WINED3DPRESENT_PARAMETERS localParameters;
HRESULT hr;
- TRACE("(%p) Relay \n", This);
+ TRACE("(%p) Relay\n", This);
/* Check the validity range of the adapter parameter */
if (Adapter >= IDirect3D9Impl_GetAdapterCount(iface)) {
Index: dlls/d3d9/vertexshader.c
===================================================================
RCS file: /var/cvs/wine/dlls/d3d9/vertexshader.c,v
retrieving revision 1.12
diff -u -p -r1.12 vertexshader.c
--- dlls/d3d9/vertexshader.c 23 Aug 2005 09:34:57 -0000 1.12
+++ dlls/d3d9/vertexshader.c 9 Nov 2005 16:21:11 -0000
@@ -134,10 +134,10 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetV
IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface;
HRESULT hrc = D3D_OK;
- TRACE("(%p) : Relay \n", This);
+ TRACE("(%p) : Relay\n", This);
hrc = IWineD3DDevice_SetVertexShader(This->WineD3DDevice, pShader==NULL?NULL:((IDirect3DVertexShader9Impl *)pShader)->wineD3DVertexShader);
- TRACE("(%p) : returning hr(%lu) \n", This, hrc);
+ TRACE("(%p) : returning hr(%lu)\n", This, hrc);
return hrc;
}
@@ -146,7 +146,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetV
IWineD3DVertexShader *pShader;
HRESULT hrc = D3D_OK;
- TRACE("(%p) : Relay device@%p \n", This, This->WineD3DDevice);
+ TRACE("(%p) : Relay device@%p\n", This, This->WineD3DDevice);
hrc = IWineD3DDevice_GetVertexShader(This->WineD3DDevice, &pShader);
if(hrc == D3D_OK){
hrc = IWineD3DVertexShader_GetParent(pShader, (IUnknown **)ppShader);
Index: dlls/ddraw/ddraw_main.c
===================================================================
RCS file: /var/cvs/wine/dlls/ddraw/ddraw_main.c,v
retrieving revision 1.11
diff -u -p -r1.11 ddraw_main.c
--- dlls/ddraw/ddraw_main.c 10 Oct 2005 10:44:23 -0000 1.11
+++ dlls/ddraw/ddraw_main.c 9 Nov 2005 16:20:09 -0000
@@ -978,14 +978,14 @@ Main_DirectDraw_GetCaps(LPDIRECTDRAW7 if
if (pDriverCaps != NULL) {
DD_STRUCT_COPY_BYSIZE(pDriverCaps,&This->caps);
if (TRACE_ON(ddraw)) {
- TRACE("Driver Caps : \n");
+ TRACE("Driver Caps :\n");
DDRAW_dump_DDCAPS(pDriverCaps);
}
}
if (pHELCaps != NULL) {
DD_STRUCT_COPY_BYSIZE(pHELCaps,&This->caps);
if (TRACE_ON(ddraw)) {
- TRACE("HEL Caps : \n");
+ TRACE("HEL Caps :\n");
DDRAW_dump_DDCAPS(pHELCaps);
}
}
Index: dlls/ddraw/device_main.c
===================================================================
RCS file: /var/cvs/wine/dlls/ddraw/device_main.c,v
retrieving revision 1.3
diff -u -p -r1.3 device_main.c
--- dlls/ddraw/device_main.c 25 Sep 2005 15:18:18 -0000 1.3
+++ dlls/ddraw/device_main.c 9 Nov 2005 16:20:09 -0000
@@ -588,7 +588,7 @@ Main_IDirect3DDeviceImpl_7_GetViewport(L
*lpData = This->active_viewport;
if (TRACE_ON(ddraw)) {
- TRACE(" returning viewport : \n");
+ TRACE(" returning viewport :\n");
TRACE(" - dwX = %ld dwY = %ld\n",
lpData->dwX, lpData->dwY);
TRACE(" - dwWidth = %ld dwHeight = %ld\n",
@@ -619,7 +619,7 @@ Main_IDirect3DDeviceImpl_7_GetMaterial(L
*lpMat = This->current_material;
if (TRACE_ON(ddraw)) {
- TRACE(" returning material : \n");
+ TRACE(" returning material :\n");
dump_D3DMATERIAL7(lpMat);
}
@@ -656,7 +656,7 @@ Main_IDirect3DDeviceImpl_7_GetLight(LPDI
return DDERR_INVALIDPARAMS;
if (TRACE_ON(ddraw)) {
- TRACE(" returning light : \n");
+ TRACE(" returning light :\n");
dump_D3DLIGHT7(lpLight);
}
Index: dlls/ddraw/device_opengl.c
===================================================================
RCS file: /var/cvs/wine/dlls/ddraw/device_opengl.c,v
retrieving revision 1.10
diff -u -p -r1.10 device_opengl.c
--- dlls/ddraw/device_opengl.c 12 Oct 2005 21:05:40 -0000 1.10
+++ dlls/ddraw/device_opengl.c 9 Nov 2005 16:20:09 -0000
@@ -2431,7 +2431,7 @@ GL_IDirect3DDeviceImpl_7_SetMaterial(LPD
TRACE("(%p/%p)->(%p)\n", This, iface, lpMat);
if (TRACE_ON(ddraw)) {
- TRACE(" material is : \n");
+ TRACE(" material is :\n");
dump_D3DMATERIAL7(lpMat);
}
@@ -2495,7 +2495,7 @@ GL_IDirect3DDeviceImpl_7_SetLight(LPDIRE
TRACE("(%p/%p)->(%08lx,%p)\n", This, iface, dwLightIndex, lpLight);
if (TRACE_ON(ddraw)) {
- TRACE(" setting light : \n");
+ TRACE(" setting light :\n");
dump_D3DLIGHT7(lpLight);
}
@@ -2646,7 +2646,7 @@ GL_IDirect3DDeviceImpl_7_SetViewport(LPD
TRACE("(%p/%p)->(%p)\n", This, iface, lpData);
if (TRACE_ON(ddraw)) {
- TRACE(" viewport is : \n");
+ TRACE(" viewport is :\n");
TRACE(" - dwX = %ld dwY = %ld\n",
lpData->dwX, lpData->dwY);
TRACE(" - dwWidth = %ld dwHeight = %ld\n",
@@ -2900,7 +2900,7 @@ static HRESULT d3ddevice_clear(IDirect3D
if (TRACE_ON(ddraw)) {
if (dwCount > 0) {
unsigned int i;
- TRACE(" rectangles : \n");
+ TRACE(" rectangles :\n");
for (i = 0; i < dwCount; i++) {
TRACE(" - %ld x %ld %ld x %ld\n", lpRects[i].u1.x1, lpRects[i].u2.y1, lpRects[i].u3.x2, lpRects[i].u4.y2);
}
Index: dlls/ddraw/executebuffer.c
===================================================================
RCS file: /var/cvs/wine/dlls/ddraw/executebuffer.c,v
retrieving revision 1.2
diff -u -p -r1.2 executebuffer.c
--- dlls/ddraw/executebuffer.c 26 Jul 2005 20:10:51 -0000 1.2
+++ dlls/ddraw/executebuffer.c 9 Nov 2005 16:20:09 -0000
@@ -80,7 +80,7 @@ static void execute(IDirect3DExecuteBuff
lpViewport->active_device = lpDevice;
lpViewport->activate(lpViewport);
- TRACE("ExecuteData : \n");
+ TRACE("ExecuteData :\n");
if (TRACE_ON(ddraw))
_dump_executedata(&(This->data));
@@ -570,7 +570,7 @@ Main_IDirect3DExecuteBufferImpl_1_Lock(L
memcpy(lpDesc, &This->desc, dwSize);
if (TRACE_ON(ddraw)) {
- TRACE(" Returning description : \n");
+ TRACE(" Returning description :\n");
_dump_D3DEXECUTEBUFFERDESC(lpDesc);
}
return DD_OK;
@@ -621,7 +621,7 @@ Main_IDirect3DExecuteBufferImpl_1_GetExe
memcpy(lpData, &This->data, dwSize);
if (TRACE_ON(ddraw)) {
- TRACE("Returning data : \n");
+ TRACE("Returning data :\n");
_dump_executedata(lpData);
}
Index: dlls/ddraw/light.c
===================================================================
RCS file: /var/cvs/wine/dlls/ddraw/light.c,v
retrieving revision 1.3
diff -u -p -r1.3 light.c
--- dlls/ddraw/light.c 31 Oct 2005 10:05:15 -0000 1.3
+++ dlls/ddraw/light.c 9 Nov 2005 16:20:09 -0000
@@ -103,7 +103,7 @@ Main_IDirect3DLightImpl_1_SetLight(LPDIR
LPD3DLIGHT7 light7 = &(This->light7);
TRACE("(%p/%p)->(%p)\n", This, iface, lpLight);
if (TRACE_ON(ddraw)) {
- TRACE(" Light definition : \n");
+ TRACE(" Light definition :\n");
dump_light((LPD3DLIGHT2) lpLight);
}
@@ -145,7 +145,7 @@ Main_IDirect3DLightImpl_1_GetLight(LPDIR
ICOM_THIS_FROM(IDirect3DLightImpl, IDirect3DLight, iface);
TRACE("(%p/%p)->(%p)\n", This, iface, lpLight);
if (TRACE_ON(ddraw)) {
- TRACE(" Returning light definition : \n");
+ TRACE(" Returning light definition :\n");
dump_light(&This->light);
}
memcpy(lpLight, &This->light, lpLight->dwSize);
Index: dlls/ddraw/opengl_utils.c
===================================================================
RCS file: /var/cvs/wine/dlls/ddraw/opengl_utils.c,v
retrieving revision 1.1
diff -u -p -r1.1 opengl_utils.c
--- dlls/ddraw/opengl_utils.c 6 Jun 2005 15:51:50 -0000 1.1
+++ dlls/ddraw/opengl_utils.c 9 Nov 2005 16:20:09 -0000
@@ -905,7 +905,7 @@ HRESULT upload_surface_to_tex_memory_ini
}
if (error) {
- ERR("Unsupported pixel format for textures : \n");
+ ERR("Unsupported pixel format for textures :\n");
if (ERR_ON(ddraw)) {
DDRAW_dump_pixelformat(src_pf);
}
Index: dlls/ddraw/surface_main.c
===================================================================
RCS file: /var/cvs/wine/dlls/ddraw/surface_main.c,v
retrieving revision 1.7
diff -u -p -r1.7 surface_main.c
--- dlls/ddraw/surface_main.c 10 Oct 2005 10:28:05 -0000 1.7
+++ dlls/ddraw/surface_main.c 9 Nov 2005 16:20:09 -0000
@@ -745,7 +745,7 @@ Main_DirectDrawSurface_GetAttachedSurfac
for (surf = This->attached; surf != NULL; surf = surf->next_attached)
{
if (TRACE_ON(ddraw)) {
- TRACE("Surface: (%p) caps: %lx,%lx,%lx,%lx \n",surf ,
+ TRACE("Surface: (%p) caps: %lx,%lx,%lx,%lx\n", surf,
surf->surface_desc.ddsCaps.dwCaps,
surf->surface_desc.ddsCaps.dwCaps2,
surf->surface_desc.ddsCaps.dwCaps3,
@@ -777,7 +777,7 @@ Main_DirectDrawSurface_GetAttachedSurfac
*ppSurface = ICOM_INTERFACE(found, IDirectDrawSurface7);
if (TRACE_ON(ddraw)) {
- TRACE("Returning surface %p with description : \n", *ppSurface);
+ TRACE("Returning surface %p with description :\n", *ppSurface);
DDRAW_dump_surface_desc(&(found->surface_desc));
}
@@ -1167,7 +1167,7 @@ Main_DirectDrawSurface_Lock(LPDIRECTDRAW
This->locked = TRUE;
- TRACE("locked surface returning description : \n");
+ TRACE("locked surface returning description :\n");
if (TRACE_ON(ddraw)) DDRAW_dump_surface_desc(pDDSD);
return DD_OK;
Index: dlls/ddraw/vertexbuffer.c
===================================================================
RCS file: /var/cvs/wine/dlls/ddraw/vertexbuffer.c,v
retrieving revision 1.3
diff -u -p -r1.3 vertexbuffer.c
--- dlls/ddraw/vertexbuffer.c 26 Jul 2005 20:10:51 -0000 1.3
+++ dlls/ddraw/vertexbuffer.c 9 Nov 2005 16:20:09 -0000
@@ -546,7 +546,7 @@ HRESULT d3dvertexbuffer_create(IDirect3D
*obj = object;
if (TRACE_ON(ddraw)) {
- TRACE(" creating implementation at %p with description : \n", *obj);
+ TRACE(" creating implementation at %p with description :\n", *obj);
TRACE(" flags : "); DDRAW_dump_flags_(lpD3DVertBufDesc->dwCaps, flags, sizeof(flags)/sizeof(flags[0]), TRUE);
TRACE(" vertex type : "); dump_flexible_vertex(lpD3DVertBufDesc->dwFVF);
TRACE(" num vertices : %ld\n", lpD3DVertBufDesc->dwNumVertices);
Index: dlls/dinput/device.c
===================================================================
RCS file: /var/cvs/wine/dlls/dinput/device.c,v
retrieving revision 1.30
diff -u -p -r1.30 device.c
--- dlls/dinput/device.c 12 Sep 2005 10:30:06 -0000 1.30
+++ dlls/dinput/device.c 9 Nov 2005 16:21:12 -0000
@@ -279,7 +279,7 @@ void fill_DataFormat(void *out, const vo
void release_DataFormat(DataFormat * format)
{
- TRACE("Deleting DataTransform : \n");
+ TRACE("Deleting DataTransform :\n");
HeapFree(GetProcessHeap(), 0, format->dt);
}
@@ -300,7 +300,7 @@ DataFormat *create_DataFormat(const DIDA
dt = HeapAlloc(GetProcessHeap(), 0, asked_format->dwNumObjs * sizeof(DataTransform));
- TRACE("Creating DataTransform : \n");
+ TRACE("Creating DataTransform :\n");
for (i = 0; i < wine_format->dwNumObjs; i++) {
offset[i] = -1;
@@ -328,7 +328,7 @@ DataFormat *create_DataFormat(const DIDA
done[j] = 1;
- TRACE("Matching : \n");
+ TRACE("Matching :\n");
TRACE(" - Asked (%d) :\n", j);
TRACE(" * GUID: %s ('%s')\n",
debugstr_guid(asked_format->rgodf[j].pguid),
Index: dlls/dinput/mouse.c
===================================================================
RCS file: /var/cvs/wine/dlls/dinput/mouse.c,v
retrieving revision 1.28
diff -u -p -r1.28 mouse.c
--- dlls/dinput/mouse.c 12 Sep 2005 10:30:06 -0000 1.28
+++ dlls/dinput/mouse.c 9 Nov 2005 16:34:49 -0000
@@ -689,7 +689,7 @@ static HRESULT WINAPI SysMouseAImpl_GetD
if(This->acquired == 0) return DIERR_NOTACQUIRED;
EnterCriticalSection(&(This->crit));
- TRACE("(this=%p,0x%08lx,%p): \n",This,len,ptr);
+ TRACE("(this=%p,0x%08lx,%p):\n", This, len, ptr);
TRACE("(X: %ld - Y: %ld - Z: %ld L: %02x M: %02x R: %02x)\n",
This->m_state.lX, This->m_state.lY, This->m_state.lZ,
This->m_state.rgbButtons[0], This->m_state.rgbButtons[2], This->m_state.rgbButtons[1]);
Index: dlls/dmime/segtriggertrack.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmime/segtriggertrack.c,v
retrieving revision 1.18
diff -u -p -r1.18 segtriggertrack.c
--- dlls/dmime/segtriggertrack.c 21 Jun 2005 09:44:28 -0000 1.18
+++ dlls/dmime/segtriggertrack.c 9 Nov 2005 16:21:13 -0000
@@ -286,7 +286,7 @@ static HRESULT IDirectMusicSegTriggerTra
case DMUS_FOURCC_SEGMENTITEMNAME_CHUNK: {
TRACE_(dmfile)(": segment item name chunk\n");
IStream_Read (pStm, pNewItem->wszName, Chunk.dwSize, NULL);
- TRACE_(dmfile)(" - name: %s \n", debugstr_w(pNewItem->wszName));
+ TRACE_(dmfile)(" - name: %s\n", debugstr_w(pNewItem->wszName));
break;
}
case FOURCC_LIST: {
Index: dlls/dmscript/script.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmscript/script.c,v
retrieving revision 1.21
diff -u -p -r1.21 script.c
--- dlls/dmscript/script.c 30 May 2005 10:01:09 -0000 1.21
+++ dlls/dmscript/script.c 9 Nov 2005 16:21:14 -0000
@@ -472,14 +472,14 @@ HRESULT WINAPI IDirectMusicScriptImpl_IP
TRACE_(dmfile)(": script version chunk\n");
This->pVersion = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, Chunk.dwSize);
IStream_Read (pStm, This->pVersion, Chunk.dwSize, NULL);
- TRACE_(dmfile)("version: 0x%08lx.0x%08lx \n", This->pVersion->dwVersionMS, This->pVersion->dwVersionLS);
+ TRACE_(dmfile)("version: 0x%08lx.0x%08lx\n", This->pVersion->dwVersionMS, This->pVersion->dwVersionLS);
break;
}
case DMUS_FOURCC_SCRIPTLANGUAGE_CHUNK: {
TRACE_(dmfile)(": script language chunk\n");
This->pwzLanguage = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, Chunk.dwSize);
IStream_Read (pStm, This->pwzLanguage, Chunk.dwSize, NULL);
- TRACE_(dmfile)("using language: %s \n", debugstr_w(This->pwzLanguage));
+ TRACE_(dmfile)("using language: %s\n", debugstr_w(This->pwzLanguage));
break;
}
case DMUS_FOURCC_SCRIPTSOURCE_CHUNK: {
Index: dlls/dmstyle/styletrack.c
===================================================================
RCS file: /var/cvs/wine/dlls/dmstyle/styletrack.c,v
retrieving revision 1.13
diff -u -p -r1.13 styletrack.c
--- dlls/dmstyle/styletrack.c 30 May 2005 10:01:08 -0000 1.13
+++ dlls/dmstyle/styletrack.c 9 Nov 2005 16:21:14 -0000
@@ -275,7 +275,7 @@ static HRESULT IDirectMusicStyleTrack_IP
TRACE_(dmfile)(": %s chunk (size = %ld)", debugstr_fourcc (Chunk.fccID), Chunk.dwSize);
switch (Chunk.fccID) {
case DMUS_FOURCC_TIME_STAMP_CHUNK: {
- TRACE_(dmfile)(": Time Stamp chunck \n");
+ TRACE_(dmfile)(": Time Stamp chunck\n");
pNewItem = HeapAlloc (GetProcessHeap (), HEAP_ZERO_MEMORY, sizeof(DMUS_PRIVATE_STYLE_ITEM));
if (NULL == pNewItem) {
ERR(": no more memory\n");
Index: dlls/dplayx/dplay.c
===================================================================
RCS file: /var/cvs/wine/dlls/dplayx/dplay.c,v
retrieving revision 1.63
diff -u -p -r1.63 dplay.c
--- dlls/dplayx/dplay.c 30 Aug 2005 08:56:35 -0000 1.63
+++ dlls/dplayx/dplay.c 9 Nov 2005 16:21:14 -0000
@@ -2664,7 +2664,7 @@ static HRESULT WINAPI DP_IF_GetPlayerNam
LPDPNAME lpName = (LPDPNAME)lpData;
DWORD dwRequiredDataSize;
- FIXME( "(%p)->(0x%08lx,%p,%p,%u): ANSI \n",
+ FIXME( "(%p)->(0x%08lx,%p,%p,%u): ANSI\n",
This, idPlayer, lpData, lpdwDataSize, bAnsi );
if( ( lpPList = DP_FindPlayer( This, idPlayer ) ) == NULL )
Index: dlls/dpnet/address.c
===================================================================
RCS file: /var/cvs/wine/dlls/dpnet/address.c,v
retrieving revision 1.8
diff -u -p -r1.8 address.c
--- dlls/dpnet/address.c 1 Jun 2005 19:57:42 -0000 1.8
+++ dlls/dpnet/address.c 9 Nov 2005 16:21:15 -0000
@@ -177,14 +177,14 @@ HRESULT WINAPI IDirectPlay8AddressImpl_A
switch (dwDataType) {
case DPNA_DATATYPE_DWORD:
if (sizeof(DWORD) != dwDataSize) return DPNERR_INVALIDPARAM;
- TRACE("(%p, %lu): DWORD Type -> %lu \n", lpvData, dwDataSize, *(const DWORD*) lpvData);
+ TRACE("(%p, %lu): DWORD Type -> %lu\n", lpvData, dwDataSize, *(const DWORD*) lpvData);
break;
case DPNA_DATATYPE_GUID:
if (sizeof(GUID) != dwDataSize) return DPNERR_INVALIDPARAM;
- TRACE("(%p, %lu): GUID Type -> %s \n", lpvData, dwDataSize, debugstr_guid((const GUID*) lpvData));
+ TRACE("(%p, %lu): GUID Type -> %s\n", lpvData, dwDataSize, debugstr_guid((const GUID*) lpvData));
break;
case DPNA_DATATYPE_STRING:
- TRACE("(%p, %lu): STRING Type -> %s \n", lpvData, dwDataSize, (const CHAR*) lpvData);
+ TRACE("(%p, %lu): STRING Type -> %s\n", lpvData, dwDataSize, (const CHAR*) lpvData);
break;
case DPNA_DATATYPE_BINARY:
TRACE("(%p, %lu): BINARY Type\n", lpvData, dwDataSize);
Index: dlls/dsound/dsound_main.c
===================================================================
RCS file: /var/cvs/wine/dlls/dsound/dsound_main.c,v
retrieving revision 1.129
diff -u -p -r1.129 dsound_main.c
--- dlls/dsound/dsound_main.c 17 Oct 2005 09:24:50 -0000 1.129
+++ dlls/dsound/dsound_main.c 9 Nov 2005 16:35:28 -0000
@@ -148,7 +148,7 @@ void setup_dsound_options(void)
if ((p = strrchr( appname, '/' ))) appname = p + 1;
if ((p = strrchr( appname, '\\' ))) appname = p + 1;
strcat( appname, "\\DirectSound" );
- TRACE("appname = [%s] \n",appname);
+ TRACE("appname = [%s]\n", appname);
if (RegOpenKeyA( tmpkey, appname, &appkey )) appkey = 0;
RegCloseKey( tmpkey );
}
Index: dlls/dxdiagn/provider.c
===================================================================
RCS file: /var/cvs/wine/dlls/dxdiagn/provider.c,v
retrieving revision 1.12
diff -u -p -r1.12 provider.c
--- dlls/dxdiagn/provider.c 8 Nov 2005 10:57:39 -0000 1.12
+++ dlls/dxdiagn/provider.c 9 Nov 2005 16:21:16 -0000
@@ -521,7 +521,7 @@ HRESULT DXDiag_InitDXDiagDirectShowFilte
IEnumMoniker* pEnum = NULL;
IMoniker* pMoniker = NULL;
hr = ICreateDevEnum_CreateClassEnumerator(pCreateDevEnum, &clsidCat, &pEnum, 0);
- FIXME("\tClassEnumerator for clsid(%s) pEnum(%p) \n", debugstr_guid(&clsidCat), pEnum);
+ FIXME("\tClassEnumerator for clsid(%s) pEnum(%p)\n", debugstr_guid(&clsidCat), pEnum);
if (FAILED(hr) || pEnum == NULL) {
goto class_enum_failed;
}
More information about the wine-patches
mailing list