bug fix

0d0a0c0e · May 25, 2020 · 00ddfcf · 00ddfcf
1 parent 4855512
commit 00ddfcf
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/ClrPhlib/include/ClrPhlib.h b/ClrPhlib/include/ClrPhlib.h
@@ -157,6 +157,9 @@ namespace Dependencies {
             // Check if the PE is 32-bit
             bool IsWow64Dll();
 
+            // Check if the PE is 32-bit
+            bool IsArm32Dll();
+
             // Return the ApiSetSchema
             ApiSetSchema^ GetApiSetSchema();
 

diff --git a/ClrPhlib/src/managed/PE.cpp b/ClrPhlib/src/managed/PE.cpp
@@ -194,4 +194,10 @@ String^ PE::GetManifest()
 bool PE::IsWow64Dll() 
 {
     return ((Properties->Machine & 0xffff ) == IMAGE_FILE_MACHINE_I386);
-}
+}
+
+bool PE::IsArm32Dll()
+{
+  return ((Properties->Machine & 0xffff) == IMAGE_FILE_MACHINE_ARMNT);
+}
+
diff --git a/DependenciesGui/DependencyWindow.xaml.cs b/DependenciesGui/DependencyWindow.xaml.cs
@@ -308,7 +308,7 @@ public bool OpenPeviewer(object Context)
             }
 
             PeviewerProcess.StartInfo.FileName = String.Format("\"{0:s}\"", programPath);
-            PeviewerProcess.StartInfo.Arguments = Filepath;
+            PeviewerProcess.StartInfo.Arguments = String.Format("\"{0:s}\"", Filepath); 
             return PeviewerProcess.Start();
         }
 
@@ -463,8 +463,11 @@ private void ProcessPe(Dictionary<string, ImportContext> NewTreeContexts, PE new
             Environment.SpecialFolder WindowsSystemFolder = (this.Pe.IsWow64Dll()) ?
                 Environment.SpecialFolder.SystemX86 :
                 Environment.SpecialFolder.System;
-            string User32Filepath = Path.Combine(Environment.GetFolderPath(WindowsSystemFolder), "user32.dll");
-            string MsCoreeFilepath = Path.Combine(Environment.GetFolderPath(WindowsSystemFolder), "mscoree.dll");
+
+            string systemPath = (this.Pe.IsArm32Dll()) ? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), "SysArm32") 
+                : Environment.GetFolderPath(WindowsSystemFolder);
+            string User32Filepath = Path.Combine(systemPath, "user32.dll");
+            string MsCoreeFilepath = Path.Combine(systemPath, "mscoree.dll");
 
             foreach (PeImportDll DllImport in PeImports)
             {

diff --git a/DependenciesLib/FindPeModule.cs b/DependenciesLib/FindPeModule.cs
@@ -116,7 +116,8 @@ public static Tuple<ModuleSearchStrategy, string> FindPeFromDefault(PE RootPe, s
             Environment.SpecialFolder WindowsSystemFolder = (Wow64Dll) ?
                 Environment.SpecialFolder.SystemX86 :
                 Environment.SpecialFolder.System;
-            String WindowsSystemFolderPath = Environment.GetFolderPath(WindowsSystemFolder);
+            String WindowsSystemFolderPath = (RootPe.IsArm32Dll()) ? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), "SysArm32") 
+            : Environment.GetFolderPath(WindowsSystemFolder);
 
 
             // -1. Look in Sxs manifest (copious reversing needed)