From 0380ba642b8e9bd66214154cfbc3f30ee6d8dbf3 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Sun, 26 Apr 2015 20:43:01 -0500 Subject: [PATCH 1/2] Blur de hur --- src/sound/i_sound.cpp | 6 +++--- zdoom.vcproj | 32 ++++++++++++++++---------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/sound/i_sound.cpp b/src/sound/i_sound.cpp index 0a14adc29c..78c4526e86 100644 --- a/src/sound/i_sound.cpp +++ b/src/sound/i_sound.cpp @@ -639,11 +639,11 @@ SoundDecoder *SoundRenderer::CreateDecoder(FileReader *reader) TArray SoundDecoder::readAll() { TArray output; - size_t total = 0; - size_t got; + unsigned total = 0; + unsigned got; output.Resize(total+32768); - while((got=read(&output[total], output.Size()-total)) > 0) + while((got=(unsigned)read(&output[total], output.Size()-total)) > 0) { total += got; output.Resize(total*2); diff --git a/zdoom.vcproj b/zdoom.vcproj index c7e3217752..d802fc61c3 100644 --- a/zdoom.vcproj +++ b/zdoom.vcproj @@ -57,7 +57,7 @@ OmitFramePointers="true" WholeProgramOptimization="false" AdditionalIncludeDirectories="src\win32;src\sound;src;zlib;src\g_shared;src\g_doom;src\g_raven;src\g_heretic;src\g_hexen;src\g_strife;"jpeg-6b";"game-music-emu";gdtoa;bzip2;lzma\C" - PreprocessorDefinitions="NDEBUG,WIN32,_WIN32,_WINDOWS,HAVE_STRUPR,HAVE_FILELENGTH;NO_VA_COPY,BACKPATCH,HAVE_FLUIDSYNTH,DYN_FLUIDSYNTH" + PreprocessorDefinitions="NDEBUG,WIN32,_WIN32,_WINDOWS,HAVE_STRUPR,HAVE_FILELENGTH;NO_VA_COPY,BACKPATCH,HAVE_FLUIDSYNTH,DYN_FLUIDSYNTH,NO_OPENAL" StringPooling="true" ExceptionHandling="1" RuntimeLibrary="0" @@ -180,7 +180,7 @@ FavorSizeOrSpeed="1" OmitFramePointers="true" AdditionalIncludeDirectories="src\win32;src\sound;src;zlib;src\g_shared;src\g_doom;src\g_raven;src\g_heretic;src\g_hexen;src\g_strife;"jpeg-6b";game-music-emu;gdtoa;bzip2;lzma\C" - PreprocessorDefinitions="NDEBUG,WIN32,_WIN32,_WINDOWS,HAVE_STRUPR,HAVE_FILELENGTH;NO_VA_COPY" + PreprocessorDefinitions="NDEBUG,WIN32,_WIN32,_WINDOWS,HAVE_STRUPR,HAVE_FILELENGTH;NO_VA_COPY,NO_OPENAL" StringPooling="true" RuntimeLibrary="0" EnableFunctionLevelLinking="false" @@ -290,7 +290,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="src\win32;src\sound;src;zlib;src\g_shared;src\g_doom;src\g_raven;src\g_heretic;src\g_hexen;src\g_strife;"jpeg-6b";"game-music-emu";gdtoa;bzip2;lzma\C" - PreprocessorDefinitions="WIN32,_DEBUG,_WIN32,_WINDOWS,_CRTDBG_MAP_ALLOC,HAVE_STRUPR,HAVE_FILELENGTH;NO_VA_COPY,BACKPATCH,HAVE_FLUIDSYNTH,DYN_FLUIDSYNTH" + PreprocessorDefinitions="WIN32,_DEBUG,_WIN32,_WINDOWS,_CRTDBG_MAP_ALLOC,HAVE_STRUPR,HAVE_FILELENGTH;NO_VA_COPY,BACKPATCH,HAVE_FLUIDSYNTH,DYN_FLUIDSYNTH,NO_OPENAL" MinimalRebuild="true" RuntimeLibrary="1" EnableFunctionLevelLinking="true" @@ -398,7 +398,7 @@ Name="VCCLCompilerTool" Optimization="0" AdditionalIncludeDirectories="src\win32;src\sound;src;zlib;src\g_shared;src\g_doom;src\g_raven;src\g_heretic;src\g_hexen;src\g_strife;"jpeg-6b";game-music-emu;gdtoa;bzip2;lzma\C" - PreprocessorDefinitions="WIN32,_DEBUG,_WIN32,_WINDOWS,_CRTDBG_MAP_ALLOC,HAVE_STRUPR,HAVE_FILELENGTH;NO_VA_COPY" + PreprocessorDefinitions="WIN32,_DEBUG,_WIN32,_WINDOWS,_CRTDBG_MAP_ALLOC,HAVE_STRUPR,HAVE_FILELENGTH;NO_VA_COPY,NO_OPENAL" MinimalRebuild="true" RuntimeLibrary="1" EnableFunctionLevelLinking="true" @@ -2481,6 +2481,10 @@ + + @@ -2493,18 +2497,6 @@ RelativePath=".\src\sound\fmodsound.h" > - - - - - - @@ -2605,6 +2597,14 @@ RelativePath=".\src\sound\music_xmi_midiout.cpp" > + + + + From 68e43fe65d326f3f6a925bb8e9bc16e98dcd7c4a Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Sun, 26 Apr 2015 20:53:16 -0500 Subject: [PATCH 2/2] You never want to blindly switch between widechar and ANSI functions --- src/win32/i_system.cpp | 6 +++--- src/win32/i_system.h | 13 ++++--------- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/src/win32/i_system.cpp b/src/win32/i_system.cpp index d25229b672..1d2bae8e1e 100644 --- a/src/win32/i_system.cpp +++ b/src/win32/i_system.cpp @@ -1601,19 +1601,19 @@ unsigned int I_MakeRNGSeed() FString I_GetLongPathName(FString shortpath) { static TOptWin32Proc - GetLongPathName("kernel32.dll", "GetLongPathNameA", NULL); + GetLongPathNameA("kernel32.dll", "GetLongPathNameA"); // Doesn't exist on NT4 if (GetLongPathName == NULL) return shortpath; - DWORD buffsize = GetLongPathName.Call(shortpath.GetChars(), NULL, 0); + DWORD buffsize = GetLongPathNameA.Call(shortpath.GetChars(), NULL, 0); if (buffsize == 0) { // nothing to change (it doesn't exist, maybe?) return shortpath; } TCHAR *buff = new TCHAR[buffsize]; - DWORD buffsize2 = GetLongPathName.Call(shortpath.GetChars(), buff, buffsize); + DWORD buffsize2 = GetLongPathNameA.Call(shortpath.GetChars(), buff, buffsize); if (buffsize2 >= buffsize) { // Failure! Just return the short path delete[] buff; diff --git a/src/win32/i_system.h b/src/win32/i_system.h index 6872ca232c..566ca19778 100644 --- a/src/win32/i_system.h +++ b/src/win32/i_system.h @@ -56,25 +56,20 @@ extern os_t OSPlatform; template class TOptWin32Proc { - static Proto GetOptionalWin32Proc(const char* module, const char* function, const char* alt) + static Proto GetOptionalWin32Proc(const char* module, const char* function) { HMODULE hmodule = GetModuleHandle(module); if (hmodule == NULL) return NULL; - Proto ret = (Proto)GetProcAddress(hmodule, function); - if(ret != NULL || alt == NULL) - return ret; - - // Lookup alternate function name (ex. ProcW -> ProcA) - return (Proto)GetProcAddress(hmodule, alt); + return (Proto)GetProcAddress(hmodule, function); } public: const Proto Call; - TOptWin32Proc(const char* module, const char* function, const char* alt=NULL) - : Call(GetOptionalWin32Proc(module, function, alt)) {} + TOptWin32Proc(const char* module, const char* function) + : Call(GetOptionalWin32Proc(module, function)) {} // Wrapper object can be tested against NULL, but not directly called. operator const void*() const { return Call; }