Add missing newline to WARN messages

Francois Gouget fgouget at free.fr
Tue May 8 22:04:37 CDT 2001


On Tue, 8 May 2001, James Juran wrote:

>       James Juran <jamesjuran at alumni.psu.edu>
>       Add missing newline to WARN messages.
[...]

   Hey James, you forgot a bunch! As Andi would say, when you see a bug
somewhere, check whether there is the same bug elsewhere.
   Fortunately I think I caught them all ;-)


Seriously:
 * I scanned the source for TRACE/WARN/ERR/FIXME statements without a
terminating newline. There are few cases where this is justified because
of following DPRINTFs. But most of the time there should be a \n
otherwise the trace will not be flushed to disk immediately and the logs
will look bad.

 * I found two instances of "blah blah \
some more text"
   This is a gcc-ism and support for it is in serious jeopardy. The
correct form is "blah blah "
                "some more text"
   See how cool it is. You can even maintain a proper indentation.

 * There's a few cases where I don't understand what the traces expect
to do. I did not modify those, see my other mail (soon to be written) to
wine-dev.


Changelog:

 * controls/menu.c,
   dlls/comctl32/commctrl.c,
   dlls/comctl32/listview.c,
   dlls/comctl32/treeview.c,
   dlls/commdlg/filedlg.c,
   dlls/ddraw/ddraw/main.c,
   dlls/dinput/mouse/main.c,
   dlls/dsound/dsound_main.c,
   dlls/gdi/printdrv.c,
   dlls/imm32/imc.c,
   dlls/imm32/imewnd.c,
   dlls/imm32/imm.c,
   dlls/imm32/memory.c,
   dlls/kernel/utthunk.c,
   dlls/msvcrt/file.c,
   dlls/msvcrt/locale.c,
   dlls/msvcrt/math.c,
   dlls/odbc32/proxyodbc.c,
   dlls/ole32/bindctx.c,
   dlls/ole32/compositemoniker.c,
   dlls/ole32/filemoniker.c,
   dlls/oleaut32/safearray.c,
   dlls/oleaut32/typelib.c,
   dlls/psapi/psapi_main.c,
   dlls/rpcrt4/rpcrt4_main.c,
   dlls/shell32/shell32_main.c,
   dlls/shell32/shlfileop.c,
   dlls/shell32/shlfolder.c,
   dlls/shell32/shlview.c,
   dlls/shlwapi/shlwapi_main.c,
   dlls/ttydrv/palette.c,
   dlls/user/resource.c,
   dlls/version/install.c,
   dlls/winaspi/aspi.c,
   dlls/wininet/internet.c,
   dlls/winmm/driver.c,
   dlls/winmm/mci.c,
   dlls/winmm/mciavi/mmoutput.c,
   dlls/winmm/mciavi/wnd.c,
   dlls/winmm/mcicda/mcicda.c,
   dlls/winmm/wineoss/audio.c,
   dlls/winspool/info.c,
   files/profile.c,
   graphics/win16drv/init.c,
   graphics/x11drv/palette.c,
   graphics/x11drv/xfont.c,
   memory/global.c,
   msdos/int10.c,
   msdos/int21.c,
   msdos/ioports.c,
   objects/palette.c,
   windows/clipboard.c,
   windows/defwnd.c,
   windows/scroll.c,
   windows/x11drv/event.c,
   windows/x11drv/keyboard.c,
   windows/x11drv/wineclipsrv.c

   Add '\n' at the end of traces


--
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
        It really galls me that most of the computer power in the world
                          is wasted on screen savers.
                     Chris Caldwell from the GIMPS project
                       http://www.mersenne.org/prime.htm
