From b7bf5b91f0dce983b02e5868d203ef01bd84f54a Mon Sep 17 00:00:00 2001 From: Akash Mozumdar Date: Fri, 20 Jul 2018 15:10:34 -0400 Subject: [PATCH] move folders into root --- CMakeLists.txt | 7 ++--- {vnr/texthook => texthook}/CMakeLists.txt | 2 ++ {vnr/texthook => texthook}/hookman.cc | 0 {vnr/texthook => texthook}/hookman.h | 0 {vnr/texthook => texthook}/host.cc | 0 {vnr/texthook => texthook}/host.h | 0 {vnr/texthook => texthook}/pipe.cc | 0 {vnr/texthook => texthook}/pipe.h | 0 {vnr/texthook => texthook}/textthread.cc | 0 {vnr/texthook => texthook}/textthread.h | 0 {vnr/texthook => texthook}/winmutex.h | 0 vnr/CMakeLists.txt | 27 ------------------- {vnr/vnrhook => vnrhook}/CMakeLists.txt | 2 ++ {vnr/vnrhook => vnrhook}/include/const.h | 0 {vnr/vnrhook => vnrhook}/include/defs.h | 0 {vnr/vnrhook => vnrhook}/include/types.h | 0 {vnr/vnrhook => vnrhook}/src/engine/engine.cc | 0 {vnr/vnrhook => vnrhook}/src/engine/engine.h | 0 .../vnrhook => vnrhook}/src/engine/hookdefs.h | 0 {vnr/vnrhook => vnrhook}/src/engine/match.cc | 0 {vnr/vnrhook => vnrhook}/src/engine/match.h | 0 .../src/engine/mono/funcinfo.h | 0 .../src/engine/mono/types.h | 0 .../vnrhook => vnrhook}/src/engine/pchooks.cc | 0 {vnr/vnrhook => vnrhook}/src/engine/pchooks.h | 0 .../src/engine/ppsspp/funcinfo.h | 0 {vnr/vnrhook => vnrhook}/src/except.h | 0 .../src/hijack/texthook.cc | 0 .../vnrhook => vnrhook}/src/hijack/texthook.h | 0 {vnr/vnrhook => vnrhook}/src/main.cc | 0 {vnr/vnrhook => vnrhook}/src/main.h | 0 {vnr/vnrhook => vnrhook}/src/pipe.cc | 0 .../src/util/cpputil/cppcstring.h | 0 .../src/util/disasm/disasm.cc | 0 .../src/util/disasm/disasm.h | 0 {vnr/vnrhook => vnrhook}/src/util/growl.h | 0 .../src/util/ithsys/ithsys.cc | 0 .../src/util/ithsys/ithsys.h | 0 .../src/util/memdbg/memdbg.h | 0 .../src/util/memdbg/memsearch.cc | 0 .../src/util/memdbg/memsearch.h | 0 .../src/util/mono/monoobject.h | 0 .../src/util/mono/monotype.h | 0 .../src/util/ntdll/ntdll.h | 0 {vnr/vnrhook => vnrhook}/src/util/util.cc | 0 {vnr/vnrhook => vnrhook}/src/util/util.h | 0 46 files changed, 8 insertions(+), 30 deletions(-) rename {vnr/texthook => texthook}/CMakeLists.txt (98%) rename {vnr/texthook => texthook}/hookman.cc (100%) rename {vnr/texthook => texthook}/hookman.h (100%) rename {vnr/texthook => texthook}/host.cc (100%) rename {vnr/texthook => texthook}/host.h (100%) rename {vnr/texthook => texthook}/pipe.cc (100%) rename {vnr/texthook => texthook}/pipe.h (100%) rename {vnr/texthook => texthook}/textthread.cc (100%) rename {vnr/texthook => texthook}/textthread.h (100%) rename {vnr/texthook => texthook}/winmutex.h (100%) delete mode 100644 vnr/CMakeLists.txt rename {vnr/vnrhook => vnrhook}/CMakeLists.txt (99%) rename {vnr/vnrhook => vnrhook}/include/const.h (100%) rename {vnr/vnrhook => vnrhook}/include/defs.h (100%) rename {vnr/vnrhook => vnrhook}/include/types.h (100%) rename {vnr/vnrhook => vnrhook}/src/engine/engine.cc (100%) rename {vnr/vnrhook => vnrhook}/src/engine/engine.h (100%) rename {vnr/vnrhook => vnrhook}/src/engine/hookdefs.h (100%) rename {vnr/vnrhook => vnrhook}/src/engine/match.cc (100%) rename {vnr/vnrhook => vnrhook}/src/engine/match.h (100%) rename {vnr/vnrhook => vnrhook}/src/engine/mono/funcinfo.h (100%) rename {vnr/vnrhook => vnrhook}/src/engine/mono/types.h (100%) rename {vnr/vnrhook => vnrhook}/src/engine/pchooks.cc (100%) rename {vnr/vnrhook => vnrhook}/src/engine/pchooks.h (100%) rename {vnr/vnrhook => vnrhook}/src/engine/ppsspp/funcinfo.h (100%) rename {vnr/vnrhook => vnrhook}/src/except.h (100%) rename {vnr/vnrhook => vnrhook}/src/hijack/texthook.cc (100%) rename {vnr/vnrhook => vnrhook}/src/hijack/texthook.h (100%) rename {vnr/vnrhook => vnrhook}/src/main.cc (100%) rename {vnr/vnrhook => vnrhook}/src/main.h (100%) rename {vnr/vnrhook => vnrhook}/src/pipe.cc (100%) rename {vnr/vnrhook => vnrhook}/src/util/cpputil/cppcstring.h (100%) rename {vnr/vnrhook => vnrhook}/src/util/disasm/disasm.cc (100%) rename {vnr/vnrhook => vnrhook}/src/util/disasm/disasm.h (100%) rename {vnr/vnrhook => vnrhook}/src/util/growl.h (100%) rename {vnr/vnrhook => vnrhook}/src/util/ithsys/ithsys.cc (100%) rename {vnr/vnrhook => vnrhook}/src/util/ithsys/ithsys.h (100%) rename {vnr/vnrhook => vnrhook}/src/util/memdbg/memdbg.h (100%) rename {vnr/vnrhook => vnrhook}/src/util/memdbg/memsearch.cc (100%) rename {vnr/vnrhook => vnrhook}/src/util/memdbg/memsearch.h (100%) rename {vnr/vnrhook => vnrhook}/src/util/mono/monoobject.h (100%) rename {vnr/vnrhook => vnrhook}/src/util/mono/monotype.h (100%) rename {vnr/vnrhook => vnrhook}/src/util/ntdll/ntdll.h (100%) rename {vnr/vnrhook => vnrhook}/src/util/util.cc (100%) rename {vnr/vnrhook => vnrhook}/src/util/util.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9d0c4fa..d8650f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -47,8 +47,8 @@ add_definitions( include_directories( . - vnr - vnr/texthook + + texthook ${CMAKE_BINARY_DIR}/gui ) @@ -90,7 +90,8 @@ source_group("Resource Files" FILES ${resource_src}) add_executable(${PROJECT_NAME} ${nexthooker_src}) - add_subdirectory(vnr) +add_subdirectory(texthook) +add_subdirectory(vnrhook) # add_subdirectory(profile) set_target_properties(${PROJECT_NAME} PROPERTIES diff --git a/vnr/texthook/CMakeLists.txt b/texthook/CMakeLists.txt similarity index 98% rename from vnr/texthook/CMakeLists.txt rename to texthook/CMakeLists.txt index cc6aeb4..0982464 100644 --- a/vnr/texthook/CMakeLists.txt +++ b/texthook/CMakeLists.txt @@ -6,6 +6,8 @@ # # TODO: Get rid of dependence on msvc's swprintf # DEFINES += _CRT_NON_CONFORMING_SWPRINTFS +project(host) + set(vnrhost_src hookman.h host.h diff --git a/vnr/texthook/hookman.cc b/texthook/hookman.cc similarity index 100% rename from vnr/texthook/hookman.cc rename to texthook/hookman.cc diff --git a/vnr/texthook/hookman.h b/texthook/hookman.h similarity index 100% rename from vnr/texthook/hookman.h rename to texthook/hookman.h diff --git a/vnr/texthook/host.cc b/texthook/host.cc similarity index 100% rename from vnr/texthook/host.cc rename to texthook/host.cc diff --git a/vnr/texthook/host.h b/texthook/host.h similarity index 100% rename from vnr/texthook/host.h rename to texthook/host.h diff --git a/vnr/texthook/pipe.cc b/texthook/pipe.cc similarity index 100% rename from vnr/texthook/pipe.cc rename to texthook/pipe.cc diff --git a/vnr/texthook/pipe.h b/texthook/pipe.h similarity index 100% rename from vnr/texthook/pipe.h rename to texthook/pipe.h diff --git a/vnr/texthook/textthread.cc b/texthook/textthread.cc similarity index 100% rename from vnr/texthook/textthread.cc rename to texthook/textthread.cc diff --git a/vnr/texthook/textthread.h b/texthook/textthread.h similarity index 100% rename from vnr/texthook/textthread.h rename to texthook/textthread.h diff --git a/vnr/texthook/winmutex.h b/texthook/winmutex.h similarity index 100% rename from vnr/texthook/winmutex.h rename to texthook/winmutex.h diff --git a/vnr/CMakeLists.txt b/vnr/CMakeLists.txt deleted file mode 100644 index 016681f..0000000 --- a/vnr/CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ -# config.pri -# DEFINES += _SECURE_SCL=0 _SCL_SECURE_NO_WARNINGS -# DEFINES += _CRT_SECURE_NO_WARNINGS - -cmake_minimum_required(VERSION 2.8) - -set(CMAKE_CONFIGURATION_TYPES Debug Release) - -project(vnr) - -set(WDK_HOME "C:\\WinDDK\\7600.16385.1" CACHE FILEPATH "Windows Driver Kit path") - -add_definitions( - /DUNICODE - /D_UNICODE - /D_SECURE_SCL=0 - /D_SCL_SECURE_NO_WARNINGS - /D_CRT_SECURE_NO_WARNINGS -) - -include_directories( - ${PROJECT_SOURCE_DIR} - #${PROJECT_SOURCE_DIR}/texthook -) - -add_subdirectory(vnrhook) -add_subdirectory(texthook) diff --git a/vnr/vnrhook/CMakeLists.txt b/vnrhook/CMakeLists.txt similarity index 99% rename from vnr/vnrhook/CMakeLists.txt rename to vnrhook/CMakeLists.txt index e8a770a..9efcc1d 100644 --- a/vnr/vnrhook/CMakeLists.txt +++ b/vnrhook/CMakeLists.txt @@ -17,6 +17,8 @@ # QMAKE_CXXFLAGS_EXCEPTIONS_ON += /EHa # } +project(engine) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}) set(vnrhook_src diff --git a/vnr/vnrhook/include/const.h b/vnrhook/include/const.h similarity index 100% rename from vnr/vnrhook/include/const.h rename to vnrhook/include/const.h diff --git a/vnr/vnrhook/include/defs.h b/vnrhook/include/defs.h similarity index 100% rename from vnr/vnrhook/include/defs.h rename to vnrhook/include/defs.h diff --git a/vnr/vnrhook/include/types.h b/vnrhook/include/types.h similarity index 100% rename from vnr/vnrhook/include/types.h rename to vnrhook/include/types.h diff --git a/vnr/vnrhook/src/engine/engine.cc b/vnrhook/src/engine/engine.cc similarity index 100% rename from vnr/vnrhook/src/engine/engine.cc rename to vnrhook/src/engine/engine.cc diff --git a/vnr/vnrhook/src/engine/engine.h b/vnrhook/src/engine/engine.h similarity index 100% rename from vnr/vnrhook/src/engine/engine.h rename to vnrhook/src/engine/engine.h diff --git a/vnr/vnrhook/src/engine/hookdefs.h b/vnrhook/src/engine/hookdefs.h similarity index 100% rename from vnr/vnrhook/src/engine/hookdefs.h rename to vnrhook/src/engine/hookdefs.h diff --git a/vnr/vnrhook/src/engine/match.cc b/vnrhook/src/engine/match.cc similarity index 100% rename from vnr/vnrhook/src/engine/match.cc rename to vnrhook/src/engine/match.cc diff --git a/vnr/vnrhook/src/engine/match.h b/vnrhook/src/engine/match.h similarity index 100% rename from vnr/vnrhook/src/engine/match.h rename to vnrhook/src/engine/match.h diff --git a/vnr/vnrhook/src/engine/mono/funcinfo.h b/vnrhook/src/engine/mono/funcinfo.h similarity index 100% rename from vnr/vnrhook/src/engine/mono/funcinfo.h rename to vnrhook/src/engine/mono/funcinfo.h diff --git a/vnr/vnrhook/src/engine/mono/types.h b/vnrhook/src/engine/mono/types.h similarity index 100% rename from vnr/vnrhook/src/engine/mono/types.h rename to vnrhook/src/engine/mono/types.h diff --git a/vnr/vnrhook/src/engine/pchooks.cc b/vnrhook/src/engine/pchooks.cc similarity index 100% rename from vnr/vnrhook/src/engine/pchooks.cc rename to vnrhook/src/engine/pchooks.cc diff --git a/vnr/vnrhook/src/engine/pchooks.h b/vnrhook/src/engine/pchooks.h similarity index 100% rename from vnr/vnrhook/src/engine/pchooks.h rename to vnrhook/src/engine/pchooks.h diff --git a/vnr/vnrhook/src/engine/ppsspp/funcinfo.h b/vnrhook/src/engine/ppsspp/funcinfo.h similarity index 100% rename from vnr/vnrhook/src/engine/ppsspp/funcinfo.h rename to vnrhook/src/engine/ppsspp/funcinfo.h diff --git a/vnr/vnrhook/src/except.h b/vnrhook/src/except.h similarity index 100% rename from vnr/vnrhook/src/except.h rename to vnrhook/src/except.h diff --git a/vnr/vnrhook/src/hijack/texthook.cc b/vnrhook/src/hijack/texthook.cc similarity index 100% rename from vnr/vnrhook/src/hijack/texthook.cc rename to vnrhook/src/hijack/texthook.cc diff --git a/vnr/vnrhook/src/hijack/texthook.h b/vnrhook/src/hijack/texthook.h similarity index 100% rename from vnr/vnrhook/src/hijack/texthook.h rename to vnrhook/src/hijack/texthook.h diff --git a/vnr/vnrhook/src/main.cc b/vnrhook/src/main.cc similarity index 100% rename from vnr/vnrhook/src/main.cc rename to vnrhook/src/main.cc diff --git a/vnr/vnrhook/src/main.h b/vnrhook/src/main.h similarity index 100% rename from vnr/vnrhook/src/main.h rename to vnrhook/src/main.h diff --git a/vnr/vnrhook/src/pipe.cc b/vnrhook/src/pipe.cc similarity index 100% rename from vnr/vnrhook/src/pipe.cc rename to vnrhook/src/pipe.cc diff --git a/vnr/vnrhook/src/util/cpputil/cppcstring.h b/vnrhook/src/util/cpputil/cppcstring.h similarity index 100% rename from vnr/vnrhook/src/util/cpputil/cppcstring.h rename to vnrhook/src/util/cpputil/cppcstring.h diff --git a/vnr/vnrhook/src/util/disasm/disasm.cc b/vnrhook/src/util/disasm/disasm.cc similarity index 100% rename from vnr/vnrhook/src/util/disasm/disasm.cc rename to vnrhook/src/util/disasm/disasm.cc diff --git a/vnr/vnrhook/src/util/disasm/disasm.h b/vnrhook/src/util/disasm/disasm.h similarity index 100% rename from vnr/vnrhook/src/util/disasm/disasm.h rename to vnrhook/src/util/disasm/disasm.h diff --git a/vnr/vnrhook/src/util/growl.h b/vnrhook/src/util/growl.h similarity index 100% rename from vnr/vnrhook/src/util/growl.h rename to vnrhook/src/util/growl.h diff --git a/vnr/vnrhook/src/util/ithsys/ithsys.cc b/vnrhook/src/util/ithsys/ithsys.cc similarity index 100% rename from vnr/vnrhook/src/util/ithsys/ithsys.cc rename to vnrhook/src/util/ithsys/ithsys.cc diff --git a/vnr/vnrhook/src/util/ithsys/ithsys.h b/vnrhook/src/util/ithsys/ithsys.h similarity index 100% rename from vnr/vnrhook/src/util/ithsys/ithsys.h rename to vnrhook/src/util/ithsys/ithsys.h diff --git a/vnr/vnrhook/src/util/memdbg/memdbg.h b/vnrhook/src/util/memdbg/memdbg.h similarity index 100% rename from vnr/vnrhook/src/util/memdbg/memdbg.h rename to vnrhook/src/util/memdbg/memdbg.h diff --git a/vnr/vnrhook/src/util/memdbg/memsearch.cc b/vnrhook/src/util/memdbg/memsearch.cc similarity index 100% rename from vnr/vnrhook/src/util/memdbg/memsearch.cc rename to vnrhook/src/util/memdbg/memsearch.cc diff --git a/vnr/vnrhook/src/util/memdbg/memsearch.h b/vnrhook/src/util/memdbg/memsearch.h similarity index 100% rename from vnr/vnrhook/src/util/memdbg/memsearch.h rename to vnrhook/src/util/memdbg/memsearch.h diff --git a/vnr/vnrhook/src/util/mono/monoobject.h b/vnrhook/src/util/mono/monoobject.h similarity index 100% rename from vnr/vnrhook/src/util/mono/monoobject.h rename to vnrhook/src/util/mono/monoobject.h diff --git a/vnr/vnrhook/src/util/mono/monotype.h b/vnrhook/src/util/mono/monotype.h similarity index 100% rename from vnr/vnrhook/src/util/mono/monotype.h rename to vnrhook/src/util/mono/monotype.h diff --git a/vnr/vnrhook/src/util/ntdll/ntdll.h b/vnrhook/src/util/ntdll/ntdll.h similarity index 100% rename from vnr/vnrhook/src/util/ntdll/ntdll.h rename to vnrhook/src/util/ntdll/ntdll.h diff --git a/vnr/vnrhook/src/util/util.cc b/vnrhook/src/util/util.cc similarity index 100% rename from vnr/vnrhook/src/util/util.cc rename to vnrhook/src/util/util.cc diff --git a/vnr/vnrhook/src/util/util.h b/vnrhook/src/util/util.h similarity index 100% rename from vnr/vnrhook/src/util/util.h rename to vnrhook/src/util/util.h