diff --git a/controls/menu.c b/controls/menu.c
index 2bd9f359c40403d79d53a56d0230e720e346cfd5..49201ecaa31f4016c3bd8971120c6ca01f496dfb 100644
--- a/controls/menu.c
+++ b/controls/menu.c
@@ -3630,7 +3630,7 @@ BOOL WINAPI InsertMenuW( HMENU hMenu, UINT pos, UINT flags,
 
     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",
diff --git a/dlls/comctl32/commctrl.c b/dlls/comctl32/commctrl.c
index aed7a6d2eba6ff206f877105b8e11bab6c591a27..25db18a35951dd4522c621dc8c30cd6dc788130d 100644
--- a/dlls/comctl32/commctrl.c
+++ b/dlls/comctl32/commctrl.c
@@ -879,7 +879,7 @@ HRESULT WINAPI
 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 @@ _TrackMouseEvent (TRACKMOUSEEVENT *ptme)
     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;
     }
diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index cff5129de77190aa8a3bacde04789526dacb1c90..2e5001706889db6e4059f32b7b190dc7cc31fafc 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -3035,8 +3035,8 @@ static VOID LISTVIEW_DrawLargeItem(HWND hwnd, HDC hdc, INT nItem, RECT rcItem,
   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 +8506,7 @@ static LRESULT LISTVIEW_NotifyFormat(HWND hwndFrom, HWND hwnd, INT nCommand)
                                          (WPARAM)hwnd, (LPARAM)NF_QUERY);
     if (infoPtr->notifyFormat == NFR_UNICODE)
     {
-      FIXME("NO support for unicode structures");
+      FIXME("NO support for unicode structures\n");
     }
   }
 
