Skip to content

[PROJECT] Add qualifier formatting #69

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
TheRedDaemon wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[PROJECT] Add qualifier formatting #69

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
3 changes: 3 additions & 0 deletions .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,7 @@ TabWidth: 4
UseTab: Never
InsertNewlineAtEOF: true
SpaceInEmptyBraces: Never
PointerAlignment: Left
QualifierAlignment: Custom
QualifierOrder: [inline, static, type, const, volatile]
...
8 changes: 4 additions & 4 deletions src/core/Resolver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@

static void createRelativeJump(int from, int to)
{
const int instructionLength = 5;
const int relativeOffset = to - (from + instructionLength);
int const instructionLength = 5;
int const relativeOffset = to - (from + instructionLength);

DWORD oldProtection;
if (!VirtualProtect((void*)from, instructionLength, PAGE_EXECUTE_READWRITE, &oldProtection)) {
Expand All @@ -36,7 +36,7 @@ static void createRelativeJump(int from, int to)
#endif

void StructResolver::initialize(
bool& initialized, bool isImplemented, int gameAddress, const void* structPtr, const char* typeName)
bool& initialized, bool isImplemented, int gameAddress, void const* structPtr, char const* typeName)
{
if (initialized) {
#ifdef OPEN_SHC_EXE
Expand Down Expand Up @@ -67,7 +67,7 @@ void StructResolver::initialize(
}

void FunctionResolver::initialize(
bool& initialized, bool isImplemented, int gameAddress, const void* funcPtr, const char* funcName)
bool& initialized, bool isImplemented, int gameAddress, void const* funcPtr, char const* funcName)
{
if (initialized) {
#ifdef OPEN_SHC_EXE
Expand Down
18 changes: 9 additions & 9 deletions src/precomp/FunctionResolver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ struct FunctionResolver {
};

static void initialize(
bool& initialized, bool isImplemented, int gameAddress, const void* funcPtr, const char* funcName);
bool& initialized, bool isImplemented, int gameAddress, void const* funcPtr, char const* funcName);

template <int options> struct OptionFlags {
enum {
Expand All @@ -198,18 +198,18 @@ struct FunctionResolver {
struct Resolver {
private:
// only use this for internal logic and declarations/definitions
static const bool isImplemented = OPEN_SHC_IMPLEMENTED(implemented);
static bool const isImplemented = OPEN_SHC_IMPLEMENTED(implemented);

typedef OptionFlags<options> Flags;

struct Initializer {
Initializer();
};
static const Initializer initializer;
static Initializer const initializer;

template <bool implemented, bool wrapper, typename _> struct FunctionPtrUnifier;
template <typename _> struct FunctionPtrUnifier<true, false, _> {
inline static const FuncPtrType get() { return funcAddress; }
inline static FuncPtrType const get() { return funcAddress; }
};

// At the moment, there is not much sense in allowing the wrapper function for the exe.
Expand All @@ -218,10 +218,10 @@ struct FunctionResolver {
#ifdef OPEN_SHC_DLL

template <typename _> struct FunctionPtrUnifier<false, false, _> {
inline static const FuncPtrType get() { return GameFunction<FuncPtrType>::get(); }
inline static FuncPtrType const get() { return GameFunction<FuncPtrType>::get(); }
};
template <bool implemented, typename _> struct FunctionPtrUnifier<implemented, true, _> {
inline static const FuncPtrType get()
inline static FuncPtrType const get()
{
return reinterpret_cast<FuncPtrType>(&Wrapper<FuncPtrType>::Function::call);
}
Expand Down Expand Up @@ -418,14 +418,14 @@ struct FunctionResolver {
template <int address> bool FunctionResolver::AddressUsageKeeper<address>::initialized = false;

template <typename FuncPtrType, bool implemented, int gameAddress, FuncPtrType funcAddress, int options>
const typename FunctionResolver::Resolver<FuncPtrType, implemented, gameAddress, funcAddress, options>::Initializer
typename FunctionResolver::Resolver<FuncPtrType, implemented, gameAddress, funcAddress, options>::Initializer const
FunctionResolver::Resolver<FuncPtrType, implemented, gameAddress, funcAddress, options>::initializer;

template <typename FuncPtrType, bool implemented, int gameAddress, FuncPtrType funcAddress, int options>
FunctionResolver::Resolver<FuncPtrType, implemented, gameAddress, funcAddress, options>::Initializer::Initializer()
{
const FuncPtrType funcPtr = Function::get();
const void* func = *((void**)&funcPtr);
FuncPtrType const funcPtr = Function::get();
void const* func = *((void**)&funcPtr);
initialize(AddressUsageKeeper<gameAddress>::initialized, isImplemented, gameAddress, func,
getFuncPtrName<FuncPtrType, funcAddress>());
}
Expand Down
8 changes: 4 additions & 4 deletions src/precomp/StructResolver.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,18 @@ struct StructResolver {
};

static void initialize(
bool& initialized, bool isImplemented, int gameAddress, const void* structPtr, const char* typeName);
bool& initialized, bool isImplemented, int gameAddress, void const* structPtr, char const* typeName);

public:
template <typename T, bool implemented, int gameAddress> struct Resolver {
private:
// only use this for internal logic and declarations/definitions
static const bool isImplemented = OPEN_SHC_IMPLEMENTED(implemented);
static bool const isImplemented = OPEN_SHC_IMPLEMENTED(implemented);

struct Initializer {
Initializer();
};
static const Initializer initializer;
static Initializer const initializer;

public:
typedef typename InternalResolver<T, isImplemented, gameAddress> Ptr;
Expand All @@ -48,7 +48,7 @@ T* const StructResolver::InternalResolver<T, true, gameAddress>::ptr
template <int address> bool StructResolver::AddressUsageKeeper<address>::initialized = false;

template <typename T, bool implemented, int gameAddress>
const typename StructResolver::Resolver<T, implemented, gameAddress>::Initializer
typename StructResolver::Resolver<T, implemented, gameAddress>::Initializer const
StructResolver::Resolver<T, implemented, gameAddress>::initializer;

template <typename T, bool implemented, int gameAddress>
Expand Down
24 changes: 12 additions & 12 deletions src/precomp/TypeUtility.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@

#include <string>

template <typename T> const char* getTypeName()
template <typename T> char const* getTypeName()
{
static std::string cached;
if (!cached.empty()) {
return cached.c_str();
}
static const char* fallback = "<UNKNOWN>";
static char const* fallback = "<UNKNOWN>";

const char* sig = __FUNCSIG__;
const char* start = std::strchr(sig, '<');
const char* end = std::strrchr(sig, '>');
char const* sig = __FUNCSIG__;
char const* start = std::strchr(sig, '<');
char const* end = std::strrchr(sig, '>');

if (start && end && end > start) {
cached = std::string(start + 1, end);
Expand All @@ -23,29 +23,29 @@ template <typename T> const char* getTypeName()
return cached.c_str();
}

template <typename FuncPtrType, FuncPtrType funcPtr> const char* getFuncPtrName()
template <typename FuncPtrType, FuncPtrType funcPtr> char const* getFuncPtrName()
{
static std::string cached;
if (!cached.empty()) {
return cached.c_str();
}
static const char* fallback = "<UNKNOWN>";
static char const* fallback = "<UNKNOWN>";

const char* sig = __FUNCSIG__;
const char* typePart = getTypeName<FuncPtrType>();
char const* sig = __FUNCSIG__;
char const* typePart = getTypeName<FuncPtrType>();
if (!typePart) {
cached = fallback;
return cached.c_str();
}

const char* typeInThisSig = std::strstr(sig, typePart);
char const* typeInThisSig = std::strstr(sig, typePart);
if (!typeInThisSig) {
cached = fallback;
return cached.c_str();
}

const char* start = typeInThisSig + std::strlen(typePart);
const char* end = std::strrchr(sig, '>');
char const* start = typeInThisSig + std::strlen(typePart);
char const* end = std::strrchr(sig, '>');
if (start && end && end > start) {
cached = std::string(start + 1, end); // 1 for comma
} else {
Expand Down