Fixed compiling on Windows Mobile SDK 5.0 with Visual Studio 2008

VisualCE/SDL.sln

 
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual Studio 2005
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL", "SDL\SDL.vcproj", "{C598024D-8030-4F9C-AB76-69BF4CA0645F}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDLmain", "SDLmain\SDLmain.vcproj", "{5AC88B84-5EAA-4C1E-948D-332DA34227F6}"

VisualCE/SDLMain/SDLmain.vcproj

 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9.00"
 	Name="SDLmain"
 	ProjectGUID="{5AC88B84-5EAA-4C1E-948D-332DA34227F6}"
 	RootNamespace="SDLmain"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -88,6 +89,9 @@
 				SuppressStartupBanner="true"
 				OutputFile="$(PlatformName)\$(ConfigurationName)/SDLmain.bsc"
 			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
 			<Tool
 				Name="VCCodeSignTool"
 			/>
@@ -171,6 +175,9 @@
 				SuppressStartupBanner="true"
 				OutputFile="$(PlatformName)\$(ConfigurationName)/SDLmain.bsc"
 			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
 			<Tool
 				Name="VCCodeSignTool"
 			/>
@@ -254,6 +261,9 @@
 				SuppressStartupBanner="true"
 				OutputFile="$(PlatformName)\$(ConfigurationName)/SDLmain.bsc"
 			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
 			<Tool
 				Name="VCCodeSignTool"
 			/>
@@ -337,6 +347,9 @@
 				SuppressStartupBanner="true"
 				OutputFile="$(PlatformName)\$(ConfigurationName)/SDLmain.bsc"
 			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
 			<Tool
 				Name="VCCodeSignTool"
 			/>
@@ -420,6 +433,9 @@
 				SuppressStartupBanner="true"
 				OutputFile="$(PlatformName)\$(ConfigurationName)/SDLmain.bsc"
 			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
 			<Tool
 				Name="VCCodeSignTool"
 			/>
@@ -506,6 +522,9 @@
 				SuppressStartupBanner="true"
 				OutputFile="$(PlatformName)\$(ConfigurationName)/SDLmain.bsc"
 			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
 			<Tool
 				Name="VCCodeSignTool"
 			/>
@@ -530,62 +549,8 @@
 			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
 			>
 			<File
-				RelativePath="..\..\src\main\win32\SDL_win32_main.c"
-				>
-				<FileConfiguration
-					Name="Debug|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Debug|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Smartphone 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Pocket PC 2003 (ARMV4)"
-					>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
-				<FileConfiguration
-					Name="Release|Windows Mobile 5.0 Pocket PC SDK (ARMV4I)"
+				RelativePath="..\..\src\main\windows\SDL_windows_main.c"
 				>
-					<Tool
-						Name="VCCLCompilerTool"
-						AdditionalIncludeDirectories=""
-						UsePrecompiledHeader="0"
-					/>
-				</FileConfiguration>
 			</File>
 		</Filter>
 		<Filter

VisualCE/loopwave/loopwave.vcproj

 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9.00"
 	Name="loopwave"
 	ProjectGUID="{6F642636-CB11-4DC7-855E-27FE1744003A}"
 	RootNamespace="loopwave"
 	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -74,6 +75,8 @@
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/loopwave.pdb"
 				SubSystem="0"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -84,6 +87,9 @@
 			<Tool
 				Name="VCBscMakeTool"
 			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
 			<Tool
 				Name="VCCodeSignTool"
 			/>
@@ -125,7 +131,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
-				AdditionalIncludeDirectories="..\..\nclude"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_WINDOWS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
@@ -154,6 +160,8 @@
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/loopwave.pdb"
 				SubSystem="0"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -164,6 +172,9 @@
 			<Tool
 				Name="VCBscMakeTool"
 			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
 			<Tool
 				Name="VCCodeSignTool"
 			/>
@@ -236,6 +247,8 @@
 				SubSystem="0"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -246,6 +259,9 @@
 			<Tool
 				Name="VCBscMakeTool"
 			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
 			<Tool
 				Name="VCCodeSignTool"
 			/>
@@ -317,6 +333,8 @@
 				SubSystem="0"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -327,6 +345,9 @@
 			<Tool
 				Name="VCBscMakeTool"
 			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
 			<Tool
 				Name="VCCodeSignTool"
 			/>

VisualCE/testalpha/testalpha.vcproj

 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9.00"
 	Name="testalpha"
 	ProjectGUID="{DF401CB3-6F70-4485-996B-B7C357CF7EE7}"
 	RootNamespace="testalpha"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -94,6 +95,8 @@
 				StackCommitSize="4096"
 				EntryPointSymbol="WinMainCRTStartup"
 				BaseAddress="0x00010000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -106,6 +109,9 @@
 				SuppressStartupBanner="true"
 				OutputFile="$(PlatformName)\$(ConfigurationName)/testalpha.bsc"
 			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
 			<Tool
 				Name="VCCodeSignTool"
 			/>
@@ -195,6 +201,8 @@
 				StackCommitSize="4096"
 				EntryPointSymbol="WinMainCRTStartup"
 				BaseAddress="0x00010000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -207,6 +215,9 @@
 				SuppressStartupBanner="true"
 				OutputFile="$(PlatformName)\$(ConfigurationName)/testalpha.bsc"
 			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
 			<Tool
 				Name="VCCodeSignTool"
 			/>
@@ -300,6 +311,8 @@
 				LinkTimeCodeGeneration="1"
 				EntryPointSymbol="WinMainCRTStartup"
 				BaseAddress="0x00010000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -312,6 +325,9 @@
 				SuppressStartupBanner="true"
 				OutputFile="$(PlatformName)\$(ConfigurationName)/testalpha.bsc"
 			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
 			<Tool
 				Name="VCCodeSignTool"
 			/>