-------------- next part --------------
Index: controls/menu.c
===================================================================
RCS file: /home/cvs/wine/wine/controls/menu.c,v
retrieving revision 1.113
diff -u -r1.113 menu.c
--- controls/menu.c	2001/04/27 18:03:51	1.113
+++ controls/menu.c	2001/05/09 02:17:01
@@ -3630,7 +3634,7 @@
 
     if (IS_STRING_ITEM(flags) && str)
         TRACE("hMenu %04x, pos %d, flags %08x, "
-		      "id %04x, str '%s'\n",
+		      "id %04x, str %s\n",
                       hMenu, pos, flags, id, debugstr_w(str) );
     else TRACE("hMenu %04x, pos %d, flags %08x, "
 		       "id %04x, str %08lx (not a string)\n",
Index: dlls/comctl32/commctrl.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/comctl32/commctrl.c,v
retrieving revision 1.39
diff -u -r1.39 commctrl.c
--- dlls/comctl32/commctrl.c	2001/03/16 16:50:24	1.39
+++ dlls/comctl32/commctrl.c	2001/05/09 02:17:02
@@ -879,7 +879,7 @@
 COMCTL32_DllGetVersion (DLLVERSIONINFO *pdvi)
 {
     if (pdvi->cbSize != sizeof(DLLVERSIONINFO)) {
-        WARN("wrong DLLVERSIONINFO size from app");
+        WARN("wrong DLLVERSIONINFO size from app\n");
 	return E_INVALIDARG;
     }
 
@@ -1024,7 +1024,7 @@
     TRACE("%lx, %lx, %x, %lx\n", ptme->cbSize, ptme->dwFlags, ptme->hwndTrack, ptme->dwHoverTime);
 
     if (ptme->cbSize != sizeof(TRACKMOUSEEVENT)) {
-        WARN("wrong TRACKMOUSEEVENT size from app");
+        WARN("wrong TRACKMOUSEEVENT size from app\n");
         SetLastError(ERROR_INVALID_PARAMETER); /* FIXME not sure if this is correct */
         return FALSE;
     }
Index: dlls/comctl32/listview.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/comctl32/listview.c,v
retrieving revision 1.104
diff -u -r1.104 listview.c
--- dlls/comctl32/listview.c	2001/04/18 17:40:04	1.104
+++ dlls/comctl32/listview.c	2001/05/09 02:17:07
@@ -3035,8 +3049,8 @@
   UINT textoutOptions = ETO_CLIPPED | ETO_OPAQUE;
   RECT rcTemp;
 
-  TRACE("(hwnd=%x, hdc=%x, nItem=%d, left=%d, top=%d, right=%d, \
-bottom=%d)\n", hwnd, hdc, nItem, rcItem.left, rcItem.top, rcItem.right, 
+  TRACE("(hwnd=%x, hdc=%x, nItem=%d, left=%d, top=%d, right=%d, bottom=%d)\n",
+        hwnd, hdc, nItem, rcItem.left, rcItem.top, rcItem.right,
         rcItem.bottom);
 
   /* get information needed for drawing the item */
@@ -8506,7 +8550,7 @@
                                          (WPARAM)hwnd, (LPARAM)NF_QUERY);
     if (infoPtr->notifyFormat == NFR_UNICODE)
     {
-      FIXME("NO support for unicode structures");
+      FIXME("NO support for unicode structures\n");
     }
   }
 
Index: dlls/comctl32/treeview.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/comctl32/treeview.c,v
retrieving revision 1.91
diff -u -r1.91 treeview.c
--- dlls/comctl32/treeview.c	2001/04/09 18:28:47	1.91
+++ dlls/comctl32/treeview.c	2001/05/09 02:17:11
@@ -3450,7 +3450,7 @@
 
 	if (iLength >= 1023)
 	{
-	    ERR("Insuficient space to retrieve new item label.");
+	    ERR("Insuficient space to retrieve new item label\n");
 	}
 
 	tvdi.item.pszText = tmpText;
@@ -3472,7 +3472,7 @@
 	{
 	    if (NULL == COMCTL32_ReAlloc(editedItem->pszText, iLength + 1))
 	    {
-		ERR("OutOfMemory, cannot allocate space for label");
+		ERR("OutOfMemory, cannot allocate space for label\n");
 		DestroyWindow(infoPtr->hwndEdit);
 		infoPtr->hwndEdit = 0;
 		return FALSE;
Index: dlls/commdlg/filedlg.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/commdlg/filedlg.c,v
retrieving revision 1.44
diff -u -r1.44 filedlg.c
--- dlls/commdlg/filedlg.c	2001/03/03 00:18:14	1.44
+++ dlls/commdlg/filedlg.c	2001/05/09 02:17:12
@@ -543,8 +543,8 @@
                                    (LPARAM)(ofn->lpstrCustomFilter) + n );
           n += lstrlenW(pstr) + 1;
 	  pstr += lstrlenW(pstr) + 1;
-	  TRACE("add str='%s' "
-	  "associated to '%s'\n", debugstr_w(old_pstr), debugstr_w(pstr));
+	  TRACE("add str='%s' associated to '%s'\n",
+                debugstr_w(old_pstr), debugstr_w(pstr));
           SendDlgItemMessageW(hWnd, cmb1, CB_SETITEMDATA, i, (LPARAM)pstr);
           n += lstrlenW(pstr) + 1;
 	  pstr += lstrlenW(pstr) + 1;
@@ -560,8 +560,8 @@
 				       (LPARAM)(ofn->lpstrFilter + n) );
 	  n += lstrlenW(pstr) + 1;
 	  pstr += lstrlenW(pstr) + 1;
-	  TRACE("add str='%s' "
-		  "associated to '%s'\n", debugstr_w(old_pstr), debugstr_w(pstr));
+	  TRACE("add str='%s' associated to '%s'\n",
+                debugstr_w(old_pstr), debugstr_w(pstr));
 	  SendDlgItemMessageW(hWnd, cmb1, CB_SETITEMDATA, i, (LPARAM)pstr);
 	  n += lstrlenW(pstr) + 1;
 	  pstr += lstrlenW(pstr) + 1;
Index: dlls/ddraw/ddraw/main.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/ddraw/ddraw/main.c,v
retrieving revision 1.16
diff -u -r1.16 main.c
--- dlls/ddraw/ddraw/main.c	2001/04/17 17:34:48	1.16
+++ dlls/ddraw/ddraw/main.c	2001/05/09 02:17:13
@@ -1246,7 +1246,7 @@
     const ddraw_driver* driver;
     ICOM_THIS(IDirectDrawImpl, iface);
 
-    TRACE("(%p)->(%p)", iface, pDeviceGuid);
+    TRACE("(%p)->(%p)\n", iface, pDeviceGuid);
 
     driver = DDRAW_FindDriver(pDeviceGuid);
     /* XXX This return value is not documented. (Not checked.) */
Index: dlls/dinput/mouse/main.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/dinput/mouse/main.c,v
retrieving revision 1.7
diff -u -r1.7 main.c
--- dlls/dinput/mouse/main.c	2001/01/28 23:14:25	1.7
+++ dlls/dinput/mouse/main.c	2001/05/09 02:17:13
@@ -305,8 +305,8 @@
   else if (df->dwFlags == DIDF_RELAXIS)
     This->absolute = 0;
   else
-    ERR("Neither absolute nor relative flag set.");
-  
+    ERR("Neither absolute nor relative flag set\n");
+
   /* Store the new data format */
   This->df = HeapAlloc(GetProcessHeap(),0,df->dwSize);
   memcpy(This->df, df, df->dwSize);
Index: dlls/dsound/dsound_main.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/dsound/dsound_main.c,v
retrieving revision 1.42
diff -u -r1.42 dsound_main.c
--- dlls/dsound/dsound_main.c	2001/03/19 19:14:39	1.42
+++ dlls/dsound/dsound_main.c	2001/05/09 02:17:15
@@ -2412,7 +2412,7 @@
 {
 	INT16	*bufs = (INT16 *) buf;
 
-	/* TRACE("(%p)", buf); */
+	/* TRACE("(%p)\n", buf); */
 	if ((dsb->wfx.wBitsPerSample == 8) && dsb->wfx.nChannels == 2) {
 		*fl = cvtU8toS16(*buf);
 		*fr = cvtU8toS16(*(buf + 1));
@@ -2601,7 +2601,7 @@
 	obp = buf;
 
 	if (buf_mixpos > buflen) {
-		FIXME("Major breakage");
+		FIXME("Major breakage\n");
 		return;
 	}
 
Index: dlls/gdi/printdrv.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/gdi/printdrv.c,v
retrieving revision 1.9
diff -u -r1.9 printdrv.c
--- dlls/gdi/printdrv.c	2001/04/27 18:02:46	1.9
+++ dlls/gdi/printdrv.c	2001/05/09 02:17:16
@@ -384,7 +384,7 @@
 {
     struct hpq *queueItem = HeapAlloc(GetProcessHeap(), 0, sizeof(struct hpq));
     if(queueItem == NULL) {
-        ERR("Memory exausted!");
+        ERR("Memory exausted!\n");
         return FALSE;
     }
     queueItem->next = hpqueue;
@@ -555,7 +555,7 @@
 	{
 	    pPrintJob = HeapAlloc(GetProcessHeap(), 0, sizeof(PRINTJOB));
             if(pPrintJob == NULL) {
-                WARN("Memory exausted!");
+                WARN("Memory exausted!\n");
                 return hHandle;
             }
             
Index: dlls/imm32/imc.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/imm32/imc.c,v
retrieving revision 1.1
diff -u -r1.1 imc.c
--- dlls/imm32/imc.c	2000/12/18 03:51:16	1.1
+++ dlls/imm32/imc.c	2001/05/09 02:17:16
@@ -161,7 +161,7 @@
 
 	if ( pIMC->context.hWnd != (HWND)NULL )
 	{
-		FIXME( "please release lock of the context.hWnd!" );
+		FIXME( "please release lock of the context.hWnd!\n" );
 	}
 
 	if ( pIMC->fSelected )
Index: dlls/imm32/imewnd.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/imm32/imewnd.c,v
retrieving revision 1.2
diff -u -r1.2 imewnd.c
--- dlls/imm32/imewnd.c	2000/12/18 03:51:16	1.2
+++ dlls/imm32/imewnd.c	2001/05/09 02:17:16
@@ -191,10 +191,10 @@
 	case WM_KEYUP:
 		return IMM32_IMEWnd_WM_KEYUP( pParam, wParam, lParam );
 	case WM_IME_KEYDOWN:
-		ERR( "Why WM_IME_KEYDOWN is generated?" );
+		ERR( "Why WM_IME_KEYDOWN is generated?\n" );
 		return 0;
 	case WM_IME_KEYUP:
-		ERR( "Why WM_IME_KEYUP is generated?" );
+		ERR( "Why WM_IME_KEYUP is generated?\n" );
 		return 0;
 	case WM_IME_CHAR:
 		FIXME( "ignore WM_IME_CHAR - wParam %08x, lParam %08lx.\n",
Index: dlls/imm32/imm.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/imm32/imm.c,v
retrieving revision 1.9
diff -u -r1.9 imm.c
--- dlls/imm32/imm.c	2000/12/18 03:51:16	1.9
+++ dlls/imm32/imm.c	2001/05/09 02:17:16
@@ -178,7 +178,7 @@
   case VER_PLATFORM_WIN32_WINDOWS: return -1;
   case VER_PLATFORM_WIN32_NT: return 0;
   default:
-      FIXME("%ld not supported",version.dwPlatformId);
+      FIXME("%ld not supported\n",version.dwPlatformId);
       return -1;
   }
 }
@@ -201,7 +201,7 @@
   case VER_PLATFORM_WIN32_WINDOWS: return -1;
   case VER_PLATFORM_WIN32_NT: return 0;
   default:
-      FIXME("%ld not supported",version.dwPlatformId);
+      FIXME("%ld not supported\n",version.dwPlatformId);
       return -1;
   }
 }
@@ -365,7 +365,7 @@
   case VER_PLATFORM_WIN32_NT:
       return 0;
   default:
-      FIXME("%ld not supported",version.dwPlatformId);
+      FIXME("%ld not supported\n",version.dwPlatformId);
       return VK_PROCESSKEY;
   }
 }
