cosmetics

This commit is contained in:
deepzero 2014-01-15 11:36:38 +01:00 committed by cypherpunk
parent 79e1457a93
commit 019b628400
1 changed files with 14 additions and 63 deletions

View File

@ -181,29 +181,20 @@ unsigned long Crc32Table[256];
// Global.Handle.functions: // Global.Handle.functions:
bool EngineCloseHandle(HANDLE myHandle) bool EngineCloseHandle(HANDLE myHandle)
{ {
DWORD HandleFlags; DWORD HandleFlags;
if(GetHandleInformation(myHandle, &HandleFlags)) if(GetHandleInformation(myHandle, &HandleFlags))
{ {
if(CloseHandle(myHandle)) if(CloseHandle(myHandle))
{ {
return(true); return(true);
} }
else }
{
return(false); return(false);
}
}
else
{
return(false);
}
} }
// Global.Mapping.functions: // Global.Mapping.functions:
bool MapFileEx(char* szFileName, DWORD ReadOrWrite, LPHANDLE FileHandle, LPDWORD FileSize, LPHANDLE FileMap, LPVOID FileMapVA, DWORD SizeModifier) bool MapFileEx(char* szFileName, DWORD ReadOrWrite, LPHANDLE FileHandle, LPDWORD FileSize, LPHANDLE FileMap, LPVOID FileMapVA, DWORD SizeModifier)
{ {
HANDLE hFile = 0; HANDLE hFile = 0;
DWORD FileAccess = 0; DWORD FileAccess = 0;
DWORD FileMapType = 0; DWORD FileMapType = 0;
@ -460,9 +451,7 @@ bool EngineIsThereFreeHardwareBreakSlot(LPDWORD FreeRegister)
bool EngineFileExists(char* szFileName) bool EngineFileExists(char* szFileName)
{ {
HANDLE hFile; HANDLE hFile = CreateFileA(szFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
hFile = CreateFileA(szFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
if(hFile != INVALID_HANDLE_VALUE) if(hFile != INVALID_HANDLE_VALUE)
{ {
EngineCloseHandle(hFile); EngineCloseHandle(hFile);
@ -548,10 +537,6 @@ bool EngineCreatePathForFile(char* szFileName)
} }
} }
} }
else
{
return(true);
}
} }
return(true); return(true);
} }
@ -589,10 +574,6 @@ bool EngineCreatePathForFileW(wchar_t* szFileName)
} }
} }
} }
else
{
return(true);
}
} }
return(true); return(true);
} }
@ -665,10 +646,6 @@ bool EngineIsPointedMemoryString(ULONG_PTR PossibleStringPtr)
{ {
return(true); return(true);
} }
else
{
return(false);
}
} }
return(false); return(false);
} }
@ -714,10 +691,6 @@ int EnginePointedMemoryStringLength(ULONG_PTR PossibleStringPtr)
i = 512 - i; i = 512 - i;
return(i); return(i);
} }
else
{
return(NULL);
}
} }
return(NULL); return(NULL);
} }
@ -763,6 +736,7 @@ long long EngineEstimateNewSectionRVA(ULONG_PTR FileMapVA)
{ {
return(0); return(0);
} }
if(!FileIs64) if(!FileIs64)
{ {
PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader32 + PEHeader32->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4); PESections = (PIMAGE_SECTION_HEADER)((ULONG_PTR)PEHeader32 + PEHeader32->FileHeader.SizeOfOptionalHeader + sizeof(IMAGE_FILE_HEADER) + 4);
@ -848,19 +822,11 @@ bool EngineExtractForwarderData(ULONG_PTR PossibleStringPtr, LPVOID szFwdDLLName
} }
bool EngineGrabDataFromMappedFile(HANDLE hFile, ULONG_PTR FileMapVA, ULONG_PTR FileOffset, DWORD CopySize, LPVOID CopyToMemory) bool EngineGrabDataFromMappedFile(HANDLE hFile, ULONG_PTR FileMapVA, ULONG_PTR FileOffset, DWORD CopySize, LPVOID CopyToMemory)
{ {
DWORD rfNumberOfBytesRead = NULL; DWORD rfNumberOfBytesRead = NULL;
RtlZeroMemory(CopyToMemory, CopySize); RtlZeroMemory(CopyToMemory, CopySize);
SetFilePointer(hFile, (DWORD)(FileOffset - FileMapVA), NULL, FILE_BEGIN); SetFilePointer(hFile, (DWORD)(FileOffset - FileMapVA), NULL, FILE_BEGIN);
if(ReadFile(hFile, CopyToMemory, CopySize, &rfNumberOfBytesRead, NULL)) return !!ReadFile(hFile, CopyToMemory, CopySize, &rfNumberOfBytesRead, NULL);
{
return(true);
}
else
{
return(false);
}
} }
bool EngineExtractResource(char* szResourceName, wchar_t* szExtractedFileName) bool EngineExtractResource(char* szResourceName, wchar_t* szExtractedFileName)
{ {
@ -919,6 +885,7 @@ bool EngineIsDependencyPresent(char* szFileName, char* szDependencyForFile, char
return(true); return(true);
} }
} }
if(szFileName != NULL) if(szFileName != NULL)
{ {
hFile = CreateFileA(szFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL); hFile = CreateFileA(szFileName, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
@ -1013,6 +980,7 @@ bool EngineIsDependencyPresentW(wchar_t* szFileName, wchar_t* szDependencyForFil
return(true); return(true);
} }
} }
if(GetWindowsDirectoryW(szTryFileName, 512) > NULL) if(GetWindowsDirectoryW(szTryFileName, 512) > NULL)
{ {
lstrcatW(szTryFileName, L"\\"); lstrcatW(szTryFileName, L"\\");
@ -1024,6 +992,7 @@ bool EngineIsDependencyPresentW(wchar_t* szFileName, wchar_t* szDependencyForFil
return(true); return(true);
} }
} }
if(szDependencyForFile != NULL) if(szDependencyForFile != NULL)
{ {
i = lstrlenW(szDependencyForFile); i = lstrlenW(szDependencyForFile);
@ -2967,15 +2936,9 @@ __declspec(dllexport) bool TITCALL DumpMemoryExW(DWORD ProcessId, LPVOID MemoryS
{ {
return(true); return(true);
} }
else }
{
return(false); return(false);
}
}
else
{
return(false);
}
} }
__declspec(dllexport) bool TITCALL DumpRegions(HANDLE hProcess, char* szDumpFolder, bool DumpAboveImageBaseOnly) __declspec(dllexport) bool TITCALL DumpRegions(HANDLE hProcess, char* szDumpFolder, bool DumpAboveImageBaseOnly)
{ {
@ -3074,15 +3037,9 @@ __declspec(dllexport) bool TITCALL DumpRegionsExW(DWORD ProcessId, wchar_t* szDu
{ {
return(true); return(true);
} }
else }
{
return(false); return(false);
}
}
else
{
return(false);
}
} }
__declspec(dllexport) bool TITCALL DumpModule(HANDLE hProcess, LPVOID ModuleBase, char* szDumpFileName) __declspec(dllexport) bool TITCALL DumpModule(HANDLE hProcess, LPVOID ModuleBase, char* szDumpFileName)
{ {
@ -3150,15 +3107,9 @@ __declspec(dllexport) bool TITCALL DumpModuleExW(DWORD ProcessId, LPVOID ModuleB
{ {
return(true); return(true);
} }
else }
{
return(false); return(false);
}
}
else
{
return(false);
}
} }
__declspec(dllexport) bool TITCALL PastePEHeader(HANDLE hProcess, LPVOID ImageBase, char* szDebuggedFileName) __declspec(dllexport) bool TITCALL PastePEHeader(HANDLE hProcess, LPVOID ImageBase, char* szDebuggedFileName)
{ {