@@ -400,6 +416,8 @@
 				StackCommitSize="4096"
 				EntryPointSymbol="WinMainCRTStartup"
 				BaseAddress="0x00010000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -412,6 +430,9 @@
 				SuppressStartupBanner="true"
 				OutputFile="$(PlatformName)\$(ConfigurationName)/testalpha.bsc"
 			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
 			<Tool
 				Name="VCCodeSignTool"
 			/>
@@ -500,6 +521,8 @@
 				StackCommitSize="4096"
 				EntryPointSymbol="WinMainCRTStartup"
 				BaseAddress="0x00010000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -512,6 +535,9 @@
 				SuppressStartupBanner="true"
 				OutputFile="$(PlatformName)\$(ConfigurationName)/testalpha.bsc"
 			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
 			<Tool
 				Name="VCCodeSignTool"
 			/>
@@ -600,6 +626,8 @@
 				StackCommitSize="4096"
 				EntryPointSymbol="WinMainCRTStartup"
 				BaseAddress="0x00010000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -612,6 +640,9 @@
 				SuppressStartupBanner="true"
 				OutputFile="$(PlatformName)\$(ConfigurationName)/testalpha.bsc"
 			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
 			<Tool
 				Name="VCCodeSignTool"
 			/>

VisualCE/testtimer/testtimer.vcproj

 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9.00"
 	Name="testtimer"
 	ProjectGUID="{D482D7EE-6FF0-4254-9027-C59F8F03AB1F}"
 	RootNamespace="testtimer"
 	Keyword="Win32Proj"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -74,6 +75,8 @@
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/testtimer.pdb"
 				SubSystem="0"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -84,6 +87,9 @@
 			<Tool
 				Name="VCBscMakeTool"
 			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
 			<Tool
 				Name="VCCodeSignTool"
 			/>
@@ -125,6 +131,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="0"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;DEBUG;_WINDOWS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
 				MinimalRebuild="true"
 				RuntimeLibrary="1"
@@ -153,6 +160,8 @@
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="$(OutDir)/testtimer.pdb"
 				SubSystem="0"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -163,6 +172,9 @@
 			<Tool
 				Name="VCBscMakeTool"
 			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
 			<Tool
 				Name="VCCodeSignTool"
 			/>
@@ -235,6 +247,8 @@
 				SubSystem="0"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -245,6 +259,9 @@
 			<Tool
 				Name="VCBscMakeTool"
 			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
 			<Tool
 				Name="VCCodeSignTool"
 			/>
@@ -286,6 +303,7 @@
 				Name="VCCLCompilerTool"
 				ExecutionBucket="7"
 				Optimization="2"
+				AdditionalIncludeDirectories="..\..\include"
 				PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;$(PLATFORMDEFINES);WINCE;_WINDOWS;$(ARCHFAM);$(_ARCHFAM_);_UNICODE;UNICODE"
 				RuntimeLibrary="0"
 				UsePrecompiledHeader="0"
@@ -315,6 +333,8 @@
 				SubSystem="0"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -325,6 +345,9 @@
 			<Tool
 				Name="VCBscMakeTool"
 			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
 			<Tool
 				Name="VCCodeSignTool"
 			/>

VisualCE/testwin/testwin.vcproj

 <?xml version="1.0" encoding="windows-1251"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="8,00"
+	Version="9.00"
 	Name="testwin"
 	ProjectGUID="{DC516978-88CB-4F9A-A39A-C351C258613B}"
 	RootNamespace="testwin"
+	TargetFrameworkVersion="131072"
 	>
 	<Platforms>
 		<Platform
@@ -93,6 +94,8 @@
 				StackCommitSize="4096"
 				EntryPointSymbol="WinMainCRTStartup"
 				BaseAddress="0x00010000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -105,6 +108,9 @@
 				SuppressStartupBanner="true"
 				OutputFile="$(PlatformName)\$(ConfigurationName)/testwin.bsc"
 			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
 			<Tool
 				Name="VCCodeSignTool"
 			/>
@@ -194,6 +200,8 @@
 				StackCommitSize="4096"
 				EntryPointSymbol="WinMainCRTStartup"
 				BaseAddress="0x00010000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -206,6 +214,9 @@
 				SuppressStartupBanner="true"
 				OutputFile="$(PlatformName)\$(ConfigurationName)/testwin.bsc"
 			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
 			<Tool
 				Name="VCCodeSignTool"
 			/>
@@ -295,6 +306,8 @@
 				StackCommitSize="4096"
 				EntryPointSymbol="WinMainCRTStartup"
 				BaseAddress="0x00010000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -307,6 +320,9 @@
 				SuppressStartupBanner="true"
 				OutputFile="$(PlatformName)\$(ConfigurationName)/testwin.bsc"
 			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
 			<Tool
 				Name="VCCodeSignTool"
 			/>
@@ -395,6 +411,8 @@
 				StackCommitSize="4096"
 				EntryPointSymbol="WinMainCRTStartup"
 				BaseAddress="0x00010000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -407,6 +425,9 @@
 				SuppressStartupBanner="true"
 				OutputFile="$(PlatformName)\$(ConfigurationName)/testwin.bsc"
 			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
 			<Tool
 				Name="VCCodeSignTool"
 			/>
@@ -495,6 +516,8 @@
 				StackCommitSize="4096"
 				EntryPointSymbol="WinMainCRTStartup"
 				BaseAddress="0x00010000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -507,6 +530,9 @@
 				SuppressStartupBanner="true"
 				OutputFile="$(PlatformName)\$(ConfigurationName)/testwin.bsc"
 			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
 			<Tool
 				Name="VCCodeSignTool"
 			/>
@@ -595,6 +621,8 @@
 				StackCommitSize="4096"
 				EntryPointSymbol="WinMainCRTStartup"
 				BaseAddress="0x00010000"
