diff --git a/src/cdrom/cdrom.h b/src/cdrom/cdrom.h index 0c14225..b042da2 100644 --- a/src/cdrom/cdrom.h +++ b/src/cdrom/cdrom.h @@ -8,7 +8,7 @@ * * Definitions for the CDROM module.. * - * Version: @(#)cdrom.h 1.0.1 2018/02/14 + * Version: @(#)cdrom.h 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Miran Grca, diff --git a/src/cdrom/cdrom_image.cc b/src/cdrom/cdrom_image.cc index 79203cb..2eee62b 100644 --- a/src/cdrom/cdrom_image.cc +++ b/src/cdrom/cdrom_image.cc @@ -8,7 +8,7 @@ * * CD-ROM image support. * - * Version: @(#)cdrom_image.cc 1.0.1 2018/02/14 + * Version: @(#)cdrom_image.cc 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -386,44 +386,41 @@ static int image_is_track_audio(uint8_t id, uint32_t pos, int ismsf) return attr == AUDIO_TRACK; } -#ifdef _MSC_VER -#pragma pack(push, 1) -#define __attribute__(x) -#endif -typedef struct __attribute__((__packed__)) +#pragma pack(push, 1) +typedef struct { uint8_t user_data[2048]; uint8_t ecc[288]; } m1_data_t; -typedef struct __attribute__((__packed__)) +typedef struct { uint8_t sub_header[8]; uint8_t user_data[2328]; } m2_data_t; -typedef union __attribute__((__packed__)) +typedef union { m1_data_t m1_data; m2_data_t m2_data; uint8_t raw_data[2336]; } sector_data_t; -typedef struct __attribute__((__packed__)) +typedef struct { uint8_t sync[12]; uint8_t header[4]; sector_data_t data; } sector_raw_data_t; -typedef union __attribute__((__packed__)) +typedef union { sector_raw_data_t sector_data; uint8_t raw_data[2352]; } sector_t; -typedef struct __attribute__((__packed__)) +typedef struct { sector_t sector; uint8_t c2[296]; @@ -432,16 +429,12 @@ typedef struct __attribute__((__packed__)) uint8_t subchannel_rw[96]; } cdrom_sector_t; -typedef union __attribute__((__packed__)) +typedef union { cdrom_sector_t cdrom_sector; uint8_t buffer[2856]; } sector_buffer_t; - -#ifdef _MSC_VER #pragma pack(pop) -#undef __attribute__ -#endif sector_buffer_t cdrom_sector_buffer; diff --git a/src/cdrom/cdrom_null.c b/src/cdrom/cdrom_null.c index bc5e9b6..cb6aef9 100644 --- a/src/cdrom/cdrom_null.c +++ b/src/cdrom/cdrom_null.c @@ -9,7 +9,7 @@ * Implementation of the CD-ROM null interface for unmounted * guest CD-ROM drives. * - * Version: @(#)cdrom_null.c 1.0.1 2018/02/14 + * Version: @(#)cdrom_null.c 1.0.2 2018/02/21 * * Author: Miran Grca, * Sarah Walker, diff --git a/src/cpu/codegen_ops_arith.h b/src/cpu/codegen_ops_arith.h index e76187c..b0057a6 100644 --- a/src/cpu/codegen_ops_arith.h +++ b/src/cpu/codegen_ops_arith.h @@ -8,7 +8,7 @@ * * Miscellaneous instructions. * - * Version: @(#)codegen_ops_arith.h 1.0.1 2018/02/14 + * Version: @(#)codegen_ops_arith.h 1.0.2 2018/02/21 * * Authors: Sarah Walker, * Miran Grca, diff --git a/src/cpu/codegen_ops_logic.h b/src/cpu/codegen_ops_logic.h index 4429ab8..40e3328 100644 --- a/src/cpu/codegen_ops_logic.h +++ b/src/cpu/codegen_ops_logic.h @@ -8,7 +8,7 @@ * * Miscellaneous Instructions. * - * Version: @(#)codegen_ops_logic.h 1.0.1 2018/02/14 + * Version: @(#)codegen_ops_logic.h 1.0.2 2018/02/21 * * Authors: Sarah Walker, * Miran Grca, diff --git a/src/cpu/codegen_x86.c b/src/cpu/codegen_x86.c index e318643..bee83c7 100644 --- a/src/cpu/codegen_x86.c +++ b/src/cpu/codegen_x86.c @@ -8,7 +8,7 @@ * * Dynamic Recompiler for Intel 32-bit systems. * - * Version: @(#)codegen_x86.c 1.0.1 2018/02/14 + * Version: @(#)codegen_x86.c 1.0.2 2018/02/21 * * Authors: Sarah Walker, * Miran Grca, diff --git a/src/cpu/cpu.h b/src/cpu/cpu.h index 5a0b018..03a1ad2 100644 --- a/src/cpu/cpu.h +++ b/src/cpu/cpu.h @@ -8,7 +8,7 @@ * * CPU type handler. * - * Version: @(#)cpu.h 1.0.1 2018/02/14 + * Version: @(#)cpu.h 1.0.2 2018/02/21 * * Authors: Sarah Walker, * leilei, @@ -265,6 +265,7 @@ struct _cpustate_ { #define CPU_STATUS_NOTFLATSS (1 << 17) #define CPU_STATUS_MASK 0xffff0000 +/* FIXME: why not use #if sizeof(cpu_state) <= 128 #error? --FvK */ #ifdef _MSC_VER # define COMPILE_TIME_ASSERT(expr) /*nada*/ #else diff --git a/src/cpu/x87_ops.h b/src/cpu/x87_ops.h index d5e6f7a..9e48d3e 100644 --- a/src/cpu/x87_ops.h +++ b/src/cpu/x87_ops.h @@ -8,7 +8,7 @@ * * x87 FPU instructions core. * - * Version: @(#)x87_ops.h 1.0.1 2018/02/14 + * Version: @(#)x87_ops.h 1.0.2 2018/02/21 * * Authors: Sarah Walker, * leilei, @@ -39,7 +39,7 @@ #include #include #ifdef _MSC_VER -#include +# include #endif #define fplog 0 diff --git a/src/floppy/fdd_imd.c b/src/floppy/fdd_imd.c index 8daf57c..d59a74c 100644 --- a/src/floppy/fdd_imd.c +++ b/src/floppy/fdd_imd.c @@ -8,7 +8,7 @@ * * Implementation of the IMD floppy image format. * - * Version: @(#)fdd_imd.c 1.0.1 2018/02/14 + * Version: @(#)fdd_imd.c 1.0.2 2018/02/21 * * Author: Miran Grca, * diff --git a/src/game/joystick_ch_flightstick_pro.c b/src/game/joystick_ch_flightstick_pro.c index db1661c..277c71c 100644 --- a/src/game/joystick_ch_flightstick_pro.c +++ b/src/game/joystick_ch_flightstick_pro.c @@ -8,7 +8,7 @@ * * Implementation of the Flight Stick Pro. * - * Version: @(#)flightstick_pro.c 1.0.1 2018/02/14 + * Version: @(#)flightstick_pro.c 1.0.2 2018/02/21 * * Authors: Miran Grca, * Sarah Walker, diff --git a/src/game/joystick_standard.c b/src/game/joystick_standard.c index 9580112..09f7158 100644 --- a/src/game/joystick_standard.c +++ b/src/game/joystick_standard.c @@ -8,7 +8,7 @@ * * Implementation of a standard joystick. * - * Version: @(#)joystick_standard.c 1.0.1 2018/02/14 + * Version: @(#)joystick_standard.c 1.0.2 2018/02/21 * * Authors: Miran Grca, * Sarah Walker, diff --git a/src/game/joystick_sw_pad.c b/src/game/joystick_sw_pad.c index eebb22a..5b46dbc 100644 --- a/src/game/joystick_sw_pad.c +++ b/src/game/joystick_sw_pad.c @@ -29,7 +29,7 @@ * - Some DOS stuff will write to 0x201 while a packet is * being transferred. This seems to be ignored. * - * Version: @(#)sw_pad.c 1.0.1 2018/02/14 + * Version: @(#)sw_pad.c 1.0.2 2018/02/21 * * Authors: Miran Grca, * Sarah Walker, diff --git a/src/intel_flash.c b/src/intel_flash.c index e45a169..9946c2f 100644 --- a/src/intel_flash.c +++ b/src/intel_flash.c @@ -8,7 +8,7 @@ * * Implementation of the Intel 2 Mbit 8-bit flash devices. * - * Version: @(#)intel_flash.c 1.0.1 2018/02/14 + * Version: @(#)intel_flash.c 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Miran Grca, diff --git a/src/plat.h b/src/plat.h index 9b6a766..859ac71 100644 --- a/src/plat.h +++ b/src/plat.h @@ -8,7 +8,7 @@ * * Define the various platform support functions. * - * Version: @(#)plat.h 1.0.1 2018/02/11 + * Version: @(#)plat.h 1.0.2 2018/02/21 * * Author: Fred N. van Kempen, * @@ -75,11 +75,11 @@ #ifndef _MSC_VER -/* A hack (GCC-specific?) to allow us to ignore unused parameters. */ -#define UNUSED(arg) __attribute__((unused))arg + /* A hack (GCC-specific?) to allow us to ignore unused parameters. */ +# define UNUSED(arg) __attribute__((unused))arg #else -/* MSVC does not have __attribute__((unused)). */ -#define UNUSED(arg) arg + /* MSVC does not have __attribute__((unused)). */ +# define UNUSED(arg) arg #endif /* Return the size (in wchar's) of a wchar_t array. */ diff --git a/src/rom.c b/src/rom.c index bfae2f1..ef4e6bc 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.1 2018/02/14 + * Version: @(#)rom.c 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -276,6 +276,7 @@ rom_load_bios(int rom_id) { FILE *f; + /* FIXME: do this in the video card driver. */ loadfont(L"roms/video/mda/mda.rom", 0); loadfont(L"roms/video/wyse700/wy700.rom", 3); loadfont(L"roms/video/genius/8x12.bin", 4); @@ -425,7 +426,7 @@ rom_load_bios(int rom_id) if (! rom_load_interleaved( L"roms/machines/portableii/109740-001.rom", L"roms/machines/portableii/109739-001.rom", - 0x000000, 32768, 0, rom)) break; + 0x008000, 32768, 0, rom)) break; biosmask = 0x7fff; return(1); @@ -676,6 +677,7 @@ rom_load_bios(int rom_id) #if 0 case ROM_586MC1: + /* FIXME: no ROM? --FvK */ if (! rom_load_linear( L"roms/machines/586mc1/is.34", 0x000000, 131072, 0, rom)) break; diff --git a/src/scsi/scsi_buslogic.c b/src/scsi/scsi_buslogic.c index a836eec..cf89fda 100644 --- a/src/scsi/scsi_buslogic.c +++ b/src/scsi/scsi_buslogic.c @@ -13,7 +13,7 @@ * 1 - BT-545S ISA; * 2 - BT-958D PCI * - * Version: @(#)scsi_buslogic.c 1.0.1 2018/02/14 + * Version: @(#)scsi_buslogic.c 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Miran Grca, diff --git a/src/scsi/scsi_ncr53c810.c b/src/scsi/scsi_ncr53c810.c index ba3d9fc..b6e482e 100644 --- a/src/scsi/scsi_ncr53c810.c +++ b/src/scsi/scsi_ncr53c810.c @@ -10,7 +10,7 @@ * NCR and later Symbios and LSI. This controller was designed * for the PCI bus. * - * Version: @(#)scsi_ncr53c810.c 1.0.1 2018/02/14 + * Version: @(#)scsi_ncr53c810.c 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Miran Grca, diff --git a/src/scsi/scsi_x54x.c b/src/scsi/scsi_x54x.c index 94e4c86..0d5b525 100644 --- a/src/scsi/scsi_x54x.c +++ b/src/scsi/scsi_x54x.c @@ -12,7 +12,7 @@ * * These controllers were designed for various buses. * - * Version: @(#)scsi_x54x.c 1.0.1 2018/02/14 + * Version: @(#)scsi_x54x.c 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Miran Grca, diff --git a/src/sound/snd_adlibgold.c b/src/sound/snd_adlibgold.c index a21aa7a..c1acd49 100644 --- a/src/sound/snd_adlibgold.c +++ b/src/sound/snd_adlibgold.c @@ -8,7 +8,9 @@ * * Implementation of the Adlib Gold sound device. * - * Version: @(#)snd_adlibgold.c 1.0.1 2018/02/14 + * TODO: Stack allocation of big buffers (line 688 et al.) + * + * Version: @(#)snd_adlibgold.c 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Miran Grca, diff --git a/src/sound/snd_audiopci.c b/src/sound/snd_audiopci.c index 15e4d6c..9afc1ea 100644 --- a/src/sound/snd_audiopci.c +++ b/src/sound/snd_audiopci.c @@ -8,7 +8,7 @@ * * Implementation of the AudioPCI sound device. * - * Version: @(#)snd_audiopci.c 1.0.1 2018/02/14 + * Version: @(#)snd_audiopci.c 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Miran Grca, diff --git a/src/sound/snd_dbopl.cc b/src/sound/snd_dbopl.cc index 2e6baa2..51c73e1 100644 --- a/src/sound/snd_dbopl.cc +++ b/src/sound/snd_dbopl.cc @@ -8,7 +8,9 @@ * * DOSbox OPL emulation. * - * Version: @(#)snd_dbopl.c 1.0.1 2018/02/14 + * NOTE: See MSC_ macros for allocation on stack. --FvK + * + * Version: @(#)snd_dbopl.c 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -37,15 +39,15 @@ * Boston, MA 02111-1307 * USA. */ +#ifdef _MSC_VER + /* for _alloca() and printing of the related error message with pclog() */ +# include +# include +# include "../emu.h" +#endif #include "dbopl.h" #include "nukedopl.h" #include "snd_dbopl.h" -#ifdef _MSC_VER -/* for _alloca() and printing of the related error message with pclog() */ -#include -#include -#include "../emu.h" -#endif int opl3_type = 0; diff --git a/src/sound/snd_sb.c b/src/sound/snd_sb.c index 609b439..4250e4d 100644 --- a/src/sound/snd_sb.c +++ b/src/sound/snd_sb.c @@ -8,7 +8,7 @@ * * Sound Blaster emulation. * - * Version: @(#)sound_sb.c 1.0.1 2018/02/14 + * Version: @(#)sound_sb.c 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Miran Grca, diff --git a/src/video/vid_svga.h b/src/video/vid_svga.h index 0e325e7..ec59ff1 100644 --- a/src/video/vid_svga.h +++ b/src/video/vid_svga.h @@ -8,7 +8,7 @@ * * Definitions for the generic SVGA driver. * - * Version: @(#)vid_svga.h 1.0.1 2018/02/14 + * Version: @(#)vid_svga.h 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Miran Grca, diff --git a/src/video/vid_voodoo.c b/src/video/vid_voodoo.c index 6d07e9f..0579780 100644 --- a/src/video/vid_voodoo.c +++ b/src/video/vid_voodoo.c @@ -8,7 +8,7 @@ * * Emulation of the 3DFX Voodoo Graphics controller. * - * Version: @(#)vid_voodoo.c 1.0.1 2018/02/14 + * Version: @(#)vid_voodoo.c 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -43,6 +43,9 @@ #include #include #include +#ifdef _MSC_VER +# include +#endif #include #include #include "../emu.h" @@ -59,9 +62,6 @@ #include "vid_svga.h" #include "vid_voodoo.h" #include "vid_voodoo_dither.h" -#ifdef _MSC_VER -#include -#endif #ifdef MIN #undef MIN diff --git a/src/video/vid_voodoo_codegen_x86.h b/src/video/vid_voodoo_codegen_x86.h index 9ee444f..887b878 100644 --- a/src/video/vid_voodoo_codegen_x86.h +++ b/src/video/vid_voodoo_codegen_x86.h @@ -8,7 +8,7 @@ * * Implementation of the Voodoo Recompiler (32bit.) * - * Version: @(#)vid_voodoo_codegen_x86.h 1.0.1 2018/02/14 + * Version: @(#)vid_voodoo_codegen_x86.h 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -56,7 +56,7 @@ #endif #ifdef _MSC_VER -#include +# include #endif #include diff --git a/src/win/VARCem.rc b/src/win/VARCem.rc index 8218570..28dcb0b 100644 --- a/src/win/VARCem.rc +++ b/src/win/VARCem.rc @@ -8,7 +8,7 @@ * * Application resource script for Windows. * - * Version: @(#)VARCem.rc 1.0.1 2018/02/14 + * Version: @(#)VARCem.rc 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Miran Grca, diff --git a/src/win/resource.h b/src/win/resource.h index 0dc04d1..2507397 100644 --- a/src/win/resource.h +++ b/src/win/resource.h @@ -8,7 +8,7 @@ * * Windows resource defines. * - * Version: @(#)resource.h 1.0.1 2018/02/14 + * Version: @(#)resource.h 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -121,7 +121,7 @@ #define IDC_CHECK_SYNC 1008 /* Leave this as is until we finally get into localization in. */ #if 0 -#define IDC_COMBO_LANG 1009 +# define IDC_COMBO_LANG 1009 #endif #define IDC_COMBO_MACHINE 1010 /* machine/cpu config */ @@ -131,7 +131,7 @@ #define IDC_CHECK_FPU 1014 #define IDC_COMBO_WS 1015 #ifdef USE_DYNAREC -#define IDC_CHECK_DYNAREC 1016 +# define IDC_CHECK_DYNAREC 1016 #endif #define IDC_MEMTEXT 1017 #define IDC_MEMSPIN 1018 diff --git a/src/win/win.h b/src/win/win.h index be518c2..a8c6f4e 100644 --- a/src/win/win.h +++ b/src/win/win.h @@ -8,7 +8,7 @@ * * Platform support defintions for Win32. * - * Version: @(#)win.h 1.0.1 2018/02/14 + * Version: @(#)win.h 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -39,21 +39,19 @@ #ifndef PLAT_WIN_H # define PLAT_WIN_H - #ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif -# define UNICODE -# define BITMAP WINDOWS_BITMAP -# if 0 -# ifdef _WIN32_WINNT -# undef _WIN32_WINNT -# define _WIN32_WINNT 0x0501 -# endif +#define UNICODE +#if 0 +# ifdef _WIN32_WINNT +# undef _WIN32_WINNT +# define _WIN32_WINNT 0x0501 # endif -# include -# include "resource.h" -# undef BITMAP +#endif +#include +#include "resource.h" /* Class names and such. */ @@ -148,7 +146,8 @@ extern void StatusWindowCreate(HWND hwnd); /* Functions in win_stbar.c: */ extern HWND hwndSBAR; -extern void StatusBarCreate(HWND hwndParent, uintptr_t idStatus, HINSTANCE hInst); +extern void StatusBarCreate(HWND hwndParent, uintptr_t idStatus, + HINSTANCE hInst); /* Functions in win_dialog.c: */ diff --git a/src/win/win_about.c b/src/win/win_about.c index 7707eb5..64a458f 100644 --- a/src/win/win_about.c +++ b/src/win/win_about.c @@ -8,7 +8,7 @@ * * Handle the About dialog. * - * Version: @(#)win_about.c 1.0.1 2018/02/14 + * Version: @(#)win_about.c 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -35,10 +35,8 @@ * USA. */ #define UNICODE -#define BITMAP WINDOWS_BITMAP #include #include -#undef BITMAP #include #include #include diff --git a/src/win/win_cdrom.c b/src/win/win_cdrom.c index ce9b65c..bda1748 100644 --- a/src/win/win_cdrom.c +++ b/src/win/win_cdrom.c @@ -8,7 +8,7 @@ * * Handle the platform-side of CDROM drives. * - * Version: @(#)win_cdrom.c 1.0.1 2018/02/14 + * Version: @(#)win_cdrom.c 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -35,10 +35,8 @@ * USA. */ #define UNICODE -#define BITMAP WINDOWS_BITMAP #include #include -#undef BITMAP #include #include #include diff --git a/src/win/win_crashdump.c b/src/win/win_crashdump.c index a6058ca..431ef65 100644 --- a/src/win/win_crashdump.c +++ b/src/win/win_crashdump.c @@ -8,7 +8,7 @@ * * Handle generation of crash-dump reports. * - * Version: @(#)win_crashdump.c 1.0.1 2018/02/14 + * Version: @(#)win_crashdump.c 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Riley (Rain-chan), @@ -54,7 +54,8 @@ static char *ExceptionHandlerBuffer, *CurrentBufferPointer; -LONG CALLBACK MakeCrashDump(PEXCEPTION_POINTERS ExceptionInfo) +static LONG CALLBACK +MakeCrashDump(PEXCEPTION_POINTERS ExceptionInfo) { SYSTEMTIME SystemTime; HANDLE hDumpFile; @@ -160,8 +161,8 @@ LONG CALLBACK MakeCrashDump(PEXCEPTION_POINTERS ExceptionInfo) GetModuleInformation(GetCurrentProcess(), hMods[i], &modInfo, sizeof(MODULEINFO)); /* If the exception address is in the range of this module.. */ - if ( (ExceptionInfo->ExceptionRecord->ExceptionAddress >= modInfo.lpBaseOfDll) && - (ExceptionInfo->ExceptionRecord->ExceptionAddress < ((char *)modInfo.lpBaseOfDll + modInfo.SizeOfImage))) { + if ( ((char *)ExceptionInfo->ExceptionRecord->ExceptionAddress >= (char *)modInfo.lpBaseOfDll) && + ((char *)ExceptionInfo->ExceptionRecord->ExceptionAddress < ((char *)modInfo.lpBaseOfDll + modInfo.SizeOfImage))) { /* ...this is the module we're looking for! */ ipModule = hMods[i]; break; diff --git a/src/win/win_d3d.cpp b/src/win/win_d3d.cpp index 2c85469..7536e77 100644 --- a/src/win/win_d3d.cpp +++ b/src/win/win_d3d.cpp @@ -8,7 +8,7 @@ * * Rendering module for Microsoft Direct3D 9. * - * Version: @(#)win_d3d.cpp 1.0.1 2018/02/14 + * Version: @(#)win_d3d.cpp 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Miran Grca, diff --git a/src/win/win_d3d.h b/src/win/win_d3d.h index d0a1c57..5fe162f 100644 --- a/src/win/win_d3d.h +++ b/src/win/win_d3d.h @@ -8,7 +8,7 @@ * * Direct3D 9 rendererer and screenshots taking. * - * Version: @(#)win_d3d.h 1.0.1 2018/02/14 + * Version: @(#)win_d3d.h 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -39,10 +39,8 @@ #ifndef WIN_D3D_H # define WIN_D3D_H # define UNICODE -# define BITMAP WINDOWS_BITMAP # include # include -# undef BITMAP #ifdef __cplusplus diff --git a/src/win/win_ddraw.h b/src/win/win_ddraw.h index 0e383a6..1b360df 100644 --- a/src/win/win_ddraw.h +++ b/src/win/win_ddraw.h @@ -8,7 +8,7 @@ * * Definitions for the DirectDraw 9 rendering module. * - * Version: @(#)win_ddraw.h 1.0.1 2018/02/14 + * Version: @(#)win_ddraw.h 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -39,9 +39,7 @@ #ifndef WIN_DDRAW_H # define WIN_DDRAW_H # define UNICODE -# define BITMAP WINDOWS_BITMAP # include -# undef BITMAP #ifdef __cplusplus diff --git a/src/win/win_joystick.cpp b/src/win/win_joystick.cpp index 09b8b98..9a839ff 100644 --- a/src/win/win_joystick.cpp +++ b/src/win/win_joystick.cpp @@ -8,7 +8,10 @@ * * Joystick interface to host device. * - * Version: @(#)win_joystick.cpp 1.0.1 2018/02/14 + * NOTE: Hacks currently needed to compile with MSVC; DX needs to + * be updated to 11 or 12 or so. --FvK + * + * Version: @(#)win_joystick.cpp 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -39,8 +42,10 @@ #define DIRECTINPUT_VERSION 0x0800 #include #ifndef DIDEVTYPE_JOYSTICK -/* TODO: This is a crude hack to fix compilation on MSVC ... it needs a rework at some point */ -#define DIDEVTYPE_JOYSTICK 4 + /* TODO: This is a crude hack to fix compilation on MSVC ... + * it needs a rework at some point + */ +# define DIDEVTYPE_JOYSTICK 4 #endif #include #include diff --git a/src/win/win_keyboard.c b/src/win/win_keyboard.c index 1d00282..a301fd8 100644 --- a/src/win/win_keyboard.c +++ b/src/win/win_keyboard.c @@ -8,7 +8,7 @@ * * Windows raw keyboard input handler. * - * Version: @(#)win_keyboard.c 1.0.1 2018/02/14 + * Version: @(#)win_keyboard.c 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -36,10 +36,8 @@ */ #define UNICODE #define _WIN32_WINNT 0x0501 -#define BITMAP WINDOWS_BITMAP #include #include -#undef BITMAP #include #include #include diff --git a/src/win/win_new_floppy.c b/src/win/win_new_floppy.c index bb822a2..f38d1ba 100644 --- a/src/win/win_new_floppy.c +++ b/src/win/win_new_floppy.c @@ -8,7 +8,7 @@ * * Implementation of the New Floppy Image dialog. * - * Version: @(#)win_new_floppy.c 1.0.1 2018/02/14 + * Version: @(#)win_new_floppy.c 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -35,10 +35,8 @@ * USA. */ #define UNICODE -#define BITMAP WINDOWS_BITMAP #include #include -#undef BITMAP #include #include #include diff --git a/src/win/win_settings.c b/src/win/win_settings.c index afcfa94..a7659df 100644 --- a/src/win/win_settings.c +++ b/src/win/win_settings.c @@ -8,7 +8,7 @@ * * Implementation of the Settings dialog. * - * Version: @(#)win_settings.c 1.0.1 2018/02/14 + * Version: @(#)win_settings.c 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -35,10 +35,8 @@ * USA. */ #define UNICODE -#define BITMAP WINDOWS_BITMAP #include #include -#undef BITMAP #include #include #include diff --git a/src/win/win_snd_gain.c b/src/win/win_snd_gain.c index a09ed32..f3f06e1 100644 --- a/src/win/win_snd_gain.c +++ b/src/win/win_snd_gain.c @@ -8,7 +8,7 @@ * * Implementation of the Sound Gain dialog. * - * Version: @(#)win_snd_gain.c 1.0.1 2018/02/14 + * Version: @(#)win_snd_gain.c 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -35,10 +35,8 @@ * USA. */ #define UNICODE -#define BITMAP WINDOWS_BITMAP #include #include -#undef BITMAP #include #include #include diff --git a/src/win/win_status.c b/src/win/win_status.c index 9795173..13b957c 100644 --- a/src/win/win_status.c +++ b/src/win/win_status.c @@ -8,7 +8,7 @@ * * Implementation of the Status Window dialog. * - * Version: @(#)win_status.c 1.0.1 2018/02/14 + * Version: @(#)win_status.c 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -36,10 +36,8 @@ * Boston, MA 02111-1307 * USA. */ -#define BITMAP WINDOWS_BITMAP #include #include -#undef BITMAP #include #include #include diff --git a/src/win/win_stbar.c b/src/win/win_stbar.c index 65f91e4..33f3110 100644 --- a/src/win/win_stbar.c +++ b/src/win/win_stbar.c @@ -8,7 +8,7 @@ * * Implementation of the Status Bar module. * - * Version: @(#)win_stbar.c 1.0.1 2018/02/14 + * Version: @(#)win_stbar.c 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Miran Grca, @@ -35,12 +35,10 @@ * USA. */ #define UNICODE -#define BITMAP WINDOWS_BITMAP #include #include #include #include -#undef BITMAP #include #include #include diff --git a/src/win/win_thread.c b/src/win/win_thread.c index bc07e9b..8320d70 100644 --- a/src/win/win_thread.c +++ b/src/win/win_thread.c @@ -8,7 +8,7 @@ * * Implement threads and mutexes for the Win32 platform. * - * Version: @(#)win_thread.c 1.0.1 2018/02/14 + * Version: @(#)win_thread.c 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Sarah Walker, @@ -35,11 +35,9 @@ * USA. */ #define UNICODE -#define BITMAP WINDOWS_BITMAP #include #include #include -#undef BITMAP #include #include #include diff --git a/src/win/win_ui.c b/src/win/win_ui.c index a8fa7ae..ccbff19 100644 --- a/src/win/win_ui.c +++ b/src/win/win_ui.c @@ -8,7 +8,7 @@ * * Implement the user Interface module. * - * Version: @(#)win_ui.c 1.0.1 2018/02/14 + * Version: @(#)win_ui.c 1.0.2 2018/02/21 * * Authors: Fred N. van Kempen, * Miran Grca,