flatten build directories

.gitignore

@@ -1,2 +1,5 @@
-gui/command.cpp
-.vs/
+Build/
+Builds/
+*.vs/
+*.vscode/
+*.user

CMakeLists.txt

@@ -7,18 +7,26 @@ project(ITHVNR)
 set(WDK_HOME "C:\\WinDDK\\7600.16385.1" CACHE FILEPATH "Windows Driver Kit path")
 set(CMAKE_INSTALL_PREFIX "" CACHE FILEPATH "installation path")
 
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/Debug")
-set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/Release")
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}/Debug")
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}/Release")
+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "8")
+  set(CMAKE_FINAL_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/Builds/${CMAKE_BUILD_TYPE}_x64)
+else()
+  set(CMAKE_FINAL_OUTPUT_DIRECTORY ${CMAKE_SOURCE_DIR}/Builds/${CMAKE_BUILD_TYPE}_x86)
+endif()
+set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_FINAL_OUTPUT_DIRECTORY})
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_FINAL_OUTPUT_DIRECTORY})
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_FINAL_OUTPUT_DIRECTORY})
 
 set(CMAKE_WARN_ON_ABSOLUTE_INSTALL_DESTINATION ON)
 
+execute_process(COMMAND "cmd" " /C date /T" OUTPUT_VARIABLE FULLDATE)
+# set(DATE "07/13/2018")
+string(SUBSTRING ${FULLDATE} 0 10 BUILD_DATE)
+set(BUILD_DATE ${BUILD_DATE})
 
 set(CPACK_GENERATOR "ZIP")
 set(CPACK_PACKAGE_VERSION_MAJOR 3)
-set(CPACK_PACKAGE_VERSION_MINOR 5640)
-set(CPACK_PACKAGE_VERSION_PATCH 1)
+set(CPACK_PACKAGE_VERSION_MINOR 5642)
+set(CPACK_PACKAGE_VERSION_PATCH 0)
 set(CPACK_SOURCE_GENERATOR "ZIP")
 set(CPACK_SOURCE_IGNORE_FILES "/CVS/;/\\\\.svn/;/\\\\.bzr/;/\\\\.hg/;/\\\\.git/;\\\\.swp$;\\\\.#;/#" ".*\\\\.user$" "\\\\.gitignore$" "\\\\.gitmodules$" "\\\\.git$")
 include(CPack)
@@ -28,7 +36,7 @@ add_compile_options(
   /wd4819 # config.pri
   /MP
   /GS-
-#  $<$<CONFIG:Release>:/MT>
+  $<$<CONFIG:RelWithDebInfo>:/MT>
 #  $<$<CONFIG:Debug>:/MTd>
 )
 
@@ -99,7 +107,7 @@ target_link_libraries(${PROJECT_NAME}
   profile
   vnrhost
   ithsys
-  ${WDK_HOME}/lib/wxp/i386/ntdll.lib
+  ntdll.lib
   comctl32.lib
   psapi.lib
 )

CMakeSettings.json

@@ -0,0 +1,16 @@
+{
+  "configurations": [
+    {
+      "name": "x86-Debug",
+      "generator": "Ninja",
+      "configurationType": "Debug",
+      "inheritEnvironments": ["msvc_x86"]
+    },
+    {
+      "name": "x86-Release",
+      "generator": "Ninja",
+      "configurationType": "RelWithDebInfo",
+      "inheritEnvironments": ["msvc_x86"]
+    }
+  ]
+}

gui/language.cpp

@@ -82,10 +82,9 @@ const wchar_t* ErrorNoAttach=L"No process attached.";
 //profile.cpp
 const wchar_t* ErrorMonitor=L"Can't monitor process.";
 //utility.cpp
-const wchar_t* InitMessage=L"Copyright (C) 2010-2012  kaosu <qiupf2000@gmail.com>\r\n\
-Copyright (C) 2015 zorkzero <zorkzero@hotmail.com>\r\n\
-Source code <https://code.google.com/p/interactive-text-hooker/>\r\n\
-General discussion <https://groups.google.com/forum/?fromgroups#!forum/interactive-text-hooker>";
+const wchar_t* InitMessage=L"Current developer: Artikash (akashmozumdar@gmail.com)\r\n\
+Former developers: kaosu, jichi, Andys, Stomp, mireado\r\n\
+Source code: https://github.com/Artikash/Textractor/tree/ithvnr-verbose";
 const wchar_t* BackgroundMsg=L"Type \":h\" or \":help\" for help.";
 const wchar_t* ErrorLinkExist=L"Link exist.";
 const wchar_t* ErrorCylicLink=L"Link failed. No cyclic link allowed.";

gui/version.h.in

@@ -1,2 +1,2 @@
-const wchar_t* build_date=L"27.01.2013";
+const wchar_t* build_date=L"@BUILD_DATE@";
 const WCHAR program_version[] = L"@CPACK_PACKAGE_VERSION_MAJOR@.@CPACK_PACKAGE_VERSION_MINOR@.@CPACK_PACKAGE_VERSION_PATCH@";

vnr/texthook/host/CMakeLists.txt

@@ -54,7 +54,7 @@ target_compile_options(vnrhost PRIVATE
 target_link_libraries(vnrhost
   ithsys
   profile
-  ${WDK_HOME}/lib/wxp/i386/ntdll.lib
+  ntdll.lib
 )
 
 target_compile_definitions(vnrhost

vnr/texthook/host/pipe.cc

@@ -9,6 +9,7 @@
 #include "vnrhook/include/const.h"
 #include "ithsys/ithsys.h"
 #include <stdio.h>
+#include <atlbase.h>
 //#include "CommandQueue.h"
 //#include <QtCore/QDebug>
 
@@ -267,7 +268,8 @@ DWORD WINAPI RecvThread(LPVOID lpThreadParameter)
           lock = 0;
         } break;
       case HOST_NOTIFICATION_TEXT:
-        //qDebug() << ((LPCSTR)(buff + 8));
+		USES_CONVERSION;
+		man->AddConsoleOutput(A2W((LPCSTR)(buff + 8)));
         break;
       }
     } else {

vnr/vnrhook/CMakeLists.txt

@@ -93,7 +93,7 @@ target_compile_options(vnrhook PRIVATE
 
 set(vnrhook_libs
   ithsys
-  ${WDK_HOME}/lib/wxp/i386/ntdll.lib
+  ntdll.lib
   Version.lib
 )
 

vnr/vnrhook/src/main.cc

@@ -302,7 +302,8 @@ DWORD NewHook(const HookParam &hp, LPCSTR name, DWORD flag)
 		strcpy(str, name);
 	}
 
-    ConsoleOutput("vnrcli:NewHook: try inserting hook");
+    ConsoleOutput("vnrcli:NewHook: try inserting hook:");
+	ConsoleOutput(str);
 
     // jichi 7/13/2014: This function would raise when too many hooks added
     ::hookman[current].InitHook(hp, str, flag & 0xffff);