+				RandomizedBaseAddress="1"
+				DataExecutionPrevention="0"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -607,6 +635,9 @@
 				SuppressStartupBanner="true"
 				OutputFile="$(PlatformName)\$(ConfigurationName)/testwin.bsc"
 			/>
+			<Tool
+				Name="VCFxCopTool"
+			/>
 			<Tool
 				Name="VCCodeSignTool"
 			/>

include/SDL_assert.h

@@ -50,7 +50,7 @@ on the assertion line and not in some random guts of SDL, and so each
 assert can have unique static variables associated with it.
 */
 
-#if defined(_MSC_VER)
+#if defined(_MSC_VER) && !defined(_WIN32_WCE)
 #include <intrin.h>
     #define SDL_TriggerBreakpoint() __debugbreak()
 #elif (defined(__GNUC__) && ((__i386__) || (__x86_64__)))

include/SDL_atomic.h

@@ -58,7 +58,7 @@
 
 /* Need to do this here because intrin.h has C++ code in it */
 /* Visual Studio 2005 has a bug where intrin.h conflicts with winnt.h */
-#if defined(_MSC_VER) && (_MSC_VER >= 1500)
+#if defined(_MSC_VER) && (_MSC_VER >= 1500) && !defined(_WIN32_WCE)
 #include <intrin.h>
 #define HAVE_MSC_ATOMICS
 #endif

include/SDL_compat.h

