diff --git a/TitanEngine.sln b/TitanEngine.sln index 69436f8..8b4e093 100644 --- a/TitanEngine.sln +++ b/TitanEngine.sln @@ -3,16 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TitanEngine", "TitanEngine\TitanEngine.vcxproj", "{9C7B8246-FDDA-48C7-9634-044969701E40}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TitanUnitTest", "TitanUnitTest\TitanUnitTest.vcxproj", "{5B5AB3CD-4D32-43B0-8840-E05C9483381D}" - ProjectSection(ProjectDependencies) = postProject - {9C7B8246-FDDA-48C7-9634-044969701E40} = {9C7B8246-FDDA-48C7-9634-044969701E40} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TitanScriptGui", "TitanScriptGui\TitanScriptGui.vcxproj", "{49C88677-C374-4AE2-B431-8F3B424BF245}" - ProjectSection(ProjectDependencies) = postProject - {9C7B8246-FDDA-48C7-9634-044969701E40} = {9C7B8246-FDDA-48C7-9634-044969701E40} - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -29,22 +19,6 @@ Global {9C7B8246-FDDA-48C7-9634-044969701E40}.Release|Win32.Build.0 = Release|Win32 {9C7B8246-FDDA-48C7-9634-044969701E40}.Release|x64.ActiveCfg = Release|x64 {9C7B8246-FDDA-48C7-9634-044969701E40}.Release|x64.Build.0 = Release|x64 - {5B5AB3CD-4D32-43B0-8840-E05C9483381D}.Debug|Win32.ActiveCfg = Debug|Win32 - {5B5AB3CD-4D32-43B0-8840-E05C9483381D}.Debug|Win32.Build.0 = Debug|Win32 - {5B5AB3CD-4D32-43B0-8840-E05C9483381D}.Debug|x64.ActiveCfg = Debug|x64 - {5B5AB3CD-4D32-43B0-8840-E05C9483381D}.Debug|x64.Build.0 = Debug|x64 - {5B5AB3CD-4D32-43B0-8840-E05C9483381D}.Release|Win32.ActiveCfg = Release|Win32 - {5B5AB3CD-4D32-43B0-8840-E05C9483381D}.Release|Win32.Build.0 = Release|Win32 - {5B5AB3CD-4D32-43B0-8840-E05C9483381D}.Release|x64.ActiveCfg = Release|x64 - {5B5AB3CD-4D32-43B0-8840-E05C9483381D}.Release|x64.Build.0 = Release|x64 - {49C88677-C374-4AE2-B431-8F3B424BF245}.Debug|Win32.ActiveCfg = Debug|Win32 - {49C88677-C374-4AE2-B431-8F3B424BF245}.Debug|Win32.Build.0 = Debug|Win32 - {49C88677-C374-4AE2-B431-8F3B424BF245}.Debug|x64.ActiveCfg = Debug|x64 - {49C88677-C374-4AE2-B431-8F3B424BF245}.Debug|x64.Build.0 = Debug|x64 - {49C88677-C374-4AE2-B431-8F3B424BF245}.Release|Win32.ActiveCfg = Release|Win32 - {49C88677-C374-4AE2-B431-8F3B424BF245}.Release|Win32.Build.0 = Release|Win32 - {49C88677-C374-4AE2-B431-8F3B424BF245}.Release|x64.ActiveCfg = Release|x64 - {49C88677-C374-4AE2-B431-8F3B424BF245}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/TitanEngine/Global.Engine.GUI.cpp b/TitanEngine/Global.Engine.GUI.cpp index 796d594..2770cc5 100644 --- a/TitanEngine/Global.Engine.GUI.cpp +++ b/TitanEngine/Global.Engine.GUI.cpp @@ -55,9 +55,9 @@ long EngineWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam) if(uMsg == WM_INITDIALOG) { SendMessageA(hwndDlg, WM_SETTEXT, NULL, (LPARAM)&szWindowUnpackerTitle); - HICON hIconLarge = (HICON)LoadImage(engineHandle, MAKEINTRESOURCE(IDI_ICON1), IMAGE_ICON, 32, 32, LR_DEFAULTSIZE); - SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIconLarge); - HICON hIconSmall = (HICON)LoadImage(engineHandle, MAKEINTRESOURCE(IDI_ICON1), IMAGE_ICON, 16, 16, LR_DEFAULTSIZE); + HICON hIconLarge = (HICON)LoadImage(engineHandle, MAKEINTRESOURCE(IDI_ICON1), IMAGE_ICON, 32, 32, LR_DEFAULTSIZE); + SendMessage(hwndDlg, WM_SETICON, ICON_BIG, (LPARAM)hIconLarge); + HICON hIconSmall = (HICON)LoadImage(engineHandle, MAKEINTRESOURCE(IDI_ICON1), IMAGE_ICON, 16, 16, LR_DEFAULTSIZE); SendMessage(hwndDlg, WM_SETICON, ICON_SMALL, (LPARAM)hIconSmall); SetDlgItemTextA(hwndDlg, IDD_UNPACKERTITLE, szWindowUnpackerLongTitle); SetDlgItemTextA(hwndDlg, IDC_FILENAME, "filename.exe"); diff --git a/TitanEngine/TitanEngine.Disassembler.cpp b/TitanEngine/TitanEngine.Disassembler.cpp index 9fcf7ef..ddacaed 100644 --- a/TitanEngine/TitanEngine.Disassembler.cpp +++ b/TitanEngine/TitanEngine.Disassembler.cpp @@ -50,7 +50,8 @@ long IsBadReadPtrRemote(HANDLE hProcess, const VOID *lp, SIZE_T length) section += (ULONG_PTR)MemInfo.RegionSize; - } while (res < length); + } + while (res < length); return length; //good } @@ -95,7 +96,7 @@ __declspec(dllexport) void* TITCALL DisassembleEx(HANDLE hProcess, LPVOID Disass { _DecodedInst engineDecodedInstructions[1]; unsigned int DecodedInstructionsCount = 0; - BYTE readBuffer[MAXIMUM_INSTRUCTION_SIZE] = {0}; + BYTE readBuffer[MAXIMUM_INSTRUCTION_SIZE] = {0}; if(hProcess != NULL) { @@ -183,4 +184,4 @@ __declspec(dllexport) long TITCALL LengthDisassembleEx(HANDLE hProcess, LPVOID D __declspec(dllexport) long TITCALL LengthDisassemble(LPVOID DisassmAddress) { return LengthDisassembleEx(dbgProcessInformation.hProcess, DisassmAddress); -} \ No newline at end of file +} diff --git a/TitanScriptGui/MAINICON.ico b/TitanScriptGui/MAINICON.ico deleted file mode 100644 index 3da8e95..0000000 Binary files a/TitanScriptGui/MAINICON.ico and /dev/null differ diff --git a/TitanScriptGui/TitanScript.h b/TitanScriptGui/TitanScript.h deleted file mode 100644 index 59cf769..0000000 --- a/TitanScriptGui/TitanScript.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef TITANSCRIPT_H -#define TITANSCRIPT_H - -#if _MSC_VER > 1000 -//#pragma once -#endif - -#include - -enum eLogType {TS_LOG_NORMAL, TS_LOG_ERROR, TS_LOG_COMMAND, TS_LOG_DEBUG}; -typedef void(*fLogCallback)(const char* szString, eLogType Type); -typedef void(*fLogCallbackW)(const wchar_t* szString, eLogType Type); - -typedef bool (*tScripterLoadFileA)(const char*); -typedef bool (*tScripterLoadFileW)(const wchar_t*); -typedef bool (*tScripterLoadBuffer)(const char*); -typedef bool (*tScripterResume)(); -typedef bool (*tScripterPause)(); -typedef bool (*tScripterAutoDebugA)(const char*); -typedef bool (*tScripterAutoDebugW)(const wchar_t*); -typedef void (*tScripterSetLogCallback)(fLogCallback Callback); -typedef void (*tScripterSetLogCallbackW)(fLogCallbackW Callback); -typedef bool (*tScripterExecuteWithTitanMistA)(const char*, const char*); -typedef bool (*tScripterExecuteWithTitanMistW)(const wchar_t*, const wchar_t*); - -// use like this: tScripterResume foo = GetTSFunctionPointer(Resume); -#define GetTSFunctionPointer(x) ((tScripter ## x)GetProcAddress(GetModuleHandleA("TitanScript"), "Scripter" #x)) - -#endif /*TITANSCRIPT_H*/ diff --git a/TitanScriptGui/TitanScriptGui.cpp b/TitanScriptGui/TitanScriptGui.cpp deleted file mode 100644 index 8a89f8e..0000000 --- a/TitanScriptGui/TitanScriptGui.cpp +++ /dev/null @@ -1,324 +0,0 @@ -#include "stdafx.h" -#include "TitanScriptGui.h" -#include "..\SDK\CPP\TitanEngine.h" -#include "TitanScript.h" - -#define MAX_LOG_LINE_LENGTH 100 -#define MAX_LOG_LINE_COUNT 100 - -#ifdef _WIN64 -const WCHAR WindowTitle[] = L"TitanScriptGUI x64"; -#else -const WCHAR WindowTitle[] = L"TitanScriptGUI x86"; -#endif - -//variables -static HINSTANCE hInst; -static HWND hLogBox; -static HWND hRunBtn; -static bool bRunning; -static TCHAR FileNameTarget[MAX_PATH] = {}; -static TCHAR FileNameScript[MAX_PATH] = {}; -static TCHAR FileNameIni[MAX_PATH] = {}; - -//functions -static INT_PTR CALLBACK WndProc(HWND, UINT, WPARAM, LPARAM); -static bool GetFileDialog(TCHAR[MAX_PATH]); -static void AddLogMessageW(const wchar_t* szLogMessage, eLogType Type); -static void SettingSet(const TCHAR* name, const TCHAR* value); -static void SettingGet(const TCHAR* name, TCHAR* value, int value_size); -static bool FileExists(LPCTSTR szPath); -static void CreateDummyUnicodeFile(const TCHAR* szFileName); -static DWORD WINAPI TitanScriptExecThread(LPVOID lpParam); - -//TitanScript functions -static tScripterLoadFileW load_file = NULL; -static tScripterExecuteWithTitanMistW exec = NULL; -static tScripterSetLogCallbackW set_log_callback = NULL; - -int APIENTRY _tWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPTSTR lpCmdLine, int nCmdShow) -{ - UNREFERENCED_PARAMETER(hPrevInstance); - UNREFERENCED_PARAMETER(lpCmdLine); - - hInst = hInstance; - - DialogBox(hInstance, MAKEINTRESOURCE(IDD_MAINWINDOW), NULL, &WndProc); - ExitProcess(NULL); -} - -INT_PTR CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) -{ - switch (message) - { - case WM_INITDIALOG: - { - SetWindowTextW(hWnd, WindowTitle); - - //set icon - HICON hIconLarge = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_ICON1), IMAGE_ICON, 32, 32, LR_DEFAULTSIZE); - SendMessage(hWnd, WM_SETICON, ICON_BIG, (LPARAM)hIconLarge); - HICON hIconSmall = (HICON)LoadImage(hInst, MAKEINTRESOURCE(IDI_ICON1), IMAGE_ICON, 16, 16, LR_DEFAULTSIZE); - SendMessage(hWnd, WM_SETICON, ICON_SMALL, (LPARAM)hIconSmall); - - //initialize variables - hLogBox = GetDlgItem(hWnd, IDC_LOG); - hRunBtn = GetDlgItem(hWnd, IDC_RUN); - int i = GetModuleFileName(hInst, FileNameIni, _countof(FileNameIni)); - while(FileNameIni[i] != TCHAR('\\') && i) - i--; - if(i) - { - int len = lstrlen(FileNameIni); - while(FileNameIni[i] != TCHAR('.') && i < len) - i++; - if(i+1 < len) - FileNameIni[i] = TCHAR('\0'); - } - lstrcat(FileNameIni, _T(".ini")); - CreateDummyUnicodeFile(FileNameIni); - - //restore last files - SettingGet(_T("Target"), FileNameTarget, _countof(FileNameTarget)); - if(lstrlen(FileNameTarget)) - SetDlgItemText(hWnd, IDC_TARGETPATH, FileNameTarget); - SettingGet(_T("Script"), FileNameScript, _countof(FileNameScript)); - if(lstrlen(FileNameScript)) - SetDlgItemText(hWnd, IDC_SCRIPTPATH, FileNameScript); - - //make sure TitanScript is available - if ( !ExtensionManagerIsPluginLoaded( "TitanScript" ) || !ExtensionManagerIsPluginEnabled( "TitanScript" ) ) - { - AddLogMessageW(L"TitanScript failed to load", TS_LOG_ERROR); -#ifdef _WIN64 - AddLogMessageW(L"Ensure plugins\\x64\\TitanScript.dll exists !", TS_LOG_ERROR); -#else - AddLogMessageW(L"Ensure plugins\\x86\\TitanScript.dll exists !", TS_LOG_ERROR); -#endif //_WIN64 - EnableWindow(GetDlgItem(hWnd, IDC_RUN ), FALSE); - } - else - { - load_file = GetTSFunctionPointer( LoadFileW ); - exec = GetTSFunctionPointer( ExecuteWithTitanMistW ); - set_log_callback = GetTSFunctionPointer( SetLogCallbackW ); - set_log_callback(&AddLogMessageW); - } - - break; - } - - case WM_COMMAND: - { - switch (LOWORD(wParam)) - { - case IDC_BROWSETARGET: - { - if(GetFileDialog(FileNameTarget)) - { - SetDlgItemText(hWnd, IDC_TARGETPATH, FileNameTarget); - SettingSet(_T("Target"), FileNameTarget); - } - break; - } - case IDC_BROWSESCRIPT: - { - if(GetFileDialog(FileNameScript)) - { - SetDlgItemText(hWnd, IDC_SCRIPTPATH, FileNameScript); - SettingSet(_T("Script"), FileNameScript); - } - break; - } - case IDC_RUN: - { - if(!bRunning) - CreateThread(0, 0, TitanScriptExecThread, 0, 0, 0); - else - StopDebug(); - - break; - } - case IDC_COPY: { - //get lines - LRESULT cnt = SendMessageW(hLogBox, LB_GETCOUNT, 0, 0); - - if (cnt != 0 && cnt != LB_ERR) - { - WCHAR * copy = (WCHAR *)calloc(1, sizeof(WCHAR)); - int copyLength = 1; - - for(LRESULT i=0; i 0) - { - LRESULT cSelect = SendMessage(hLogBox, LB_INSERTSTRING, (WPARAM)-1, (LPARAM)szLogMessage); - if (cSelect == LB_ERR) - { - MessageBoxW(0, L"ERROR LOG MESSAGE - LB_INSERTSTRING", L"ERROR", MB_ICONWARNING); - } else if (cSelect == LB_ERRSPACE) - { - MessageBoxW(0, L"ERROR LOG MESSAGE - LB_ERRSPACE - Not enough space!", L"ERROR", MB_ICONWARNING); - } - else - { - SendMessage(hLogBox, LB_SETCURSEL, cSelect, NULL); - } - } -} - -static bool IsValidChar(char s) -{ - if (isalnum(s)) - { - return true; - } - else if (s == '$' || s == '-' || s == '>') - { - return true; - } - else - { - return false; - } -} - -static void SettingSet(const TCHAR* name, const TCHAR* value) -{ - WritePrivateProfileString(_T("Settings"), name, value, FileNameIni); -} - -static void SettingGet(const TCHAR* name, TCHAR* value, int value_size) -{ - GetPrivateProfileString(_T("Settings"), name, _T(""), value, value_size, FileNameIni); -} - -static bool FileExists(LPCTSTR szPath) -{ - DWORD dwAttrib = GetFileAttributes(szPath); - return (dwAttrib != INVALID_FILE_ATTRIBUTES && !(dwAttrib & FILE_ATTRIBUTE_DIRECTORY)); -} - -static void CreateDummyUnicodeFile(const TCHAR* szFileName) -{ - //http://www.codeproject.com/Articles/9071/Using-Unicode-in-INI-files - if (!FileExists(szFileName)) - { - // UTF16-LE BOM(FFFE) - WORD wBOM = 0xFEFF; - DWORD NumberOfBytesWritten; - HANDLE hFile = CreateFile(szFileName, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); - WriteFile(hFile, &wBOM, sizeof(WORD), &NumberOfBytesWritten, NULL); - CloseHandle(hFile); - } -} - -static DWORD WINAPI TitanScriptExecThread(LPVOID lpParam) -{ - if(!load_file(FileNameScript)) - { - AddLogMessageW(L"Script failed to load", TS_LOG_ERROR); - return 0; - } - SetWindowText(hRunBtn, _T("Stop")); - bRunning = true; - if(!exec(FileNameTarget, L"")) //TitanScript will generate the output filename - { - AddLogMessageW(L"Failed to execute", TS_LOG_ERROR); - } - else - AddLogMessageW(L"Debugging stopped", TS_LOG_NORMAL); - bRunning = false; - SetWindowText(hRunBtn, _T("Run")); - return 0; -} \ No newline at end of file diff --git a/TitanScriptGui/TitanScriptGui.h b/TitanScriptGui/TitanScriptGui.h deleted file mode 100644 index e60f2eb..0000000 --- a/TitanScriptGui/TitanScriptGui.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "resource.h" diff --git a/TitanScriptGui/TitanScriptGui.rc b/TitanScriptGui/TitanScriptGui.rc deleted file mode 100644 index 2d7a72e..0000000 Binary files a/TitanScriptGui/TitanScriptGui.rc and /dev/null differ diff --git a/TitanScriptGui/TitanScriptGui.vcxproj b/TitanScriptGui/TitanScriptGui.vcxproj deleted file mode 100644 index 5342bbc..0000000 --- a/TitanScriptGui/TitanScriptGui.vcxproj +++ /dev/null @@ -1,188 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {49C88677-C374-4AE2-B431-8F3B424BF245} - Win32Proj - TitanScriptGui - - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - false - true - Unicode - - - Application - false - true - Unicode - - - - - - - - - - - - - - - - - - - true - $(SolutionDir)\$(Configuration)\x32\ - $(Configuration)\x32\ - - - true - $(SolutionDir)\$(Configuration)\x64\ - $(Configuration)\x64\ - - - false - $(SolutionDir)\$(Configuration)\x32\ - $(Configuration)\x32\ - - - false - $(SolutionDir)\$(Configuration)\x64\ - $(Configuration)\x64\ - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - - - Windows - true - $(OutDir)TitanEngine.lib;comdlg32.lib;user32.lib - - - manifest.xml - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions) - - - Windows - true - $(OutDir)TitanEngine.lib;comdlg32.lib;user32.lib - - - manifest.xml - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreaded - - - Windows - false - true - true - $(OutDir)TitanEngine.lib;comdlg32.lib;user32.lib - true - - - manifest.xml - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions) - MultiThreaded - - - Windows - false - true - true - $(OutDir)TitanEngine.lib;comdlg32.lib;user32.lib - true - - - manifest.xml - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - - - - - - \ No newline at end of file diff --git a/TitanScriptGui/TitanScriptGui.vcxproj.filters b/TitanScriptGui/TitanScriptGui.vcxproj.filters deleted file mode 100644 index 039b995..0000000 --- a/TitanScriptGui/TitanScriptGui.vcxproj.filters +++ /dev/null @@ -1,64 +0,0 @@ - - - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - {6072cfa4-c101-4f1a-9920-89951ba83a2b} - - - {a0cc27fd-de5f-4551-9fe5-4a45f9ae862c} - - - - - Resource Files\Images - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files\SDK - - - Header Files\SDK - - - - - Source Files - - - Source Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/TitanScriptGui/manifest.xml b/TitanScriptGui/manifest.xml deleted file mode 100644 index 618fb8e..0000000 --- a/TitanScriptGui/manifest.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/TitanScriptGui/resource.h b/TitanScriptGui/resource.h deleted file mode 100644 index 28bdea6..0000000 Binary files a/TitanScriptGui/resource.h and /dev/null differ diff --git a/TitanScriptGui/stdafx.cpp b/TitanScriptGui/stdafx.cpp deleted file mode 100644 index 1577c4e..0000000 --- a/TitanScriptGui/stdafx.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "stdafx.h" \ No newline at end of file diff --git a/TitanScriptGui/stdafx.h b/TitanScriptGui/stdafx.h deleted file mode 100644 index dbf3c98..0000000 --- a/TitanScriptGui/stdafx.h +++ /dev/null @@ -1,12 +0,0 @@ -#pragma once -#define _CRT_SECURE_NO_WARNINGS -#include "targetver.h" - -#define WIN32_LEAN_AND_MEAN -#include -#include - -#include -#include -#include -#include diff --git a/TitanScriptGui/targetver.h b/TitanScriptGui/targetver.h deleted file mode 100644 index 2b26ce2..0000000 --- a/TitanScriptGui/targetver.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include diff --git a/TitanUnitTest/README b/TitanUnitTest/README deleted file mode 100644 index a496c61..0000000 --- a/TitanUnitTest/README +++ /dev/null @@ -1,16 +0,0 @@ -Setup: -- Put disasm.dll into Debug/Release folder. -- Put TitanEngine.dll into Debug/Release folder. -- Put TitanScript.dll into plugins/x86/ folder in Debug/Release folder. -(Can be found here https://bitbucket.org/cypherpunk/titanscript-update) - -Usage: -- TitanUnitTest.exe script.osc target.exe - -It understands complete OllyDbgScript language and adds additional TE commands - -Example script: -#log - -GPA "IsDebuggerPresent", "kernel32.dll" -LOG $RESULT \ No newline at end of file diff --git a/TitanUnitTest/TitanScript.h b/TitanUnitTest/TitanScript.h deleted file mode 100644 index 28e5c8c..0000000 --- a/TitanUnitTest/TitanScript.h +++ /dev/null @@ -1,26 +0,0 @@ -#ifndef TITANSCRIPT_H -#define TITANSCRIPT_H - -#if _MSC_VER > 1000 -//#pragma once -#endif - -#include - -enum eLogType {TS_LOG_NORMAL, TS_LOG_ERROR, TS_LOG_COMMAND, TS_LOG_DEBUG}; -typedef void(*fLogCallback)(const char* szString, eLogType Type); - -typedef bool (*tScripterLoadFileA)(const char*); -typedef bool (*tScripterLoadFileW)(const wchar_t*); -typedef bool (*tScripterLoadBuffer)(const char*); -typedef bool (*tScripterResume)(); -typedef bool (*tScripterPause)(); -typedef bool (*tScripterAutoDebugA)(const char*); -typedef bool (*tScripterAutoDebugW)(const wchar_t*); -typedef void (*tScripterSetLogCallback)(fLogCallback Callback); -typedef bool (*tScripterExecuteWithTitanMistA)(const char*, const char*); - -// use like this: tScripterResume foo = GetTSFunctionPointer(Resume); -#define GetTSFunctionPointer(x) ((tScripter ## x)GetProcAddress(GetModuleHandleA("TitanScript"), "Scripter" #x)) - -#endif /*TITANSCRIPT_H*/ diff --git a/TitanUnitTest/TitanUnitTest.cpp b/TitanUnitTest/TitanUnitTest.cpp deleted file mode 100644 index 176bae1..0000000 --- a/TitanUnitTest/TitanUnitTest.cpp +++ /dev/null @@ -1,43 +0,0 @@ -#include "stdafx.h" -#include "..\SDK\CPP\TitanEngine.h" -#include "TitanScript.h" -#include - -void log_callback( const char* str, eLogType log_type ); - -int main(int argc, char* argv[]) -{ - if(argc < 3) - { - log_callback("Usage: titan_unittest.exe script.osc target.exe", TS_LOG_ERROR); - return -1; - } - - if ( !ExtensionManagerIsPluginLoaded( "TitanScript" ) || !ExtensionManagerIsPluginEnabled( "TitanScript" ) ) - { - throw std::runtime_error( "TitanScript failed to load!" ); - } - - tScripterLoadFileA load_file = GetTSFunctionPointer( LoadFileA ); - tScripterExecuteWithTitanMistA exec = GetTSFunctionPointer( ExecuteWithTitanMistA ); - tScripterSetLogCallback set_log_callback = GetTSFunctionPointer( SetLogCallback ); - - set_log_callback(&log_callback ); - - if(!load_file(argv[1])) - { - log_callback("Error loading script", TS_LOG_ERROR); - return -1; - } - - exec(argv[2], "dump.exe" ); - - return 0; -} - - -void log_callback( const char* str, eLogType log_type ) -{ - std::cout << str << "\n" << std::flush; -} - diff --git a/TitanUnitTest/TitanUnitTest.vcxproj b/TitanUnitTest/TitanUnitTest.vcxproj deleted file mode 100644 index 02edfc5..0000000 --- a/TitanUnitTest/TitanUnitTest.vcxproj +++ /dev/null @@ -1,174 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {5B5AB3CD-4D32-43B0-8840-E05C9483381D} - Win32Proj - titan_unittest - - - - Application - true - Unicode - true - - - Application - true - Unicode - true - - - Application - false - true - Unicode - - - Application - false - true - Unicode - - - - - - - - - - - - - - - - - - - true - $(SolutionDir)\$(Configuration)\x32\ - $(Configuration)\x32\ - - - true - $(SolutionDir)\$(Configuration)\x64\ - $(Configuration)\x64\ - - - false - $(SolutionDir)\$(Configuration)\x32\ - $(Configuration)\x32\ - - - false - $(SolutionDir)\$(Configuration)\x64\ - $(Configuration)\x64\ - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - - - Console - true - $(OutDir)TitanEngine.lib;%(AdditionalDependencies) - - - - - - - Use - Level3 - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDebugDLL - - - Console - true - $(OutDir)TitanEngine.lib;%(AdditionalDependencies) - - - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Console - true - true - true - $(OutDir)TitanEngine.lib;%(AdditionalDependencies) - - - - - Level3 - Use - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - MultiThreadedDLL - - - Console - true - true - true - $(OutDir)TitanEngine.lib;%(AdditionalDependencies) - - - - - - - - - - - - Create - Create - Create - Create - - - - - - - \ No newline at end of file diff --git a/TitanUnitTest/TitanUnitTest.vcxproj.filters b/TitanUnitTest/TitanUnitTest.vcxproj.filters deleted file mode 100644 index 6cccd5b..0000000 --- a/TitanUnitTest/TitanUnitTest.vcxproj.filters +++ /dev/null @@ -1,41 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - {dcabac3b-acfe-4e79-a827-01d97b369669} - - - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files\SDK - - - Header Files\SDK - - - \ No newline at end of file diff --git a/TitanUnitTest/disasm.dll b/TitanUnitTest/disasm.dll deleted file mode 100644 index ef17bf1..0000000 Binary files a/TitanUnitTest/disasm.dll and /dev/null differ diff --git a/TitanUnitTest/stdafx.cpp b/TitanUnitTest/stdafx.cpp deleted file mode 100644 index 1577c4e..0000000 --- a/TitanUnitTest/stdafx.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "stdafx.h" \ No newline at end of file diff --git a/TitanUnitTest/stdafx.h b/TitanUnitTest/stdafx.h deleted file mode 100644 index 45c4afd..0000000 --- a/TitanUnitTest/stdafx.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -#include "targetver.h" - -#include -#include diff --git a/TitanUnitTest/targetver.h b/TitanUnitTest/targetver.h deleted file mode 100644 index 2b26ce2..0000000 --- a/TitanUnitTest/targetver.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include diff --git a/release_titanscript.bat b/release_titanscript.bat deleted file mode 100644 index b6c76ed..0000000 --- a/release_titanscript.bat +++ /dev/null @@ -1,29 +0,0 @@ -@echo off -IF EXIST TitanScriptRelease rmdir TitanScriptRelease /s /q -mkdir TitanScriptRelease -mkdir .\TitanScriptRelease\x86 -mkdir .\TitanScriptRelease\x64 - - -copy .\Release\x32\TitanScriptGui.exe .\TitanScriptRelease\x86\TitanScriptGuix86.exe -copy .\Release\x32\TitanScriptGui.map .\TitanScriptRelease\x86\TitanScriptGuix86.map -copy .\Release\x32\TitanEngine.dll .\TitanScriptRelease\x86\TitanEngine.dll -copy .\Release\x32\TitanEngine.map .\TitanScriptRelease\x86\TitanEngine.map - -copy .\Release\x64\TitanScriptGui.exe .\TitanScriptRelease\x64\TitanScriptGuix64.exe -copy .\Release\x64\TitanScriptGui.map .\TitanScriptRelease\x64\TitanScriptGuix64.map -copy .\Release\x64\TitanEngine.dll .\TitanScriptRelease\x64\TitanEngine.dll -copy .\Release\x64\TitanEngine.map .\TitanScriptRelease\x64\TitanEngine.map - -mkdir .\TitanScriptRelease\x86\plugins -mkdir .\TitanScriptRelease\x86\plugins\x86 -mkdir .\TitanScriptRelease\x64\plugins -mkdir .\TitanScriptRelease\x64\plugins\x64 - -copy ..\titanscript-update\Release\Win32\TitanScript.dll .\TitanScriptRelease\x86\plugins\x86\TitanScript.dll -copy ..\titanscript-update\Release\Win32\TitanScript.map .\TitanScriptRelease\x86\plugins\x86\TitanScript.map -copy ..\titanscript-update\Release\x64\TitanScript.dll .\TitanScriptRelease\x64\plugins\x64\TitanScript.dll -copy ..\titanscript-update\Release\x64\TitanScript.map .\TitanScriptRelease\x64\plugins\x64\TitanScript.map - -pause -