imported winuaesrc1610b3.zip

diff --git a/ChangeLog b/ChangeLog
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/a2091.c b/a2091.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/adide.c b/adide.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/akiko.c b/akiko.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/akiko2.c b/akiko2.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/amax.c b/amax.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/ar.c b/ar.c
old mode 100644 (file)
new mode 100755 (executable)
index 361c73c..ac72981
--- a/ar.c
+++ b/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);
     }
 }
 

diff --git a/arcadia.c b/arcadia.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/7z/7zBuf.c b/archivers/7z/7zBuf.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/7z/7zBuf.h b/archivers/7z/7zBuf.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/7z/7zCrc.c b/archivers/7z/7zCrc.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/7z/7zCrc.h b/archivers/7z/7zCrc.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/7z/7zStream.c b/archivers/7z/7zStream.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/7z/7zVersion.h b/archivers/7z/7zVersion.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/7z/Archive/7z/7zAlloc.c b/archivers/7z/Archive/7z/7zAlloc.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/7z/Archive/7z/7zAlloc.h b/archivers/7z/Archive/7z/7zAlloc.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/7z/Archive/7z/7zDecode.c b/archivers/7z/Archive/7z/7zDecode.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/7z/Archive/7z/7zDecode.h b/archivers/7z/Archive/7z/7zDecode.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/7z/Archive/7z/7zExtract.c b/archivers/7z/Archive/7z/7zExtract.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/7z/Archive/7z/7zExtract.h b/archivers/7z/Archive/7z/7zExtract.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/7z/Archive/7z/7zHeader.c b/archivers/7z/Archive/7z/7zHeader.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/7z/Archive/7z/7zHeader.h b/archivers/7z/Archive/7z/7zHeader.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/7z/Archive/7z/7zIn.c b/archivers/7z/Archive/7z/7zIn.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/7z/Archive/7z/7zIn.h b/archivers/7z/Archive/7z/7zIn.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/7z/Archive/7z/7zItem.c b/archivers/7z/Archive/7z/7zItem.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/7z/Archive/7z/7zItem.h b/archivers/7z/Archive/7z/7zItem.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/7z/Bcj2.c b/archivers/7z/Bcj2.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/7z/Bcj2.h b/archivers/7z/Bcj2.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/7z/Bra.c b/archivers/7z/Bra.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/7z/Bra.h b/archivers/7z/Bra.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/7z/Bra86.c b/archivers/7z/Bra86.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/7z/CpuArch.h b/archivers/7z/CpuArch.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/7z/LzmaDec.c b/archivers/7z/LzmaDec.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/7z/LzmaDec.h b/archivers/7z/LzmaDec.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/7z/Types.h b/archivers/7z/Types.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/dms/cdata.h b/archivers/dms/cdata.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/dms/crc_csum.c b/archivers/dms/crc_csum.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/dms/crc_csum.h b/archivers/dms/crc_csum.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/dms/getbits.c b/archivers/dms/getbits.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/dms/getbits.h b/archivers/dms/getbits.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/dms/maketbl.c b/archivers/dms/maketbl.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/dms/maketbl.h b/archivers/dms/maketbl.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/dms/pfile.c b/archivers/dms/pfile.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/dms/pfile.h b/archivers/dms/pfile.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/dms/tables.c b/archivers/dms/tables.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/dms/tables.h b/archivers/dms/tables.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/dms/u_deep.c b/archivers/dms/u_deep.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/dms/u_deep.h b/archivers/dms/u_deep.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/dms/u_heavy.c b/archivers/dms/u_heavy.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/dms/u_heavy.h b/archivers/dms/u_heavy.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/dms/u_init.c b/archivers/dms/u_init.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/dms/u_init.h b/archivers/dms/u_init.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/dms/u_medium.c b/archivers/dms/u_medium.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/dms/u_medium.h b/archivers/dms/u_medium.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/dms/u_quick.c b/archivers/dms/u_quick.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/dms/u_quick.h b/archivers/dms/u_quick.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/dms/u_rle.c b/archivers/dms/u_rle.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/dms/u_rle.h b/archivers/dms/u_rle.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/lha/crcio.c b/archivers/lha/crcio.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/lha/dhuf.c b/archivers/lha/dhuf.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/lha/header.c b/archivers/lha/header.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/lha/huf.c b/archivers/lha/huf.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/lha/larc.c b/archivers/lha/larc.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/lha/lha.h b/archivers/lha/lha.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/lha/lha_macro.h b/archivers/lha/lha_macro.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/lha/lhamaketbl.c b/archivers/lha/lhamaketbl.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/lha/lharc.c b/archivers/lha/lharc.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/lha/shuf.c b/archivers/lha/shuf.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/lha/slide.c b/archivers/lha/slide.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/lha/uae_lha.c b/archivers/lha/uae_lha.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/lha/util.c b/archivers/lha/util.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/lzx/unlzx.c b/archivers/lzx/unlzx.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/wrp/warp.c b/archivers/wrp/warp.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/wrp/warp.h b/archivers/wrp/warp.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/xfd/main.c b/archivers/xfd/main.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/xfd/xfd.c b/archivers/xfd/xfd.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/xfd/xfdmaster.h b/archivers/xfd/xfdmaster.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/zip/unzip.c b/archivers/zip/unzip.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/archivers/zip/unzip.h b/archivers/zip/unzip.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/audio.c b/audio.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/autoconf.c b/autoconf.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/blitops.c b/blitops.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/blitter.c b/blitter.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/blkdev.c b/blkdev.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/bsdsocket.c b/bsdsocket.c
old mode 100644 (file)
new mode 100755 (executable)
index f2e7f83..beeea2a
--- a/bsdsocket.c
+++ b/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;
 }

diff --git a/build68k.c b/build68k.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/catweasel.c b/catweasel.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/cd32_fmv.c b/cd32_fmv.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/cdrom.c b/cdrom.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/cdtv.c b/cdtv.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/cfgfile.c b/cfgfile.c
old mode 100644 (file)
new mode 100755 (executable)
index 2007637..9212d6c
--- a/cfgfile.c
+++ b/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;

diff --git a/cia.c b/cia.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/core.cw4.c b/core.cw4.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/cpu_small.c b/cpu_small.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/cpummu.c b/cpummu.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/cpuopti.c b/cpuopti.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/cpustbl_small.c b/cpustbl_small.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/cputbl_small.h b/cputbl_small.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/crc32.c b/crc32.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/custom.c b/custom.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/debug.c b/debug.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/disk.c b/disk.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/diskutil.c b/diskutil.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/drawing.c b/drawing.c
old mode 100644 (file)
new mode 100755 (executable)
index 84358ff..e111d49
--- a/drawing.c
+++ b/drawing.c
@@ -2471,6 +2471,8 @@ void draw_status_line_single (uae_u8 *buf, int bpp, int y, int totalwidth, uae_u
            pos = 2;
            on_rgb = 0x000000;
            off_rgb = 0x000000;
+           if (fps > 999)
+               fps = 999;
            num1 = fps / 100;
            num2 = (fps - num1 * 100) / 10;
            num3 = fps % 10;

diff --git a/driveclick.c b/driveclick.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/enforcer.c b/enforcer.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/epsonprinter.c b/epsonprinter.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/ersatz.c b/ersatz.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/expansion.c b/expansion.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/fdi2raw.c b/fdi2raw.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/filesys.asm b/filesys.asm
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/filesys.c b/filesys.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/filesys.sh b/filesys.sh
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/filesys_bootrom.c b/filesys_bootrom.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/fpp.c b/fpp.c
old mode 100644 (file)
new mode 100755 (executable)
index e46d50c..1d8e3b5
--- a/fpp.c
+++ b/fpp.c
@@ -1621,6 +1621,13 @@ void fpuop_arithmetic (uae_u32 opcode, struct regstruct *regs, uae_u16 extra)
     op_illg (opcode, regs);
 }
 
