From 879b0c296122827b4436bde1c573ed8b130a3317 Mon Sep 17 00:00:00 2001 From: Jief L Date: Wed, 8 Apr 2020 13:49:00 +0300 Subject: [PATCH] DontStopAtPanic helper, XUINTN remove, PRIuPTR and few warnings. --- .../CloverX64.xcodeproj/project.pbxproj | 44 +-- .../cpp_tests.xcodeproj/project.pbxproj | 20 -- .../xcschemes/cpp_tests UTF32.xcscheme | 27 +- rEFIt_UEFI/Platform/Platform.h | 2 + rEFIt_UEFI/Platform/Posix/stddef.h | 2 +- rEFIt_UEFI/Platform/Posix/stdint.h | 7 + rEFIt_UEFI/Platform/Posix/stdio.h | 2 - rEFIt_UEFI/cpp_foundation/XArray.h | 2 +- rEFIt_UEFI/cpp_foundation/XObjArray.h | 2 +- rEFIt_UEFI/cpp_foundation/XUINTN.cpp | 27 -- rEFIt_UEFI/cpp_foundation/XUINTN.h | 73 ----- rEFIt_UEFI/cpp_unit_test/XUINTN_test.cpp | 267 ------------------ rEFIt_UEFI/cpp_unit_test/XUINTN_test.h | 1 - rEFIt_UEFI/cpp_unit_test/all_tests.cpp | 49 +++- rEFIt_UEFI/cpp_util/globals_dtor.cpp | 3 +- rEFIt_UEFI/cpp_util/panic.h | 7 + rEFIt_UEFI/libeg/VectorGraphics.cpp | 22 +- rEFIt_UEFI/libeg/text.cpp | 4 +- rEFIt_UEFI/refit.inf | 8 +- 19 files changed, 76 insertions(+), 493 deletions(-) delete mode 100755 rEFIt_UEFI/cpp_foundation/XUINTN.cpp delete mode 100755 rEFIt_UEFI/cpp_foundation/XUINTN.h delete mode 100755 rEFIt_UEFI/cpp_unit_test/XUINTN_test.cpp delete mode 100644 rEFIt_UEFI/cpp_unit_test/XUINTN_test.h diff --git a/Xcode/CloverX64/CloverX64.xcodeproj/project.pbxproj b/Xcode/CloverX64/CloverX64.xcodeproj/project.pbxproj index ff9f09a05..50ba2ad51 100644 --- a/Xcode/CloverX64/CloverX64.xcodeproj/project.pbxproj +++ b/Xcode/CloverX64/CloverX64.xcodeproj/project.pbxproj @@ -46,10 +46,6 @@ 9A4185BB2439F29D00BEAFB8 /* LoadOptions_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A4185B52439F29D00BEAFB8 /* LoadOptions_test.cpp */; }; 9A4185BC2439F29D00BEAFB8 /* LoadOptions_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A4185B52439F29D00BEAFB8 /* LoadOptions_test.cpp */; }; 9A4185BD2439F29D00BEAFB8 /* LoadOptions_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A4185B52439F29D00BEAFB8 /* LoadOptions_test.cpp */; }; - 9A57C25724192D650029A39F /* XUINTN.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A57C25524192D650029A39F /* XUINTN.cpp */; }; - 9A57C25824192D650029A39F /* XUINTN.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A57C25624192D650029A39F /* XUINTN.h */; }; - 9A57C25B24192D710029A39F /* XUINTN_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A57C25924192D710029A39F /* XUINTN_test.cpp */; }; - 9A57C25C24192D710029A39F /* XUINTN_test.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A57C25A24192D710029A39F /* XUINTN_test.h */; }; 9A637AE82430D927000B9474 /* XTheme.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5E3262F2428F4EE002240E8 /* XTheme.cpp */; }; 9A637AE92430D928000B9474 /* XTheme.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5E3262F2428F4EE002240E8 /* XTheme.cpp */; }; 9A637AEA2430D928000B9474 /* XTheme.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5E3262F2428F4EE002240E8 /* XTheme.cpp */; }; @@ -237,7 +233,6 @@ 9ACFE65324309AF80071CC93 /* nvidia.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F3324176C04005CDD5C /* nvidia.h */; }; 9ACFE65424309AF80071CC93 /* operatorNewDelete.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77FA324176C04005CDD5C /* operatorNewDelete.h */; }; 9ACFE65524309AF80071CC93 /* BasicIO.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AF4173E242F15CC00D2644C /* BasicIO.h */; }; - 9ACFE65624309AF80071CC93 /* XUINTN_test.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A57C25A24192D710029A39F /* XUINTN_test.h */; }; 9ACFE65724309AF80071CC93 /* XStringWArray_test.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77ECC24176C04005CDD5C /* XStringWArray_test.h */; }; 9ACFE65824309AF80071CC93 /* syslinux_mbr.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F1424176C04005CDD5C /* syslinux_mbr.h */; }; 9ACFE65924309AF80071CC93 /* lodepng.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F6024176C04005CDD5C /* lodepng.h */; }; @@ -260,7 +255,6 @@ 9ACFE66A24309AF80071CC93 /* Events.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F3424176C04005CDD5C /* Events.h */; }; 9ACFE66B24309AF80071CC93 /* printlib-test-cpp_conf.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AF4155F242BABC700D2644C /* printlib-test-cpp_conf.h */; }; 9ACFE66C24309AF80071CC93 /* XStringWArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77FAC24176C04005CDD5C /* XStringWArray.h */; }; - 9ACFE66D24309AF80071CC93 /* XUINTN.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A57C25624192D650029A39F /* XUINTN.h */; }; 9ACFE66E24309AF80071CC93 /* strcmp_test.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A28CD2D241BC0DF00F3D247 /* strcmp_test.h */; }; 9ACFE66F24309AF80071CC93 /* boot.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F3824176C04005CDD5C /* boot.h */; }; 9ACFE67024309AF80071CC93 /* ati.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F4624176C04005CDD5C /* ati.h */; }; @@ -388,7 +382,6 @@ 9ACFE6ED24309AF80071CC93 /* LegacyBoot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F1824176C04005CDD5C /* LegacyBoot.cpp */; }; 9ACFE6EE24309AF80071CC93 /* REFIT_MENU_SCREEN.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F9124176C04005CDD5C /* REFIT_MENU_SCREEN.cpp */; }; 9ACFE6EF24309AF80071CC93 /* LegacyBiosThunk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F3624176C04005CDD5C /* LegacyBiosThunk.cpp */; }; - 9ACFE6F024309AF80071CC93 /* XUINTN_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A57C25924192D710029A39F /* XUINTN_test.cpp */; }; 9ACFE6F124309AF80071CC93 /* string.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F3724176C04005CDD5C /* string.cpp */; }; 9ACFE6F224309AF80071CC93 /* XStringW.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77FB024176C04005CDD5C /* XStringW.cpp */; }; 9ACFE6F324309AF80071CC93 /* lockedgraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F8324176C04005CDD5C /* lockedgraphics.cpp */; }; @@ -426,7 +419,6 @@ 9ACFE71324309AF80071CC93 /* kext_inject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F3024176C04005CDD5C /* kext_inject.cpp */; }; 9ACFE71424309AF80071CC93 /* guid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F5324176C04005CDD5C /* guid.cpp */; }; 9ACFE71524309AF80071CC93 /* bootscreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F8624176C04005CDD5C /* bootscreen.cpp */; }; - 9ACFE71624309AF80071CC93 /* XUINTN.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A57C25524192D650029A39F /* XUINTN.cpp */; }; 9ACFE71724309AF80071CC93 /* strlen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A28CD27241BC0C700F3D247 /* strlen.cpp */; }; 9ACFE71824309AF80071CC93 /* Console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F2B24176C04005CDD5C /* Console.cpp */; }; 9ACFE71924309AF80071CC93 /* utf8Conversion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77FB124176C04005CDD5C /* utf8Conversion.cpp */; }; @@ -452,7 +444,6 @@ 9AF41588242CD75C00D2644C /* XStringWP.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC780B62417F359005CDD5C /* XStringWP.h */; }; 9AF41589242CD75C00D2644C /* nvidia.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F3324176C04005CDD5C /* nvidia.h */; }; 9AF4158A242CD75C00D2644C /* operatorNewDelete.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77FA324176C04005CDD5C /* operatorNewDelete.h */; }; - 9AF4158B242CD75C00D2644C /* XUINTN_test.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A57C25A24192D710029A39F /* XUINTN_test.h */; }; 9AF4158C242CD75C00D2644C /* XStringWArray_test.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77ECC24176C04005CDD5C /* XStringWArray_test.h */; }; 9AF4158D242CD75C00D2644C /* syslinux_mbr.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F1424176C04005CDD5C /* syslinux_mbr.h */; }; 9AF4158F242CD75C00D2644C /* lodepng.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F6024176C04005CDD5C /* lodepng.h */; }; @@ -474,7 +465,6 @@ 9AF4159F242CD75C00D2644C /* Events.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F3424176C04005CDD5C /* Events.h */; }; 9AF415A0242CD75C00D2644C /* printlib-test-cpp_conf.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AF4155F242BABC700D2644C /* printlib-test-cpp_conf.h */; }; 9AF415A1242CD75C00D2644C /* XStringWArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77FAC24176C04005CDD5C /* XStringWArray.h */; }; - 9AF415A2242CD75C00D2644C /* XUINTN.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A57C25624192D650029A39F /* XUINTN.h */; }; 9AF415A3242CD75C00D2644C /* strcmp_test.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A28CD2D241BC0DF00F3D247 /* strcmp_test.h */; }; 9AF415A4242CD75C00D2644C /* boot.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F3824176C04005CDD5C /* boot.h */; }; 9AF415A5242CD75C00D2644C /* ati.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F4624176C04005CDD5C /* ati.h */; }; @@ -600,7 +590,6 @@ 9AF41623242CD75C00D2644C /* LegacyBoot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F1824176C04005CDD5C /* LegacyBoot.cpp */; }; 9AF41624242CD75C00D2644C /* REFIT_MENU_SCREEN.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F9124176C04005CDD5C /* REFIT_MENU_SCREEN.cpp */; }; 9AF41625242CD75C00D2644C /* LegacyBiosThunk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F3624176C04005CDD5C /* LegacyBiosThunk.cpp */; }; - 9AF41626242CD75C00D2644C /* XUINTN_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A57C25924192D710029A39F /* XUINTN_test.cpp */; }; 9AF41627242CD75C00D2644C /* string.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F3724176C04005CDD5C /* string.cpp */; }; 9AF41628242CD75C00D2644C /* XStringW.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77FB024176C04005CDD5C /* XStringW.cpp */; }; 9AF41629242CD75C00D2644C /* lockedgraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F8324176C04005CDD5C /* lockedgraphics.cpp */; }; @@ -638,7 +627,6 @@ 9AF41649242CD75C00D2644C /* kext_inject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F3024176C04005CDD5C /* kext_inject.cpp */; }; 9AF4164A242CD75C00D2644C /* guid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F5324176C04005CDD5C /* guid.cpp */; }; 9AF4164B242CD75C00D2644C /* bootscreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F8624176C04005CDD5C /* bootscreen.cpp */; }; - 9AF4164C242CD75C00D2644C /* XUINTN.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A57C25524192D650029A39F /* XUINTN.cpp */; }; 9AF4164D242CD75C00D2644C /* strlen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A28CD27241BC0C700F3D247 /* strlen.cpp */; }; 9AF4164E242CD75C00D2644C /* Console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F2B24176C04005CDD5C /* Console.cpp */; }; 9AF4164F242CD75C00D2644C /* utf8Conversion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77FB124176C04005CDD5C /* utf8Conversion.cpp */; }; @@ -658,7 +646,6 @@ 9AF41665242CDA5800D2644C /* XStringWP.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC780B62417F359005CDD5C /* XStringWP.h */; }; 9AF41666242CDA5800D2644C /* nvidia.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F3324176C04005CDD5C /* nvidia.h */; }; 9AF41667242CDA5800D2644C /* operatorNewDelete.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77FA324176C04005CDD5C /* operatorNewDelete.h */; }; - 9AF41668242CDA5800D2644C /* XUINTN_test.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A57C25A24192D710029A39F /* XUINTN_test.h */; }; 9AF41669242CDA5800D2644C /* XStringWArray_test.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77ECC24176C04005CDD5C /* XStringWArray_test.h */; }; 9AF4166A242CDA5800D2644C /* syslinux_mbr.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F1424176C04005CDD5C /* syslinux_mbr.h */; }; 9AF4166C242CDA5800D2644C /* lodepng.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F6024176C04005CDD5C /* lodepng.h */; }; @@ -680,7 +667,6 @@ 9AF4167C242CDA5800D2644C /* Events.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F3424176C04005CDD5C /* Events.h */; }; 9AF4167D242CDA5800D2644C /* printlib-test-cpp_conf.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AF4155F242BABC700D2644C /* printlib-test-cpp_conf.h */; }; 9AF4167E242CDA5800D2644C /* XStringWArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77FAC24176C04005CDD5C /* XStringWArray.h */; }; - 9AF4167F242CDA5800D2644C /* XUINTN.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A57C25624192D650029A39F /* XUINTN.h */; }; 9AF41680242CDA5800D2644C /* strcmp_test.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A28CD2D241BC0DF00F3D247 /* strcmp_test.h */; }; 9AF41681242CDA5800D2644C /* boot.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F3824176C04005CDD5C /* boot.h */; }; 9AF41682242CDA5800D2644C /* ati.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F4624176C04005CDD5C /* ati.h */; }; @@ -806,7 +792,6 @@ 9AF41700242CDA5800D2644C /* LegacyBoot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F1824176C04005CDD5C /* LegacyBoot.cpp */; }; 9AF41701242CDA5800D2644C /* REFIT_MENU_SCREEN.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F9124176C04005CDD5C /* REFIT_MENU_SCREEN.cpp */; }; 9AF41702242CDA5800D2644C /* LegacyBiosThunk.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F3624176C04005CDD5C /* LegacyBiosThunk.cpp */; }; - 9AF41703242CDA5800D2644C /* XUINTN_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A57C25924192D710029A39F /* XUINTN_test.cpp */; }; 9AF41704242CDA5800D2644C /* string.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F3724176C04005CDD5C /* string.cpp */; }; 9AF41705242CDA5800D2644C /* XStringW.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77FB024176C04005CDD5C /* XStringW.cpp */; }; 9AF41706242CDA5800D2644C /* lockedgraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F8324176C04005CDD5C /* lockedgraphics.cpp */; }; @@ -844,7 +829,6 @@ 9AF41726242CDA5800D2644C /* kext_inject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F3024176C04005CDD5C /* kext_inject.cpp */; }; 9AF41727242CDA5800D2644C /* guid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F5324176C04005CDD5C /* guid.cpp */; }; 9AF41728242CDA5800D2644C /* bootscreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F8624176C04005CDD5C /* bootscreen.cpp */; }; - 9AF41729242CDA5800D2644C /* XUINTN.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A57C25524192D650029A39F /* XUINTN.cpp */; }; 9AF4172A242CDA5800D2644C /* strlen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A28CD27241BC0C700F3D247 /* strlen.cpp */; }; 9AF4172B242CDA5800D2644C /* Console.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F2B24176C04005CDD5C /* Console.cpp */; }; 9AF4172C242CDA5800D2644C /* utf8Conversion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77FB124176C04005CDD5C /* utf8Conversion.cpp */; }; @@ -890,10 +874,6 @@ 9A28CD30241BC0DF00F3D247 /* strncmp_test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = strncmp_test.h; sourceTree = ""; }; 9A4185B42439F29D00BEAFB8 /* LoadOptions_test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoadOptions_test.h; sourceTree = ""; }; 9A4185B52439F29D00BEAFB8 /* LoadOptions_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LoadOptions_test.cpp; sourceTree = ""; }; - 9A57C25524192D650029A39F /* XUINTN.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XUINTN.cpp; sourceTree = ""; }; - 9A57C25624192D650029A39F /* XUINTN.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XUINTN.h; sourceTree = ""; }; - 9A57C25924192D710029A39F /* XUINTN_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XUINTN_test.cpp; sourceTree = ""; }; - 9A57C25A24192D710029A39F /* XUINTN_test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XUINTN_test.h; sourceTree = ""; }; 9A9D3B2024221562006D8CD9 /* printf_lite_test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = printf_lite_test.h; sourceTree = ""; }; 9A9D3B2124221563006D8CD9 /* printf_lite-test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "printf_lite-test.cpp"; sourceTree = ""; }; 9A9D3B2424221570006D8CD9 /* unicode_conversions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = unicode_conversions.cpp; sourceTree = ""; }; @@ -1222,8 +1202,6 @@ 9AC77ED224176C04005CDD5C /* XStringW_test.h */, 9AC77ECE24176C04005CDD5C /* XStringWArray_test.cpp */, 9AC77ECC24176C04005CDD5C /* XStringWArray_test.h */, - 9A57C25924192D710029A39F /* XUINTN_test.cpp */, - 9A57C25A24192D710029A39F /* XUINTN_test.h */, ); path = cpp_unit_test; sourceTree = ""; @@ -1453,8 +1431,6 @@ 9AC780B62417F359005CDD5C /* XStringWP.h */, 9AC77FB424176C04005CDD5C /* XToolsCommon.cpp */, 9AC77FAD24176C04005CDD5C /* XToolsCommon.h */, - 9A57C25524192D650029A39F /* XUINTN.cpp */, - 9A57C25624192D650029A39F /* XUINTN.h */, ); path = cpp_foundation; sourceTree = ""; @@ -1474,7 +1450,6 @@ 9AC7801C24176C04005CDD5C /* nvidia.h in Headers */, 9AC7808524176C04005CDD5C /* operatorNewDelete.h in Headers */, 9AF41741242F15CC00D2644C /* BasicIO.h in Headers */, - 9A57C25C24192D710029A39F /* XUINTN_test.h in Headers */, 9AC77FB924176C04005CDD5C /* XStringWArray_test.h in Headers */, 9AC77FFE24176C04005CDD5C /* syslinux_mbr.h in Headers */, 9AC7804724176C04005CDD5C /* lodepng.h in Headers */, @@ -1497,7 +1472,6 @@ 9AC7801D24176C04005CDD5C /* Events.h in Headers */, 9AF41562242BABC700D2644C /* printlib-test-cpp_conf.h in Headers */, 9AC7808D24176C04005CDD5C /* XStringWArray.h in Headers */, - 9A57C25824192D650029A39F /* XUINTN.h in Headers */, 9A28CD33241BC0DF00F3D247 /* strcmp_test.h in Headers */, 9AC7802124176C04005CDD5C /* boot.h in Headers */, 9AC7802F24176C04005CDD5C /* ati.h in Headers */, @@ -1585,7 +1559,6 @@ 9ACFE65324309AF80071CC93 /* nvidia.h in Headers */, 9ACFE65424309AF80071CC93 /* operatorNewDelete.h in Headers */, 9ACFE65524309AF80071CC93 /* BasicIO.h in Headers */, - 9ACFE65624309AF80071CC93 /* XUINTN_test.h in Headers */, 9ACFE65724309AF80071CC93 /* XStringWArray_test.h in Headers */, 9ACFE65824309AF80071CC93 /* syslinux_mbr.h in Headers */, 9ACFE65924309AF80071CC93 /* lodepng.h in Headers */, @@ -1608,7 +1581,6 @@ 9ACFE66A24309AF80071CC93 /* Events.h in Headers */, 9ACFE66B24309AF80071CC93 /* printlib-test-cpp_conf.h in Headers */, 9ACFE66C24309AF80071CC93 /* XStringWArray.h in Headers */, - 9ACFE66D24309AF80071CC93 /* XUINTN.h in Headers */, 9ACFE66E24309AF80071CC93 /* strcmp_test.h in Headers */, 9ACFE66F24309AF80071CC93 /* boot.h in Headers */, 9ACFE67024309AF80071CC93 /* ati.h in Headers */, @@ -1695,7 +1667,6 @@ 9AF41588242CD75C00D2644C /* XStringWP.h in Headers */, 9AF41589242CD75C00D2644C /* nvidia.h in Headers */, 9AF4158A242CD75C00D2644C /* operatorNewDelete.h in Headers */, - 9AF4158B242CD75C00D2644C /* XUINTN_test.h in Headers */, 9AF4158C242CD75C00D2644C /* XStringWArray_test.h in Headers */, 9AF4158D242CD75C00D2644C /* syslinux_mbr.h in Headers */, 9AF4158F242CD75C00D2644C /* lodepng.h in Headers */, @@ -1718,7 +1689,6 @@ 9AF415A0242CD75C00D2644C /* printlib-test-cpp_conf.h in Headers */, 9AF415A1242CD75C00D2644C /* XStringWArray.h in Headers */, 9A09863C2438A15400826276 /* shared_with_menu.h in Headers */, - 9AF415A2242CD75C00D2644C /* XUINTN.h in Headers */, 9A4185B72439F29D00BEAFB8 /* LoadOptions_test.h in Headers */, 9AF415A3242CD75C00D2644C /* strcmp_test.h in Headers */, 9AF415A4242CD75C00D2644C /* boot.h in Headers */, @@ -1804,7 +1774,6 @@ 9AF41665242CDA5800D2644C /* XStringWP.h in Headers */, 9AF41666242CDA5800D2644C /* nvidia.h in Headers */, 9AF41667242CDA5800D2644C /* operatorNewDelete.h in Headers */, - 9AF41668242CDA5800D2644C /* XUINTN_test.h in Headers */, 9AF41669242CDA5800D2644C /* XStringWArray_test.h in Headers */, 9AF4166A242CDA5800D2644C /* syslinux_mbr.h in Headers */, 9AF4166C242CDA5800D2644C /* lodepng.h in Headers */, @@ -1827,7 +1796,6 @@ 9AF4167D242CDA5800D2644C /* printlib-test-cpp_conf.h in Headers */, 9AF4167E242CDA5800D2644C /* XStringWArray.h in Headers */, 9A09863D2438A15400826276 /* shared_with_menu.h in Headers */, - 9AF4167F242CDA5800D2644C /* XUINTN.h in Headers */, 9A4185B82439F29D00BEAFB8 /* LoadOptions_test.h in Headers */, 9AF41680242CDA5800D2644C /* strcmp_test.h in Headers */, 9AF41681242CDA5800D2644C /* boot.h in Headers */, @@ -2142,7 +2110,6 @@ 9AC7800124176C04005CDD5C /* LegacyBoot.cpp in Sources */, 9AC7807524176C04005CDD5C /* REFIT_MENU_SCREEN.cpp in Sources */, 9AC7801F24176C04005CDD5C /* LegacyBiosThunk.cpp in Sources */, - 9A57C25B24192D710029A39F /* XUINTN_test.cpp in Sources */, 9A09863124389A6A00826276 /* menu.cpp in Sources */, 9AC7802024176C04005CDD5C /* string.cpp in Sources */, 9AC7809124176C04005CDD5C /* XStringW.cpp in Sources */, @@ -2184,7 +2151,6 @@ 9A637AEA2430D928000B9474 /* XTheme.cpp in Sources */, 9AC7803C24176C04005CDD5C /* guid.cpp in Sources */, 9AC7806C24176C04005CDD5C /* bootscreen.cpp in Sources */, - 9A57C25724192D650029A39F /* XUINTN.cpp in Sources */, 9A28CD2A241BC0C700F3D247 /* strlen.cpp in Sources */, 9AC7801424176C04005CDD5C /* Console.cpp in Sources */, 9AC7809224176C04005CDD5C /* utf8Conversion.cpp in Sources */, @@ -2262,7 +2228,6 @@ 9ACFE6EE24309AF80071CC93 /* REFIT_MENU_SCREEN.cpp in Sources */, 9ACFE6EF24309AF80071CC93 /* LegacyBiosThunk.cpp in Sources */, 9A09863424389A6A00826276 /* menu.cpp in Sources */, - 9ACFE6F024309AF80071CC93 /* XUINTN_test.cpp in Sources */, 9ACFE6F124309AF80071CC93 /* string.cpp in Sources */, 9ACFE6F224309AF80071CC93 /* XStringW.cpp in Sources */, 9ACFE6F324309AF80071CC93 /* lockedgraphics.cpp in Sources */, @@ -2302,7 +2267,6 @@ 9ACFE71324309AF80071CC93 /* kext_inject.cpp in Sources */, 9ACFE71424309AF80071CC93 /* guid.cpp in Sources */, 9ACFE71524309AF80071CC93 /* bootscreen.cpp in Sources */, - 9ACFE71624309AF80071CC93 /* XUINTN.cpp in Sources */, 9ACFE71724309AF80071CC93 /* strlen.cpp in Sources */, 9ACFE71824309AF80071CC93 /* Console.cpp in Sources */, 9ACFE71924309AF80071CC93 /* utf8Conversion.cpp in Sources */, @@ -2378,7 +2342,6 @@ 9AF41623242CD75C00D2644C /* LegacyBoot.cpp in Sources */, 9AF41624242CD75C00D2644C /* REFIT_MENU_SCREEN.cpp in Sources */, 9AF41625242CD75C00D2644C /* LegacyBiosThunk.cpp in Sources */, - 9AF41626242CD75C00D2644C /* XUINTN_test.cpp in Sources */, 9A09863224389A6A00826276 /* menu.cpp in Sources */, 9AF41627242CD75C00D2644C /* string.cpp in Sources */, 9AF41628242CD75C00D2644C /* XStringW.cpp in Sources */, @@ -2420,7 +2383,6 @@ 9A637AE92430D928000B9474 /* XTheme.cpp in Sources */, 9AF4164A242CD75C00D2644C /* guid.cpp in Sources */, 9AF4164B242CD75C00D2644C /* bootscreen.cpp in Sources */, - 9AF4164C242CD75C00D2644C /* XUINTN.cpp in Sources */, 9AF4164D242CD75C00D2644C /* strlen.cpp in Sources */, 9AF4164E242CD75C00D2644C /* Console.cpp in Sources */, 9AF4164F242CD75C00D2644C /* utf8Conversion.cpp in Sources */, @@ -2496,7 +2458,6 @@ 9AF41700242CDA5800D2644C /* LegacyBoot.cpp in Sources */, 9AF41701242CDA5800D2644C /* REFIT_MENU_SCREEN.cpp in Sources */, 9AF41702242CDA5800D2644C /* LegacyBiosThunk.cpp in Sources */, - 9AF41703242CDA5800D2644C /* XUINTN_test.cpp in Sources */, 9A09863324389A6A00826276 /* menu.cpp in Sources */, 9AF41704242CDA5800D2644C /* string.cpp in Sources */, 9AF41705242CDA5800D2644C /* XStringW.cpp in Sources */, @@ -2538,7 +2499,6 @@ 9A637AE82430D927000B9474 /* XTheme.cpp in Sources */, 9AF41727242CDA5800D2644C /* guid.cpp in Sources */, 9AF41728242CDA5800D2644C /* bootscreen.cpp in Sources */, - 9AF41729242CDA5800D2644C /* XUINTN.cpp in Sources */, 9AF4172A242CDA5800D2644C /* strlen.cpp in Sources */, 9AF4172B242CDA5800D2644C /* Console.cpp in Sources */, 9AF4172C242CDA5800D2644C /* utf8Conversion.cpp in Sources */, @@ -2563,7 +2523,7 @@ ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_FLOAT_CONVERSION = YES; - CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES; + CLANG_WARN_IMPLICIT_SIGN_CONVERSION = NO; GCC_ENABLE_CPP_EXCEPTIONS = NO; GCC_ENABLE_CPP_RTTI = NO; GCC_PREPROCESSOR_DEFINITIONS = ( @@ -2627,7 +2587,7 @@ ARCHS = "$(ARCHS_STANDARD_64_BIT)"; CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; CLANG_WARN_FLOAT_CONVERSION = YES; - CLANG_WARN_IMPLICIT_SIGN_CONVERSION = YES; + CLANG_WARN_IMPLICIT_SIGN_CONVERSION = NO; ENABLE_NS_ASSERTIONS = NO; GCC_ENABLE_CPP_EXCEPTIONS = NO; GCC_ENABLE_CPP_RTTI = NO; diff --git a/Xcode/cpp_tests/cpp_tests.xcodeproj/project.pbxproj b/Xcode/cpp_tests/cpp_tests.xcodeproj/project.pbxproj index a3927c325..65e7feb8a 100644 --- a/Xcode/cpp_tests/cpp_tests.xcodeproj/project.pbxproj +++ b/Xcode/cpp_tests/cpp_tests.xcodeproj/project.pbxproj @@ -55,17 +55,11 @@ 9A4185C02439F73A00BEAFB8 /* XStringArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A4185BE2439F73A00BEAFB8 /* XStringArray.cpp */; }; 9A4185C12439F73A00BEAFB8 /* XStringArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A4185BE2439F73A00BEAFB8 /* XStringArray.cpp */; }; 9A4185C22439F73A00BEAFB8 /* XStringArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A4185BE2439F73A00BEAFB8 /* XStringArray.cpp */; }; - 9A57C20D2418A27B0029A39F /* XUINTN.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A57C20B2418A27B0029A39F /* XUINTN.cpp */; }; - 9A57C20E2418A27B0029A39F /* XUINTN.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A57C20B2418A27B0029A39F /* XUINTN.cpp */; }; - 9A57C2112418A3560029A39F /* XUINTN_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A57C20F2418A3550029A39F /* XUINTN_test.cpp */; }; - 9A57C2122418A3560029A39F /* XUINTN_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A57C20F2418A3550029A39F /* XUINTN_test.cpp */; }; 9A57C2152418A6EA0029A39F /* XStringWP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A57C2132418A6E90029A39F /* XStringWP.cpp */; }; 9A57C2162418A6EA0029A39F /* XStringWP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A57C2132418A6E90029A39F /* XStringWP.cpp */; }; - 9A57C2192418B9A00029A39F /* XUINTN.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A57C20B2418A27B0029A39F /* XUINTN.cpp */; }; 9A57C21A2418B9A00029A39F /* XObjArray_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A0B08522402FE9B00E2B470 /* XObjArray_tests.cpp */; }; 9A57C21B2418B9A00029A39F /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9223302402FD1000483CBA /* main.cpp */; }; 9A57C21D2418B9A00029A39F /* XStringWArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A0B08472402FE9300E2B470 /* XStringWArray.cpp */; }; - 9A57C21E2418B9A00029A39F /* XUINTN_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A57C20F2418A3550029A39F /* XUINTN_test.cpp */; }; 9A57C21F2418B9A00029A39F /* utf8Conversion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AA05BB6240FC78D008EA4F8 /* utf8Conversion.cpp */; }; 9A57C2202418B9A00029A39F /* panic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC780A32417DD2F005CDD5C /* panic.cpp */; }; 9A57C2212418B9A00029A39F /* XStringW.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A0B08482402FE9300E2B470 /* XStringW.cpp */; }; @@ -170,10 +164,6 @@ 9A4185BE2439F73A00BEAFB8 /* XStringArray.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XStringArray.cpp; sourceTree = ""; }; 9A4185BF2439F73A00BEAFB8 /* XStringArray.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XStringArray.h; sourceTree = ""; }; 9A57C20A2418A1FD0029A39F /* global_test.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = global_test.h; sourceTree = ""; }; - 9A57C20B2418A27B0029A39F /* XUINTN.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XUINTN.cpp; sourceTree = ""; }; - 9A57C20C2418A27B0029A39F /* XUINTN.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XUINTN.h; sourceTree = ""; }; - 9A57C20F2418A3550029A39F /* XUINTN_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XUINTN_test.cpp; sourceTree = ""; }; - 9A57C2102418A3550029A39F /* XUINTN_test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XUINTN_test.h; sourceTree = ""; }; 9A57C2132418A6E90029A39F /* XStringWP.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XStringWP.cpp; sourceTree = ""; }; 9A57C2142418A6EA0029A39F /* XStringWP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XStringWP.h; sourceTree = ""; }; 9A57C22F2418B9A00029A39F /* cpp_tests UTF16 unsigned char */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "cpp_tests UTF16 unsigned char"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -254,8 +244,6 @@ 9A57C2142418A6EA0029A39F /* XStringWP.h */, 9A0B08492402FE9300E2B470 /* XToolsCommon.cpp */, 9A0B08452402FE9300E2B470 /* XToolsCommon.h */, - 9A57C20B2418A27B0029A39F /* XUINTN.cpp */, - 9A57C20C2418A27B0029A39F /* XUINTN.h */, ); name = cpp_foundation; path = ../../rEFIt_UEFI/cpp_foundation; @@ -297,8 +285,6 @@ 9A0B08632403132300E2B470 /* XStringW_test.h */, 9A0B084F2402FE9B00E2B470 /* XStringWArray_test.cpp */, 9A0B084D2402FE9B00E2B470 /* XStringWArray_test.h */, - 9A57C20F2418A3550029A39F /* XUINTN_test.cpp */, - 9A57C2102418A3550029A39F /* XUINTN_test.h */, ); name = cpp_unit_test; path = ../../rEFIt_UEFI/cpp_unit_test; @@ -489,7 +475,6 @@ buildActionMask = 2147483647; files = ( 9A4185B22439E4D600BEAFB8 /* LoadOptions_test.cpp in Sources */, - 9A57C20E2418A27B0029A39F /* XUINTN.cpp in Sources */, 9A0B08732403B08400E2B470 /* XObjArray_tests.cpp in Sources */, 9A28CD20241BB61B00F3D247 /* abort.cpp in Sources */, 9A28CD23241BB61B00F3D247 /* strlen.cpp in Sources */, @@ -498,7 +483,6 @@ 9A57C264241A752E0029A39F /* XString_test.cpp in Sources */, 9A28CD17241BACBB00F3D247 /* strlen_test.cpp in Sources */, 9A0B08772403B08400E2B470 /* XStringWArray.cpp in Sources */, - 9A57C2122418A3560029A39F /* XUINTN_test.cpp in Sources */, 9A28CD0D241B8DD400F3D247 /* strcmp_test.cpp in Sources */, 9A28CD0A241B8DD400F3D247 /* strncmp_test.cpp in Sources */, 9AA05BB8240FC78D008EA4F8 /* utf8Conversion.cpp in Sources */, @@ -526,7 +510,6 @@ buildActionMask = 2147483647; files = ( 9A4185B32439E4D600BEAFB8 /* LoadOptions_test.cpp in Sources */, - 9A57C2192418B9A00029A39F /* XUINTN.cpp in Sources */, 9A57C21A2418B9A00029A39F /* XObjArray_tests.cpp in Sources */, 9A28CD21241BB61B00F3D247 /* abort.cpp in Sources */, 9A28CD24241BB61B00F3D247 /* strlen.cpp in Sources */, @@ -535,7 +518,6 @@ 9A57C265241A752E0029A39F /* XString_test.cpp in Sources */, 9A28CD18241BACBB00F3D247 /* strlen_test.cpp in Sources */, 9A57C21D2418B9A00029A39F /* XStringWArray.cpp in Sources */, - 9A57C21E2418B9A00029A39F /* XUINTN_test.cpp in Sources */, 9A28CD0E241B8DD400F3D247 /* strcmp_test.cpp in Sources */, 9A28CD0B241B8DD400F3D247 /* strncmp_test.cpp in Sources */, 9A57C21F2418B9A00029A39F /* utf8Conversion.cpp in Sources */, @@ -562,7 +544,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 9A57C20D2418A27B0029A39F /* XUINTN.cpp in Sources */, 9A0B085A2402FF8400E2B470 /* XObjArray_tests.cpp in Sources */, 9A28CD1F241BB61B00F3D247 /* abort.cpp in Sources */, 9A28CD22241BB61B00F3D247 /* strlen.cpp in Sources */, @@ -571,7 +552,6 @@ 9A57C263241A752E0029A39F /* XString_test.cpp in Sources */, 9A28CD16241BACBB00F3D247 /* strlen_test.cpp in Sources */, 9A0B08562402FF7700E2B470 /* XStringWArray.cpp in Sources */, - 9A57C2112418A3560029A39F /* XUINTN_test.cpp in Sources */, 9A28CD0C241B8DD400F3D247 /* strcmp_test.cpp in Sources */, 9A28CD09241B8DD400F3D247 /* strncmp_test.cpp in Sources */, 9AA05BB7240FC78D008EA4F8 /* utf8Conversion.cpp in Sources */, diff --git a/Xcode/cpp_tests/cpp_tests.xcodeproj/xcshareddata/xcschemes/cpp_tests UTF32.xcscheme b/Xcode/cpp_tests/cpp_tests.xcodeproj/xcshareddata/xcschemes/cpp_tests UTF32.xcscheme index fc90a49ef..20a90e38a 100644 --- a/Xcode/cpp_tests/cpp_tests.xcodeproj/xcshareddata/xcschemes/cpp_tests UTF32.xcscheme +++ b/Xcode/cpp_tests/cpp_tests.xcodeproj/xcshareddata/xcschemes/cpp_tests UTF32.xcscheme @@ -45,7 +45,7 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - enableUBSanitizer = "YES" + disableMainThreadChecker = "YES" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" @@ -64,31 +64,6 @@ - - - - - - - - - - + #include #include diff --git a/rEFIt_UEFI/Platform/Posix/stddef.h b/rEFIt_UEFI/Platform/Posix/stddef.h index 1cb3d4a63..5eba1d40e 100644 --- a/rEFIt_UEFI/Platform/Posix/stddef.h +++ b/rEFIt_UEFI/Platform/Posix/stddef.h @@ -1,7 +1,7 @@ #ifndef __CLOVER_STDDEF_H__ #define __CLOVER_STDDEF_H__ -#include "stdint.h" +//#include "stdint.h" // DO NOT include stdint.h from stddef.h // How can we prevent VC to define this ? #ifdef _MSC_VER diff --git a/rEFIt_UEFI/Platform/Posix/stdint.h b/rEFIt_UEFI/Platform/Posix/stdint.h index 1b86305e9..152ed541c 100644 --- a/rEFIt_UEFI/Platform/Posix/stdint.h +++ b/rEFIt_UEFI/Platform/Posix/stdint.h @@ -34,6 +34,13 @@ typedef INT64 int64_t; #define PRId32 "d" #define PRId64 "lld" +// Jief : Certainly not massively multi platform and multi target ! So far we only compile x86_64 (I think). To be extended if needed. +#ifdef _MSC_VER +#define PRIuPTR "lld" +#else +#define PRIuPTR "lld" +#endif + #define PRIud8 "hhu" #define PRIu16 "hu" diff --git a/rEFIt_UEFI/Platform/Posix/stdio.h b/rEFIt_UEFI/Platform/Posix/stdio.h index abf1016d4..945bb608e 100644 --- a/rEFIt_UEFI/Platform/Posix/stdio.h +++ b/rEFIt_UEFI/Platform/Posix/stdio.h @@ -5,8 +5,6 @@ extern "C" { #endif -#include - #ifdef _MSC_VER #define __attribute__(x) #endif diff --git a/rEFIt_UEFI/cpp_foundation/XArray.h b/rEFIt_UEFI/cpp_foundation/XArray.h index 6b167da00..96eabf388 100755 --- a/rEFIt_UEFI/cpp_foundation/XArray.h +++ b/rEFIt_UEFI/cpp_foundation/XArray.h @@ -181,7 +181,7 @@ void XArray::CheckSize(xsize nNewSize, xsize nGrowBy) nNewSize += nGrowBy; m_data = (TYPE *)realloc((void *)m_data, nNewSize * sizeof(TYPE), m_allocatedSize * sizeof(TYPE) ); if ( !m_data ) { - DebugLog(2, "XArray::CheckSize(nNewSize=%llu, nGrowBy=%llu) : Xrealloc(%llu, %llu, %llu) returned NULL. System halted\n", nNewSize, nGrowBy, m_allocatedSize, nNewSize*sizeof(TYPE), (uintptr_t)m_data); + DebugLog(2, "XArray::CheckSize(nNewSize=%llu, nGrowBy=%llu) : Xrealloc(%llu, %llu, %" PRIuPTR ") returned NULL. System halted\n", nNewSize, nGrowBy, m_allocatedSize, nNewSize*sizeof(TYPE), (uintptr_t)m_data); panic(); } // memset(&_Data[_Size], 0, (nNewSize-_Size) * sizeof(TYPE)); // Could help for debugging, but zeroing in not needed. diff --git a/rEFIt_UEFI/cpp_foundation/XObjArray.h b/rEFIt_UEFI/cpp_foundation/XObjArray.h index c4c392f3b..5ececb0ba 100755 --- a/rEFIt_UEFI/cpp_foundation/XObjArray.h +++ b/rEFIt_UEFI/cpp_foundation/XObjArray.h @@ -183,7 +183,7 @@ void XObjArrayNC::CheckSize(xsize nNewSize, xsize nGrowBy) nNewSize += nGrowBy + 1; _Data = (XObjArrayEntry *)realloc((void *)_Data, sizeof(XObjArrayEntry) * nNewSize, sizeof(XObjArrayEntry) * m_allocatedSize); if ( !_Data ) { - XObjArray_DBG("XObjArrayNC::CheckSize(nNewSize=%llu, nGrowBy=%llu) : Xrealloc(%llu, %llu, %llu) returned NULL. System halted\n", nNewSize, nGrowBy, m_allocatedSize, sizeof(XObjArrayEntry) * nNewSize, (uintptr_t)_Data); + XObjArray_DBG("XObjArrayNC::CheckSize(nNewSize=%llu, nGrowBy=%llu) : Xrealloc(%llu, %llu, %" PRIuPTR ") returned NULL. System halted\n", nNewSize, nGrowBy, m_allocatedSize, sizeof(XObjArrayEntry) * nNewSize, (uintptr_t)_Data); } // memset(&_Data[m_allocatedSize], 0, (nNewSize-m_allocatedSize) * sizeof(XObjArrayEntry)); m_allocatedSize = nNewSize; diff --git a/rEFIt_UEFI/cpp_foundation/XUINTN.cpp b/rEFIt_UEFI/cpp_foundation/XUINTN.cpp deleted file mode 100755 index 0c46d04fa..000000000 --- a/rEFIt_UEFI/cpp_foundation/XUINTN.cpp +++ /dev/null @@ -1,27 +0,0 @@ -//************************************************************************************************* -//************************************************************************************************* -// -// STRING -// -// Developed by jief666, from 1997. -// -//************************************************************************************************* -//************************************************************************************************* - -#if 0 -#define DBG(...) DebugLog(2, __VA_ARGS__) -#else -#define DBG(...) -#endif - -#include "XToolsCommon.h" -#include "XUINTN.h" - -//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -// Constructor -//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx - - -//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx -// -//xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx diff --git a/rEFIt_UEFI/cpp_foundation/XUINTN.h b/rEFIt_UEFI/cpp_foundation/XUINTN.h deleted file mode 100755 index c55c42a80..000000000 --- a/rEFIt_UEFI/cpp_foundation/XUINTN.h +++ /dev/null @@ -1,73 +0,0 @@ -//************************************************************************************************* -//************************************************************************************************* -// -// STRING -// -//************************************************************************************************* -//************************************************************************************************* - -#if !defined(__XUINTN_H__) -#define __XUINTN_H__ - -#include "XToolsCommon.h" - -class XUINTN -{ -public: - UINTN m_value; - -public: - XUINTN() : m_value(0) {}; - XUINTN(UINT64 v) : m_value(v) {}; - XUINTN(unsigned int v) : m_value(v) {}; - XUINTN(INT64 v) { if ( v < 0 ) panic("XUINTN(INT64 v) -> value is < 0"); m_value=(UINT64)v; }; - XUINTN(int v) { if ( v < 0 ) panic("XUINTN(int v) -> value is < 0"); m_value=(UINT64)v; }; - - bool operator != (UINT8 u) const { return m_value != u; }; - bool operator != (UINT16 u) const { return m_value != u; }; - bool operator != (UINT32 u) const { return m_value != u; }; - bool operator != (UINT64 u) const { return m_value != u; }; - - bool operator != (INT8 i) const { if ( i < 0 ) return false; return m_value != (UINT8)i; }; - bool operator != (INT16 i) const { if ( i < 0 ) return false; return m_value != (UINT16)i; }; - bool operator != (INT32 i) const { if ( i < 0 ) return false; return m_value != (UINT32)i; }; - bool operator != (INT64 i) const { if ( i < 0 ) return false; return m_value != (UINT64)i; }; - - bool operator == (UINT8 u) const { return m_value == u; }; - bool operator == (UINT16 u) const { return m_value == u; }; - bool operator == (UINT32 u) const { return m_value == u; }; - bool operator == (UINT64 u) const { return m_value == u; }; - - bool operator == (INT8 i) const { if ( i < 0 ) return false; return m_value == (UINT8)i; }; - bool operator == (INT16 i) const { if ( i < 0 ) return false; return m_value == (UINT16)i; }; - bool operator == (INT32 i) const { if ( i < 0 ) return false; return m_value == (UINT32)i; }; - bool operator == (INT64 i) const { if ( i < 0 ) return false; return m_value == (UINT64)i; }; - -/* seems not needed to define all type for operator + and -, contrary to the other operators. */ -// UINTN operator + (int i) const { if ( (i>=0 && value + (unsigned int)i < value) || (i<0 && value + (unsigned int)i > value)) panic("UINTN operator + (int i) const -> overflow"); return (UINTN)(value + (unsigned int)i); }; -// UINTN operator + (UINT8 u) const { if ( value + u < value ) panic("UINTN operator + (UINT8 u) -> overflow"); return value + u; }; -// UINTN operator + (UINT16 u) const { if ( value + u < value ) panic("UINTN operator + (UINT16 u) -> overflow"); return value + u; }; -// UINTN operator + (UINT32 u) const { if ( value + u < value ) panic("UINTN operator + (UINT32 u) -> overflow"); return value + u; }; - UINTN operator + (UINT64 u) const { if ( m_value + u < m_value ) panic("UINTN operator + (UINT64 u) -> overflow"); return m_value + u; }; - - UINTN operator - (UINT64 u) const { if ( m_value - u > m_value ) panic("UINTN operator - (UINT64 u) -> overflow"); return m_value - u; }; - - UINTN operator > (UINT64 u) const { return m_value > u; }; - UINTN operator >= (UINT64 u) const { return m_value >= u; }; - UINTN operator < (UINT64 u) const { return m_value < u; }; - UINTN operator <= (UINT64 u) const { return m_value <= u; }; - - - explicit operator UINT8() const { if ( m_value > MAX_UINT8 ) panic("operator UINT8() const -> value too big to be casted as UINT8"); return (UINT8)m_value; }; - explicit operator UINT16() const { if ( m_value > MAX_UINT16 ) panic("operator UINT16() const -> value too big to be casted as UINT16"); return (UINT16)m_value; }; - explicit operator UINT32() const { if ( m_value > MAX_UINT32 ) panic("operator UINT32() const -> value too big to be casted as UINT32"); return (UINT32)m_value; }; - explicit operator UINT64() const { return m_value; }; - - explicit operator INT8() const { if ( m_value > MAX_INT8 ) panic("operator INT8() const -> value too big to be casted as INT8"); return (INT8)m_value; }; - explicit operator INT16() const { if ( m_value > MAX_INT16 ) panic("operator INT16() const -> value too big to be casted as INT16"); return (INT16)m_value; }; - explicit operator INT32() const { if ( m_value > MAX_INT32 ) panic("operator INT32() const -> value too big to be casted as INT32"); return (INT32)m_value; }; - explicit operator INT64() const { if ( m_value > MAX_INT64 ) panic("operator INT64() const -> value too big to be casted as INT64"); return (INT64)m_value; }; - -}; - -#endif diff --git a/rEFIt_UEFI/cpp_unit_test/XUINTN_test.cpp b/rEFIt_UEFI/cpp_unit_test/XUINTN_test.cpp deleted file mode 100755 index 54c0c2808..000000000 --- a/rEFIt_UEFI/cpp_unit_test/XUINTN_test.cpp +++ /dev/null @@ -1,267 +0,0 @@ -#include -#include "../cpp_foundation/XUINTN.h" -#include "../cpp_foundation/XStringWP.h" - -//#include - -#ifdef _MSC_VER -#pragma warning(disable : 4310) -#pragma warning(disable : 4127) -#endif - -#define CHECK_CTOR_FAIL(value, code) \ -{ \ - stop_at_panic = false; \ - i_have_panicked = false; \ - XUINTN xu(value); \ - if ( !i_have_panicked ) return code; \ - stop_at_panic = true; \ - i_have_panicked = false; \ -} - -#define CHECK_CTOR_8_16_32_64_int_FAIL(code) \ -{ \ - CHECK_CTOR_FAIL((INT8)-10, code); \ - CHECK_CTOR_FAIL((INT16)-10, code+1); \ - CHECK_CTOR_FAIL((INT32)-10, code+2); \ - CHECK_CTOR_FAIL((INT64)-10, code+3); \ - CHECK_CTOR_FAIL((int)-10, code+4); \ -} - -// return code..code+3 -#define CHECK_EQUAL_EQUAL_OPERATOR_OK_(xu, type, value, code) \ -{ \ - type u = (value); \ - if ( !(xu == u) ) return code; \ - if ( !(xu.operator ==(u)) ) return code+1; \ - if ( xu != u ) return code+2; \ - if ( xu.operator !=(u) ) return code+3; \ -} - -// return code..code+33 -#define CHECK_EQUAL_EQUAL_OPERATOR_8_16_32_64(type_root, value, code) \ -{ \ - XUINTN xu(145); \ - \ - if ( (value) < MAX_##type_root##8 ) { xu = (type_root##8)(value); CHECK_EQUAL_EQUAL_OPERATOR_OK_(xu, type_root##8, (type_root##8)(value), code); } \ - \ - if ( (value) < MAX_##type_root##16 ) { xu = (type_root##16)(value); CHECK_EQUAL_EQUAL_OPERATOR_OK_(xu, type_root##16, (type_root##16)(value), code+10); } \ - \ - if ( (value) < MAX_##type_root##32 ) { xu = (type_root##32)(value); CHECK_EQUAL_EQUAL_OPERATOR_OK_(xu, type_root##32, (type_root##32)(value), code+20); } \ - \ - if ( (value) < MAX_##type_root##64 ) { xu = (type_root##64)(value); CHECK_EQUAL_EQUAL_OPERATOR_OK_(xu, type_root##64, (type_root##64)(value), code+30); } \ -} - -// return code..code+7 -#define CHECK_EQUAL_EQUAL_OPERATOR_FAIL(xu, type, value, code) \ -{ \ - type u = (value); \ -\ - stop_at_panic = false; \ - i_have_panicked = false; \ - if ( xu == u ) ; \ - if ( !i_have_panicked ) return code+1; \ - i_have_panicked = false; \ - if ( xu.operator ==(u) ) ; \ - if ( !i_have_panicked ) return code+3; \ - i_have_panicked = false; \ - if ( xu != u ) ; \ - if ( !i_have_panicked ) return code+5; \ - i_have_panicked = false; \ - if ( xu.operator !=(u) ) ; \ - if ( !i_have_panicked ) return code+7; \ - stop_at_panic = true; \ - i_have_panicked = false; \ -} - -// return code..code+33 -#define CHECK_PLUS_27_OPERATOR(type_root, type, value, code) \ -{ \ - XUINTN xu(27); \ - XUINTN xu2(27); \ - xu2 = xu + (type)(value)-1; \ - if ( xu2.m_value != (UINTN)(value) + 27-1 ) return code; \ -} - -// return code..code+333 -#define CHECK_ALL_PLUS_OPERATOR(type_root, code) \ -{ \ - CHECK_PLUS_27_OPERATOR(type_root, type_root##8, MAX_##type_root##8-27, code) \ - CHECK_PLUS_27_OPERATOR(type_root, type_root##16, MAX_##type_root##16-27, code+100) \ - CHECK_PLUS_27_OPERATOR(type_root, type_root##32, MAX_##type_root##32-27, code+200) \ - CHECK_PLUS_27_OPERATOR(type_root, type_root##64, MAX_##type_root##64-27, code+300) \ -} - -// return code..code+33 -#define CHECK_MINUS_OPERATOR(type_root, type, value, code) \ -{ \ - XUINTN xu(MAX_##type); \ - XUINTN xu2(0); \ - xu2 = xu - (type)(value); \ - if ( xu2.m_value != (UINTN)MAX_##type - (value) ) return code; \ -} - -// return code..code+333 -#define CHECK_ALL_MINUS_OPERATOR(type_root, code) \ -{ \ - CHECK_MINUS_OPERATOR(type_root, type_root##8, 45, code) \ - CHECK_MINUS_OPERATOR(type_root, type_root##16, 45, code+100) \ - CHECK_MINUS_OPERATOR(type_root, type_root##32, 45, code+200) \ - CHECK_MINUS_OPERATOR(type_root, type_root##64, 45, code+300) \ - CHECK_MINUS_OPERATOR(type_root, type_root##8, MAX_##type_root##8-1, code) \ - CHECK_MINUS_OPERATOR(type_root, type_root##16, MAX_##type_root##16-1, code+100) \ - CHECK_MINUS_OPERATOR(type_root, type_root##32, MAX_##type_root##32-1, code+200) \ - CHECK_MINUS_OPERATOR(type_root, type_root##64, MAX_##type_root##64-1, code+300) \ -} - -// return code..code+33 -#define CHECK_SUPERIOR_OPERATOR(value1, type, value, code) \ -{ \ - XUINTN xu(value1); \ - if ( !(xu > (type)(value)) ) return code; \ - if ( xu <= (type)(value) ) return code+1; \ - xu = value; \ - if ( !(xu < (type)(value1)) ) return code+2; \ - if ( xu >= (type)(value1) ) return code+3; \ -} - -#define CHECK_ALL_SUPERIOR_OPERATOR(type_root, code) \ -{ \ - CHECK_SUPERIOR_OPERATOR(MAX_##type_root##8, type_root##8, MAX_##type_root##8-1, code) \ - CHECK_SUPERIOR_OPERATOR(MAX_##type_root##16, type_root##16, MAX_##type_root##16-1, code+10) \ - CHECK_SUPERIOR_OPERATOR(MAX_##type_root##32, type_root##32, MAX_##type_root##32-1, code+20) \ - CHECK_SUPERIOR_OPERATOR(MAX_##type_root##64, type_root##64, MAX_##type_root##64-1, code+30) \ - CHECK_SUPERIOR_OPERATOR(MAX_UINT32, unsigned int, MAX_UINT32-1, code+40) \ -} - -// return code..code+1 -#define CHECK_CAST_TO_TYPE_OK(type, value, code) \ -{ \ - stop_at_panic = false; \ - i_have_panicked = false; \ - XUINTN xu(value); \ - type u64; \ - u64 = (type)xu; \ - if ( i_have_panicked || u64 != (value) ) return code; \ - u64 = xu.operator type(); \ - if ( i_have_panicked || u64 != (value) ) return code+1; \ - stop_at_panic = true; \ - i_have_panicked = false; \ -} - -// return code..code+5 -#define CHECK_CAST_TO_TYPE_8_16_32_64_OK(type_root, code) \ -{ \ - CHECK_CAST_TO_TYPE_OK(type_root##8, (UINTN)MAX_##type_root##8, code); \ - CHECK_CAST_TO_TYPE_OK(type_root##16, (UINTN)MAX_##type_root##16, code+2); \ - CHECK_CAST_TO_TYPE_OK(type_root##32, (UINTN)MAX_##type_root##32, code+4); \ - CHECK_CAST_TO_TYPE_OK(type_root##64, (UINTN)MAX_##type_root##64, code+4); \ -} - -// return code..code+1 -#define CHECK_CAST_TO_TYPE_PANIC(type, value, code) \ -{ \ - stop_at_panic = false; \ - i_have_panicked = false; \ - XUINTN xu(value); \ - type u8; \ -\ - u8 = (type)xu; \ - if ( !i_have_panicked ) return code; \ -\ - /* same test as before. be sure that the overloaded cast is really called. */ \ - i_have_panicked = false; \ - u8 = xu.operator type(); \ - if ( !i_have_panicked ) return code+1; \ -\ - stop_at_panic = true; \ - i_have_panicked = false; \ -} - -// return code..code+5 -#define CHECK_CAST_TO_TYPE_8_16_32_PANIC(type_root, code) \ -{ \ - CHECK_CAST_TO_TYPE_PANIC(type_root##8, (UINTN)MAX_##type_root##8+1, code); \ - CHECK_CAST_TO_TYPE_PANIC(type_root##16, (UINTN)MAX_##type_root##16+1, code+2); \ - CHECK_CAST_TO_TYPE_PANIC(type_root##32, (UINTN)MAX_##type_root##32+1, code+4); \ -} - -int XUINTN_tests() -{ - - CHECK_CTOR_8_16_32_64_int_FAIL(200); - - - CHECK_EQUAL_EQUAL_OPERATOR_8_16_32_64(UINT, MAX_UINT8, 300); - CHECK_EQUAL_EQUAL_OPERATOR_8_16_32_64(UINT, MAX_UINT16, 400); - CHECK_EQUAL_EQUAL_OPERATOR_8_16_32_64(UINT, MAX_UINT32, 500); - CHECK_EQUAL_EQUAL_OPERATOR_8_16_32_64(UINT, MAX_UINT64, 600); - { - unsigned int ui = MAX_UINT32; - XUINTN xu = ui; - CHECK_EQUAL_EQUAL_OPERATOR_OK_(xu, unsigned int, (unsigned int)(MAX_UINT32), 680); - } - - CHECK_EQUAL_EQUAL_OPERATOR_8_16_32_64(INT, MAX_INT8, 700); - CHECK_EQUAL_EQUAL_OPERATOR_8_16_32_64(INT, MAX_INT16, 800); - CHECK_EQUAL_EQUAL_OPERATOR_8_16_32_64(INT, MAX_INT32, 900); - CHECK_EQUAL_EQUAL_OPERATOR_8_16_32_64(INT, MAX_INT64, 1000); - { - int i = MAX_INT32; - XUINTN xu = i; - CHECK_EQUAL_EQUAL_OPERATOR_OK_(xu, unsigned int, (unsigned int)(MAX_INT32), 690); - } - - - CHECK_ALL_PLUS_OPERATOR(UINT, 2000); - CHECK_ALL_PLUS_OPERATOR(INT, 3000); - CHECK_ALL_MINUS_OPERATOR(UINT, 2000); - CHECK_ALL_MINUS_OPERATOR(INT, 3000); - - // Check + operation that fail - { - stop_at_panic = false; - i_have_panicked = false; - - XUINTN xu1 = (UINT64)MAX_UINT64 - 1; - XUINTN xu2 = xu1 + 2; - if ( !i_have_panicked ) return 100; - (void)xu2; - - stop_at_panic = true; - i_have_panicked = false; - } - - CHECK_ALL_SUPERIOR_OPERATOR(UINT, 5000); - - CHECK_CAST_TO_TYPE_8_16_32_64_OK(UINT, 210); - if ( sizeof(unsigned int) == 4 ) { - CHECK_CAST_TO_TYPE_OK(unsigned int, (UINTN)MAX_UINT32, 220); - }else{ - panic("Please define unsigned int test in XUINTN_test.cpp"); - } - CHECK_CAST_TO_TYPE_8_16_32_PANIC(UINT, 220); - if ( sizeof(unsigned int) == 4 ) { - CHECK_CAST_TO_TYPE_PANIC(unsigned int, (UINTN)MAX_UINT32+1, 230); - }else{ - panic("Please define unsigned int test in XUINTN_test.cpp"); - } - - - CHECK_CAST_TO_TYPE_8_16_32_64_OK(INT, 240); - if ( sizeof(unsigned int) == 4 ) { - CHECK_CAST_TO_TYPE_OK(unsigned int, (UINTN)MAX_UINT32, 250); - }else{ - panic("Please define unsigned int test in XUINTN_test.cpp"); - } - CHECK_CAST_TO_TYPE_8_16_32_PANIC(INT, 260); - if ( sizeof(unsigned int) == 4 ) { - CHECK_CAST_TO_TYPE_PANIC(int, (UINTN)MAX_INT32+1, 270); - }else{ - panic("Please define unsigned int test in XUINTN_test.cpp"); - } - - - return 0; -} - diff --git a/rEFIt_UEFI/cpp_unit_test/XUINTN_test.h b/rEFIt_UEFI/cpp_unit_test/XUINTN_test.h deleted file mode 100644 index 7740d7f2b..000000000 --- a/rEFIt_UEFI/cpp_unit_test/XUINTN_test.h +++ /dev/null @@ -1 +0,0 @@ -int XUINTN_tests(); diff --git a/rEFIt_UEFI/cpp_unit_test/all_tests.cpp b/rEFIt_UEFI/cpp_unit_test/all_tests.cpp index 9659e93cb..c2b906d54 100644 --- a/rEFIt_UEFI/cpp_unit_test/all_tests.cpp +++ b/rEFIt_UEFI/cpp_unit_test/all_tests.cpp @@ -1,4 +1,4 @@ -#include +#include // Only use angled for Platform, else, xcode project won't compile #include "../cpp_foundation/XStringW.h" #include "../cpp_foundation/XArray.h" #include "../cpp_foundation/XObjArray.h" @@ -10,22 +10,32 @@ #include "XStringWArray_test.h" #include "XString_test.h" #include "XStringW_test.h" -#include "XUINTN_test.h" #include "strcmp_test.h" #include "strncmp_test.h" #include "strlen_test.h" -#include // Only use angled for Platform, else, xcode project won't compile #include "printf_lite-test.h" #include "LoadOptions_test.h" //#include "poolprint-test.h" //#include "printlib-test.h" + +/* On macOS + * sizeof(long)=8 + * sizeof(long long)=8 + * sizeof(size_t)=8 + */ + bool all_tests() { bool all_ok = true; int ret; #ifdef JIEF_DEBUG +// ret = XUINTN_tests(); +// if ( ret != 0 ) { +// DebugLog(2, "XUINTN_tests() failed at test %d\n", ret); +// all_ok = false; +// } #if defined(CLOVER_BUILD) // ret = printlib_tests(); // if ( ret != 0 ) { @@ -96,20 +106,31 @@ bool all_tests() DebugLog(2, "XStringWArray_tests() failed at test %d\n", ret); all_ok = false; } - ret = XUINTN_tests(); - if ( ret != 0 ) { - DebugLog(2, "XUINTN_tests() failed at test %d\n", ret); - all_ok = false; - } +// ret = XUINTN_tests(); +// if ( ret != 0 ) { +// DebugLog(2, "XUINTN_tests() failed at test %d\n", ret); +// all_ok = false; +// } if ( !all_ok ) { DebugLog(2, "A test failed\n"); - PauseForKey(L"press"); - }else{ -#ifdef JIEF_DEBUG - DebugLog(2, "All tests are ok\n"); -// PauseForKey(L"press"); -#endif } + +#if defined(JIEF_DEBUG) + if ( !all_ok ) { + printf("All tests are NOT ok\n"); + }else{ + printf("All tests are ok\n"); + } +#endif + +#if defined(CLOVER_BUILD) && defined(JIEF_DEBUG) + if ( !all_ok ) { +// PauseForKey(L"press"); + }else{ + PauseForKey(L"press"); + } +#endif + return all_ok; } diff --git a/rEFIt_UEFI/cpp_util/globals_dtor.cpp b/rEFIt_UEFI/cpp_util/globals_dtor.cpp index 09631c749..e344de6a6 100755 --- a/rEFIt_UEFI/cpp_util/globals_dtor.cpp +++ b/rEFIt_UEFI/cpp_util/globals_dtor.cpp @@ -14,7 +14,8 @@ typedef void (destructor_func_t)(void*); #elif defined(_MSC_VER) typedef void (__cdecl destructor_func_t)(void); -extern "C" int _fltused = 0; // it should be a single underscore since the double one is the mangled name +// Next was needed at some point. 2020-04-08 today it's breaking compilation in VS Studio (but not with edkII build system) +//extern "C" int _fltused = 0; // it should be a single underscore since the double one is the mangled name #else # error compiler not supported #endif diff --git a/rEFIt_UEFI/cpp_util/panic.h b/rEFIt_UEFI/cpp_util/panic.h index 6b2e7bc23..09bb3cb51 100644 --- a/rEFIt_UEFI/cpp_util/panic.h +++ b/rEFIt_UEFI/cpp_util/panic.h @@ -7,4 +7,11 @@ extern bool i_have_panicked; void panic(void); void panic(const char* s); +class DontStopAtPanic +{ + public: + DontStopAtPanic() { stop_at_panic = false; i_have_panicked = false; } + ~DontStopAtPanic() { stop_at_panic = true; i_have_panicked = false; } +}; + #endif diff --git a/rEFIt_UEFI/libeg/VectorGraphics.cpp b/rEFIt_UEFI/libeg/VectorGraphics.cpp index bdfebc7c2..3919a4395 100755 --- a/rEFIt_UEFI/libeg/VectorGraphics.cpp +++ b/rEFIt_UEFI/libeg/VectorGraphics.cpp @@ -66,7 +66,7 @@ textFaces textFace[4]; //0-help 1-message 2-menu 3-test, far future it wil NSVGparser *mainParser = NULL; //it must be global variable #if USE_XTHEME -EFI_STATUS XTheme::ParseSVGXIcon(void *parser, INTN Id, const XString& IconNameX, float Scale, XImage* Image) +EFI_STATUS XTheme::ParseSVGXIcon(void *parser, INTN Id, const XString& IconNameX, float iconScale, XImage* Image) // scale renamed iconScale to not hide member var Scale { EFI_STATUS Status = EFI_NOT_FOUND; NSVGimage *SVGimage; @@ -115,12 +115,12 @@ EFI_STATUS XTheme::ParseSVGXIcon(void *parser, INTN Id, const XString& IconNameX } if ((strstr(IconName, "selection_big") != NULL) && (!SelectionOnTop)) { - MainEntriesSize = (int)(IconImage->width * Scale); //xxx - row0TileSize = MainEntriesSize + (int)(16.f * Scale); + MainEntriesSize = (int)(IconImage->width * iconScale); //xxx + row0TileSize = MainEntriesSize + (int)(16.f * iconScale); DBG("main entry size = %lld\n", MainEntriesSize); } if ((strstr(IconName, "selection_small") != NULL) && (!SelectionOnTop)) { - row1TileSize = (int)(IconImage->width * Scale); + row1TileSize = (int)(IconImage->width * iconScale); } // not exclude BoundingRect from IconImage? @@ -193,13 +193,13 @@ EFI_STATUS XTheme::ParseSVGXIcon(void *parser, INTN Id, const XString& IconNameX nsvg__imageBounds(p2, bounds); CopyMem(IconImage->realBounds, bounds, 4 * sizeof(float)); if ((Id == BUILTIN_ICON_BANNER) && (strstr(IconName, "Banner") != NULL)) { - BannerPosX = (int)(bounds[0] * Scale - CentreShift); - BannerPosY = (int)(bounds[1] * Scale); + BannerPosX = (int)(bounds[0] * iconScale - CentreShift); + BannerPosY = (int)(bounds[1] * iconScale); DBG("Banner position at parse [%lld,%lld]\n", BannerPosX, BannerPosY); } - float Height = IconImage->height * Scale; - float Width = IconImage->width * Scale; + float Height = IconImage->height * iconScale; + float Width = IconImage->width * iconScale; // DBG("icon %s width=%f height=%f\n", IconName, Width, Height); int iWidth = (int)(Width + 0.5f); int iHeight = (int)(Height + 0.5f); @@ -216,13 +216,13 @@ EFI_STATUS XTheme::ParseSVGXIcon(void *parser, INTN Id, const XString& IconNameX if ((Id != BUILTIN_ICON_BACKGROUND) && (Id != BUILTIN_ICON_ANIME) && (strstr(IconName, "Banner") == NULL)) { - float realWidth = (bounds[2] - bounds[0]) * Scale; - float realHeight = (bounds[3] - bounds[1]) * Scale; + float realWidth = (bounds[2] - bounds[0]) * iconScale; + float realHeight = (bounds[3] - bounds[1]) * iconScale; tx = (Width - realWidth) * 0.5f; ty = (Height - realHeight) * 0.5f; } - nsvgRasterize(rast, IconImage, tx,ty,Scale,Scale, (UINT8*)NewImage.GetPixelPtr(0,0), iWidth, iHeight, iWidth*4); + nsvgRasterize(rast, IconImage, tx,ty,iconScale,iconScale, (UINT8*)NewImage.GetPixelPtr(0,0), iWidth, iHeight, iWidth*4); // DBG("%s rastered, blt\n", IconImage); nsvgDeleteRasterizer(rast); diff --git a/rEFIt_UEFI/libeg/text.cpp b/rEFIt_UEFI/libeg/text.cpp index 8d51d9708..eac236ff3 100644 --- a/rEFIt_UEFI/libeg/text.cpp +++ b/rEFIt_UEFI/libeg/text.cpp @@ -536,8 +536,8 @@ INTN XTheme::RenderText(IN const XStringW& Text, OUT XImage* CompImage_ptr, Area.Width = RealWidth; Bukva.XPos = c * FontWidth + RightSpace; // DBG("place [%lld,%lld,%lld,%lld], bukva [%lld,%lld,%lld,%lld]\n", - Area.XPos, Area.YPos, Area.Width, Area.Height, - Bukva.XPos, Bukva.YPos, Bukva.Width, Bukva.Height); +// Area.XPos, Area.YPos, Area.Width, Area.Height, +// Bukva.XPos, Bukva.YPos, Bukva.Width, Bukva.Height); // Bukva.YPos CompImage.Compose(Area, Bukva, FontImage, false); // CompImage.CopyRect(FontImage, Area, Bukva); diff --git a/rEFIt_UEFI/refit.inf b/rEFIt_UEFI/refit.inf index e2a8246ae..9e43c352c 100644 --- a/rEFIt_UEFI/refit.inf +++ b/rEFIt_UEFI/refit.inf @@ -227,8 +227,8 @@ cpp_foundation/XStringWP.h cpp_foundation/XToolsCommon.cpp cpp_foundation/XToolsCommon.h - cpp_foundation/XUINTN.cpp - cpp_foundation/XUINTN.h +# cpp_foundation/XUINTN.cpp +# cpp_foundation/XUINTN.h cpp_unit_test/all_tests.h cpp_unit_test/all_tests.cpp cpp_unit_test/global_test.h @@ -256,8 +256,8 @@ cpp_unit_test/XStringW_test.h cpp_unit_test/XStringWArray_test.cpp cpp_unit_test/XStringWArray_test.h - cpp_unit_test/XUINTN_test.cpp - cpp_unit_test/XUINTN_test.h +# cpp_unit_test/XUINTN_test.cpp +# cpp_unit_test/XUINTN_test.h [Sources.IA32] libeg/ftol.asm | MSFT