From fec958cc0ade5401331bbe9951a8a596746181d2 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Fri, 10 Mar 2017 19:46:22 +0100 Subject: [PATCH] - finally managed to get rid of the DWORD type. This one was particularly nasty because Windows also defines a DWORD, but in Windows it is an unsigned long, not an unsigned int so changing types caused type conflicts and not all could be removed. Those referring to the Windows type have to be kept, fortunately they are mostly in the Win32 directory, with a handful of exceptions elsewhere. --- src/basictypes.h | 11 +------ src/c_console.cpp | 2 +- src/ct_chat.cpp | 2 +- src/files.cpp | 4 +-- src/g_game.cpp | 1 - src/g_input.h | 9 ++++++ src/gl/system/gl_swframebuffer.cpp | 1 - src/gl/system/gl_swwipe.cpp | 1 - src/gl/utility/gl_clock.cpp | 1 - src/i_module.cpp | 1 - src/i_net.cpp | 1 - src/menu/menu.cpp | 2 +- src/oplsynth/dosbox/opl.cpp | 2 +- src/oplsynth/music_opldumper_mididevice.cpp | 4 +-- src/oplsynth/nukedopl3.h | 2 +- src/posix/i_input.h | 10 ------- src/resourcefiles/file_7z.cpp | 4 +-- src/sound/fmodsound.cpp | 1 - src/sound/fmodsound.h | 2 +- src/sound/i_midi_win32.h | 4 --- src/sound/i_music.cpp | 1 - src/sound/i_sound.cpp | 1 - src/sound/mpg123_decoder.cpp | 1 - src/sound/music_audiotoolbox_mididevice.cpp | 14 ++++----- src/sound/music_dumb.cpp | 32 ++++++++++----------- src/sound/music_midi_base.cpp | 6 ++-- src/sound/music_midistream.cpp | 16 +++++------ src/sound/music_softsynth_mididevice.cpp | 8 +++--- src/sound/oalsound.cpp | 1 - src/sound/sndfile_decoder.cpp | 1 - src/timidity/gf1patch.h | 2 +- src/timidity/instrum_dls.cpp | 2 ++ src/win32/critsec.cpp | 1 - src/win32/eaxedit.cpp | 1 - src/win32/fb_d3d9.cpp | 1 - src/win32/fb_d3d9_wipe.cpp | 1 - src/win32/fb_ddraw.cpp | 1 - src/win32/hardware.cpp | 1 - src/win32/i_cd.cpp | 1 - src/win32/i_crash.cpp | 1 - src/win32/i_dijoy.cpp | 1 - src/win32/i_input.cpp | 1 - src/win32/i_input.h | 7 +---- src/win32/i_keyboard.cpp | 1 - src/win32/i_main.cpp | 1 - src/win32/i_mouse.cpp | 1 - src/win32/i_rawps2.cpp | 1 - src/win32/i_specialpaths.cpp | 1 - src/win32/i_system.cpp | 1 - src/win32/i_xinput.cpp | 1 - src/win32/optwin32.h | 1 - src/win32/st_start.cpp | 9 +++--- src/win32/win32gliface.cpp | 1 - src/win32/win32video.cpp | 1 - 54 files changed, 66 insertions(+), 120 deletions(-) create mode 100644 src/g_input.h diff --git a/src/basictypes.h b/src/basictypes.h index 0e0e44cdb1..025d119a53 100644 --- a/src/basictypes.h +++ b/src/basictypes.h @@ -3,16 +3,7 @@ #include -// windef.h, included by windows.h, has its own incompatible definition -// of DWORD as a long. In files that mix Doom and Windows code, you -// must define USE_WINDOWS_DWORD before including doomtype.h so that -// you are aware that those files have a different DWORD than the rest -// of the source. - -#ifndef USE_WINDOWS_DWORD -typedef uint32_t DWORD; -#endif -typedef uint32_t BITFIELD; +typedef uint32_t BITFIELD; typedef int INTBOOL; #if !defined(GUID_DEFINED) diff --git a/src/c_console.cpp b/src/c_console.cpp index b2dbf8edf9..18e99af5f8 100644 --- a/src/c_console.cpp +++ b/src/c_console.cpp @@ -48,7 +48,7 @@ #include "hu_stuff.h" #include "i_system.h" #include "i_video.h" -#include "i_input.h" +#include "g_input.h" #include "m_swap.h" #include "v_palette.h" #include "v_video.h" diff --git a/src/ct_chat.cpp b/src/ct_chat.cpp index 98e95cdde4..c49e95f578 100644 --- a/src/ct_chat.cpp +++ b/src/ct_chat.cpp @@ -27,7 +27,7 @@ #include "v_video.h" #include "gi.h" #include "d_gui.h" -#include "i_input.h" +#include "g_input.h" #include "templates.h" #include "d_net.h" #include "d_event.h" diff --git a/src/files.cpp b/src/files.cpp index 03bab9b458..0de13e8ea8 100644 --- a/src/files.cpp +++ b/src/files.cpp @@ -33,9 +33,7 @@ ** */ -#ifdef _WIN32 -#define USE_WINDOWS_DWORD -#endif +// This also pulls in windows.h #include "LzmaDec.h" #include "files.h" diff --git a/src/g_game.cpp b/src/g_game.cpp index 1a5eb2026f..ad10555ee8 100644 --- a/src/g_game.cpp +++ b/src/g_game.cpp @@ -45,7 +45,6 @@ #include "m_random.h" #include "m_crc32.h" #include "i_system.h" -#include "i_input.h" #include "p_saveg.h" #include "p_tick.h" #include "d_main.h" diff --git a/src/g_input.h b/src/g_input.h new file mode 100644 index 0000000000..1a998014bd --- /dev/null +++ b/src/g_input.h @@ -0,0 +1,9 @@ +#pragma once + +// These were in i_input.h, which differed between platforms and on Windows caused problems with its +// inclusion of system specific data, so it has been separated into this platform independent file. +void I_PutInClipboard (const char *str); +FString I_GetFromClipboard (bool use_primary_selection); +void I_SetMouseCapture(); +void I_ReleaseMouseCapture(); + diff --git a/src/gl/system/gl_swframebuffer.cpp b/src/gl/system/gl_swframebuffer.cpp index 3197ed4a58..1b7c6d43fc 100644 --- a/src/gl/system/gl_swframebuffer.cpp +++ b/src/gl/system/gl_swframebuffer.cpp @@ -52,7 +52,6 @@ #include "templates.h" #include "i_system.h" #include "i_video.h" -#include "i_input.h" #include "v_pfx.h" #include "stats.h" #include "doomerrors.h" diff --git a/src/gl/system/gl_swwipe.cpp b/src/gl/system/gl_swwipe.cpp index 86fa115252..930278ac91 100644 --- a/src/gl/system/gl_swwipe.cpp +++ b/src/gl/system/gl_swwipe.cpp @@ -48,7 +48,6 @@ #include "templates.h" #include "i_system.h" #include "i_video.h" -#include "i_input.h" #include "v_pfx.h" #include "stats.h" #include "doomerrors.h" diff --git a/src/gl/utility/gl_clock.cpp b/src/gl/utility/gl_clock.cpp index 7f41431b4f..984e1a3f31 100644 --- a/src/gl/utility/gl_clock.cpp +++ b/src/gl/utility/gl_clock.cpp @@ -39,7 +39,6 @@ #include #include -#define USE_WINDOWS_DWORD #elif defined __APPLE__ #include #endif diff --git a/src/i_module.cpp b/src/i_module.cpp index a82963ec5f..f28942109f 100644 --- a/src/i_module.cpp +++ b/src/i_module.cpp @@ -36,7 +36,6 @@ #ifdef _WIN32 #define WIN32_LEAN_AND_MEAN #include -#define USE_WINDOWS_DWORD #else #include #endif diff --git a/src/i_net.cpp b/src/i_net.cpp index cc357e2c94..7bf1f29aae 100644 --- a/src/i_net.cpp +++ b/src/i_net.cpp @@ -37,7 +37,6 @@ # define WIN32_LEAN_AND_MEAN # include # include -#define USE_WINDOWS_DWORD #else # include # include diff --git a/src/menu/menu.cpp b/src/menu/menu.cpp index 435a867a2b..ca96593762 100644 --- a/src/menu/menu.cpp +++ b/src/menu/menu.cpp @@ -49,7 +49,7 @@ #include "hu_stuff.h" #include "gi.h" #include "v_palette.h" -#include "i_input.h" +#include "g_input.h" #include "gameconfigfile.h" #include "gstrings.h" #include "r_utility.h" diff --git a/src/oplsynth/dosbox/opl.cpp b/src/oplsynth/dosbox/opl.cpp index 3795fc0c8a..25b4462109 100644 --- a/src/oplsynth/dosbox/opl.cpp +++ b/src/oplsynth/dosbox/opl.cpp @@ -34,7 +34,7 @@ static FRandom pr_opl; typedef uintptr_t Bitu; typedef intptr_t Bits; -typedef DWORD Bit32u; +typedef uint32_t Bit32u; typedef int32_t Bit32s; typedef uint16_t Bit16u; typedef int16_t Bit16s; diff --git a/src/oplsynth/music_opldumper_mididevice.cpp b/src/oplsynth/music_opldumper_mididevice.cpp index 9e9110285b..cf7000d4c6 100644 --- a/src/oplsynth/music_opldumper_mididevice.cpp +++ b/src/oplsynth/music_opldumper_mididevice.cpp @@ -200,11 +200,11 @@ public: if (File != NULL) { long where_am_i = ftell(File); - DWORD len[2]; + uint32_t len[2]; fseek(File, 12, SEEK_SET); len[0] = LittleLong(CurIntTime); - len[1] = LittleLong(DWORD(where_am_i - 24)); + len[1] = LittleLong(uint32_t(where_am_i - 24)); fwrite(len, 4, 2, File); fclose(File); } diff --git a/src/oplsynth/nukedopl3.h b/src/oplsynth/nukedopl3.h index 2c42233fa2..17ebbe4d2c 100644 --- a/src/oplsynth/nukedopl3.h +++ b/src/oplsynth/nukedopl3.h @@ -34,7 +34,7 @@ typedef uintptr_t Bitu; typedef intptr_t Bits; -typedef DWORD Bit32u; +typedef uint32_t Bit32u; typedef int32_t Bit32s; typedef uint16_t Bit16u; typedef int16_t Bit16s; diff --git a/src/posix/i_input.h b/src/posix/i_input.h index 07ee1115d2..e69de29bb2 100644 --- a/src/posix/i_input.h +++ b/src/posix/i_input.h @@ -1,10 +0,0 @@ -#ifndef __I_INPUT_H__ -#define __I_INPUT_H__ - -void I_PutInClipboard (const char *str); -FString I_GetFromClipboard (bool use_primary_selection); -void I_SetMouseCapture(); -void I_ReleaseMouseCapture(); - -#endif - diff --git a/src/resourcefiles/file_7z.cpp b/src/resourcefiles/file_7z.cpp index 9cc52f6c9d..d6bfa68f65 100644 --- a/src/resourcefiles/file_7z.cpp +++ b/src/resourcefiles/file_7z.cpp @@ -32,10 +32,8 @@ ** ** */ -#ifdef _WIN32 -#define USE_WINDOWS_DWORD -#endif +// Note that 7z made the unwise decision to include windows.h :( #include "7z.h" #include "7zCrc.h" diff --git a/src/sound/fmodsound.cpp b/src/sound/fmodsound.cpp index 75bfb9623d..a5972dceb6 100644 --- a/src/sound/fmodsound.cpp +++ b/src/sound/fmodsound.cpp @@ -39,7 +39,6 @@ #include #include extern HWND Window; -#define USE_WINDOWS_DWORD #else #define FALSE 0 #define TRUE 1 diff --git a/src/sound/fmodsound.h b/src/sound/fmodsound.h index de35258f64..d80423ebda 100644 --- a/src/sound/fmodsound.h +++ b/src/sound/fmodsound.h @@ -71,7 +71,7 @@ public: virtual MIDIDevice* CreateMIDIDevice() const override; private: - DWORD ActiveFMODVersion; + uint32_t ActiveFMODVersion; int SFXPaused; bool InitSuccess; bool DSPLocked; diff --git a/src/sound/i_midi_win32.h b/src/sound/i_midi_win32.h index 62823c7222..1c7193081e 100644 --- a/src/sound/i_midi_win32.h +++ b/src/sound/i_midi_win32.h @@ -1,15 +1,11 @@ #ifdef _WIN32 #define WIN32_LEAN_AND_MEAN -#define USE_WINDOWS_DWORD #if defined(_WIN32_WINNT) && _WIN32_WINNT < 0x0400 #undef _WIN32_WINNT #endif #ifndef _WIN32_WINNT #define _WIN32_WINNT 0x0400 #endif -#ifndef USE_WINDOWS_DWORD -#define USE_WINDOWS_DWORD -#endif #include #include #else diff --git a/src/sound/i_music.cpp b/src/sound/i_music.cpp index 9ad273eb9e..4a9d459103 100644 --- a/src/sound/i_music.cpp +++ b/src/sound/i_music.cpp @@ -36,7 +36,6 @@ #define WIN32_LEAN_AND_MEAN #include #include -#define USE_WINDOWS_DWORD #else #include #include diff --git a/src/sound/i_sound.cpp b/src/sound/i_sound.cpp index 64eefcbb8f..85a8c63b3a 100644 --- a/src/sound/i_sound.cpp +++ b/src/sound/i_sound.cpp @@ -39,7 +39,6 @@ #include "resource.h" extern HWND Window; extern HINSTANCE g_hInst; -#define USE_WINDOWS_DWORD #endif #include diff --git a/src/sound/mpg123_decoder.cpp b/src/sound/mpg123_decoder.cpp index 0a2ba94f1b..605970bc9b 100644 --- a/src/sound/mpg123_decoder.cpp +++ b/src/sound/mpg123_decoder.cpp @@ -1,7 +1,6 @@ #ifdef _WIN32 #define WIN32_LEAN_AND_MEAN #include -#define USE_WINDOWS_DWORD #endif #include "mpg123_decoder.h" diff --git a/src/sound/music_audiotoolbox_mididevice.cpp b/src/sound/music_audiotoolbox_mididevice.cpp index 979aeaff54..78da422574 100644 --- a/src/sound/music_audiotoolbox_mididevice.cpp +++ b/src/sound/music_audiotoolbox_mididevice.cpp @@ -210,20 +210,20 @@ void AudioToolboxMIDIDevice::Stop() int AudioToolboxMIDIDevice::PrepareHeader(MidiHeader* data) { MidiHeader* events = data; - DWORD position = 0; + uint32_t position = 0; while (nullptr != events) { - DWORD* const event = reinterpret_cast(events->lpData + position); - const DWORD message = event[2]; + uint32_t* const event = reinterpret_cast(events->lpData + position); + const uint32_t message = event[2]; if (0 == MEVENT_EVENTTYPE(message)) { - static const DWORD VOLUME_CHANGE_EVENT = 7; + static const uint32_t VOLUME_CHANGE_EVENT = 7; - const DWORD status = message & 0xFF; - const DWORD param1 = (message >> 8) & 0x7F; - const DWORD param2 = (message >> 16) & 0x7F; + const uint32_t status = message & 0xFF; + const uint32_t param1 = (message >> 8) & 0x7F; + const uint32_t param2 = (message >> 16) & 0x7F; if (nullptr != m_audioUnit && MIDI_CTRLCHANGE == status && VOLUME_CHANGE_EVENT == param1) { diff --git a/src/sound/music_dumb.cpp b/src/sound/music_dumb.cpp index 998dcdc56d..dfe05f7b08 100644 --- a/src/sound/music_dumb.cpp +++ b/src/sound/music_dumb.cpp @@ -78,7 +78,7 @@ protected: typedef struct tagITFILEHEADER { - DWORD id; // 0x4D504D49 + uint32_t id; // 0x4D504D49 char songname[26]; uint16_t reserved1; // 0x1004 uint16_t ordnum; @@ -96,8 +96,8 @@ typedef struct tagITFILEHEADER uint8_t sep; uint8_t zero; uint16_t msglength; - DWORD msgoffset; - DWORD reserved2; + uint32_t msgoffset; + uint32_t reserved2; uint8_t chnpan[64]; uint8_t chnvol[64]; } FORCE_PACKED ITFILEHEADER, *PITFILEHEADER; @@ -274,16 +274,16 @@ static bool ReadIT(const uint8_t * ptr, unsigned size, input_mod *info, bool met unsigned msgoffset = LittleLong(pifh->msgoffset); unsigned msgend = msgoffset + LittleShort(pifh->msglength); - DWORD * offset; + uint32_t * offset; // FString name; if (meta) { - offset = (DWORD *)(ptr + 0xC0 + LittleShort(pifh->ordnum) + LittleShort(pifh->insnum) * 4); + offset = (uint32_t *)(ptr + 0xC0 + LittleShort(pifh->ordnum) + LittleShort(pifh->insnum) * 4); for (n = 0, l = LittleShort(pifh->smpnum); n < l; n++, offset++) { - DWORD offset_n = LittleLong( *offset ); + uint32_t offset_n = LittleLong( *offset ); if ( offset_n >= msgoffset && offset_n < msgend ) msgend = offset_n; if ((!offset_n) || (offset_n + 0x14 + 26 + 2 >= size)) continue; // XXX @@ -304,11 +304,11 @@ static bool ReadIT(const uint8_t * ptr, unsigned size, input_mod *info, bool met #endif } - offset = (DWORD *)(ptr + 0xC0 + LittleShort(pifh->ordnum)); + offset = (uint32_t *)(ptr + 0xC0 + LittleShort(pifh->ordnum)); for (n = 0, l = LittleShort(pifh->insnum); n < l; n++, offset++) { - DWORD offset_n = LittleLong( *offset ); + uint32_t offset_n = LittleLong( *offset ); if ( offset_n >= msgoffset && offset_n < msgend ) msgend = offset_n; if ((!offset_n) || (offset_n + 0x20 + 26 >= size)) continue; #if 0 @@ -340,9 +340,9 @@ static bool ReadIT(const uint8_t * ptr, unsigned size, input_mod *info, bool met } } - if ((pos + 8 < size) && (*(DWORD *)(ptr + pos) == MAKE_ID('P','N','A','M'))) + if ((pos + 8 < size) && (*(uint32_t *)(ptr + pos) == MAKE_ID('P','N','A','M'))) { - unsigned len = LittleLong(*(DWORD *)(ptr + pos + 4)); + unsigned len = LittleLong(*(uint32_t *)(ptr + pos + 4)); pos += 8; if ((pos + len <= size) && (len <= 240 * 32) && (len >= 32)) { @@ -366,9 +366,9 @@ static bool ReadIT(const uint8_t * ptr, unsigned size, input_mod *info, bool met } } - if ((pos + 8 < size) && (*(DWORD *)(ptr + pos) == MAKE_ID('C','N','A','M'))) + if ((pos + 8 < size) && (*(uint32_t *)(ptr + pos) == MAKE_ID('C','N','A','M'))) { - unsigned len = LittleLong(*(DWORD *)(ptr + pos + 4)); + unsigned len = LittleLong(*(uint32_t *)(ptr + pos + 4)); pos += 8; if ((pos + len <= size) && (len <= 64 * 20) && (len >= 20)) { @@ -393,14 +393,14 @@ static bool ReadIT(const uint8_t * ptr, unsigned size, input_mod *info, bool met } } - offset = (DWORD *)(ptr + 0xC0 + LittleShort(pifh->ordnum) + LittleShort(pifh->insnum) * 4 + LittleShort(pifh->smpnum) * 4); + offset = (uint32_t *)(ptr + 0xC0 + LittleShort(pifh->ordnum) + LittleShort(pifh->insnum) * 4 + LittleShort(pifh->smpnum) * 4); uint8_t chnmask[64]; for (n = 0, l = LittleShort(pifh->patnum); n < l; n++) { memset(chnmask, 0, sizeof(chnmask)); - DWORD offset_n = LittleLong( offset[n] ); + uint32_t offset_n = LittleLong( offset[n] ); if ((!offset_n) || (offset_n + 4 >= size)) continue; unsigned len = LittleShort(*(uint16_t *)(ptr + offset_n)); unsigned rows = LittleShort(*(uint16_t *)(ptr + offset_n + 2)); @@ -759,7 +759,7 @@ MusInfo *MOD_OpenSong(FileReader &reader) union { uint8_t start[64]; - DWORD dstart[64/4]; + uint32_t dstart[64/4]; }; dumbfile_mem_status filestate; DUMBFILE *f = NULL; @@ -845,7 +845,7 @@ MusInfo *MOD_OpenSong(FileReader &reader) /*start_order = 0;*/ } } - else if (size >= 4 && dstart[0] == (DWORD)MAKE_ID('P','S','M',254)) + else if (size >= 4 && dstart[0] == (uint32_t)MAKE_ID('P','S','M',254)) { if ((f = dumb_read_allfile(&filestate, start, reader, headsize, size))) { diff --git a/src/sound/music_midi_base.cpp b/src/sound/music_midi_base.cpp index 9391ed9129..4e3708eb48 100644 --- a/src/sound/music_midi_base.cpp +++ b/src/sound/music_midi_base.cpp @@ -10,7 +10,7 @@ #include "v_text.h" #include "menu/menu.h" -static DWORD nummididevices; +static uint32_t nummididevices; static bool nummididevicesset; #ifdef HAVE_FLUIDSYNTH @@ -117,7 +117,7 @@ void I_BuildMIDIMenuList (FOptionValues *opt) { AddDefaultMidiDevices(opt); - for (DWORD id = 0; id < nummididevices; ++id) + for (uint32_t id = 0; id < nummididevices; ++id) { MIDIOUTCAPS caps; MMRESULT res; @@ -133,7 +133,7 @@ void I_BuildMIDIMenuList (FOptionValues *opt) } } -static void PrintMidiDevice (int id, const char *name, uint16_t tech, DWORD support) +static void PrintMidiDevice (int id, const char *name, uint16_t tech, uint32_t support) { if (id == snd_mididevice) { diff --git a/src/sound/music_midistream.cpp b/src/sound/music_midistream.cpp index 7a19277f68..2b72e29bf3 100644 --- a/src/sound/music_midistream.cpp +++ b/src/sound/music_midistream.cpp @@ -56,7 +56,7 @@ // PRIVATE FUNCTION PROTOTYPES --------------------------------------------- -static void WriteVarLen (TArray &file, DWORD value); +static void WriteVarLen (TArray &file, uint32_t value); // EXTERNAL DATA DECLARATIONS ---------------------------------------------- @@ -496,7 +496,7 @@ void MIDIStreamer::MusicVolumeChanged() if (MIDI != NULL && MIDI->FakeVolume()) { float realvolume = clamp(snd_musicvolume * relative_volume, 0.f, 1.f); - Volume = clamp((DWORD)(realvolume * 65535.f), 0, 65535); + Volume = clamp((uint32_t)(realvolume * 65535.f), 0, 65535); } else { @@ -773,7 +773,7 @@ int MIDIStreamer::FillBuffer(int buffer_num, int max_events, uint32_t max_time) { // Be more responsive when unpausing by only playing each buffer // for a third of the maximum time. - events[0] = MAX(1, (max_time / 3) * Division / Tempo); + events[0] = MAX(1, (max_time / 3) * Division / Tempo); events[1] = 0; events[2] = MEVENT_NOP << 24; events += 3; @@ -828,7 +828,7 @@ int MIDIStreamer::FillStopBuffer(int buffer_num) memset(&Buffer[buffer_num], 0, sizeof(MidiHeader)); Buffer[buffer_num].lpData = (uint8_t*)Events[buffer_num]; - Buffer[buffer_num].dwBufferLength = DWORD((uint8_t*)events - Buffer[buffer_num].lpData); + Buffer[buffer_num].dwBufferLength = uint32_t((uint8_t*)events - Buffer[buffer_num].lpData); Buffer[buffer_num].dwBytesRecorded = Buffer[buffer_num].dwBufferLength; if (0 != (i = MIDI->PrepareHeader(&Buffer[buffer_num]))) { @@ -974,7 +974,7 @@ void MIDIStreamer::Precache() void MIDIStreamer::CreateSMF(TArray &file, int looplimit) { - DWORD delay = 0; + uint32_t delay = 0; uint8_t running_status = 255; // Always create songs aimed at GM devices. @@ -1066,7 +1066,7 @@ void MIDIStreamer::CreateSMF(TArray &file, int looplimit) file.Push(0); // Fill in track length - DWORD len = file.Size() - 22; + uint32_t len = file.Size() - 22; file[18] = uint8_t(len >> 24); file[19] = uint8_t(len >> 16); file[20] = uint8_t(len >> 8); @@ -1081,9 +1081,9 @@ void MIDIStreamer::CreateSMF(TArray &file, int looplimit) // //========================================================================== -static void WriteVarLen (TArray &file, DWORD value) +static void WriteVarLen (TArray &file, uint32_t value) { - DWORD buffer = value & 0x7F; + uint32_t buffer = value & 0x7F; while ( (value >>= 7) ) { diff --git a/src/sound/music_softsynth_mididevice.cpp b/src/sound/music_softsynth_mididevice.cpp index 421880e469..ae46e31d3f 100644 --- a/src/sound/music_softsynth_mididevice.cpp +++ b/src/sound/music_softsynth_mididevice.cpp @@ -261,7 +261,7 @@ int SoftSynthMIDIDevice::StreamOut(MidiHeader *header) if (Events == NULL) { Events = header; - NextTickIn = SamplesPerTick * *(DWORD *)header->lpData; + NextTickIn = SamplesPerTick * *(uint32_t *)header->lpData; Position = 0; } else @@ -302,11 +302,11 @@ bool SoftSynthMIDIDevice::Pause(bool paused) int SoftSynthMIDIDevice::PlayTick() { - DWORD delay = 0; + uint32_t delay = 0; while (delay == 0 && Events != NULL) { - DWORD *event = (DWORD *)(Events->lpData + Position); + uint32_t *event = (uint32_t *)(Events->lpData + Position); if (MEVENT_EVENTTYPE(event[2]) == MEVENT_TEMPO) { SetTempo(MEVENT_EVENTPARM(event[2])); @@ -373,7 +373,7 @@ int SoftSynthMIDIDevice::PlayTick() return int(Division); } - delay = *(DWORD *)(Events->lpData + Position); + delay = *(uint32_t *)(Events->lpData + Position); } return delay; } diff --git a/src/sound/oalsound.cpp b/src/sound/oalsound.cpp index 99ccee82ff..ff82f288b4 100644 --- a/src/sound/oalsound.cpp +++ b/src/sound/oalsound.cpp @@ -35,7 +35,6 @@ #ifdef _WIN32 #define WIN32_LEAN_AND_MEAN #include -#define USE_WINDOWS_DWORD #else #include #endif diff --git a/src/sound/sndfile_decoder.cpp b/src/sound/sndfile_decoder.cpp index 02f24b9da2..5a957eb271 100644 --- a/src/sound/sndfile_decoder.cpp +++ b/src/sound/sndfile_decoder.cpp @@ -1,7 +1,6 @@ #ifdef _WIN32 #define WIN32_LEAN_AND_MEAN #include -#define USE_WINDOWS_DWORD #endif #include "sndfile_decoder.h" diff --git a/src/timidity/gf1patch.h b/src/timidity/gf1patch.h index c8a6ebe90f..9b1800799a 100644 --- a/src/timidity/gf1patch.h +++ b/src/timidity/gf1patch.h @@ -31,7 +31,7 @@ struct GF1PatchHeader uint8_t Channels; uint16_t WaveForms; uint16_t MasterVolume; - DWORD DataSize; + uint32_t DataSize; uint8_t Reserved[PATCH_HEADER_RESERVED_SIZE]; } GCC_PACKED; diff --git a/src/timidity/instrum_dls.cpp b/src/timidity/instrum_dls.cpp index bdff876e96..4f553ff5fd 100644 --- a/src/timidity/instrum_dls.cpp +++ b/src/timidity/instrum_dls.cpp @@ -255,6 +255,8 @@ typedef int16_t SHORT; typedef uint16_t USHORT; typedef int32_t LONG; typedef uint32_t ULONG; +typedef uint32_t DWORD; + #define mmioFOURCC MAKE_ID #define DEFINE_GUID(A, B, C, E, F, G, H, I, J, K, L, M) diff --git a/src/win32/critsec.cpp b/src/win32/critsec.cpp index a270fcef54..4fcd085a9a 100644 --- a/src/win32/critsec.cpp +++ b/src/win32/critsec.cpp @@ -3,7 +3,6 @@ #ifndef _WINNT_ #define WIN32_LEAN_AND_MEAN #include -#define USE_WINDOWS_DWORD #endif class FInternalCriticalSection diff --git a/src/win32/eaxedit.cpp b/src/win32/eaxedit.cpp index c28603aa61..09344a46b4 100644 --- a/src/win32/eaxedit.cpp +++ b/src/win32/eaxedit.cpp @@ -9,7 +9,6 @@ #include #include -#define USE_WINDOWS_DWORD #include "resource.h" #include "s_sound.h" #include "templates.h" diff --git a/src/win32/fb_d3d9.cpp b/src/win32/fb_d3d9.cpp index 1056d52fff..3c32555155 100644 --- a/src/win32/fb_d3d9.cpp +++ b/src/win32/fb_d3d9.cpp @@ -51,7 +51,6 @@ #include -#define USE_WINDOWS_DWORD #include "doomtype.h" #include "c_dispatch.h" diff --git a/src/win32/fb_d3d9_wipe.cpp b/src/win32/fb_d3d9_wipe.cpp index 7e5880d471..62533899ac 100644 --- a/src/win32/fb_d3d9_wipe.cpp +++ b/src/win32/fb_d3d9_wipe.cpp @@ -44,7 +44,6 @@ #include #include -#define USE_WINDOWS_DWORD #include "doomtype.h" #include "f_wipe.h" #include "win32iface.h" diff --git a/src/win32/fb_ddraw.cpp b/src/win32/fb_ddraw.cpp index a921487350..b7f314608f 100644 --- a/src/win32/fb_ddraw.cpp +++ b/src/win32/fb_ddraw.cpp @@ -41,7 +41,6 @@ #include #include -#define USE_WINDOWS_DWORD #include "doomtype.h" #include "c_dispatch.h" diff --git a/src/win32/hardware.cpp b/src/win32/hardware.cpp index 437ec81aa5..b083f4fe96 100644 --- a/src/win32/hardware.cpp +++ b/src/win32/hardware.cpp @@ -35,7 +35,6 @@ #define WIN32_LEAN_AND_MEAN #include -#define USE_WINDOWS_DWORD #include "hardware.h" #include "win32iface.h" #include "i_video.h" diff --git a/src/win32/i_cd.cpp b/src/win32/i_cd.cpp index 8c328a1499..12a673eb90 100644 --- a/src/win32/i_cd.cpp +++ b/src/win32/i_cd.cpp @@ -39,7 +39,6 @@ #include #include -#define USE_WINDOWS_DWORD #include "doomtype.h" #include "c_cvars.h" #include "c_dispatch.h" diff --git a/src/win32/i_crash.cpp b/src/win32/i_crash.cpp index 1352e6f68b..2e904cc0f5 100644 --- a/src/win32/i_crash.cpp +++ b/src/win32/i_crash.cpp @@ -63,7 +63,6 @@ #include #include -#define USE_WINDOWS_DWORD #include "doomtype.h" #include "resource.h" #include "version.h" diff --git a/src/win32/i_dijoy.cpp b/src/win32/i_dijoy.cpp index fa4f16e3e2..b48efa983f 100644 --- a/src/win32/i_dijoy.cpp +++ b/src/win32/i_dijoy.cpp @@ -11,7 +11,6 @@ #include #include -#define USE_WINDOWS_DWORD #include "i_input.h" #include "i_system.h" #include "d_event.h" diff --git a/src/win32/i_input.cpp b/src/win32/i_input.cpp index c2d4fddbb4..9b05775feb 100644 --- a/src/win32/i_input.cpp +++ b/src/win32/i_input.cpp @@ -77,7 +77,6 @@ #endif -#define USE_WINDOWS_DWORD #include "c_dispatch.h" #include "doomtype.h" #include "doomdef.h" diff --git a/src/win32/i_input.h b/src/win32/i_input.h index 705b4d9861..500e27bb79 100644 --- a/src/win32/i_input.h +++ b/src/win32/i_input.h @@ -37,13 +37,8 @@ #include "doomtype.h" #include "doomdef.h" -void I_SetMouseCapture(); -void I_ReleaseMouseCapture(); - bool I_InitInput (void *hwnd); void I_ShutdownInput (); -void I_PutInClipboard (const char *str); -FString I_GetFromClipboard (bool windows_has_no_selection_clipboard); void I_GetEvent(); @@ -56,7 +51,7 @@ enum }; -#ifdef USE_WINDOWS_DWORD +#ifdef _WIN32 #include "m_joy.h" // Don't make these definitions available to the main body of the source code. diff --git a/src/win32/i_keyboard.cpp b/src/win32/i_keyboard.cpp index a5d223589e..9443b0a869 100644 --- a/src/win32/i_keyboard.cpp +++ b/src/win32/i_keyboard.cpp @@ -6,7 +6,6 @@ #include #include -#define USE_WINDOWS_DWORD #include "i_input.h" #include "i_system.h" #include "d_event.h" diff --git a/src/win32/i_main.cpp b/src/win32/i_main.cpp index 406c5d8dbf..138266946c 100644 --- a/src/win32/i_main.cpp +++ b/src/win32/i_main.cpp @@ -61,7 +61,6 @@ #include #include -#define USE_WINDOWS_DWORD #include "doomerrors.h" #include "hardware.h" diff --git a/src/win32/i_mouse.cpp b/src/win32/i_mouse.cpp index 0af52cb1ad..ff3b638ebd 100644 --- a/src/win32/i_mouse.cpp +++ b/src/win32/i_mouse.cpp @@ -7,7 +7,6 @@ #include #include -#define USE_WINDOWS_DWORD #include "i_input.h" #include "i_system.h" #include "d_event.h" diff --git a/src/win32/i_rawps2.cpp b/src/win32/i_rawps2.cpp index 498fffbc2e..fc43ff6026 100644 --- a/src/win32/i_rawps2.cpp +++ b/src/win32/i_rawps2.cpp @@ -6,7 +6,6 @@ #include #include -#define USE_WINDOWS_DWORD #include "i_input.h" #include "i_system.h" #include "d_event.h" diff --git a/src/win32/i_specialpaths.cpp b/src/win32/i_specialpaths.cpp index cddeacde6e..58c87a8ca8 100644 --- a/src/win32/i_specialpaths.cpp +++ b/src/win32/i_specialpaths.cpp @@ -37,7 +37,6 @@ #include #include #include -#define USE_WINDOWS_DWORD #include "cmdlib.h" #include "m_misc.h" diff --git a/src/win32/i_system.cpp b/src/win32/i_system.cpp index 3d37d1ef82..003e956628 100644 --- a/src/win32/i_system.cpp +++ b/src/win32/i_system.cpp @@ -63,7 +63,6 @@ #include #include -#define USE_WINDOWS_DWORD #include "hardware.h" #include "doomerrors.h" #include diff --git a/src/win32/i_xinput.cpp b/src/win32/i_xinput.cpp index 58dcfe0c89..6756cd6386 100644 --- a/src/win32/i_xinput.cpp +++ b/src/win32/i_xinput.cpp @@ -9,7 +9,6 @@ #include #include -#define USE_WINDOWS_DWORD #include "i_input.h" #include "i_system.h" #include "d_event.h" diff --git a/src/win32/optwin32.h b/src/win32/optwin32.h index 0f1458c57e..c6cced98b7 100644 --- a/src/win32/optwin32.h +++ b/src/win32/optwin32.h @@ -6,7 +6,6 @@ #define WIN32_LEAN_AND_MEAN #include #include -#define USE_WINDOWS_DWORD #include "i_module.h" diff --git a/src/win32/st_start.cpp b/src/win32/st_start.cpp index 391277caf6..c1556f0023 100644 --- a/src/win32/st_start.cpp +++ b/src/win32/st_start.cpp @@ -41,7 +41,6 @@ #include #include "resource.h" -#define USE_WINDOWS_DWORD #include "st_start.h" #include "resource.h" #include "templates.h" @@ -659,7 +658,7 @@ FHexenStartupScreen::FHexenStartupScreen(int max_progress, HRESULT &hr) union { RGBQUAD color; - DWORD quad; + uint32_t quad; } c; Wads.ReadLump (startup_lump, startup_screen); @@ -1332,8 +1331,8 @@ void ST_Util_DrawBlock (BITMAPINFO *bitmap_info, const uint8_t *src, int x, int { // progress notches for (; height > 0; --height) { - ((DWORD *)dest)[0] = ((const DWORD *)src)[0]; - ((DWORD *)dest)[1] = ((const DWORD *)src)[1]; + ((uint32_t *)dest)[0] = ((const uint32_t *)src)[0]; + ((uint32_t *)dest)[1] = ((const uint32_t *)src)[1]; dest += destpitch; src += 8; } @@ -1395,7 +1394,7 @@ void ST_Util_ClearBlock (BITMAPINFO *bitmap_info, uint8_t fill, int x, int y, in BITMAPINFO *ST_Util_CreateBitmap (int width, int height, int color_bits) { - DWORD size_image = (width * height) >> int(color_bits == 4); + uint32_t size_image = (width * height) >> int(color_bits == 4); BITMAPINFO *bitmap_info = (BITMAPINFO *)M_Malloc (sizeof(BITMAPINFOHEADER) + (sizeof(RGBQUAD) << color_bits) + size_image); diff --git a/src/win32/win32gliface.cpp b/src/win32/win32gliface.cpp index 14993c6150..7d3ff00be6 100644 --- a/src/win32/win32gliface.cpp +++ b/src/win32/win32gliface.cpp @@ -5,7 +5,6 @@ #include #include "wglext.h" -#define USE_WINDOWS_DWORD #include "win32iface.h" #include "win32gliface.h" //#include "gl/gl_intern.h" diff --git a/src/win32/win32video.cpp b/src/win32/win32video.cpp index a1a2efdbe3..f734ac7891 100644 --- a/src/win32/win32video.cpp +++ b/src/win32/win32video.cpp @@ -55,7 +55,6 @@ #include #include -#define USE_WINDOWS_DWORD #include "doomtype.h" #include "c_dispatch.h"