From: Toni Wilen Date: Mon, 25 Dec 2006 19:54:56 +0000 (+0200) Subject: imported winuaesrc1340b7.zip X-Git-Tag: 2100~257 X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=3bc9f113a7e1b2056b8845f1d82cdeab84c0593b;p=francis%2Fwinuae.git imported winuaesrc1340b7.zip --- diff --git a/7z/7zAlloc.c b/7z/7zAlloc.c old mode 100644 new mode 100755 diff --git a/7z/7zAlloc.h b/7z/7zAlloc.h old mode 100644 new mode 100755 diff --git a/7z/7zBuffer.c b/7z/7zBuffer.c old mode 100644 new mode 100755 diff --git a/7z/7zBuffer.h b/7z/7zBuffer.h old mode 100644 new mode 100755 diff --git a/7z/7zCrc.c b/7z/7zCrc.c old mode 100644 new mode 100755 diff --git a/7z/7zCrc.h b/7z/7zCrc.h old mode 100644 new mode 100755 diff --git a/7z/7zDecode.c b/7z/7zDecode.c old mode 100644 new mode 100755 diff --git a/7z/7zDecode.h b/7z/7zDecode.h old mode 100644 new mode 100755 diff --git a/7z/7zExtract.c b/7z/7zExtract.c old mode 100644 new mode 100755 diff --git a/7z/7zExtract.h b/7z/7zExtract.h old mode 100644 new mode 100755 diff --git a/7z/7zHeader.c b/7z/7zHeader.c old mode 100644 new mode 100755 diff --git a/7z/7zHeader.h b/7z/7zHeader.h old mode 100644 new mode 100755 diff --git a/7z/7zIn.c b/7z/7zIn.c old mode 100644 new mode 100755 diff --git a/7z/7zIn.h b/7z/7zIn.h old mode 100644 new mode 100755 diff --git a/7z/7zItem.c b/7z/7zItem.c old mode 100644 new mode 100755 diff --git a/7z/7zItem.h b/7z/7zItem.h old mode 100644 new mode 100755 diff --git a/7z/7zMain.c b/7z/7zMain.c old mode 100644 new mode 100755 diff --git a/7z/7zMethodID.c b/7z/7zMethodID.c old mode 100644 new mode 100755 diff --git a/7z/7zMethodID.h b/7z/7zMethodID.h old mode 100644 new mode 100755 diff --git a/7z/7zTypes.h b/7z/7zTypes.h old mode 100644 new mode 100755 diff --git a/7z/LzmaDecode.c b/7z/LzmaDecode.c old mode 100644 new mode 100755 diff --git a/7z/LzmaDecode.h b/7z/LzmaDecode.h old mode 100644 new mode 100755 diff --git a/7z/LzmaTypes.h b/7z/LzmaTypes.h old mode 100644 new mode 100755 diff --git a/ChangeLog b/ChangeLog old mode 100644 new mode 100755 diff --git a/akiko.c b/akiko.c old mode 100644 new mode 100755 diff --git a/akiko2.c b/akiko2.c old mode 100644 new mode 100755 diff --git a/ar.c b/ar.c old mode 100644 new mode 100755 diff --git a/arcadia.c b/arcadia.c old mode 100644 new mode 100755 diff --git a/audio.c b/audio.c old mode 100644 new mode 100755 diff --git a/autoconf.c b/autoconf.c old mode 100644 new mode 100755 diff --git a/blitops.c b/blitops.c old mode 100644 new mode 100755 diff --git a/blitter.c b/blitter.c old mode 100644 new mode 100755 diff --git a/blitter2.c b/blitter2.c old mode 100644 new mode 100755 diff --git a/blitter3.c b/blitter3.c old mode 100644 new mode 100755 diff --git a/blkdev.c b/blkdev.c old mode 100644 new mode 100755 diff --git a/bsdsocket.c b/bsdsocket.c old mode 100644 new mode 100755 diff --git a/build68k.c b/build68k.c old mode 100644 new mode 100755 diff --git a/catweasel.c b/catweasel.c old mode 100644 new mode 100755 diff --git a/cdrom.c b/cdrom.c old mode 100644 new mode 100755 diff --git a/cdtv.c b/cdtv.c old mode 100644 new mode 100755 diff --git a/cfgfile.c b/cfgfile.c old mode 100644 new mode 100755 diff --git a/cia.c b/cia.c old mode 100644 new mode 100755 diff --git a/compemu_fpp.c b/compemu_fpp.c old mode 100644 new mode 100755 diff --git a/compemu_optimizer.c b/compemu_optimizer.c old mode 100644 new mode 100755 diff --git a/compemu_optimizer_x86.c b/compemu_optimizer_x86.c old mode 100644 new mode 100755 diff --git a/compemu_raw_x86.c b/compemu_raw_x86.c old mode 100644 new mode 100755 diff --git a/compemu_support.c b/compemu_support.c old mode 100644 new mode 100755 diff --git a/core.cw4.c b/core.cw4.c old mode 100644 new mode 100755 diff --git a/cpuopti.c b/cpuopti.c old mode 100644 new mode 100755 diff --git a/crc32.c b/crc32.c old mode 100644 new mode 100755 diff --git a/custom.c b/custom.c old mode 100644 new mode 100755 index d4aed672..31028182 --- a/custom.c +++ b/custom.c @@ -2261,6 +2261,8 @@ void init_hz (void) minfirstline = vsstop; if (minfirstline < 2) minfirstline = 2; + if (minfirstline >= maxvpos) + minfirstline = maxvpos - 1; sprite_vblank_endline = minfirstline - 2; dumpsync(); ciavsyncmode = 1; @@ -2867,8 +2869,9 @@ static void DIWSTOP (int hpos, uae_u16 v) static void DIWHIGH (int hpos, uae_u16 v) { - if (! (currprefs.chipset_mask & CSMASK_ECS_AGNUS)) + if (!(currprefs.chipset_mask & CSMASK_ECS_AGNUS)) return; + v &= ~(0x8000 | 0x4000 | 0x0080 | 0x0040); if (diwhigh_written && diwhigh == v) return; decide_line (hpos); @@ -4574,6 +4577,9 @@ void customreset (void) bplcon4 = 0x11; /* Get AGA chipset into ECS compatibility mode */ bplcon3 = 0xC00; + diwhigh = 0; + diwhigh_written = 0; + FMODE (0); CLXCON (0); } @@ -5318,8 +5324,7 @@ uae_u8 *restore_custom (uae_u8 *src) vsstrt = RW; /* 1E0 VSSTT */ hcenter = RW; /* 1E2 HCENTER */ diwhigh = RW; /* 1E4 DIWHIGH */ - if (diwhigh & 0x8000) - diwhigh_written = 1; + diwhigh_written = (diwhigh & 0x8000) ? 1 : 0; diwhigh &= 0x7fff; RW; /* 1E6 ? */ RW; /* 1E8 ? */ diff --git a/custom2.c b/custom2.c old mode 100644 new mode 100755 diff --git a/debug.c b/debug.c old mode 100644 new mode 100755 diff --git a/disk.c b/disk.c old mode 100644 new mode 100755 diff --git a/dms/cdata.h b/dms/cdata.h old mode 100644 new mode 100755 diff --git a/dms/crc_csum.c b/dms/crc_csum.c old mode 100644 new mode 100755 diff --git a/dms/crc_csum.h b/dms/crc_csum.h old mode 100644 new mode 100755 diff --git a/dms/getbits.c b/dms/getbits.c old mode 100644 new mode 100755 diff --git a/dms/getbits.h b/dms/getbits.h old mode 100644 new mode 100755 diff --git a/dms/maketbl.c b/dms/maketbl.c old mode 100644 new mode 100755 diff --git a/dms/maketbl.h b/dms/maketbl.h old mode 100644 new mode 100755 diff --git a/dms/pfile.c b/dms/pfile.c old mode 100644 new mode 100755 diff --git a/dms/pfile.h b/dms/pfile.h old mode 100644 new mode 100755 diff --git a/dms/tables.c b/dms/tables.c old mode 100644 new mode 100755 diff --git a/dms/tables.h b/dms/tables.h old mode 100644 new mode 100755 diff --git a/dms/u_deep.c b/dms/u_deep.c old mode 100644 new mode 100755 diff --git a/dms/u_deep.h b/dms/u_deep.h old mode 100644 new mode 100755 diff --git a/dms/u_heavy.c b/dms/u_heavy.c old mode 100644 new mode 100755 diff --git a/dms/u_heavy.h b/dms/u_heavy.h old mode 100644 new mode 100755 diff --git a/dms/u_init.c b/dms/u_init.c old mode 100644 new mode 100755 diff --git a/dms/u_init.h b/dms/u_init.h old mode 100644 new mode 100755 diff --git a/dms/u_medium.c b/dms/u_medium.c old mode 100644 new mode 100755 diff --git a/dms/u_medium.h b/dms/u_medium.h old mode 100644 new mode 100755 diff --git a/dms/u_quick.c b/dms/u_quick.c old mode 100644 new mode 100755 diff --git a/dms/u_quick.h b/dms/u_quick.h old mode 100644 new mode 100755 diff --git a/dms/u_rle.c b/dms/u_rle.c old mode 100644 new mode 100755 diff --git a/dms/u_rle.h b/dms/u_rle.h old mode 100644 new mode 100755 diff --git a/drawing.c b/drawing.c old mode 100644 new mode 100755 index 1b4e4d9c..9ccc03f4 --- a/drawing.c +++ b/drawing.c @@ -60,7 +60,7 @@ static int res_shift; int interlace_seen = 0; #define AUTO_LORES_FRAMES 10 -static int can_use_lores = 0, frame_res, frame_res_lace; +static int can_use_lores = 0, frame_res, frame_res_lace, last_max_ypos; /* Lookup tables for dual playfields. The dblpf_*1 versions are for the case that playfield 1 has the priority, dbplpf_*2 are used if playfield 2 has @@ -1091,7 +1091,7 @@ void init_row_map (void) j = 0; for (i = 0; i < MAX_VIDHEIGHT + 1; i++) row_map[i] = row_tmp; - for (i = 0; i < gfxvidinfo.height + 1; i++, j += gfxvidinfo.rowbytes) + for (i = 0; i < gfxvidinfo.height; i++, j += gfxvidinfo.rowbytes) row_map[i] = gfxvidinfo.bufmem + j; } @@ -1110,8 +1110,8 @@ static void init_aspect_maps (void) free (amiga2aspect_line_map); /* At least for this array the +1 is necessary. */ - amiga2aspect_line_map = (int *)malloc (sizeof (int) * (MAXVPOS + 1) * 2 + 1); - native2amiga_line_map = (int *)malloc (sizeof (int) * gfxvidinfo.height); + amiga2aspect_line_map = malloc (sizeof (int) * (MAXVPOS + 1) * 2 + 1); + native2amiga_line_map = malloc (sizeof (int) * gfxvidinfo.height); if (currprefs.gfx_correct_aspect) native_lines_per_amiga_line = ((double)gfxvidinfo.height @@ -1394,7 +1394,7 @@ enum double_how { dh_emerg }; -STATIC_INLINE void pfield_draw_line (int lineno, int gfx_ypos, int follow_ypos) +static void pfield_draw_line (int lineno, int gfx_ypos, int follow_ypos) { static int warned = 0; int border = 0; @@ -1509,6 +1509,7 @@ STATIC_INLINE void pfield_draw_line (int lineno, int gfx_ypos, int follow_ypos) } do_color_changes (pfield_do_fill_line, pfield_do_linetoscr); + if (dh == dh_emerg) memcpy (row_map[gfx_ypos], xlinebuffer + linetoscr_x_adjust_bytes, gfxvidinfo.pixbytes * gfxvidinfo.width); @@ -1524,10 +1525,20 @@ STATIC_INLINE void pfield_draw_line (int lineno, int gfx_ypos, int follow_ypos) currprefs.gfx_lores = 0; } else if (border == 1) { + int dosprites = 0; adjust_drawing_colors (dp_for_drawing->ctable, 0); - if (dip_for_drawing->nr_color_changes == 0) { +#ifdef AGA /* this makes things complex.. */ + if (brdsprt && (currprefs.chipset_mask & CSMASK_AGA) && dip_for_drawing->nr_sprites > 0) { + dosprites = 1; + pfield_expand_dp_bplcon (); + pfield_init_linetoscr (); + memset (pixdata.apixels + MAX_PIXELS_PER_LINE, brdblank ? 0 : colors_for_drawing.acolors[0], MAX_PIXELS_PER_LINE); + } +#endif + + if (!dosprites && dip_for_drawing->nr_color_changes == 0) { fill_line (); do_flush_line (gfx_ypos); @@ -1543,10 +1554,22 @@ STATIC_INLINE void pfield_draw_line (int lineno, int gfx_ypos, int follow_ypos) return; } - playfield_start = visible_right_border; - playfield_end = visible_right_border; - do_color_changes (pfield_do_fill_line, pfield_do_fill_line); + if (dosprites) { + + int i; + for (i = 0; i < dip_for_drawing->nr_sprites; i++) { + draw_sprites_aga (curr_sprite_entries + dip_for_drawing->first_sprite_entry + i); + } + do_color_changes (pfield_do_fill_line, pfield_do_linetoscr); + + } else { + + playfield_start = visible_right_border; + playfield_end = visible_right_border; + do_color_changes (pfield_do_fill_line, pfield_do_fill_line); + + } if (dh == dh_emerg) memcpy (row_map[gfx_ypos], xlinebuffer + linetoscr_x_adjust_bytes, gfxvidinfo.pixbytes * gfxvidinfo.width); @@ -1557,8 +1580,6 @@ STATIC_INLINE void pfield_draw_line (int lineno, int gfx_ypos, int follow_ypos) memcpy (row_map[follow_ypos], xlinebuffer + linetoscr_x_adjust_bytes, gfxvidinfo.pixbytes * gfxvidinfo.width); else if (dh == dh_buf) memcpy (row_map[follow_ypos], row_map[gfx_ypos], gfxvidinfo.pixbytes * gfxvidinfo.width); - /* If dh == dh_line, do_flush_line will re-use the rendered line - * from linemem. */ do_flush_line (follow_ypos); } @@ -1577,6 +1598,7 @@ static void center_image (void) { int prev_x_adjust = visible_left_border; int prev_y_adjust = thisframe_y_adjust; + int tmp; if (currprefs.gfx_xcenter) { int w = gfxvidinfo.width; @@ -1630,7 +1652,13 @@ static void center_image (void) thisframe_y_adjust = minfirstline; } thisframe_y_adjust_real = thisframe_y_adjust << (currprefs.gfx_linedbl ? 1 : 0); - max_ypos_thisframe = (maxvpos - thisframe_y_adjust) << (currprefs.gfx_linedbl ? 1 : 0); + tmp = (maxvpos - thisframe_y_adjust) << (currprefs.gfx_linedbl ? 1 : 0); + if (tmp != max_ypos_thisframe) { + last_max_ypos = tmp; + if (last_max_ypos < 0) + last_max_ypos = 0; + } + max_ypos_thisframe = tmp; /* @@@ interlace_seen used to be (bplcon0 & 4), but this is probably * better. */ @@ -2001,8 +2029,6 @@ static void lightpen_update (void) if (lightpen_cy >= maxvpos) lightpen_cy = maxvpos - 1; - //write_log("%d x %d %d x %d\n", lightpen_x, lightpen_y, lightpen_cx, lightpen_cy); - for (i = 0; i < LIGHTPEN_HEIGHT; i++) { int line = lightpen_y + i - LIGHTPEN_HEIGHT / 2; if (line >= 0 || line < max_ypos_thisframe) { @@ -2047,6 +2073,17 @@ void finish_drawing_frame (void) pfield_draw_line (line, where, amiga2aspect_line_map[i1 + 1]); } + + /* clear possible old garbage at the bottom if emulated area become smaller */ + while (last_max_ypos < gfxvidinfo.height) { + xlinebuffer = gfxvidinfo.linemem; + if (xlinebuffer == 0) + xlinebuffer = row_map[last_max_ypos]; + memset (xlinebuffer, brdblank ? 0 : colors_for_drawing.acolors[0], gfxvidinfo.width * gfxvidinfo.pixbytes); + do_flush_line (last_max_ypos); + last_max_ypos++; + } + if (currprefs.leds_on_screen) { for (i = 0; i < TD_TOTAL_HEIGHT; i++) { int line = gfxvidinfo.height - TD_TOTAL_HEIGHT + i; @@ -2054,8 +2091,10 @@ void finish_drawing_frame (void) do_flush_line (line); } } + if (lightpen_x > 0 || lightpen_y > 0) lightpen_update (); + do_flush_screen (first_drawn_line, last_drawn_line); } diff --git a/driveclick.c b/driveclick.c old mode 100644 new mode 100755 diff --git a/enforcer.c b/enforcer.c old mode 100644 new mode 100755 diff --git a/ersatz.c b/ersatz.c old mode 100644 new mode 100755 diff --git a/expansion.c b/expansion.c old mode 100644 new mode 100755 diff --git a/fdi2raw.c b/fdi2raw.c old mode 100644 new mode 100755 diff --git a/filesys.asm b/filesys.asm old mode 100644 new mode 100755 diff --git a/filesys.c b/filesys.c old mode 100644 new mode 100755 diff --git a/filesys.sh b/filesys.sh old mode 100644 new mode 100755 diff --git a/filesys_bootrom.c b/filesys_bootrom.c old mode 100644 new mode 100755 diff --git a/fpp.c b/fpp.c old mode 100644 new mode 100755 diff --git a/fsdb.c b/fsdb.c old mode 100644 new mode 100755 diff --git a/fsdb_unix.c b/fsdb_unix.c old mode 100644 new mode 100755 diff --git a/fsusage.c b/fsusage.c old mode 100644 new mode 100755 diff --git a/gayle.c b/gayle.c old mode 100644 new mode 100755 diff --git a/genblitter.c b/genblitter.c old mode 100644 new mode 100755 diff --git a/gencomp.c b/gencomp.c old mode 100644 new mode 100755 diff --git a/gencpu.c b/gencpu.c old mode 100644 new mode 100755 diff --git a/gengenblitter.c b/gengenblitter.c old mode 100644 new mode 100755 diff --git a/genlinetoscr.c b/genlinetoscr.c old mode 100644 new mode 100755 diff --git a/genp2c.c b/genp2c.c old mode 100644 new mode 100755 diff --git a/gfxlib.c b/gfxlib.c old mode 100644 new mode 100755 diff --git a/gfxutil.c b/gfxutil.c old mode 100644 new mode 100755 diff --git a/gtkui.c b/gtkui.c old mode 100644 new mode 100755 diff --git a/hardfile.c b/hardfile.c old mode 100644 new mode 100755 diff --git a/hrtmon_rom.c b/hrtmon_rom.c old mode 100644 new mode 100755 diff --git a/identify.c b/identify.c old mode 100644 new mode 100755 diff --git a/include/akiko.h b/include/akiko.h old mode 100644 new mode 100755 diff --git a/include/ar.h b/include/ar.h old mode 100644 new mode 100755 diff --git a/include/arcadia.h b/include/arcadia.h old mode 100644 new mode 100755 diff --git a/include/audio.h b/include/audio.h old mode 100644 new mode 100755 diff --git a/include/autoconf.h b/include/autoconf.h old mode 100644 new mode 100755 diff --git a/include/blitter.h b/include/blitter.h old mode 100644 new mode 100755 diff --git a/include/blkdev.h b/include/blkdev.h old mode 100644 new mode 100755 diff --git a/include/bsdsocket.h b/include/bsdsocket.h old mode 100644 new mode 100755 diff --git a/include/catweasel.h b/include/catweasel.h old mode 100644 new mode 100755 diff --git a/include/cdtv.h b/include/cdtv.h old mode 100644 new mode 100755 diff --git a/include/cia.h b/include/cia.h old mode 100644 new mode 100755 diff --git a/include/commpipe.h b/include/commpipe.h old mode 100644 new mode 100755 diff --git a/include/compemu.h b/include/compemu.h old mode 100644 new mode 100755 diff --git a/include/cpu_prefetch.h b/include/cpu_prefetch.h old mode 100644 new mode 100755 diff --git a/include/crc32.h b/include/crc32.h old mode 100644 new mode 100755 diff --git a/include/custom.h b/include/custom.h old mode 100644 new mode 100755 diff --git a/include/debug.h b/include/debug.h old mode 100644 new mode 100755 diff --git a/include/disk.h b/include/disk.h old mode 100644 new mode 100755 diff --git a/include/drawing.h b/include/drawing.h old mode 100644 new mode 100755 diff --git a/include/driveclick.h b/include/driveclick.h old mode 100644 new mode 100755 diff --git a/include/enforcer.h b/include/enforcer.h old mode 100644 new mode 100755 diff --git a/include/ersatz.h b/include/ersatz.h old mode 100644 new mode 100755 diff --git a/include/events.h b/include/events.h old mode 100644 new mode 100755 diff --git a/include/events_jit.h b/include/events_jit.h old mode 100644 new mode 100755 diff --git a/include/events_normal.h b/include/events_normal.h old mode 100644 new mode 100755 diff --git a/include/execlib.h b/include/execlib.h old mode 100644 new mode 100755 diff --git a/include/fdi2raw.h b/include/fdi2raw.h old mode 100644 new mode 100755 diff --git a/include/filesys.h b/include/filesys.h old mode 100644 new mode 100755 diff --git a/include/filter.h b/include/filter.h old mode 100644 new mode 100755 diff --git a/include/fpp-ieee-be.h b/include/fpp-ieee-be.h old mode 100644 new mode 100755 diff --git a/include/fpp-unknown.h b/include/fpp-unknown.h old mode 100644 new mode 100755 diff --git a/include/fsdb.h b/include/fsdb.h old mode 100644 new mode 100755 diff --git a/include/fsusage.h b/include/fsusage.h old mode 100644 new mode 100755 diff --git a/include/genblitter.h b/include/genblitter.h old mode 100644 new mode 100755 diff --git a/include/gensound.h b/include/gensound.h old mode 100644 new mode 100755 diff --git a/include/gfxfilter.h b/include/gfxfilter.h old mode 100644 new mode 100755 diff --git a/include/gui.h b/include/gui.h old mode 100644 new mode 100755 diff --git a/include/identify.h b/include/identify.h old mode 100644 new mode 100755 diff --git a/include/inputdevice.h b/include/inputdevice.h old mode 100644 new mode 100755 diff --git a/include/keyboard.h b/include/keyboard.h old mode 100644 new mode 100755 diff --git a/include/keybuf.h b/include/keybuf.h old mode 100644 new mode 100755 diff --git a/include/mackbd.h b/include/mackbd.h old mode 100644 new mode 100755 diff --git a/include/memory.h b/include/memory.h old mode 100644 new mode 100755 diff --git a/include/moduleripper.h b/include/moduleripper.h old mode 100644 new mode 100755 diff --git a/include/native2amiga.h b/include/native2amiga.h old mode 100644 new mode 100755 diff --git a/include/newcpu.h b/include/newcpu.h old mode 100644 new mode 100755 diff --git a/include/options.h b/include/options.h old mode 100644 new mode 100755 diff --git a/include/osemu.h b/include/osemu.h old mode 100644 new mode 100755 diff --git a/include/parallel.h b/include/parallel.h old mode 100644 new mode 100755 diff --git a/include/picasso96.h b/include/picasso96.h old mode 100644 new mode 100755 diff --git a/include/readcpu.h b/include/readcpu.h old mode 100644 new mode 100755 diff --git a/include/savestate.h b/include/savestate.h old mode 100644 new mode 100755 diff --git a/include/scsidev.h b/include/scsidev.h old mode 100644 new mode 100755 diff --git a/include/serial.h b/include/serial.h old mode 100644 new mode 100755 diff --git a/include/sysconfig.h.win32 b/include/sysconfig.h.win32 old mode 100644 new mode 100755 diff --git a/include/sysdeps.h b/include/sysdeps.h old mode 100644 new mode 100755 diff --git a/include/traps.h b/include/traps.h old mode 100644 new mode 100755 diff --git a/include/tui.h b/include/tui.h old mode 100644 new mode 100755 diff --git a/include/uae.h b/include/uae.h old mode 100644 new mode 100755 diff --git a/include/uaeexe.h b/include/uaeexe.h old mode 100644 new mode 100755 diff --git a/include/uaeipc.h b/include/uaeipc.h old mode 100644 new mode 100755 diff --git a/include/uaeserial.h b/include/uaeserial.h old mode 100644 new mode 100755 diff --git a/include/unzip.h b/include/unzip.h old mode 100644 new mode 100755 diff --git a/include/xwin.h b/include/xwin.h old mode 100644 new mode 100755 diff --git a/include/zfile.h b/include/zfile.h old mode 100644 new mode 100755 diff --git a/inputdevice.c b/inputdevice.c old mode 100644 new mode 100755 diff --git a/inputevents.def b/inputevents.def old mode 100644 new mode 100755 diff --git a/keybuf.c b/keybuf.c old mode 100644 new mode 100755 diff --git a/main.c b/main.c old mode 100644 new mode 100755 diff --git a/memory.c b/memory.c old mode 100644 new mode 100755 diff --git a/missing.c b/missing.c old mode 100644 new mode 100755 diff --git a/moduleripper.c b/moduleripper.c old mode 100644 new mode 100755 diff --git a/native2amiga.c b/native2amiga.c old mode 100644 new mode 100755 diff --git a/ncurses.c b/ncurses.c old mode 100644 new mode 100755 diff --git a/newcpu.c b/newcpu.c old mode 100644 new mode 100755 diff --git a/nogui.c b/nogui.c old mode 100644 new mode 100755 diff --git a/od-generic/exectasks.h b/od-generic/exectasks.h old mode 100644 new mode 100755 diff --git a/od-generic/joystick.c b/od-generic/joystick.c old mode 100644 new mode 100755 diff --git a/od-generic/memory.h b/od-generic/memory.h old mode 100644 new mode 100755 diff --git a/od-generic/sound.c b/od-generic/sound.c old mode 100644 new mode 100755 diff --git a/od-generic/sound.h b/od-generic/sound.h old mode 100644 new mode 100755 diff --git a/od-win32/7zplugin.c b/od-win32/7zplugin.c old mode 100644 new mode 100755 diff --git a/od-win32/WinUAE_Install.nsi b/od-win32/WinUAE_Install.nsi old mode 100644 new mode 100755 diff --git a/od-win32/ahidsound.c b/od-win32/ahidsound.c old mode 100644 new mode 100755 diff --git a/od-win32/ahidsound.h b/od-win32/ahidsound.h old mode 100644 new mode 100755 diff --git a/od-win32/asm.bat b/od-win32/asm.bat old mode 100644 new mode 100755 diff --git a/od-win32/avioutput.c b/od-win32/avioutput.c old mode 100644 new mode 100755 diff --git a/od-win32/avioutput.h b/od-win32/avioutput.h old mode 100644 new mode 100755 diff --git a/od-win32/blkdev_win32_aspi.c b/od-win32/blkdev_win32_aspi.c old mode 100644 new mode 100755 diff --git a/od-win32/blkdev_win32_ioctl.c b/od-win32/blkdev_win32_ioctl.c old mode 100644 new mode 100755 diff --git a/od-win32/blkdev_win32_spti.c b/od-win32/blkdev_win32_spti.c old mode 100644 new mode 100755 diff --git a/od-win32/bsdsock.c b/od-win32/bsdsock.c old mode 100644 new mode 100755 diff --git a/od-win32/build68k_msvc/build68k_msvc.rc b/od-win32/build68k_msvc/build68k_msvc.rc old mode 100644 new mode 100755 diff --git a/od-win32/build68k_msvc/build68k_msvc.vcproj b/od-win32/build68k_msvc/build68k_msvc.vcproj old mode 100644 new mode 100755 diff --git a/od-win32/caps/CapsAPI.h b/od-win32/caps/CapsAPI.h old mode 100644 new mode 100755 diff --git a/od-win32/caps/CapsLib.h b/od-win32/caps/CapsLib.h old mode 100644 new mode 100755 diff --git a/od-win32/caps/Comlib.h b/od-win32/caps/Comlib.h old mode 100644 new mode 100755 diff --git a/od-win32/caps/Comtype.h b/od-win32/caps/Comtype.h old mode 100644 new mode 100755 diff --git a/od-win32/caps/caps_win32.c b/od-win32/caps/caps_win32.c old mode 100644 new mode 100755 diff --git a/od-win32/caps/caps_win32.h b/od-win32/caps/caps_win32.h old mode 100644 new mode 100755 diff --git a/od-win32/dinput.c b/od-win32/dinput.c old mode 100644 new mode 100755 diff --git a/od-win32/direct3d.c b/od-win32/direct3d.c old mode 100644 new mode 100755 diff --git a/od-win32/direct3d.h b/od-win32/direct3d.h old mode 100644 new mode 100755 diff --git a/od-win32/diskutil.c b/od-win32/diskutil.c old mode 100644 new mode 100755 diff --git a/od-win32/diskutil.h b/od-win32/diskutil.h old mode 100644 new mode 100755 diff --git a/od-win32/driveclick_win32.c b/od-win32/driveclick_win32.c old mode 100644 new mode 100755 diff --git a/od-win32/dxwrap.c b/od-win32/dxwrap.c old mode 100644 new mode 100755 diff --git a/od-win32/dxwrap.h b/od-win32/dxwrap.h old mode 100644 new mode 100755 diff --git a/od-win32/fdrawcmd.c b/od-win32/fdrawcmd.c old mode 100644 new mode 100755 index 6c21df4d..51ad9f20 --- a/od-win32/fdrawcmd.c +++ b/od-win32/fdrawcmd.c @@ -233,14 +233,14 @@ int main(int argc, char *argv[]) DWORD ver; if (argc < 2) { - printf("adfread.exe \n"); + printf("adfread 1.1\nUsage: adfread.exe \n"); return 0; } ver = checkversion(); if (!ver) return 0; - printf ("fdrawcmd.sys %x detected\n", ver); + printf ("adfread 1.1: fdrawcmd.sys %x detected\n", ver); trackbuffer = VirtualAlloc(NULL, TRACK_SIZE * 2, MEM_COMMIT, PAGE_READWRITE); if (opendevice()) { readloop(argv[1]); diff --git a/od-win32/fsdb_win32.c b/od-win32/fsdb_win32.c old mode 100644 new mode 100755 diff --git a/od-win32/genblitter_msvc/genblitter_msvc.vcproj b/od-win32/genblitter_msvc/genblitter_msvc.vcproj old mode 100644 new mode 100755 diff --git a/od-win32/gencomp_msvc/gencomp_msvc.vcproj b/od-win32/gencomp_msvc/gencomp_msvc.vcproj old mode 100644 new mode 100755 diff --git a/od-win32/gencpu_msvc/gencpu_msvc.vcproj b/od-win32/gencpu_msvc/gencpu_msvc.vcproj old mode 100644 new mode 100755 diff --git a/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcproj b/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcproj old mode 100644 new mode 100755 diff --git a/od-win32/graphics/amiga_header.bmp b/od-win32/graphics/amiga_header.bmp old mode 100644 new mode 100755 diff --git a/od-win32/graphics/amiga_welcome.bmp b/od-win32/graphics/amiga_welcome.bmp old mode 100644 new mode 100755 diff --git a/od-win32/graphics/installer_icon.ico b/od-win32/graphics/installer_icon.ico old mode 100644 new mode 100755 diff --git a/od-win32/hardfile_win32.c b/od-win32/hardfile_win32.c old mode 100644 new mode 100755 diff --git a/od-win32/hq2x32.asm b/od-win32/hq2x32.asm old mode 100644 new mode 100755 diff --git a/od-win32/hq3x16.asm b/od-win32/hq3x16.asm old mode 100644 new mode 100755 diff --git a/od-win32/hq3x32.asm b/od-win32/hq3x32.asm old mode 100644 new mode 100755 diff --git a/od-win32/hq4x32.asm b/od-win32/hq4x32.asm old mode 100644 new mode 100755 diff --git a/od-win32/ioport.c b/od-win32/ioport.c old mode 100644 new mode 100755 diff --git a/od-win32/ioport.h b/od-win32/ioport.h old mode 100644 new mode 100755 diff --git a/od-win32/ipctester.c b/od-win32/ipctester.c old mode 100644 new mode 100755 diff --git a/od-win32/keyboard_win32.c b/od-win32/keyboard_win32.c old mode 100644 new mode 100755 diff --git a/od-win32/lcd.c b/od-win32/lcd.c old mode 100644 new mode 100755 diff --git a/od-win32/lcd.h b/od-win32/lcd.h old mode 100644 new mode 100755 diff --git a/od-win32/machdep/m68k.h b/od-win32/machdep/m68k.h old mode 100644 new mode 100755 diff --git a/od-win32/machdep/maccess.h b/od-win32/machdep/maccess.h old mode 100644 new mode 100755 diff --git a/od-win32/machdep/rpt.h b/od-win32/machdep/rpt.h old mode 100644 new mode 100755 diff --git a/od-win32/machdep/support.c b/od-win32/machdep/support.c old mode 100644 new mode 100755 diff --git a/od-win32/makeexe.bat b/od-win32/makeexe.bat old mode 100644 new mode 100755 diff --git a/od-win32/md-fpp.h b/od-win32/md-fpp.h old mode 100644 new mode 100755 diff --git a/od-win32/midi.c b/od-win32/midi.c old mode 100644 new mode 100755 diff --git a/od-win32/midi.h b/od-win32/midi.h old mode 100644 new mode 100755 diff --git a/od-win32/midiin.c b/od-win32/midiin.c old mode 100644 new mode 100755 diff --git a/od-win32/mman.c b/od-win32/mman.c old mode 100644 new mode 100755 diff --git a/od-win32/opengl.c b/od-win32/opengl.c old mode 100644 new mode 100755 diff --git a/od-win32/opengl.h b/od-win32/opengl.h old mode 100644 new mode 100755 diff --git a/od-win32/parser.c b/od-win32/parser.c old mode 100644 new mode 100755 index 1eef96ad..26ab4ac7 --- a/od-win32/parser.c +++ b/od-win32/parser.c @@ -1204,13 +1204,16 @@ int enumserialports(void) void sernametodev(char *sername) { int i; + for (i = 0; i < MAX_SERIAL_PORTS && comports[i].name; i++) { if (!strcmp(sername, comports[i].cfgname)) { strcpy (sername, comports[i].dev); return; } } + sername[0] = 0; } + void serdevtoname(char *sername) { int i; @@ -1220,4 +1223,5 @@ void serdevtoname(char *sername) return; } } + sername[0] = 0; } diff --git a/od-win32/parser.h b/od-win32/parser.h old mode 100644 new mode 100755 diff --git a/od-win32/picasso96_win.c b/od-win32/picasso96_win.c old mode 100644 new mode 100755 diff --git a/od-win32/picasso96_win.h b/od-win32/picasso96_win.h old mode 100644 new mode 100755 diff --git a/od-win32/posixemu.c b/od-win32/posixemu.c old mode 100644 new mode 100755 diff --git a/od-win32/posixemu.h b/od-win32/posixemu.h old mode 100644 new mode 100755 diff --git a/od-win32/resources/35floppy.ico b/od-win32/resources/35floppy.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/Mycomp.ico b/od-win32/resources/Mycomp.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/RCa00564 b/od-win32/resources/RCa00564 old mode 100644 new mode 100755 diff --git a/od-win32/resources/WinUAE_German.rc b/od-win32/resources/WinUAE_German.rc old mode 100644 new mode 100755 diff --git a/od-win32/resources/amigainfo.ico b/od-win32/resources/amigainfo.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/avioutput.ico b/od-win32/resources/avioutput.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/chip.ico b/od-win32/resources/chip.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/cpu.ico b/od-win32/resources/cpu.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/drive.ico b/od-win32/resources/drive.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/drive_click.wav b/od-win32/resources/drive_click.wav old mode 100644 new mode 100755 diff --git a/od-win32/resources/drive_snatch.wav b/od-win32/resources/drive_snatch.wav old mode 100644 new mode 100755 diff --git a/od-win32/resources/drive_spin.wav b/od-win32/resources/drive_spin.wav old mode 100644 new mode 100755 diff --git a/od-win32/resources/drive_spinnd.wav b/od-win32/resources/drive_spinnd.wav old mode 100644 new mode 100755 diff --git a/od-win32/resources/drive_startup.wav b/od-win32/resources/drive_startup.wav old mode 100644 new mode 100755 diff --git a/od-win32/resources/file.ico b/od-win32/resources/file.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/folder.ico b/od-win32/resources/folder.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/h_arrow.cur b/od-win32/resources/h_arrow.cur old mode 100644 new mode 100755 diff --git a/od-win32/resources/joystick.ico b/od-win32/resources/joystick.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/lcd.bmp b/od-win32/resources/lcd.bmp old mode 100644 new mode 100755 diff --git a/od-win32/resources/misc.ico b/od-win32/resources/misc.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/move_dow.ico b/od-win32/resources/move_dow.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/move_up.ico b/od-win32/resources/move_up.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/paths.ico b/od-win32/resources/paths.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/quickstart.ico b/od-win32/resources/quickstart.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/resource.h b/od-win32/resources/resource.h old mode 100644 new mode 100755 diff --git a/od-win32/resources/resource.hm b/od-win32/resources/resource.hm old mode 100644 new mode 100755 diff --git a/od-win32/resources/root.ico b/od-win32/resources/root.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/screen.ico b/od-win32/resources/screen.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/sound.ico b/od-win32/resources/sound.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/winuae.exe.manifest b/od-win32/resources/winuae.exe.manifest old mode 100644 new mode 100755 diff --git a/od-win32/resources/winuae.ico b/od-win32/resources/winuae.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc old mode 100644 new mode 100755 diff --git a/od-win32/resources/winuae_minimal.rc b/od-win32/resources/winuae_minimal.rc old mode 100644 new mode 100755 diff --git a/od-win32/resources/xarcade-winuae.bmp b/od-win32/resources/xarcade-winuae.bmp old mode 100644 new mode 100755 diff --git a/od-win32/scaler.c b/od-win32/scaler.c old mode 100644 new mode 100755 diff --git a/od-win32/scaler2.c b/od-win32/scaler2.c old mode 100644 new mode 100755 diff --git a/od-win32/screenshot.c b/od-win32/screenshot.c old mode 100644 new mode 100755 diff --git a/od-win32/scsidef.h b/od-win32/scsidef.h old mode 100644 new mode 100755 diff --git a/od-win32/serial_win32.c b/od-win32/serial_win32.c old mode 100644 new mode 100755 diff --git a/od-win32/sfhelper.c b/od-win32/sfhelper.c old mode 100644 new mode 100755 diff --git a/od-win32/shm.c b/od-win32/shm.c old mode 100644 new mode 100755 diff --git a/od-win32/soundcheck.c b/od-win32/soundcheck.c old mode 100644 new mode 100755 diff --git a/od-win32/sounddep/sound.c b/od-win32/sounddep/sound.c old mode 100644 new mode 100755 index e625e4ce..4d045434 --- a/od-win32/sounddep/sound.c +++ b/od-win32/sounddep/sound.c @@ -29,7 +29,10 @@ #include #include +#include #include +#include +#include #include @@ -67,6 +70,7 @@ static int num_sound_devices; static LPDIRECTSOUNDBUFFER lpDSBprimary; +#define USE_DS8 #ifdef USE_DS8 static LPDIRECTSOUND8 lpDS; static LPDIRECTSOUNDBUFFER8 lpDSBsecondary; @@ -213,13 +217,16 @@ static void setvolume (void) setvolume_ahi (vol); } +const static GUID KSDATAFORMAT_SUBTYPE_PCM = {0x00000001,0x0000,0x0010, +{0x80,0x00,0x00,0xaa,0x00,0x38,0x9b,0x71}}; + static int open_audio_ds (int size) { HRESULT hr; DSBUFFERDESC sound_buffer; DSCAPS DSCaps; DSBCAPS DSBCaps; - WAVEFORMATEX wavfmt; + WAVEFORMATEXTENSIBLE wavfmt; int freq = currprefs.sound_freq; LPDIRECTSOUNDBUFFER pdsb; @@ -236,6 +243,42 @@ static int open_audio_ds (int size) if (sndbufsize > SND_MAX_BUFFER) sndbufsize = SND_MAX_BUFFER; + max_sndbufsize = size * 4; + if (max_sndbufsize > SND_MAX_BUFFER2) + max_sndbufsize = SND_MAX_BUFFER2; + dsoundbuf = max_sndbufsize * 2; + + if (dsoundbuf < DSBSIZE_MIN) + dsoundbuf = DSBSIZE_MIN; + if (dsoundbuf > DSBSIZE_MAX) + dsoundbuf = DSBSIZE_MAX; + + if (max_sndbufsize * 2 > dsoundbuf) + max_sndbufsize = dsoundbuf / 2; + + snd_writeoffset = max_sndbufsize * 5 / 8; + snd_maxoffset = max_sndbufsize; + snd_totalmaxoffset_of = max_sndbufsize + (dsoundbuf - max_sndbufsize) * 1 / 3; + snd_totalmaxoffset_uf = max_sndbufsize + (dsoundbuf - max_sndbufsize) * 2 / 3; + + memset (&wavfmt, 0, sizeof (WAVEFORMATEXTENSIBLE)); + wavfmt.Format.nChannels = (currprefs.sound_stereo == 3 || currprefs.sound_stereo == 2) ? 4 : (currprefs.sound_stereo ? 2 : 1); + wavfmt.Format.wFormatTag = wavfmt.Format.nChannels > 2 ? WAVE_FORMAT_EXTENSIBLE : WAVE_FORMAT_PCM; + wavfmt.Format.nSamplesPerSec = freq; + wavfmt.Format.wBitsPerSample = 16; + wavfmt.Format.nBlockAlign = wavfmt.Format.wBitsPerSample / 8 * wavfmt.Format.nChannels; + wavfmt.Format.nAvgBytesPerSec = wavfmt.Format.nBlockAlign * wavfmt.Format.nSamplesPerSec; + if (wavfmt.Format.nChannels > 2) { + wavfmt.Format.cbSize = sizeof (WAVEFORMATEXTENSIBLE) - sizeof (WAVEFORMATEX); + wavfmt.SubFormat = KSDATAFORMAT_SUBTYPE_PCM; + wavfmt.Samples.wValidBitsPerSample = 16; + wavfmt.dwChannelMask = KSAUDIO_SPEAKER_QUAD; + } + + write_log ("SOUND: '%s'/%d/%d bits/%d Hz/buffer %d/dist %d\n", + sound_devices[currprefs.win32_soundcard], + wavfmt.Format.nChannels, 16, freq, max_sndbufsize, snd_configsize); + #ifdef USE_DS8 hr = DirectSoundCreate8 (&sound_device_guid[currprefs.win32_soundcard], &lpDS, NULL); #else @@ -294,42 +337,16 @@ static int open_audio_ds (int size) goto error; } - memset (&wavfmt, 0, sizeof (WAVEFORMATEX)); - wavfmt.wFormatTag = WAVE_FORMAT_PCM; - wavfmt.nChannels = (currprefs.sound_stereo == 3 || currprefs.sound_stereo == 2) ? 4 : (currprefs.sound_stereo ? 2 : 1); - wavfmt.nSamplesPerSec = freq; - wavfmt.wBitsPerSample = 16; - wavfmt.nBlockAlign = wavfmt.wBitsPerSample / 8 * wavfmt.nChannels; - wavfmt.nAvgBytesPerSec = wavfmt.nBlockAlign * wavfmt.nSamplesPerSec; - - hr = IDirectSoundBuffer_SetFormat (lpDSBprimary, &wavfmt); + hr = IDirectSoundBuffer_SetFormat (lpDSBprimary, &wavfmt.Format); if (FAILED(hr)) { write_log ("SOUND: Primary SetFormat() failure: %s\n", DXError (hr)); goto error; } - max_sndbufsize = size * 4; - if (max_sndbufsize > SND_MAX_BUFFER2) - max_sndbufsize = SND_MAX_BUFFER2; - dsoundbuf = max_sndbufsize * 2; - - if (dsoundbuf < DSBSIZE_MIN) - dsoundbuf = DSBSIZE_MIN; - if (dsoundbuf > DSBSIZE_MAX) - dsoundbuf = DSBSIZE_MAX; - - if (max_sndbufsize * 2 > dsoundbuf) - max_sndbufsize = dsoundbuf / 2; - - snd_writeoffset = max_sndbufsize * 5 / 8; - snd_maxoffset = max_sndbufsize; - snd_totalmaxoffset_of = max_sndbufsize + (dsoundbuf - max_sndbufsize) * 1 / 3; - snd_totalmaxoffset_uf = max_sndbufsize + (dsoundbuf - max_sndbufsize) * 2 / 3; - memset (&sound_buffer, 0, sizeof (sound_buffer)); sound_buffer.dwSize = sizeof (sound_buffer); sound_buffer.dwBufferBytes = dsoundbuf; - sound_buffer.lpwfxFormat = &wavfmt; + sound_buffer.lpwfxFormat = &wavfmt.Format; sound_buffer.dwFlags = DSBCAPS_GETCURRENTPOSITION2 | DSBCAPS_GLOBALFOCUS; sound_buffer.dwFlags |= DSBCAPS_CTRLVOLUME | DSBCAPS_LOCSOFTWARE; sound_buffer.guid3DAlgorithm = GUID_NULL; @@ -359,10 +376,6 @@ static int open_audio_ds (int size) else sample_handler = currprefs.sound_stereo ? sample16s_handler : sample16_handler; - write_log ("DS driver '%s'/%d/%d bits/%d Hz/buffer %d/dist %d\n", - sound_devices[currprefs.win32_soundcard], - wavfmt.nChannels, - 16, freq, max_sndbufsize, snd_configsize); obtainedfreq = currprefs.sound_freq; return 1; diff --git a/od-win32/sounddep/sound.h b/od-win32/sounddep/sound.h old mode 100644 new mode 100755 diff --git a/od-win32/srcrelease.bat b/od-win32/srcrelease.bat old mode 100644 new mode 100755 diff --git a/od-win32/support.c b/od-win32/support.c old mode 100644 new mode 100755 diff --git a/od-win32/sys/ipc.h b/od-win32/sys/ipc.h old mode 100644 new mode 100755 diff --git a/od-win32/sys/mman.h b/od-win32/sys/mman.h old mode 100644 new mode 100755 diff --git a/od-win32/sys/shm.h b/od-win32/sys/shm.h old mode 100644 new mode 100755 diff --git a/od-win32/sysconfig.h b/od-win32/sysconfig.h old mode 100644 new mode 100755 diff --git a/od-win32/target.h b/od-win32/target.h old mode 100644 new mode 100755 diff --git a/od-win32/threaddep/thread.h b/od-win32/threaddep/thread.h old mode 100644 new mode 100755 diff --git a/od-win32/unistd.h b/od-win32/unistd.h old mode 100644 new mode 100755 diff --git a/od-win32/wcc.sh b/od-win32/wcc.sh old mode 100644 new mode 100755 diff --git a/od-win32/win32.c b/od-win32/win32.c old mode 100644 new mode 100755 index f9a77227..f923e816 --- a/od-win32/win32.c +++ b/od-win32/win32.c @@ -1507,7 +1507,7 @@ HMODULE language_load(WORD language) if (vsFileInfo && HIWORD(vsFileInfo->dwProductVersionMS) == UAEMAJOR && LOWORD(vsFileInfo->dwProductVersionMS) == UAEMINOR - /* && HIWORD(vsFileInfo->dwProductVersionLS) <= UAESUBREV */ ) { + && HIWORD(vsFileInfo->dwProductVersionLS) == UAESUBREV) { success = TRUE; write_log ("Translation DLL '%s' loaded and enabled\n", dllbuf); } else { diff --git a/od-win32/win32.h b/od-win32/win32.h old mode 100644 new mode 100755 index a13fff1e..22559f55 --- a/od-win32/win32.h +++ b/od-win32/win32.h @@ -15,9 +15,9 @@ #define GETBDM(x) (((x) - ((x / 10000) * 10000)) / 100) #define GETBDD(x) ((x) % 100) -#define WINUAEBETA 6 +#define WINUAEBETA 7 #define WINUAEPUBLICBETA 1 -#define WINUAEDATE MAKEBD(2006, 12, 24) +#define WINUAEDATE MAKEBD(2006, 12, 25) #define IHF_WINDOWHIDDEN 6 #define NORMAL_WINDOW_STYLE (WS_VISIBLE | WS_BORDER | WS_CAPTION | WS_MINIMIZEBOX | WS_SYSMENU) diff --git a/od-win32/win32_decompress.c b/od-win32/win32_decompress.c old mode 100644 new mode 100755 diff --git a/od-win32/win32_filesys.c b/od-win32/win32_filesys.c old mode 100644 new mode 100755 diff --git a/od-win32/win32_nogui.c b/od-win32/win32_nogui.c old mode 100644 new mode 100755 diff --git a/od-win32/win32_scale2x.c b/od-win32/win32_scale2x.c old mode 100644 new mode 100755 diff --git a/od-win32/win32gfx.c b/od-win32/win32gfx.c old mode 100644 new mode 100755 diff --git a/od-win32/win32gfx.h b/od-win32/win32gfx.h old mode 100644 new mode 100755 diff --git a/od-win32/win32gui.c b/od-win32/win32gui.c old mode 100644 new mode 100755 diff --git a/od-win32/win32gui.h b/od-win32/win32gui.h old mode 100644 new mode 100755 diff --git a/od-win32/winuae_msvc/winuae_msvc.vcproj b/od-win32/winuae_msvc/winuae_msvc.vcproj old mode 100644 new mode 100755 diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt old mode 100644 new mode 100755 index 8e585313..63bda408 --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -1,4 +1,20 @@ +Beta 7: (RC2) + +- AGA sprites outside display window emulated when sprite is above or + below the display window. Previously they were only visible when + it was on left or right side of display window. + (fixes Spheris Legacy missing status graphics) +- clear garbage at the bottom of screen for example when switching from + doubled to non-doubled +- serial port set to none in config file didn't work properly +- cloned stereo and 4 channel sound mode uses proper initialization + (according to MSDN WAVEFORMATEXTENSIBLE is required if >2 channels but + for some reason "incorrect" way also worked previously..) +- mask unused DIWHIGH bits, could have caused narrow image appearing on + screen when loading statefile with diwhigh having highest bit set and + ECS Agnus or AGA enabled. + Beta 6: (RC) - serial port "friendly" names listed in serial port selection, diff --git a/od-win32/wrc.sh b/od-win32/wrc.sh old mode 100644 new mode 100755 diff --git a/od-win32/writelog.c b/od-win32/writelog.c old mode 100644 new mode 100755 diff --git a/picasso96.c b/picasso96.c old mode 100644 new mode 100755 diff --git a/prowizard/misc/misc.c b/prowizard/misc/misc.c old mode 100644 new mode 100755 diff --git a/prowizard/misc/testbag.c b/prowizard/misc/testbag.c old mode 100644 new mode 100755 diff --git a/prowizard/prowiz.c b/prowizard/prowiz.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/AC1D_packer.c b/prowizard/rippers/AC1D_packer.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/AMOS-MusicBank.c b/prowizard/rippers/AMOS-MusicBank.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/AMOS-PowerPackerBank.c b/prowizard/rippers/AMOS-PowerPackerBank.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/BP-Soundmonitor.c b/prowizard/rippers/BP-Soundmonitor.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/BSI-FutureComposer.c b/prowizard/rippers/BSI-FutureComposer.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/Bytekiller.c b/prowizard/rippers/Bytekiller.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/ChipTracker.c b/prowizard/rippers/ChipTracker.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/Crunchmania-Address.c b/prowizard/rippers/Crunchmania-Address.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/Crunchmania-Simple.c b/prowizard/rippers/Crunchmania-Simple.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/DefjamCruncher32-pro.c b/prowizard/rippers/DefjamCruncher32-pro.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/DigiBooster17.c b/prowizard/rippers/DigiBooster17.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/DigitalIllusion.c b/prowizard/rippers/DigitalIllusion.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/DoubleAction.c b/prowizard/rippers/DoubleAction.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/Dragpack100.c b/prowizard/rippers/Dragpack100.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/Dragpack252.c b/prowizard/rippers/Dragpack252.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/EurekaPacker.c b/prowizard/rippers/EurekaPacker.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/FC-M-Packer.c b/prowizard/rippers/FC-M-Packer.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/FastTracker2.c b/prowizard/rippers/FastTracker2.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/FuchsTracker.c b/prowizard/rippers/FuchsTracker.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/FutureComposer13.c b/prowizard/rippers/FutureComposer13.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/FutureComposer14.c b/prowizard/rippers/FutureComposer14.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/FuzzacPacker.c b/prowizard/rippers/FuzzacPacker.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/GNUPacker12.c b/prowizard/rippers/GNUPacker12.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/GPMO.c b/prowizard/rippers/GPMO.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/GameMusicCreator.c b/prowizard/rippers/GameMusicCreator.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/GnuPlayer.c b/prowizard/rippers/GnuPlayer.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/HQC2.c b/prowizard/rippers/HQC2.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/HeatseekerMC10.c b/prowizard/rippers/HeatseekerMC10.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/HornetPacker.c b/prowizard/rippers/HornetPacker.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/JamCracker.c b/prowizard/rippers/JamCracker.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/KefrensSoundMachine.c b/prowizard/rippers/KefrensSoundMachine.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/MED-Octamed.c b/prowizard/rippers/MED-Octamed.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/MOD-compatible.c b/prowizard/rippers/MOD-compatible.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/MasterCruncher30-Address.c b/prowizard/rippers/MasterCruncher30-Address.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/MaxPacker12.c b/prowizard/rippers/MaxPacker12.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/MegaCruncher-Object.c b/prowizard/rippers/MegaCruncher-Object.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/MegaCruncher.c b/prowizard/rippers/MegaCruncher.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/ModuleProtector.c b/prowizard/rippers/ModuleProtector.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/Mugician.c b/prowizard/rippers/Mugician.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/Newtron.c b/prowizard/rippers/Newtron.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/NoiseFromHeaven.c b/prowizard/rippers/NoiseFromHeaven.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/NoisePacker1.c b/prowizard/rippers/NoisePacker1.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/NoisePacker2.c b/prowizard/rippers/NoisePacker2.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/NoisePacker3.c b/prowizard/rippers/NoisePacker3.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/NoiseRunner.c b/prowizard/rippers/NoiseRunner.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/PhaPacker.c b/prowizard/rippers/PhaPacker.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/PolkaPacker.c b/prowizard/rippers/PolkaPacker.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/PowerMusic.c b/prowizard/rippers/PowerMusic.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/PowerPacker23.c b/prowizard/rippers/PowerPacker23.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/PowerPacker30.c b/prowizard/rippers/PowerPacker30.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/PowerPacker40-library.c b/prowizard/rippers/PowerPacker40-library.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/PowerPacker40.c b/prowizard/rippers/PowerPacker40.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/ProPacker10.c b/prowizard/rippers/ProPacker10.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/ProPacker21.c b/prowizard/rippers/ProPacker21.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/ProPacker30.c b/prowizard/rippers/ProPacker30.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/Promizer01.c b/prowizard/rippers/Promizer01.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/Promizer10c.c b/prowizard/rippers/Promizer10c.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/Promizer18a.c b/prowizard/rippers/Promizer18a.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/Promizer20.c b/prowizard/rippers/Promizer20.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/Promizer40.c b/prowizard/rippers/Promizer40.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/Prorunner10.c b/prowizard/rippers/Prorunner10.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/Prorunner20.c b/prowizard/rippers/Prorunner20.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/QuadraComposer.c b/prowizard/rippers/QuadraComposer.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/RelokIt10.c b/prowizard/rippers/RelokIt10.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/SGT-Packer.c b/prowizard/rippers/SGT-Packer.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/SkytPacker.c b/prowizard/rippers/SkytPacker.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/SoundFX.c b/prowizard/rippers/SoundFX.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/SoundTracker.c b/prowizard/rippers/SoundTracker.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/SoundTracker26.c b/prowizard/rippers/SoundTracker26.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/SpikeCruncher.c b/prowizard/rippers/SpikeCruncher.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/StartrekkerPack.c b/prowizard/rippers/StartrekkerPack.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/StimPacker.c b/prowizard/rippers/StimPacker.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/StoneCracker270.c b/prowizard/rippers/StoneCracker270.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/StoneCracker299.c b/prowizard/rippers/StoneCracker299.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/StoneCracker299b.c b/prowizard/rippers/StoneCracker299b.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/StoneCracker299d.c b/prowizard/rippers/StoneCracker299d.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/StoneCracker300.c b/prowizard/rippers/StoneCracker300.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/StoneCracker310.c b/prowizard/rippers/StoneCracker310.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/SuperCruncher27.c b/prowizard/rippers/SuperCruncher27.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/SyncroPacker46.c b/prowizard/rippers/SyncroPacker46.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/TMK.c b/prowizard/rippers/TMK.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/TNMCruncher.c b/prowizard/rippers/TNMCruncher.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/TetraPack102.c b/prowizard/rippers/TetraPack102.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/TetraPack21.c b/prowizard/rippers/TetraPack21.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/TetraPack22.c b/prowizard/rippers/TetraPack22.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/TheDarkDemon.c b/prowizard/rippers/TheDarkDemon.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/ThePlayer22a.c b/prowizard/rippers/ThePlayer22a.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/ThePlayer30a.c b/prowizard/rippers/ThePlayer30a.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/ThePlayer40.c b/prowizard/rippers/ThePlayer40.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/ThePlayer41a.c b/prowizard/rippers/ThePlayer41a.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/ThePlayer50a.c b/prowizard/rippers/ThePlayer50a.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/ThePlayer60a.c b/prowizard/rippers/ThePlayer60a.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/ThePlayer61a.c b/prowizard/rippers/ThePlayer61a.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/TimeCruncher17.c b/prowizard/rippers/TimeCruncher17.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/TrackerPacker1.c b/prowizard/rippers/TrackerPacker1.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/TrackerPacker2.c b/prowizard/rippers/TrackerPacker2.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/TrackerPacker3.c b/prowizard/rippers/TrackerPacker3.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/TreasurePattern.c b/prowizard/rippers/TreasurePattern.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/TryItCruncher101.c b/prowizard/rippers/TryItCruncher101.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/TurboSqueezer61.c b/prowizard/rippers/TurboSqueezer61.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/UnicTracker.c b/prowizard/rippers/UnicTracker.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/UnicTracker2.c b/prowizard/rippers/UnicTracker2.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/WantonPacker.c b/prowizard/rippers/WantonPacker.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/XannPlayer.c b/prowizard/rippers/XannPlayer.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/ZenPacker.c b/prowizard/rippers/ZenPacker.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/datacrunchers.c b/prowizard/rippers/datacrunchers.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/extern.h b/prowizard/rippers/extern.h old mode 100644 new mode 100755 diff --git a/prowizard/rippers/globals.h b/prowizard/rippers/globals.h old mode 100644 new mode 100755 diff --git a/prowizard/rippers/ptktable.h b/prowizard/rippers/ptktable.h old mode 100644 new mode 100755 diff --git a/prowizard/rippers/tuning.h b/prowizard/rippers/tuning.h old mode 100644 new mode 100755 diff --git a/prowizard/rippers/vars.h b/prowizard/rippers/vars.h old mode 100644 new mode 100755 diff --git a/readcpu.c b/readcpu.c old mode 100644 new mode 100755 diff --git a/readdisk.c b/readdisk.c old mode 100644 new mode 100755 diff --git a/rpc.c b/rpc.c old mode 100644 new mode 100755 diff --git a/savestate.c b/savestate.c old mode 100644 new mode 100755 diff --git a/scsi-none.c b/scsi-none.c old mode 100644 new mode 100755 diff --git a/scsidev.c b/scsidev.c old mode 100644 new mode 100755 diff --git a/scsiemul.c b/scsiemul.c old mode 100644 new mode 100755 diff --git a/sdl-joystick.c b/sdl-joystick.c old mode 100644 new mode 100755 diff --git a/serial.c b/serial.c old mode 100644 new mode 100755 diff --git a/sinctable.c b/sinctable.c old mode 100644 new mode 100755 diff --git a/svga.c b/svga.c old mode 100644 new mode 100755 diff --git a/svgancui.c b/svgancui.c old mode 100644 new mode 100755 diff --git a/table68k b/table68k old mode 100644 new mode 100755 diff --git a/traps.c b/traps.c old mode 100644 new mode 100755 diff --git a/tui.c b/tui.c old mode 100644 new mode 100755 diff --git a/uaeexe.c b/uaeexe.c old mode 100644 new mode 100755 diff --git a/uaeipc.c b/uaeipc.c old mode 100644 new mode 100755 diff --git a/uaelib.c b/uaelib.c old mode 100644 new mode 100755 diff --git a/uaeserial.c b/uaeserial.c old mode 100644 new mode 100755 diff --git a/unzip.c b/unzip.c old mode 100644 new mode 100755 diff --git a/writelog.c b/writelog.c old mode 100644 new mode 100755 diff --git a/zfile.c b/zfile.c old mode 100644 new mode 100755