Remove spaces before '\n' in traces (#1)

Francois Gouget fgouget at free.fr
Wed Nov 9 11:57:03 CST 2005


Spaces printed before a '\n' are not going to be visible anyway 
(unless they cause a line wrap) so we might as well not print them in 
the first place.


Changelog:

  * dlls/advapi32/security.c
    dlls/comctl32/comboex.c
    dlls/comctl32/listview.c
    dlls/comctl32/treeview.c
    dlls/commdlg/filetitle.c
    dlls/gdi/bitmap.c
    dlls/gdi/mfdrv/bitblt.c
    dlls/kernel/comm.c
    dlls/mcicda/mcicda.c
    dlls/mciseq/mcimidi.c
    dlls/msi/action.c
    dlls/msi/custom.c
    dlls/msi/files.c
    dlls/msi/format.c
    dlls/msi/package.c
    dlls/msi/table.c
    dlls/msvcrt/tests/cpp.c
    dlls/ntdll/misc.c
    dlls/odbc32/proxyodbc.c
    dlls/ole32/antimoniker.c
    dlls/ole32/bindctx.c
    dlls/ole32/ole2.c
    dlls/oleaut32/typelib.c
    dlls/oleaut32/varformat.c
    dlls/olepro32/olepro32stubs.c
    dlls/opengl32/wgl.c
    dlls/opengl32/wgl_ext.c

    Francois Gouget <fgouget at free.fr>
    Remove spaces before '\n' in traces

-- 
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
      You can have my guns when you pry them from my kids cold, dead hands.
-------------- next part --------------
Index: dlls/advapi32/security.c
===================================================================
RCS file: /var/cvs/wine/dlls/advapi32/security.c,v
retrieving revision 1.115
diff -u -p -r1.115 security.c
--- dlls/advapi32/security.c	4 Nov 2005 11:43:27 -0000	1.115
+++ dlls/advapi32/security.c	9 Nov 2005 15:59:13 -0000
@@ -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" :
Index: dlls/comctl32/comboex.c
===================================================================
RCS file: /var/cvs/wine/dlls/comctl32/comboex.c,v
retrieving revision 1.85
diff -u -p -r1.85 comboex.c
--- dlls/comctl32/comboex.c	21 Sep 2005 09:45:09 -0000	1.85
+++ dlls/comctl32/comboex.c	9 Nov 2005 16:03:14 -0000
@@ -1395,7 +1395,7 @@ static LRESULT COMBOEX_DrawItem (COMBOEX
     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;
 	}
     }
Index: dlls/comctl32/listview.c
===================================================================
RCS file: /var/cvs/wine/dlls/comctl32/listview.c,v
retrieving revision 1.435
diff -u -p -r1.435 listview.c
--- dlls/comctl32/listview.c	5 Nov 2005 10:42:35 -0000	1.435
+++ dlls/comctl32/listview.c	9 Nov 2005 16:03:24 -0000
@@ -4190,7 +4190,7 @@ static HIMAGELIST LISTVIEW_CreateDragIma
     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;
