chenx221/Textractor_test
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

reorganize files

Browse Source
This commit is contained in:
Akash Mozumdar 2018-07-19 00:09:58 -04:00
parent 2065359a4e
commit 48450f9717
20 changed files with 54 additions and 159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gui/ProcessWindow.cpp
View File

@ -1,7 +1,7 @@
#include "ProcessWindow.h"
#include "resource.h"
#include "host/host.h"
#include "host/hookman.h"
#include "host.h"
#include "hookman.h"
#include "ProfileManager.h"
#include "profile/Profile.h"

4
gui/ProfileManager.cpp
View File

@ -1,7 +1,7 @@
#include "ProfileManager.h"
#include "profile/Profile.h"
#include "host/host.h"
#include "host/hookman.h"
#include "host.h"
#include "hookman.h"
#include "vnrhook/include/types.h"
#include "vnrhook/include/const.h"
#include "utility.h"

2
gui/command.cpp
View File

@ -16,7 +16,7 @@
*/
#include "ITH.h"
#include "host/host.h"
#include "host.h"
#include "vnrhook/include/const.h"
#include "vnrhook/include/types.h"
#include "language.h"

4
gui/main.cpp
View File

@ -16,8 +16,8 @@
*/
#include "ITH.h"
#include "host/host.h"
#include "host/hookman.h"
#include "host.h"
#include "hookman.h"
#include "profile/Profile.h"
#include "ProfileManager.h"

4
gui/utility.cpp
View File

@ -16,8 +16,8 @@
*/
#include "utility.h"
#include "host/host.h"
#include "host/hookman.h"
#include "host.h"
#include "hookman.h"
#include "vnrhook/include/types.h"
#include "vnrhook/include/const.h"
#include "profile/misc.h"

2
gui/utility.h
View File

@ -1,7 +1,7 @@
#pragma once
#include "ITH.h"
#include "texthook/host/textthread.h"
#include "textthread.h"
struct HookParam;
struct ProcessRecord;

4
gui/window.cpp
View File

@ -18,8 +18,8 @@
#include "ProcessWindow.h"
#include "resource.h"
#include "language.h"
#include "host/host.h"
#include "host/hookman.h"
#include "host.h"
#include "hookman.h"
#include "vnrhook/include/const.h"
#include "version.h"
#include "ProfileManager.h"

2
vnr/CMakeLists.txt
View File

@ -24,5 +24,5 @@ include_directories(
)
add_subdirectory(vnrhook)
add_subdirectory(texthook/host)
add_subdirectory(texthook)
add_subdirectory(profile)

4
vnr/profile/Profile.cpp
View File

@ -16,8 +16,8 @@
*/
#include "host/host.h"
#include "host/hookman.h"
#include "host.h"
#include "hookman.h"
#include "vnrhook/include/types.h"
#include "vnrhook/include/const.h"
#include "Profile.h"

2
vnr/profile/misc.cpp
View File

@ -1,7 +1,7 @@
#include "misc.h"
#include <regex>
#include <memory>
#include "host/host.h"
#include "host.h"
#include "vnrhook/include/const.h"
#include "vnrhook/include/types.h"

0
vnr/texthook/host/CMakeLists.txt → vnr/texthook/CMakeLists.txt
View File

0
vnr/texthook/host/config.h → vnr/texthook/config.h
View File

85
vnr/texthook/growl.h
View File

