Merge branch 'pr/208'

This commit is contained in:
Callow 2022-07-13 11:48:41 +03:00
commit 4a2f26711d

View File

@ -18,79 +18,110 @@ bool OpenGenshinProcess(HANDLE* phProcess, HANDLE* phThread);
int main(int argc, char* argv[])
{
Logger::SetLevel(Logger::Level::Debug, Logger::LoggerType::ConsoleLogger);
Logger::SetLevel(Logger::Level::Debug, Logger::LoggerType::ConsoleLogger);
auto path = std::filesystem::path(argv[0]).parent_path();
current_path(path);
auto path = std::filesystem::path(argv[0]).parent_path();
current_path(path);
WaitForCloseProcess(GlobalGenshinProcName);
WaitForCloseProcess(ChinaGenshinProcName);
WaitForCloseProcess(GlobalGenshinProcName);
WaitForCloseProcess(ChinaGenshinProcName);
Sleep(1000); // Wait for unloading all dlls.
Sleep(1000); // Wait for unloading all dlls.
ini.SetUnicode();
ini.LoadFile("cfg.ini");
ini.SetUnicode();
ini.LoadFile("cfg.ini");
HANDLE hProcess, hThread;
if (!OpenGenshinProcess(&hProcess, &hThread))
{
std::cout << "Failed to open GenshinImpact process." << std::endl;
return 1;
}
HANDLE hProcess, hThread;
if (!OpenGenshinProcess(&hProcess, &hThread))
{
std::cout << "Failed to open GenshinImpact process." << std::endl;
system("pause");
return 1;
}
current_path(path);
ini.SaveFile("cfg.ini");
current_path(path);
ini.SaveFile("cfg.ini");
std::string filename = (argc == 2 ? argv[1] : "CLibrary.dll");
std::filesystem::path currentDllPath = std::filesystem::current_path() / filename;
std::string filename = (argc == 2 ? argv[1] : "CLibrary.dll");
std::filesystem::path currentDllPath = std::filesystem::current_path() / filename;
#ifdef _DEBUG
std::filesystem::path tempDllPath = std::filesystem::temp_directory_path() / filename;
std::filesystem::path tempDllPath = std::filesystem::temp_directory_path() / filename;
std::error_code ec;
std::filesystem::copy_file(currentDllPath, tempDllPath, std::filesystem::copy_options::update_existing, ec);
if (ec)
{
LOG_ERROR("Copy dll failed: %s", ec.message().c_str());
std::system("pause");
}
std::error_code ec;
std::filesystem::copy_file(currentDllPath, tempDllPath, std::filesystem::copy_options::update_existing, ec);
if (ec)
{
LOG_ERROR("Copy dll failed: %s", ec.message().c_str());
std::system("pause");
}
InjectDLL(hProcess, tempDllPath.string());
InjectDLL(hProcess, tempDllPath.string());
#else
InjectDLL(hProcess, currentDllPath.string());
InjectDLL(hProcess, currentDllPath.string());
#endif
Sleep(2000);
ResumeThread(hThread);
Sleep(2000);
ResumeThread(hThread);
CloseHandle(hProcess);
CloseHandle(hProcess);
}
bool OpenGenshinProcess(HANDLE *phProcess, HANDLE* phThread)
bool OpenGenshinProcess(HANDLE* phProcess, HANDLE* phThread)
{
STARTUPINFOA startInfo{};
PROCESS_INFORMATION processInformation{};
auto filePath = util::GetOrSelectPath(ini, "Inject", "GenshinPath", "genshin path", "Executable\0GenshinImpact.exe;YuanShen.exe\0");
auto commandline = ini.GetValue("Inject", "GenshinCommandLine");
LPSTR lpstr = commandline == nullptr ? nullptr : const_cast<LPSTR>(commandline);
if (!filePath)
return false;
BOOL result = CreateProcessA(filePath->c_str(),
lpstr, 0, 0, FALSE, CREATE_SUSPENDED, nullptr, nullptr, &startInfo, &processInformation);
if (result == FALSE)
{
LOG_LAST_ERROR("Failed to create game process.");
LOG_ERROR("If you have problem with GenshinImpact.exe path. You can change it manually in cfg.ini.");
return false;
}
ini.SaveFile("cfg.ini");
*phThread = processInformation.hThread;
*phProcess = processInformation.hProcess;
return true;
HANDLE hToken;
BOOL TokenRet = OpenProcessToken(GetCurrentProcess(), TOKEN_ALL_ACCESS, &hToken);
if (!TokenRet) {
LOG_LAST_ERROR("Privilege escalation failed!");
return false;
}
bool OpenRet = false;
auto filePath = util::GetOrSelectPath(ini, "Inject", "GenshinPath", "genshin path", "Executable\0GenshinImpact.exe;YuanShen.exe\0");
auto commandline = ini.GetValue("Inject", "GenshinCommandLine");
LPSTR lpstr = commandline == nullptr ? nullptr : const_cast<LPSTR>(commandline);
if (!filePath)
return false;
DWORD pid = FindProcessId("explorer.exe");
if (pid == 0)
{
LOG_ERROR("Can't find 'explorer' pid!");
return false;
}
std::string CurrentDirectory = filePath.value();
int pos = CurrentDirectory.rfind("\\", CurrentDirectory.length());
CurrentDirectory = CurrentDirectory.substr(0, pos);
LOG_INFO("%s", CurrentDirectory.data());
HANDLE handle = OpenProcess(PROCESS_ALL_ACCESS, FALSE, pid);
STARTUPINFOEXA si;
ZeroMemory(&si, sizeof(si));
si.StartupInfo.cb = sizeof(si);
SIZE_T lpsize = 0;
InitializeProcThreadAttributeList(NULL, 1, 0, &lpsize);
char* temp = new char[lpsize];
LPPROC_THREAD_ATTRIBUTE_LIST AttributeList = (LPPROC_THREAD_ATTRIBUTE_LIST)temp;
InitializeProcThreadAttributeList(AttributeList, 1, 0, &lpsize);
if (!UpdateProcThreadAttribute(AttributeList, 0, PROC_THREAD_ATTRIBUTE_PARENT_PROCESS, &handle, sizeof(HANDLE), NULL, NULL))
{
LOG_WARNING("UpdateProcThreadAttribute failed ! (%d).\n", GetLastError());
}
si.lpAttributeList = AttributeList;
PROCESS_INFORMATION pi;
ZeroMemory(&pi, sizeof(pi));
BOOL result = CreateProcessAsUserA(hToken, const_cast<LPSTR>(filePath->data()), lpstr,
0, 0, 0, EXTENDED_STARTUPINFO_PRESENT | CREATE_SUSPENDED, 0, (LPSTR)CurrentDirectory.data(), (LPSTARTUPINFOA)&si, &pi);
if (result == FALSE)
{
LOG_LAST_ERROR("Failed to create game process.");
LOG_ERROR("If you have problem with GenshinImpact.exe path. You can change it manually in cfg.ini.");
goto End;
}
ini.SaveFile("cfg.ini");
*phThread = pi.hThread;
*phProcess = pi.hProcess;
OpenRet = true;
End:
DeleteProcThreadAttributeList(AttributeList);
delete temp;
return OpenRet;
}