Merge pull request x64dbg#423 from x64dbg/Nukem9-master

Nukem9 master

Author: mrexodia

.gitignore

@@ -1,17 +1,19 @@
-#ignore directories
-bin/
+# Ignored directories
+bin/*/
 obj/
 ipch/
 Win32/
 x64/
 release/
 build/
+gui_build/
 debug/
 *XE Results*/
 doxygen*/
 doc/
+COV/
 
-#global filetypes to ignore
+# Global filetypes to ignore
 *.depend
 *.layout
 *.patch
@@ -30,49 +32,32 @@ doc/
 *.pro.user.*
 *.orig
 cov-int*
-COV/
 *.pdb
 ui_*
+*.aps
+*.pro.user
+.DS_Store
+*.ipgset
+*.vcxproj.user
 
-#project to ignore
-todo_bridge.txt
+# Project to ignore
 help/x64*dbg.chm
 help/output/
 
-#debugger files to ignore
-x64_dbg_dbg/ODbgScript.chm
-x64_dbg_dbg/ODbgScript.chw
-x64_dbg_dbg/CppCheckResults.xml
-x64_dbg_dbg/.cccc/
-x64_dbg_dbg/suggestions.txt
+# Debugger files to ignore
+CppCheckResults.xml
+src/dbg/ODbgScript.chm
+src/dbg/ODbgScript.chw
 
-# For GUI
-*.pro.user
-x64_dbg_gui/DebuggerX64-build-Debug
-x64_dbg_gui/DebuggerX64-build-Release
-x64_dbg_gui/bin
-x64_dbg_gui/Project/GeneratedFiles/
-x64_dbg_gui/Project/release/
-x64_dbg_gui/Project/Win32/
-x64_dbg_gui/Project/x64/
-x64_dbg_gui/Project/Makefile
-x64_dbg_gui/Project/Makefile.Debug
-x64_dbg_gui/Project/Makefile.Release
-x64_dbg_gui/Project/Src/Bridge/libx32*bridge.a
-x64_dbg_gui/Project/Src/Bridge/libx64*bridge.a
-x64_dbg_gui/Project/Src/Bridge/x32*bridge.lib
-x64_dbg_gui/Project/Src/Bridge/x64*bridge.lib
-x64_dbg_gui/*/Makefile
-x64_dbg_gui/*/Makefile.Debug
-x64_dbg_gui/*/Makefile.Release
+# GUI files
+src/gui/build
+src/gui/Makefile*
 tools/
 RCa*
-*.aps
+src/build-*/
 
-# Intel performance guide
-*.ipgset
-
-#exceptions
-!/AStyleWhore.exe
-!/AStyle.dll
-.DS_Store
+# Exceptions
+!/hooks/AStyleWhore.exe
+!/hooks/AStyle.dll
+!/bin/x64dbg_shell_remove.reg
+!*.lib

README.md

