From: Toni Wilen Date: Sun, 14 Jun 2009 11:00:07 +0000 (+0300) Subject: imported winuaesrc1610b4.zip X-Git-Tag: 2100~76 X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=b0f6ebb47e8bb1cf26d47bf5ce1a9af4771b4353;p=francis%2Fwinuae.git imported winuaesrc1610b4.zip --- diff --git a/ChangeLog b/ChangeLog old mode 100755 new mode 100644 diff --git a/a2091.c b/a2091.c old mode 100755 new mode 100644 diff --git a/adide.c b/adide.c old mode 100755 new mode 100644 diff --git a/akiko.c b/akiko.c old mode 100755 new mode 100644 diff --git a/akiko2.c b/akiko2.c old mode 100755 new mode 100644 diff --git a/amax.c b/amax.c old mode 100755 new mode 100644 diff --git a/ar.c b/ar.c old mode 100755 new mode 100644 index ac729811..cac97b79 --- a/ar.c +++ b/ar.c @@ -1669,7 +1669,7 @@ int action_replay_load (void) return 0; } action_replay_flag = ACTION_REPLAY_INACTIVE; - armemory_rom = (uae_u8*)xmalloc (ar_rom_file_size); + armemory_rom = xmalloc (ar_rom_file_size); zfile_fread (armemory_rom, 1, ar_rom_file_size, f); zfile_fclose (f); if (ar_rom_file_size == 65536) { @@ -1688,7 +1688,7 @@ int action_replay_load (void) } arram_mask = arram_size - 1; arrom_mask = arrom_size - 1; - armemory_ram = (uae_u8*)xcalloc (arram_size, 1); + armemory_ram = xcalloc (arram_size, 1); write_log (L"Action Replay %d installed at %08X, size %08X\n", armodel, arrom_start, arrom_size); action_replay_version(); return armodel; diff --git a/arcadia.c b/arcadia.c old mode 100755 new mode 100644 diff --git a/archivers/7z/7zBuf.c b/archivers/7z/7zBuf.c old mode 100755 new mode 100644 diff --git a/archivers/7z/7zBuf.h b/archivers/7z/7zBuf.h old mode 100755 new mode 100644 diff --git a/archivers/7z/7zCrc.c b/archivers/7z/7zCrc.c old mode 100755 new mode 100644 diff --git a/archivers/7z/7zCrc.h b/archivers/7z/7zCrc.h old mode 100755 new mode 100644 diff --git a/archivers/7z/7zStream.c b/archivers/7z/7zStream.c old mode 100755 new mode 100644 diff --git a/archivers/7z/7zVersion.h b/archivers/7z/7zVersion.h old mode 100755 new mode 100644 diff --git a/archivers/7z/Archive/7z/7zAlloc.c b/archivers/7z/Archive/7z/7zAlloc.c old mode 100755 new mode 100644 diff --git a/archivers/7z/Archive/7z/7zAlloc.h b/archivers/7z/Archive/7z/7zAlloc.h old mode 100755 new mode 100644 diff --git a/archivers/7z/Archive/7z/7zDecode.c b/archivers/7z/Archive/7z/7zDecode.c old mode 100755 new mode 100644 diff --git a/archivers/7z/Archive/7z/7zDecode.h b/archivers/7z/Archive/7z/7zDecode.h old mode 100755 new mode 100644 diff --git a/archivers/7z/Archive/7z/7zExtract.c b/archivers/7z/Archive/7z/7zExtract.c old mode 100755 new mode 100644 diff --git a/archivers/7z/Archive/7z/7zExtract.h b/archivers/7z/Archive/7z/7zExtract.h old mode 100755 new mode 100644 diff --git a/archivers/7z/Archive/7z/7zHeader.c b/archivers/7z/Archive/7z/7zHeader.c old mode 100755 new mode 100644 diff --git a/archivers/7z/Archive/7z/7zHeader.h b/archivers/7z/Archive/7z/7zHeader.h old mode 100755 new mode 100644 diff --git a/archivers/7z/Archive/7z/7zIn.c b/archivers/7z/Archive/7z/7zIn.c old mode 100755 new mode 100644 diff --git a/archivers/7z/Archive/7z/7zIn.h b/archivers/7z/Archive/7z/7zIn.h old mode 100755 new mode 100644 diff --git a/archivers/7z/Archive/7z/7zItem.c b/archivers/7z/Archive/7z/7zItem.c old mode 100755 new mode 100644 diff --git a/archivers/7z/Archive/7z/7zItem.h b/archivers/7z/Archive/7z/7zItem.h old mode 100755 new mode 100644 diff --git a/archivers/7z/Bcj2.c b/archivers/7z/Bcj2.c old mode 100755 new mode 100644 diff --git a/archivers/7z/Bcj2.h b/archivers/7z/Bcj2.h old mode 100755 new mode 100644 diff --git a/archivers/7z/Bra.c b/archivers/7z/Bra.c old mode 100755 new mode 100644 diff --git a/archivers/7z/Bra.h b/archivers/7z/Bra.h old mode 100755 new mode 100644 diff --git a/archivers/7z/Bra86.c b/archivers/7z/Bra86.c old mode 100755 new mode 100644 diff --git a/archivers/7z/CpuArch.h b/archivers/7z/CpuArch.h old mode 100755 new mode 100644 diff --git a/archivers/7z/LzmaDec.c b/archivers/7z/LzmaDec.c old mode 100755 new mode 100644 diff --git a/archivers/7z/LzmaDec.h b/archivers/7z/LzmaDec.h old mode 100755 new mode 100644 diff --git a/archivers/7z/Types.h b/archivers/7z/Types.h old mode 100755 new mode 100644 diff --git a/archivers/dms/cdata.h b/archivers/dms/cdata.h old mode 100755 new mode 100644 diff --git a/archivers/dms/crc_csum.c b/archivers/dms/crc_csum.c old mode 100755 new mode 100644 diff --git a/archivers/dms/crc_csum.h b/archivers/dms/crc_csum.h old mode 100755 new mode 100644 diff --git a/archivers/dms/getbits.c b/archivers/dms/getbits.c old mode 100755 new mode 100644 diff --git a/archivers/dms/getbits.h b/archivers/dms/getbits.h old mode 100755 new mode 100644 diff --git a/archivers/dms/maketbl.c b/archivers/dms/maketbl.c old mode 100755 new mode 100644 diff --git a/archivers/dms/maketbl.h b/archivers/dms/maketbl.h old mode 100755 new mode 100644 diff --git a/archivers/dms/pfile.c b/archivers/dms/pfile.c old mode 100755 new mode 100644 diff --git a/archivers/dms/pfile.h b/archivers/dms/pfile.h old mode 100755 new mode 100644 diff --git a/archivers/dms/tables.c b/archivers/dms/tables.c old mode 100755 new mode 100644 diff --git a/archivers/dms/tables.h b/archivers/dms/tables.h old mode 100755 new mode 100644 diff --git a/archivers/dms/u_deep.c b/archivers/dms/u_deep.c old mode 100755 new mode 100644 diff --git a/archivers/dms/u_deep.h b/archivers/dms/u_deep.h old mode 100755 new mode 100644 diff --git a/archivers/dms/u_heavy.c b/archivers/dms/u_heavy.c old mode 100755 new mode 100644 diff --git a/archivers/dms/u_heavy.h b/archivers/dms/u_heavy.h old mode 100755 new mode 100644 diff --git a/archivers/dms/u_init.c b/archivers/dms/u_init.c old mode 100755 new mode 100644 diff --git a/archivers/dms/u_init.h b/archivers/dms/u_init.h old mode 100755 new mode 100644 diff --git a/archivers/dms/u_medium.c b/archivers/dms/u_medium.c old mode 100755 new mode 100644 diff --git a/archivers/dms/u_medium.h b/archivers/dms/u_medium.h old mode 100755 new mode 100644 diff --git a/archivers/dms/u_quick.c b/archivers/dms/u_quick.c old mode 100755 new mode 100644 diff --git a/archivers/dms/u_quick.h b/archivers/dms/u_quick.h old mode 100755 new mode 100644 diff --git a/archivers/dms/u_rle.c b/archivers/dms/u_rle.c old mode 100755 new mode 100644 diff --git a/archivers/dms/u_rle.h b/archivers/dms/u_rle.h old mode 100755 new mode 100644 diff --git a/archivers/lha/crcio.c b/archivers/lha/crcio.c old mode 100755 new mode 100644 diff --git a/archivers/lha/dhuf.c b/archivers/lha/dhuf.c old mode 100755 new mode 100644 diff --git a/archivers/lha/header.c b/archivers/lha/header.c old mode 100755 new mode 100644 diff --git a/archivers/lha/huf.c b/archivers/lha/huf.c old mode 100755 new mode 100644 diff --git a/archivers/lha/larc.c b/archivers/lha/larc.c old mode 100755 new mode 100644 diff --git a/archivers/lha/lha.h b/archivers/lha/lha.h old mode 100755 new mode 100644 diff --git a/archivers/lha/lha_macro.h b/archivers/lha/lha_macro.h old mode 100755 new mode 100644 diff --git a/archivers/lha/lhamaketbl.c b/archivers/lha/lhamaketbl.c old mode 100755 new mode 100644 diff --git a/archivers/lha/lharc.c b/archivers/lha/lharc.c old mode 100755 new mode 100644 diff --git a/archivers/lha/shuf.c b/archivers/lha/shuf.c old mode 100755 new mode 100644 diff --git a/archivers/lha/slide.c b/archivers/lha/slide.c old mode 100755 new mode 100644 diff --git a/archivers/lha/uae_lha.c b/archivers/lha/uae_lha.c old mode 100755 new mode 100644 diff --git a/archivers/lha/util.c b/archivers/lha/util.c old mode 100755 new mode 100644 diff --git a/archivers/lzx/unlzx.c b/archivers/lzx/unlzx.c old mode 100755 new mode 100644 diff --git a/archivers/wrp/warp.c b/archivers/wrp/warp.c old mode 100755 new mode 100644 diff --git a/archivers/wrp/warp.h b/archivers/wrp/warp.h old mode 100755 new mode 100644 diff --git a/archivers/xfd/main.c b/archivers/xfd/main.c old mode 100755 new mode 100644 diff --git a/archivers/xfd/xfd.c b/archivers/xfd/xfd.c old mode 100755 new mode 100644 diff --git a/archivers/xfd/xfdmaster.h b/archivers/xfd/xfdmaster.h old mode 100755 new mode 100644 diff --git a/archivers/zip/unzip.c b/archivers/zip/unzip.c old mode 100755 new mode 100644 diff --git a/archivers/zip/unzip.h b/archivers/zip/unzip.h old mode 100755 new mode 100644 diff --git a/audio.c b/audio.c old mode 100755 new mode 100644 diff --git a/autoconf.c b/autoconf.c old mode 100755 new mode 100644 diff --git a/blitops.c b/blitops.c old mode 100755 new mode 100644 diff --git a/blitter.c b/blitter.c old mode 100755 new mode 100644 diff --git a/blkdev.c b/blkdev.c old mode 100755 new mode 100644 diff --git a/bsdsocket.c b/bsdsocket.c old mode 100755 new mode 100644 diff --git a/build68k.c b/build68k.c old mode 100755 new mode 100644 diff --git a/catweasel.c b/catweasel.c old mode 100755 new mode 100644 diff --git a/cd32_fmv.c b/cd32_fmv.c old mode 100755 new mode 100644 diff --git a/cdrom.c b/cdrom.c old mode 100755 new mode 100644 diff --git a/cdtv.c b/cdtv.c old mode 100755 new mode 100644 diff --git a/cfgfile.c b/cfgfile.c old mode 100755 new mode 100644 index 9212d6cb..7cac94bb --- a/cfgfile.c +++ b/cfgfile.c @@ -272,10 +272,13 @@ static void cfg_dowrite (struct zfile *f, const TCHAR *option, const TCHAR *valu cfg_write (tmp, f); if (utf8 && !unicode_config) { char *opt = ua (option); - if (target) - sprintf (tmpa, "%s.%s.utf8=%s", TARGET_NAME, opt, tmp2); - else + if (target) { + char *tna = ua (TARGET_NAME); + sprintf (tmpa, "%s.%s.utf8=%s", tna, opt, tmp2); + xfree (tna); + } else { sprintf (tmpa, "%s.utf8=%s", opt, tmp2); + } xfree (opt); zfile_fwrite (tmpa, strlen (tmpa), 1, f); zfile_fwrite (&lf, 1, 1, f); @@ -1995,6 +1998,8 @@ static int isobsolete (TCHAR *s) } i++; } + if (_tcslen (s) > 2 && !_tcsncmp (s, L"w.", 2)) + return 1; if (_tcslen (s) >= 10 && !_tcsncmp (s, L"gfx_opengl", 10)) { write_log (L"obsolete config entry '%s\n", s); return 1; diff --git a/cia.c b/cia.c old mode 100755 new mode 100644 diff --git a/core.cw4.c b/core.cw4.c old mode 100755 new mode 100644 diff --git a/cpu_small.c b/cpu_small.c old mode 100755 new mode 100644 diff --git a/cpummu.c b/cpummu.c old mode 100755 new mode 100644 diff --git a/cpuopti.c b/cpuopti.c old mode 100755 new mode 100644 diff --git a/cpustbl_small.c b/cpustbl_small.c old mode 100755 new mode 100644 diff --git a/cputbl_small.h b/cputbl_small.h old mode 100755 new mode 100644 diff --git a/crc32.c b/crc32.c old mode 100755 new mode 100644 diff --git a/custom.c b/custom.c old mode 100755 new mode 100644 index f48e7f0d..2a46ba5a --- a/custom.c +++ b/custom.c @@ -3237,6 +3237,7 @@ static int isehb (uae_u16 bplcon0, uae_u16 bplcon2) bplehb = ((bplcon0 & 0xFC00) == 0x6000 || (bplcon0 & 0xFC00) == 0x7000) && !currprefs.cs_denisenoehb; return bplehb; } + static void BPLCON0 (int hpos, uae_u16 v) { if (! (currprefs.chipset_mask & CSMASK_ECS_DENISE)) diff --git a/debug.c b/debug.c old mode 100755 new mode 100644 diff --git a/disk.c b/disk.c old mode 100755 new mode 100644 diff --git a/diskutil.c b/diskutil.c old mode 100755 new mode 100644 diff --git a/drawing.c b/drawing.c old mode 100755 new mode 100644 index e111d497..508ef9c1 --- a/drawing.c +++ b/drawing.c @@ -1310,7 +1310,7 @@ static void init_ham_decoding (void) int pv = pixdata.apixels[ham_decode_pixel + unpainted_amiga - 1]; #ifdef AGA if (currprefs.chipset_mask & CSMASK_AGA) - ham_lastcolor = colors_for_drawing.color_regs_aga[pv]; + ham_lastcolor = colors_for_drawing.color_regs_aga[pv ^ bplxor]; else #endif ham_lastcolor = colors_for_drawing.color_regs_ecs[pv]; @@ -1319,7 +1319,7 @@ static void init_ham_decoding (void) } else if (currprefs.chipset_mask & CSMASK_AGA) { if (bplplanecnt >= 7) { /* AGA mode HAM8 */ while (unpainted_amiga-- > 0) { - int pv = pixdata.apixels[ham_decode_pixel++]; + int pv = pixdata.apixels[ham_decode_pixel++] ^ bplxor; switch (pv & 0x3) { case 0x0: ham_lastcolor = colors_for_drawing.color_regs_aga[pv >> 2]; break; @@ -1330,7 +1330,7 @@ static void init_ham_decoding (void) } } else { /* AGA mode HAM6 */ while (unpainted_amiga-- > 0) { - int pv = pixdata.apixels[ham_decode_pixel++]; + int pv = pixdata.apixels[ham_decode_pixel++] ^ bplxor; switch (pv & 0x30) { case 0x00: ham_lastcolor = colors_for_drawing.color_regs_aga[pv]; break; @@ -1365,7 +1365,7 @@ static void decode_ham (int pix, int stoppos) int pv = pixdata.apixels[ham_decode_pixel]; #ifdef AGA if (currprefs.chipset_mask & CSMASK_AGA) - ham_lastcolor = colors_for_drawing.color_regs_aga[pv]; + ham_lastcolor = colors_for_drawing.color_regs_aga[pv ^ bplxor]; else #endif ham_lastcolor = colors_for_drawing.color_regs_ecs[pv]; @@ -1376,7 +1376,7 @@ static void decode_ham (int pix, int stoppos) } else if (currprefs.chipset_mask & CSMASK_AGA) { if (bplplanecnt >= 7) { /* AGA mode HAM8 */ while (todraw_amiga-- > 0) { - int pv = pixdata.apixels[ham_decode_pixel]; + int pv = pixdata.apixels[ham_decode_pixel] ^ bplxor; switch (pv & 0x3) { case 0x0: ham_lastcolor = colors_for_drawing.color_regs_aga[pv >> 2]; break; @@ -1388,7 +1388,7 @@ static void decode_ham (int pix, int stoppos) } } else { /* AGA mode HAM6 */ while (todraw_amiga-- > 0) { - int pv = pixdata.apixels[ham_decode_pixel]; + int pv = pixdata.apixels[ham_decode_pixel] ^ bplxor; switch (pv & 0x30) { case 0x00: ham_lastcolor = colors_for_drawing.color_regs_aga[pv]; break; @@ -1841,6 +1841,25 @@ static void pfield_expand_dp_bplcon (void) #endif } +static int isham (uae_u16 bplcon0) +{ + int p = GET_PLANES (bplcon0); + if (!(bplcon0 & 0x800)) + return 0; + if (currprefs.chipset_mask & CSMASK_AGA) { + // AGA only has 6 or 8 plane HAM + if (p == 6 || p == 8) + return 1; + } else { + // OCS/ECS also supports 5 plane HAM + if (GET_RES_DENISE (bplcon0) > 0) + return 0; + if (p >= 5) + return 1; + } + return 0; +} + static void pfield_expand_dp_bplcon2 (int regno, int v) { regno -= 0x1000; @@ -1850,7 +1869,7 @@ static void pfield_expand_dp_bplcon2 (int regno, int v) dp_for_drawing->bplcon0 = v; dp_for_drawing->bplres = GET_RES_DENISE (v); dp_for_drawing->nr_planes = GET_PLANES (v); - dp_for_drawing->ham_seen = !! (v & 0x800); + dp_for_drawing->ham_seen = isham (v); break; case 0x104: dp_for_drawing->bplcon2 = v; diff --git a/driveclick.c b/driveclick.c old mode 100755 new mode 100644 diff --git a/enforcer.c b/enforcer.c old mode 100755 new mode 100644 diff --git a/epsonprinter.c b/epsonprinter.c old mode 100755 new mode 100644 diff --git a/ersatz.c b/ersatz.c old mode 100755 new mode 100644 diff --git a/expansion.c b/expansion.c old mode 100755 new mode 100644 diff --git a/fdi2raw.c b/fdi2raw.c old mode 100755 new mode 100644 diff --git a/filesys.asm b/filesys.asm old mode 100755 new mode 100644 diff --git a/filesys.c b/filesys.c old mode 100755 new mode 100644 index 5a5b809c..df38f39b --- a/filesys.c +++ b/filesys.c @@ -566,9 +566,9 @@ int move_filesys_unitconfig (struct uae_prefs *p, int nr, int to) } -static void filesys_addexternals(void); +static void filesys_addexternals (void); -static void initialize_mountinfo(void) +static void initialize_mountinfo (void) { int i; struct uaedev_config_info *uci; @@ -5003,7 +5003,6 @@ static void filesys_reset2 (void) key_uniq = 0; a_uniq = 0; free_mountinfo (); - initialize_mountinfo (); } void filesys_reset (void) @@ -5011,6 +5010,7 @@ void filesys_reset (void) if (savestate_state == STATE_RESTORE) return; filesys_reset2 (); + initialize_mountinfo (); } static void filesys_prepare_reset2 (void) diff --git a/filesys.sh b/filesys.sh old mode 100755 new mode 100644 diff --git a/filesys_bootrom.c b/filesys_bootrom.c old mode 100755 new mode 100644 diff --git a/fpp.c b/fpp.c old mode 100755 new mode 100644 diff --git a/fsdb.c b/fsdb.c old mode 100755 new mode 100644 diff --git a/fsdb_unix.c b/fsdb_unix.c old mode 100755 new mode 100644 diff --git a/fsusage.c b/fsusage.c old mode 100755 new mode 100644 diff --git a/gayle.c b/gayle.c old mode 100755 new mode 100644 diff --git a/genblitter.c b/genblitter.c old mode 100755 new mode 100644 diff --git a/gencpu.c b/gencpu.c old mode 100755 new mode 100644 diff --git a/gencpu_mini.c b/gencpu_mini.c old mode 100755 new mode 100644 diff --git a/gengenblitter.c b/gengenblitter.c old mode 100755 new mode 100644 diff --git a/genlinetoscr.c b/genlinetoscr.c old mode 100755 new mode 100644 diff --git a/genp2c.c b/genp2c.c old mode 100755 new mode 100644 diff --git a/gfxlib.c b/gfxlib.c old mode 100755 new mode 100644 diff --git a/gfxutil.c b/gfxutil.c old mode 100755 new mode 100644 diff --git a/gtkui.c b/gtkui.c old mode 100755 new mode 100644 diff --git a/hardfile.c b/hardfile.c old mode 100755 new mode 100644 diff --git a/hrtmon_rom.c b/hrtmon_rom.c old mode 100755 new mode 100644 diff --git a/identify.c b/identify.c old mode 100755 new mode 100644 diff --git a/include/a2091.h b/include/a2091.h old mode 100755 new mode 100644 diff --git a/include/akiko.h b/include/akiko.h old mode 100755 new mode 100644 diff --git a/include/amax.h b/include/amax.h old mode 100755 new mode 100644 diff --git a/include/ar.h b/include/ar.h old mode 100755 new mode 100644 diff --git a/include/arcadia.h b/include/arcadia.h old mode 100755 new mode 100644 diff --git a/include/audio.h b/include/audio.h old mode 100755 new mode 100644 diff --git a/include/autoconf.h b/include/autoconf.h old mode 100755 new mode 100644 diff --git a/include/blitter.h b/include/blitter.h old mode 100755 new mode 100644 diff --git a/include/blkdev.h b/include/blkdev.h old mode 100755 new mode 100644 diff --git a/include/bsdsocket.h b/include/bsdsocket.h old mode 100755 new mode 100644 diff --git a/include/catweasel.h b/include/catweasel.h old mode 100755 new mode 100644 diff --git a/include/cd32_fmv.h b/include/cd32_fmv.h old mode 100755 new mode 100644 diff --git a/include/cdtv.h b/include/cdtv.h old mode 100755 new mode 100644 diff --git a/include/cia.h b/include/cia.h old mode 100755 new mode 100644 diff --git a/include/clipboard.h b/include/clipboard.h old mode 100755 new mode 100644 diff --git a/include/commpipe.h b/include/commpipe.h old mode 100755 new mode 100644 diff --git a/include/cpu_prefetch.h b/include/cpu_prefetch.h old mode 100755 new mode 100644 diff --git a/include/cpu_small.h b/include/cpu_small.h old mode 100755 new mode 100644 diff --git a/include/cpummu.h b/include/cpummu.h old mode 100755 new mode 100644 diff --git a/include/crc32.h b/include/crc32.h old mode 100755 new mode 100644 diff --git a/include/custom.h b/include/custom.h old mode 100755 new mode 100644 index c4d8ed19..1dd2a1cb --- a/include/custom.h +++ b/include/custom.h @@ -180,7 +180,14 @@ STATIC_INLINE int GET_RES_AGNUS (uae_u16 con0) /* get sprite width from FMODE */ #define GET_SPRITEWIDTH(FMODE) ((((FMODE) >> 2) & 3) == 3 ? 64 : (((FMODE) >> 2) & 3) == 0 ? 16 : 32) /* Compute the number of bitplanes from a value written to BPLCON0 */ -#define GET_PLANES(x) ((((x) >> 12) & 7) | (((x) & 0x10) >> 1)) +STATIC_INLINE int GET_PLANES(uae_u16 bplcon0) +{ + if ((bplcon0 & 0x0010) && (bplcon0 & 0x7000)) + return 0; + if (bplcon0 & 0x0010) + return 8; + return (bplcon0 >> 12) & 7; +} extern void fpscounter_reset (void); extern unsigned long idletime; diff --git a/include/debug.h b/include/debug.h old mode 100755 new mode 100644 diff --git a/include/disk.h b/include/disk.h old mode 100755 new mode 100644 diff --git a/include/diskutil.h b/include/diskutil.h old mode 100755 new mode 100644 diff --git a/include/drawing.h b/include/drawing.h old mode 100755 new mode 100644 diff --git a/include/driveclick.h b/include/driveclick.h old mode 100755 new mode 100644 diff --git a/include/enforcer.h b/include/enforcer.h old mode 100755 new mode 100644 diff --git a/include/epsonprinter.h b/include/epsonprinter.h old mode 100755 new mode 100644 diff --git a/include/ersatz.h b/include/ersatz.h old mode 100755 new mode 100644 diff --git a/include/events.h b/include/events.h old mode 100755 new mode 100644 diff --git a/include/events_jit.h b/include/events_jit.h old mode 100755 new mode 100644 diff --git a/include/events_normal.h b/include/events_normal.h old mode 100755 new mode 100644 diff --git a/include/execio.h b/include/execio.h old mode 100755 new mode 100644 diff --git a/include/execlib.h b/include/execlib.h old mode 100755 new mode 100644 diff --git a/include/fdi2raw.h b/include/fdi2raw.h old mode 100755 new mode 100644 diff --git a/include/filesys.h b/include/filesys.h old mode 100755 new mode 100644 diff --git a/include/flags_x86.h b/include/flags_x86.h old mode 100755 new mode 100644 diff --git a/include/fpp-ieee-be.h b/include/fpp-ieee-be.h old mode 100755 new mode 100644 diff --git a/include/fpp-unknown.h b/include/fpp-unknown.h old mode 100755 new mode 100644 diff --git a/include/fsdb.h b/include/fsdb.h old mode 100755 new mode 100644 diff --git a/include/fsusage.h b/include/fsusage.h old mode 100755 new mode 100644 diff --git a/include/gayle.h b/include/gayle.h old mode 100755 new mode 100644 diff --git a/include/genblitter.h b/include/genblitter.h old mode 100755 new mode 100644 diff --git a/include/gensound.h b/include/gensound.h old mode 100755 new mode 100644 diff --git a/include/gfxfilter.h b/include/gfxfilter.h old mode 100755 new mode 100644 diff --git a/include/gui.h b/include/gui.h old mode 100755 new mode 100644 diff --git a/include/identify.h b/include/identify.h old mode 100755 new mode 100644 diff --git a/include/inputdevice.h b/include/inputdevice.h old mode 100755 new mode 100644 diff --git a/include/keyboard.h b/include/keyboard.h old mode 100755 new mode 100644 diff --git a/include/keybuf.h b/include/keybuf.h old mode 100755 new mode 100644 diff --git a/include/mackbd.h b/include/mackbd.h old mode 100755 new mode 100644 diff --git a/include/memory.h b/include/memory.h old mode 100755 new mode 100644 diff --git a/include/moduleripper.h b/include/moduleripper.h old mode 100755 new mode 100644 diff --git a/include/native2amiga.h b/include/native2amiga.h old mode 100755 new mode 100644 diff --git a/include/native2amiga_api.h b/include/native2amiga_api.h old mode 100755 new mode 100644 diff --git a/include/ncr_scsi.h b/include/ncr_scsi.h old mode 100755 new mode 100644 diff --git a/include/newcpu.h b/include/newcpu.h old mode 100755 new mode 100644 diff --git a/include/options.h b/include/options.h old mode 100755 new mode 100644 diff --git a/include/osemu.h b/include/osemu.h old mode 100755 new mode 100644 diff --git a/include/parallel.h b/include/parallel.h old mode 100755 new mode 100644 diff --git a/include/picasso96.h b/include/picasso96.h old mode 100755 new mode 100644 diff --git a/include/readcpu.h b/include/readcpu.h old mode 100755 new mode 100644 diff --git a/include/rtgmodes.h b/include/rtgmodes.h old mode 100755 new mode 100644 diff --git a/include/sana2.h b/include/sana2.h old mode 100755 new mode 100644 diff --git a/include/savestate.h b/include/savestate.h old mode 100755 new mode 100644 diff --git a/include/scsi.h b/include/scsi.h old mode 100755 new mode 100644 diff --git a/include/scsidev.h b/include/scsidev.h old mode 100755 new mode 100644 diff --git a/include/serial.h b/include/serial.h old mode 100755 new mode 100644 diff --git a/include/statusline.h b/include/statusline.h old mode 100755 new mode 100644 diff --git a/include/sysdeps.h b/include/sysdeps.h old mode 100755 new mode 100644 diff --git a/include/traps.h b/include/traps.h old mode 100755 new mode 100644 diff --git a/include/uae.h b/include/uae.h old mode 100755 new mode 100644 diff --git a/include/uaeexe.h b/include/uaeexe.h old mode 100755 new mode 100644 diff --git a/include/uaeipc.h b/include/uaeipc.h old mode 100755 new mode 100644 diff --git a/include/uaeresource.h b/include/uaeresource.h old mode 100755 new mode 100644 diff --git a/include/uaeserial.h b/include/uaeserial.h old mode 100755 new mode 100644 diff --git a/include/xwin.h b/include/xwin.h old mode 100755 new mode 100644 diff --git a/include/zarchive.h b/include/zarchive.h old mode 100755 new mode 100644 diff --git a/include/zfile.h b/include/zfile.h old mode 100755 new mode 100644 diff --git a/inprec.c b/inprec.c old mode 100755 new mode 100644 diff --git a/inputdevice.c b/inputdevice.c old mode 100755 new mode 100644 index cfcb2772..60f9ce17 --- a/inputdevice.c +++ b/inputdevice.c @@ -892,18 +892,29 @@ static uaecptr get_base (const uae_char *name) uae_u8 *p; b = &get_mem_bank (v); if (!b || !b->check (v, 32) || b->flags != ABFLAG_RAM) - return 0xffffffff; + goto fail; v2 = get_long (v + 10); // name b = &get_mem_bank (v2); if (!b || !b->check (v2, 20)) - return 0xffffffff; + goto fail; if (b->flags != ABFLAG_ROM && b->flags != ABFLAG_RAM) return 0; p = b->xlateaddr (v2); - if (!memcmp (p, name, strlen (name) + 1)) + if (!memcmp (p, name, strlen (name) + 1)) { + TCHAR *s = au (name); + write_log (L"get_base('%s')=%08x\n", s, v); + xfree (s); return v; + } } return 0; +fail: + { + TCHAR *s = au (name); + write_log (L"get_base('%s') failed, invalid library list\n", s); + xfree (s); + } + return 0xffffffff; } static uaecptr get_intuitionbase (void) @@ -1455,7 +1466,7 @@ end: x += dx; y += dy; } - if (!dmaen(DMA_SPRITE)) + if (!dmaen (DMA_SPRITE)) setmouseactivexy (x, y, 0); else setmouseactivexy (x, y, dir); @@ -1532,37 +1543,38 @@ static void mouseupdate (int pct, int vsync) { int v, i; int max = 127; + static int mxd, myd; if (pct > 1000) pct = 1000; if (vsync) { - if (mouse_delta[0][0] < 0) { + if (mxd < 0) { if (mouseedge_x > 0) mouseedge_x = 0; else - mouseedge_x += mouse_delta[0][0]; + mouseedge_x += mxd; mouseedge_time = MOUSEEDGE_TIME; } - if (mouse_delta[0][0] > 0) { + if (mxd > 0) { if (mouseedge_x < 0) mouseedge_x = 0; else - mouseedge_x += mouse_delta[0][0]; + mouseedge_x += mxd; mouseedge_time = MOUSEEDGE_TIME; } - if (mouse_delta[0][1] < 0) { + if (myd < 0) { if (mouseedge_y > 0) mouseedge_y = 0; else - mouseedge_y += mouse_delta[0][1]; + mouseedge_y += myd; mouseedge_time = MOUSEEDGE_TIME; } - if (mouse_delta[0][1] > 0) { + if (myd > 0) { if (mouseedge_y < 0) mouseedge_y = 0; else - mouseedge_y += mouse_delta[0][1]; + mouseedge_y += myd; mouseedge_time = MOUSEEDGE_TIME; } if (mouseedge_time > 0) { @@ -1572,14 +1584,18 @@ static void mouseupdate (int pct, int vsync) mouseedge_y = 0; } } + mxd = 0; + myd = 0; } for (i = 0; i < 2; i++) { v = getvelocity (i, 0, pct); + mxd += v; mouse_x[i] += v; v = getvelocity (i, 1, pct); + myd += v; mouse_y[i] += v; v = getvelocity (i, 2, pct); @@ -2386,6 +2402,7 @@ int handle_input_event (int nr, int state, int max, int autofire) int delta; int deadzone = currprefs.input_joymouse_deadzone * max / 100; int unit = ie->data & 0x7f; + if (max) { if (state <= deadzone && state >= -deadzone) { state = 0; @@ -2410,6 +2427,7 @@ int handle_input_event (int nr, int state, int max, int autofire) else if (state < 0) delta = -JOYMOUSE_CDTV; } + mouse_delta[joy][unit] += delta * ((ie->data & IE_INVERT) ? -1 : 1); } else if (ie->type & 32) { /* button mouse emulation vertical */ @@ -4105,6 +4123,7 @@ void setmousestate (int mouse, int axis, int data, int isabs) for (i = 0; i < MAX_INPUT_SUB_EVENT; i++) handle_input_event (id->eventid[ID_AXIS_OFFSET + axis][i], v, 0, 0); } + int getmousestate (int joy) { if (testmode) diff --git a/inputevents.def b/inputevents.def old mode 100755 new mode 100644 diff --git a/jit/codegen_x86.c b/jit/codegen_x86.c old mode 100755 new mode 100644 diff --git a/jit/codegen_x86.h b/jit/codegen_x86.h old mode 100755 new mode 100644 diff --git a/jit/compemu.h b/jit/compemu.h old mode 100755 new mode 100644 diff --git a/jit/compemu_codegen.h b/jit/compemu_codegen.h old mode 100755 new mode 100644 diff --git a/jit/compemu_fpp.c b/jit/compemu_fpp.c old mode 100755 new mode 100644 diff --git a/jit/compemu_optimizer_x86.c b/jit/compemu_optimizer_x86.c old mode 100755 new mode 100644 diff --git a/jit/compemu_raw_x86.c b/jit/compemu_raw_x86.c old mode 100755 new mode 100644 diff --git a/jit/compemu_support.c b/jit/compemu_support.c old mode 100755 new mode 100644 diff --git a/jit/compemu_support_codegen.c b/jit/compemu_support_codegen.c old mode 100755 new mode 100644 diff --git a/jit/gencomp.c b/jit/gencomp.c old mode 100755 new mode 100644 diff --git a/keybuf.c b/keybuf.c old mode 100755 new mode 100644 diff --git a/main.c b/main.c old mode 100755 new mode 100644 diff --git a/memory.c b/memory.c old mode 100755 new mode 100644 index bf9eeca4..4f358e60 --- a/memory.c +++ b/memory.c @@ -3920,33 +3920,39 @@ uae_u8 *restore_rom (uae_u8 *src) crcdet = 0; for (i = 0; i < romlist_cnt; i++) { if (rl[i].rd->crc32 == crc32 && crc32) { + if (zfile_exists (rl[i].path)) { + switch (mem_type) + { + case 0: + _tcsncpy (changed_prefs.romfile, rl[i].path, 255); + break; + case 1: + _tcsncpy (changed_prefs.romextfile, rl[i].path, 255); + break; + } + write_log (L"ROM '%s' = '%s'\n", romn, rl[i].path); + crcdet = 1; + } else { + write_log (L"ROM '%s' = '%s' invalid rom scanner path!", romn, rl[i].path); + } + break; + } + } + s = restore_string (); + if (!crcdet) { + if (zfile_exists (s)) { switch (mem_type) { case 0: - _tcsncpy (changed_prefs.romfile, rl[i].path, 255); + _tcsncpy (changed_prefs.romfile, s, 255); break; case 1: - _tcsncpy (changed_prefs.romextfile, rl[i].path, 255); + _tcsncpy (changed_prefs.romextfile, s, 255); break; } - write_log (L"ROM '%s' = '%s'\n", romn, rl[i].path); + write_log (L"ROM detected (path) as '%s'\n", s); crcdet = 1; - break; - } - } - s = restore_string (); - if (!crcdet && zfile_exists (s)) { - switch (mem_type) - { - case 0: - _tcsncpy (changed_prefs.romfile, s, 255); - break; - case 1: - _tcsncpy (changed_prefs.romextfile, s, 255); - break; } - write_log (L"ROM detected (path) as '%s'\n", s); - crcdet = 1; } xfree (s); if (!crcdet) diff --git a/missing.c b/missing.c old mode 100755 new mode 100644 diff --git a/moduleripper.c b/moduleripper.c old mode 100755 new mode 100644 diff --git a/native2amiga.c b/native2amiga.c old mode 100755 new mode 100644 diff --git a/ncr_scsi.c b/ncr_scsi.c old mode 100755 new mode 100644 diff --git a/newcpu.c b/newcpu.c old mode 100755 new mode 100644 index 7c032532..acb00914 --- a/newcpu.c +++ b/newcpu.c @@ -187,6 +187,8 @@ static void build_cpufunctbl (void) break; #endif #endif + default: + changed_prefs.cpu_model = currprefs.cpu_model = 68000; case 68000: lvl = 0; tbl = op_smalltbl_5_ff; @@ -202,7 +204,7 @@ static void build_cpufunctbl (void) } if (tbl == 0) { - write_log (L"no CPU emulation cores available!"); + write_log (L"no CPU emulation cores available CPU=%d!", currprefs.cpu_model); abort (); } @@ -3062,7 +3064,7 @@ uae_u8 *restore_cpu (uae_u8 *src) currprefs.m68k_speed = changed_prefs.m68k_speed = 0; } write_log (L"CPU %d%s%03d, PC=%08X\n", - model / 1000, flags & 1 ? "EC" : "", model % 1000, regs.pc); + model / 1000, flags & 1 ? L"EC" : L"", model % 1000, regs.pc); return src; } diff --git a/nogui.c b/nogui.c old mode 100755 new mode 100644 diff --git a/od-win32/7zplugin.c b/od-win32/7zplugin.c old mode 100755 new mode 100644 diff --git a/od-win32/WinUAE_Install.nsi b/od-win32/WinUAE_Install.nsi old mode 100755 new mode 100644 diff --git a/od-win32/ahidsound.h b/od-win32/ahidsound.h old mode 100755 new mode 100644 diff --git a/od-win32/ahidsound_dsonly.c b/od-win32/ahidsound_dsonly.c old mode 100755 new mode 100644 diff --git a/od-win32/ahidsound_new.c b/od-win32/ahidsound_new.c old mode 100755 new mode 100644 diff --git a/od-win32/ahidsound_new.h b/od-win32/ahidsound_new.h old mode 100755 new mode 100644 diff --git a/od-win32/ahidsound_new2.c b/od-win32/ahidsound_new2.c old mode 100755 new mode 100644 diff --git a/od-win32/ahidsound_unified.c b/od-win32/ahidsound_unified.c old mode 100755 new mode 100644 diff --git a/od-win32/ahidsoundx_new.c b/od-win32/ahidsoundx_new.c old mode 100755 new mode 100644 diff --git a/od-win32/asm.cmd b/od-win32/asm.cmd old mode 100755 new mode 100644 diff --git a/od-win32/avioutput.c b/od-win32/avioutput.c old mode 100755 new mode 100644 diff --git a/od-win32/avioutput.h b/od-win32/avioutput.h old mode 100755 new mode 100644 diff --git a/od-win32/blkdev_win32_aspi.c b/od-win32/blkdev_win32_aspi.c old mode 100755 new mode 100644 diff --git a/od-win32/blkdev_win32_ioctl.c b/od-win32/blkdev_win32_ioctl.c old mode 100755 new mode 100644 diff --git a/od-win32/blkdev_win32_spti.c b/od-win32/blkdev_win32_spti.c old mode 100755 new mode 100644 diff --git a/od-win32/bsdsock.c b/od-win32/bsdsock.c old mode 100755 new mode 100644 diff --git a/od-win32/build68k_msvc/build68k_msvc.rc b/od-win32/build68k_msvc/build68k_msvc.rc old mode 100755 new mode 100644 diff --git a/od-win32/build68k_msvc/build68k_msvc.vcproj b/od-win32/build68k_msvc/build68k_msvc.vcproj old mode 100755 new mode 100644 diff --git a/od-win32/build68k_msvc/build68k_msvc.vcxproj b/od-win32/build68k_msvc/build68k_msvc.vcxproj old mode 100755 new mode 100644 diff --git a/od-win32/build68k_msvc/build68k_msvc.vcxproj.filters b/od-win32/build68k_msvc/build68k_msvc.vcxproj.filters old mode 100755 new mode 100644 diff --git a/od-win32/caps/CapsAPI.h b/od-win32/caps/CapsAPI.h old mode 100755 new mode 100644 diff --git a/od-win32/caps/CapsLib.h b/od-win32/caps/CapsLib.h old mode 100755 new mode 100644 diff --git a/od-win32/caps/Comlib.h b/od-win32/caps/Comlib.h old mode 100755 new mode 100644 diff --git a/od-win32/caps/Comtype.h b/od-win32/caps/Comtype.h old mode 100755 new mode 100644 diff --git a/od-win32/caps/caps_win32.c b/od-win32/caps/caps_win32.c old mode 100755 new mode 100644 diff --git a/od-win32/caps/caps_win32.h b/od-win32/caps/caps_win32.h old mode 100755 new mode 100644 diff --git a/od-win32/clipboard_win32.c b/od-win32/clipboard_win32.c old mode 100755 new mode 100644 diff --git a/od-win32/clipboard_win32.h b/od-win32/clipboard_win32.h old mode 100755 new mode 100644 diff --git a/od-win32/clirun.c b/od-win32/clirun.c old mode 100755 new mode 100644 diff --git a/od-win32/cloanto/RetroPlatformGuestIPC.c b/od-win32/cloanto/RetroPlatformGuestIPC.c old mode 100755 new mode 100644 diff --git a/od-win32/cloanto/RetroPlatformGuestIPC.h b/od-win32/cloanto/RetroPlatformGuestIPC.h old mode 100755 new mode 100644 diff --git a/od-win32/cloanto/RetroPlatformIPC.h b/od-win32/cloanto/RetroPlatformIPC.h old mode 100755 new mode 100644 diff --git a/od-win32/cloanto/RetroPlatformIPC_doc_draft.txt b/od-win32/cloanto/RetroPlatformIPC_doc_draft.txt old mode 100755 new mode 100644 diff --git a/od-win32/debug_win32.c b/od-win32/debug_win32.c old mode 100755 new mode 100644 diff --git a/od-win32/debug_win32.h b/od-win32/debug_win32.h old mode 100755 new mode 100644 diff --git a/od-win32/dinput.c b/od-win32/dinput.c old mode 100755 new mode 100644 diff --git a/od-win32/direct3d.c b/od-win32/direct3d.c old mode 100755 new mode 100644 diff --git a/od-win32/direct3d.h b/od-win32/direct3d.h old mode 100755 new mode 100644 diff --git a/od-win32/diskutil.c b/od-win32/diskutil.c old mode 100755 new mode 100644 diff --git a/od-win32/diskutil.h b/od-win32/diskutil.h old mode 100755 new mode 100644 diff --git a/od-win32/driveclick_win32.c b/od-win32/driveclick_win32.c old mode 100755 new mode 100644 diff --git a/od-win32/dxwrap.c b/od-win32/dxwrap.c old mode 100755 new mode 100644 diff --git a/od-win32/dxwrap.h b/od-win32/dxwrap.h old mode 100755 new mode 100644 diff --git a/od-win32/fdrawcmd.c b/od-win32/fdrawcmd.c old mode 100755 new mode 100644 diff --git a/od-win32/fsdb_mywin32.c b/od-win32/fsdb_mywin32.c old mode 100755 new mode 100644 diff --git a/od-win32/fsdb_win32.c b/od-win32/fsdb_win32.c old mode 100755 new mode 100644 diff --git a/od-win32/genblitter_msvc/genblitter_msvc.vcproj b/od-win32/genblitter_msvc/genblitter_msvc.vcproj old mode 100755 new mode 100644 diff --git a/od-win32/genblitter_msvc/genblitter_msvc.vcxproj b/od-win32/genblitter_msvc/genblitter_msvc.vcxproj old mode 100755 new mode 100644 diff --git a/od-win32/genblitter_msvc/genblitter_msvc.vcxproj.filters b/od-win32/genblitter_msvc/genblitter_msvc.vcxproj.filters old mode 100755 new mode 100644 diff --git a/od-win32/gencomp_msvc/gencomp_msvc.vcproj b/od-win32/gencomp_msvc/gencomp_msvc.vcproj old mode 100755 new mode 100644 diff --git a/od-win32/gencomp_msvc/gencomp_msvc.vcxproj b/od-win32/gencomp_msvc/gencomp_msvc.vcxproj old mode 100755 new mode 100644 diff --git a/od-win32/gencomp_msvc/gencomp_msvc.vcxproj.filters b/od-win32/gencomp_msvc/gencomp_msvc.vcxproj.filters old mode 100755 new mode 100644 diff --git a/od-win32/gencpu_msvc/gencpu.exe.manifest b/od-win32/gencpu_msvc/gencpu.exe.manifest old mode 100755 new mode 100644 diff --git a/od-win32/gencpu_msvc/gencpu_msvc.vcproj b/od-win32/gencpu_msvc/gencpu_msvc.vcproj old mode 100755 new mode 100644 diff --git a/od-win32/gencpu_msvc/gencpu_msvc.vcxproj b/od-win32/gencpu_msvc/gencpu_msvc.vcxproj old mode 100755 new mode 100644 diff --git a/od-win32/gencpu_msvc/gencpu_msvc.vcxproj.filters b/od-win32/gencpu_msvc/gencpu_msvc.vcxproj.filters old mode 100755 new mode 100644 diff --git a/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcproj b/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcproj old mode 100755 new mode 100644 diff --git a/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj b/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj old mode 100755 new mode 100644 diff --git a/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj.filters b/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcxproj.filters old mode 100755 new mode 100644 diff --git a/od-win32/graphics/amiga_header.bmp b/od-win32/graphics/amiga_header.bmp old mode 100755 new mode 100644 diff --git a/od-win32/graphics/amiga_welcome.bmp b/od-win32/graphics/amiga_welcome.bmp old mode 100755 new mode 100644 diff --git a/od-win32/graphics/installer_icon.ico b/od-win32/graphics/installer_icon.ico old mode 100755 new mode 100644 diff --git a/od-win32/hardfile_win32.c b/od-win32/hardfile_win32.c old mode 100755 new mode 100644 diff --git a/od-win32/hq2x16.asm b/od-win32/hq2x16.asm old mode 100755 new mode 100644 diff --git a/od-win32/hq2x32.asm b/od-win32/hq2x32.asm old mode 100755 new mode 100644 diff --git a/od-win32/hq2x_d3d.c b/od-win32/hq2x_d3d.c old mode 100755 new mode 100644 diff --git a/od-win32/hq2x_d3d.h b/od-win32/hq2x_d3d.h old mode 100755 new mode 100644 diff --git a/od-win32/hq3x16.asm b/od-win32/hq3x16.asm old mode 100755 new mode 100644 diff --git a/od-win32/hq3x32.asm b/od-win32/hq3x32.asm old mode 100755 new mode 100644 diff --git a/od-win32/hq4x16.asm b/od-win32/hq4x16.asm old mode 100755 new mode 100644 diff --git a/od-win32/hq4x32.asm b/od-win32/hq4x32.asm old mode 100755 new mode 100644 diff --git a/od-win32/ioport.c b/od-win32/ioport.c old mode 100755 new mode 100644 diff --git a/od-win32/ioport.h b/od-win32/ioport.h old mode 100755 new mode 100644 diff --git a/od-win32/ipctester.c b/od-win32/ipctester.c old mode 100755 new mode 100644 diff --git a/od-win32/keyboard_win32.c b/od-win32/keyboard_win32.c old mode 100755 new mode 100644 diff --git a/od-win32/lcd.c b/od-win32/lcd.c old mode 100755 new mode 100644 diff --git a/od-win32/lcd.h b/od-win32/lcd.h old mode 100755 new mode 100644 diff --git a/od-win32/machdep/m68k.h b/od-win32/machdep/m68k.h old mode 100755 new mode 100644 diff --git a/od-win32/machdep/maccess.h b/od-win32/machdep/maccess.h old mode 100755 new mode 100644 diff --git a/od-win32/machdep/rpt.h b/od-win32/machdep/rpt.h old mode 100755 new mode 100644 diff --git a/od-win32/machdep/support.c b/od-win32/machdep/support.c old mode 100755 new mode 100644 diff --git a/od-win32/makeexe.cmd b/od-win32/makeexe.cmd old mode 100755 new mode 100644 diff --git a/od-win32/md-fpp.h b/od-win32/md-fpp.h old mode 100755 new mode 100644 diff --git a/od-win32/midi.c b/od-win32/midi.c old mode 100755 new mode 100644 diff --git a/od-win32/midi.h b/od-win32/midi.h old mode 100755 new mode 100644 diff --git a/od-win32/midiin.c b/od-win32/midiin.c old mode 100755 new mode 100644 diff --git a/od-win32/mman.c b/od-win32/mman.c old mode 100755 new mode 100644 diff --git a/od-win32/opengl.c b/od-win32/opengl.c old mode 100755 new mode 100644 diff --git a/od-win32/opengl.h b/od-win32/opengl.h old mode 100755 new mode 100644 diff --git a/od-win32/parser.c b/od-win32/parser.c old mode 100755 new mode 100644 diff --git a/od-win32/parser.h b/od-win32/parser.h old mode 100755 new mode 100644 diff --git a/od-win32/picasso96_win.c b/od-win32/picasso96_win.c old mode 100755 new mode 100644 diff --git a/od-win32/picasso96_win.h b/od-win32/picasso96_win.h old mode 100755 new mode 100644 diff --git a/od-win32/posixemu.c b/od-win32/posixemu.c old mode 100755 new mode 100644 diff --git a/od-win32/posixemu.h b/od-win32/posixemu.h old mode 100755 new mode 100644 diff --git a/od-win32/registry.c b/od-win32/registry.c old mode 100755 new mode 100644 diff --git a/od-win32/registry.h b/od-win32/registry.h old mode 100755 new mode 100644 diff --git a/od-win32/resources/35floppy.ico b/od-win32/resources/35floppy.ico old mode 100755 new mode 100644 diff --git a/od-win32/resources/Mycomp.ico b/od-win32/resources/Mycomp.ico old mode 100755 new mode 100644 diff --git a/od-win32/resources/WinUAE_German.rc b/od-win32/resources/WinUAE_German.rc old mode 100755 new mode 100644 diff --git a/od-win32/resources/amiga.png b/od-win32/resources/amiga.png old mode 100755 new mode 100644 diff --git a/od-win32/resources/amigainfo.ico b/od-win32/resources/amigainfo.ico old mode 100755 new mode 100644 diff --git a/od-win32/resources/avioutput.ico b/od-win32/resources/avioutput.ico old mode 100755 new mode 100644 diff --git a/od-win32/resources/base floppy.png b/od-win32/resources/base floppy.png new file mode 100644 index 00000000..b6eb69c5 Binary files /dev/null and b/od-win32/resources/base floppy.png differ diff --git a/od-win32/resources/chip.ico b/od-win32/resources/chip.ico old mode 100755 new mode 100644 diff --git a/od-win32/resources/cpu.ico b/od-win32/resources/cpu.ico old mode 100755 new mode 100644 diff --git a/od-win32/resources/diskimage.ico b/od-win32/resources/diskimage.ico new file mode 100644 index 00000000..b966b99b Binary files /dev/null and b/od-win32/resources/diskimage.ico differ diff --git a/od-win32/resources/drive.ico b/od-win32/resources/drive.ico old mode 100755 new mode 100644 diff --git a/od-win32/resources/drive_click.wav b/od-win32/resources/drive_click.wav old mode 100755 new mode 100644 diff --git a/od-win32/resources/drive_snatch.wav b/od-win32/resources/drive_snatch.wav old mode 100755 new mode 100644 diff --git a/od-win32/resources/drive_spin.wav b/od-win32/resources/drive_spin.wav old mode 100755 new mode 100644 diff --git a/od-win32/resources/drive_spinnd.wav b/od-win32/resources/drive_spinnd.wav old mode 100755 new mode 100644 diff --git a/od-win32/resources/drive_startup.wav b/od-win32/resources/drive_startup.wav old mode 100755 new mode 100644 diff --git a/od-win32/resources/file.ico b/od-win32/resources/file.ico old mode 100755 new mode 100644 diff --git a/od-win32/resources/folder.ico b/od-win32/resources/folder.ico old mode 100755 new mode 100644 diff --git a/od-win32/resources/h_arrow.cur b/od-win32/resources/h_arrow.cur old mode 100755 new mode 100644 diff --git a/od-win32/resources/icon3.ico b/od-win32/resources/icon3.ico new file mode 100644 index 00000000..f1282c69 Binary files /dev/null and b/od-win32/resources/icon3.ico differ diff --git a/od-win32/resources/joystick.ico b/od-win32/resources/joystick.ico old mode 100755 new mode 100644 diff --git a/od-win32/resources/lcd.bmp b/od-win32/resources/lcd.bmp old mode 100755 new mode 100644 diff --git a/od-win32/resources/misc.ico b/od-win32/resources/misc.ico old mode 100755 new mode 100644 diff --git a/od-win32/resources/move_dow.ico b/od-win32/resources/move_dow.ico old mode 100755 new mode 100644 diff --git a/od-win32/resources/move_up.ico b/od-win32/resources/move_up.ico old mode 100755 new mode 100644 diff --git a/od-win32/resources/paths.ico b/od-win32/resources/paths.ico old mode 100755 new mode 100644 diff --git a/od-win32/resources/quickstart.ico b/od-win32/resources/quickstart.ico old mode 100755 new mode 100644 diff --git a/od-win32/resources/resource b/od-win32/resources/resource old mode 100755 new mode 100644 index da475347..7632b674 --- a/od-win32/resources/resource +++ b/od-win32/resources/resource @@ -307,6 +307,7 @@ #define IDS_JOYMODE_MOUSE_CDTV 343 #define IDS_JOYMODE_JOYSTICK_CD32 344 #define IDS_TABLET_BOTH_CURSORS 345 +#define IDI_DISKIMAGE 345 #define IDS_TABLET_NATIVE_CURSOR 346 #define IDS_TABLET_HOST_CURSOR 347 #define IDS_AUTOSCALE_DISABLED 348 @@ -1038,7 +1039,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS #define _APS_NO_MFC 1 #define _APS_3D_CONTROLS 1 -#define _APS_NEXT_RESOURCE_VALUE 345 +#define _APS_NEXT_RESOURCE_VALUE 346 #define _APS_NEXT_COMMAND_VALUE 40045 #define _APS_NEXT_CONTROL_VALUE 1790 #define _APS_NEXT_SYMED_VALUE 101 diff --git a/od-win32/resources/root.ico b/od-win32/resources/root.ico old mode 100755 new mode 100644 diff --git a/od-win32/resources/screen.ico b/od-win32/resources/screen.ico old mode 100755 new mode 100644 diff --git a/od-win32/resources/sound.ico b/od-win32/resources/sound.ico old mode 100755 new mode 100644 diff --git a/od-win32/resources/winuae.exe.manifest b/od-win32/resources/winuae.exe.manifest old mode 100755 new mode 100644 diff --git a/od-win32/resources/winuae.ico b/od-win32/resources/winuae.ico old mode 100755 new mode 100644 diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc old mode 100755 new mode 100644 index 820a1358..975b10e5 --- a/od-win32/resources/winuae.rc +++ b/od-win32/resources/winuae.rc @@ -115,8 +115,8 @@ BEGIN RTEXT "Resolution:",IDC_STATIC,27,152,59,15,SS_CENTERIMAGE COMBOBOX IDC_LORES,100,152,102,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP CONTROL "Remove interlace artifacts",IDC_FLICKERFIXER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,19,139,99,10 - RTEXT "Windowed:",IDC_STATIC,18,46,38,15,SS_CENTERIMAGE - RTEXT "Fullscreen:",IDC_STATIC,17,19,38,15,SS_CENTERIMAGE + RTEXT "Windowed:",IDC_STATIC,17,46,40,15,SS_CENTERIMAGE + RTEXT "Fullscreen:",IDC_STATIC,17,19,40,15,SS_CENTERIMAGE END IDD_MEMORY DIALOGEX 0, 0, 300, 239 @@ -1473,6 +1473,15 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT #pragma code_page(1252) #endif //_WIN32 +///////////////////////////////////////////////////////////////////////////// +// +// Icon +// + +// Icon with lowest ID value placed first to ensure application icon +// remains consistent on all systems. +IDI_DISKIMAGE ICON "diskimage.ico" + #ifdef APSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// // diff --git a/od-win32/resources/winuae9.exe.manifest b/od-win32/resources/winuae9.exe.manifest old mode 100755 new mode 100644 diff --git a/od-win32/resources/winuae_minimal.rc b/od-win32/resources/winuae_minimal.rc old mode 100755 new mode 100644 diff --git a/od-win32/resources/winuae_old.rc b/od-win32/resources/winuae_old.rc old mode 100755 new mode 100644 diff --git a/od-win32/resources/xarcade-winuae.bmp b/od-win32/resources/xarcade-winuae.bmp old mode 100755 new mode 100644 diff --git a/od-win32/rp.c b/od-win32/rp.c old mode 100755 new mode 100644 diff --git a/od-win32/rp.h b/od-win32/rp.h old mode 100755 new mode 100644 diff --git a/od-win32/scaler.c b/od-win32/scaler.c old mode 100755 new mode 100644 diff --git a/od-win32/scaler2.c b/od-win32/scaler2.c old mode 100755 new mode 100644 diff --git a/od-win32/scaler_more.c b/od-win32/scaler_more.c old mode 100755 new mode 100644 diff --git a/od-win32/screenshot.c b/od-win32/screenshot.c old mode 100755 new mode 100644 diff --git a/od-win32/scsidef.h b/od-win32/scsidef.h old mode 100755 new mode 100644 diff --git a/od-win32/serial_win32.c b/od-win32/serial_win32.c old mode 100755 new mode 100644 diff --git a/od-win32/sfhelper.c b/od-win32/sfhelper.c old mode 100755 new mode 100644 diff --git a/od-win32/shm.c b/od-win32/shm.c old mode 100755 new mode 100644 diff --git a/od-win32/soundcheck.c b/od-win32/soundcheck.c old mode 100755 new mode 100644 diff --git a/od-win32/sounddep/sound.c b/od-win32/sounddep/sound.c old mode 100755 new mode 100644 index cc1bac6d..d0cc982d --- a/od-win32/sounddep/sound.c +++ b/od-win32/sounddep/sound.c @@ -138,14 +138,7 @@ void update_sound (int freq, int longframe) lines += 1.0; if (have_sound) { - if (isvsync () || currprefs.chipset_refreshrate) { - if (currprefs.ntscmode) - scaled_sample_evtime_orig = (MAXHPOS_NTSC * (MAXVPOS_NTSC + lines) * freq * CYCLE_UNIT) / (float)sdp->obtainedfreq; - else - scaled_sample_evtime_orig = (MAXHPOS_PAL * (MAXVPOS_PAL + lines) * freq * CYCLE_UNIT) / (float)sdp->obtainedfreq; - } else { - scaled_sample_evtime_orig = 227.0 * (lines + 312) * 50 * CYCLE_UNIT / (float)sdp->obtainedfreq; - } + scaled_sample_evtime_orig = 227.0 * (lines + maxvpos) * freq * CYCLE_UNIT / (float)sdp->obtainedfreq; scaled_sample_evtime = scaled_sample_evtime_orig; } } diff --git a/od-win32/sounddep/sound.h b/od-win32/sounddep/sound.h old mode 100755 new mode 100644 diff --git a/od-win32/srcrelease.cmd b/od-win32/srcrelease.cmd old mode 100755 new mode 100644 diff --git a/od-win32/support.c b/od-win32/support.c old mode 100755 new mode 100644 diff --git a/od-win32/sys/ipc.h b/od-win32/sys/ipc.h old mode 100755 new mode 100644 diff --git a/od-win32/sys/mman.h b/od-win32/sys/mman.h old mode 100755 new mode 100644 diff --git a/od-win32/sys/shm.h b/od-win32/sys/shm.h old mode 100755 new mode 100644 diff --git a/od-win32/sysconfig.h b/od-win32/sysconfig.h old mode 100755 new mode 100644 diff --git a/od-win32/target.h b/od-win32/target.h old mode 100755 new mode 100644 diff --git a/od-win32/threaddep/thread.h b/od-win32/threaddep/thread.h old mode 100755 new mode 100644 diff --git a/od-win32/tun.c b/od-win32/tun.c old mode 100755 new mode 100644 diff --git a/od-win32/tun.h b/od-win32/tun.h old mode 100755 new mode 100644 diff --git a/od-win32/tun_uae.h b/od-win32/tun_uae.h old mode 100755 new mode 100644 diff --git a/od-win32/uaeunp/uaeunp.vcproj b/od-win32/uaeunp/uaeunp.vcproj old mode 100755 new mode 100644 diff --git a/od-win32/uaeunp/uaeunp.vcxproj b/od-win32/uaeunp/uaeunp.vcxproj old mode 100755 new mode 100644 diff --git a/od-win32/uaeunp/uaeunp.vcxproj.filters b/od-win32/uaeunp/uaeunp.vcxproj.filters old mode 100755 new mode 100644 diff --git a/od-win32/uaeunp_win32.c b/od-win32/uaeunp_win32.c old mode 100755 new mode 100644 diff --git a/od-win32/unicode.c b/od-win32/unicode.c old mode 100755 new mode 100644 diff --git a/od-win32/unistd.h b/od-win32/unistd.h old mode 100755 new mode 100644 diff --git a/od-win32/win32.c b/od-win32/win32.c old mode 100755 new mode 100644 index 16f89970..b8302d8d --- a/od-win32/win32.c +++ b/od-win32/win32.c @@ -2685,7 +2685,7 @@ static int shell_deassociate (const TCHAR *extension) } static int shell_associate_2 (const TCHAR *extension, const TCHAR *shellcommand, const TCHAR *command, const TCHAR *perceivedtype, - const TCHAR *description, const TCHAR *ext2) + const TCHAR *description, const TCHAR *ext2, int icon) { TCHAR rpath1[MAX_DPATH], rpath2[MAX_DPATH], progid2[MAX_DPATH]; HKEY rkey, key1, key2; @@ -2728,12 +2728,14 @@ static int shell_associate_2 (const TCHAR *extension, const TCHAR *shellcommand, RegSetValueEx (key2, L"", 0, REG_SZ, (CONST BYTE *)defprogid, (_tcslen (defprogid) + 1) * sizeof (TCHAR)); RegCloseKey (key2); } - _tcscpy (tmp, rpath2); - _tcscat (tmp, L"\\DefaultIcon"); - if (RegCreateKeyEx (rkey, tmp, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE | KEY_READ, NULL, &key2, &disposition) == ERROR_SUCCESS) { - _stprintf (tmp, L"%s,-1", _wpgmptr); - RegSetValueEx (key2, L"", 0, REG_SZ, (CONST BYTE *)tmp, (_tcslen (tmp) + 1) * sizeof (TCHAR)); - RegCloseKey (key2); + if (icon) { + _tcscpy (tmp, rpath2); + _tcscat (tmp, L"\\DefaultIcon"); + if (RegCreateKeyEx (rkey, tmp, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_WRITE | KEY_READ, NULL, &key2, &disposition) == ERROR_SUCCESS) { + _stprintf (tmp, L"%s,%d", _wpgmptr, -icon); + RegSetValueEx (key2, L"", 0, REG_SZ, (CONST BYTE *)tmp, (_tcslen (tmp) + 1) * sizeof (TCHAR)); + RegCloseKey (key2); + } } RegCloseKey (key1); } @@ -2758,11 +2760,11 @@ static int shell_associate_2 (const TCHAR *extension, const TCHAR *shellcommand, regclosetree (fkey); return 1; } -static int shell_associate (const TCHAR *extension, const TCHAR *command, const TCHAR *perceivedtype, const TCHAR *description, const TCHAR *ext2) +static int shell_associate (const TCHAR *extension, const TCHAR *command, const TCHAR *perceivedtype, const TCHAR *description, const TCHAR *ext2, int icon) { - int v = shell_associate_2 (extension, NULL, command, perceivedtype, description, ext2); + int v = shell_associate_2 (extension, NULL, command, perceivedtype, description, ext2, icon); if (!_tcscmp (extension, L".uae")) - shell_associate_2 (extension, L"edit", L"-f \"%1\" -s use_gui=yes", L"text", description, NULL); + shell_associate_2 (extension, L"edit", L"-f \"%1\" -s use_gui=yes", L"text", description, NULL, 0); return v; } @@ -2785,7 +2787,7 @@ static int shell_associate_is (const TCHAR *extension) _tcscpy (rpath1, L"Software\\Classes\\"); _tcscpy (rpath2, rpath1); _tcscat (rpath2, extension); - size = sizeof tmp; + size = sizeof tmp / sizeof (TCHAR); if (RegOpenKeyEx (rkey, rpath2, 0, KEY_READ, &key1) == ERROR_SUCCESS) { if (RegQueryValueEx (key1, NULL, NULL, NULL, (LPBYTE)tmp, &size) == ERROR_SUCCESS) { if (_tcscmp (tmp, def ? progid : progid2)) { @@ -2807,13 +2809,13 @@ static int shell_associate_is (const TCHAR *extension) } struct assext exts[] = { - { L".uae", L"-f \"%1\"", L"WinUAE configuration file", }, - { L".adf", L"-0 \"%1\" -s use_gui=no", L"WinUAE floppy disk image" }, - { L".adz", L"-0 \"%1\" -s use_gui=no", L"WinUAE floppy disk image" }, - { L".dms", L"-0 \"%1\" -s use_gui=no", L"WinUAE floppy disk image" }, - { L".fdi", L"-0 \"%1\" -s use_gui=no", L"WinUAE floppy disk image" }, - { L".ipf", L"-0 \"%1\" -s use_gui=no", L"WinUAE floppy disk image" }, - { L".uss", L"-s statefile=\"%1\" -s use_gui=no", L"WinUAE statefile" }, + { L".uae", L"-f \"%1\"", L"WinUAE configuration file", IDI_APPICON }, + { L".adf", L"-0 \"%1\" -s use_gui=no", L"WinUAE floppy disk image", IDI_DISKIMAGE }, + { L".adz", L"-0 \"%1\" -s use_gui=no", L"WinUAE floppy disk image", IDI_DISKIMAGE }, + { L".dms", L"-0 \"%1\" -s use_gui=no", L"WinUAE floppy disk image", IDI_DISKIMAGE }, + { L".fdi", L"-0 \"%1\" -s use_gui=no", L"WinUAE floppy disk image", IDI_DISKIMAGE }, + { L".ipf", L"-0 \"%1\" -s use_gui=no", L"WinUAE floppy disk image", IDI_DISKIMAGE }, + { L".uss", L"-s statefile=\"%1\" -s use_gui=no", L"WinUAE statefile", IDI_APPICON }, { NULL } }; @@ -2830,13 +2832,39 @@ static void associate_init_extensions (void) if (!regexiststree (NULL, L"FileAssociations")) { UAEREG *fkey; if (exts[0].enabled == 0) { - shell_associate (exts[0].ext, exts[0].cmd, NULL, exts[0].desc, NULL); + shell_associate (exts[0].ext, exts[0].cmd, NULL, exts[0].desc, NULL, exts[0].icon); exts[0].enabled = shell_associate_is (exts[0].ext); } fkey = regcreatetree (NULL, L"FileAssociations"); regsetstr (fkey, exts[0].ext, L""); regclosetree (fkey); } + if (os_winnt_admin > 1) { + DWORD disposition; + TCHAR rpath[MAX_DPATH]; + HKEY rkey = HKEY_LOCAL_MACHINE; + HKEY key1; + int setit = 1; + + _tcscpy (rpath, L"Software\\Microsoft\\Windows\\CurrentVersion\\App Paths\\winuae.exe"); + if (RegOpenKeyEx (rkey, rpath, 0, KEY_READ, &key1) == ERROR_SUCCESS) { + TCHAR tmp[MAX_DPATH]; + DWORD size = sizeof tmp / sizeof (TCHAR); + if (RegQueryValueEx (key1, NULL, NULL, NULL, (LPBYTE)tmp, &size) == ERROR_SUCCESS) { + if (!_tcscmp (tmp, _wpgmptr)) + setit = 0; + } + RegCloseKey (key1); + } + if (setit) { + if (RegCreateKeyEx (rkey, rpath, 0, NULL, REG_OPTION_NON_VOLATILE, KEY_READ | KEY_WRITE, NULL, &key1, &disposition) == ERROR_SUCCESS) { + RegSetValueEx (key1, L"", 0, REG_SZ, (CONST BYTE *)_wpgmptr, (_tcslen (_wpgmptr) + 1) * sizeof (TCHAR)); + RegCloseKey (key1); + SHChangeNotify (SHCNE_ASSOCCHANGED, 0, 0, 0); + } + } + } + #if 0 UAEREG *fkey; fkey = regcreatetree (NULL, L"FileAssociations"); @@ -2892,12 +2920,14 @@ void associate_file_extensions (void) if (exts[i].enabled == 0 && already) { shell_deassociate (exts[i].ext); exts[i].enabled = shell_associate_is (exts[i].ext); - if (exts[i].enabled) + if (exts[i].enabled) { modified = 1; - } else if (exts[i].enabled && already == 0) { - shell_associate (exts[i].ext, exts[i].cmd, NULL, exts[i].desc, NULL); + shell_associate (exts[i].ext, exts[i].cmd, NULL, exts[i].desc, NULL, exts[i].icon); + } + } else if (exts[i].enabled) { + shell_associate (exts[i].ext, exts[i].cmd, NULL, exts[i].desc, NULL, exts[i].icon); exts[i].enabled = shell_associate_is (exts[i].ext); - if (exts[i].enabled == 0) + if (exts[i].enabled != already) modified = 1; } } diff --git a/od-win32/win32.h b/od-win32/win32.h old mode 100755 new mode 100644 index a03e24d9..320b094b --- a/od-win32/win32.h +++ b/od-win32/win32.h @@ -17,8 +17,8 @@ #define WINUAEPUBLICBETA 1 -#define WINUAEBETA L"Beta 3" -#define WINUAEDATE MAKEBD(2009, 6, 10) +#define WINUAEBETA L"Beta 4" +#define WINUAEDATE MAKEBD(2009, 6, 14) #define WINUAEEXTRA L"" #define WINUAEREV L"" @@ -173,6 +173,7 @@ struct assext { TCHAR *ext; TCHAR *cmd; TCHAR *desc; + int icon; int enabled; }; struct assext exts[]; diff --git a/od-win32/win32_decompress.c b/od-win32/win32_decompress.c old mode 100755 new mode 100644 diff --git a/od-win32/win32_filesys.c b/od-win32/win32_filesys.c old mode 100755 new mode 100644 diff --git a/od-win32/win32_nogui.c b/od-win32/win32_nogui.c old mode 100755 new mode 100644 diff --git a/od-win32/win32_scale2x.c b/od-win32/win32_scale2x.c old mode 100755 new mode 100644 diff --git a/od-win32/win32_uaenet.c b/od-win32/win32_uaenet.c old mode 100755 new mode 100644 diff --git a/od-win32/win32_uaenet.h b/od-win32/win32_uaenet.h old mode 100755 new mode 100644 diff --git a/od-win32/win32gfx.c b/od-win32/win32gfx.c old mode 100755 new mode 100644 diff --git a/od-win32/win32gfx.h b/od-win32/win32gfx.h old mode 100755 new mode 100644 diff --git a/od-win32/win32gui.c b/od-win32/win32gui.c old mode 100755 new mode 100644 index b8fbecb0..be8a85f7 --- a/od-win32/win32gui.c +++ b/od-win32/win32gui.c @@ -2773,7 +2773,7 @@ static void update_listview_input (HWND hDlg) static int clicked_entry = -1; #define LOADSAVE_COLUMNS 2 -#define INPUT_COLUMNS 4 +#define INPUT_COLUMNS 5 #define HARDDISK_COLUMNS 8 #define DISK_COLUMNS 3 #define MISC2_COLUMNS 2 @@ -2781,7 +2781,7 @@ static int clicked_entry = -1; #define LV_LOADSAVE 1 #define LV_HARDDISK 2 -#define LV_INPUT 4 +#define LV_INPUT 3 #define LV_DISK 4 #define LV_MISC2 5 @@ -2807,6 +2807,7 @@ void InitializeListView (HWND hDlg) int listview_column_width[HARDDISK_COLUMNS]; if (hDlg == pages[HARDDISK_ID]) { + listview_num_columns = HARDDISK_COLUMNS; lv_type = LV_HARDDISK; _tcscpy (column_heading[0], L"*"); @@ -2818,7 +2819,9 @@ void InitializeListView (HWND hDlg) WIN32GUI_LoadUIString(IDS_HFDSIZE, column_heading[6], MAX_COLUMN_HEADING_WIDTH); WIN32GUI_LoadUIString(IDS_BOOTPRI, column_heading[7], MAX_COLUMN_HEADING_WIDTH); list = GetDlgItem(hDlg, IDC_VOLUMELIST); + } else if (hDlg == pages[INPUT_ID]) { + listview_num_columns = INPUT_COLUMNS; lv_type = LV_INPUT; WIN32GUI_LoadUIString(IDS_INPUTHOSTWIDGET, column_heading[0], MAX_COLUMN_HEADING_WIDTH); @@ -2827,19 +2830,23 @@ void InitializeListView (HWND hDlg) WIN32GUI_LoadUIString(IDS_INPUTTOGGLE, column_heading[3], MAX_COLUMN_HEADING_WIDTH); _tcscpy (column_heading[4], L"#"); list = GetDlgItem(hDlg, IDC_INPUTLIST); + } else if (hDlg == pages[MISC2_ID]) { + listview_num_columns = MISC2_COLUMNS; lv_type = LV_MISC2; _tcscpy (column_heading[0], L"Extension"); _tcscpy (column_heading[1], L""); list = GetDlgItem (hDlg, IDC_ASSOCIATELIST); } else { + listview_num_columns = DISK_COLUMNS; lv_type = LV_DISK; _tcscpy (column_heading[0], L"#"); WIN32GUI_LoadUIString(IDS_DISK_IMAGENAME, column_heading[1], MAX_COLUMN_HEADING_WIDTH); WIN32GUI_LoadUIString(IDS_DISK_DRIVENAME, column_heading[2], MAX_COLUMN_HEADING_WIDTH); list = GetDlgItem (hDlg, IDC_DISK); + } cachedlist = list; @@ -2860,7 +2867,9 @@ void InitializeListView (HWND hDlg) ListView_InsertColumn (list, i, &lvcolumn); } } + if (lv_type == LV_MISC2) { + listview_column_width[0] = 180; listview_column_width[1] = 10; for (i = 0; exts[i].ext; i++) { @@ -2873,6 +2882,7 @@ void InitializeListView (HWND hDlg) ListView_SetItemText (list, result, 1, exts[i].enabled ? L"*" : L""); } } else if (lv_type == LV_INPUT) { + for (i = 0; input_total_devices && i < inputdevice_get_widget_num (input_selected_device); i++) { TCHAR name[100]; inputdevice_get_widget_type (input_selected_device, i, name); @@ -2892,7 +2902,9 @@ void InitializeListView (HWND hDlg) listview_column_width [3] = 65; listview_column_width [4] = 30; update_listview_input (hDlg); + } else if (lv_type == LV_DISK) { + for (i = 0; i < MAX_SPARE_DRIVES; i++) { int drv; _stprintf (tmp, L"%d", i + 1); @@ -9056,7 +9068,6 @@ static void enable_for_gameportsdlg (HWND hDlg) { int v = full_property_sheet; ew (hDlg, IDC_PORT_TABLET_FULL, v && is_tablet () && workprefs.input_tablet > 0); - ew (hDlg, IDC_PORT_MOUSETRICK, v); ew (hDlg, IDC_PORT_TABLET_CURSOR, v && workprefs.input_tablet > 0); ew (hDlg, IDC_PORT_TABLET, v); } @@ -9201,7 +9212,7 @@ static void values_from_gameportsdlg (HWND hDlg, int d) if (success) currprefs.input_mouse_speed = workprefs.input_mouse_speed = i; - workprefs.input_magic_mouse = IsDlgButtonChecked (hDlg, IDC_PORT_MOUSETRICK) ? -1 : 0; + currprefs.input_magic_mouse = workprefs.input_magic_mouse = IsDlgButtonChecked (hDlg, IDC_PORT_MOUSETRICK) ? -1 : 0; workprefs.input_magic_mouse_cursor = SendDlgItemMessage (hDlg, IDC_PORT_TABLET_CURSOR, CB_GETCURSEL, 0, 0L); workprefs.input_tablet = 0; if (IsDlgButtonChecked (hDlg, IDC_PORT_TABLET)) { diff --git a/od-win32/win32gui.h b/od-win32/win32gui.h old mode 100755 new mode 100644 diff --git a/od-win32/win32gui_extra.c b/od-win32/win32gui_extra.c old mode 100755 new mode 100644 diff --git a/od-win32/wintablet.h b/od-win32/wintablet.h old mode 100755 new mode 100644 diff --git a/od-win32/winuae_msvc/winuae_msvc.vcproj b/od-win32/winuae_msvc/winuae_msvc.vcproj old mode 100755 new mode 100644 index f0609bca..4c9d7d61 --- a/od-win32/winuae_msvc/winuae_msvc.vcproj +++ b/od-win32/winuae_msvc/winuae_msvc.vcproj @@ -1452,6 +1452,14 @@ RelativePath="..\resources\cpu.ico" > + + + + diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt old mode 100755 new mode 100644 index 848ffcb7..3dfa2ec0 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -1,4 +1,25 @@ +Beta 4: + +- mixed disk swapper panel id and number of input panel columns.. +- magic mouse was unreliable in directinput mouse mode ("mouse *") +- magic mouse can be switched on/off on the fly +- utf8 configuration entries didn't work correctly and caused + duplicate entries. (fix by loading and saving config again) +- added generic disk icon image (from Cloanto) that is associated + with disk image extensions (if enabled in associations panel) This + may change before 1.6.1 if my brother feels less lazy next week :) +- App Paths winuae.exe reg key created if winuae is run as admin + at least once, this fixes some file association issues (wrong or + missing icon for example), also some other association updates +- statefile harddisk restore problem fixed (still not guaranteed + to work..) +- 60Hz on PAL (or NTSC in 50Hz) sound sync/vsync calculation was + incorrect +- in AGA only HAM6 or HAM8 supported. HAM mode bit set with 5 or 7 + planes seems to be ignored (OCS/ECS has "HAM5") +- HAM ignored AGA BPLAM (BPLCON4) bits + Beta 3: - added exception handler that writes log message if openal or diff --git a/od-win32/writelog.c b/od-win32/writelog.c old mode 100755 new mode 100644 diff --git a/p96_blit.c b/p96_blit.c old mode 100755 new mode 100644 diff --git a/picasso96.c b/picasso96.c old mode 100755 new mode 100644 diff --git a/prowizard/include/extern.h b/prowizard/include/extern.h old mode 100755 new mode 100644 diff --git a/prowizard/include/globals.h b/prowizard/include/globals.h old mode 100755 new mode 100644 diff --git a/prowizard/include/ptktable.h b/prowizard/include/ptktable.h old mode 100755 new mode 100644 diff --git a/prowizard/include/tuning.h b/prowizard/include/tuning.h old mode 100755 new mode 100644 diff --git a/prowizard/include/vars.h b/prowizard/include/vars.h old mode 100755 new mode 100644 diff --git a/prowizard/misc/misc.c b/prowizard/misc/misc.c old mode 100755 new mode 100644 diff --git a/prowizard/misc/testbag.c b/prowizard/misc/testbag.c old mode 100755 new mode 100644 diff --git a/prowizard/prowiz.c b/prowizard/prowiz.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/AC1D_packer.c b/prowizard/rippers/AC1D_packer.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/AMOS-MusicBank.c b/prowizard/rippers/AMOS-MusicBank.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/AMOS-PowerPackerBank.c b/prowizard/rippers/AMOS-PowerPackerBank.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/BP-Soundmonitor.c b/prowizard/rippers/BP-Soundmonitor.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/BSI-FutureComposer.c b/prowizard/rippers/BSI-FutureComposer.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/Bytekiller.c b/prowizard/rippers/Bytekiller.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/ChipTracker.c b/prowizard/rippers/ChipTracker.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/Crunchmania-Address.c b/prowizard/rippers/Crunchmania-Address.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/Crunchmania-Simple.c b/prowizard/rippers/Crunchmania-Simple.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/DefjamCruncher32-pro.c b/prowizard/rippers/DefjamCruncher32-pro.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/DigiBooster17.c b/prowizard/rippers/DigiBooster17.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/DigitalIllusion.c b/prowizard/rippers/DigitalIllusion.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/DoubleAction.c b/prowizard/rippers/DoubleAction.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/Dragpack100.c b/prowizard/rippers/Dragpack100.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/Dragpack252.c b/prowizard/rippers/Dragpack252.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/EurekaPacker.c b/prowizard/rippers/EurekaPacker.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/FC-M-Packer.c b/prowizard/rippers/FC-M-Packer.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/FastTracker2.c b/prowizard/rippers/FastTracker2.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/FuchsTracker.c b/prowizard/rippers/FuchsTracker.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/FutureComposer13.c b/prowizard/rippers/FutureComposer13.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/FutureComposer14.c b/prowizard/rippers/FutureComposer14.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/FuzzacPacker.c b/prowizard/rippers/FuzzacPacker.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/GNUPacker12.c b/prowizard/rippers/GNUPacker12.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/GPMO.c b/prowizard/rippers/GPMO.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/GameMusicCreator.c b/prowizard/rippers/GameMusicCreator.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/GnuPlayer.c b/prowizard/rippers/GnuPlayer.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/HQC2.c b/prowizard/rippers/HQC2.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/HeatseekerMC10.c b/prowizard/rippers/HeatseekerMC10.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/HornetPacker.c b/prowizard/rippers/HornetPacker.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/JamCracker.c b/prowizard/rippers/JamCracker.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/KefrensSoundMachine.c b/prowizard/rippers/KefrensSoundMachine.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/MED-Octamed.c b/prowizard/rippers/MED-Octamed.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/MOD-compatible.c b/prowizard/rippers/MOD-compatible.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/MasterCruncher30-Address.c b/prowizard/rippers/MasterCruncher30-Address.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/MaxPacker12.c b/prowizard/rippers/MaxPacker12.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/MegaCruncher-Object.c b/prowizard/rippers/MegaCruncher-Object.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/MegaCruncher.c b/prowizard/rippers/MegaCruncher.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/ModuleProtector.c b/prowizard/rippers/ModuleProtector.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/Mugician.c b/prowizard/rippers/Mugician.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/Newtron.c b/prowizard/rippers/Newtron.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/NewtronOld.c b/prowizard/rippers/NewtronOld.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/NoiseFromHeaven.c b/prowizard/rippers/NoiseFromHeaven.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/NoisePacker1.c b/prowizard/rippers/NoisePacker1.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/NoisePacker2.c b/prowizard/rippers/NoisePacker2.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/NoisePacker3.c b/prowizard/rippers/NoisePacker3.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/NoiseRunner.c b/prowizard/rippers/NoiseRunner.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/NovoTrade.c b/prowizard/rippers/NovoTrade.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/PhaPacker.c b/prowizard/rippers/PhaPacker.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/PolkaPacker.c b/prowizard/rippers/PolkaPacker.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/PowerMusic.c b/prowizard/rippers/PowerMusic.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/PowerPacker23.c b/prowizard/rippers/PowerPacker23.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/PowerPacker30.c b/prowizard/rippers/PowerPacker30.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/PowerPacker40-library.c b/prowizard/rippers/PowerPacker40-library.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/PowerPacker40.c b/prowizard/rippers/PowerPacker40.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/ProPacker10.c b/prowizard/rippers/ProPacker10.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/ProPacker21.c b/prowizard/rippers/ProPacker21.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/ProPacker30.c b/prowizard/rippers/ProPacker30.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/Promizer01.c b/prowizard/rippers/Promizer01.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/Promizer10c.c b/prowizard/rippers/Promizer10c.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/Promizer18a.c b/prowizard/rippers/Promizer18a.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/Promizer20.c b/prowizard/rippers/Promizer20.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/Promizer40.c b/prowizard/rippers/Promizer40.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/Prorunner10.c b/prowizard/rippers/Prorunner10.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/Prorunner20.c b/prowizard/rippers/Prorunner20.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/QuadraComposer.c b/prowizard/rippers/QuadraComposer.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/RelokIt10.c b/prowizard/rippers/RelokIt10.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/SGT-Packer.c b/prowizard/rippers/SGT-Packer.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/SkytPacker.c b/prowizard/rippers/SkytPacker.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/SoundFX.c b/prowizard/rippers/SoundFX.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/SoundTracker.c b/prowizard/rippers/SoundTracker.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/SoundTracker26.c b/prowizard/rippers/SoundTracker26.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/SpikeCruncher.c b/prowizard/rippers/SpikeCruncher.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/StartrekkerPack.c b/prowizard/rippers/StartrekkerPack.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/StimPacker.c b/prowizard/rippers/StimPacker.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/StoneArtsPlayer.c b/prowizard/rippers/StoneArtsPlayer.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/StoneCracker270.c b/prowizard/rippers/StoneCracker270.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/StoneCracker299.c b/prowizard/rippers/StoneCracker299.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/StoneCracker299b.c b/prowizard/rippers/StoneCracker299b.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/StoneCracker299d.c b/prowizard/rippers/StoneCracker299d.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/StoneCracker300.c b/prowizard/rippers/StoneCracker300.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/StoneCracker310.c b/prowizard/rippers/StoneCracker310.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/SuperCruncher27.c b/prowizard/rippers/SuperCruncher27.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/SyncroPacker46.c b/prowizard/rippers/SyncroPacker46.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/TMK.c b/prowizard/rippers/TMK.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/TNMCruncher.c b/prowizard/rippers/TNMCruncher.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/TetraPack102.c b/prowizard/rippers/TetraPack102.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/TetraPack21.c b/prowizard/rippers/TetraPack21.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/TetraPack22.c b/prowizard/rippers/TetraPack22.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/TheDarkDemon.c b/prowizard/rippers/TheDarkDemon.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/ThePlayer22a.c b/prowizard/rippers/ThePlayer22a.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/ThePlayer30a.c b/prowizard/rippers/ThePlayer30a.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/ThePlayer40.c b/prowizard/rippers/ThePlayer40.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/ThePlayer41a.c b/prowizard/rippers/ThePlayer41a.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/ThePlayer50a.c b/prowizard/rippers/ThePlayer50a.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/ThePlayer60a.c b/prowizard/rippers/ThePlayer60a.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/ThePlayer61a.c b/prowizard/rippers/ThePlayer61a.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/TimeCruncher17.c b/prowizard/rippers/TimeCruncher17.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/TitanicsPlayer.c b/prowizard/rippers/TitanicsPlayer.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/TrackerPacker1.c b/prowizard/rippers/TrackerPacker1.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/TrackerPacker2.c b/prowizard/rippers/TrackerPacker2.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/TrackerPacker3.c b/prowizard/rippers/TrackerPacker3.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/TreasurePattern.c b/prowizard/rippers/TreasurePattern.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/TryItCruncher101.c b/prowizard/rippers/TryItCruncher101.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/TurboSqueezer61.c b/prowizard/rippers/TurboSqueezer61.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/UnicTracker.c b/prowizard/rippers/UnicTracker.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/UnicTracker2.c b/prowizard/rippers/UnicTracker2.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/Viruz2.c b/prowizard/rippers/Viruz2.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/WantonPacker.c b/prowizard/rippers/WantonPacker.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/XannPlayer.c b/prowizard/rippers/XannPlayer.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/ZenPacker.c b/prowizard/rippers/ZenPacker.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/datacrunchers.c b/prowizard/rippers/datacrunchers.c old mode 100755 new mode 100644 diff --git a/prowizard/rippers/skizzo.c b/prowizard/rippers/skizzo.c old mode 100755 new mode 100644 diff --git a/readcpu.c b/readcpu.c old mode 100755 new mode 100644 diff --git a/readdisk.c b/readdisk.c old mode 100755 new mode 100644 diff --git a/rpc.c b/rpc.c old mode 100755 new mode 100644 diff --git a/sana2.c b/sana2.c old mode 100755 new mode 100644 diff --git a/savestate.c b/savestate.c old mode 100755 new mode 100644 diff --git a/scsi.c b/scsi.c old mode 100755 new mode 100644 diff --git a/scsidev.c b/scsidev.c old mode 100755 new mode 100644 diff --git a/scsiemul.c b/scsiemul.c old mode 100755 new mode 100644 diff --git a/serial.c b/serial.c old mode 100755 new mode 100644 diff --git a/sinctable.c b/sinctable.c old mode 100755 new mode 100644 diff --git a/table68k b/table68k old mode 100755 new mode 100644 diff --git a/traps.c b/traps.c old mode 100755 new mode 100644 diff --git a/uaeexe.c b/uaeexe.c old mode 100755 new mode 100644 diff --git a/uaeipc.c b/uaeipc.c old mode 100755 new mode 100644 diff --git a/uaelib.c b/uaelib.c old mode 100755 new mode 100644 diff --git a/uaeresource.c b/uaeresource.c old mode 100755 new mode 100644 diff --git a/uaeserial.c b/uaeserial.c old mode 100755 new mode 100644 diff --git a/uaeunp.c b/uaeunp.c old mode 100755 new mode 100644 diff --git a/writelog.c b/writelog.c old mode 100755 new mode 100644 diff --git a/zfile.c b/zfile.c old mode 100755 new mode 100644 index dd38088a..2e003c21 --- a/zfile.c +++ b/zfile.c @@ -1061,24 +1061,14 @@ struct zfile *zfile_dup (struct zfile *zf) int zfile_exists (const TCHAR *name) { - TCHAR fname[MAX_DPATH]; - struct zfile *f; + struct zfile *z; - if (_tcslen (name) == 0) + if (my_existsfile (name)) + return 1; + z = zfile_fopen (name, L"rb", ZFD_NORMAL); + if (!z) return 0; - manglefilename (fname, name); - f = openzip (fname); - if (!f) { - FILE *f2; - manglefilename (fname, name); - if (!my_existsfile (fname)) - return 0; - f2 = _tfopen (fname, L"rb"); - if (!f2) - return 0; - fclose (f2); - } - zfile_fclose (f); + zfile_fclose (z); return 1; } diff --git a/zfile_archive.c b/zfile_archive.c old mode 100755 new mode 100644