Index: dlls/imm32/memory.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/imm32/memory.c,v
retrieving revision 1.1
diff -u -r1.1 memory.c
--- dlls/imm32/memory.c	2000/12/15 23:00:00	1.1
+++ dlls/imm32/memory.c	2001/05/09 02:17:16
@@ -89,7 +89,7 @@
 {
 	if ( lpMoveable->dwLockCount == IMM32_MOVEABLEMEM_LOCK_MAX )
 	{
-		ERR( "lock count is 0xffffffff." );
+		ERR( "lock count is 0xffffffff\n" );
 	}
 	else
 	{
Index: dlls/kernel/utthunk.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/kernel/utthunk.c,v
retrieving revision 1.10
diff -u -r1.10 utthunk.c
--- dlls/kernel/utthunk.c	2001/02/12 03:51:04	1.10
+++ dlls/kernel/utthunk.c	2001/05/09 02:17:16
@@ -108,7 +108,7 @@
         segptrList = HeapAlloc( GetProcessHeap(), 0, sizeof(SEGPTR)*nList );
         if ( !segptrList )
         {
-            FIXME("Unable to allocate segptrList!" );
+            FIXME("Unable to allocate segptrList!\n" );
             return 0;
         }
 
Index: dlls/msvcrt/file.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/msvcrt/file.c,v
retrieving revision 1.5
diff -u -r1.5 file.c
--- dlls/msvcrt/file.c	2001/04/10 23:25:25	1.5
+++ dlls/msvcrt/file.c	2001/05/09 02:17:18
@@ -566,7 +566,7 @@
     MSVCRT__set_errno(ERROR_INVALID_PARAMETER);
     return -1;
   }
-  FIXME(":dwFileAttributes = %d, mode set to 0",hfi.dwFileAttributes);
+  FIXME(":dwFileAttributes = %d, mode set to 0\n",hfi.dwFileAttributes);
   buf->st_nlink = hfi.nNumberOfLinks;
   buf->st_size  = hfi.nFileSizeLow;
   RtlTimeToSecondsSince1970(&hfi.ftLastAccessTime, &dw);
Index: dlls/msvcrt/locale.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/msvcrt/locale.c,v
retrieving revision 1.5
diff -u -r1.5 locale.c
--- dlls/msvcrt/locale.c	2001/04/10 23:25:25	1.5
+++ dlls/msvcrt/locale.c	2001/05/09 02:17:18
@@ -406,7 +406,7 @@
 
   if (haveCP && !haveCountry && !haveLang)
   {
-    FIXME(":Codepage only locale not implemented");
+    FIXME(":Codepage only locale not implemented\n");
     /* FIXME: Use default lang/country and skip locale_to_LCID()
      * call below...
      */
@@ -456,7 +456,7 @@
   static const char *MSVCRT_days = ":Sun:Sunday:Mon:Monday:Tue:Tuesday:Wed:"
                             "Wednesday:Thu:Thursday:Fri:Friday:Sat:Saturday";
   /* FIXME: Use locale */
-  TRACE("(void) semi-stub");
+  TRACE("(void) semi-stub\n");
   return MSVCRT_days;
 }
 
@@ -469,7 +469,7 @@
                 "April:May:May:Jun:June:Jul:July:Aug:August:Sep:September:Oct:"
                 "October:Nov:November:Dec:December";
   /* FIXME: Use locale */
-  TRACE("(void) semi-stub");
+  TRACE("(void) semi-stub\n");
   return MSVCRT_months;
 }
 
@@ -479,7 +479,7 @@
 const char* _Getnames(void)
 {
   /* FIXME: */
-  TRACE("(void) stub");
+  TRACE("(void) stub\n");
   return "";
 }
 
@@ -490,7 +490,7 @@
                                      const void *tm, void *foo)
 {
   /* FIXME: */
-  TRACE("(%p %d %s %p %p) stub", out, len, fmt, tm, foo);
+  TRACE("(%p %d %s %p %p) stub\n", out, len, fmt, tm, foo);
   return "";
 }

Index: dlls/msvcrt/math.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/msvcrt/math.c,v
retrieving revision 1.8
diff -u -r1.8 math.c
--- dlls/msvcrt/math.c	2001/04/10 23:25:25	1.8
+++ dlls/msvcrt/math.c	2001/05/09 02:17:18
@@ -719,7 +719,7 @@
  */
 void _adj_fdiv_m16i(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -733,7 +733,7 @@
  */
 void _adj_fdiv_m32(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -747,7 +747,7 @@
  */
 void _adj_fdiv_m32i(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -761,7 +761,7 @@
  */
 void _adj_fdiv_m64(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -775,7 +775,7 @@
  */
 void _adj_fdiv_r(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -789,7 +789,7 @@
  */
 void _adj_fdivr_m16i(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -803,7 +803,7 @@
  */
 void _adj_fdivr_m32(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -817,7 +817,7 @@
  */
 void _adj_fdivr_m32i(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -831,7 +831,7 @@
  */
 void _adj_fdivr_m64(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -845,7 +845,7 @@
  */
 void _adj_fpatan(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -859,7 +859,7 @@
  */
 void _adj_fprem(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -873,7 +873,7 @@
  */
 void _adj_fprem1(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -887,7 +887,7 @@
  */
 void _adj_fptan(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -898,7 +898,7 @@
  */
 void _adjust_fdiv(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -912,7 +912,7 @@
  */
 void _safe_fdiv(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -926,7 +926,7 @@
  */
 void _safe_fdivr(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -940,7 +940,7 @@
  */
 void _safe_fprem(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -955,7 +955,7 @@
  */
 void _safe_fprem1(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 
Index: dlls/odbc32/proxyodbc.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/odbc32/proxyodbc.c,v
retrieving revision 1.10
diff -u -r1.10 proxyodbc.c
--- dlls/odbc32/proxyodbc.c	2000/12/13 21:32:55	1.10
+++ dlls/odbc32/proxyodbc.c	2001/05/09 02:17:19
@@ -240,7 +240,7 @@
 
         if (error[0])
         {
-            ERR("Failed to load function %s",gProxyHandle.functions[i].name);
+            ERR("Failed to load function %s\n",gProxyHandle.functions[i].name);
             gProxyHandle.functions[i].func = SQLDummyFunc;
         }
     }
@@ -550,9 +550,10 @@
         {
            TRACE("returns: %d \t", ret);
            if (*NameLength1 > 0)
-             TRACE("DataSource = %s,", ServerName);
+             DPRINTF("DataSource = %s,", ServerName);
            if (*NameLength2 > 0)
-             TRACE(" Description = %s\n", Description);
+             DPRINTF(" Description = %s", Description);
+           DPRINTF("\n");
         }
 
         return ret;
Index: dlls/ole32/bindctx.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/ole32/bindctx.c,v
retrieving revision 1.8
diff -u -r1.8 bindctx.c
--- dlls/ole32/bindctx.c	2001/04/20 18:36:06	1.8
+++ dlls/ole32/bindctx.c	2001/05/09 02:17:20
@@ -309,7 +309,7 @@
     
     if (pbindopts->cbStruct > sizeof(BIND_OPTS2))
     {
-        WARN("invalid size");
+        WARN("invalid size\n");
         return E_INVALIDARG; /* FIXME : not verified */
     }
     memcpy(&This->bindOption2, pbindopts, pbindopts->cbStruct);
@@ -330,7 +330,7 @@
 
     if (pbindopts->cbStruct > sizeof(BIND_OPTS2))
     {
-        WARN("invalid size");
+        WARN("invalid size\n");
         return E_INVALIDARG; /* FIXME : not verified */
     }
     memcpy(pbindopts, &This->bindOption2, pbindopts->cbStruct);
Index: dlls/ole32/compositemoniker.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/ole32/compositemoniker.c,v
retrieving revision 1.9
diff -u -r1.9 compositemoniker.c
--- dlls/ole32/compositemoniker.c	2001/04/20 18:36:06	1.9
+++ dlls/ole32/compositemoniker.c	2001/05/09 02:17:21
@@ -340,8 +340,10 @@
         else if (IsEqualIID(&clsid,&CLSID_CompositeMoniker))
             return E_FAIL;
 
-        else{
-            FIXME("()");
+        else
+        {
+            FIXME("()\n");
+            /* FIXME: To whoever wrote this code: It's either return or break. it cannot be both! */
             break;
             return E_NOTIMPL;
         }
Index: dlls/ole32/filemoniker.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/ole32/filemoniker.c,v
retrieving revision 1.10
diff -u -r1.10 filemoniker.c
--- dlls/ole32/filemoniker.c	2001/04/20 18:36:06	1.10
+++ dlls/ole32/filemoniker.c	2001/05/09 02:17:21
@@ -595,7 +595,7 @@
         }
         if (pca!=NULL){
 
-            FIXME("()");
+            FIXME("()\n");
             
             /*res=GetClassFile(This->filePathName,&clsID);
 
@@ -610,7 +610,7 @@
                 }
             }*/
         }
-}
+    }
 
     if (pObj!=NULL){
         /* get the requested interface from the loaded class */
Index: dlls/oleaut32/safearray.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/oleaut32/safearray.c,v
retrieving revision 1.8
diff -u -r1.8 safearray.c
--- dlls/oleaut32/safearray.c	2000/12/21 20:18:18	1.8
+++ dlls/oleaut32/safearray.c	2001/05/09 02:17:22
@@ -1062,7 +1062,7 @@
   if (psa->fFeatures & FADF_HAVEVARTYPE)
   {
     /* VT tag @ negative offset 4 in the array descriptor */
-    FIXME("Returning VT_BSTR instead of VT_...");
+    FIXME("Returning VT_BSTR instead of VT_...\n");
     vt = VT_BSTR;
   }
   else if (psa->fFeatures & FADF_RECORD)
@@ -1083,7 +1083,7 @@
     *pvt = vt;
     hr = S_OK;
   }
-  
-  TRACE("HRESULT = %08lx", hr);
+
+  TRACE("HRESULT = %08lx\n", hr);
   return hr;
 }
Index: dlls/oleaut32/typelib.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/oleaut32/typelib.c,v
retrieving revision 1.35
diff -u -r1.35 typelib.c
--- dlls/oleaut32/typelib.c	2001/03/05 19:32:50	1.35
+++ dlls/oleaut32/typelib.c	2001/05/09 02:17:24
@@ -18,7 +18,7 @@
  * - locale stuff is partially implemented but hasn't been tested.
  *
  * - imported typelib should be stored together in a linked list instead of having
- *   independant TLBImpLib strucutures in each ITypeInfo. This way, imported libraries
+ *   independant TLBImpLib structures in each ITypeInfo. This way, imported libraries
  *   are just imported once (major optimization)
  *
  * - typelib file is still read it's in entirety, but it is released now.
@@ -372,7 +372,7 @@
     case 0x00000004:  /* NT4 */
 		return MAKELONG(4277, 40); /* NT4 SP6 */
     default:
-	FIXME("Version value not known yet. Please investigate it !");
+	FIXME("Version value not known yet. Please investigate it!\n");
 		return 0;
     }
 }
@@ -649,7 +649,7 @@
             break;
     }
         
-    TRACE("VARTYPE: %s", szVarType);
+    TRACE("VARTYPE: %s\n", szVarType);
     
     switch (V_VT(pvar))
     {
Index: dlls/psapi/psapi_main.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/psapi/psapi_main.c,v
retrieving revision 1.9
diff -u -r1.9 psapi_main.c
--- dlls/psapi/psapi_main.c	2001/01/25 22:22:21	1.9
+++ dlls/psapi/psapi_main.c	2001/05/09 02:17:24
@@ -288,7 +288,7 @@
  */
 BOOL WINAPI QueryWorkingSet(HANDLE hProcess, LPVOID pv, DWORD cb)
 {
-  FIXME("(hProcess=0x%08x, %p, %ld)", hProcess, pv, cb);
+  FIXME("(hProcess=0x%08x, %p, %ld)\n", hProcess, pv, cb);
 
   if(pv && cb)
     ((DWORD *) pv)[0] = 0; /* Empty WorkingSet */
Index: dlls/rpcrt4/rpcrt4_main.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/rpcrt4/rpcrt4_main.c,v
retrieving revision 1.10
diff -u -r1.10 rpcrt4_main.c
--- dlls/rpcrt4/rpcrt4_main.c	2001/01/17 22:03:19	1.10
+++ dlls/rpcrt4/rpcrt4_main.c	2001/05/09 02:17:24
@@ -259,7 +259,7 @@
    ((unsigned char*)Uuid->Data4)[6] = a[4];
    ((unsigned char*)Uuid->Data4)[7] = a[5];
    
-   TRACE("%s", debugstr_guid(Uuid));
+   TRACE("%s\n", debugstr_guid(Uuid));
    
    return S_OK;
 }
Index: dlls/shell32/shell32_main.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/shell32/shell32_main.c,v
retrieving revision 1.73
diff -u -r1.73 shell32_main.c
--- dlls/shell32/shell32_main.c	2001/03/10 19:14:30	1.73
+++ dlls/shell32/shell32_main.c	2001/05/09 02:17:25
@@ -816,9 +816,9 @@
 
 HRESULT WINAPI SHELL32_DllGetVersion (DLLVERSIONINFO *pdvi)
 {
-	if (pdvi->cbSize != sizeof(DLLVERSIONINFO)) 
+	if (pdvi->cbSize != sizeof(DLLVERSIONINFO))
 	{
-	  WARN("wrong DLLVERSIONINFO size from app");
+	  WARN("wrong DLLVERSIONINFO size from app\n");
 	  return E_INVALIDARG;
 	}
 
Index: dlls/shell32/shlfileop.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/shell32/shlfileop.c,v
retrieving revision 1.11
diff -u -r1.11 shlfileop.c
--- dlls/shell32/shlfileop.c	2001/02/26 22:31:38	1.11
+++ dlls/shell32/shlfileop.c	2001/05/09 02:17:25
@@ -40,7 +40,7 @@
 		szCaption, sizeof(szCaption));
         }
 	else {
-          FIXME("Called without a valid nKindOfDialog specified!");
+          FIXME("Called without a valid nKindOfDialog specified!\n");
 	  LoadStringA(shell32_hInstance, IDS_DELETEITEM_TEXT, szText, 
 		sizeof(szText));
 	  LoadStringA(shell32_hInstance, IDS_DELETEITEM_CAPTION, 
Index: dlls/shell32/shlfolder.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/shell32/shlfolder.c,v
retrieving revision 1.57
diff -u -r1.57 shlfolder.c
--- dlls/shell32/shlfolder.c	2001/03/10 19:13:59	1.57
+++ dlls/shell32/shlfolder.c	2001/05/09 02:17:26
@@ -1518,7 +1518,7 @@
 	    TRACE("delete %s\n", szPath);
 	    if (! SHELL_DeleteDirectoryA(szPath, bConfirm))
 	    {
-              TRACE("delete %s failed, bConfirm=%d", szPath, bConfirm);
+              TRACE("delete %s failed, bConfirm=%d\n", szPath, bConfirm);
 	      return E_FAIL;
 	    }
 	    pidl = ILCombine(This->absPidl, apidl[i]);
@@ -1532,7 +1532,7 @@
 	    TRACE("delete %s\n", szPath);
 	    if (! SHELL_DeleteFileA(szPath, bConfirm))
 	    {
-              TRACE("delete %s failed, bConfirm=%d", szPath, bConfirm);
+              TRACE("delete %s failed, bConfirm=%d\n", szPath, bConfirm);
 	      return E_FAIL;
 	    }
 	    pidl = ILCombine(This->absPidl, apidl[i]);
Index: dlls/shell32/shlview.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/shell32/shlview.c,v
retrieving revision 1.60
diff -u -r1.60 shlview.c
--- dlls/shell32/shlview.c	2001/02/21 04:01:03	1.60
+++ dlls/shell32/shlview.c	2001/05/09 02:17:27
@@ -1554,7 +1554,7 @@
 	
 	if ((lpmsg->message>=WM_KEYFIRST) && (lpmsg->message>=WM_KEYLAST))
 	{
-	  TRACE("-- key=0x04%x",lpmsg->wParam) ;
+	  TRACE("-- key=0x04%x\n",lpmsg->wParam) ;
 	}
 	return S_FALSE; /* not handled */
 }
Index: dlls/shlwapi/shlwapi_main.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/shlwapi/shlwapi_main.c,v
retrieving revision 1.7
diff -u -r1.7 shlwapi_main.c
--- dlls/shlwapi/shlwapi_main.c	2001/02/13 20:17:59	1.7
+++ dlls/shlwapi/shlwapi_main.c	2001/05/09 02:17:28
@@ -62,9 +62,9 @@
 
 HRESULT WINAPI SHLWAPI_DllGetVersion (DLLVERSIONINFO *pdvi)
 {
-	if (pdvi->cbSize != sizeof(DLLVERSIONINFO)) 
+	if (pdvi->cbSize != sizeof(DLLVERSIONINFO))
 	{
-	  WARN("wrong DLLVERSIONINFO size from app");
+	  WARN("wrong DLLVERSIONINFO size from app\n");
 	  return E_INVALIDARG;
 	}
 
Index: dlls/ttydrv/palette.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/ttydrv/palette.c,v
retrieving revision 1.1
diff -u -r1.1 palette.c
--- dlls/ttydrv/palette.c	2000/08/10 01:16:19	1.1
+++ dlls/ttydrv/palette.c	2001/05/09 02:17:28
@@ -37,7 +37,7 @@
 
   COLOR_sysPal = (PALETTEENTRY *) HeapAlloc(GetProcessHeap(), 0, sizeof(PALETTEENTRY) * TTYDRV_DC_DevCaps.sizePalette);
   if(COLOR_sysPal == NULL) {
-    WARN("No memory to create system palette!");
+    WARN("No memory to create system palette!\n");
     return FALSE;
   }
 
Index: dlls/user/resource.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/user/resource.c,v
retrieving revision 1.6
diff -u -r1.6 resource.c
--- dlls/user/resource.c	2001/01/25 22:22:21	1.6
+++ dlls/user/resource.c	2001/05/09 02:17:28
@@ -348,8 +348,8 @@
 
     if (HIWORD(resource_id)==0xFFFF) /* netscape 3 passes this */
 	resource_id = (UINT)(-((INT)resource_id));
-    TRACE("instance = %04x, id = %04x, buffer = %08x, "
-          "length = %d\n", instance, (int)resource_id, (int) buffer, buflen);
+    TRACE("instance = %04x, id = %04x, buffer = %08x, length = %d\n",
+          instance, (int)resource_id, (int) buffer, buflen);
 
     /* Use bits 4 - 19 (incremented by 1) as resourceid, mask out 
      * 20 - 31. */
@@ -394,8 +394,8 @@
     INT    retval;
     LPWSTR wbuf;
 
-    TRACE("instance = %04x, id = %04x, buffer = %08x, "
-          "length = %d\n", instance, (int)resource_id, (int) buffer, buflen);
+    TRACE("instance = %04x, id = %04x, buffer = %08x, length = %d\n",
+          instance, (int)resource_id, (int) buffer, buflen);
 
     if(buffer == NULL) /* asked size of string */
 	return LoadStringW(instance, resource_id, NULL, 0);
Index: dlls/version/install.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/version/install.c,v
retrieving revision 1.14
diff -u -r1.14 install.c
--- dlls/version/install.c	2001/01/02 19:56:21	1.14
+++ dlls/version/install.c	2001/05/09 02:17:28
@@ -121,7 +121,7 @@
     char  systemDir[MAX_PATH];
 
     /* Print out debugging information */
-    TRACE("flags = %x filename=%s windir=%s appdir=%s curdirlen=%p(%u) destdirlen=%p(%u)",
+    TRACE("flags = %x filename=%s windir=%s appdir=%s curdirlen=%p(%u) destdirlen=%p(%u)\n",
           flags, debugstr_a(lpszFilename), debugstr_a(lpszWinDir), debugstr_a(lpszAppDir),
           lpuCurDirLen, lpuCurDirLen ? *lpuCurDirLen : 0,
           lpuDestDirLen, lpuDestDirLen ? *lpuDestDirLen : 0 );
@@ -212,7 +212,7 @@
     WCHAR systemDir[MAX_PATH];
 
     /* Print out debugging information */
-    TRACE("flags = %x filename=%s windir=%s appdir=%s curdirlen=%p(%u) destdirlen=%p(%u)",
+    TRACE("flags = %x filename=%s windir=%s appdir=%s curdirlen=%p(%u) destdirlen=%p(%u)\n",
           flags, debugstr_w(lpszFilename), debugstr_w(lpszWinDir), debugstr_w(lpszAppDir),
           lpuCurDirLen, lpuCurDirLen ? *lpuCurDirLen : 0,
           lpuDestDirLen, lpuDestDirLen ? *lpuDestDirLen : 0 );
@@ -295,7 +295,7 @@
     alloclen = 1000;
     buf=HeapAlloc(GetProcessHeap(), 0, alloclen);
     if(buf == NULL) {
-        WARN("Memory exausted while fetching version info!");
+        WARN("Memory exausted while fetching version info!\n");
         return NULL;
     }
     while (1) {
@@ -309,7 +309,7 @@
 	    HeapFree(GetProcessHeap(), 0, buf);
 	    buf = HeapAlloc(GetProcessHeap(), 0, alloclen);
             if(buf == NULL) {
-               WARN("Memory exausted while fetching version info!");
+               WARN("Memory exausted while fetching version info!\n");
                return NULL;
             }                                                                 
 	} else {
Index: dlls/winaspi/aspi.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/winaspi/aspi.c,v
retrieving revision 1.11
diff -u -r1.11 aspi.c
--- dlls/winaspi/aspi.c	2001/01/22 02:17:30	1.11
+++ dlls/winaspi/aspi.c	2001/05/09 02:17:29
@@ -95,7 +95,7 @@
         SetLastError( ERROR_BAD_FORMAT );
         break;
     default:
-        WARN( "unknown file error: %s", strerror(save_errno) );
+        WARN( "unknown file error: %s\n", strerror(save_errno) );
         SetLastError( ERROR_GEN_FAILURE );
         break;
     }
Index: dlls/wininet/internet.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/wininet/internet.c,v
retrieving revision 1.16
diff -u -r1.16 internet.c
--- dlls/wininet/internet.c	2001/01/06 00:36:43	1.16
+++ dlls/wininet/internet.c	2001/05/09 02:17:30
@@ -909,7 +909,7 @@
        }
 
        default:
-         FIXME("Stub!");
+         FIXME("Stub!\n");
          break;
     }
 
@@ -986,7 +986,7 @@
       *
       * So someone needs to implement this.
       */
-     FIXME("Unimplemented with URL of NULL");
+     FIXME("Unimplemented with URL of NULL\n");
      return TRUE;
   }
   else
Index: dlls/winmm/driver.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/winmm/driver.c,v
retrieving revision 1.5
diff -u -r1.5 driver.c
--- dlls/winmm/driver.c	2001/01/17 21:52:42	1.5
+++ dlls/winmm/driver.c	2001/05/09 02:17:31
@@ -35,7 +35,7 @@
     LPWINE_DRIVER	lpDrv;
     WORD		count = 0;
 
-    if (lpNewDrv->dwFlags & WINE_GDF_16BIT) ERR("OOOch");
+    if (lpNewDrv->dwFlags & WINE_GDF_16BIT) ERR("OOOch\n");
     for (lpDrv = lpDrvItemList; lpDrv; lpDrv = lpDrv->lpNextItem) {
 	if (!(lpDrv->dwFlags & WINE_GDF_16BIT) &&
 	    lpDrv->d.d32.hModule == lpNewDrv->d.d32.hModule) {
Index: dlls/winmm/mci.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/winmm/mci.c,v
retrieving revision 1.17
diff -u -r1.17 mci.c
--- dlls/winmm/mci.c	2001/01/28 23:11:27	1.17
+++ dlls/winmm/mci.c	2001/05/09 02:17:32
@@ -732,7 +732,7 @@
 		    if ((dwRet = MCI_GetString((LPSTR*)&data[offset], &args)))
 			return dwRet;
 		    break;
-		default:	ERR("oops");
+		default:	ERR("oops\n");
 		}
 		/* exit inside while loop, except if just entered in constant area definition */
 		if (!inCst || eid != MCI_CONSTANT) eid = MCI_END_COMMAND;
@@ -749,7 +749,7 @@
 		case MCI_END_CONSTANT:		
 		case MCI_STRING:		offset++; break;
 		case MCI_RECT:			offset += 4; break;
-		default:			ERR("oops");
+		default:			ERR("oops\n");
 		}
 	    }
 	} while (eid != MCI_END_COMMAND);
Index: dlls/winmm/mciavi/mmoutput.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/winmm/mciavi/mmoutput.c,v
retrieving revision 1.1
diff -u -r1.1 mmoutput.c
--- dlls/winmm/mciavi/mmoutput.c	2001/02/14 21:49:22	1.1
+++ dlls/winmm/mciavi/mmoutput.c	2001/05/09 02:17:32
@@ -457,7 +457,7 @@
     }
     
     if (wma->dwCurrVideoFrame != 0 && wma->lpWaveFormat) {
-	FIXME("Should recompute dwCurrAudioBlock, except unsynchronized sound & video");
+	FIXME("Should recompute dwCurrAudioBlock, except unsynchronized sound & video\n");
     }
     wma->dwCurrAudioBlock = 0;
     
Index: dlls/winmm/mciavi/wnd.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/winmm/mciavi/wnd.c,v
retrieving revision 1.1
diff -u -r1.1 wnd.c
--- dlls/winmm/mciavi/wnd.c	2001/02/14 21:49:22	1.1
+++ dlls/winmm/mciavi/wnd.c	2001/05/09 02:17:33
@@ -164,7 +164,7 @@
 	GetClientRect(wma->hWnd, &lpParms->rc);
     }
     if (dwFlags & MCI_DGV_WHERE_FRAME) {
-	FIXME(x = "Frame");
+	FIXME(x = "Frame\n");
 	return MCIERR_UNRECOGNIZED_COMMAND;
     }
     if (dwFlags & MCI_DGV_WHERE_SOURCE) {
@@ -174,7 +174,7 @@
 	lpParms->rc.bottom = wma->mah.dwHeight;
     }
     if (dwFlags & MCI_DGV_WHERE_VIDEO) {
-	FIXME(x = "Video");
+	FIXME(x = "Video\n");
 	return MCIERR_UNRECOGNIZED_COMMAND;
     }
     if (dwFlags & MCI_DGV_WHERE_WINDOW) {
Index: dlls/winmm/mcicda/mcicda.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/winmm/mcicda/mcicda.c,v
retrieving revision 1.17
diff -u -r1.17 mcicda.c
--- dlls/winmm/mcicda/mcicda.c	2001/03/21 20:31:26	1.17
+++ dlls/winmm/mcicda/mcicda.c	2001/05/09 02:17:33
@@ -241,7 +241,7 @@
     }
     if (dwFlags & MCI_OPEN_ELEMENT) {
         if (dwFlags & MCI_OPEN_ELEMENT_ID) {
-            WARN("MCI_OPEN_ELEMENT_ID %8lx ! Abort", (DWORD)lpOpenParms->lpstrElementName);
+            WARN("MCI_OPEN_ELEMENT_ID %8lx ! Abort\n", (DWORD)lpOpenParms->lpstrElementName);
             return MCIERR_NO_ELEMENT_ALLOWED;
         }
         WARN("MCI_OPEN_ELEMENT %s ignored\n",lpOpenParms->lpstrElementName);
Index: dlls/winmm/wineoss/audio.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/winmm/wineoss/audio.c,v
retrieving revision 1.39
diff -u -r1.39 audio.c
--- dlls/winmm/wineoss/audio.c	2001/04/13 22:26:51	1.39
+++ dlls/winmm/wineoss/audio.c	2001/05/09 02:17:34
@@ -1864,7 +1864,7 @@
 	    switch (msg.message) {
 	    case WINE_WM_PAUSING:
 		wwi->state = WINE_WS_PAUSED;
-                /*FIXME("Device should stop recording");*/
+                /*FIXME("Device should stop recording\n");*/
 		SetEvent(wwi->hEvent);
 		break;
 	    case WINE_WM_RESTARTING:
Index: dlls/winspool/info.c
===================================================================
RCS file: /home/cvs/wine/wine/dlls/winspool/info.c,v
retrieving revision 1.35
diff -u -r1.35 info.c
--- dlls/winspool/info.c	2001/04/27 18:02:46	1.35
+++ dlls/winspool/info.c	2001/05/09 02:17:38
@@ -2123,7 +2123,7 @@
 	return FALSE;
     }
     if(!pDriverInfo) {
-        WARN("pDriverInfo == NULL");
+        WARN("pDriverInfo == NULL\n");
 	SetLastError(ERROR_INVALID_PARAMETER);
 	return FALSE;
     }
Index: files/profile.c
===================================================================
RCS file: /home/cvs/wine/wine/files/profile.c,v
retrieving revision 1.47
diff -u -r1.47 profile.c
--- files/profile.c	2001/03/23 19:13:23	1.47
+++ files/profile.c	2001/05/09 02:17:42
@@ -991,8 +993,7 @@
 	retval = def;
     }
 
-    TRACE("(\"%s\", \"%s\", %s), "
-		    "[%c], ret %s.\n", section, key_name,
+    TRACE("(\"%s\", \"%s\", %s), [%c], ret %s.\n", section, key_name,
 		    def ? "TRUE" : "FALSE", key_value[0],
 		    retval ? "TRUE" : "FALSE");
 
Index: graphics/win16drv/init.c
===================================================================
RCS file: /home/cvs/wine/wine/graphics/win16drv/init.c,v
retrieving revision 1.31
diff -u -r1.31 init.c
--- graphics/win16drv/init.c	2001/03/20 01:55:18	1.31
+++ graphics/win16drv/init.c	2001/05/09 02:17:42
@@ -234,7 +234,7 @@
     
     printerDevCaps = (DeviceCaps *) calloc(1, sizeof(DeviceCaps));
     if(printerDevCaps == NULL) {
-        ERR("No memory to read the device capabilities!");
+        ERR("No memory to read the device capabilities!\n");
         HeapFree( GetProcessHeap(), 0, physDev );
         return FALSE;
     }
Index: graphics/x11drv/palette.c
===================================================================
RCS file: /home/cvs/wine/wine/graphics/x11drv/palette.c,v
retrieving revision 1.21
diff -u -r1.21 palette.c
--- graphics/x11drv/palette.c	2001/04/16 19:33:25	1.21
+++ graphics/x11drv/palette.c	2001/05/09 02:17:42
@@ -891,7 +891,7 @@
     mapping = HeapReAlloc( GetProcessHeap(), 0, palPtr->mapping,
                            sizeof(int)*palPtr->logpalette.palNumEntries);
     if(mapping == NULL) {
-        ERR("Can not allocate new mapping -- memory exausted!");
+        ERR("Can not allocate new mapping -- memory exausted!\n");
         return 0;
     }
     palPtr->mapping = mapping;
Index: graphics/x11drv/xfont.c
===================================================================
RCS file: /home/cvs/wine/wine/graphics/x11drv/xfont.c,v
retrieving revision 1.71
diff -u -r1.71 xfont.c
--- graphics/x11drv/xfont.c	2001/04/16 18:55:02	1.71
+++ graphics/x11drv/xfont.c	2001/05/09 02:17:45
@@ -616,7 +616,7 @@
    j = strlen(lfd->pixel_size);
    if( j == 0 || j > 3 )
    {
-       WARN(ridiculous, fullname, "pixel_size");
+       WARN(ridiculous, fullname, "pixel_size\n");
        return FALSE;
    }
    if( !(fi->lfd_height = atoi(lfd->pixel_size)) )
@@ -625,7 +625,7 @@
    j = strlen(lfd->point_size);
    if( j == 0 || j > 3 )
    {
-       WARN(ridiculous, fullname, "point_size");
+       WARN(ridiculous, fullname, "point_size\n");
        return FALSE;
    }
    if( !(atoi(lfd->point_size)) )
@@ -634,7 +634,7 @@
    j = strlen(lfd->resolution_x);
    if( j == 0 || j > 3 )
    {
-       WARN(ridiculous, fullname, "resolution_x");
+       WARN(ridiculous, fullname, "resolution_x\n");
        return FALSE;
    }
    if( !(fi->lfd_resolution = atoi(lfd->resolution_x)) )
@@ -643,7 +643,7 @@
    j = strlen(lfd->resolution_y);
    if( j == 0 || j > 3 )
    {
-       WARN(ridiculous, fullname, "resolution_y");
+       WARN(ridiculous, fullname, "resolution_y\n");
        return FALSE;
    }
    if( !(atoi(lfd->resolution_y)) )
@@ -691,7 +691,7 @@
    j = strlen(lpstr);
    if( j == 0 || j > 3 )
    {
-       WARN(ridiculous, fullname, "average_width");
+       WARN(ridiculous, fullname, "average_width\n");
        return FALSE;
    }
 
Index: memory/global.c
===================================================================
RCS file: /home/cvs/wine/wine/memory/global.c,v
retrieving revision 1.50
diff -u -r1.50 global.c
--- memory/global.c	2001/02/23 01:35:36	1.50
+++ memory/global.c	2001/05/09 02:17:50
@@ -1435,7 +1435,7 @@
       }
       else
       {
-	 WARN("Invalid handle: %04x", hmem);
+	 WARN("Invalid handle: %04x\n", hmem);
 	 retval=0;
       }
       /* HeapUnlock(GetProcessHeap()); */
Index: msdos/int10.c
===================================================================
RCS file: /home/cvs/wine/wine/msdos/int10.c,v
retrieving revision 1.30
diff -u -r1.30 int10.c
--- msdos/int10.c	2000/12/02 20:18:09	1.30
+++ msdos/int10.c	2001/05/09 02:17:50
@@ -479,12 +479,12 @@
                           (AH_reg(context) == 0x09) ? BL_reg(context) : -1,
                           CX_reg(context));
            if (CX_reg(context) > 1)
-              TRACE("Write Character%s at Cursor Position "
-                 "(Rep. %d): %c\n", (AH_reg(context) == 0x09) ? " and Attribute" : "",
+              TRACE("Write Character%s at Cursor Position (Rep. %d): %c\n",
+                    (AH_reg(context) == 0x09) ? " and Attribute" : "",
                  CX_reg(context), AL_reg(context));
            else
-              TRACE("Write Character%s at Cursor "
-                "Position: %c\n", (AH_reg(context) == 0x09) ? " and Attribute" : "",
+              TRACE("Write Character%s at Cursor Position: %c\n",
+                    (AH_reg(context) == 0x09) ? " and Attribute" : "",
                 AL_reg(context));
        }
        break;
Index: msdos/int21.c
===================================================================
RCS file: /home/cvs/wine/wine/msdos/int21.c,v
retrieving revision 1.60
diff -u -r1.60 int21.c
--- msdos/int21.c	2001/04/04 00:21:05	1.60
+++ msdos/int21.c	2001/05/09 02:17:52
@@ -1739,7 +1739,7 @@
 	case 0x52:  /* DR-DOS version */
             /* This is not DR-DOS */
 
-            TRACE("GET DR-DOS VERSION requested");
+            TRACE("GET DR-DOS VERSION requested\n");
 
             AX_reg(context) = 0x0001; /* Invalid function */
             SET_CFLAG(context);       /* Error */
Index: msdos/ioports.c
===================================================================
RCS file: /home/cvs/wine/wine/msdos/ioports.c,v
retrieving revision 1.23
diff -u -r1.23 ioports.c
--- msdos/ioports.c	2000/12/26 00:22:46	1.23
+++ msdos/ioports.c	2001/05/09 02:17:52
@@ -95,7 +95,7 @@
             Dosvm.SetTimer(maxval);
             break;
         case 1: /* RAM refresh */
-            FIXME("RAM refresh counter handling not implemented !");
+            FIXME("RAM refresh counter handling not implemented !\n");
             break;
         case 2: /* cassette & speaker */
             /* speaker on ? */
Index: objects/palette.c
===================================================================
RCS file: /home/cvs/wine/wine/objects/palette.c,v
retrieving revision 1.32
diff -u -r1.32 palette.c
--- objects/palette.c	2001/02/20 00:55:18	1.32
+++ objects/palette.c	2001/05/09 02:17:52
@@ -71,7 +71,7 @@
     if (palObj)
     {
         if (!(palObj->mapping = HeapAlloc( GetProcessHeap(), 0, sizeof(int) * 20 )))
-            ERR("Can not create palette mapping -- out of memory!");
+            ERR("Can not create palette mapping -- out of memory!\n");
         GDI_ReleaseObj( hpalette );
     }
     return hpalette;
@@ -333,7 +333,7 @@
                                     mapping, cEntries * sizeof(int) );
 	if(newMap == NULL) 
         {
-            ERR("Can not resize mapping -- out of memory!");
+            ERR("Can not resize mapping -- out of memory!\n");
             GDI_ReleaseObj( hPal );
             return FALSE;
         }
Index: windows/clipboard.c
===================================================================
RCS file: /home/cvs/wine/wine/windows/clipboard.c,v
retrieving revision 1.36
diff -u -r1.36 clipboard.c
--- windows/clipboard.c	2001/02/20 01:54:08	1.36
+++ windows/clipboard.c	2001/05/09 02:17:57
@@ -796,7 +796,7 @@
 
     if (hClipLock != GetCurrentTask())
     {
-        WARN("Clipboard not opened by calling task!");
+        WARN("Clipboard not opened by calling task!\n");
         return FALSE;
     }
     
@@ -1046,7 +1046,7 @@
 
     if (CLIPBOARD_IsLocked())
     {
-        WARN("Clipboard not opened by calling task!");
+        WARN("Clipboard not opened by calling task!\n");
         return 0;
     }
 
@@ -1168,7 +1168,7 @@
 
     if (CLIPBOARD_IsLocked())
     {
-        WARN("Clipboard not opened by calling task!");
+        WARN("Clipboard not opened by calling task!\n");
         return 0;
     }
 
@@ -1207,7 +1207,7 @@
 
     lpNewFormat = (LPWINE_CLIPFORMAT)HeapAlloc(GetProcessHeap(), 0, sizeof(WINE_CLIPFORMAT));
     if(lpNewFormat == NULL) {
-        WARN("No more memory for a new format!");
+        WARN("No more memory for a new format!\n");
         return 0;
     }
     lpFormat->NextFormat = lpNewFormat;
@@ -1216,7 +1216,7 @@
 
     lpNewFormat->Name = (LPSTR)HEAP_strdupA(GetProcessHeap(), 0, FormatName);
     if(lpNewFormat->Name == NULL) {
-        WARN("No more memory for the new format name!");
+        WARN("No more memory for the new format name!\n");
         HeapFree(GetProcessHeap(), 0, lpNewFormat);
         return 0;
     }
Index: windows/defwnd.c
===================================================================
RCS file: /home/cvs/wine/wine/windows/defwnd.c,v
retrieving revision 1.53
diff -u -r1.53 defwnd.c
--- windows/defwnd.c	2001/04/24 23:28:52	1.53
+++ windows/defwnd.c	2001/05/09 02:17:58
@@ -70,7 +70,7 @@
     if ((wndPtr->text = HeapAlloc(GetProcessHeap(), 0, count * sizeof(WCHAR))))
         MultiByteToWideChar( CP_ACP, 0, text, -1, wndPtr->text, count );
     else
-        ERR("Not enough memory for window text");
+        ERR("Not enough memory for window text\n");
 
     if (USER_Driver.pSetWindowText)
         USER_Driver.pSetWindowText(wndPtr->hwndSelf, wndPtr->text);
@@ -93,7 +93,7 @@
     if ((wndPtr->text = HeapAlloc(GetProcessHeap(), 0, count * sizeof(WCHAR))))
 	strcpyW( wndPtr->text, text );
     else
-        ERR("Not enough memory for window text");
+        ERR("Not enough memory for window text\n");
 
     if (USER_Driver.pSetWindowText)
         USER_Driver.pSetWindowText(wndPtr->hwndSelf, wndPtr->text);
Index: windows/scroll.c
===================================================================
RCS file: /home/cvs/wine/wine/windows/scroll.c,v
retrieving revision 1.30
diff -u -r1.30 scroll.c
--- windows/scroll.c	2001/04/24 23:28:52	1.30
+++ windows/scroll.c	2001/05/09 02:17:59
@@ -268,11 +268,11 @@
         HRGN  hrgnTemp = CreateRectRgnIndirect(&rc);
         RECT  caretrc;
 
-TRACE("%04x, %d,%d hrgnUpdate=%04x rcUpdate = %p \
-cliprc = (%d,%d-%d,%d), rc=(%d,%d-%d,%d) %04x\n",             
-(HWND16)hwnd, dx, dy, hrgnUpdate, rcUpdate,
-clipRect?clipRect->left:0, clipRect?clipRect->top:0, clipRect?clipRect->right:0, clipRect?clipRect->bottom:0,
-rc.left, rc.top, rc.right, rc.bottom, (UINT16)flags );
+        TRACE("%04x, %d,%d hrgnUpdate=%04x rcUpdate = %p cliprc = (%d,%d-%d,%d), rc=(%d,%d-%d,%d) %04x\n",
+              (HWND16)hwnd, dx, dy, hrgnUpdate, rcUpdate,
+              clipRect?clipRect->left:0, clipRect?clipRect->top:0,
+              clipRect?clipRect->right:0, clipRect?clipRect->bottom:0,
+              rc.left, rc.top, rc.right, rc.bottom, (UINT16)flags );
 
         caretrc = rc; 
 	bCaret = SCROLL_FixCaret(hwnd, &caretrc, flags);
Index: windows/x11drv/event.c
===================================================================
RCS file: /home/cvs/wine/wine/windows/x11drv/event.c,v
retrieving revision 1.94
diff -u -r1.94 event.c
--- windows/x11drv/event.c	2001/04/30 18:16:51	1.94
+++ windows/x11drv/event.c	2001/05/09 02:18:01
@@ -1061,7 +1061,7 @@
     }
     
     /* Update the X property */
-    TRACE("\tUpdating property %s...", TSXGetAtomName(display, rprop));
+    TRACE("\tUpdating property %s...\n", TSXGetAtomName(display, rprop));
 
     /* We may want to consider setting the type to xaTargets instead,
      * in case some apps expect this instead of XA_ATOM */
@@ -1363,7 +1363,7 @@
               /* We must have a non "None" property to service a MULTIPLE target atom */
               if ( !targetPropList[i+1] )
               {
-                  TRACE("\tMULTIPLE(%d): Skipping target with empty property!", i);
+                  TRACE("\tMULTIPLE(%d): Skipping target with empty property!\n", i);
                   continue;
               }
               
@@ -1502,7 +1502,7 @@
 static void EVENT_PropertyNotify( XPropertyEvent *event )
 {
   /* Check if we have any resources to free */
-  TRACE("Received PropertyNotify event: ");
+  TRACE("Received PropertyNotify event: \n");
 
   switch(event->state)
   {
Index: windows/x11drv/keyboard.c
===================================================================
RCS file: /home/cvs/wine/wine/windows/x11drv/keyboard.c,v
retrieving revision 1.89
diff -u -r1.89 keyboard.c
--- windows/x11drv/keyboard.c	2001/05/05 00:49:16	1.89
+++ windows/x11drv/keyboard.c	2001/05/09 02:18:02
@@ -692,7 +692,7 @@
 
     TRACE("called\n");
     if (!TSXQueryKeymap(display, keys_return)) {
-        ERR("Error getting keymap !");
+        ERR("Error getting keymap !\n");
         return;
     }
 
@@ -850,7 +850,7 @@
 
   syms = keysyms_per_keycode;
   if (syms > 4) {
-    WARN("%d keysyms per keycode not supported, set to 4", syms);
+    WARN("%d keysyms per keycode not supported, set to 4\n", syms);
     syms = 4;
   }
   for (current = 0; main_key_tab[current].comment; current++) {
Index: windows/x11drv/wineclipsrv.c
===================================================================
RCS file: /home/cvs/wine/wine/windows/x11drv/wineclipsrv.c,v
retrieving revision 1.4
diff -u -r1.4 wineclipsrv.c
--- windows/x11drv/wineclipsrv.c	2000/11/26 04:04:22	1.4
+++ windows/x11drv/wineclipsrv.c	2001/05/09 02:18:03
@@ -842,7 +842,7 @@
               /* We must have a non "None" property to service a MULTIPLE target atom */
               if ( !targetPropList[i+1] )
               {
-                  TRACE("\tMULTIPLE(%d): Skipping target with empty property!", i);
+                  TRACE("\tMULTIPLE(%d): Skipping target with empty property!\n", i);
                   continue;
               }
               


More information about the wine-patches mailing list