Got rid of more casts, fixed more warnings...

BasiliskII/src/audio.cpp

@@ -82,7 +82,7 @@ static int32 AudioGetInfo(uint32 infoPtr, uint32 selector, uint32 sourceID)
 			uint32 h = r.a[0];
 			if (h == 0)
 				return memFullErr;
-			WriteMacInt16(infoPtr + sil_count, audio_sample_sizes.size());
+			WriteMacInt16(infoPtr + sil_count, uint16(audio_sample_sizes.size()));
 			WriteMacInt32(infoPtr + sil_infoHandle, h);
 			uint32 sp = ReadMacInt32(h);
 			for (unsigned i=0; i<audio_sample_sizes.size(); i++)
@@ -100,7 +100,7 @@ static int32 AudioGetInfo(uint32 infoPtr, uint32 selector, uint32 sourceID)
 			uint32 h = r.a[0];
 			if (h == 0)
 				return memFullErr;
-			WriteMacInt16(infoPtr + sil_count, audio_channel_counts.size());
+			WriteMacInt16(infoPtr + sil_count, uint16(audio_channel_counts.size()));
 			WriteMacInt32(infoPtr + sil_infoHandle, h);
 			uint32 sp = ReadMacInt32(h);
 			for (unsigned i=0; i<audio_channel_counts.size(); i++)
@@ -118,7 +118,7 @@ static int32 AudioGetInfo(uint32 infoPtr, uint32 selector, uint32 sourceID)
 			uint32 h = r.a[0];
 			if (h == 0)
 				return memFullErr;
-			WriteMacInt16(infoPtr + sil_count, audio_sample_rates.size());
+			WriteMacInt16(infoPtr + sil_count, uint16(audio_sample_rates.size()));
 			WriteMacInt32(infoPtr + sil_infoHandle, h);
 			uint32 lp = ReadMacInt32(h);
 			for (unsigned i=0; i<audio_sample_rates.size(); i++)

BasiliskII/src/emul_op.cpp

@@ -565,7 +565,7 @@ void EmulOp(uint16 opcode, M68kRegisters *r)
 			break;
 
 		default:
