still a virtual device bug

NtQuery · Mar 20, 2014 · fba6ea9 · fba6ea9
1 parent bd9b664
commit fba6ea9
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/Scylla/DumpMemoryGui.cpp b/Scylla/DumpMemoryGui.cpp
@@ -540,7 +540,12 @@ bool DumpMemoryGui::getMappedFilename( Memory* memory )
 
 	if (GetMappedFileNameW(ProcessAccessHelp::hProcess, (LPVOID)memory->address, filename, _countof(filename)) > 0)
 	{
-		return deviceNameResolver->resolveDeviceLongNameToShort(filename, memory->mappedFilename);
+		if (!deviceNameResolver->resolveDeviceLongNameToShort(filename, memory->mappedFilename))
+        {
+            wcscpy_s(memory->mappedFilename, filename);
+        }
+
+        return true;
 	}
 
 	return false;

diff --git a/Scylla/ProcessAccessHelp.cpp b/Scylla/ProcessAccessHelp.cpp
@@ -682,9 +682,16 @@ bool ProcessAccessHelp::getProcessModules(HANDLE hProcess, std::vector<ModuleInf
                 {
                     if (!deviceNameResolver.resolveDeviceLongNameToShort(filename, module.fullPath))
                     {
-                        MessageBoxW(0, filename, L"Cannot resolve this path!", MB_ICONERROR);
+                        if (!GetModuleFileNameExW(hProcess, (HMODULE)module.modBaseAddr, module.fullPath, _countof(module.fullPath)))
+                        {
+                            wcscpy_s(module.fullPath, filename);
+                        }
                     }
                 }
+                else
+                {
+                    GetModuleFileNameExW(hProcess, (HMODULE)module.modBaseAddr, module.fullPath, _countof(module.fullPath));
+                }
 
                 moduleList.push_back(module);
             }

diff --git a/Scylla/ProcessLister.cpp b/Scylla/ProcessLister.cpp
@@ -132,7 +132,10 @@ bool ProcessLister::getAbsoluteFilePath(HANDLE hProcess, Process * process)
 #endif
 			//some virtual volumes
 
-            MessageBoxW(0, processPath, L"Cannot resolve this path!", MB_ICONERROR);        
+            if (GetModuleFileNameExW(hProcess, 0, process->fullPath, _countof(process->fullPath)) != 0)
+            {
+                retVal = true;
+            }       
 		}
 		else
 		{

diff --git a/Scylla/Scylla.h b/Scylla/Scylla.h
@@ -6,7 +6,7 @@
 #include "Logger.h"
 
 #define APPNAME_S "Scylla"
-#define APPVERSION_S "v0.9.5"
+#define APPVERSION_S "v0.9.5b"
 #define APPVERSIONDWORD 0x00009500
 
 #define DONATE_BTC_ADDRESS "1GmVrhWwUhwLohaCLP4SKV5kkz8rd16N8h"