add headers

stepmania/src/ProfileManager.cpp

@@ -20,6 +20,10 @@
 #include "SongManager.h"
 #include "GameState.h"
 
+#ifdef _WINDOWS
+#include "windows.h"
+#endif
+
 ProfileManager*	PROFILEMAN = NULL;	// global and accessable from anywhere in our program
 
 

stepmania/src/RageLog.cpp

@@ -19,6 +19,9 @@
 #include "RageFile.h"
 #include <time.h>
 #include "ProductInfo.h"
+#if defined(WIN32) && !defined(_XBOX)
+#include "windows.h"
+#endif
 
 RageLog* LOG;		// global and accessable from anywhere in the program
 

stepmania/src/RageUtil.cpp

@@ -147,6 +147,7 @@ CString vssprintf( const char *fmt, va_list argList)
 }
 
 #ifdef WIN32
+#include "windows.h"
 #ifdef _XBOX
 #include "D3DX8Core.h"
 #else

stepmania/src/RageUtil_CharConversions.cpp

@@ -6,6 +6,8 @@
 
 #if defined(_WINDOWS)
 
+#include "windows.h"
+
 /* Convert from the given codepage to UTF-8.  Return true if successful. */
 static bool CodePageConvert(CString &txt, int cp)
 {

stepmania/src/RageUtil_FileDB.cpp

@@ -15,6 +15,8 @@
 #if !defined(WIN32)
 #include <dirent.h>
 #include <fcntl.h>
+#else
+#include "windows.h"
 #endif
 
 

stepmania/src/StepMania.h

@@ -22,6 +22,7 @@ void SaveGamePrefsToDisk();
 void ChangeCurrentGame( Game g );
 
 #if defined(WIN32)
+#include "windows.h"
 extern HWND g_hWndMain;
 #endif
 

stepmania/src/arch/Sound/DSoundHelpers.cpp

@@ -3,6 +3,7 @@
 #include "../../RageUtil.h"
 #include "../../RageLog.h"
 
+#include <mmsystem.h>
 #define DIRECTSOUND_VERSION 0x0700
 #include <dsound.h>
 

stepmania/src/arch/Sound/DSoundHelpers.h

@@ -2,6 +2,7 @@
 #define DSOUND_HELPERS 1
 
 #include "SDL.h"
+#include "windows.h"
 
 struct IDirectSound;
 struct IDirectSoundBuffer;

stepmania/src/arch/Sound/RageSoundDriver_WaveOut.h

@@ -3,6 +3,7 @@
 
 #include "RageSoundDriver.h"
 #include "RageThreads.h"
+#include "windows.h"
 #include "Mmsystem.h"
 
 class RageSound_WaveOut: public RageSoundDriver

stepmania/src/archutils/Win32/AppInstance.h

@@ -1,6 +1,8 @@
 #ifndef APP_INSTANCE_H
 #define APP_INSTANCE_H
 
+#include "windows.h"
+
 /* Win32 only: get an HINSTANCE; used for starting dialog boxes. */
 class AppInstance
 {

stepmania/src/archutils/Win32/DebugInfoHunt.cpp

@@ -3,6 +3,8 @@
 #include "RageLog.h"
 #include "RageUtil.h"
 #include "VideoDriverInfo.h"
+#include "windows.h"
+#include <mmsystem.h>
 
 
 void LogVideoDriverInfo( VideoDriverInfo info )

stepmania/src/archutils/Win32/GotoURL.cpp

@@ -1,5 +1,7 @@
 #include "global.h"
 #include "GotoURL.h"
+#include "windows.h"
+#include "shellapi.h"
 
 LONG GetRegKey(HKEY key, CString subkey, LPTSTR retdata)
 {
@@ -37,11 +39,11 @@ bool GotoURL(CString url)
 	if (GetRegKey(HKEY_CLASSES_ROOT,key,key) != ERROR_SUCCESS)
 		return false;
 
-	char *pos = _tcsstr(key, "\"%1\"");
+	char *pos = strstr( key, "\"%1\"" );
 	if (pos == NULL)
 	{
 		// No quotes found.  Check for %1 without quotes
-		pos = strstr(key, _T("%1"));
+		pos = strstr( key, "%1" );
 		if (pos == NULL)                   
 			pos = key+lstrlen(key)-1; // No parameter.
 		else

stepmania/src/archutils/Win32/RestartProgram.cpp

@@ -1,5 +1,6 @@
 #include "global.h"
 #include "RestartProgram.h"
+#include "windows.h"
 
 void Win32RestartProgram()
 {

stepmania/src/archutils/Win32/USB.cpp

@@ -9,10 +9,7 @@
 extern "C" {
 #include "ddk/setupapi.h"
 /* Quiet header warning: */
-#pragma warning( push )
-#pragma warning (disable : 4201)
 #include "ddk/hidsdi.h"
-#pragma warning( pop )
 }
 
 static CString GetUSBDevicePath (int num)

stepmania/src/archutils/Win32/USB.h

@@ -2,6 +2,7 @@
 #define WIN32_USB_H
 
 #include <vector>
+#include "windows.h"
 
 /* The API for Windows device I/O is obscenely horrible, so encapsulate it. */
 class WindowsFileIO

stepmania/src/archutils/Win32/VideoDriverInfo.cpp

@@ -2,6 +2,7 @@
 #include "VideoDriverInfo.h"
 #include "RageUtil.h"
 #include "RageLog.h"
+#include "windows.h"
 
 static void GetRegSubKeys( HKEY hKey, vector<CString> &lst )
 {