diff --git a/src/cdrom/cdrom.c b/src/cdrom/cdrom.c index ab9210560..084b1b14a 100644 --- a/src/cdrom/cdrom.c +++ b/src/cdrom/cdrom.c @@ -70,12 +70,9 @@ uint8_t scsi_cdrom_drives[16][8] = { { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF }, { 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF } }; -#ifdef __MSC__ -# pragma pack(push,1) + +#pragma pack(push,1) static struct -#else -static struct __attribute__((__packed__)) -#endif { uint8_t opcode; uint8_t polled; @@ -85,24 +82,17 @@ static struct __attribute__((__packed__)) uint16_t len; uint8_t control; } *gesn_cdb; -#ifdef __MSC__ -# pragma pack(pop) -#endif +#pragma pack(pop) -#ifdef __MSC__ -# pragma pack(push,1) +#pragma pack(push,1) static struct -#else -static struct __attribute__((__packed__)) -#endif { uint16_t len; uint8_t notification_class; uint8_t supported_events; } *gesn_event_header; -#ifdef __MSC__ -# pragma pack(pop) -#endif +#pragma pack(pop) + /* Table of all SCSI commands and their flags, needed for the new disc change / not ready handler. */ uint8_t cdrom_command_flags[0x100] = @@ -3989,24 +3979,41 @@ void cdrom_hard_reset(void) } } -void cdrom_general_init(void) -{ - int c = 0; -#if 0 +/* Peform a master init on the entire module. */ +void +cdrom_global_init(void) +{ + int c; + + /* Clear the global data. */ + memset(cdrom, 0x00, sizeof(cdrom)); + memset(cdrom_drives, 0x00, sizeof(cdrom_drives)); + + /* Initialize the host devices, if any. */ cdrom_init_host_drives(); -#endif + + /* Set all drives to NULL mode. */ + for (c=0; c='A') && (cdrom_drives[c].host_drive <= 'Z')) - { + if ((cdrom_drives[c].host_drive>='A') && (cdrom_drives[c].host_drive <= 'Z')) { ioctl_open(c, cdrom_drives[c].host_drive); } else { cdrom_null_open(c, cdrom_drives[c].host_drive); diff --git a/src/cdrom/cdrom.h b/src/cdrom/cdrom.h index df9b03944..dfdd70977 100644 --- a/src/cdrom/cdrom.h +++ b/src/cdrom/cdrom.h @@ -9,10 +9,11 @@ * Implementation of the CD-ROM drive with SCSI(-like) * commands, for both ATAPI and SCSI usage. * - * Version: @(#)cdrom.h 1.0.1 2017/06/03 + * Version: @(#)cdrom.h 1.0.2 2017/10/12 * * Author: Miran Grca, - * Copyright 2016-2017 Miran Grca. + * + * Copyright 2016,2017 Miran Grca. */ #ifndef EMU_CDROM_H #define EMU_CDROM_H @@ -41,6 +42,7 @@ typedef struct { int (*ready)(uint8_t id); int (*medium_changed)(uint8_t id); int (*media_type_id)(uint8_t id); + void (*audio_callback)(uint8_t id, int16_t *output, int len); void (*audio_stop)(uint8_t id); int (*readtoc)(uint8_t id, uint8_t *b, uint8_t starttrack, int msf, int maxlen, int single); @@ -61,7 +63,6 @@ typedef struct { void (*exit)(uint8_t id); } CDROM; -#pragma pack(push,1) typedef struct { uint8_t previous_command; @@ -132,9 +133,7 @@ typedef struct { int init_length; } cdrom_t; -#pragma pack(pop) -#pragma pack(push,1) typedef struct { int max_blocks_at_once; @@ -155,7 +154,6 @@ typedef struct { unsigned int sound_on; unsigned int atapi_dma; } cdrom_drive_t; -#pragma pack(pop) typedef struct { int image_is_iso; @@ -229,14 +227,15 @@ int cdrom_lba_to_msf_accurate(int lba); } #endif -void cdrom_reset(uint8_t id); -void cdrom_set_signature(int id); -void cdrom_request_sense_for_scsi(uint8_t id, uint8_t *buffer, uint8_t alloc_length); -void cdrom_update_cdb(uint8_t *cdb, int lba_pos, int number_of_blocks); -void cdrom_insert(uint8_t id); +extern void cdrom_close(uint8_t id); +extern void cdrom_reset(uint8_t id); +extern void cdrom_set_signature(int id); +extern void cdrom_request_sense_for_scsi(uint8_t id, uint8_t *buffer, uint8_t alloc_length); +extern void cdrom_update_cdb(uint8_t *cdb, int lba_pos, int number_of_blocks); +extern void cdrom_insert(uint8_t id); -int find_cdrom_for_scsi_id(uint8_t scsi_id, uint8_t scsi_lun); -int cdrom_read_capacity(uint8_t id, uint8_t *cdb, uint8_t *buffer, uint32_t *len); +extern int find_cdrom_for_scsi_id(uint8_t scsi_id, uint8_t scsi_lun); +extern int cdrom_read_capacity(uint8_t id, uint8_t *cdb, uint8_t *buffer, uint32_t *len); #define cdrom_sense_error cdrom[id].sense[0] #define cdrom_sense_key cdrom[id].sense[2] @@ -244,9 +243,9 @@ int cdrom_read_capacity(uint8_t id, uint8_t *cdb, uint8_t *buffer, uint32_t *len #define cdrom_ascq cdrom[id].sense[13] #define cdrom_drive cdrom_drives[id].host_drive -extern void cdrom_close(uint8_t id); +extern void cdrom_global_init(void); +extern void cdrom_global_reset(void); extern void cdrom_hard_reset(void); -extern void cdrom_general_init(void); #endif /*EMU_CDROM_H*/ diff --git a/src/cdrom/cdrom_image.cc b/src/cdrom/cdrom_image.cc index bff23da58..5d728c4fe 100644 --- a/src/cdrom/cdrom_image.cc +++ b/src/cdrom/cdrom_image.cc @@ -991,7 +991,7 @@ int image_open(uint8_t id, wchar_t *fn) if (!cdrom_image[id].image_inited || cdrom_image[id].image_changed) { - swprintf(cdrom_image[id].image_path, sizeof(cdrom_image[id].image_path)/sizeof(wchar_t), L"%ws", fn); + swprintf(cdrom_image[id].image_path, sizeof(cdrom_image[id].image_path)/sizeof(wchar_t), L"%S", fn); } if (! wcscasecmp(get_extension_w(fn), L"ISO")) diff --git a/src/config.c b/src/config.c index 2df51ee1e..e197114ad 100644 --- a/src/config.c +++ b/src/config.c @@ -8,7 +8,7 @@ * * Configuration file handler. * - * Version: @(#)config.c 1.0.18 2017/10/12 + * Version: @(#)config.c 1.0.19 2017/10/12 * * Authors: Sarah Walker, * Miran Grca, @@ -258,6 +258,10 @@ config_read(wchar_t *fn) fgetws(buff, sizeof(buff)-1, f); if (feof(f)) break; + /* Make sure there are no stray newlines or hard-returns in there. */ + if (buff[wcslen(buff)-1] == L'\n') buff[wcslen(buff)-1] = L'\0'; + if (buff[wcslen(buff)-1] == L'\r') buff[wcslen(buff)-1] = L'\0'; + c = 0; while (buff[c] == L' ') c++; @@ -353,9 +357,9 @@ config_write(wchar_t *fn) if (sec->name[0]) { mbstowcs(wname, sec->name, strlen(sec->name)+1); if (fl) - fwprintf(f, L"\n[%ws]\n", wname); + fwprintf(f, L"\n[%S]\n", wname); else - fwprintf(f, L"[%ws]\n", wname); + fwprintf(f, L"[%S]\n", wname); fl++; } @@ -364,9 +368,9 @@ config_write(wchar_t *fn) if (ent->name[0]) { mbstowcs(wname, ent->name, strlen(ent->name)+1); if (ent->wdata[0] == L'\0') - fwprintf(f, L"%ws = \n", wname); + fwprintf(f, L"%S = \n", wname); else - fwprintf(f, L"%ws = %ws\n", wname, ent->wdata); + fwprintf(f, L"%S = %S\n", wname, ent->wdata); fl++; } @@ -964,7 +968,7 @@ load_removable_devices(void) memcpy(floppyfns[c], wp, (wcslen(wp) << 1) + 2); if (*wp != L'\0') - printf("Floppy%d: %ws\n", c, floppyfns[c]); + printf("Floppy%d: %S\n", c, floppyfns[c]); sprintf(temp, "fdd_%02i_writeprot", c+1); ui_writeprot[c] = !!config_get_int(cat, temp, 0); sprintf(temp, "fdd_%02i_turbo", c + 1); @@ -1107,7 +1111,7 @@ config_load(wchar_t *fn) { if (fn == NULL) fn = config_file_default; - pclog("Loading config file '%ws'..\n", fn); + pclog("Loading config file '%S'..\n", fn); if (! config_read(fn)) { cpu = 0; @@ -1963,6 +1967,7 @@ config_set_wstring(char *head, char *name, wchar_t *val) } +#if 0 /* FIXME: should be moved elsewhere. --FvK */ char * get_filename(char *s) @@ -1977,6 +1982,7 @@ get_filename(char *s) return(s); } +#endif /* FIXME: should be moved elsewhere. --FvK */ @@ -1995,23 +2001,26 @@ get_filename_w(wchar_t *s) } +#if 0 /* FIXME: should be moved elsewhere. --FvK */ void append_filename(char *dest, char *s1, char *s2, int size) { sprintf(dest, "%s%s", s1, s2); } +#endif /* FIXME: should be moved elsewhere. --FvK */ void append_filename_w(wchar_t *dest, wchar_t *s1, wchar_t *s2, int size) { - /* We assume 512 here (pathnames) which "should" be safe. --FvK */ - swprintf(dest, 512, L"%s%s", s1, s2); + wcscat(dest, s1); + wcscat(dest, s2); } +#if 0 /* FIXME: should be moved elsewhere. --FvK */ void put_backslash(char *s) @@ -2021,6 +2030,7 @@ put_backslash(char *s) if (s[c] != '/' && s[c] != '\\') s[c] = '/'; } +#endif /* FIXME: should be moved elsewhere. --FvK */ @@ -2045,12 +2055,12 @@ get_extension(char *s) while (c && s[c] != '.') c--; - + if (!c) return(&s[strlen(s)]); return(&s[c+1]); -} +} /* FIXME: should be moved elsewhere. --FvK */ @@ -2061,12 +2071,12 @@ wchar_t if (c <= 0) return(s); - + while (c && s[c] != L'.') c--; - + if (!c) return(&s[wcslen(s)]); return(&s[c+1]); -} +} diff --git a/src/cpu/386.c b/src/cpu/386.c index e988d3186..4bbb87976 100644 --- a/src/cpu/386.c +++ b/src/cpu/386.c @@ -50,12 +50,6 @@ int cgate32; uint32_t cr2, cr3, cr4; uint32_t dr[8]; -#if FIXME -/* in mem.c and rom.c */ -uint8_t romext[32768]; -uint8_t *ram,*rom; -#endif - uint32_t rmdat32; #define rmdat rmdat32 #define fetchdat rmdat32 diff --git a/src/cpu/386_dynarec.c b/src/cpu/386_dynarec.c index d8c2418ed..38feafdda 100644 --- a/src/cpu/386_dynarec.c +++ b/src/cpu/386_dynarec.c @@ -51,11 +51,6 @@ uint16_t ea_rseg; int cgate32; -#if FIXME -uint8_t romext[32768]; -uint8_t *ram,*rom; -#endif - uint32_t rmdat32; uint32_t backupregs[16]; int oddeven=0; diff --git a/src/cpu/codegen_ops_x86-64.h b/src/cpu/codegen_ops_x86-64.h index f6ec2f055..773829b1d 100644 --- a/src/cpu/codegen_ops_x86-64.h +++ b/src/cpu/codegen_ops_x86-64.h @@ -543,7 +543,7 @@ static x86seg *FETCH_EA_16(x86seg *op_ea_seg, uint32_t fetchdat, int op_ssegs, u } else { - int base_reg, index_reg; + int base_reg = 0, index_reg = 0; switch (rm) { diff --git a/src/cpu/codegen_x86-64.c b/src/cpu/codegen_x86-64.c index 17d10646c..671630021 100644 --- a/src/cpu/codegen_x86-64.c +++ b/src/cpu/codegen_x86-64.c @@ -64,7 +64,9 @@ static int last_ssegs; void codegen_init() { +#if UNUSED int c; +#endif #ifdef __linux__ void *start; size_t len; @@ -238,7 +240,9 @@ void codegen_check_flush(page_t *page, uint64_t mask, uint32_t phys_addr) void codegen_block_init(uint32_t phys_addr) { codeblock_t *block; +#if UNUSED int has_evicted = 0; +#endif page_t *page = &pages[phys_addr >> 12]; if (!page->block[(phys_addr >> 10) & 3]) @@ -278,7 +282,9 @@ void codegen_block_init(uint32_t phys_addr) void codegen_block_start_recompile(codeblock_t *block) { +#if UNUSED int has_evicted = 0; +#endif page_t *page = &pages[block->phys >> 12]; if (!page->block[(block->phys >> 10) & 3]) @@ -594,7 +600,7 @@ static x86seg *codegen_generate_ea_16_long(x86seg *op_ea_seg, uint32_t fetchdat, } else { - int base_reg, index_reg; + int base_reg = 0, index_reg = 0; switch (cpu_rm) { @@ -1078,11 +1084,11 @@ void codegen_generate_call(uint8_t opcode, OpFn op, uint32_t fetchdat, uint32_t generate_call: codegen_timing_opcode(opcode, fetchdat, op_32); - if ((op_table == x86_dynarec_opcodes && - ((opcode & 0xf0) == 0x70 || (opcode & 0xfc) == 0xe0 || opcode == 0xc2 || - (opcode & 0xfe) == 0xca || (opcode & 0xfc) == 0xcc || (opcode & 0xfc) == 0xe8 || - (opcode == 0xff && ((fetchdat & 0x38) >= 0x10 && (fetchdat & 0x38) < 0x30))) || - (op_table == x86_dynarec_opcodes_0f && ((opcode & 0xf0) == 0x80)))) + if (((op_table == x86_dynarec_opcodes) && + (((opcode & 0xf0) == 0x70) || ((opcode & 0xfc) == 0xe0) || (opcode == 0xc2) || + ((opcode & 0xfe) == 0xca) || ((opcode & 0xfc) == 0xcc) || ((opcode & 0xfc) == 0xe8) || + ((opcode == 0xff) && (((fetchdat & 0x38) >= 0x10) && ((fetchdat & 0x38) < 0x30)))) || + ((op_table == x86_dynarec_opcodes_0f) && ((opcode & 0xf0) == 0x80)))) { /*Opcode is likely to cause block to exit, update cycle count*/ if (codegen_block_cycles) diff --git a/src/disk/hdd_image.c b/src/disk/hdd_image.c index e51548708..1302a852f 100644 --- a/src/disk/hdd_image.c +++ b/src/disk/hdd_image.c @@ -103,7 +103,7 @@ image_is_hdx(const wchar_t *s, int check_signature) return 0; } memcpy(ext, ws + ((len - 4) << 1), 8); - if (wcsicmp(ext, L".HDX") == 0) + if (wcscasecmp(ext, L".HDX") == 0) { if (check_signature) { diff --git a/src/floppy/floppy.c b/src/floppy/floppy.c index 3d6fd09d2..8771749bb 100644 --- a/src/floppy/floppy.c +++ b/src/floppy/floppy.c @@ -156,7 +156,7 @@ void floppy_load(int drive, wchar_t *fn) } c++; } - pclog("Couldn't load %ws %s\n",fn,p); + pclog("Couldn't load %S %s\n",fn,p); drive_empty[drive] = 1; fdd_set_head(real_drive(drive), 0); memset(floppyfns[drive], 0, sizeof(floppyfns[drive])); diff --git a/src/intel_flash.c b/src/intel_flash.c index 807c53d23..933a62dda 100644 --- a/src/intel_flash.c +++ b/src/intel_flash.c @@ -198,7 +198,7 @@ void *intel_flash_init(uint8_t type) wcscpy(flash_path, flash_name); - pclog("Flash path: %ws\n", flash_name); + pclog("Flash path: %S\n", flash_name); flash->flash_id = (type & FLASH_IS_BXB) ? 0x95 : 0x94; flash->invert_high_pin = (type & FLASH_INVERT); diff --git a/src/nvr.c b/src/nvr.c index c9c8837c3..1ed9b8e6c 100644 --- a/src/nvr.c +++ b/src/nvr.c @@ -186,7 +186,7 @@ * (DS12887A) which implemented a "century" register to be * compatible with Y2K. * - * Version: @(#)nvr.c 1.0.7 2017/10/12 + * Version: @(#)nvr.c 1.0.8 2017/10/12 * * Authors: Sarah Walker, * Miran Grca, @@ -680,7 +680,7 @@ nvr_load(void) /* We are responsible for loading. */ f = NULL; if (saved_nvr->mask != 0) { - pclog("Opening NVR file: %ws...\n", saved_nvr->fname); + pclog("Opening NVR file: %S...\n", saved_nvr->fname); f = plat_fopen(nvr_path(saved_nvr->fname), L"rb"); } @@ -723,7 +723,7 @@ nvr_save(void) /* We are responsible for saving. */ f = NULL; if (saved_nvr->mask != 0) { - pclog("Saving NVR file: %ws...\n", saved_nvr->fname); + pclog("Saving NVR file: %S...\n", saved_nvr->fname); f = plat_fopen(nvr_path(saved_nvr->fname), L"wb"); } diff --git a/src/pc.c b/src/pc.c index 00d6c345f..c4247b855 100644 --- a/src/pc.c +++ b/src/pc.c @@ -67,12 +67,6 @@ #include "sound/snd_ssi2001.h" #include "video/video.h" #include "video/vid_voodoo.h" -#ifdef WALTJE -# define UNICODE -# include -# include "plat_dir.h" -# undef UNICODE -#endif #include "ui.h" #include "plat.h" #include "plat_joystick.h" @@ -192,12 +186,7 @@ pc_concat(wchar_t *str) int pc_init(int argc, wchar_t *argv[]) { - wchar_t *cfg = NULL; - wchar_t *p; -#ifdef WALTJE - struct direct *dp; - DIR *dir; -#endif + wchar_t *cfg = NULL, *p; int c; /* Grab the executable's full path. */ @@ -227,33 +216,19 @@ usage: printf("-P or --vmpath path - set 'path' to be root for vm\n"); printf("\nA config file can be specified. If none ie, the default file will be used.\n"); return(0); - } else if (!_wcsicmp(argv[c], L"--dump") || - !_wcsicmp(argv[c], L"-D")) { + } else if (!wcscasecmp(argv[c], L"--dump") || + !wcscasecmp(argv[c], L"-D")) { dump_on_exit = 1; - } else if (!_wcsicmp(argv[c], L"--fullscreen") || - !_wcsicmp(argv[c], L"-F")) { + } else if (!wcscasecmp(argv[c], L"--fullscreen") || + !wcscasecmp(argv[c], L"-F")) { start_in_fullscreen = 1; - } else if (!_wcsicmp(argv[c], L"--vmpath") || - !_wcsicmp(argv[c], L"-P")) { + } else if (!wcscasecmp(argv[c], L"--vmpath") || + !wcscasecmp(argv[c], L"-P")) { if ((c+1) == argc) break; wcscpy(cfg_path, argv[++c]); - } else if (!_wcsicmp(argv[c], L"--test")) { + } else if (!wcscasecmp(argv[c], L"--test")) { /* some (undocumented) test function here.. */ -#ifdef WALTJE - dir = opendirw(exe_path); - if (dir != NULL) { - printf("Directory '%ws':\n", exe_path); - for (;;) { - dp = readdir(dir); - if (dp == NULL) break; - printf(">> '%ws'\n", dp->d_name); - } - closedir(dir); - } else { - printf("Could not open '%ws'..\n", exe_path); - } -#endif /* .. and then exit. */ return(0); @@ -275,12 +250,16 @@ usage: */ /* Make sure cfg_path has a trailing backslash. */ - pclog("exe_path=%ws\n", exe_path); + pclog("exe_path=%S\n", exe_path); if ((cfg_path[wcslen(cfg_path)-1] != L'\\') && (cfg_path[wcslen(cfg_path)-1] != L'/')) { +#ifdef WIN32 wcscat(cfg_path, L"\\"); +#else + wcscat(cfg_path, L"/"); +#endif } - pclog("cfg_path=%ws\n", cfg_path); + pclog("cfg_path=%S\n", cfg_path); if (cfg != NULL) { /* @@ -291,10 +270,13 @@ usage: * Otherwise, assume the pathname given is * relative to whatever the cfg_path is. */ +#ifdef WIN32 if ((cfg[1] == L':') || /* drive letter present */ (cfg[0] == L'\\')) /* backslash, root dir */ - append_filename_w(config_file_default, - NULL, cfg, 511); +#else + if (cfg[0] == L'/') /* slash, root dir */ +#endif + wcscpy(config_file_default, cfg); else append_filename_w(config_file_default, cfg_path, cfg, 511); @@ -311,7 +293,7 @@ usage: */ hdd_init(); network_init(); - cdrom_init_host_drives(); + cdrom_global_init(); /* Load the configuration file. */ config_load(cfg); @@ -435,7 +417,7 @@ again2: ide_init_first(); - cdrom_general_init(); + cdrom_global_reset(); device_init(); diff --git a/src/rom.c b/src/rom.c index d1edba500..8851c2f5c 100644 --- a/src/rom.c +++ b/src/rom.c @@ -13,7 +13,7 @@ * - c386sx16 BIOS fails checksum * - the loadfont() calls should be done elsewhere * - * Version: @(#)rom.c 1.0.9 2017/10/12 + * Version: @(#)rom.c 1.0.10 2017/10/12 * * Authors: Sarah Walker, * Miran Grca, @@ -135,7 +135,7 @@ rom_load_linear(wchar_t *fn, uint32_t addr, int sz, int off, uint8_t *ptr) FILE *f = rom_fopen(fn, L"rb"); if (f == NULL) { - pclog("ROM: image '%ws' not found\n", fn); + pclog("ROM: image '%S' not found\n", fn); return(0); } @@ -166,9 +166,9 @@ rom_load_interleaved(wchar_t *fnl, wchar_t *fnh, uint32_t addr, int sz, int off, int c; if (fl == NULL || fh == NULL) { - if (fl == NULL) pclog("ROM: image '%ws' not found\n", fnl); + if (fl == NULL) pclog("ROM: image '%S' not found\n", fnl); else (void)fclose(fl); - if (fh == NULL) pclog("ROM: image '%ws' not found\n", fnh); + if (fh == NULL) pclog("ROM: image '%S' not found\n", fnh); else (void)fclose(fh); return(0); diff --git a/src/scsi/scsi_aha154x.c b/src/scsi/scsi_aha154x.c index d904cb171..663e88718 100644 --- a/src/scsi/scsi_aha154x.c +++ b/src/scsi/scsi_aha154x.c @@ -12,7 +12,7 @@ * * NOTE: THIS IS CURRENTLY A MESS, but will be cleaned up as I go. * - * Version: @(#)scsi_aha154x.c 1.0.27 2017/10/11 + * Version: @(#)scsi_aha154x.c 1.0.28 2017/10/12 * * Authors: Fred N. van Kempen, * Original Buslogic version by SA1988 and Miran Grca. @@ -2030,7 +2030,7 @@ aha_setbios(aha_t *dev) if (dev->bios_path == NULL) return; /* Open the BIOS image file and make sure it exists. */ - pclog("%s: loading BIOS from '%ws'\n", dev->name, dev->bios_path); + pclog("%s: loading BIOS from '%S'\n", dev->name, dev->bios_path); if ((f = rom_fopen(dev->bios_path, L"rb")) == NULL) { pclog("%s: BIOS ROM not found!\n", dev->name); return; diff --git a/src/sound/munt/Partial.cpp b/src/sound/munt/Partial.cpp index da5e7c4a1..0b7231122 100644 --- a/src/sound/munt/Partial.cpp +++ b/src/sound/munt/Partial.cpp @@ -43,7 +43,7 @@ static Bit32s getPANFactor(Bit32s panSetting) { if (firstRun) { firstRun = false; - for (Bit32u i = 1; i < PAN_FACTORS_COUNT; i++) { + for (Bit32u i = 1; i < (Bit32u)PAN_FACTORS_COUNT; i++) { PAN_FACTORS[i] = Bit32s(0.5 + i * 8192.0 / double(PAN_FACTORS_COUNT - 1)); } } diff --git a/src/ui.h b/src/ui.h index 291894f3a..9dc9c688e 100644 --- a/src/ui.h +++ b/src/ui.h @@ -8,7 +8,7 @@ * * Define the various UI functions. * - * Version: @(#)ui.h 1.0.2 2017/10/09 + * Version: @(#)ui.h 1.0.2 2017/10/12 * * Authors: Miran Grca, * Fred N. van Kempen, @@ -28,7 +28,7 @@ extern "C" { #ifdef WIN32 # include "win/resource.h" #else -# include "lnx/strings.h" +# include "linux/strings.h" #endif diff --git a/src/win/86Box.rc b/src/win/86Box.rc index 7327f1ca6..245c9d2e0 100644 --- a/src/win/86Box.rc +++ b/src/win/86Box.rc @@ -8,10 +8,11 @@ * * Windows resource script. * - * Version: @(#)86Box.rc 1.0.15 2017/10/05 + * Version: @(#)86Box.rc 1.0.16 2017/10/12 * * Authors: Miran Grca, * Fred N. van Kempen, + * * Copyright 2016,2017 Miran Grca. */ #include @@ -816,7 +817,7 @@ BEGIN IDS_2155 "IRQ %i" IDS_2156 "%" PRIu64 IDS_2157 "%" PRIu64 " MB (CHS: %" PRIu64 ", %" PRIu64 ", %" PRIu64 ")" - IDS_2158 "Floppy %i (%s): %ws" + IDS_2158 "Floppy %i (%s): %S" IDS_2159"All floppy images (*.0??;*.12;*.144;*.360;*.720;*.86F;*.BIN;*.CQ;*.CQM;*.DSK;*.FDI;*.FDF;*.FLP;*.HDM;*.IMA;*.IMD;*.IMG;*.JSON;*.TD0;*.VFD;*.XDF)\0*.0??;*.12;*.144;*.360;*.720;*.86F;*.BIN;*.CQ;*.CQM;*.DSK;*.FDI;*.FDF;*.FLP;*.HDM;*.IMA;*.IMD;*.IMG;*.JSON;*.TD0;*.VFD;*.XDF\0Advanced sector-based images (*.IMD;*.TD0)\0*.IMD;*.JSON;*.TD0\0Basic sector-based images (*.0??;*.12;*.144;*.360;*.720;*.BIN;*.CQ;*.CQM;*.DSK;*.FDI;*.FDF;*.FLP;*.HDM;*.IMA;*.IMG;*.JSON;*.VFD;*.XDF)\0*.0??;*.12;*.144;*.360;*.720;*.BIN;*.CQ;*.CQM;*.DSK;*.FDI;*.FDF;*.FLP;*.HDM;*.IMA;*.IMG;*.JSON;*.VFD;*.XDF\0Flux images (*.FDI)\0*.FDI\0Surface-based images (*.86F)\0*.86F\0All files (*.*)\0*.*\0" IDS_2160 "Configuration files (*.CFG)\0*.CFG\0All files (*.*)\0*.*\0" IDS_2161 "&New image..." @@ -862,7 +863,7 @@ BEGIN IDS_4112 "Please enter a valid file name" IDS_4113 "Remember to partition and format the new drive" IDS_4114 "MFM/RLL or ESDI CD-ROM drives never existed" - IDS_4115 "Removable disk %i (SCSI): %ws" + IDS_4115 "Removable disk %i (SCSI): %S" IDS_4352 "MFM/RLL" IDS_4353 "XT IDE" diff --git a/src/win/win.c b/src/win/win.c index 83ef6d181..fae60d2a9 100644 --- a/src/win/win.c +++ b/src/win/win.c @@ -8,7 +8,7 @@ * * The Emulator's Windows core. * - * Version: @(#)win.c 1.0.21 2017/10/12 + * Version: @(#)win.c 1.0.22 2017/10/12 * * Authors: Sarah Walker, * Miran Grca, @@ -1547,7 +1547,7 @@ take_screenshot(void) ddraw_take_screenshot(path); } - pclog("Screenshot: fn='%ws'\n", path); + pclog("Screenshot: fn='%S'\n", path); }