@@ -65,7 +65,7 @@ extern "C" {
 /*@{*/
 
 /* Platform */
-#ifdef __WINDOWS__
+#ifdef __WIN32__
 #undef __WIN32__
 #define __WIN32__   1
 #endif

include/SDL_config_windows.h

@@ -20,8 +20,8 @@
     slouken@libsdl.org
 */
 
-#ifndef _SDL_config_windows2_h
-#define _SDL_config_windows2_h
+#ifndef _SDL_config_windows_h
+#define _SDL_config_windows_h
 
 #include "SDL_platform.h"
 
@@ -178,7 +178,11 @@ typedef unsigned int uintptr_t;
 #define SDL_VIDEO_DRIVER_DUMMY	1
 #define SDL_VIDEO_DRIVER_WINDOWS	1
 
+#ifdef _WIN32_WCE
+#define SDL_VIDEO_RENDER_GAPI	1
+#else
 #define SDL_VIDEO_RENDER_D3D	1
+#endif
 #define SDL_VIDEO_RENDER_GDI	1
 
 /* Enable OpenGL support */
@@ -196,4 +200,4 @@ typedef unsigned int uintptr_t;
 #define SDL_ASSEMBLY_ROUTINES	1
 #endif
 
-#endif /* _SDL_config_windows2_h */
+#endif /* _SDL_config_windows_h */

include/SDL_main.h

@@ -31,7 +31,7 @@
  *  Redefine main() on some platforms so that it is called by SDL.
  */
 
-#if defined(__WINDOWS__) || \
+#if defined(__WIN32__) || \
     (defined(__MWERKS__) && !defined(__BEOS__)) || \
     defined(__SYMBIAN32__) || defined(__IPHONEOS__) || \
     defined(__ANDROID__)
@@ -66,7 +66,7 @@ extern C_LINKAGE int SDL_main(int argc, char *argv[]);
 
 
 /* From the SDL library code -- needed for registering the app on Win32 */
-#ifdef __WINDOWS__
+#ifdef __WIN32__
 
 #include "begin_code.h"
 #ifdef __cplusplus

include/SDL_opengl.h

@@ -31,7 +31,7 @@
 
 #include "SDL_config.h"
 
-#ifdef __WINDOWS__
+#ifdef __WIN32__
 #define WIN32_LEAN_AND_MEAN
 #ifndef NOMINMAX
 #define NOMINMAX                /* Don't defined min() and max() */

include/SDL_platform.h

@@ -125,8 +125,8 @@
 #define __SOLARIS__	1
 #endif
 #if defined(WIN32) || defined(_WIN32)
-#undef __WINDOWS__
-#define __WINDOWS__	1
+#undef __WIN32__
+#define __WIN32__	1
 #endif
 
 #if defined(__NDS__)

include/SDL_rwops.h

@@ -83,7 +83,7 @@ typedef struct SDL_RWops
     Uint32 type;
     union
     {
-#ifdef __WINDOWS__
+#ifdef __WIN32__
         struct
         {
             SDL_bool append;

include/SDL_thread.h

@@ -55,7 +55,7 @@ typedef unsigned long SDL_threadID;
  */
 typedef int (SDLCALL * SDL_ThreadFunction) (void *data);
 
-#if defined(__WINDOWS__) && !defined(HAVE_LIBC)
+#if defined(__WIN32__) && !defined(HAVE_LIBC)
 /**
  *  \file SDL_thread.h
  *  

include/begin_code.h

@@ -42,7 +42,7 @@
 #  else
 #   define DECLSPEC	__declspec(export)
 #  endif
-# elif defined(__WINDOWS__)
+# elif defined(__WIN32__)
 #  ifdef __BORLANDC__
 #   ifdef BUILD_SDL
 #    define DECLSPEC
@@ -63,7 +63,7 @@
 
 /* By default SDL uses the C calling convention */
 #ifndef SDLCALL
-#if defined(__WINDOWS__) && !defined(__GNUC__)
+#if defined(__WIN32__) && !defined(__GNUC__)
 #define SDLCALL __cdecl
 #else
 #define SDLCALL

src/SDL.c

@@ -39,7 +39,7 @@ extern void SDL_StartTicks(void);
 extern int SDL_TimerInit(void);
 extern void SDL_TimerQuit(void);
 #endif
-#if defined(__WINDOWS__)
+#if defined(__WIN32__)
 extern int SDL_HelperWindowCreate(void);
 extern int SDL_HelperWindowDestroy(void);
 #endif
@@ -147,7 +147,7 @@ SDL_Init(Uint32 flags)
     /* Clear the error message */
     SDL_ClearError();
 
-#if defined(__WINDOWS__)
+#if defined(__WIN32__)
     if (SDL_HelperWindowCreate() < 0) {
         return -1;
     }
@@ -220,7 +220,7 @@ SDL_Quit(void)
     fflush(stdout);
 #endif
 
-#if defined(__WINDOWS__)
+#if defined(__WIN32__)
     SDL_HelperWindowDestroy();
 #endif
     SDL_QuitSubSystem(SDL_INIT_EVERYTHING);
@@ -312,7 +312,7 @@ SDL_GetPlatform()
     return "RISC OS";
 #elif __SOLARIS__
     return "Solaris";
-#elif __WINDOWS__
+#elif __WIN32__
 #ifdef _WIN32_WCE
     return "Windows CE";
 #else
@@ -325,7 +325,7 @@ SDL_GetPlatform()
 #endif
 }
 
-#if defined(__WINDOWS__)
+#if defined(__WIN32__)
 
 #if !defined(HAVE_LIBC) || (defined(__WATCOMC__) && defined(BUILD_DLL))
 /* Need to include DllMain() on Watcom C for some reason.. */
@@ -347,6 +347,6 @@ _DllMainCRTStartup(HANDLE hModule,
 }
 #endif /* building DLL with Watcom C */
 
-#endif /* __WINDOWS__ */
+#endif /* __WIN32__ */
 
 /* vi: set ts=4 sw=4 expandtab: */

src/SDL_assert.c

@@ -26,9 +26,19 @@
 #include "SDL_assert_c.h"
 #include "video/SDL_sysvideo.h"
 
-#ifdef __WINDOWS__
+#ifdef __WIN32__
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
+
+#ifndef WS_OVERLAPPEDWINDOW
+#define WS_OVERLAPPEDWINDOW 0
+#endif
+
+#ifdef UNICODE
+#define WIN_UTF8ToString(S) (WCHAR *)SDL_iconv_string("UCS-2", "UTF-8", (char *)S, SDL_strlen(S)+1)
+#else
+#define WIN_UTF8ToString(S) SDL_iconv_string("ASCII", "UTF-8", (char *)S, SDL_strlen(S)+1)
+#endif
 #else  /* fprintf, _exit(), etc. */
 #include <stdio.h>
 #include <stdlib.h>
@@ -57,11 +67,12 @@ debug_print(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
 static void
 debug_print(const char *fmt, ...)
 {
-#ifdef __WINDOWS__
+#ifdef __WIN32__
     /* Format into a buffer for OutputDebugStringA(). */
     char buf[1024];
     char *startptr;
     char *ptr;
+    LPTSTR tstr;
     int len;
     va_list ap;
     va_start(ap, fmt);
@@ -78,15 +89,19 @@ debug_print(const char *fmt, ...)
     for (ptr = startptr; *ptr; ptr++) {
         if (*ptr == '\n') {
             *ptr = '\0';
-            OutputDebugStringA(startptr);
-            OutputDebugStringA("\r\n");
+            tstr = WIN_UTF8ToString(startptr);
+            OutputDebugString(tstr);
+            SDL_free(tstr);
+            OutputDebugString(TEXT("\r\n"));
             startptr = ptr+1;
         }
     }
 
     /* catch that last piece if it didn't have a newline... */
     if (startptr != ptr) {
-        OutputDebugStringA(startptr);
+        tstr = WIN_UTF8ToString(startptr);
+        OutputDebugString(tstr);
+        SDL_free(tstr);
     }
 #else
     /* Unix has it easy. Just dump it to stderr. */
@@ -99,7 +114,7 @@ debug_print(const char *fmt, ...)
 }
 
 
-#ifdef __WINDOWS__
+#ifdef __WIN32__
 static SDL_assert_state SDL_Windows_AssertChoice = SDL_ASSERTION_ABORT;
 static const SDL_assert_data *SDL_Windows_AssertData = NULL;
 
@@ -113,6 +128,7 @@ SDL_Assertion_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
             /* !!! FIXME: all this code stinks. */
             const SDL_assert_data *data = SDL_Windows_AssertData;
             char buf[1024];
+            LPTSTR tstr;
             const int w = 100;
             const int h = 25;
             const int gap = 10;
@@ -121,14 +137,14 @@ SDL_Assertion_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
             int len;
             int i;
             static const struct { 
-                const char *name;
+                LPCTSTR name;
                 SDL_assert_state state;
             } buttons[] = {
-                {"Abort", SDL_ASSERTION_ABORT },
-                {"Break", SDL_ASSERTION_BREAK },
-                {"Retry", SDL_ASSERTION_RETRY },
-                {"Ignore", SDL_ASSERTION_IGNORE },
-                {"Always Ignore", SDL_ASSERTION_ALWAYS_IGNORE },
+                {TEXT("Abort"), SDL_ASSERTION_ABORT },
+                {TEXT("Break"), SDL_ASSERTION_BREAK },
+                {TEXT("Retry"), SDL_ASSERTION_RETRY },
+                {TEXT("Ignore"), SDL_ASSERTION_IGNORE },
+                {TEXT("Always Ignore"), SDL_ASSERTION_ALWAYS_IGNORE },
             };
 
             len = (int) SDL_snprintf(buf, sizeof (buf), 
@@ -140,14 +156,16 @@ SDL_Assertion_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
                 buf[sizeof (buf) - 1] = '\0';
             }
 
-            CreateWindowA("STATIC", buf,
+            tstr = WIN_UTF8ToString(buf);
+            CreateWindow(TEXT("STATIC"), tstr,
                          WS_VISIBLE | WS_CHILD | SS_LEFT,
                          x, y, 550, 100,
                          hwnd, (HMENU) 1, NULL, NULL);
+            SDL_free(tstr);
             y += 110;
 
             for (i = 0; i < (sizeof (buttons) / sizeof (buttons[0])); i++) {
-                CreateWindowA("BUTTON", buttons[i].name,
+                CreateWindow(TEXT("BUTTON"), buttons[i].name,
                          WS_VISIBLE | WS_CHILD,
                          x, y, w, h,
                          hwnd, (HMENU) buttons[i].state, NULL, NULL);
@@ -248,7 +266,7 @@ static void SDL_GenerateAssertionReport(void)
 
 static void SDL_ExitProcess(int exitcode)
 {
-#ifdef __WINDOWS__
+#ifdef __WIN32__
     ExitProcess(42);
 #else
     _exit(42);
@@ -311,7 +329,7 @@ SDL_PromptAssertion(const SDL_assert_data *data, void *userdata)
 
     /* platform-specific UI... */
 
-#ifdef __WINDOWS__
+#ifdef __WIN32__
     state = SDL_PromptAssertion_windows(data);
 
 #elif __MACOSX__

src/atomic/SDL_spinlock.c

@@ -26,8 +26,13 @@
 
 /* Don't do the check for Visual Studio 2005, it's safe here */
 #if defined(_MSC_VER)
+#ifdef _WIN32_WCE
+#define WIN32_LEAN_AND_MEAN
+#include <windows.h>
+#else
 #include <intrin.h>
 #endif
+#endif /* _MSC_VER */
 
 /* This function is where all the magic happens... */
 SDL_bool

src/audio/SDL_audio.c

@@ -971,7 +971,7 @@ open_audio_device(const char *devname, int iscapture,
     if (!current_audio.impl.ProvidesOwnCallbackThread) {
         /* Start the audio thread */
 /* !!! FIXME: this is nasty. */
-#if (defined(__WINDOWS__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC)
+#if (defined(__WIN32__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC)
 #undef SDL_CreateThread
         device->thread = SDL_CreateThread(SDL_RunAudio, device, NULL, NULL);
 #else

src/cpuinfo/SDL_cpuinfo.c

@@ -38,7 +38,7 @@
 #include <signal.h>
 #include <setjmp.h>
 #endif
-#ifdef __WINDOWS__
+#ifdef __WIN32__
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #endif
@@ -319,7 +319,7 @@ SDL_GetCPUCount()
             sysctlbyname("hw.ncpu", &SDL_CPUCount, &size, NULL, 0);
         }
 #endif
-#ifdef __WINDOWS__
+#ifdef __WIN32__
         if (SDL_CPUCount <= 0) {
             SYSTEM_INFO info;
             GetSystemInfo(&info);

src/events/SDL_events.c

@@ -170,7 +170,7 @@ SDL_StartEventThread(Uint32 flags)
 
         /* The event thread will handle timers too */
         SDL_SetTimerThreaded(2);
-#if (defined(__WINDOWS__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC)
+#if (defined(__WIN32__) && !defined(_WIN32_WCE)) && !defined(HAVE_LIBC)
 #undef SDL_CreateThread
         SDL_EventThread =
             SDL_CreateThread(SDL_GobbleEvents, NULL, NULL, NULL);

src/events/SDL_sysevents.h

@@ -29,7 +29,7 @@
 #define MUST_THREAD_EVENTS
 #endif
 
-#ifdef __WINDOWS__              /* Windows doesn't allow a separate event thread */
+#ifdef __WIN32__              /* Windows doesn't allow a separate event thread */
 #define CANT_THREAD_EVENTS
 #endif
 

src/file/SDL_rwops.c

@@ -37,7 +37,7 @@
 #include <fat.h>
 #endif /* __NDS__ */
 
-#ifdef __WINDOWS__
+#ifdef __WIN32__
 
 /* Functions to read/write Win32 API file pointers */
 /* Will not use it on WinCE because stdio is buffered, it means
@@ -295,7 +295,7 @@ windows_file_close(SDL_RWops * context)
     }
     return (0);
 }
-#endif /* __WINDOWS__ */
+#endif /* __WIN32__ */
 
 #ifdef HAVE_STDIO_H
 
@@ -449,7 +449,7 @@ SDL_RWFromFile(const char *file, const char *mode)
         SDL_SetError("SDL_RWFromFile(): No file or no mode specified");
         return NULL;
     }
-#if defined(__WINDOWS__)
+#if defined(__WIN32__)
     rwops = SDL_AllocRW();
     if (!rwops)
         return NULL;            /* SDL_SetError already setup by SDL_AllocRW() */

src/libm/math_private.h

@@ -19,7 +19,7 @@
 
 /*#include <endian.h>*/
 #include "SDL_endian.h"
-#include <sys/types.h>
+/*#include <sys/types.h>*/
 
 #define attribute_hidden
 #define libm_hidden_proto(x)

src/loadso/windows/SDL_sysloadso.c

@@ -61,7 +61,7 @@ SDL_LoadObject(const char *sofile)
     SDL_free(sofile_t);
     SDL_free(errbuf_t);
 
-#else /*if defined(__WINDOWS__) */
+#else /*if defined(__WIN32__) */
     char errbuf[512];
 
     handle = (void *) LoadLibrary(sofile);

src/power/windows/SDL_syspower.c

@@ -32,11 +32,20 @@
 SDL_bool
 SDL_GetPowerInfo_Windows(SDL_PowerState * state, int *seconds, int *percent)
 {
+#ifdef _WIN32_WCE
+    SYSTEM_POWER_STATUS_EX status;
+#else
     SYSTEM_POWER_STATUS status;
+#endif
     SDL_bool need_details = SDL_FALSE;
 
     /* This API should exist back to Win95 and Windows CE. */
-    if (!GetSystemPowerStatus(&status)) {
+#ifdef _WIN32_WCE
+    if (!GetSystemPowerStatusEx(&status, FALSE))
+#else
+    if (!GetSystemPowerStatus(&status))
+#endif
+    {
         /* !!! FIXME: push GetLastError() into SDL_GetError() */
         *state = SDL_POWERSTATE_UNKNOWN;
     } else if (status.BatteryFlag == 0xFF) {    /* unknown state */

src/stdlib/SDL_getenv.c

@@ -25,7 +25,7 @@
 
 #ifndef HAVE_GETENV
 
-#if defined(__WINDOWS__) && !defined(_WIN32_WCE)
+#if defined(__WIN32__) && !defined(_WIN32_WCE)
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -163,7 +163,7 @@ SDL_getenv(const char *name)
     return value;
 }
 
-#endif /* __WINDOWS__ */
+#endif /* __WIN32__ */
 
 #endif /* !HAVE_GETENV */
 

src/stdlib/SDL_stdlib.c

@@ -35,9 +35,7 @@
 __declspec(selectany) int _fltused = 1;
 #endif
 
-#ifdef _WIN64
-
-#else
+#ifdef _M_IX86
 
 void
 __declspec(naked)

src/thread/windows/SDL_syssem.c

@@ -39,7 +39,7 @@ struct SDL_semaphore
 #else
     HANDLE id;
 #endif
-    LONG volatile count;
+    LONG count;
 };
 
 

src/thread/windows/SDL_systhread.c

@@ -23,12 +23,10 @@
 
 /* Win32 thread management routines for SDL */
 
-#define WIN32_LEAN_AND_MEAN
-#include <windows.h>
-
 #include "SDL_thread.h"
 #include "../SDL_thread_c.h"
 #include "../SDL_systhread.h"
+#include "SDL_systhread_c.h"
 
 #ifndef SDL_PASSED_BEGINTHREAD_ENDTHREAD
 #ifndef _WIN32_WCE

src/video/SDL_renderer_gl.c

@@ -1181,7 +1181,7 @@ GL_RenderDrawLines(SDL_Renderer * renderer, const SDL_Point * points,
         }
         data->glEnd();
     } else {
-#if defined(__APPLE__) || defined(__WINDOWS__)
+#if defined(__APPLE__) || defined(__WIN32__)
 #else
         int x1, y1, x2, y2;
 #endif
@@ -1200,7 +1200,7 @@ GL_RenderDrawLines(SDL_Renderer * renderer, const SDL_Point * points,
          * least it would be pixel perfect.
          */
         data->glBegin(GL_POINTS);
-#if defined(__APPLE__) || defined(__WINDOWS__)
+#if defined(__APPLE__) || defined(__WIN32__)
         /* Mac OS X and Windows seem to always leave the second point open */
         data->glVertex2f(0.5f + points[count-1].x, 0.5f + points[count-1].y);
 #else

src/video/windows/SDL_gapirender.c

@@ -197,8 +197,8 @@ const		char* GetOrientationName(int orientation);
 void                UpdateLine16to16(const FrameBufferInfo* fb, const Uint16* src, Uint16* dst, Uint16 width);
 
 // stdlib
-inline int	__abs(int x){ return x < 0 ? -x : x; };
-inline void	__swap(int* a, int* b){ int t = *a; *a = *b; *b = t; };
+static __inline__ int        __abs(int x){ return x < 0 ? -x : x; };
+static __inline__ void        __swap(int* a, int* b){ int t = *a; *a = *b; *b = t; };
 
 #define GAPI_RENDER_NAME        "gapi"
 #define RAW_RENDER_NAME                "raw"
@@ -251,6 +251,7 @@ SDL_RenderDriver RAW_RenderDriver = {
 
 int WINCE_Available(void)
 {
+    HMODULE render_gapi;
     const char* preferably = SDL_getenv("SDL_VIDEO_RENDERER");
 
     // raw check
@@ -266,7 +267,7 @@ int WINCE_Available(void)
     if(preferably && 0 == SDL_strcasecmp(preferably, RAW_RENDER_NAME)) return 0 != render_raw;
 
     // gapi check
-    HMODULE render_gapi = LoadLibrary(TEXT("\\Windows\\gx.dll"));
+    render_gapi = LoadLibrary(TEXT("\\Windows\\gx.dll"));
     if(0 == render_gapi)
         render_gapi = LoadLibrary(TEXT("gx.dll"));
     FreeLibrary(render_gapi);
@@ -448,14 +449,15 @@ int WINCE_CreateTexture(SDL_Renderer* renderer, SDL_Texture* texture)
 
     if(SDL_ISPIXELFORMAT_FOURCC(texture->format))
     {
+        SDL_Window* window = renderer->window;
+        SDL_VideoDisplay* display = window->display;
+
         texturedata->yuv = SDL_SW_CreateYUVTexture(texture->format, texture->w, texture->h);
         if(NULL == texturedata->yuv)
         {
             SDL_OutOfMemory();
             return -1;
         }
-	SDL_Window* window = renderer->window;
-	SDL_VideoDisplay* display = window->display;
         texturedata->format = display->current_mode.format;
     }
     else
@@ -538,6 +540,7 @@ int WINCE_LockTexture(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Re
                     rect->y * texturedata->pitch +
                     rect->x * SDL_BYTESPERPIXEL(texture->format));
     *pitch = texturedata->pitch;
+    return 0;
 }
 
 void WINCE_UnlockTexture(SDL_Renderer* renderer, SDL_Texture* texture)
@@ -555,15 +558,17 @@ int WINCE_RenderCopy(SDL_Renderer* renderer, SDL_Texture* texture, const SDL_Rec
 {
     WINCE_RenderData* dstdata = (WINCE_RenderData*) renderer->driverdata;
     WINCE_TextureData* srcdata = (WINCE_TextureData*) texture->driverdata;
+    const unsigned char *src;
+    unsigned char *dst;
 
     if((dstdata->flags & FB_SUSPENDED) ||
-       0 >= srect->w || 0 >= srect->h) return;
+       0 >= srect->w || 0 >= srect->h) return 0;
 
     // lock gapi
     if(dstdata->gapi) dstdata->gapi->GXBeginDraw();
 
-    const unsigned char *src = ((const unsigned char*) srcdata->pixels);
-    unsigned char *dst = dstdata->pixels + (dstdata->flags & FB_SKIP_OFFSET ? 0 : dstdata->fb.offset) +
+    src = ((const unsigned char*) srcdata->pixels);
+    dst = dstdata->pixels + (dstdata->flags & FB_SKIP_OFFSET ? 0 : dstdata->fb.offset) +
                                 drect->y * dstdata->fb.ypitch +
                                 drect->x * dstdata->fb.xpitch;
     if(srcdata->yuv)
@@ -630,8 +635,8 @@ int WINCE_RenderFillRects(SDL_Renderer* renderer, const SDL_Rect** rects, int co
 
 void WINCE_SetupOrientation(WINCE_RenderData* data, int width, int height)
 {
-    const float maxW1 = GetSystemMetrics(SM_CXSCREEN) > GetSystemMetrics(SM_CYSCREEN) ? GetSystemMetrics(SM_CXSCREEN) : GetSystemMetrics(SM_CYSCREEN);
-    const float maxW2 = data->fb.width > data->fb.height ? data->fb.width : data->fb.height;
+    const float maxW1 = (float)(GetSystemMetrics(SM_CXSCREEN) > GetSystemMetrics(SM_CYSCREEN) ? GetSystemMetrics(SM_CXSCREEN) : GetSystemMetrics(SM_CYSCREEN));
+    const float maxW2 = (float)(data->fb.width > data->fb.height ? data->fb.width : data->fb.height);
 
     // scale define
     data->scale = maxW2 / maxW1;
@@ -649,7 +654,7 @@ void WINCE_SetupOrientation(WINCE_RenderData* data, int width, int height)
         WINCE_DumpVideoInfo(data);
 
     if(data->systemOrientation == ORIENTATION_UNKNOWN)
-	data->systemOrientation == ORIENTATION_UP;
+        data->systemOrientation = ORIENTATION_UP;
 
     data->userOrientation = ORIENTATION_UP;
 
@@ -749,8 +754,8 @@ void WINCE_PointerCoordinateTransform(SDL_Window* window, POINT* pt)
 {
     WINCE_RenderData* data = (WINCE_RenderData*) window->renderer->driverdata;
 
-    pt->x *= data->scale;
-    pt->y *= data->scale;
+    pt->x = (LONG)(pt->x * data->scale);
+    pt->y = (LONG)(pt->y * data->scale);
 
     PointerRotate(pt, &data->fb, data->userOrientation);
 }
@@ -760,7 +765,7 @@ void WINCE_PortraitTransform(WINCE_RenderData* data, int width, int height)
     if(data->systemOrientation != ORIENTATION_UP)
         FrameBufferRotate(&data->fb, data->systemOrientation);
 
-    if(data->fb.width != width || data->fb.height != height)
+    if(data->fb.width != width || data->fb.height != height) {
         switch(data->systemOrientation)
         {
             case ORIENTATION_UP:
@@ -769,6 +774,7 @@ void WINCE_PortraitTransform(WINCE_RenderData* data, int width, int height)
             case ORIENTATION_DOWN: data->userOrientation = ORIENTATION_LEFT; break;
             default: break;
         }
+    }
 
     if(data->userOrientation != ORIENTATION_UP)
         FrameBufferRotate(&data->fb, data->userOrientation);
@@ -865,6 +871,10 @@ int GAPI_Init(WINCE_RenderData* data, HWND hwnd)
 {
     if(NULL == data->gapi)
     {
+        struct GXDisplayProperties gxProperties;
+        GXDeviceInfo gxInfo = { 0 };
+        HDC hdc;
+        int enable, result;
         const char* preferably = SDL_getenv("SDL_VIDEO_RENDERER");
         if(preferably && 0 != SDL_strcasecmp(preferably, GAPI_RENDER_NAME)) return 0;
 
@@ -893,7 +903,7 @@ int GAPI_Init(WINCE_RenderData* data, HWND hwnd)
         LINK(GXResume,              data->gapi->GXResume,              "?GXResume@@YAHXZ");
 #undef LINK
 
-	int enable = data->gapi->GXGetDisplayProperties && data->gapi->GXCloseDisplay && data->gapi->GXOpenDisplay &&
+        enable = data->gapi->GXGetDisplayProperties && data->gapi->GXCloseDisplay && data->gapi->GXOpenDisplay &&
             data->gapi->GXBeginDraw && data->gapi->GXEndDraw && data->gapi->GXSuspend && data->gapi->GXResume;
 
         if(!enable)
@@ -910,7 +920,7 @@ int GAPI_Init(WINCE_RenderData* data, HWND hwnd)
             return 0;
         }
 
-	struct GXDisplayProperties gxProperties = data->gapi->GXGetDisplayProperties();
+        gxProperties = data->gapi->GXGetDisplayProperties();
 
         // fill FrameBufferInfo
         data->fb.xpitch = gxProperties.cbxPitch;
@@ -928,11 +938,10 @@ int GAPI_Init(WINCE_RenderData* data, HWND hwnd)
             data->format = 0;
 
         // get pixels
-	GXDeviceInfo gxInfo = { 0 };
-	HDC hdc = GetDC(NULL);
+        hdc = GetDC(NULL);
 
         gxInfo.Version = 100;
-	int result = ExtEscape(hdc, GETGXINFO, 0, NULL, sizeof(gxInfo), (char *) &gxInfo);
+        result = ExtEscape(hdc, GETGXINFO, 0, NULL, sizeof(gxInfo), (char *) &gxInfo);
         ReleaseDC(NULL, hdc);
 
         if(result > 0)
@@ -940,6 +949,8 @@ int GAPI_Init(WINCE_RenderData* data, HWND hwnd)
             // more debug
             if(data->debug)
             {
+                int i;
+
                 printf("GXDeviceInfo.pvFrameBuffer:    %p\n", gxInfo.pvFrameBuffer);
                 printf("GXDeviceInfo.cxWidth:          %d\n", gxInfo.cxWidth);
                 printf("GXDeviceInfo.cyHeight:         %d\n", gxInfo.cyHeight);
@@ -948,13 +959,12 @@ int GAPI_Init(WINCE_RenderData* data, HWND hwnd)
                 printf("GXDeviceInfo.ffFormat:        0x%x\n", gxInfo.ffFormat);
 
                 printf("GXDeviceInfo.unk:\n");
-		int ii; for(ii = 0; ii <  sizeof(gxInfo.unknown); ++ii)
-		printf("0x%02hhX,", gxInfo.unknown[ii]);
+                for(i = 0; i <  sizeof(gxInfo.unknown); ++i)
+                    printf("0x%02hhX,", gxInfo.unknown[i]);
                 printf("\n");
             }
 
-    	    if(gxInfo.ffFormat && gxInfo.ffFormat != gxProperties.ffFormat)
-	    {
+                if(gxInfo.ffFormat && gxInfo.ffFormat != gxProperties.ffFormat) {
                     if((gxInfo.ffFormat & kfDirect565) || 16 == gxInfo.cBPP)
                         data->format = SDL_PIXELFORMAT_RGB565;
                     else
@@ -1004,12 +1014,14 @@ void GAPI_Quit(WINCE_RenderData* data)
 
 int RAW_Init(WINCE_RenderData* data)
 {
+    RawFrameBufferInfo rfbi = { 0 };
+    HDC hdc;
+    int result;
     const char* preferably = SDL_getenv("SDL_VIDEO_RENDERER");
     if(preferably && 0 != SDL_strcasecmp(preferably, RAW_RENDER_NAME)) return 0;
 
-    RawFrameBufferInfo rfbi = { 0 };
-    HDC hdc = GetDC(NULL);
-    int result = ExtEscape(hdc, GETRAWFRAMEBUFFER, 0, NULL, sizeof(RawFrameBufferInfo), (char *) &rfbi);
+    hdc = GetDC(NULL);
+    result = ExtEscape(hdc, GETRAWFRAMEBUFFER, 0, NULL, sizeof(RawFrameBufferInfo), (char *) &rfbi);
     ReleaseDC(NULL, hdc);
 
     //disable
@@ -1233,13 +1245,15 @@ int WINCE_SetDMOrientation(int orientation)
 
 void FrameBufferDumpInfo(const FrameBufferInfo* fb, const char* name)
 {
+    int orientation;
+
     printf("%s fb.width:       %d\n", name, fb->width);
     printf("%s fb.height:      %d\n", name, fb->height);
     printf("%s fb.xpitch:      %d\n", name, fb->xpitch);
     printf("%s fb.ypitch:      %d\n", name, fb->ypitch);
     printf("%s fb.offset:      %d\n", name, fb->offset);
 
-    int orientation = GetFrameBufferOrientation(fb);
+    orientation = GetFrameBufferOrientation(fb);
     printf("%s fb.orientation: %d, %s\n", name, orientation, GetOrientationName(orientation));
 }
 

src/video/windows/SDL_gdirender.c

@@ -167,8 +167,10 @@ GDI_CreateRenderer(SDL_Window * window, Uint32 flags)
     SDL_WindowData *windowdata = (SDL_WindowData *) window->driverdata;
     SDL_Renderer *renderer;
     GDI_RenderData *data;
+#ifndef NO_GETDIBBITS
     int bmi_size;
     HBITMAP hbm;
+#endif
     int i, n;
 
     renderer = (SDL_Renderer *) SDL_calloc(1, sizeof(*renderer));

src/video/windows/SDL_windowsevents.c

@@ -252,12 +252,15 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
             break;
         }
 
+#ifdef WM_MOUSELEAVE
+    /* FIXME: Do we need the SDL 1.2 hack to generate WM_MOUSELEAVE now? */
     case WM_MOUSELEAVE:
         if (SDL_GetMouseFocus() == data->window) {
             SDL_SetMouseFocus(NULL);
         }
         returnCode = 0;
         break;
+#endif /* WM_MOUSELEAVE */
 
     case WM_SYSKEYDOWN:
     case WM_KEYDOWN:
@@ -382,13 +385,16 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
         returnCode = 0;
         break;
 
+#ifdef WM_INPUTLANGCHANGE
     case WM_INPUTLANGCHANGE:
         {
             WIN_UpdateKeymap();
         }
         returnCode = 1;
         break;
+#endif /* WM_INPUTLANGCHANGE */
 
+#ifdef WM_GETMINMAXINFO
     case WM_GETMINMAXINFO:
         {
             MINMAXINFO *info;
@@ -447,6 +453,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
         }
         returnCode = 0;
         break;
+#endif /* WM_GETMINMAXINFO */
 
     case WM_WINDOWPOSCHANGED:
         {
@@ -534,6 +541,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
         }
         return (1);
 
+#if defined(SC_SCREENSAVE) || defined(SC_MONITORPOWER)
     case WM_SYSCOMMAND:
         {
             /* Don't start the screensaver or blank the monitor in fullscreen apps */
@@ -545,6 +553,7 @@ WIN_WindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
             }
         }
         break;
+#endif /* System has screensaver support */
 
     case WM_CLOSE:
         {
@@ -656,7 +665,9 @@ SDL_RegisterApp(char *name, Uint32 style, void *hInst)
     }
     if (!name && !SDL_Appname) {
         name = "SDL_app";
+#if defined(CS_BYTEALIGNCLIENT) || defined(CS_OWNDC)
         SDL_Appstyle = (CS_BYTEALIGNCLIENT | CS_OWNDC);
+#endif
         SDL_Instance = hInst ? hInst : GetModuleHandle(NULL);
     }