More fixes for endlines

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This patch is in the same vein as James's.
The graphics/x11drv/xfont.c removal of \n is normal: the endline is
already in ridiculous.
And I know that the dlls/shlwapi/reg.c WARN is in a comment, but I fixed
it anyway.

Changelog:
 - Fixes some more enlines.

Vincent
diff -urN wine-orig/dlls/ddraw/d3dexecutebuffer.c wine/dlls/ddraw/d3dexecutebuffer.c
--- wine-orig/dlls/ddraw/d3dexecutebuffer.c	Sat Mar  9 18:29:35 2002
+++ wine/dlls/ddraw/d3dexecutebuffer.c	Tue May 28 18:39:31 2002
@@ -517,7 +517,7 @@
 	/* This is where doing Direct3D on top on OpenGL is quite difficult.
 	   This method transforms a set of vertices using the CURRENT state
 	   (lighting, projection, ...) but does not rasterize them.
-	   They will oinly be put on screen later (with the POINT / LINE and
+	   They will only be put on screen later (with the POINT / LINE and
 	   TRIANGLE op-codes). The problem is that you can have a triangle
 	   with each point having been transformed using another state...
 
diff -urN wine-orig/dlls/ddraw/dsurface/dib.c wine/dlls/ddraw/dsurface/dib.c
--- wine-orig/dlls/ddraw/dsurface/dib.c	Thu Mar 28 17:25:02 2002
+++ wine/dlls/ddraw/dsurface/dib.c	Tue May 28 17:28:07 2002
@@ -615,7 +615,7 @@
 	FIXME("(%p)->(%ld,%ld,%p,%p,%08lx)\n",
 		This,dstx,dsty,src,rsrc,trans
 	);
-	FIXME("	trans:");
+	FIXME("\ttrans:");
 	if (FIXME_ON(ddraw))
 	  DDRAW_dump_DDBLTFAST(trans);
 	if (rsrc)
diff -urN wine-orig/dlls/oleaut32/variant.c wine/dlls/oleaut32/variant.c
--- wine-orig/dlls/oleaut32/variant.c	Mon Mar 25 20:54:25 2002
+++ wine/dlls/oleaut32/variant.c	Tue May 28 18:46:22 2002
@@ -4464,7 +4464,7 @@
 
     struct tm r;
 
-    TRACE(" Variant = %f SYSTEMTIME ptr %p", vtime, lpSystemTime);
+    TRACE(" Variant = %f SYSTEMTIME ptr %p\n", vtime, lpSystemTime);
 
     if (vtime >= 0)
     {
diff -urN wine-orig/dlls/shlwapi/reg.c wine/dlls/shlwapi/reg.c
--- wine-orig/dlls/shlwapi/reg.c	Fri May 24 22:13:15 2002
+++ wine/dlls/shlwapi/reg.c	Tue May 28 19:57:09 2002
@@ -771,7 +771,7 @@
 {
   char szBuff[MAX_PATH];
 
-  FIXME("(hkey=0x%08x,%s,%s,%p,%ld) - semi-stub",hKey, debugstr_a(lpszSubKey),
+  FIXME("(hkey=0x%08x,%s,%s,%p,%ld) - semi-stub\n",hKey, debugstr_a(lpszSubKey),
         debugstr_a(lpszValue), lpszPath, dwFlags);
 
   lstrcpyA(szBuff, lpszPath);
@@ -792,7 +792,7 @@
 {
   WCHAR szBuff[MAX_PATH];
 
-  FIXME("(hkey=0x%08x,%s,%s,%p,%ld) - semi-stub",hKey, debugstr_w(lpszSubKey),
+  FIXME("(hkey=0x%08x,%s,%s,%p,%ld) - semi-stub\n",hKey, debugstr_w(lpszSubKey),
         debugstr_w(lpszValue), lpszPath, dwFlags);
 
   lstrcpyW(szBuff, lpszPath);
@@ -999,7 +999,7 @@
 
       if (!pcbData && pData != pvData)
       {
-        WARN("Invalid pcbData would crash under Win32!");
+        WARN("Invalid pcbData would crash under Win32!\n");
         return ERROR_OUTOFMEMORY;
       }
 
@@ -1370,7 +1370,7 @@
   HKEY hSubKey;
   DWORD dwKeyCount = 0, dwValueCount = 0, dwRet;
 
-  TRACE("(hkey=0x%08x,%s)", hKey, debugstr_a(lpszSubKey));
+  TRACE("(hkey=0x%08x,%s)\n", hKey, debugstr_a(lpszSubKey));
 
   dwRet = RegOpenKeyExA(hKey, lpszSubKey, 0, KEY_READ, &hSubKey);
 
@@ -1399,7 +1399,7 @@
   HKEY hSubKey;
   DWORD dwKeyCount = 0, dwValueCount = 0, dwRet;
 
-  TRACE("(hkey=0x%08x,%s)", hKey, debugstr_w(lpszSubKey));
+  TRACE("(hkey=0x%08x,%s)\n", hKey, debugstr_w(lpszSubKey));
 
   dwRet = RegOpenKeyExW(hKey, lpszSubKey, 0, KEY_READ, &hSubKey);
 
diff -urN wine-orig/graphics/x11drv/xfont.c wine/graphics/x11drv/xfont.c
--- wine-orig/graphics/x11drv/xfont.c	Fri May 24 22:13:15 2002
+++ wine/graphics/x11drv/xfont.c	Tue May 28 19:59:46 2002
@@ -644,7 +644,7 @@
    j = strlen(lfd->pixel_size);
    if( j == 0 || j > 3 )
    {
-       WARN(ridiculous, fullname, "pixel_size\n");
+       WARN(ridiculous, fullname, "pixel_size");
        return FALSE;
    }
    if( !(fi->lfd_height = atoi(lfd->pixel_size)) )
@@ -653,7 +653,7 @@
    j = strlen(lfd->point_size);
    if( j == 0 || j > 3 )
    {
-       WARN(ridiculous, fullname, "point_size\n");
+       WARN(ridiculous, fullname, "point_size");
        return FALSE;
    }
    if( !(atoi(lfd->point_size)) )
@@ -662,7 +662,7 @@
    j = strlen(lfd->resolution_x);
    if( j == 0 || j > 3 )
    {
-       WARN(ridiculous, fullname, "resolution_x\n");
+       WARN(ridiculous, fullname, "resolution_x");
        return FALSE;
    }
    if( !(fi->lfd_resolution = atoi(lfd->resolution_x)) )
@@ -671,7 +671,7 @@
    j = strlen(lfd->resolution_y);
    if( j == 0 || j > 3 )
    {
-       WARN(ridiculous, fullname, "resolution_y\n");
+       WARN(ridiculous, fullname, "resolution_y");
        return FALSE;
    }
    if( !(atoi(lfd->resolution_y)) )
diff -urN wine-orig/tools/winedump/README wine/tools/winedump/README
--- wine-orig/tools/winedump/README	Fri Sep  7 12:04:39 2001
+++ wine/tools/winedump/README	Tue May 28 19:38:09 2002
@@ -307,7 +307,7 @@
 .c:
 BOOL __stdcall ZIPEXTRA__OpenZipFile(LPCSTR pszFileName)
 {
-  TRACE("stub");
+  TRACE("stub\n");
   return 0;
 }
 
@@ -379,7 +379,7 @@
 {
   BOOL (__stdcall *pFunc)(LPCSTR) = (void*)GetProcAddress(hDLL,"_OpenZipFile");
   BOOL retVal;
-  TRACE("((LPCSTR)%s) stub", pszFileName);
+  TRACE("((LPCSTR)%s) stub\n", pszFileName);
   retVal = pFunc(pszFileName);
   TRACE("returned (%ld)\n",(LONG)retVal));
   return retVal;

[Index of Archives]     [Gimp for Windows]     [Red Hat]     [Samba]     [Yosemite Camping]     [Graphics Cards]     [Wine Home]

  Powered by Linux