[*] Merge branches (includes fixes)

This commit is contained in:
Reece Wilson 2022-06-12 19:23:18 +01:00
parent 1d943af9b9
commit 8bd7f698e3
3 changed files with 15 additions and 11 deletions

View File

@ -15,16 +15,16 @@ namespace Aurora::Process
{
AuString moduleName;
AuString modulePath;
AuUInt moduleBase;
AuUInt origVa;
AuUInt moduleBase {};
AuUInt origVa {};
};
struct PageTable
{
bool NX;
bool writable;
bool readable;
bool acSanity;
bool NX {};
bool writable {};
bool readable {};
bool acSanity {};
};
static const auto kSectionNameStack = "STACK";
@ -33,10 +33,10 @@ namespace Aurora::Process
struct Section
{
AuUInt baseVa;
AuUInt origVa;
AuUInt fsOff;
AuUInt size;
AuUInt baseVa {};
AuUInt origVa {};
AuUInt fsOff {};
AuUInt size {};
PageTable pt;
AuString name;
AuWPtr<PublicModule> moduleMeta;

View File

@ -214,6 +214,8 @@ namespace Aurora
AuString supportPublic {"https://git.reece.sx/AuroraSupport/AuroraRuntime/issues"};
AuString supportInternal {"https://jira.reece.sx"};
bool consoleTTYHasPerAppHistory {true};
};
struct LoggerConfig
@ -262,6 +264,8 @@ namespace Aurora
struct DebugConfig
{
bool nonshipPrecachesSymbols {true};
bool enableWin32RootExceptionHandler {true};
bool enableInjectedExceptionHandler {true};
};
struct RuntimeStartInfo

View File

@ -138,7 +138,7 @@ namespace Aurora::Async
AuSPtr<IWorkItem> WorkItem::AddDelayTime(AuUInt32 ms)
{
this->delayTimeNs_ += AuUInt64(ms) * AuMSToNS<AuUInt64>(ms);
this->delayTimeNs_ += AuMSToNS<AuUInt64>(ms);
return AU_SHARED_FROM_THIS;
}