From e4c49d8de9aabab88fdd7cd905efa7100bad24ff Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.sf.net>
Date: Wed, 21 Apr 2010 04:32:19 +0000
Subject: [PATCH] merge r3561 from release branch

---
 desmume/src/movie.cpp            |  11 ++++++-----
 desmume/src/windows/replay.cpp   |  10 ++++++----
 desmume/src/windows/resources.rc | Bin 930728 -> 930740 bytes
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/desmume/src/movie.cpp b/desmume/src/movie.cpp
index 02be6c4d6..e37e7e5f0 100644
--- a/desmume/src/movie.cpp
+++ b/desmume/src/movie.cpp
@@ -178,7 +178,7 @@ time_t FCEUI_MovieGetRTCDefault()
 	t.tm_mon  = 0;   // 1 (Jan)
 	t.tm_mday = 1;
 	t.tm_wday = 4;
-	t.tm_hour = 12;
+	t.tm_hour = 0; //12 AM
 	t.tm_min  = 0;
 	t.tm_sec  = 0;
 	t.tm_isdst= -1;
@@ -288,15 +288,16 @@ int MovieData::dump(EMUFILE* fp, bool binary)
 	fp->fprintf("romChecksum %s\n", u32ToHexString(gameInfo.crc).c_str());
 	fp->fprintf("romSerial %s\n", romSerial.c_str());
 	fp->fprintf("guid %s\n", guid.toString().c_str());
-	fp->fprintf("useExtBios %d\n", CommonSettings.UseExtBIOS);
+	fp->fprintf("useExtBios %d\n", CommonSettings.UseExtBIOS?1:0);
+	fp->fprintf("advancedTiming %d\n", CommonSettings.advanced_timing?1:0);
 
 	if(CommonSettings.UseExtBIOS)
-		fp->fprintf("swiFromBios %d\n", CommonSettings.SWIFromBIOS);
+		fp->fprintf("swiFromBios %d\n", CommonSettings.SWIFromBIOS?1:0);
 
-	fp->fprintf("useExtFirmware %d\n", CommonSettings.UseExtFirmware);
+	fp->fprintf("useExtFirmware %d\n", CommonSettings.UseExtFirmware?1:0);
 
 	if(CommonSettings.UseExtFirmware) {
-		fp->fprintf("bootFromFirmware %d\n", CommonSettings.BootFromFirmware);
+		fp->fprintf("bootFromFirmware %d\n", CommonSettings.BootFromFirmware?1:0);
 	}
 	else {
 		char temp_str[27];
diff --git a/desmume/src/windows/replay.cpp b/desmume/src/windows/replay.cpp
index 1d5a1f65a..b4a9e75a2 100644
--- a/desmume/src/windows/replay.cpp
+++ b/desmume/src/windows/replay.cpp
@@ -271,8 +271,10 @@ static INT_PTR CALLBACK RecordDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam,
 			DateTime_SetSystemtime(GetDlgItem(hwndDlg, IDC_DTP_DATE), GDT_VALID, &systime);
 			DateTime_SetSystemtime(GetDlgItem(hwndDlg, IDC_DTP_TIME), GDT_VALID, &systime);
 
-			SYSTEMTIME rtcMin;
-			SYSTEMTIME rtcMax;
+			union {
+				struct { SYSTEMTIME rtcMin, rtcMax; };
+				SYSTEMTIME rtcMinMax[];
+			};
 			ZeroMemory(&rtcMin, sizeof(SYSTEMTIME));
 			ZeroMemory(&rtcMax, sizeof(SYSTEMTIME));
 			rtcMin.wYear = 2000;
@@ -283,8 +285,8 @@ static INT_PTR CALLBACK RecordDialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam,
 			rtcMax.wMonth = 12;
 			rtcMax.wDay = 31;
 			rtcMax.wDayOfWeek = 4;
-			DateTime_SetRange(GetDlgItem(hwndDlg, IDC_DTP_DATE), GDTR_MIN, &rtcMin);
-			DateTime_SetRange(GetDlgItem(hwndDlg, IDC_DTP_DATE), GDTR_MAX, &rtcMax);
+			DateTime_SetRange(GetDlgItem(hwndDlg, IDC_DTP_DATE), GDTR_MIN, &rtcMinMax);
+			DateTime_SetRange(GetDlgItem(hwndDlg, IDC_DTP_DATE), GDTR_MAX, &rtcMinMax);
 			return false;
 		}
 
diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc
index 879d8e65e6cd93f0c4cf571112329a3c1269ca17..32a3c3821bfe802f42efa7310389cab5d0db90b0 100644
GIT binary patch
delta 430
zcmZ4S++xdfi-s+X66Yo>XedoOBsJ|jGs|{^3yfh*(*^jLwI&_nnV#^FXBD#%gYoo*
zHte@~%^A!XbQnw-On{`>^!lgV%I$M5F#<8u_BofBCz+s`vx#x~4=$D^L>o4F0mr22
z1)0ok?WcHHwx8l*J=8vZ-DFmU=^PU|q}mTmVcmXU3fsNqINUSYagFHq59b-bFiyVU
z$kIN|o*jrefS7apG<&XBESQe-^58l|isN|N^*p(Nn0vdPClAXEOalXsa<NQ%%Cm`R
yLpLwrkYe1vU>@r=#_11EaSOGddcm{()C=Aa_vtStaM(=0u$h}>dxQaB05bqttCTwc

delta 370
zcmdn;++xLZi-s+X66dA|oM6$LUf|BPirIw0VEV+1jJNqM84MY87)%*VfTRh7`Syvn
z?Cea_c`h(6nw%ppHvIuBuSNTnON>CwwEfB@<|q>)4Pj-PuE5E%1Z2qM1ss#67i2QG
zwV&c)*?x+L^-wz_=k$$X+{W$4rm${5Hihlpa-0ro2RaCdIe?fG=s2#gY{Wa@UofZ8
z^e#894NzC`Y~IHz!`L3+#RbIN+XK9KUQ8q2v;`;GS*Ghf=Gg=?ZSw*SDaQ5}&v>@K
Sc*bkv3Gt8V_5=gI5M}@d(so?{