@ -1,85 +0,0 @@
#pragma once
// growl.h
// 9/17/2013 jichi
//#ifdef GROWL_HAS_GROWL
#include <windows.h>
#include <cstdio>
#define GROWL_MSG_A(_msg) MessageBoxA(nullptr, _msg, "VNR Message", MB_OK)
#define GROWL_MSG(_msg) MessageBoxW(nullptr, _msg, L"VNR Message", MB_OK)
#define GROWL_WARN(_msg) MessageBoxW(nullptr, _msg, L"VNR Warning", MB_OK)
#define GROWL_ERROR(_msg) MessageBoxW(nullptr, _msg, L"VNR Error", MB_OK)
inline void GROWL_DWORD(DWORD value)
{
WCHAR buf[100];
swprintf(buf, L"DWORD: %x", value);
GROWL_MSG(buf);
}
inline void GROWL_DWORD2(DWORD v, DWORD v2)
{
WCHAR buf[100];
swprintf(buf, L"DWORD2: %x,%x", v, v2);
GROWL_MSG(buf);
}
inline void GROWL_DWORD3(DWORD v, DWORD v2, DWORD v3)
{
WCHAR buf[100];
swprintf(buf, L"DWORD3: %x,%x,%x", v, v2, v3);
GROWL_MSG(buf);
}
inline void GROWL_DWORD4(DWORD v, DWORD v2, DWORD v3, DWORD v4)
{
WCHAR buf[100];
swprintf(buf, L"DWORD4: %x,%x,%x,%x", v, v2, v3, v4);
GROWL_MSG(buf);
}
inline void GROWL_DWORD5(DWORD v, DWORD v2, DWORD v3, DWORD v4, DWORD v5)
{
WCHAR buf[100];
swprintf(buf, L"DWORD5: %x,%x,%x,%x,%x", v, v2, v3, v4, v5);
GROWL_MSG(buf);
}
inline void GROWL_DWORD6(DWORD v, DWORD v2, DWORD v3, DWORD v4, DWORD v5, DWORD v6)
{
WCHAR buf[100];
swprintf(buf, L"DWORD6: %x,%x,%x,%x,%x,%x", v, v2, v3, v4, v5, v6);
GROWL_MSG(buf);
}
inline void GROWL_DWORD7(DWORD v, DWORD v2, DWORD v3, DWORD v4, DWORD v5, DWORD v6, DWORD v7)
{
WCHAR buf[100];
swprintf(buf, L"DWORD7: %x,%x,%x,%x,%x,%x,%x", v, v2, v3, v4, v5, v6, v7);
GROWL_MSG(buf);
}
inline void GROWL_DWORD8(DWORD v, DWORD v2, DWORD v3, DWORD v4, DWORD v5, DWORD v6, DWORD v7, DWORD v8)
{
WCHAR buf[100];
swprintf(buf, L"DWORD8: %x,%x,%x,%x,%x,%x,%x,%x", v, v2, v3, v4, v5, v6, v7, v8);
GROWL_MSG(buf);
}
inline void GROWL_DWORD9(DWORD v, DWORD v2, DWORD v3, DWORD v4, DWORD v5, DWORD v6, DWORD v7, DWORD v8, DWORD v9)
{
WCHAR buf[100];
swprintf(buf, L"DWORD9: %x,%x,%x,%x,%x,%x,%x,%x,%x", v, v2, v3, v4, v5, v6, v7, v8, v9);
GROWL_MSG(buf);
}
inline void GROWL(DWORD v) { GROWL_DWORD(v); }
inline void GROWL(LPCWSTR v) { GROWL_MSG(v); }
inline void GROWL(LPCSTR v) { GROWL_MSG_A(v); }
//#endif // GROWL_HAS_GROWL
// EOF

0
vnr/texthook/host/hookman.cc → vnr/texthook/hookman.cc
View File

0
vnr/texthook/host/hookman.h → vnr/texthook/hookman.h
View File

73
vnr/texthook/host/host.cc → vnr/texthook/host.cc
View File

