From 12ae6dcb9d3ec7c43d72918b662ae53977fe5a6a Mon Sep 17 00:00:00 2001 From: NtQuery Date: Thu, 13 Mar 2014 21:27:18 +0100 Subject: [PATCH] small bugfix --- TitanScriptGui/TitanScriptGui.cpp | 270 +++++++++++++++--------------- 1 file changed, 138 insertions(+), 132 deletions(-) diff --git a/TitanScriptGui/TitanScriptGui.cpp b/TitanScriptGui/TitanScriptGui.cpp index 66fe5a3..bcb1779 100644 --- a/TitanScriptGui/TitanScriptGui.cpp +++ b/TitanScriptGui/TitanScriptGui.cpp @@ -47,162 +47,168 @@ INT_PTR CALLBACK WndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) switch (message) { case WM_INITDIALOG: - { - //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); + //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); - //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); + //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); - //make sure TitanScript is available - if ( !ExtensionManagerIsPluginLoaded( "TitanScript" ) || !ExtensionManagerIsPluginEnabled( "TitanScript" ) ) - { - AddLogMessageW(L"TitanScript failed to load", TS_LOG_ERROR); + //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); + AddLogMessageW(L"Ensure plugins\\x64\\TitanScript.dll exists !", TS_LOG_ERROR); #else - AddLogMessageW(L"Ensure plugins\\x86\\TitanScript.dll exists !", TS_LOG_ERROR); + 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( SetLogCallback ); - set_log_callback(&AddLogMessage); - } + EnableWindow(GetDlgItem(hWnd, IDC_RUN ), FALSE); + } + else + { + load_file = GetTSFunctionPointer( LoadFileW ); + exec = GetTSFunctionPointer( ExecuteWithTitanMistW ); + set_log_callback = GetTSFunctionPointer( SetLogCallback ); + set_log_callback(&AddLogMessage); + } - break; - } + break; + } case WM_COMMAND: - { - switch (LOWORD(wParam)) { - case IDC_BROWSETARGET: - { - if(GetFileDialog(FileNameTarget)) + switch (LOWORD(wParam)) { - 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 = 0; - int copyLength = 0; - - for(LRESULT i=0; i