clean code

Author: tangzx

debugger/attach/windows/src/Arch.vcxproj

@@ -72,13 +72,13 @@
   <PropertyGroup Label="UserMacros" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(IncludePath)</IncludePath>
+    <IncludePath>Shared;$(IncludePath)</IncludePath>
     <OutDir>$(SolutionDir)Build\$(Configuration)\x86\</OutDir>
     <IntDir>$(SolutionDir)Build\$(Configuration)\x86\Temp\$(ProjectName)</IntDir>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
     <LinkIncremental>true</LinkIncremental>
-    <IncludePath>$(IncludePath)</IncludePath>
+    <IncludePath>Shared;$(IncludePath)</IncludePath>
     <OutDir>$(SolutionDir)Build\$(Configuration)\x64</OutDir>
     <IntDir>$(SolutionDir)Build\$(Configuration)\x64\Temp\$(ProjectName)</IntDir>
   </PropertyGroup>
@@ -168,9 +168,6 @@
     <ProjectReference Include="Shared.vcxproj">
       <Project>{2cd198e9-319c-48fb-85dc-ae3427a05bd2}</Project>
     </ProjectReference>
-    <ProjectReference Include="tinyxml\tinyxmlSTL.vcxproj">
-      <Project>{a3a84737-5017-4577-b8a2-79429a25b8b6}</Project>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="arch\main.cpp" />

debugger/attach/windows/src/Debugger/DebugFrontend.cpp

@@ -24,6 +24,7 @@ along with Decoda.  If not, see <http://www.gnu.org/licenses/>.
 #include "DebugEvent.h"
 #include "CriticalSectionLock.h"
 #include "StlUtility.h"
+#include "Utility.h"
 
 #include <assert.h>
 #include <imagehlp.h>
@@ -984,41 +985,6 @@ unsigned int DebugFrontend::GetNumLines(const std::string& source) const
 
 }
 
