diff --git a/.gitignore b/.gitignore index cc91ea2..728cae0 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,8 @@ *.aps *.res *.a +*.recipe +*.FileListAbsolute.txt .vs/* Packaged/* DebugData/* diff --git a/ASADTool/ASADTool.vcxproj b/ASADTool/ASADTool.vcxproj index 3933905..020a7cf 100644 --- a/ASADTool/ASADTool.vcxproj +++ b/ASADTool/ASADTool.vcxproj @@ -14,19 +14,19 @@ 15.0 {DF692F94-3A11-40E1-8846-9815B4DBBDB0} ASADTool - 10.0.17763.0 + 10.0 Application true - v141 + v142 MultiByte Application false - v141 + v142 true MultiByte diff --git a/Aerofoil/Aerofoil.vcxproj b/Aerofoil/Aerofoil.vcxproj index 3307793..7251a26 100644 --- a/Aerofoil/Aerofoil.vcxproj +++ b/Aerofoil/Aerofoil.vcxproj @@ -14,19 +14,19 @@ 15.0 {0E383EF0-CEF7-4733-87C6-5AC9844AA1EF} Aerofoil - 10.0.17763.0 + 10.0 Application true - v141 + v142 MultiByte Application false - v141 + v142 true MultiByte diff --git a/Aerofoil/GpFileSystem_Win32.cpp b/Aerofoil/GpFileSystem_Win32.cpp index 36c22c5..9f566fa 100644 --- a/Aerofoil/GpFileSystem_Win32.cpp +++ b/Aerofoil/GpFileSystem_Win32.cpp @@ -260,7 +260,7 @@ GpIOStream *GpFileSystem_Win32::OpenFileNested(PortabilityLayer::VirtualDirector wchar_t winPath[MAX_PATH + 1]; if (!ResolvePath(virtualDirectory, paths, numPaths, winPath)) - return false; + return nullptr; const DWORD desiredAccess = writeAccess ? (GENERIC_WRITE | GENERIC_READ) : GENERIC_READ; DWORD winCreationDisposition = 0; @@ -283,12 +283,12 @@ GpIOStream *GpFileSystem_Win32::OpenFileNested(PortabilityLayer::VirtualDirector winCreationDisposition = TRUNCATE_EXISTING; break; default: - return false; + return nullptr; } HANDLE h = CreateFileW(winPath, desiredAccess, FILE_SHARE_READ, nullptr, winCreationDisposition, FILE_ATTRIBUTE_NORMAL, nullptr); if (h == INVALID_HANDLE_VALUE) - return false; + return nullptr; return GpFileStream_Win32::Create(m_alloc, h, true, writeAccess, true); } diff --git a/AerofoilSDL/AerofoilSDL.vcxproj b/AerofoilSDL/AerofoilSDL.vcxproj index 071b61d..ac0a600 100644 --- a/AerofoilSDL/AerofoilSDL.vcxproj +++ b/AerofoilSDL/AerofoilSDL.vcxproj @@ -14,19 +14,19 @@ 15.0 {33542FF0-0473-4802-BC79-3B8261790F65} AerofoilSDL - 10.0.17763.0 + 10.0 Application true - v141 + v142 MultiByte Application false - v141 + v142 true MultiByte diff --git a/CompileShadersD3D11/CompileShadersD3D11.vcxproj b/CompileShadersD3D11/CompileShadersD3D11.vcxproj index 576051f..4f21d93 100644 --- a/CompileShadersD3D11/CompileShadersD3D11.vcxproj +++ b/CompileShadersD3D11/CompileShadersD3D11.vcxproj @@ -14,19 +14,19 @@ 15.0 {ED2F91E1-673A-4590-82B2-EB157927D3E3} CompileShadersD3D11 - 10.0.17763.0 + 10.0 Application true - v141 + v142 MultiByte Application false - v141 + v142 true MultiByte diff --git a/ConvertColorCursors/ConvertColorCursors.vcxproj b/ConvertColorCursors/ConvertColorCursors.vcxproj index 930df10..7e9db34 100644 --- a/ConvertColorCursors/ConvertColorCursors.vcxproj +++ b/ConvertColorCursors/ConvertColorCursors.vcxproj @@ -14,19 +14,19 @@ 15.0 {B852D549-4020-4477-8BFB-E199FF78B047} ConvertColorCursors - 10.0.17763.0 + 10.0 Application true - v141 + v142 MultiByte Application false - v141 + v142 true MultiByte diff --git a/EmitWiXVersion/EmitWiXVersion.vcxproj b/EmitWiXVersion/EmitWiXVersion.vcxproj index b4ca1ac..3961cfd 100644 --- a/EmitWiXVersion/EmitWiXVersion.vcxproj +++ b/EmitWiXVersion/EmitWiXVersion.vcxproj @@ -14,19 +14,19 @@ 15.0 {7EFF1E21-C375-45EA-A069-4E2232C8A72B} EmitWiXVersion - 10.0.17763.0 + 10.0 Application true - v141 + v142 MultiByte Application false - v141 + v142 true MultiByte diff --git a/FTagData/FTagData.vcxproj b/FTagData/FTagData.vcxproj index dd37835..31d6b9a 100644 --- a/FTagData/FTagData.vcxproj +++ b/FTagData/FTagData.vcxproj @@ -14,19 +14,19 @@ 15.0 {A8FCDC5E-729C-4A80-BF9F-B669C52B2AE3} FTagData - 10.0.17763.0 + 10.0 Application true - v141 + v142 MultiByte Application false - v141 + v142 true MultiByte diff --git a/FreeType/FreeType.vcxproj b/FreeType/FreeType.vcxproj index 90f1ff3..4cfb1f4 100644 --- a/FreeType/FreeType.vcxproj +++ b/FreeType/FreeType.vcxproj @@ -43,19 +43,19 @@ 15.0 {487216D8-16BA-4B4C-B5BF-43FEEDFEE03A} FreeType - 10.0.17763.0 + 10.0 DynamicLibrary true - v141 + v142 MultiByte DynamicLibrary false - v141 + v142 true MultiByte diff --git a/GenerateFonts/GenerateFonts.vcxproj b/GenerateFonts/GenerateFonts.vcxproj index 57a1326..a7583f9 100644 --- a/GenerateFonts/GenerateFonts.vcxproj +++ b/GenerateFonts/GenerateFonts.vcxproj @@ -14,19 +14,19 @@ 15.0 {3B7FD18D-7A50-4DF5-AC25-543E539BFACE} GenerateFonts - 10.0.17763.0 + 10.0 Application true - v141 + v142 MultiByte Application false - v141 + v142 true MultiByte diff --git a/GpApp/GpApp.vcxproj b/GpApp/GpApp.vcxproj index c80f962..3179bc8 100644 --- a/GpApp/GpApp.vcxproj +++ b/GpApp/GpApp.vcxproj @@ -14,19 +14,19 @@ 15.0 {6233C3F2-5781-488E-B190-4FA8836F5A77} GpApp - 10.0.17763.0 + 10.0 DynamicLibrary true - v141 + v142 MultiByte DynamicLibrary false - v141 + v142 true MultiByte diff --git a/GpApp/HouseIO.cpp b/GpApp/HouseIO.cpp index 775d4f3..8dee7fd 100644 --- a/GpApp/HouseIO.cpp +++ b/GpApp/HouseIO.cpp @@ -3232,7 +3232,7 @@ static ExportHouseResult_t TryExportIcon(GpVector &resData, const THand const PixMap *pixMap = *surface->m_port.GetPixMap(); for (size_t row = 0; row < height; row++) { - const PortabilityLayer::RGBAColor *srcColors = reinterpret_cast(static_cast(pixMap->m_data) + pixMap->m_pitch * row); + const PortabilityLayer::RGBAColor *srcColors = reinterpret_cast(static_cast(pixMap->m_data) + pixMap->m_pitch * row); for (size_t col = 0; col < width; col++) { diff --git a/GpAudioDriver_XAudio2/GpAudioDriver_XAudio2.vcxproj b/GpAudioDriver_XAudio2/GpAudioDriver_XAudio2.vcxproj index 44a373a..1866461 100644 --- a/GpAudioDriver_XAudio2/GpAudioDriver_XAudio2.vcxproj +++ b/GpAudioDriver_XAudio2/GpAudioDriver_XAudio2.vcxproj @@ -14,19 +14,19 @@ 15.0 {E3BDC783-8646-433E-ADF0-8B6390D36669} GpAudioDriverXAudio2 - 10.0.17763.0 + 10.0 DynamicLibrary true - v141 + v142 MultiByte DynamicLibrary false - v141 + v142 true MultiByte diff --git a/GpDisplayDriver_D3D11/GpDisplayDriver_D3D11.vcxproj b/GpDisplayDriver_D3D11/GpDisplayDriver_D3D11.vcxproj index c724827..c8f7f19 100644 --- a/GpDisplayDriver_D3D11/GpDisplayDriver_D3D11.vcxproj +++ b/GpDisplayDriver_D3D11/GpDisplayDriver_D3D11.vcxproj @@ -14,19 +14,19 @@ 15.0 {FFC961AC-55B4-4A38-A83E-06AE98F59ACC} GpDisplayDriverD3D11 - 10.0.17763.0 + 10.0 DynamicLibrary true - v141 + v142 MultiByte DynamicLibrary false - v141 + v142 true MultiByte diff --git a/GpFontHandler_FreeType2/GpFontHandler_FreeType2.vcxproj b/GpFontHandler_FreeType2/GpFontHandler_FreeType2.vcxproj index f5c082f..72ca564 100644 --- a/GpFontHandler_FreeType2/GpFontHandler_FreeType2.vcxproj +++ b/GpFontHandler_FreeType2/GpFontHandler_FreeType2.vcxproj @@ -14,19 +14,19 @@ 15.0 {4B564030-8985-4975-91E1-E1B2C16AE2A1} GpFontHandlerFreeType2 - 10.0.17763.0 + 10.0 DynamicLibrary true - v141 + v142 MultiByte DynamicLibrary false - v141 + v142 true MultiByte diff --git a/GpInputDriver_XInput/GpInputDriver_XInput.vcxproj b/GpInputDriver_XInput/GpInputDriver_XInput.vcxproj index 66acaa9..57794d4 100644 --- a/GpInputDriver_XInput/GpInputDriver_XInput.vcxproj +++ b/GpInputDriver_XInput/GpInputDriver_XInput.vcxproj @@ -14,19 +14,19 @@ 15.0 {17B96F07-EF92-47CD-95A5-8E6EE38AB564} GpInputDriverXInput - 10.0.17763.0 + 10.0 DynamicLibrary true - v141 + v142 MultiByte DynamicLibrary false - v141 + v142 true MultiByte diff --git a/GpShell/GpShell.vcxproj b/GpShell/GpShell.vcxproj index 992c623..bbb4e45 100644 --- a/GpShell/GpShell.vcxproj +++ b/GpShell/GpShell.vcxproj @@ -14,19 +14,19 @@ 15.0 {10CF9B5F-61D0-4B5B-89F4-810B58FC053D} GpShell - 10.0.17763.0 + 10.0 StaticLibrary true - v141 + v142 MultiByte StaticLibrary false - v141 + v142 true MultiByte diff --git a/HouseTool/HouseTool.vcxproj b/HouseTool/HouseTool.vcxproj index d480288..9bc3427 100644 --- a/HouseTool/HouseTool.vcxproj +++ b/HouseTool/HouseTool.vcxproj @@ -14,19 +14,19 @@ 15.0 {B31BFF9D-2D14-4B1A-A625-8348CC3D8D67} HouseTool - 10.0.17763.0 + 10.0 Application true - v141 + v142 MultiByte Application false - v141 + v142 true MultiByte diff --git a/MacRomanConversion/MacRomanConversion.vcxproj b/MacRomanConversion/MacRomanConversion.vcxproj index 9b818f6..195bffa 100644 --- a/MacRomanConversion/MacRomanConversion.vcxproj +++ b/MacRomanConversion/MacRomanConversion.vcxproj @@ -14,19 +14,19 @@ 15.0 {07351A8E-1F79-42C9-BBAB-31F071EAA99E} MacRomanConversion - 10.0.17763.0 + 10.0 StaticLibrary true - v141 + v142 MultiByte StaticLibrary false - v141 + v142 true MultiByte diff --git a/MakeTimestamp/MakeTimestamp.vcxproj b/MakeTimestamp/MakeTimestamp.vcxproj index c4e41c3..3ced700 100644 --- a/MakeTimestamp/MakeTimestamp.vcxproj +++ b/MakeTimestamp/MakeTimestamp.vcxproj @@ -14,19 +14,19 @@ 15.0 {9023DF2F-A33D-485A-B13D-0973348B2F9B} MakeTimestamp - 10.0.17763.0 + 10.0 Application true - v141 + v142 MultiByte Application false - v141 + v142 true MultiByte diff --git a/MergeGPF/MergeGPF.vcxproj b/MergeGPF/MergeGPF.vcxproj index bc0571a..72caa02 100644 --- a/MergeGPF/MergeGPF.vcxproj +++ b/MergeGPF/MergeGPF.vcxproj @@ -14,19 +14,19 @@ 15.0 {36DAF5FA-6ADB-4F20-9810-1610DE0AE653} MergeGPF - 10.0.17763.0 + 10.0 Application true - v141 + v142 MultiByte Application false - v141 + v142 true MultiByte diff --git a/MiniRez/MiniRez.vcxproj b/MiniRez/MiniRez.vcxproj index 1e3eb6f..d1af708 100644 --- a/MiniRez/MiniRez.vcxproj +++ b/MiniRez/MiniRez.vcxproj @@ -14,19 +14,19 @@ 15.0 {2FF15659-5C72-48B8-B55B-3C658E4125B5} MiniRez - 10.0.16299.0 + 10.0 Application true - v141 + v142 MultiByte Application false - v141 + v142 true MultiByte diff --git a/PortabilityLayer/PortabilityLayer.vcxproj b/PortabilityLayer/PortabilityLayer.vcxproj index 8e1479c..e9d28d8 100644 --- a/PortabilityLayer/PortabilityLayer.vcxproj +++ b/PortabilityLayer/PortabilityLayer.vcxproj @@ -14,19 +14,19 @@ 15.0 {6EC62B0F-9353-40A4-A510-3788F1368B33} PortabilityLayer - 10.0.16299.0 + 10.0 StaticLibrary true - v141 + v142 MultiByte StaticLibrary false - v141 + v142 true MultiByte diff --git a/WindowsUnicodeToolShim/WindowsUnicodeToolShim.vcxproj b/WindowsUnicodeToolShim/WindowsUnicodeToolShim.vcxproj index c4bd6b2..cfdb02d 100644 --- a/WindowsUnicodeToolShim/WindowsUnicodeToolShim.vcxproj +++ b/WindowsUnicodeToolShim/WindowsUnicodeToolShim.vcxproj @@ -14,19 +14,19 @@ 15.0 {15009625-1120-405E-8BBA-69A16CD6713D} WindowsUnicodeToolShim - 10.0.17763.0 + 10.0 StaticLibrary true - v141 + v142 MultiByte StaticLibrary false - v141 + v142 true MultiByte diff --git a/bin2gp/bin2gp.vcxproj b/bin2gp/bin2gp.vcxproj index 6cdd940..2f8ddd3 100644 --- a/bin2gp/bin2gp.vcxproj +++ b/bin2gp/bin2gp.vcxproj @@ -14,19 +14,19 @@ 15.0 {D7BFE702-0667-4155-9B0B-2A54DF9AE60B} bin2gp - 10.0.17763.0 + 10.0 Application true - v141 + v142 MultiByte Application false - v141 + v142 true MultiByte diff --git a/bin2h/bin2h.vcxproj b/bin2h/bin2h.vcxproj index 3667f61..04e4c6b 100644 --- a/bin2h/bin2h.vcxproj +++ b/bin2h/bin2h.vcxproj @@ -14,19 +14,19 @@ 15.0 {D045F28D-F245-44DD-B576-CC91BF3BE6E9} bin2h - 10.0.17763.0 + 10.0 Application true - v141 + v142 MultiByte Application false - v141 + v142 true MultiByte diff --git a/flattenmov/flattenmov.vcxproj b/flattenmov/flattenmov.vcxproj index bc58c83..b3ba3bb 100644 --- a/flattenmov/flattenmov.vcxproj +++ b/flattenmov/flattenmov.vcxproj @@ -14,19 +14,19 @@ 15.0 {89F8D13E-F216-4B67-8DE9-7F842D349E94} flattenmov - 10.0.17763.0 + 10.0 Application true - v141 + v142 MultiByte Application false - v141 + v142 true MultiByte diff --git a/gpr2gpa/gpr2gpa.vcxproj b/gpr2gpa/gpr2gpa.vcxproj index 2b8f5c9..57309f2 100644 --- a/gpr2gpa/gpr2gpa.vcxproj +++ b/gpr2gpa/gpr2gpa.vcxproj @@ -14,19 +14,19 @@ 15.0 {27B7CA46-ED23-45C2-BF5F-0C126D81AEBF} gpr2gpa - 10.0.17763.0 + 10.0 Application true - v141 + v142 MultiByte Application false - v141 + v142 true MultiByte diff --git a/hqx2bin/hqx2bin.vcxproj b/hqx2bin/hqx2bin.vcxproj index 8af67fb..c17eceb 100644 --- a/hqx2bin/hqx2bin.vcxproj +++ b/hqx2bin/hqx2bin.vcxproj @@ -14,19 +14,19 @@ 15.0 {45B1B18C-C846-4044-9206-74F58DFC5E88} hqx2bin - 10.0.16299.0 + 10.0 Application true - v141 + v142 MultiByte Application false - v141 + v142 true MultiByte diff --git a/hqx2gp/hqx2gp.vcxproj b/hqx2gp/hqx2gp.vcxproj index 6b7122a..4ff466c 100644 --- a/hqx2gp/hqx2gp.vcxproj +++ b/hqx2gp/hqx2gp.vcxproj @@ -14,19 +14,19 @@ 15.0 {5FDE4822-C771-46A5-B6B2-FD12BACE86BF} hqx2gp - 10.0.17763.0 + 10.0 Application true - v141 + v142 MultiByte Application false - v141 + v142 true MultiByte diff --git a/unpacktool/StuffIt13Decompressor.cpp b/unpacktool/StuffIt13Decompressor.cpp index b91413d..3effdf6 100644 --- a/unpacktool/StuffIt13Decompressor.cpp +++ b/unpacktool/StuffIt13Decompressor.cpp @@ -403,7 +403,7 @@ XADPrefixCode *StuffIt13Decompressor::allocAndParseCodeOfSize(int numcodes, XADP { unsigned int bits; if (!CSInputNextBitStringLE(input, 3, bits)) - return false; + return nullptr; val = bits + 2; while (val--) @@ -414,7 +414,7 @@ XADPrefixCode *StuffIt13Decompressor::allocAndParseCodeOfSize(int numcodes, XADP { unsigned int bits; if (!CSInputNextBitStringLE(input, 6, bits)) - return false; + return nullptr; val = bits + 10; while (val--) diff --git a/unpacktool/StuffItParser.cpp b/unpacktool/StuffItParser.cpp index 8ed43e3..24956ca 100644 --- a/unpacktool/StuffItParser.cpp +++ b/unpacktool/StuffItParser.cpp @@ -161,7 +161,7 @@ ArchiveItemList *StuffItParser::Parse(IFileReader &reader) const uint8_t fileNameLength = header[SITFH_FNAMESIZE]; if (fileNameLength > SITFH_FNAME_CRC - SITFH_FNAME) - return false; + return nullptr; std::vector utf8FileName; StringCommon::ConvertMacRomanFileName(utf8FileName, header + SITFH_FNAME, fileNameLength); diff --git a/unpacktool/unpacktool.vcxproj b/unpacktool/unpacktool.vcxproj index 2c12b92..11f4306 100644 --- a/unpacktool/unpacktool.vcxproj +++ b/unpacktool/unpacktool.vcxproj @@ -14,19 +14,19 @@ 15.0 {A778D062-DE76-49F6-8D05-EB26852DD605} unpacktool - 10.0.17763.0 + 10.0 Application true - v141 + v142 MultiByte Application false - v141 + v142 true MultiByte diff --git a/zlib/zlib.vcxproj b/zlib/zlib.vcxproj index 83c4856..34968ae 100644 --- a/zlib/zlib.vcxproj +++ b/zlib/zlib.vcxproj @@ -14,19 +14,19 @@ 15.0 {6AE5C85E-6631-4A12-97A0-A05F812FE9CA} zlib - 10.0.17763.0 + 10.0 StaticLibrary true - v141 + v142 MultiByte StaticLibrary false - v141 + v142 true MultiByte