From a2548e687bd5199f981d5e53ad83f66f7d040a17 Mon Sep 17 00:00:00 2001
From: luigi__ <luigi__@users.sf.net>
Date: Tue, 3 Feb 2009 17:34:10 +0000
Subject: [PATCH] Added GDI+ setup as I plan to rewrite the viewers soon
 (they'll use GDI+). But, we do keep DirectDraw for the main window!

---
 desmume/src/windows/DeSmuME_2008.vcproj |  4 ++--
 desmume/src/windows/main.cpp            | 17 +++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/desmume/src/windows/DeSmuME_2008.vcproj b/desmume/src/windows/DeSmuME_2008.vcproj
index 8a3bc1da6..3429ded08 100644
--- a/desmume/src/windows/DeSmuME_2008.vcproj
+++ b/desmume/src/windows/DeSmuME_2008.vcproj
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="shift_jis"?>
 <VisualStudioProject
 	ProjectType="Visual C++"
-	Version="9.00"
+	Version="9,00"
 	Name="DeSmuME_VS2008"
 	ProjectGUID="{9F5F72A1-D3A5-4918-B460-E076B16D10A9}"
 	RootNamespace="DeSmuME"
@@ -161,7 +161,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib directx\dxguid.lib shell32.lib comdlg32.lib shlwapi.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib shlwapi.lib"
+				AdditionalDependencies="vfw32.lib winmm.lib comctl32.lib opengl32.lib glu32.lib ws2_32.lib user32.lib gdi32.lib gdiplus.lib directx\dxguid.lib shell32.lib comdlg32.lib shlwapi.lib directx\dxerr8.lib directx\dsound.lib directx\dinput8.lib directx\ddraw.lib zlib-2008-x32.lib zziplib-2008-x32.lib"
 				OutputFile="$(OutDir)\$(ProjectName)_interim_sse2.exe"
 				AdditionalLibraryDirectories=".\zlib123;.\zziplib"
 				GenerateDebugInformation="true"
diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp
index 24a204ec0..386fafe9a 100644
--- a/desmume/src/windows/main.cpp
+++ b/desmume/src/windows/main.cpp
@@ -79,6 +79,10 @@
 
 using namespace std;
 
+#include <GdiPlus.h>
+
+using namespace Gdiplus;
+
 //----Recent ROMs menu globals----------
 vector<string> RecentRoms;					//The list of recent ROM filenames
 const unsigned int MAX_RECENT_ROMS = 10;	//To change the recent rom max, simply change this number
@@ -1302,6 +1306,17 @@ int WINAPI WinMain (HINSTANCE hThisInstance,
                     int nFunsterStil)
 
 {
+	ULONG_PTR GdiplusToken;
+	GdiplusStartupInput GdiplusSI;
+
+	GdiplusSI.GdiplusVersion = 1;
+
+	if(GdiplusStartup(&GdiplusToken, &GdiplusSI, NULL) != Ok)
+	{
+		MessageBox(0, "Failed to initialize GDI+ !", "Severe error", MB_OK | MB_ICONERROR);
+		return 1;
+	}
+
 	InitializeCriticalSection(&win_sync);
 
 #ifdef GDB_STUB
@@ -1635,6 +1650,8 @@ int WINAPI WinMain (HINSTANCE hThisInstance,
 	
 	CloseConsole();
 
+	GdiplusShutdown(GdiplusToken);
+
     return 0;
 }