imported winuaesrc1600b8.zip

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/blitter.c b/blitter.c
old mode 100755 (executable)
new mode 100644 (file)
index 50c2251..1ad2309
--- a/blitter.c
+++ b/blitter.c
@@ -954,9 +954,18 @@ static void blit_bltset (int con)
 {
     int i;
 
+    blitdesc = bltcon1 & 2;
+
+    blt_info.blitashift = bltcon0 >> 12;
+    blt_info.blitdownashift = 16 - blt_info.blitashift;
+    blt_info.blitbshift = bltcon1 >> 12;
+    blt_info.blitdownbshift = 16 - blt_info.blitbshift;
+
+    if (bltstate != BLT_done && con == 2)
+       return;
+
     blitline = bltcon1 & 1;
     blitfill = bltcon1 & 0x18;
-    blitdesc = bltcon1 & 2;
     blit_ch = (bltcon0 & 0x0f00) >> 8;
 
     if (blitline) {
@@ -992,10 +1001,6 @@ static void blit_bltset (int con)
            blit_nod = 0;
     }
 
-    blt_info.blitashift = bltcon0 >> 12;
-    blt_info.blitdownashift = 16 - blt_info.blitashift;
-    blt_info.blitbshift = bltcon1 >> 12;
-    blt_info.blitdownbshift = 16 - blt_info.blitbshift;
 }
 
 static void blit_modset (void)

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

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

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

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

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

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

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

diff --git a/cfgfile.c b/cfgfile.c
old mode 100755 (executable)
new mode 100644 (file)
index 13e1214..eeabd91
--- a/cfgfile.c
+++ b/cfgfile.c
@@ -524,6 +524,7 @@ void cfgfile_save_options (struct zfile *f, struct uae_prefs *p, int type)
     cfgfile_write (f, "gfx_lores=%s\n", p->gfx_resolution == 0 ? "true" : "false");
     cfgfile_write (f, "gfx_resolution=%s\n", lorestype1[p->gfx_resolution]);
     cfgfile_write (f, "gfx_lores_mode=%s\n", loresmode[p->gfx_lores_mode]);
+    cfgfile_write (f, "gfx_flickerfixer=%s\n", p->gfx_scandoubler ? "true" : "false");
     cfgfile_write (f, "gfx_linemode=%s\n", linemode1[p->gfx_linedbl]);
     cfgfile_write (f, "gfx_fullscreen_amiga=%s\n", fullmodes[p->gfx_afullscreen]);
     cfgfile_write (f, "gfx_fullscreen_picasso=%s\n", fullmodes[p->gfx_pfullscreen]);
@@ -940,6 +941,7 @@ static int cfgfile_parse_host (struct uae_prefs *p, char *option, char *value)
        || cfgfile_yesno (option, value, "gfx_vsync", &p->gfx_avsync)
        || cfgfile_yesno (option, value, "gfx_vsync_picasso", &p->gfx_pvsync)
        || cfgfile_yesno (option, value, "gfx_blacker_than_black", &p->gfx_blackerthanblack)
+       || cfgfile_yesno (option, value, "gfx_flickerfixer", &p->gfx_scandoubler)
        || cfgfile_yesno (option, value, "show_leds", &p->leds_on_screen)
        || cfgfile_yesno (option, value, "synchronize_clock", &p->tod_hack)
        || cfgfile_yesno (option, value, "magic_mouse", &p->input_magic_mouse)
@@ -3013,7 +3015,7 @@ void default_prefs (struct uae_prefs *p, int type)
     p->gfx_filter_filtermode = 0;
     p->gfx_filter_scanlineratio = (1 << 4) | 1;
     p->gfx_filter_keep_aspect = 0;
-    p->gfx_filter_autoscale = 1;
+    p->gfx_filter_autoscale = 0;
 
     strcpy (p->df[0], "df0.adf");
     strcpy (p->df[1], "df1.adf");

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

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

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

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

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

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

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

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

diff --git a/custom.c b/custom.c
old mode 100755 (executable)
new mode 100644 (file)
index 855ac78..b8a7bc8
--- a/custom.c
+++ b/custom.c
@@ -141,6 +141,8 @@ static uae_u16 lof;
 static int next_lineno, prev_lineno;
 static enum nln_how nextline_how;
 static int lof_changed = 0;
+static int scandoubled_line;
+
 /* Stupid genlock-detection prevention hack.
  * We should stop calling vsync_handler() and
  * hstop_handler() completely but it is not
@@ -392,6 +394,11 @@ STATIC_INLINE int nodraw (void)
     return !currprefs.cpu_cycle_exact && framecnt != 0;
 }
 
+static int doflickerfix (void)
+{
+    return currprefs.gfx_linedbl && doublescan < 0 && interlace_seen;
+}
+
 uae_u32 get_copper_address (int copno)
 {
     switch (copno) {
@@ -2339,13 +2346,12 @@ STATIC_INLINE int color_changes_differ (struct draw_info *dip, struct draw_info
 
 /* End of a horizontal scan line. Finish off all decisions that were not
  * made yet. */
-static void finish_decisions (void)
+static void finish_decisions (int hpos)
 {
     struct draw_info *dip;
     struct draw_info *dip_old;
     struct decision *dp;
     int changed;
-    int hpos = current_hpos ();
 
     if (nodraw ())
        return;
@@ -2452,7 +2458,7 @@ static void reset_decisions (void)
     fetch_state = fetch_not_started;
 
     if (plfstate > plf_active)
-       plfstate = plf_idle;
+        plfstate = plf_idle;
     if (plfstate == plf_active && !(currprefs.chipset_mask & CSMASK_ECS_AGNUS))
         plfstate = plf_idle;
 
@@ -2621,7 +2627,7 @@ void init_hz (void)
     eventtab[ev_hsync].evtime = get_cycles() + HSYNCTIME;
     events_schedule ();
     if (hzc) {
-       interlace_seen = bplcon0 & 4;
+       interlace_seen = (bplcon0 & 4) ? 1 : 0;
         reset_drawing ();
     }
     compute_vsynctime ();
@@ -4362,6 +4368,8 @@ static void do_sprites (int hpos)
 
     if (vpos < sprite_vblank_endline)
        return;
+    if (doflickerfix () && !(next_lineno & 1))
+       return;
 
 #ifndef CUSTOM_SIMPLE
     maxspr = hpos;
@@ -4753,27 +4761,28 @@ static void CIA_vsync_prehandler (int dotod)
     ciavsync_counter++;
 }
 
-static uaecptr prevbpl[MAXVPOS][8];
-static void hsync_scandoubler (int line, int lof)
+static uaecptr prevbpl[2][MAXVPOS][8];
+static void hsync_scandoubler (int lof)
 {
     int i;
-    uaecptr bpl[8];
 
     for (i = 0; i < 8; i++) {
-       bpl[i] = prevbpl[vpos][i];
-       prevbpl[vpos][i] = bplpt[i];
-       bplpt[i] = bpl[i];
+       prevbpl[lof][vpos][i] = bplpt[i];
+       bplpt[i] = prevbpl[1 - lof][vpos - lof][i];
     }
+
     next_lineno++;
+    scandoubled_line = 1;
     reset_decisions ();
-    finish_decisions ();
+    plfstate = plf_idle;
+    finish_decisions (maxhpos);
     hsync_record_line_state (next_lineno, nln_normal, thisline_changed);
     hardware_line_completed (next_lineno);
-
-    for (i = 0; i < 8; i++) {
-       bplpt[i] = prevbpl[vpos][i];
-    }
+    scandoubled_line = 0;
     next_lineno--;
+
+    for (i = 0; i < 8; i++)
+       bplpt[i] = prevbpl[lof][vpos][i];
 }
 
 static void hsync_handler (void)
@@ -4782,7 +4791,7 @@ static void hsync_handler (void)
 
     if (!nocustom ()) {
        sync_copper_with_cpu (maxhpos, 0);
-       finish_decisions ();
+       finish_decisions (hpos);
        if (thisline_decision.plfleft != -1) {
            if (currprefs.collision_level > 1)
                do_sprite_collisions ();
@@ -4861,6 +4870,10 @@ static void hsync_handler (void)
                cycle_diagram_free_cycles[f_fetchmode][GET_RES (f_bplcon0)][GET_PLANES_LIMIT (f_bplcon0)]);
        }
        hardware_line_completed (next_lineno);
+       if (doflickerfix ()) {
+           hsync_scandoubler (lof ? 1 : 0);
+           next_lineno++;
+       }
     }
 
     /* In theory only an equality test is needed here - but if a program
@@ -4921,13 +4934,14 @@ static void hsync_handler (void)
        if ((bplcon0 & 4) && currprefs.gfx_linedbl)
            notice_interlace_seen ();
        nextline_how = nln_normal;
-       if (currprefs.gfx_linedbl && doublescan < 0) {
+       if (doflickerfix ()) {
            lineno *= 2;
-           hsync_scandoubler (lineno, lof);
-       } else if (currprefs.gfx_linedbl && (doublescan == 0 || interlace_seen)) {
+           if (!lof)
+               lineno++;
+       } else if (currprefs.gfx_linedbl && (doublescan <= 0 || interlace_seen > 0)) {
            lineno *= 2;
            nextline_how = currprefs.gfx_linedbl == 1 ? nln_doubled : nln_nblack;
-           if ((bplcon0 & 4) || (interlace_seen && !lof)) {
+           if ((bplcon0 & 4) || (interlace_seen > 0 && !lof)) {
                if (!lof) {
                    lineno++;
                    nextline_how = nln_lower;

diff --git a/debug.c b/debug.c
old mode 100755 (executable)
new mode 100644 (file)
index 04972c4..5739006
--- a/debug.c
+++ b/debug.c
@@ -1035,6 +1035,8 @@ static void deepcheatsearch (char **c)
            addrcnt += size;
            cnt++;
        }
+       if (cnt > 0)
+           console_out ("\n");
        listcheater (1, size);
     } else {
        console_out ("Now continue with 'g' and use 'D' again after you have lost another life\n");

diff --git a/desktop.ini b/desktop.ini
deleted file mode 100755 (executable)
index c5547ea..0000000
--- a/desktop.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[ViewState]
-Mode=
-Vid=
-FolderType=NotSpecified

diff --git a/disk.c b/disk.c
old mode 100755 (executable)
new mode 100644 (file)
index 18b9adb..d3adafe
--- a/disk.c
+++ b/disk.c
@@ -1148,7 +1148,7 @@ static int drive_running (drive * drv)
     return !drv->motoroff;
 }
 
-static void motordelay_func(uae_u32 v)
+static void motordelay_func (uae_u32 v)
 {
     floppy[v].motordelay = 0;
 }
@@ -1177,7 +1177,7 @@ static void drive_motor (drive * drv, int off)
            write_log (" ->motor off");
        if (currprefs.cpu_model <= 68010 && currprefs.m68k_speed == 0) {
            drv->motordelay = 1;
-           event2_newevent2(30, drv - floppy, motordelay_func);
+           event2_newevent2 (30, drv - floppy, motordelay_func);
        }
     }
     drv->motoroff = off;
@@ -2123,7 +2123,7 @@ void DISK_check_change (void)
        if (drv->dskready_down_time > 0)
            drv->dskready_down_time--;
        /* emulate drive motor turn on time */
-       if (drv->dskready_time && !drive_empty(drv)) {
+       if (drv->dskready_time > 0 && !drive_empty(drv)) {
            drv->dskready_time--;
            if (drv->dskready_time == 0)
                drv->dskready = 1;
@@ -2270,15 +2270,18 @@ uae_u8 DISK_status (void)
                        st &= ~0x20;
                }
            } else {
-               /* report drive ID */
-               if (drv->idbit && currprefs.dfxtype[dr] != DRV_35_DD_ESCOM)
-                   st &= ~0x20;
+               if (currprefs.cs_df0idhw || dr > 0) {
+                   /* report drive ID */
+                   if (drv->idbit && currprefs.dfxtype[dr] != DRV_35_DD_ESCOM)
+                       st &= ~0x20;
+               } else {
+                   /* non-ID internal drive: mirror real dskready */
+                   if (drv->dskready)
+                       st &= ~0x20;
+               }
                /* dskrdy needs some cycles after switching the motor off.. (Pro Tennis Tour) */
-               if (drv->motordelay) {
-                   write_log ("MOTORDELAY! %x\n", M68K_GETPC);
+               if (!currprefs.cs_df0idhw && dr == 0 && drv->motordelay)
                    st &= ~0x20;
-                   drv->motordelay = 0;
-               }
            }
            if (drive_track0 (drv))
                st &= ~0x10;

diff --git a/drawing.c b/drawing.c
old mode 100755 (executable)
new mode 100644 (file)
index bf99c24..b30d49b
--- a/drawing.c
+++ b/drawing.c
@@ -215,7 +215,7 @@ uae_sem_t gui_sem;
 int inhibit_frame;
 
 int framecnt = 0;
-int frame_redraw_necessary;
+static int frame_redraw_necessary;
 static int picasso_redraw_necessary;
 
 #ifdef XLINECHECK
@@ -364,7 +364,7 @@ int get_custom_limits (int *pw, int *ph, int *pdx, int *pdy)
        dx = 1;
 
     dbl2 = dbl1 = currprefs.gfx_linedbl ? 1 : 0;
