From 694800197ffe4e00dfe472fd911343399cfa8485 Mon Sep 17 00:00:00 2001
From: wj32 <wj32@21ef857c-d57f-4fe0-8362-d861dc6d29cd>
Date: Tue, 17 Mar 2009 06:40:49 +0000
Subject: [PATCH] fixed weird module lists

git-svn-id: svn://svn.code.sf.net/p/processhacker/code@897 21ef857c-d57f-4fe0-8362-d861dc6d29cd
---
 trunk/ProcessHacker/Forms/HackerWindow.cs     | 7 ++++++-
 trunk/ProcessHacker/Forms/ProcessWindow.cs    | 8 ++++----
 trunk/ProcessHacker/Symbols/SymbolProvider.cs | 8 ++------
 3 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/trunk/ProcessHacker/Forms/HackerWindow.cs b/trunk/ProcessHacker/Forms/HackerWindow.cs
index 6f6b231ec..db0bdda2b 100644
--- a/trunk/ProcessHacker/Forms/HackerWindow.cs
+++ b/trunk/ProcessHacker/Forms/HackerWindow.cs
@@ -2368,7 +2368,12 @@ namespace ProcessHacker
             {
                 try
                 {
-                    string[] modules = { "kernel32.dll", "ntdll.dll", "shell32.dll" };
+                    string[] modules =
+                    {
+                        "advapi32.dll", "comctl32.dll", "crypt32.dll", "dnsapi.dll",
+                        "gdi32.dll", "imagehlp.dll", "kernel32.dll", 
+                        "ntdll.dll", "ole32.dll", "psapi.dll", "rpcrt4.dll", "shell32.dll",
+                        "user32.dll", "winsta.dll", "wintrust.dll", "wtsapi32.dll" };
 
                     foreach (string module in modules)
                     {
diff --git a/trunk/ProcessHacker/Forms/ProcessWindow.cs b/trunk/ProcessHacker/Forms/ProcessWindow.cs
index 1e749b48d..9d660121e 100644
--- a/trunk/ProcessHacker/Forms/ProcessWindow.cs
+++ b/trunk/ProcessHacker/Forms/ProcessWindow.cs
@@ -435,16 +435,16 @@ namespace ProcessHacker
             _threadP = new ThreadProvider(_pid);
             _threadP.Interval = Properties.Settings.Default.RefreshInterval;
             _threadP.Updated += new ThreadProvider.ProviderUpdateOnce(_threadP_Updated);
-            //_threadP.RunOnceAsync();
             listThreads.Provider = _threadP;
+            //_threadP.RunOnceAsync();
 
             listModules.BeginUpdate();
             listModules.Highlight = false;
             _moduleP = new ModuleProvider(_pid);
             _moduleP.Interval = Properties.Settings.Default.RefreshInterval;
             _moduleP.Updated += new ModuleProvider.ProviderUpdateOnce(_moduleP_Updated);
-            _moduleP.RunOnceAsync();
             listModules.Provider = _moduleP;
+            _moduleP.RunOnceAsync();
 
             listMemory.BeginUpdate();
             listMemory.Highlight = false;
@@ -452,8 +452,8 @@ namespace ProcessHacker
             _memoryP.IgnoreFreeRegions = true;
             _memoryP.Interval = Properties.Settings.Default.RefreshInterval;
             _memoryP.Updated += new MemoryProvider.ProviderUpdateOnce(_memoryP_Updated);
-            //_memoryP.RunOnceAsync();
             listMemory.Provider = _memoryP;
+            //_memoryP.RunOnceAsync();
 
             listHandles.BeginUpdate();
             listHandles.Highlight = false;
@@ -461,8 +461,8 @@ namespace ProcessHacker
             _handleP.HideHandlesWithNoName = Properties.Settings.Default.HideHandlesWithNoName;
             _handleP.Interval = Properties.Settings.Default.RefreshInterval;
             _handleP.Updated += new HandleProvider.ProviderUpdateOnce(_handleP_Updated);
-            //_handleP.RunOnceAsync();
             listHandles.Provider = _handleP;
+            //_handleP.RunOnceAsync();
 
             Win32.SetWindowTheme(listThreads.List.Handle, "explorer", null);
             Win32.SetWindowTheme(listModules.List.Handle, "explorer", null);
diff --git a/trunk/ProcessHacker/Symbols/SymbolProvider.cs b/trunk/ProcessHacker/Symbols/SymbolProvider.cs
index cb8c66318..e9d7650a4 100644
--- a/trunk/ProcessHacker/Symbols/SymbolProvider.cs
+++ b/trunk/ProcessHacker/Symbols/SymbolProvider.cs
@@ -79,11 +79,7 @@ namespace ProcessHacker
             if (SymbolProvider.BaseInstance != null)
             {
                 _libraryLookup = new List<KeyValuePair<uint, string>>(SymbolProvider.BaseInstance._libraryLookup);
-                _symbols = new Dictionary<string, List<KeyValuePair<uint, string>>>();
-
-                foreach (string k in SymbolProvider.BaseInstance._symbols.Keys)
-                    _symbols.Add(k, new List<KeyValuePair<uint, string>>(SymbolProvider.BaseInstance._symbols[k]));
-
+                _symbols = new Dictionary<string, List<KeyValuePair<uint, string>>>(SymbolProvider.BaseInstance._symbols);
                 _librarySizes = new Dictionary<string, uint>(SymbolProvider.BaseInstance._librarySizes);
             }
             else
@@ -154,7 +150,7 @@ namespace ProcessHacker
 
                 // if we didn't even get to load the PE file
                 if (!_librarySizes.ContainsKey(realPath))
-                    _librarySizes.Add(realPath, 0x7fffffff);
+                    _librarySizes.Add(realPath, 0xffffffff);
             }
             else
             {