Changeset 7935 for trunk/src

Timestamp:

Feb 16, 2002, 7:07:20 PM (24 years ago)

Author:

sandervl

Message:

logging updates

Location:

trunk/src/kernel32

Files:

• dbgwrap.cpp (modified) (2 diffs)
• directory.cpp (modified) (3 diffs)
• heap.cpp (modified) (8 diffs)

trunk/src/kernel32/dbgwrap.cpp

@@ -547 +547 @@
 #define DBG_LOCALLOG    DBG_heap
 
-DEBUGWRAP8(LocalAlloc);
-DEBUGWRAP4(LocalCompact);
-DEBUGWRAP4(LocalFlags);
-DEBUGWRAP4(LocalFree);
-DEBUGWRAP4(LocalHandle);
-DEBUGWRAP4(LocalLock);
-DEBUGWRAP12(LocalReAlloc);
-DEBUGWRAP8(LocalShrink);
-DEBUGWRAP4(LocalSize);
-DEBUGWRAP4(LocalUnlock);
-DEBUGWRAP8(GlobalAlloc);
-DEBUGWRAP4(GlobalCompact);
-DEBUGWRAP4(GlobalFix);
-DEBUGWRAP4(GlobalFlags);
-DEBUGWRAP4(GlobalFree);
-DEBUGWRAP4(GlobalHandle);
-DEBUGWRAP4(GlobalLock);
-DEBUGWRAP4(GlobalMemoryStatus);
-DEBUGWRAP12(GlobalReAlloc);
-DEBUGWRAP4(GlobalSize);
-DEBUGWRAP4(GlobalUnWire);
-DEBUGWRAP4(GlobalUnfix);
-DEBUGWRAP4(GlobalUnlock);
-DEBUGWRAP4(GlobalWire);
-DEBUGWRAP12(HeapAlloc);
-DEBUGWRAP8(HeapCompact);
-DEBUGWRAP12(HeapCreate);
-DEBUGWRAP4(HeapDestroy);
-DEBUGWRAP12(HeapFree);
-DEBUGWRAP4(HeapLock);
-DEBUGWRAP16(HeapReAlloc);
-DEBUGWRAP12(HeapSize);
-DEBUGWRAP4(HeapUnlock);
-DEBUGWRAP12(HeapValidate);
-DEBUGWRAP8(HeapWalk);
+DEBUGWRAP_LVL2_8(LocalAlloc);
+DEBUGWRAP_LVL2_4(LocalCompact);
+DEBUGWRAP_LVL2_4(LocalFlags);
+DEBUGWRAP_LVL2_4(LocalFree);
+DEBUGWRAP_LVL2_4(LocalHandle);
+DEBUGWRAP_LVL2_4(LocalLock);
+DEBUGWRAP_LVL2_12(LocalReAlloc);
+DEBUGWRAP_LVL2_8(LocalShrink);
+DEBUGWRAP_LVL2_4(LocalSize);
+DEBUGWRAP_LVL2_4(LocalUnlock);
+DEBUGWRAP_LVL2_8(GlobalAlloc);
+DEBUGWRAP_LVL2_4(GlobalCompact);
+DEBUGWRAP_LVL2_4(GlobalFix);
+DEBUGWRAP_LVL2_4(GlobalFlags);
+DEBUGWRAP_LVL2_4(GlobalFree);
+DEBUGWRAP_LVL2_4(GlobalHandle);
+DEBUGWRAP_LVL2_4(GlobalLock);
+DEBUGWRAP_LVL2_4(GlobalMemoryStatus);
+DEBUGWRAP_LVL2_12(GlobalReAlloc);
+DEBUGWRAP_LVL2_4(GlobalSize);
+DEBUGWRAP_LVL2_4(GlobalUnWire);
+DEBUGWRAP_LVL2_4(GlobalUnfix);
+DEBUGWRAP_LVL2_4(GlobalUnlock);
+DEBUGWRAP_LVL2_4(GlobalWire);
+DEBUGWRAP_LVL2_12(HeapAlloc);
+DEBUGWRAP_LVL2_8(HeapCompact);
+DEBUGWRAP_LVL2_12(HeapCreate);
+DEBUGWRAP_LVL2_4(HeapDestroy);
+DEBUGWRAP_LVL2_12(HeapFree);
+DEBUGWRAP_LVL2_4(HeapLock);
+DEBUGWRAP_LVL2_16(HeapReAlloc);
+DEBUGWRAP_LVL2_12(HeapSize);
+DEBUGWRAP_LVL2_4(HeapUnlock);
+DEBUGWRAP_LVL2_12(HeapValidate);
+DEBUGWRAP_LVL2_8(HeapWalk);
 
 
@@ -883 +883 @@
 DEBUGWRAP24(LCMapStringA);
 DEBUGWRAP24(LCMapStringW);