Index: dlls/comctl32/treeview.c
===================================================================
RCS file: /var/cvs/wine/dlls/comctl32/treeview.c,v
retrieving revision 1.177
diff -u -p -r1.177 treeview.c
--- dlls/comctl32/treeview.c	8 Nov 2005 13:11:48 -0000	1.177
+++ dlls/comctl32/treeview.c	9 Nov 2005 16:21:09 -0000
@@ -1805,7 +1805,7 @@ TREEVIEW_SetItemHeight(TREEVIEW_INFO *in
 {
     INT prevHeight = infoPtr->uItemHeight;
 
-    TRACE("%d \n", newHeight);
+    TRACE("%d\n", newHeight);
     if (newHeight == -1)
     {
 	infoPtr->uItemHeight = TREEVIEW_NaturalHeight(infoPtr);
Index: dlls/commdlg/filetitle.c
===================================================================
RCS file: /var/cvs/wine/dlls/commdlg/filetitle.c,v
retrieving revision 1.17
diff -u -p -r1.17 filetitle.c
--- dlls/commdlg/filetitle.c	28 Jun 2005 19:19:07 -0000	1.17
+++ dlls/commdlg/filetitle.c	9 Nov 2005 16:21:09 -0000
@@ -65,7 +65,7 @@ short WINAPI GetFileTitleW(LPCWSTR lpFil
 {
 	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 lpFil
 	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)
Index: dlls/gdi/bitmap.c
===================================================================
RCS file: /var/cvs/wine/dlls/gdi/bitmap.c,v
retrieving revision 1.7
diff -u -p -r1.7 bitmap.c
--- dlls/gdi/bitmap.c	13 Apr 2005 16:11:18 -0000	1.7
+++ dlls/gdi/bitmap.c	9 Nov 2005 16:21:16 -0000
@@ -132,7 +132,7 @@ HBITMAP WINAPI CreateCompatibleBitmap( H
     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))
     {
Index: dlls/gdi/mfdrv/bitblt.c
===================================================================
RCS file: /var/cvs/wine/dlls/gdi/mfdrv/bitblt.c,v
retrieving revision 1.8
diff -u -p -r1.8 bitblt.c
--- dlls/gdi/mfdrv/bitblt.c	24 Mar 2005 21:01:38 -0000	1.8
+++ dlls/gdi/mfdrv/bitblt.c	9 Nov 2005 16:36:37 -0000
@@ -115,7 +115,7 @@ BOOL MFDRV_StretchBlt( PHYSDEV devDst, I
     *(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
     {
Index: dlls/kernel/comm.c
===================================================================
RCS file: /var/cvs/wine/dlls/kernel/comm.c,v
retrieving revision 1.99
diff -u -p -r1.99 comm.c
--- dlls/kernel/comm.c	8 Nov 2005 11:01:03 -0000	1.99
+++ dlls/kernel/comm.c	9 Nov 2005 16:37:05 -0000
@@ -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
     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;
Index: dlls/mcicda/mcicda.c
===================================================================
RCS file: /var/cvs/wine/dlls/mcicda/mcicda.c,v
retrieving revision 1.1
diff -u -p -r1.1 mcicda.c
--- dlls/mcicda/mcicda.c	27 Jul 2005 15:42:40 -0000	1.1
+++ dlls/mcicda/mcicda.c	9 Nov 2005 16:01:35 -0000
@@ -739,7 +739,7 @@ static DWORD MCICDA_Play(UINT wDevID, DW
 	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, DW
     }
     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)) {
Index: dlls/mciseq/mcimidi.c
===================================================================
RCS file: /var/cvs/wine/dlls/mciseq/mcimidi.c,v
retrieving revision 1.2
diff -u -p -r1.2 mcimidi.c
--- dlls/mciseq/mcimidi.c	18 Aug 2005 10:53:58 -0000	1.2
+++ dlls/mciseq/mcimidi.c	9 Nov 2005 16:01:20 -0000
@@ -114,7 +114,7 @@ static DWORD CALLBACK	MCI_SCAStarter(LPV
 	  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_MCI
 	} 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_
     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_MCIMI
     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_MCIMI
     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, D
 	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,
     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,
     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,
 	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;
Index: dlls/msi/action.c
===================================================================
RCS file: /var/cvs/wine/dlls/msi/action.c,v
retrieving revision 1.230
diff -u -p -r1.230 action.c
--- dlls/msi/action.c	3 Nov 2005 11:35:11 -0000	1.230
+++ dlls/msi/action.c	9 Nov 2005 16:21:21 -0000
@@ -875,7 +875,7 @@ static UINT ACTION_ProcessUISequence(MSI
     
     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(MSIREC
     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(MSIPACKA
             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(MSIPAC
         }
         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(MSIPA
         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 );
 
Index: dlls/msi/custom.c
===================================================================
RCS file: /var/cvs/wine/dlls/msi/custom.c,v
retrieving revision 1.30
diff -u -p -r1.30 custom.c
--- dlls/msi/custom.c	27 Oct 2005 12:39:28 -0000	1.30
+++ dlls/msi/custom.c	9 Nov 2005 16:21:22 -0000
@@ -413,7 +413,7 @@ static DWORD WINAPI ACTION_CallDllFuncti
     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(MSIPACKAG
         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(MSIPACKA
         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(MSIPACKA
     }
     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(MSIPACKA
     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);
Index: dlls/msi/files.c
===================================================================
RCS file: /var/cvs/wine/dlls/msi/files.c,v
retrieving revision 1.30
diff -u -p -r1.30 files.c
--- dlls/msi/files.c	3 Nov 2005 09:56:29 -0000	1.30
+++ dlls/msi/files.c	9 Nov 2005 16:21:22 -0000
@@ -542,7 +542,7 @@ static UINT ready_media_for_file( MSIPAC
             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
Index: dlls/msi/format.c
===================================================================
RCS file: /var/cvs/wine/dlls/msi/format.c,v
retrieving revision 1.24
diff -u -p -r1.24 format.c
--- dlls/msi/format.c	27 Oct 2005 12:36:12 -0000	1.24
+++ dlls/msi/format.c	9 Nov 2005 16:38:11 -0000
@@ -434,7 +434,7 @@ static DWORD deformat_string_internal(MS
         {
             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);
Index: dlls/msi/package.c
===================================================================
RCS file: /var/cvs/wine/dlls/msi/package.c,v
retrieving revision 1.64
diff -u -p -r1.64 package.c
--- dlls/msi/package.c	31 Oct 2005 14:07:37 -0000	1.64
+++ dlls/msi/package.c	9 Nov 2005 16:38:28 -0000
@@ -569,7 +569,7 @@ INT MSI_ProcessMessage( MSIPACKAGE *pack
     char *msg;
     int len;
 
-    TRACE("%x \n",eMessageType);
+    TRACE("%x\n", eMessageType);
     rc = 0;
 
     if ((eMessageType & 0xff000000) == INSTALLMESSAGE_ERROR)
Index: dlls/msi/table.c
===================================================================
RCS file: /var/cvs/wine/dlls/msi/table.c,v
retrieving revision 1.50
diff -u -p -r1.50 table.c
--- dlls/msi/table.c	2 Nov 2005 14:24:21 -0000	1.50
+++ dlls/msi/table.c	9 Nov 2005 16:21:21 -0000
@@ -1064,7 +1064,7 @@ static UINT TABLE_fetch_int( struct tagM
         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;
 }
Index: dlls/msvcrt/tests/cpp.c
===================================================================
RCS file: /var/cvs/wine/dlls/msvcrt/tests/cpp.c,v
retrieving revision 1.5
diff -u -p -r1.5 cpp.c
--- dlls/msvcrt/tests/cpp.c	20 Oct 2005 13:15:11 -0000	1.5
+++ dlls/msvcrt/tests/cpp.c	9 Nov 2005 16:21:23 -0000
@@ -824,7 +824,7 @@ static void test_demangle(void)
     static const char * mangled = ".ABVVec4 at 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)
Index: dlls/ntdll/misc.c
===================================================================
RCS file: /var/cvs/wine/dlls/ntdll/misc.c,v
retrieving revision 1.18
diff -u -p -r1.18 misc.c
--- dlls/ntdll/misc.c	19 Aug 2003 01:03:08 -0000	1.18
+++ dlls/ntdll/misc.c	9 Nov 2005 16:21:24 -0000
@@ -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);
 }
Index: dlls/odbc32/proxyodbc.c
===================================================================
RCS file: /var/cvs/wine/dlls/odbc32/proxyodbc.c,v
retrieving revision 1.30
diff -u -p -r1.30 proxyodbc.c
--- dlls/odbc32/proxyodbc.c	29 Aug 2005 09:38:19 -0000	1.30
+++ dlls/odbc32/proxyodbc.c	9 Nov 2005 16:21:25 -0000
@@ -158,7 +158,7 @@ static PROXYHANDLE gProxyHandle;
 
 SQLRETURN SQLDummyFunc()
 {
-    TRACE("SQLDummyFunc: \n");
+    TRACE("SQLDummyFunc:\n");
     return SQL_SUCCESS;
 }
 
Index: dlls/ole32/antimoniker.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/antimoniker.c,v
retrieving revision 1.27
diff -u -p -r1.27 antimoniker.c
--- dlls/ole32/antimoniker.c	27 Jul 2005 12:09:39 -0000	1.27
+++ dlls/ole32/antimoniker.c	9 Nov 2005 16:21:25 -0000
@@ -442,7 +442,7 @@ AntiMonikerImpl_GetDisplayName(IMoniker*
         return E_POINTER;
 
     if (pmkToLeft!=NULL){
-        FIXME("() pmkToLeft!=NULL not implemented \n");
+        FIXME("() pmkToLeft!=NULL not implemented\n");
         return E_NOTIMPL;
     }
 
Index: dlls/ole32/bindctx.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/bindctx.c,v
retrieving revision 1.36
diff -u -p -r1.36 bindctx.c
--- dlls/ole32/bindctx.c	25 Sep 2005 15:17:10 -0000	1.36
+++ dlls/ole32/bindctx.c	9 Nov 2005 16:39:28 -0000
@@ -170,7 +170,7 @@ BindCtxImpl_RegisterObjectBound(IBindCtx
     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
         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,
Index: dlls/ole32/ole2.c
===================================================================
RCS file: /var/cvs/wine/dlls/ole32/ole2.c,v
retrieving revision 1.77
diff -u -p -r1.77 ole2.c
--- dlls/ole32/ole2.c	25 Sep 2005 15:17:10 -0000	1.77
+++ dlls/ole32/ole2.c	9 Nov 2005 16:21:25 -0000
@@ -2545,7 +2545,7 @@ HRESULT WINAPI OleCreate(
 
     *ppvObj = pUnk;
 
-    TRACE("-- %p \n", pUnk);
+    TRACE("-- %p\n", pUnk);
     return hres;
 }
 
Index: dlls/oleaut32/typelib.c
===================================================================
RCS file: /var/cvs/wine/dlls/oleaut32/typelib.c,v
retrieving revision 1.174
diff -u -p -r1.174 typelib.c
--- dlls/oleaut32/typelib.c	2 Nov 2005 20:54:34 -0000	1.174
+++ dlls/oleaut32/typelib.c	9 Nov 2005 16:40:26 -0000
@@ -3549,7 +3549,7 @@ static HRESULT WINAPI ITypeLib2_fnGetTyp
     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_fnGetTyp
     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_fnGetAll
             VariantCopy(& pCustData->prgCustData[i].varValue, & pCData->data);
         }
     }else{
-        ERR(" OUT OF MEMORY! \n");
+        ERR(" OUT OF MEMORY!\n");
         return E_OUTOFMEMORY;
     }
     return S_OK;
@@ -5769,7 +5769,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetAl
             VariantCopy(& pCustData->prgCustData[i].varValue, & pCData->data);
         }
     }else{
-        ERR(" OUT OF MEMORY! \n");
+        ERR(" OUT OF MEMORY!\n");
         return E_OUTOFMEMORY;
     }
     return S_OK;
@@ -5805,7 +5805,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetAl
                         & pCData->data);
             }
         }else{
-            ERR(" OUT OF MEMORY! \n");
+            ERR(" OUT OF MEMORY!\n");
             return E_OUTOFMEMORY;
         }
         return S_OK;
@@ -5842,7 +5842,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetAl
                         & pCData->data);
             }
         }else{
-            ERR(" OUT OF MEMORY! \n");
+            ERR(" OUT OF MEMORY!\n");
             return E_OUTOFMEMORY;
         }
         return S_OK;
@@ -5878,7 +5878,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetAl
                         & pCData->data);
             }
         }else{
-            ERR(" OUT OF MEMORY! \n");
+            ERR(" OUT OF MEMORY!\n");
             return E_OUTOFMEMORY;
         }
         return S_OK;
@@ -5916,7 +5916,7 @@ static HRESULT WINAPI ITypeInfo2_fnGetAl
                         & pCData->data);
             }
         }else{
-            ERR(" OUT OF MEMORY! \n");
+            ERR(" OUT OF MEMORY!\n");
             return E_OUTOFMEMORY;
         }
         return S_OK;