+void fpu_reset (void)
+{
+    regs.fpcr = regs.fpsr = regs.fpiar = 0;
+    regs.fp_result = 1;
+    fpux_restore (NULL);
+}
+
 uae_u8 *restore_fpu (uae_u8 *src)
 {
     int i;

diff --git a/fsdb.c b/fsdb.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/fsdb_unix.c b/fsdb_unix.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/fsusage.c b/fsusage.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/gayle.c b/gayle.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/genblitter.c b/genblitter.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/gencpu.c b/gencpu.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/gencpu_mini.c b/gencpu_mini.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/gengenblitter.c b/gengenblitter.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/genlinetoscr.c b/genlinetoscr.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/genp2c.c b/genp2c.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/gfxlib.c b/gfxlib.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/gfxutil.c b/gfxutil.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/gtkui.c b/gtkui.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/hardfile.c b/hardfile.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/hrtmon_rom.c b/hrtmon_rom.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/identify.c b/identify.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/a2091.h b/include/a2091.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/akiko.h b/include/akiko.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/amax.h b/include/amax.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/ar.h b/include/ar.h
old mode 100644 (file)
new mode 100755 (executable)
index 81b58d4..d2ef971
--- a/include/ar.h
+++ b/include/ar.h
@@ -40,18 +40,18 @@ extern void action_replay_hide (void);
 extern void action_replay_reset (void);
 extern int action_replay_load (void);
 
-extern void action_replay_memory_reset(void);
+extern void action_replay_memory_reset (void);
 extern void action_replay_init (int);
 extern void action_replay_cleanup (void);
-extern void action_replay_chipwrite(void);
-extern void action_replay_map_banks(void);
+extern void action_replay_chipwrite (void);
+extern void action_replay_map_banks (void);
 extern void REGPARAM3 chipmem_lput_actionreplay23 (uaecptr addr, uae_u32 l) REGPARAM;
 extern void REGPARAM3 chipmem_wput_actionreplay23 (uaecptr addr, uae_u32 w) REGPARAM;
 extern void REGPARAM3 chipmem_bput_actionreplay1 (uaecptr addr, uae_u32 b) REGPARAM;
 extern void REGPARAM3 chipmem_wput_actionreplay1 (uaecptr addr, uae_u32 w) REGPARAM;
 extern void REGPARAM3 chipmem_lput_actionreplay1 (uaecptr addr, uae_u32 l) REGPARAM;
 
-extern void action_replay_version(void);
+extern void action_replay_version (void);
 
 extern void descramble_nordicpro (uae_u8*, int, int);
 
@@ -63,7 +63,7 @@ extern void hrtmon_ciaread (void);
 extern void hrtmon_hide (void);
 extern void hrtmon_reset (void);
 extern int hrtmon_load (void);
-extern void hrtmon_map_banks(void);
+extern void hrtmon_map_banks (void);
 
 /*extern uae_u8 *hrtmemory;*/
 extern uae_u32 hrtmem_start, hrtmem_size;

diff --git a/include/arcadia.h b/include/arcadia.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/audio.h b/include/audio.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/autoconf.h b/include/autoconf.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/blitter.h b/include/blitter.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/blkdev.h b/include/blkdev.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/bsdsocket.h b/include/bsdsocket.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/catweasel.h b/include/catweasel.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/cd32_fmv.h b/include/cd32_fmv.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/cdtv.h b/include/cdtv.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/cia.h b/include/cia.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/clipboard.h b/include/clipboard.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/commpipe.h b/include/commpipe.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/cpu_prefetch.h b/include/cpu_prefetch.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/cpu_small.h b/include/cpu_small.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/cpummu.h b/include/cpummu.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/crc32.h b/include/crc32.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/custom.h b/include/custom.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/debug.h b/include/debug.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/disk.h b/include/disk.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/diskutil.h b/include/diskutil.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/drawing.h b/include/drawing.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/driveclick.h b/include/driveclick.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/enforcer.h b/include/enforcer.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/epsonprinter.h b/include/epsonprinter.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/ersatz.h b/include/ersatz.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/events.h b/include/events.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/events_jit.h b/include/events_jit.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/events_normal.h b/include/events_normal.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/execio.h b/include/execio.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/execlib.h b/include/execlib.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/fdi2raw.h b/include/fdi2raw.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/filesys.h b/include/filesys.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/flags_x86.h b/include/flags_x86.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/fpp-ieee-be.h b/include/fpp-ieee-be.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/fpp-unknown.h b/include/fpp-unknown.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/fsdb.h b/include/fsdb.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/fsusage.h b/include/fsusage.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/gayle.h b/include/gayle.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/genblitter.h b/include/genblitter.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/gensound.h b/include/gensound.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/gfxfilter.h b/include/gfxfilter.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/gui.h b/include/gui.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/identify.h b/include/identify.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/inputdevice.h b/include/inputdevice.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/keyboard.h b/include/keyboard.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/keybuf.h b/include/keybuf.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/mackbd.h b/include/mackbd.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/memory.h b/include/memory.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/moduleripper.h b/include/moduleripper.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/native2amiga.h b/include/native2amiga.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/native2amiga_api.h b/include/native2amiga_api.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/ncr_scsi.h b/include/ncr_scsi.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/newcpu.h b/include/newcpu.h
old mode 100644 (file)
new mode 100755 (executable)
index e9429e0..e826810
--- a/include/newcpu.h
+++ b/include/newcpu.h
@@ -316,6 +316,9 @@ extern void fpuop_bcc(uae_u32, struct regstruct *regs, uaecptr, uae_u32);
 extern void fpuop_save(uae_u32, struct regstruct *regs);
 extern void fpuop_restore(uae_u32, struct regstruct *regs);
 extern uae_u32 fpp_get_fpsr (const struct regstruct *regs);
+extern void fpu_reset (void);
+extern void fpux_save (int*);
+extern void fpux_restore (int*);
 
 extern void exception3 (uae_u32 opcode, uaecptr addr, uaecptr fault);
 extern void exception3i (uae_u32 opcode, uaecptr addr, uaecptr fault);

diff --git a/include/options.h b/include/options.h
old mode 100644 (file)
new mode 100755 (executable)
index c5d101d..ff578fd
--- a/include/options.h
+++ b/include/options.h
@@ -180,6 +180,7 @@ struct uae_prefs {
     int gfx_max_horizontal, gfx_max_vertical;
     int gfx_saturation, gfx_luminance, gfx_contrast, gfx_gamma;
     int gfx_blackerthanblack;
+    int gfx_backbuffers;
     int color_mode;
 
     int gfx_filter;

diff --git a/include/osemu.h b/include/osemu.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/parallel.h b/include/parallel.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/picasso96.h b/include/picasso96.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/readcpu.h b/include/readcpu.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/rtgmodes.h b/include/rtgmodes.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/sana2.h b/include/sana2.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/savestate.h b/include/savestate.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/scsi.h b/include/scsi.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/scsidev.h b/include/scsidev.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/serial.h b/include/serial.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/statusline.h b/include/statusline.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/sysdeps.h b/include/sysdeps.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/traps.h b/include/traps.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/uae.h b/include/uae.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/uaeexe.h b/include/uaeexe.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/uaeipc.h b/include/uaeipc.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/uaeresource.h b/include/uaeresource.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/uaeserial.h b/include/uaeserial.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/xwin.h b/include/xwin.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/include/zarchive.h b/include/zarchive.h
old mode 100644 (file)
new mode 100755 (executable)
index 634b64a..db65a2c
--- a/include/zarchive.h
+++ b/include/zarchive.h
@@ -76,6 +76,7 @@ struct zarchive_info
 #define ArchiveFormatLHA 'lha '
 #define ArchiveFormatLZX 'lzx '
 #define ArchiveFormatPLAIN '----'
+#define ArchiveFormatDIR 'DIR '
 #define ArchiveFormatAA 'aa  ' // method only
 #define ArchiveFormatADF 'DOS '
 #define ArchiveFormatRDB 'RDSK'
@@ -111,6 +112,7 @@ extern struct zvolume *archive_directory_rdb (struct zfile *z);
 extern struct zfile *archive_access_rdb (struct znode *zn);
 extern struct zvolume *archive_directory_fat (struct zfile *z);
 extern struct zfile *archive_access_fat (struct znode *zn);
+extern struct zfile *archive_access_dir (struct znode *zn);
 
 extern struct zfile *archive_access_select (struct znode *parent, struct zfile *zf, unsigned int id, int doselect, int *retcode);
 extern struct zfile *archive_access_arcacc_select (struct zfile *zf, unsigned int id, int *retcode);

diff --git a/include/zfile.h b/include/zfile.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/inprec.c b/inprec.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/inputdevice.c b/inputdevice.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/inputevents.def b/inputevents.def
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/jit/codegen_x86.c b/jit/codegen_x86.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/jit/codegen_x86.h b/jit/codegen_x86.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/jit/compemu.h b/jit/compemu.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/jit/compemu_codegen.h b/jit/compemu_codegen.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/jit/compemu_fpp.c b/jit/compemu_fpp.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/jit/compemu_optimizer_x86.c b/jit/compemu_optimizer_x86.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/jit/compemu_raw_x86.c b/jit/compemu_raw_x86.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/jit/compemu_support.c b/jit/compemu_support.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/jit/compemu_support_codegen.c b/jit/compemu_support_codegen.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/jit/gencomp.c b/jit/gencomp.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/keybuf.c b/keybuf.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/main.c b/main.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/memory.c b/memory.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/missing.c b/missing.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/moduleripper.c b/moduleripper.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/native2amiga.c b/native2amiga.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/ncr_scsi.c b/ncr_scsi.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/newcpu.c b/newcpu.c
old mode 100644 (file)
new mode 100755 (executable)
index ed7d40d..7c03253
--- a/newcpu.c
+++ b/newcpu.c
@@ -1614,10 +1614,9 @@ void m68k_reset (int hardreset)
     SET_NFLG (&regs.ccrflags, 0);
     regs.intmask = 7;
     regs.vbr = regs.sfc = regs.dfc = 0;
-#ifdef FPUEMU
-    regs.fpcr = regs.fpsr = regs.fpiar = 0;
-    regs.fp_result = 1;
     regs.irc = 0xffff;
+#ifdef FPUEMU
+    fpu_reset ();
 #endif
     regs.caar = regs.cacr = 0;
     regs.itt0 = regs.itt1 = regs.dtt0 = regs.dtt1 = 0;

diff --git a/nogui.c b/nogui.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/7zplugin.c b/od-win32/7zplugin.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/WinUAE_Install.nsi b/od-win32/WinUAE_Install.nsi
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/ahidsound.h b/od-win32/ahidsound.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/ahidsound_dsonly.c b/od-win32/ahidsound_dsonly.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/ahidsound_new.c b/od-win32/ahidsound_new.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/ahidsound_new.h b/od-win32/ahidsound_new.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/ahidsound_new2.c b/od-win32/ahidsound_new2.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/ahidsound_unified.c b/od-win32/ahidsound_unified.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/ahidsoundx_new.c b/od-win32/ahidsoundx_new.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/asm.cmd b/od-win32/asm.cmd
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/avioutput.c b/od-win32/avioutput.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/avioutput.h b/od-win32/avioutput.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/blkdev_win32_aspi.c b/od-win32/blkdev_win32_aspi.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/blkdev_win32_ioctl.c b/od-win32/blkdev_win32_ioctl.c
old mode 100644 (file)
new mode 100755 (executable)
index b339c97..3c335b7
--- a/od-win32/blkdev_win32_ioctl.c
+++ b/od-win32/blkdev_win32_ioctl.c
@@ -62,7 +62,7 @@ static void reseterrormode (int unitnum)
 static void close_device (int unitnum);
 static int open_device (int unitnum);
 
-static void mcierr(TCHAR *str, DWORD err)
+static void mcierr (TCHAR *str, DWORD err)
 {
     TCHAR es[1000];
     if (err == MMSYSERR_NOERROR)

diff --git a/od-win32/blkdev_win32_spti.c b/od-win32/blkdev_win32_spti.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/bsdsock.c b/od-win32/bsdsock.c
old mode 100644 (file)
new mode 100755 (executable)
index 4fde94f..ae29348
--- a/od-win32/bsdsock.c
+++ b/od-win32/bsdsock.c
@@ -344,14 +344,17 @@ void host_sbcleanup(SB)
                        bsd->asyncsb[i] = NULL;
        }
 
-       if (sb->hEvent != NULL)
+       if (sb->hEvent != NULL) {
                CloseHandle(sb->hEvent);
+               sb->hEvent = NULL;
+       }
 
        for (i = sb->dtablesize; i--; ) {
                if (sb->dtable[i] != INVALID_SOCKET)
                        host_closesocketquick(sb->dtable[i]);
+               sb->dtable[i] = INVALID_SOCKET;
 
-               if (sb->mtable[i])
+               if (sb->mtable && sb->mtable[i])
                        bsd->asyncsb[(sb->mtable[i] - 0xb000) / 2] = NULL;
        }
 
@@ -359,6 +362,7 @@ void host_sbcleanup(SB)
        closesocket(sb->sockAbort);
 
        free(sb->mtable);
+       sb->mtable = NULL;
 }
 
 void host_sbreset(void)

diff --git a/od-win32/build68k_msvc/build68k_msvc.rc b/od-win32/build68k_msvc/build68k_msvc.rc
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/build68k_msvc/build68k_msvc.vcproj b/od-win32/build68k_msvc/build68k_msvc.vcproj
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/build68k_msvc/build68k_msvc.vcxproj b/od-win32/build68k_msvc/build68k_msvc.vcxproj
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/build68k_msvc/build68k_msvc.vcxproj.filters b/od-win32/build68k_msvc/build68k_msvc.vcxproj.filters
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/caps/CapsAPI.h b/od-win32/caps/CapsAPI.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/caps/CapsLib.h b/od-win32/caps/CapsLib.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/caps/Comlib.h b/od-win32/caps/Comlib.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/caps/Comtype.h b/od-win32/caps/Comtype.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/caps/caps_win32.c b/od-win32/caps/caps_win32.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/caps/caps_win32.h b/od-win32/caps/caps_win32.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/clipboard_win32.c b/od-win32/clipboard_win32.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/clipboard_win32.h b/od-win32/clipboard_win32.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/clirun.c b/od-win32/clirun.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/cloanto/RetroPlatformGuestIPC.c b/od-win32/cloanto/RetroPlatformGuestIPC.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/cloanto/RetroPlatformGuestIPC.h b/od-win32/cloanto/RetroPlatformGuestIPC.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/cloanto/RetroPlatformIPC.h b/od-win32/cloanto/RetroPlatformIPC.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/cloanto/RetroPlatformIPC_doc_draft.txt b/od-win32/cloanto/RetroPlatformIPC_doc_draft.txt
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/debug_win32.c b/od-win32/debug_win32.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/debug_win32.h b/od-win32/debug_win32.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/dinput.c b/od-win32/dinput.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/direct3d.c b/od-win32/direct3d.c
old mode 100644 (file)
new mode 100755 (executable)
index fd260bf..d4d655e
--- a/od-win32/direct3d.c
+++ b/od-win32/direct3d.c
@@ -607,7 +607,7 @@ static LPDIRECT3DTEXTURE9 createtext (int *ww, int *hh, D3DFORMAT format)
 
     w = *ww;
     h = *hh;
-    if (!tex_pow2) {
+    if (tex_pow2) {
        if (w < 256)
            w = 256;
        else if (w < 512)
@@ -633,16 +633,27 @@ static LPDIRECT3DTEXTURE9 createtext (int *ww, int *hh, D3DFORMAT format)
        else
            h = 8192;
     }
+    if (tex_square) {
+        if (w > h)
+           h = w;
+       else
+           w = h;
+    }
 
     if (tex_dynamic) {
         hr = IDirect3DDevice9_CreateTexture (d3ddev, w, h, 1, D3DUSAGE_DYNAMIC, format,
            D3DPOOL_DEFAULT, &t, NULL);
-    } else {
+       if (FAILED (hr))
+           write_log (L"IDirect3DDevice9_CreateTexture() D3DUSAGE_DYNAMIC failed: %s (%d*%d %08x)\n",
+               D3D_ErrorString (hr), w, h, format);
+    }
+    if (!tex_dynamic || (tex_dynamic && FAILED (hr))) {
         hr = IDirect3DDevice9_CreateTexture (d3ddev, w, h, 1, 0, format,
            D3DPOOL_MANAGED, &t, NULL);
     }
     if (FAILED (hr)) {
-        write_log (L"IDirect3DDevice9_CreateTexture failed: %s\n", D3D_ErrorString (hr));
+        write_log (L"IDirect3DDevice9_CreateTexture() failed: %s (%d*%d %08x)\n",
+           D3D_ErrorString (hr), w, h, format);
        return 0;
     }
 
@@ -1167,9 +1178,8 @@ const TCHAR *D3D_init (HWND ahwnd, int w_w, int w_h, int t_w, int t_h, int depth
        tex_dynamic = TRUE;
 
     if(d3dCaps.PixelShaderVersion >= D3DPS_VERSION(2,0)) {
-       if((d3dCaps.DevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT) && tex_dynamic) {
+       if((d3dCaps.DevCaps & D3DDEVCAPS_HWTRANSFORMANDLIGHT) && tex_dynamic && !tex_pow2 && !tex_square) {
            psEnabled = TRUE;
-           tex_pow2 = TRUE;
        } else {
            psEnabled = FALSE;
        }
@@ -1180,10 +1190,10 @@ const TCHAR *D3D_init (HWND ahwnd, int w_w, int w_h, int t_w, int t_h, int depth
     max_texture_w = d3dCaps.MaxTextureWidth;
     max_texture_h = d3dCaps.MaxTextureHeight;
 
-    write_log (L"D3D: PS=%d.%d VS=%d.%d Square=%d, Pow2=%d, Tex Size=%d*%d\n",
+    write_log (L"D3D: PS=%d.%d VS=%d.%d Square=%d, Pow2=%d, Dyn=%d, %d*%d\n",
        (d3dCaps.PixelShaderVersion >> 8) & 0xff, d3dCaps.PixelShaderVersion & 0xff,
        (d3dCaps.VertexShaderVersion >> 8) & 0xff, d3dCaps.VertexShaderVersion & 0xff,
-       tex_square, tex_pow2,
+       tex_square, tex_pow2, tex_dynamic,
        max_texture_w, max_texture_h);
 
     if (max_texture_w < t_w || max_texture_h < t_h) {
@@ -1265,9 +1275,10 @@ void D3D_clear (void)
     }
 }
 
-static void D3D_render2 (int clear)
+static void D3D_render22 (int clear)
 {
     HRESULT hr;
+
     if (!d3d_enabled)
        return;
     if (FAILED (IDirect3DDevice9_TestCooperativeLevel (d3ddev)))
@@ -1360,6 +1371,16 @@ static void D3D_render2 (int clear)
 
     hr = IDirect3DDevice9_EndScene (d3ddev);
     hr = IDirect3DDevice9_Present (d3ddev, NULL, NULL, NULL, NULL);
+
+}
+
+static void D3D_render2 (int clear)
+{   
+    int fpuv;
+
+    fpux_save (&fpuv);
+    D3D_render22 (clear);
+    fpux_restore (&fpuv);
 }
 
 void D3D_render (void)

diff --git a/od-win32/direct3d.h b/od-win32/direct3d.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/diskutil.c b/od-win32/diskutil.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/diskutil.h b/od-win32/diskutil.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/driveclick_win32.c b/od-win32/driveclick_win32.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/dxwrap.c b/od-win32/dxwrap.c
old mode 100644 (file)
new mode 100755 (executable)
index ed4f414..7993c25
--- a/od-win32/dxwrap.c
+++ b/od-win32/dxwrap.c
@@ -354,25 +354,32 @@ HRESULT DirectDraw_CreateMainSurface (int width, int height)
     desc.dwFlags = DDSD_CAPS;
     desc.ddsCaps.dwCaps = DDSCAPS_PRIMARYSURFACE;
     if (dxdata.fsmodeset) {
+       int ok = 0;
        DWORD oldcaps = desc.ddsCaps.dwCaps;
        DWORD oldflags = desc.dwFlags;
        desc.dwFlags |= DDSD_BACKBUFFERCOUNT;
        desc.ddsCaps.dwCaps |= DDSCAPS_COMPLEX | DDSCAPS_FLIP;
-       desc.dwBackBufferCount = 2;
-       ddrval = IDirectDraw7_CreateSurface (dxdata.maindd, &desc, &dxdata.primary, NULL);
-       if (SUCCEEDED (ddrval)) {
-           DDSCAPS2 ddscaps;
-           memset (&ddscaps, 0, sizeof (ddscaps));
-           ddscaps.dwCaps = DDSCAPS_BACKBUFFER;
-           ddrval = IDirectDrawSurface7_GetAttachedSurface (dxdata.primary, &ddscaps, &dxdata.flipping[0]);
-           if(SUCCEEDED (ddrval)) {
+       desc.dwBackBufferCount = currprefs.gfx_backbuffers;
+       if (desc.dwBackBufferCount > 0) {
+           ddrval = IDirectDraw7_CreateSurface (dxdata.maindd, &desc, &dxdata.primary, NULL);
+           if (SUCCEEDED (ddrval)) {
+               DDSCAPS2 ddscaps;
                memset (&ddscaps, 0, sizeof (ddscaps));
-               ddscaps.dwCaps = DDSCAPS_FLIP;
-               ddrval = IDirectDrawSurface7_GetAttachedSurface (dxdata.flipping[0], &ddscaps, &dxdata.flipping[1]);
+               ddscaps.dwCaps = DDSCAPS_BACKBUFFER;
+               ddrval = IDirectDrawSurface7_GetAttachedSurface (dxdata.primary, &ddscaps, &dxdata.flipping[0]);
+               if(SUCCEEDED (ddrval)) {
+                   if (desc.dwBackBufferCount > 1) {
+                       memset (&ddscaps, 0, sizeof (ddscaps));
+                       ddscaps.dwCaps = DDSCAPS_FLIP;
+                       ddrval = IDirectDrawSurface7_GetAttachedSurface (dxdata.flipping[0], &ddscaps, &dxdata.flipping[1]);
+                   }
+               }
+               if (FAILED (ddrval))
+                   write_log (L"IDirectDrawSurface7_GetAttachedSurface: %s\n", DXError (ddrval));
+               ok = 1;
            }
-           if (FAILED (ddrval))
-               write_log (L"IDirectDrawSurface7_GetAttachedSurface: %s\n", DXError (ddrval));
-       } else {
+       }
+       if (!ok) {
            desc.dwBackBufferCount = 0;
            desc.ddsCaps.dwCaps = oldcaps;
            desc.dwFlags = oldflags;

diff --git a/od-win32/dxwrap.h b/od-win32/dxwrap.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/fdrawcmd.c b/od-win32/fdrawcmd.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/fsdb_mywin32.c b/od-win32/fsdb_mywin32.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/fsdb_win32.c b/od-win32/fsdb_win32.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/genblitter_msvc/genblitter_msvc.vcproj b/od-win32/genblitter_msvc/genblitter_msvc.vcproj
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/genblitter_msvc/genblitter_msvc.vcxproj b/od-win32/genblitter_msvc/genblitter_msvc.vcxproj
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/genblitter_msvc/genblitter_msvc.vcxproj.filters b/od-win32/genblitter_msvc/genblitter_msvc.vcxproj.filters
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/gencomp_msvc/gencomp_msvc.vcproj b/od-win32/gencomp_msvc/gencomp_msvc.vcproj
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/gencomp_msvc/gencomp_msvc.vcxproj b/od-win32/gencomp_msvc/gencomp_msvc.vcxproj
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/gencomp_msvc/gencomp_msvc.vcxproj.filters b/od-win32/gencomp_msvc/gencomp_msvc.vcxproj.filters
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/gencpu_msvc/gencpu.exe.manifest b/od-win32/gencpu_msvc/gencpu.exe.manifest
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/gencpu_msvc/gencpu_msvc.vcproj b/od-win32/gencpu_msvc/gencpu_msvc.vcproj
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/gencpu_msvc/gencpu_msvc.vcxproj b/od-win32/gencpu_msvc/gencpu_msvc.vcxproj
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/gencpu_msvc/gencpu_msvc.vcxproj.filters b/od-win32/gencpu_msvc/gencpu_msvc.vcxproj.filters
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcproj b/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcproj
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj b/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj.filters b/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj.filters
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/graphics/amiga_header.bmp b/od-win32/graphics/amiga_header.bmp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/graphics/amiga_welcome.bmp b/od-win32/graphics/amiga_welcome.bmp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/graphics/installer_icon.ico b/od-win32/graphics/installer_icon.ico
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/hardfile_win32.c b/od-win32/hardfile_win32.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/hq2x16.asm b/od-win32/hq2x16.asm
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/hq2x32.asm b/od-win32/hq2x32.asm
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/hq2x_d3d.c b/od-win32/hq2x_d3d.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/hq2x_d3d.h b/od-win32/hq2x_d3d.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/hq3x16.asm b/od-win32/hq3x16.asm
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/hq3x32.asm b/od-win32/hq3x32.asm
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/hq4x16.asm b/od-win32/hq4x16.asm
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/hq4x32.asm b/od-win32/hq4x32.asm
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/ioport.c b/od-win32/ioport.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/ioport.h b/od-win32/ioport.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/ipctester.c b/od-win32/ipctester.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/keyboard_win32.c b/od-win32/keyboard_win32.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/lcd.c b/od-win32/lcd.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/lcd.h b/od-win32/lcd.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/machdep/m68k.h b/od-win32/machdep/m68k.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/machdep/maccess.h b/od-win32/machdep/maccess.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/machdep/rpt.h b/od-win32/machdep/rpt.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/machdep/support.c b/od-win32/machdep/support.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/makeexe.cmd b/od-win32/makeexe.cmd
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/md-fpp.h b/od-win32/md-fpp.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/midi.c b/od-win32/midi.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/midi.h b/od-win32/midi.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/midiin.c b/od-win32/midiin.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/mman.c b/od-win32/mman.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/opengl.c b/od-win32/opengl.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/opengl.h b/od-win32/opengl.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/parser.c b/od-win32/parser.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/parser.h b/od-win32/parser.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/picasso96_win.c b/od-win32/picasso96_win.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/picasso96_win.h b/od-win32/picasso96_win.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/posixemu.c b/od-win32/posixemu.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/posixemu.h b/od-win32/posixemu.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/registry.c b/od-win32/registry.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/registry.h b/od-win32/registry.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/35floppy.ico b/od-win32/resources/35floppy.ico
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/Mycomp.ico b/od-win32/resources/Mycomp.ico
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/WinUAE_German.rc b/od-win32/resources/WinUAE_German.rc
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/amiga.png b/od-win32/resources/amiga.png
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/amigainfo.ico b/od-win32/resources/amigainfo.ico
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/avioutput.ico b/od-win32/resources/avioutput.ico
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/chip.ico b/od-win32/resources/chip.ico
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/cpu.ico b/od-win32/resources/cpu.ico
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/drive.ico b/od-win32/resources/drive.ico
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/drive_click.wav b/od-win32/resources/drive_click.wav
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/drive_snatch.wav b/od-win32/resources/drive_snatch.wav
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/drive_spin.wav b/od-win32/resources/drive_spin.wav
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/drive_spinnd.wav b/od-win32/resources/drive_spinnd.wav
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/drive_startup.wav b/od-win32/resources/drive_startup.wav
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/file.ico b/od-win32/resources/file.ico
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/folder.ico b/od-win32/resources/folder.ico
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/h_arrow.cur b/od-win32/resources/h_arrow.cur
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/joystick.ico b/od-win32/resources/joystick.ico
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/lcd.bmp b/od-win32/resources/lcd.bmp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/misc.ico b/od-win32/resources/misc.ico
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/move_dow.ico b/od-win32/resources/move_dow.ico
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/move_up.ico b/od-win32/resources/move_up.ico
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/paths.ico b/od-win32/resources/paths.ico
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/quickstart.ico b/od-win32/resources/quickstart.ico
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/resource b/od-win32/resources/resource
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/root.ico b/od-win32/resources/root.ico
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/screen.ico b/od-win32/resources/screen.ico
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/sound.ico b/od-win32/resources/sound.ico
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/winuae.exe.manifest b/od-win32/resources/winuae.exe.manifest
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/winuae.ico b/od-win32/resources/winuae.ico
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/winuae9.exe.manifest b/od-win32/resources/winuae9.exe.manifest
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/winuae_minimal.rc b/od-win32/resources/winuae_minimal.rc
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/winuae_old.rc b/od-win32/resources/winuae_old.rc
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/resources/xarcade-winuae.bmp b/od-win32/resources/xarcade-winuae.bmp
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/rp.c b/od-win32/rp.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/rp.h b/od-win32/rp.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/scaler.c b/od-win32/scaler.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/scaler2.c b/od-win32/scaler2.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/scaler_more.c b/od-win32/scaler_more.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/screenshot.c b/od-win32/screenshot.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/scsidef.h b/od-win32/scsidef.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/serial_win32.c b/od-win32/serial_win32.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/sfhelper.c b/od-win32/sfhelper.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/shm.c b/od-win32/shm.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/soundcheck.c b/od-win32/soundcheck.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/sounddep/sound.c b/od-win32/sounddep/sound.c
old mode 100644 (file)
new mode 100755 (executable)
index c45d548..cc1bac6
--- a/od-win32/sounddep/sound.c
+++ b/od-win32/sounddep/sound.c
@@ -1470,11 +1470,11 @@ static void OpenALEnumerate (struct sound_device *sds, const char *pDeviceNames,
                    if (iMajorVersion > 1 || (iMajorVersion == 1 && iMinorVersion > 0)) {
                        ok = 1;
                    }
+                   alcMakeContextCurrent (NULL);
+                   alcDestroyContext (context);
                }
-               alcMakeContextCurrent (NULL);
-               alcDestroyContext (context);
+               alcCloseDevice (pDevice);
            }
-           alcCloseDevice (pDevice);
        } else {
            ok = 1;
        }
@@ -1569,6 +1569,12 @@ static void PortAudioEnumerate (struct sound_device *sds)
     }
 }
 #endif
+
+static LONG WINAPI ExceptionFilter (struct _EXCEPTION_POINTERS * pExceptionPointers, DWORD ec)
+{
+    return EXCEPTION_EXECUTE_HANDLER;
+}
+
 int enumerate_sound_devices (void)
 {
     if (!num_sound_devices) {
@@ -1576,21 +1582,26 @@ int enumerate_sound_devices (void)
        write_log (L"Enumerating DirectSound devices..\n");
        DirectSoundEnumerate ((LPDSENUMCALLBACK)DSEnumProc, sound_devices);
        DirectSoundCaptureEnumerate ((LPDSENUMCALLBACK)DSEnumProc, record_devices);
-       if (isdllversion (L"openal32.dll", 6, 14, 357, 22)) {
-           write_log (L"Enumerating OpenAL devices..\n");
-           if (alcIsExtensionPresent (NULL, "ALC_ENUMERATION_EXT")) {
-               const char* ppDefaultDevice = alcGetString (NULL, ALC_DEFAULT_DEVICE_SPECIFIER);
-               const char* pDeviceNames = alcGetString (NULL, ALC_DEVICE_SPECIFIER);
-               if (alcIsExtensionPresent (NULL, "ALC_ENUMERATE_ALL_EXT"))
-                   pDeviceNames = alcGetString (NULL, ALC_ALL_DEVICES_SPECIFIER);
-               OpenALEnumerate (sound_devices, pDeviceNames, ppDefaultDevice, FALSE);
-               ppDefaultDevice = alcGetString (NULL, ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER);
-               pDeviceNames = alcGetString (NULL, ALC_CAPTURE_DEVICE_SPECIFIER);
-               OpenALEnumerate (record_devices, pDeviceNames, ppDefaultDevice, TRUE);
+       __try {
+           if (isdllversion (L"openal32.dll", 6, 14, 357, 22)) {
+               write_log (L"Enumerating OpenAL devices..\n");
+               if (alcIsExtensionPresent (NULL, "ALC_ENUMERATION_EXT")) {
+                   const char* ppDefaultDevice = alcGetString (NULL, ALC_DEFAULT_DEVICE_SPECIFIER);
+                   const char* pDeviceNames = alcGetString (NULL, ALC_DEVICE_SPECIFIER);
+                   if (alcIsExtensionPresent (NULL, "ALC_ENUMERATE_ALL_EXT"))
+                       pDeviceNames = alcGetString (NULL, ALC_ALL_DEVICES_SPECIFIER);
+                   OpenALEnumerate (sound_devices, pDeviceNames, ppDefaultDevice, FALSE);
+                   ppDefaultDevice = alcGetString (NULL, ALC_CAPTURE_DEFAULT_DEVICE_SPECIFIER);
+                   pDeviceNames = alcGetString (NULL, ALC_CAPTURE_DEVICE_SPECIFIER);
+                   OpenALEnumerate (record_devices, pDeviceNames, ppDefaultDevice, TRUE);
+               }
            }
-       }
+    } __except(ExceptionFilter (GetExceptionInformation (), GetExceptionCode ())) {
+       write_log (L"OpenAL enumeration crashed!\n");
+        flush_log ();
+    }
 #if PORTAUDIO
-       {
+       __try {
            HMODULE hm = WIN32_LoadLibrary (L"portaudio_x86.dll");
            if (hm) {
                TCHAR *s;
@@ -1602,19 +1613,22 @@ int enumerate_sound_devices (void)
                if (Pa_GetVersion () >= 1899) {
                    err = Pa_Initialize ();
                    if (err == paNoError) {
-                       PortAudioEnumerate (sound_devices);
+                       PortAudioEnumerate (sound_devices);
                    } else {
                        s = au (Pa_GetErrorText (err));
-                       write_log (L"Portaudio initializiation failed: %d (%s)\n",
+                       write_log (L"Portaudio initialization failed: %d (%s)\n",
                            err, s);
                        xfree (s);
                        FreeLibrary (hm);
                    }
                } else {
                    write_log (L"Too old PortAudio library\n");
-                   FreeLibrary (hm);
+                   flush_log ();
+                   FreeLibrary (hm);
                }
            }
+       } __except(ExceptionFilter (GetExceptionInformation (), GetExceptionCode ())) {
+           write_log (L"Portaudio enumeration crashed!\n");
        }
 #endif
        write_log (L"Enumeration end\n");

diff --git a/od-win32/sounddep/sound.h b/od-win32/sounddep/sound.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/srcrelease.cmd b/od-win32/srcrelease.cmd
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/support.c b/od-win32/support.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/sys/ipc.h b/od-win32/sys/ipc.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/sys/mman.h b/od-win32/sys/mman.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/sys/shm.h b/od-win32/sys/shm.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/sysconfig.h b/od-win32/sysconfig.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/target.h b/od-win32/target.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/threaddep/thread.h b/od-win32/threaddep/thread.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/tun.c b/od-win32/tun.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/tun.h b/od-win32/tun.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/tun_uae.h b/od-win32/tun_uae.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/uaeunp/uaeunp.vcproj b/od-win32/uaeunp/uaeunp.vcproj
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/uaeunp/uaeunp.vcxproj b/od-win32/uaeunp/uaeunp.vcxproj
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/uaeunp/uaeunp.vcxproj.filters b/od-win32/uaeunp/uaeunp.vcxproj.filters
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/uaeunp_win32.c b/od-win32/uaeunp_win32.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/unicode.c b/od-win32/unicode.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/unistd.h b/od-win32/unistd.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/win32.c b/od-win32/win32.c
old mode 100644 (file)
new mode 100755 (executable)
index c9abb19..16f8997
--- a/od-win32/win32.c
+++ b/od-win32/win32.c
@@ -31,6 +31,7 @@
 #include <shlobj.h>
 #include <shlwapi.h>
 #include <dbghelp.h>
+#include <float.h>
 
 #include "resource"
 
@@ -87,6 +88,7 @@
 extern int harddrive_dangerous, do_rdbdump, aspi_allow_all, no_rawinput, rawkeyboard;
 int log_scsi, log_net, uaelib_debug;
 int pissoff_value = 25000;
+unsigned int fpucontrol;
 
 extern FILE *debugfile;
 extern int console_logging;
@@ -4398,6 +4400,17 @@ uae_u32 emulib_target_getcpurate (uae_u32 v, uae_u32 *low)
     return 0;
 }
 
+void fpux_save (int *v)
+{
+    *v = _controlfp (fpucontrol, _MCW_IC | _MCW_RC | _MCW_PC);
+}
+void fpux_restore (int *v)
+{
+    if (v)
+       _controlfp (*v, _MCW_IC | _MCW_RC | _MCW_PC);
+    else
+       _controlfp (fpucontrol, _MCW_IC | _MCW_RC | _MCW_PC);
+}
 
 typedef BOOL (CALLBACK* SETPROCESSDPIAWARE)(void);
 typedef BOOL (CALLBACK* CHANGEWINDOWMESSAGEFILTER)(UINT, DWORD);
@@ -4415,6 +4428,7 @@ int PASCAL wWinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpCmdL
     GetProcessAffinityMask (GetCurrentProcess (), &original_affinity, &sys_aff);
 
     thread = GetCurrentThread ();
+    fpucontrol = _controlfp (0, 0) & (_MCW_IC | _MCW_RC | _MCW_PC);
     //original_affinity = SetThreadAffinityMask(thread, 1);
 
 #if 0

diff --git a/od-win32/win32.h b/od-win32/win32.h
old mode 100644 (file)
new mode 100755 (executable)
index 2f8b865..a03e24d
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -17,8 +17,8 @@
 
 #define WINUAEPUBLICBETA 1
 
-#define WINUAEBETA L"Beta 2"
-#define WINUAEDATE MAKEBD(2009, 6, 6)
+#define WINUAEBETA L"Beta 3"
+#define WINUAEDATE MAKEBD(2009, 6, 10)
 #define WINUAEEXTRA L""
 #define WINUAEREV L""
 
@@ -143,6 +143,9 @@ struct winuae_lang
 };
 extern struct winuae_lang langs[];
 extern HMODULE language_load (WORD language);
+extern unsigned int fpucontrol;
+extern void fpux_save (int *v);
+extern void fpux_restore (int *v);
 
 extern void logging_open (int,int);
 extern void logging_cleanup (void);

diff --git a/od-win32/win32_decompress.c b/od-win32/win32_decompress.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/win32_filesys.c b/od-win32/win32_filesys.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/win32_nogui.c b/od-win32/win32_nogui.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/win32_scale2x.c b/od-win32/win32_scale2x.c
old mode 100644 (file)
new mode 100755 (executable)
index f5fb8cb..35ebda6
--- a/od-win32/win32_scale2x.c
+++ b/od-win32/win32_scale2x.c
@@ -15,6 +15,8 @@
 #include "statusline.h"
 #include "drawing.h"
 
+#include <float.h>
+
 struct uae_filter uaefilters[] =
 {
     { UAE_FILTER_NULL, 0, 1, L"Null filter", L"null", 0, UAE_FILTER_MODE_16_16 | UAE_FILTER_MODE_32_32, 0, 0, 0 },
@@ -23,7 +25,7 @@ struct uae_filter uaefilters[] =
 
     { UAE_FILTER_OPENGL, 0, 1, L"OpenGL (unsupported)", L"opengl", 1, 0, 0, 0, 0 },
 
-    { UAE_FILTER_SCALE2X, 0, 2, L"Scale2X", L"scale2x", 0, 0, UAE_FILTER_MODE_16_16 | UAE_FILTER_MODE_32_32, 0, 0 },
+    { UAE_FILTER_SCALE2X, 0, 2, L"Scale2X", L"scale2x", 0, 0, UAE_FILTER_MODE_16_16 | UAE_FILTER_MODE_32_32, 0, 0, 0 },
 
     { UAE_FILTER_HQ, 0, 2, L"hq2x/3x/4x", L"hqx", 0, 0, UAE_FILTER_MODE_16_16 | UAE_FILTER_MODE_16_32, UAE_FILTER_MODE_16_16 | UAE_FILTER_MODE_16_32, UAE_FILTER_MODE_16_16 | UAE_FILTER_MODE_16_32 },
 
@@ -148,7 +150,10 @@ void getfilterrect2 (RECT *sr, RECT *dr, RECT *zr, int dst_width, int dst_height
     float xmult, ymult;
     int v;
     int extraw, extrah;
-    
+    int fpuv;
+   
+    fpux_save (&fpuv);
+
     getinit ();
     ahs2 = vblscale (ah) * scale;
     aws = aw * scale;
@@ -250,7 +255,7 @@ void getfilterrect2 (RECT *sr, RECT *dr, RECT *zr, int dst_width, int dst_height
                OffsetRect (zr, -(changed_prefs.gfx_size_win.width - ww + 1) / 2, 0);
                filteroffsetx = -zr->left / scale;
                filteroffsety = -zr->top / scale;
-               return;
+               goto end;
            }
 
            dr->left = (temp_width - aws) /2;
@@ -309,7 +314,7 @@ void getfilterrect2 (RECT *sr, RECT *dr, RECT *zr, int dst_width, int dst_height
            filterxmult = diff * 1000 / (dst_width * scale);
            diff = dr->bottom - dr->top;
            filterymult = diff * 1000 / (dst_height * scale);
-           return;
+           goto end;
        }
     }
   
@@ -387,6 +392,9 @@ void getfilterrect2 (RECT *sr, RECT *dr, RECT *zr, int dst_width, int dst_height
     filteroffsetx += (dst_width - aw * 1000 / filterxmult) / 2;
     filteroffsety += (dst_height - ah * 1000 / filterymult) / 2;
 
+end:
+    fpux_restore (&fpuv);
+
 }
 
 static void statusline (void)
@@ -654,6 +662,7 @@ void S2X_render (void)
     }
 
 endfail:
+
     if (ok == 0 && currprefs.gfx_filter) {
        usedfilter = &uaefilters[0];
        changed_prefs.gfx_filter = usedfilter->type;

diff --git a/od-win32/win32_uaenet.c b/od-win32/win32_uaenet.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/win32_uaenet.h b/od-win32/win32_uaenet.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/win32gfx.c b/od-win32/win32gfx.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/win32gfx.h b/od-win32/win32gfx.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/win32gui.c b/od-win32/win32gui.c
old mode 100644 (file)
new mode 100755 (executable)
index 4f981f7..b8fbecb
--- a/od-win32/win32gui.c
+++ b/od-win32/win32gui.c
@@ -12424,13 +12424,16 @@ void gui_led (int led, int on)
        pos = 5;
        ptr = _tcscpy (drive_text + pos * 16, L"CD");
     } else if (led == 7) {
+       double fps = (double)gui_data.fps / 10.0;
        extern int p96vblank;
        pos = 2;
        ptr = drive_text + pos * 16;
+       if (fps > 999.9)
+           fps = 999.9;
        if (picasso_on)
-           _stprintf (ptr, L"%d [%.1f]", p96vblank, (double)(gui_data.fps  / 10.0));
+           _stprintf (ptr, L"%d [%.1f]", p96vblank, fps);
        else
-           _stprintf (ptr, L"FPS: %.1f", (double)(gui_data.fps  / 10.0));
+           _stprintf (ptr, L"FPS: %.1f", fps);
        if (pause_emulation)
            _tcscpy (ptr, L"PAUSED");
     } else if (led == 8) {

diff --git a/od-win32/win32gui.h b/od-win32/win32gui.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/win32gui_extra.c b/od-win32/win32gui_extra.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/wintablet.h b/od-win32/wintablet.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/winuae_msvc/winuae_msvc.vcproj b/od-win32/winuae_msvc/winuae_msvc.vcproj
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
old mode 100644 (file)
new mode 100755 (executable)
index 68e420b..848ffcb
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,3 +1,17 @@
+
+Beta 3:
+
+- added exception handler that writes log message if openal or
+  portaudio device enumeration crashes
+- fixed d3d pot/square texture restriction check, only for really
+  old display cards (which may be too slow for d3d filter..)
+- bsdsocket cleanup crash fix (ancient win32-specific bug)
+- gzip decompression problem (yet another unicode conversion bug),
+  also broke built-in hrtmon (which is gzipped internally)
+- reset fpu rounding state to original temporarily when doing filter
+  calculations (single pixel jittering in some filtering modes if
+  Amiga-side code uses FPU and modifies rounding mode)
+  
 Beta 2:
 
 - fs "double vsync" mode (100Hz+) was still slow in warp mode

diff --git a/od-win32/writelog.c b/od-win32/writelog.c
old mode 100644 (file)
new mode 100755 (executable)
index a43bd30..65d0390
--- a/od-win32/writelog.c
+++ b/od-win32/writelog.c
@@ -186,6 +186,17 @@ static void writeconsole (const TCHAR *buffer)
     }
 }
 
+static void flushconsole (void)
+{
+    if (consoleopen > 0) {
+       fflush (stdout);
+    } else if (realconsole) {
+       fflush (stdout);
+    } else if (consoleopen < 0) {
+       FlushFileBuffers  (stdoutput);
+    }
+}
+
 void console_out_f (const TCHAR *format,...)
 {
     va_list parms;
@@ -234,6 +245,7 @@ int console_get (TCHAR *out, int maxlen)
 
 void console_flush (void)
 {
+    flushconsole ();
 }
 
 static int lfdetected = 1;
@@ -356,6 +368,7 @@ void flush_log (void)
 {
     if (debugfile)
        fflush (debugfile);
+    flushconsole ();
 }
 
 void f_out (void *f, const TCHAR *format, ...)

diff --git a/p96_blit.c b/p96_blit.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/picasso96.c b/picasso96.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/include/extern.h b/prowizard/include/extern.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/include/globals.h b/prowizard/include/globals.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/include/ptktable.h b/prowizard/include/ptktable.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/include/tuning.h b/prowizard/include/tuning.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/include/vars.h b/prowizard/include/vars.h
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/misc/misc.c b/prowizard/misc/misc.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/misc/testbag.c b/prowizard/misc/testbag.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/prowiz.c b/prowizard/prowiz.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/AC1D_packer.c b/prowizard/rippers/AC1D_packer.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/AMOS-MusicBank.c b/prowizard/rippers/AMOS-MusicBank.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/AMOS-PowerPackerBank.c b/prowizard/rippers/AMOS-PowerPackerBank.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/BP-Soundmonitor.c b/prowizard/rippers/BP-Soundmonitor.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/BSI-FutureComposer.c b/prowizard/rippers/BSI-FutureComposer.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/Bytekiller.c b/prowizard/rippers/Bytekiller.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/ChipTracker.c b/prowizard/rippers/ChipTracker.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/Crunchmania-Address.c b/prowizard/rippers/Crunchmania-Address.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/Crunchmania-Simple.c b/prowizard/rippers/Crunchmania-Simple.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/DefjamCruncher32-pro.c b/prowizard/rippers/DefjamCruncher32-pro.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/DigiBooster17.c b/prowizard/rippers/DigiBooster17.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/DigitalIllusion.c b/prowizard/rippers/DigitalIllusion.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/DoubleAction.c b/prowizard/rippers/DoubleAction.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/Dragpack100.c b/prowizard/rippers/Dragpack100.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/Dragpack252.c b/prowizard/rippers/Dragpack252.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/EurekaPacker.c b/prowizard/rippers/EurekaPacker.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/FC-M-Packer.c b/prowizard/rippers/FC-M-Packer.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/FastTracker2.c b/prowizard/rippers/FastTracker2.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/FuchsTracker.c b/prowizard/rippers/FuchsTracker.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/FutureComposer13.c b/prowizard/rippers/FutureComposer13.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/FutureComposer14.c b/prowizard/rippers/FutureComposer14.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/FuzzacPacker.c b/prowizard/rippers/FuzzacPacker.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/GNUPacker12.c b/prowizard/rippers/GNUPacker12.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/GPMO.c b/prowizard/rippers/GPMO.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/GameMusicCreator.c b/prowizard/rippers/GameMusicCreator.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/GnuPlayer.c b/prowizard/rippers/GnuPlayer.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/HQC2.c b/prowizard/rippers/HQC2.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/HeatseekerMC10.c b/prowizard/rippers/HeatseekerMC10.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/HornetPacker.c b/prowizard/rippers/HornetPacker.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/JamCracker.c b/prowizard/rippers/JamCracker.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/KefrensSoundMachine.c b/prowizard/rippers/KefrensSoundMachine.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/MED-Octamed.c b/prowizard/rippers/MED-Octamed.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/MOD-compatible.c b/prowizard/rippers/MOD-compatible.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/MasterCruncher30-Address.c b/prowizard/rippers/MasterCruncher30-Address.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/MaxPacker12.c b/prowizard/rippers/MaxPacker12.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/MegaCruncher-Object.c b/prowizard/rippers/MegaCruncher-Object.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/MegaCruncher.c b/prowizard/rippers/MegaCruncher.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/ModuleProtector.c b/prowizard/rippers/ModuleProtector.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/Mugician.c b/prowizard/rippers/Mugician.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/Newtron.c b/prowizard/rippers/Newtron.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/NewtronOld.c b/prowizard/rippers/NewtronOld.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/NoiseFromHeaven.c b/prowizard/rippers/NoiseFromHeaven.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/NoisePacker1.c b/prowizard/rippers/NoisePacker1.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/NoisePacker2.c b/prowizard/rippers/NoisePacker2.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/NoisePacker3.c b/prowizard/rippers/NoisePacker3.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/NoiseRunner.c b/prowizard/rippers/NoiseRunner.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/NovoTrade.c b/prowizard/rippers/NovoTrade.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/PhaPacker.c b/prowizard/rippers/PhaPacker.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/PolkaPacker.c b/prowizard/rippers/PolkaPacker.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/PowerMusic.c b/prowizard/rippers/PowerMusic.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/PowerPacker23.c b/prowizard/rippers/PowerPacker23.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/PowerPacker30.c b/prowizard/rippers/PowerPacker30.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/PowerPacker40-library.c b/prowizard/rippers/PowerPacker40-library.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/PowerPacker40.c b/prowizard/rippers/PowerPacker40.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/ProPacker10.c b/prowizard/rippers/ProPacker10.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/ProPacker21.c b/prowizard/rippers/ProPacker21.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/ProPacker30.c b/prowizard/rippers/ProPacker30.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/Promizer01.c b/prowizard/rippers/Promizer01.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/Promizer10c.c b/prowizard/rippers/Promizer10c.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/Promizer18a.c b/prowizard/rippers/Promizer18a.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/Promizer20.c b/prowizard/rippers/Promizer20.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/Promizer40.c b/prowizard/rippers/Promizer40.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/Prorunner10.c b/prowizard/rippers/Prorunner10.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/Prorunner20.c b/prowizard/rippers/Prorunner20.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/QuadraComposer.c b/prowizard/rippers/QuadraComposer.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/RelokIt10.c b/prowizard/rippers/RelokIt10.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/SGT-Packer.c b/prowizard/rippers/SGT-Packer.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/SkytPacker.c b/prowizard/rippers/SkytPacker.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/SoundFX.c b/prowizard/rippers/SoundFX.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/SoundTracker.c b/prowizard/rippers/SoundTracker.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/SoundTracker26.c b/prowizard/rippers/SoundTracker26.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/SpikeCruncher.c b/prowizard/rippers/SpikeCruncher.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/StartrekkerPack.c b/prowizard/rippers/StartrekkerPack.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/StimPacker.c b/prowizard/rippers/StimPacker.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/StoneArtsPlayer.c b/prowizard/rippers/StoneArtsPlayer.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/StoneCracker270.c b/prowizard/rippers/StoneCracker270.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/StoneCracker299.c b/prowizard/rippers/StoneCracker299.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/StoneCracker299b.c b/prowizard/rippers/StoneCracker299b.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/StoneCracker299d.c b/prowizard/rippers/StoneCracker299d.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/StoneCracker300.c b/prowizard/rippers/StoneCracker300.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/StoneCracker310.c b/prowizard/rippers/StoneCracker310.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/SuperCruncher27.c b/prowizard/rippers/SuperCruncher27.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/SyncroPacker46.c b/prowizard/rippers/SyncroPacker46.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/TMK.c b/prowizard/rippers/TMK.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/TNMCruncher.c b/prowizard/rippers/TNMCruncher.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/TetraPack102.c b/prowizard/rippers/TetraPack102.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/TetraPack21.c b/prowizard/rippers/TetraPack21.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/TetraPack22.c b/prowizard/rippers/TetraPack22.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/TheDarkDemon.c b/prowizard/rippers/TheDarkDemon.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/ThePlayer22a.c b/prowizard/rippers/ThePlayer22a.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/ThePlayer30a.c b/prowizard/rippers/ThePlayer30a.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/ThePlayer40.c b/prowizard/rippers/ThePlayer40.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/ThePlayer41a.c b/prowizard/rippers/ThePlayer41a.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/ThePlayer50a.c b/prowizard/rippers/ThePlayer50a.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/ThePlayer60a.c b/prowizard/rippers/ThePlayer60a.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/ThePlayer61a.c b/prowizard/rippers/ThePlayer61a.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/TimeCruncher17.c b/prowizard/rippers/TimeCruncher17.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/TitanicsPlayer.c b/prowizard/rippers/TitanicsPlayer.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/TrackerPacker1.c b/prowizard/rippers/TrackerPacker1.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/TrackerPacker2.c b/prowizard/rippers/TrackerPacker2.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/TrackerPacker3.c b/prowizard/rippers/TrackerPacker3.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/TreasurePattern.c b/prowizard/rippers/TreasurePattern.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/TryItCruncher101.c b/prowizard/rippers/TryItCruncher101.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/TurboSqueezer61.c b/prowizard/rippers/TurboSqueezer61.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/UnicTracker.c b/prowizard/rippers/UnicTracker.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/UnicTracker2.c b/prowizard/rippers/UnicTracker2.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/Viruz2.c b/prowizard/rippers/Viruz2.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/WantonPacker.c b/prowizard/rippers/WantonPacker.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/XannPlayer.c b/prowizard/rippers/XannPlayer.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/ZenPacker.c b/prowizard/rippers/ZenPacker.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/datacrunchers.c b/prowizard/rippers/datacrunchers.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/prowizard/rippers/skizzo.c b/prowizard/rippers/skizzo.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/readcpu.c b/readcpu.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/readdisk.c b/readdisk.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/rpc.c b/rpc.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/sana2.c b/sana2.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/savestate.c b/savestate.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/scsi.c b/scsi.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/scsidev.c b/scsidev.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/scsiemul.c b/scsiemul.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/serial.c b/serial.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/sinctable.c b/sinctable.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/table68k b/table68k
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/traps.c b/traps.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/uaeexe.c b/uaeexe.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/uaeipc.c b/uaeipc.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/uaelib.c b/uaelib.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/uaeresource.c b/uaeresource.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/uaeserial.c b/uaeserial.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/uaeunp.c b/uaeunp.c
old mode 100644 (file)
new mode 100755 (executable)
index 53c0f18..433ace5
--- a/uaeunp.c
+++ b/uaeunp.c
@@ -511,7 +511,7 @@ static int unpack2 (const TCHAR *src, const TCHAR *match, int level)
            s = zfile_open_archive (tmp, 0);
            if (!s) {
                geterror();
-               _tprintf (L"Couldn't open '%s' for reading\n", src);
+               _tprintf (L"Couldn't open '%s' for reading\n", tmp);
                continue;
            }
            zfile_fseek (s, 0, SEEK_END); 
@@ -672,13 +672,13 @@ int wmain (int argc, wchar_t *argv[], wchar_t *envp[])
     if (crclist) {
        docrclist (L".");
        ok = 1;
-    } else if (match) {
+    } else if (!list && match) {
        unpack2 (path, match, 0);
        ok = 1;
-    } else if (!parm2 && all > 0) {
+    } else if (!list && !parm2 && all > 0) {
        unpack2 (path, L"*", 0);
        ok = 1;
-    } else if (extract && parm2) {
+    } else if (!list && extract && parm2) {
        unpack2 (path, parm2, 0);
        ok = 1;
     } else if (argc == 2 || (argc > 2 && list)) {

diff --git a/writelog.c b/writelog.c
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/zfile.c b/zfile.c
old mode 100644 (file)
new mode 100755 (executable)
index 845faa6..dd38088
--- a/zfile.c
+++ b/zfile.c
@@ -193,11 +193,13 @@ struct zfile *zfile_gunzip (struct zfile *z)
        zfile_fseek (z, size + 2, SEEK_CUR);
     }
     if (flags & 8) { /* get original file name */
+       uae_char aname[MAX_DPATH];
        i = 0;
        do {
-           zfile_fread (name + i, 1, 1, z);
-       } while (i < MAX_DPATH - 1 && name[i++]);
-       name[i] = 0;
+           zfile_fread (aname + i, 1, 1, z);
+       } while (i < MAX_DPATH - 1 && aname[i++]);
+       aname[i] = 0;
+       au_copy (name, MAX_DPATH, aname);
     }
     if (flags & 16) { /* skip comment */
        i = 0;
@@ -229,7 +231,7 @@ struct zfile *zfile_gunzip (struct zfile *z)
        zs.next_in = buffer;
        zs.avail_in = zfile_fread (buffer, 1, sizeof (buffer), z);
        if (first) {
-           if (inflateInit2_ (&zs, -MAX_WBITS, ZLIB_VERSION, sizeof(z_stream)) != Z_OK)
+           if (inflateInit2_ (&zs, -MAX_WBITS, ZLIB_VERSION, sizeof (z_stream)) != Z_OK)
                break;
            first = 0;
        }
@@ -1237,7 +1239,6 @@ size_t zfile_fread  (void *b, size_t l1, size_t l2,struct zfile *z)
     if (z->parent) {
        uae_s64 v;
        uae_s64 size = z->size;
-       z = z->parent;
        v = zfile_ftell (z);
        if (v + l1 * l2 > size) {
            if (l1)
@@ -1247,6 +1248,7 @@ size_t zfile_fread  (void *b, size_t l1, size_t l2,struct zfile *z)
            if (l2 < 0)
                l2 = 0;
        }
+       z = z->parent;
     }
     return fread (b, l1, l2, z->f);
 }
@@ -1439,7 +1441,7 @@ int zfile_zcompress (struct zfile *f, void *src, int size)
 
 TCHAR *zfile_getname (struct zfile *f)
 {
-    return f->name;
+    return f ? f->name : NULL;
 }
 
 TCHAR *zfile_getfilename (struct zfile *f)
@@ -1640,6 +1642,10 @@ struct zvolume *zvolume_alloc (struct zfile *z, unsigned int id, void *handle, c
 {
     return zvolume_alloc_2 (zfile_getname (z), z, id, handle, volumename);
 }
+struct zvolume *zvolume_alloc_nofile (const TCHAR *name, unsigned int id, void *handle, const TCHAR *volumename)
+{
+    return zvolume_alloc_2 (name, NULL, id, handle, volumename);
+}
 struct zvolume *zvolume_alloc_empty (struct zvolume *prev, const TCHAR *name)
 {
     struct zvolume *zv = zvolume_alloc_2(name, 0, 0, 0, NULL);
@@ -1655,6 +1661,8 @@ static struct zvolume *get_zvolume (const TCHAR *path)
     struct zvolume *zv = zvolume_list;
     while (zv) {
        TCHAR *s = zfile_getname (zv->archive);
+       if (!s)
+           s = zv->root.name;
        if (_tcslen (path) >= _tcslen (s) && !memcmp (path, s, _tcslen (s) * sizeof (TCHAR)))
            return zv;
        zv = zv->next;
@@ -1960,6 +1968,45 @@ struct znode *zvolume_addfile_abs (struct zvolume *zv, struct zarchive_info *zai
     return zn;
 }
 
+struct zvolume *zfile_fopen_directory (const TCHAR *dirname)
+{
+    struct zvolume *zv = NULL;
+    void *dir;
+    TCHAR fname[MAX_DPATH];
+
+    dir = my_opendir (dirname);
+    if (!dir)
+       return NULL;
+    zv = zvolume_alloc_nofile (dirname, ArchiveFormatDIR, NULL, NULL);
+    while (my_readdir (dir, fname)) {
+       TCHAR fullname[MAX_DPATH];
+       struct _stat64 statbuf;
+       struct zarchive_info zai = { 0 };
+       if (!_tcscmp (fname, L".") || !_tcscmp (fname, L".."))
+           continue;
+       _tcscpy (fullname, dirname);
+       _tcscat (fullname, L"\\");
+       _tcscat (fullname, fname);
+       if (stat (fullname, &statbuf) == -1)
+           continue;
+       zai.name = fname;
+       zai.size = statbuf.st_size;
+       zai.t = statbuf.st_mtime;
+       if (statbuf.st_mode & FILEFLAG_DIR) {
+           zvolume_adddir_abs (zv, &zai);
+       } else {
+           struct znode *zn;
+           zn = zvolume_addfile_abs (zv, &zai);
+           //zfile_fopen_archive_recurse2 (zv, zn);
+       }
+    }
+    my_closedir (dir);
+//    zfile_fopen_archive_recurse (zv);
+    if (zv)
+       zvolume_addtolist (zv);
+    return zv;
+}
+
 struct zvolume *zfile_fopen_archive (const TCHAR *filename)
 {
     struct zvolume *zv = NULL;
@@ -2006,6 +2053,9 @@ struct zvolume *zfile_fopen_archive_root (const TCHAR *filename)
     //int last = 0;
     int num, i;
 
+    if (my_existsdir (filename))
+       return zfile_fopen_directory (filename);
+
     num = 1;
     lastp = NULL;
     for (;;) {

diff --git a/zfile_archive.c b/zfile_archive.c
old mode 100644 (file)
new mode 100755 (executable)
index 4ca73f7..43fbea9
--- a/zfile_archive.c
+++ b/zfile_archive.c
@@ -116,6 +116,9 @@ struct zfile *archive_getzfile (struct znode *zn, unsigned int id)
        case ArchiveFormatFAT:
        zf = archive_access_fat (zn);
        break;
+       case ArchiveFormatDIR:
+       zf = archive_access_dir (zn);
+       break;
     }
     return zf;
 }
@@ -642,10 +645,12 @@ struct zfile *archive_access_rar (struct znode *zn)
        }
     }
     zf = zfile_fopen_empty (zn->volume->archive, zn->fullname, zn->size);
-    rarunpackzf = zf;
-    if (pRARProcessFile (rc->hArcData, RAR_TEST, NULL, NULL)) {
-       zfile_fclose (zf);
-       zf = NULL;
+    if (zf) {
+       rarunpackzf = zf;
+       if (pRARProcessFile (rc->hArcData, RAR_TEST, NULL, NULL)) {
+           zfile_fclose (zf);
+           zf = NULL;
+       }
     }
 end:
     pRARCloseArchive(rc->hArcData);
@@ -1061,6 +1066,8 @@ static void recurseadf (struct znode *zn, int root, TCHAR *name)
            }
            _tcscat (name2, fname);
            zai.name = name2;
+           if (size < 0 || size > 0x7fffffff)
+               size = 0;
            zai.size = size;
            zai.flags = gl (adf, bs - 48 * 4);
            zai.t = put_time (gl (adf, bs - 23 * 4), gl (adf, bs - 22 * 4),gl (adf, bs - 21 * 4));
@@ -1905,3 +1912,9 @@ void archive_access_close (void *handle, unsigned int id)
        break;
     }
 }
+
+struct zfile *archive_access_dir (struct znode *zn)
+{
+    return zfile_fopen (zn->fullname, L"rb", 0);
+}
+