Skip to content

Fix: Correct CMake build configuration #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tubbylumpkinz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix: Correct CMake build configuration #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 12 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,18 @@ set(CMAKE_CXX_STANDARD 17)
set(wxBUILD_SHARED OFF CACHE BOOL "OFF for static library!" FORCE) # force wxWidgets to use static library
mark_as_advanced(wxBUILD_SHARED)

add_executable(fateInjector WIN32)
add_subdirectory(src)
add_executable(fateInjector WIN32
src/cApp.cpp
src/cMain.cpp
src/config.cpp
src/FixFilePerms.cpp
src/inject.cpp
src/pch.cpp
src/taskBarIcon.cpp
src/icon.rc
)

target_precompile_headers(fateInjector PRIVATE "src/pch.h")

SET_TARGET_PROPERTIES(fateInjector PROPERTIES LINK_FLAGS "/level='requireAdministrator' /uiAccess='false'") # requireAdministrator

Expand All @@ -18,4 +28,3 @@ target_link_libraries(fateInjector wx::net wx::core wx::base)

set(CPACK_PROJECT_NAME ${PROJECT_NAME})
set(CPACK_PROJECT_VERSION ${PROJECT_VERSION})

10 changes: 0 additions & 10 deletions src/CMakeLists.txt
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions src/cApp.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,6 @@
#include "cApp.h"
#include "config.h"


cMain* ref; // I am to dumb for all this,
// Don't do this but yeah...


wxIMPLEMENT_APP(cApp);

cApp::cApp() {
Expand All @@ -26,7 +21,6 @@ bool cApp::OnInit() {
}

m_frame1 = new cMain();
ref = m_frame1;
m_frame1->Show();
return true;
}
Expand Down
99 changes: 50 additions & 49 deletions src/cMain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,21 @@
#include "config.h"
#include "icon/icon.xpm"

enum IDs {
INJECT_BUTTON_ID = 1,
HIDE_BUTTON_ID,
SELECT_BUTTON_ID,
CUSTOM_CHECKBOX_ID,
AUTO_CHECKBOX_ID,
};

wxBEGIN_EVENT_TABLE(cMain, wxFrame)
EVT_BUTTON(101, OnInjectButton)
EVT_BUTTON(102, OnHideButton)
EVT_BUTTON(103, OnSelectButton)
EVT_BUTTON(INJECT_BUTTON_ID, OnInjectButton)
EVT_BUTTON(HIDE_BUTTON_ID, OnHideButton)
EVT_BUTTON(SELECT_BUTTON_ID, OnSelectButton)

EVT_CHECKBOX(201, OnCustomCheckBox)
EVT_CHECKBOX(202, OnAutoCheckBox)
EVT_CHECKBOX(CUSTOM_CHECKBOX_ID, OnCustomCheckBox)
EVT_CHECKBOX(AUTO_CHECKBOX_ID, OnAutoCheckBox)

wxEND_EVENT_TABLE();

Expand All @@ -23,12 +31,12 @@ cMain::cMain() : wxFrame(nullptr, wxID_ANY, "Fate Client Injector", wxDefaultPos
this->SetBackgroundColour(wxColour(255, 255, 255, 255));

mainPanel = new wxPanel(this, wxID_ANY);
btn_Inject = new wxButton(mainPanel, 101, "Inject", wxPoint(5, 5), wxSize(100, 40));
btn_Hide = new wxButton(mainPanel, 102, "Hide Menu", wxPoint(5, 50), wxSize(100, 20));
btn_Select = new wxButton(mainPanel, 103, "Select", wxPoint(5, 75), wxSize(60, 20));
btn_Inject = new wxButton(mainPanel, INJECT_BUTTON_ID, "Inject", wxPoint(5, 5), wxSize(100, 40));
btn_Hide = new wxButton(mainPanel, HIDE_BUTTON_ID, "Hide Menu", wxPoint(5, 50), wxSize(100, 20));
btn_Select = new wxButton(mainPanel, SELECT_BUTTON_ID, "Select", wxPoint(5, 75), wxSize(60, 20));
txt_Name = new wxTextCtrl(mainPanel, wxID_ANY, "minecraft.windows.exe", wxPoint(110, 5), wxSize(165, 20));
check_Custom = new wxCheckBox(mainPanel, 201, "Custom Target", wxPoint(110, 30), wxSize(165, 20));
check_Auto = new wxCheckBox(mainPanel, 202, "Auto Inject", wxPoint(110, 50), wxSize(130, 20));
check_Custom = new wxCheckBox(mainPanel, CUSTOM_CHECKBOX_ID, "Custom Target", wxPoint(110, 30), wxSize(165, 20));
check_Auto = new wxCheckBox(mainPanel, AUTO_CHECKBOX_ID, "Auto Inject", wxPoint(110, 50), wxSize(130, 20));
txt_Delay = new wxTextCtrl(mainPanel, wxID_ANY, "5", wxPoint(245, 50), wxSize(30, 20), wxTE_CENTRE, wxTextValidator(wxFILTER_NUMERIC));
txt_Delay->SetMaxLength(2);
txt_Path = new wxTextCtrl(mainPanel, wxID_ANY, "Click \"Select\" to select the dll file", wxPoint(70, 75), wxSize(205, 20));
Expand Down Expand Up @@ -62,44 +70,39 @@ cMain::~cMain() {


void cMain::OnInjectButton(wxCommandEvent& evt) {

cMain::OnInjectButtonExecute(evt, this);
}

void cMain::OnInjectButtonExecute(wxCommandEvent& evt, cMain* ref) {
std::string debug;

DWORD procId = 0;

procId = GetProcId(ref->txt_Name->GetValue().mb_str());
procId = GetProcId(txt_Name->GetValue().mb_str());


if (procId == 0) {

debug = "Can't find process! | " + std::to_string(procId);
ref->SetStatusText(debug, 0);
SetStatusText(debug, 0);
return;
}
wxString wxStrPath = ref->txt_Path->GetValue();
wxString wxStrPath = txt_Path->GetValue();
std::wstring wStrPath = wxStrPath.ToStdWstring(); // converting wxstr to wstr
std::ifstream test(wStrPath.c_str()); // test if file path is valid
if (!test) {

debug = "Process found! | " + std::to_string(procId) + " | invalid file path";
ref->SetStatusText(debug, 0);
SetStatusText(debug, 0);
return;
}

SetAccessControl(wStrPath, L"S-1-15-2-1");
performInjection(procId, wStrPath.c_str());
debug = "Process found! | " + std::to_string(procId) + " | valid file path | Injected!";
ref->SetStatusText(debug, 0);
SetStatusText(debug, 0);


customProcName = ref->check_Custom->GetValue();
delaystr = ref->txt_Delay->GetValue();
dllPath = ref->txt_Path->GetValue();
procName = ref->txt_Name->GetValue();
customProcName = check_Custom->GetValue();
delaystr = txt_Delay->GetValue();
dllPath = txt_Path->GetValue();
procName = txt_Name->GetValue();

config cfg;
cfg.saveConfig();
Expand Down Expand Up @@ -141,19 +144,15 @@ void cMain::OnCustomCheckBox(wxCommandEvent& evt) {
}


bool cheapThreadFix = false;

void cMain::OnAutoCheckBox(wxCommandEvent& evt) {
if (check_Auto->IsChecked()) {
txt_Name->Disable();
txt_Path->Disable();
txt_Delay->Disable();
btn_Select->Disable();
check_Custom->Disable();
if (!cheapThreadFix) {
std::thread loopthread(&cMain::loopInject, this); // for autoinject
loopthread.detach();
}
std::thread loopthread(&cMain::loopInject, this);
loopthread.detach();
}
else {
disableAutoInject();
Expand All @@ -172,21 +171,28 @@ void cMain::disableAutoInject() {
btn_Select->Enable();
}

bool cMain::loopInject() {
cheapThreadFix = true;
void cMain::UpdateStatus(const wxString& newStatus) {
SetStatusText(newStatus, 0);
}

void cMain::UpdateDelayLabel(const wxString& newLabel) {
txt_Delay->SetLabel(newLabel);
}

void cMain::loopInject() {
std::string debug;

int delay = atoi(txt_Delay->GetValue().mb_str());

if (delay <= 1) {
delay = 1;
txt_Delay->SetLabel("1");
CallAfter(&cMain::UpdateDelayLabel, "1");
debug = "AutoInject: Enabled | trying every second";
}
else {
debug = "AutoInject: Enabled | trying every " + std::to_string(delay) + " seconds";
}
SetStatusText(debug, 0);
CallAfter(&cMain::UpdateStatus, debug);


DWORD procId = 0;
Expand All @@ -201,44 +207,39 @@ bool cMain::loopInject() {
procId = GetProcId(txt_Name->GetValue().mb_str());
if (procId == 0) {
debug = "AutoInject: Can't find process! | " + std::to_string(procId);
SetStatusText(debug, 0);
CallAfter(&cMain::UpdateStatus, debug);
}
else if (procId == oldProcId) {
debug = "AutoInject: Already Injected! | " + std::to_string(procId);
SetStatusText(debug, 0);
CallAfter(&cMain::UpdateStatus, debug);
}
if (!check_Auto->IsChecked()) {
cheapThreadFix = false;
return false;
return;
}
}
wxString wxStrPath = txt_Path->GetValue();
std::wstring wStrPath = wxStrPath.ToStdWstring(); // converting wxstr to wstr
std::ifstream test(wStrPath.c_str()); // test if file path is valid
if (!test) {

debug = "AutoInject: Process found! | " + std::to_string(procId) + " | invalid file path";
SetStatusText(debug, 0);
CallAfter(&cMain::UpdateStatus, debug);
check_Auto->SetValue(false); // wxWidgets does that automaticly on click so we only need this here
disableAutoInject();
cheapThreadFix = false;
return true;
return;
}
SetAccessControl(wStrPath, L"S-1-15-2-1");
performInjection(procId, wStrPath.c_str());
debug = "Process found! | " + std::to_string(procId) + " | valid file path | Injected!";
SetStatusText(debug, 0);
CallAfter(&cMain::UpdateStatus, debug);
oldProcId = procId;

customProcName = ref->check_Custom->GetValue();
delaystr = ref->txt_Delay->GetValue();
dllPath = ref->txt_Path->GetValue();
procName = ref->txt_Name->GetValue();
customProcName = check_Custom->GetValue();
delaystr = txt_Delay->GetValue();
dllPath = txt_Path->GetValue();
procName = txt_Name->GetValue();

config cfg;
cfg.saveConfig();
}
cheapThreadFix = false;
return false;
}

5 changes: 3 additions & 2 deletions src/cMain.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ class cMain : public wxFrame
wxNotificationMessage *notification = nullptr;

public:
static void OnInjectButtonExecute(wxCommandEvent &evt, cMain *ref);
void OnInjectButton(wxCommandEvent &evt);
void OnHideButton(wxCommandEvent &evt);
void OnSelectButton(wxCommandEvent &evt);
Expand All @@ -37,7 +36,9 @@ class cMain : public wxFrame
wxDECLARE_EVENT_TABLE();

public:
bool loopInject();
void loopInject();
void disableAutoInject();
void UpdateStatus(const wxString& newStatus);
void UpdateDelayLabel(const wxString& newLabel);
friend taskBarIcon::taskBarIcon();
};