@ -6,7 +6,6 @@
#include "vnrhook/include/const.h"
#include "vnrhook/include/defs.h"
#include "vnrhook/include/types.h"
#include <string>
#include "extensions/Extensions.h"
HANDLE preventDuplicationMutex;
@ -15,11 +14,10 @@ HookManager* man;
HWND dummyWindow;
bool running;
namespace
namespace
{ // unnamed
void GetDebugPrivileges()
{ // Artikash 5/19/2018: Is it just me or is this function 100% superfluous?
void GetDebugPrivileges() // Artikash 5/19/2018: Is it just me or is this function 100% superfluous?
{
HANDLE processToken;
TOKEN_PRIVILEGES Privileges = { 1, {0x14, 0, SE_PRIVILEGE_ENABLED} };
@ -27,7 +25,6 @@ namespace
AdjustTokenPrivileges(processToken, FALSE, &Privileges, 0, nullptr, nullptr);
CloseHandle(processToken);
}
} // unnamed namespace
void CreateNewPipe();
@ -39,14 +36,11 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID unused)
case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls(hinstDLL);
GetDebugPrivileges();
// jichi 12/20/2013: Since I already have a GUI, I don't have to InitCommonControls()
// Used by timers.
// InitCommonControls();
// jichi 8/24/2013: Create hidden window so that ITH can access timer and events
dummyWindow = CreateWindowW(L"Button", L"InternalWindow", 0, 0, 0, 0, 0, 0, 0, hinstDLL, 0);
break;
case DLL_PROCESS_DETACH:
if (::running) CloseHost();
CloseHost();
DestroyWindow(dummyWindow);
break;
default:
@ -60,7 +54,7 @@ DLLEXPORT bool StartHost()
preventDuplicationMutex = CreateMutexW(nullptr, TRUE, ITH_SERVER_MUTEX);
if (GetLastError() == ERROR_ALREADY_EXISTS || ::running)
{
GROWL_WARN(L"I am sorry that this game is attached by some other VNR ><\nPlease restart the game and try again!");
MessageBoxW(nullptr, L"I am sorry that this game is attached by some other VNR ><\nPlease restart the game and try again!", L"Error", MB_ICONERROR);
return false;
}
else
@ -114,7 +108,7 @@ DLLEXPORT bool InjectProcessById(DWORD processId, DWORD timeout)
CloseHandle(processHandle);
return true;
}
man->AddConsoleOutput(L"couldn't inject dll");
return false;
}
@ -128,44 +122,41 @@ DLLEXPORT bool DetachProcessById(DWORD processId)
DLLEXPORT void GetHostHookManager(HookManager** hookman)
{
if (::running)
{
*hookman = man;
}
*hookman = man;
}
DLLEXPORT DWORD InsertHook(DWORD pid, const HookParam *hp, std::string name)
{
HANDLE commandPipe = man->GetHostPipe(pid);
if (commandPipe == nullptr)
return -1;
BYTE buffer[PIPE_BUFFER_SIZE] = {};
*(DWORD*)buffer = HOST_COMMAND_NEW_HOOK;
*(HookParam*)(buffer + sizeof(DWORD)) = *hp;
if (name.size()) strcpy((char*)buffer + sizeof(DWORD) + sizeof(HookParam), name.c_str());
DWORD unused;
WriteFile(commandPipe, buffer, sizeof(DWORD) + sizeof(HookParam) + name.size(), &unused, nullptr);
return 0;
}
DLLEXPORT DWORD RemoveHook(DWORD pid, DWORD addr)
DLLEXPORT bool InsertHook(DWORD pid, const HookParam *hp, std::string name)
{
HANDLE commandPipe = man->GetHostPipe(pid);
if (commandPipe == nullptr) return -1;
if (commandPipe == nullptr) return false;
BYTE buffer[PIPE_BUFFER_SIZE] = {};
*(DWORD*)buffer = HOST_COMMAND_NEW_HOOK;
*(HookParam*)(buffer + sizeof(DWORD)) = *hp;
if (name.size()) strcpy((char*)buffer + sizeof(DWORD) + sizeof(HookParam), name.c_str());
DWORD unused;
WriteFile(commandPipe, buffer, sizeof(DWORD) + sizeof(HookParam) + name.size(), &unused, nullptr);
return true;
}
DLLEXPORT bool RemoveHook(DWORD pid, DWORD addr)
{
HANDLE commandPipe = man->GetHostPipe(pid);
if (commandPipe == nullptr) return false;
HANDLE hookRemovalEvent = CreateEventW(nullptr, TRUE, FALSE, ITH_REMOVEHOOK_EVENT);
BYTE buffer[sizeof(DWORD) * 2] = {};
*(DWORD*)buffer = HOST_COMMAND_REMOVE_HOOK;
*(DWORD*)(buffer + sizeof(DWORD)) = addr;
DWORD unused;
WriteFile(commandPipe, buffer, sizeof(DWORD) * 2, &unused, nullptr);
WaitForSingleObject(hookRemovalEvent, 1000);
CloseHandle(hookRemovalEvent);
man->RemoveSingleHook(pid, addr);
return 0;
WriteFile(commandPipe, buffer, sizeof(DWORD) * 2, &unused, nullptr);
WaitForSingleObject(hookRemovalEvent, 1000);
CloseHandle(hookRemovalEvent);
man->RemoveSingleHook(pid, addr);
return true;
}
// EOF

