From: Toni Wilen <twilen@winuae.net>
Date: Tue, 22 Jun 2010 12:44:02 +0000 (+0300)
Subject: cd drive change updates
X-Git-Tag: 2200~6
X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=e616a84e99619e7e2ba0f5d33cdfba7afed86765;p=francis%2Fwinuae.git

cd drive change updates
---

diff --git a/blkdev_cdimage.cpp b/blkdev_cdimage.cpp
index aab297c9..9889a57f 100644
--- a/blkdev_cdimage.cpp
+++ b/blkdev_cdimage.cpp
@@ -1104,7 +1104,7 @@ void cdimage_vsync (void)
 		}
 	}
 #ifdef RETROPLATFORM
-	rp_cd_image_change (0, media ? currprefs.cdimagefile : NULL);
+	rp_cd_image_change (0, currprefs.cdimagefile);
 #endif
 	config_changed = 1;
 }
@@ -1129,7 +1129,7 @@ static int open_bus (int flags)
 		v = 1;
 #ifdef RETROPLATFORM
 	rp_cd_change (0, 0);
-	rp_cd_image_change (0, currprefs.cdimagefile[0] ? currprefs.cdimagefile : NULL);
+	rp_cd_image_change (0, currprefs.cdimagefile);
 #endif
 	return v;
 }
diff --git a/od-win32/dinput.cpp b/od-win32/dinput.cpp
index 6d1cb8d3..4b69b674 100644
--- a/od-win32/dinput.cpp
+++ b/od-win32/dinput.cpp
@@ -68,7 +68,7 @@ struct didata {
 	TCHAR *name;
 	TCHAR *sortname;
 	TCHAR *configname;
-	int vid, pid;
+	int vid, pid, mi;
 
 	int connection;
 	LPDIRECTINPUTDEVICE8 lpdi;
@@ -735,21 +735,26 @@ static TCHAR *rawkeyboardlabels[256] =
 	L""
 };
 
-static void getvidpid2 (TCHAR *devname, int *id, TCHAR *str)
+static void getvidpid2 (const TCHAR *devname, int *id, const TCHAR *str)
 {
-	TCHAR *s = _tcsstr (devname, str);
-	if (!s)
-		return;
-	int val = -1;
-	_stscanf (s + _tcslen (str), L"%X", &val);
-	*id = val;
+	TCHAR *dv = my_strdup (devname);
+	for (int i = 0; i < _tcslen (dv); i++)
+		dv[i] = _totupper (dv[i]);
+	TCHAR *s = _tcsstr (dv, str);
+	if (s) {
+		int val = -1;
+		_stscanf (s + _tcslen (str), L"%X", &val);
+		*id = val;
+	}
+	xfree (dv);
 }
 
-static void getvidpid (TCHAR *devname, int *vid, int *pid)
+static void getvidpid (const TCHAR *devname, int *vid, int *pid, int *mi)
 {
-	*vid = *pid = -1;
+	*vid = *pid = *mi = -1;
 	getvidpid2 (devname, vid, L"VID_");
 	getvidpid2 (devname, pid, L"PID_");
+	getvidpid2 (devname, mi, L"MI_");
 }
 
 static int initialize_rawinput (void)
@@ -838,7 +843,7 @@ static int initialize_rawinput (void)
 
 			rnum_raw++;
 			cleardid (did);
-			getvidpid (buf, &did->vid, &did->pid);
+			getvidpid (buf, &did->vid, &did->pid, &did->mi);
 			if (did->vid > 0 && did->pid > 0)
 				_stprintf (tmp, L"%s (%04X/%04X)", type == RIM_TYPEMOUSE ? L"RAW Mouse" : L"RAW Keyboard", did->vid, did->pid);
 			else
diff --git a/od-win32/win32.h b/od-win32/win32.h
index ffe67364..cf468874 100644
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -15,12 +15,12 @@
 #define GETBDM(x) (((x) - ((x / 10000) * 10000)) / 100)
 #define GETBDD(x) ((x) % 100)
 
-#define WINUAEPUBLICBETA 0
+#define WINUAEPUBLICBETA 1
 #define LANG_DLL 1
 
-#define WINUAEBETA L""
+#define WINUAEBETA L"11"
 #define WINUAEDATE MAKEBD(2010, 6, 22)
-#define WINUAEEXTRA L""
+#define WINUAEEXTRA L"RC2"
 #define WINUAEREV L""
 
 #define IHF_WINDOWHIDDEN 6
diff --git a/od-win32/winuae_msvc10/winuae.idc b/od-win32/winuae_msvc10/winuae.idc
new file mode 100644
index 00000000..428a2ec7
--- /dev/null
+++ b/od-win32/winuae_msvc10/winuae.idc
@@ -0,0 +1 @@
+<Configurations active="Default"><Configuration name="Default"><GuestCommandRemote val="project command through a shared folder"></GuestCommandRemote><ShareFoldersRemote val=""></ShareFoldersRemote><RemoteDebugMonitor val="C:\msvs\Common7\IDE\Remote Debugger\x86\msvsmon.exe"></RemoteDebugMonitor><MonitorName val="VMDebug"></MonitorName><RemoteVM val=""></RemoteVM><StartMode val="No"></StartMode><TerminationModeRemote val="No operation"></TerminationModeRemote><CopyFilesRemote val=""></CopyFilesRemote><PreRemoteCommandLine val=""></PreRemoteCommandLine><PostRemoteCommandLine val=""></PostRemoteCommandLine><RecordingToReplay val=""></RecordingToReplay><ReplayVM val=""></ReplayVM><BaseSnapshotForRecording val=""></BaseSnapshotForRecording><CopyFilesRecord val=""></CopyFilesRecord><PreRecordCommandLine val=""></PreRecordCommandLine><PostRecordCommandLine val=""></PostRecordCommandLine><TerminationModeRecord val="No operation"></TerminationModeRecord><InstanceToDebug val=""></InstanceToDebug><GuestCommandReplay val="project command through a shared folder"></GuestCommandReplay><ShareFoldersRecord val=""></ShareFoldersRecord><RemoteReplayFlag val=""></RemoteReplayFlag><RemoteMachine val=""></RemoteMachine><RemoteReplayVM val=""></RemoteReplayVM><RemoteRecordingToReplay val=""></RemoteRecordingToReplay><RemoteReplayPasscode val=""></RemoteReplayPasscode><HostSearchPath val=""></HostSearchPath></Configuration></Configurations>