imported winuaesrc1610b3.zip

ar.c

@@ -686,7 +686,7 @@ static uae_u32 REGPARAM2 arram_lget (uaecptr addr)
     addr &= arram_mask;
     m = (uae_u32 *)(armemory_ram + addr);
     if (strncmp ("T8", (char*)m, 2) == 0)
-	write_log_debug (L"Reading T8 from addr %088x PC=%p\n", addr, m68k_getpc (&regs));
+	write_log_debug (L"Reading T8 from addr %08x PC=%p\n", addr, m68k_getpc (&regs));
     if (strncmp ("LAME", (char*)m, 4) == 0)
 	write_log_debug (L"Reading LAME from addr %08x PC=%p\n", addr, m68k_getpc (&regs));
     if (strncmp ("RES1", (char*)m, 4) == 0)
@@ -1479,7 +1479,8 @@ int action_replay_unload (int in_memory_reset)
 	L"ACTION_REPLAY_HIDE",
     };
 
-    write_log_debug (L"Action Replay State:(%s)\nHrtmon State:(%s)\n", state[action_replay_flag+3],state[hrtmon_flag+3]);
+    write_log_debug (L"Action Replay State:(%s)\nHrtmon State:(%s)\n",
+	state[action_replay_flag + 3], state[hrtmon_flag + 3]);
 
     if (armemory_rom && armodel == 1) {
 	if (is_ar_pc_in_ram() || is_ar_pc_in_rom() || action_replay_flag == ACTION_REPLAY_WAIT_PC) {
@@ -1849,7 +1850,7 @@ int hrtmon_load (void)
     return 1;
 }
 
-void hrtmon_map_banks ()
+void hrtmon_map_banks (void)
 {
     uaecptr addr;
 
@@ -1876,7 +1877,7 @@ void hrtmon_map_banks ()
 	map_banks (&hrtmem3_bank, hrtmem3_start >> 16, hrtmem3_size >> 16, 0);
 }
 
-static void hrtmon_unmap_banks ()
+static void hrtmon_unmap_banks (void)
 {
     uaecptr addr;
 
@@ -1917,8 +1918,8 @@ void action_replay_version(void)
     int iArVersionMinor = -1;
     char* pNext;
     uae_char sArDate[11];
-    *sArDate = '\0';
 
+    *sArDate = '\0';
     if (!armemory_rom)
 	return;
 
@@ -1960,7 +1961,9 @@ void action_replay_version(void)
     }
 
     if (iArVersionMajor > 0) {
-	write_log (L"Version of cart is '%d.%.02d', date is '%s'\n", iArVersionMajor, iArVersionMinor, sArDate);
+	TCHAR *s = au (sArDate);
+	write_log (L"Version of cart is '%d.%.02d', date is '%s'\n", iArVersionMajor, iArVersionMinor, s);
+	xfree (s);
     }
 }
 

bsdsocket.c

@@ -691,6 +691,7 @@ static uae_u32 bsdsocklib_SetDTableSize (SB, int newSize)
 {
     int *newdtable;
     int *newftable;
+    int *newmtable;
     int i;
 
     if (newSize < sb->dtablesize) {
@@ -698,25 +699,32 @@ static uae_u32 bsdsocklib_SetDTableSize (SB, int newSize)
 	return 0;
     }
 
-    newdtable = (int *)malloc(newSize * sizeof(*sb->dtable));
-    newftable = (int *)malloc(newSize * sizeof(*sb->ftable));
+    newdtable = (int *)calloc(newSize, sizeof(*sb->dtable));
+    newftable = (int *)calloc(newSize, sizeof(*sb->ftable));
+    newmtable = (int *)calloc(newSize, sizeof(*sb->mtable));
 
-    if (newdtable == NULL || newftable == NULL) {
+    if (newdtable == NULL || newftable == NULL || newmtable == NULL) {
 	sb->resultval = -1;
 	bsdsocklib_seterrno(sb, ENOMEM);
+	free (newdtable);
+	free (newftable);
+	free (newmtable);
 	return -1;
     }
 
     memcpy(newdtable, sb->dtable, sb->dtablesize * sizeof(*sb->dtable));
     memcpy(newftable, sb->ftable, sb->dtablesize * sizeof(*sb->ftable));
+    memcpy(newmtable, sb->mtable, sb->dtablesize * sizeof(*sb->mtable));
     for (i = sb->dtablesize + 1; i < newSize; i++)
 	newdtable[i] = -1;
 
     sb->dtablesize = newSize;
     free(sb->dtable);
     free(sb->ftable);
+    free(sb->mtable);
     sb->dtable = (SOCKET*)newdtable;
     sb->ftable = newftable;
+    sb->mtable = newmtable;
     sb->resultval = 0;
     return 0;
 }

cfgfile.c

@@ -985,6 +985,7 @@ static int cfgfile_parse_host (struct uae_prefs *p, TCHAR *option, TCHAR *value)
 	|| cfgfile_intval (option, value, L"gfx_height_fullscreen", &p->gfx_size_fs.height, 1)
 	|| cfgfile_intval (option, value, L"gfx_refreshrate", &p->gfx_refreshrate, 1)
 	|| cfgfile_intval (option, value, L"gfx_autoresolution", &p->gfx_autoresolution, 1)
+	|| cfgfile_intval (option, value, L"gfx_backbuffers", &p->gfx_backbuffers, 1)
 
 	|| cfgfile_intval (option, value, L"gfx_center_horizontal_position", &p->gfx_xcenter_pos, 1)
 	|| cfgfile_intval (option, value, L"gfx_center_vertical_position", &p->gfx_ycenter_pos, 1)
@@ -3172,6 +3173,7 @@ void default_prefs (struct uae_prefs *p, int type)
     p->gfx_max_vertical = 1;
     p->color_mode = 2;
     p->gfx_blackerthanblack = 0;
+    p->gfx_backbuffers = 2;
 
     p->x11_use_low_bandwidth = 0;
     p->x11_use_mitshm = 0;