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