From 6b0badf3aab9b76b765b07e8819a8555f6747637 Mon Sep 17 00:00:00 2001
From: "Mr. eXoDia" <mr.exodia.tpodt@gmail.com>
Date: Sun, 2 Nov 2014 02:13:16 +0100
Subject: [PATCH] DBG+EXE: fixed some bugs

---
 x64_dbg_dbg/_exports.cpp                | 2 +-
 x64_dbg_dbg/symbolinfo.cpp              | 4 ++--
 x64_dbg_dbg/value.cpp                   | 1 +
 x64_dbg_exe/x64_dbg_exe.vcxproj         | 4 ++++
 x64_dbg_exe/x64_dbg_exe.vcxproj.filters | 6 ++++++
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/x64_dbg_dbg/_exports.cpp b/x64_dbg_dbg/_exports.cpp
index 0160c197..b952f58d 100644
--- a/x64_dbg_dbg/_exports.cpp
+++ b/x64_dbg_dbg/_exports.cpp
@@ -104,7 +104,7 @@ extern "C" DLL_EXPORT bool _dbg_addrinfoget(duint addr, SEGMENTREG segment, ADDR
             char buffer[sizeof(SYMBOL_INFO) + MAX_LABEL_SIZE * sizeof(char)];
             PSYMBOL_INFO pSymbol = (PSYMBOL_INFO)buffer;
             pSymbol->SizeOfStruct = sizeof(SYMBOL_INFO);
-            pSymbol->MaxNameLen = MAX_LABEL_SIZE;
+            pSymbol->MaxNameLen = MAX_LABEL_SIZE - 1;
             if(SymFromAddr(fdProcessInfo->hProcess, (DWORD64)addr, &displacement, pSymbol) and !displacement)
             {
                 if(bUndecorateSymbolNames or !UnDecorateSymbolName(pSymbol->Name, addrinfo->label, MAX_LABEL_SIZE, UNDNAME_COMPLETE))
diff --git a/x64_dbg_dbg/symbolinfo.cpp b/x64_dbg_dbg/symbolinfo.cpp
index d9141228..ddb29ab7 100644
--- a/x64_dbg_dbg/symbolinfo.cpp
+++ b/x64_dbg_dbg/symbolinfo.cpp
@@ -131,7 +131,7 @@ bool symfromname(const char* name, uint* addr)
     char buffer[sizeof(SYMBOL_INFO) + MAX_LABEL_SIZE * sizeof(char)];
     PSYMBOL_INFO pSymbol = (PSYMBOL_INFO)buffer;
     pSymbol->SizeOfStruct = sizeof(SYMBOL_INFO);
-    pSymbol->MaxNameLen = MAX_LABEL_SIZE;
+    pSymbol->MaxNameLen = MAX_LABEL_SIZE - 1;
     if(!SymFromName(fdProcessInfo->hProcess, name, pSymbol))
         return false;
     *addr = (uint)pSymbol->Address;
@@ -152,7 +152,7 @@ const char* symgetsymbolicname(uint addr)
         char buffer[sizeof(SYMBOL_INFO) + MAX_LABEL_SIZE * sizeof(char)];
         PSYMBOL_INFO pSymbol = (PSYMBOL_INFO)buffer;
         pSymbol->SizeOfStruct = sizeof(SYMBOL_INFO);
-        pSymbol->MaxNameLen = MAX_LABEL_SIZE;
+        pSymbol->MaxNameLen = MAX_LABEL_SIZE - 1;
         if(SymFromAddr(fdProcessInfo->hProcess, (DWORD64)addr, &displacement, pSymbol) and !displacement)
         {
             if(!bUndecorateSymbolNames or !UnDecorateSymbolName(pSymbol->Name, label, MAX_SYM_NAME, UNDNAME_COMPLETE))
diff --git a/x64_dbg_dbg/value.cpp b/x64_dbg_dbg/value.cpp
index a40322e8..d7258a82 100644
--- a/x64_dbg_dbg/value.cpp
+++ b/x64_dbg_dbg/value.cpp
@@ -1953,6 +1953,7 @@ bool valtostring(const char* string, uint* value, bool silent)
         {
             uint csp = GetContextDataEx(hActiveThread, UE_CSP);
             GuiStackDumpAt(csp, csp);
+            GuiUpdateRegisterView();
         }
         else
             GuiUpdateAllViews(); //repaint gui
diff --git a/x64_dbg_exe/x64_dbg_exe.vcxproj b/x64_dbg_exe/x64_dbg_exe.vcxproj
index 2ad12bb5..4e831d7c 100644
--- a/x64_dbg_exe/x64_dbg_exe.vcxproj
+++ b/x64_dbg_exe/x64_dbg_exe.vcxproj
@@ -19,6 +19,10 @@
   <ItemGroup>
     <ResourceCompile Include="resource.rc" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\bug.ico" />
+    <None Include="manifest.xml" />
+  </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{3A22175E-6B72-FDCC-1603-C4A2163C7900}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
diff --git a/x64_dbg_exe/x64_dbg_exe.vcxproj.filters b/x64_dbg_exe/x64_dbg_exe.vcxproj.filters
index aeb105a7..c37e6d1a 100644
--- a/x64_dbg_exe/x64_dbg_exe.vcxproj.filters
+++ b/x64_dbg_exe/x64_dbg_exe.vcxproj.filters
@@ -29,4 +29,10 @@
       <Filter>Resource Files</Filter>
     </ResourceCompile>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="..\bug.ico">
+      <Filter>Resource Files</Filter>
+    </None>
+    <None Include="manifest.xml" />
+  </ItemGroup>
 </Project>
\ No newline at end of file