From 94969c4eadb0aaf0794115be2f71c7e7ddff1f35 Mon Sep 17 00:00:00 2001
From: "Unknown W. Brackets" <checkins@unknownbrackets.org>
Date: Fri, 28 Dec 2012 13:50:59 -0800
Subject: [PATCH] Add some basic Windows UI for save states.

---
 Windows/WndMainWindow.cpp |  19 ++++++++++++++-----
 Windows/WndMainWindow.h   |   1 +
 Windows/ppsspp.rc         | Bin 28864 -> 29384 bytes
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/Windows/WndMainWindow.cpp b/Windows/WndMainWindow.cpp
index debfc928bd..1e8a469a6d 100644
--- a/Windows/WndMainWindow.cpp
+++ b/Windows/WndMainWindow.cpp
@@ -18,8 +18,9 @@
 #include "main.h"
 
 #include "../Core/Core.h"
-#include "../Core/System.h"
 #include "../Core/MemMap.h"
+#include "../Core/SaveState.h"
+#include "../Core/System.h"
 #include "EmuThread.h"
 
 #include "resource.h"
@@ -312,18 +313,18 @@ namespace MainWindow
 				break;
 
 			case ID_FILE_LOADSTATE:
-				if (W32Util::BrowseForFileName(true, hWnd, "Load state",0,"Save States (*.gcs)\0*.gcs\0All files\0*.*\0\0","gcs",fn))
+				if (W32Util::BrowseForFileName(true, hWnd, "Load state",0,"Save States (*.ppssppst)\0*.ppssppst\0All files\0*.*\0\0","ppssppst",fn))
 				{
 					SetCursor(LoadCursor(0,IDC_WAIT));
-					SetCursor(LoadCursor(0,IDC_ARROW));
+					SaveState::Load(fn, SaveStateActionFinished);
 				}
 				break;
 
 			case ID_FILE_SAVESTATE:
-				if (W32Util::BrowseForFileName(false, hWnd, "Save state",0,"Save States (*.gcs)\0*.gcs\0All files\0*.*\0\0","gcs",fn))
+				if (W32Util::BrowseForFileName(false, hWnd, "Save state",0,"Save States (*.ppssppst)\0*.ppssppst\0All files\0*.*\0\0","ppssppst",fn))
 				{
 					SetCursor(LoadCursor(0,IDC_WAIT));
-					SetCursor(LoadCursor(0,IDC_ARROW));
+					SaveState::Save(fn, SaveStateActionFinished);
 				}
 				break;
 
@@ -766,6 +767,14 @@ namespace MainWindow
 		}
 	}
 
+	void SaveStateActionFinished(bool result)
+	{
+		// TODO: Improve messaging?
+		if (!result)
+			MessageBox(0, "Savestate failure.  Please try again later.", "Sorry", MB_OK);
+		SetCursor(LoadCursor(0, IDC_ARROW));
+	}
+
 	void SetNextState(CoreState state)
 	{
 		nextState = state;
diff --git a/Windows/WndMainWindow.h b/Windows/WndMainWindow.h
index 7aaaaab423..b58823ca25 100644
--- a/Windows/WndMainWindow.h
+++ b/Windows/WndMainWindow.h
@@ -17,6 +17,7 @@ namespace MainWindow
 	void SetPlaying(const char*text);
 	void BrowseAndBoot();
 	void SetNextState(CoreState state);
+	void SaveStateActionFinished(bool result);
 	void _ViewFullScreen(HWND hWnd);
 	void _ViewNormal(HWND hWnd);
 }
diff --git a/Windows/ppsspp.rc b/Windows/ppsspp.rc
index 3c691428661e75dc9a4105a434f708ed81e8a7dd..e9561bdac4468508cfa78c949648e089abb2f193 100644
GIT binary patch
delta 327
zcmX@`knzM*#tqkunK>CaCttJ_m-S)DXGmm7VNhTQW+(x&N*GcZVt}L@g9(Gu<U&*B
z$u=fjlX;9e1cMnu7#xAvm4TOmivg;Ca*QRHFuG17gigs|pq?<G9!%Yefxer68K-D*
za{?83GsFX}G@AS|Ru*I-&`5M`I+GI<<R_nr6+u#O0#griAUDDam|B_1X>l@>KO{;`
zR&e5BHDrij(3$)&%6sy!I4P*8z+|g<uE}2UF)&q=PsH<0eih|3SuO#lhG%kuGt1<-
Q1g^<iu^yYZC2$D<089i`xBvhE

delta 110
zcmX@{l<~kr#tqkuCvUJ;*(_z6qBSX=V{%!7%;X79YLoXQa7~s-mYBRQS#L61B1lYW
ivPU8xTx=Rt>;{sUS`tKEgA2>#oFtfjv(5XGxC8)-Vk$)d