Changeset 7423 for trunk/src/odinprof/symfile.cpp

Timestamp:

Nov 22, 2001, 12:34:44 PM (24 years ago)

Author:

phaller

Message:

.

File:

• trunk/src/odinprof/symfile.cpp (modified) (10 diffs)

trunk/src/odinprof/symfile.cpp

@@ -1 @@
-/* $Id: symfile.cpp,v 1.1 2001-11-22 10:44:00 phaller Exp $ */
+/* $Id: symfile.cpp,v 1.2 2001-11-22 11:34:43 phaller Exp $ */
 /*
  * Project Odin Software License can be found in LICENSE.TXT
@@ -17 +17 @@
    => verify against kernel32\exceptionstack.cpp
    (KERNEL32.SYM is not interpreted correctly)
- - try to demangle C++ names
- - fix weird duplicate lookups of same symbol (i. e. SetBkColor)
  */
 
@@ -204 +202 @@
 
 
-BOOL   LXSymbolFile::getSymbolName(ULONG objNr,
-                                   ULONG offset,
-                                   PSZ   pszNameBuffer,
-                                   ULONG ulNameBufferLength)
+BOOL   LXSymbolFile::getSymbolName(ULONG  objNr,
+                                   ULONG  offset,
+                                   PSZ    pszNameBuffer,
+                                   ULONG  ulNameBufferLength,
+                                   PULONG pulSymbolOffset)
 {
   PUCHAR    p = (PUCHAR)pSymbolRawData;
@@ -264 +263 @@
               // find nearest symbol to the given offset
               if (iCurrent > 0)
-                if (iClosest < iCurrent)
+                if (iClosest > iCurrent)
                   pSymClosest = pSymDef32;
             }
@@ -278 +277 @@
               // terminate the string in any case
               pszNameBuffer[iLen] = 0;
+              *pulSymbolOffset = 0;
               
               // OK, found
@@ -293 +293 @@
         {
           CHAR szBuf[128];
-          CHAR szBuf2[128];
           int  iLen;
           
@@ -301 +300 @@
           {
             memcpy(szBuf, pSymClosest->achSymName, sizeof(szBuf));
-            szBuf[ sizeof(szBuf) ] = 0;
-            sprintf(szBuf2, "%s+%0xh", szBuf, offset - pSymClosest->wSymVal);
-            iLen = min(pSymClosest->cbSymName, ulNameBufferLength);
+            szBuf[ min(sizeof(szBuf), pSymClosest->cbSymName) ] = 0;
+            iLen = min(strlen(szBuf), ulNameBufferLength);
           }
           else
           {
-            sprintf(szBuf2, "%s:obj%d:%08xh", getName(), objNr, offset);
-            iLen = min(strlen(szBuf2), ulNameBufferLength);
+            sprintf(szBuf, "%s:obj%d:%08xh", getName(), objNr, offset);
+            iLen = min(strlen(szBuf), ulNameBufferLength);
           }
 
-          memcpy(pszNameBuffer, szBuf2, iLen);
+          memcpy(pszNameBuffer, szBuf, iLen);
           pszNameBuffer[iLen] = 0; // terminate the string in any case
+          *pulSymbolOffset = offset - pSymClosest->wSymVal;
           return TRUE;            // at least something usable has been found!
         }
@@ -386 +385 @@
 
   
-BOOL   SymbolFilePool::getSymbolName(PSZ   pszModule,
-                                     ULONG objNr,
-                                     ULONG offset,
-                                     PSZ   pszNameBuffer,
-                                     ULONG ulNameBufferLength)
+BOOL   SymbolFilePool::getSymbolName(PSZ    pszModule,
+                                     ULONG  objNr,
+                                     ULONG  offset,
+                                     PSZ    pszNameBuffer,
+                                     ULONG  ulNameBufferLength,
+                                     PULONG pulSymbolOffset)
 {
   LXSymbolFile* pSym = (LXSymbolFile*)pHashModules->getElement(pszModule);
@@ -421 +421 @@
                              offset,
                              pszNameBuffer,
-                             ulNameBufferLength);
+                             ulNameBufferLength,
+                             pulSymbolOffset);
     
     if (rc == TRUE)
@@ -433 +434 @@
                 name->Text(),
                 ulNameBufferLength);
-      
         delete name;
+      }
+
+      // append symbol offsets
+      if (*pulSymbolOffset != 0)
+      {
+        CHAR szBuf[256];
+        sprintf(szBuf,
+                "%s+%xh",
+                pszNameBuffer,
+                *pulSymbolOffset);
+        strncpy(pszNameBuffer,
+                szBuf,
+                ulNameBufferLength);
       }
     }