6
vnr/texthook/host/host.h → vnr/texthook/host.h
View File

@ -6,7 +6,7 @@
//#include "host/settings.h"
#include "config.h"
#include "host/hookman.h"
#include "hookman.h"
#include <string>
struct HookParam;
@ -17,7 +17,7 @@ DLLEXPORT void CloseHost();
DLLEXPORT void GetHostHookManager(HookManager **hookman);
DLLEXPORT bool InjectProcessById(DWORD pid, DWORD timeout = 5000);
DLLEXPORT bool DetachProcessById(DWORD pid);
DLLEXPORT DWORD InsertHook(DWORD pid, const HookParam *hp, std::string name = "");
DLLEXPORT DWORD RemoveHook(DWORD pid, DWORD addr);
DLLEXPORT bool InsertHook(DWORD pid, const HookParam *hp, std::string name = "");
DLLEXPORT bool RemoveHook(DWORD pid, DWORD addr);
// EOF

11
vnr/texthook/host/pipe.cc → vnr/texthook/pipe.cc
View File

@ -7,8 +7,6 @@
#include "hookman.h"
#include "vnrhook/include/defs.h"
#include "vnrhook/include/const.h"
#include <stdio.h>
#include "growl.h"
#include <atlbase.h>
extern HookManager* man;
@ -38,13 +36,6 @@ DWORD WINAPI TextReceiver(LPVOID lpThreadParameter)
BYTE buffer[PIPE_BUFFER_SIZE] = {};
DWORD bytesRead, processId;
// Artikash 5/20/2018: Shouldn't Windows automatically close the handles when the host process stops running?
//if (!::running) {
// NtClose(hookPipe);
// return 0;
//}
ReadFile(pipes->hookPipe, &processId, sizeof(processId), &bytesRead, nullptr);
man->RegisterProcess(processId, pipes->hostPipe);
@ -91,9 +82,7 @@ DWORD WINAPI TextReceiver(LPVOID lpThreadParameter)
man->UnRegisterProcess(processId);
CloseHandle(pipes->hookPipe);
CloseHandle(pipes->hostPipe);
delete pipes;
return 0;
}

6
vnr/texthook/host/textthread.cc → vnr/texthook/textthread.cc
View File

@ -69,9 +69,9 @@ void TextThread::AddSentence(std::wstring sentence)
void TextThread::AddText(const BYTE *con, int len)
{
TT_LOCK;
sentenceBuffer.insert(sentenceBuffer.end(), con, con+len);
SetTimer(dummyWindow, (UINT_PTR)this, splitDelay,
[](HWND hWnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime)
sentenceBuffer.insert(sentenceBuffer.end(), con, con + len);
SetTimer(dummyWindow, (UINT_PTR)this, splitDelay,
[](HWND hWnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime)
{
KillTimer(hWnd, idEvent);
((TextThread*)idEvent)->AddSentence();

0
vnr/texthook/host/textthread.h → vnr/texthook/textthread.h
View File