diff --git a/dlls/comctl32/treeview.c b/dlls/comctl32/treeview.c
index 6e9549e8fc650ef406692b3cc28bc0f369f7de35..86a763d1e5045880774bbecfb260bf28223fd879 100644
--- a/dlls/comctl32/treeview.c
+++ b/dlls/comctl32/treeview.c
@@ -3450,7 +3450,7 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel)
 
 	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 @@ TREEVIEW_EndEditLabelNow(TREEVIEW_INFO *infoPtr, BOOL bCancel)
 	{
 	    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;
diff --git a/dlls/commdlg/filedlg.c b/dlls/commdlg/filedlg.c
index 9aa2a5f7035f27b8f38212bb403a52dbd856573c..44eb8cc498d0d2b390749676fcc8610ddecbc879 100644
--- a/dlls/commdlg/filedlg.c
+++ b/dlls/commdlg/filedlg.c
@@ -543,8 +543,8 @@ static LONG FILEDLG_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam)
                                    (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 @@ static LONG FILEDLG_WMInitDialog(HWND hWnd, WPARAM wParam, LPARAM lParam)
 				       (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;
diff --git a/dlls/ddraw/ddraw/main.c b/dlls/ddraw/ddraw/main.c
index 99c6a8f7506785e0ccd1653a675f45967bc55599..6f9b6382ced174eec55964810fb6729c9088bb0d 100644
--- a/dlls/ddraw/ddraw/main.c
+++ b/dlls/ddraw/ddraw/main.c
@@ -1246,7 +1246,7 @@ Uninit_DirectDraw_Initialize(LPDIRECTDRAW7 iface, LPGUID pDeviceGuid)
     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.) */
diff --git a/dlls/dinput/mouse/main.c b/dlls/dinput/mouse/main.c
index f96d86785602eec710ad101ea3c6c700811e8e76..0ab0199de268f644180fc7ccb91430bb15eadef1 100644
--- a/dlls/dinput/mouse/main.c
+++ b/dlls/dinput/mouse/main.c
@@ -305,8 +305,8 @@ static HRESULT WINAPI SysMouseAImpl_SetDataFormat(
   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);
diff --git a/dlls/dsound/dsound_main.c b/dlls/dsound/dsound_main.c
index 0504517c8af9afff5d1363d6adfbf7773fe73652..ea84913af59876a26a0b81d7ff97ca9b4e365cd8 100644
--- a/dlls/dsound/dsound_main.c
+++ b/dlls/dsound/dsound_main.c
@@ -2412,7 +2412,7 @@ static inline void get_fields(const IDirectSoundBufferImpl *dsb, BYTE *buf, INT
 {
 	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 @@ static void DSOUND_Mixer3D(IDirectSoundBufferImpl *dsb, BYTE *buf, INT len)
 	obp = buf;
 
 	if (buf_mixpos > buflen) {
-		FIXME("Major breakage");
+		FIXME("Major breakage\n");
 		return;
 	}
 
diff --git a/dlls/imm32/imc.c b/dlls/imm32/imc.c
index 115812e11224d2b417405870e0c3d7bbc376f84a..5d27182fe43ff58089ff1d7822a5accbc94cb10a 100644
--- a/dlls/imm32/imc.c
+++ b/dlls/imm32/imc.c
@@ -161,7 +161,7 @@ static BOOL IMM32_DestroyIMC( HIMC hIMC )
 
 	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 )
diff --git a/dlls/imm32/imewnd.c b/dlls/imm32/imewnd.c
index deda449d4821f8daf1270c1661024a0b57a5406b..a305d2c02863b556a2d62b6598f256c6b07c9f5b 100644
--- a/dlls/imm32/imewnd.c
+++ b/dlls/imm32/imewnd.c
@@ -191,10 +191,10 @@ LRESULT CALLBACK IMM32_IMEWndProc( HWND hwnd, UINT nMsg,
 	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",
diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c
index fdc877f7802cd6e05cfa73344afb1e5b4990dafa..45153ca58ad6df3e450e1d645b8eae3aeb981333 100644
--- a/dlls/imm32/imm.c
+++ b/dlls/imm32/imm.c
@@ -178,7 +178,7 @@ LONG WINAPI ImmGetCompositionStringA(
   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 @@ LONG WINAPI ImmGetCompositionStringW(
   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 @@ UINT WINAPI ImmGetVirtualKey(HWND hWnd)
   case VER_PLATFORM_WIN32_NT:
       return 0;
   default:
-      FIXME("%ld not supported",version.dwPlatformId);
+      FIXME("%ld not supported\n",version.dwPlatformId);
       return VK_PROCESSKEY;
   }
 }
diff --git a/dlls/imm32/memory.c b/dlls/imm32/memory.c
index 991aeaf240dd9592bd19c5f90688f1b330e22f10..5b5f3235874b5aaa0c3b410739b94385f0d1f6f6 100644
--- a/dlls/imm32/memory.c
+++ b/dlls/imm32/memory.c
@@ -89,7 +89,7 @@ LPVOID IMM32_MoveableLock( IMM32_MOVEABLEMEM* lpMoveable )
 {
 	if ( lpMoveable->dwLockCount == IMM32_MOVEABLEMEM_LOCK_MAX )
 	{
-		ERR( "lock count is 0xffffffff." );
+		ERR( "lock count is 0xffffffff\n" );
 	}
 	else
 	{
diff --git a/dlls/kernel/utthunk.c b/dlls/kernel/utthunk.c
index 74f42c1b1b07ade9f44b83d5a43c1878120e32cf..9497b60ab52f3850f66276edf4b7e65b1ff01cf6 100644
--- a/dlls/kernel/utthunk.c
+++ b/dlls/kernel/utthunk.c
@@ -108,7 +108,7 @@ static DWORD WINAPI UTGlue32( FARPROC16 target, LPVOID lpBuff, DWORD dwUserDefin
         segptrList = HeapAlloc( GetProcessHeap(), 0, sizeof(SEGPTR)*nList );
         if ( !segptrList )
         {
-            FIXME("Unable to allocate segptrList!" );
+            FIXME("Unable to allocate segptrList!\n" );
             return 0;
         }
 
diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c
index bcbdfd5959d8e6eec7505c4510e9f63b4ad663a5..925e58484fdac28564a885b96cec7734176c51bb 100644
--- a/dlls/msvcrt/file.c
+++ b/dlls/msvcrt/file.c
@@ -566,7 +566,7 @@ int _fstat(int fd, struct _stat* buf)
     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);
diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c
index 60156f3902763641aeda9c39eb860ef1cd5aad02..83d8d36ba6dd21733ba5a693ad3bedc35c67ddf9 100644
--- a/dlls/msvcrt/locale.c
+++ b/dlls/msvcrt/locale.c
@@ -406,7 +406,7 @@ char* MSVCRT_setlocale(int category, const char* locale)
 
   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 @@ const char* _Getdays(void)
   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 @@ const char* _Getmonths(void)
                 "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* _Getmonths(void)
 const char* _Getnames(void)
 {
   /* FIXME: */
-  TRACE("(void) stub");
+  TRACE("(void) stub\n");
   return "";
 }
 
@@ -490,7 +490,7 @@ const char* _Strftime(char *out, unsigned int len, const char *fmt,
                                      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 "";
 }
 
diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c
index 25a4aae0e06f0143fe3888f29c3f15fe60dcbd41..df881243eb2cea0ee49e4e6574e634e149467b46 100644
--- a/dlls/msvcrt/math.c
+++ b/dlls/msvcrt/math.c
@@ -719,7 +719,7 @@ MSVCRT_ldiv_t MSVCRT_ldiv(long num, long denom)
  */
 void _adj_fdiv_m16i(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -733,7 +733,7 @@ void _adj_fdiv_m16i(void)
  */
 void _adj_fdiv_m32(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -747,7 +747,7 @@ void _adj_fdiv_m32(void)
  */
 void _adj_fdiv_m32i(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -761,7 +761,7 @@ void _adj_fdiv_m32i(void)
  */
 void _adj_fdiv_m64(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -775,7 +775,7 @@ void _adj_fdiv_m64(void)
  */
 void _adj_fdiv_r(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -789,7 +789,7 @@ void _adj_fdiv_r(void)
  */
 void _adj_fdivr_m16i(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -803,7 +803,7 @@ void _adj_fdivr_m16i(void)
  */
 void _adj_fdivr_m32(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -817,7 +817,7 @@ void _adj_fdivr_m32(void)
  */
 void _adj_fdivr_m32i(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -831,7 +831,7 @@ void _adj_fdivr_m32i(void)
  */
 void _adj_fdivr_m64(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -845,7 +845,7 @@ void _adj_fdivr_m64(void)
  */
 void _adj_fpatan(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -859,7 +859,7 @@ void _adj_fpatan(void)
  */
 void _adj_fprem(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -873,7 +873,7 @@ void _adj_fprem(void)
  */
 void _adj_fprem1(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -887,7 +887,7 @@ void _adj_fprem1(void)
  */
 void _adj_fptan(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -898,7 +898,7 @@ void _adj_fptan(void)
  */
 void _adjust_fdiv(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -912,7 +912,7 @@ void _adjust_fdiv(void)
  */
 void _safe_fdiv(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -926,7 +926,7 @@ void _safe_fdiv(void)
  */
 void _safe_fdivr(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -940,7 +940,7 @@ void _safe_fdivr(void)
  */
 void _safe_fprem(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 /***********************************************************************
@@ -955,7 +955,7 @@ void _safe_fprem(void)
  */
 void _safe_fprem1(void)
 {
-  TRACE("(): stub");
+  TRACE("(): stub\n");
 }
 
 
diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
index 6144c48c5ac578a3595a1981f62cb43120d497e4..6bf55f4b9fa1181928118d34d1838d0513629a6a 100644
--- a/dlls/odbc32/proxyodbc.c
+++ b/dlls/odbc32/proxyodbc.c
@@ -240,7 +240,7 @@ BOOL ODBC_LoadDMFunctions()
 
         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 @@ SQLRETURN WINAPI SQLDataSources(SQLHENV EnvironmentHandle,
         {
            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;
diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c
index d6e4c1d0f063e2a3a6a2ad7776c9b43871a63740..f45303a7da816fcda8676d9b356b02ae8f979492 100644
--- a/dlls/ole32/bindctx.c
+++ b/dlls/ole32/bindctx.c
@@ -309,7 +309,7 @@ HRESULT WINAPI BindCtxImpl_SetBindOptions(IBindCtx* iface,LPBIND_OPTS2 pbindopts
     
     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 @@ HRESULT WINAPI BindCtxImpl_GetBindOptions(IBindCtx* iface,LPBIND_OPTS2 pbindopts
 
     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);
diff --git a/dlls/ole32/compositemoniker.c b/dlls/ole32/compositemoniker.c
index e844c9dc77445e944208d12ad24a36562125dd28..47f9e6b20ef48d8197d0782cf08086e971f0e9e4 100644
--- a/dlls/ole32/compositemoniker.c
+++ b/dlls/ole32/compositemoniker.c
@@ -340,8 +340,10 @@ HRESULT WINAPI CompositeMonikerImpl_Load(IMoniker* iface,IStream* pStm)
         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;
         }
diff --git a/dlls/ole32/filemoniker.c b/dlls/ole32/filemoniker.c
index d82f46e1174a8dd2c3c6988dcf25a7f8d3b4a277..818da5f03606677fc2bddd5703018aa582814aad 100644
--- a/dlls/ole32/filemoniker.c
+++ b/dlls/ole32/filemoniker.c
@@ -595,7 +595,7 @@ HRESULT WINAPI FileMonikerImpl_BindToObject(IMoniker* iface,
         }
         if (pca!=NULL){
 
-            FIXME("()");
+            FIXME("()\n");
             
             /*res=GetClassFile(This->filePathName,&clsID);
 
@@ -610,7 +610,7 @@ HRESULT WINAPI FileMonikerImpl_BindToObject(IMoniker* iface,
                 }
             }*/
         }
-}
+    }
 
     if (pObj!=NULL){
         /* get the requested interface from the loaded class */
diff --git a/dlls/oleaut32/safearray.c b/dlls/oleaut32/safearray.c
index 7a8527d899183cdcd41c8e2fb0d944cf00cc2523..abb5b3d0e5d3b9e03f82b4c57990395fe0867e77 100644
--- a/dlls/oleaut32/safearray.c
+++ b/dlls/oleaut32/safearray.c
@@ -1062,7 +1062,7 @@ HRESULT WINAPI SafeArrayGetVarType(
   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 @@ HRESULT WINAPI SafeArrayGetVarType(
     *pvt = vt;
     hr = S_OK;
   }
-  
-  TRACE("HRESULT = %08lx", hr);
+
+  TRACE("HRESULT = %08lx\n", hr);
   return hr;
 }
diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c
index af4852c12105bbe721f17317d54ec531e1b1ca08..00d2c026aeb2126749c9991ab73ec1bc5be9641b 100644
--- a/dlls/oleaut32/typelib.c
+++ b/dlls/oleaut32/typelib.c
@@ -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 @@ DWORD WINAPI OaBuildVersion16(void)
     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 @@ static void dump_Variant(VARIANT * pvar)
             break;
     }
         
-    TRACE("VARTYPE: %s", szVarType);
+    TRACE("VARTYPE: %s\n", szVarType);
     
     switch (V_VT(pvar))
     {
diff --git a/dlls/psapi/psapi_main.c b/dlls/psapi/psapi_main.c
index b258f6a7e9bf2741c147399149a3a4a18723cfc3..98626c4ac548547a485d35184a990156432c55ff 100644
--- a/dlls/psapi/psapi_main.c
+++ b/dlls/psapi/psapi_main.c
@@ -288,7 +288,7 @@ BOOL WINAPI InitializeProcessForWsWatch(HANDLE hProcess)
  */
 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 */
diff --git a/dlls/rpcrt4/rpcrt4_main.c b/dlls/rpcrt4/rpcrt4_main.c
index 7917dc430def92b103361199224d34456248135a..7480b5dcd4b9e0a0b32d924619e5cf2719eb0b19 100644
--- a/dlls/rpcrt4/rpcrt4_main.c
+++ b/dlls/rpcrt4/rpcrt4_main.c
@@ -259,7 +259,7 @@ sizeof((i).ifr_name)+(i).ifr_addr.sa_len)
    ((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;
 }
diff --git a/dlls/shell32/shell32_main.c b/dlls/shell32/shell32_main.c
index 981666cf7cbc6ef7c248fc2c93f687f841b30c4f..e55db24aae91f1a22dafa1a813168d5e15e78f5c 100644
--- a/dlls/shell32/shell32_main.c
+++ b/dlls/shell32/shell32_main.c
@@ -816,9 +816,9 @@ void WINAPI FreeIconList( DWORD dw )
 
 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;
 	}
 
diff --git a/dlls/shell32/shlfileop.c b/dlls/shell32/shlfileop.c
index da7e3de948a09fc8961c1afff47ce3d836f824c4..e1e4e5348fbd5560cd2f5a6bf5ce861c14276119 100644
--- a/dlls/shell32/shlfileop.c
+++ b/dlls/shell32/shlfileop.c
@@ -40,7 +40,7 @@ BOOL SHELL_WarnItemDelete (int nKindOfDialog, LPCSTR szDir)
 		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, 
diff --git a/dlls/shell32/shlfolder.c b/dlls/shell32/shlfolder.c
index 31fc1c7acd8bdca55bd049a856634b0ea35d3b46..7f08e5c960904d5e87efd359e22e713b0f9da3d3 100644
--- a/dlls/shell32/shlfolder.c
+++ b/dlls/shell32/shlfolder.c
@@ -1518,7 +1518,7 @@ static HRESULT WINAPI ISFHelper_fnDeleteItems(
 	    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 @@ static HRESULT WINAPI ISFHelper_fnDeleteItems(
 	    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]);
diff --git a/dlls/shell32/shlview.c b/dlls/shell32/shlview.c
index c8850d50a21b895c211fe5b4e7fcd12871001908..3d3828bcf8b0c038fef2e438e083b0f8f2372b5b 100644
--- a/dlls/shell32/shlview.c
+++ b/dlls/shell32/shlview.c
@@ -1554,7 +1554,7 @@ static HRESULT WINAPI IShellView_fnTranslateAccelerator(IShellView * iface,LPMSG
 	
 	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 */
 }
diff --git a/dlls/shlwapi/shlwapi_main.c b/dlls/shlwapi/shlwapi_main.c
index ff5a24101acbb05cdcbbb4693e4a218ba9377c76..b7c2cd1286cddf735b15f26635330e45e4094c13 100644
--- a/dlls/shlwapi/shlwapi_main.c
+++ b/dlls/shlwapi/shlwapi_main.c
@@ -62,9 +62,9 @@ BOOL WINAPI SHLWAPI_LibMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID fImpLoad
 
 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;
 	}
 
diff --git a/dlls/ttydrv/palette.c b/dlls/ttydrv/palette.c
index ec558f57b41f27fcdbd8d4e64e764d9f6da9589f..c7e06e180e745ce229ed456744ee98b9ba8b953a 100644
--- a/dlls/ttydrv/palette.c
+++ b/dlls/ttydrv/palette.c
@@ -37,7 +37,7 @@ BOOL TTYDRV_PALETTE_Initialize(void)
 
   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;
   }
 
diff --git a/dlls/user/resource.c b/dlls/user/resource.c
index e5a08025eea14b84adadda80428d0e665df24d54..0c3acf948512d6d7688ec234fbd49b421850b9c7 100644
--- a/dlls/user/resource.c
+++ b/dlls/user/resource.c
@@ -348,8 +348,8 @@ INT WINAPI LoadStringW( HINSTANCE instance, UINT resource_id,
 
     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 WINAPI LoadStringA( HINSTANCE instance, UINT resource_id,
     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);
diff --git a/dlls/version/install.c b/dlls/version/install.c
index fb4ae91bbb20caaee6ef4312452ab31ad87fdbf0..0e2a2f763bc41a639eb80335712906601802f8a4 100644
--- a/dlls/version/install.c
+++ b/dlls/version/install.c
@@ -121,7 +121,7 @@ DWORD WINAPI VerFindFileA(
     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 @@ DWORD WINAPI VerFindFileW( UINT flags,LPCWSTR lpszFilename,LPCWSTR lpszWinDir,
     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 @@ _fetch_versioninfo(LPSTR fn,VS_FIXEDFILEINFO **vffi) {
     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 @@ _fetch_versioninfo(LPSTR fn,VS_FIXEDFILEINFO **vffi) {
 	    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 {
diff --git a/dlls/winaspi/aspi.c b/dlls/winaspi/aspi.c
index 29b930d11e96a45a2c184fd4fd1de2bbf22c9ac2..0c07182fcca13b3f9dabf3b2b88901232424ee30 100644
--- a/dlls/winaspi/aspi.c
+++ b/dlls/winaspi/aspi.c
@@ -95,7 +95,7 @@ static void set_last_error(void)
         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;
     }
diff --git a/dlls/wininet/internet.c b/dlls/wininet/internet.c
index 94e367f393f4158d45b6b759f5bb0e145c089a1b..2259a463c75fc6b451b1cb94b4d3f96ac64e18eb 100644
--- a/dlls/wininet/internet.c
+++ b/dlls/wininet/internet.c
@@ -909,7 +909,7 @@ BOOL WINAPI InternetQueryOptionA(HINTERNET hInternet, DWORD dwOption,
        }
 
        default:
-         FIXME("Stub!");
+         FIXME("Stub!\n");
          break;
     }
 
@@ -986,7 +986,7 @@ BOOL WINAPI InternetCheckConnectionA( LPCSTR lpszUrl, DWORD dwFlags, DWORD dwRes
       *
       * So someone needs to implement this.
       */
-     FIXME("Unimplemented with URL of NULL");
+     FIXME("Unimplemented with URL of NULL\n");
      return TRUE;
   }
   else
diff --git a/dlls/winmm/driver.c b/dlls/winmm/driver.c
index 93ece946444ff8eb4b5a15f76898a0c9096fe3ac..8c8d1efa0eabf0b70c42cb665ca6f15de75f48c2 100644
--- a/dlls/winmm/driver.c
+++ b/dlls/winmm/driver.c
@@ -35,7 +35,7 @@ static	WORD	DRIVER_GetNumberOfModuleRefs(LPWINE_DRIVER lpNewDrv)
     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) {
diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c
index c992166a9bf1f7b856e8cb3e5bcea90bfe6a6e8c..d70af6c86ba6921813382a56ad66b4a0963676f2 100644
--- a/dlls/winmm/mci.c
+++ b/dlls/winmm/mci.c
@@ -732,7 +732,7 @@ static	DWORD	MCI_ParseOptArgs(LPDWORD data, int _offset, LPCSTR lpCmd,
 		    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 @@ static	DWORD	MCI_ParseOptArgs(LPDWORD data, int _offset, LPCSTR lpCmd,
 		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);
diff --git a/dlls/winmm/mciavi/mmoutput.c b/dlls/winmm/mciavi/mmoutput.c
index 9932ad45bcad574574c739366902ede20f738e8d..bcac07d3ea39cc4bcd7e4f33dc7c2c1ed7c11d31 100644
--- a/dlls/winmm/mciavi/mmoutput.c
+++ b/dlls/winmm/mciavi/mmoutput.c
@@ -457,7 +457,7 @@ DWORD MCIAVI_OpenAudio(WINE_MCIAVI* wma, unsigned* nHdr, LPWAVEHDR* pWaveHdr)
     }
     
     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;
     
diff --git a/dlls/winmm/mciavi/wnd.c b/dlls/winmm/mciavi/wnd.c
index b39e28dd0ec739946f5ce9e9432a546744fb6722..35b04de2d1c21ff7704828fbdb60421bb59ea8d2 100644
--- a/dlls/winmm/mciavi/wnd.c
+++ b/dlls/winmm/mciavi/wnd.c
@@ -164,7 +164,7 @@ DWORD	MCIAVI_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lpParms)
 	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 @@ DWORD	MCIAVI_mciWhere(UINT wDevID, DWORD dwFlags, LPMCI_DGV_RECT_PARMS lpParms)
 	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) {
diff --git a/dlls/winmm/mcicda/mcicda.c b/dlls/winmm/mcicda/mcicda.c
index 9267ff8c7dc3e2f458b587ab28b31b81f38108b2..d044c3430adac01ac692494e117e17415c64c0b7 100644
--- a/dlls/winmm/mcicda/mcicda.c
+++ b/dlls/winmm/mcicda/mcicda.c
@@ -241,7 +241,7 @@ static DWORD MCICDA_Open(UINT wDevID, DWORD dwFlags, LPMCI_OPEN_PARMSA lpOpenPar
     }
     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);
diff --git a/dlls/winmm/wineoss/audio.c b/dlls/winmm/wineoss/audio.c
index 1af7b8f72e555e892b55270e1cf3b84304e185e7..6585a26aa4e45475d23dd6ec082e977f23421ca1 100644
--- a/dlls/winmm/wineoss/audio.c
+++ b/dlls/winmm/wineoss/audio.c
@@ -1864,7 +1864,7 @@ static	DWORD	CALLBACK	widRecorder(LPVOID pmt)
 	    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:
diff --git a/files/profile.c b/files/profile.c
index c0db4efacac292abb4db9febe7f22f9ecdf4ee74..5ae6f65b639a08b58d6dc874434e417b6ec10e54 100644
--- a/files/profile.c
+++ b/files/profile.c
@@ -993,8 +993,7 @@ int  PROFILE_GetWineIniBool(
 	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");
 
diff --git a/graphics/win16drv/init.c b/graphics/win16drv/init.c
index e9588f92af5080275b3e8f6ea792460d16a66953..c3c3e7c350a83bc5a2d16aa86944e5dc08c088c9 100644
--- a/graphics/win16drv/init.c
+++ b/graphics/win16drv/init.c
@@ -234,7 +234,7 @@ BOOL WIN16DRV_CreateDC( DC *dc, LPCSTR driver, LPCSTR device, LPCSTR output,
     
     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;
     }
diff --git a/graphics/x11drv/palette.c b/graphics/x11drv/palette.c
index 76f23cf4a4cb01ca25662570ccc7e9f4eb4cf2ff..644c6f4bc2cd39ab2a3deec8b7089c2aea98ac52 100644
--- a/graphics/x11drv/palette.c
+++ b/graphics/x11drv/palette.c
@@ -891,7 +891,7 @@ int X11DRV_PALETTE_SetMapping( PALETTEOBJ* palPtr, UINT uStart, UINT uNum, BOOL
     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;
diff --git a/memory/global.c b/memory/global.c
index 137d0b7298b0989aee1ee2ecbeb89abaaf700a73..c6f744a15b7cab9693ae5a22be85fb0bdd21aa16 100644
--- a/memory/global.c
+++ b/memory/global.c
@@ -1435,7 +1435,7 @@ UINT WINAPI GlobalFlags(
       }
       else
       {
-	 WARN("Invalid handle: %04x", hmem);
+	 WARN("Invalid handle: %04x\n", hmem);
 	 retval=0;
       }
       /* HeapUnlock(GetProcessHeap()); */
diff --git a/msdos/int10.c b/msdos/int10.c
index 2e2a85826184ec5c35a19b0d15316174a6fdce3b..f693e27cfe55e6acd4c7fc16b2290440790b22e1 100644
--- a/msdos/int10.c
+++ b/msdos/int10.c
@@ -479,12 +479,12 @@ else {
                           (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;
diff --git a/msdos/int21.c b/msdos/int21.c
index 2497783c3e4a6d66776aa6fc2aa9a949c7a3ef5a..51e45313b1a8bfcdc77522a4817bc0c482c2282d 100644
--- a/msdos/int21.c
+++ b/msdos/int21.c
@@ -1739,7 +1739,7 @@ void WINAPI DOS3Call( CONTEXT86 *context )
 	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 */
diff --git a/msdos/ioports.c b/msdos/ioports.c
index b43bfde1a348f2e9af5c2e50fb4addcfe7bda5f2..18a73cf33bf5b8d2d41d23da4bc26d391884d7e4 100644
--- a/msdos/ioports.c
+++ b/msdos/ioports.c
@@ -95,7 +95,7 @@ static void set_timer_maxval(unsigned timer, unsigned maxval)
             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 ? */
diff --git a/objects/palette.c b/objects/palette.c
index 78ed5b61d80f75d91cdaa97263554586772d8854..1281945780c7b70e615747b33bc88c56d9d44850 100644
--- a/objects/palette.c
+++ b/objects/palette.c
@@ -71,7 +71,7 @@ HPALETTE16 PALETTE_Init(void)
     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 @@ BOOL WINAPI ResizePalette(
                                     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;
         }
diff --git a/windows/clipboard.c b/windows/clipboard.c
index d51e063a9e6969397fe629cfd64b1dc83916855b..06fe2363a6565e50aa367ee82a39c1206c2a7047 100644
--- a/windows/clipboard.c
+++ b/windows/clipboard.c
@@ -796,7 +796,7 @@ BOOL WINAPI EmptyClipboard(void)
 
     if (hClipLock != GetCurrentTask())
     {
-        WARN("Clipboard not opened by calling task!");
+        WARN("Clipboard not opened by calling task!\n");
         return FALSE;
     }
     
@@ -1046,7 +1046,7 @@ HANDLE WINAPI GetClipboardData( UINT wFormat )
 
     if (CLIPBOARD_IsLocked())
     {
-        WARN("Clipboard not opened by calling task!");
+        WARN("Clipboard not opened by calling task!\n");
         return 0;
     }
 
@@ -1168,7 +1168,7 @@ UINT WINAPI EnumClipboardFormats( UINT wFormat )
 
     if (CLIPBOARD_IsLocked())
     {
-        WARN("Clipboard not opened by calling task!");
+        WARN("Clipboard not opened by calling task!\n");
         return 0;
     }
 
@@ -1207,7 +1207,7 @@ UINT16 WINAPI RegisterClipboardFormat16( LPCSTR FormatName )
 
     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 @@ UINT16 WINAPI RegisterClipboardFormat16( LPCSTR FormatName )
 
     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;
     }
diff --git a/windows/defwnd.c b/windows/defwnd.c
index 855bde36d52d371cc22ab7a4bb9b751b845f54f1..d5459abea414abc3aac373ee33590c48c2b7faf2 100644
--- a/windows/defwnd.c
+++ b/windows/defwnd.c
@@ -70,7 +70,7 @@ void DEFWND_SetTextA( WND *wndPtr, LPCSTR text )
     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 @@ void DEFWND_SetTextW( WND *wndPtr, LPCWSTR text )
     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);
diff --git a/windows/scroll.c b/windows/scroll.c
index 71dc90ac0a0b477ddec1fdc0f3d82dd13218ea7b..9afd2f0bc4217df55217ff6d3e4aec5536c18269 100644
--- a/windows/scroll.c
+++ b/windows/scroll.c
@@ -268,11 +268,11 @@ INT WINAPI ScrollWindowEx( HWND hwnd, INT dx, INT dy,
         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);
diff --git a/windows/x11drv/event.c b/windows/x11drv/event.c
index ceb6994390fcabbc7dd53956818eb29705c32d3a..a62d60136cb937f22ccc91d85a35fc054e489fad 100644
--- a/windows/x11drv/event.c
+++ b/windows/x11drv/event.c
@@ -1061,7 +1061,7 @@ static Atom EVENT_SelectionRequest_TARGETS( Window requestor, Atom target, Atom
     }
     
     /* 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 @@ static Atom EVENT_SelectionRequest_MULTIPLE( HWND hWnd, XSelectionRequestEvent *
               /* 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_SelectionClear( HWND hWnd, XSelectionClearEvent *event )
 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)
   {
diff --git a/windows/x11drv/keyboard.c b/windows/x11drv/keyboard.c
index f9a18bb97644920daf2264fbb30b4db72691dceb..9bc5242b4984510adb1c5a85e723e1a643110a6e 100644
--- a/windows/x11drv/keyboard.c
+++ b/windows/x11drv/keyboard.c
@@ -692,7 +692,7 @@ void X11DRV_KEYBOARD_UpdateState ( void )
 
     TRACE("called\n");
     if (!TSXQueryKeymap(display, keys_return)) {
-        ERR("Error getting keymap !");
+        ERR("Error getting keymap !\n");
         return;
     }
 
@@ -850,7 +850,7 @@ X11DRV_KEYBOARD_DetectLayout (void)
 
   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++) {
diff --git a/windows/x11drv/wineclipsrv.c b/windows/x11drv/wineclipsrv.c
index c54d2f5eb63226cd97fe7f57d3b55b950aa77b9b..5e0b938bef8f8b0456726079b75b91ead5b52998 100644
--- a/windows/x11drv/wineclipsrv.c
+++ b/windows/x11drv/wineclipsrv.c
@@ -842,7 +842,7 @@ Atom EVENT_SelectionRequest_MULTIPLE( XSelectionRequestEvent *pevent )
               /* 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;
               }