Public-Mirror/Textractor
1
0
Fork 1
mirror of https://github.com/Artikash/Textractor.git synced 2024-12-23 17:04:12 +08:00
Code Issues Projects Releases Wiki Activity

remove ntdll from util.h

Browse Source
This commit is contained in:
Akash Mozumdar 2018-06-14 11:51:09 -04:00
parent d89cc56d6f
commit b7764ad860
5 changed files with 13 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
vnr/vnrhook/src/engine/engine.h
View File

@ -11,7 +11,7 @@ struct HookParam; // defined in ith types.h
namespace Engine {
// Global variables
extern wchar_t process_name_[MAX_PATH], // cached
extern wchar_t *process_name_, // cached
process_path_[MAX_PATH]; // cached
extern DWORD module_base_,
module_limit_;

9
vnr/vnrhook/src/engine/match.cc
View File

@ -24,7 +24,7 @@ enum { MAX_REL_ADDR = 0x200000 }; // jichi 8/18/2013: maximum relative address
namespace Engine {
WCHAR process_name_[MAX_PATH], // cached
WCHAR *process_name_, // cached
process_path_[MAX_PATH]; // cached
DWORD module_base_,
@ -896,8 +896,11 @@ DWORD WINAPI hijackThreadProc(LPVOID unused)
// jichi 12/18/2013: Though FillRange could raise, it should never raise for he current process
// So, SEH is not used here.
Util::GetProcessName(process_name_); // Initialize shared process name
Util::GetProcessPath(process_path_); // Initialize shared process path
// Initialize shared process name and path
wchar_t* p = GetModuleFileNameW(nullptr, process_path_, MAX_PATH) + process_path_;
while (*(--p) != L'\\');
process_name_ = p + 1;
FillRange(process_name_, &module_base_, &module_limit_);
DetermineEngineType();

11
vnr/vnrhook/src/hijack/texthook.cc
View File

@ -488,7 +488,6 @@ DWORD TextHook::UnsafeSend(DWORD dwDataBase, DWORD dwRetn)
if (dwCount) {
IO_STATUS_BLOCK ios = {};
IthCoolDown(); // jichi 9/28/2013: cool down to prevent parallelization in wine
//CliLockPipe();
WriteFile(::hookPipe, pbData, dwCount + HEADER_SIZE, nullptr, nullptr);
//CliUnlockPipe();
@ -505,7 +504,7 @@ int TextHook::InsertHook()
//ConsoleOutput("vnrcli:InsertHook: enter");
WaitForSingleObject(hmMutex, 0);
int ok = InsertHookCode();
IthReleaseMutex(hmMutex);
ReleaseMutex(hmMutex);
if (hp.type & HOOK_ADDITIONAL) {
NotifyHookInsert(hp.address);
//ConsoleOutput(hook_name);
@ -688,7 +687,7 @@ int TextHook::InitHook(LPVOID addr, DWORD data, DWORD data_ind,
currentHook++;
if (current_available >= this)
for (current_available = this + 1; current_available->Address(); current_available++);
IthReleaseMutex(hmMutex);
ReleaseMutex(hmMutex);
return this - hookman;
}
@ -704,7 +703,7 @@ int TextHook::InitHook(const HookParam &h, LPCSTR name, WORD set_flag)
current_available = this+1;
while (current_available->Address())
current_available++;
IthReleaseMutex(hmMutex);
ReleaseMutex(hmMutex);
return 1;
}
@ -724,7 +723,7 @@ int TextHook::RemoveHook()
} ITH_EXCEPT {}
//});
hp.hook_len = 0;
IthReleaseMutex(hmMutex);
ReleaseMutex(hmMutex);
ConsoleOutput("vnrcli:RemoveHook: leave");
return yes;
}
@ -741,7 +740,7 @@ int TextHook::ClearHook()
//if (current_available>this)
// current_available = this;
currentHook--;
IthReleaseMutex(hmMutex);
ReleaseMutex(hmMutex);
return err;
}

19
vnr/vnrhook/src/main.cc
View File

@ -32,24 +32,6 @@
DWORD processStartAddress,
processStopAddress;
namespace { // unnamed
wchar_t processName[MAX_PATH];
inline void GetProcessName(wchar_t *name)
{
//assert(name);
PLDR_DATA_TABLE_ENTRY it;
__asm
{
mov eax,fs:[0x30]
mov eax,[eax+0xc]
mov eax,[eax+0xc]
mov it,eax
}
wcscpy(name, it->BaseDllName.Buffer);
}
} // unmaed namespace
enum { HOOK_BUFFER_SIZE = MAX_HOOK * sizeof(TextHook) };
//#define MAX_HOOK (HOOK_BUFFER_SIZE/sizeof(TextHook))
DWORD hook_buff_len = HOOK_BUFFER_SIZE;
@ -164,7 +146,6 @@ BOOL WINAPI DllMain(HINSTANCE hModule, DWORD fdwReason, LPVOID unused)
hSection = CreateFileMappingW(INVALID_HANDLE_VALUE, nullptr, PAGE_EXECUTE_READWRITE, 0, HOOK_SECTION_SIZE, hm_section);
::hookman = (TextHook*)MapViewOfFile(hSection, FILE_MAP_ALL_ACCESS, 0, 0, HOOK_SECTION_SIZE / 2);
GetProcessName(::processName);
::processStartAddress = (DWORD)GetModuleHandleW(nullptr);
{

36
vnr/vnrhook/src/util/util.h
View File

@ -3,7 +3,7 @@
// util.h
// 8/23/2013 jichi
#include "ntdll/ntdll.h"
#include <Windows.h>
namespace Util {
@ -24,40 +24,6 @@ DWORD FindModuleBase(DWORD hash);
bool SearchResourceString(LPCWSTR str);
/**
* @param name process name without path deliminator
*/
inline void GetProcessName(wchar_t *name)
{
//assert(name);
PLDR_DATA_TABLE_ENTRY it;
__asm
{
mov eax,fs:[0x30]
mov eax,[eax+0xc]
mov eax,[eax+0xc]
mov it,eax
}
::wcscpy(name, it->BaseDllName.Buffer);
}
/**
* @param path with process name and directy name
*/
inline void GetProcessPath(wchar_t *path)
{
//assert(path);
PLDR_DATA_TABLE_ENTRY it;
__asm
{
mov eax,fs:[0x30]
mov eax,[eax+0xc]
mov eax,[eax+0xc]
mov it,eax
}
::wcscpy(path, it->FullDllName.Buffer);
}
/**
* @return HANDLE module handle
*/