Changeset 10300 for trunk/src/version/install.c

Timestamp:

Oct 24, 2003, 5:08:11 PM (22 years ago)

Author:

sandervl

Message:

flexible debug logging

File:

• trunk/src/version/install.c (modified) (9 diffs)

trunk/src/version/install.c

@@ -36 +36 @@
 #include "lzexpand.h"
 #include "wine/debug.h"
+
+#define DBG_LOCALLOG    DBG_install
+#include "dbglocal.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ver);
@@ -140 +143 @@
 
     /* Print out debugging information */
-    TRACE("flags = %x filename=%s windir=%s appdir=%s curdirlen=%p(%u) destdirlen=%p(%u)\n",
+    dprintf(("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 );
+          lpuDestDirLen, lpuDestDirLen ? *lpuDestDirLen : 0 ));
 
     /* Figure out where the file should go; shared files default to the
@@ -206 +209 @@
     }
 
-    TRACE("ret = %lu (%s%s%s) curdir=%s destdir=%s\n", retval,
+    dprintf(("ret = %lu (%s%s%s) curdir=%s destdir=%s\n", retval,
           (retval & VFF_CURNEDEST) ? "VFF_CURNEDEST " : "",
           (retval & VFF_FILEINUSE) ? "VFF_FILEINUSE " : "",
           (retval & VFF_BUFFTOOSMALL) ? "VFF_BUFFTOOSMALL " : "",
-          debugstr_a(lpszCurDir), debugstr_a(lpszDestDir));
+          debugstr_a(lpszCurDir), debugstr_a(lpszDestDir)));
 
     return retval;
@@ -231 +234 @@
 
     /* Print out debugging information */
-    TRACE("flags = %x filename=%s windir=%s appdir=%s curdirlen=%p(%u) destdirlen=%p(%u)\n",
+    dprintf(("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 );
+          lpuDestDirLen, lpuDestDirLen ? *lpuDestDirLen : 0 ));
 
     /* Figure out where the file should go; shared files default to the
@@ -297 +300 @@
     }
 
-    TRACE("ret = %lu (%s%s%s) curdir=%s destdir=%s\n", retval,
+    dprintf(("ret = %lu (%s%s%s) curdir=%s destdir=%s\n", retval,
           (retval & VFF_CURNEDEST) ? "VFF_CURNEDEST " : "",
           (retval & VFF_FILEINUSE) ? "VFF_FILEINUSE " : "",
           (retval & VFF_BUFFTOOSMALL) ? "VFF_BUFFTOOSMALL " : "",
-          debugstr_w(lpszCurDir), debugstr_w(lpszDestDir));
+          debugstr_w(lpszCurDir), debugstr_w(lpszDestDir)));
     return retval;
 }
@@ -314 +317 @@
     buf=HeapAlloc(GetProcessHeap(), 0, alloclen);
     if(buf == NULL) {
-        WARN("Memory exausted while fetching version info!\n");
+        dprintf(("Memory exausted while fetching version info!\n"));
         return NULL;
     }
@@ -328 +331 @@
             buf = HeapAlloc(GetProcessHeap(), 0, alloclen);
             if(buf == NULL) {
-               WARN("Memory exausted while fetching version info!\n");
+               dprintf(("Memory exausted while fetching version info!\n"));
                return NULL;
             }
@@ -336 +339 @@
                 *vffi = (VS_FIXEDFILEINFO*)(buf+0x28);
             if ((*vffi)->dwSignature != VS_FFI_SIGNATURE)
-                WARN("Bad VS_FIXEDFILEINFO signature 0x%08lx\n",(*vffi)->dwSignature);
+                dprintf(("Bad VS_FIXEDFILEINFO signature 0x%08lx\n",(*vffi)->dwSignature));
             return buf;
         }
@@ -369 +372 @@
     OFSTRUCT    ofs;
 
-    TRACE("(%x,%s,%s,%s,%s,%s,%p,%d)\n",
+    dprintf(("(%x,%s,%s,%s,%s,%s,%p,%d)\n",
             flags,srcfilename,destfilename,srcdir,destdir,curdir,tmpfile,*tmpfilelen
-    );
+    ));
     xret = 0;
     sprintf(srcfn,"%s\\%s",srcdir,srcfilename);