-DEBUGWRAP24(MultiByteToWideChar);
+DEBUGWRAP_LVL2_24(MultiByteToWideChar);
 DEBUGWRAP20(GetStringTypeA);
 DEBUGWRAP20(GetStringTypeExA);
 DEBUGWRAP20(GetStringTypeExW);
 DEBUGWRAP16(GetStringTypeW);
-DEBUGWRAP4(IsDBCSLeadByte);
-DEBUGWRAP8(IsDBCSLeadByteEx);
-DEBUGWRAP32(WideCharToMultiByte);
+DEBUGWRAP_LVL2_4(IsDBCSLeadByte);
+DEBUGWRAP_LVL2_8(IsDBCSLeadByteEx);
+DEBUGWRAP_LVL2_32(WideCharToMultiByte);
 
 

trunk/src/kernel32/directory.cpp

@@ -1 @@
-/* $Id: directory.cpp,v 1.44 2002-02-09 12:45:12 sandervl Exp $ */
+/* $Id: directory.cpp,v 1.45 2002-02-16 18:07:20 sandervl Exp $ */
 
 /*
@@ -714 +714 @@
     char full_name[MAX_PATHNAME_LEN];
 
+    dprintf(("SearchPathA %s %s %s", path, name, ext));
     if (!DIR_SearchPath( path, name, ext, (LPSTR)full_name )) return 0;
     lstrcpynA( buffer, (LPSTR)full_name, buflen);
@@ -732 +733 @@
     LPSTR nameA = HEAP_strdupWtoA( GetProcessHeap(), 0, name );
     LPSTR extA  = HEAP_strdupWtoA( GetProcessHeap(), 0, ext );
+    dprintf(("SearchPathA %s %s %s", pathA, nameA, extA));
     DWORD ret = DIR_SearchPath( pathA, nameA, extA, (LPSTR)full_name );
     HeapFree( GetProcessHeap(), 0, extA );

trunk/src/kernel32/heap.cpp

@@ -87 +87 @@
 
   rc = curheap->Alloc(dwFlags, dwBytes);
-  dprintf2(("HeapAlloc %d bytes -> %x", dwBytes, rc));
   return rc;
 }
@@ -100 +99 @@
   FINDHEAP(curheap,hHeap)
 
-  dprintf2(("HeapReAlloc %x %x %x %X bytes", hHeap, dwFlags, lpMem, dwBytes));
   if(curheap == NULL)
         return(NULL);
@@ -119 +117 @@
   FINDHEAP(curheap,hHeap)
 
-  dprintf2(("HeapFree %X", lpMem));
   if(curheap == NULL)
     return(FALSE);
@@ -136 +133 @@
  OS2Heap *curheap;
 
-  //Create Open32 heap for it's handle
-  dprintf2(("HeapCreate dwInitialSize %X", dwInitialSize));
-
+  //Create Open32 heap for its handle
   curheap = new OS2Heap(flOptions, dwInitialSize, dwMaximumSize);
 
@@ -160 +155 @@
   FINDHEAP(curheap,hHeap)
 
-  dprintf2(("HeapDestroy %X", hHeap));
   if(curheap == NULL)
         return(FALSE);
@@ -174 +168 @@
   FINDHEAP(curheap,hHeap)
 
-  dprintf2(("HeapSize %X %x %x", hHeap, arg2, lpMem));
   if(curheap == NULL)
         return(0);
@@ -194 +187 @@
   FINDHEAP(curheap,hHeap)
 
-  dprintf2(("KERNEL32: HeapValidate %x %x %x", hHeap, dwFlags, lpMem));
   if(curheap == NULL)
         return FALSE;
@@ -356 +348 @@
    /* HeapUnlock(GETPROCESSHEAP); */;
 
-   dprintf(("KERNEL32: GlobalLock %x returned %x", hmem, palloc));
    return palloc;
 }