@@ -29,7 +29,7 @@ Jenkins build server can be found [here](http://jenkins.x64dbg.com).
 - Fully customizable color scheme
 - Dynamically recognize modules and strings
 - Import reconstructor integrated (Scylla)
-- Fast disassembler (BeaEngine)
+- Fast disassembler (Capstone)
 - User database (JSON) for comments, labels, bookmarks, etc.
 - Plugin support with growing API
 - Extendable, debuggable scripting language for automation
@@ -39,13 +39,15 @@ Jenkins build server can be found [here](http://jenkins.x64dbg.com).
 - Built-in assembler (XEDParse)
 - Executable patching
 - Yara Pattern Matching
+- Decompiler (Snowman)
+- Analysis
 
 ## License
 *x64dbg* is licensed under GPLv3, which means you can freely distribute and/or modify the source of *x64dbg*, as long as you share your changes with us. The only exception is that plugins you write do not have to comply with the GPLv3 license. They do not have to be open-source and they can be commercial and/or private. The only exception to this is when your plugin uses code copied from *x64dbg*. In that case you would still have to share the changes to *x64dbg* with us.
 
 ## Credits
 - Debugger core by [TitanEngine Community Edition](https://bitbucket.org/mrexodia/titanengine-update)
-- Disassembly powered by [BeaEngine](http://www.beaengine.org) ([Updated](https://bitbucket.org/mrexodia/beaengine)) & [Capstone](http://capstone-engine.org)
+- Disassembly powered by [Capstone](http://capstone-engine.org)
 - Assembly powered by [XEDParse](https://bitbucket.org/mrexodia/xedparse)
 - Import reconstruction powered by [Scylla](https://github.com/NtQuery/Scylla)
 - JSON powered by [Jansson](http://www.digip.org/jansson)

x64dbg_shell_remove.reg renamed to bin/x64dbg_shell_remove.reg

@@ -3,70 +3,64 @@
 echo Saving PATH
 if "%OLDPATH%"=="" set OLDPATH=%PATH%
 
-if "%1"=="x32" (
-    call setenv.bat x32
-    set type=Win32
-	goto build
-) else if "%1"=="x64" (
-    call setenv.bat x64
-    set type=x64
-	goto build
-) else if "%1"=="coverity" (
-    if "%2"=="" (
-        echo "usage: build.bat coverity x32/x64"
-        goto :eof
-    )
-	goto coverity
-) else if "%1"=="doxygen" (
-    goto doxygen
-) else if "%1"=="chm" (
-    goto chm
-) else (
-    echo "usage: build.bat x32/x64/coverity/doxygen/chm"
-    goto :eof
-)
+cd %~dp0
+
+if /i "%1"=="x32"	call setenv.bat x32&set type=Configuration=Release;Platform=Win32&goto build
+if /i "%1"=="x64"	call setenv.bat x64&set type=Configuration=Release;Platform=x64&goto build
+if /i "%1"=="coverity"	goto coverity
+if /i "%1"=="doxygen"	call setenv.bat doxygen&goto doxygen
+if /i "%1"=="chm"	call setenv.bat chm&goto chm
+
+goto usage
+
 
 :build
 echo Building DBG...
-devenv /Rebuild "Release|%type%" x64_dbg.sln
-
-echo GUI prebuildStep
-cd x64_dbg_gui\Project
-cmd /k "prebuildStep.bat %1"
-cd ..
-cd ..
+msbuild.exe x64dbg.sln /m /verbosity:minimal /t:Rebuild /p:%type%
 
 echo Building GUI...
-rmdir /S /Q build
-mkdir build
-cd build
-qmake ..\x64_dbg_gui\Project\x64_dbg.pro CONFIG+=release
+rmdir /S /Q src\gui_build
+cd src\gui
+qmake x64dbg.pro CONFIG+=release
 jom
-cd ..
+cd ..\..
+goto :restorepath
 
-echo GUI afterbuildStep
-cd x64_dbg_gui\Project
-call afterbuildStep.bat %1 ..\..\build\release
-cd ..
-cd ..
-goto restorepath
 
 :coverity
+if "%2"=="" (
+    echo "Usage: build.bat coverity x32/x64"
+    goto usage
+)
+
 call setenv.bat coverity
 echo Building with Coverity
 cov-configure --msvc
 cov-build --dir cov-int --instrument build.bat %2%
-goto restorepath
+goto :restorepath
+
 
 :doxygen
-call setenv.bat doxygen
 doxygen
-goto restorepath
+goto :restorepath
+
 
 :chm
-call setenv.bat chm
 start /w "" winchm.exe help\x64_dbg.wcp /h
-goto restorepath
+goto :restorepath
+
+
+:usage
+echo "Usage: build.bat x32/x64/coverity (x32/x64)/doxygen/chm"
+echo.
+echo Examples:
+echo   build.bat x32               : builds 32-bit release build
+echo   build.bat x64               : builds 64-bit release build
+echo   build.bat coverity x32      : builds 32-bit coverity build
+echo   build.bat coverity x64      : builds 64-bit coverity build
+echo   build.bat doxygen           : generate doxygen documentation
+echo   build.bat chm               : generate windows help format documentation
+goto :restorepath
 
 :restorepath
 echo Resetting PATH

build.bat

@@ -1,58 +1,49 @@
 @echo off
-echo cleaning base directory...
+
+echo Cleaning base directory...
 del /Q *.sdf
 del /Q *.layout
 del /Q /A H *.suo
 rmdir /S /Q ipch
 rmdir /S /Q release
-echo cleaning x64_dbg_bridge...
-cd x64_dbg_bridge
-rmdir /S /Q obj
-rmdir /S /Q Win32
-rmdir /S /Q x64
-del /Q *.bmarks
-del /Q *.layout
-del /Q *.depend
-cd ..
-echo cleaning x64_dbg_dbg...
-cd x64_dbg_dbg
-rmdir /S /Q obj
-rmdir /S /Q Win32
-rmdir /S /Q x64
-del /Q *.bmarks
-del /Q *.layout
-del /Q *.depend
-cd ..
-echo cleaning x64_dbg_exe...
-cd x64_dbg_exe
-rmdir /S /Q obj
-rmdir /S /Q Win32
-rmdir /S /Q x64
-del /Q *.bmarks
-del /Q *.layout
-del /Q *.depend
-cd ..
-echo cleaning x64_dbg_gui...
-cd x64_dbg_gui
-rmdir /S /Q bin
-rmdir /S /Q Project\GeneratedFiles
-rmdir /S /Q Project\release
-rmdir /S /Q Project\debug
-rmdir /S /Q Project\Win32
-rmdir /S /Q Project\x64
-del /Q Project\Src\Bridge\libx32bridge.a
-del /Q Project\Src\Bridge\libx64bridge.a
-del /Q Project\Src\Bridge\x32bridge.lib
-del /Q Project\Src\Bridge\x64bridge.lib
-cd ..
-echo cleaning bin\
+rmdir /S /Q build
+rmdir /S /Q cov-int
+
+echo Cleaning BRIDGE...
+cd src\bridge
+call :delfiles
+
+echo Cleaning DBG...
+cd src\dbg
+call :delfiles
+
+echo Cleaning EXE...
+cd src\exe
+call :delfiles
+
+echo Cleaning LAUNCHER...
+cd src\launcher
+call :delfiles
+
+echo Cleaning GUI SRC...
+rmdir /S /Q src\gui_build
+
+echo Cleaning GUI...
+cd src/gui
+rmdir /S /Q build
+del /Q Makefile*
+del /Q *.pdb
+cd ..\..
+
+echo Cleaning bin\
 del /Q bin\*.pdb
 del /Q bin\*.exp
 del /Q bin\*.a
 del /Q bin\*.lib
 del /Q bin\*.def
-del /Q bin\x96_dbg.exe
-echo cleaning bin\x32...
+del /Q bin\x96dbg.exe
+
+echo Cleaning bin\x32...
 rmdir /S /Q bin\x32\db
 del /Q bin\x32\*.pdb
 del /Q bin\x32\*.exp
@@ -63,7 +54,8 @@ del /Q bin\x32\x32dbg.exe
 del /Q bin\x32\x32dbg.dll
 del /Q bin\x32\x32gui.dll
 del /Q bin\x32\x32bridge.dll
-echo cleaning bin\x64...
+
+echo Cleaning bin\x64...
 rmdir /S /Q bin\x64\db
 del /Q bin\x64\*.pdb
 del /Q bin\x64\*.exp
@@ -74,8 +66,21 @@ del /Q bin\x64\x64dbg.exe
 del /Q bin\x64\x64dbg.dll
 del /Q bin\x64\x64gui.dll
 del /Q bin\x64\x64bridge.dll
-echo cleaning help...
+
+echo Cleaning help...
 cd help
 del /Q *.chm
 rmdir /S /Q output
-exit 0
+
+echo Done!
+exit 0
+
+:delfiles
+rmdir /S /Q obj
+rmdir /S /Q Win32
+rmdir /S /Q x64
+del /Q *.bmarks
+del /Q *.layout
+del /Q *.depend
+del /Q *.pdb
+cd ..\..

clean.bat

@@ -4,13 +4,13 @@
 #
 
 #check if the formatter is present
-if [ ! -f ./AStyleWhore.exe ]; then
+if [ ! -f ./hooks/AStyleWhore.exe ]; then
     echo "AStyleWhore not found!"
     exit 0
 fi
 
 #format the code
-"./AStyleWhore.exe" Silent
+"./hooks/AStyleWhore.exe" Silent
 
 #exit when nothing needs to be done
 if [ $? == 0 ]; then
@@ -28,6 +28,6 @@ fi
 #cancel commit if the changes were undone by the formatting
 gitFiles=$(git diff-index --name-only --cached HEAD)
 if [ -z "$gitFiles" ]; then
-    "./AStyleWhore.exe" "After formatting, no files were staged..."
+    "./hooks/AStyleWhore.exe" "After formatting, no files were staged..."
     exit 1
 fi

formatting_regexes.txt

@@ -21,7 +21,7 @@ if "%1"=="x32" (
 ) else if "%1"=="chm" (
     goto chm
 ) else (
-    echo "usage: setenv x32/x64/coverity/doxygen/chm"
+    echo "Usage: setenv x32/x64/coverity/doxygen/chm"
     goto :eof
 )