From: Toni Wilen Date: Tue, 16 Jan 2007 19:05:00 +0000 (+0200) Subject: imported winuaesrc1400b1a.zip X-Git-Tag: 2100~250 X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=9fc7316a739bb4907b80da06d49651389aaedccd;p=francis%2Fwinuae.git imported winuaesrc1400b1a.zip --- diff --git a/7z/7zAlloc.c b/7z/7zAlloc.c old mode 100644 new mode 100755 diff --git a/7z/7zAlloc.h b/7z/7zAlloc.h old mode 100644 new mode 100755 diff --git a/7z/7zBuffer.c b/7z/7zBuffer.c old mode 100644 new mode 100755 diff --git a/7z/7zBuffer.h b/7z/7zBuffer.h old mode 100644 new mode 100755 diff --git a/7z/7zCrc.c b/7z/7zCrc.c old mode 100644 new mode 100755 diff --git a/7z/7zCrc.h b/7z/7zCrc.h old mode 100644 new mode 100755 diff --git a/7z/7zDecode.c b/7z/7zDecode.c old mode 100644 new mode 100755 diff --git a/7z/7zDecode.h b/7z/7zDecode.h old mode 100644 new mode 100755 diff --git a/7z/7zExtract.c b/7z/7zExtract.c old mode 100644 new mode 100755 diff --git a/7z/7zExtract.h b/7z/7zExtract.h old mode 100644 new mode 100755 diff --git a/7z/7zHeader.c b/7z/7zHeader.c old mode 100644 new mode 100755 diff --git a/7z/7zHeader.h b/7z/7zHeader.h old mode 100644 new mode 100755 diff --git a/7z/7zIn.c b/7z/7zIn.c old mode 100644 new mode 100755 diff --git a/7z/7zIn.h b/7z/7zIn.h old mode 100644 new mode 100755 diff --git a/7z/7zItem.c b/7z/7zItem.c old mode 100644 new mode 100755 diff --git a/7z/7zItem.h b/7z/7zItem.h old mode 100644 new mode 100755 diff --git a/7z/7zMain.c b/7z/7zMain.c old mode 100644 new mode 100755 diff --git a/7z/7zMethodID.c b/7z/7zMethodID.c old mode 100644 new mode 100755 diff --git a/7z/7zMethodID.h b/7z/7zMethodID.h old mode 100644 new mode 100755 diff --git a/7z/7zTypes.h b/7z/7zTypes.h old mode 100644 new mode 100755 diff --git a/7z/LzmaDecode.c b/7z/LzmaDecode.c old mode 100644 new mode 100755 diff --git a/7z/LzmaDecode.h b/7z/LzmaDecode.h old mode 100644 new mode 100755 diff --git a/7z/LzmaTypes.h b/7z/LzmaTypes.h old mode 100644 new mode 100755 diff --git a/ChangeLog b/ChangeLog old mode 100644 new mode 100755 diff --git a/akiko.c b/akiko.c old mode 100644 new mode 100755 diff --git a/akiko2.c b/akiko2.c old mode 100644 new mode 100755 diff --git a/ar.c b/ar.c old mode 100644 new mode 100755 diff --git a/arcadia.c b/arcadia.c old mode 100644 new mode 100755 diff --git a/audio.c b/audio.c old mode 100644 new mode 100755 diff --git a/autoconf.c b/autoconf.c old mode 100644 new mode 100755 diff --git a/blitops.c b/blitops.c old mode 100644 new mode 100755 diff --git a/blitter.c b/blitter.c old mode 100644 new mode 100755 diff --git a/blitter2.c b/blitter2.c old mode 100644 new mode 100755 diff --git a/blitter3.c b/blitter3.c old mode 100644 new mode 100755 diff --git a/blkdev.c b/blkdev.c old mode 100644 new mode 100755 diff --git a/bsdsocket.c b/bsdsocket.c old mode 100644 new mode 100755 diff --git a/build68k.c b/build68k.c old mode 100644 new mode 100755 diff --git a/catweasel.c b/catweasel.c old mode 100644 new mode 100755 diff --git a/cdrom.c b/cdrom.c old mode 100644 new mode 100755 diff --git a/cdtv.c b/cdtv.c old mode 100644 new mode 100755 diff --git a/cfgfile.c b/cfgfile.c old mode 100644 new mode 100755 diff --git a/cia.c b/cia.c old mode 100644 new mode 100755 diff --git a/compemu_fpp.c b/compemu_fpp.c old mode 100644 new mode 100755 diff --git a/compemu_optimizer.c b/compemu_optimizer.c old mode 100644 new mode 100755 diff --git a/compemu_optimizer_x86.c b/compemu_optimizer_x86.c old mode 100644 new mode 100755 diff --git a/compemu_raw_x86.c b/compemu_raw_x86.c old mode 100644 new mode 100755 diff --git a/compemu_support.c b/compemu_support.c old mode 100644 new mode 100755 diff --git a/core.cw4.c b/core.cw4.c old mode 100644 new mode 100755 diff --git a/cpuopti.c b/cpuopti.c old mode 100644 new mode 100755 diff --git a/crc32.c b/crc32.c old mode 100644 new mode 100755 diff --git a/custom.c b/custom.c old mode 100644 new mode 100755 diff --git a/custom2.c b/custom2.c old mode 100644 new mode 100755 diff --git a/debug.c b/debug.c old mode 100644 new mode 100755 diff --git a/disk.c b/disk.c old mode 100644 new mode 100755 index 3ea48f79..6bdadd28 --- a/disk.c +++ b/disk.c @@ -2060,7 +2060,7 @@ void DISK_check_change (void) currprefs.dfxtype[i] = changed_prefs.dfxtype[i]; reset_drive (i); } - if (strcmp (currprefs.df[i], changed_prefs.df[i])) + if (drv->dskchange_time == 0 && strcmp (currprefs.df[i], changed_prefs.df[i])) disk_insert (i, changed_prefs.df[i]); gui_unlock (); if (drv->dskready_down_time > 0) diff --git a/dms/cdata.h b/dms/cdata.h old mode 100644 new mode 100755 diff --git a/dms/crc_csum.c b/dms/crc_csum.c old mode 100644 new mode 100755 diff --git a/dms/crc_csum.h b/dms/crc_csum.h old mode 100644 new mode 100755 diff --git a/dms/getbits.c b/dms/getbits.c old mode 100644 new mode 100755 diff --git a/dms/getbits.h b/dms/getbits.h old mode 100644 new mode 100755 diff --git a/dms/maketbl.c b/dms/maketbl.c old mode 100644 new mode 100755 diff --git a/dms/maketbl.h b/dms/maketbl.h old mode 100644 new mode 100755 diff --git a/dms/pfile.c b/dms/pfile.c old mode 100644 new mode 100755 diff --git a/dms/pfile.h b/dms/pfile.h old mode 100644 new mode 100755 diff --git a/dms/tables.c b/dms/tables.c old mode 100644 new mode 100755 diff --git a/dms/tables.h b/dms/tables.h old mode 100644 new mode 100755 diff --git a/dms/u_deep.c b/dms/u_deep.c old mode 100644 new mode 100755 diff --git a/dms/u_deep.h b/dms/u_deep.h old mode 100644 new mode 100755 diff --git a/dms/u_heavy.c b/dms/u_heavy.c old mode 100644 new mode 100755 diff --git a/dms/u_heavy.h b/dms/u_heavy.h old mode 100644 new mode 100755 diff --git a/dms/u_init.c b/dms/u_init.c old mode 100644 new mode 100755 diff --git a/dms/u_init.h b/dms/u_init.h old mode 100644 new mode 100755 diff --git a/dms/u_medium.c b/dms/u_medium.c old mode 100644 new mode 100755 diff --git a/dms/u_medium.h b/dms/u_medium.h old mode 100644 new mode 100755 diff --git a/dms/u_quick.c b/dms/u_quick.c old mode 100644 new mode 100755 diff --git a/dms/u_quick.h b/dms/u_quick.h old mode 100644 new mode 100755 diff --git a/dms/u_rle.c b/dms/u_rle.c old mode 100644 new mode 100755 diff --git a/dms/u_rle.h b/dms/u_rle.h old mode 100644 new mode 100755 diff --git a/drawing.c b/drawing.c old mode 100644 new mode 100755 diff --git a/driveclick.c b/driveclick.c old mode 100644 new mode 100755 diff --git a/enforcer.c b/enforcer.c old mode 100644 new mode 100755 diff --git a/ersatz.c b/ersatz.c old mode 100644 new mode 100755 diff --git a/expansion.c b/expansion.c old mode 100644 new mode 100755 diff --git a/fdi2raw.c b/fdi2raw.c old mode 100644 new mode 100755 diff --git a/filesys.asm b/filesys.asm old mode 100644 new mode 100755 diff --git a/filesys.c b/filesys.c old mode 100644 new mode 100755 diff --git a/filesys.sh b/filesys.sh old mode 100644 new mode 100755 diff --git a/filesys_bootrom.c b/filesys_bootrom.c old mode 100644 new mode 100755 diff --git a/fpp.c b/fpp.c old mode 100644 new mode 100755 diff --git a/fsdb.c b/fsdb.c old mode 100644 new mode 100755 diff --git a/fsdb_unix.c b/fsdb_unix.c old mode 100644 new mode 100755 diff --git a/fsusage.c b/fsusage.c old mode 100644 new mode 100755 diff --git a/gayle.c b/gayle.c old mode 100644 new mode 100755 diff --git a/genblitter.c b/genblitter.c old mode 100644 new mode 100755 diff --git a/gencomp.c b/gencomp.c old mode 100644 new mode 100755 diff --git a/gencpu.c b/gencpu.c old mode 100644 new mode 100755 diff --git a/gengenblitter.c b/gengenblitter.c old mode 100644 new mode 100755 diff --git a/genlinetoscr.c b/genlinetoscr.c old mode 100644 new mode 100755 diff --git a/genp2c.c b/genp2c.c old mode 100644 new mode 100755 diff --git a/gfxlib.c b/gfxlib.c old mode 100644 new mode 100755 diff --git a/gfxutil.c b/gfxutil.c old mode 100644 new mode 100755 diff --git a/gtkui.c b/gtkui.c old mode 100644 new mode 100755 diff --git a/hardfile.c b/hardfile.c old mode 100644 new mode 100755 diff --git a/hrtmon_rom.c b/hrtmon_rom.c old mode 100644 new mode 100755 diff --git a/identify.c b/identify.c old mode 100644 new mode 100755 diff --git a/include/akiko.h b/include/akiko.h old mode 100644 new mode 100755 diff --git a/include/ar.h b/include/ar.h old mode 100644 new mode 100755 diff --git a/include/arcadia.h b/include/arcadia.h old mode 100644 new mode 100755 diff --git a/include/audio.h b/include/audio.h old mode 100644 new mode 100755 diff --git a/include/autoconf.h b/include/autoconf.h old mode 100644 new mode 100755 diff --git a/include/blitter.h b/include/blitter.h old mode 100644 new mode 100755 diff --git a/include/blkdev.h b/include/blkdev.h old mode 100644 new mode 100755 diff --git a/include/bsdsocket.h b/include/bsdsocket.h old mode 100644 new mode 100755 diff --git a/include/catweasel.h b/include/catweasel.h old mode 100644 new mode 100755 diff --git a/include/cdtv.h b/include/cdtv.h old mode 100644 new mode 100755 diff --git a/include/cia.h b/include/cia.h old mode 100644 new mode 100755 diff --git a/include/commpipe.h b/include/commpipe.h old mode 100644 new mode 100755 diff --git a/include/compemu.h b/include/compemu.h old mode 100644 new mode 100755 diff --git a/include/cpu_prefetch.h b/include/cpu_prefetch.h old mode 100644 new mode 100755 diff --git a/include/crc32.h b/include/crc32.h old mode 100644 new mode 100755 diff --git a/include/custom.h b/include/custom.h old mode 100644 new mode 100755 diff --git a/include/debug.h b/include/debug.h old mode 100644 new mode 100755 diff --git a/include/disk.h b/include/disk.h old mode 100644 new mode 100755 diff --git a/include/drawing.h b/include/drawing.h old mode 100644 new mode 100755 diff --git a/include/driveclick.h b/include/driveclick.h old mode 100644 new mode 100755 diff --git a/include/enforcer.h b/include/enforcer.h old mode 100644 new mode 100755 diff --git a/include/ersatz.h b/include/ersatz.h old mode 100644 new mode 100755 diff --git a/include/events.h b/include/events.h old mode 100644 new mode 100755 diff --git a/include/events_jit.h b/include/events_jit.h old mode 100644 new mode 100755 diff --git a/include/events_normal.h b/include/events_normal.h old mode 100644 new mode 100755 diff --git a/include/execlib.h b/include/execlib.h old mode 100644 new mode 100755 diff --git a/include/fdi2raw.h b/include/fdi2raw.h old mode 100644 new mode 100755 diff --git a/include/filesys.h b/include/filesys.h old mode 100644 new mode 100755 diff --git a/include/filter.h b/include/filter.h old mode 100644 new mode 100755 diff --git a/include/fpp-ieee-be.h b/include/fpp-ieee-be.h old mode 100644 new mode 100755 diff --git a/include/fpp-unknown.h b/include/fpp-unknown.h old mode 100644 new mode 100755 diff --git a/include/fsdb.h b/include/fsdb.h old mode 100644 new mode 100755 diff --git a/include/fsusage.h b/include/fsusage.h old mode 100644 new mode 100755 diff --git a/include/gayle.h b/include/gayle.h old mode 100644 new mode 100755 diff --git a/include/genblitter.h b/include/genblitter.h old mode 100644 new mode 100755 diff --git a/include/gensound.h b/include/gensound.h old mode 100644 new mode 100755 diff --git a/include/gfxfilter.h b/include/gfxfilter.h old mode 100644 new mode 100755 diff --git a/include/gui.h b/include/gui.h old mode 100644 new mode 100755 diff --git a/include/identify.h b/include/identify.h old mode 100644 new mode 100755 diff --git a/include/inputdevice.h b/include/inputdevice.h old mode 100644 new mode 100755 diff --git a/include/keyboard.h b/include/keyboard.h old mode 100644 new mode 100755 diff --git a/include/keybuf.h b/include/keybuf.h old mode 100644 new mode 100755 diff --git a/include/mackbd.h b/include/mackbd.h old mode 100644 new mode 100755 diff --git a/include/memory.h b/include/memory.h old mode 100644 new mode 100755 diff --git a/include/moduleripper.h b/include/moduleripper.h old mode 100644 new mode 100755 diff --git a/include/native2amiga.h b/include/native2amiga.h old mode 100644 new mode 100755 diff --git a/include/newcpu.h b/include/newcpu.h old mode 100644 new mode 100755 diff --git a/include/options.h b/include/options.h old mode 100644 new mode 100755 diff --git a/include/osemu.h b/include/osemu.h old mode 100644 new mode 100755 diff --git a/include/parallel.h b/include/parallel.h old mode 100644 new mode 100755 diff --git a/include/picasso96.h b/include/picasso96.h old mode 100644 new mode 100755 diff --git a/include/readcpu.h b/include/readcpu.h old mode 100644 new mode 100755 diff --git a/include/savestate.h b/include/savestate.h old mode 100644 new mode 100755 diff --git a/include/scsidev.h b/include/scsidev.h old mode 100644 new mode 100755 diff --git a/include/serial.h b/include/serial.h old mode 100644 new mode 100755 diff --git a/include/sysconfig.h.win32 b/include/sysconfig.h.win32 old mode 100644 new mode 100755 diff --git a/include/sysdeps.h b/include/sysdeps.h old mode 100644 new mode 100755 diff --git a/include/traps.h b/include/traps.h old mode 100644 new mode 100755 diff --git a/include/tui.h b/include/tui.h old mode 100644 new mode 100755 diff --git a/include/uae.h b/include/uae.h old mode 100644 new mode 100755 diff --git a/include/uaeexe.h b/include/uaeexe.h old mode 100644 new mode 100755 diff --git a/include/uaeipc.h b/include/uaeipc.h old mode 100644 new mode 100755 diff --git a/include/uaeserial.h b/include/uaeserial.h old mode 100644 new mode 100755 diff --git a/include/unzip.h b/include/unzip.h old mode 100644 new mode 100755 diff --git a/include/xwin.h b/include/xwin.h old mode 100644 new mode 100755 diff --git a/include/zfile.h b/include/zfile.h old mode 100644 new mode 100755 diff --git a/inputdevice.c b/inputdevice.c old mode 100644 new mode 100755 index 5b2977e3..5a2d3bd7 --- a/inputdevice.c +++ b/inputdevice.c @@ -745,21 +745,32 @@ void read_inputdevice_config (struct uae_prefs *pr, char *option, char *value) static int ievent_alive = 0; static int lastmx, lastmy; +static uae_u32 magicmouse_ibase = 0; static uaecptr get_intuitionbase(void) { uaecptr v = get_long(4); addrbank *b = &get_mem_bank(v); - if (!b || !b->check(v, 128) || b->flags != ABFLAG_RAM) + if (!b || !b->check(v, 400) || b->flags != ABFLAG_RAM) return 0; v += 378; // liblist - while ((v = get_long(v))) { - uae_u32 v2 = get_long(v + 10); // name + while (v = get_long(v)) { + uae_u32 v2; uae_u8 *p; + b = &get_mem_bank(v); + if (!b || !b->check (v, 32) || b->flags != ABFLAG_RAM) { + magicmouse_ibase = 0xffffffff; + return 0; + } + v2 = get_long(v + 10); // name b = &get_mem_bank(v2); - if (!b || !b->check (v2, 20)) - continue; + if (!b || !b->check (v2, 20)) { + magicmouse_ibase = 0xffffffff; + return 0; + } + if (b->flags != ABFLAG_ROM) + return 0; p = b->xlateaddr(v2); if (!strcmp(p, "intuition.library")) return v; @@ -802,6 +813,7 @@ void setamigamouse(int x, int y) extern void setmouseactivexy(int,int,int); extern void drawing_adjust_mousepos(int*,int*); + static void mouseedge(void) { int x, y, dir; @@ -809,14 +821,17 @@ static void mouseedge(void) static int melast_x, melast_y; static int isnonzero; - if (!currprefs.win32_outsidemouse) + if (!currprefs.win32_outsidemouse || magicmouse_ibase == 0xffffffff) return; dir = 0; if (!mouseedge_time) { isnonzero = 0; goto end; } - ib = get_intuitionbase(); + if (magicmouse_ibase == 0) + ib = get_intuitionbase(); + else + ib = magicmouse_ibase; if (!ib) return; x = get_word(ib + 70); @@ -1768,6 +1783,7 @@ void inputdevice_vsync (void) void inputdevice_reset (void) { ievent_alive = 0; + magicmouse_ibase = 0; } static int switchdevice(struct uae_input_device *id, int num) diff --git a/inputevents.def b/inputevents.def old mode 100644 new mode 100755 diff --git a/keybuf.c b/keybuf.c old mode 100644 new mode 100755 diff --git a/main.c b/main.c old mode 100644 new mode 100755 diff --git a/memory.c b/memory.c old mode 100644 new mode 100755 diff --git a/missing.c b/missing.c old mode 100644 new mode 100755 diff --git a/moduleripper.c b/moduleripper.c old mode 100644 new mode 100755 diff --git a/native2amiga.c b/native2amiga.c old mode 100644 new mode 100755 diff --git a/ncurses.c b/ncurses.c old mode 100644 new mode 100755 diff --git a/newcpu.c b/newcpu.c old mode 100644 new mode 100755 diff --git a/nogui.c b/nogui.c old mode 100644 new mode 100755 diff --git a/od-generic/exectasks.h b/od-generic/exectasks.h old mode 100644 new mode 100755 diff --git a/od-generic/joystick.c b/od-generic/joystick.c old mode 100644 new mode 100755 diff --git a/od-generic/memory.h b/od-generic/memory.h old mode 100644 new mode 100755 diff --git a/od-generic/sound.c b/od-generic/sound.c old mode 100644 new mode 100755 diff --git a/od-generic/sound.h b/od-generic/sound.h old mode 100644 new mode 100755 diff --git a/od-win32/7zplugin.c b/od-win32/7zplugin.c old mode 100644 new mode 100755 diff --git a/od-win32/WinUAE_Install.nsi b/od-win32/WinUAE_Install.nsi old mode 100644 new mode 100755 diff --git a/od-win32/ahidsound.c b/od-win32/ahidsound.c old mode 100644 new mode 100755 diff --git a/od-win32/ahidsound.h b/od-win32/ahidsound.h old mode 100644 new mode 100755 diff --git a/od-win32/asm.bat b/od-win32/asm.bat old mode 100644 new mode 100755 diff --git a/od-win32/avioutput.c b/od-win32/avioutput.c old mode 100644 new mode 100755 diff --git a/od-win32/avioutput.h b/od-win32/avioutput.h old mode 100644 new mode 100755 diff --git a/od-win32/blkdev_win32_aspi.c b/od-win32/blkdev_win32_aspi.c old mode 100644 new mode 100755 diff --git a/od-win32/blkdev_win32_ioctl.c b/od-win32/blkdev_win32_ioctl.c old mode 100644 new mode 100755 diff --git a/od-win32/blkdev_win32_spti.c b/od-win32/blkdev_win32_spti.c old mode 100644 new mode 100755 diff --git a/od-win32/bsdsock.c b/od-win32/bsdsock.c old mode 100644 new mode 100755 index fc3b0e86..1c091e71 --- a/od-win32/bsdsock.c +++ b/od-win32/bsdsock.c @@ -37,6 +37,24 @@ static int hWndSelector = 0; /* Set this to zero to get hSockWnd */ +struct threadargs { + struct socketbase *sb; + uae_u32 args1; + uae_u32 args2; + int args3; + long args4; + char *args5; +}; + +struct threadargsw { + struct socketbase *sb; + uae_u32 nfds; + uae_u32 readfds; + uae_u32 writefds; + uae_u32 exceptfds; + uae_u32 timeout; +}; + #define MAX_SELECT_THREADS 64 #define MAX_GET_THREADS 64 @@ -93,24 +111,6 @@ static LRESULT CALLBACK SocketWindowProc(HWND hwnd, UINT message, WPARAM wParam, static int PASCAL WSAEventSelect(SOCKET,HANDLE,long); -struct threadargs { - struct socketbase *sb; - uae_u32 args1; - uae_u32 args2; - int args3; - long args4; - char *args5; -}; - -struct threadargsw { - struct socketbase *sb; - uae_u32 nfds; - uae_u32 readfds; - uae_u32 writefds; - uae_u32 exceptfds; - uae_u32 timeout; -}; - #define PREPARE_THREAD EnterCriticalSection(&bsd->SockThreadCS) #define TRIGGER_THREAD { SetEvent(bsd->hSockReq); WaitForSingleObject(bsd->hSockReqHandled, INFINITE); LeaveCriticalSection(&bsd->SockThreadCS); } @@ -414,8 +414,8 @@ static void sockmsg(unsigned int msg, WPARAM wParam, LPARAM lParam) static unsigned int allocasyncmsg(SB,uae_u32 sd,SOCKET s) { int i; + locksigqueue(); - for (i = bsd->asyncindex + 1; i != bsd->asyncindex; i++) { if (i >= MAXPENDINGASYNC) i = 0; @@ -850,7 +850,7 @@ static LRESULT CALLBACK SocketWindowProc(HWND hwnd, UINT message, WPARAM wParam, -static unsigned int __stdcall sock_thread(void *blah) +static unsigned int sock_thread2(void *blah) { unsigned int result = 0; HANDLE WaitHandle; @@ -872,7 +872,7 @@ static unsigned int __stdcall sock_thread(void *blah) if(bsd->hSockReq) { DWORD wait; WaitHandle = bsd->hSockReq; - wait = MsgWaitForMultipleObjects (1, &WaitHandle, FALSE,INFINITE, QS_POSTMESSAGE); + wait = MsgWaitForMultipleObjects (1, &WaitHandle, FALSE, INFINITE, QS_POSTMESSAGE); if (wait == WAIT_OBJECT_0) { if(HandleStuff()) // See if its time to quit... break; @@ -892,6 +892,14 @@ static unsigned int __stdcall sock_thread(void *blah) return result; } +static unsigned int __stdcall sock_thread(void *p) +{ + __try { + return sock_thread2 (p); + } __except(WIN32_ExceptionFilter(GetExceptionInformation(), GetExceptionCode())) { + } + return 0; +} void host_connect(TrapContext *context, SB, uae_u32 sd, uae_u32 name, uae_u32 namelen) { @@ -1166,7 +1174,7 @@ void host_recvfrom(TrapContext *context, SB, uae_u32 sd, uae_u32 msg, uae_u32 le TRIGGER_THREAD; if (sb->resultval == -1) { - if (sb->sb_errno == WSAEWOULDBLOCK-WSABASEERR && sb->ftable[sd-1] & SF_BLOCKING) + if (sb->sb_errno == WSAEWOULDBLOCK - WSABASEERR && sb->ftable[sd-1] & SF_BLOCKING) { if (sb->mtable[sd-1] || (wMsg = allocasyncmsg(sb,sd,s)) != 0) { if (sb->mtable[sd-1] == 0) { @@ -1607,9 +1615,9 @@ static void fd_zero(uae_u32 fdset, uae_u32 nfds) } // This seems to be the only way of implementing a cancelable WinSock2 select() call... sigh. -static unsigned int __stdcall thread_WaitSelect(void *indexp) +static unsigned int thread_WaitSelect2(void *indexp) { - uae_u32 index = *((uae_u32*)indexp); + int index = *((int*)indexp); unsigned int result = 0; long nfds; uae_u32 readfds, writefds, exceptfds; @@ -1624,7 +1632,7 @@ static unsigned int __stdcall thread_WaitSelect(void *indexp) WaitForSingleObject(bsd->hEvents[index], INFINITE); if ((args = bsd->threadargsw[index]) != NULL) { - sb = args->sb; + sb = args->sb; nfds = args->nfds; readfds = args->readfds; writefds = args->writefds; @@ -1632,11 +1640,11 @@ static unsigned int __stdcall thread_WaitSelect(void *indexp) timeout = args->timeout; // construct descriptor tables - makesocktable(sb,readfds,&readsocks,nfds,sb->sockAbort); + makesocktable(sb, readfds, &readsocks, nfds, sb->sockAbort); if (writefds) - makesocktable(sb,writefds,&writesocks,nfds,INVALID_SOCKET); + makesocktable(sb, writefds, &writesocks, nfds, INVALID_SOCKET); if (exceptfds) - makesocktable(sb,exceptfds,&exceptsocks,nfds,INVALID_SOCKET); + makesocktable(sb, exceptfds, &exceptsocks, nfds, INVALID_SOCKET); if (timeout) { tv.tv_sec = get_long(timeout); @@ -1646,16 +1654,16 @@ static unsigned int __stdcall thread_WaitSelect(void *indexp) TRACE(("-> ")); - sb->resultval = select(nfds+1,&readsocks,writefds ? &writesocks : NULL, - exceptfds ? &exceptsocks : NULL,timeout ? &tv : 0); + sb->resultval = select(nfds+1, &readsocks, writefds ? &writesocks : NULL, + exceptfds ? &exceptsocks : NULL, timeout ? &tv : 0); if (sb->resultval == SOCKET_ERROR) { // select was stopped by sb->sockAbort if (readsocks.fd_count > 1) { - makesocktable(sb,readfds,&readsocks,nfds,INVALID_SOCKET); + makesocktable(sb, readfds, &readsocks, nfds, INVALID_SOCKET); tv.tv_sec = 0; tv.tv_usec = 10000; // Check for 10ms if data is available - sb->resultval = select(nfds+1,&readsocks,writefds ? &writesocks : NULL,exceptfds ? &exceptsocks : NULL,&tv); + sb->resultval = select(nfds+1, &readsocks, writefds ? &writesocks : NULL,exceptfds ? &exceptsocks : NULL,&tv); if (sb->resultval == 0) { // Now timeout -> really no data available if (GetLastError() != 0) { sb->resultval = SOCKET_ERROR; @@ -1699,6 +1707,15 @@ static unsigned int __stdcall thread_WaitSelect(void *indexp) return result; } +static unsigned int __stdcall thread_WaitSelect(void *p) +{ + __try { + return thread_WaitSelect2 (p); + } __except(WIN32_ExceptionFilter(GetExceptionInformation(), GetExceptionCode())) { + } + return 0; +} + void host_WaitSelect(TrapContext *context, SB, uae_u32 nfds, uae_u32 readfds, uae_u32 writefds, uae_u32 exceptfds, uae_u32 timeout, uae_u32 sigmp) { uae_u32 sigs, wssigs; @@ -1766,7 +1783,7 @@ void host_WaitSelect(TrapContext *context, SB, uae_u32 nfds, uae_u32 readfds, ua for (i = 0; i < MAX_SELECT_THREADS; i++) { if (!bsd->hThreads[i]) { bsd->hEvents[i] = CreateEvent(NULL,FALSE,FALSE,NULL); - bsd->hThreads[i] = THREAD(thread_WaitSelect, &i); + bsd->hThreads[i] = THREAD(thread_WaitSelect, &threadindextable[i]); if (bsd->hEvents[i] == NULL || bsd->hThreads[i] == NULL) { bsd->hThreads[i] = 0; write_log("BSDSOCK: ERROR - Thread/Event creation failed - error code: %d\n", @@ -1776,7 +1793,7 @@ void host_WaitSelect(TrapContext *context, SB, uae_u32 nfds, uae_u32 readfds, ua return; } // this should improve responsiveness - SetThreadPriority(bsd->hThreads[i], THREAD_PRIORITY_TIME_CRITICAL); + SetThreadPriority(bsd->hThreads[i], THREAD_PRIORITY_ABOVE_NORMAL); break; } } @@ -1906,7 +1923,7 @@ static BOOL CheckOnline(SB) return bReturn; } -static unsigned int __stdcall thread_get(void *indexp) +static unsigned int thread_get2(void *indexp) { int index = *((int*)indexp); unsigned int result = 0; @@ -1935,7 +1952,7 @@ static unsigned int __stdcall thread_get(void *indexp) buf = args->args5; name_rp = get_real_address(name); - if (strchr(name_rp,'.') == 0 || CheckOnline(sb) == TRUE) { + if (strchr(name_rp, '.') == 0 || CheckOnline(sb) == TRUE) { // Local Address or Internet Online ? if (addrtype == -1) { host = gethostbyname(name_rp); @@ -2023,6 +2040,15 @@ static unsigned int __stdcall thread_get(void *indexp) return result; } +static unsigned int __stdcall thread_get(void *p) +{ + __try { + return thread_get2 (p); + } __except(WIN32_ExceptionFilter(GetExceptionInformation(), GetExceptionCode())) { + } + return 0; +} + void host_gethostbynameaddr(TrapContext *context, SB, uae_u32 name, uae_u32 namelen, long addrtype) { HOSTENT *h; @@ -2206,7 +2232,7 @@ void host_getprotobyname(TrapContext *context, SB, uae_u32 name) for (i = 0; i < MAX_GET_THREADS; i++) { if (!bsd->hGetThreads[i]) { bsd->hEvents[i] = CreateEvent(NULL, FALSE, FALSE, NULL); - bsd->hGetThreads[i] = THREAD(thread_get, &i); + bsd->hGetThreads[i] = THREAD(thread_get, &threadindextable[i]); if (bsd->hGetEvents[i] == NULL || bsd->hGetThreads[i] == NULL) { bsd->hGetThreads[i] = 0; write_log("BSDSOCK: ERROR - Thread/Event creation failed - error code: %d\n", GetLastError()); @@ -2331,7 +2357,7 @@ void host_getservbynameport(TrapContext *context, SB, uae_u32 nameport, uae_u32 for (i = 0; i < MAX_GET_THREADS; i++) { if (!bsd->hGetThreads[i]) { bsd->hGetEvents[i] = CreateEvent(NULL, FALSE, FALSE, NULL); - bsd->hGetThreads[i] = THREAD(thread_get, &i); + bsd->hGetThreads[i] = THREAD(thread_get, &threadindextable[i]); if (bsd->hGetEvents[i] == NULL || bsd->hGetThreads[i] == NULL) { bsd->hGetThreads[i] = 0; write_log("BSDSOCK: ERROR - Thread/Event creation failed - error code: %d\n", GetLastError()); diff --git a/od-win32/build68k_msvc/build68k_msvc.rc b/od-win32/build68k_msvc/build68k_msvc.rc old mode 100644 new mode 100755 diff --git a/od-win32/build68k_msvc/build68k_msvc.vcproj b/od-win32/build68k_msvc/build68k_msvc.vcproj old mode 100644 new mode 100755 diff --git a/od-win32/caps/CapsAPI.h b/od-win32/caps/CapsAPI.h old mode 100644 new mode 100755 diff --git a/od-win32/caps/CapsLib.h b/od-win32/caps/CapsLib.h old mode 100644 new mode 100755 diff --git a/od-win32/caps/Comlib.h b/od-win32/caps/Comlib.h old mode 100644 new mode 100755 diff --git a/od-win32/caps/Comtype.h b/od-win32/caps/Comtype.h old mode 100644 new mode 100755 diff --git a/od-win32/caps/caps_win32.c b/od-win32/caps/caps_win32.c old mode 100644 new mode 100755 diff --git a/od-win32/caps/caps_win32.h b/od-win32/caps/caps_win32.h old mode 100644 new mode 100755 diff --git a/od-win32/dinput.c b/od-win32/dinput.c old mode 100644 new mode 100755 index 295f818b..aabf39bb --- a/od-win32/dinput.c +++ b/od-win32/dinput.c @@ -91,7 +91,7 @@ static int oldleds, oldusedleds, newleds, oldusbleds; static int normalmouse, supermouse, rawmouse, winmouse, winmousenumber, winmousemode; static int normalkb, superkb, rawkb; -int no_rawinput; +int no_rawinput, dinput_enum_all; int dinput_winmouse (void) { @@ -848,8 +848,17 @@ static int di_do_init (void) gui_message ("Failed to initialize DirectInput!"); return 0; } - write_log("DirectInput enumeration..\n"); - IDirectInput8_EnumDevices (g_lpdi, DI8DEVCLASS_ALL, di_enumcallback, 0, DIEDFL_ATTACHEDONLY); + if (dinput_enum_all) { + write_log("DirectInput enumeration..\n"); + IDirectInput8_EnumDevices (g_lpdi, DI8DEVCLASS_ALL, di_enumcallback, 0, DIEDFL_ATTACHEDONLY); + } else { + write_log("DirectInput enumeration.. Keyboards..\n"); + IDirectInput8_EnumDevices (g_lpdi, DI8DEVCLASS_KEYBOARD, di_enumcallback, 0, DIEDFL_ATTACHEDONLY); + write_log("DirectInput enumeration.. Pointing devices..\n"); + IDirectInput8_EnumDevices (g_lpdi, DI8DEVCLASS_POINTER, di_enumcallback, 0, DIEDFL_ATTACHEDONLY); + write_log("DirectInput enumeration.. Game controllers..\n"); + IDirectInput8_EnumDevices (g_lpdi, DI8DEVCLASS_GAMECTRL, di_enumcallback, 0, DIEDFL_ATTACHEDONLY); + } write_log("RawInput enumeration..\n"); initialize_rawinput(); write_log("Windowsmouse initialization..\n"); diff --git a/od-win32/direct3d.c b/od-win32/direct3d.c old mode 100644 new mode 100755 diff --git a/od-win32/direct3d.h b/od-win32/direct3d.h old mode 100644 new mode 100755 diff --git a/od-win32/diskutil.c b/od-win32/diskutil.c old mode 100644 new mode 100755 diff --git a/od-win32/diskutil.h b/od-win32/diskutil.h old mode 100644 new mode 100755 diff --git a/od-win32/driveclick_win32.c b/od-win32/driveclick_win32.c old mode 100644 new mode 100755 diff --git a/od-win32/dxwrap.c b/od-win32/dxwrap.c old mode 100644 new mode 100755 diff --git a/od-win32/dxwrap.h b/od-win32/dxwrap.h old mode 100644 new mode 100755 diff --git a/od-win32/fdrawcmd.c b/od-win32/fdrawcmd.c old mode 100644 new mode 100755 diff --git a/od-win32/fsdb_win32.c b/od-win32/fsdb_win32.c old mode 100644 new mode 100755 diff --git a/od-win32/genblitter_msvc/genblitter_msvc.vcproj b/od-win32/genblitter_msvc/genblitter_msvc.vcproj old mode 100644 new mode 100755 diff --git a/od-win32/gencomp_msvc/gencomp_msvc.vcproj b/od-win32/gencomp_msvc/gencomp_msvc.vcproj old mode 100644 new mode 100755 diff --git a/od-win32/gencpu_msvc/gencpu_msvc.vcproj b/od-win32/gencpu_msvc/gencpu_msvc.vcproj old mode 100644 new mode 100755 diff --git a/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcproj b/od-win32/genlinetoscr_msvc/genlinetoscr_msvc.vcproj old mode 100644 new mode 100755 diff --git a/od-win32/graphics/amiga_header.bmp b/od-win32/graphics/amiga_header.bmp old mode 100644 new mode 100755 diff --git a/od-win32/graphics/amiga_welcome.bmp b/od-win32/graphics/amiga_welcome.bmp old mode 100644 new mode 100755 diff --git a/od-win32/graphics/installer_icon.ico b/od-win32/graphics/installer_icon.ico old mode 100644 new mode 100755 diff --git a/od-win32/hardfile_win32.c b/od-win32/hardfile_win32.c old mode 100644 new mode 100755 diff --git a/od-win32/hq2x32.asm b/od-win32/hq2x32.asm old mode 100644 new mode 100755 diff --git a/od-win32/hq3x16.asm b/od-win32/hq3x16.asm old mode 100644 new mode 100755 diff --git a/od-win32/hq3x32.asm b/od-win32/hq3x32.asm old mode 100644 new mode 100755 diff --git a/od-win32/hq4x32.asm b/od-win32/hq4x32.asm old mode 100644 new mode 100755 diff --git a/od-win32/ioport.c b/od-win32/ioport.c old mode 100644 new mode 100755 diff --git a/od-win32/ioport.h b/od-win32/ioport.h old mode 100644 new mode 100755 diff --git a/od-win32/ipctester.c b/od-win32/ipctester.c old mode 100644 new mode 100755 diff --git a/od-win32/keyboard_win32.c b/od-win32/keyboard_win32.c old mode 100644 new mode 100755 diff --git a/od-win32/lcd.c b/od-win32/lcd.c old mode 100644 new mode 100755 diff --git a/od-win32/lcd.h b/od-win32/lcd.h old mode 100644 new mode 100755 diff --git a/od-win32/machdep/m68k.h b/od-win32/machdep/m68k.h old mode 100644 new mode 100755 diff --git a/od-win32/machdep/maccess.h b/od-win32/machdep/maccess.h old mode 100644 new mode 100755 diff --git a/od-win32/machdep/rpt.h b/od-win32/machdep/rpt.h old mode 100644 new mode 100755 diff --git a/od-win32/machdep/support.c b/od-win32/machdep/support.c old mode 100644 new mode 100755 diff --git a/od-win32/makeexe.bat b/od-win32/makeexe.bat old mode 100644 new mode 100755 diff --git a/od-win32/md-fpp.h b/od-win32/md-fpp.h old mode 100644 new mode 100755 diff --git a/od-win32/midi.c b/od-win32/midi.c old mode 100644 new mode 100755 diff --git a/od-win32/midi.h b/od-win32/midi.h old mode 100644 new mode 100755 diff --git a/od-win32/midiin.c b/od-win32/midiin.c old mode 100644 new mode 100755 diff --git a/od-win32/mman.c b/od-win32/mman.c old mode 100644 new mode 100755 diff --git a/od-win32/opengl.c b/od-win32/opengl.c old mode 100644 new mode 100755 index e57042c3..d373753e --- a/od-win32/opengl.c +++ b/od-win32/opengl.c @@ -289,11 +289,10 @@ const char *OGL_init (HWND ahwnd, int w_w, int w_h, int t_w, int t_h, int depth) ti2d_type = -1; if (depth == 15 || depth == 16) { if (!packed_pixels) { - gui_message( - "OPENGL: can't use 15/16 bit screen depths because EXT_packed_pixels\n" - "extension was not found. Falling back to 32-bit mode"); + sprintf(errmsg, "OPENGL: can't use 15/16 bit screen depths because\n" + "EXT_packed_pixels extension was not found."); OGL_free(); - return OGL_init(ahwnd, w_w, w_h, t_w, t_h, 32); + return errmsg; } ti2d_internalformat = GL_RGB5_A1; ti2d_format = GL_RGBA; @@ -311,6 +310,7 @@ const char *OGL_init (HWND ahwnd, int w_w, int w_h, int t_w, int t_h, int depth) } if (ti2d_type < 0) { sprintf (errmsg, "OPENGL: Only 15, 16 or 32 bit screen depths supported (was %d)", depth); + OGL_free(); return errmsg; } diff --git a/od-win32/opengl.h b/od-win32/opengl.h old mode 100644 new mode 100755 diff --git a/od-win32/parser.c b/od-win32/parser.c old mode 100644 new mode 100755 diff --git a/od-win32/parser.h b/od-win32/parser.h old mode 100644 new mode 100755 diff --git a/od-win32/picasso96_win.c b/od-win32/picasso96_win.c old mode 100644 new mode 100755 index 3dbc3f3b..329acedf --- a/od-win32/picasso96_win.c +++ b/od-win32/picasso96_win.c @@ -1705,6 +1705,15 @@ static struct modeids mi[] = 2048,1536, 155, 2560,1600, 156, 2560,2048, 157, + 400, 300, 158, + 512, 384, 159, + 1360, 768, 160, + 1360,1024, 161, + 1400,1050, 162, + 1792,1344, 163, + 1800,1440, 164, + 1856,1392, 165, + 1920,1440, 166, -1,-1,0 }; diff --git a/od-win32/picasso96_win.h b/od-win32/picasso96_win.h old mode 100644 new mode 100755 diff --git a/od-win32/posixemu.c b/od-win32/posixemu.c old mode 100644 new mode 100755 diff --git a/od-win32/posixemu.h b/od-win32/posixemu.h old mode 100644 new mode 100755 diff --git a/od-win32/resources/35floppy.ico b/od-win32/resources/35floppy.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/Mycomp.ico b/od-win32/resources/Mycomp.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/RCa00564 b/od-win32/resources/RCa00564 old mode 100644 new mode 100755 diff --git a/od-win32/resources/WinUAE_German.rc b/od-win32/resources/WinUAE_German.rc old mode 100644 new mode 100755 diff --git a/od-win32/resources/amigainfo.ico b/od-win32/resources/amigainfo.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/avioutput.ico b/od-win32/resources/avioutput.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/chip.ico b/od-win32/resources/chip.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/cpu.ico b/od-win32/resources/cpu.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/drive.ico b/od-win32/resources/drive.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/drive_click.wav b/od-win32/resources/drive_click.wav old mode 100644 new mode 100755 diff --git a/od-win32/resources/drive_snatch.wav b/od-win32/resources/drive_snatch.wav old mode 100644 new mode 100755 diff --git a/od-win32/resources/drive_spin.wav b/od-win32/resources/drive_spin.wav old mode 100644 new mode 100755 diff --git a/od-win32/resources/drive_spinnd.wav b/od-win32/resources/drive_spinnd.wav old mode 100644 new mode 100755 diff --git a/od-win32/resources/drive_startup.wav b/od-win32/resources/drive_startup.wav old mode 100644 new mode 100755 diff --git a/od-win32/resources/file.ico b/od-win32/resources/file.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/folder.ico b/od-win32/resources/folder.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/h_arrow.cur b/od-win32/resources/h_arrow.cur old mode 100644 new mode 100755 diff --git a/od-win32/resources/joystick.ico b/od-win32/resources/joystick.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/lcd.bmp b/od-win32/resources/lcd.bmp old mode 100644 new mode 100755 diff --git a/od-win32/resources/misc.ico b/od-win32/resources/misc.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/move_dow.ico b/od-win32/resources/move_dow.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/move_up.ico b/od-win32/resources/move_up.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/paths.ico b/od-win32/resources/paths.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/quickstart.ico b/od-win32/resources/quickstart.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/resource.h b/od-win32/resources/resource.h old mode 100644 new mode 100755 diff --git a/od-win32/resources/resource.hm b/od-win32/resources/resource.hm old mode 100644 new mode 100755 diff --git a/od-win32/resources/root.ico b/od-win32/resources/root.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/screen.ico b/od-win32/resources/screen.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/sound.ico b/od-win32/resources/sound.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/winuae.exe.manifest b/od-win32/resources/winuae.exe.manifest old mode 100644 new mode 100755 diff --git a/od-win32/resources/winuae.ico b/od-win32/resources/winuae.ico old mode 100644 new mode 100755 diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc old mode 100644 new mode 100755 diff --git a/od-win32/resources/winuae_minimal.rc b/od-win32/resources/winuae_minimal.rc old mode 100644 new mode 100755 diff --git a/od-win32/resources/xarcade-winuae.bmp b/od-win32/resources/xarcade-winuae.bmp old mode 100644 new mode 100755 diff --git a/od-win32/scaler.c b/od-win32/scaler.c old mode 100644 new mode 100755 diff --git a/od-win32/scaler2.c b/od-win32/scaler2.c old mode 100644 new mode 100755 diff --git a/od-win32/screenshot.c b/od-win32/screenshot.c old mode 100644 new mode 100755 diff --git a/od-win32/scsidef.h b/od-win32/scsidef.h old mode 100644 new mode 100755 diff --git a/od-win32/serial_win32.c b/od-win32/serial_win32.c old mode 100644 new mode 100755 diff --git a/od-win32/sfhelper.c b/od-win32/sfhelper.c old mode 100644 new mode 100755 diff --git a/od-win32/shm.c b/od-win32/shm.c old mode 100644 new mode 100755 diff --git a/od-win32/soundcheck.c b/od-win32/soundcheck.c old mode 100644 new mode 100755 diff --git a/od-win32/sounddep/sound.c b/od-win32/sounddep/sound.c old mode 100644 new mode 100755 diff --git a/od-win32/sounddep/sound.h b/od-win32/sounddep/sound.h old mode 100644 new mode 100755 diff --git a/od-win32/srcrelease.bat b/od-win32/srcrelease.bat old mode 100644 new mode 100755 diff --git a/od-win32/support.c b/od-win32/support.c old mode 100644 new mode 100755 diff --git a/od-win32/sys/ipc.h b/od-win32/sys/ipc.h old mode 100644 new mode 100755 diff --git a/od-win32/sys/mman.h b/od-win32/sys/mman.h old mode 100644 new mode 100755 diff --git a/od-win32/sys/shm.h b/od-win32/sys/shm.h old mode 100644 new mode 100755 diff --git a/od-win32/sysconfig.h b/od-win32/sysconfig.h old mode 100644 new mode 100755 diff --git a/od-win32/target.h b/od-win32/target.h old mode 100644 new mode 100755 diff --git a/od-win32/threaddep/thread.h b/od-win32/threaddep/thread.h old mode 100644 new mode 100755 diff --git a/od-win32/unistd.h b/od-win32/unistd.h old mode 100644 new mode 100755 diff --git a/od-win32/wcc.sh b/od-win32/wcc.sh old mode 100644 new mode 100755 diff --git a/od-win32/win32.c b/od-win32/win32.c old mode 100644 new mode 100755 index fd48f445..74ef44ae --- a/od-win32/win32.c +++ b/od-win32/win32.c @@ -2700,6 +2700,8 @@ static int PASCAL WinMain2 (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR return 0; if (!dxdetect()) return 0; + if (!os_winnt && max_allowed_mman > 256) + max_allowed_mman = 256; hInst = hInstance; hMutex = CreateMutex( NULL, FALSE, "WinUAE Instantiated" ); // To tell the installer we're running @@ -2707,16 +2709,13 @@ static int PASCAL WinMain2 (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR AVIOutput_Initialize(); #endif + argv = xcalloc (sizeof (char*), __argc); + argc = process_arg(argv); + getstartpaths(start_data); makeverstr(VersionStr); SetCurrentDirectory (start_path_data); - if (!os_winnt && max_allowed_mman > 256) - max_allowed_mman = 256; - - argv = xcalloc (sizeof (char*), __argc); - argc = process_arg(argv); - logging_init (); if(WIN32_RegisterClasses() && WIN32_InitLibraries() && DirectDraw_Start(NULL)) { @@ -2836,7 +2835,7 @@ int driveclick_loadresource (struct drvsample *sp, int drivetype) #if defined(WIN64) -static LONG WINAPI ExceptionFilter( struct _EXCEPTION_POINTERS * pExceptionPointers, DWORD ec) +static LONG WINAPI WIN32_ExceptionFilter( struct _EXCEPTION_POINTERS * pExceptionPointers, DWORD ec) { write_log("EVALEXCEPTION!\n"); return EXCEPTION_EXECUTE_HANDLER; @@ -2862,7 +2861,7 @@ static void efix (DWORD *regp, void *p, void *ps, int *got) } } -static LONG WINAPI ExceptionFilter( struct _EXCEPTION_POINTERS * pExceptionPointers, DWORD ec) +LONG WINAPI WIN32_ExceptionFilter(struct _EXCEPTION_POINTERS *pExceptionPointers, DWORD ec) { static uae_u8 *prevpc; LONG lRet = EXCEPTION_CONTINUE_SEARCH; @@ -3111,7 +3110,7 @@ int PASCAL WinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLin #endif __try { WinMain2 (hInstance, hPrevInstance, lpCmdLine, nCmdShow); - } __except(ExceptionFilter(GetExceptionInformation(), GetExceptionCode())) { + } __except(WIN32_ExceptionFilter(GetExceptionInformation(), GetExceptionCode())) { } SetThreadAffinityMask(thread, original_affinity); return FALSE; diff --git a/od-win32/win32.h b/od-win32/win32.h old mode 100644 new mode 100755 index fa49d28e..a40be449 --- a/od-win32/win32.h +++ b/od-win32/win32.h @@ -121,4 +121,5 @@ extern HMODULE language_load(WORD language); extern void logging_open(int,int); extern void logging_cleanup(void); +extern LONG WINAPI WIN32_ExceptionFilter(struct _EXCEPTION_POINTERS *pExceptionPointers, DWORD ec); #endif \ No newline at end of file diff --git a/od-win32/win32_decompress.c b/od-win32/win32_decompress.c old mode 100644 new mode 100755 diff --git a/od-win32/win32_filesys.c b/od-win32/win32_filesys.c old mode 100644 new mode 100755 diff --git a/od-win32/win32_nogui.c b/od-win32/win32_nogui.c old mode 100644 new mode 100755 diff --git a/od-win32/win32_scale2x.c b/od-win32/win32_scale2x.c old mode 100644 new mode 100755 index 883fb22f..cc3238ea --- a/od-win32/win32_scale2x.c +++ b/od-win32/win32_scale2x.c @@ -108,20 +108,20 @@ void S2X_render (void) sptr = gfxvidinfo.bufmem; endsptr = gfxvidinfo.realbufmem + (amiga_height - 1) * 3 * gfxvidinfo.rowbytes; - v = currprefs.gfx_filter_horiz_offset / 10; + v = currprefs.gfx_filter_horiz_offset; v += (dst_width / scale - amiga_width) / 8; - sptr += -v * (amiga_depth / 8) * 4; - aw -= -v * 4; + sptr += (int)(-v * 4.0 / 10.0) * (amiga_depth / 8); + aw -= (int)(-v * 4.0 / 10); - v = currprefs.gfx_filter_vert_offset / 10; + v = currprefs.gfx_filter_vert_offset; v += (dst_height / scale - amiga_height) / 8; - sptr += -v * gfxvidinfo.rowbytes * 4; - ah -= -v * 4; + sptr += (int)(-v * 4.0 / 10.0) * gfxvidinfo.rowbytes; + ah -= (int)(-v * 4.0 / 10); if (aw * scale > dst_width) - aw = (dst_width / scale) & ~3; + aw = dst_width / scale; if (ah * scale > dst_height) - ah = (dst_height / scale) & ~3; + ah = dst_height / scale; if (ah < 16) return; diff --git a/od-win32/win32gfx.c b/od-win32/win32gfx.c old mode 100644 new mode 100755 diff --git a/od-win32/win32gfx.h b/od-win32/win32gfx.h old mode 100644 new mode 100755 diff --git a/od-win32/win32gui.c b/od-win32/win32gui.c old mode 100644 new mode 100755 index 2175b0df..d8dce987 --- a/od-win32/win32gui.c +++ b/od-win32/win32gui.c @@ -7902,17 +7902,17 @@ static void values_to_hw3ddlg (HWND hDlg) HKEY fkey; SendDlgItemMessage(hDlg, IDC_FILTERHZ, TBM_SETRANGE, TRUE, MAKELONG (-999, +999)); - SendDlgItemMessage(hDlg, IDC_FILTERHZ, TBM_SETPAGESIZE, 0, 10); + SendDlgItemMessage(hDlg, IDC_FILTERHZ, TBM_SETPAGESIZE, 0, 1); SendDlgItemMessage(hDlg, IDC_FILTERVZ, TBM_SETRANGE, TRUE, MAKELONG (-999, +999)); - SendDlgItemMessage(hDlg, IDC_FILTERVZ, TBM_SETPAGESIZE, 0, 10); + SendDlgItemMessage(hDlg, IDC_FILTERVZ, TBM_SETPAGESIZE, 0, 1); SendDlgItemMessage(hDlg, IDC_FILTERHO, TBM_SETRANGE, TRUE, MAKELONG (-999, +999)); - SendDlgItemMessage(hDlg, IDC_FILTERHO, TBM_SETPAGESIZE, 0, 10); + SendDlgItemMessage(hDlg, IDC_FILTERHO, TBM_SETPAGESIZE, 0, 1); SendDlgItemMessage(hDlg, IDC_FILTERVO, TBM_SETRANGE, TRUE, MAKELONG (-999, +999)); - SendDlgItemMessage(hDlg, IDC_FILTERVO, TBM_SETPAGESIZE, 0, 10); + SendDlgItemMessage(hDlg, IDC_FILTERVO, TBM_SETPAGESIZE, 0, 1); SendDlgItemMessage(hDlg, IDC_FILTERSL, TBM_SETRANGE, TRUE, MAKELONG ( 0, +1000)); - SendDlgItemMessage(hDlg, IDC_FILTERSL, TBM_SETPAGESIZE, 0, 10); + SendDlgItemMessage(hDlg, IDC_FILTERSL, TBM_SETPAGESIZE, 0, 1); SendDlgItemMessage(hDlg, IDC_FILTERSL2, TBM_SETRANGE, TRUE, MAKELONG ( 0, +1000)); - SendDlgItemMessage(hDlg, IDC_FILTERSL2, TBM_SETPAGESIZE, 0, 10); + SendDlgItemMessage(hDlg, IDC_FILTERSL2, TBM_SETPAGESIZE, 0, 1); SendDlgItemMessage (hDlg, IDC_FILTERMODE, CB_RESETCONTENT, 0, 0L); uf = &uaefilters[0]; @@ -9097,7 +9097,6 @@ int dragdrop (HWND hDlg, HDROP hd, struct uae_prefs *prefs, int currentpage) } } } else { - DISK_history_add (file, -1); strcpy (workprefs.df[drv], file); disk_insert (drv, workprefs.df[drv]); drv++; @@ -9648,7 +9647,7 @@ int gui_message_multibutton (int flags, const char *format,...) void gui_message (const char *format,...) { char msg[2048]; - char szTitle[ MAX_DPATH ]; + char szTitle[MAX_DPATH]; va_list parms; int flipflop = 0; int fullscreen = 0; @@ -9657,7 +9656,7 @@ void gui_message (const char *format,...) HWND hwnd; va_start (parms, format); - vsprintf( msg, format, parms ); + vsprintf(msg, format, parms); va_end (parms); if (full_property_sheet) { pre_gui_message (msg); @@ -9668,7 +9667,7 @@ void gui_message (const char *format,...) if (flipflop) ShowWindow (hAmigaWnd, SW_MINIMIZE); - write_log( msg ); + write_log(msg); if (msg[strlen(msg)-1]!='\n') write_log("\n"); @@ -9696,15 +9695,15 @@ void pre_gui_message (const char *format,...) va_list parms; va_start (parms, format); - vsprintf( msg, format, parms ); + vsprintf (msg, format, parms); va_end (parms); - write_log( msg ); + write_log (msg); if (msg[strlen(msg)-1]!='\n') write_log("\n"); WIN32GUI_LoadUIString (IDS_ERRORTITLE, szTitle, MAX_DPATH); strcat (szTitle, BetaStr); - MessageBox (guiDlg, msg, szTitle, MB_OK | MB_TASKMODAL | MB_SETFOREGROUND ); + MessageBox (guiDlg, msg, szTitle, MB_OK | MB_TASKMODAL | MB_SETFOREGROUND); } diff --git a/od-win32/win32gui.h b/od-win32/win32gui.h old mode 100644 new mode 100755 diff --git a/od-win32/winuae_msvc/winuae_msvc.vcproj b/od-win32/winuae_msvc/winuae_msvc.vcproj old mode 100644 new mode 100755 diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt old mode 100644 new mode 100755 index 6bfa4c95..1893022b --- a/od-win32/winuaechangelog.txt +++ b/od-win32/winuaechangelog.txt @@ -1,4 +1,16 @@ +Beta 2: + +- filter zoom and position is not restricted to coordinates divisible + by 4 pixels anymore +- datapath command line parameter fixed (broke in 1.3.4b9) +- enumerate only known DirectInput devices types (keyboards, pointers + and game controllers), apparently there are some broken DI compatible + "unknown" devices that crash DirectInput's internal enumeration code.. +- "magic mouse" related freezes fixed +- dragndrop disk insert fixed (again..) +- added more Picasso96 modes to "unique" mode list + Beta 1: Lots of scary options. Do not touch! - added new misc configuration options "(handled in previous versions)" diff --git a/od-win32/wrc.sh b/od-win32/wrc.sh old mode 100644 new mode 100755 diff --git a/od-win32/writelog.c b/od-win32/writelog.c old mode 100644 new mode 100755 diff --git a/picasso96.c b/picasso96.c old mode 100644 new mode 100755 diff --git a/prowizard/misc/misc.c b/prowizard/misc/misc.c old mode 100644 new mode 100755 diff --git a/prowizard/misc/testbag.c b/prowizard/misc/testbag.c old mode 100644 new mode 100755 diff --git a/prowizard/prowiz.c b/prowizard/prowiz.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/AC1D_packer.c b/prowizard/rippers/AC1D_packer.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/AMOS-MusicBank.c b/prowizard/rippers/AMOS-MusicBank.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/AMOS-PowerPackerBank.c b/prowizard/rippers/AMOS-PowerPackerBank.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/BP-Soundmonitor.c b/prowizard/rippers/BP-Soundmonitor.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/BSI-FutureComposer.c b/prowizard/rippers/BSI-FutureComposer.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/Bytekiller.c b/prowizard/rippers/Bytekiller.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/ChipTracker.c b/prowizard/rippers/ChipTracker.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/Crunchmania-Address.c b/prowizard/rippers/Crunchmania-Address.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/Crunchmania-Simple.c b/prowizard/rippers/Crunchmania-Simple.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/DefjamCruncher32-pro.c b/prowizard/rippers/DefjamCruncher32-pro.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/DigiBooster17.c b/prowizard/rippers/DigiBooster17.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/DigitalIllusion.c b/prowizard/rippers/DigitalIllusion.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/DoubleAction.c b/prowizard/rippers/DoubleAction.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/Dragpack100.c b/prowizard/rippers/Dragpack100.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/Dragpack252.c b/prowizard/rippers/Dragpack252.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/EurekaPacker.c b/prowizard/rippers/EurekaPacker.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/FC-M-Packer.c b/prowizard/rippers/FC-M-Packer.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/FastTracker2.c b/prowizard/rippers/FastTracker2.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/FuchsTracker.c b/prowizard/rippers/FuchsTracker.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/FutureComposer13.c b/prowizard/rippers/FutureComposer13.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/FutureComposer14.c b/prowizard/rippers/FutureComposer14.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/FuzzacPacker.c b/prowizard/rippers/FuzzacPacker.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/GNUPacker12.c b/prowizard/rippers/GNUPacker12.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/GPMO.c b/prowizard/rippers/GPMO.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/GameMusicCreator.c b/prowizard/rippers/GameMusicCreator.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/GnuPlayer.c b/prowizard/rippers/GnuPlayer.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/HQC2.c b/prowizard/rippers/HQC2.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/HeatseekerMC10.c b/prowizard/rippers/HeatseekerMC10.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/HornetPacker.c b/prowizard/rippers/HornetPacker.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/JamCracker.c b/prowizard/rippers/JamCracker.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/KefrensSoundMachine.c b/prowizard/rippers/KefrensSoundMachine.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/MED-Octamed.c b/prowizard/rippers/MED-Octamed.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/MOD-compatible.c b/prowizard/rippers/MOD-compatible.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/MasterCruncher30-Address.c b/prowizard/rippers/MasterCruncher30-Address.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/MaxPacker12.c b/prowizard/rippers/MaxPacker12.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/MegaCruncher-Object.c b/prowizard/rippers/MegaCruncher-Object.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/MegaCruncher.c b/prowizard/rippers/MegaCruncher.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/ModuleProtector.c b/prowizard/rippers/ModuleProtector.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/Mugician.c b/prowizard/rippers/Mugician.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/Newtron.c b/prowizard/rippers/Newtron.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/NoiseFromHeaven.c b/prowizard/rippers/NoiseFromHeaven.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/NoisePacker1.c b/prowizard/rippers/NoisePacker1.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/NoisePacker2.c b/prowizard/rippers/NoisePacker2.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/NoisePacker3.c b/prowizard/rippers/NoisePacker3.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/NoiseRunner.c b/prowizard/rippers/NoiseRunner.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/PhaPacker.c b/prowizard/rippers/PhaPacker.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/PolkaPacker.c b/prowizard/rippers/PolkaPacker.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/PowerMusic.c b/prowizard/rippers/PowerMusic.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/PowerPacker23.c b/prowizard/rippers/PowerPacker23.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/PowerPacker30.c b/prowizard/rippers/PowerPacker30.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/PowerPacker40-library.c b/prowizard/rippers/PowerPacker40-library.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/PowerPacker40.c b/prowizard/rippers/PowerPacker40.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/ProPacker10.c b/prowizard/rippers/ProPacker10.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/ProPacker21.c b/prowizard/rippers/ProPacker21.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/ProPacker30.c b/prowizard/rippers/ProPacker30.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/Promizer01.c b/prowizard/rippers/Promizer01.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/Promizer10c.c b/prowizard/rippers/Promizer10c.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/Promizer18a.c b/prowizard/rippers/Promizer18a.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/Promizer20.c b/prowizard/rippers/Promizer20.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/Promizer40.c b/prowizard/rippers/Promizer40.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/Prorunner10.c b/prowizard/rippers/Prorunner10.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/Prorunner20.c b/prowizard/rippers/Prorunner20.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/QuadraComposer.c b/prowizard/rippers/QuadraComposer.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/RelokIt10.c b/prowizard/rippers/RelokIt10.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/SGT-Packer.c b/prowizard/rippers/SGT-Packer.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/SkytPacker.c b/prowizard/rippers/SkytPacker.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/SoundFX.c b/prowizard/rippers/SoundFX.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/SoundTracker.c b/prowizard/rippers/SoundTracker.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/SoundTracker26.c b/prowizard/rippers/SoundTracker26.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/SpikeCruncher.c b/prowizard/rippers/SpikeCruncher.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/StartrekkerPack.c b/prowizard/rippers/StartrekkerPack.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/StimPacker.c b/prowizard/rippers/StimPacker.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/StoneCracker270.c b/prowizard/rippers/StoneCracker270.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/StoneCracker299.c b/prowizard/rippers/StoneCracker299.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/StoneCracker299b.c b/prowizard/rippers/StoneCracker299b.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/StoneCracker299d.c b/prowizard/rippers/StoneCracker299d.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/StoneCracker300.c b/prowizard/rippers/StoneCracker300.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/StoneCracker310.c b/prowizard/rippers/StoneCracker310.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/SuperCruncher27.c b/prowizard/rippers/SuperCruncher27.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/SyncroPacker46.c b/prowizard/rippers/SyncroPacker46.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/TMK.c b/prowizard/rippers/TMK.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/TNMCruncher.c b/prowizard/rippers/TNMCruncher.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/TetraPack102.c b/prowizard/rippers/TetraPack102.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/TetraPack21.c b/prowizard/rippers/TetraPack21.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/TetraPack22.c b/prowizard/rippers/TetraPack22.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/TheDarkDemon.c b/prowizard/rippers/TheDarkDemon.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/ThePlayer22a.c b/prowizard/rippers/ThePlayer22a.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/ThePlayer30a.c b/prowizard/rippers/ThePlayer30a.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/ThePlayer40.c b/prowizard/rippers/ThePlayer40.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/ThePlayer41a.c b/prowizard/rippers/ThePlayer41a.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/ThePlayer50a.c b/prowizard/rippers/ThePlayer50a.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/ThePlayer60a.c b/prowizard/rippers/ThePlayer60a.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/ThePlayer61a.c b/prowizard/rippers/ThePlayer61a.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/TimeCruncher17.c b/prowizard/rippers/TimeCruncher17.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/TrackerPacker1.c b/prowizard/rippers/TrackerPacker1.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/TrackerPacker2.c b/prowizard/rippers/TrackerPacker2.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/TrackerPacker3.c b/prowizard/rippers/TrackerPacker3.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/TreasurePattern.c b/prowizard/rippers/TreasurePattern.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/TryItCruncher101.c b/prowizard/rippers/TryItCruncher101.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/TurboSqueezer61.c b/prowizard/rippers/TurboSqueezer61.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/UnicTracker.c b/prowizard/rippers/UnicTracker.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/UnicTracker2.c b/prowizard/rippers/UnicTracker2.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/WantonPacker.c b/prowizard/rippers/WantonPacker.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/XannPlayer.c b/prowizard/rippers/XannPlayer.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/ZenPacker.c b/prowizard/rippers/ZenPacker.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/datacrunchers.c b/prowizard/rippers/datacrunchers.c old mode 100644 new mode 100755 diff --git a/prowizard/rippers/extern.h b/prowizard/rippers/extern.h old mode 100644 new mode 100755 diff --git a/prowizard/rippers/globals.h b/prowizard/rippers/globals.h old mode 100644 new mode 100755 diff --git a/prowizard/rippers/ptktable.h b/prowizard/rippers/ptktable.h old mode 100644 new mode 100755 diff --git a/prowizard/rippers/tuning.h b/prowizard/rippers/tuning.h old mode 100644 new mode 100755 diff --git a/prowizard/rippers/vars.h b/prowizard/rippers/vars.h old mode 100644 new mode 100755 diff --git a/readcpu.c b/readcpu.c old mode 100644 new mode 100755 diff --git a/readdisk.c b/readdisk.c old mode 100644 new mode 100755 diff --git a/rpc.c b/rpc.c old mode 100644 new mode 100755 diff --git a/savestate.c b/savestate.c old mode 100644 new mode 100755 diff --git a/scsi-none.c b/scsi-none.c old mode 100644 new mode 100755 diff --git a/scsidev.c b/scsidev.c old mode 100644 new mode 100755 diff --git a/scsiemul.c b/scsiemul.c old mode 100644 new mode 100755 diff --git a/sdl-joystick.c b/sdl-joystick.c old mode 100644 new mode 100755 diff --git a/serial.c b/serial.c old mode 100644 new mode 100755 diff --git a/sinctable.c b/sinctable.c old mode 100644 new mode 100755 diff --git a/svga.c b/svga.c old mode 100644 new mode 100755 diff --git a/svgancui.c b/svgancui.c old mode 100644 new mode 100755 diff --git a/table68k b/table68k old mode 100644 new mode 100755 diff --git a/traps.c b/traps.c old mode 100644 new mode 100755 diff --git a/tui.c b/tui.c old mode 100644 new mode 100755 diff --git a/uaeexe.c b/uaeexe.c old mode 100644 new mode 100755 diff --git a/uaeipc.c b/uaeipc.c old mode 100644 new mode 100755 diff --git a/uaelib.c b/uaelib.c old mode 100644 new mode 100755 diff --git a/uaeserial.c b/uaeserial.c old mode 100644 new mode 100755 diff --git a/unzip.c b/unzip.c old mode 100644 new mode 100755 diff --git a/writelog.c b/writelog.c old mode 100644 new mode 100755 diff --git a/zfile.c b/zfile.c old mode 100644 new mode 100755