From 7d93795c10f0843e7da95287f8d116618988a1dd Mon Sep 17 00:00:00 2001
From: Ben Vanik <ben.vanik@gmail.com>
Date: Sun, 19 May 2013 09:29:31 -0700
Subject: [PATCH] Fixing Windows compilation errors.

---
 src/xenia/core/pal_win.cc     | 4 ++--
 src/xenia/core/path_win.cc    | 4 +++-
 src/xenia/platform_includes.h | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/xenia/core/pal_win.cc b/src/xenia/core/pal_win.cc
index 4bc43cdc7..febf87935 100644
--- a/src/xenia/core/pal_win.cc
+++ b/src/xenia/core/pal_win.cc
@@ -22,7 +22,7 @@ xe_pal_win_t* pal;
 
 void xe_pal_dealloc();
 int xe_pal_init(xe_pal_options_t options) {
-  pal = (xe_pal_win_t)xe_calloc(sizeof(pal));
+  pal = (xe_pal_win_t*)xe_calloc(sizeof(xe_pal_win_t));
 
   // Get QPC timing frequency... hopefully stable over the life of the app,
   // but likely not.
@@ -103,7 +103,7 @@ int xe_pal_get_system_info(xe_system_info* out_info) {
         if (buffer[n].ProcessorCore.Flags == 1) {
           // Hyper-threaded.
           // The number of processors is set as bits in ProcessorMask.
-          out_info.processors.logical_count +=
+          out_info->processors.logical_count +=
               CountSetBits(buffer[n].ProcessorMask);
         } else {
           // A real core - just count as one.
diff --git a/src/xenia/core/path_win.cc b/src/xenia/core/path_win.cc
index c5a764dd9..e1361d945 100644
--- a/src/xenia/core/path_win.cc
+++ b/src/xenia/core/path_win.cc
@@ -11,5 +11,7 @@
 
 
 const xechar_t* xe_path_get_tmp(const xechar_t* prefix) {
-  //
+  //
+  XEASSERTALWAYS();
+  return NULL;
 }
diff --git a/src/xenia/platform_includes.h b/src/xenia/platform_includes.h
index 60d81bc2e..9dbf186ec 100644
--- a/src/xenia/platform_includes.h
+++ b/src/xenia/platform_includes.h
@@ -19,6 +19,7 @@
 #endif
 #include <SDKDDKVer.h>
 #include <windows.h>
+#include <ObjBase.h>
 #undef min
 #undef max
 #endif  // WINCE || WIN32