Changeset 10300

Timestamp:

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

Author:

sandervl

Message:

flexible debug logging

Location:

trunk/src/version

Files:

• dbglocal.cpp (added)
• dbglocal.h (added)
• info.c (modified) (1 diff)
• install.c (modified) (9 diffs)
• resource.c (modified) (12 diffs)
• versiondbg.def (added)

trunk/src/version/info.c ¶

@@ -36 +36 @@
 #include "winerror.h"
 #include "wine/debug.h"
+
+#define DBG_LOCALLOG    DBG_info
+#include "dbglocal.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ver);

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);

trunk/src/version/resource.c ¶

@@ -44 +44 @@
 #include "wine/debug.h"
 #include <module.h>
+
+#define DBG_LOCALLOG    DBG_resource
+#include "dbglocal.h"
 
 WINE_DEFAULT_DEBUG_CHANNEL(ver);
@@ -192 +195 @@
     if ( !resTabSize )
     {
-        TRACE("No resources in NE dll\n" );
+        dprintf(("No resources in NE dll\n" ));
         return FALSE;
     }
@@ -234 +237 @@
         }
     }
-    TRACE("No typeid entry found for %p\n", typeid );
+    dprintf(("No typeid entry found for %p\n", typeid ));
     HeapFree( GetProcessHeap(), 0, resTab );
     return FALSE;
@@ -257 +260 @@
             if (nameInfo->id == id) goto found_name;
     }
-    TRACE("No resid entry found for %p\n", typeid );
+    dprintf(("No resid entry found for %p\n", typeid ));
     HeapFree( GetProcessHeap(), 0, resTab );
     return FALSE;
@@ -295 +298 @@
     if ( !resDataDir->Size )
     {
-        TRACE("No resources in PE dll\n" );
+        dprintf(("No resources in PE dll\n" ));
         return FALSE;
     }
@@ -327 +330 @@
     {
         HeapFree( GetProcessHeap(), 0, sections );
-        TRACE("Couldn't find resource section\n" );
+        dprintf(("Couldn't find resource section\n" ));
         return FALSE;
     }
@@ -350 +353 @@
     if ( !resPtr )
     {
-        TRACE("No typeid entry found for %p\n", typeid );
+        dprintf(("No typeid entry found for %p\n", typeid ));
         goto done;
     }
@@ -356 +359 @@
     if ( !resPtr )
     {
-        TRACE("No resid entry found for %p\n", resid );
+        dprintf(("No resid entry found for %p\n", resid ));
         goto done;
     }
@@ -362 +365 @@
     if ( !resPtr )
     {
-        TRACE("No default language entry found for %p\n", resid );
+        dprintf(("No default language entry found for %p\n", resid ));
         goto done;
     }
@@ -376 +379 @@
     if ( i == nSections )
     {
-        TRACE("Couldn't find resource data section\n" );
+        dprintf(("Couldn't find resource data section\n" ));
         goto done;
     }
@@ -404 +407 @@
     DWORD reslen;
 
-    TRACE("(%s,type=0x%lx,id=0x%lx,off=%p)\n",
+    dprintf(("(%s,type=0x%lx,id=0x%lx,off=%p)\n",
                 debugstr_a(lpszFileName), (LONG)lpszResType, (LONG)lpszResId,
-                lpszResId );
+                lpszResId ));
 
     lzfd = LZOpenFileA( (LPSTR)lpszFileName, &ofs, OF_READ );
@@ -441 +444 @@
     DWORD reslen = dwResLen;
 
-    TRACE("(%s,type=0x%lx,id=0x%lx,off=%ld,len=%ld,data=%p)\n",
+    dprintf(("(%s,type=0x%lx,id=0x%lx,off=%ld,len=%ld,data=%p)\n",
                 debugstr_a(lpszFileName), (LONG)lpszResType, (LONG)lpszResId,
-                dwFileOffset, dwResLen, lpvData );
+                dwFileOffset, dwResLen, lpvData ));
 
     lzfd = LZOpenFileA( (LPSTR)lpszFileName, &ofs, OF_READ );