Changeset 91 for trunk/src/helpers/memdebug_win.c

Timestamp:

Aug 2, 2001, 10:36:35 PM (24 years ago)

Author:

umoeller

Message:

Misc changes

File:

• trunk/src/helpers/memdebug_win.c (modified) (11 diffs)

trunk/src/helpers/memdebug_win.c

@@ -104 +104 @@
 
     ULONG       ulLine;
+
+    ULONG       ulAddress;      // has pAfterMagic, invisible, only
+                                // for sorting V0.9.14 (2001-08-01) [umoeller]
 
     PSZ         pszAddress;     // points to szAddress
@@ -235 +238 @@
                 }
 
-                sprintf(pMemRecordThis->szAddress, "0x%lX", pMemRecordThis->pObject);
-                strcpy(pMemRecordThis->szSource,
+                pMemRecordThis->ulAddress = (ULONG)pMemRecordThis->pObject;
+
+                sprintf(pMemRecordThis->szAddress,
+                        "0x%lX",
+                        pMemRecordThis->pObject);
+                strhcpy(pMemRecordThis->szSource,
                         (pMemRecordThis->filename)
                             ? pMemRecordThis->filename
@@ -332 +339 @@
                 pMemRecordThis->ulTID = pHeapItem->ulTID;
 
-                strcpy(pMemRecordThis->szSource, pHeapItem->pcszSourceFile);
+                strhcpy(pMemRecordThis->szSource, pHeapItem->pcszSourceFile);
                 pMemRecordThis->pszSource = pMemRecordThis->szSource;
 
                 pMemRecordThis->ulLine = pHeapItem->ulLine;
 
-                strcpy(pMemRecordThis->szFunction, pHeapItem->pcszFunction);
+                strhcpy(pMemRecordThis->szFunction, pHeapItem->pcszFunction);
                 pMemRecordThis->pszFunction = pMemRecordThis->szFunction;
 
-                sprintf(pMemRecordThis->szAddress, "0x%lX", pHeapItem->pAfterMagic);
+                pMemRecordThis->ulAddress = (ULONG)pHeapItem->pAfterMagic;
+
+                sprintf(pMemRecordThis->szAddress,
+                        "0x%lX",
+                        pHeapItem->pAfterMagic);
                 pMemRecordThis->pszAddress = pMemRecordThis->szAddress;
 
@@ -361 +372 @@
 
                 sprintf(pMemRecordThis->szAddress, "0x%lX", pMemRecordThis->pObject);
-                strcpy(pMemRecordThis->szSource,
+                strhcpy(pMemRecordThis->szSource,
                         (pMemRecordThis->filename)
                             ? pMemRecordThis->filename
@@ -391 +402 @@
 SHORT EXPENTRY mnu_fnCompareIndex(PMEMRECORD pmrc1, PMEMRECORD  pmrc2, PVOID pStorage)
 {
-    // HAB habDesktop = WinQueryAnchorBlock(HWND_DESKTOP);
     pStorage = pStorage; // to keep the compiler happy
     if ((pmrc1) && (pmrc2))
@@ -434 +444 @@
  *@@ mnu_fnCompareSourceFile:
  *
- *V0.9.6 (2000-11-12) [umoeller]
+ *@@added V0.9.6 (2000-11-12) [umoeller]
  */
 
 SHORT EXPENTRY mnu_fnCompareSize(PMEMRECORD pmrc1, PMEMRECORD  pmrc2, PVOID pStorage)
 {
-    HAB habDesktop = WinQueryAnchorBlock(HWND_DESKTOP);
     pStorage = pStorage; // to keep the compiler happy
     if ((pmrc1) && (pmrc2))
@@ -452 +461 @@
 }
 
+/*
+ *@@ mnu_fnCompareAddress:
+ *
+ *@@added V0.9.14 (2001-08-01) [umoeller]
+ */
+
+SHORT EXPENTRY mnu_fnCompareAddress(PMEMRECORD pmrc1, PMEMRECORD  pmrc2, PVOID pStorage)
+{
+    pStorage = pStorage; // to keep the compiler happy
+    if ((pmrc1) && (pmrc2))
+    {
+        if (pmrc1->ulAddress > pmrc2->ulAddress)
+            return (1);
+        else if (pmrc1->ulAddress < pmrc2->ulAddress)
+            return (-1);
+    }
+
+    return (0);
+}
+
 #define ID_MEMCNR   1000
 
@@ -469 +498 @@
  *
  *@@added V0.9.1 (99-12-04) [umoeller]
+ *@@changed V0.9.14 (2001-08-01) [umoeller]: added sort by address
  */
 
@@ -648 +678 @@
                                        "Sort by object size",
                                        MIS_TEXT, 0);
+                    winhInsertMenuItem(G_hwndMemDebugMenu,
+                                       MIT_END,
+                                       1004,
+                                       "Sort by address",
+                                       MIS_TEXT, 0);
 
                     WinSetFocus(HWND_DESKTOP, hwndCnr);
@@ -715 +750 @@
                                CM_SORTRECORD,
                                (MPARAM)mnu_fnCompareSize,
+                               0);
+                break;
+
+                case 1004: // sort by address V0.9.14 (2001-08-01) [umoeller]
+                    WinSendMsg(WinWindowFromID(hwndClient, ID_MEMCNR),
+                               CM_SORTRECORD,
+                               (MPARAM)mnu_fnCompareAddress,
                                0);
                 break;
@@ -788 +830 @@
 {
     int i = 0;
+    i++;
 }
 #endif