Revert "Isolate MFC hooks from studio builds"
This reverts commit b749d5d382.
This commit is contained in:
parent
b749d5d382
commit
a9d8fa6e47
|
|
@ -1,8 +1,7 @@
|
||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#define MFC2011
|
#define MFC2010
|
||||||
#define PLAYERBUILD
|
#define ARBITERBUILD
|
||||||
// #define ARBITERBUILD
|
|
||||||
|
|
||||||
// when ARBITERBUILD is defined, the following changes occur:
|
// when ARBITERBUILD is defined, the following changes occur:
|
||||||
// DataModel->getJobId is hooked
|
// DataModel->getJobId is hooked
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ struct DataModel
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (defined(MFC2010) || defined(MFC2011)) && (defined(PLAYERBUILD) || defined(ARBITERBUILD))
|
#if defined(MFC2010) || defined(MFC2011)
|
||||||
// 2010 struct definitions:
|
// 2010 struct definitions:
|
||||||
// 0x47E010: CWorkspace->DoExecScript()
|
// 0x47E010: CWorkspace->DoExecScript()
|
||||||
// 0x47EC10: CWorkspace->ExecUrlScript()
|
// 0x47EC10: CWorkspace->ExecUrlScript()
|
||||||
|
|
|
||||||
|
|
@ -29,7 +29,7 @@ StandardOut__print_t StandardOut__print = (StandardOut__print_t)ADDRESS_STANDARD
|
||||||
Application__ParseArguments_t Application__ParseArguments = (Application__ParseArguments_t)ADDRESS_APPLICATION__PARSEARGUMENTS;
|
Application__ParseArguments_t Application__ParseArguments = (Application__ParseArguments_t)ADDRESS_APPLICATION__PARSEARGUMENTS;
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#if (defined(MFC2010) || defined(MFC2011)) && (defined(PLAYERBUILD) || defined(ARBITERBUILD))
|
#if defined(MFC2010) || defined(MFC2011)
|
||||||
// CApp__CreateGame_t CApp__CreateGame = (CApp__CreateGame_t)ADDRESS_CAPP__CREATEGAME;
|
// CApp__CreateGame_t CApp__CreateGame = (CApp__CreateGame_t)ADDRESS_CAPP__CREATEGAME;
|
||||||
CRobloxApp__InitInstance_t CRobloxApp__InitInstance = (CRobloxApp__InitInstance_t)ADDRESS_CROBLOXAPP__INITINSTANCE;
|
CRobloxApp__InitInstance_t CRobloxApp__InitInstance = (CRobloxApp__InitInstance_t)ADDRESS_CROBLOXAPP__INITINSTANCE;
|
||||||
CRobloxCommandLineInfo__ParseParam_t CRobloxCommandLineInfo__ParseParam = (CRobloxCommandLineInfo__ParseParam_t)ADDRESS_CROBLOXCOMMANDLINEINFO__PARSEPARAM;
|
CRobloxCommandLineInfo__ParseParam_t CRobloxCommandLineInfo__ParseParam = (CRobloxCommandLineInfo__ParseParam_t)ADDRESS_CROBLOXCOMMANDLINEINFO__PARSEPARAM;
|
||||||
|
|
@ -162,7 +162,7 @@ BOOL __fastcall Application__ParseArguments_hook(int _this, void*, int a2, const
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (defined(MFC2010) || defined(MFC2011)) && (defined(PLAYERBUILD) || defined(ARBITERBUILD))
|
#if defined(MFC2010) || defined(MFC2011)
|
||||||
/* INT __fastcall CApp__CreateGame_hook(CApp* _this, void*, int* a2, LPCWSTR a3)
|
/* INT __fastcall CApp__CreateGame_hook(CApp* _this, void*, int* a2, LPCWSTR a3)
|
||||||
{
|
{
|
||||||
printf("CApp::CreateGame called\n");
|
printf("CApp::CreateGame called\n");
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ typedef void(__thiscall* StandardOut__print_t)(int _this, int type, std::string*
|
||||||
typedef BOOL(__thiscall* Application__ParseArguments_t)(int _this, int a2, const char* argv);
|
typedef BOOL(__thiscall* Application__ParseArguments_t)(int _this, int a2, const char* argv);
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#if (defined(MFC2010) || defined(MFC2011)) && (defined(PLAYERBUILD) || defined(ARBITERBUILD))
|
#if defined(MFC2010) || defined(MFC2011)
|
||||||
// typedef INT(__thiscall* CApp__CreateGame_t)(CApp* _this, int *a2, LPCWSTR a3);
|
// typedef INT(__thiscall* CApp__CreateGame_t)(CApp* _this, int *a2, LPCWSTR a3);
|
||||||
typedef BOOL(__thiscall* CRobloxApp__InitInstance_t)(CRobloxApp* _this);
|
typedef BOOL(__thiscall* CRobloxApp__InitInstance_t)(CRobloxApp* _this);
|
||||||
typedef void(__thiscall* CRobloxCommandLineInfo__ParseParam_t)(CRobloxCommandLineInfo* _this, const char* pszParam, BOOL bFlag, BOOL bLast);
|
typedef void(__thiscall* CRobloxCommandLineInfo__ParseParam_t)(CRobloxCommandLineInfo* _this, const char* pszParam, BOOL bFlag, BOOL bLast);
|
||||||
|
|
@ -32,7 +32,7 @@ extern StandardOut__print_t StandardOut__print;
|
||||||
extern Application__ParseArguments_t Application__ParseArguments;
|
extern Application__ParseArguments_t Application__ParseArguments;
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#if (defined(MFC2010) || defined(MFC2011)) && (defined(PLAYERBUILD) || defined(ARBITERBUILD))
|
#if defined(MFC2010) || defined(MFC2011)
|
||||||
// extern CApp__CreateGame_t CApp__CreateGame;
|
// extern CApp__CreateGame_t CApp__CreateGame;
|
||||||
extern CRobloxApp__InitInstance_t CRobloxApp__InitInstance;
|
extern CRobloxApp__InitInstance_t CRobloxApp__InitInstance;
|
||||||
extern CRobloxCommandLineInfo__ParseParam_t CRobloxCommandLineInfo__ParseParam;
|
extern CRobloxCommandLineInfo__ParseParam_t CRobloxCommandLineInfo__ParseParam;
|
||||||
|
|
@ -50,7 +50,7 @@ void __fastcall StandardOut__print_hook(int _this, void*, int type, std::string*
|
||||||
BOOL __fastcall Application__ParseArguments_hook(int _this, void*, int a2, const char* argv);
|
BOOL __fastcall Application__ParseArguments_hook(int _this, void*, int a2, const char* argv);
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#if (defined(MFC2010) || defined(MFC2011)) && (defined(PLAYERBUILD) || defined(ARBITERBUILD))
|
#if defined(MFC2010) || defined(MFC2011)
|
||||||
// INT __fastcall CApp__CreateGame_hook(CApp* _this, void*, int *a2, LPCWSTR a3);
|
// INT __fastcall CApp__CreateGame_hook(CApp* _this, void*, int *a2, LPCWSTR a3);
|
||||||
BOOL __fastcall CRobloxApp__InitInstance_hook(CRobloxApp* _this);
|
BOOL __fastcall CRobloxApp__InitInstance_hook(CRobloxApp* _this);
|
||||||
void __fastcall CRobloxCommandLineInfo__ParseParam_hook(CRobloxCommandLineInfo* _this, void*, const char* pszParam, BOOL bFlag, BOOL bLast);
|
void __fastcall CRobloxCommandLineInfo__ParseParam_hook(CRobloxCommandLineInfo* _this, void*, const char* pszParam, BOOL bFlag, BOOL bLast);
|
||||||
|
|
|
||||||
|
|
@ -15,7 +15,7 @@ ADD_PATCH(StandardOut__print, StandardOut__print_hook)
|
||||||
ADD_PATCH(Application__ParseArguments, Application__ParseArguments_hook)
|
ADD_PATCH(Application__ParseArguments, Application__ParseArguments_hook)
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
#if (defined(MFC2010) || defined(MFC2011)) && (defined(PLAYERBUILD) || defined(ARBITERBUILD))
|
#if defined(MFC2010) || defined(MFC2011)
|
||||||
// ADD_PATCH(CApp__CreateGame, CApp__CreateGame_hook)
|
// ADD_PATCH(CApp__CreateGame, CApp__CreateGame_hook)
|
||||||
ADD_PATCH(CRobloxApp__InitInstance, CRobloxApp__InitInstance_hook)
|
ADD_PATCH(CRobloxApp__InitInstance, CRobloxApp__InitInstance_hook)
|
||||||
ADD_PATCH(CRobloxCommandLineInfo__ParseParam, CRobloxCommandLineInfo__ParseParam_hook)
|
ADD_PATCH(CRobloxCommandLineInfo__ParseParam, CRobloxCommandLineInfo__ParseParam_hook)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue