static void irq(void)
{
if (!(intreq & 8)) {
- INTREQ_f(0x8000 | 0x0008);
+ INTREQ_0 (0x8000 | 0x0008);
}
}
static int cdromok = 0;
static int cd_hunt;
+static void checkint (void)
+{
+ if (cdrom_status1 & cdrom_status2)
+ irq();
+}
static void set_status(uae_u32 status)
{
cdrom_status1 |= status;
- if (cdrom_status1 & cdrom_status2)
- irq();
+ checkint ();
}
+void rethink_akiko (void)
+{
+ checkint ();
+}
+
+
static uae_u8 frombcd (uae_u8 v)
{
return (v >> 4) * 10 + (v & 15);
unsigned int startpos;
struct znode *znfirst, *znlast;
struct zfile *zf = zn->volume->archive;
- struct zfile *dstf;
+ struct zfile *dstf, *newzf;
uae_u8 *buf, *dbuf;
unsigned int compsize, unpsize;
dstf = NULL;
buf = dbuf = NULL;
+ newzf = NULL;
/* find first file in compressed block */
unpsize = 0;
znfirst = zn;
while (znfirst->prev) {
- znfirst = znfirst->prev;
- if (!znfirst || znfirst->offset != 0)
+ struct znode *zt = znfirst->prev;
+ if (!zt || zt->offset != 0)
break;
+ znfirst = zt;
unpsize += znfirst->size;
}
/* find last file in compressed block */
zfile_fseek (zf, startpos, SEEK_SET);
buf = xmalloc(compsize);
zfile_fread (buf, compsize, 1, zf);
- dbuf = xmalloc (unpsize);
+ dbuf = xcalloc (unpsize, 1);
/* unpack complete block */
memset(offset_len, 0, sizeof offset_len);
global_shift = -16;
last_offset = 1;
destination = dbuf;
- while (unpsize > 0) {
- uae_u8 *pdest = destination;
- if (!read_literal_table()) {
- int s;
- destination_end = destination + decrunch_length;
- decrunch();
- s = destination - pdest;
- unpsize -= s;
- crc_calc (pdest, s);
- } else {
- write_log ("LZX corrupt compressed data\n");
- goto end;
+ if (compsize == unpsize) {
+ memcpy (dbuf, buf, unpsize);
+ } else {
+ while (unpsize > 0) {
+ uae_u8 *pdest = destination;
+ if (!read_literal_table()) {
+ destination_end = destination + decrunch_length;
+ decrunch();
+ unpsize -= decrunch_length;
+ crc_calc (pdest, decrunch_length);
+ } else {
+ write_log ("LZX corrupt compressed data %s\n", zn->name);
+ goto end;
+ }
}
}
/* pre-cache all files we just decompressed */
dstf = zfile_fopen_empty (znfirst->name, znfirst->size);
zfile_fwrite(dbuf + znfirst->offset2, znfirst->size, 1, dstf);
znfirst->f = dstf;
+ if (znfirst == zn)
+ newzf = zfile_dup (dstf);
}
if (znfirst == znlast)
break;
end:
xfree(buf);
xfree(dbuf);
- return zn->f;
+ return newzf;
}
struct zvolume *archive_directory_lzx (struct zfile *in_file)
zn = zvolume_addfile_abs(zv, &zai);
zn->offset2 = merge_size;
- //write_log ("%d %d %d %s\n", unpack_size, merge_size, pack_size, zai.name);
total_pack += pack_size;
total_unpack += unpack_size;
total_files++;
}
else
abort = 0; /* continue */
+
+ //write_log ("unp=%6d mrg=%6d pack=%6d off=%6d %s\n", unpack_size, merge_size, pack_size, zn->offset, zai.name);
+
+
}
}
}
SockLibBase = 0;
- write_log("BSDSOCK: cleanup starting..\n");
- host_sbcleanup (NULL);
- for (sb = socketbases; sb; sb = nsb) {
+ write_log("BSDSOCK: cleanup start..\n");
+ host_sbcleanup (NULL);
+ for (sb = socketbases; sb; sb = nsb) {
nsb = sb->next;
write_log("BSDSOCK: cleanup start socket %x\n", sb);
host_sbcleanup (sb);
- write_log("BSDSOCK: cleanup end\n");
free (sb->dtable);
free (sb->ftable);
free (sb);
}
+ write_log("BSDSOCK: cleanup end\n");
socketbases = NULL;
#if 1
}
host_sbreset ();
- write_log("BSDSOCK: cleanup end\n");
+ write_log("BSDSOCK: cleanup finished\n");
}
static const TrapHandler sockfuncs[] = {
static void INT2(void)
{
if (!(intreq & 8)) {
- INTREQ_f(0x8000 | 0x0008);
+ INTREQ_0 (0x8000 | 0x0008);
}
}
return;
if (sten == 1) {
- if (!(tp_air & (1 << 3)) && (tp_cd & (1 << 3))) {
+ if (tp_cd & (1 << 3)) {
tp_air |= 1 << 3;
INT2();
}
static void checkint(void)
{
int irq = 0;
+
if (currprefs.cs_cdtvscsi && (wdscsi_getauxstatus() & 0x80)) {
dmac_istr |= ISTR_INTS;
if ((dmac_cntr & CNTR_INTEN) && (dmac_istr & ISTR_INTS))
INT2();
}
+void rethink_cdtv (void)
+{
+ checkint ();
+ tp_check_interrupts ();
+}
+
+
void CDTV_hsync_handler(void)
{
static int subqcnt;
if (cd_playing)
gui_cd_led (1);
if (cd_media && (tp_cr & 1)) {
- if (!(tp_air & (1 << 1))) {
- tp_air |= 1 << 1;
- INT2();
- }
+ tp_air |= 1 << 1;
+ INT2();
}
subqcnt--;
addrbank dmac_bank = {
dmac_lget, dmac_wget, dmac_bget,
dmac_lput, dmac_wput, dmac_bput,
- default_xlate, default_check, NULL, "CDTV CD Controller",
+ default_xlate, default_check, NULL, "CDTV DMAC/CD Controller",
dummy_lgeti, dummy_wgeti, ABFLAG_IO
};
#ifdef A2091
rethink_a2091 ();
#endif
+#ifdef CDTV
+ rethink_cdtv ();
+#endif
+#ifdef CD32
+ rethink_akiko ();
+#endif
}
static void INTREQ_d (uae_u16 v, int d)
}
z3fastmem_start = currprefs.z3fastmem_start;
- p96ram_start = currprefs.z3fastmem_start + ((currprefs.z3fastmem_size + 0xffffff) & ~0xffffff);
+ if (!p96mode)
+ p96ram_start = currprefs.z3fastmem_start + ((currprefs.z3fastmem_size + 0xffffff) & ~0xffffff);
(*card_init[0]) ();
}
extern void AKIKO_hsync_handler (void);
extern uae_u8 *extendedkickmemory;
+
+extern void rethink_akiko (void);
\ No newline at end of file
extern void cdtv_getdmadata(uae_u32*);
+extern void rethink_cdtv (void);
+
#endif
#define UAEMAJOR 1
#define UAEMINOR 4
-#define UAESUBREV 4
+#define UAESUBREV 5
typedef enum { KBD_LANG_US, KBD_LANG_DK, KBD_LANG_DE, KBD_LANG_SE, KBD_LANG_FR, KBD_LANG_IT, KBD_LANG_ES } KbdLang;
!define PRODUCT_NAME "WinUAE"
-!define PRODUCT_VERSION "1.4.3"
+!define PRODUCT_VERSION "1.4.4"
!define PRODUCT_PUBLISHER "Arabuusimiehet"
!define PRODUCT_WEB_SITE "http://www.winuae.net/"
!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\winuae.exe"
{
if (!bsd)
return;
- WSACleanup();
if(bsd->hSockThread) {
HANDLE t = bsd->hSockThread;
DeleteCriticalSection(&bsd->csSigQueueLock);
UnregisterClass ("SocketFun", hInst);
}
close_selectget_threads ();
+ WSACleanup();
}
#ifdef BSDSOCKET
{
void *result = (void *)-1;
BOOL got = FALSE;
+ int p96special = FALSE;
#ifdef NATMEM_OFFSET
unsigned int size=shmids[shmid].size;
if(!strcmp(shmids[shmid].name,"gfx")) {
got = TRUE;
if (p96mode) {
+ p96special = TRUE;
p96ram_start = p96mem_offset - natmem_offset;
shmaddr = natmem_offset + p96ram_start;
} else {
if (got == FALSE) {
if (shmaddr)
virtualfreewithlock(shmaddr, os_winnt ? size : 0, os_winnt ? MEM_DECOMMIT : MEM_RELEASE);
- result = virtualallocwithlock(shmaddr, size, os_winnt ? MEM_COMMIT : (MEM_RESERVE | MEM_COMMIT | (p96mode ? MEM_WRITE_WATCH : 0)),
+ result = virtualallocwithlock(shmaddr, size, os_winnt ? MEM_COMMIT : (MEM_RESERVE | MEM_COMMIT | (p96special ? MEM_WRITE_WATCH : 0)),
PAGE_EXECUTE_READWRITE);
if (result == NULL) {
result = (void*)-1;
if (memorylocking && os_winnt)
VirtualLock(shmaddr, size);
shmids[shmid].attached = result;
- write_log ("VirtualAlloc %08.8X - %08.8X %x (%dk) ok\n",
+ write_log ("VirtualAlloc %08.8X - %08.8X %x (%dk) ok%s\n",
(uae_u8*)shmaddr - natmem_offset, (uae_u8*)shmaddr - natmem_offset + size,
- size, size >> 10);
+ size, size >> 10, p96special ? " P96" : "");
}
} else {
shmids[shmid].attached = shmaddr;
cnt = enumserialports_2();
for (i = 0; i < 10; i++) {
sprintf(name, "COM%d", i);
- if (!QueryDosDevice(name, devname, sizeof devname)) {
+ if (!QueryDosDevice(name, devname, sizeof devname))
continue;
- } else {
- for(j = 0; j < cnt; j++) {
- if (!strcmp(comports[j].cfgname, name))
- break;
- }
- if (j == cnt) {
- if (cnt >= MAX_SERIAL_PORTS)
- break;
+ for(j = 0; j < cnt; j++) {
+ if (!strcmp(comports[j].cfgname, name))
+ break;
+ }
+ if (j == cnt) {
+ if (cnt >= MAX_SERIAL_PORTS)
+ break;
+ comports[j].dev = xmalloc(100);
+ sprintf(comports[cnt].dev, "\\.\\\\%s", name);
+ comports[j].cfgname = my_strdup (name);
+ comports[j].name = my_strdup (name);
+ write_log ("SERPORT: %d:'%s' = '%s' (%s)\n", cnt, comports[j].name, comports[j].dev, devname);
+ cnt++;
+ }
+ }
+ if (cnt == 0 && !os_winnt) {
+ /* windows 98 hack */
+ for (i = 0; i < 8; i++) {
+ COMMCONFIG cc;
+ DWORD size = sizeof(COMMCONFIG);
+ sprintf(name, "COM%d", i);
+ if(GetDefaultCommConfig (name, &cc, &size)) {
+ j = cnt;
comports[j].dev = xmalloc(100);
sprintf(comports[cnt].dev, "\\.\\\\%s", name);
comports[j].cfgname = my_strdup (name);
comports[j].name = my_strdup (name);
- write_log ("SERPORT: %d:'%s' = '%s' (%s)\n", cnt, comports[j].name, comports[j].dev, devname);
+ write_log ("W98SERPORT: %d:'%s'\n", cnt, comports[j].name);
cnt++;
}
}
static void flushpixels_rgbx(uae_u8 *dst)
{
- int i, j;
+ int i, j, off;
int rowwidth_src = picasso_vidinfo.width * picasso_vidinfo.pixbytes;
int rowwidth_dst = picasso96_state.Width * picasso96_state.BytesPerPixel;
ULONG ps;
ULONG_PTR gwwcnt;
+ uae_u8 *src = p96ram_start + natmem_offset;
if (!picasso_vidinfo.extra_mem)
return;
gwwbufsize = allocated_gfxmem / 4096 + 1;
gwwbuf = xmalloc (gwwbufsize * sizeof (void*));
}
- gwwcnt = gwwbufsize;
- if (GetWriteWatch(WRITE_WATCH_FLAG_RESET, p96ram_start + natmem_offset, allocated_gfxmem, gwwbuf, &gwwcnt, &ps))
- return;
- for (i = 0; i < gwwcnt; i++) {
- uae_u8 *p = gwwbuf[i];
- uaecptr addr = p - p96ram_start - natmem_offset;
- for (j = 0; j < ps / 4; j++) {
- int xbytes, y;
- uae_u32 *dst2;
- y = addr / picasso96_state.BytesPerRow;
- xbytes = addr % picasso96_state.BytesPerRow;
- dst2 = (uae_u32*)(dst + y * picasso_vidinfo.rowbytes + xbytes);
- if (xbytes < rowwidth_dst && y < picasso96_state.Height)
- *dst2 = ((uae_u32*)p)[0];
- addr += 4;
- p += 4;
+ for (;;) {
+ gwwcnt = gwwbufsize;
+ if (GetWriteWatch(WRITE_WATCH_FLAG_RESET, src, allocated_gfxmem, gwwbuf, &gwwcnt, &ps))
+ return;
+ if (gwwcnt == 0)
+ return;
+ off = picasso96_state.XYOffset - gfxmem_start;
+ for (i = 0; i < gwwcnt; i++) {
+ uae_u8 *p = gwwbuf[i];
+ uaecptr addr = (p - src) - off;
+ int y = addr / picasso96_state.BytesPerRow;
+ int yend = (addr + ps + picasso96_state.BytesPerRow - 1) / picasso96_state.BytesPerRow;
+ uae_u8 *src2 = src + y * picasso96_state.BytesPerRow + off;
+ uae_u8 *dst2 = dst + y * picasso_vidinfo.rowbytes;
+
+ while (y <= yend && y < picasso96_state.Height) {
+#if 0
+ for (j = 0; j < rowwidth_dst; j++)
+ dst2[j] = src2[j] ^ 0xff;
+#else
+ memcpy (dst2, src2, rowwidth_dst);
+#endif
+ src2 += picasso96_state.BytesPerRow;
+ dst2 += picasso_vidinfo.rowbytes;
+ y++;
+ }
+
+#if 0
+ for (j = 0; j < ps / 4; j++) {
+ int xbytes, y;
+ uae_u32 *dst2;
+ y = addr / picasso96_state.BytesPerRow;
+ xbytes = addr % picasso96_state.BytesPerRow;
+ if (xbytes < rowwidth_dst && y < picasso96_state.Height) {
+ dst2 = (uae_u32*)(dst + y * picasso_vidinfo.rowbytes + xbytes);
+ *dst2 = ((uae_u32*)p)[0];
+ }
+ addr += 4;
+ p += 4;
+ }
+#endif
}
}
}
if (p96mode) {
if(picasso_vidinfo.rgbformat == picasso96_state.RGBFormat)
flushpixels_rgbx(dst);
+ else
+ write_log("!");
} else {
if(picasso_vidinfo.rgbformat == picasso96_state.RGBFormat)
flushpixels_rgb(dst);
+++ /dev/null
-// Microsoft Visual C++ generated Help ID include file.
-// Used by winuae.rc
-//
+++ /dev/null
-//{{NO_DEPENDENCIES}}
-// Microsoft Visual C++ generated include file.
-// Used by winuae.rc
-//
-#define IDS_KICKSTART 1
-#define IDS_DISK 2
-#define IDS_DISPLAY 3
-#define IDC_HARDDRIVE_IMAGE 3
-#define IDS_HARDDISK 4
-#define IDS_FLOPPY 5
-#define IDS_ABOUT 6
-#define IDS_LOADSAVE 7
-#define IDS_AVIOUTPUT 8
-#define IDS_PORTS 9
-#define IDS_MISC1 10
-#define IDS_MEMORY 11
-#define IDS_CPU 12
-#define IDS_CHIPSET 13
-#define IDS_INPUT 14
-#define IDS_OPENGL 15
-#define IDS_FILTER 15
-#define IDS_MISC2 16
-#define IDS_PATHS 17
-#define IDS_QUICKSTART 18
-#define IDS_FRONTEND 19
-#define IDS_CHIPSET2 20
-#define IDS_EXTTEXT 100
-#define IDS_EXTACTUAL 101
-#define IDS_SOUND 102
-#define IDS_CDROM 103
-#define IDS_FRAMERATE 104
-#define IDS_SECOND 105
-#define IDS_THIRD 106
-#define IDD_KICKSTART 107
-#define IDS_FOURTH 107
-#define IDD_DISPLAY 108
-#define IDS_FIFTH 108
-#define IDD_MEMORY 109
-#define IDS_SIXTH 109
-#define IDD_FLOPPY 110
-#define IDS_SEVENTH 110
-#define IDD_CPU 111
-#define IDS_EIGHTH 111
-#define IDD_ABOUT 112
-#define IDS_NINTH 112
-#define IDD_HARDDISK 113
-#define IDS_TENTH 113
-#define IDS_SELECTADF 114
-#define IDS_ADF 115
-#define IDS_CHOOSEBLANK 116
-#define IDS_SELECTHDF 117
-#define IDS_HDF 118
-#define IDS_SELECTUAE 119
-#define IDS_UAE 120
-#define IDS_SELECTROM 121
-#define IDD_SOUND 122
-#define IDS_ROM 122
-#define IDI_APPICON 123
-#define IDS_SELECTKEY 123
-#define IDI_CPU 124
-#define IDS_KEY 124
-#define IDI_ABOUT 125
-#define IDS_SELECTINFO 125
-#define IDS_NONE 126
-#define IDS_VOLUME 127
-#define IDI_HARDDISK 128
-#define IDS_PATH 128
-#define IDS_RW 129
-#define IDI_SOUND 130
-#define IDS_SECTORS 130
-#define IDS_SURFACES 131
-#define IDS_RESERVED 132
-#define IDS_BLOCKSIZE 133
-#define IDI_FLOPPY 134
-#define IDS_NAME 134
-#define IDD_LOADSAVE 135
-#define IDS_DESCRIPTION 135
-#define IDS_ONEINSTANCE 136
-#define IDI_PORTS 137
-#define IDS_INSTALLDIRECTX 137
-#define IDD_PORTS 138
-#define IDS_REGKEYCREATEFAILED 138
-#define IDS_COULDNOTLOADCONFIG 139
-#define IDD_CONTRIBUTORS 140
-#define IDS_NOHELP 140
-#define IDD_MISC1 141
-#define IDS_MUSTSELECTCONFIG 141
-#define IDD_HARDFILE 142
-#define IDS_NOAGA 142
-#define IDD_FILESYS 143
-#define IDS_INVALIDCOMPORT 143
-#define IDS_WSOCK2NEEDED 144
-#define IDD_MISC2 144
-#define IDS_UNSUPPORTEDPIXELFORMAT 145
-#define IDS_WAVEOUTOPENFAILURE 146
-#define IDS_MUSTENTERNAME 147
-#define IDS_MUSTSELECTCONFIGFORDELETE 148
-#define IDS_DELETECONFIGCONFIRMATION 149
-#define IDI_MISC1 150
-#define IDS_DELETECONFIGTITLE 150
-#define IDC_MYHAND 151
-#define IDS_GFXCARDCHECK 151
-#define IDD_DIALOG1 152
-#define IDS_GFXCARDTITLE 152
-#define IDD_DEBUGGER 152
-#define IDD_SETINFO 153
-#define IDS_MUSTSELECTPATH 153
-#define IDI_ICON1 153
-#define IDS_SETTINGSERROR 154
-#define IDD_CHIPSET 154
-#define IDS_MUSTSELECTNAME 155
-#define IDI_MOVE_UP 155
-#define IDD_CHIPSET2 155
-#define IDS_MUSTSELECTFILE 156
-#define IDI_MOVE_DOWN 156
-#define IDS_FAILEDHARDFILECREATION 157
-#define IDD_AVIOUTPUT 157
-#define IDS_CREATIONERROR 158
-#define IDI_AVIOUTPUT 158
-#define IDS_ERRORTITLE 159
-#define IDS_SELECTFILESYSROOT 160
-#define IDD_OPENGL 160
-#define IDD_FILTER 160
-#define IDS_DEFAULTMIDIOUT 161
-#define IDS_DEFAULTMIDIIN 162
-#define IDS_CONTRIBUTORS1 163
-#define IDD_HARDDRIVE 163
-#define IDS_CONTRIBUTORS2 164
-#define IDS_INVALIDPRTPORT 165
-#define IDS_SELECTUSS 166
-#define IDS_RESTOREUSS 166
-#define IDS_USS 167
-#define IDS_WRONGOSVERSION 168
-#define IDR_DRIVE_STARTUP_A500_1 168
-#define IDS_SELECTFLASH 169
-#define IDR_DRIVE_CLICK_A500_1 169
-#define IDS_FLASH 170
-#define IDR_DRIVE_SPIN_A500_1 170
-#define IDD_INPUT 171
-#define IDS_INPUTHOSTWIDGET 171
-#define IDI_INPUT 172
-#define IDS_INPUTAMIGAEVENT 172
-#define IDD_DISK 172
-#define IDS_INPUTAUTOFIRE 173
-#define IDS_SAVEUSS 174
-#define IDS_MIDIOVERFLOW 175
-#define IDS_HFDSIZE 176
-#define IDS_DEVICE 177
-#define IDS_BOOTPRI 178
-#define IDS_WRONGDXVERSION 179
-#define IDI_MISC2 180
-#define IDS_FLOPPY_COMPATIBLE 180
-#define IDR_DRIVE_SNATCH_A500_1 181
-#define IDS_FLOPPY_TURBO 181
-#define IDI_DISK 182
-#define IDR_DRIVE_SPINND_A500_1 182
-#define IDS_YES 182
-#define IDD_PANEL 183
-#define IDS_NO 183
-#define IDD_PATHS 184
-#define IDS_PRI_ABOVENORMAL 184
-#define IDI_CONFIGFILE 185
-#define IDD_QUICKSTART 185
-#define IDS_PRI_NORMAL 185
-#define IDM_SYSTRAY 186
-#define IDS_PRI_BELOWNORMAL 186
-#define IDS_PRI_LOW 187
-#define IDI_FOLDER 188
-#define IDS_OLDRTGLIBRARY 188
-#define IDS_DEFAULT_AF2005 189
-#define IDI_DISPLAY 190
-#define IDS_DEFAULT_AF 190
-#define IDS_DEFAULT_WINUAE 191
-#define IDI_ROOT 192
-#define IDS_INP 192
-#define IDS_RESTOREINP 193
-#define IDI_ICON2 194
-#define IDI_MEMORY 194
-#define IDS_SAVEINP 194
-#define IDS_SCREEN_WINDOWED 195
-#define IDS_SCREEN_FULLSCREEN 196
-#define IDS_SCREEN_FULLWINDOW 197
-#define IDS_SCREEN_VSYNC 198
-#define IDS_SOUND_MONO 200
-#define IDS_SOUND_MIXED 201
-#define IDI_QUICKSTART 201
-#define IDS_SOUND_STEREO 202
-#define IDS_SOUND_INTERPOL_DISABLED 203
-#define IDS_SOUND_INTERPOL_RH 204
-#define IDI_PATHS 204
-#define IDS_SOUND_INTERPOL_CRUX 205
-#define IDS_SOUND_FILTER_OFF 206
-#define IDS_SOUND_FILTER_EMULATED 207
-#define IDS_SOUND_FILTER_EMULATED_E 208
-#define IDS_INPUT_COMPATIBILITY 209
-#define IDS_INPUT_CUSTOM 210
-#define IDS_INPUT_COPY_DEFAULT 211
-#define IDS_INPUT_COPY_CUSTOM 212
-#define IDS_3D_NO_FILTER 213
-#define IDS_3D_BILINEAR 214
-#define IDS_VSYNC_DEFAULT 215
-#define IDS_DRIVESOUND_NONE 216
-#define IDS_DRIVESOUND_DEFAULT_A500 217
-#define IDS_AVIOUTPUT_NOCODEC 218
-#define IDS_DISK_IMAGENAME 219
-#define IDS_DISK_DRIVENAME 220
-#define IDS_AGA8BIT 221
-#define IDS_UNSUPPORTEDSCREENMODE 222
-#define IDS_UNSUPPORTEDSCREENMODE_1 223
-#define IDS_UNSUPPORTEDSCREENMODE_2 224
-#define IDS_UNSUPPORTEDSCREENMODE_3 225
-#define IDS_UNSUPPORTEDSCREENMODE_4 226
-#define IDS_FLOPPYTYPE35DD 227
-#define IDS_FLOPPYTYPE35HD 228
-#define IDS_FLOPPYTYPE525SD 229
-#define IDS_FLOPPYTYPEDISABLED 230
-#define IDS_STMENUNOFLOPPY 231
-#define IDS_TREEVIEW_HARDWARE 232
-#define IDS_TREEVIEW_HOST 233
-#define IDS_TREEVIEW_MISC 234
-#define IDS_TREEVIEW_SETTINGS 235
-#define IDS_WINUAETITLE_MMB 236
-#define IDS_WINUAETITLE_NORMAL 237
-#define IDS_STARTEMULATION 238
-#define IDS_TREEVIEW_ABOUT 239
-#define IDS_NOHARDDRIVES 240
-#define IDS_DEFAULT_HOST 241
-#define IDS_SOUND_4CHANNEL 242
-#define IDS_HF_FS_CUSTOM 243
-#define IDS_SELECTFS 244
-#define IDS_KEYJOY 245
-#define IDB_XARCADE 246
-#define IDS_STATEFILE_UNCOMPRESSED 246
-#define IDS_STATEFILE_RAMDUMP 247
-#define IDS_STATEFILE_WAVE 248
-#define IDD_FRONTEND 249
-#define IDS_SOUND_SWAP_PAULA 249
-#define IDS_SOUND_SWAP_AHI 250
-#define IDD_PROGRESSBAR 250
-#define IDS_SOUND_SWAP_BOTH 251
-#define IDD_STRINGBOX 251
-#define IDB_BITMAP1 252
-#define IDB_LCD160X43 252
-#define IDS_SOUND_FILTER_ON_AGA 252
-#define IDS_SOUND_FILTER_ON 253
-#define IDS_SOUND_FILTER_ON_A500 253
-#define IDS_DRIVESOUND_PC_FLOPPY 254
-#define IDS_FLOPPYTYPE35DDESCOM 255
-#define IDS_SOUND_STEREO2 256
-#define IDS_INPUT_CUSTOMEVENT 257
-#define IDS_DEFAULT_NEWWINUAE 258
-#define IDS_NUMSG_NEEDEXT2 300
-#define IDS_NUMSG_NOROMKEY 301
-#define IDS_NUMSG_KSROMCRCERROR 302
-#define IDS_NUMSG_KSROMREADERROR 303
-#define IDS_NUMSG_NOEXTROM 304
-#define IDS_NUMSG_MODRIP_NOTFOUND 305
-#define IDS_NUMSG_MODRIP_FINISHED 306
-#define IDS_NUMSG_MODRIP_SAVE 307
-#define IDS_NUMSG_KS68020 308
-#define IDS_NUMSG_ROMNEED 309
-#define IDS_NUMSG_NOZLIB 310
-#define IDS_NUMSG_STATEHD 311
-#define IDS_NUMSG_NOCAPS 312
-#define IDS_NUMSG_OLDCAPS 313
-#define IDS_IMGCHK_BOOTBLOCKCRCERROR 314
-#define IDS_IMGCHK_BOOTBLOCKNO 315
-#define IDS_IMGCHK_DAMAGED 316
-#define IDS_IMGCHK_KS2 317
-#define IDS_IMGCHK_KS3 318
-#define IDS_ROMSCANEND 319
-#define IDS_ROM_AVAILABLE 320
-#define IDS_ROM_UNAVAILABLE 321
-#define IDS_HARDDRIVESAFETYWARNING 322
-#define IDS_NUMSG_KS68EC020 323
-#define IDS_ROMSCANNOROMS 324
-#define IDS_NUMSG_KICKREP 325
-#define IDS_NUMSG_KICKREPNO 326
-#define IDS_NUMSG_NOROM 327
-#define IDS_HDCLONE_OK 328
-#define IDS_HDCLONE_FAIL 329
-#define IDR_DBGACCEL 330
-#define IDS_NUMSG_KS68030 331
-#define IDS_NUMSG_EXPROMNEED 332
-#define IDS_QS_MODELS 1000
-#define IDS_QS_MODEL_A500 1001
-#define IDS_QS_MODEL_A500P 1002
-#define IDS_QS_MODEL_A600 1003
-#define IDS_QS_MODEL_A1000 1004
-#define IDS_QS_MODEL_A1200 1005
-#define IDS_QS_MODEL_CD32 1006
-#define IDS_QS_MODEL_CDTV 1007
-#define IDS_QS_MODEL_UAE 1008
-#define IDS_QS_MODEL_ARCADIA 1009
-#define IDS_QS_MODEL_A3000 1010
-#define IDS_QS_MODEL_A4000 1011
-#define IDS_QS_MODEL_A4000T 1012
-#define IDC_RESOLUTION 1021
-#define IDC_SERIAL 1022
-#define IDC_REFRESHRATE 1022
-#define IDC_ILLEGAL 1023
-#define IDC_MIDILIST 1023
-#define IDC_MIDIOUTLIST 1023
-#define IDC_DA_MODE 1023
-#define IDC_SHOWGUI 1024
-#define IDC_MIDIINLIST 1024
-#define IDC_RESOLUTION2 1024
-#define IDC_DISPLAYSELECT 1024
-#define IDC_AUTOCONFIG 1025
-#define IDC_PRINTERLIST 1025
-#define IDC_RESOLUTION3 1025
-#define IDC_RESOLUTIONDEPTH 1025
-#define IDC_CHIPMEM 1026
-#define IDC_CREATELOGFILE 1026
-#define IDC_PORT0_JOYS 1026
-#define IDC_SCREENMODE_NATIVE 1026
-#define IDC_FASTMEM 1027
-#define IDC_SHOWLEDS 1027
-#define IDC_PORT1_JOYS 1027
-#define IDC_SCREENMODE_RTG 1027
-#define IDC_MBMEM1 1028
-#define IDC_SLOWMEM 1030
-#define IDC_MBMEM2 1031
-#define IDC_PARALLEL 1033
-#define IDC_JULIAN 1040
-#define IDC_FASTTEXT 1043
-#define IDC_FASTRAM 1044
-#define IDC_CHIPRAM 1045
-#define IDC_SLOWRAM 1046
-#define IDC_Z3TEXT 1047
-#define IDC_Z3FASTRAM 1048
-#define IDC_Z3FASTMEM 1049
-#define IDC_MBRAM1 1050
-#define IDC_MBRAM2 1051
-#define IDC_UAEHOME 1070
-#define IDC_PICASSOHOME 1071
-#define IDC_AMIGAHOME 1072
-#define IDC_WINUAEHOME 1073
-#define IDC_AIABHOME 1074
-#define IDC_CLOANTOHOME 1075
-#define IDC_THEROOTS 1076
-#define IDC_CAPS 1077
-#define IDC_ABIME 1078
-#define IDC_AMIGASYS 1079
-#define IDC_AMIKIT 1080
-#define IDC_RICHEDIT1 1091
-#define IDC_RICHEDIT2 1092
-#define IDC_CONTRIBUTORS 1124
-#define IDC_ASPECT 1170
-#define IDC_BLIT32 1173
-#define IDC_BLITIMM 1174
-#define IDC_LORES 1176
-#define IDC_LORES_SMOOTHED 1179
-#define IDC_FRAMERATE 1185
-#define IDC_RATETEXT 1186
-#define IDC_XSIZE 1187
-#define IDC_YSIZE 1188
-#define IDC_INPUTAUTOFIRERATE 1188
-#define IDC_LM_NORMAL 1189
-#define IDC_INPUTSPEEDD 1189
-#define IDC_LM_DOUBLED 1190
-#define IDC_INPUTSPEEDA 1190
-#define IDC_GFXCARDTEXT 1191
-#define IDC_LM_SCANLINES 1191
-#define IDC_INPUTSPEEDM 1191
-#define IDC_P96RAM 1192
-#define IDC_P96MEM 1193
-#define IDC_DA_SLIDER 1193
-#define IDC_FRAMERATE2 1194
-#define IDC_RATE2TEXT 1195
-#define IDC_CPU0 1200
-#define IDC_CPU1 1201
-#define IDC_CPU2 1202
-#define IDC_CPU3 1203
-#define IDC_CPU4 1204
-#define IDC_CPU5 1205
-#define IDC_CS_HOST 1209
-#define IDC_CS_68000 1210
-#define IDC_CS_ADJUSTABLE 1211
-#define IDC_CS_CPU_TEXT 1212
-#define IDC_CS_CHIPSET_TEXT 1213
-#define IDC_COMPATIBLE 1214
-#define IDC_TRUST0 1215
-#define IDC_TRUST1 1216
-#define IDC_TRUST2 1217
-#define IDC_CACHE 1218
-#define IDC_CYCLEEXACT 1219
-#define IDC_CS_CPU_TEXT2 1219
-#define IDC_CPUIDLE 1220
-#define IDC_GENLOCK 1220
-#define IDC_COMPATIBLE_FPU 1221
-#define IDC_FASTERRTG 1221
-#define IDC_COMPATIBLE24 1222
-#define IDC_SPEED 1223
-#define IDC_FPU0 1224
-#define IDC_FPU1 1225
-#define IDC_FPU2 1226
-#define IDC_FPU3 1227
-#define IDC_SOUNDSETTINGS 1229
-#define IDC_8BIT 1230
-#define IDC_16BIT 1231
-#define IDC_11KHZ 1232
-#define IDC_22KHZ 1233
-#define IDC_44KHZ 1234
-#define IDC_48KHZ 1235
-#define IDC_SOUNDSIZE 1236
-#define IDC_FREQUENCY 1237
-#define IDC_SOUND0 1238
-#define IDC_SOUND1 1239
-#define IDC_SOUND2 1240
-#define IDC_SOUND3 1241
-#define IDC_SOUNDSTYLE 1242
-#define IDC_SOUNDSTYLE0 1243
-#define IDC_STEREO 1244
-#define IDC_SOUNDSTYLE1 1245
-#define IDC_SOUNDINTERPOLATION 1248
-#define IDC_INTERPOLATION0 1249
-#define IDC_INTERPOLATION1 1250
-#define IDC_INTERPOLATION2 1251
-#define IDC_STEREOMODE 1252
-#define IDC_SOUNDINTERPOLATION2 1252
-#define IDC_STEREOMODE0 1253
-#define IDC_STEREOMODE1 1254
-#define IDC_STEREOMODE2 1255
-#define IDC_SOUNDINTERPOLATION3 1256
-#define IDC_DF0TEXT 1270
-#define IDC_DF1TEXT 1271
-#define IDC_DF2TEXT 1272
-#define IDC_DF3TEXT 1273
-#define IDC_EJECT0 1274
-#define IDC_EJECT1 1275
-#define IDC_EJECT2 1276
-#define IDC_EJECT3 1277
-#define IDC_DF0 1278
-#define IDC_DF1 1279
-#define IDC_DF2 1280
-#define IDC_DF3 1281
-#define IDC_CREATE 1282
-#define IDC_CREATE_RAW 1283
-#define IDC_SNAPSHOTNAME 1284
-#define IDC_SNAPSHOT 1285
-#define IDC_SAVEIMAGE0 1285
-#define IDC_DOSAVESTATE 1286
-#define IDC_SAVEIMAGE1 1286
-#define IDC_DOLOADSTATE 1287
-#define IDC_SAVEIMAGE2 1287
-#define IDC_PROWIZARD 1288
-#define IDC_SAVEIMAGE3 1288
-#define IDC_PORT0_JOYSC 1302
-#define IDC_PORT0_KBDA 1303
-#define IDC_PORT0_KBDB 1304
-#define IDC_PORT0_KBDC 1305
-#define IDC_PORT0_KBDD 1306
-#define IDC_PORT0_KBDE 1307
-#define IDC_PORT1_JOYSC 1308
-#define IDC_PORT1_KBDA 1309
-#define IDC_PORT1_KBDB 1310
-#define IDC_PORT1_KBDC 1311
-#define IDC_PORT1_KBDD 1312
-#define IDC_PORT1_KBDE 1313
-#define IDC_MIDIFRAME 1314
-#define IDC_SERPARFRAME 1315
-#define IDC_SERIALFRAME 1316
-#define IDC_EDIT 1334
-#define IDC_REMOVE 1335
-#define IDC_VOLUMELIST 1336
-#define IDC_UP 1337
-#define IDC_DOWN 1338
-#define IDC_NEW_FS 1339
-#define IDC_NEW_HF 1340
-#define IDC_NEW_HD 1341
-#define IDC_PORT0 1342
-#define IDC_PORT1 1343
-#define IDC_PATH_NAME 1362
-#define IDC_SELECTOR 1363
-#define IDC_VOLUME_NAME 1364
-#define IDC_HARDFILE_DEVICE 1364
-#define IDC_SECTORS 1365
-#define IDC_VOLUME_DEVICE 1365
-#define IDC_HEADS 1366
-#define IDC_RESERVED 1367
-#define IDC_BLOCKSIZE 1368
-#define IDC_HARDFILE_BOOTPRI 1369
-#define IDC_SECTORS_TEXT 1370
-#define IDC_SURFACES_TEXT 1371
-#define IDC_RESERVED_TEXT 1372
-#define IDC_RESERVED_TEXT2 1373
-#define IDC_BLOCKSIZE_TEXT 1374
-#define ID_OK 1375
-#define IDC_HARDFILE_BOOTPRI_TEXT 1375
-#define IDC_PATH_FILESYS 1376
-#define IDC_HARDFILE_DIR_TEXT 1377
-#define IDC_HARDFILE_DEVICE_TEXT 1378
-#define IDC_RW 1379
-#define IDC_HFRDB 1380
-#define IDC_RW2 1380
-#define IDC_RDB 1380
-#define IDC_HARDFILE_FILESYS_TEXT 1380
-#define IDC_FILESYS_SELECTOR 1381
-#define IDC_ROMFILE 1390
-#define IDC_KEYFILE 1391
-#define IDC_KICKCHOOSER 1392
-#define IDC_KEYCHOOSER 1393
-#define IDC_ROMFILE2 1394
-#define IDC_ROMCHOOSER2 1395
-#define IDC_FLASHCHOOSER 1396
-#define IDC_FLASHFILE 1397
-#define IDC_CARTFILE 1398
-#define IDC_CARTCHOOSER 1399
-#define IDC_SAVE 1400
-#define IDC_LOAD 1401
-#define IDC_DELETE 1403
-#define IDC_CONFIGLIST 1404
-#define IDC_EDITNAME 1405
-#define IDC_EDITDESCRIPTION 1406
-#define IDC_QUICKSAVE 1408
-#define IDC_QUICKLOAD 1409
-#define IDC_EXIT 1410
-#define IDC_EDITPATH 1410
-#define IDC_HDF_RDB 1500
-#define IDC_HFSIZE 1501
-#define IDC_HF_SIZE 1501
-#define IDC_LINEMODE 1502
-#define IDC_CREATEHF 1502
-#define IDC_HF_CREATE 1502
-#define IDC_SOCKETS 1503
-#define IDC_HF_DOSTYPE 1503
-#define IDC_HDF_CONTROLLER 1504
-#define IDC_RESETAMIGA 1504
-#define IDC_QUITEMU 1505
-#define IDC_MAPDRIVES 1507
-#define IDC_CPUTEXT 1508
-#define IDC_MAPDRIVES_NET 1508
-#define IDC_SWAP 1509
-#define IDC_CACHETEXT 1509
-#define IDC_SELECTRESTEXT 1510
-#define IDC_FLUSHPRINTER 1510
-#define IDC_SCREENRESTEXT 1511
-#define IDC_WIDTHTEXT 1512
-#define IDC_WINDOWEDTEXT 1512
-#define IDC_HEIGHTTEXT 1513
-#define IDC_SETTINGSTEXT 1514
-#define IDC_REFRESHTEXT 1515
-#define IDC_SETTINGSTEXT2 1515
-#define IDC_DISABLE1 1516
-#define IDC_DF1WP 1516
-#define IDC_QUICKSTART_COMPA 1516
-#define IDC_REFRESH2TEXT 1516
-#define IDC_DISABLE2 1517
-#define IDC_DF2WP 1517
-#define IDC_QUICKSTART_DF 1517
-#define IDC_DISABLE3 1518
-#define IDC_XCENTER 1518
-#define IDC_DF3WP 1518
-#define IDC_DF1WP2 1518
-#define IDC_QUICKSTART_HOST 1518
-#define IDC_YCENTER 1519
-#define IDC_DISABLE0 1519
-#define IDC_DF0WP 1519
-#define IDC_OCS 1520
-#define IDC_HDFLOPPY 1520
-#define IDC_ECS_AGNUS 1521
-#define IDC_ECS_DENISE 1522
-#define IDC_ECS 1523
-#define IDC_AGA 1524
-#define IDC_NTSC 1525
-#define IDC_NOSPEED 1527
-#define IDC_NOSOUND 1528
-#define IDC_INACTIVE_NOSOUND 1528
-#define IDC_MIDI 1529
-#define IDC_NOSPEEDPAUSE 1529
-#define IDC_INACTIVE_PAUSE 1529
-#define IDC_KICKSHIFTER 1530
-#define IDC_MIDI2 1530
-#define IDC_HIGHPRIORITY 1530
-#define IDC_MINIMIZED_NOSOUND 1530
-#define IDC_MINIMIZED_PAUSE 1531
-#define IDC_STATE_CAPTURE 1532
-#define IDC_KBLED_USB 1533
-#define IDC_SER_SHARED 1553
-#define IDC_SER_CTSRTS 1554
-#define IDC_SER_DIRECT 1555
-#define IDC_PSPRINTER 1556
-#define IDC_PSPRINTERDETECT 1557
-#define IDC_UAESERIAL 1558
-#define IDC_VIEWINFO 1568
-#define IDC_SETINFO 1569
-#define IDC_FLOPPYSLIDER 1570
-#define IDC_FLOPPYSLIDERTEXT 1571
-#define IDC_FLOPPYSPEED 1572
-#define IDC_FLOPPYSPD 1572
-#define IDC_GUILANGUAGE_LIST 1573
-#define IDC_SOUNDBUFFERRAM 1574
-#define IDC_SOUNDADJUST 1575
-#define IDC_SOUNDBUFFERTEXT 1576
-#define IDC_SOUNDVOLUME 1576
-#define IDC_SOUNDBUFFERMEM 1577
-#define IDC_HARDFLUSH 1578
-#define IDC_SOUNDADJUSTNUM 1578
-#define IDC_CONSTJUMP 1579
-#define IDC_SOUNDDRIVEVOLUME 1579
-#define IDC_JITFPU 1580
-#define IDC_SOUNDVOLUME2 1580
-#define IDC_NOFLAGS 1581
-#define IDC_SOUNDDRIVEVOLUME2 1581
-#define IDC_CS_CACHE_TEXT 1582
-#define IDC_FORCE 1583
-#define IDC_COLLISIONS 1584
-#define IDC_JITENABLE 1584
-#define IDC_DISASSEMBLY 1585
-#define IDC_CTRLF11 1586
-#define IDC_FASTCOPPER 1588
-#define IDC_COLLISION0 1589
-#define IDC_COLLISION1 1590
-#define IDC_AUDIOSYNC 1590
-#define IDC_COLLISION2 1591
-#define IDC_COLLISION3 1592
-#define IDC_SOUNDLAGSLIDER 1592
-#define IDC_SOUNDLAGCAPTION 1594
-#define IDC_FLOPPYTYPE 1594
-#define IDC_SYNCPARAMS 1595
-#define IDC_DF0TYPE 1595
-#define IDC_SOUNDLAGTEXT 1596
-#define IDC_DF1TYPE 1596
-#define IDC_DF2TYPE 1597
-#define IDC_SOUNDSPEEDSLIDER 1598
-#define IDC_DF0TYPE4 1598
-#define IDC_DF3TYPE 1598
-#define IDC_SOUNDSPEEDTEXT 1599
-#define IDC_SOUNDSPEEDCAPTION 1600
-#define IDC_NOOVERLAY 1601
-#define IDC_ROMFILE2TEXT 1602
-#define IDC_ROMTEXT 1603
-#define IDC_KEYTEXT 1604
-#define IDC_CD32 1605
-#define IDC_AKIKOC2P 1605
-#define IDC_FLASHTEXT 1605
-#define IDC_SCSIDEVICE 1606
-#define IDC_FLASHTEXT2 1606
-#define IDC_AVIOUTPUT_PAL 1607
-#define IDC_INPUTTYPE 1607
-#define IDC_AVIOUTPUT_NTSC 1608
-#define IDC_INPUTSELECTTEXT 1608
-#define IDC_NOUAEFSDB 1608
-#define IDC_NOTASKBARBUTTON 1608
-#define IDC_CLOCKSYNC 1609
-#define IDC_AVIOUTPUT_FPS 1609
-#define IDC_INPUTDEVICE 1609
-#define IDC_MAPROM 1609
-#define IDC_NORECYCLEBIN 1609
-#define IDC_AVIOUTPUT_FILETEXT 1610
-#define IDC_INPUTDEVICETEXT 1610
-#define IDC_ALWAYSONTOP 1610
-#define IDC_MAPROM2 1610
-#define IDC_HRTMON 1610
-#define IDC_AVIOUTPUT_FILE 1611
-#define IDC_INPUTLIST 1611
-#define IDC_CATWEASEL 1611
-#define IDC_AVIOUTPUT_FPS_STATIC 1612
-#define IDC_INPUTAMIGA 1612
-#define IDC_ALWAYSONTOP2 1612
-#define IDC_BORDERLESS 1612
-#define IDC_POWERSAVE 1612
-#define IDC_AVIOUTPUT_VIDEO 1613
-#define IDC_INPUTAUTOFIRE 1613
-#define IDC_MOUSETRICK 1613
-#define IDC_AVIOUTPUT_AUDIO 1614
-#define IDC_INPUTCOPYFROM 1614
-#define IDC_AVIOUTPUT_VIDEO_CODEC 1615
-#define IDC_INPUTDEVICEDISABLE 1615
-#define IDC_AVIOUTPUT_ACTIVATED 1615
-#define IDC_FILTERENABLE 1615
-#define IDC_AVIOUTPUT_AUDIO_CODEC 1616
-#define IDC_INPUTAMIGACNT 1616
-#define IDC_FILTERHZ 1616
-#define IDC_SAMPLERIPPER_ACTIVATED 1616
-#define IDC_AVIOUTPUT_BORDER_TRIM 1617
-#define IDC_FILTERVZ 1617
-#define IDC_INPREC_RECORD 1617
-#define IDC_AVIOUTPUT_AUDIO_STATIC 1618
-#define IDC_FILTERHO 1618
-#define IDC_AVIOUTPUT_VIDEO_STATIC 1619
-#define IDC_FILTERVO 1619
-#define IDC_AVIOUTPUT_8BIT 1620
-#define IDC_INPREC_PLAY 1620
-#define IDC_AVIOUTPUT_24BIT 1621
-#define IDC_AVIOUTPUT_WIDTH 1622
-#define IDC_AVIOUTPUT_HEIGHT 1623
-#define IDC_AVIOUTPUT_FRAME 1624
-#define IDC_FILTERXL 1624
-#define IDC_FILTERSLR 1625
-#define IDC_FILTERHZMULT 1626
-#define IDC_FILTERMODE 1627
-#define IDC_FILTERFILTER 1628
-#define IDC_FILTERDEFAULT 1629
-#define IDC_FILTERXTRA 1630
-#define IDC_INPUTDEADZONE 1630
-#define IDC_INPUTCOPY 1631
-#define IDC_FILTERPRESETS 1631
-#define IDC_SCREENSHOT 1632
-#define IDC_INPUTSWAP 1632
-#define IDC_FILTERPRESETLOAD 1632
-#define IDC_FLOPPYSPDTEXT 1633
-#define IDC_FILTERPRESETSAVE 1633
-#define IDC_FLOPPYSPD_TEXT 1634
-#define IDC_FILTERPRESETDELETE 1634
-#define IDC_HARDDRIVE 1635
-#define IDC_INACTIVE_PRI 1635
-#define IDC_FILTERVZMULT 1635
-#define IDC_SOUNDPRIMARY 1636
-#define IDC_MINIMIZED_PRI 1636
-#define IDC_VOLUME_BOOTPRI_TEXT 1637
-#define IDC_VOLUME_BOOTPRI 1638
-#define IDC_KBLED1 1639
-#define IDC_KBLED2 1640
-#define IDC_SOUNDFILTER 1640
-#define IDC_KBLED3 1641
-#define IDC_SOUNDCALIBRATE 1641
-#define IDC_ACTIVE_PRIORITY 1642
-#define IDC_SOUNDDRIVE 1642
-#define IDC_INACTIVE_PRIORITY 1643
-#define IDC_ACTIVE_PRI 1644
-#define IDC_MINIMIZED_PRIORITY 1645
-#define IDC_AVIOUTPUT_FRAMELIMITER 1645
-#define IDC_STATE_RATE 1646
-#define IDC_INPREC_PLAYMODE 1646
-#define IDC_STATE_BUFFERSIZE 1647
-#define IDC_SOUNDDRIVESELECT 1647
-#define IDC_PANELTREE 1647
-#define IDC_AVIOUTPUT_FRAMELIMITER2 1647
-#define IDC_AVIOUTPUT_NOSOUNDOUTPUT 1647
-#define IDC_AVIOUTPUT_DIMENSIONS_STATIC 1648
-#define IDC_STATE_BUFFERSIZE_TEXT 1648
-#define IDC_CONFIGTREE 1648
-#define IDC_AVIOUTPUT_OPTIONS 1649
-#define IDC_STATE_RATE_TEXT 1649
-#define IDC_DISKLISTREMOVE 1649
-#define IDC_DF0QENABLE 1649
-#define IDC_SOUNDCARD 1650
-#define IDC_CS_SOUND0 1650
-#define IDC_UPBM 1650
-#define IDC_DISKLISTREMOVE2 1650
-#define IDC_DISKLISTINSERT 1650
-#define IDC_DF1QENABLE 1650
-#define IDC_SOUNDCARDLIST 1651
-#define IDC_CS_SOUND1 1651
-#define IDC_SOUNDFREQ 1652
-#define IDC_CS_SOUND2 1652
-#define IDC_SOUNDCARD2 1653
-#define IDC_SOUNDFREQTXT 1653
-#define IDC_PANEL_FRAME 1653
-#define IDC_SOUNDFILTERTXT 1654
-#define IDC_PANEL_FRAME_OUTER 1654
-#define IDC_SOUNDSTEREO 1655
-#define IDC_CONFIGTYPE 1655
-#define IDC_SOUNDDRIVETXT 1656
-#define IDC_PATHS_ROM 1656
-#define IDC_SOUNDSTEREOSEP 1656
-#define IDC_SOUNDSTEREOTXT 1657
-#define IDC_PATHS_CONFIG 1657
-#define IDC_SOUNDINTERPOLATIONTXT 1658
-#define IDC_PATHS_SCREENSHOT 1658
-#define IDC_DISK 1659
-#define IDC_DISKLIST 1659
-#define IDC_PATHS_SAVEIMAGE 1659
-#define IDC_SOUNDSTEREOSEPTXT 1659
-#define IDC_PATHS_SAVESTATE 1660
-#define IDC_SOUNDSTEREOMIXTXT 1660
-#define IDC_PATHS_ROMS 1661
-#define IDC_SOUNDSTEREOMIX 1661
-#define IDC_PATHS_CONFIGS 1662
-#define IDC_SOUNDSWAP 1662
-#define IDC_PATHS_SCREENSHOTS 1663
-#define IDC_PATHS_SAVESTATES 1664
-#define IDC_SOUNDSTEREOSWAPTXT 1664
-#define IDC_SOUNDSWAPTXT 1664
-#define IDC_PATHS_SAVEIMAGES 1665
-#define IDC_PATHS_ROML 1666
-#define IDC_PATHS_CONFIGL 1667
-#define IDC_PATHS_SCREENSHOTL 1668
-#define IDC_PATHS_STATEFILEL 1669
-#define IDC_PATHS_SAVEIMAGEL 1670
-#define IDC_PATHS_DEFAULT 1671
-#define IDC_ROM_RESCAN 1672
-#define IDC_QUICKSTARTMODE 1673
-#define IDC_RESETREGISTRY 1673
-#define IDC_QUICKSTART_MODEL 1674
-#define IDC_PATHS_AVIOUTPUTL 1674
-#define IDC_QUICKSTART_CONFIGURATION 1675
-#define IDC_PATHS_AVIOUTPUT 1675
-#define IDC_QUICKSTART_COMPATIBILITY 1676
-#define IDC_PATHS_AVIOUTPUTS 1676
-#define IDC_QUICKSTART_CONFIG 1677
-#define IDC_RESETDISKHISTORY 1677
-#define IDC_DF0Q 1678
-#define IDC_DF0QQ 1678
-#define IDC_DF1Q 1679
-#define IDC_QUICKSTART_HOSTCONFIG 1679
-#define IDC_DF1QQ 1680
-#define IDC_QUICKSTART_SETCONFIG 1681
-#define IDC_CONFIGAUTO 1682
-#define IDC_DF0TEXTQ 1683
-#define IDC_CONFIGNOLINK 1683
-#define IDC_DF0WPQ 1684
-#define IDC_EJECT0Q 1685
-#define IDC_DF1WPQ 1686
-#define IDC_EJECT1Q 1687
-#define IDC_DF1TEXTQ 1688
-#define IDC_FILTERXLV 1692
-#define IDC_FILTERVOV 1693
-#define IDC_FILTERHOV 1694
-#define IDC_CONFIGLINK 1694
-#define IDC_FILTERVZV 1695
-#define IDC_PS_PARAMS 1695
-#define IDC_FILTERHZV 1696
-#define IDC_HF_TYPE 1696
-#define IDC_PRINTERAUTOFLUSH 1697
-#define IDC_PRINTERAUTOFLUSHTXT 1698
-#define IDC_DISKTEXT 1699
-#define IDC_FE_LIST 1700
-#define IDC_FE_INFO 1701
-#define IDC_FE_INFO2 1702
-#define IDC_FE_SCREENSHOT 1702
-#define IDC_PATHS_DEFAULTTYPE 1704
-#define IDC_SCSIMODE 1705
-#define IDC_PROGRESS1 1705
-#define IDC_PROGRESSBAR 1705
-#define IDC_PROGRESSBAR_TEXT 1706
-#define IDC_SCSIMODE2 1706
-#define IDC_LANGUAGE 1706
-#define IDC_CREATE_NAME 1707
-#define IDC_FILTERAUTORES 1708
-#define IDC_SOUND_AUTO 1709
-#define IDC_CS_RTC 1710
-#define IDC_CS_CIAA_TOD1 1711
-#define IDC_CS_CIAA_TOD2 1712
-#define IDC_CS_EXT 1712
-#define IDC_CS_CIAA_TOD3 1713
-#define IDC_CS_COMPATIBLE 1714
-#define IDC_CS_RAMSEYREV 1715
-#define IDC_CS_KSMIRROR 1716
-#define IDC_STRINGBOXEDIT 1716
-#define IDC_CS_CD32CD 1717
-#define IDC_STRINGBOX_TEXT 1717
-#define IDC_CS_CD32C2P 1718
-#define IDC_CS_CD32NVRAM 1719
-#define IDC_CS_CDTVCD 1720
-#define IDC_CS_CDTVRAM 1721
-#define IDC_CS_IDE1 1722
-#define IDC_CS_IDE2 1723
-#define IDC_CS_IDE3 1724
-#define IDC_CS_A1000RAM 1724
-#define IDC_CS_RAMSEY 1725
-#define IDC_CS_GARY 1726
-#define IDC_CS_FATGARY 1726
-#define IDC_CS_DMAC 1727
-#define IDC_CS_RTCADJUST 1728
-#define IDC_CS_RAMSEYREV3 1729
-#define IDC_CS_FATGARYREV 1729
-#define IDC_CS_CDTVRAMEXP 1730
-#define IDC_CS_RTC1 1731
-#define IDC_CS_RTC2 1732
-#define IDC_CS_RTC3 1733
-#define IDC_CS_IDE4 1734
-#define IDC_CS_DF0IDHW 1734
-#define IDC_CS_AGNUS 1735
-#define IDC_CS_AGNUSREV 1736
-#define IDC_CS_DENISE 1737
-#define IDC_CS_AGNUSREV2 1738
-#define IDC_CS_DENISEREV 1738
-#define IDC_DBG_OUTPUT1 1739
-#define IDC_CS_PCMCIA 1739
-#define IDC_DBG_HELP 1740
-#define IDC_DBG_INPUT 1741
-#define IDC_DBG_DREG 1742
-#define IDC_DBG_AREG 1743
-#define IDC_DBG_CCR 1744
-#define IDC_DBG_AMEM 1745
-#define IDC_DBG_SP_VBR 1746
-#define IDC_DBG_MMISC 1747
-#define IDC_DBG_PC 1748
-#define IDC_DBG_PREFETCH 1749
-#define IDC_DBG_FPREG 1750
-#define IDC_DBG_FPSR 1751
-#define IDC_DBG_OUTPUT2 1752
-#define IDC_DBG_MEMINPUT 1753
-#define IDC_DBG_MEMDOWN 1754
-#define IDC_DBG_MEMUP 1755
-#define IDC_DBG_MEM 1756
-#define IDC_DBG_DASM 1757
-#define IDC_DBG_MEMDOWNFAST 1758
-#define IDC_DBG_MEMTOPC 1759
-#define IDC_DBG_MEMUPFAST 1760
-#define IDC_DA_RESET 1761
-#define IDC_DBG_STATUS 1762
-#define IDC_DBG_BRKPTS 1763
-#define IDC_DBG_MCUSTOM 1764
-#define IDC_DBG_MISC 1765
-#define IDC_DBG_CUSTOM 1766
-#define IDC_DBG_MISCCPU 1767
-#define IDC_CS_A2091 1768
-#define IDC_CS_DMAC2 1769
-#define IDC_CS_A4091 1770
-#define IDC_CS_CDTVSCSI 1771
-#define IDC_CS_SCSIMODE 1772
-#define ID__FLOPPYDRIVES 40004
-#define ID_FLOPPYDRIVES_DF0 40005
-#define ID_ST_CONFIGURATION 40010
-#define ID_ST_HELP 40011
-#define ID_ST_QUIT 40012
-#define ID_ST_EJECTALL 40013
-#define ID_ST_DF0 40014
-#define ID_ST_DF1 40015
-#define ID_ST_DF2 40016
-#define ID_ST_DF3 40017
-#define ID_ST_RESET 40019
-#define ID_DBG_PAGE1 40020
-#define ID_DBG_PAGE2 40021
-#define ID_DBG_PAGE3 40022
-#define ID_DBG_PAGE4 40023
-#define ID_DBG_PAGE5 40024
-#define ID_DBG_PAGE6 40025
-#define ID_DBG_PAGE7 40026
-#define ID_DBG_PAGE8 40027
-#define ID_DBG_PAGE9 40028
-
-// Next default values for new objects
-//
-#ifdef APSTUDIO_INVOKED
-#ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NO_MFC 1
-#define _APS_3D_CONTROLS 1
-#define _APS_NEXT_RESOURCE_VALUE 253
-#define _APS_NEXT_COMMAND_VALUE 40029
-#define _APS_NEXT_CONTROL_VALUE 1773
-#define _APS_NEXT_SYMED_VALUE 101
-#endif
-#endif
FONT 8, "MS Sans Serif", 0, 0, 0x0\r
BEGIN\r
PUSHBUTTON "Cancel",IDCANCEL,88,40,50,14\r
- CONTROL "",IDC_PROGRESSBAR,"msctls_progress32",PBS_SMOOTH | WS_BORDER,7,19,215,14\r
+ CONTROL "",IDC_PROGRESSBAR,"msctls_progress32",WS_BORDER | 0x1,7,19,215,14\r
CTEXT "x",IDC_PROGRESSBAR_TEXT,23,5,187,10,SS_CENTERIMAGE | WS_TABSTOP\r
END\r
\r
//\r
\r
VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 1,4,4,0\r
- PRODUCTVERSION 1,4,4,0\r
+ FILEVERSION 1,4,5,0\r
+ PRODUCTVERSION 1,4,5,0\r
FILEFLAGSMASK 0x3fL\r
#ifdef _DEBUG\r
FILEFLAGS 0x1L\r
BLOCK "040904b0"\r
BEGIN\r
VALUE "FileDescription", "WinUAE"\r
- VALUE "FileVersion", "1.4.4"\r
+ VALUE "FileVersion", "1.4.5"\r
VALUE "InternalName", "WinUAE"\r
VALUE "LegalCopyright", "© 1996-2007 under the GNU Public License (GPL)"\r
VALUE "OriginalFilename", "WinUAE.exe"\r
VALUE "ProductName", "WinUAE"\r
- VALUE "ProductVersion", "1.4.4"\r
+ VALUE "ProductVersion", "1.4.5"\r
END\r
END\r
BLOCK "VarFileInfo"\r
RTEXT "Flash RAM file:",IDC_FLASHTEXT,8,112,75,10\r
EDITTEXT IDC_FLASHFILE,89,110,185,13,ES_AUTOHSCROLL\r
PUSHBUTTON "...",IDC_FLASHCHOOSER,280,110,10,15\r
- GROUPBOX "HRTMon Settings",-1,5,136,290,31,NOT WS_VISIBLE\r
- CONTROL "Enable HRTMon [] HRTMon is monitor/debugger similar to Action Replay series, default activation key is Page Up.",IDC_HRTMON,\r
- "Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,89,148,84,10\r
END\r
\r
IDD_DISPLAY DIALOGEX 0, 0, 300, 235\r
STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD\r
FONT 8, "MS Sans Serif", 0, 0, 0x1\r
BEGIN\r
- GROUPBOX "Screen",IDC_SCREENRESTEXT,12,0,199,67,BS_LEFT\r
+ GROUPBOX "Screen",IDC_SCREENRESTEXT,12,0,270,67,BS_LEFT\r
RTEXT "Full screen:",IDC_SELECTRESTEXT,15,17,40,15,SS_CENTERIMAGE\r
- COMBOBOX IDC_DISPLAYSELECT,59,10,147,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
- COMBOBOX IDC_RESOLUTION,59,27,52,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
- COMBOBOX IDC_REFRESHRATE,145,27,61,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
- EDITTEXT IDC_XSIZE,59,48,35,12,ES_NUMBER\r
- EDITTEXT IDC_YSIZE,103,48,35,12,ES_NUMBER\r
+ COMBOBOX IDC_DISPLAYSELECT,59,10,215,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
+ COMBOBOX IDC_RESOLUTION,59,27,68,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
+ COMBOBOX IDC_REFRESHRATE,187,27,87,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
+ EDITTEXT IDC_XSIZE,59,48,48,12,ES_NUMBER\r
+ EDITTEXT IDC_YSIZE,114,48,47,12,ES_NUMBER\r
GROUPBOX "Settings",IDC_SETTINGSTEXT,12,73,199,125\r
CONTROL "Correct aspect ratio",IDC_ASPECT,"Button",BS_AUTOCHECKBOX | BS_LEFT | WS_TABSTOP,19,126,92,10\r
CONTROL "Force low resolution",IDC_LORES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,118,126,89,10\r
LTEXT "Refresh:",IDC_REFRESHTEXT,18,162,28,8\r
CONTROL "Slider1",IDC_FRAMERATE,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,47,157,75,20\r
EDITTEXT IDC_RATETEXT,127,161,77,12,ES_CENTER | ES_READONLY\r
- GROUPBOX "Centering",IDC_STATIC,221,0,61,67\r
- CONTROL "Horizontal",IDC_XCENTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,16,49,10\r
- CONTROL "Vertical",IDC_YCENTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,32,49,10\r
- GROUPBOX "Line Mode",IDC_LINEMODE,222,73,61,73\r
- CONTROL "Normal",IDC_LM_NORMAL,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_GROUP | WS_TABSTOP,231,89,44,10\r
- CONTROL "Double",IDC_LM_DOUBLED,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,231,105,45,10\r
- CONTROL "Scanlines",IDC_LM_SCANLINES,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,231,121,46,10\r
+ GROUPBOX "Centering",IDC_STATIC,221,73,61,49\r
+ CONTROL "Horizontal",IDC_XCENTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,87,49,10\r
+ CONTROL "Vertical",IDC_YCENTER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,229,103,49,10\r
+ GROUPBOX "Line Mode",IDC_LINEMODE,222,126,61,73\r
+ CONTROL "Normal",IDC_LM_NORMAL,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_GROUP | WS_TABSTOP,231,142,44,10\r
+ CONTROL "Double",IDC_LM_DOUBLED,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,231,158,45,10\r
+ CONTROL "Scanlines",IDC_LM_SCANLINES,"Button",BS_AUTORADIOBUTTON | BS_LEFT | WS_TABSTOP,231,174,46,10\r
COMBOBOX IDC_DA_MODE,20,211,58,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
CONTROL "",IDC_DA_SLIDER,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,84,207,101,20\r
LTEXT "FPS adj.:",IDC_REFRESH2TEXT,16,182,32,8\r
CONTROL "",IDC_FRAMERATE2,"msctls_trackbar32",TBS_AUTOTICKS | TBS_TOP | WS_TABSTOP,47,177,127,20\r
EDITTEXT IDC_RATE2TEXT,178,181,26,12,ES_CENTER | ES_READONLY\r
- COMBOBOX IDC_RESOLUTIONDEPTH,112,27,32,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
+ COMBOBOX IDC_RESOLUTIONDEPTH,135,27,46,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
CONTROL "Filtered low resolution",IDC_LORES_SMOOTHED,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,118,140,89,10\r
COMBOBOX IDC_SCREENMODE_NATIVE,100,85,102,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
COMBOBOX IDC_SCREENMODE_RTG,100,103,102,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
CONTROL "DF3:",IDC_DF3ENABLE,"Button",BS_AUTOCHECKBOX | WS_DISABLED | WS_TABSTOP,3,111,34,15\r
END\r
\r
-IDD_HARDDISK DIALOGEX 0, 0, 300, 240\r
+IDD_HARDDISK DIALOGEX 0, 0, 300, 245\r
STYLE DS_LOCALEDIT | DS_SETFONT | DS_3DLOOK | DS_CONTROL | WS_CHILD\r
EXSTYLE WS_EX_CONTEXTHELP\r
FONT 8, "MS Sans Serif", 0, 0, 0x1\r
BEGIN\r
CONTROL "List1",IDC_VOLUMELIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,5,0,290,182\r
- PUSHBUTTON "Add &Directory...",IDC_NEW_FS,10,186,64,15\r
- PUSHBUTTON "Add &Hardfile...",IDC_NEW_HF,153,186,64,15\r
- PUSHBUTTON "Add Ha&rd Drive...",IDC_NEW_HD,223,186,65,15\r
+ PUSHBUTTON "Add &Directory or Archive...",IDC_NEW_FS,10,186,103,15\r
+ PUSHBUTTON "Add &Hardfile...",IDC_NEW_HF,130,186,74,15\r
+ PUSHBUTTON "Add Ha&rd Drive...",IDC_NEW_HD,220,186,75,15\r
PUSHBUTTON "Remove",IDC_REMOVE,232,207,60,15\r
- PUSHBUTTON "&Properties",IDC_EDIT,232,225,60,15\r
+ PUSHBUTTON "&Properties",IDC_EDIT,232,230,60,15\r
CONTROL "Add PC drives at startup",IDC_MAPDRIVES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,209,100,10\r
CONTROL "Disable UAEFSDB-support",IDC_NOUAEFSDB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,110,209,119,10\r
CONTROL "Don't use Windows Recycle Bin",IDC_NORECYCLEBIN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,110,220,121,10\r
- CONTROL "Include network drives",IDC_MAPDRIVES_NET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,220,101,10\r
- PUSHBUTTON "Add Archive...",IDC_NEW_FSARCH,82,186,64,15\r
+ CONTROL "Include network drives..",IDC_MAPDRIVES_NET,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,232,101,10\r
+ CONTROL "Include CD/DVD drives..",IDC_MAPDRIVES_CD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,220,100,10\r
+ CONTROL "Automount removable drives",IDC_MAPDRIVES_AUTO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,110,232,115,10\r
END\r
\r
IDD_SOUND DIALOGEX 0, 0, 300, 231\r
FONT 8, "MS Sans Serif", 0, 0, 0x0\r
BEGIN\r
LTEXT "Device name:",-1,5,9,54,10\r
- EDITTEXT IDC_VOLUME_DEVICE,65,5,86,15,ES_AUTOHSCROLL\r
+ EDITTEXT IDC_VOLUME_DEVICE,65,5,104,15,ES_AUTOHSCROLL\r
LTEXT "Volume label:",-1,5,31,54,10\r
- EDITTEXT IDC_VOLUME_NAME,65,25,85,15,ES_AUTOHSCROLL\r
+ EDITTEXT IDC_VOLUME_NAME,65,25,103,15,ES_AUTOHSCROLL\r
LTEXT "Path:",-1,5,51,44,10\r
- EDITTEXT IDC_PATH_NAME,65,46,213,15,ES_AUTOHSCROLL\r
- PUSHBUTTON "...",IDC_SELECTOR,283,46,10,15\r
- CONTROL "Read/write",IDC_RW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,72,70,50,10\r
- RTEXT "Boot priority:",IDC_VOLUME_BOOTPRI_TEXT,135,70,51,8\r
- EDITTEXT IDC_VOLUME_BOOTPRI,199,68,27,15\r
- PUSHBUTTON "OK",IDOK,120,91,48,15\r
- PUSHBUTTON "Cancel",IDCANCEL,175,91,48,15\r
+ EDITTEXT IDC_PATH_NAME,65,46,227,15,ES_AUTOHSCROLL\r
+ PUSHBUTTON "Select Directory",IDC_FS_SELECT_DIR,64,66,103,15\r
+ CONTROL "Read/write",IDC_RW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,215,9,75,10\r
+ RTEXT "Boot priority:",IDC_VOLUME_BOOTPRI_TEXT,178,29,59,8\r
+ EDITTEXT IDC_VOLUME_BOOTPRI,261,27,30,15\r
+ PUSHBUTTON "OK",IDOK,65,91,48,15\r
+ PUSHBUTTON "Cancel",IDCANCEL,120,91,48,15\r
+ PUSHBUTTON "Select Archive or Plain File",IDC_FS_SELECT_FILE,189,66,103,15\r
+ PUSHBUTTON "Eject",IDC_FS_SELECT_EJECT,230,91,62,15\r
END\r
\r
IDD_SETINFO DIALOGEX 0, 0, 229, 85\r
LTEXT "fps",IDC_AVIOUTPUT_FPS_STATIC,255,84,19,8\r
PUSHBUTTON "Save screenshot",IDC_SCREENSHOT,16,141,76,14\r
GROUPBOX "Ripper",IDC_STATIC,5,127,274,38\r
- PUSHBUTTON "Pro Wizard",IDC_PROWIZARD,100,141,76,14,WS_DISABLED\r
+ PUSHBUTTON "Pro Wizard 1.62",IDC_PROWIZARD,100,141,76,14,WS_DISABLED\r
CONTROL "Sample ripper",IDC_SAMPLERIPPER_ACTIVATED,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,192,141,77,14\r
GROUPBOX "Input Recorder",IDC_STATIC,5,166,274,33\r
CONTROL "Record",IDC_INPREC_RECORD,"Button",BS_AUTORADIOBUTTON | BS_PUSHLIKE | BS_FLAT,191,177,77,14\r
CAPTION "Harddrive Settings"\r
FONT 8, "MS Sans Serif", 0, 0, 0x0\r
BEGIN\r
- LTEXT "Hard drive:",-1,7,11,35,10\r
+ LTEXT "Hard drive:",IDC_STATIC,7,11,35,10\r
COMBOBOX IDC_HARDDRIVE,49,9,325,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
- CONTROL "Read/write",IDC_RW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,247,33,55,10\r
- DEFPUSHBUTTON "Add hard drive",IDOK,173,30,65,14\r
- PUSHBUTTON "Cancel",IDCANCEL,321,30,54,14\r
+ CONTROL "Read/write",IDC_RW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,161,51,55,10\r
+ DEFPUSHBUTTON "Add hard drive",IDOK,231,48,65,14\r
+ PUSHBUTTON "Cancel",IDCANCEL,319,48,54,14\r
DEFPUSHBUTTON "Create hard disk image file",IDC_HARDDRIVE_IMAGE,49,30,115,14\r
- EDITTEXT IDC_PATH_NAME,89,49,169,15,ES_AUTOHSCROLL | NOT WS_VISIBLE\r
+ EDITTEXT IDC_PATH_NAME,183,27,97,15,ES_AUTOHSCROLL | NOT WS_VISIBLE\r
+ COMBOBOX IDC_HDF_CONTROLLER,102,50,41,150,CBS_DROPDOWNLIST | CBS_HASSTRINGS | WS_VSCROLL | WS_TABSTOP\r
+ RTEXT "HD Controller:",IDC_STATIC,42,52,52,10,SS_CENTERIMAGE\r
END\r
\r
IDD_MISC2 DIALOGEX 0, 0, 300, 92\r
FONT 8, "MS Sans Serif", 0, 0, 0x0\r
BEGIN\r
GROUPBOX "",IDC_PANEL_FRAME,112,4,303,247,NOT WS_VISIBLE\r
- CONTROL "",IDC_PANELTREE,"SysTreeView32",TVS_HASLINES | TVS_SHOWSELALWAYS | TVS_NOSCROLL | WS_BORDER | WS_TABSTOP,5,5,101,248,WS_EX_CLIENTEDGE\r
+ CONTROL "",IDC_PANELTREE,"SysTreeView32",TVS_HASLINES | TVS_SHOWSELALWAYS | TVS_NOSCROLL | WS_BORDER | WS_HSCROLL | WS_TABSTOP,5,5,101,248,WS_EX_CLIENTEDGE\r
GROUPBOX "",IDC_PANEL_FRAME_OUTER,110,2,307,251\r
PUSHBUTTON "Reset",IDC_RESETAMIGA,6,259,47,14\r
PUSHBUTTON "Quit",IDC_QUITEMU,57,259,47,14\r
DEFPUSHBUTTON "OK",IDOK,260,259,50,14\r
PUSHBUTTON "Cancel",IDCANCEL,313,259,50,14\r
PUSHBUTTON "Help",IDHELP,366,259,50,14,WS_DISABLED\r
+ PUSHBUTTON "Restart",IDC_RESTARTEMU,109,259,47,14,NOT WS_VISIBLE\r
END\r
\r
IDD_PATHS DIALOGEX 0, 0, 300, 237\r
FONT 8, "MS Sans Serif", 0, 0, 0x0\r
BEGIN\r
PUSHBUTTON "Cancel",IDCANCEL,88,40,50,14\r
- CONTROL "",IDC_PROGRESSBAR,"msctls_progress32",WS_BORDER | 0x1,7,19,215,14\r
+ CONTROL "",IDC_PROGRESSBAR,"msctls_progress32",PBS_SMOOTH | WS_BORDER,7,19,215,14\r
CTEXT "x",IDC_PROGRESSBAR_TEXT,23,5,187,10,SS_CENTERIMAGE | WS_TABSTOP\r
END\r
\r
//\r
\r
VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 1,4,3,0\r
- PRODUCTVERSION 1,4,3,0\r
+ FILEVERSION 1,4,4,0\r
+ PRODUCTVERSION 1,4,4,0\r
FILEFLAGSMASK 0x3fL\r
#ifdef _DEBUG\r
FILEFLAGS 0x1L\r
BLOCK "040904b0"\r
BEGIN\r
VALUE "FileDescription", "WinUAE"\r
- VALUE "FileVersion", "1.4.3"\r
+ VALUE "FileVersion", "1.4.4"\r
VALUE "InternalName", "WinUAE"\r
VALUE "LegalCopyright", "© 1996-2007 under the GNU Public License (GPL)"\r
VALUE "OriginalFilename", "WinUAE.exe"\r
VALUE "ProductName", "WinUAE"\r
- VALUE "ProductVersion", "1.4.3"\r
+ VALUE "ProductVersion", "1.4.4"\r
END\r
END\r
BLOCK "VarFileInfo"\r
END\r
END\r
\r
+\r
/////////////////////////////////////////////////////////////////////////////\r
//\r
// String Table\r
IDS_SELECTFILESYSROOT "Please select the root directory of the file system..."\r
IDS_DEFAULTMIDIOUT "Default MIDI-Out Device"\r
IDS_CONTRIBUTORS1 "Bernd Schmidt - The Grand-Master\nSam Jordan - Custom-chip, floppy-DMA, etc.\nMathias Ortmann - Original WinUAE Main Guy, BSD Socket support\nBrian King - Picasso96 Support, Integrated GUI for WinUAE, previous WinUAE Main Guy\nToni Wilen - Core updates, WinUAE Main Guy\nGustavo Goedert/Peter Remmers/Michael Sontheimer/Tomi Hakala/Tim Gunn/Nemo Pohle - DOS Port Stuff\nSamuel Devulder/Olaf Barthel/Sam Jordan - Amiga Ports\nKrister Bergman - XFree86 and OS/2 Port\nA. Blanchard/Ernesto Corvi - MacOS Port\nChristian Bauer - BeOS Port\nIan Stephenson - NextStep Port\nPeter Teichmann - Acorn/RiscOS Port\nStefan Reinauer - ZorroII/III AutoConfig, Serial Support\nChristian Schmitt/Chris Hames - Serial Support\nHerman ten Brugge - 68020/68881 Emulation Code\nTauno Taipaleenmaki - Various UAE-Control/UAE-Library Support\nBrett Eden/Tim Gunn/Paolo Besser/Nemo Pohle - Various Docs and Web-Sites\nGeorg Veichtlbauer - Help File coordinator, German GUI\nFulvio Leonardi - Italian translator for WinUAE\n"\r
- IDS_CONTRIBUTORS2 "Bill Panagouleas - Hardware support\nSpecial thanks to Alexander Kneer and Tobias Abt (The Picasso96 Team)\nSteven Weiser - Postscript printing emulation idea and testing.\nPéter Tóth /Balázs Rátkai/Iván Herczeg/András Arató - Hungarian translation.\nKarsten Bock, Gavin Fance and Dirk Trowe - Freezer cartridge hardware support."\r
+ IDS_CONTRIBUTORS2 "Bill Panagouleas - Hardware support\nSpecial thanks to Alexander Kneer and Tobias Abt (The Picasso96 Team)\nSteven Weiser - Postscript printing emulation idea and testing.\nPéter Tóth /Balázs Rátkai/Iván Herczeg/András Arató - Hungarian translation.\nKarsten Bock, Gavin Fance, Dirk Trowe and Christoph Meier - Freezer cartridge hardware support."\r
IDS_INVALIDPRTPORT "The printer you have in this configuration is not valid on this machine.\n"\r
IDS_RESTOREUSS "Restore a WinUAE snapshot file"\r
IDS_USS "WinUAE snapshot files"\r
IDS_NUMSG_NOEXTROM "No extended ROM found."\r
IDS_NUMSG_MODRIP_NOTFOUND "No music modules or packed data found."\r
IDS_NUMSG_MODRIP_FINISHED "Scan finished."\r
- IDS_NUMSG_MODRIP_SAVE "Module/packed data found\n%s\nWould you like to save it?"\r
+ IDS_NUMSG_MODRIP_SAVE "Module/packed data found\n%s\nStart address %08.8X, Size %d bytes\nWould you like to save it?"\r
IDS_NUMSG_KS68020 "The selected system ROM requires a 68020 with 32-bit addressing or 68030 or higher CPU."\r
IDS_NUMSG_ROMNEED "One of the following system ROMs is required:\n\n%s\n\nCheck the System ROM path in the Paths panel and click Rescan ROMs."\r
IDS_NUMSG_STATEHD "WARNING: Current configuration is not fully compatible with state saves.\nThis message will not appear again."\r
\r
STRINGTABLE \r
BEGIN\r
- IDS_QS_MODELS "A500\nA500+\nA600\nA1000\nA1200\nA3000\nCD32\nCDTV\nArcadia Multi Select system\nExpanded WinUAE example configuration"\r
+ IDS_QS_MODELS "A500\nA500+\nA600\nA1000\nA1200\nA3000\nA4000\nCD32\nCDTV\nArcadia Multi Select system\nExpanded WinUAE example configuration"\r
IDS_QS_MODEL_A500 "1.3 ROM, OCS, 512 KB Chip + 512 KB Slow RAM (most common)\nThis configuration is capable of running most games and demos produced for first-generation hardware. Only few exceptions need a different configuration (e.g. the oldest games tend to be incompatible with this configuration).\n1.3 ROM, ECS Agnus, 512 KB Chip RAM + 512 KB Slow RAM\nLater hardware revision of the A500. Nearly 100% compatible with the previous configuration.\n1.3 ROM, ECS Agnus, 1 MB Chip RAM\nFew newer games and demos require this configuration.\n1.3 ROM, OCS Agnus, 512 KB Chip RAM\nVery old (e.g. pre-1988) games and demos may require this configuration.\n1.2 ROM, OCS Agnus, 512 KB Chip RAM\nAs available for the A1000, and installed on the first A500 and A2000 series. Some very old programs only work correctly with this configuration. Note: This system ROM version can only boot from floppy disk (no hard disk boot support).\n1.2 ROM, OCS Agnus, 512 KB Chip RAM + 512 KB Slow RAM\nThis configuration adds expansion memory to the first A500 produced. Try this if your game does not work with newer configurations, but works with the previous one. It could add some features to the game, including faster loading times. Note: This system ROM version can only boot from floppy disk (no hard disk boot support)."\r
IDS_QS_MODEL_A500P "Basic non-expanded configuration\nThe A500+ adds an ECS Agnus chip, 1 MB of Chip RAM and a 2.0 ROM to the A500. Many A500 games and demos don't work properly on an A500+.\n2 MB Chip RAM expanded configuration\n\n4 MB Fast RAM expanded configuration\n"\r
IDS_QS_MODEL_A600 "Basic non-expanded configuration\nThe A600 is smaller than the A500+ and has an updated 2.0 ROM.\n2 MB Chip RAM expanded configuration\n\n4 MB Fast RAM expanded configuration\n"\r
IDS_QS_MODEL_UAE "High-end expanded configuration"\r
IDS_QS_MODEL_ARCADIA "Arcadia\nArcadia Multi Select system is arcade platform developed by Arcadia and Mastertronic. It is based on an A500 mainboard with ROM cage attached to expansion port. Arcadia ROM files go to ""Cartridge ROM File"" in ROM-panel."\r
IDS_QS_MODEL_A3000 "1.4 ROM, 2MB Chip + 8MB Fast\n\n3.1 ROM, 2MB Chip + 8MB Fast\n"\r
- IDS_QS_MODEL_A4000 "A4000 (test)\nA4000"\r
+ IDS_QS_MODEL_A4000 "68030, 3.1 ROM, 2MB Chip + 8MB Fast\n\n68040, 3.1 ROM, 2MB Chip + 8MB Fast\n"\r
IDS_QS_MODEL_A4000T "A4000T (test)\nA4000T"\r
END\r
\r
static int sounddata_frequency = 44100;
static int sounddata_stereo = 2;
-static int sounddata_bufsize = 262144;
+static int sounddata_bufsize = 262144 * 2;
#define write_log printf
static LPDIRECTSOUNDBUFFER lpDSBprimary;
static LPDIRECTSOUNDBUFFER lpDSBsecondary;
-static uae_u8 sndbuffer[131072];
+static uae_u8 sndbuffer[131072*8];
static int dsoundbuf, snd_configsize;
static DWORD writepos;
static HWND hwnd;
DSCAPS DSCaps;
DSBCAPS DSBCaps;
WAVEFORMATEX wavfmt;
- int minfreq, maxfreq;
int freq = sounddata_frequency;
hr = DirectSoundCreate (&sound_device_guid[devicenum], &lpDS, NULL);
if (DSCaps.dwFlags & DSCAPS_EMULDRIVER) {
write_log ("SOUND: Emulated DirectSound driver detected, don't complain if sound quality is crap :)\n");
}
- minfreq = DSCaps.dwMinSecondarySampleRate;
- maxfreq = DSCaps.dwMaxSecondarySampleRate;
- if (maxfreq > 11000) {
- if (minfreq > freq) {
+ if (DSCaps.dwFlags & DSCAPS_CONTINUOUSRATE) {
+ int minfreq = DSCaps.dwMinSecondarySampleRate;
+ int maxfreq = DSCaps.dwMaxSecondarySampleRate;
+ if (minfreq > freq && freq < 22050) {
freq = minfreq;
- sounddata_frequency = freq;
write_log ("SOUND: minimum supported frequency: %d\n", minfreq);
}
- if (maxfreq < freq) {
+ if (maxfreq < freq && freq > 44100) {
freq = maxfreq;
- sounddata_frequency = freq;
write_log ("SOUND: maximum supported frequency: %d\n", maxfreq);
}
- } else {
- write_log ("SOUND: ignored weird min (%d) or max (%d) sample rate\n", minfreq, maxfreq);
}
memset (&sound_buffer, 0, sizeof (sound_buffer));
// ensure window title has been updated
- Sleep(40);
+ Sleep(1000);
// look for NewWindowTitle
return 1;
}
-static int srates[] = { 22050, 32000, 44100, 0 };
+static int srates[] = { 22050, 44100, 48000, 0 };
int main (int argc, char **argv)
{
logfile = fopen("soundlog.txt","w");
osdetect();
- write_log2("OS: %s %d.%d%s\n", os_winnt ? "NT" : "W9X/ME", osVersion.dwMajorVersion, osVersion.dwMinorVersion, os_winnt_admin ? " (Admin)" : "");
+ write_log2("WinUAE soundtest 0.2. OS: %s %d.%d%s\n",
+ os_winnt ? "NT" : "W9X/ME", osVersion.dwMajorVersion, osVersion.dwMinorVersion, os_winnt_admin ? " (Admin)" : "");
init_mmtimer();
if (!QueryPerformanceFrequency(&qpf)) {
dummythread_die = 1;
sleep_resolution = 1;
- if (clkdiv >= 0.90 && clkdiv <= 1.10 && rpt_available) {
+ if ((clkdiv >= 0.90 && clkdiv <= 1.10 && rpt_available) && no_rdtsc < 2) {
limit = 2.5;
if (mm_timerres && (ratea1 / ratecnt) < limit * clockrate1000) { /* MM-timer is ok */
timermode = 0;
if (SystemInfo.wProcessorArchitecture == PROCESSOR_ARCHITECTURE_AMD64)
os_64bit = 1;
}
- if (!os_winnt)
+ if (!os_winnt) {
+ extern int p96mode;
+ p96mode = 0;
return 1;
+ }
os_winnt_admin = isadminpriv ();
if (os_winnt_admin) {
if (pIsUserAnAdmin) {
}
extern void test (void);
-extern int screenshotmode, b0rken_ati_overlay, postscript_print_debugging, sound_debug, log_uaeserial;
+extern int screenshotmode, postscript_print_debugging, sound_debug, log_uaeserial;
extern int force_direct_catweasel, max_allowed_mman, sound_mode_skip;
extern DWORD_PTR cpu_affinity;
continue;
}
#endif
- if (!strcmp (arg, "-disableowr")) {
- b0rken_ati_overlay = -1;
- continue;
- }
- if (!strcmp (arg, "-enableowr")) {
- b0rken_ati_overlay = 1;
- continue;
- }
if (!strcmp (arg, "-nordtsc")) {
no_rdtsc = 1;
continue;
no_rdtsc = -1;
continue;
}
+ if (!strcmp (arg, "-busywait")) {
+ no_rdtsc = 2;
+ continue;
+ }
if (!strcmp (arg, "-norawinput")) {
no_rawinput = 1;
continue;
#define GETBDM(x) (((x) - ((x / 10000) * 10000)) / 100)
#define GETBDD(x) ((x) % 100)
-#define WINUAEBETA 0
-#define WINUAEPUBLICBETA 0
-#define WINUAEDATE MAKEBD(2007, 9, 22)
+#define WINUAEBETA 1
+#define WINUAEPUBLICBETA 1
+#define WINUAEDATE MAKEBD(2007, 9, 29)
#define WINUAEEXTRA ""
#define WINUAEREV ""
int display_change_requested, normal_display_change_starting;
int window_led_drives, window_led_drives_end;
extern int console_logging;
-int b0rken_ati_overlay;
#define SM_WINDOW 0
#define SM_WINDOW_OVERLAY 1
GetMonitorInfo(hm, (LPMONITORINFO)&lpmi);
}
md->rect = lpmi.rcMonitor;
- if (md->rect.left == 0 && md->rect.top == 0)
- sprintf (tmp, "%s (%d*%d)", desc, md->rect.right - md->rect.left, md->rect.bottom - md->rect.top);
- else
- sprintf (tmp, "%s (%d*%d) [%d*%d]", desc, md->rect.right - md->rect.left, md->rect.bottom - md->rect.top, md->rect.left, md->rect.top);
+ if (os_winnt) {
+ if (md->rect.left == 0 && md->rect.top == 0)
+ sprintf (tmp, "%s (%d*%d)", desc, md->rect.right - md->rect.left, md->rect.bottom - md->rect.top);
+ else
+ sprintf (tmp, "%s (%d*%d) [%d*%d]", desc, md->rect.right - md->rect.left, md->rect.bottom - md->rect.top, md->rect.left, md->rect.top);
+ } else {
+ strcpy (tmp, desc);
+ }
md->name = my_strdup (tmp);
write_log ("'%s' '%s' %s\n", desc, name, outGUID(guid));
return 1;
MONITORINFO mi;
if (quick) {
- if (!(currentmode->flags & DM_OVERLAY) || b0rken_ati_overlay <= 0)
+ if (!(currentmode->flags & DM_OVERLAY))
return;
goto end;
}
RelativePath="..\hq2x32.obj"
>
</File>
- <File
- RelativePath="..\resources\resource"
- >
- </File>
<File
RelativePath="..\resources\resource.h"
>
+Beta 1:
+
+- CDTV and CD32 interrupt handling improved, fixes "Snoopy In The
+ Case Of The Missing Blanket"
+- lzx decompressor compatibility and stability improved, store-mode
+ supported
+- do not include display dimensions in display list if Windows 98/ME
+ (it is garbage, at least on some systems)
+- Windows 98/ME serial port detection update
+- possible fix for overlay issues but it might cause slow downs in
+ some cases..
+- added -busywait debugging command line option
+- DiskSqueeze (dsq) dms-like disk packer format supported (probably
+ totally useless but was easy to do..) cop, dimp, warp (not to be
+ confused with mfmwarp) support may be "useful" too, perhaps in
+ future.. Unfortunately most formats are not documented.
+
+1.4.4
+
Beta 9: RC2
- deleting file, recycle bin support enabled and deletion fails:
- return error code was wrong (SHFileOperation() is weird)
+ returned error code was wrong (SHFileOperation() is weird)
- Action Replay 1/2/3 work again
- bsdsocket froze if new configuration was loaded on the fly
- filter crashes (old bug) if display was big, also centering code
}
static uae_u8 exeheader[]={0x00,0x00,0x03,0xf3,0x00,0x00,0x00,0x00};
+static char *diskimages[] = { "adf", "adz", "ipf", "fdi", "dms", "dsq", 0 };
int zfile_gettype (struct zfile *z)
{
uae_u8 buf[8];
return ZFILE_UNKNOWN;
ext = strrchr (z->name, '.');
if (ext != NULL) {
+ int i;
ext++;
- if (strcasecmp (ext, "adf") == 0)
- return ZFILE_DISKIMAGE;
- if (strcasecmp (ext, "adz") == 0)
- return ZFILE_DISKIMAGE;
+ for (i = 0; diskimages[i]; i++) {
+ if (strcasecmp (ext, diskimages[i]) == 0)
+ return ZFILE_DISKIMAGE;
+ }
if (strcasecmp (ext, "roz") == 0)
return ZFILE_ROM;
- if (strcasecmp (ext, "ipf") == 0)
- return ZFILE_DISKIMAGE;
- if (strcasecmp (ext, "fdi") == 0)
- return ZFILE_DISKIMAGE;
if (strcasecmp (ext, "uss") == 0)
return ZFILE_STATEFILE;
- if (strcasecmp (ext, "dms") == 0)
- return ZFILE_DISKIMAGE;
if (strcasecmp (ext, "rom") == 0)
return ZFILE_ROM;
if (strcasecmp (ext, "key") == 0)
return z2;
}
+static struct zfile *dsq (struct zfile *z)
+{
+ struct zfile *zo;
+
+ zo = zfile_fopen_empty ("zipped.dsq", 1760 * 512);
+ if (zo) {
+ struct zvolume *zv = archive_directory_lzx (z);
+ if (zv) {
+ if (zv->root.child) {
+ struct zfile *zi = archive_access_lzx (zv->root.child);
+ if (zi) {
+ uae_u8 *buf = zi->data;
+ if (!memcmp (buf, "PKD", 3)) {
+ int sectors = buf[18];
+ int heads = buf[15];
+ int blocks = (buf[6] << 8) | buf[7];
+ int blocksize = (buf[10] << 8) | buf[11];
+ if (blocksize == 512 && blocks == 1760 && sectors == 22 && heads == 2) {
+ int off = 52;
+ int i;
+ for (i = 0; i < blocks / (sectors / heads); i++) {
+ zfile_fwrite (zi->data + off, sectors * blocksize / heads, 1, zo);
+ off += sectors * (blocksize + 16) / heads;
+ }
+ zfile_fclose_archive (zv);
+ zfile_fclose (z);
+ return zo;
+ }
+ }
+ }
+ zfile_fclose (zi);
+ }
+ }
+ zfile_fclose (zo);
+ }
+ return z;
+}
+
static struct zfile *dms (struct zfile *z)
{
int ret;
struct zfile *zo;
zo = zfile_fopen_empty ("zipped.dms", 1760 * 512);
- if (!zo) return z;
+ if (!zo)
+ return z;
ret = DMS_Process_File (z, zo, CMD_UNPACK, OPT_VERBOSE, 0, 0);
if (ret == NO_PROBLEM || ret == DMS_FILE_END) {
zfile_fclose (z);
const char *uae_ignoreextensions[] =
{ ".gif", ".jpg", ".png", ".xml", ".pdf", ".txt", 0 };
const char *uae_diskimageextensions[] =
- { ".adf", ".adz", ".ipf", ".fdi", ".exe", ".dms", 0 };
+ { ".adf", ".adz", ".ipf", ".fdi", ".exe", ".dms", ".dsq", 0 };
int zfile_is_ignore_ext(const char *name)
return zfile_gunzip (z);
if (strcasecmp (ext, "dms") == 0)
return dms (z);
+ if (strcasecmp (ext, "dsq") == 0)
+ return dsq (z);
#if defined(ARCHIVEACCESS)
for (i = 0; plugins_7z_x[i]; i++) {
if (strcasecmp (ext, plugins_7z[i]) == 0)
struct zfile *zfile_dup (struct zfile *zf)
{
struct zfile *nzf;
- if (!zf->data)
+ if (!zf || !zf->data)
return NULL;
nzf = zfile_create();
nzf->data = (uae_u8*)malloc (zf->size);
projects / francis / winuae.git / commitdiff