-bool DebugFrontend::GetExeInfo(LPCSTR fileName, ExeInfo& info) const
-{
-    
-    LOADED_IMAGE loadedImage;
-    if (!MapAndLoad(const_cast<PSTR>(fileName), nullptr, &loadedImage, FALSE, TRUE))
-    {
-        return false;
-    }
-
-    // Check if this is a managed application.
-    // http://www.codeguru.com/cpp/w-p/system/misc/print.php/c14001
-
-    info.managed = false;
-    if (loadedImage.FileHeader->Signature == IMAGE_NT_SIGNATURE)
-    {
-       
-        DWORD netHeaderAddress =
-            loadedImage.FileHeader->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress;
-
-        if (netHeaderAddress)
-        {
-            info.managed = true;
-        }
-    
-    }
-    
-    info.entryPoint = loadedImage.FileHeader->OptionalHeader.AddressOfEntryPoint;
-    info.i386       = loadedImage.FileHeader->FileHeader.Machine == IMAGE_FILE_MACHINE_I386;
-
-    UnMapAndLoad(&loadedImage);
-
-    return true;
-
-}
-
 void DebugFrontend::SetBreakpoint(HANDLE hProcess, LPVOID entryPoint, bool set, BYTE* data) const
 {
 

debugger/attach/windows/src/Debugger/DebugFrontend.h

@@ -200,13 +200,6 @@ class DebugFrontend
 
 private:
 
-    struct ExeInfo
-    {
-        size_t			entryPoint;
-        bool            managed;
-        bool            i386;
-    };
-
     /**
      * Constructor.
      */
@@ -293,12 +286,6 @@ class DebugFrontend
      */
     bool GetIsBeingDebugged(DWORD processId) const;
 
-    /**
-     * Gets the entry point for the specified executable file from the PE data. If the PE
-     * is a .NET/managed application the managed parameter will be set to true.
-     */
-    bool GetExeInfo(LPCSTR fileName, ExeInfo& info) const;
-
     /**
      * Writes or clears a breakpoint (interrupt 3) at the address in the specified
      * process. When writing a breakpoint, the overwritten byte is store in data. The

debugger/attach/windows/src/Shared/Utility.cpp

@@ -1,4 +1,5 @@
 #include "Utility.h"
+#include <imagehlp.h>
 
 HWND g_wnd;
 
@@ -26,3 +27,32 @@ HWND GetCurrentWnd()
 	EnumWindows(EnumWindowsProcGetWndTitle, 0);
 	return g_wnd;
 }
+
+bool GetExeInfo(LPCSTR fileName, ExeInfo&info)
+{
+	LOADED_IMAGE loadedImage;
+	if (!MapAndLoad(const_cast<PSTR>(fileName), NULL, &loadedImage, FALSE, TRUE))
+	{
+		return false;
+	}
+
+	info.managed = false;
+	if (loadedImage.FileHeader->Signature == IMAGE_NT_SIGNATURE)
+	{
+
+		DWORD netHeaderAddress =
+			loadedImage.FileHeader->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress;
+
+		if (netHeaderAddress)
+		{
+			info.managed = true;
+		}
+	}
+
+	info.entryPoint = loadedImage.FileHeader->OptionalHeader.AddressOfEntryPoint;
+	info.i386 = loadedImage.FileHeader->FileHeader.Machine == IMAGE_FILE_MACHINE_I386;
+
+	UnMapAndLoad(&loadedImage);
+
+	return true;
+}

debugger/attach/windows/src/Shared/Utility.h

@@ -2,6 +2,20 @@
 #define UTILITY_H
 #include <windows.h>
 
+struct ExeInfo
+{
+	size_t			entryPoint;
+	bool            managed;
+	bool            i386;
+};
+
+/**
+* Gets the entry point for the specified executable file from the PE data. If the PE
+* is a .NET/managed application the managed parameter will be set to true.
+*/
+bool GetExeInfo(LPCSTR fileName, ExeInfo&info);
+
+// »ñÈ¡µ±Ç°Ö÷´°¿Ú
 HWND GetCurrentWnd();
 
 #endif

debugger/attach/windows/src/arch/main.cpp

@@ -1,44 +1,8 @@
 #include <wtypes.h>
 #include <stdio.h>
-#include <imagehlp.h>
 #include <string>
 #include <psapi.h>
-
-struct ExeInfo
-{
-	size_t			entryPoint;
-	bool            managed;
-	bool            i386;
-};
-
-bool GetExeInfo(LPCSTR fileName, ExeInfo&info)
-{
-	LOADED_IMAGE loadedImage;
-	if (!MapAndLoad(const_cast<PSTR>(fileName), NULL, &loadedImage, FALSE, TRUE))
-	{
-		return false;
-	}
-
-	info.managed = false;
-	if (loadedImage.FileHeader->Signature == IMAGE_NT_SIGNATURE)
-	{
-
-		DWORD netHeaderAddress =
-			loadedImage.FileHeader->OptionalHeader.DataDirectory[IMAGE_DIRECTORY_ENTRY_COM_DESCRIPTOR].VirtualAddress;
-
-		if (netHeaderAddress)
-		{
-			info.managed = true;
-		}
-	}
-
-	info.entryPoint = loadedImage.FileHeader->OptionalHeader.AddressOfEntryPoint;
-	info.i386 = loadedImage.FileHeader->FileHeader.Machine == IMAGE_FILE_MACHINE_I386;
-
-	UnMapAndLoad(&loadedImage);
-
-	return true;
-}
+#include "Utility.h"
 
 int main(int argc, char** argv)
 {
@@ -52,6 +16,7 @@ int main(int argc, char** argv)
 				printf("%d", info.i386);
 				return info.i386;
 			}
+			return -1;//file not exist
 		}
 		else if(cmd == "-pid") {
 			const char* pid_str = argv[2];