Reformat all the things. Have fun with merge conflicts.

This commit is contained in:
Pierre Bourdon
2016-06-24 10:43:46 +02:00
parent 2115e8a4a6
commit 3570c7f03a
1116 changed files with 187405 additions and 180344 deletions

View File

@ -11,8 +11,8 @@
#include <vector>
#include "Common/CommonTypes.h"
#include "Common/MsgHandler.h"
#include "Common/Logging/Log.h"
#include "Common/MsgHandler.h"
// This class is meant to edit the values in a given Wii SYSCONF file
// It currently does not add/remove/rearrange sections,
@ -22,163 +22,165 @@
enum SysconfType
{
Type_BigArray = 1,
Type_SmallArray,
Type_Byte,
Type_Short,
Type_Long,
Type_Unknown,
Type_Bool
Type_BigArray = 1,
Type_SmallArray,
Type_Byte,
Type_Short,
Type_Long,
Type_Unknown,
Type_Bool
};
struct SSysConfHeader
{
char version[4];
u16 numEntries;
char version[4];
u16 numEntries;
};
struct SSysConfEntry
{
u16 offset;
SysconfType type;
u8 nameLength;
char name[32];
u16 dataLength;
u8* data;
u16 offset;
SysconfType type;
u8 nameLength;
char name[32];
u16 dataLength;
u8* data;
template<class T>
T GetData() { return *(T*)data; }
bool GetArrayData(u8* dest, u16 destSize)
{
if (dest && destSize >= dataLength)
{
memcpy(dest, data, dataLength);
return true;
}
return false;
}
bool SetArrayData(u8* buffer, u16 bufferSize)
{
if (buffer)
{
memcpy(data, buffer, std::min<u16>(bufferSize, dataLength));
return true;
}
return false;
}
template <class T>
T GetData()
{
return *(T*)data;
}
bool GetArrayData(u8* dest, u16 destSize)
{
if (dest && destSize >= dataLength)
{
memcpy(dest, data, dataLength);
return true;
}
return false;
}
bool SetArrayData(u8* buffer, u16 bufferSize)
{
if (buffer)
{
memcpy(data, buffer, std::min<u16>(bufferSize, dataLength));
return true;
}
return false;
}
};
class SysConf
{
public:
SysConf();
~SysConf();
SysConf();
~SysConf();
bool IsValid() { return m_IsValid; }
bool IsValid() { return m_IsValid; }
template <class T>
T GetData(const char* sectionName)
{
if (!m_IsValid)
{
PanicAlertT("Trying to read from invalid SYSCONF");
return 0;
}
template<class T>
T GetData(const char* sectionName)
{
if (!m_IsValid)
{
PanicAlertT("Trying to read from invalid SYSCONF");
return 0;
}
std::vector<SSysConfEntry>::iterator index = m_Entries.begin();
for (; index < m_Entries.end() - 1; ++index)
{
if (strcmp(index->name, sectionName) == 0)
break;
}
if (index == m_Entries.end() - 1)
{
PanicAlertT("Section %s not found in SYSCONF", sectionName);
return 0;
}
std::vector<SSysConfEntry>::iterator index = m_Entries.begin();
for (; index < m_Entries.end() - 1; ++index)
{
if (strcmp(index->name, sectionName) == 0)
break;
}
if (index == m_Entries.end() - 1)
{
PanicAlertT("Section %s not found in SYSCONF", sectionName);
return 0;
}
return index->GetData<T>();
}
return index->GetData<T>();
}
bool GetArrayData(const char* sectionName, u8* dest, u16 destSize)
{
if (!m_IsValid)
{
PanicAlertT("Trying to read from invalid SYSCONF");
return 0;
}
bool GetArrayData(const char* sectionName, u8* dest, u16 destSize)
{
if (!m_IsValid)
{
PanicAlertT("Trying to read from invalid SYSCONF");
return 0;
}
std::vector<SSysConfEntry>::iterator index = m_Entries.begin();
for (; index < m_Entries.end() - 1; ++index)
{
if (strcmp(index->name, sectionName) == 0)
break;
}
if (index == m_Entries.end() - 1)
{
PanicAlertT("Section %s not found in SYSCONF", sectionName);
return 0;
}
std::vector<SSysConfEntry>::iterator index = m_Entries.begin();
for (; index < m_Entries.end() - 1; ++index)
{
if (strcmp(index->name, sectionName) == 0)
break;
}
if (index == m_Entries.end() - 1)
{
PanicAlertT("Section %s not found in SYSCONF", sectionName);
return 0;
}
return index->GetArrayData(dest, destSize);
}
return index->GetArrayData(dest, destSize);
}
bool SetArrayData(const char* sectionName, u8* buffer, u16 bufferSize)
{
if (!m_IsValid)
return false;
bool SetArrayData(const char* sectionName, u8* buffer, u16 bufferSize)
{
if (!m_IsValid)
return false;
std::vector<SSysConfEntry>::iterator index = m_Entries.begin();
for (; index < m_Entries.end() - 1; ++index)
{
if (strcmp(index->name, sectionName) == 0)
break;
}
if (index == m_Entries.end() - 1)
{
PanicAlertT("Section %s not found in SYSCONF", sectionName);
return false;
}
std::vector<SSysConfEntry>::iterator index = m_Entries.begin();
for (; index < m_Entries.end() - 1; ++index)
{
if (strcmp(index->name, sectionName) == 0)
break;
}
if (index == m_Entries.end() - 1)
{
PanicAlertT("Section %s not found in SYSCONF", sectionName);
return false;
}
return index->SetArrayData(buffer, bufferSize);
}
return index->SetArrayData(buffer, bufferSize);
}
template <class T>
bool SetData(const char* sectionName, T newValue)
{
if (!m_IsValid)
return false;
template<class T>
bool SetData(const char* sectionName, T newValue)
{
if (!m_IsValid)
return false;
std::vector<SSysConfEntry>::iterator index = m_Entries.begin();
for (; index < m_Entries.end() - 1; ++index)
{
if (strcmp(index->name, sectionName) == 0)
break;
}
if (index == m_Entries.end() - 1)
{
PanicAlertT("Section %s not found in SYSCONF", sectionName);
return false;
}
std::vector<SSysConfEntry>::iterator index = m_Entries.begin();
for (; index < m_Entries.end() - 1; ++index)
{
if (strcmp(index->name, sectionName) == 0)
break;
}
if (index == m_Entries.end() - 1)
{
PanicAlertT("Section %s not found in SYSCONF", sectionName);
return false;
}
*(T*)index->data = newValue;
return true;
}
*(T*)index->data = newValue;
return true;
}
bool Save();
bool SaveToFile(const std::string& filename);
bool LoadFromFile(const std::string& filename);
bool Reload();
// This function is used when the NAND root is changed
void UpdateLocation();
bool Save();
bool SaveToFile(const std::string& filename);
bool LoadFromFile(const std::string& filename);
bool Reload();
// This function is used when the NAND root is changed
void UpdateLocation();
private:
bool LoadFromFileInternal(FILE* fh);
void GenerateSysConf();
void Clear();
bool LoadFromFileInternal(FILE* fh);
void GenerateSysConf();
void Clear();
std::string m_Filename;
std::string m_FilenameDefault;
std::vector<SSysConfEntry> m_Entries;
bool m_IsValid;
std::string m_Filename;
std::string m_FilenameDefault;
std::vector<SSysConfEntry> m_Entries;
bool m_IsValid;
};