bug/chore: more assorted fixes :P

This commit is contained in:
rjindael 2023-07-26 21:54:48 -07:00
parent a2e379d41a
commit 862e97bdea
No known key found for this signature in database
GPG Key ID: D069369C906CCF31
11 changed files with 26 additions and 13 deletions

View File

@ -6,10 +6,9 @@
#include <discord_register.h> #include <discord_register.h>
#include <rapidjson/document.h> #include <rapidjson/document.h>
#include "Globals.hpp"
#include "Hooks/CRoblox.hpp" #include "Hooks/CRoblox.hpp"
#include "Globals.hpp"
class Discord { class Discord {
public: public:

View File

@ -1,5 +1,9 @@
#pragma once #pragma once
#include <string>
#include <vector>
#include <map>
#include <curl/curl.h> #include <curl/curl.h>
#include "Globals.hpp" #include "Globals.hpp"

View File

@ -8,6 +8,10 @@
#include "Helpers.hpp" #include "Helpers.hpp"
#include "Discord.hpp" #include "Discord.hpp"
#ifdef SERVER
#include "Server.hpp"
#endif
class CWorkspace; class CWorkspace;
const auto CWorkspace__ExecUrlScript = (HRESULT(__stdcall*)(CWorkspace * workspace, LPCWSTR, VARIANTARG, VARIANTARG, VARIANTARG, VARIANTARG, LPVOID))ADDRESS_CWORKSPACE__EXECURLSCRIPT; const auto CWorkspace__ExecUrlScript = (HRESULT(__stdcall*)(CWorkspace * workspace, LPCWSTR, VARIANTARG, VARIANTARG, VARIANTARG, VARIANTARG, LPVOID))ADDRESS_CWORKSPACE__EXECURLSCRIPT;

View File

@ -1,8 +1,12 @@
#pragma once #pragma once
#include <string>
#include <wincrypt.h> #include <wincrypt.h>
#include "Globals.hpp" #include "Globals.hpp"
#include "Helpers.hpp"
#include "Patcher.hpp"
typedef void(__thiscall* Crypt__verifySignatureBase64_t)(HCRYPTPROV* _this, int a2, BYTE* pbData, int a4, int a5, int a6, DWORD dwDataLen, int a8, int a9, int a10, int a11, int a12, int a13, int a14, int a15); typedef void(__thiscall* Crypt__verifySignatureBase64_t)(HCRYPTPROV* _this, int a2, BYTE* pbData, int a4, int a5, int a6, DWORD dwDataLen, int a8, int a9, int a10, int a11, int a12, int a13, int a14, int a15);
void __fastcall Crypt__verifySignatureBase64_hook(HCRYPTPROV* _this, void*, int a2, BYTE* pbData, int a4, int a5, int a6, DWORD dwDataLen, int a8, int a9, int a10, int a11, int a12, int a13, int a14, int a15); void __fastcall Crypt__verifySignatureBase64_hook(HCRYPTPROV* _this, void*, int a2, BYTE* pbData, int a4, int a5, int a6, DWORD dwDataLen, int a8, int a9, int a10, int a11, int a12, int a13, int a14, int a15);

View File

@ -1,3 +1,7 @@
#pragma once
#include <string>
#include <curl/curl.h> #include <curl/curl.h>
#include <rapidjson/document.h> #include <rapidjson/document.h>

View File

@ -1,5 +1,8 @@
#pragma once #pragma once
#include <vector>
#include <utility>
#include <detours/detours.h> #include <detours/detours.h>
namespace Patcher namespace Patcher

View File

@ -2,11 +2,11 @@
#pragma once #pragma once
#include "Hooks/StandardOut.hpp"
#include "Globals.hpp" #include "Globals.hpp"
#include "Helpers.hpp" #include "Helpers.hpp"
#include "Hooks/StandardOut.hpp"
enum class RequestType { enum class RequestType {
POST, POST,
GET GET

View File

@ -4,9 +4,9 @@
#define VERSION_MAJOR_MINOR_PATCH_STR "1.0.0" #define VERSION_MAJOR_MINOR_PATCH_STR "1.0.0"
#define VERSION_FULL_STR "1.0.0.0" #define VERSION_FULL_STR "1.0.0.0"
#define VERSION_RESOURCE 1, 0, 0, 0 #define VERSION_RESOURCE 1, 0, 0, 0
#define VERSION_RESOURCE_STR VERSION_FULL_STR "\0" #define VERSION_RESOURCE_STR VERSION_FULL_STR
#define APP_NAME "Kiseki.Patcher" #define APP_NAME "Kiseki.Patcher"
#define APP_DESCRIPTION "Client Functionality Library" #define APP_DESCRIPTION "Client Functionality Library"
#define APP_ORGANIZATION "Kiseki" #define APP_ORGANIZATION "Kiseki"
#define APP_COPYRIGHT "Copyright (c) Kiseki 2023" #define APP_COPYRIGHT "Copyright (c) Kiseki 2023"

View File

@ -2,10 +2,6 @@
#include "Hooks/CRoblox.hpp" #include "Hooks/CRoblox.hpp"
#ifdef SERVER
#include "Server.h"
#endif
bool hasAuthenticationUrl = false; bool hasAuthenticationUrl = false;
bool hasAuthenticationTicket = false; bool hasAuthenticationTicket = false;
bool hasJoinScriptUrl = false; bool hasJoinScriptUrl = false;

View File

@ -1,8 +1,5 @@
#include "Hooks/Crypt.hpp" #include "Hooks/Crypt.hpp"
#include "Helpers.hpp"
#include "Patcher.hpp"
Crypt::Crypt() Crypt::Crypt()
{ {
if (!CryptAcquireContext(&context, NULL, MS_ENH_RSA_AES_PROV, PROV_RSA_AES, CRYPT_VERIFYCONTEXT)) if (!CryptAcquireContext(&context, NULL, MS_ENH_RSA_AES_PROV, PROV_RSA_AES, CRYPT_VERIFYCONTEXT))

View File

@ -1,4 +1,6 @@
#include <windows.h>
#include "Globals.hpp" #include "Globals.hpp"
#include "Patcher.hpp" #include "Patcher.hpp"