Index: dlls/oleaut32/varformat.c
===================================================================
RCS file: /var/cvs/wine/dlls/oleaut32/varformat.c,v
retrieving revision 1.15
diff -u -p -r1.15 varformat.c
--- dlls/oleaut32/varformat.c	5 Nov 2005 10:42:09 -0000	1.15
+++ dlls/oleaut32/varformat.c	9 Nov 2005 16:21:27 -0000
@@ -55,7 +55,7 @@ static const WCHAR szPercentZeroStar_d[]
 
 #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"); \
Index: dlls/olepro32/olepro32stubs.c
===================================================================
RCS file: /var/cvs/wine/dlls/olepro32/olepro32stubs.c,v
retrieving revision 1.13
diff -u -p -r1.13 olepro32stubs.c
--- dlls/olepro32/olepro32stubs.c	17 Jun 2005 20:58:33 -0000	1.13
+++ dlls/olepro32/olepro32stubs.c	9 Nov 2005 16:21:28 -0000
@@ -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;
 }
Index: dlls/opengl32/wgl.c
===================================================================
RCS file: /var/cvs/wine/dlls/opengl32/wgl.c,v
retrieving revision 1.65
diff -u -p -r1.65 wgl.c
--- dlls/opengl32/wgl.c	2 Nov 2005 20:51:41 -0000	1.65
+++ dlls/opengl32/wgl.c	9 Nov 2005 16:21:28 -0000
@@ -624,7 +624,7 @@ static BOOL internal_wglUseFontBitmaps(H
 	    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) {
Index: dlls/opengl32/wgl_ext.c
===================================================================
RCS file: /var/cvs/wine/dlls/opengl32/wgl_ext.c,v
retrieving revision 1.10
diff -u -p -r1.10 wgl_ext.c
--- dlls/opengl32/wgl_ext.c	10 Aug 2005 09:48:58 -0000	1.10
+++ dlls/opengl32/wgl_ext.c	9 Nov 2005 16:21:28 -0000
@@ -191,7 +191,7 @@ BOOL WINAPI wglSwapIntervalEXT(int inter
   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;
 }
 


More information about the wine-patches mailing list