[Project64] Remove #include <objbase.h> from Common/Trace.h

Source/Common/CriticalSection.cpp

@@ -1,4 +1,7 @@
 #include "stdafx.h"
+#ifdef _WIN32
+#include <Windows.h>
+#endif
 
 CriticalSection::CriticalSection()
 {

Source/Common/HighResTimeStamp.cpp

@@ -1,6 +1,8 @@
 #include "stdafx.h"
 #include "HighResTimeStamp.h"
-#ifndef _WIN32
+#ifdef _WIN32
+#include <Windows.h>
+#else
 #include <math.h>
 #endif
 

Source/Common/Thread.cpp

@@ -1,6 +1,8 @@
 #include "stdafx.h"
 #include "Thread.h"
-#ifndef _WIN32
+#ifdef _WIN32
+#include <Windows.h>
+#else
 #include <unistd.h>
 #include <pthread.h>
 #include <sys/syscall.h>

Source/Common/Trace.h

@@ -11,9 +11,7 @@ enum TraceSeverity
     TraceVerbose = 0x00000006,
 };
 
-#if defined(_WIN32)
+#ifndef _WIN32
-#include <objbase.h>
-#else
 #define __interface struct
 #endif
 

Source/Project64-audio/AudioMain.cpp

@@ -249,6 +249,10 @@ EXPORT void CALL ProcessAList(void)
     WriteTrace(TraceAudioInterface, TraceDebug, "Called");
 }
 
+#ifdef _WIN32
+#include <Windows.h>
+#endif
+
 extern "C" void UseUnregisteredSetting(int /*SettingID*/)
 {
     WriteTrace(TraceAudioInterface, TraceDebug, "Called");

Source/Project64-core/N64System/Mips/FlashRam.cpp

@@ -133,11 +133,7 @@ bool CFlashram::LoadFlashram()
 
     if (!m_File.Open(FileName, (m_ReadOnly ? CFileBase::modeRead : CFileBase::modeReadWrite) | CFileBase::modeNoTruncate | CFileBase::modeCreate))
     {
-#ifdef _WIN32
-        WriteTrace(TraceN64System, TraceError, "Failed to open (%s), ReadOnly = %d, LastError = %X", (const char *)FileName, m_ReadOnly, GetLastError());
-#else
         WriteTrace(TraceN64System, TraceError, "Failed to open (%s), ReadOnly = %d", (const char *)FileName, m_ReadOnly);
-#endif
         g_Notify->DisplayError(GS(MSG_FAIL_OPEN_FLASH));
         return false;
     }

Source/Project64-core/N64System/Mips/Sram.cpp

@@ -36,11 +36,7 @@ bool CSram::LoadSram()
 
     if (!m_File.Open(FileName, (m_ReadOnly ? CFileBase::modeRead : CFileBase::modeReadWrite) | CFileBase::modeNoTruncate | CFileBase::modeCreate))
     {
-#ifdef _WIN32
-        WriteTrace(TraceN64System, TraceError, "Failed to open (%s), ReadOnly = %d, LastError = %X", (const char *)FileName, m_ReadOnly, GetLastError());
-#else
         WriteTrace(TraceN64System, TraceError, "Failed to open (%s), ReadOnly = %d", (const char *)FileName, m_ReadOnly);
-#endif
         return false;
     }
     m_File.SeekToBegin();

Source/Project64-video/Main.cpp

@@ -37,6 +37,7 @@
 #include "ScreenResolution.h"
 
 #ifdef _WIN32
+#include <Windows.h>
 #include <commctrl.h>
 #endif
 

Source/Project64-video/ScreenResolution.cpp

@@ -11,7 +11,9 @@
 #include "ScreenResolution.h"
 #include "settings.h"
 #include "trace.h"
-
+#ifdef _WIN32
+#include <Windows.h>
+#endif
 #ifdef ANDROID
 #include <Common/StdString.h>
 #include <vector>