diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c index af5e66a31b0..6d88b02694d 100644 --- a/dlls/advapi32/security.c +++ b/dlls/advapi32/security.c @@ -292,7 +292,7 @@ BOOL WINAPI GetTokenInformation( HANDLE token, TOKEN_INFORMATION_CLASS tokeninfoclass, LPVOID tokeninfo, DWORD tokeninfolength, LPDWORD retlen ) { - TRACE("(%p, %s, %p, %ld, %p): \n", + TRACE("(%p, %s, %p, %ld, %p):\n", token, (tokeninfoclass == TokenUser) ? "TokenUser" : (tokeninfoclass == TokenGroups) ? "TokenGroups" : diff --git a/dlls/comctl32/comboex.c b/dlls/comctl32/comboex.c index 65c5d8fbb62..b2ed2ac69d8 100644 --- a/dlls/comctl32/comboex.c +++ b/dlls/comctl32/comboex.c @@ -1395,7 +1395,7 @@ static LRESULT COMBOEX_DrawItem (COMBOEX_INFO *infoPtr, DRAWITEMSTRUCT *dis) if (!item) { item = get_item_data(infoPtr, dis->itemID); if (item == (CBE_ITEMDATA *)CB_ERR) { - ERR("invalid item for id %d \n", dis->itemID); + ERR("invalid item for id %d\n", dis->itemID); return 0; } } diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index a399576bf14..3cb5137da65 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4190,7 +4190,7 @@ static HIMAGELIST LISTVIEW_CreateDragImage(LISTVIEW_INFO *infoPtr, INT iItem, LP HDC hdc, hdcOrig; HBITMAP hbmp, hOldbmp; HIMAGELIST dragList = 0; - TRACE("iItem=%d Count=%d \n", iItem, infoPtr->nItemCount); + TRACE("iItem=%d Count=%d\n", iItem, infoPtr->nItemCount); if (iItem < 0 || iItem >= infoPtr->nItemCount) return 0; diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c index 63841cbddc2..cf04d4bcbe9 100644 --- a/dlls/comctl32/treeview.c +++ b/dlls/comctl32/treeview.c @@ -1805,7 +1805,7 @@ TREEVIEW_SetItemHeight(TREEVIEW_INFO *infoPtr, INT newHeight) { INT prevHeight = infoPtr->uItemHeight; - TRACE("%d \n", newHeight); + TRACE("%d\n", newHeight); if (newHeight == -1) { infoPtr->uItemHeight = TREEVIEW_NaturalHeight(infoPtr); diff --git a/dlls/commdlg/filetitle.c b/dlls/commdlg/filetitle.c index c1601f93fbb..5b2f4bf802e 100644 --- a/dlls/commdlg/filetitle.c +++ b/dlls/commdlg/filetitle.c @@ -65,7 +65,7 @@ short WINAPI GetFileTitleW(LPCWSTR lpFile, LPWSTR lpTitle, WORD cbBuf) { int i, len; static const WCHAR brkpoint[] = {'*','[',']',0}; - TRACE("(%p %p %d); \n", lpFile, lpTitle, cbBuf); + TRACE("(%p %p %d);\n", lpFile, lpTitle, cbBuf); if(lpFile == NULL || lpTitle == NULL) return -1; @@ -95,7 +95,7 @@ short WINAPI GetFileTitleW(LPCWSTR lpFile, LPWSTR lpTitle, WORD cbBuf) if(i == -1) i++; - TRACE("---> '%s' \n", debugstr_w(&lpFile[i])); + TRACE("---> '%s'\n", debugstr_w(&lpFile[i])); len = strlenW(lpFile+i)+1; if(cbBuf < len) diff --git a/dlls/d3d8/cubetexture.c b/dlls/d3d8/cubetexture.c index b3822436e1a..9289ada7b31 100644 --- a/dlls/d3d8/cubetexture.c +++ b/dlls/d3d8/cubetexture.c @@ -236,7 +236,7 @@ HRESULT WINAPI IDirect3DCubeTexture8Impl_GetCubeMapSurface(LPDIRECT3DCUB 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; diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 3d2d0ef8d7b..77a59a99aa0 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -3916,7 +3916,7 @@ HRESULT WINAPI IDirect3DDevice8Impl_DrawIndexedPrimitive(LPDIRECT3DDEVICE8 ifa 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); diff --git a/dlls/d3d8/directx.c b/dlls/d3d8/directx.c index 4b083c1539f..9454aa80337 100644 --- a/dlls/d3d8/directx.c +++ b/dlls/d3d8/directx.c @@ -195,7 +195,7 @@ HRESULT WINAPI IDirect3D8Impl_GetDeviceCaps(LPDIRECT3D8 iface, UINT Adapter, D 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; diff --git a/dlls/d3d8/shader.c b/dlls/d3d8/shader.c index eee4983c9e8..f29c0666d2c 100644 --- a/dlls/d3d8/shader.c +++ b/dlls/d3d8/shader.c @@ -294,10 +294,10 @@ void vshader_m4x4(D3DSHADERVECTOR* d, D3DSHADERVECTOR* s0, /*D3DSHADERVECTOR* ma 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, D3DSHADERVECTOR* s0, D3DMATRIX43 mat) { 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) { diff --git a/dlls/d3d8/stateblock.c b/dlls/d3d8/stateblock.c index ac783fb6ca8..c48794ecce0 100644 --- a/dlls/d3d8/stateblock.c +++ b/dlls/d3d8/stateblock.c @@ -569,7 +569,7 @@ HRESULT WINAPI IDirect3DDeviceImpl_CaptureStateBlock(IDirect3DDevice8Impl* This, 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) { diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index e98c1566496..022da3b8f08 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -158,7 +158,7 @@ void WINAPI IDirect3DTexture8Impl_PreLoad(LPDIRECT3DTEXTURE8 iface) { } 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; } diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index a6071f298bb..efc4374fafb 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -113,7 +113,7 @@ HRESULT WINAPI IDirect3DDevice9Impl_GetDeviceCaps(LPDIRECT3DDEVICE9 iface, D3D 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_CreateSurface(LPDIRECT3DDEVICE9 iface, UINT 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_GetTexture(LPDIRECT3DDEVICE9 iface, DWORD 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; diff --git a/dlls/d3d9/directx.c b/dlls/d3d9/directx.c index aede43dc9db..f34c23b7b5e 100644 --- a/dlls/d3d9/directx.c +++ b/dlls/d3d9/directx.c @@ -153,7 +153,7 @@ HRESULT WINAPI IDirect3D9Impl_GetDeviceCaps(LPDIRECT3D9 iface, UINT Adapter, D 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_CreateDevice(LPDIRECT3D9 iface, UINT Adapter, D3 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)) { diff --git a/dlls/d3d9/vertexshader.c b/dlls/d3d9/vertexshader.c index 767ba9e2a09..5135c7cf114 100644 --- a/dlls/d3d9/vertexshader.c +++ b/dlls/d3d9/vertexshader.c @@ -134,10 +134,10 @@ HRESULT WINAPI IDirect3DDevice9Impl_SetVertexShader(LPDIRECT3DDEVICE9 iface, IDi 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_GetVertexShader(LPDIRECT3DDEVICE9 iface, IDi 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); diff --git a/dlls/ddraw/ddraw_main.c b/dlls/ddraw/ddraw_main.c index ca0dbec1c19..9fbd4f7c5cf 100644 --- a/dlls/ddraw/ddraw_main.c +++ b/dlls/ddraw/ddraw_main.c @@ -978,14 +978,14 @@ Main_DirectDraw_GetCaps(LPDIRECTDRAW7 iface, LPDDCAPS pDriverCaps, 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); } } diff --git a/dlls/ddraw/device_main.c b/dlls/ddraw/device_main.c index 920896010af..98efdf2bead 100644 --- a/dlls/ddraw/device_main.c +++ b/dlls/ddraw/device_main.c @@ -588,7 +588,7 @@ Main_IDirect3DDeviceImpl_7_GetViewport(LPDIRECT3DDEVICE7 iface, *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(LPDIRECT3DDEVICE7 iface, *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(LPDIRECT3DDEVICE7 iface, return DDERR_INVALIDPARAMS; if (TRACE_ON(ddraw)) { - TRACE(" returning light : \n"); + TRACE(" returning light :\n"); dump_D3DLIGHT7(lpLight); } diff --git a/dlls/ddraw/device_opengl.c b/dlls/ddraw/device_opengl.c index eaa542d12ba..16c5e94b54c 100644 --- a/dlls/ddraw/device_opengl.c +++ b/dlls/ddraw/device_opengl.c @@ -2431,7 +2431,7 @@ GL_IDirect3DDeviceImpl_7_SetMaterial(LPDIRECT3DDEVICE7 iface, 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(LPDIRECT3DDEVICE7 iface, 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(LPDIRECT3DDEVICE7 iface, 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(IDirect3DDeviceImpl *This, 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); } diff --git a/dlls/ddraw/executebuffer.c b/dlls/ddraw/executebuffer.c index 705328935d7..ef7d5a709da 100644 --- a/dlls/ddraw/executebuffer.c +++ b/dlls/ddraw/executebuffer.c @@ -80,7 +80,7 @@ static void execute(IDirect3DExecuteBufferImpl *This, 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(LPDIRECT3DEXECUTEBUFFER iface, 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_GetExecuteData(LPDIRECT3DEXECUTEBUFFER iface, memcpy(lpData, &This->data, dwSize); if (TRACE_ON(ddraw)) { - TRACE("Returning data : \n"); + TRACE("Returning data :\n"); _dump_executedata(lpData); } diff --git a/dlls/ddraw/light.c b/dlls/ddraw/light.c index a8791d398e3..8f38f7da0f5 100644 --- a/dlls/ddraw/light.c +++ b/dlls/ddraw/light.c @@ -103,7 +103,7 @@ Main_IDirect3DLightImpl_1_SetLight(LPDIRECT3DLIGHT iface, 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(LPDIRECT3DLIGHT iface, 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); diff --git a/dlls/ddraw/opengl_utils.c b/dlls/ddraw/opengl_utils.c index 74d483a4379..b3c589fd87c 100644 --- a/dlls/ddraw/opengl_utils.c +++ b/dlls/ddraw/opengl_utils.c @@ -905,7 +905,7 @@ HRESULT upload_surface_to_tex_memory_init(IDirectDrawSurfaceImpl *surf_ptr, GLui } 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); } diff --git a/dlls/ddraw/surface_main.c b/dlls/ddraw/surface_main.c index 4e610bc5323..d01d6331aae 100644 --- a/dlls/ddraw/surface_main.c +++ b/dlls/ddraw/surface_main.c @@ -745,7 +745,7 @@ Main_DirectDrawSurface_GetAttachedSurface(LPDIRECTDRAWSURFACE7 iface, 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_GetAttachedSurface(LPDIRECTDRAWSURFACE7 iface, *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(LPDIRECTDRAWSURFACE7 iface, LPRECT prect, 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; diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index ba626e5bb6b..0702f0f0ce7 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -546,7 +546,7 @@ HRESULT d3dvertexbuffer_create(IDirect3DVertexBufferImpl **obj, IDirectDrawImpl *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); diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index a38dea64a5d..a032b7de151 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -279,7 +279,7 @@ void fill_DataFormat(void *out, const void *in, DataFormat *df) { 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 DIDATAFORMAT *wine_format, LPCDIDATAFORMAT a 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 DIDATAFORMAT *wine_format, LPCDIDATAFORMAT a 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), diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 30f5727ca95..6570d1f813a 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -689,7 +689,7 @@ static HRESULT WINAPI SysMouseAImpl_GetDeviceState( 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]); diff --git a/dlls/dmime/segtriggertrack.c b/dlls/dmime/segtriggertrack.c index 3dfdb841942..9e1a7f7928a 100644 --- a/dlls/dmime/segtriggertrack.c +++ b/dlls/dmime/segtriggertrack.c @@ -286,7 +286,7 @@ static HRESULT IDirectMusicSegTriggerTrack_IPersistStream_ParseSegment (LPPERSIS 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: { diff --git a/dlls/dmscript/script.c b/dlls/dmscript/script.c index 19b074f0f3d..e475315c5c4 100644 --- a/dlls/dmscript/script.c +++ b/dlls/dmscript/script.c @@ -472,14 +472,14 @@ HRESULT WINAPI IDirectMusicScriptImpl_IPersistStream_Load (LPPERSISTSTREAM iface 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: { diff --git a/dlls/dmstyle/styletrack.c b/dlls/dmstyle/styletrack.c index 117fa957c5d..031d46316c8 100644 --- a/dlls/dmstyle/styletrack.c +++ b/dlls/dmstyle/styletrack.c @@ -275,7 +275,7 @@ static HRESULT IDirectMusicStyleTrack_IPersistStream_ParseStyleRef (LPPERSISTSTR 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"); diff --git a/dlls/dplayx/dplay.c b/dlls/dplayx/dplay.c index 5c70e0b28e9..c847987def5 100644 --- a/dlls/dplayx/dplay.c +++ b/dlls/dplayx/dplay.c @@ -2664,7 +2664,7 @@ static HRESULT WINAPI DP_IF_GetPlayerName 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 ) diff --git a/dlls/dpnet/address.c b/dlls/dpnet/address.c index 0eab7add00a..4996a1ca406 100644 --- a/dlls/dpnet/address.c +++ b/dlls/dpnet/address.c @@ -177,14 +177,14 @@ HRESULT WINAPI IDirectPlay8AddressImpl_AddComponent(PDIRECTPLAY8ADDRESS iface, C 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); diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c index 23f0ba1816a..9ea9ea27c0c 100644 --- a/dlls/dsound/dsound_main.c +++ b/dlls/dsound/dsound_main.c @@ -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 ); } diff --git a/dlls/dxdiagn/provider.c b/dlls/dxdiagn/provider.c index 71bd9e4afc5..3b049ff1b8c 100644 --- a/dlls/dxdiagn/provider.c +++ b/dlls/dxdiagn/provider.c @@ -521,7 +521,7 @@ HRESULT DXDiag_InitDXDiagDirectShowFiltersContainer(IDxDiagContainer* pSubCont) 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; } diff --git a/dlls/gdi/bitmap.c b/dlls/gdi/bitmap.c index 19517edfa71..0688c8b72f6 100644 --- a/dlls/gdi/bitmap.c +++ b/dlls/gdi/bitmap.c @@ -132,7 +132,7 @@ HBITMAP WINAPI CreateCompatibleBitmap( HDC hdc, INT width, INT height) HBITMAP hbmpRet = 0; DC *dc; - TRACE("(%p,%d,%d) = \n", hdc, width, height); + TRACE("(%p,%d,%d) =\n", hdc, width, height); if ((width >= 0x10000) || (height >= 0x10000)) { diff --git a/dlls/gdi/mfdrv/bitblt.c b/dlls/gdi/mfdrv/bitblt.c index 3327ab192ca..dc490d9e8ad 100644 --- a/dlls/gdi/mfdrv/bitblt.c +++ b/dlls/gdi/mfdrv/bitblt.c @@ -115,7 +115,7 @@ BOOL MFDRV_StretchBlt( PHYSDEV devDst, INT xDst, INT yDst, INT widthDst, *(mr->rdParm +12) = BM.bmWidthBytes; *(mr->rdParm +13) = BM.bmPlanes; *(mr->rdParm +14) = BM.bmBitsPixel; - TRACE("len = %ld rop=%lx \n",len,rop); + TRACE("len = %ld rop=%lx\n", len, rop); if (GetBitmapBits( hBitmap, BM.bmWidthBytes * BM.bmHeight, mr->rdParm + 15)) #endif { diff --git a/dlls/kernel/comm.c b/dlls/kernel/comm.c index 234e531dc2b..7fabf1bbbed 100644 --- a/dlls/kernel/comm.c +++ b/dlls/kernel/comm.c @@ -1584,7 +1584,7 @@ BOOL WINAPI GetCommState( break; #endif default: - ERR("unknown speed %x \n",speed); + ERR("unknown speed %x\n", speed); } #endif switch (port.c_cflag & CSIZE) { @@ -1601,7 +1601,7 @@ BOOL WINAPI GetCommState( lpdcb->ByteSize = 8; break; default: - ERR("unknown size %x \n",port.c_cflag & CSIZE); + ERR("unknown size %x\n", port.c_cflag & CSIZE); } if(port.c_iflag & INPCK) @@ -1920,13 +1920,13 @@ static DWORD WINAPI Comm_CheckEvents(int fd, DWORD mask, serial_irq_info *new, s DWORD ret = 0, queue; TRACE("mask 0x%08lx\n", mask); - TRACE("old->rx 0x%08x vs. new->rx 0x%08x \n", old->rx, new->rx); - TRACE("old->tx 0x%08x vs. new->tx 0x%08x \n", old->tx, new->tx); - TRACE("old->frame 0x%08x vs. new->frame 0x%08x \n", old->frame, new->frame); - TRACE("old->overrun 0x%08x vs. new->overrun 0x%08x \n", old->overrun, new->overrun); - TRACE("old->parity 0x%08x vs. new->parity 0x%08x \n", old->parity, new->parity); - TRACE("old->brk 0x%08x vs. new->brk 0x%08x \n", old->brk, new->brk); - TRACE("old->buf_overrun 0x%08x vs. new->buf_overrun 0x%08x \n", old->buf_overrun, new->buf_overrun); + TRACE("old->rx 0x%08x vs. new->rx 0x%08x\n", old->rx, new->rx); + TRACE("old->tx 0x%08x vs. new->tx 0x%08x\n", old->tx, new->tx); + TRACE("old->frame 0x%08x vs. new->frame 0x%08x\n", old->frame, new->frame); + TRACE("old->overrun 0x%08x vs. new->overrun 0x%08x\n", old->overrun, new->overrun); + TRACE("old->parity 0x%08x vs. new->parity 0x%08x\n", old->parity, new->parity); + TRACE("old->brk 0x%08x vs. new->brk 0x%08x\n", old->brk, new->brk); + TRACE("old->buf_overrun 0x%08x vs. new->buf_overrun 0x%08x\n", old->buf_overrun, new->buf_overrun); ret |= ((mask & EV_BREAK) && ( old->brk != new->brk))?EV_BREAK:0; ret |= ((mask & EV_CTS ) && ((old_mstat&MS_CTS_ON )!=(new_mstat&MS_CTS_ON )))?EV_CTS :0; diff --git a/dlls/mcicda/mcicda.c b/dlls/mcicda/mcicda.c index b80dd021ddb..6b87579901a 100644 --- a/dlls/mcicda/mcicda.c +++ b/dlls/mcicda/mcicda.c @@ -739,7 +739,7 @@ static DWORD MCICDA_Play(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) start = MCICDA_CalcFrame(wmcda, lpParms->dwFrom); if ( (ret=MCICDA_SkipDataTracks(wmcda, &start)) ) return ret; - TRACE("MCI_FROM=%08lX -> %lu \n", lpParms->dwFrom, start); + TRACE("MCI_FROM=%08lX -> %lu\n", lpParms->dwFrom, start); } else { fmt.Format = IOCTL_CDROM_CURRENT_POSITION; if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_Q_CHANNEL, &fmt, sizeof(fmt), @@ -752,7 +752,7 @@ static DWORD MCICDA_Play(UINT wDevID, DWORD dwFlags, LPMCI_PLAY_PARMS lpParms) } if (dwFlags & MCI_TO) { end = MCICDA_CalcFrame(wmcda, lpParms->dwTo); - TRACE("MCI_TO=%08lX -> %lu \n", lpParms->dwTo, end); + TRACE("MCI_TO=%08lX -> %lu\n", lpParms->dwTo, end); } else { if (!DeviceIoControl(wmcda->handle, IOCTL_CDROM_READ_TOC, NULL, 0, &toc, sizeof(toc), &br, NULL)) { diff --git a/dlls/mciseq/mcimidi.c b/dlls/mciseq/mcimidi.c index 16b8b8737eb..e69f0001d02 100644 --- a/dlls/mciseq/mcimidi.c +++ b/dlls/mciseq/mcimidi.c @@ -114,7 +114,7 @@ static DWORD CALLBACK MCI_SCAStarter(LPVOID arg) sca->wDevID, sca->wMsg, sca->dwParam1, sca->dwParam2); HeapFree(GetProcessHeap(), 0, sca); ExitThread(ret); - WARN("Should not happen ? what's wrong \n"); + WARN("Should not happen ? what's wrong\n"); /* should not go after this point */ return ret; } @@ -281,7 +281,7 @@ static WORD MIDI_mciReadVaryLen(WINE_MCIMIDI* wmm, LPDWORD lpdw) } while (byte & 0x80); *lpdw = value; /* - TRACE("val=%08lX \n", value); + TRACE("val=%08lX\n", value); */ } return ret; @@ -299,7 +299,7 @@ static DWORD MIDI_mciReadNextEvent(WINE_MCIMIDI* wmm, MCI_MIDITRACK* mmt) DWORD tmp; if (mmioSeek(wmm->hFile, mmt->dwIndex, SEEK_SET) != mmt->dwIndex) { - WARN("Can't seek at %08lX \n", mmt->dwIndex); + WARN("Can't seek at %08lX\n", mmt->dwIndex); return MCIERR_INVALID_FILE; } evtLength = MIDI_mciReadVaryLen(wmm, &evtPulse) + 1; /* > 0 */ @@ -460,7 +460,7 @@ static DWORD MIDI_mciReadMThd(WINE_MCIMIDI* wmm, DWORD dwOffset) TRACE("(%p, %08lX);\n", wmm, dwOffset); if (mmioSeek(wmm->hFile, dwOffset, SEEK_SET) != dwOffset) { - WARN("Can't seek at %08lX begin of 'MThd' \n", dwOffset); + WARN("Can't seek at %08lX begin of 'MThd'\n", dwOffset); return MCIERR_INVALID_FILE; } if (mmioRead(wmm->hFile, (HPSTR)&fourcc, @@ -558,7 +558,7 @@ static DWORD MIDI_mciReadMThd(WINE_MCIMIDI* wmm, DWORD dwOffset) for (nt = 0; nt < wmm->nTracks; nt++) { wmm->tracks[nt].wTrackNr = nt; if (MIDI_mciReadMTrk(wmm, &wmm->tracks[nt]) != 0) { - WARN("Can't read 'MTrk' header \n"); + WARN("Can't read 'MTrk' header\n"); return MCIERR_INVALID_FILE; } } @@ -768,21 +768,21 @@ static DWORD MIDI_mciOpen(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSW lpParms) if (mmioDescend(wmm->hFile, &ckMainRIFF, NULL, 0) != 0) { dwRet = MCIERR_INVALID_FILE; } else { - TRACE("ParentChunk ckid=%.4s fccType=%.4s cksize=%08lX \n", + TRACE("ParentChunk ckid=%.4s fccType=%.4s cksize=%08lX\n", (LPSTR)&ckMainRIFF.ckid, (LPSTR)&ckMainRIFF.fccType, ckMainRIFF.cksize); if (ckMainRIFF.ckid == FOURCC_RIFF && ckMainRIFF.fccType == mmioFOURCC('R', 'M', 'I', 'D')) { mmckInfo.ckid = mmioFOURCC('d', 'a', 't', 'a'); mmioSeek(wmm->hFile, ckMainRIFF.dwDataOffset + ((ckMainRIFF.cksize + 1) & ~1), SEEK_SET); if (mmioDescend(wmm->hFile, &mmckInfo, &ckMainRIFF, MMIO_FINDCHUNK) == 0) { - TRACE("... is a 'RMID' file \n"); + TRACE("... is a 'RMID' file\n"); dwOffset = mmckInfo.dwDataOffset; } else { dwRet = MCIERR_INVALID_FILE; } } if (dwRet == 0 && MIDI_mciReadMThd(wmm, dwOffset) != 0) { - WARN("Can't read 'MThd' header \n"); + WARN("Can't read 'MThd' header\n"); dwRet = MCIERR_INVALID_FILE; } } @@ -1204,11 +1204,11 @@ static DWORD MIDI_mciRecord(UINT wDevID, DWORD dwFlags, LPMCI_RECORD_PARMS lpPar start = 1; end = 99999; if (lpParms && (dwFlags & MCI_FROM)) { start = lpParms->dwFrom; - TRACE("MCI_FROM=%d \n", start); + TRACE("MCI_FROM=%d\n", start); } if (lpParms && (dwFlags & MCI_TO)) { end = lpParms->dwTo; - TRACE("MCI_TO=%d \n", end); + TRACE("MCI_TO=%d\n", end); } midiHdr.lpData = HeapAlloc(GetProcessHeap(), 0, 1200); if (!midiHdr.lpData) @@ -1217,7 +1217,7 @@ static DWORD MIDI_mciRecord(UINT wDevID, DWORD dwFlags, LPMCI_RECORD_PARMS lpPar midiHdr.dwUser = 0L; midiHdr.dwFlags = 0L; dwRet = midiInPrepareHeader((HMIDIIN)wmm->hMidi, &midiHdr, sizeof(MIDIHDR)); - TRACE("After MIDM_PREPARE \n"); + TRACE("After MIDM_PREPARE\n"); wmm->dwStatus = MCI_MODE_RECORD; /* FIXME: there is no buffer added */ while (wmm->dwStatus != MCI_MODE_STOP) { @@ -1228,9 +1228,9 @@ static DWORD MIDI_mciRecord(UINT wDevID, DWORD dwFlags, LPMCI_RECORD_PARMS lpPar TRACE("midiInStart => dwBytesRecorded=%lu\n", midiHdr.dwBytesRecorded); if (midiHdr.dwBytesRecorded == 0) break; } - TRACE("Before MIDM_UNPREPARE \n"); + TRACE("Before MIDM_UNPREPARE\n"); dwRet = midiInUnprepareHeader((HMIDIIN)wmm->hMidi, &midiHdr, sizeof(MIDIHDR)); - TRACE("After MIDM_UNPREPARE \n"); + TRACE("After MIDM_UNPREPARE\n"); if (midiHdr.lpData != NULL) { HeapFree(GetProcessHeap(), 0, midiHdr.lpData); midiHdr.lpData = NULL; diff --git a/dlls/msi/action.c b/dlls/msi/action.c index c90801618fe..be2b6860a68 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -875,7 +875,7 @@ static UINT ACTION_ProcessUISequence(MSIPACKAGE *package) if (rc == ERROR_SUCCESS) { - TRACE("Running the actions \n"); + TRACE("Running the actions\n"); rc = MSI_IterateRecords(view, NULL, ITERATE_Actions, &iap); msiobj_release(&view->hdr); @@ -1028,7 +1028,7 @@ static UINT ITERATE_CreateFolders(MSIRECORD *row, LPVOID param) dir = MSI_RecordGetString(row,1); if (!dir) { - ERR("Unable to get folder id \n"); + ERR("Unable to get folder id\n"); return ERROR_SUCCESS; } @@ -1887,7 +1887,7 @@ static UINT ACTION_CostFinalize(MSIPACKAGE *package) WCHAR filever[0x100]; VS_FIXEDFILEINFO *lpVer; - TRACE("Version comparison.. \n"); + TRACE("Version comparison..\n"); versize = GetFileVersionInfoSizeW(file->TargetPath,&handle); version = msi_alloc(versize); GetFileVersionInfoW(file->TargetPath, 0, versize, version); @@ -3118,7 +3118,7 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) } else { - ERR("Unable to query Revision_Number... \n"); + ERR("Unable to query Revision_Number...\n"); rc = ERROR_SUCCESS; } MsiCloseHandle(hSumInfo); @@ -3540,7 +3540,7 @@ static UINT ACTION_RegisterProduct(MSIPACKAGE *package) return rc; /* dump all the info i can grab */ - FIXME("Flesh out more information \n"); + FIXME("Flesh out more information\n"); msi_write_uninstall_property_vals( package, hkey ); diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index d44d6ac7e46..1c6695351b0 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -413,7 +413,7 @@ static DWORD WINAPI ACTION_CallDllFunction(thread_struct *stuff) CustomEntry *fn; DWORD rc = ERROR_SUCCESS; - TRACE("calling function (%s, %s) \n", debugstr_w(stuff->source), + TRACE("calling function (%s, %s)\n", debugstr_w(stuff->source), debugstr_w(stuff->target)); hModule = LoadLibraryW(stuff->source); @@ -543,7 +543,7 @@ static UINT HANDLE_CustomType2(MSIPACKAGE *package, LPCWSTR source, msi_free(deformated); } - TRACE("executing exe %s \n",debugstr_w(cmd)); + TRACE("executing exe %s\n", debugstr_w(cmd)); rc = CreateProcessW(NULL, cmd, NULL, NULL, FALSE, 0, NULL, c_collen, &si, &info); @@ -604,7 +604,7 @@ static UINT HANDLE_CustomType18(MSIPACKAGE *package, LPCWSTR source, msi_free(deformated); } - TRACE("executing exe %s \n",debugstr_w(cmd)); + TRACE("executing exe %s\n", debugstr_w(cmd)); rc = CreateProcessW(NULL, cmd, NULL, NULL, FALSE, 0, NULL, c_collen, &si, &info); @@ -689,7 +689,7 @@ static UINT HANDLE_CustomType50(MSIPACKAGE *package, LPCWSTR source, } msi_free(prop); - TRACE("executing exe %s \n",debugstr_w(cmd)); + TRACE("executing exe %s\n", debugstr_w(cmd)); rc = CreateProcessW(NULL, cmd, NULL, NULL, FALSE, 0, NULL, c_collen, &si, &info); @@ -729,7 +729,7 @@ static UINT HANDLE_CustomType34(MSIPACKAGE *package, LPCWSTR source, if (!deformated) return ERROR_FUNCTION_FAILED; - TRACE("executing exe %s \n",debugstr_w(deformated)); + TRACE("executing exe %s\n", debugstr_w(deformated)); rc = CreateProcessW(NULL, deformated, NULL, NULL, FALSE, 0, NULL, c_collen, &si, &info); diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 2a74116089e..694f6d668a1 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -542,7 +542,7 @@ static UINT ready_media_for_file( MSIPACKAGE *package, struct media_info *mi, mi->last_path = msi_alloc(MAX_PATH*sizeof(WCHAR)); if (MSI_GetPropertyW(package, cszSourceDir, mi->source, &sz)) { - ERR("No Source dir defined \n"); + ERR("No Source dir defined\n"); rc = ERROR_FUNCTION_FAILED; } else diff --git a/dlls/msi/format.c b/dlls/msi/format.c index 5ce4fff2f1c..2730433bb0a 100644 --- a/dlls/msi/format.c +++ b/dlls/msi/format.c @@ -434,7 +434,7 @@ static DWORD deformat_string_internal(MSIPACKAGE *package, LPCWSTR ptr, { LPBYTE nd2; - TRACE("after value %s \n",debugstr_wn((LPWSTR)newdata, + TRACE("after value %s\n", debugstr_wn((LPWSTR)newdata, size/sizeof(WCHAR))); chunk = (len - (progress - ptr)) * sizeof(WCHAR); TRACE("after chunk is %li + %li\n",size,chunk); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 1a55db6bce3..68caa2076ce 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -569,7 +569,7 @@ INT MSI_ProcessMessage( MSIPACKAGE *package, INSTALLMESSAGE eMessageType, char *msg; int len; - TRACE("%x \n",eMessageType); + TRACE("%x\n", eMessageType); rc = 0; if ((eMessageType & 0xff000000) == INSTALLMESSAGE_ERROR) diff --git a/dlls/msi/table.c b/dlls/msi/table.c index e8a76f62f1b..a3becc6770e 100644 --- a/dlls/msi/table.c +++ b/dlls/msi/table.c @@ -1064,7 +1064,7 @@ static UINT TABLE_fetch_int( struct tagMSIVIEW *view, UINT row, UINT col, UINT * return ERROR_FUNCTION_FAILED; } - /* TRACE("Data [%d][%d] = %d \n", row, col, *val ); */ + /* TRACE("Data [%d][%d] = %d\n", row, col, *val ); */ return ERROR_SUCCESS; } diff --git a/dlls/msvcrt/tests/cpp.c b/dlls/msvcrt/tests/cpp.c index eb74fb4c049..dcf13840eb5 100644 --- a/dlls/msvcrt/tests/cpp.c +++ b/dlls/msvcrt/tests/cpp.c @@ -824,7 +824,7 @@ static void test_demangle(void) static const char * mangled = ".ABVVec4@ref2@dice@@"; static const char * result = "class dice::ref2::Vec4 const &"; name = p__unDName(0, mangled + 1, 0,pmalloc,pfree,0x2800); - ok(name != NULL && !strcmp(name,result),"Got name %s \n",name); + ok(name != NULL && !strcmp(name,result),"Got name %s\n", name); } START_TEST(cpp) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 13fb4526914..463326379e1 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ntdll); void dump_ObjectAttributes (const OBJECT_ATTRIBUTES *oa) { if (oa) - TRACE("%p:(name=%s, attr=0x%08lx, hRoot=%p, sd=%p) \n", + TRACE("%p:(name=%s, attr=0x%08lx, hRoot=%p, sd=%p)\n", oa, debugstr_us(oa->ObjectName), oa->Attributes, oa->RootDirectory, oa->SecurityDescriptor); } diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c index 3edc9428116..d6cb221e383 100644 --- a/dlls/odbc32/proxyodbc.c +++ b/dlls/odbc32/proxyodbc.c @@ -158,7 +158,7 @@ static PROXYHANDLE gProxyHandle; SQLRETURN SQLDummyFunc() { - TRACE("SQLDummyFunc: \n"); + TRACE("SQLDummyFunc:\n"); return SQL_SUCCESS; } diff --git a/dlls/ole32/antimoniker.c b/dlls/ole32/antimoniker.c index c01552510e0..bcd59e12684 100644 --- a/dlls/ole32/antimoniker.c +++ b/dlls/ole32/antimoniker.c @@ -442,7 +442,7 @@ AntiMonikerImpl_GetDisplayName(IMoniker* iface, IBindCtx* pbc, return E_POINTER; if (pmkToLeft!=NULL){ - FIXME("() pmkToLeft!=NULL not implemented \n"); + FIXME("() pmkToLeft!=NULL not implemented\n"); return E_NOTIMPL; } diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c index 59990792e0c..a58457d133a 100644 --- a/dlls/ole32/bindctx.c +++ b/dlls/ole32/bindctx.c @@ -170,7 +170,7 @@ BindCtxImpl_RegisterObjectBound(IBindCtx* iface,IUnknown* punk) if (lastIndex == This->bindCtxTableSize){ /* the table is full so it must be resized */ if (This->bindCtxTableSize > (MAX_TAB_SIZE-BLOCK_TAB_SIZE)){ - FIXME("This->bindCtxTableSize: %ld is out of data limite \n",This->bindCtxTableSize); + FIXME("This->bindCtxTableSize: %ld is out of data limite\n", This->bindCtxTableSize); return E_FAIL; } @@ -351,7 +351,7 @@ BindCtxImpl_RegisterObjectParam(IBindCtx* iface,LPOLESTR pszkey, IUnknown* punk) This->bindCtxTableSize+=BLOCK_TAB_SIZE; /* new table size */ if (This->bindCtxTableSize > (MAX_TAB_SIZE-BLOCK_TAB_SIZE)) { - FIXME("This->bindCtxTableSize: %ld is out of data limite \n",This->bindCtxTableSize); + FIXME("This->bindCtxTableSize: %ld is out of data limite\n", This->bindCtxTableSize); return E_FAIL; } This->bindCtxTable = HeapReAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,This->bindCtxTable, diff --git a/dlls/ole32/ole2.c b/dlls/ole32/ole2.c index 0363f1332ca..4bc815e9058 100644 --- a/dlls/ole32/ole2.c +++ b/dlls/ole32/ole2.c @@ -2533,7 +2533,7 @@ HRESULT WINAPI OleCreate( *ppvObj = pUnk; - TRACE("-- %p \n", pUnk); + TRACE("-- %p\n", pUnk); return hres; } diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 2989ca26b69..a65cbf10e68 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -3549,7 +3549,7 @@ static HRESULT WINAPI ITypeLib2_fnGetTypeInfo( ITypeLibImpl *This = (ITypeLibImpl *)iface; ITypeInfoImpl *pTypeInfo = This->pTypeInfo; - TRACE("(%p)->(index=%d) \n", This, index); + TRACE("(%p)->(index=%d)\n", This, index); if (!ppTInfo) return E_INVALIDARG; @@ -3585,7 +3585,7 @@ static HRESULT WINAPI ITypeLib2_fnGetTypeInfoType( int i; ITypeInfoImpl *pTInfo = This->pTypeInfo; - TRACE("(%p) index %d \n",This, index); + TRACE("(%p) index %d\n", This, index); if(!pTKind) return E_INVALIDARG; @@ -4019,7 +4019,7 @@ static HRESULT WINAPI ITypeLib2_fnGetAllCustData( VariantCopy(& pCustData->prgCustData[i].varValue, & pCData->data); } }else{ - ERR(" OUT OF MEMORY! \n"); + ERR(" OUT OF MEMORY!\n"); return E_OUTOFMEMORY; } return S_OK; @@ -5770,7 +5770,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetAllCustData( VariantCopy(& pCustData->prgCustData[i].varValue, & pCData->data); } }else{ - ERR(" OUT OF MEMORY! \n"); + ERR(" OUT OF MEMORY!\n"); return E_OUTOFMEMORY; } return S_OK; @@ -5806,7 +5806,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetAllFuncCustData( & pCData->data); } }else{ - ERR(" OUT OF MEMORY! \n"); + ERR(" OUT OF MEMORY!\n"); return E_OUTOFMEMORY; } return S_OK; @@ -5843,7 +5843,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetAllParamCustData( ITypeInfo2 * iface, & pCData->data); } }else{ - ERR(" OUT OF MEMORY! \n"); + ERR(" OUT OF MEMORY!\n"); return E_OUTOFMEMORY; } return S_OK; @@ -5879,7 +5879,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetAllVarCustData( ITypeInfo2 * iface, & pCData->data); } }else{ - ERR(" OUT OF MEMORY! \n"); + ERR(" OUT OF MEMORY!\n"); return E_OUTOFMEMORY; } return S_OK; @@ -5917,7 +5917,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetAllImplTypeCustData( & pCData->data); } }else{ - ERR(" OUT OF MEMORY! \n"); + ERR(" OUT OF MEMORY!\n"); return E_OUTOFMEMORY; } return S_OK; diff --git a/dlls/oleaut32/varformat.c b/dlls/oleaut32/varformat.c index ead2cb1e30e..13458a24633 100644 --- a/dlls/oleaut32/varformat.c +++ b/dlls/oleaut32/varformat.c @@ -55,7 +55,7 @@ static const WCHAR szPercentZeroStar_d[] = { '%','0','*','d','\0' }; #if 0 #define dump_tokens(rgb) do { \ - int i_; TRACE("Tokens->{ \n"); \ + int i_; TRACE("Tokens->{\n"); \ for (i_ = 0; i_ < rgb[0]; i_++) \ TRACE("%s0x%02x", i_?",":"",rgb[i_]); \ TRACE(" }\n"); \ diff --git a/dlls/olepro32/olepro32stubs.c b/dlls/olepro32/olepro32stubs.c index 5633080223a..1d6c80fe712 100644 --- a/dlls/olepro32/olepro32stubs.c +++ b/dlls/olepro32/olepro32stubs.c @@ -36,7 +36,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(ole); */ HRESULT WINAPI DllUnregisterServer() { - FIXME("not implemented (olepro32.dll) \n"); + FIXME("not implemented (olepro32.dll)\n"); return S_OK; } @@ -45,7 +45,7 @@ HRESULT WINAPI DllUnregisterServer() */ HRESULT WINAPI DllRegisterServer() { - FIXME("not implemented (olepro32.dll) \n"); + FIXME("not implemented (olepro32.dll)\n"); return S_OK; } @@ -54,7 +54,7 @@ HRESULT WINAPI DllRegisterServer() */ HRESULT WINAPI DllCanUnloadNow(void) { - FIXME("not implemented (olepro32.dll) \n"); + FIXME("not implemented (olepro32.dll)\n"); return S_OK; } @@ -63,6 +63,6 @@ HRESULT WINAPI DllCanUnloadNow(void) */ HRESULT WINAPI DllGetClassObject( REFCLSID rclsid, REFIID riid, LPVOID* ppv ) { - FIXME("not implemented (olepro32.dll) \n"); + FIXME("not implemented (olepro32.dll)\n"); return S_OK; } diff --git a/dlls/opengl32/wgl.c b/dlls/opengl32/wgl.c index 3e677a2825a..a0866023ce8 100644 --- a/dlls/opengl32/wgl.c +++ b/dlls/opengl32/wgl.c @@ -624,7 +624,7 @@ static BOOL internal_wglUseFontBitmaps(HDC hdc, TRACE(" - origin : (%ld , %ld)\n", gm.gmptGlyphOrigin.x, gm.gmptGlyphOrigin.y); TRACE(" - increment : %d - %d\n", gm.gmCellIncX, gm.gmCellIncY); if (needed_size != 0) { - TRACE(" - bitmap : \n"); + TRACE(" - bitmap :\n"); for (height = 0; height < gm.gmBlackBoxY; height++) { TRACE(" "); for (width = 0, bitmask = 0x80; width < gm.gmBlackBoxX; width++, bitmask >>= 1) { diff --git a/dlls/opengl32/wgl_ext.c b/dlls/opengl32/wgl_ext.c index 335554ab014..c7b79742424 100644 --- a/dlls/opengl32/wgl_ext.c +++ b/dlls/opengl32/wgl_ext.c @@ -191,7 +191,7 @@ BOOL WINAPI wglSwapIntervalEXT(int interval) { if (NULL != p_glXSwapIntervalSGI) { return 0 == p_glXSwapIntervalSGI(interval); } - WARN("(): GLX_SGI_swap_control extension seems not supported \n"); + WARN("(): GLX_SGI_swap_control extension seems not supported\n"); return TRUE; } diff --git a/dlls/shell32/cpanelfolder.c b/dlls/shell32/cpanelfolder.c index 07d0fd117dd..cbac65ab3a9 100644 --- a/dlls/shell32/cpanelfolder.c +++ b/dlls/shell32/cpanelfolder.c @@ -410,7 +410,7 @@ static BOOL CreateCPanelEnumList( WIN32_FIND_DATAA wfd; HANDLE hFile; - TRACE("(%p)->(flags=0x%08lx) \n",iface,dwFlags); + TRACE("(%p)->(flags=0x%08lx)\n", iface, dwFlags); /* enumerate control panel folders folders */ if (dwFlags & SHCONTF_FOLDERS) diff --git a/dlls/shell32/enumidlist.c b/dlls/shell32/enumidlist.c index 972bd207d11..98577f22e43 100644 --- a/dlls/shell32/enumidlist.c +++ b/dlls/shell32/enumidlist.c @@ -116,7 +116,7 @@ BOOL CreateFolderEnumList( static const WCHAR dot[] = { '.',0 }; static const WCHAR dotdot[] = { '.','.',0 }; - TRACE("(%p)->(path=%s flags=0x%08lx) \n",list,debugstr_w(lpszPath),dwFlags); + TRACE("(%p)->(path=%s flags=0x%08lx)\n", list, debugstr_w(lpszPath), dwFlags); if(!lpszPath || !lpszPath[0]) return FALSE; diff --git a/dlls/shell32/pidl.c b/dlls/shell32/pidl.c index 02a9676127d..b39fb249742 100644 --- a/dlls/shell32/pidl.c +++ b/dlls/shell32/pidl.c @@ -254,7 +254,7 @@ LPITEMIDLIST WINAPI ILCloneFirst(LPCITEMIDLIST pidl) DWORD len; LPITEMIDLIST pidlNew = NULL; - TRACE("pidl=%p \n",pidl); + TRACE("pidl=%p\n", pidl); pdump(pidl); if (pidl) diff --git a/dlls/shell32/shelllink.c b/dlls/shell32/shelllink.c index 359bb569b71..85073141743 100644 --- a/dlls/shell32/shelllink.c +++ b/dlls/shell32/shelllink.c @@ -1112,7 +1112,7 @@ static HRESULT WINAPI IPersistStream_fnSave( return r; } - TRACE("Writing pidl \n"); + TRACE("Writing pidl\n"); /* write the PIDL to the shortcut */ if( This->pPidl ) diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c index 5c705568673..f5f7a3f8973 100644 --- a/dlls/shell32/shellord.c +++ b/dlls/shell32/shellord.c @@ -739,7 +739,7 @@ void WINAPI SHAddToRecentDocs (UINT uFlags,LPCVOID pv) * DeleteFileA(old_lnk_name); * } */ - FIXME("should delete all files in %s\\ \n", link_dir); + FIXME("should delete all files in %s\\\n", link_dir); /* clear MRU list */ @@ -1151,7 +1151,7 @@ BOOL WINAPI ReadCabinetState(CABINETSTATE *cs, int length) HKEY hkey = 0; DWORD type, r; - TRACE("%p %d \n",cs,length); + TRACE("%p %d\n", cs, length); if( (cs == NULL) || (length < (int)sizeof(*cs)) ) return FALSE; diff --git a/dlls/shell32/shfldr_desktop.c b/dlls/shell32/shfldr_desktop.c index c73ebbca140..887ec806b06 100644 --- a/dlls/shell32/shfldr_desktop.c +++ b/dlls/shell32/shfldr_desktop.c @@ -268,7 +268,7 @@ static BOOL CreateDesktopEnumList(IEnumIDList *list, DWORD dwFlags) BOOL ret = TRUE; WCHAR szPath[MAX_PATH]; - TRACE("(%p)->(flags=0x%08lx) \n",list,dwFlags); + TRACE("(%p)->(flags=0x%08lx)\n", list, dwFlags); /* enumerate the root folders */ if (dwFlags & SHCONTF_FOLDERS) diff --git a/dlls/shell32/shfldr_mycomp.c b/dlls/shell32/shfldr_mycomp.c index abbafd50250..ec137ce05e2 100644 --- a/dlls/shell32/shfldr_mycomp.c +++ b/dlls/shell32/shfldr_mycomp.c @@ -266,7 +266,7 @@ static BOOL CreateMyCompEnumList(IEnumIDList *list, DWORD dwFlags) { BOOL ret = TRUE; - TRACE("(%p)->(flags=0x%08lx) \n",list,dwFlags); + TRACE("(%p)->(flags=0x%08lx)\n", list, dwFlags); /* enumerate the folders */ if (dwFlags & SHCONTF_FOLDERS) diff --git a/dlls/shell32/tests/shlfileop.c b/dlls/shell32/tests/shlfileop.c index f4509d2cf65..fed4b2678a4 100644 --- a/dlls/shell32/tests/shlfileop.c +++ b/dlls/shell32/tests/shlfileop.c @@ -309,7 +309,7 @@ static void test_copy(void) set_curr_dir_path(from, "test1.txt\0test2.txt\0"); ok(!file_exists(".\\testdir2\\test1.txt"), "The file is not copied yet\n"); ok(!file_exists(".\\testdir2\\test2.txt"), "The file is not copied yet\n"); - ok(!SHFileOperationA(&shfo), "Files are copied to other directory \n"); + ok(!SHFileOperationA(&shfo), "Files are copied to other directory\n"); ok(file_exists(".\\testdir2\\test1.txt"), "The file is copied\n"); ok(file_exists(".\\testdir2\\test2.txt"), "The file is copied\n"); clean_after_shfo_tests(); diff --git a/dlls/shlwapi/tests/ordinal.c b/dlls/shlwapi/tests/ordinal.c index 8a27116878a..ccc7d348057 100644 --- a/dlls/shlwapi/tests/ordinal.c +++ b/dlls/shlwapi/tests/ordinal.c @@ -102,12 +102,12 @@ static void test_GetAcceptLanguagesA(void) "last error wrong: got %08lx; expected ERROR_SUCCESS(NT4)/ERROR_CALL_NOT_IMPLEMENTED(98/ME)/" "ERROR_PROC_NOT_FOUND(NT4)/ERROR_NO_IMPERSONATION_TOKEN(XP)\n", GetLastError()); ok(exactsize == strlen(buffer), - "buffer content (length) wrong: got %08x, expected %08lx \n", strlen(buffer), exactsize); + "buffer content (length) wrong: got %08x, expected %08lx\n", strlen(buffer), exactsize); } else if((buffersize +1) == buffersize2) { ok(ERROR_SUCCESS == GetLastError(), "last error wrong: got %08lx; expected ERROR_SUCCESS\n", GetLastError()); ok(buffersize == strlen(buffer), - "buffer content (length) wrong: got %08x, expected %08lx \n", strlen(buffer), buffersize); + "buffer content (length) wrong: got %08x, expected %08lx\n", strlen(buffer), buffersize); } else ok( 0, "retval %08lx, size %08lx, buffer (%s), last error %ld\n", retval, buffersize, buffer, GetLastError()); @@ -118,7 +118,7 @@ static void test_GetAcceptLanguagesA(void) ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "last error wrong: got %08lx; expected ERROR_INSUFFICIENT_BUFFER\n", GetLastError()); ok(buffersize2 == strlen(buffer), - "buffer content (length) wrong: got %08x, expected %08lx \n", strlen(buffer), buffersize2); + "buffer content (length) wrong: got %08x, expected %08lx\n", strlen(buffer), buffersize2); break; default: ok( 0, "retval %08lx, size %08lx, buffer (%s), last error %ld\n", @@ -137,7 +137,7 @@ static void test_GetAcceptLanguagesA(void) if((buffersize == exactsize) /* XP */ || ((buffersize +1)== exactsize) /* 98 */) ok(buffersize == strlen(buffer), - "buffer content (length) wrong: got %08x, expected %08lx \n", strlen(buffer), buffersize); + "buffer content (length) wrong: got %08x, expected %08lx\n", strlen(buffer), buffersize); else ok( 0, "retval %08lx, size %08lx, buffer (%s), last error %ld\n", retval, buffersize, buffer, GetLastError()); @@ -148,7 +148,7 @@ static void test_GetAcceptLanguagesA(void) ok(ERROR_INSUFFICIENT_BUFFER == GetLastError(), "last error wrong: got %08lx; expected ERROR_INSUFFICIENT_BUFFER\n", GetLastError()); ok(buffersize2 == strlen(buffer), - "buffer content (length) wrong: got %08x, expected %08lx \n", strlen(buffer), buffersize2); + "buffer content (length) wrong: got %08x, expected %08lx\n", strlen(buffer), buffersize2); break; default: ok( 0, "retval %08lx, size %08lx, buffer (%s), last error %ld\n", diff --git a/dlls/tapi32/line.c b/dlls/tapi32/line.c index 7c8f66b92e3..ea2bfd8e940 100644 --- a/dlls/tapi32/line.c +++ b/dlls/tapi32/line.c @@ -921,7 +921,7 @@ DWORD WINAPI lineGetTranslateCapsA(HLINEAPP hLineApp, DWORD dwAPIVersion, if(hkCardLocations) RegCloseKey(hkCardLocations); HeapFree(GetProcessHeap(), 0, loc_key_name); HeapFree(GetProcessHeap(), 0, card_key_name); - TRACE(" returning success tot %ld needed %ld used %ld \n", + TRACE(" returning success tot %ld needed %ld used %ld\n", lpTranslateCaps->dwTotalSize, lpTranslateCaps->dwNeededSize, lpTranslateCaps->dwUsedSize ); diff --git a/dlls/user/comm16.c b/dlls/user/comm16.c index 10a61e633ed..c2366e458a0 100644 --- a/dlls/user/comm16.c +++ b/dlls/user/comm16.c @@ -904,7 +904,7 @@ INT16 WINAPI TransmitCommChar16(INT16 cid,CHAR chTransmit) { struct DosDeviceStruct *ptr; - TRACE("cid %d, data %d \n", cid, chTransmit); + TRACE("cid %d, data %d\n", cid, chTransmit); if ((ptr = GetDeviceStruct(cid)) == NULL) { FIXME("no handle for cid = %0x!\n",cid); return -1; diff --git a/dlls/user/dde_misc.c b/dlls/user/dde_misc.c index 1139cf09800..e25319d3e46 100644 --- a/dlls/user/dde_misc.c +++ b/dlls/user/dde_misc.c @@ -397,7 +397,7 @@ UINT WDML_Initialize(LPDWORD pidInst, PFNCALLBACK pfnCallback, (pInstance->CBFflags & CBF_FAIL_ALLSVRXACTIONS) == CBF_FAIL_ALLSVRXACTIONS; } - TRACE("instance created - checking validity \n"); + TRACE("instance created - checking validity\n"); if (*pidInst == 0) { @@ -1074,11 +1074,11 @@ static HSZ WDML_CreateString(WDML_INSTANCE* pInstance, LPCVOID ptr, int codepage { case CP_WINANSI: hsz = ATOM2HSZ(AddAtomA(ptr)); - TRACE("added atom %s with HSZ %p, \n", debugstr_a(ptr), hsz); + TRACE("added atom %s with HSZ %p,\n", debugstr_a(ptr), hsz); break; case CP_WINUNICODE: hsz = ATOM2HSZ(AddAtomW(ptr)); - TRACE("added atom %s with HSZ %p, \n", debugstr_w(ptr), hsz); + TRACE("added atom %s with HSZ %p,\n", debugstr_w(ptr), hsz); break; default: ERR("Unknown code page %d\n", codepage); @@ -1156,7 +1156,7 @@ BOOL WINAPI DdeFreeStringHandle(DWORD idInst, HSZ hsz) WDML_INSTANCE* pInstance; BOOL ret = FALSE; - TRACE("(%ld,%p): \n", idInst, hsz); + TRACE("(%ld,%p):\n", idInst, hsz); EnterCriticalSection(&WDML_CritSect); @@ -1183,7 +1183,7 @@ BOOL WINAPI DdeKeepStringHandle(DWORD idInst, HSZ hsz) WDML_INSTANCE* pInstance; BOOL ret = FALSE; - TRACE("(%ld,%p): \n", idInst, hsz); + TRACE("(%ld,%p):\n", idInst, hsz); EnterCriticalSection(&WDML_CritSect); diff --git a/dlls/user/tests/menu.c b/dlls/user/tests/menu.c index f639837b0fc..5b209ab0064 100644 --- a/dlls/user/tests/menu.c +++ b/dlls/user/tests/menu.c @@ -80,7 +80,7 @@ static LRESULT WINAPI menu_ownerdraw_wnd_proc(HWND hwnd, UINT msg, SIZE sz; pdis = (DRAWITEMSTRUCT *) lparam; if( winetest_debug) { - trace("WM_DRAWITEM received itemdata %ld item %d rc %ld,%ld-%ld,%ld \n", + trace("WM_DRAWITEM received itemdata %ld item %d rc %ld,%ld-%ld,%ld\n", pdis->itemData, pdis->itemID, pdis->rcItem.left, pdis->rcItem.top, pdis->rcItem.right,pdis->rcItem.bottom ); diff --git a/dlls/vwin32.vxd/vwin32.c b/dlls/vwin32.vxd/vwin32.c index ee192ae6e0f..73a01dcb90d 100644 --- a/dlls/vwin32.vxd/vwin32.c +++ b/dlls/vwin32.vxd/vwin32.c @@ -112,7 +112,7 @@ BOOL WINAPI VWIN32_DeviceIoControl(DWORD dwIoControlCode, TRACE( "Control '%s': " "eax=0x%08lx, ebx=0x%08lx, ecx=0x%08lx, " - "edx=0x%08lx, esi=0x%08lx, edi=0x%08lx \n", + "edx=0x%08lx, esi=0x%08lx, edi=0x%08lx\n", (dwIoControlCode == VWIN32_DIOC_DOS_IOCTL)? "VWIN32_DIOC_DOS_IOCTL" : (dwIoControlCode == VWIN32_DIOC_DOS_INT25)? "VWIN32_DIOC_DOS_INT25" : (dwIoControlCode == VWIN32_DIOC_DOS_INT26)? "VWIN32_DIOC_DOS_INT26" : diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index 893bf196a05..a8bb0ff7f69 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -161,7 +161,7 @@ DWORD WINAPI IWineD3DBaseTextureImpl_SetLOD(IWineD3DBaseTexture *iface, DWORD LO LODNew = This->baseTexture.levels - 1; This->baseTexture.LOD = LODNew; - TRACE("(%p) : set bogus LOD to %d \n", This, This->baseTexture.LOD); + TRACE("(%p) : set bogus LOD to %d\n", This, This->baseTexture.LOD); return This->baseTexture.LOD; } @@ -173,7 +173,7 @@ DWORD WINAPI IWineD3DBaseTextureImpl_GetLOD(IWineD3DBaseTexture *iface) { return D3DERR_INVALIDCALL; } - TRACE("(%p) : returning %d \n", This, This->baseTexture.LOD); + TRACE("(%p) : returning %d\n", This, This->baseTexture.LOD); return This->baseTexture.LOD; } @@ -192,7 +192,7 @@ HRESULT WINAPI IWineD3DBaseTextureImpl_SetAutoGenFilterType(IWineD3DBaseTexture return D3DERR_INVALIDCALL; } This->baseTexture.filterType = FilterType; - TRACE("(%p) : \n", This); + TRACE("(%p) :\n", This); return D3D_OK; } @@ -361,7 +361,7 @@ void WINAPI IWineD3DBaseTextureImpl_ApplyStateChanges(IWineD3DBaseTexture *iface for (i = 0 ;textureObjectSamplerStates[i].state != -1; i++) { if (*state != samplerStates[textureObjectSamplerStates[i].state]) { /* apply the state */ - TRACE("(%p) : Changing state %u from %ld to %ld \n",This, i, *state , samplerStates[textureObjectSamplerStates[i].state]); + TRACE("(%p) : Changing state %u from %ld to %ld\n", This, i, *state , samplerStates[textureObjectSamplerStates[i].state]); switch (textureObjectSamplerStates[i].function) { case WINED3DSAMP_ADDRESSU: case WINED3DSAMP_ADDRESSV: /* fall through */ diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index e659a9f63ba..ce0bfce0869 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -200,19 +200,19 @@ BOOL WINAPI IWineD3DCubeTextureImpl_GetDirty(IWineD3DCubeTexture *iface) { HRESULT WINAPI IWineD3DCubeTextureImpl_BindTexture(IWineD3DCubeTexture *iface) { IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; - TRACE("(%p) : relay to BaseTexture \n", This); + TRACE("(%p) : relay to BaseTexture\n", This); return IWineD3DBaseTextureImpl_BindTexture((IWineD3DBaseTexture *)iface); } HRESULT WINAPI IWineD3DCubeTextureImpl_UnBindTexture(IWineD3DCubeTexture *iface) { IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; - TRACE("(%p) : relay to BaseTexture \n", This); + TRACE("(%p) : relay to BaseTexture\n", This); return IWineD3DBaseTextureImpl_UnBindTexture((IWineD3DBaseTexture *)iface); } UINT WINAPI IWineD3DCubeTextureImpl_GetTextureDimensions(IWineD3DCubeTexture *iface){ IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; - TRACE("(%p) \n", This); + TRACE("(%p)\n", This); return GL_TEXTURE_CUBE_MAP_ARB; } @@ -280,7 +280,7 @@ HRESULT WINAPI IWineD3DCubeTextureImpl_GetCubeMapSurface(IWineD3DCubeTexture *if hr = D3D_OK; } if (D3D_OK == hr) { - 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 { WARN("(%p) level(%d) overflow Levels(%d)\n", This, Level, This->baseTexture.levels); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e0db9923a68..38db2e84a07 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -442,7 +442,7 @@ ULONG WINAPI IWineD3DDeviceImpl_Release(IWineD3DDevice *iface) { IWineD3D_Release(This->wineD3D); This->wineD3D = NULL; HeapFree(GetProcessHeap(), 0, This); - TRACE("Freed device %p \n",This); + TRACE("Freed device %p\n", This); This = NULL; } return refCount; @@ -663,12 +663,12 @@ HRESULT WINAPI IWineD3DDeviceImpl_CreateSurface(IWineD3DDevice *iface, UINT Wid ***************************/ if(MultisampleQuality < 0) { - FIXME("Invalid multisample level %ld \n", MultisampleQuality); + FIXME("Invalid multisample level %ld\n", MultisampleQuality); return D3DERR_INVALIDCALL; /* TODO: Check that this is the case! */ } if(MultisampleQuality > 0) { - FIXME("MultisampleQuality set to %ld, substituting 0 \n" , MultisampleQuality); + FIXME("MultisampleQuality set to %ld, substituting 0\n", MultisampleQuality); MultisampleQuality=0; } @@ -687,7 +687,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_CreateSurface(IWineD3DDevice *iface, UINT Wid /** TODO: add support for non power two compressed textures (OpenGL 2 provices support for * non-power-two textures gratis) **/ if (Format == WINED3DFMT_DXT1 || Format == WINED3DFMT_DXT2 || Format == WINED3DFMT_DXT3 || Format == WINED3DFMT_DXT4 || Format == WINED3DFMT_DXT5) { - FIXME("(%p) Compressed non-power-two textures are not supported w(%d) h(%d) \n", + FIXME("(%p) Compressed non-power-two textures are not supported w(%d) h(%d)\n", This, Width, Height); return D3DERR_NOTAVAILABLE; } @@ -827,7 +827,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, UINT Wid unsigned int pow2Height = Height; - TRACE("(%p), Width(%d) Height(%d) Levels(%d) Usage(%ld) .... \n", This, Width, Height, Levels, Usage); + TRACE("(%p), Width(%d) Height(%d) Levels(%d) Usage(%ld) ....\n", This, Width, Height, Levels, Usage); D3DCREATERESOURCEOBJECTINSTANCE(object, Texture, D3DRTYPE_TEXTURE, 0); D3DINITILIZEBASETEXTURE(object->baseTexture); @@ -844,7 +844,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, UINT Wid /* Precalculated scaling for 'faked' non power of two texture coords */ object->pow2scalingFactorX = (((float)Width) / ((float)pow2Width)); object->pow2scalingFactorY = (((float)Height) / ((float)pow2Height)); - TRACE(" xf(%f) yf(%f) \n", object->pow2scalingFactorX, object->pow2scalingFactorY); + TRACE(" xf(%f) yf(%f)\n", object->pow2scalingFactorX, object->pow2scalingFactorY); /* Calculate levels for mip mapping */ if (Levels == 0) { @@ -869,7 +869,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_CreateTexture(IWineD3DDevice *iface, UINT Wid hr = D3DCB_CreateSurface(This->parent, tmpW, tmpH, Format, Usage, Pool, i, &object->surfaces[i],NULL); if (hr!= D3D_OK) { int j; - FIXME("Failed to create surface %p \n",object); + FIXME("Failed to create surface %p\n", object); /* clean up */ for (j = 0 ; j < i ; j++) { IWineD3DSurface_Release(object->surfaces[j]); @@ -1003,7 +1003,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface, UINT D3DCREATERESOURCEOBJECTINSTANCE(object, CubeTexture, D3DRTYPE_CUBETEXTURE, 0); D3DINITILIZEBASETEXTURE(object->baseTexture); - TRACE("(%p) Create Cube Texture \n", This); + TRACE("(%p) Create Cube Texture\n", This); /** Non-power2 support **/ @@ -1056,7 +1056,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_CreateCubeTexture(IWineD3DDevice *iface, UINT return hr; } IWineD3DSurface_SetContainer(object->surfaces[j][i], (IUnknown *)object); - TRACE("Created surface level %d @ %p, \n", i, object->surfaces[j][i]); + TRACE("Created surface level %d @ %p,\n", i, object->surfaces[j][i]); } tmpW = max(1, tmpW >> 1); } @@ -1173,7 +1173,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_CreateAdditionalSwapChain(IWineD3DDevice* ifac hDc = GetDC(object->win_handle); object->display = get_display(hDc); ReleaseDC(object->win_handle, hDc); - TRACE("Using a display of %p %p \n", object->display, hDc); + TRACE("Using a display of %p %p\n", object->display, hDc); if (NULL == object->display || NULL == hDc) { WARN("Failed to get a display and HDc for Window %p\n", object->win_handle); @@ -1542,7 +1542,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_GetSwapChain(IWineD3DDevice *iface, UINT iSw SwapChainList *swapchain; HRESULT hr = D3DERR_INVALIDCALL; swapchain = This->swapchains; - TRACE("(%p) : swapchain %d \n", This, iSwapChain); + TRACE("(%p) : swapchain %d\n", This, iSwapChain); TRACE("(%p) Finding swapchain %d\n", This, iSwapChain); @@ -2628,7 +2628,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_GetIndices(IWineD3DDevice *iface, IWineD3DInde }else{ TRACE("(%p) No index data set\n", This); } - TRACE("Returning %p %d \n",*ppIndexData, *pBaseVertexIndex); + TRACE("Returning %p %d\n", *ppIndexData, *pBaseVertexIndex); return D3D_OK; } @@ -3628,7 +3628,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetSamplerState(IWineD3DDevice *iface, DWORD S FIXME("out of range %d %d sampler %ld type %u\n", GL_LIMITS(samplers), WINED3D_HIGHEST_SAMPLER_STATE, Sampler, Type); return D3DERR_INVALIDCALL; } - TRACE("Setting sampler %ld %d to %ld \n", Sampler, Type, Value); + TRACE("Setting sampler %ld %d to %ld\n", Sampler, Type, Value); This->updateStateBlock->samplerState[Sampler][Type] = Value; This->updateStateBlock->set.samplerState[Sampler][Type] = Value; This->updateStateBlock->changed.samplerState[Sampler][Type] = Value; @@ -4385,7 +4385,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_SetTexture(IWineD3DDevice *iface, DWORD Stage, HRESULT WINAPI IWineD3DDeviceImpl_GetTexture(IWineD3DDevice *iface, DWORD Stage, IWineD3DBaseTexture** ppTexture) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - TRACE("(%p) : (%ld /* Stage */,%p /* ppTexture */) \n", This, Stage, ppTexture); + TRACE("(%p) : (%ld /* Stage */,%p /* ppTexture */)\n", This, Stage, ppTexture); /* Reject invalid texture units */ if (Stage >= GL_LIMITS(textures)) { @@ -4702,7 +4702,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_DrawIndexedPrimitive(IWineD3DDevice *iface, pIB = This->stateBlock->pIndexData; This->stateBlock->streamIsUP = FALSE; - TRACE("(%p) : Type=(%d,%s), min=%d, CountV=%d, startIdx=%d, baseVidx=%d, countP=%d \n", This, + TRACE("(%p) : Type=(%d,%s), min=%d, CountV=%d, startIdx=%d, baseVidx=%d, countP=%d\n", This, PrimitiveType, debug_d3dprimitivetype(PrimitiveType), minIndex, NumVertices, startIndex, baseVIndex, primCount); @@ -5134,7 +5134,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_GetRasterStatus(IWineD3DDevice *iface, UINT hr = IWineD3DSwapChain_GetRasterStatus(swapChain, pRasterStatus); IWineD3DSwapChain_Release(swapChain); }else{ - FIXME("(%p) IWineD3DSwapChain_GetRasterStatus returned in error \n", This); + FIXME("(%p) IWineD3DSwapChain_GetRasterStatus returned in error\n", This); } return hr; } @@ -5369,7 +5369,7 @@ OpenGL evaluators or tessellate surfaces within your application. /* http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c/directx/graphics/reference/d3d/interfaces/idirect3ddevice9/DrawRectPatch.asp */ HRESULT WINAPI IWineD3DDeviceImpl_DrawRectPatch(IWineD3DDevice *iface, UINT Handle, CONST float* pNumSegs, CONST D3DRECTPATCH_INFO* pRectPatchInfo) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - TRACE("(%p) Handle(%d) noSegs(%p) rectpatch(%p) \n", This, Handle, pNumSegs, pRectPatchInfo); + TRACE("(%p) Handle(%d) noSegs(%p) rectpatch(%p)\n", This, Handle, pNumSegs, pRectPatchInfo); FIXME("(%p) : Stub\n", This); return D3D_OK; @@ -5378,7 +5378,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_DrawRectPatch(IWineD3DDevice *iface, UINT Hand /* http://msdn.microsoft.com/library/default.asp?url=/library/en-us/directx9_c/directx/graphics/reference/d3d/interfaces/idirect3ddevice9/DrawTriPatch.asp */ HRESULT WINAPI IWineD3DDeviceImpl_DrawTriPatch(IWineD3DDevice *iface, UINT Handle, CONST float* pNumSegs, CONST D3DTRIPATCH_INFO* pTriPatchInfo) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - TRACE("(%p) Handle(%d) noSegs(%p) tripatch(%p) \n", This, Handle, pNumSegs, pTriPatchInfo); + TRACE("(%p) Handle(%d) noSegs(%p) tripatch(%p)\n", This, Handle, pNumSegs, pTriPatchInfo); FIXME("(%p) : Stub\n", This); return D3D_OK; } @@ -5426,7 +5426,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, IWineD3DSurfa } } else { if (D3DUSAGE_DEPTHSTENCIL & surface->resource.usage) { - FIXME("colouring of depth_stencil? %p buffers is not yet supported? %ld \n", surface, surface->resource.usage); + FIXME("colouring of depth_stencil? %p buffers is not yet supported? %ld\n", surface, surface->resource.usage); } else { FIXME("(%p) : Regression %ld %p %p\n", This, surface->resource.usage, pSurface, This->renderTarget); } @@ -6299,7 +6299,7 @@ void WINAPI IWineD3DDeviceImpl_ResourceReleased(IWineD3DDevice *iface, IWineD3DR break; default: - FIXME("(%p) unknown resource type %p %u \n", This, resource, IWineD3DResource_GetType(resource)); + FIXME("(%p) unknown resource type %p %u\n", This, resource, IWineD3DResource_GetType(resource)); break; } diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 1c78c9070ff..164c07c21fb 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1702,7 +1702,7 @@ HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter, D3DDEV /* Create a WineD3DDevice object */ object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IWineD3DDeviceImpl)); *ppReturnedDeviceInterface = (IWineD3DDevice *)object; - TRACE("Created WineD3DDevice object @ %p \n", object); + TRACE("Created WineD3DDevice object @ %p\n", object); if (NULL == object) { return D3DERR_OUTOFVIDEOMEMORY; } @@ -1745,7 +1745,7 @@ HRESULT WINAPI IWineD3DImpl_CreateDevice(IWineD3D *iface, UINT Adapter, D3DDEV WARN("Failed to create stateblock\n"); goto create_device_error; } - TRACE("(%p) : Created stateblock (%p) \n", This, object->stateBlock); + TRACE("(%p) : Created stateblock (%p)\n", This, object->stateBlock); object->updateStateBlock = object->stateBlock; IWineD3DStateBlock_AddRef((IWineD3DStateBlock*)object->updateStateBlock); /* Setup surfaces for the backbuffer, frontbuffer and depthstencil buffer */ diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 88e527ce72f..64ddd899041 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -567,7 +567,7 @@ static void primitiveConvertToStridedData(IWineD3DDevice *iface, Direct3DVertexS if(thisFVF & D3DFVF_LASTBETA_UBYTE4) numBlends--; if ((thisFVF & D3DFVF_XYZB5 ) > D3DFVF_XYZRHW) { - TRACE("Setting blend Weights to %p \n", data); + TRACE("Setting blend Weights to %p\n", data); strided->u.s.blendWeights.lpData = data; strided->u.s.blendWeights.dwType = D3DDECLTYPE_FLOAT1 + numBlends - 1; strided->u.s.blendWeights.dwStride = stride; @@ -935,7 +935,7 @@ static void loadVertexData(IWineD3DDevice *iface, Direct3DVertexStridedData *sd) #if 0 /* TODO: Vertex blending */ glDisable(GL_VERTEX_BLEND_ARB); #endif - TRACE("ARB_VERTEX_BLEND \n"); + TRACE("ARB_VERTEX_BLEND\n"); } else if (GL_SUPPORT(EXT_VERTEX_WEIGHTING)) { TRACE(" EXT_VERTEX_WEIGHTING\n"); glDisableClientState(GL_VERTEX_WEIGHT_ARRAY_EXT); @@ -955,7 +955,7 @@ static void loadVertexData(IWineD3DDevice *iface, Direct3DVertexStridedData *sd) } else { /* don't bother falling back to 'slow' as we don't support software FOG yet. */ /* FIXME: fixme once */ - TRACE("Hardware support for FOG is not avaiable, FOG disabled. \n"); + TRACE("Hardware support for FOG is not avaiable, FOG disabled.\n"); } } else { if (GL_SUPPRT(EXT_FOR_COORD) { @@ -989,7 +989,7 @@ static void loadVertexData(IWineD3DDevice *iface, Direct3DVertexStridedData *sd) } else { /* don't bother falling back to 'slow' as we don't support software tangents and binormals yet . */ /* FIXME: fixme once */ - TRACE("Hardware support for tangents and binormals is not avaiable, tangents and binormals disabled. \n"); + TRACE("Hardware support for tangents and binormals is not avaiable, tangents and binormals disabled.\n"); } } else { if (GL_SUPPORT(EXT_COORDINATE_FRAME) { @@ -1968,7 +1968,7 @@ void drawPrimitive(IWineD3DDevice *iface, rc = initializeFVF(iface, &fvf); if (rc) return; } else { - TRACE("(%p) : using vertex declaration %p \n", iface, This->stateBlock->vertexDecl); + TRACE("(%p) : using vertex declaration %p\n", iface, This->stateBlock->vertexDecl); } /* Ok, we will be updating the screen from here onwards so grab the lock */ diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index be998f25039..6d83a88b5da 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -239,7 +239,7 @@ HRESULT WINAPI IWineD3DQueryImpl_GetData(IWineD3DQuery* iface, void* pData, DWOR /*dwGetDataFlags = 0 || D3DGETDATA_FLUSH D3DGETDATA_FLUSH may return D3DERR_DEVICELOST if the device is lost */ - FIXME("(%p) : stub \n", This); + FIXME("(%p) : stub\n", This); return S_OK; /* S_OK if the query data is available*/ } @@ -247,7 +247,7 @@ HRESULT WINAPI IWineD3DQueryImpl_GetData(IWineD3DQuery* iface, void* pData, DWOR DWORD WINAPI IWineD3DQueryImpl_GetDataSize(IWineD3DQuery* iface){ IWineD3DQueryImpl *This = (IWineD3DQueryImpl *)iface; int dataSize = 0; - FIXME("(%p) : stub \n", This); + FIXME("(%p) : stub\n", This); switch(This->type){ case WINED3DQUERYTYPE_VCACHE: dataSize = sizeof(WINED3DDEVINFO_VCACHE); @@ -312,7 +312,7 @@ WINED3DQUERYTYPE WINAPI IWineD3DQueryImpl_GetType(IWineD3DQuery* iface){ HRESULT WINAPI IWineD3DQueryImpl_Issue(IWineD3DQuery* iface, DWORD dwIssueFlags){ IWineD3DQueryImpl *This = (IWineD3DQueryImpl *)iface; - FIXME("(%p) : stub \n", This); + FIXME("(%p) : stub\n", This); return D3D_OK; /* can be D3DERR_INVALIDCALL. */ } diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 2c4bd18505d..380bacd148c 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -129,7 +129,7 @@ HRESULT WINAPI IWineD3DStateBlockImpl_Capture(IWineD3DStateBlock *iface){ IWineD3DStateBlockImpl *This = (IWineD3DStateBlockImpl *)iface; IWineD3DStateBlockImpl *targetStateBlock = This->wineD3DDevice->stateBlock; - TRACE("(%p) : Updating state block %p ------------------v \n", targetStateBlock, This); + TRACE("(%p) : Updating state block %p ------------------v\n", targetStateBlock, This); /* If not recorded, then update can just recapture */ if (/*TODO: 'magic' statetype, replace with BOOL This->blockType == D3DSBT_RECORDED */ 0) { @@ -570,7 +570,7 @@ HRESULT WINAPI IWineD3DStateBlockImpl_InitStartupStateBlock(IWineD3DStateBlock* /* Note this may have a large overhead but it should only be executed once, in order to initialize the complete state of the device and all opengl equivalents */ - TRACE("(%p) -----------------------> Setting up device defaults... %p \n", This, This->wineD3DDevice); + TRACE("(%p) -----------------------> Setting up device defaults... %p\n", This, This->wineD3DDevice); /* TODO: make a special stateblock type for the primary stateblock (it never gets applied so it doesn't need a real type) */ This->blockType = WINED3DSBT_INIT; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 406c03b3810..6e69bb21dfa 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -35,7 +35,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_QueryInterface(IWineD3DSurface *iface, REFIID { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; /* Warn ,but be nice about things */ - TRACE("(%p)->(%s,%p) \n", This,debugstr_guid(riid),ppobj); + TRACE("(%p)->(%s,%p)\n", This,debugstr_guid(riid),ppobj); if (riid == NULL) { ERR("Probably FIXME: Calling query interface with NULL riid\n"); } @@ -338,7 +338,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, D3DLOCKED_RE /* Make sure that the texture is loaded */ IWineD3DSurface_PreLoad(iface); /* Make sure there is a texture to bind! */ - TRACE("(%p) glGetTexImage level(%d), fmt(%d), typ(%d), mem(%p) \n" , This, This->glDescription.level, This->glDescription.glFormat, This->glDescription.glType, This->resource.allocatedMemory); + TRACE("(%p) glGetTexImage level(%d), fmt(%d), typ(%d), mem(%p)\n" , This, This->glDescription.level, This->glDescription.glFormat, This->glDescription.glType, This->resource.allocatedMemory); if (This->resource.format == WINED3DFMT_DXT1 || This->resource.format == WINED3DFMT_DXT2 || diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index adbbc758b66..541cd5ab29a 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -65,7 +65,7 @@ ULONG WINAPI IWineD3DSwapChainImpl_AddRef(IWineD3DSwapChain *iface) { HRESULT WINAPI IWineD3DSwapChainImpl_QueryInterface(IWineD3DSwapChain *iface, REFIID riid, LPVOID *ppobj) { IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface; - TRACE("(%p)->(%s,%p) \n",This,debugstr_guid(riid),ppobj); + TRACE("(%p)->(%s,%p)\n", This, debugstr_guid(riid), ppobj); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IWineD3DSwapChain)){ IWineD3DSwapChainImpl_AddRef(iface); @@ -163,7 +163,7 @@ HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CONST REC This->win_handle = hDestWindowOverride; This->win = (Window)GetPropA( hDestWindowOverride, "__wine_x11_whole_window" ); - TRACE("Creating a new context for the window %p \n", hDestWindowOverride); + TRACE("Creating a new context for the window %p\n", hDestWindowOverride); ENTER_GL(); TRACE("Desctroying context %p %p\n", This->display, This->render_ctx); @@ -330,7 +330,7 @@ HRESULT WINAPI IWineD3DSwapChainImpl_GetFrontBufferData(IWineD3DSwapChain *iface WINED3DSURFACE_DESC desc; glDescriptor *glDescription; - TRACE("(%p) : iface(%p) pDestSurface(%p) \n", This, iface, pDestSurface); + TRACE("(%p) : iface(%p) pDestSurface(%p)\n", This, iface, pDestSurface); ENTER_GL(); memset(&desc, 0, sizeof(desc)); desc.Width = &width; @@ -437,7 +437,7 @@ HRESULT WINAPI IWineD3DSwapChainImpl_SetGammaRamp(IWineD3DSwapChain *iface, DWOR IWineD3DSwapChainImpl *This = (IWineD3DSwapChainImpl *)iface; HDC hDC; - TRACE("(%p) : pRamp@%p flags(%ld) \n", This, pRamp, Flags); + TRACE("(%p) : pRamp@%p flags(%ld)\n", This, pRamp, Flags); hDC = GetDC(This->win_handle); SetDeviceGammaRamp(hDC, (LPVOID)pRamp); ReleaseDC(This->win_handle, hDC); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index a88d15c9f33..1bb2257aa1b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -70,7 +70,7 @@ ULONG WINAPI IWineD3DTextureImpl_Release(IWineD3DTexture *iface) { IUnknown_Release(surfaceParent); } } - TRACE("(%p) : cleaning up base texture \n", This); + TRACE("(%p) : cleaning up base texture\n", This); IWineD3DBaseTextureImpl_CleanUp((IWineD3DBaseTexture *)iface); /* free the object */ HeapFree(GetProcessHeap(), 0, This); @@ -183,19 +183,19 @@ BOOL WINAPI IWineD3DTextureImpl_GetDirty(IWineD3DTexture *iface) { HRESULT WINAPI IWineD3DTextureImpl_BindTexture(IWineD3DTexture *iface) { IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; - TRACE("(%p) : relay to BaseTexture \n", This); + TRACE("(%p) : relay to BaseTexture\n", This); return IWineD3DBaseTextureImpl_BindTexture((IWineD3DBaseTexture *)iface); } HRESULT WINAPI IWineD3DTextureImpl_UnBindTexture(IWineD3DTexture *iface) { IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; - TRACE("(%p) : relay to BaseTexture \n", This); + TRACE("(%p) : relay to BaseTexture\n", This); return IWineD3DBaseTextureImpl_UnBindTexture((IWineD3DBaseTexture *)iface); } UINT WINAPI IWineD3DTextureImpl_GetTextureDimensions(IWineD3DTexture *iface) { IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; - TRACE("(%p) \n", This); + TRACE("(%p)\n", This); return GL_TEXTURE_2D; } diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index e08127a3241..f8d4567328a 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -166,19 +166,19 @@ BOOL WINAPI IWineD3DVolumeTextureImpl_GetDirty(IWineD3DVolumeTexture *iface) { HRESULT WINAPI IWineD3DVolumeTextureImpl_BindTexture(IWineD3DVolumeTexture *iface) { IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface; - TRACE("(%p) : relay to BaseTexture \n", This); + TRACE("(%p) : relay to BaseTexture\n", This); return IWineD3DBaseTextureImpl_BindTexture((IWineD3DBaseTexture *)iface); } HRESULT WINAPI IWineD3DVolumeTextureImpl_UnBindTexture(IWineD3DVolumeTexture *iface) { IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface; - TRACE("(%p) : relay to BaseTexture \n", This); + TRACE("(%p) : relay to BaseTexture\n", This); return IWineD3DBaseTextureImpl_UnBindTexture((IWineD3DBaseTexture *)iface); } UINT WINAPI IWineD3DVolumeTextureImpl_GetTextureDimensions(IWineD3DVolumeTexture *iface) { IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface; - TRACE("(%p) \n", This); + TRACE("(%p)\n", This); return GL_TEXTURE_3D; } diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index e437aa2d15b..339b871086f 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -121,7 +121,7 @@ BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) if ((p = strrchr( appname, '/' ))) appname = p + 1; if ((p = strrchr( appname, '\\' ))) appname = p + 1; strcat( appname, "\\Direct3D" ); - TRACE("appname = [%s] \n", appname); + TRACE("appname = [%s]\n", appname); if (RegOpenKeyA( tmpkey, appname, &appkey )) appkey = 0; RegCloseKey( tmpkey ); } diff --git a/dlls/winedos/int10.c b/dlls/winedos/int10.c index 70a110c21ed..a3a4cd5cf83 100644 --- a/dlls/winedos/int10.c +++ b/dlls/winedos/int10.c @@ -1258,11 +1258,11 @@ void WINAPI DOSVM_Int10Handler( CONTEXT86 *context ) SET_BH( context, VGA_GetColor16((int)BL_reg(context)) ); break; case 0x08: /* READ OVERSCAN (BORDER COLOR) REGISTER - A.C. */ - TRACE("Read Overscan (Border Color) Register \n"); + TRACE("Read Overscan (Border Color) Register\n"); SET_BH( context, VGA_GetColor16(16) ); break; case 0x09: /* READ ALL PALETTE REGISTERS AND OVERSCAN REGISTER - A.C.*/ - TRACE("Read All Palette Registers and Overscan Register \n"); + TRACE("Read All Palette Registers and Overscan Register\n"); /* ES:DX points to a 17 byte table where the results */ /* of this call should be stored. */ VGA_Get16Palette(CTX_SEG_OFF_TO_LIN(context, context->SegEs, context->Edx)); diff --git a/dlls/winedos/int15.c b/dlls/winedos/int15.c index 41af8660303..e25508cb7c2 100644 --- a/dlls/winedos/int15.c +++ b/dlls/winedos/int15.c @@ -76,7 +76,7 @@ void WINAPI DOSVM_Int15Handler( CONTEXT86 *context ) break; case 0x86: /* wait*/ FIXME("INT15: Wait not correctly handled yet\n"); - if ( AL_reg( context ) != 0x00 ) ERR("Invalid Input to Int15 function 0x86h AL != 0x00 \n"); + if ( AL_reg( context ) != 0x00 ) ERR("Invalid Input to Int15 function 0x86h AL != 0x00\n"); break; case 0x87: /* move memory regions*/ FIXME("INT15: Move memory regions not implemented\n"); diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c index af4605f888c..9dbdb51c276 100644 --- a/dlls/wininet/ftp.c +++ b/dlls/wininet/ftp.c @@ -1948,7 +1948,7 @@ INT FTP_ReceiveResponse(LPWININETFTPSESSIONW lpwfs, DWORD dwContext) BOOL multiline = FALSE; LPWININETAPPINFOW hIC = NULL; - TRACE("socket(%d) \n", lpwfs->sndSocket); + TRACE("socket(%d)\n", lpwfs->sndSocket); hIC = (LPWININETAPPINFOW) lpwfs->hdr.lpwhparent; SendAsyncCallback(&lpwfs->hdr, dwContext, INTERNET_STATUS_RECEIVING_RESPONSE, NULL, 0); diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 3066bd19780..c11b38374d8 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -671,7 +671,7 @@ HINTERNET WINAPI HTTP_HttpOpenRequestW(LPWININETHTTPSESSIONW lpwhs, DWORD len; INTERNET_ASYNC_RESULT iar; - TRACE("--> \n"); + TRACE("-->\n"); assert( lpwhs->hdr.htype == WH_HHTTPSESSION ); hIC = (LPWININETAPPINFOW) lpwhs->hdr.lpwhparent; diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c index 32baf5e5c6e..f6ab6fe524c 100644 --- a/dlls/wininet/internet.c +++ b/dlls/wininet/internet.c @@ -2075,7 +2075,7 @@ static BOOL INET_QueryOptionHelper(BOOL bIsUnicode, HINTERNET hInternet, DWORD d break; default: - FIXME("Stub! %ld \n",dwOption); + FIXME("Stub! %ld\n", dwOption); break; } if (lpwhh) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 1ca44ccc78d..e73b5dee307 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -886,7 +886,7 @@ static DWORD MCI_LoadMciDriver(LPCWSTR _strDevTyp, LPWINE_MCIDRIVER* lpwmd) LeaveCriticalSection(&WINMM_IData.cs); - TRACE("wDevID=%04X \n", modp.wDeviceID); + TRACE("wDevID=%04X\n", modp.wDeviceID); modp.lpstrParams = NULL; @@ -1866,7 +1866,7 @@ static DWORD MCI_SysInfo(UINT uDevID, DWORD dwFlags, LPMCI_SYSINFO_PARMSW lpParm ret = MCI_INTEGER_RETURNED; break; case MCI_SYSINFO_INSTALLNAME: - TRACE("MCI_SYSINFO_INSTALLNAME \n"); + TRACE("MCI_SYSINFO_INSTALLNAME\n"); if ((wmd = MCI_GetDriver(uDevID))) { ret = MCI_WriteString(lpParms->lpstrReturn, lpParms->dwRetSize, wmd->lpstrDeviceType); diff --git a/dlls/winmm/mciwave/mciwave.c b/dlls/winmm/mciwave/mciwave.c index 2caa0b68e14..e63fb9c731f 100644 --- a/dlls/winmm/mciwave/mciwave.c +++ b/dlls/winmm/mciwave/mciwave.c @@ -87,7 +87,7 @@ static DWORD CALLBACK MCI_SCAStarter(LPVOID arg) sca->wDevID, sca->wMsg, sca->dwParam1, sca->dwParam2); HeapFree(GetProcessHeap(), 0, sca); ExitThread(ret); - WARN("Should not happen ? what's wrong \n"); + WARN("Should not happen ? what's wrong\n"); /* should not go after this point */ return ret; } @@ -252,7 +252,7 @@ static DWORD WAVE_mciReadFmt(WINE_MCIWAVE* wmw, MMCKINFO* pckMainRIFF) mmckInfo.ckid = mmioFOURCC('f', 'm', 't', ' '); if (mmioDescend(wmw->hFile, &mmckInfo, pckMainRIFF, MMIO_FINDCHUNK) != 0) return MCIERR_INVALID_FILE; - TRACE("Chunk Found ckid=%.4s fccType=%.4s cksize=%08lX \n", + TRACE("Chunk Found ckid=%.4s fccType=%.4s cksize=%08lX\n", (LPSTR)&mmckInfo.ckid, (LPSTR)&mmckInfo.fccType, mmckInfo.cksize); wmw->lpWaveFormat = HeapAlloc(GetProcessHeap(), 0, mmckInfo.cksize); @@ -262,10 +262,10 @@ static DWORD WAVE_mciReadFmt(WINE_MCIWAVE* wmw, MMCKINFO* pckMainRIFF) return MCIERR_INVALID_FILE; TRACE("wFormatTag=%04X !\n", wmw->lpWaveFormat->wFormatTag); - TRACE("nChannels=%d \n", wmw->lpWaveFormat->nChannels); + TRACE("nChannels=%d\n", wmw->lpWaveFormat->nChannels); TRACE("nSamplesPerSec=%ld\n", wmw->lpWaveFormat->nSamplesPerSec); TRACE("nAvgBytesPerSec=%ld\n", wmw->lpWaveFormat->nAvgBytesPerSec); - TRACE("nBlockAlign=%d \n", wmw->lpWaveFormat->nBlockAlign); + TRACE("nBlockAlign=%d\n", wmw->lpWaveFormat->nBlockAlign); TRACE("wBitsPerSample=%u !\n", wmw->lpWaveFormat->wBitsPerSample); if (r >= (long)sizeof(WAVEFORMATEX)) TRACE("cbSize=%u !\n", wmw->lpWaveFormat->cbSize); @@ -276,7 +276,7 @@ static DWORD WAVE_mciReadFmt(WINE_MCIWAVE* wmw, MMCKINFO* pckMainRIFF) TRACE("can't find data chunk\n"); return MCIERR_INVALID_FILE; } - TRACE("Chunk Found ckid=%.4s fccType=%.4s cksize=%08lX \n", + TRACE("Chunk Found ckid=%.4s fccType=%.4s cksize=%08lX\n", (LPSTR)&wmw->ckWaveData.ckid, (LPSTR)&wmw->ckWaveData.fccType, wmw->ckWaveData.cksize); TRACE("nChannels=%d nSamplesPerSec=%ld\n", wmw->lpWaveFormat->nChannels, wmw->lpWaveFormat->nSamplesPerSec); @@ -406,7 +406,7 @@ static DWORD WAVE_mciOpen(UINT wDevID, DWORD dwFlags, LPMCI_WAVE_OPEN_PARMSW lpO if (mmioDescend(wmw->hFile, lpckMainRIFF, NULL, 0) != 0) { dwRet = MCIERR_INVALID_FILE; } else { - TRACE("ParentChunk ckid=%.4s fccType=%.4s cksize=%08lX \n", + TRACE("ParentChunk ckid=%.4s fccType=%.4s cksize=%08lX\n", (LPSTR)&(lpckMainRIFF->ckid), (LPSTR) &(lpckMainRIFF->fccType), (lpckMainRIFF->cksize)); diff --git a/dlls/winmm/mmsystem.c b/dlls/winmm/mmsystem.c index dc0fc1853b6..54055698d15 100644 --- a/dlls/winmm/mmsystem.c +++ b/dlls/winmm/mmsystem.c @@ -114,7 +114,7 @@ BOOL WINAPI MMSYSTEM_LibMain(DWORD fdwReason, HINSTANCE hinstDLL, WORD ds, int WINAPI MMSYSTEM_WEP(HINSTANCE16 hInstance, WORD wDataSeg, WORD cbHeapSize, LPSTR lpCmdLine) { - TRACE("STUB: Unloading MMSystem DLL ... hInst=%04X \n", hInstance); + TRACE("STUB: Unloading MMSystem DLL ... hInst=%04X\n", hInstance); return TRUE; } diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c index 8cca18b2267..156eaae1b09 100644 --- a/dlls/winmm/playsound.c +++ b/dlls/winmm/playsound.c @@ -317,7 +317,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) if (mmioDescend(hmmio, &ckMainRIFF, NULL, 0)) goto errCleanUp; - TRACE("ParentChunk ckid=%.4s fccType=%.4s cksize=%08lX \n", + TRACE("ParentChunk ckid=%.4s fccType=%.4s cksize=%08lX\n", (LPSTR)&ckMainRIFF.ckid, (LPSTR)&ckMainRIFF.fccType, ckMainRIFF.cksize); if ((ckMainRIFF.ckid != FOURCC_RIFF) || @@ -328,7 +328,7 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) if (mmioDescend(hmmio, &mmckInfo, &ckMainRIFF, MMIO_FINDCHUNK)) goto errCleanUp; - TRACE("Chunk Found ckid=%.4s fccType=%08lx cksize=%08lX \n", + TRACE("Chunk Found ckid=%.4s fccType=%08lx cksize=%08lX\n", (LPSTR)&mmckInfo.ckid, mmckInfo.fccType, mmckInfo.cksize); lpWaveFormat = HeapAlloc(GetProcessHeap(), 0, mmckInfo.cksize); @@ -336,10 +336,10 @@ static DWORD WINAPI proc_PlaySound(LPVOID arg) goto errCleanUp; TRACE("wFormatTag=%04X !\n", lpWaveFormat->wFormatTag); - TRACE("nChannels=%d \n", lpWaveFormat->nChannels); + TRACE("nChannels=%d\n", lpWaveFormat->nChannels); TRACE("nSamplesPerSec=%ld\n", lpWaveFormat->nSamplesPerSec); TRACE("nAvgBytesPerSec=%ld\n", lpWaveFormat->nAvgBytesPerSec); - TRACE("nBlockAlign=%d \n", lpWaveFormat->nBlockAlign); + TRACE("nBlockAlign=%d\n", lpWaveFormat->nBlockAlign); TRACE("wBitsPerSample=%u !\n", lpWaveFormat->wBitsPerSample); /* move to end of 'fmt ' chunk */ diff --git a/dlls/winmm/tests/mixer.c b/dlls/winmm/tests/mixer.c index 70902130f57..31afdb98ac3 100644 --- a/dlls/winmm/tests/mixer.c +++ b/dlls/winmm/tests/mixer.c @@ -431,7 +431,7 @@ static void mixer_test_deviceA(int device) d,mixerlineA.szShortName, mixerlineA.szName, mixerlineA.dwDestination,mixerlineA.dwSource); trace(" LineID=%08lx Channels=%ld " - "Connections=%ld Controls=%ld \n", + "Connections=%ld Controls=%ld\n", mixerlineA.dwLineID,mixerlineA.cChannels, mixerlineA.cConnections,mixerlineA.cControls); trace(" State=0x%08lx(%s)\n", @@ -468,7 +468,7 @@ static void mixer_test_deviceA(int device) s,mixerlineA.szShortName, mixerlineA.szName, mixerlineA.dwDestination,mixerlineA.dwSource); trace(" LineID=%08lx Channels=%ld " - "Connections=%ld Controls=%ld \n", + "Connections=%ld Controls=%ld\n", mixerlineA.dwLineID,mixerlineA.cChannels, mixerlineA.cConnections,mixerlineA.cControls); trace(" State=0x%08lx(%s)\n", @@ -821,7 +821,7 @@ static void mixer_test_deviceW(int device) d,szShortName,szName, mixerlineW.dwDestination,mixerlineW.dwSource); trace(" LineID=%08lx Channels=%ld " - "Connections=%ld Controls=%ld \n", + "Connections=%ld Controls=%ld\n", mixerlineW.dwLineID,mixerlineW.cChannels, mixerlineW.cConnections,mixerlineW.cControls); trace(" State=0x%08lx(%s)\n", @@ -866,7 +866,7 @@ static void mixer_test_deviceW(int device) s,szShortName,szName, mixerlineW.dwDestination,mixerlineW.dwSource); trace(" LineID=%08lx Channels=%ld " - "Connections=%ld Controls=%ld \n", + "Connections=%ld Controls=%ld\n", mixerlineW.dwLineID,mixerlineW.cChannels, mixerlineW.cConnections,mixerlineW.cControls); trace(" State=0x%08lx(%s)\n", diff --git a/dlls/winmm/winealsa/audio.c b/dlls/winmm/winealsa/audio.c index 73ff614957a..a8d35b09ee0 100644 --- a/dlls/winmm/winealsa/audio.c +++ b/dlls/winmm/winealsa/audio.c @@ -744,7 +744,7 @@ static void ALSA_TraceParameters(snd_pcm_hw_params_t * hw_params, snd_pcm_sw_par #define X(x) ((x)? "true" : "false") if (full) TRACE("FLAGS: sampleres=%s overrng=%s pause=%s resume=%s syncstart=%s batch=%s block=%s double=%s " - "halfd=%s joint=%s \n", + "halfd=%s joint=%s\n", X(snd_pcm_hw_params_can_mmap_sample_resolution(hw_params)), X(snd_pcm_hw_params_can_overrange(hw_params)), X(snd_pcm_hw_params_can_pause(hw_params)), diff --git a/dlls/winmm/winearts/audio.c b/dlls/winmm/winearts/audio.c index 486642f7995..ea5c5caf84a 100644 --- a/dlls/winmm/winearts/audio.c +++ b/dlls/winmm/winearts/audio.c @@ -1536,7 +1536,7 @@ DWORD WINAPI ARTS_wodMessage(UINT wDevID, UINT wMsg, DWORD dwUser, */ static DWORD widGetNumDevs(void) { - TRACE("%d \n",MAX_WAVEINDRV); + TRACE("%d\n", MAX_WAVEINDRV); return MAX_WAVEINDRV; } diff --git a/dlls/winmm/wineesd/audio.c b/dlls/winmm/wineesd/audio.c index 62f6fd5e680..c607dac2f90 100644 --- a/dlls/winmm/wineesd/audio.c +++ b/dlls/winmm/wineesd/audio.c @@ -1544,7 +1544,7 @@ DWORD WINAPI ESD_wodMessage(UINT wDevID, UINT wMsg, DWORD dwUser, */ static DWORD widGetNumDevs(void) { - TRACE("%d \n",MAX_WAVEINDRV); + TRACE("%d\n", MAX_WAVEINDRV); return MAX_WAVEINDRV; } diff --git a/dlls/winsock/socket16.c b/dlls/winsock/socket16.c index ead264516e8..d3a61f310ba 100644 --- a/dlls/winsock/socket16.c +++ b/dlls/winsock/socket16.c @@ -599,6 +599,6 @@ INT16 WINAPI __WSAFDIsSet16(SOCKET16 s, ws_fd_set16 *set) */ INT16 WINAPI WSARecvEx16(SOCKET16 s, char *buf, INT16 len, INT16 *flags) { - FIXME("(WSARecvEx16) partial packet return value not set \n"); + FIXME("(WSARecvEx16) partial packet return value not set\n"); return recv16(s, buf, len, *flags); } diff --git a/dlls/winsock/tests/sock.c b/dlls/winsock/tests/sock.c index 57ced75bad1..28cc420f9a0 100644 --- a/dlls/winsock/tests/sock.c +++ b/dlls/winsock/tests/sock.c @@ -819,7 +819,7 @@ static void test_set_getsockopt(void) ok( !lingval.l_onoff == !linger_testvals[i].l_onoff && (lingval.l_linger == linger_testvals[i].l_linger || (!lingval.l_linger && !linger_testvals[i].l_onoff)) - , "getsockopt(SO_LINGER #%d) returned wrong value %d,%d not %d,%d \n", i, + , "getsockopt(SO_LINGER #%d) returned wrong value %d,%d not %d,%d\n", i, lingval.l_onoff, lingval.l_linger, linger_testvals[i].l_onoff, linger_testvals[i].l_linger); } @@ -1322,9 +1322,9 @@ START_TEST( sock ) for (i = 0; i < NUM_TESTS; i++) { - trace ( " **** STARTING TEST %d **** \n", i ); + trace ( " **** STARTING TEST %d ****\n", i ); do_test ( &tests[i] ); - trace ( " **** TEST %d COMPLETE **** \n", i ); + trace ( " **** TEST %d COMPLETE ****\n", i ); } test_UDP(); diff --git a/dlls/wintab32/context.c b/dlls/wintab32/context.c index b7d7ae264cd..897082c5829 100644 --- a/dlls/wintab32/context.c +++ b/dlls/wintab32/context.c @@ -852,7 +852,7 @@ int WINAPI WTDataPeek(HCTX hCtx, UINT wBegin, UINT wEnd, if (bgn == context->PacketsQueued || end == context->PacketsQueued) { - TRACE("%i %i %i \n", bgn, end, context->PacketsQueued); + TRACE("%i %i %i\n", bgn, end, context->PacketsQueued); LeaveCriticalSection(&csTablet); return 0; } diff --git a/dlls/wsock32/socket.c b/dlls/wsock32/socket.c index 35ea897a9ee..d09ccc3f68c 100644 --- a/dlls/wsock32/socket.c +++ b/dlls/wsock32/socket.c @@ -606,7 +606,7 @@ DWORD WINAPI WsControl(DWORD protocol, char type= *(unsigned char*)(inbuf+15); /* 0x2: don't fragment*/ #endif - FIXME("(ICMP_ECHO) to 0x%08x stub \n", addr); + FIXME("(ICMP_ECHO) to 0x%08x stub\n", addr); break; } @@ -635,7 +635,7 @@ DWORD WINAPI WsControl(DWORD protocol, */ INT WINAPI WSARecvEx(SOCKET s, char *buf, INT len, INT *flags) { - FIXME("(WSARecvEx) partial packet return value not set \n"); + FIXME("(WSARecvEx) partial packet return value not set\n"); return recv(s, buf, len, *flags); } diff --git a/dlls/x11drv/event.c b/dlls/x11drv/event.c index 8d01d0639f1..e47523d1142 100644 --- a/dlls/x11drv/event.c +++ b/dlls/x11drv/event.c @@ -570,7 +570,7 @@ static void EVENT_PropertyNotify( HWND hwnd, XEvent *xev ) { XPropertyEvent *event = &xev->xproperty; /* Check if we have any resources to free */ - TRACE("Received PropertyNotify event: \n"); + TRACE("Received PropertyNotify event:\n"); switch(event->state) { @@ -849,7 +849,7 @@ static void EVENT_DropURLs( HWND hWnd, XClientMessageEvent *event ) TRACE("drop file %s as %s\n", p+5, p_drop); p_drop += len+1; } else { - WARN("can't convert file %s to dos name \n", p+5); + WARN("can't convert file %s to dos name\n", p+5); } } else { WARN("unknown mime type %s\n", p); diff --git a/dlls/x11drv/keyboard.c b/dlls/x11drv/keyboard.c index 0f4e38e4c6c..3c8e59174fc 100644 --- a/dlls/x11drv/keyboard.c +++ b/dlls/x11drv/keyboard.c @@ -2047,7 +2047,7 @@ UINT X11DRV_MapVirtualKeyEx(UINT wCode, UINT wMapType, HKL hkl) if (!e.keycode) { - WARN("Unknown virtual key %X !!! \n", wCode); + WARN("Unknown virtual key %X !!!\n", wCode); wine_tsx11_unlock(); return 0; /* whatever */ } @@ -2359,7 +2359,7 @@ INT X11DRV_ToUnicodeEx(UINT virtKey, UINT scanCode, LPBYTE lpKeyState, if (!e.keycode && virtKey != VK_NONAME) { - WARN("Unknown virtual key %X !!! \n",virtKey); + WARN("Unknown virtual key %X !!!\n", virtKey); wine_tsx11_unlock(); return virtKey; /* whatever */ } diff --git a/dlls/x11drv/palette.c b/dlls/x11drv/palette.c index 8aed3c6f27f..56ae55dc314 100644 --- a/dlls/x11drv/palette.c +++ b/dlls/x11drv/palette.c @@ -464,7 +464,7 @@ static BOOL X11DRV_PALETTE_BuildSharedMap( const PALETTEENTRY *sys_pal_template { int c_min = 0, c_max = palette_size, c_val; - TRACE("Dynamic colormap... \n"); + TRACE("Dynamic colormap...\n"); /* let's become the first client that actually follows * X guidelines and does binary search... diff --git a/dlls/x11drv/xfont.c b/dlls/x11drv/xfont.c index 1a8ea56fc3a..e572443748d 100644 --- a/dlls/x11drv/xfont.c +++ b/dlls/x11drv/xfont.c @@ -789,7 +789,7 @@ static int LFD_InitFontInfo( fontInfo* fi, const LFD* lfd, LPCSTR fullname ) } else { - FIXME("font '%s' has unknown registry '%s' and character encoding '%s' \n", + FIXME("font '%s' has unknown registry '%s' and character encoding '%s'\n", fullname, lfd->charset_registry, lfd->charset_encoding); j = 255; } @@ -3062,7 +3062,7 @@ static X_PHYSFONT XFONT_RealizeFont( const LPLOGFONT16 plf, if(abs(plf->lfHeight) > MAX_FONT_SIZE) { ERR( - "plf->lfHeight = %d, Creating a 100 pixel font and rescaling metrics \n", + "plf->lfHeight = %d, Creating a 100 pixel font and rescaling metrics\n", plf->lfHeight); pfo->rescale = fabs(plf->lfHeight / 100.0); if(plf->lfHeight > 0) plf->lfHeight = 100; diff --git a/dlls/x11drv/xrandr.c b/dlls/x11drv/xrandr.c index b6e5805d074..96b5a7ac92b 100644 --- a/dlls/x11drv/xrandr.c +++ b/dlls/x11drv/xrandr.c @@ -296,7 +296,7 @@ void X11DRV_XRandR_Init(void) nmodes++; TRACE(" "); } - TRACE(" Hz \n"); + TRACE(" Hz\n"); } } wine_tsx11_unlock(); diff --git a/programs/winevdm/winevdm.c b/programs/winevdm/winevdm.c index c31d72e1ab4..ff41cda7cd7 100644 --- a/programs/winevdm/winevdm.c +++ b/programs/winevdm/winevdm.c @@ -161,7 +161,7 @@ static BOOL read_pif_file( HANDLE hFile, char *progname, char *title, pif386rec.memmin, pif386rec.memmax, pif386rec.emsmin, pif386rec.emsmax, pif386rec.xmsmin, pif386rec.xmsmax); - WINE_TRACE("386rec: option 0x%x memory 0x%x video 0x%x \n", + WINE_TRACE("386rec: option 0x%x memory 0x%x video 0x%x\n", pif386rec.optflags, pif386rec.memflags, pif386rec.videoflags); WINE_TRACE("386rec: optional parameters %s\n",