Merge branch 'master' into d3d12

src/xenia/kernel/xam/xam_info.cc

@@ -28,6 +28,9 @@ namespace xam {
 constexpr uint32_t X_LANGUAGE_ENGLISH = 1;
 constexpr uint32_t X_LANGUAGE_JAPANESE = 2;
 
+dword_result_t XamFeatureEnabled(dword_t unk) { return 0; }
+DECLARE_XAM_EXPORT1(XamFeatureEnabled, kNone, kStub);
+
 // Empty stub schema binary.
 uint8_t schema_bin[] = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

third_party/mspack.lua

@@ -2,8 +2,10 @@ group("third_party")
 project("mspack")
   uuid("0881692A-75A1-4E7B-87D8-BB9108CEDEA4")
   kind("StaticLib")
-  language("C")
-
+  language("C++")
+  links({
+    "xenia-base",
+  })
   defines({
     "_LIB",
     "HAVE_CONFIG_H",
@@ -16,6 +18,7 @@ project("mspack")
       "mspack",
   })
   files({
+      "mspack/logging.cc",
       "mspack/lzx.h",
       "mspack/lzxd.c",
       "mspack/mspack.h",

third_party/mspack/logging.cc

@@ -0,0 +1,10 @@
+#include "xenia/base/logging.h"
+
+extern "C" void xenia_log(const char* fmt, ...) {
+  char buffer[128];
+  va_list args;
+  va_start(args, fmt);
+  vsnprintf(buffer, sizeof(buffer), fmt, args);
+  va_end(args);
+  XELOGW("mspack: %s", buffer);
+}

third_party/mspack/lzxd.c

@@ -15,6 +15,11 @@
 #include <system.h>
 #include <lzx.h>
 
+extern void xenia_log(const char*, ...);
+
+#undef D
+#define D(x) do { xenia_log x; } while (0);
+
 /* Microsoft's LZX document (in cab-sdk.exe) and their implementation
  * of the com.ms.util.cab Java package do not concur.
  *