-    if (doublescan && !interlace_seen) {
+    if (doublescan && interlace_seen <= 0) {
        dbl1--;
        dbl2--;
     }
@@ -458,13 +458,13 @@ void get_custom_mouse_limits (int *pw, int *ph, int *pdx, int *pdy, int dbl)
     dx = xshift (dx, res_shift);
 
     dbl2 = dbl1 = currprefs.gfx_linedbl ? 1 : 0;
-    if ((doublescan || interlace_seen) && !dbl) {
+    if ((doublescan || interlace_seen > 0) && !dbl) {
         dbl1--;
         dbl2--;
     }
-    if (interlace_seen)
+    if (interlace_seen > 0)
         dbl2++;
-    if (!interlace_seen && dbl)
+    if (interlace_seen <= 0 && dbl)
         dbl2--;
     h = xshift (h, dbl1);
     dy = xshift (dy, dbl2);
@@ -1668,7 +1668,7 @@ static void init_aspect_maps (void)
        return;
 
     linedbld = linedbl = currprefs.gfx_linedbl;
-    if (doublescan > 0 && !interlace_seen) {
+    if (doublescan > 0 && interlace_seen <= 0) {
        linedbl = 0;
        linedbld = 1;
     }
@@ -1932,7 +1932,9 @@ static void pfield_draw_line (int lineno, int gfx_ypos, int follow_ypos)
 
     dp_for_drawing = line_decisions + lineno;
     dip_for_drawing = curr_drawinfo + lineno;
-    switch (linestate[lineno]) {
+
+    switch (linestate[lineno])
+    {
     case LINE_REMEMBERED_AS_PREVIOUS:
        if (!warned)
            write_log ("Shouldn't get here... this is a bug.\n"), warned++;
@@ -2216,7 +2218,7 @@ static void center_image (void)
     /* @@@ interlace_seen used to be (bplcon0 & 4), but this is probably
      * better.  */
     if (prev_x_adjust != visible_left_border || prev_y_adjust != thisframe_y_adjust)
-       frame_redraw_necessary |= (interlace_seen && linedbl) ? 2 : 1;
+       frame_redraw_necessary |= (interlace_seen > 0 && linedbl) ? 2 : 1;
 
     max_diwstop = 0;
     min_diwstart = 10000;
@@ -2633,40 +2635,40 @@ void finish_drawing_frame (void)
     for (i = 0; i < max_ypos_thisframe; i++) {
        int i1 = i + min_ypos_for_screen;
        int line = i + thisframe_y_adjust_real;
-       int where;
+       int where2;
 
        if (linestate[line] == LINE_UNDECIDED)
            break;
 
-       where = amiga2aspect_line_map[i1];
-       if (where >= gfxvidinfo.height)
+       where2 = amiga2aspect_line_map[i1];
+       if (where2 >= gfxvidinfo.height)
            break;
-       if (where < 0)
+       if (where2 < 0)
            continue;
 
-       pfield_draw_line (line, where, amiga2aspect_line_map[i1 + 1]);
+       pfield_draw_line (line, where2, amiga2aspect_line_map[i1 + 1]);
     }
 
     /* clear possible old garbage at the bottom if emulated area become smaller */
     for (i = last_max_ypos; i < gfxvidinfo.height; i++) {
        int i1 = i + min_ypos_for_screen;
        int line = i + thisframe_y_adjust_real;
-       int where = amiga2aspect_line_map[i1];
+       int where2 = amiga2aspect_line_map[i1];
        xcolnr tmp;
 
-       if (where >= gfxvidinfo.height)
+       if (where2 >= gfxvidinfo.height)
            break;
-       if (where < 0)
+       if (where2 < 0)
            continue;
        tmp = colors_for_drawing.acolors[0];
        colors_for_drawing.acolors[0] = getxcolor (0);
        xlinebuffer = gfxvidinfo.linemem;
        if (xlinebuffer == 0)
-           xlinebuffer = row_map[where];
+           xlinebuffer = row_map[where2];
        xlinebuffer -= linetoscr_x_adjust_bytes;
        fill_line ();
        linestate[line] = LINE_UNDECIDED;
-       do_flush_line (where);
+       do_flush_line (where2);
        colors_for_drawing.acolors[0] = tmp;
     }
 
@@ -2745,12 +2747,15 @@ void redraw_frame (void)
 void vsync_handle_redraw (int long_frame, int lof_changed)
 {
     last_redraw_point++;
-    if (lof_changed || ! interlace_seen || last_redraw_point >= 2 || long_frame) {
+    if (lof_changed || interlace_seen <= 0 || last_redraw_point >= 2 || long_frame || doublescan < 0) {
        last_redraw_point = 0;
 
        if (framecnt == 0)
            finish_drawing_frame ();
-       interlace_seen = 0;
+       if (interlace_seen > 0)
+           interlace_seen = -1;
+       else if (interlace_seen == -1)
+           interlace_seen = 0;
 
        /* At this point, we have finished both the hardware and the
         * drawing frame. Essentially, we are outside of all loops and
@@ -2884,6 +2889,9 @@ static void gfxbuffer_reset (void)
 
 void notice_interlace_seen (void)
 {
+    // non-lace to lace switch (non-lace active at least one frame)?
+    if (interlace_seen == 0)
+       frame_redraw_necessary = 2;
     interlace_seen = 1;
     frame_res_lace = 1;
 }

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

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

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

diff --git a/expansion.c b/expansion.c
old mode 100755 (executable)
new mode 100644 (file)
index 6c47104..9fe9ac5
--- a/expansion.c
+++ b/expansion.c
@@ -1216,7 +1216,7 @@ static uaecptr check_boot_rom (void)
        return b;
     if (currprefs.sana2)
        return b;
-    if (currprefs.input_tablet > 0 || currprefs.input_magic_mouse == 0)
+    if (currprefs.input_tablet > 0)
        return b;
     if (currprefs.gfxmem_size)
        return b;

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

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

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

diff --git a/filesys.c b/filesys.c
old mode 100755 (executable)
new mode 100644 (file)
index ed8a552..dfee0a1
--- a/filesys.c
+++ b/filesys.c
@@ -992,7 +992,7 @@ int filesys_eject (int nr)
     write_log ("FILESYS: removed volume '%s'\n", u->ui.volname);
     flush_cache (u, -1);
     put_byte (u->volume + 172 - 32, -2);
-    uae_Signal(get_long(u->volume + 176 - 32), 1 << 17);
+    uae_Signal (get_long(u->volume + 176 - 32), 1 << 13);
     return 1;
 }
 
@@ -1114,7 +1114,7 @@ int filesys_media_change (const char *rootdir, int inserted, struct uaedev_confi
        if (inserted > 1)
            mountinfo.ui[nr].canremove = 1;
        automountunit = nr;
-       uae_Signal (mountertask, 1 << 17);
+       uae_Signal (mountertask, 1 << 13);
        /* poof */
        if (uci)
            uci->configoffset = nr;
@@ -1130,7 +1130,7 @@ int hardfile_remount (int nr)
     if (!mountertask)
        return 0;
     automountunit = nr;
-    uae_Signal (mountertask, 1 << 17);
+    uae_Signal (mountertask, 1 << 13);
 #endif
     return 1;
 }
@@ -1200,7 +1200,7 @@ int filesys_insert (int nr, char *volume, const char *rootdir, int readonly, int
        uci->readonly = ui->readonly = u->ui.readonly = readonly;
     put_byte (u->volume + 44, 0);
     put_byte (u->volume + 172 - 32, 1);
-    uae_Signal (get_long (u->volume + 176 - 32), 1 << 17);
+    uae_Signal (get_long (u->volume + 176 - 32), 1 << 13);
     return 100 + nr;
 }
 

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

diff --git a/filesys_bootrom.c b/filesys_bootrom.c
old mode 100755 (executable)
new mode 100644 (file)
index 06a8c5d..1014d6b
--- a/filesys_bootrom.c
+++ b/filesys_bootrom.c
@@ -2,14 +2,14 @@
  db(0x60); db(0x00); db(0x09); db(0x6a); db(0x00); db(0x00); db(0x07); db(0x48);
  db(0x00); db(0x00); db(0x00); db(0x30); db(0x00); db(0x00); db(0x01); db(0x74);
  db(0x00); db(0x00); db(0x00); db(0x1c); db(0x00); db(0x00); db(0x02); db(0x30);
- db(0x00); db(0x00); db(0x0d); db(0x52); db(0x43); db(0xfa); db(0x12); db(0x23);
+ db(0x00); db(0x00); db(0x0d); db(0x38); db(0x43); db(0xfa); db(0x12); db(0xb7);
  db(0x4e); db(0xae); db(0xff); db(0xa0); db(0x20); db(0x40); db(0x20); db(0x28);
  db(0x00); db(0x16); db(0x20); db(0x40); db(0x4e); db(0x90); db(0x4e); db(0x75);
  db(0x48); db(0xe7); db(0xff); db(0xfe); db(0x2c); db(0x78); db(0x00); db(0x04);
- db(0x30); db(0x3c); db(0xff); db(0xfc); db(0x61); db(0x00); db(0x0b); db(0x56);
- db(0x2a); db(0x50); db(0x43); db(0xfa); db(0x12); db(0x2c); db(0x70); db(0x24);
+ db(0x30); db(0x3c); db(0xff); db(0xfc); db(0x61); db(0x00); db(0x0b); db(0x66);
+ db(0x2a); db(0x50); db(0x43); db(0xfa); db(0x12); db(0xc0); db(0x70); db(0x24);
  db(0x7a); db(0x01); db(0x4e); db(0xae); db(0xfd); db(0xd8); db(0x4a); db(0x80);
- db(0x66); db(0x0c); db(0x43); db(0xfa); db(0x12); db(0x1c); db(0x70); db(0x00);
+ db(0x66); db(0x0c); db(0x43); db(0xfa); db(0x12); db(0xb0); db(0x70); db(0x00);
  db(0x7a); db(0x00); db(0x4e); db(0xae); db(0xfd); db(0xd8); db(0x28); db(0x40);
  db(0x4a); db(0xad); db(0x01); db(0x0c); db(0x67); db(0x5a); db(0x20); db(0x3c);
  db(0x00); db(0x00); db(0x02); db(0x2c); db(0x22); db(0x3c); db(0x00); db(0x01);
@@ -25,31 +25,31 @@
  db(0x00); db(0x00); db(0x02); db(0x2c); db(0x4e); db(0xae); db(0xff); db(0x2e);
  db(0x2c); db(0x78); db(0x00); db(0x04); db(0x22); db(0x4c); db(0x4e); db(0xae);
  db(0xfe); db(0x62); db(0x30); db(0x3c); db(0xff); db(0x80); db(0x61); db(0x00);
- db(0x0a); db(0xc4); db(0x4e); db(0x90); db(0x72); db(0x03); db(0x74); db(0xf6);
+ db(0x0a); db(0xd4); db(0x4e); db(0x90); db(0x72); db(0x03); db(0x74); db(0xf6);
  db(0x20); db(0x7c); db(0x00); db(0x20); db(0x00); db(0x00); db(0x90); db(0x88);
  db(0x65); db(0x0a); db(0x67); db(0x08); db(0x78); db(0x00); db(0x22); db(0x44);
- db(0x4e); db(0xae); db(0xfd); db(0x96); db(0x41); db(0xfa); db(0x11); db(0x27);
+ db(0x4e); db(0xae); db(0xfd); db(0x96); db(0x41); db(0xfa); db(0x11); db(0xbb);
  db(0x43); db(0xfa); db(0x00); db(0x1c); db(0x70); db(0x0a); db(0x61); db(0x00);
- db(0x0b); db(0xa2); db(0x22); db(0x40); db(0x72); db(0x01); db(0x30); db(0x3c);
- db(0xff); db(0x48); db(0x61); db(0x00); db(0x0a); db(0x90); db(0x4e); db(0x90);
+ db(0x0b); db(0x88); db(0x22); db(0x40); db(0x72); db(0x01); db(0x30); db(0x3c);
+ db(0xff); db(0x48); db(0x61); db(0x00); db(0x0a); db(0xa0); db(0x4e); db(0x90);
  db(0x4c); db(0xdf); db(0x7f); db(0xff); db(0x4e); db(0x75); db(0x2c); db(0x78);
- db(0x00); db(0x04); db(0x70); db(0x00); db(0x08); db(0xc0); db(0x00); db(0x11);
- db(0x4e); db(0xae); db(0xfe); db(0xc2); db(0x43); db(0xfa); db(0x11); db(0x23);
+ db(0x00); db(0x04); db(0x70); db(0x00); db(0x08); db(0xc0); db(0x00); db(0x0d);
+ db(0x4e); db(0xae); db(0xfe); db(0xc2); db(0x43); db(0xfa); db(0x11); db(0xb7);
  db(0x70); db(0x00); db(0x4e); db(0xae); db(0xfd); db(0xd8); db(0x4a); db(0x80);
- db(0x67); db(0xe4); db(0x2c); db(0x40); db(0x41); db(0xfa); db(0x10); db(0xfa);
+ db(0x67); db(0xe4); db(0x2c); db(0x40); db(0x41); db(0xfa); db(0x11); db(0x8e);
  db(0x22); db(0x08); db(0x74); db(0x0f); db(0x41); db(0xfa); db(0x00); db(0x22);
  db(0x26); db(0x08); db(0xe4); db(0x8b); db(0x28); db(0x3c); db(0x00); db(0x00);
  db(0x1f); db(0x40); db(0x4e); db(0xae); db(0xff); db(0x76); db(0x22); db(0x4e);
  db(0x2c); db(0x78); db(0x00); db(0x04); db(0x4e); db(0xae); db(0xfe); db(0x62);
  db(0x60); db(0xbc); db(0x00); db(0x00); db(0x00); db(0x00); db(0x00); db(0x10);
  db(0x00); db(0x00); db(0x00); db(0x00); db(0x72); db(0x02); db(0x30); db(0x3c);
- db(0xff); db(0x48); db(0x61); db(0x00); db(0x0a); db(0x30); db(0x4e); db(0x90);
+ db(0xff); db(0x48); db(0x61); db(0x00); db(0x0a); db(0x40); db(0x4e); db(0x90);
  db(0x22); db(0x00); db(0x6b); db(0x04); db(0x61); db(0x00); db(0x07); db(0x86);
  db(0x70); db(0x00); db(0x4e); db(0x75); db(0x48); db(0xe7); db(0x00); db(0x20);
- db(0x30); db(0x3c); db(0xff); db(0x50); db(0x61); db(0x00); db(0x0a); db(0x16);
+ db(0x30); db(0x3c); db(0xff); db(0x50); db(0x61); db(0x00); db(0x0a); db(0x26);
  db(0x70); db(0x00); db(0x4e); db(0x90); db(0x4a); db(0x80); db(0x67); db(0x00);
  db(0x00); db(0xa2); db(0x2c); db(0x78); db(0x00); db(0x04); db(0x30); db(0x3c);
- db(0xff); db(0x50); db(0x61); db(0x00); db(0x0a); db(0x00); db(0x70); db(0x02);
+ db(0xff); db(0x50); db(0x61); db(0x00); db(0x0a); db(0x10); db(0x70); db(0x02);
  db(0x4e); db(0x90); db(0x0c); db(0x40); db(0x00); db(0x01); db(0x6d); db(0x00);
  db(0x00); db(0x7c); db(0x6e); db(0x06); db(0x4e); db(0xae); db(0xfe); db(0x92);
  db(0x60); db(0xe4); db(0x0c); db(0x40); db(0x00); db(0x02); db(0x6e); db(0x08);
@@ -67,16 +67,16 @@
  db(0x00); db(0x18); db(0x25); db(0x49); db(0x00); db(0x1a); db(0x20); db(0x69);
  db(0x00); db(0x10); db(0x22); db(0x4a); db(0x4e); db(0xae); db(0xfe); db(0x92);
  db(0x60); db(0x00); db(0xff); db(0x74); db(0x30); db(0x3c); db(0xff); db(0x50);
- db(0x61); db(0x00); db(0x09); db(0x72); db(0x70); db(0x04); db(0x4e); db(0x90);
+ db(0x61); db(0x00); db(0x09); db(0x82); db(0x70); db(0x04); db(0x4e); db(0x90);
  db(0x70); db(0x01); db(0x4c); db(0xdf); db(0x04); db(0x00); db(0x4e); db(0x75);
  db(0x48); db(0xe7); db(0xc0); db(0xc0); db(0x70); db(0x1a); db(0x22); db(0x3c);
  db(0x00); db(0x01); db(0x00); db(0x01); db(0x4e); db(0xae); db(0xff); db(0x3a);
- db(0x22); db(0x40); db(0x41); db(0xfa); db(0x0f); db(0xc2); db(0x23); db(0x48);
+ db(0x22); db(0x40); db(0x41); db(0xfa); db(0x10); db(0x56); db(0x23); db(0x48);
  db(0x00); db(0x0a); db(0x41); db(0xfa); db(0xff); db(0x28); db(0x23); db(0x48);
  db(0x00); db(0x0e); db(0x41); db(0xfa); db(0xff); db(0x20); db(0x23); db(0x48);
  db(0x00); db(0x12); db(0x33); db(0x7c); db(0x02); db(0x14); db(0x00); db(0x08);
  db(0x70); db(0x03); db(0x4e); db(0xae); db(0xff); db(0x58); db(0x30); db(0x3a);
- db(0x0a); db(0xea); db(0x67); db(0x04); db(0x61); db(0x00); db(0x0a); db(0x88);
+ db(0x0a); db(0xd0); db(0x67); db(0x04); db(0x61); db(0x00); db(0x0a); db(0x6e);
  db(0x4c); db(0xdf); db(0x03); db(0x03); db(0x4e); db(0x75); db(0x48); db(0xe7);
  db(0xc0); db(0xf2); db(0x2c); db(0x78); db(0x00); db(0x04); db(0x24); db(0x48);
  db(0x26); db(0x49); db(0x20); db(0x3c); db(0x00); db(0x00); db(0x00); db(0xbe);
@@ -85,7 +85,7 @@
  db(0x01); db(0xa0); db(0x11); db(0xb1); db(0x00); db(0x00); db(0x00); db(0x0e);
  db(0x52); db(0x40); db(0x0c); db(0x40); db(0x00); db(0x8c); db(0x66); db(0xf2);
  db(0x20); db(0x0a); db(0xe4); db(0x88); db(0x21); db(0x40); db(0x00); db(0x36);
- db(0x22); db(0x48); db(0x41); db(0xfa); db(0x0f); db(0x52); db(0x23); db(0x48);
+ db(0x22); db(0x48); db(0x41); db(0xfa); db(0x0f); db(0xe6); db(0x23); db(0x48);
  db(0x00); db(0x0a); db(0x20); db(0x6b); db(0x01); db(0x98); db(0x41); db(0xe8);
  db(0x00); db(0x12); db(0x4e); db(0xae); db(0xff); db(0x10); db(0x4c); db(0xdf);
  db(0x4f); db(0x03); db(0x4e); db(0x75); db(0x48); db(0xe7); db(0x7f); db(0x7e);
@@ -122,14 +122,14 @@
  db(0x4e); db(0x75); db(0x7e); db(0x00); db(0x60); db(0xf4); db(0x48); db(0xe7);
  db(0x40); db(0xe2); db(0x2c); db(0x78); db(0x00); db(0x04); db(0x41); db(0xee);
  db(0x01); db(0x50); db(0x20); db(0x50); db(0x4a); db(0x90); db(0x67); db(0x1a);
- db(0x22); db(0x68); db(0x00); db(0x0a); db(0x45); db(0xfa); db(0x0e); db(0xa4);
+ db(0x22); db(0x68); db(0x00); db(0x0a); db(0x45); db(0xfa); db(0x0f); db(0x38);
  db(0x10); db(0x19); db(0x12); db(0x1a); db(0xb0); db(0x01); db(0x66); db(0x06);
  db(0x4a); db(0x00); db(0x67); db(0x42); db(0x60); db(0xf2); db(0x20); db(0x50);
  db(0x60); db(0xe2); db(0x70); db(0x20); db(0x22); db(0x3c); db(0x00); db(0x01);
  db(0x00); db(0x01); db(0x4e); db(0xae); db(0xff); db(0x3a); db(0x24); db(0x40);
  db(0x15); db(0x7c); db(0x00); db(0x08); db(0x00); db(0x08); db(0x41); db(0xfa);
- db(0x0e); db(0x7a); db(0x25); db(0x48); db(0x00); db(0x0a); db(0x41); db(0xfa);
- db(0x0d); db(0xf6); db(0x25); db(0x48); db(0x00); db(0x0e); db(0x41); db(0xea);
+ db(0x0f); db(0x0e); db(0x25); db(0x48); db(0x00); db(0x0a); db(0x41); db(0xfa);
+ db(0x0e); db(0x8a); db(0x25); db(0x48); db(0x00); db(0x0e); db(0x41); db(0xea);
  db(0x00); db(0x12); db(0x20); db(0x88); db(0x58); db(0x90); db(0x21); db(0x48);
  db(0x00); db(0x08); db(0x41); db(0xee); db(0x01); db(0x50); db(0x22); db(0x4a);
  db(0x4e); db(0xae); db(0xff); db(0x0a); db(0x20); db(0x4a); db(0x20); db(0x08);
@@ -234,8 +234,8 @@
  db(0x20); db(0x6c); db(0x00); db(0x24); db(0x4a); db(0x90); db(0x4e); db(0x75);
  db(0x61); db(0x00); db(0xfc); db(0x7c); db(0x21); db(0x40); db(0x01); db(0x98);
  db(0x2f); db(0x08); db(0x30); db(0x3c); db(0xff); db(0xfc); db(0x61); db(0x00);
- db(0x04); db(0x3c); db(0x2a); db(0x50); db(0x30); db(0x3c); db(0xff); db(0x28);
- db(0x61); db(0x00); db(0x04); db(0x32); db(0x22); db(0x48); db(0x20); db(0x5f);
+ db(0x04); db(0x4c); db(0x2a); db(0x50); db(0x30); db(0x3c); db(0xff); db(0x28);
+ db(0x61); db(0x00); db(0x04); db(0x42); db(0x22); db(0x48); db(0x20); db(0x5f);
  db(0x42); db(0xa8); db(0x01); db(0x90); db(0x42); db(0xa8); db(0x01); db(0x94);
  db(0x4e); db(0x91); db(0x26); db(0x00); db(0x0c); db(0x43); db(0xff); db(0xfe);
  db(0x67); db(0x00); db(0xf9); db(0x92); db(0x20); db(0x28); db(0x01); db(0x90);
@@ -243,10 +243,10 @@
  db(0x2c); db(0x78); db(0x00); db(0x04); db(0x4e); db(0xae); db(0xff); db(0x3a);
  db(0x20); db(0x5f); db(0x21); db(0x40); db(0x01); db(0x94); db(0x4a); db(0x83);
  db(0x6a); db(0x0e); db(0x22); db(0x48); db(0x30); db(0x3c); db(0xff); db(0x20);
- db(0x61); db(0x00); db(0x03); db(0xf2); db(0x4e); db(0x90); db(0x60); db(0x26);
+ db(0x61); db(0x00); db(0x04); db(0x02); db(0x4e); db(0x90); db(0x60); db(0x26);
  db(0x2c); db(0x4c); db(0x2f); db(0x08); db(0x4e); db(0xae); db(0xff); db(0x70);
  db(0x20); db(0x5f); db(0x22); db(0x48); db(0x26); db(0x40); db(0x30); db(0x3c);
- db(0xff); db(0x20); db(0x61); db(0x00); db(0x03); db(0xd8); db(0x4e); db(0x90);
+ db(0xff); db(0x20); db(0x61); db(0x00); db(0x03); db(0xe8); db(0x4e); db(0x90);
  db(0x70); db(0x00); db(0x27); db(0x40); db(0x00); db(0x08); db(0x27); db(0x40);
  db(0x00); db(0x10); db(0x27); db(0x40); db(0x00); db(0x20); db(0x4a); db(0xa9);
  db(0x01); db(0x94); db(0x67); db(0x28); db(0x20); db(0x69); db(0x01); db(0x94);
@@ -256,7 +256,7 @@
  db(0x4c); db(0xdf); db(0x03); db(0x01); db(0x4a); db(0x80); db(0x67); db(0x04);
  db(0x61); db(0x00); db(0xfa); db(0x7c); db(0x4a); db(0x83); db(0x6b); db(0x00);
  db(0xf9); db(0x0c); db(0x30); db(0x3c); db(0xff); db(0x18); db(0x61); db(0x00);
- db(0x03); db(0x8c); db(0x4e); db(0x90); db(0x20); db(0x03); db(0x16); db(0x29);
+ db(0x03); db(0x9c); db(0x4e); db(0x90); db(0x20); db(0x03); db(0x16); db(0x29);
  db(0x00); db(0x4f); db(0x4a); db(0x80); db(0x66); db(0x1a); db(0x27); db(0x7c);
  db(0x00); db(0x00); db(0x17); db(0x70); db(0x00); db(0x14); db(0x41); db(0xfa);
  db(0xf7); db(0xdc); db(0x20); db(0x08); db(0xe4); db(0x88); db(0x27); db(0x40);
@@ -280,16 +280,16 @@
  db(0xff); db(0x3a); db(0x4a); db(0x80); db(0x67); db(0x3a); db(0x20); db(0x52);
  db(0x24); db(0x40); db(0x22); db(0x4a); db(0x12); db(0xd8); db(0x66); db(0xfc);
  db(0x13); db(0x7c); db(0x00); db(0x3a); db(0xff); db(0xff); db(0x42); db(0x11);
- db(0x2c); db(0x78); db(0x00); db(0x04); db(0x43); db(0xfa); db(0x09); db(0x73);
+ db(0x2c); db(0x78); db(0x00); db(0x04); db(0x43); db(0xfa); db(0x0a); db(0x07);
  db(0x70); db(0x00); db(0x4e); db(0xae); db(0xfd); db(0xd8); db(0x2c); db(0x40);
  db(0x22); db(0x0a); db(0x4e); db(0xae); db(0xff); db(0x52); db(0x22); db(0x4e);
  db(0x2c); db(0x78); db(0x00); db(0x04); db(0x4e); db(0xae); db(0xfe); db(0x62);
  db(0x22); db(0x4a); db(0x20); db(0x02); db(0x4e); db(0xae); db(0xff); db(0x2e);
  db(0x70); db(0x00); db(0x4e); db(0x75); db(0x48); db(0xe7); db(0x3f); db(0x3e);
  db(0x2c); db(0x01); db(0x7e); db(0x06); db(0x2c); db(0x78); db(0x00); db(0x04);
- db(0x43); db(0xfa); db(0x09); db(0x6e); db(0x70); db(0x24); db(0x4e); db(0xae);
+ db(0x43); db(0xfa); db(0x0a); db(0x02); db(0x70); db(0x24); db(0x4e); db(0xae);
  db(0xfd); db(0xd8); db(0x4a); db(0x80); db(0x66); db(0x0e); db(0x08); db(0x87);
- db(0x00); db(0x02); db(0x43); db(0xfa); db(0x09); db(0x5c); db(0x70); db(0x00);
+ db(0x00); db(0x02); db(0x43); db(0xfa); db(0x09); db(0xf0); db(0x70); db(0x00);
  db(0x4e); db(0xae); db(0xfd); db(0xd8); db(0x28); db(0x40); db(0x20); db(0x3c);
  db(0x00); db(0x00); db(0x02); db(0x2c); db(0x22); db(0x3c); db(0x00); db(0x01);
  db(0x00); db(0x01); db(0x4e); db(0xae); db(0xff); db(0x3a); db(0x20); db(0x40);
@@ -302,7 +302,7 @@
  db(0x22); db(0x4c); db(0x4e); db(0xae); db(0xfe); db(0x62); db(0x4c); db(0xdf);
  db(0x7c); db(0xfc); db(0x4e); db(0x75); db(0x2c); db(0x78); db(0x00); db(0x04);
  db(0x93); db(0xc9); db(0x4e); db(0xae); db(0xfe); db(0xda); db(0x20); db(0x40);
- db(0x4b); db(0xe8); db(0x00); db(0x5c); db(0x43); db(0xfa); db(0x08); db(0xc3);
+ db(0x4b); db(0xe8); db(0x00); db(0x5c); db(0x43); db(0xfa); db(0x09); db(0x57);
  db(0x70); db(0x00); db(0x4e); db(0xae); db(0xfd); db(0xd8); db(0x24); db(0x40);
  db(0x20); db(0x3c); db(0x00); db(0x00); db(0x00); db(0xb9); db(0x22); db(0x3c);
  db(0x00); db(0x01); db(0x00); db(0x01); db(0x4e); db(0xae); db(0xff); db(0x3a);
@@ -310,20 +310,22 @@
  db(0x00); db(0x04); db(0x27); db(0x46); db(0x00); db(0x08); db(0x27); db(0x4a);
  db(0x00); db(0xa0); db(0x50); db(0xeb); db(0x00); db(0x9e); db(0x93); db(0xc9);
  db(0x4e); db(0xae); db(0xfe); db(0xda); db(0x27); db(0x40); db(0x00); db(0xb0);
- db(0x61); db(0x00); db(0x02); db(0x78); db(0x27); db(0x40); db(0x00); db(0xa4);
- db(0x61); db(0x00); db(0x02); db(0xa4); db(0x27); db(0x40); db(0x00); db(0xa8);
+ db(0x41); db(0xfa); db(0x08); db(0xa4); db(0x70); db(0x00); db(0x72); db(0x00);
+ db(0x61); db(0x00); db(0x02); db(0x84); db(0x27); db(0x40); db(0x00); db(0xa4);
+ db(0x41); db(0xfa); db(0x08); db(0xa1); db(0x70); db(0x00); db(0x72); db(0x00);
+ db(0x61); db(0x00); db(0x02); db(0x74); db(0x27); db(0x40); db(0x00); db(0xa8);
  db(0x7a); db(0x00); db(0x20); db(0x4d); db(0x4e); db(0xae); db(0xfe); db(0x80);
  db(0x20); db(0x4d); db(0x4e); db(0xae); db(0xfe); db(0x8c); db(0x28); db(0x40);
  db(0x26); db(0x2c); db(0x00); db(0x0a); db(0x30); db(0x3c); db(0xff); db(0x40);
  db(0x61); db(0x00); db(0x01); db(0xb2); db(0x70); db(0x00); db(0x4e); db(0x90);
- db(0x24); db(0x00); db(0x70); db(0x01); db(0x61); db(0x00); db(0xfa); db(0x48);
+ db(0x24); db(0x00); db(0x70); db(0x01); db(0x61); db(0x00); db(0xfa); db(0x38);
  db(0x08); db(0x02); db(0x00); db(0x01); db(0x67); db(0x06); db(0x70); db(0x01);
- db(0x61); db(0x00); db(0xfb); db(0xb0); db(0x60); db(0x00); db(0x00); db(0xf8);
+ db(0x61); db(0x00); db(0xfb); db(0xa0); db(0x60); db(0x00); db(0x00); db(0xf8);
  db(0x20); db(0x4d); db(0x4e); db(0xae); db(0xfe); db(0x8c); db(0x28); db(0x40);
  db(0x4a); db(0x80); db(0x66); db(0x10); db(0x70); db(0x00); db(0x12); db(0x2d);
- db(0x00); db(0x0f); db(0x03); db(0xc0); db(0x08); db(0xc0); db(0x00); db(0x11);
+ db(0x00); db(0x0f); db(0x03); db(0xc0); db(0x08); db(0xc0); db(0x00); db(0x0d);
  db(0x4e); db(0xae); db(0xfe); db(0xc2); db(0x4a); db(0x2b); db(0x00); db(0xac);
- db(0x67); db(0x08); db(0x61); db(0x00); db(0xfc); db(0x5c); db(0x42); db(0x2b);
+ db(0x67); db(0x08); db(0x61); db(0x00); db(0xfc); db(0x4c); db(0x42); db(0x2b);
  db(0x00); db(0xac); db(0x20); db(0x0c); db(0x67); db(0xd2); db(0x0c); db(0x6c);
  db(0x00); db(0x26); db(0x00); db(0x12); db(0x66); db(0x4c); db(0x0c); db(0xac);
  db(0x40); db(0x00); db(0x00); db(0x00); db(0x00); db(0x14); db(0x66); db(0x42);
@@ -352,9 +354,9 @@
  db(0x00); db(0x04); db(0x60); db(0x00); db(0xff); db(0x0c); db(0x28); db(0x43);
  db(0x61); db(0x04); db(0x60); db(0x00); db(0xff); db(0x04); db(0x0c); db(0xac);
  db(0x00); db(0x00); db(0x00); db(0x1f); db(0x00); db(0x08); db(0x66); db(0x04);
- db(0x61); db(0x00); db(0xfb); db(0x5c); db(0x0c); db(0xac); db(0x00); db(0x00);
+ db(0x61); db(0x00); db(0xfb); db(0x4c); db(0x0c); db(0xac); db(0x00); db(0x00);
  db(0x04); db(0x09); db(0x00); db(0x08); db(0x66); db(0x12); db(0x61); db(0x00);
- db(0xfb); db(0x8a); db(0x66); db(0x0c); db(0x30); db(0x3c); db(0xff); db(0x58);
+ db(0xfb); db(0x7a); db(0x66); db(0x0c); db(0x30); db(0x3c); db(0xff); db(0x58);
  db(0x61); db(0x00); db(0x00); db(0x72); db(0x4e); db(0x90); db(0x60); db(0xee);
  db(0x22); db(0x54); db(0x20); db(0x6c); db(0x00); db(0x04); db(0x29); db(0x4d);
  db(0x00); db(0x04); db(0x4e); db(0xee); db(0xfe); db(0x92); db(0x2f); db(0x05);
@@ -369,7 +371,7 @@
  db(0x22); db(0x80); db(0x22); db(0x4a); db(0x24); db(0x51); db(0x70); db(0x18);
  db(0x4e); db(0xae); db(0xff); db(0x2e); db(0x06); db(0x86); db(0x00); db(0x01);
  db(0x00); db(0x00); db(0x20); db(0x0a); db(0x66); db(0xec); db(0x26); db(0x87);
- db(0x2a); db(0x1f); db(0x4e); db(0x75); db(0x41); db(0xfa); db(0xf4); db(0x5e);
+ db(0x2a); db(0x1f); db(0x4e); db(0x75); db(0x41); db(0xfa); db(0xf4); db(0x4e);
  db(0x02); db(0x80); db(0x00); db(0x00); db(0xff); db(0xff); db(0xd1); db(0xc0);
  db(0x4e); db(0x75); db(0x20); db(0x88); db(0x58); db(0x90); db(0x42); db(0xa8);
  db(0x00); db(0x04); db(0x21); db(0x48); db(0x00); db(0x08); db(0x4e); db(0x75);
@@ -384,215 +386,231 @@
  db(0x61); db(0x00); db(0xff); db(0xb0); db(0x20); db(0x4a); db(0x20); db(0x08);
  db(0x4c); db(0xdf); db(0x44); db(0x04); db(0x4e); db(0x75); db(0x48); db(0xe7);
  db(0x20); db(0x22); db(0x2c); db(0x78); db(0x00); db(0x04); db(0x4a); db(0x80);
- db(0x67); db(0x20); db(0x24); db(0x40); db(0x74); db(0x30); db(0x20); db(0x02);
- db(0x22); db(0x3c); db(0x00); db(0x01); db(0x00); db(0x01); db(0x4e); db(0xae);
- db(0xff); db(0x3a); db(0x20); db(0x40); db(0x11); db(0x7c); db(0x00); db(0x0a);
- db(0x00); db(0x08); db(0x31); db(0x42); db(0x00); db(0x12); db(0x21); db(0x4a);
- db(0x00); db(0x0e); db(0x4a); db(0x80); db(0x4c); db(0xdf); db(0x44); db(0x04);
- db(0x4e); db(0x75); db(0x48); db(0xe7); db(0x00); db(0x22); db(0x2c); db(0x78);
- db(0x00); db(0x04); db(0x61); db(0x00); db(0xff); db(0x74); db(0x61); db(0x00);
- db(0xff); db(0xbe); db(0x67); db(0x1a); db(0x22); db(0x40); db(0x24); db(0x40);
- db(0x41); db(0xfa); db(0x05); db(0x90); db(0x70); db(0x00); db(0x72); db(0x00);
- db(0x4e); db(0xae); db(0xfe); db(0x44); db(0x22); db(0x00); db(0x70); db(0x00);
- db(0x4a); db(0x81); db(0x66); db(0x02); db(0x20); db(0x0a); db(0x4a); db(0x80);
- db(0x4c); db(0xdf); db(0x44); db(0x00); db(0x4e); db(0x75); db(0x48); db(0xe7);
- db(0x00); db(0x22); db(0x2c); db(0x78); db(0x00); db(0x04); db(0x61); db(0x00);
- db(0xff); db(0x40); db(0x61); db(0x00); db(0xff); db(0x8a); db(0x67); db(0x1a);
- db(0x24); db(0x40); db(0x22); db(0x40); db(0x41); db(0xfa); db(0x05); db(0x69);
- db(0x70); db(0x00); db(0x72); db(0x00); db(0x4e); db(0xae); db(0xfe); db(0x44);
- db(0x22); db(0x00); db(0x70); db(0x00); db(0x4a); db(0x81); db(0x66); db(0x02);
- db(0x20); db(0x0a); db(0x4a); db(0x80); db(0x4c); db(0xdf); db(0x44); db(0x00);
- db(0x4e); db(0x75); db(0x48); db(0xe7); db(0x38); db(0x32); db(0x2c); db(0x78);
- db(0x00); db(0x04); db(0x28); db(0x00); db(0x24); db(0x08); db(0x26); db(0x09);
- db(0x20); db(0x3c); db(0x00); db(0x00); db(0x08); db(0x5c); db(0x22); db(0x3c);
- db(0x00); db(0x01); db(0x00); db(0x01); db(0x4e); db(0xae); db(0xff); db(0x3a);
- db(0x4a); db(0x80); db(0x67); db(0x00); db(0x00); db(0x34); db(0x24); db(0x40);
- db(0x15); db(0x7c); db(0x00); db(0x01); db(0x00); db(0x08); db(0x15); db(0x44);
- db(0x00); db(0x09); db(0x25); db(0x42); db(0x00); db(0x0a); db(0x47); db(0xea);
- db(0x00); db(0x5c); db(0x25); db(0x4b); db(0x00); db(0x3a); db(0x47); db(0xeb);
- db(0x08); db(0x00); db(0x25); db(0x4b); db(0x00); db(0x3e); db(0x25); db(0x4b);
- db(0x00); db(0x36); db(0x22); db(0x4a); db(0x24); db(0x43); db(0x97); db(0xcb);
- db(0x24); db(0x09); db(0x4e); db(0xae); db(0xfe); db(0xe6); db(0x20); db(0x02);
- db(0x4c); db(0xdf); db(0x4c); db(0x1c); db(0x4e); db(0x75); db(0x41); db(0xfa);
- db(0x04); db(0xfc); db(0x43); db(0xfa); db(0x01); db(0x30); db(0x70); db(0x13);
- db(0x61); db(0x00); db(0xff); db(0x98); db(0x4e); db(0x75); db(0x22); db(0x6d);
- db(0x01); db(0x88); db(0x33); db(0x7c); db(0x00); db(0x0a); db(0x00); db(0x1c);
- db(0x13); db(0x7c); db(0x00); db(0x01); db(0x00); db(0x1e); db(0x4e); db(0xae);
- db(0xfe); db(0x38); db(0x22); db(0x6d); db(0x01); db(0x88); db(0x25); db(0x69);
- db(0x00); db(0x20); db(0x00); db(0x0e); db(0x25); db(0x69); db(0x00); db(0x24);
- db(0x00); db(0x12); db(0x22); db(0x6d); db(0x01); db(0x84); db(0x13); db(0x7c);
- db(0x00); db(0x01); db(0x00); db(0x1e); db(0x4e); db(0xae); db(0xfe); db(0x38);
- db(0x4e); db(0x75); db(0x42); db(0xaa); db(0x00); db(0x0e); db(0x42); db(0xaa);
- db(0x00); db(0x12); db(0x22); db(0x6d); db(0x01); db(0x84); db(0x13); db(0x7c);
+ db(0x67); db(0x24); db(0x24); db(0x40); db(0x24); db(0x01); db(0x66); db(0x02);
+ db(0x74); db(0x30); db(0x20); db(0x02); db(0x22); db(0x3c); db(0x00); db(0x01);
+ db(0x00); db(0x01); db(0x4e); db(0xae); db(0xff); db(0x3a); db(0x20); db(0x40);
+ db(0x11); db(0x7c); db(0x00); db(0x0a); db(0x00); db(0x08); db(0x31); db(0x42);
+ db(0x00); db(0x12); db(0x21); db(0x4a); db(0x00); db(0x0e); db(0x4a); db(0x80);
+ db(0x4c); db(0xdf); db(0x44); db(0x04); db(0x4e); db(0x75); db(0x48); db(0xe7);
+ db(0x30); db(0x22); db(0x24); db(0x48); db(0x24); db(0x00); db(0x26); db(0x01);
+ db(0x2c); db(0x78); db(0x00); db(0x04); db(0x61); db(0x00); db(0xff); db(0x6a);
+ db(0x22); db(0x03); db(0x61); db(0x00); db(0xff); db(0xb2); db(0x67); db(0x18);
+ db(0x20); db(0x4a); db(0x22); db(0x40); db(0x24); db(0x40); db(0x20); db(0x02);
+ db(0x72); db(0x00); db(0x4e); db(0xae); db(0xfe); db(0x44); db(0x22); db(0x00);
+ db(0x70); db(0x00); db(0x4a); db(0x81); db(0x66); db(0x02); db(0x20); db(0x0a);
+ db(0x4a); db(0x80); db(0x4c); db(0xdf); db(0x44); db(0x0c); db(0x4e); db(0x75);
+ db(0x48); db(0xe7); db(0x38); db(0x32); db(0x2c); db(0x78); db(0x00); db(0x04);
+ db(0x28); db(0x00); db(0x24); db(0x08); db(0x26); db(0x09); db(0x20); db(0x3c);
+ db(0x00); db(0x00); db(0x08); db(0x5c); db(0x22); db(0x3c); db(0x00); db(0x01);
+ db(0x00); db(0x01); db(0x4e); db(0xae); db(0xff); db(0x3a); db(0x4a); db(0x80);
+ db(0x67); db(0x00); db(0x00); db(0x34); db(0x24); db(0x40); db(0x15); db(0x7c);
+ db(0x00); db(0x01); db(0x00); db(0x08); db(0x15); db(0x44); db(0x00); db(0x09);
+ db(0x25); db(0x42); db(0x00); db(0x0a); db(0x47); db(0xea); db(0x00); db(0x5c);
+ db(0x25); db(0x4b); db(0x00); db(0x3a); db(0x47); db(0xeb); db(0x08); db(0x00);
+ db(0x25); db(0x4b); db(0x00); db(0x3e); db(0x25); db(0x4b); db(0x00); db(0x36);
+ db(0x22); db(0x4a); db(0x24); db(0x43); db(0x97); db(0xcb); db(0x24); db(0x09);
+ db(0x4e); db(0xae); db(0xfe); db(0xe6); db(0x20); db(0x02); db(0x4c); db(0xdf);
+ db(0x4c); db(0x1c); db(0x4e); db(0x75); db(0x41); db(0xfa); db(0x05); db(0xab);
+ db(0x43); db(0xfa); db(0x01); db(0x30); db(0x70); db(0x13); db(0x61); db(0x00);
+ db(0xff); db(0x98); db(0x4e); db(0x75); db(0x22); db(0x6d); db(0x01); db(0x9e);
+ db(0x33); db(0x7c); db(0x00); db(0x0a); db(0x00); db(0x1c); db(0x13); db(0x7c);
  db(0x00); db(0x01); db(0x00); db(0x1e); db(0x4e); db(0xae); db(0xfe); db(0x38);
- db(0x4e); db(0x75); db(0x00); db(0x00); db(0xff); db(0xff); db(0x00); db(0x00);
+ db(0x22); db(0x6d); db(0x01); db(0x9e); db(0x25); db(0x69); db(0x00); db(0x20);
+ db(0x00); db(0x0e); db(0x25); db(0x69); db(0x00); db(0x24); db(0x00); db(0x12);
+ db(0x22); db(0x6d); db(0x01); db(0x9a); db(0x13); db(0x7c); db(0x00); db(0x01);
+ db(0x00); db(0x1e); db(0x4e); db(0xae); db(0xfe); db(0x38); db(0x4e); db(0x75);
+ db(0x42); db(0xaa); db(0x00); db(0x0e); db(0x42); db(0xaa); db(0x00); db(0x12);
+ db(0x22); db(0x6d); db(0x01); db(0x9a); db(0x13); db(0x7c); db(0x00); db(0x01);
+ db(0x00); db(0x1e); db(0x4e); db(0xae); db(0xfe); db(0x38); db(0x4e); db(0x75);
+ db(0x00); db(0x00); db(0xff); db(0xff); db(0x00); db(0x00); db(0x00); db(0x00);
  db(0x00); db(0x00); db(0x00); db(0x00); db(0x00); db(0x00); db(0x00); db(0x00);
  db(0x00); db(0x00); db(0x00); db(0x00); db(0x00); db(0x00); db(0x00); db(0x00);
  db(0x00); db(0x00); db(0x00); db(0x00); db(0x00); db(0x00); db(0x00); db(0x00);
  db(0x00); db(0x00); db(0x00); db(0x00); db(0x00); db(0x00); db(0x00); db(0x00);
- db(0x00); db(0x00); db(0x00); db(0x00); db(0x00); db(0x00); db(0x48); db(0xe7);
- db(0xf0); db(0xfe); db(0x2a); db(0x48); db(0x95); db(0xca); db(0x97); db(0xcb);
- db(0x99); db(0xcc); db(0x2c); db(0x6d); db(0x00); db(0x18); db(0x20); db(0x6d);
- db(0x00); db(0x14); db(0x20); db(0x28); db(0x00); db(0x3c); db(0x67); db(0x40);
- db(0x20); db(0x40); db(0x41); db(0xe8); db(0x00); db(0x2c); db(0x28); db(0x48);
- db(0x4e); db(0xae); db(0xfc); db(0xe8); db(0x72); db(0xff); db(0xb2); db(0x80);
- db(0x67); db(0x2e); db(0x26); db(0x00); db(0x91); db(0xc8); db(0x43); db(0xed);
- db(0x00); db(0x30); db(0x70); db(0x00); db(0x30); db(0x3c); db(0x00); db(0x58);
- db(0x22); db(0x3c); db(0x80); db(0x00); db(0x10); db(0x00); db(0x24); db(0x03);
- db(0x4e); db(0xae); db(0xfd); db(0x0c); db(0x72); db(0xff); db(0x74); db(0xff);
- db(0x4a); db(0x80); db(0x6b); db(0x0c); db(0x45); db(0xed); db(0x00); db(0x30);
- db(0x22); db(0x2a); db(0x00); db(0x32); db(0x24); db(0x2a); db(0x00); db(0x36);
- db(0x20); db(0x2c); db(0x00); db(0x1c); db(0xb0); db(0xad); db(0x00); db(0x28);
- db(0x66); db(0x0c); db(0xb2); db(0xad); db(0x00); db(0x20); db(0x66); db(0x06);
- db(0xb4); db(0xad); db(0x00); db(0x24); db(0x67); db(0x38); db(0x2b); db(0x40);
- db(0x00); db(0x28); db(0x2b); db(0x41); db(0x00); db(0x20); db(0x2b); db(0x42);
- db(0x00); db(0x24); db(0x91); db(0xc8); db(0x43); db(0xed); db(0x00); db(0x88);
+ db(0x00); db(0x00); db(0x00); db(0x00); db(0x48); db(0xe7); db(0xf0); db(0xfe);
+ db(0x2a); db(0x48); db(0x95); db(0xca); db(0x97); db(0xcb); db(0x99); db(0xcc);
+ db(0x2c); db(0x6d); db(0x00); db(0x18); db(0x20); db(0x6d); db(0x00); db(0x14);
+ db(0x20); db(0x28); db(0x00); db(0x3c); db(0x67); db(0x40); db(0x20); db(0x40);
+ db(0x41); db(0xe8); db(0x00); db(0x2c); db(0x28); db(0x48); db(0x4e); db(0xae);
+ db(0xfc); db(0xe8); db(0x72); db(0xff); db(0xb2); db(0x80); db(0x67); db(0x2e);
+ db(0x26); db(0x00); db(0x91); db(0xc8); db(0x43); db(0xed); db(0x00); db(0x30);
  db(0x70); db(0x00); db(0x30); db(0x3c); db(0x00); db(0x58); db(0x22); db(0x3c);
- db(0x80); db(0x00); db(0x00); db(0x00); db(0x24); db(0x03); db(0x4e); db(0xae);
- db(0xfd); db(0x0c); db(0x4a); db(0x80); db(0x6b); db(0x04); db(0x47); db(0xed);
- db(0x00); db(0x88); db(0x30); db(0x3c); db(0xff); db(0x38); db(0x72); db(0x01);
- db(0x61); db(0x00); db(0xfd); db(0x72); db(0x4e); db(0x90); db(0x4c); db(0xdf);
- db(0x7f); db(0x0f); db(0x4e); db(0x75); db(0x2c); db(0x78); db(0x00); db(0x04);
- db(0x3e); db(0x2e); db(0x00); db(0x14); db(0x70); db(0xff); db(0x4e); db(0xae);
- db(0xfe); db(0xb6); db(0x7c); db(0x00); db(0x01); db(0xc6); db(0x93); db(0xc9);
- db(0x4e); db(0xae); db(0xfe); db(0xda); db(0x28); db(0x40); db(0x70); db(0x14);
- db(0x22); db(0x4c); db(0x4e); db(0xae); db(0xfe); db(0xd4); db(0x70); db(0x00);
- db(0x30); db(0x3c); db(0x01); db(0x8c); db(0x22); db(0x3c); db(0x00); db(0x01);
- db(0x00); db(0x01); db(0x4e); db(0xae); db(0xff); db(0x3a); db(0x2a); db(0x40);
- db(0x47); db(0xed); db(0x00); db(0x16); db(0x27); db(0x4e); db(0x00); db(0x10);
- db(0x27); db(0x4c); db(0x00); db(0x08); db(0x27); db(0x46); db(0x00); db(0x0c);
- db(0x70); db(0xff); db(0x37); db(0x40); db(0x00); db(0x00); db(0x43); db(0xed);
- db(0x00); db(0x00); db(0x13); db(0x7c); db(0x00); db(0x02); db(0x00); db(0x08);
- db(0x13); db(0x7c); db(0x00); db(0x05); db(0x00); db(0x09); db(0x41); db(0xfa);
- db(0x03); db(0x6c); db(0x23); db(0x48); db(0x00); db(0x0a); db(0x41); db(0xfa);
- db(0x02); db(0xfe); db(0x23); db(0x48); db(0x00); db(0x12); db(0x23); db(0x4d);
- db(0x00); db(0x0e); db(0x70); db(0x05); db(0x4e); db(0xae); db(0xff); db(0x58);
- db(0x20); db(0x06); db(0x4e); db(0xae); db(0xfe); db(0xc2); db(0x70); db(0x00);
- db(0x53); db(0xab); db(0x00); db(0x1c); db(0x6a); db(0x06); db(0x70); db(0x0a);
- db(0x27); db(0x40); db(0x00); db(0x1c); db(0x4a); db(0xab); db(0x00); db(0x14);
- db(0x66); db(0x18); db(0x4a); db(0xab); db(0x00); db(0x1c); db(0x66); db(0xe0);
- db(0x43); db(0xfa); db(0x03); db(0x8b); db(0x70); db(0x00); db(0x4e); db(0xae);
- db(0xfd); db(0xd8); db(0x27); db(0x40); db(0x00); db(0x14); db(0x67); db(0x00);
- db(0xff); db(0xd0); db(0x4a); db(0xab); db(0x00); db(0x18); db(0x66); db(0x18);
- db(0x4a); db(0xab); db(0x00); db(0x1c); db(0x66); db(0xc2); db(0x43); db(0xfa);
- db(0x03); db(0x7f); db(0x70); db(0x00); db(0x4e); db(0xae); db(0xfd); db(0xd8);
- db(0x27); db(0x40); db(0x00); db(0x18); db(0x67); db(0x00); db(0xff); db(0xb2);
- db(0x4a); db(0xad); db(0x01); db(0x84); db(0x66); db(0x30); db(0x4a); db(0xab);
- db(0x00); db(0x1c); db(0x66); db(0xa4); db(0x4e); db(0xae); db(0xff); db(0x7c);
- db(0x41); db(0xee); db(0x01); db(0x5e); db(0x43); db(0xfa); db(0x02); db(0xd4);
- db(0x4e); db(0xae); db(0xfe); db(0xec); db(0x24); db(0x00); db(0x4e); db(0xae);
- db(0xff); db(0x76); db(0x4a); db(0x82); db(0x67); db(0x8a); db(0x61); db(0x00);
- db(0xfd); db(0x1a); db(0x2b); db(0x40); db(0x01); db(0x84); db(0x67); db(0x00);
- db(0x02); db(0x6c); db(0x60); db(0x00); db(0xff); db(0x7c); db(0x4a); db(0xad);
- db(0x01); db(0x88); db(0x66); db(0x40); db(0x4a); db(0xab); db(0x00); db(0x1c);
- db(0x66); db(0x00); db(0xff); db(0x6e); db(0x4e); db(0xae); db(0xff); db(0x7c);
- db(0x41); db(0xee); db(0x01); db(0x5e); db(0x43); db(0xfa); db(0x02); db(0xa9);
- db(0x4e); db(0xae); db(0xfe); db(0xec); db(0x24); db(0x00); db(0x4e); db(0xae);
- db(0xff); db(0x76); db(0x4a); db(0x82); db(0x67); db(0x00); db(0xff); db(0x52);
- db(0x61); db(0x00); db(0xfd); db(0x14); db(0x2b); db(0x40); db(0x01); db(0x88);
- db(0x67); db(0x00); db(0x02); db(0x32); db(0x30); db(0x3c); db(0xff); db(0x38);
- db(0x72); db(0x00); db(0x61); db(0x00); db(0xfc); db(0x30); db(0x4e); db(0x90);
- db(0x60); db(0x00); db(0xff); db(0x36); db(0x0c); db(0x47); db(0x00); db(0x24);
- db(0x65); db(0x06); db(0x20); db(0x4b); db(0x61); db(0x00); db(0xfe); db(0x08);
- db(0x22); db(0x6d); db(0x01); db(0x84); db(0x45); db(0xed); db(0x00); db(0xce);
- db(0x33); db(0x7c); db(0x00); db(0x0b); db(0x00); db(0x1c); db(0x23); db(0x7c);
- db(0x00); db(0x00); db(0x00); db(0x16); db(0x00); db(0x24); db(0x23); db(0x4a);
- db(0x00); db(0x28); db(0x10); db(0x3a); db(0xfd); db(0xbe); db(0x6a); db(0x08);
- db(0x0c); db(0x47); db(0x00); db(0x24); db(0x65); db(0x00); db(0x01); db(0xaa);
- db(0x15); db(0x7c); db(0x00); db(0x13); db(0x00); db(0x04); db(0x42); db(0x6a);
- db(0x00); db(0x06); db(0x22); db(0x3a); db(0xfd); db(0xc8); db(0x02); db(0x41);
- db(0x00); db(0x07); db(0x70); db(0x07); db(0x90); db(0x41); db(0xe1); db(0x48);
- db(0xe9); db(0x48); db(0x35); db(0x40); db(0x00); db(0x08); db(0x41); db(0xed);
- db(0x00); db(0xe4); db(0x25); db(0x48); db(0x00); db(0x0a); db(0x10); db(0x3a);
- db(0xfd); db(0x8a); db(0x6b); db(0x00); db(0x00); db(0xf2); db(0x0c); db(0x47);
- db(0x00); db(0x27); db(0x65); db(0x00); db(0x00); db(0xee); db(0x15); db(0x7c);
- db(0x00); db(0x03); db(0x00); db(0x05); db(0x42); db(0x90); db(0x42); db(0xa8);
- db(0x00); db(0x04); db(0x42); db(0xa8); db(0x00); db(0x08); db(0x42); db(0x68);
- db(0x00); db(0x0c); db(0x31); db(0x7a); db(0xfd); db(0x70); db(0x00); db(0x0e);
- db(0x42); db(0x68); db(0x00); db(0x10); db(0x31); db(0x7a); db(0xfd); db(0x68);
- db(0x00); db(0x12); db(0x42); db(0x68); db(0x00); db(0x14); db(0x31); db(0x7a);
- db(0xfd); db(0x56); db(0x00); db(0x16); db(0x42); db(0x68); db(0x00); db(0x18);
- db(0x31); db(0x7a); db(0xfd); db(0x4e); db(0x00); db(0x1a); db(0x43); db(0xed);
- db(0x01); db(0x04); db(0x21); db(0x49); db(0x00); db(0x1c); db(0x22); db(0xfc);
- db(0x80); db(0x03); db(0xa0); db(0x06); db(0x30); db(0x3a); db(0xfd); db(0x54);
- db(0x48); db(0xc0); db(0xe1); db(0x80); db(0x22); db(0xc0); db(0x22); db(0xfc);
- db(0x80); db(0x03); db(0xa0); db(0x07); db(0x22); db(0xfa); db(0xfd); db(0x46);
- db(0x70); db(0x00); db(0x30); db(0x3a); db(0xfd); db(0x2e); db(0x6b); db(0x08);
- db(0x22); db(0xfc); db(0x80); db(0x03); db(0xa0); db(0x09); db(0x22); db(0xc0);
- db(0x30); db(0x3a); db(0xfd); db(0x22); db(0x6b); db(0x08); db(0x22); db(0xfc);
- db(0x80); db(0x03); db(0xa0); db(0x0a); db(0x22); db(0xc0); db(0x30); db(0x3a);
- db(0xfd); db(0x0a); db(0x6b); db(0x14); db(0x22); db(0xfc); db(0x80); db(0x03);
- db(0xa0); db(0x02); db(0x22); db(0xc0); db(0x30); db(0x3a); db(0xfd); db(0x02);
- db(0x22); db(0xfc); db(0x80); db(0x03); db(0xa0); db(0x01); db(0x22); db(0xc0);
- db(0x30); db(0x3a); db(0xfc); db(0xfc); db(0x6b); db(0x10); db(0x22); db(0xfc);
- db(0x80); db(0x03); db(0xa0); db(0x03); db(0x30); db(0x3a); db(0xfc); db(0xf6);
- db(0x48); db(0xc0); db(0xe1); db(0x80); db(0x22); db(0xc0); db(0x30); db(0x3a);
- db(0xfc); db(0xe8); db(0x6b); db(0x10); db(0x22); db(0xfc); db(0x80); db(0x03);
- db(0xa0); db(0x04); db(0x30); db(0x3a); db(0xfc); db(0xe2); db(0x48); db(0xc0);
- db(0xe1); db(0x80); db(0x22); db(0xc0); db(0x30); db(0x3a); db(0xfc); db(0xd4);
- db(0x6b); db(0x10); db(0x22); db(0xfc); db(0x80); db(0x03); db(0xa0); db(0x05);
- db(0x30); db(0x3a); db(0xfc); db(0xce); db(0x48); db(0xc0); db(0xe1); db(0x80);
- db(0x22); db(0xc0); db(0x70); db(0x00); db(0x30); db(0x3a); db(0xfc); db(0xca);
- db(0x6b); db(0x08); db(0x22); db(0xfc); db(0x80); db(0x03); db(0xa0); db(0x08);
- db(0x22); db(0xc0); db(0x42); db(0x91); db(0x60); db(0x32); db(0x42); db(0x6a);
- db(0x00); db(0x08); db(0x0c); db(0x47); db(0x00); db(0x24); db(0x65); db(0x00);
- db(0xfd); db(0xd8); db(0x15); db(0x7c); db(0x00); db(0x02); db(0x00); db(0x05);
- db(0x30); db(0xba); db(0xfc); db(0x84); db(0x31); db(0x7a); db(0xfc); db(0x82);
- db(0x00); db(0x02); db(0x31); db(0x7a); db(0xfc); db(0x80); db(0x00); db(0x04);
- db(0x31); db(0x7a); db(0xfc); db(0x7c); db(0x00); db(0x06); db(0x30); db(0x3a);
- db(0xfc); db(0x8a); db(0xe0); db(0x40); db(0x31); db(0x40); db(0x00); db(0x08);
- db(0x61); db(0x00); db(0xfc); db(0x48); db(0x10); db(0x3a); db(0xfc); db(0x5c);
- db(0x6b); db(0x00); db(0xfd); db(0xa6); db(0x36); db(0x3c); db(0x00); db(0x68);
- db(0x74); db(0x01); db(0x28); db(0x3a); db(0xfc); db(0x70); db(0x20); db(0x04);
- db(0xc0); db(0x82); db(0x22); db(0x2b); db(0x00); db(0x04); db(0xc2); db(0x82);
- db(0xb2); db(0x80); db(0x67); db(0x22); db(0x42); db(0x92); db(0x35); db(0x7c);
- db(0x02); db(0x00); db(0x00); db(0x04); db(0x42); db(0xaa); db(0x00); db(0x0a);
- db(0x32); db(0x03); db(0x4a); db(0x00); db(0x66); db(0x04); db(0x08); db(0xc1);
- db(0x00); db(0x07); db(0x35); db(0x41); db(0x00); db(0x06); db(0x42); db(0x6a);
- db(0x00); db(0x08); db(0x61); db(0x00); db(0xfc); db(0x06); db(0x52); db(0x43);
- db(0xd4); db(0x42); db(0x0c); db(0x42); db(0x00); db(0x08); db(0x66); db(0xc6);
- db(0x27); db(0x44); db(0x00); db(0x04); db(0x60); db(0x00); db(0xfd); db(0x5a);
- db(0x42); db(0x92); db(0x35); db(0x7c); db(0x04); db(0x00); db(0x00); db(0x04);
- db(0x42); db(0x6a); db(0x00); db(0x06); db(0x42); db(0x6a); db(0x00); db(0x08);
- db(0x20); db(0x6b); db(0x00); db(0x14); db(0x30); db(0x3a); db(0xfc); db(0x1c);
- db(0x32); db(0x28); db(0x00); db(0x30); db(0xd2); db(0x41); db(0x90); db(0x41);
- db(0x6a); db(0x02); db(0x70); db(0x00); db(0x35); db(0x40); db(0x00); db(0x0a);
- db(0x30); db(0x3a); db(0xfc); db(0x0a); db(0x32); db(0x28); db(0x00); db(0x2e);
- db(0xd2); db(0x41); db(0x90); db(0x41); db(0x6a); db(0x02); db(0x70); db(0x00);
- db(0x35); db(0x40); db(0x00); db(0x0c); db(0x61); db(0x00); db(0xfb); db(0x80);
- db(0x60); db(0x00); db(0xfd); db(0x16); db(0x4e); db(0x75); db(0x4a); db(0xa9);
- db(0x01); db(0x84); db(0x67); db(0x14); db(0x4a); db(0xa9); db(0x01); db(0x88);
- db(0x67); db(0x0e); db(0x30); db(0x3a); db(0xfb); db(0xb8); db(0xb0); db(0x69);
- db(0x00); db(0x16); db(0x67); db(0x14); db(0x33); db(0x40); db(0x00); db(0x16);
- db(0x2c); db(0x69); db(0x00); db(0x26); db(0x20); db(0x29); db(0x00); db(0x22);
- db(0x22); db(0x69); db(0x00); db(0x1e); db(0x4e); db(0xae); db(0xfe); db(0xbc);
- db(0x53); db(0x69); db(0x00); db(0x42); db(0x6a); db(0x12); db(0x33); db(0x7c);
- db(0x00); db(0x32); db(0x00); db(0x42); db(0x30); db(0x3c); db(0xff); db(0x38);
- db(0x72); db(0x02); db(0x61); db(0x00); db(0xf9); db(0xc8); db(0x4e); db(0x90);
- db(0x41); db(0xf9); db(0x00); db(0xdf); db(0xf0); db(0x00); db(0x70); db(0x00);
- db(0x4e); db(0x75); db(0x69); db(0x6e); db(0x70); db(0x75); db(0x74); db(0x2e);
- db(0x64); db(0x65); db(0x76); db(0x69); db(0x63); db(0x65); db(0x00); db(0x74);
- db(0x69); db(0x6d); db(0x65); db(0x72); db(0x2e); db(0x64); db(0x65); db(0x76);
- db(0x69); db(0x63); db(0x65); db(0x00); db(0x55); db(0x41); db(0x45); db(0x20);
- db(0x74); db(0x61); db(0x62); db(0x6c); db(0x65); db(0x74); db(0x20); db(0x64);
- db(0x72); db(0x69); db(0x76); db(0x65); db(0x72); db(0x00); db(0x55); db(0x41);
- db(0x45); db(0x20); db(0x66); db(0x69); db(0x6c); db(0x65); db(0x73); db(0x79);
- db(0x73); db(0x74); db(0x65); db(0x6d); db(0x00); db(0x55); db(0x41); db(0x45);
- db(0x20); db(0x66); db(0x73); db(0x20); db(0x61); db(0x75); db(0x74); db(0x6f);
- db(0x6d); db(0x6f); db(0x75); db(0x6e); db(0x74); db(0x65); db(0x72); db(0x00);
- db(0x55); db(0x41); db(0x45); db(0x20); db(0x66); db(0x73); db(0x20); db(0x61);
- db(0x75); db(0x74); db(0x6f); db(0x6d); db(0x6f); db(0x75); db(0x6e); db(0x74);
- db(0x20); db(0x70); db(0x72); db(0x6f); db(0x63); db(0x65); db(0x73); db(0x73);
- db(0x00); db(0x64); db(0x6f); db(0x73); db(0x2e); db(0x6c); db(0x69); db(0x62);
- db(0x72); db(0x61); db(0x72); db(0x79); db(0x00); db(0x69); db(0x6e); db(0x74);
- db(0x75); db(0x69); db(0x74); db(0x69); db(0x6f); db(0x6e); db(0x2e); db(0x6c);
- db(0x69); db(0x62); db(0x72); db(0x61); db(0x72); db(0x79); db(0x00); db(0x67);
- db(0x72); db(0x61); db(0x70); db(0x68); db(0x69); db(0x63); db(0x73); db(0x2e);
- db(0x6c); db(0x69); db(0x62); db(0x72); db(0x61); db(0x72); db(0x79); db(0x00);
- db(0x65); db(0x78); db(0x70); db(0x61); db(0x6e); db(0x73); db(0x69); db(0x6f);
- db(0x6e); db(0x2e); db(0x6c); db(0x69); db(0x62); db(0x72); db(0x61); db(0x72);
- db(0x79); db(0x00); db(0x46); db(0x69); db(0x6c); db(0x65); db(0x53); db(0x79);
- db(0x73); db(0x74); db(0x65); db(0x6d); db(0x2e); db(0x72); db(0x65); db(0x73);
- db(0x6f); db(0x75); db(0x72); db(0x63); db(0x65); db(0x00); db(0x00); db(0x00);
- db(0x00); db(0x00); db(0x03); db(0xf2);
+ db(0x80); db(0x00); db(0x10); db(0x00); db(0x24); db(0x03); db(0x4e); db(0xae);
+ db(0xfd); db(0x0c); db(0x72); db(0xff); db(0x74); db(0xff); db(0x4a); db(0x80);
+ db(0x6b); db(0x0c); db(0x45); db(0xed); db(0x00); db(0x30); db(0x22); db(0x2a);
+ db(0x00); db(0x32); db(0x24); db(0x2a); db(0x00); db(0x36); db(0x20); db(0x2c);
+ db(0x00); db(0x1c); db(0xb0); db(0xad); db(0x00); db(0x28); db(0x66); db(0x0c);
+ db(0xb2); db(0xad); db(0x00); db(0x20); db(0x66); db(0x06); db(0xb4); db(0xad);
+ db(0x00); db(0x24); db(0x67); db(0x38); db(0x2b); db(0x40); db(0x00); db(0x28);
+ db(0x2b); db(0x41); db(0x00); db(0x20); db(0x2b); db(0x42); db(0x00); db(0x24);
+ db(0x91); db(0xc8); db(0x43); db(0xed); db(0x00); db(0x88); db(0x70); db(0x00);
+ db(0x30); db(0x3c); db(0x00); db(0x58); db(0x22); db(0x3c); db(0x80); db(0x00);
+ db(0x00); db(0x00); db(0x24); db(0x03); db(0x4e); db(0xae); db(0xfd); db(0x0c);
+ db(0x4a); db(0x80); db(0x6b); db(0x04); db(0x47); db(0xed); db(0x00); db(0x88);
+ db(0x30); db(0x3c); db(0xff); db(0x38); db(0x72); db(0x01); db(0x61); db(0x00);
+ db(0xfd); db(0x9c); db(0x4e); db(0x90); db(0x4c); db(0xdf); db(0x7f); db(0x0f);
+ db(0x4e); db(0x75); db(0x2c); db(0x78); db(0x00); db(0x04); db(0x3e); db(0x2e);
+ db(0x00); db(0x14); db(0x70); db(0xff); db(0x4e); db(0xae); db(0xfe); db(0xb6);
+ db(0x7c); db(0x00); db(0x01); db(0xc6); db(0x93); db(0xc9); db(0x4e); db(0xae);
+ db(0xfe); db(0xda); db(0x28); db(0x40); db(0x70); db(0x14); db(0x22); db(0x4c);
+ db(0x4e); db(0xae); db(0xfe); db(0xd4); db(0x70); db(0x00); db(0x30); db(0x3c);
+ db(0x01); db(0xa2); db(0x22); db(0x3c); db(0x00); db(0x01); db(0x00); db(0x01);
+ db(0x4e); db(0xae); db(0xff); db(0x3a); db(0x2a); db(0x40); db(0x47); db(0xed);
+ db(0x00); db(0x16); db(0x27); db(0x4e); db(0x00); db(0x10); db(0x27); db(0x4c);
+ db(0x00); db(0x08); db(0x27); db(0x46); db(0x00); db(0x0c); db(0x70); db(0xff);
+ db(0x37); db(0x40); db(0x00); db(0x00); db(0x43); db(0xed); db(0x00); db(0x00);
+ db(0x13); db(0x7c); db(0x00); db(0x02); db(0x00); db(0x08); db(0x13); db(0x7c);
+ db(0x00); db(0x05); db(0x00); db(0x09); db(0x41); db(0xfa); db(0x04); db(0x1b);
+ db(0x23); db(0x48); db(0x00); db(0x0a); db(0x41); db(0xfa); db(0x03); db(0x0e);
+ db(0x23); db(0x48); db(0x00); db(0x12); db(0x23); db(0x4d); db(0x00); db(0x0e);
+ db(0x70); db(0x05); db(0x4e); db(0xae); db(0xff); db(0x58); db(0x20); db(0x06);
+ db(0x4e); db(0xae); db(0xfe); db(0xc2); db(0x70); db(0x00); db(0x53); db(0xab);
+ db(0x00); db(0x1c); db(0x6a); db(0x06); db(0x70); db(0x0a); db(0x27); db(0x40);
+ db(0x00); db(0x1c); db(0x4a); db(0xab); db(0x00); db(0x14); db(0x66); db(0x18);
+ db(0x4a); db(0xab); db(0x00); db(0x1c); db(0x66); db(0xe0); db(0x43); db(0xfa);
+ db(0x04); db(0x39); db(0x70); db(0x00); db(0x4e); db(0xae); db(0xfd); db(0xd8);
+ db(0x27); db(0x40); db(0x00); db(0x14); db(0x67); db(0x00); db(0xff); db(0xd0);
+ db(0x4a); db(0xab); db(0x00); db(0x18); db(0x66); db(0x18); db(0x4a); db(0xab);
+ db(0x00); db(0x1c); db(0x66); db(0xc2); db(0x43); db(0xfa); db(0x04); db(0x2d);
+ db(0x70); db(0x00); db(0x4e); db(0xae); db(0xfd); db(0xd8); db(0x27); db(0x40);
+ db(0x00); db(0x18); db(0x67); db(0x00); db(0xff); db(0xb2); db(0x4a); db(0xad);
+ db(0x01); db(0x9a); db(0x66); db(0x38); db(0x4a); db(0xab); db(0x00); db(0x1c);
+ db(0x66); db(0xa4); db(0x4e); db(0xae); db(0xff); db(0x7c); db(0x41); db(0xee);
+ db(0x01); db(0x5e); db(0x43); db(0xfa); db(0x03); db(0x72); db(0x4e); db(0xae);
+ db(0xfe); db(0xec); db(0x24); db(0x00); db(0x4e); db(0xae); db(0xff); db(0x76);
+ db(0x4a); db(0x82); db(0x67); db(0x8a); db(0x41); db(0xfa); db(0x03); db(0x60);
+ db(0x70); db(0x00); db(0x72); db(0x00); db(0x61); db(0x00); db(0xfd); db(0x40);
+ db(0x2b); db(0x40); db(0x01); db(0x9a); db(0x67); db(0x00); db(0x02); db(0x74);
+ db(0x60); db(0x00); db(0xff); db(0x74); db(0x4a); db(0xad); db(0x01); db(0x9e);
+ db(0x66); db(0x48); db(0x4a); db(0xab); db(0x00); db(0x1c); db(0x66); db(0x00);
+ db(0xff); db(0x66); db(0x4e); db(0xae); db(0xff); db(0x7c); db(0x41); db(0xee);
+ db(0x01); db(0x5e); db(0x43); db(0xfa); db(0x03); db(0x3f); db(0x4e); db(0xae);
+ db(0xfe); db(0xec); db(0x24); db(0x00); db(0x4e); db(0xae); db(0xff); db(0x76);
+ db(0x4a); db(0x82); db(0x67); db(0x00); db(0xff); db(0x4a); db(0x41); db(0xfa);
+ db(0x03); db(0x2b); db(0x70); db(0x00); db(0x72); db(0x00); db(0x61); db(0x00);
+ db(0xfc); db(0xfe); db(0x2b); db(0x40); db(0x01); db(0x9e); db(0x67); db(0x00);
+ db(0x02); db(0x32); db(0x30); db(0x3c); db(0xff); db(0x38); db(0x72); db(0x00);
+ db(0x61); db(0x00); db(0xfc); db(0x4a); db(0x4e); db(0x90); db(0x60); db(0x00);
+ db(0xff); db(0x26); db(0x0c); db(0x47); db(0x00); db(0x24); db(0x65); db(0x06);
+ db(0x20); db(0x4b); db(0x61); db(0x00); db(0xfd); db(0xf8); db(0x22); db(0x6d);
+ db(0x01); db(0x9a); db(0x45); db(0xed); db(0x00); db(0xce); db(0x33); db(0x7c);
+ db(0x00); db(0x0b); db(0x00); db(0x1c); db(0x23); db(0x7c); db(0x00); db(0x00);
+ db(0x00); db(0x16); db(0x00); db(0x24); db(0x23); db(0x4a); db(0x00); db(0x28);
+ db(0x10); db(0x3a); db(0xfd); db(0xae); db(0x6a); db(0x08); db(0x0c); db(0x47);
+ db(0x00); db(0x24); db(0x65); db(0x00); db(0x01); db(0xaa); db(0x15); db(0x7c);
+ db(0x00); db(0x13); db(0x00); db(0x04); db(0x42); db(0x6a); db(0x00); db(0x06);
+ db(0x22); db(0x3a); db(0xfd); db(0xb8); db(0x02); db(0x41); db(0x00); db(0x07);
+ db(0x70); db(0x07); db(0x90); db(0x41); db(0xe1); db(0x48); db(0xe9); db(0x48);
+ db(0x35); db(0x40); db(0x00); db(0x08); db(0x41); db(0xed); db(0x00); db(0xfa);
+ db(0x25); db(0x48); db(0x00); db(0x0a); db(0x10); db(0x3a); db(0xfd); db(0x7a);
+ db(0x6b); db(0x00); db(0x00); db(0xf2); db(0x0c); db(0x47); db(0x00); db(0x27);
+ db(0x65); db(0x00); db(0x00); db(0xee); db(0x15); db(0x7c); db(0x00); db(0x03);
+ db(0x00); db(0x05); db(0x42); db(0x90); db(0x42); db(0xa8); db(0x00); db(0x04);
+ db(0x42); db(0xa8); db(0x00); db(0x08); db(0x42); db(0x68); db(0x00); db(0x0c);
+ db(0x31); db(0x7a); db(0xfd); db(0x60); db(0x00); db(0x0e); db(0x42); db(0x68);
+ db(0x00); db(0x10); db(0x31); db(0x7a); db(0xfd); db(0x58); db(0x00); db(0x12);
+ db(0x42); db(0x68); db(0x00); db(0x14); db(0x31); db(0x7a); db(0xfd); db(0x46);
+ db(0x00); db(0x16); db(0x42); db(0x68); db(0x00); db(0x18); db(0x31); db(0x7a);
+ db(0xfd); db(0x3e); db(0x00); db(0x1a); db(0x43); db(0xed); db(0x01); db(0x1a);
+ db(0x21); db(0x49); db(0x00); db(0x1c); db(0x22); db(0xfc); db(0x80); db(0x03);
+ db(0xa0); db(0x06); db(0x30); db(0x3a); db(0xfd); db(0x44); db(0x48); db(0xc0);
+ db(0xe1); db(0x80); db(0x22); db(0xc0); db(0x22); db(0xfc); db(0x80); db(0x03);
+ db(0xa0); db(0x07); db(0x22); db(0xfa); db(0xfd); db(0x36); db(0x70); db(0x00);
+ db(0x30); db(0x3a); db(0xfd); db(0x1e); db(0x6b); db(0x08); db(0x22); db(0xfc);
+ db(0x80); db(0x03); db(0xa0); db(0x09); db(0x22); db(0xc0); db(0x30); db(0x3a);
+ db(0xfd); db(0x12); db(0x6b); db(0x08); db(0x22); db(0xfc); db(0x80); db(0x03);
+ db(0xa0); db(0x0a); db(0x22); db(0xc0); db(0x30); db(0x3a); db(0xfc); db(0xfa);
+ db(0x6b); db(0x14); db(0x22); db(0xfc); db(0x80); db(0x03); db(0xa0); db(0x02);
+ db(0x22); db(0xc0); db(0x30); db(0x3a); db(0xfc); db(0xf2); db(0x22); db(0xfc);
+ db(0x80); db(0x03); db(0xa0); db(0x01); db(0x22); db(0xc0); db(0x30); db(0x3a);
+ db(0xfc); db(0xec); db(0x6b); db(0x10); db(0x22); db(0xfc); db(0x80); db(0x03);
+ db(0xa0); db(0x03); db(0x30); db(0x3a); db(0xfc); db(0xe6); db(0x48); db(0xc0);
+ db(0xe1); db(0x80); db(0x22); db(0xc0); db(0x30); db(0x3a); db(0xfc); db(0xd8);
+ db(0x6b); db(0x10); db(0x22); db(0xfc); db(0x80); db(0x03); db(0xa0); db(0x04);
+ db(0x30); db(0x3a); db(0xfc); db(0xd2); db(0x48); db(0xc0); db(0xe1); db(0x80);
+ db(0x22); db(0xc0); db(0x30); db(0x3a); db(0xfc); db(0xc4); db(0x6b); db(0x10);
+ db(0x22); db(0xfc); db(0x80); db(0x03); db(0xa0); db(0x05); db(0x30); db(0x3a);
+ db(0xfc); db(0xbe); db(0x48); db(0xc0); db(0xe1); db(0x80); db(0x22); db(0xc0);
+ db(0x70); db(0x00); db(0x30); db(0x3a); db(0xfc); db(0xba); db(0x6b); db(0x08);
+ db(0x22); db(0xfc); db(0x80); db(0x03); db(0xa0); db(0x08); db(0x22); db(0xc0);
+ db(0x42); db(0x91); db(0x60); db(0x32); db(0x42); db(0x6a); db(0x00); db(0x08);
+ db(0x0c); db(0x47); db(0x00); db(0x24); db(0x65); db(0x00); db(0xfd); db(0xc8);
+ db(0x15); db(0x7c); db(0x00); db(0x02); db(0x00); db(0x05); db(0x30); db(0xba);
+ db(0xfc); db(0x74); db(0x31); db(0x7a); db(0xfc); db(0x72); db(0x00); db(0x02);
+ db(0x31); db(0x7a); db(0xfc); db(0x70); db(0x00); db(0x04); db(0x31); db(0x7a);
+ db(0xfc); db(0x6c); db(0x00); db(0x06); db(0x30); db(0x3a); db(0xfc); db(0x7a);
+ db(0xe0); db(0x40); db(0x31); db(0x40); db(0x00); db(0x08); db(0x61); db(0x00);
+ db(0xfc); db(0x38); db(0x10); db(0x3a); db(0xfc); db(0x4c); db(0x6b); db(0x00);
+ db(0xfd); db(0x96); db(0x36); db(0x3c); db(0x00); db(0x68); db(0x74); db(0x01);
+ db(0x28); db(0x3a); db(0xfc); db(0x60); db(0x20); db(0x04); db(0xc0); db(0x82);
+ db(0x22); db(0x2b); db(0x00); db(0x04); db(0xc2); db(0x82); db(0xb2); db(0x80);
+ db(0x67); db(0x22); db(0x42); db(0x92); db(0x35); db(0x7c); db(0x02); db(0x00);
+ db(0x00); db(0x04); db(0x42); db(0xaa); db(0x00); db(0x0a); db(0x32); db(0x03);
+ db(0x4a); db(0x00); db(0x66); db(0x04); db(0x08); db(0xc1); db(0x00); db(0x07);
+ db(0x35); db(0x41); db(0x00); db(0x06); db(0x42); db(0x6a); db(0x00); db(0x08);
+ db(0x61); db(0x00); db(0xfb); db(0xf6); db(0x52); db(0x43); db(0xd4); db(0x42);
+ db(0x0c); db(0x42); db(0x00); db(0x08); db(0x66); db(0xc6); db(0x27); db(0x44);
+ db(0x00); db(0x04); db(0x60); db(0x00); db(0xfd); db(0x4a); db(0x42); db(0x92);
+ db(0x35); db(0x7c); db(0x04); db(0x00); db(0x00); db(0x04); db(0x42); db(0x6a);
+ db(0x00); db(0x06); db(0x42); db(0x6a); db(0x00); db(0x08); db(0x20); db(0x6b);
+ db(0x00); db(0x14); db(0x30); db(0x3a); db(0xfc); db(0x0c); db(0x32); db(0x28);
+ db(0x00); db(0x30); db(0xd2); db(0x41); db(0x90); db(0x41); db(0x6a); db(0x02);
+ db(0x70); db(0x00); db(0x35); db(0x40); db(0x00); db(0x0a); db(0x30); db(0x3a);
+ db(0xfb); db(0xfa); db(0x32); db(0x28); db(0x00); db(0x2e); db(0xd2); db(0x41);
+ db(0x90); db(0x41); db(0x6a); db(0x02); db(0x70); db(0x00); db(0x35); db(0x40);
+ db(0x00); db(0x0c); db(0x61); db(0x00); db(0xfb); db(0x70); db(0x60); db(0x00);
+ db(0xfd); db(0x06); db(0x4e); db(0x75); db(0x4a); db(0xa9); db(0x01); db(0x9a);
+ db(0x67); db(0x14); db(0x4a); db(0xa9); db(0x01); db(0x9e); db(0x67); db(0x0e);
+ db(0x30); db(0x3a); db(0xfb); db(0xa8); db(0xb0); db(0x69); db(0x00); db(0x16);
+ db(0x67); db(0x14); db(0x33); db(0x40); db(0x00); db(0x16); db(0x2c); db(0x69);
+ db(0x00); db(0x26); db(0x20); db(0x29); db(0x00); db(0x22); db(0x22); db(0x69);
+ db(0x00); db(0x1e); db(0x4e); db(0xae); db(0xfe); db(0xbc); db(0x53); db(0x69);
+ db(0x00); db(0x42); db(0x6a); db(0x12); db(0x33); db(0x7c); db(0x00); db(0x32);
+ db(0x00); db(0x42); db(0x30); db(0x3c); db(0xff); db(0x38); db(0x72); db(0x02);
+ db(0x61); db(0x00); db(0xf9); db(0xe2); db(0x4e); db(0x90); db(0x41); db(0xf9);
+ db(0x00); db(0xdf); db(0xf0); db(0x00); db(0x70); db(0x00); db(0x4e); db(0x75);
+ db(0x2c); db(0x78); db(0x00); db(0x04); db(0x20); db(0x3c); db(0x00); db(0x00);
+ db(0x00); db(0x84); db(0x22); db(0x3c); db(0x00); db(0x01); db(0x00); db(0x01);
+ db(0x4e); db(0xae); db(0xff); db(0x3a); db(0x2a); db(0x40); db(0x93); db(0xc9);
+ db(0x4e); db(0xae); db(0xfe); db(0xda); db(0x2b); db(0x40); db(0x00); db(0x04);
+ db(0x41); db(0xfa); db(0x00); db(0x86); db(0x70); db(0x00); db(0x72); db(0x00);
+ db(0x32); db(0x3c); db(0x00); db(0x34); db(0x61); db(0x00); db(0xfa); db(0x48);
+ db(0x28); db(0x40); db(0x41); db(0xed); db(0x00); db(0x0c); db(0x29); db(0x48);
+ db(0x00); db(0x28); db(0x70); db(0x01); db(0x29); db(0x40); db(0x00); db(0x24);
+ db(0x39); db(0x7c); db(0x00); db(0x0c); db(0x00); db(0x1c); db(0x2b); db(0x4d);
+ db(0x00); db(0x1c); db(0x41); db(0xfa); db(0x00); db(0x1c); db(0x2b); db(0x48);
+ db(0x00); db(0x14); db(0x22); db(0x4c); db(0x4e); db(0xae); db(0xfe); db(0x38);
+ db(0x70); db(0x00); db(0x08); db(0xc0); db(0x00); db(0x0d); db(0x4e); db(0xae);
+ db(0xfe); db(0xc2); db(0x39); db(0x7c); db(0x00); db(0x02); db(0x00); db(0x1c);
+ db(0x48); db(0xe7); db(0x00); db(0x06); db(0x2a); db(0x48); db(0x2b); db(0x69);
+ db(0x00); db(0x08); db(0x00); db(0x08); db(0x2c); db(0x6d); db(0x00); db(0x00);
+ db(0x22); db(0x6d); db(0x00); db(0x04); db(0x70); db(0x00); db(0x08); db(0xc0);
+ db(0x00); db(0x0d); db(0x4e); db(0xae); db(0xfe); db(0xbc); db(0x70); db(0x00);
+ db(0x4c); db(0xdf); db(0x60); db(0x00); db(0x4e); db(0x75); db(0x69); db(0x6e);
+ db(0x70); db(0x75); db(0x74); db(0x2e); db(0x64); db(0x65); db(0x76); db(0x69);
+ db(0x63); db(0x65); db(0x00); db(0x74); db(0x69); db(0x6d); db(0x65); db(0x72);
+ db(0x2e); db(0x64); db(0x65); db(0x76); db(0x69); db(0x63); db(0x65); db(0x00);
+ db(0x63); db(0x6c); db(0x69); db(0x70); db(0x62); db(0x6f); db(0x61); db(0x72);
+ db(0x64); db(0x2e); db(0x64); db(0x65); db(0x76); db(0x69); db(0x63); db(0x65);
+ db(0x00); db(0x55); db(0x41); db(0x45); db(0x20); db(0x6d); db(0x6f); db(0x75);
+ db(0x73); db(0x65); db(0x20); db(0x64); db(0x72); db(0x69); db(0x76); db(0x65);
+ db(0x72); db(0x00); db(0x55); db(0x41); db(0x45); db(0x20); db(0x66); db(0x69);
+ db(0x6c); db(0x65); db(0x73); db(0x79); db(0x73); db(0x74); db(0x65); db(0x6d);
+ db(0x00); db(0x55); db(0x41); db(0x45); db(0x20); db(0x66); db(0x73); db(0x20);
+ db(0x61); db(0x75); db(0x74); db(0x6f); db(0x6d); db(0x6f); db(0x75); db(0x6e);
+ db(0x74); db(0x65); db(0x72); db(0x00); db(0x55); db(0x41); db(0x45); db(0x20);
+ db(0x66); db(0x73); db(0x20); db(0x61); db(0x75); db(0x74); db(0x6f); db(0x6d);
+ db(0x6f); db(0x75); db(0x6e); db(0x74); db(0x20); db(0x70); db(0x72); db(0x6f);
+ db(0x63); db(0x65); db(0x73); db(0x73); db(0x00); db(0x64); db(0x6f); db(0x73);
+ db(0x2e); db(0x6c); db(0x69); db(0x62); db(0x72); db(0x61); db(0x72); db(0x79);
+ db(0x00); db(0x69); db(0x6e); db(0x74); db(0x75); db(0x69); db(0x74); db(0x69);
+ db(0x6f); db(0x6e); db(0x2e); db(0x6c); db(0x69); db(0x62); db(0x72); db(0x61);
+ db(0x72); db(0x79); db(0x00); db(0x67); db(0x72); db(0x61); db(0x70); db(0x68);
+ db(0x69); db(0x63); db(0x73); db(0x2e); db(0x6c); db(0x69); db(0x62); db(0x72);
+ db(0x61); db(0x72); db(0x79); db(0x00); db(0x65); db(0x78); db(0x70); db(0x61);
+ db(0x6e); db(0x73); db(0x69); db(0x6f); db(0x6e); db(0x2e); db(0x6c); db(0x69);
+ db(0x62); db(0x72); db(0x61); db(0x72); db(0x79); db(0x00); db(0x46); db(0x69);
+ db(0x6c); db(0x65); db(0x53); db(0x79); db(0x73); db(0x74); db(0x65); db(0x6d);
+ db(0x2e); db(0x72); db(0x65); db(0x73); db(0x6f); db(0x75); db(0x72); db(0x63);
+ db(0x65); db(0x00); db(0x00); db(0x00); db(0x00); db(0x00); db(0x03); db(0xf2);
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/include/cpu_prefetch.h b/include/cpu_prefetch.h
old mode 100755 (executable)
new mode 100644 (file)
index ca2b467..9bdae7d
--- a/include/cpu_prefetch.h
+++ b/include/cpu_prefetch.h
@@ -13,11 +13,6 @@ STATIC_INLINE uae_u32 get_long_prefetch (struct regstruct *regs, int o)
 }
 
 #ifdef CPUEMU_12
-#define CE_MEMBANK_FAST 0
-#define CE_MEMBANK_CHIP 1
-#define CE_MEMBANK_CIA 2
-extern uae_u8 ce_banktype[256];
-
 
 STATIC_INLINE uae_u32 mem_access_delay_word_read (uaecptr addr)
 {

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/include/memory.h b/include/memory.h
old mode 100755 (executable)
new mode 100644 (file)
index de6c994..6ce5bc6
--- a/include/memory.h
+++ b/include/memory.h
@@ -96,6 +96,11 @@ typedef struct {
     int flags;
 } addrbank;
 
+#define CE_MEMBANK_FAST 0
+#define CE_MEMBANK_CHIP 1
+#define CE_MEMBANK_CIA 2
+extern uae_u8 ce_banktype[256];
+
 extern uae_u8 *filesysory;
 extern uae_u8 *rtarea;
 

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

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

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

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

diff --git a/include/options.h b/include/options.h
old mode 100755 (executable)
new mode 100644 (file)
index 30be49b..7ab572c
--- a/include/options.h
+++ b/include/options.h
@@ -329,6 +329,7 @@ struct uae_prefs {
     int win32_automount_drives;
     int win32_automount_cddrives;
     int win32_automount_netdrives;
+    int win32_automount_removabledrives;
     int win32_midioutdev;
     int win32_midiindev;
     int win32_uaescsimode;

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/inputdevice.c b/inputdevice.c
old mode 100755 (executable)
new mode 100644 (file)
index 6a1feed..c1508ad
--- a/inputdevice.c
+++ b/inputdevice.c
@@ -1196,6 +1196,11 @@ static void inputdevice_tablet_abs_v36 (int x, int y)
     diffx = diffy = 0;
     maxx = maxy = 0;
 
+    {
+       //uaecptr gb = get_intuitionbase ();
+       //write_log ("%d %d\n", get_word (gb + 70), get_word (gb + 68));
+    }
+
     if (picasso_on) {
        maxx = picasso96_state.Width;
        maxy = picasso96_state.Height;

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/memory.c b/memory.c
old mode 100755 (executable)
new mode 100644 (file)
index c8f5171..2d8d76e
--- a/memory.c
+++ b/memory.c
@@ -65,6 +65,7 @@ uae_u32 allocated_z3fastmem, allocated_z3fastmem2;
 uae_u32 allocated_a3000lmem;
 uae_u32 allocated_a3000hmem;
 uae_u32 allocated_cardmem;
+uae_u8 ce_banktype[256];
 
 #if defined(CPU_64_BIT)
 uae_u32 max_z3fastmem = 2048UL * 1024 * 1024;
@@ -3716,6 +3717,28 @@ void memory_hardreset (void)
     expansion_clear ();
 }
 
+static void fill_ce_banks (void)
+{
+    int i;
+
+    memset (ce_banktype, CE_MEMBANK_FAST, 256);
+    for (i = 0; i < (0x200000 >> 16); i++)
+       ce_banktype[i] = CE_MEMBANK_CHIP;
+    if (!currprefs.cs_slowmemisfast) {
+       for (i = (0xc00000 >> 16); i < (0xe00000 >> 16); i++)
+           ce_banktype[i] = CE_MEMBANK_CHIP;
+    }
+    for (i = (0xd00000 >> 16); i < (0xe00000 >> 16); i++)
+       ce_banktype[i] = CE_MEMBANK_CHIP;
+    for (i = (0xa00000 >> 16); i < (0xc00000 >> 16); i++) {
+       addrbank *b;
+       ce_banktype[i] = CE_MEMBANK_CIA;
+       b = &get_mem_bank (i << 16);
+       if (b != &cia_bank)
+           ce_banktype[i] = CE_MEMBANK_FAST;
+    }
+}
+
 void map_banks (addrbank *bank, int start, int size, int realsize)
 {
     int bnr, old;
@@ -3777,6 +3800,7 @@ void map_banks (addrbank *bank, int start, int size, int realsize)
        }
     }
     debug_bankchange (old);
+    fill_ce_banks ();
 }
 
 #ifdef SAVESTATE

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

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

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

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

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

diff --git a/newcpu.c b/newcpu.c
old mode 100755 (executable)
new mode 100644 (file)
index 27e0134..c85cbee
--- a/newcpu.c
+++ b/newcpu.c
@@ -66,7 +66,6 @@ int movem_index2[256];
 int movem_next[256];
 
 cpuop_func *cpufunctbl[65536];
-uae_u8 ce_banktype[256];
 
 extern uae_u32 get_fpsr (void);
 
@@ -324,23 +323,6 @@ void check_prefs_changed_cpu (void)
 
 }
 
-static void fill_cebanks (void)
-{
-    int i;
-
-    memset (ce_banktype, CE_MEMBANK_FAST, 256);
-    for (i = 0; i < (0x200000 >> 16); i++)
-       ce_banktype[i] = CE_MEMBANK_CHIP;
-    if (!currprefs.cs_slowmemisfast) {
-       for (i = (0xc00000 >> 16); i < (0xe00000 >> 16); i++)
-           ce_banktype[i] = CE_MEMBANK_CHIP;
-    }
-    for (i = (0xd00000 >> 16); i < (0xe00000 >> 16); i++)
-       ce_banktype[i] = CE_MEMBANK_CHIP;
-    for (i = (0xa00000 >> 16); i < (0xc00000 >> 16); i++)
-       ce_banktype[i] = CE_MEMBANK_CIA;
-}
-
 void init_m68k (void)
 {
     int i;
@@ -401,7 +383,6 @@ void init_m68k (void)
     write_log ("%d CPU functions\n", nr_cpuop_funcs);
 
     build_cpufunctbl ();
-    fill_cebanks ();
 
 #ifdef JIT
     /* We need to check whether NATMEM settings have changed
@@ -1142,7 +1123,7 @@ void REGPARAM2 Exception (int nr, struct regstruct *regs, uaecptr oldpc)
 {
 #if 0
     //if (nr < 24)
-    if (nr >= 24 + 8)
+    if (nr == 24 + 3)
        write_log ("exception %d %08X %08X (%04X %04X)\n",
            nr, oldpc, m68k_getpc (regs), intena, intreq);
 #endif

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/od-win32/clipboard.c b/od-win32/clipboard.c
new file mode 100644 (file)
index 0000000..92648df
--- /dev/null
+++ b/od-win32/clipboard.c
@@ -0,0 +1,55 @@
+
+#include "sysconfig.h"
+#include "sysdeps.h"
+
+#include <stdlib.h>
+#include <stdarg.h>
+
+#include <windows.h>
+
+#include "clipboard.h"
+
+static HWND chwnd;
+
+void clipboard_init (HWND hwnd)
+{
+    chwnd = hwnd;
+}
+
+void clipboard_changed (HWND hwnd)
+{
+    HGLOBAL hglb;
+    
+    if (!IsClipboardFormatAvailable (CF_TEXT)) 
+       return;
+    if (!OpenClipboard (hwnd))
+       return;
+    hglb = GetClipboardData (CF_TEXT); 
+    if (hglb != NULL) { 
+       char *lptstr = GlobalLock (hglb); 
+       if (lptstr != NULL) {
+           GlobalUnlock (hglb);
+       }
+    }
+     CloseClipboard ();
+}
+
+int clipboard_put_text (const char *txt)
+{
+    HGLOBAL hglb;
+    int ret = FALSE;
+
+    if (!OpenClipboard (chwnd)) 
+       return ret; 
+    EmptyClipboard (); 
+    hglb = GlobalAlloc (GMEM_MOVEABLE, strlen (txt) + 1);
+    if (hglb) {
+       char *lptstr = GlobalLock (hglb);
+       strcpy (lptstr, txt);
+       GlobalUnlock (hglb);
+       SetClipboardData (CF_TEXT, hglb); 
+       ret = TRUE;
+    }
+    CloseClipboard ();
+    return ret;
+}

diff --git a/od-win32/clipboard.h b/od-win32/clipboard.h
new file mode 100644 (file)
index 0000000..9006605
--- /dev/null
+++ b/od-win32/clipboard.h
@@ -0,0 +1,5 @@
+
+extern void clipboard_init (HWND hwnd);
+extern void clipboard_changed (HWND);
+extern int clipboard_put_text (const char *txt);
+

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/od-win32/resources/resource b/od-win32/resources/resource
old mode 100755 (executable)
new mode 100644 (file)
index d3f77dc..39399b6
--- a/od-win32/resources/resource
+++ b/od-win32/resources/resource
@@ -363,6 +363,8 @@
 #define IDC_BLITIMM                     1174
 #define IDC_LORES                       1176
 #define IDC_LORES_SMOOTHED              1179
+#define IDC_LORES_SMOOTHED2             1180
+#define IDC_FLICKERFIXER                1180
 #define IDC_FRAMERATE                   1185
 #define IDC_RATETEXT                    1186
 #define IDC_XSIZE                       1187
@@ -550,6 +552,7 @@
 #define IDC_MAPDRIVES_CD                1509
 #define IDC_SELECTRESTEXT               1510
 #define IDC_FLUSHPRINTER                1510
+#define IDC_MAPDRIVES_REMOVABLE         1510
 #define IDC_SCREENRESTEXT               1511
 #define IDC_MAPDRIVES_AUTO              1511
 #define IDC_WIDTHTEXT                   1512

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

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

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

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

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

diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc
old mode 100755 (executable)
new mode 100644 (file)
index bf961df..e62d0a2
--- a/od-win32/resources/winuae.rc
+++ b/od-win32/resources/winuae.rc
@@ -89,33 +89,34 @@ BEGIN
     COMBOBOX        IDC_REFRESHRATE,187,27,87,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
     EDITTEXT        IDC_XSIZE,59,48,48,12,ES_NUMBER\r
     EDITTEXT        IDC_YSIZE,114,48,47,12,ES_NUMBER\r
-    GROUPBOX        "Settings",IDC_SETTINGSTEXT,12,73,199,125\r
-    CONTROL         "Blacker than black",IDC_BLACKER_THAN_BLACK,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,19,126,92,10\r
-    LTEXT           "Refresh:",IDC_REFRESHTEXT,18,162,28,8\r
-    CONTROL         "Slider1",IDC_FRAMERATE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,47,157,75,20\r
-    EDITTEXT        IDC_RATETEXT,124,161,77,12,ES_CENTER | ES_READONLY\r
+    GROUPBOX        "Settings",IDC_SETTINGSTEXT,12,73,199,137\r
+    CONTROL         "Blacker than black",IDC_BLACKER_THAN_BLACK,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,19,125,92,10\r
+    LTEXT           "Refresh:",IDC_REFRESHTEXT,18,173,28,8\r
+    CONTROL         "Slider1",IDC_FRAMERATE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,47,168,75,20\r
+    EDITTEXT        IDC_RATETEXT,124,172,77,12,ES_CENTER | ES_READONLY\r
     GROUPBOX        "Centering",IDC_STATIC,221,73,61,49\r
     CONTROL         "Horizontal",IDC_XCENTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,87,49,10\r
     CONTROL         "Vertical",IDC_YCENTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,103,49,10\r
-    GROUPBOX        "Line Mode",IDC_LINEMODE,222,126,61,73\r
-    CONTROL         "Normal",IDC_LM_NORMAL,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_GROUP | WS_TABSTOP,231,142,44,10\r
-    CONTROL         "Double",IDC_LM_DOUBLED,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,231,158,45,10\r
-    CONTROL         "Scanlines",IDC_LM_SCANLINES,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,231,174,46,10\r
-    COMBOBOX        IDC_DA_MODE,20,211,58,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
-    CONTROL         "",IDC_DA_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,84,207,101,20\r
-    LTEXT           "FPS adj.:",IDC_REFRESH2TEXT,16,182,32,8\r
-    CONTROL         "",IDC_FRAMERATE2,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,47,177,127,20\r
-    EDITTEXT        IDC_RATE2TEXT,175,181,26,12,ES_CENTER | ES_READONLY\r
+    GROUPBOX        "Line Mode",IDC_LINEMODE,222,126,61,84\r
+    CONTROL         "Normal",IDC_LM_NORMAL,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_GROUP | WS_TABSTOP,231,148,44,10\r
+    CONTROL         "Double",IDC_LM_DOUBLED,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,231,164,45,10\r
+    CONTROL         "Scanlines",IDC_LM_SCANLINES,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,231,180,46,10\r
+    COMBOBOX        IDC_DA_MODE,20,218,58,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
+    CONTROL         "",IDC_DA_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,84,214,101,20\r
+    LTEXT           "FPS adj.:",IDC_REFRESH2TEXT,16,193,32,8\r
+    CONTROL         "",IDC_FRAMERATE2,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,47,188,127,20\r
+    EDITTEXT        IDC_RATE2TEXT,175,192,26,12,ES_CENTER | ES_READONLY\r
     COMBOBOX        IDC_RESOLUTIONDEPTH,134,27,46,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
-    CONTROL         "Filtered low resolution",IDC_LORES_SMOOTHED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,118,126,89,10\r
+    CONTROL         "Filtered low resolution",IDC_LORES_SMOOTHED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,118,125,89,10\r
     COMBOBOX        IDC_SCREENMODE_NATIVE,100,85,102,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
     COMBOBOX        IDC_SCREENMODE_RTG,100,103,102,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
     RTEXT           "Native mode:",IDC_STATIC,19,85,59,15,SS_CENTERIMAGE\r
     RTEXT           "Windowed:",IDC_WINDOWEDTEXT,15,51,40,8\r
     RTEXT           "RTG mode:",IDC_STATIC,19,101,59,15,SS_CENTERIMAGE\r
-    PUSHBUTTON      "Reset to defaults",IDC_DA_RESET,212,211,73,14\r
-    RTEXT           "Resolution:",IDC_STATIC,27,140,59,15,SS_CENTERIMAGE\r
-    COMBOBOX        IDC_LORES,100,140,102,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
+    PUSHBUTTON      "Reset to defaults",IDC_DA_RESET,212,218,73,14\r
+    RTEXT           "Resolution:",IDC_STATIC,27,152,59,15,SS_CENTERIMAGE\r
+    COMBOBOX        IDC_LORES,100,152,102,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
+    CONTROL         "Flickerfixer",IDC_FLICKERFIXER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,118,139,89,10\r
 END\r
 \r
 IDD_MEMORY DIALOGEX 0, 0, 300, 239\r
@@ -261,18 +262,20 @@ STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD
 EXSTYLE WS_EX_CONTEXTHELP\r
 FONT 8, "MS Sans Serif", 0, 0, 0x1\r
 BEGIN\r
-    CONTROL         "List1",IDC_VOLUMELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,5,0,290,176\r
-    PUSHBUTTON      "Add &Directory or Archive...",IDC_NEW_FS,10,179,103,15\r
-    PUSHBUTTON      "Add &Hardfile...",IDC_NEW_HF,130,179,74,15\r
-    PUSHBUTTON      "Add Ha&rd Drive...",IDC_NEW_HD,220,179,75,15\r
-    PUSHBUTTON      "Remove",IDC_REMOVE,235,203,60,15\r
-    PUSHBUTTON      "&Properties",IDC_EDIT,235,220,60,15\r
-    CONTROL         "Add PC drives at startup",IDC_MAPDRIVES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,202,100,10\r
-    CONTROL         "Disable UAEFSDB-support",IDC_NOUAEFSDB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,110,202,119,10\r
-    CONTROL         "Don't use Windows Recycle Bin",IDC_NORECYCLEBIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,110,213,121,10\r
-    CONTROL         "Include network drives..",IDC_MAPDRIVES_NET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,225,101,10\r
-    CONTROL         "Include CD/DVD drives..",IDC_MAPDRIVES_CD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,213,100,10\r
-    CONTROL         "Automount removable drives",IDC_MAPDRIVES_AUTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,110,225,115,10\r
+    CONTROL         "List1",IDC_VOLUMELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,5,0,290,167\r
+    PUSHBUTTON      "Add &Directory or Archive...",IDC_NEW_FS,10,171,103,15\r
+    PUSHBUTTON      "Add &Hardfile...",IDC_NEW_HF,130,171,74,15\r
+    PUSHBUTTON      "Add Ha&rd Drive...",IDC_NEW_HD,220,171,75,15\r
+    PUSHBUTTON      "Remove",IDC_REMOVE,235,193,60,15\r
+    PUSHBUTTON      "&Properties",IDC_EDIT,235,210,60,15\r
+    CONTROL         "Add PC drives at startup",IDC_MAPDRIVES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,192,100,10\r
+    CONTROL         "Disable UAEFSDB-support",IDC_NOUAEFSDB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,110,192,119,10\r
+    CONTROL         "Don't use Windows Recycle Bin",IDC_NORECYCLEBIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,110,203,121,10\r
+    CONTROL         "Include network drives..",IDC_MAPDRIVES_NET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,226,101,10\r
+    CONTROL         "Include CD/DVD drives..",IDC_MAPDRIVES_CD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,215,100,10\r
+    CONTROL         "Automount removable drives",IDC_MAPDRIVES_AUTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,110,215,115,10\r
+    CONTROL         "Include removable drives..",IDC_MAPDRIVES_REMOVABLE,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,203,100,10\r
 END\r
 \r
 IDD_SOUND DIALOGEX 0, 0, 300, 231\r
@@ -687,10 +690,10 @@ BEGIN
     COMBOBOX        IDC_FILTERMODE,20,15,103,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
     COMBOBOX        IDC_FILTERFILTER,132,15,83,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
     PUSHBUTTON      "Reset to defaults",IDC_FILTERDEFAULT,221,15,67,14\r
-    RTEXT           "Horiz. size:",-1,7,61,54,10,SS_CENTERIMAGE\r
+    RTEXT           "Horiz. size:",-1,7,61,46,10,SS_CENTERIMAGE\r
     CONTROL         "Slider1",IDC_FILTERHZ,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,99,54,152,19\r
     EDITTEXT        IDC_FILTERHZV,253,56,34,12,ES_CENTER | ES_READONLY\r
-    RTEXT           "Vert. size:",-1,7,81,54,10,SS_CENTERIMAGE\r
+    RTEXT           "Vert. size:",-1,7,81,46,10,SS_CENTERIMAGE\r
     CONTROL         "Slider1",IDC_FILTERVZ,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,99,74,152,19\r
     EDITTEXT        IDC_FILTERVZV,253,76,34,12,ES_CENTER | ES_READONLY\r
     RTEXT           "Horiz. position:",-1,5,101,55,10,SS_CENTERIMAGE\r
@@ -708,8 +711,8 @@ BEGIN
     PUSHBUTTON      "Load",IDC_FILTERPRESETLOAD,132,216,47,14\r
     PUSHBUTTON      "Save",IDC_FILTERPRESETSAVE,184,216,47,14\r
     PUSHBUTTON      "Delete",IDC_FILTERPRESETDELETE,236,216,47,14\r
-    COMBOBOX        IDC_FILTERHZMULT,67,60,27,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
-    COMBOBOX        IDC_FILTERVZMULT,67,80,27,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
+    COMBOBOX        IDC_FILTERHZMULT,59,60,35,150,CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
+    COMBOBOX        IDC_FILTERVZMULT,59,80,35,150,CBS_DROPDOWN | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
     COMBOBOX        IDC_FILTERXTRA,105,151,138,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
     COMBOBOX        IDC_FILTERASPECT,20,135,73,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
     CONTROL         "Keep aspect ratio",IDC_FILTERKEEPASPECT,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_GROUP | WS_TABSTOP,9,170,85,10\r

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/od-win32/srcrelease.cmd b/od-win32/srcrelease.cmd
old mode 100755 (executable)
new mode 100644 (file)
index 4ec868d..bc8423d
--- a/od-win32/srcrelease.cmd
+++ b/od-win32/srcrelease.cmd
@@ -107,12 +107,12 @@ cd ..
 
 cd ..
 
-zip -9 -r winuaesrc *
-
-copy winuaesrc.zip d:\amiga\winuaepackets\winuaesrc%1.zip
-move winuaesrc.zip d:\amiga
-cd c:\projects\winuae\src\od-win32
-zip -9 winuaedebug%1 winuae_msvc\release\winuae.pdb winuae_msvc\fullrelease\winuae.pdb
-move winuaedebug%1.zip d:\amiga\winuaepackets\
-copy winuae_msvc\fullrelease\winuae.pdb d:\amiga\dump
-copy d:\amiga\winuae.exe d:\amiga\dump
+#zip -9 -r winuaesrc *
+
+#copy winuaesrc.zip d:\amiga\winuaepackets\winuaesrc%1.zip
+#move winuaesrc.zip d:\amiga
+#cd c:\projects\winuae\src\od-win32
+#zip -9 winuaedebug%1 winuae_msvc\release\winuae.pdb winuae_msvc\fullrelease\winuae.pdb
+#move winuaedebug%1.zip d:\amiga\winuaepackets\
+#copy winuae_msvc\fullrelease\winuae.pdb d:\amiga\dump
+#copy d:\amiga\winuae.exe d:\amiga\dump

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

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

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

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

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

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

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

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

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

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

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

diff --git a/od-win32/win32.c b/od-win32/win32.c
old mode 100755 (executable)
new mode 100644 (file)
index f32a15e..911b63a
--- a/od-win32/win32.c
+++ b/od-win32/win32.c
@@ -78,6 +78,7 @@
 #include "akiko.h"
 #include "cdtv.h"
 #include "direct3d.h"
+#include "clipboard.h"
 #ifdef RETROPLATFORM
 #include "rp.h"
 #endif
@@ -88,7 +89,7 @@ int pissoff_value = 25000;
 
 extern FILE *debugfile;
 extern int console_logging;
-static OSVERSIONINFO osVersion;
+OSVERSIONINFO osVersion;
 static SYSTEM_INFO SystemInfo;
 static int logging_started;
 static DWORD minidumpmode = MiniDumpNormal;
@@ -110,6 +111,7 @@ static int forceroms;
 static int start_data = 0;
 static void *tablet;
 HCURSOR normalcursor;
+static HWND hwndNextViewer;
 
 char VersionStr[256];
 char BetaStr[64];
@@ -152,6 +154,9 @@ char help_file[MAX_DPATH];
 int af_path_2005, af_path_old;
 DWORD quickstart = 1, configurationcache = 1;
 
+static int multi_display = 1;
+static char *inipath = NULL;
+
 static int timeend (void)
 {
     if (!timeon)
@@ -879,9 +884,12 @@ static LRESULT CALLBACK AmigaWindowProc (HWND hWnd, UINT message, WPARAM wParam,
        DragAcceptFiles (hWnd, TRUE);
        tablet = open_tablet (hWnd);
        normalcursor = LoadCursor (NULL, IDC_ARROW);
+       hwndNextViewer = SetClipboardViewer (hWnd); 
+       clipboard_init (hWnd);
     return 0;
 
     case WM_DESTROY:
+       ChangeClipboardChain (hWnd, hwndNextViewer); 
        close_tablet (tablet);
        inputdevice_unacquire ();
        dinput_window ();
@@ -1151,6 +1159,17 @@ static LRESULT CALLBACK AmigaWindowProc (HWND hWnd, UINT message, WPARAM wParam,
     }
     break;
 
+    case WM_CHANGECBCHAIN: 
+       if ((HWND) wParam == hwndNextViewer) 
+           hwndNextViewer = (HWND) lParam; 
+       else if (hwndNextViewer != NULL) 
+           SendMessage(hwndNextViewer, message, wParam, lParam); 
+    return 0;
+    case WM_DRAWCLIPBOARD:
+       clipboard_changed (hWnd);
+       SendMessage(hwndNextViewer, message, wParam, lParam); 
+    return 0;
+
     case WT_PROXIMITY:
     {
        send_tablet_proximity (LOWORD (lParam) ? 1 : 0);
@@ -2017,6 +2036,7 @@ void target_default_options (struct uae_prefs *p, int type)
        p->win32_guikey = -1;
        p->win32_automount_removable = 0;
        p->win32_automount_drives = 0;
+       p->win32_automount_removabledrives = 0;
        p->win32_automount_cddrives = 0;
        p->win32_automount_netdrives = 0;
        p->win32_kbledmode = 0;
@@ -2036,6 +2056,7 @@ void target_default_options (struct uae_prefs *p, int type)
        p->win32_midiindev = 0;
        p->win32_automount_removable = 0;
        p->win32_automount_drives = 0;
+       p->win32_automount_removabledrives = 0;
        p->win32_automount_cddrives = 0;
        p->win32_automount_netdrives = 0;
        p->picasso96_modeflags = RGBFF_CLUT | RGBFF_R5G6B5PC | RGBFF_B8G8R8A8;
@@ -2052,6 +2073,7 @@ void target_save_options (struct zfile *f, struct uae_prefs *p)
     cfgfile_target_dwrite (f, "map_drives_auto=%s\n", p->win32_automount_removable ? "true" : "false");
     cfgfile_target_dwrite (f, "map_cd_drives=%s\n", p->win32_automount_cddrives ? "true" : "false");
     cfgfile_target_dwrite (f, "map_net_drives=%s\n", p->win32_automount_netdrives ? "true" : "false");
+    cfgfile_target_dwrite (f, "map_removable_drives=%s\n", p->win32_automount_removabledrives ? "true" : "false");
     serdevtoname (p->sername);
     cfgfile_target_dwrite (f, "serial_port=%s\n", p->sername[0] ? p->sername : "none");
     sernametodev (p->sername);
@@ -2120,6 +2142,7 @@ int target_parse_option (struct uae_prefs *p, char *option, char *value)
            || cfgfile_yesno (option, value, "map_drives_auto", &p->win32_automount_removable)
            || cfgfile_yesno (option, value, "map_cd_drives", &p->win32_automount_cddrives)
            || cfgfile_yesno (option, value, "map_net_drives", &p->win32_automount_netdrives)
+           || cfgfile_yesno (option, value, "map_removable_drives", &p->win32_automount_removabledrives)
            || cfgfile_yesno (option, value, "logfile", &p->win32_logfile)
            || cfgfile_yesno (option, value, "networking", &p->socket_emu)
            || cfgfile_yesno (option, value, "borderless", &p->win32_borderless)
@@ -2789,22 +2812,15 @@ void associate_file_extensions (void)
        SHChangeNotify (SHCNE_ASSOCCHANGED, 0, 0, 0); 
 }
 
-static void WIN32_HandleRegistryStuff(void)
+static void WIN32_HandleRegistryStuff (void)
 {
     RGBFTYPE colortype = RGBFB_NONE;
     DWORD dwType = REG_DWORD;
     DWORD dwDisplayInfoSize = sizeof (colortype);
     DWORD size;
-    DWORD disposition;
     char path[MAX_DPATH] = "";
     char version[100];
 
-    hWinUAEKey = NULL;
-    if (getregmode () == 0 || WINUAEPUBLICBETA > 0) {
-       /* Create/Open the hWinUAEKey which points our config-info */
-       RegCreateKeyEx (HKEY_CURRENT_USER, "Software\\Arabuusimiehet\\WinUAE", 0, "", REG_OPTION_NON_VOLATILE,
-           KEY_WRITE | KEY_READ, NULL, &hWinUAEKey, &disposition);
-    }
     initpath ("FloppyPath", start_path_data);
     initpath ("KickstartPath", start_path_data);
     initpath ("hdfPath", start_path_data);
@@ -3279,7 +3295,7 @@ extern int force_direct_catweasel, sound_mode_skip, maxmem;
 extern DWORD_PTR cpu_affinity, cpu_paffinity;
 static DWORD_PTR original_affinity = -1;
 
-static int getval(char *s)
+static int getval(const char *s)
 {
     int base = 10;
     int v;
@@ -3310,205 +3326,252 @@ static void makeverstr(char *s)
     }
 }
 
-static int multi_display = 1;
-static char *inipath = NULL;
-
-static int process_arg (char **xargv)
+static int parseargs (const char *arg, const char *np)
 {
-    int i, argc, xargc;
-    char **argv;
 
-    xargc = 0;
-    argc = __argc; argv = __argv;
-    xargv[xargc++] = my_strdup(argv[0]);
-    for (i = 1; i < argc; i++) {
-       char *arg = argv[i];
-       if (!strcmp (arg, "-log")) {
-           console_logging = 1;
-           continue;
-       }
+    if (!strcmp (arg, "-log")) {
+        console_logging = 1;
+        return 1;
+    }
 #ifdef FILESYS
-       if (!strcmp (arg, "-rdbdump")) {
-           do_rdbdump = 1;
-           continue;
-       }
-       if (!strcmp (arg, "-disableharddrivesafetycheck")) {
-           harddrive_dangerous = 0x1234dead;
-           continue;
-       }
-       if (!strcmp (arg, "-noaspifiltering")) {
-           aspi_allow_all = 1;
-           continue;
-       }
+    if (!strcmp (arg, "-rdbdump")) {
+        do_rdbdump = 1;
+       return 1;
+    }
+    if (!strcmp (arg, "-disableharddrivesafetycheck")) {
+        harddrive_dangerous = 0x1234dead;
+       return 1;
+    }
+    if (!strcmp (arg, "-noaspifiltering")) {
+        aspi_allow_all = 1;
+       return 1;
+    }
 #endif
-       if (!strcmp (arg, "-norawinput")) {
-           no_rawinput = 1;
-           continue;
-       }
-       if (!strcmp (arg, "-rawkeyboard")) {
-           rawkeyboard = 1;
-           continue;
-       }
-       if (!strcmp (arg, "-scsilog")) {
-           log_scsi = 1;
-           continue;
-       }
-       if (!strcmp (arg, "-netlog")) {
-           log_net = 1;
-           continue;
-       }
-       if (!strcmp (arg, "-seriallog")) {
-           log_uaeserial = 1;
-           continue;
-       }
-       if (!strcmp (arg, "-rplog")) {
-           log_rp = 1;
-           continue;
-       }
-       if (!strcmp (arg, "-nomultidisplay")) {
-           multi_display = 0;
-           continue;
-       }
-       if (!strcmp (arg, "-legacypaths")) {
-           start_data = -2;
-           continue;
-       }
-       if (!strcmp (arg, "-screenshotbmp")) {
-           screenshotmode = 0;
-           continue;
-       }
-       if (!strcmp (arg, "-psprintdebug")) {
-           postscript_print_debugging = 1;
-           continue;
-       }
-       if (!strcmp (arg, "-sounddebug")) {
-           sound_debug = 1;
-           continue;
-       }
-       if (!strcmp (arg, "-directcatweasel")) {
-           force_direct_catweasel = 1;
-           if (i + 1 < argc)
-               force_direct_catweasel = getval (argv[++i]);
-           continue;
-       }
-        if (!strcmp (arg, "-forcerdtsc")) {
-           userdtsc = 1;
-           continue;
-       }
-       if (!strcmp (arg, "-ddsoftwarecolorkey")) {
-           extern int ddsoftwarecolorkey;
-           ddsoftwarecolorkey = 1;
-           continue;
-       }
-       if (!strcmp (arg, "-logflush")) {
-           extern int always_flush_log;
-           always_flush_log = 1;
-           continue;
-       }
-       if (!strcmp (arg, "-ahidebug")) {
-           extern int ahi_debug;
-           ahi_debug = 2;
-           continue;
-       }
-       if (!strcmp (arg, "-ahidebug2")) {
-           extern int ahi_debug;
-           ahi_debug = 3;
-           continue;
+    if (!strcmp (arg, "-norawinput")) {
+        no_rawinput = 1;
+       return 1;
+    }
+    if (!strcmp (arg, "-rawkeyboard")) {
+        rawkeyboard = 1;
+       return 1;
+    }
+    if (!strcmp (arg, "-scsilog")) {
+        log_scsi = 1;
+       return 1;
+    }
+    if (!strcmp (arg, "-netlog")) {
+        log_net = 1;
+       return 1;
+    }
+    if (!strcmp (arg, "-seriallog")) {
+        log_uaeserial = 1;
+       return 1;
+    }
+    if (!strcmp (arg, "-rplog")) {
+        log_rp = 1;
+       return 1;
+    }
+    if (!strcmp (arg, "-nomultidisplay")) {
+        multi_display = 0;
+       return 1;
+    }
+    if (!strcmp (arg, "-legacypaths")) {
+        start_data = -2;
+       return 1;
+    }
+    if (!strcmp (arg, "-screenshotbmp")) {
+        screenshotmode = 0;
+       return 1;
+    }
+    if (!strcmp (arg, "-psprintdebug")) {
+        postscript_print_debugging = 1;
+       return 1;
+    }
+    if (!strcmp (arg, "-sounddebug")) {
+        sound_debug = 1;
+       return 1;
+    }
+    if (!strcmp (arg, "-directcatweasel")) {
+        force_direct_catweasel = 1;
+       if (np) {
+           force_direct_catweasel = getval (np);
+           return 2;
        }
+       return 1;
+    }
+    if (!strcmp (arg, "-forcerdtsc")) {
+        userdtsc = 1;
+       return 1;
+    }
+    if (!strcmp (arg, "-ddsoftwarecolorkey")) {
+        extern int ddsoftwarecolorkey;
+        ddsoftwarecolorkey = 1;
+       return 1;
+    }
+    if (!strcmp (arg, "-logflush")) {
+        extern int always_flush_log;
+        always_flush_log = 1;
+       return 1;
+    }
+    if (!strcmp (arg, "-ahidebug")) {
+        extern int ahi_debug;
+        ahi_debug = 2;
+       return 1;
+    }
+    if (!strcmp (arg, "-ahidebug2")) {
+        extern int ahi_debug;
+        ahi_debug = 3;
+       return 1;
+    }
 
-       if (i + 1 < argc) {
-           char *np = argv[i + 1];
+    if (!np)
+       return 0;
 
-           if (!strcmp (arg, "-ddforcemode")) {
-               extern int ddforceram;
-               ddforceram = getval (np);
-               if (ddforceram < 0 || ddforceram > 3)
-                   ddforceram = 0;
-               i++;
-               continue;
-           }
-           if (!strcmp (arg, "-affinity")) {
-               cpu_affinity = getval (np);
-               i++;
-               if (cpu_affinity == 0)
-                   cpu_affinity = original_affinity;
-               SetThreadAffinityMask (GetCurrentThread (), cpu_affinity);
-               continue;
-           }
-           if (!strcmp (arg, "-paffinity")) {
-               cpu_paffinity = getval (np);
-               i++;
-               if (cpu_paffinity == 0)
-                   cpu_paffinity = original_affinity;
-               SetProcessAffinityMask (GetCurrentProcess (), cpu_paffinity);
-               continue;
-           }
-           if (!strcmp (arg, "-datapath")) {
-               i++;
-               strcpy(start_path_data, np);
-               start_data = -1;
-               continue;
-           }
-           if (!strcmp (arg, "-maxmem")) {
-               i++;
-               maxmem = getval (np);
-               continue;
-           }
-           if (!strcmp (arg, "-soundmodeskip")) {
-               i++;
-               sound_mode_skip = getval (np);
-               continue;
-           }
-           if (!strcmp (arg, "-ini")) {
-               i++;
-               inipath = my_strdup (np);
-               continue;
-           }
-           if (!strcmp (arg, "-p96skipmode")) {
-               extern int p96skipmode;
-               i++;
-               p96skipmode = getval (np);
-               continue;
-           }
-           if (!strcmp (arg, "-minidumpmode")) {
-               i++;
-               minidumpmode = getval (np);
-               continue;
-           }
-           if (!strcmp (arg, "-jitevent")) {
-               i++;
-               pissoff_value = getval (np);
-               continue;
-           }
+    if (!strcmp (arg, "-ddforcemode")) {
+       extern int ddforceram;
+       ddforceram = getval (np);
+       if (ddforceram < 0 || ddforceram > 3)
+           ddforceram = 0;
+       return 2;
+    }
+    if (!strcmp (arg, "-affinity")) {
+       cpu_affinity = getval (np);
+       if (cpu_affinity == 0)
+           cpu_affinity = original_affinity;
+       SetThreadAffinityMask (GetCurrentThread (), cpu_affinity);
+       return 2;
+    }
+    if (!strcmp (arg, "-paffinity")) {
+       cpu_paffinity = getval (np);
+       if (cpu_paffinity == 0)
+           cpu_paffinity = original_affinity;
+       SetProcessAffinityMask (GetCurrentProcess (), cpu_paffinity);
+       return 2;
+    }
+    if (!strcmp (arg, "-datapath")) {
+       strcpy(start_path_data, np);
+       start_data = -1;
+       return 2;
+    }
+    if (!strcmp (arg, "-maxmem")) {
+       maxmem = getval (np);
+       return 2;
+    }
+    if (!strcmp (arg, "-soundmodeskip")) {
+       sound_mode_skip = getval (np);
+       return 2;
+    }
+    if (!strcmp (arg, "-ini")) {
+       inipath = my_strdup (np);
+       return 2;
+    }
+    if (!strcmp (arg, "-p96skipmode")) {
+       extern int p96skipmode;
+       p96skipmode = getval (np);
+       return 2;
+    }
+    if (!strcmp (arg, "-minidumpmode")) {
+       minidumpmode = getval (np);
+       return 2;
+    }
+    if (!strcmp (arg, "-jitevent")) {
+       pissoff_value = getval (np);
+       return 2;
+    }
 #ifdef RETROPLATFORM
-           if (!strcmp (arg, "-rphost")) {
-               i++;
-               rp_param = my_strdup (np);
-               continue;
-           }
-           if (!strcmp (arg, "-rpescapekey")) {
-               i++;
-               rp_rpescapekey = getval (np);
-               continue;
-           }
-           if (!strcmp (arg, "-rpescapeholdtime")) {
-               i++;
-               rp_rpescapeholdtime = getval (np);
-               continue;
-           }
-           if (!strcmp (arg, "-rpscreenmode")) {
-               i++;
-               rp_screenmode = getval (np);
-               continue;
-           }
-           if (!strcmp (arg, "-rpinputmode")) {
-               i++;
-               rp_inputmode = getval (np);
-               continue;
-           }
+    if (!strcmp (arg, "-rphost")) {
+       rp_param = my_strdup (np);
+       return 2;
+    }
+    if (!strcmp (arg, "-rpescapekey")) {
+       rp_rpescapekey = getval (np);
+       return 2;
+    }
+    if (!strcmp (arg, "-rpescapeholdtime")) {
+       rp_rpescapeholdtime = getval (np);
+       return 2;
+    }
+    if (!strcmp (arg, "-rpscreenmode")) {
+       rp_screenmode = getval (np);
+       return 2;
+    }
+    if (!strcmp (arg, "-rpinputmode")) {
+       rp_inputmode = getval (np);
+       return 2;
+    }
 #endif
+    return 0;
+}
+
+
+static char **parseargstring (char *s, char **xargv)
+{
+    int cnt, i, xargc;
+    char **args;
+
+    if (strlen (s) == 0)
+       return NULL;
+
+    args = xcalloc (sizeof (char*), 32 + 1);
+    cnt = 0;
+    for (;;) {
+       char *p = s;
+       int skip = 0;
+       while (*p && isspace (*p))
+           p++;
+       if (*p == 0)
+           break;
+       if (*p == '\'' || *p == '"') {
+           p++;
+           s++;
+           while (*p && *p != '\'' && *p != '"')
+               p++;
+           skip = 1;
+       } else {
+           while (*p && !isspace (*p))
+               p++;
        }
-       xargv[xargc++] = my_strdup (arg);
+       args[cnt] = xcalloc (p - s + 1, 1);
+       memcpy (args[cnt++], s, p - s);
+       p += skip;
+       while (*p && isspace (*p))
+           p++;
+       if (*p == 0)
+           break;
+       if (cnt >= 32)
+           break;
+       s = p;
+    }
+    for (xargc = 0; xargv[xargc]; xargc++);
+    for (i = 0; i < cnt; i++) {
+       char *arg = args[i];
+       char *next = i + 1 < cnt ? args[i + 1] : NULL;
+       int v = parseargs (arg, next);
+       if (!v)
+           xargv[xargc++] = my_strdup (arg);
+       else if (v == 2)
+           i++;
+    }
+    return args;
+}
+
+
+static int process_arg (char **xargv)
+{
+    int i, argc, xargc;
+    char **argv;
+
+    xargc = 0;
+    argc = __argc; argv = __argv;
+    xargv[xargc++] = my_strdup (argv[0]);
+    for (i = 1; i < argc; i++) {
+       char *arg = argv[i];
+       char *next = i + 1 < argc ? argv[i + 1] : NULL;
+       int v = parseargs (arg, next);
+       if (!v)
+           xargv[xargc++] = my_strdup (arg);
+       else if (v == 2)
+           i++;
     }
 #if 0
     argv = 0;
@@ -3517,10 +3580,29 @@ static int process_arg (char **xargv)
     return xargc;
 }
 
+static char **WIN32_InitRegistry (char **argv)
+{
+    DWORD disposition;
+    char tmp[MAX_DPATH];
+    DWORD size = sizeof tmp;
+
+    reginitializeinit (inipath);
+    hWinUAEKey = NULL;
+    if (getregmode () == 0 || WINUAEPUBLICBETA > 0) {
+       /* Create/Open the hWinUAEKey which points our config-info */
+       RegCreateKeyEx (HKEY_CURRENT_USER, "Software\\Arabuusimiehet\\WinUAE", 0, "", REG_OPTION_NON_VOLATILE,
+           KEY_WRITE | KEY_READ, NULL, &hWinUAEKey, &disposition);
+    }
+    if (regquerystr (NULL, "Commandline", tmp, &size))
+       return parseargstring (tmp, argv);
+    return NULL;
+}
+
+
 static int PASCAL WinMain2 (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
 {
     HANDLE hMutex;
-    char **argv;
+    char **argv = NULL, **argv2 = NULL;
     int argc, i;
 
 #ifdef _DEBUG
@@ -3551,15 +3633,21 @@ static int PASCAL WinMain2 (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR
     argv = xcalloc (sizeof (char*),  __argc);
     argc = process_arg (argv);
 
-    reginitializeinit (inipath);
+    argv2 = WIN32_InitRegistry (argv);
     getstartpaths ();
     makeverstr (VersionStr);
 
     logging_init ();
-    write_log ("params:\n");
-    for (i = 1; i < __argc; i++)
-       write_log ("%d: '%s'\n", i, __argv[i]);
-
+    if (__argc > 1) {
+       write_log ("params:\n");
+       for (i = 1; i < __argc; i++)
+           write_log ("%d: '%s'\n", i, __argv[i]);
+    }
+    if (argv2) {
+       write_log ("extra params:\n");
+       for (i = 0; argv2[i]; i++)
+           write_log ("%d: '%s'\n", i + 1, argv2[i]);
+    }
     if (WIN32_RegisterClasses () && WIN32_InitLibraries () && DirectDraw_Start (NULL)) {
        DEVMODE devmode;
        DWORD i;
@@ -3639,6 +3727,11 @@ static int PASCAL WinMain2 (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR
     for (i = 0; i < argc; i++)
        xfree (argv[i]);
     xfree (argv);
+    if (argv2) {
+       for (i = 0; argv2[i]; i++)
+           xfree (argv2[i]);
+       xfree (argv2);
+    }
     return FALSE;
 }
 

diff --git a/od-win32/win32.h b/od-win32/win32.h
old mode 100755 (executable)
new mode 100644 (file)
index 1e82db7..a2a389f
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -17,8 +17,8 @@
 
 #define WINUAEPUBLICBETA 1
 
-#define WINUAEBETA "7"
-#define WINUAEDATE MAKEBD(2009, 1, 3)
+#define WINUAEBETA "8"
+#define WINUAEDATE MAKEBD(2009, 1, 11)
 #define WINUAEEXTRA ""
 #define WINUAEREV ""
 
@@ -71,7 +71,8 @@ extern int framecnt;
 extern char prtname[];
 extern char VersionStr[256];
 extern char BetaStr[64];
-extern int os_winnt_admin, os_64bit, os_vista, os_winxp;
+extern int os_winnt_admin, os_64bit, os_vista, os_winxp, os_win7;
+extern OSVERSIONINFO osVersion;
 extern int paraport_mask;
 extern int gui_active;
 extern DWORD quickstart, configurationcache;

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

diff --git a/od-win32/win32_filesys.c b/od-win32/win32_filesys.c
old mode 100755 (executable)
new mode 100644 (file)
index ab7e27a..5322745
--- a/od-win32/win32_filesys.c
+++ b/od-win32/win32_filesys.c
@@ -122,7 +122,9 @@ static void filesys_addexternals(void)
                }
                if (drivetype == DRIVE_REMOTE && currprefs.win32_automount_netdrives)
                    break;
-               if ((drivetype == DRIVE_FIXED || drivetype == DRIVE_REMOVABLE) && currprefs.win32_automount_drives)
+               if (drivetype == DRIVE_FIXED && currprefs.win32_automount_drives)
+                   break;
+               if (drivetype == DRIVE_REMOVABLE && currprefs.win32_automount_removabledrives)
                    break;
                nok = TRUE;
                break;

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

diff --git a/od-win32/win32_scale2x.c b/od-win32/win32_scale2x.c
old mode 100755 (executable)
new mode 100644 (file)
index d021fef..d23c667
--- a/od-win32/win32_scale2x.c
+++ b/od-win32/win32_scale2x.c
@@ -137,6 +137,46 @@ void getfilterrect2 (RECT *sr, RECT *dr, RECT *zr, int dst_width, int dst_height
 
            if (currprefs.gfx_filter_autoscale == 2 && isfullscreen () == 0) {
                int ww;
+               static int lastresize = 0;
+               static int lastdelay = 1;
+               static int ocw, och, ocx, ocy, lcw, lch, lcx, lcy;
+               int useold = 0;
+
+               lastresize--;
+               if (lastresize > 0) {
+                   if (cw != lcw || ch != lch || cx != lcx || cy != lcy)
+                       lastresize = 50;
+                   useold = 1;
+               } else if (lastdelay == 0) {
+                   lastdelay = 2;
+                   useold = 1;
+               } else if (lastdelay > 0) {
+                   lastdelay--;
+                   useold = 1;
+                   if (lastdelay == 0) {
+                       lastdelay = -1;
+                       useold = 0;
+                   }
+               }
+
+               lcw = cw;
+               lch = ch;
+               lcx = cx;
+               lcy = cy;
+               if (useold) {
+                   cw = ocw;
+                   ch = och;
+                   cx = ocx;
+                   cy = ocy;
+               } else {
+                   ocw = cw;
+                   och = ch;
+                   ocx = cx;
+                   ocy = cy;
+                   lastresize = 50;
+                   lastdelay = 0;
+               }
+
                SetRect (sr, 0, 0, cw * scale, ch * scale);
                dr->left = (temp_width - aws) /2;
                dr->top =  (temp_height - ahs) / 2;

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

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

diff --git a/od-win32/win32gfx.c b/od-win32/win32gfx.c
old mode 100755 (executable)
new mode 100644 (file)
index b82c01a..3fbfec4
--- a/od-win32/win32gfx.c
+++ b/od-win32/win32gfx.c
@@ -1087,6 +1087,7 @@ int check_prefs_changed_gfx (void)
     c |= currprefs.gfx_resolution != changed_prefs.gfx_resolution ? (2 | 8) : 0;
     c |= currprefs.gfx_linedbl != changed_prefs.gfx_linedbl ? (2 | 8) : 0;
     c |= currprefs.gfx_lores_mode != changed_prefs.gfx_lores_mode ? (2 | 8) : 0;
+    c |= currprefs.gfx_scandoubler != changed_prefs.gfx_scandoubler ? (2 | 8) : 0;
     c |= currprefs.gfx_display != changed_prefs.gfx_display ? (2|4|8) : 0;
     c |= strcmp (currprefs.gfx_display_name, changed_prefs.gfx_display_name) ? (2|4|8) : 0;
     c |= currprefs.gfx_blackerthanblack != changed_prefs.gfx_blackerthanblack ? (2 | 8) : 0;
@@ -1146,6 +1147,7 @@ int check_prefs_changed_gfx (void)
        //currprefs.gfx_filter_ = changed_prefs.gfx_filter_;
 
        currprefs.gfx_lores_mode = changed_prefs.gfx_lores_mode;
+       currprefs.gfx_scandoubler = changed_prefs.gfx_scandoubler;
        currprefs.gfx_resolution = changed_prefs.gfx_resolution;
        currprefs.gfx_linedbl = changed_prefs.gfx_linedbl;
        currprefs.gfx_display = changed_prefs.gfx_display;

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

diff --git a/od-win32/win32gui.c b/od-win32/win32gui.c
old mode 100755 (executable)
new mode 100644 (file)
index 0242ad0..886052c
--- a/od-win32/win32gui.c
+++ b/od-win32/win32gui.c
@@ -1291,6 +1291,48 @@ static void gui_to_prefs (void)
 
     updatewinfsmode (&changed_prefs);
 }
+#if 0
+static BOOL GetNewFileName (OPENFILENAME *opn, int save)
+{  
+    IFileDialog *pfd;
+    HRESULT hr;
+
+    // CoCreate the dialog object.
+    hr = CoCreateInstance(CLSID_FileOpenDialog, 
+           NULL, 
+            CLSCTX_INPROC_SERVER, 
+            IID_PPV_ARG(IFileDialog, &pfd));
+    if (SUCCEEDED(hr)) {
+        // Show the dialog
+        hr = pfd->Show(hwnd);
+        if (SUCCEEDED(hr)) {
+            // Obtain the result of the user's interaction with the dialog.
+            IShellItem *psiResult;
+            hr = pfd->GetResult(&psiResult);
+            if (SUCCEEDED(hr)) {
+                // Do something with the result.
+                psiResult->Release();
+            }
+        }
+        pfd->Release();
+    }
+    return SUCCEEDED(hr);
+}
+#endif
+static BOOL GetOpenFileName_2 (OPENFILENAME *opn)
+{
+    if (osVersion.dwMajorVersion < 6)
+       return GetOpenFileName (opn);
+    return GetOpenFileName (opn);
+}
+
+static BOOL GetSaveFileName_2 (OPENFILENAME *opn)
+{
+    if (osVersion.dwMajorVersion < 6)
+       return GetSaveFileName (opn);
+    return GetSaveFileName (opn);
+}
+
 
 // Common routine for popping up a file-requester
 // flag - 0 for floppy loading, 1 for floppy creation, 2 for loading hdf, 3 for saving hdf
@@ -1545,26 +1587,21 @@ int DiskSelection_2 (HWND hDlg, WPARAM wParam, int flag, struct uae_prefs *prefs
     }
     openFileName.Flags = OFN_EXPLORER | OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST |
        OFN_LONGNAMES | OFN_HIDEREADONLY | OFN_NOCHANGEDIR;
-    openFileName.lpstrCustomFilter = NULL;
-    openFileName.nMaxCustFilter = 0;
     openFileName.nFilterIndex = filterindex;
     openFileName.lpstrFile = full_path;
     openFileName.nMaxFile = MAX_DPATH;
     openFileName.lpstrFileTitle = file_name;
     openFileName.nMaxFileTitle = MAX_DPATH;
     openFileName.lpstrInitialDir = init_path;
-    openFileName.lpfnHook = NULL;
-    openFileName.lpTemplateName = NULL;
-    openFileName.lCustData = 0;
     openFileName.lpstrTitle = szTitle;
 
     if (multi)
        openFileName.Flags |= OFN_ALLOWMULTISELECT;
     if (flag == 1 || flag == 3 || flag == 5 || flag == 9 || flag == 11 || flag == 16) {
-       if (!(result = GetSaveFileName (&openFileName)))
+       if (!(result = GetSaveFileName_2 (&openFileName)))
            write_log ("GetSaveFileName() failed, err=%d.\n", GetLastError());
     } else {
-       if (!(result = GetOpenFileName (&openFileName)))
+       if (!(result = GetOpenFileName_2 (&openFileName)))
            write_log ("GetOpenFileName() failed, err=%d.\n", GetLastError());
     }
     memcpy (full_path2, full_path, sizeof (full_path));
@@ -4661,6 +4698,7 @@ static void values_to_displaydlg (HWND hDlg)
 
     CheckDlgButton (hDlg, IDC_BLACKER_THAN_BLACK, workprefs.gfx_blackerthanblack);
     CheckDlgButton (hDlg, IDC_LORES_SMOOTHED, workprefs.gfx_lores_mode);
+    CheckDlgButton (hDlg, IDC_FLICKERFIXER, workprefs.gfx_scandoubler);
 
     CheckDlgButton (hDlg, IDC_XCENTER, workprefs.gfx_xcenter);
     CheckDlgButton (hDlg, IDC_YCENTER, workprefs.gfx_ycenter);
@@ -4711,6 +4749,7 @@ static void values_from_displaydlg (HWND hDlg, UINT msg, WPARAM wParam, LPARAM l
        &workprefs.gfx_pfullscreen, &workprefs.gfx_pvsync, 1);
 
     workprefs.gfx_lores_mode     = IsDlgButtonChecked (hDlg, IDC_LORES_SMOOTHED);
+    workprefs.gfx_scandoubler     = IsDlgButtonChecked (hDlg, IDC_FLICKERFIXER);
     workprefs.gfx_blackerthanblack = IsDlgButtonChecked (hDlg, IDC_BLACKER_THAN_BLACK);
     workprefs.gfx_linedbl = (IsDlgButtonChecked(hDlg, IDC_LM_SCANLINES) ? 2 :
                              IsDlgButtonChecked(hDlg, IDC_LM_DOUBLED) ? 1 : 0);
@@ -7813,6 +7852,10 @@ static void harddiskdlg_button (HWND hDlg, int button)
        workprefs.win32_automount_drives = IsDlgButtonChecked (hDlg, IDC_MAPDRIVES);
        break;
 
+     case IDC_MAPDRIVES_REMOVABLE:
+       workprefs.win32_automount_removabledrives = IsDlgButtonChecked (hDlg, IDC_MAPDRIVES_REMOVABLE);
+       break;
+
      case IDC_MAPDRIVES_CD:
        workprefs.win32_automount_cddrives = IsDlgButtonChecked (hDlg, IDC_MAPDRIVES_CD);
        break;
@@ -7886,6 +7929,7 @@ static INT_PTR CALLBACK HarddiskDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPA
        CheckDlgButton (hDlg, IDC_MAPDRIVES, workprefs.win32_automount_drives);
        CheckDlgButton (hDlg, IDC_MAPDRIVES_CD, workprefs.win32_automount_cddrives);
        CheckDlgButton (hDlg, IDC_MAPDRIVES_NET, workprefs.win32_automount_netdrives);
+       CheckDlgButton (hDlg, IDC_MAPDRIVES_REMOVABLE, workprefs.win32_automount_removabledrives);
        CheckDlgButton (hDlg, IDC_NOUAEFSDB, workprefs.filesys_no_uaefsdb);
        CheckDlgButton (hDlg, IDC_NORECYCLEBIN, workprefs.win32_norecyclebin);
        InitializeListView (hDlg);
@@ -9870,6 +9914,60 @@ static struct filterpreset filterpresets[] =
     { NULL }
 };
 
+static int getfiltermult(HWND hDlg, DWORD dlg)
+{
+    char tmp[100];
+    LRESULT v = SendDlgItemMessage (hDlg, dlg, CB_GETCURSEL, 0, 0L);
+    float f;
+
+    if (v != CB_ERR)
+       return filtermults[v];
+    SendDlgItemMessage (hDlg, dlg, WM_GETTEXT, (WPARAM)sizeof tmp, (LPARAM)tmp);
+    if (!stricmp (tmp, "FS"))
+       return 0;
+    f = atof (tmp);
+    if (f < 0)
+       f = 0;
+    if (f > 9)
+       f = 9;
+    return (int)(1000.0 / f);
+}
+
+static void setfiltermult2 (HWND hDlg, int id, int val)
+{
+    int i, got;
+
+    got = 0;
+    SendDlgItemMessage (hDlg, id, CB_SETCURSEL, 0, 0);
+    for (i = 0; filtermultnames[i]; i++) {
+       if (filtermults[i] == val) {
+           SendDlgItemMessage (hDlg, id, CB_SETCURSEL, i, 0);
+           got = 1;
+       }
+    }
+    if (!got) {
+       char tmp[100];
+       tmp[0] = 0;
+       if (val > 0)
+           sprintf (tmp, "%.2f", 1000.0 / val);
+       SetDlgItemText (hDlg, id, tmp);
+    }
+}
+
+static void setfiltermult (HWND hDlg)
+{
+    int i;
+
+    SendDlgItemMessage (hDlg, IDC_FILTERHZMULT, CB_RESETCONTENT, 0, 0L);
+    SendDlgItemMessage (hDlg, IDC_FILTERVZMULT, CB_RESETCONTENT, 0, 0L);
+    for (i = 0; filtermultnames[i]; i++) {
+       SendDlgItemMessage (hDlg, IDC_FILTERHZMULT, CB_ADDSTRING, 0, (LPARAM)filtermultnames[i]);
+       SendDlgItemMessage (hDlg, IDC_FILTERVZMULT, CB_ADDSTRING, 0, (LPARAM)filtermultnames[i]);
+    }
+    setfiltermult2 (hDlg, IDC_FILTERHZMULT, workprefs.gfx_filter_horiz_zoom_mult);
+    setfiltermult2 (hDlg, IDC_FILTERVZMULT, workprefs.gfx_filter_vert_zoom_mult);
+}
+
 static void values_to_hw3ddlg (HWND hDlg)
 {
     char txt[100], tmp[100];
@@ -10017,20 +10115,7 @@ static void values_to_hw3ddlg (HWND hDlg)
        workprefs.gfx_filter_filtermode = 0;
     SendDlgItemMessage (hDlg, IDC_FILTERFILTER, CB_SETCURSEL, workprefs.gfx_filter_filtermode, 0);
 
-    SendDlgItemMessage (hDlg, IDC_FILTERHZMULT, CB_RESETCONTENT, 0, 0L);
-    SendDlgItemMessage (hDlg, IDC_FILTERVZMULT, CB_RESETCONTENT, 0, 0L);
-    for (i = 0; filtermultnames[i]; i++) {
-       SendDlgItemMessage (hDlg, IDC_FILTERHZMULT, CB_ADDSTRING, 0, (LPARAM)filtermultnames[i]);
-       SendDlgItemMessage (hDlg, IDC_FILTERVZMULT, CB_ADDSTRING, 0, (LPARAM)filtermultnames[i]);
-    }
-    SendDlgItemMessage (hDlg, IDC_FILTERHZMULT, CB_SETCURSEL, 0, 0);
-    SendDlgItemMessage (hDlg, IDC_FILTERVZMULT, CB_SETCURSEL, 0, 0);
-    for (i = 0; filtermultnames[i]; i++) {
-       if (filtermults[i] == workprefs.gfx_filter_horiz_zoom_mult)
-           SendDlgItemMessage (hDlg, IDC_FILTERHZMULT, CB_SETCURSEL, i, 0);
-       if (filtermults[i] == workprefs.gfx_filter_vert_zoom_mult)
-           SendDlgItemMessage (hDlg, IDC_FILTERVZMULT, CB_SETCURSEL, i, 0);
-    }
+    setfiltermult (hDlg);
 
     SendDlgItemMessage (hDlg, IDC_FILTERSLR, CB_RESETCONTENT, 0, 0L);
     i = j = 0;
@@ -10218,14 +10303,6 @@ static void filter_handle (HWND hDlg)
     updatedisplayarea ();
 }
 
-static int getfiltermult(HWND hDlg, DWORD dlg)
-{
-    LRESULT v = SendDlgItemMessage (hDlg, dlg, CB_GETCURSEL, 0, 0L);
-    if (v == CB_ERR)
-       return 1000;
-    return filtermults[v];
-}
-
 static INT_PTR CALLBACK hw3dDlgProc (HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam)
 {
     static int recursive;

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

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

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

diff --git a/od-win32/winuae_msvc/winuae_msvc.vcproj b/od-win32/winuae_msvc/winuae_msvc.vcproj
old mode 100755 (executable)
new mode 100644 (file)
index 877ae6d..5ebbfad
--- a/od-win32/winuae_msvc/winuae_msvc.vcproj
+++ b/od-win32/winuae_msvc/winuae_msvc.vcproj
@@ -1285,6 +1285,10 @@
                                RelativePath="..\caps\caps_win32.c"
                                >
                        </File>
+                       <File
+                               RelativePath="..\clipboard.c"
+                               >
+                       </File>
                        <File
                                RelativePath="..\debug_win32.c"
                                >

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
old mode 100755 (executable)
new mode 100644 (file)
index 8150100..a01cd4a
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,39 @@
 
+Beta 8:
+
+- UAE boot rom was enabled when it should not have been (b7)
+- little blitter tweak, writing to bltcon1 while blitter was
+  enabled confused blitter emulation in some cases
+- filter multiplier select boxes now support manually entered
+  multipliers, for example 2.5 = 2.5x.
+- "Commandline" registry (or ini) string entry will be parsed as a
+  command line (separate step after normal command line parsing)
+- built-in hrtmon cycle-exact mode issue fixed
+- non-interlace to interlace switch issue fixed (another one,
+  they never end..)
+- do not autoresize unless display parameters are stable for next 50
+  frames
+- added "Include removable drives.." option. Now "Add PC drives" only
+  adds nonremovable drives. USB etc. will be only mounted at startup
+  if new option is ticked. "Workaround" for case when "Automount
+  removable drives" is ticked but USB (or whatever) drive is already
+  inserted.
+- removable drive insert/eject used unallocated signal bit, it did not
+  cause problems but fixed now
+- experimental "flicker fixer" implemented. Works perfectly in WB, not
+  so perfect in games yet (and impossible to get perfect in all cases,
+  as usual..) No more interlace artifacts when any graphics object or
+  mouse pointer moves.
+  
+  NOTE: first and last line will flicker or show garbage.
+  
+  Technical details: normal interlaced display goes like this: draw
+  even lines (0, 2, 4, etc..), next frame draws odd lines (1, 3, 5..)
+  This makes 25Hz refresh rate and also causes interlace artifacts when
+  objects move. UAE flickerfixer draws both fields simultaneously,
+  even lines = 0,1*,2,3*,4,5* and odd lines (0*,1,2*,3..).
+  * = draw display using bitplane pointers stored during previous frame
+  
 Beta 7:
 
 - version number bumped to 1.6.0
@@ -40,7 +75,7 @@ Beta 7:
   fixable)
 - NOTE3: both real and "fake" cursor is temporarily visible in mouse
   sync modes. They should always be in 100% sync and have identical
-  shape. (but aren't, still work to do..)
+  shape. (but aren't, still much work to do..)
 
 Beta 6:
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/uaeipc.c b/uaeipc.c
old mode 100755 (executable)
new mode 100644 (file)
index 0e49d1b..9872fd7
--- a/uaeipc.c
+++ b/uaeipc.c
@@ -103,6 +103,8 @@ static void resetIPC(struct uaeipc *ipc)
 
 void closeIPC(struct uaeipc *ipc)
 {
+    if (!ipc)
+       return;
     disconnectIPC(ipc);
     if (ipc->hipc == INVALID_HANDLE_VALUE)
        return;

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

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

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

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

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

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