-			printf("FATAL: EMUL_OP called with bogus opcode %08x\n", opcode);
+			printf("FATAL: EMUL_OP called with bogus opcode %04x\n", opcode);
 			printf("d0 %08x d1 %08x d2 %08x d3 %08x\n"
 				   "d4 %08x d5 %08x d6 %08x d7 %08x\n"
 				   "a0 %08x a1 %08x a2 %08x a3 %08x\n"

BasiliskII/src/include/video.h

@@ -159,10 +159,10 @@ class monitor_desc {
 	const video_mode &get_current_mode(void) const {return *current_mode;}
 
 	// Get Apple mode id for given depth
-	uint16 depth_to_apple_mode(video_depth depth) const {return apple_mode_for_depth[depth];}
+	uint8 depth_to_apple_mode(video_depth depth) const {return apple_mode_for_depth[depth];}
 
 	// Get current color depth
-	uint16 get_apple_mode(void) const {return depth_to_apple_mode(current_mode->depth);}
+	uint8 get_apple_mode(void) const {return depth_to_apple_mode(current_mode->depth);}
 
 	// Get bytes-per-row value for specified resolution/depth
 	// (if the mode isn't supported, make a good guess)
@@ -191,7 +191,7 @@ class monitor_desc {
 	vector<video_mode>::const_iterator invalid_mode(void) const {return modes.end();}
 
 	// Find specified mode (depth/resolution) (or invalid_mode() if not found)
-	vector<video_mode>::const_iterator find_mode(uint16 apple_mode, uint32 id) const;
+	vector<video_mode>::const_iterator find_mode(uint8 apple_mode, uint32 id) const;
 
 	// Find maximum supported depth for given resolution ID
 	video_depth max_depth_of_resolution(uint32 id) const;
@@ -226,9 +226,9 @@ class monitor_desc {
 	uint32 gamma_table;          // Mac address of gamma table
 	int alloc_gamma_table_size;  // Allocated size of gamma table
 
-	uint16 current_apple_mode;   // Currently selected depth/resolution
+	uint8 current_apple_mode;    // Currently selected depth/resolution
 	uint32 current_id;
-	uint16 preferred_apple_mode; // Preferred depth/resolution
+	uint8 preferred_apple_mode;  // Preferred depth/resolution
 	uint32 preferred_id;
 
 	uint32 slot_param;           // Mac address of Slot Manager parameter block
@@ -237,7 +237,7 @@ class monitor_desc {
 	// MacOS, the Apple modes must start at 0x80 and be contiguous. Therefore
 	// we maintain an array to map the depth codes to the corresponding Apple
 	// mode.
-	uint16 apple_mode_for_depth[6];
+	uint8 apple_mode_for_depth[6];
 
 // The following functions are implemented by platform-specific code
 public:

BasiliskII/src/main.cpp

@@ -177,7 +177,7 @@ bool InitAll(const char *vmdir)
 	XPRAM[0x56] = 0x42;	// 'B'
 	XPRAM[0x57] = 0x32;	// '2'
 	const monitor_desc &main_monitor = *VideoMonitors[0];
-	XPRAM[0x58] = uint8(main_monitor.depth_to_apple_mode(main_monitor.get_current_mode().depth));
+	XPRAM[0x58] = main_monitor.depth_to_apple_mode(main_monitor.get_current_mode().depth);
 	XPRAM[0x59] = 0;
 
 #if EMULATED_68K

BasiliskII/src/slirp/slirp.h

@@ -27,6 +27,11 @@ typedef unsigned long ioctlsockopt_t;
 # include <sys/timeb.h>
 # include <iphlpapi.h>
 
+// Microsoft's headers don't define ssize_t.
+#ifdef _MSC_VER
+typedef ptrdiff_t ssize_t;
+#endif
+
 # define USE_FIONBIO 1
 
 /* Basilisk II Router defines those */

BasiliskII/src/slot_rom.cpp

@@ -211,17 +211,17 @@ static uint32 VMonitor(const monitor_desc &m, uint32 videoType, uint32 videoName
 	Offs(0x40, gammaDir);				// Gamma directory
 	Rsrc(0x7d, 6);						// Video attributes: Default to color, built-in
 	if (m.has_depth(VDEPTH_1BIT))
-		Offs(uint8(m.depth_to_apple_mode(VDEPTH_1BIT)), vidMode1);	// Video mode parameters for 1 bit
+		Offs(m.depth_to_apple_mode(VDEPTH_1BIT), vidMode1);	// Video mode parameters for 1 bit
 	if (m.has_depth(VDEPTH_2BIT))
-		Offs(uint8(m.depth_to_apple_mode(VDEPTH_2BIT)), vidMode2);	// Video mode parameters for 2 bit
+		Offs(m.depth_to_apple_mode(VDEPTH_2BIT), vidMode2);	// Video mode parameters for 2 bit
 	if (m.has_depth(VDEPTH_4BIT))
-		Offs(uint8(m.depth_to_apple_mode(VDEPTH_4BIT)), vidMode4);	// Video mode parameters for 4 bit
+		Offs(m.depth_to_apple_mode(VDEPTH_4BIT), vidMode4);	// Video mode parameters for 4 bit
 	if (m.has_depth(VDEPTH_8BIT))
-		Offs(uint8(m.depth_to_apple_mode(VDEPTH_8BIT)), vidMode8);	// Video mode parameters for 8 bit
+		Offs(m.depth_to_apple_mode(VDEPTH_8BIT), vidMode8);	// Video mode parameters for 8 bit
 	if (m.has_depth(VDEPTH_16BIT))
-		Offs(uint8(m.depth_to_apple_mode(VDEPTH_16BIT)), vidMode16);	// Video mode parameters for 16 bit
+		Offs(m.depth_to_apple_mode(VDEPTH_16BIT), vidMode16);	// Video mode parameters for 16 bit
 	if (m.has_depth(VDEPTH_32BIT))
-		Offs(uint8(m.depth_to_apple_mode(VDEPTH_32BIT)), vidMode32);	// Video mode parameters for 32 bit
+		Offs(m.depth_to_apple_mode(VDEPTH_32BIT), vidMode32);	// Video mode parameters for 32 bit
 	EndOfList();
 	return ret;
 }

BasiliskII/src/video.cpp

@@ -91,7 +91,7 @@ monitor_desc::monitor_desc(const vector<video_mode> &available_modes, video_dept
 	slot_id = next_slot_id++;
 
 	// Initialize Apple mode list
-	uint16 mode = 0x80;
+	uint8 mode = 0x80;
 	for (int depth = VDEPTH_1BIT; depth <= VDEPTH_32BIT; depth++) {
 		if (has_depth(video_depth(depth)))
 			apple_mode_for_depth[depth] = mode++;
@@ -157,7 +157,7 @@ bool monitor_desc::has_resolution(uint32 id) const
  *  Find specified mode (depth/resolution) (or invalid_mode() if not found)
  */
 
-vector<video_mode>::const_iterator monitor_desc::find_mode(uint16 apple_mode, uint32 id) const
+vector<video_mode>::const_iterator monitor_desc::find_mode(uint8 apple_mode, uint32 id) const
 {
 	vector<video_mode>::const_iterator i, end = modes.end();
 	for (i = modes.begin(); i != end; ++i) {
@@ -502,7 +502,7 @@ int16 monitor_desc::driver_control(uint16 code, uint32 param, uint32 dce)
 				return paramErr;
 
 			if (mode != current_apple_mode) {
-				vector<video_mode>::const_iterator i = find_mode(mode, current_id);
+				vector<video_mode>::const_iterator i = find_mode(uint8(mode), current_id);
 				if (i == invalid_mode())
 					return paramErr;
 				switch_mode(i, param, dce);
@@ -640,7 +640,7 @@ int16 monitor_desc::driver_control(uint16 code, uint32 param, uint32 dce)
 			return noErr;
 
 		case cscSetDefaultMode: { // Set default color depth
-			uint16 mode = ReadMacInt8(param + csMode);
+			uint8 mode = ReadMacInt8(param + csMode);
 			D(bug(" SetDefaultMode %02x\n", mode));
 			preferred_apple_mode = mode;
 			return noErr;
@@ -658,7 +658,7 @@ int16 monitor_desc::driver_control(uint16 code, uint32 param, uint32 dce)
 				return paramErr;
 
 			if (mode != current_apple_mode || id != current_id) {
-				vector<video_mode>::const_iterator i = find_mode(mode, id);
+				vector<video_mode>::const_iterator i = find_mode(uint8(mode), id);
 				if (i == invalid_mode())
 					return paramErr;
 				switch_mode(i, param, dce);
@@ -671,7 +671,7 @@ int16 monitor_desc::driver_control(uint16 code, uint32 param, uint32 dce)
 			uint16 mode = ReadMacInt16(param + csMode);
 			uint32 id = ReadMacInt32(param + csData);
 			D(bug(" SavePreferredConfiguration %04x, %08x\n", mode, id));
-			preferred_apple_mode = mode;
+			preferred_apple_mode = uint8(mode);
 			preferred_id = id;
 			return noErr;
 		}
@@ -706,7 +706,7 @@ int16 monitor_desc::driver_status(uint16 code, uint32 param)
 	switch (code) {
 
 		case cscGetMode:			// Get current color depth
-			D(bug(" GetMode -> %04x, base %08x\n", current_apple_mode, mac_frame_base));
+			D(bug(" GetMode -> %02x, base %08x\n", current_apple_mode, mac_frame_base));
 			WriteMacInt16(param + csMode, current_apple_mode);
 			WriteMacInt16(param + csPage, 0);
 			WriteMacInt32(param + csBaseAddr, mac_frame_base);
@@ -784,7 +784,7 @@ int16 monitor_desc::driver_status(uint16 code, uint32 param)
 			return noErr;
 
 		case cscGetCurrentMode:		// Get current video mode (depth and resolution)
-			D(bug(" GetCurMode -> %04x/%08x, base %08x\n", current_apple_mode, current_id, mac_frame_base));
+			D(bug(" GetCurMode -> %02x/%08x, base %08x\n", current_apple_mode, current_id, mac_frame_base));
 			WriteMacInt16(param + csMode, current_apple_mode);
 			WriteMacInt32(param + csData, current_id);
 			WriteMacInt16(param + csPage, 0);
@@ -821,7 +821,7 @@ int16 monitor_desc::driver_status(uint16 code, uint32 param)
 			return noErr;
 
 		case cscGetPreferredConfiguration: // Get default video mode (depth and resolution)
-			D(bug(" GetPreferredConfiguration -> %04x/%08x\n", preferred_apple_mode, preferred_id));
+			D(bug(" GetPreferredConfiguration -> %02x/%08x\n", preferred_apple_mode, preferred_id));
 			WriteMacInt16(param + csMode, preferred_apple_mode);
 			WriteMacInt32(param + csData, preferred_id);
 			return noErr;