From 7b98c748fa48d2ce7b4e39a8c9181406d460a387 Mon Sep 17 00:00:00 2001 From: Ben Vanik Date: Sun, 22 Jun 2014 21:03:41 -0700 Subject: [PATCH] Fixing double allocation of memory x_x --- src/alloy/runtime/runtime.cc | 7 +------ src/xenia/xbox.h | 1 + 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/src/alloy/runtime/runtime.cc b/src/alloy/runtime/runtime.cc index db5e52d7d..7be29dce1 100644 --- a/src/alloy/runtime/runtime.cc +++ b/src/alloy/runtime/runtime.cc @@ -55,11 +55,6 @@ int Runtime::Initialize(Frontend* frontend, Backend* backend) { // Must be initialized by subclass before calling into this. XEASSERTNOTNULL(memory_); - int result = memory_->Initialize(); - if (result) { - return result; - } - // Create debugger first. Other types hook up to it. debugger_ = new Debugger(this); @@ -102,7 +97,7 @@ int Runtime::Initialize(Frontend* frontend, Backend* backend) { backend_ = backend; frontend_ = frontend; - result = backend_->Initialize(); + int result = backend_->Initialize(); if (result) { return result; } diff --git a/src/xenia/xbox.h b/src/xenia/xbox.h index 9f3a6b071..85ad57a41 100644 --- a/src/xenia/xbox.h +++ b/src/xenia/xbox.h @@ -63,6 +63,7 @@ typedef uint32_t X_RESULT; #define X_HRESULT_FROM_WIN32(x) ((X_RESULT)(x) <= 0 ? ((X_RESULT)(x)) : ((X_RESULT) (((x) & 0x0000FFFF) | (X_FACILITY_WIN32 << 16) | 0x80000000))) #define X_ERROR_SUCCESS X_HRESULT_FROM_WIN32(0x00000000L) #define X_ERROR_ACCESS_DENIED X_HRESULT_FROM_WIN32(0x00000005L) +#define X_ERROR_NO_MORE_FILES X_HRESULT_FROM_WIN32(0x00000018L) #define X_ERROR_INSUFFICIENT_BUFFER X_HRESULT_FROM_WIN32(0x0000007AL) #define X_ERROR_BAD_ARGUMENTS X_HRESULT_FROM_WIN32(0x000000A0L) #define X_ERROR_BUSY X_HRESULT_FROM_WIN32(0x000000AAL)