Fix SymGetDiaSession regression loading PDBs

Author: dmex

phlib/include/symprv.h

@@ -130,6 +130,16 @@ PhLoadModuleSymbolProvider(
     _In_ ULONG Size
     );
 
+PHLIBAPI
+BOOLEAN
+NTAPI
+PhLoadFileNameSymbolProvider(
+    _In_ PPH_SYMBOL_PROVIDER SymbolProvider,
+    _In_ PPH_STRING FileName,
+    _In_ ULONG64 BaseAddress,
+    _In_ ULONG Size
+    );
+
 PHLIBAPI
 VOID
 NTAPI

phlib/symprv.c

@@ -1034,6 +1034,70 @@ BOOLEAN PhLoadModuleSymbolProvider(
         return FALSE;
 }
 
+BOOLEAN PhLoadFileNameSymbolProvider(
+    _In_ PPH_SYMBOL_PROVIDER SymbolProvider,
+    _In_ PPH_STRING FileName,
+    _In_ ULONG64 BaseAddress,
+    _In_ ULONG Size
+    )
+{
+    ULONG64 baseAddress;
+    PPH_SYMBOL_MODULE symbolModule = NULL;
+    PPH_AVL_LINKS existingLinks;
+    PH_SYMBOL_MODULE lookupSymbolModule;
+
+    PhpRegisterSymbolProvider(SymbolProvider);
+
+    if (!SymLoadModuleExW_I)
+        return FALSE;
+
+    PhAcquireQueuedLockExclusive(&SymbolProvider->ModulesListLock);
+    lookupSymbolModule.BaseAddress = BaseAddress;
+    existingLinks = PhFindElementAvlTree(&SymbolProvider->ModulesSet, &lookupSymbolModule.Links);
+    PhReleaseQueuedLockExclusive(&SymbolProvider->ModulesListLock);
+
+    if (existingLinks)
+        return TRUE;
+
+    PH_LOCK_SYMBOLS();
+
+    baseAddress = SymLoadModuleExW_I(
+        SymbolProvider->ProcessHandle,
+        NULL,
+        FileName->Buffer,
+        NULL,
+        BaseAddress,
+        Size,
+        NULL,
+        0
+        );
+
+    PH_UNLOCK_SYMBOLS();
+
+    PhAcquireQueuedLockExclusive(&SymbolProvider->ModulesListLock);
+    lookupSymbolModule.BaseAddress = BaseAddress;
+    existingLinks = PhFindElementAvlTree(&SymbolProvider->ModulesSet, &lookupSymbolModule.Links);
+
+    if (!existingLinks)
+    {
+        symbolModule = PhAllocate(sizeof(PH_SYMBOL_MODULE));
+        symbolModule->BaseAddress = BaseAddress;
+        symbolModule->Size = Size;
+        PhSetReference(&symbolModule->FileName, FileName);
+
+        existingLinks = PhAddElementAvlTree(&SymbolProvider->ModulesSet, &symbolModule->Links);
+        assert(!existingLinks);
+        InsertTailList(&SymbolProvider->ModulesListHead, &symbolModule->ListEntry);
+    }
+
+    PhReleaseQueuedLockExclusive(&SymbolProvider->ModulesListLock);
+
+    if (baseAddress)
+        return TRUE;
+    else
+        return FALSE;
+}
+
 typedef struct _PHP_LOAD_PROCESS_SYMBOLS_CONTEXT
 {
     HANDLE LoadingSymbolsForProcessId;

tools/peview/pdb.c

@@ -1248,23 +1248,22 @@ NTSTATUS PeDumpFileSymbols(
                 &size
                 );
 
-            if (PvpLoadDbgHelp(&PvSymbolProvider))
+            if (!NT_SUCCESS(status))
             {
-                PPH_STRING fileName;
+                PhShowStatus(NULL, L"Unable to load the file.", status, 0);
+                return status;
+            }
 
-                if (NT_SUCCESS(PhGetProcessMappedFileName(NtCurrentProcess(), viewBase, &fileName)))
+            if (PvpLoadDbgHelp(&PvSymbolProvider))
+            {
+                if (PhLoadFileNameSymbolProvider(
+                    PvSymbolProvider,
+                    PvFileName,
+                    (ULONG64)viewBase,
+                    (ULONG)size
+                    ))
                 {
-                    if (PhLoadModuleSymbolProvider(
-                        PvSymbolProvider,
-                        fileName,
-                        (ULONG64)viewBase,
-                        (ULONG)size
-                        ))
-                    {
-                        baseOfDll = (ULONG64)viewBase;
-                    }
-
-                    PhDereferenceObject(fileName);
+                    baseOfDll = (ULONG64)viewBase;
                 }
             }