From ee6124bd101d675568600de865e3e0fd3902116f Mon Sep 17 00:00:00 2001 From: Jief L Date: Thu, 26 Mar 2020 15:59:20 +0300 Subject: [PATCH] Bye bye PoolPrintFloat. --- Include/Library/printf_lite.h | 2 +- Library/MemLogLibDefault/MemLogLibDefault.inf | 2 + Library/MemLogLibDefault/printf_lite.c | 4 +- .../CloverX64.xcodeproj/project.pbxproj | 1214 ++++++++++++++++- Xcode/CloverX64/clang-slink | 2 +- .../cpp_tests.xcodeproj/project.pbxproj | 34 +- .../old/poolprintfloat-test-cpp_conf.h | 12 + Xcode/cpp_tests/old/poolprintfloat-test.cpp | 135 ++ Xcode/cpp_tests/old/poolprintfloat-test.h | 1 + Xcode/cpp_tests/src/panic.cpp | 38 - Xcode/cpp_tests/src/panic.h | 10 - Xcode/cpp_tests/src/poolprint-test-cpp_conf.h | 13 + .../src/poolprintfloat-test-cpp_conf.h | 12 + Xcode/cpp_tests/src/posix.h | 3 +- Xcode/cpp_tests/src/printf_lite-conf.h | 36 + .../cpp_tests/src/printf_lite-test-cpp_conf.h | 12 + Xcode/cpp_tests/src/printlib-test-cpp_conf.h | 12 + rEFIt_UEFI/Platform/BootLog.h | 2 +- rEFIt_UEFI/Platform/Events.cpp | 5 + rEFIt_UEFI/Platform/FixBiosDsdt.cpp | 10 +- rEFIt_UEFI/Platform/LegacyBiosThunk.cpp | 3 + rEFIt_UEFI/Platform/Platform.h | 2 + rEFIt_UEFI/Platform/Posix/stdio.cpp | 12 +- rEFIt_UEFI/Platform/Posix/stdio.h | 4 +- rEFIt_UEFI/Platform/gma.cpp | 284 ++-- rEFIt_UEFI/Platform/kernel_patcher.cpp | 23 +- rEFIt_UEFI/Platform/kext_inject.cpp | 8 +- rEFIt_UEFI/Platform/kext_patcher.cpp | 23 +- rEFIt_UEFI/Platform/spd.cpp | 4 +- rEFIt_UEFI/Platform/usbfix.cpp | 4 +- rEFIt_UEFI/cpp_foundation/XString.cpp | 60 +- rEFIt_UEFI/cpp_foundation/XString.h | 78 +- rEFIt_UEFI/cpp_foundation/XStringW.cpp | 16 +- rEFIt_UEFI/cpp_foundation/XStringW.h | 46 +- rEFIt_UEFI/cpp_foundation/XToolsCommon.h | 10 +- rEFIt_UEFI/cpp_unit_test/XStringW_test.cpp | 255 ++-- rEFIt_UEFI/cpp_unit_test/XString_test.cpp | 57 +- rEFIt_UEFI/cpp_unit_test/all_tests.cpp | 24 +- .../cpp_unit_test/poolprint-test-cpp_conf.h | 1 - rEFIt_UEFI/cpp_unit_test/poolprint-test.cpp | 2 +- .../cpp_unit_test/printf_lite-test-cpp_conf.h | 1 - rEFIt_UEFI/cpp_unit_test/printf_lite-test.cpp | 4 +- .../cpp_unit_test/printlib-test-cpp_conf.h | 1 - rEFIt_UEFI/cpp_unit_test/printlib-test.cpp | 2 +- rEFIt_UEFI/libeg/FloatLib.cpp | 58 +- rEFIt_UEFI/libeg/FloatLib.h | 4 +- rEFIt_UEFI/libeg/VectorGraphics.cpp | 22 +- rEFIt_UEFI/libeg/libscreen.cpp | 6 +- rEFIt_UEFI/libeg/load_icns.cpp | 4 +- rEFIt_UEFI/libeg/nanosvg.cpp | 22 +- rEFIt_UEFI/libeg/nanosvgrast.cpp | 4 +- rEFIt_UEFI/libeg/text.cpp | 6 +- rEFIt_UEFI/refit.inf | 2 + rEFIt_UEFI/refit/lib.h | 2 +- rEFIt_UEFI/refit/main.cpp | 8 +- rEFIt_UEFI/refit/screen.cpp | 2 +- rEFIt_UEFI/refit/screen.h | 4 +- 57 files changed, 2095 insertions(+), 532 deletions(-) create mode 100644 Xcode/cpp_tests/old/poolprintfloat-test-cpp_conf.h create mode 100644 Xcode/cpp_tests/old/poolprintfloat-test.cpp create mode 100644 Xcode/cpp_tests/old/poolprintfloat-test.h delete mode 100644 Xcode/cpp_tests/src/panic.cpp delete mode 100644 Xcode/cpp_tests/src/panic.h create mode 100644 Xcode/cpp_tests/src/poolprint-test-cpp_conf.h create mode 100644 Xcode/cpp_tests/src/poolprintfloat-test-cpp_conf.h create mode 100755 Xcode/cpp_tests/src/printf_lite-conf.h create mode 100644 Xcode/cpp_tests/src/printf_lite-test-cpp_conf.h create mode 100644 Xcode/cpp_tests/src/printlib-test-cpp_conf.h diff --git a/Include/Library/printf_lite.h b/Include/Library/printf_lite.h index 70275327c..a085410d9 100755 --- a/Include/Library/printf_lite.h +++ b/Include/Library/printf_lite.h @@ -10,7 +10,7 @@ #include #include // for size_t -#include "printf_lite-conf.h" +#include #if defined(__cplusplus) extern "C" diff --git a/Library/MemLogLibDefault/MemLogLibDefault.inf b/Library/MemLogLibDefault/MemLogLibDefault.inf index 85656160a..3bc2bbf85 100644 --- a/Library/MemLogLibDefault/MemLogLibDefault.inf +++ b/Library/MemLogLibDefault/MemLogLibDefault.inf @@ -20,6 +20,8 @@ GenericIch.h printf_lite.h printf_lite.c + ../../Include/Library/printf_lite.h + ../../Include/Library/printf_lite-conf.h [Packages] MdePkg/MdePkg.dec diff --git a/Library/MemLogLibDefault/printf_lite.c b/Library/MemLogLibDefault/printf_lite.c index 2bba1e881..2bfdc406b 100644 --- a/Library/MemLogLibDefault/printf_lite.c +++ b/Library/MemLogLibDefault/printf_lite.c @@ -466,13 +466,13 @@ __attribute__((noinline, section(".printf_lite"))) #endif static void print_string(const char* s, PrintfParams* printfParams) { - while ( *s ) print_char(*s++, printfParams); + if ( s ) while ( *s ) print_char(*s++, printfParams); } #if PRINTF_UNICODE_OUTPUT_SUPPORT static void wprint_string(const wchar_t* s, PrintfParams* printfParams) { - while ( *s ) print_wchar(*s++, printfParams); + if ( s ) while ( *s ) print_wchar(*s++, printfParams); } #endif diff --git a/Xcode/CloverX64/CloverX64.xcodeproj/project.pbxproj b/Xcode/CloverX64/CloverX64.xcodeproj/project.pbxproj index 1a0b63890..4c8760719 100644 --- a/Xcode/CloverX64/CloverX64.xcodeproj/project.pbxproj +++ b/Xcode/CloverX64/CloverX64.xcodeproj/project.pbxproj @@ -214,6 +214,424 @@ 9AF41564242BABC700D2644C /* printlib-test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AF41561242BABC700D2644C /* printlib-test.cpp */; }; 9AF41566242BAD5600D2644C /* printf_lite-test-cpp_conf.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AF41565242BAD5600D2644C /* printf_lite-test-cpp_conf.h */; }; 9AF41568242BAD7D00D2644C /* poolprint-test-cpp_conf.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AF41567242BAD7D00D2644C /* poolprint-test-cpp_conf.h */; }; + 9AF41584242CD75C00D2644C /* panic.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77FA924176C04005CDD5C /* panic.h */; }; + 9AF41585242CD75C00D2644C /* MSKEK.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F8524176C04005CDD5C /* MSKEK.h */; }; + 9AF41586242CD75C00D2644C /* menu_items.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F8E24176C04005CDD5C /* menu_items.h */; }; + 9AF41587242CD75C00D2644C /* XTheme.h in Headers */ = {isa = PBXBuildFile; fileRef = A5E326302428F4EE002240E8 /* XTheme.h */; }; + 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 */; }; + 9AF41590242CD75C00D2644C /* loader.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F8224176C04005CDD5C /* loader.h */; }; + 9AF41591242CD75C00D2644C /* unicode_conversions.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A9D3B2524221570006D8CD9 /* unicode_conversions.h */; }; + 9AF41592242CD75C00D2644C /* CloverKEK.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F8824176C04005CDD5C /* CloverKEK.h */; }; + 9AF41593242CD75C00D2644C /* StateGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F1C24176C04005CDD5C /* StateGenerator.h */; }; + 9AF41594242CD75C00D2644C /* remove_ref.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77FAA24176C04005CDD5C /* remove_ref.h */; }; + 9AF41595242CD75C00D2644C /* wchar.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A9D3B2A242215A1006D8CD9 /* wchar.h */; }; + 9AF41596242CD75C00D2644C /* loader.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F4824176C04005CDD5C /* loader.h */; }; + 9AF41597242CD75C00D2644C /* AmlGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F1E24176C04005CDD5C /* AmlGenerator.h */; }; + 9AF41598242CD75C00D2644C /* XStringW.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77FAE24176C04005CDD5C /* XStringW.h */; }; + 9AF41599242CD75C00D2644C /* utf8Conversion.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77FB224176C04005CDD5C /* utf8Conversion.h */; }; + 9AF4159A242CD75C00D2644C /* stdarg.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A28CCA1241B66EA00F3D247 /* stdarg.h */; }; + 9AF4159B242CD75C00D2644C /* posix.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A28CCA0241B66EA00F3D247 /* posix.h */; }; + 9AF4159C242CD75C00D2644C /* list.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F9824176C04005CDD5C /* list.h */; }; + 9AF4159D242CD75C00D2644C /* stdlib.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A28CC9A241B66EA00F3D247 /* stdlib.h */; }; + 9AF4159E242CD75C00D2644C /* XObjArray_tests.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77ED324176C04005CDD5C /* XObjArray_tests.h */; }; + 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 */; }; + 9AF415A6242CD75C00D2644C /* global_test.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC780B42417EE53005CDD5C /* global_test.h */; }; + 9AF415A7242CD75C00D2644C /* CanonicalDB.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F7D24176C04005CDD5C /* CanonicalDB.h */; }; + 9AF415A8242CD75C00D2644C /* nanosvg.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F7224176C04005CDD5C /* nanosvg.h */; }; + 9AF415A9242CD75C00D2644C /* printf_lite-test-cpp_conf.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AF41565242BAD5600D2644C /* printf_lite-test-cpp_conf.h */; }; + 9AF415AA242CD75C00D2644C /* CloverDB.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F7B24176C04005CDD5C /* CloverDB.h */; }; + 9AF415AB242CD75C00D2644C /* LegacyBiosThunk.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F4B24176C04005CDD5C /* LegacyBiosThunk.h */; }; + 9AF415AC242CD75C00D2644C /* tool.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F8424176C04005CDD5C /* tool.h */; }; + 9AF415AD242CD75C00D2644C /* globals_dtor.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77FA124176C04005CDD5C /* globals_dtor.h */; }; + 9AF415AE242CD75C00D2644C /* screen.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F9D24176C04005CDD5C /* screen.h */; }; + 9AF415AF242CD75C00D2644C /* printlib-test.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AF41560242BABC700D2644C /* printlib-test.h */; }; + 9AF415B0242CD75C00D2644C /* DataHubCpu.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F3924176C04005CDD5C /* DataHubCpu.h */; }; + 9AF415B1242CD75C00D2644C /* lib.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F9724176C04005CDD5C /* lib.h */; }; + 9AF415B2242CD75C00D2644C /* b64cdecode.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F4C24176C04005CDD5C /* b64cdecode.h */; }; + 9AF415B3242CD75C00D2644C /* EfiFileLib.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F6B24176C04005CDD5C /* EfiFileLib.h */; }; + 9AF415B4242CD75C00D2644C /* menu_globals.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F8F24176C04005CDD5C /* menu_globals.h */; }; + 9AF415B5242CD75C00D2644C /* XObjArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77FB724176C04005CDD5C /* XObjArray.h */; }; + 9AF415B6242CD75C00D2644C /* string.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F5A24176C04005CDD5C /* string.h */; }; + 9AF415B8242CD75C00D2644C /* sse3_5_patcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F2A24176C04005CDD5C /* sse3_5_patcher.h */; }; + 9AF415B9242CD75C00D2644C /* spd.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F5524176C04005CDD5C /* spd.h */; }; + 9AF415BA242CD75C00D2644C /* IO.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F9A24176C04005CDD5C /* IO.h */; }; + 9AF415BB242CD75C00D2644C /* device_inject.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F2E24176C04005CDD5C /* device_inject.h */; }; + 9AF415BC242CD75C00D2644C /* entry_scan.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F8024176C04005CDD5C /* entry_scan.h */; }; + 9AF415BD242CD75C00D2644C /* LoaderUefi.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F2924176C04005CDD5C /* LoaderUefi.h */; }; + 9AF415BE242CD75C00D2644C /* hda.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F2D24176C04005CDD5C /* hda.h */; }; + 9AF415BF242CD75C00D2644C /* all_tests.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77ED724176C04005CDD5C /* all_tests.h */; }; + 9AF415C0242CD75C00D2644C /* strncmp_test.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A28CD30241BC0DF00F3D247 /* strncmp_test.h */; }; + 9AF415C1242CD75C00D2644C /* XPointer.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F6324176C04005CDD5C /* XPointer.h */; }; + 9AF415C2242CD75C00D2644C /* XToolsCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77FAD24176C04005CDD5C /* XToolsCommon.h */; }; + 9AF415C3242CD75C00D2644C /* stdio.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A9D3B29242215A1006D8CD9 /* stdio.h */; }; + 9AF415C4242CD75C00D2644C /* bootscreen.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F8724176C04005CDD5C /* bootscreen.h */; }; + 9AF415C5242CD75C00D2644C /* limits.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A28CC9B241B66EA00F3D247 /* limits.h */; }; + 9AF415C6242CD75C00D2644C /* Settings.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F2524176C04005CDD5C /* Settings.h */; }; + 9AF415C7242CD75C00D2644C /* XStringW_test.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77ED224176C04005CDD5C /* XStringW_test.h */; }; + 9AF415C8242CD75C00D2644C /* printf_lite_test.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A9D3B2024221562006D8CD9 /* printf_lite_test.h */; }; + 9AF415C9242CD75C00D2644C /* ati_reg.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F4F24176C04005CDD5C /* ati_reg.h */; }; + 9AF415CA242CD75C00D2644C /* libegint.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F6124176C04005CDD5C /* libegint.h */; }; + 9AF415CB242CD75C00D2644C /* memvendors.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F1D24176C04005CDD5C /* memvendors.h */; }; + 9AF415CC242CD75C00D2644C /* kernel_patcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F2224176C04005CDD5C /* kernel_patcher.h */; }; + 9AF415CD242CD75C00D2644C /* memory.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77FA824176C04005CDD5C /* memory.h */; }; + 9AF415CE242CD75C00D2644C /* menu.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F9C24176C04005CDD5C /* menu.h */; }; + 9AF415CF242CD75C00D2644C /* MSUEFICADB.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F7C24176C04005CDD5C /* MSUEFICADB.h */; }; + 9AF415D0242CD75C00D2644C /* Hibernate.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F1A24176C04005CDD5C /* Hibernate.h */; }; + 9AF415D1242CD75C00D2644C /* strlen_test.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A28CD2F241BC0DF00F3D247 /* strlen_test.h */; }; + 9AF415D2242CD75C00D2644C /* XArray_tests.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77ECD24176C04005CDD5C /* XArray_tests.h */; }; + 9AF415D3242CD75C00D2644C /* Handle.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F1524176C04005CDD5C /* Handle.h */; }; + 9AF415D4242CD75C00D2644C /* XArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77FB624176C04005CDD5C /* XArray.h */; }; + 9AF415D5242CD75C00D2644C /* MSPCADB.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F7724176C04005CDD5C /* MSPCADB.h */; }; + 9AF415D6242CD75C00D2644C /* libeg.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F6824176C04005CDD5C /* libeg.h */; }; + 9AF415D7242CD75C00D2644C /* HdaCodecDump.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F4124176C04005CDD5C /* HdaCodecDump.h */; }; + 9AF415D8242CD75C00D2644C /* kext_inject.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F4924176C04005CDD5C /* kext_inject.h */; }; + 9AF415D9242CD75C00D2644C /* Nvram.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F2624176C04005CDD5C /* Nvram.h */; }; + 9AF415DA242CD75C00D2644C /* poolprint-test-cpp_conf.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AF41567242BAD7D00D2644C /* poolprint-test-cpp_conf.h */; }; + 9AF415DB242CD75C00D2644C /* gma.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F1724176C04005CDD5C /* gma.h */; }; + 9AF415DC242CD75C00D2644C /* sse3_patcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F3B24176C04005CDD5C /* sse3_patcher.h */; }; + 9AF415DD242CD75C00D2644C /* Version.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F1224176C04005CDD5C /* Version.h */; }; + 9AF415DE242CD75C00D2644C /* XString_test.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A28CC96241AB34800F3D247 /* XString_test.h */; }; + 9AF415DF242CD75C00D2644C /* stdint.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A28CCA2241B66EA00F3D247 /* stdint.h */; }; + 9AF415E0242CD75C00D2644C /* REFIT_MENU_SCREEN.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F9024176C04005CDD5C /* REFIT_MENU_SCREEN.h */; }; + 9AF415E1242CD75C00D2644C /* Platform.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F5824176C04005CDD5C /* Platform.h */; }; + 9AF415E2242CD75C00D2644C /* XImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F7124176C04005CDD5C /* XImage.h */; }; + 9AF415E3242CD75C00D2644C /* globals_ctor.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77FA424176C04005CDD5C /* globals_ctor.h */; }; + 9AF415E4242CD75C00D2644C /* poolprint-test.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AF4155B242B8FA300D2644C /* poolprint-test.h */; }; + 9AF415E5242CD75C00D2644C /* stddef.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A28CC9C241B66EA00F3D247 /* stddef.h */; }; + 9AF415E6242CD75C00D2644C /* securebootkeys.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F8124176C04005CDD5C /* securebootkeys.h */; }; + 9AF415E7242CD75C00D2644C /* string.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A9D3B2B242215A1006D8CD9 /* string.h */; }; + 9AF415E8242CD75C00D2644C /* XString.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A28CC92241AB33700F3D247 /* XString.h */; }; + 9AF415E9242CD75C00D2644C /* FloatLib.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F7324176C04005CDD5C /* FloatLib.h */; }; + 9AF415EB242CD75C00D2644C /* Hibernate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F1F24176C04005CDD5C /* Hibernate.cpp */; }; + 9AF415EC242CD75C00D2644C /* wchar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9D3B2C242215A1006D8CD9 /* wchar.cpp */; }; + 9AF415ED242CD75C00D2644C /* DataHubCpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F2C24176C04005CDD5C /* DataHubCpu.cpp */; }; + 9AF415EE242CD75C00D2644C /* hda.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F3F24176C04005CDD5C /* hda.cpp */; }; + 9AF415EF242CD75C00D2644C /* egemb_icons_dark.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F5E24176C04005CDD5C /* egemb_icons_dark.cpp */; }; + 9AF415F0242CD75C00D2644C /* scroll_images.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F6924176C04005CDD5C /* scroll_images.cpp */; }; + 9AF415F1242CD75C00D2644C /* XStringWArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77FAF24176C04005CDD5C /* XStringWArray.cpp */; }; + 9AF415F2242CD75C00D2644C /* PlatformDriverOverride.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F2724176C04005CDD5C /* PlatformDriverOverride.cpp */; }; + 9AF415F3242CD75C00D2644C /* HdaCodecDump.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F1924176C04005CDD5C /* HdaCodecDump.cpp */; }; + 9AF415F4242CD75C00D2644C /* Nvram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F3124176C04005CDD5C /* Nvram.cpp */; }; + 9AF415F5242CD75C00D2644C /* BootOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F3A24176C04005CDD5C /* BootOptions.cpp */; }; + 9AF415F6242CD75C00D2644C /* stdio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9D3B28242215A1006D8CD9 /* stdio.cpp */; }; + 9AF415F7242CD75C00D2644C /* operatorNewDelete.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77FA724176C04005CDD5C /* operatorNewDelete.cpp */; }; + 9AF415F8242CD75C00D2644C /* securehash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F8B24176C04005CDD5C /* securehash.cpp */; }; + 9AF415F9242CD75C00D2644C /* image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F6424176C04005CDD5C /* image.cpp */; }; + 9AF415FA242CD75C00D2644C /* Events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F4D24176C04005CDD5C /* Events.cpp */; }; + 9AF415FB242CD75C00D2644C /* libscreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F7424176C04005CDD5C /* libscreen.cpp */; }; + 9AF415FC242CD75C00D2644C /* strlen_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A28CD2B241BC0DF00F3D247 /* strlen_test.cpp */; }; + 9AF415FD242CD75C00D2644C /* panic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77FA624176C04005CDD5C /* panic.cpp */; }; + 9AF415FE242CD75C00D2644C /* printlib-test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AF41561242BABC700D2644C /* printlib-test.cpp */; }; + 9AF415FF242CD75C00D2644C /* XStringW_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77ED824176C04005CDD5C /* XStringW_test.cpp */; }; + 9AF41600242CD75C00D2644C /* tool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F8924176C04005CDD5C /* tool.cpp */; }; + 9AF41601242CD75C00D2644C /* lib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F9624176C04005CDD5C /* lib.cpp */; }; + 9AF41602242CD75C00D2644C /* Injectors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F3524176C04005CDD5C /* Injectors.cpp */; }; + 9AF41603242CD75C00D2644C /* menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F9524176C04005CDD5C /* menu.cpp */; }; + 9AF41604242CD75C00D2644C /* b64cdecode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F2F24176C04005CDD5C /* b64cdecode.cpp */; }; + 9AF41605242CD75C00D2644C /* globals_dtor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77FA224176C04005CDD5C /* globals_dtor.cpp */; }; + 9AF41606242CD75C00D2644C /* DevicePath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F4724176C04005CDD5C /* DevicePath.cpp */; }; + 9AF41607242CD75C00D2644C /* XArray_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77ED624176C04005CDD5C /* XArray_tests.cpp */; }; + 9AF41608242CD75C00D2644C /* StateGenerator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F2124176C04005CDD5C /* StateGenerator.cpp */; }; + 9AF41609242CD75C00D2644C /* XImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F7524176C04005CDD5C /* XImage.cpp */; }; + 9AF4160A242CD75C00D2644C /* platformdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F4224176C04005CDD5C /* platformdata.cpp */; }; + 9AF4160B242CD75C00D2644C /* strcmp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A28CD26241BC0C700F3D247 /* strcmp.cpp */; }; + 9AF4160C242CD75C00D2644C /* XPointer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F7024176C04005CDD5C /* XPointer.cpp */; }; + 9AF4160D242CD75C00D2644C /* strncmp_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A28CD2E241BC0DF00F3D247 /* strncmp_test.cpp */; }; + 9AF4160E242CD75C00D2644C /* list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F9B24176C04005CDD5C /* list.cpp */; }; + 9AF4160F242CD75C00D2644C /* IO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F9924176C04005CDD5C /* IO.cpp */; }; + 9AF41610242CD75C00D2644C /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F4A24176C04005CDD5C /* sound.cpp */; }; + 9AF41611242CD75C00D2644C /* usbfix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F5624176C04005CDD5C /* usbfix.cpp */; }; + 9AF41612242CD75C00D2644C /* BmLib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F5F24176C04005CDD5C /* BmLib.cpp */; }; + 9AF41613242CD75C00D2644C /* card_vlist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F5724176C04005CDD5C /* card_vlist.cpp */; }; + 9AF41614242CD75C00D2644C /* global_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC780B22417EE4A005CDD5C /* global_test.cpp */; }; + 9AF41615242CD75C00D2644C /* XTheme.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5E3262F2428F4EE002240E8 /* XTheme.cpp */; }; + 9AF41616242CD75C00D2644C /* load_icns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F6F24176C04005CDD5C /* load_icns.cpp */; }; + 9AF41617242CD75C00D2644C /* egemb_font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F6A24176C04005CDD5C /* egemb_font.cpp */; }; + 9AF41618242CD75C00D2644C /* securemenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F7E24176C04005CDD5C /* securemenu.cpp */; }; + 9AF41619242CD75C00D2644C /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F6624176C04005CDD5C /* text.cpp */; }; + 9AF4161A242CD75C00D2644C /* AmlGenerator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F2324176C04005CDD5C /* AmlGenerator.cpp */; }; + 9AF4161B242CD75C00D2644C /* all_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77ED424176C04005CDD5C /* all_tests.cpp */; }; + 9AF4161C242CD75C00D2644C /* securevars.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F7F24176C04005CDD5C /* securevars.cpp */; }; + 9AF4161E242CD75C00D2644C /* loader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F8A24176C04005CDD5C /* loader.cpp */; }; + 9AF4161F242CD75C00D2644C /* XObjArray_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77ED524176C04005CDD5C /* XObjArray_tests.cpp */; }; + 9AF41620242CD75C00D2644C /* XStringWP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC780B72417F359005CDD5C /* XStringWP.cpp */; }; + 9AF41621242CD75C00D2644C /* memory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77FA024176C04005CDD5C /* memory.cpp */; }; + 9AF41622242CD75C00D2644C /* cpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F5224176C04005CDD5C /* cpu.cpp */; }; + 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 */; }; + 9AF4162A242CD75C00D2644C /* XString_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A28CC95241AB34800F3D247 /* XString_test.cpp */; }; + 9AF4162B242CD75C00D2644C /* device_inject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F4E24176C04005CDD5C /* device_inject.cpp */; }; + 9AF4162C242CD75C00D2644C /* Settings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F5924176C04005CDD5C /* Settings.cpp */; }; + 9AF4162D242CD75C00D2644C /* legacy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F7924176C04005CDD5C /* legacy.cpp */; }; + 9AF4162E242CD75C00D2644C /* AcpiPatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F2024176C04005CDD5C /* AcpiPatcher.cpp */; }; + 9AF4162F242CD75C00D2644C /* BdsConnect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F2424176C04005CDD5C /* BdsConnect.cpp */; }; + 9AF41630242CD75C00D2644C /* poolprint-test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AF4155C242B8FA300D2644C /* poolprint-test.cpp */; }; + 9AF41631242CD75C00D2644C /* spd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F4024176C04005CDD5C /* spd.cpp */; }; + 9AF41632242CD75C00D2644C /* printf_lite-test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9D3B2124221563006D8CD9 /* printf_lite-test.cpp */; }; + 9AF41633242CD75C00D2644C /* kext_patcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F1B24176C04005CDD5C /* kext_patcher.cpp */; }; + 9AF41634242CD75C00D2644C /* abort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A28CD25241BC0C700F3D247 /* abort.cpp */; }; + 9AF41635242CD75C00D2644C /* gma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F3D24176C04005CDD5C /* gma.cpp */; }; + 9AF41636242CD75C00D2644C /* FloatLib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F6D24176C04005CDD5C /* FloatLib.cpp */; }; + 9AF41637242CD75C00D2644C /* menu_items.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC7809924178F02005CDD5C /* menu_items.cpp */; }; + 9AF41638242CD75C00D2644C /* lodepng.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F6724176C04005CDD5C /* lodepng.cpp */; }; + 9AF41639242CD75C00D2644C /* secureboot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F7A24176C04005CDD5C /* secureboot.cpp */; }; + 9AF4163A242CD75C00D2644C /* FixBiosDsdt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F5424176C04005CDD5C /* FixBiosDsdt.cpp */; }; + 9AF4163B242CD75C00D2644C /* BootLog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F3224176C04005CDD5C /* BootLog.cpp */; }; + 9AF4163C242CD75C00D2644C /* icns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F9324176C04005CDD5C /* icns.cpp */; }; + 9AF4163D242CD75C00D2644C /* strcmp_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A28CD2C241BC0DF00F3D247 /* strcmp_test.cpp */; }; + 9AF4163E242CD75C00D2644C /* nanosvgrast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F6E24176C04005CDD5C /* nanosvgrast.cpp */; }; + 9AF4163F242CD75C00D2644C /* XStringWArray_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77ECE24176C04005CDD5C /* XStringWArray_test.cpp */; }; + 9AF41640242CD75C00D2644C /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F9E24176C04005CDD5C /* main.cpp */; }; + 9AF41641242CD75C00D2644C /* nvidia.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F5024176C04005CDD5C /* nvidia.cpp */; }; + 9AF41642242CD75C00D2644C /* XString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A28CC91241AB33700F3D247 /* XString.cpp */; }; + 9AF41643242CD75C00D2644C /* plist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F4424176C04005CDD5C /* plist.cpp */; }; + 9AF41644242CD75C00D2644C /* kernel_patcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F3C24176C04005CDD5C /* kernel_patcher.cpp */; }; + 9AF41645242CD75C00D2644C /* nanosvg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F6C24176C04005CDD5C /* nanosvg.cpp */; }; + 9AF41646242CD75C00D2644C /* XToolsCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77FB424176C04005CDD5C /* XToolsCommon.cpp */; }; + 9AF41647242CD75C00D2644C /* ati.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F4324176C04005CDD5C /* ati.cpp */; }; + 9AF41648242CD75C00D2644C /* Net.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F3E24176C04005CDD5C /* Net.cpp */; }; + 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 */; }; + 9AF41650242CD75C00D2644C /* unicode_conversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9D3B2424221570006D8CD9 /* unicode_conversions.cpp */; }; + 9AF41651242CD75C00D2644C /* StartupSound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F4524176C04005CDD5C /* StartupSound.cpp */; }; + 9AF41652242CD75C00D2644C /* globals_ctor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77FA524176C04005CDD5C /* globals_ctor.cpp */; }; + 9AF41653242CD75C00D2644C /* screen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F9424176C04005CDD5C /* screen.cpp */; }; + 9AF41654242CD75C00D2644C /* VectorGraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F6524176C04005CDD5C /* VectorGraphics.cpp */; }; + 9AF41655242CD75C00D2644C /* common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F7824176C04005CDD5C /* common.cpp */; }; + 9AF41656242CD75C00D2644C /* egemb_icons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F6224176C04005CDD5C /* egemb_icons.cpp */; }; + 9AF41657242CD75C00D2644C /* Edid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F2824176C04005CDD5C /* Edid.cpp */; }; + 9AF41658242CD75C00D2644C /* smbios.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F5124176C04005CDD5C /* smbios.cpp */; }; + 9AF41661242CDA5800D2644C /* panic.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77FA924176C04005CDD5C /* panic.h */; }; + 9AF41662242CDA5800D2644C /* MSKEK.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F8524176C04005CDD5C /* MSKEK.h */; }; + 9AF41663242CDA5800D2644C /* menu_items.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F8E24176C04005CDD5C /* menu_items.h */; }; + 9AF41664242CDA5800D2644C /* XTheme.h in Headers */ = {isa = PBXBuildFile; fileRef = A5E326302428F4EE002240E8 /* XTheme.h */; }; + 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 */; }; + 9AF4166D242CDA5800D2644C /* loader.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F8224176C04005CDD5C /* loader.h */; }; + 9AF4166E242CDA5800D2644C /* unicode_conversions.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A9D3B2524221570006D8CD9 /* unicode_conversions.h */; }; + 9AF4166F242CDA5800D2644C /* CloverKEK.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F8824176C04005CDD5C /* CloverKEK.h */; }; + 9AF41670242CDA5800D2644C /* StateGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F1C24176C04005CDD5C /* StateGenerator.h */; }; + 9AF41671242CDA5800D2644C /* remove_ref.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77FAA24176C04005CDD5C /* remove_ref.h */; }; + 9AF41672242CDA5800D2644C /* wchar.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A9D3B2A242215A1006D8CD9 /* wchar.h */; }; + 9AF41673242CDA5800D2644C /* loader.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F4824176C04005CDD5C /* loader.h */; }; + 9AF41674242CDA5800D2644C /* AmlGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F1E24176C04005CDD5C /* AmlGenerator.h */; }; + 9AF41675242CDA5800D2644C /* XStringW.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77FAE24176C04005CDD5C /* XStringW.h */; }; + 9AF41676242CDA5800D2644C /* utf8Conversion.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77FB224176C04005CDD5C /* utf8Conversion.h */; }; + 9AF41677242CDA5800D2644C /* stdarg.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A28CCA1241B66EA00F3D247 /* stdarg.h */; }; + 9AF41678242CDA5800D2644C /* posix.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A28CCA0241B66EA00F3D247 /* posix.h */; }; + 9AF41679242CDA5800D2644C /* list.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F9824176C04005CDD5C /* list.h */; }; + 9AF4167A242CDA5800D2644C /* stdlib.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A28CC9A241B66EA00F3D247 /* stdlib.h */; }; + 9AF4167B242CDA5800D2644C /* XObjArray_tests.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77ED324176C04005CDD5C /* XObjArray_tests.h */; }; + 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 */; }; + 9AF41683242CDA5800D2644C /* global_test.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC780B42417EE53005CDD5C /* global_test.h */; }; + 9AF41684242CDA5800D2644C /* CanonicalDB.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F7D24176C04005CDD5C /* CanonicalDB.h */; }; + 9AF41685242CDA5800D2644C /* nanosvg.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F7224176C04005CDD5C /* nanosvg.h */; }; + 9AF41686242CDA5800D2644C /* printf_lite-test-cpp_conf.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AF41565242BAD5600D2644C /* printf_lite-test-cpp_conf.h */; }; + 9AF41687242CDA5800D2644C /* CloverDB.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F7B24176C04005CDD5C /* CloverDB.h */; }; + 9AF41688242CDA5800D2644C /* LegacyBiosThunk.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F4B24176C04005CDD5C /* LegacyBiosThunk.h */; }; + 9AF41689242CDA5800D2644C /* tool.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F8424176C04005CDD5C /* tool.h */; }; + 9AF4168A242CDA5800D2644C /* globals_dtor.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77FA124176C04005CDD5C /* globals_dtor.h */; }; + 9AF4168B242CDA5800D2644C /* screen.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F9D24176C04005CDD5C /* screen.h */; }; + 9AF4168C242CDA5800D2644C /* printlib-test.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AF41560242BABC700D2644C /* printlib-test.h */; }; + 9AF4168D242CDA5800D2644C /* DataHubCpu.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F3924176C04005CDD5C /* DataHubCpu.h */; }; + 9AF4168E242CDA5800D2644C /* lib.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F9724176C04005CDD5C /* lib.h */; }; + 9AF4168F242CDA5800D2644C /* b64cdecode.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F4C24176C04005CDD5C /* b64cdecode.h */; }; + 9AF41690242CDA5800D2644C /* EfiFileLib.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F6B24176C04005CDD5C /* EfiFileLib.h */; }; + 9AF41691242CDA5800D2644C /* menu_globals.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F8F24176C04005CDD5C /* menu_globals.h */; }; + 9AF41692242CDA5800D2644C /* XObjArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77FB724176C04005CDD5C /* XObjArray.h */; }; + 9AF41693242CDA5800D2644C /* string.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F5A24176C04005CDD5C /* string.h */; }; + 9AF41695242CDA5800D2644C /* sse3_5_patcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F2A24176C04005CDD5C /* sse3_5_patcher.h */; }; + 9AF41696242CDA5800D2644C /* spd.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F5524176C04005CDD5C /* spd.h */; }; + 9AF41697242CDA5800D2644C /* IO.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F9A24176C04005CDD5C /* IO.h */; }; + 9AF41698242CDA5800D2644C /* device_inject.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F2E24176C04005CDD5C /* device_inject.h */; }; + 9AF41699242CDA5800D2644C /* entry_scan.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F8024176C04005CDD5C /* entry_scan.h */; }; + 9AF4169A242CDA5800D2644C /* LoaderUefi.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F2924176C04005CDD5C /* LoaderUefi.h */; }; + 9AF4169B242CDA5800D2644C /* hda.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F2D24176C04005CDD5C /* hda.h */; }; + 9AF4169C242CDA5800D2644C /* all_tests.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77ED724176C04005CDD5C /* all_tests.h */; }; + 9AF4169D242CDA5800D2644C /* strncmp_test.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A28CD30241BC0DF00F3D247 /* strncmp_test.h */; }; + 9AF4169E242CDA5800D2644C /* XPointer.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F6324176C04005CDD5C /* XPointer.h */; }; + 9AF4169F242CDA5800D2644C /* XToolsCommon.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77FAD24176C04005CDD5C /* XToolsCommon.h */; }; + 9AF416A0242CDA5800D2644C /* stdio.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A9D3B29242215A1006D8CD9 /* stdio.h */; }; + 9AF416A1242CDA5800D2644C /* bootscreen.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F8724176C04005CDD5C /* bootscreen.h */; }; + 9AF416A2242CDA5800D2644C /* limits.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A28CC9B241B66EA00F3D247 /* limits.h */; }; + 9AF416A3242CDA5800D2644C /* Settings.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F2524176C04005CDD5C /* Settings.h */; }; + 9AF416A4242CDA5800D2644C /* XStringW_test.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77ED224176C04005CDD5C /* XStringW_test.h */; }; + 9AF416A5242CDA5800D2644C /* printf_lite_test.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A9D3B2024221562006D8CD9 /* printf_lite_test.h */; }; + 9AF416A6242CDA5800D2644C /* ati_reg.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F4F24176C04005CDD5C /* ati_reg.h */; }; + 9AF416A7242CDA5800D2644C /* libegint.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F6124176C04005CDD5C /* libegint.h */; }; + 9AF416A8242CDA5800D2644C /* memvendors.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F1D24176C04005CDD5C /* memvendors.h */; }; + 9AF416A9242CDA5800D2644C /* kernel_patcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F2224176C04005CDD5C /* kernel_patcher.h */; }; + 9AF416AA242CDA5800D2644C /* memory.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77FA824176C04005CDD5C /* memory.h */; }; + 9AF416AB242CDA5800D2644C /* menu.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F9C24176C04005CDD5C /* menu.h */; }; + 9AF416AC242CDA5800D2644C /* MSUEFICADB.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F7C24176C04005CDD5C /* MSUEFICADB.h */; }; + 9AF416AD242CDA5800D2644C /* Hibernate.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F1A24176C04005CDD5C /* Hibernate.h */; }; + 9AF416AE242CDA5800D2644C /* strlen_test.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A28CD2F241BC0DF00F3D247 /* strlen_test.h */; }; + 9AF416AF242CDA5800D2644C /* XArray_tests.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77ECD24176C04005CDD5C /* XArray_tests.h */; }; + 9AF416B0242CDA5800D2644C /* Handle.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F1524176C04005CDD5C /* Handle.h */; }; + 9AF416B1242CDA5800D2644C /* XArray.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77FB624176C04005CDD5C /* XArray.h */; }; + 9AF416B2242CDA5800D2644C /* MSPCADB.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F7724176C04005CDD5C /* MSPCADB.h */; }; + 9AF416B3242CDA5800D2644C /* libeg.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F6824176C04005CDD5C /* libeg.h */; }; + 9AF416B4242CDA5800D2644C /* HdaCodecDump.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F4124176C04005CDD5C /* HdaCodecDump.h */; }; + 9AF416B5242CDA5800D2644C /* kext_inject.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F4924176C04005CDD5C /* kext_inject.h */; }; + 9AF416B6242CDA5800D2644C /* Nvram.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F2624176C04005CDD5C /* Nvram.h */; }; + 9AF416B7242CDA5800D2644C /* poolprint-test-cpp_conf.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AF41567242BAD7D00D2644C /* poolprint-test-cpp_conf.h */; }; + 9AF416B8242CDA5800D2644C /* gma.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F1724176C04005CDD5C /* gma.h */; }; + 9AF416B9242CDA5800D2644C /* sse3_patcher.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F3B24176C04005CDD5C /* sse3_patcher.h */; }; + 9AF416BA242CDA5800D2644C /* Version.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F1224176C04005CDD5C /* Version.h */; }; + 9AF416BB242CDA5800D2644C /* XString_test.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A28CC96241AB34800F3D247 /* XString_test.h */; }; + 9AF416BC242CDA5800D2644C /* stdint.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A28CCA2241B66EA00F3D247 /* stdint.h */; }; + 9AF416BD242CDA5800D2644C /* REFIT_MENU_SCREEN.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F9024176C04005CDD5C /* REFIT_MENU_SCREEN.h */; }; + 9AF416BE242CDA5800D2644C /* Platform.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F5824176C04005CDD5C /* Platform.h */; }; + 9AF416BF242CDA5800D2644C /* XImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F7124176C04005CDD5C /* XImage.h */; }; + 9AF416C0242CDA5800D2644C /* globals_ctor.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77FA424176C04005CDD5C /* globals_ctor.h */; }; + 9AF416C1242CDA5800D2644C /* poolprint-test.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AF4155B242B8FA300D2644C /* poolprint-test.h */; }; + 9AF416C2242CDA5800D2644C /* stddef.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A28CC9C241B66EA00F3D247 /* stddef.h */; }; + 9AF416C3242CDA5800D2644C /* securebootkeys.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F8124176C04005CDD5C /* securebootkeys.h */; }; + 9AF416C4242CDA5800D2644C /* string.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A9D3B2B242215A1006D8CD9 /* string.h */; }; + 9AF416C5242CDA5800D2644C /* XString.h in Headers */ = {isa = PBXBuildFile; fileRef = 9A28CC92241AB33700F3D247 /* XString.h */; }; + 9AF416C6242CDA5800D2644C /* FloatLib.h in Headers */ = {isa = PBXBuildFile; fileRef = 9AC77F7324176C04005CDD5C /* FloatLib.h */; }; + 9AF416C8242CDA5800D2644C /* Hibernate.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F1F24176C04005CDD5C /* Hibernate.cpp */; }; + 9AF416C9242CDA5800D2644C /* wchar.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9D3B2C242215A1006D8CD9 /* wchar.cpp */; }; + 9AF416CA242CDA5800D2644C /* DataHubCpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F2C24176C04005CDD5C /* DataHubCpu.cpp */; }; + 9AF416CB242CDA5800D2644C /* hda.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F3F24176C04005CDD5C /* hda.cpp */; }; + 9AF416CC242CDA5800D2644C /* egemb_icons_dark.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F5E24176C04005CDD5C /* egemb_icons_dark.cpp */; }; + 9AF416CD242CDA5800D2644C /* scroll_images.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F6924176C04005CDD5C /* scroll_images.cpp */; }; + 9AF416CE242CDA5800D2644C /* XStringWArray.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77FAF24176C04005CDD5C /* XStringWArray.cpp */; }; + 9AF416CF242CDA5800D2644C /* PlatformDriverOverride.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F2724176C04005CDD5C /* PlatformDriverOverride.cpp */; }; + 9AF416D0242CDA5800D2644C /* HdaCodecDump.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F1924176C04005CDD5C /* HdaCodecDump.cpp */; }; + 9AF416D1242CDA5800D2644C /* Nvram.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F3124176C04005CDD5C /* Nvram.cpp */; }; + 9AF416D2242CDA5800D2644C /* BootOptions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F3A24176C04005CDD5C /* BootOptions.cpp */; }; + 9AF416D3242CDA5800D2644C /* stdio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9D3B28242215A1006D8CD9 /* stdio.cpp */; }; + 9AF416D4242CDA5800D2644C /* operatorNewDelete.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77FA724176C04005CDD5C /* operatorNewDelete.cpp */; }; + 9AF416D5242CDA5800D2644C /* securehash.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F8B24176C04005CDD5C /* securehash.cpp */; }; + 9AF416D6242CDA5800D2644C /* image.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F6424176C04005CDD5C /* image.cpp */; }; + 9AF416D7242CDA5800D2644C /* Events.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F4D24176C04005CDD5C /* Events.cpp */; }; + 9AF416D8242CDA5800D2644C /* libscreen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F7424176C04005CDD5C /* libscreen.cpp */; }; + 9AF416D9242CDA5800D2644C /* strlen_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A28CD2B241BC0DF00F3D247 /* strlen_test.cpp */; }; + 9AF416DA242CDA5800D2644C /* panic.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77FA624176C04005CDD5C /* panic.cpp */; }; + 9AF416DB242CDA5800D2644C /* printlib-test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AF41561242BABC700D2644C /* printlib-test.cpp */; }; + 9AF416DC242CDA5800D2644C /* XStringW_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77ED824176C04005CDD5C /* XStringW_test.cpp */; }; + 9AF416DD242CDA5800D2644C /* tool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F8924176C04005CDD5C /* tool.cpp */; }; + 9AF416DE242CDA5800D2644C /* lib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F9624176C04005CDD5C /* lib.cpp */; }; + 9AF416DF242CDA5800D2644C /* Injectors.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F3524176C04005CDD5C /* Injectors.cpp */; }; + 9AF416E0242CDA5800D2644C /* menu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F9524176C04005CDD5C /* menu.cpp */; }; + 9AF416E1242CDA5800D2644C /* b64cdecode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F2F24176C04005CDD5C /* b64cdecode.cpp */; }; + 9AF416E2242CDA5800D2644C /* globals_dtor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77FA224176C04005CDD5C /* globals_dtor.cpp */; }; + 9AF416E3242CDA5800D2644C /* DevicePath.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F4724176C04005CDD5C /* DevicePath.cpp */; }; + 9AF416E4242CDA5800D2644C /* XArray_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77ED624176C04005CDD5C /* XArray_tests.cpp */; }; + 9AF416E5242CDA5800D2644C /* StateGenerator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F2124176C04005CDD5C /* StateGenerator.cpp */; }; + 9AF416E6242CDA5800D2644C /* XImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F7524176C04005CDD5C /* XImage.cpp */; }; + 9AF416E7242CDA5800D2644C /* platformdata.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F4224176C04005CDD5C /* platformdata.cpp */; }; + 9AF416E8242CDA5800D2644C /* strcmp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A28CD26241BC0C700F3D247 /* strcmp.cpp */; }; + 9AF416E9242CDA5800D2644C /* XPointer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F7024176C04005CDD5C /* XPointer.cpp */; }; + 9AF416EA242CDA5800D2644C /* strncmp_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A28CD2E241BC0DF00F3D247 /* strncmp_test.cpp */; }; + 9AF416EB242CDA5800D2644C /* list.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F9B24176C04005CDD5C /* list.cpp */; }; + 9AF416EC242CDA5800D2644C /* IO.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F9924176C04005CDD5C /* IO.cpp */; }; + 9AF416ED242CDA5800D2644C /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F4A24176C04005CDD5C /* sound.cpp */; }; + 9AF416EE242CDA5800D2644C /* usbfix.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F5624176C04005CDD5C /* usbfix.cpp */; }; + 9AF416EF242CDA5800D2644C /* BmLib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F5F24176C04005CDD5C /* BmLib.cpp */; }; + 9AF416F0242CDA5800D2644C /* card_vlist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F5724176C04005CDD5C /* card_vlist.cpp */; }; + 9AF416F1242CDA5800D2644C /* global_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC780B22417EE4A005CDD5C /* global_test.cpp */; }; + 9AF416F2242CDA5800D2644C /* XTheme.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5E3262F2428F4EE002240E8 /* XTheme.cpp */; }; + 9AF416F3242CDA5800D2644C /* load_icns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F6F24176C04005CDD5C /* load_icns.cpp */; }; + 9AF416F4242CDA5800D2644C /* egemb_font.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F6A24176C04005CDD5C /* egemb_font.cpp */; }; + 9AF416F5242CDA5800D2644C /* securemenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F7E24176C04005CDD5C /* securemenu.cpp */; }; + 9AF416F6242CDA5800D2644C /* text.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F6624176C04005CDD5C /* text.cpp */; }; + 9AF416F7242CDA5800D2644C /* AmlGenerator.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F2324176C04005CDD5C /* AmlGenerator.cpp */; }; + 9AF416F8242CDA5800D2644C /* all_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77ED424176C04005CDD5C /* all_tests.cpp */; }; + 9AF416F9242CDA5800D2644C /* securevars.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F7F24176C04005CDD5C /* securevars.cpp */; }; + 9AF416FB242CDA5800D2644C /* loader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F8A24176C04005CDD5C /* loader.cpp */; }; + 9AF416FC242CDA5800D2644C /* XObjArray_tests.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77ED524176C04005CDD5C /* XObjArray_tests.cpp */; }; + 9AF416FD242CDA5800D2644C /* XStringWP.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC780B72417F359005CDD5C /* XStringWP.cpp */; }; + 9AF416FE242CDA5800D2644C /* memory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77FA024176C04005CDD5C /* memory.cpp */; }; + 9AF416FF242CDA5800D2644C /* cpu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F5224176C04005CDD5C /* cpu.cpp */; }; + 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 */; }; + 9AF41707242CDA5800D2644C /* XString_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A28CC95241AB34800F3D247 /* XString_test.cpp */; }; + 9AF41708242CDA5800D2644C /* device_inject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F4E24176C04005CDD5C /* device_inject.cpp */; }; + 9AF41709242CDA5800D2644C /* Settings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F5924176C04005CDD5C /* Settings.cpp */; }; + 9AF4170A242CDA5800D2644C /* legacy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F7924176C04005CDD5C /* legacy.cpp */; }; + 9AF4170B242CDA5800D2644C /* AcpiPatcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F2024176C04005CDD5C /* AcpiPatcher.cpp */; }; + 9AF4170C242CDA5800D2644C /* BdsConnect.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F2424176C04005CDD5C /* BdsConnect.cpp */; }; + 9AF4170D242CDA5800D2644C /* poolprint-test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AF4155C242B8FA300D2644C /* poolprint-test.cpp */; }; + 9AF4170E242CDA5800D2644C /* spd.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F4024176C04005CDD5C /* spd.cpp */; }; + 9AF4170F242CDA5800D2644C /* printf_lite-test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9D3B2124221563006D8CD9 /* printf_lite-test.cpp */; }; + 9AF41710242CDA5800D2644C /* kext_patcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F1B24176C04005CDD5C /* kext_patcher.cpp */; }; + 9AF41711242CDA5800D2644C /* abort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A28CD25241BC0C700F3D247 /* abort.cpp */; }; + 9AF41712242CDA5800D2644C /* gma.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F3D24176C04005CDD5C /* gma.cpp */; }; + 9AF41713242CDA5800D2644C /* FloatLib.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F6D24176C04005CDD5C /* FloatLib.cpp */; }; + 9AF41714242CDA5800D2644C /* menu_items.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC7809924178F02005CDD5C /* menu_items.cpp */; }; + 9AF41715242CDA5800D2644C /* lodepng.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F6724176C04005CDD5C /* lodepng.cpp */; }; + 9AF41716242CDA5800D2644C /* secureboot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F7A24176C04005CDD5C /* secureboot.cpp */; }; + 9AF41717242CDA5800D2644C /* FixBiosDsdt.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F5424176C04005CDD5C /* FixBiosDsdt.cpp */; }; + 9AF41718242CDA5800D2644C /* BootLog.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F3224176C04005CDD5C /* BootLog.cpp */; }; + 9AF41719242CDA5800D2644C /* icns.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F9324176C04005CDD5C /* icns.cpp */; }; + 9AF4171A242CDA5800D2644C /* strcmp_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A28CD2C241BC0DF00F3D247 /* strcmp_test.cpp */; }; + 9AF4171B242CDA5800D2644C /* nanosvgrast.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F6E24176C04005CDD5C /* nanosvgrast.cpp */; }; + 9AF4171C242CDA5800D2644C /* XStringWArray_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77ECE24176C04005CDD5C /* XStringWArray_test.cpp */; }; + 9AF4171D242CDA5800D2644C /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F9E24176C04005CDD5C /* main.cpp */; }; + 9AF4171E242CDA5800D2644C /* nvidia.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F5024176C04005CDD5C /* nvidia.cpp */; }; + 9AF4171F242CDA5800D2644C /* XString.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A28CC91241AB33700F3D247 /* XString.cpp */; }; + 9AF41720242CDA5800D2644C /* plist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F4424176C04005CDD5C /* plist.cpp */; }; + 9AF41721242CDA5800D2644C /* kernel_patcher.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F3C24176C04005CDD5C /* kernel_patcher.cpp */; }; + 9AF41722242CDA5800D2644C /* nanosvg.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F6C24176C04005CDD5C /* nanosvg.cpp */; }; + 9AF41723242CDA5800D2644C /* XToolsCommon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77FB424176C04005CDD5C /* XToolsCommon.cpp */; }; + 9AF41724242CDA5800D2644C /* ati.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F4324176C04005CDD5C /* ati.cpp */; }; + 9AF41725242CDA5800D2644C /* Net.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F3E24176C04005CDD5C /* Net.cpp */; }; + 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 */; }; + 9AF4172D242CDA5800D2644C /* unicode_conversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9D3B2424221570006D8CD9 /* unicode_conversions.cpp */; }; + 9AF4172E242CDA5800D2644C /* StartupSound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F4524176C04005CDD5C /* StartupSound.cpp */; }; + 9AF4172F242CDA5800D2644C /* globals_ctor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77FA524176C04005CDD5C /* globals_ctor.cpp */; }; + 9AF41730242CDA5800D2644C /* screen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F9424176C04005CDD5C /* screen.cpp */; }; + 9AF41731242CDA5800D2644C /* VectorGraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F6524176C04005CDD5C /* VectorGraphics.cpp */; }; + 9AF41732242CDA5800D2644C /* common.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F7824176C04005CDD5C /* common.cpp */; }; + 9AF41733242CDA5800D2644C /* egemb_icons.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F6224176C04005CDD5C /* egemb_icons.cpp */; }; + 9AF41734242CDA5800D2644C /* Edid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F2824176C04005CDD5C /* Edid.cpp */; }; + 9AF41735242CDA5800D2644C /* smbios.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AC77F5124176C04005CDD5C /* smbios.cpp */; }; A5E326312428F4EE002240E8 /* XTheme.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5E3262F2428F4EE002240E8 /* XTheme.cpp */; }; A5E326322428F4EE002240E8 /* XTheme.h in Headers */ = {isa = PBXBuildFile; fileRef = A5E326302428F4EE002240E8 /* XTheme.h */; }; /* End PBXBuildFile section */ @@ -427,6 +845,8 @@ 9AF41561242BABC700D2644C /* printlib-test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "printlib-test.cpp"; sourceTree = ""; }; 9AF41565242BAD5600D2644C /* printf_lite-test-cpp_conf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "printf_lite-test-cpp_conf.h"; sourceTree = ""; }; 9AF41567242BAD7D00D2644C /* poolprint-test-cpp_conf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "poolprint-test-cpp_conf.h"; sourceTree = ""; }; + 9AF4165E242CD75C00D2644C /* libCloverX64 DEBUG_ALL=1.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libCloverX64 DEBUG_ALL=1.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 9AF4173B242CDA5800D2644C /* libCloverX64 DEBUG_ALL=2.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libCloverX64 DEBUG_ALL=2.a"; sourceTree = BUILT_PRODUCTS_DIR; }; A5E3262F2428F4EE002240E8 /* XTheme.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XTheme.cpp; sourceTree = ""; }; A5E326302428F4EE002240E8 /* XTheme.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XTheme.h; sourceTree = ""; }; /* End PBXFileReference section */ @@ -439,6 +859,20 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 9AF41659242CD75C00D2644C /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 9AF41736242CDA5800D2644C /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -484,6 +918,8 @@ isa = PBXGroup; children = ( 9AC77EC424176BF2005CDD5C /* libCloverX64.a */, + 9AF4165E242CD75C00D2644C /* libCloverX64 DEBUG_ALL=1.a */, + 9AF4173B242CDA5800D2644C /* libCloverX64 DEBUG_ALL=2.a */, ); name = Products; sourceTree = ""; @@ -881,6 +1317,220 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 9AF41583242CD75C00D2644C /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 9AF41584242CD75C00D2644C /* panic.h in Headers */, + 9AF41585242CD75C00D2644C /* MSKEK.h in Headers */, + 9AF41586242CD75C00D2644C /* menu_items.h in Headers */, + 9AF41587242CD75C00D2644C /* XTheme.h in Headers */, + 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 */, + 9AF41590242CD75C00D2644C /* loader.h in Headers */, + 9AF41591242CD75C00D2644C /* unicode_conversions.h in Headers */, + 9AF41592242CD75C00D2644C /* CloverKEK.h in Headers */, + 9AF41593242CD75C00D2644C /* StateGenerator.h in Headers */, + 9AF41594242CD75C00D2644C /* remove_ref.h in Headers */, + 9AF41595242CD75C00D2644C /* wchar.h in Headers */, + 9AF41596242CD75C00D2644C /* loader.h in Headers */, + 9AF41597242CD75C00D2644C /* AmlGenerator.h in Headers */, + 9AF41598242CD75C00D2644C /* XStringW.h in Headers */, + 9AF41599242CD75C00D2644C /* utf8Conversion.h in Headers */, + 9AF4159A242CD75C00D2644C /* stdarg.h in Headers */, + 9AF4159B242CD75C00D2644C /* posix.h in Headers */, + 9AF4159C242CD75C00D2644C /* list.h in Headers */, + 9AF4159D242CD75C00D2644C /* stdlib.h in Headers */, + 9AF4159E242CD75C00D2644C /* XObjArray_tests.h in Headers */, + 9AF4159F242CD75C00D2644C /* Events.h in Headers */, + 9AF415A0242CD75C00D2644C /* printlib-test-cpp_conf.h in Headers */, + 9AF415A1242CD75C00D2644C /* XStringWArray.h in Headers */, + 9AF415A2242CD75C00D2644C /* XUINTN.h in Headers */, + 9AF415A3242CD75C00D2644C /* strcmp_test.h in Headers */, + 9AF415A4242CD75C00D2644C /* boot.h in Headers */, + 9AF415A5242CD75C00D2644C /* ati.h in Headers */, + 9AF415A6242CD75C00D2644C /* global_test.h in Headers */, + 9AF415A7242CD75C00D2644C /* CanonicalDB.h in Headers */, + 9AF415A8242CD75C00D2644C /* nanosvg.h in Headers */, + 9AF415A9242CD75C00D2644C /* printf_lite-test-cpp_conf.h in Headers */, + 9AF415AA242CD75C00D2644C /* CloverDB.h in Headers */, + 9AF415AB242CD75C00D2644C /* LegacyBiosThunk.h in Headers */, + 9AF415AC242CD75C00D2644C /* tool.h in Headers */, + 9AF415AD242CD75C00D2644C /* globals_dtor.h in Headers */, + 9AF415AE242CD75C00D2644C /* screen.h in Headers */, + 9AF415AF242CD75C00D2644C /* printlib-test.h in Headers */, + 9AF415B0242CD75C00D2644C /* DataHubCpu.h in Headers */, + 9AF415B1242CD75C00D2644C /* lib.h in Headers */, + 9AF415B2242CD75C00D2644C /* b64cdecode.h in Headers */, + 9AF415B3242CD75C00D2644C /* EfiFileLib.h in Headers */, + 9AF415B4242CD75C00D2644C /* menu_globals.h in Headers */, + 9AF415B5242CD75C00D2644C /* XObjArray.h in Headers */, + 9AF415B6242CD75C00D2644C /* string.h in Headers */, + 9AF415B8242CD75C00D2644C /* sse3_5_patcher.h in Headers */, + 9AF415B9242CD75C00D2644C /* spd.h in Headers */, + 9AF415BA242CD75C00D2644C /* IO.h in Headers */, + 9AF415BB242CD75C00D2644C /* device_inject.h in Headers */, + 9AF415BC242CD75C00D2644C /* entry_scan.h in Headers */, + 9AF415BD242CD75C00D2644C /* LoaderUefi.h in Headers */, + 9AF415BE242CD75C00D2644C /* hda.h in Headers */, + 9AF415BF242CD75C00D2644C /* all_tests.h in Headers */, + 9AF415C0242CD75C00D2644C /* strncmp_test.h in Headers */, + 9AF415C1242CD75C00D2644C /* XPointer.h in Headers */, + 9AF415C2242CD75C00D2644C /* XToolsCommon.h in Headers */, + 9AF415C3242CD75C00D2644C /* stdio.h in Headers */, + 9AF415C4242CD75C00D2644C /* bootscreen.h in Headers */, + 9AF415C5242CD75C00D2644C /* limits.h in Headers */, + 9AF415C6242CD75C00D2644C /* Settings.h in Headers */, + 9AF415C7242CD75C00D2644C /* XStringW_test.h in Headers */, + 9AF415C8242CD75C00D2644C /* printf_lite_test.h in Headers */, + 9AF415C9242CD75C00D2644C /* ati_reg.h in Headers */, + 9AF415CA242CD75C00D2644C /* libegint.h in Headers */, + 9AF415CB242CD75C00D2644C /* memvendors.h in Headers */, + 9AF415CC242CD75C00D2644C /* kernel_patcher.h in Headers */, + 9AF415CD242CD75C00D2644C /* memory.h in Headers */, + 9AF415CE242CD75C00D2644C /* menu.h in Headers */, + 9AF415CF242CD75C00D2644C /* MSUEFICADB.h in Headers */, + 9AF415D0242CD75C00D2644C /* Hibernate.h in Headers */, + 9AF415D1242CD75C00D2644C /* strlen_test.h in Headers */, + 9AF415D2242CD75C00D2644C /* XArray_tests.h in Headers */, + 9AF415D3242CD75C00D2644C /* Handle.h in Headers */, + 9AF415D4242CD75C00D2644C /* XArray.h in Headers */, + 9AF415D5242CD75C00D2644C /* MSPCADB.h in Headers */, + 9AF415D6242CD75C00D2644C /* libeg.h in Headers */, + 9AF415D7242CD75C00D2644C /* HdaCodecDump.h in Headers */, + 9AF415D8242CD75C00D2644C /* kext_inject.h in Headers */, + 9AF415D9242CD75C00D2644C /* Nvram.h in Headers */, + 9AF415DA242CD75C00D2644C /* poolprint-test-cpp_conf.h in Headers */, + 9AF415DB242CD75C00D2644C /* gma.h in Headers */, + 9AF415DC242CD75C00D2644C /* sse3_patcher.h in Headers */, + 9AF415DD242CD75C00D2644C /* Version.h in Headers */, + 9AF415DE242CD75C00D2644C /* XString_test.h in Headers */, + 9AF415DF242CD75C00D2644C /* stdint.h in Headers */, + 9AF415E0242CD75C00D2644C /* REFIT_MENU_SCREEN.h in Headers */, + 9AF415E1242CD75C00D2644C /* Platform.h in Headers */, + 9AF415E2242CD75C00D2644C /* XImage.h in Headers */, + 9AF415E3242CD75C00D2644C /* globals_ctor.h in Headers */, + 9AF415E4242CD75C00D2644C /* poolprint-test.h in Headers */, + 9AF415E5242CD75C00D2644C /* stddef.h in Headers */, + 9AF415E6242CD75C00D2644C /* securebootkeys.h in Headers */, + 9AF415E7242CD75C00D2644C /* string.h in Headers */, + 9AF415E8242CD75C00D2644C /* XString.h in Headers */, + 9AF415E9242CD75C00D2644C /* FloatLib.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 9AF41660242CDA5800D2644C /* Headers */ = { + isa = PBXHeadersBuildPhase; + buildActionMask = 2147483647; + files = ( + 9AF41661242CDA5800D2644C /* panic.h in Headers */, + 9AF41662242CDA5800D2644C /* MSKEK.h in Headers */, + 9AF41663242CDA5800D2644C /* menu_items.h in Headers */, + 9AF41664242CDA5800D2644C /* XTheme.h in Headers */, + 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 */, + 9AF4166D242CDA5800D2644C /* loader.h in Headers */, + 9AF4166E242CDA5800D2644C /* unicode_conversions.h in Headers */, + 9AF4166F242CDA5800D2644C /* CloverKEK.h in Headers */, + 9AF41670242CDA5800D2644C /* StateGenerator.h in Headers */, + 9AF41671242CDA5800D2644C /* remove_ref.h in Headers */, + 9AF41672242CDA5800D2644C /* wchar.h in Headers */, + 9AF41673242CDA5800D2644C /* loader.h in Headers */, + 9AF41674242CDA5800D2644C /* AmlGenerator.h in Headers */, + 9AF41675242CDA5800D2644C /* XStringW.h in Headers */, + 9AF41676242CDA5800D2644C /* utf8Conversion.h in Headers */, + 9AF41677242CDA5800D2644C /* stdarg.h in Headers */, + 9AF41678242CDA5800D2644C /* posix.h in Headers */, + 9AF41679242CDA5800D2644C /* list.h in Headers */, + 9AF4167A242CDA5800D2644C /* stdlib.h in Headers */, + 9AF4167B242CDA5800D2644C /* XObjArray_tests.h in Headers */, + 9AF4167C242CDA5800D2644C /* Events.h in Headers */, + 9AF4167D242CDA5800D2644C /* printlib-test-cpp_conf.h in Headers */, + 9AF4167E242CDA5800D2644C /* XStringWArray.h in Headers */, + 9AF4167F242CDA5800D2644C /* XUINTN.h in Headers */, + 9AF41680242CDA5800D2644C /* strcmp_test.h in Headers */, + 9AF41681242CDA5800D2644C /* boot.h in Headers */, + 9AF41682242CDA5800D2644C /* ati.h in Headers */, + 9AF41683242CDA5800D2644C /* global_test.h in Headers */, + 9AF41684242CDA5800D2644C /* CanonicalDB.h in Headers */, + 9AF41685242CDA5800D2644C /* nanosvg.h in Headers */, + 9AF41686242CDA5800D2644C /* printf_lite-test-cpp_conf.h in Headers */, + 9AF41687242CDA5800D2644C /* CloverDB.h in Headers */, + 9AF41688242CDA5800D2644C /* LegacyBiosThunk.h in Headers */, + 9AF41689242CDA5800D2644C /* tool.h in Headers */, + 9AF4168A242CDA5800D2644C /* globals_dtor.h in Headers */, + 9AF4168B242CDA5800D2644C /* screen.h in Headers */, + 9AF4168C242CDA5800D2644C /* printlib-test.h in Headers */, + 9AF4168D242CDA5800D2644C /* DataHubCpu.h in Headers */, + 9AF4168E242CDA5800D2644C /* lib.h in Headers */, + 9AF4168F242CDA5800D2644C /* b64cdecode.h in Headers */, + 9AF41690242CDA5800D2644C /* EfiFileLib.h in Headers */, + 9AF41691242CDA5800D2644C /* menu_globals.h in Headers */, + 9AF41692242CDA5800D2644C /* XObjArray.h in Headers */, + 9AF41693242CDA5800D2644C /* string.h in Headers */, + 9AF41695242CDA5800D2644C /* sse3_5_patcher.h in Headers */, + 9AF41696242CDA5800D2644C /* spd.h in Headers */, + 9AF41697242CDA5800D2644C /* IO.h in Headers */, + 9AF41698242CDA5800D2644C /* device_inject.h in Headers */, + 9AF41699242CDA5800D2644C /* entry_scan.h in Headers */, + 9AF4169A242CDA5800D2644C /* LoaderUefi.h in Headers */, + 9AF4169B242CDA5800D2644C /* hda.h in Headers */, + 9AF4169C242CDA5800D2644C /* all_tests.h in Headers */, + 9AF4169D242CDA5800D2644C /* strncmp_test.h in Headers */, + 9AF4169E242CDA5800D2644C /* XPointer.h in Headers */, + 9AF4169F242CDA5800D2644C /* XToolsCommon.h in Headers */, + 9AF416A0242CDA5800D2644C /* stdio.h in Headers */, + 9AF416A1242CDA5800D2644C /* bootscreen.h in Headers */, + 9AF416A2242CDA5800D2644C /* limits.h in Headers */, + 9AF416A3242CDA5800D2644C /* Settings.h in Headers */, + 9AF416A4242CDA5800D2644C /* XStringW_test.h in Headers */, + 9AF416A5242CDA5800D2644C /* printf_lite_test.h in Headers */, + 9AF416A6242CDA5800D2644C /* ati_reg.h in Headers */, + 9AF416A7242CDA5800D2644C /* libegint.h in Headers */, + 9AF416A8242CDA5800D2644C /* memvendors.h in Headers */, + 9AF416A9242CDA5800D2644C /* kernel_patcher.h in Headers */, + 9AF416AA242CDA5800D2644C /* memory.h in Headers */, + 9AF416AB242CDA5800D2644C /* menu.h in Headers */, + 9AF416AC242CDA5800D2644C /* MSUEFICADB.h in Headers */, + 9AF416AD242CDA5800D2644C /* Hibernate.h in Headers */, + 9AF416AE242CDA5800D2644C /* strlen_test.h in Headers */, + 9AF416AF242CDA5800D2644C /* XArray_tests.h in Headers */, + 9AF416B0242CDA5800D2644C /* Handle.h in Headers */, + 9AF416B1242CDA5800D2644C /* XArray.h in Headers */, + 9AF416B2242CDA5800D2644C /* MSPCADB.h in Headers */, + 9AF416B3242CDA5800D2644C /* libeg.h in Headers */, + 9AF416B4242CDA5800D2644C /* HdaCodecDump.h in Headers */, + 9AF416B5242CDA5800D2644C /* kext_inject.h in Headers */, + 9AF416B6242CDA5800D2644C /* Nvram.h in Headers */, + 9AF416B7242CDA5800D2644C /* poolprint-test-cpp_conf.h in Headers */, + 9AF416B8242CDA5800D2644C /* gma.h in Headers */, + 9AF416B9242CDA5800D2644C /* sse3_patcher.h in Headers */, + 9AF416BA242CDA5800D2644C /* Version.h in Headers */, + 9AF416BB242CDA5800D2644C /* XString_test.h in Headers */, + 9AF416BC242CDA5800D2644C /* stdint.h in Headers */, + 9AF416BD242CDA5800D2644C /* REFIT_MENU_SCREEN.h in Headers */, + 9AF416BE242CDA5800D2644C /* Platform.h in Headers */, + 9AF416BF242CDA5800D2644C /* XImage.h in Headers */, + 9AF416C0242CDA5800D2644C /* globals_ctor.h in Headers */, + 9AF416C1242CDA5800D2644C /* poolprint-test.h in Headers */, + 9AF416C2242CDA5800D2644C /* stddef.h in Headers */, + 9AF416C3242CDA5800D2644C /* securebootkeys.h in Headers */, + 9AF416C4242CDA5800D2644C /* string.h in Headers */, + 9AF416C5242CDA5800D2644C /* XString.h in Headers */, + 9AF416C6242CDA5800D2644C /* FloatLib.h in Headers */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ @@ -902,6 +1552,42 @@ productReference = 9AC77EC424176BF2005CDD5C /* libCloverX64.a */; productType = "com.apple.product-type.library.static"; }; + 9AF41582242CD75C00D2644C /* CloverX64 DEBUG_ALL=1 */ = { + isa = PBXNativeTarget; + buildConfigurationList = 9AF4165B242CD75C00D2644C /* Build configuration list for PBXNativeTarget "CloverX64 DEBUG_ALL=1" */; + buildPhases = ( + 9AF41583242CD75C00D2644C /* Headers */, + 9AF415EA242CD75C00D2644C /* Sources */, + 9AF41659242CD75C00D2644C /* Frameworks */, + 9AF4165A242CD75C00D2644C /* ShellScript */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "CloverX64 DEBUG_ALL=1"; + productName = CloverX64; + productReference = 9AF4165E242CD75C00D2644C /* libCloverX64 DEBUG_ALL=1.a */; + productType = "com.apple.product-type.library.static"; + }; + 9AF4165F242CDA5800D2644C /* CloverX64 DEBUG_ALL=2 */ = { + isa = PBXNativeTarget; + buildConfigurationList = 9AF41738242CDA5800D2644C /* Build configuration list for PBXNativeTarget "CloverX64 DEBUG_ALL=2" */; + buildPhases = ( + 9AF41660242CDA5800D2644C /* Headers */, + 9AF416C7242CDA5800D2644C /* Sources */, + 9AF41736242CDA5800D2644C /* Frameworks */, + 9AF41737242CDA5800D2644C /* ShellScript */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = "CloverX64 DEBUG_ALL=2"; + productName = CloverX64; + productReference = 9AF4173B242CDA5800D2644C /* libCloverX64 DEBUG_ALL=2.a */; + productType = "com.apple.product-type.library.static"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -928,6 +1614,8 @@ projectRoot = ""; targets = ( 9AC77EC324176BF2005CDD5C /* CloverX64 */, + 9AF41582242CD75C00D2644C /* CloverX64 DEBUG_ALL=1 */, + 9AF4165F242CDA5800D2644C /* CloverX64 DEBUG_ALL=2 */, ); }; /* End PBXProject section */ @@ -948,7 +1636,41 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n$PROJECT_DIR/clang-slink\n"; + shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n$PROJECT_DIR/clang-slink \"$TARGET_BUILD_DIR\"/\"$FULL_PRODUCT_NAME\"\n"; + }; + 9AF4165A242CD75C00D2644C /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n$PROJECT_DIR/clang-slink \"$TARGET_BUILD_DIR\"/\"$FULL_PRODUCT_NAME\"\n"; + }; + 9AF41737242CDA5800D2644C /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "# Type a script or drag a script file from your workspace to insert its path.\n$PROJECT_DIR/clang-slink \"$TARGET_BUILD_DIR\"/\"$FULL_PRODUCT_NAME\"\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -1069,6 +1791,238 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + 9AF415EA242CD75C00D2644C /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 9AF415EB242CD75C00D2644C /* Hibernate.cpp in Sources */, + 9AF415EC242CD75C00D2644C /* wchar.cpp in Sources */, + 9AF415ED242CD75C00D2644C /* DataHubCpu.cpp in Sources */, + 9AF415EE242CD75C00D2644C /* hda.cpp in Sources */, + 9AF415EF242CD75C00D2644C /* egemb_icons_dark.cpp in Sources */, + 9AF415F0242CD75C00D2644C /* scroll_images.cpp in Sources */, + 9AF415F1242CD75C00D2644C /* XStringWArray.cpp in Sources */, + 9AF415F2242CD75C00D2644C /* PlatformDriverOverride.cpp in Sources */, + 9AF415F3242CD75C00D2644C /* HdaCodecDump.cpp in Sources */, + 9AF415F4242CD75C00D2644C /* Nvram.cpp in Sources */, + 9AF415F5242CD75C00D2644C /* BootOptions.cpp in Sources */, + 9AF415F6242CD75C00D2644C /* stdio.cpp in Sources */, + 9AF415F7242CD75C00D2644C /* operatorNewDelete.cpp in Sources */, + 9AF415F8242CD75C00D2644C /* securehash.cpp in Sources */, + 9AF415F9242CD75C00D2644C /* image.cpp in Sources */, + 9AF415FA242CD75C00D2644C /* Events.cpp in Sources */, + 9AF415FB242CD75C00D2644C /* libscreen.cpp in Sources */, + 9AF415FC242CD75C00D2644C /* strlen_test.cpp in Sources */, + 9AF415FD242CD75C00D2644C /* panic.cpp in Sources */, + 9AF415FE242CD75C00D2644C /* printlib-test.cpp in Sources */, + 9AF415FF242CD75C00D2644C /* XStringW_test.cpp in Sources */, + 9AF41600242CD75C00D2644C /* tool.cpp in Sources */, + 9AF41601242CD75C00D2644C /* lib.cpp in Sources */, + 9AF41602242CD75C00D2644C /* Injectors.cpp in Sources */, + 9AF41603242CD75C00D2644C /* menu.cpp in Sources */, + 9AF41604242CD75C00D2644C /* b64cdecode.cpp in Sources */, + 9AF41605242CD75C00D2644C /* globals_dtor.cpp in Sources */, + 9AF41606242CD75C00D2644C /* DevicePath.cpp in Sources */, + 9AF41607242CD75C00D2644C /* XArray_tests.cpp in Sources */, + 9AF41608242CD75C00D2644C /* StateGenerator.cpp in Sources */, + 9AF41609242CD75C00D2644C /* XImage.cpp in Sources */, + 9AF4160A242CD75C00D2644C /* platformdata.cpp in Sources */, + 9AF4160B242CD75C00D2644C /* strcmp.cpp in Sources */, + 9AF4160C242CD75C00D2644C /* XPointer.cpp in Sources */, + 9AF4160D242CD75C00D2644C /* strncmp_test.cpp in Sources */, + 9AF4160E242CD75C00D2644C /* list.cpp in Sources */, + 9AF4160F242CD75C00D2644C /* IO.cpp in Sources */, + 9AF41610242CD75C00D2644C /* sound.cpp in Sources */, + 9AF41611242CD75C00D2644C /* usbfix.cpp in Sources */, + 9AF41612242CD75C00D2644C /* BmLib.cpp in Sources */, + 9AF41613242CD75C00D2644C /* card_vlist.cpp in Sources */, + 9AF41614242CD75C00D2644C /* global_test.cpp in Sources */, + 9AF41615242CD75C00D2644C /* XTheme.cpp in Sources */, + 9AF41616242CD75C00D2644C /* load_icns.cpp in Sources */, + 9AF41617242CD75C00D2644C /* egemb_font.cpp in Sources */, + 9AF41618242CD75C00D2644C /* securemenu.cpp in Sources */, + 9AF41619242CD75C00D2644C /* text.cpp in Sources */, + 9AF4161A242CD75C00D2644C /* AmlGenerator.cpp in Sources */, + 9AF4161B242CD75C00D2644C /* all_tests.cpp in Sources */, + 9AF4161C242CD75C00D2644C /* securevars.cpp in Sources */, + 9AF4161E242CD75C00D2644C /* loader.cpp in Sources */, + 9AF4161F242CD75C00D2644C /* XObjArray_tests.cpp in Sources */, + 9AF41620242CD75C00D2644C /* XStringWP.cpp in Sources */, + 9AF41621242CD75C00D2644C /* memory.cpp in Sources */, + 9AF41622242CD75C00D2644C /* cpu.cpp in Sources */, + 9AF41623242CD75C00D2644C /* LegacyBoot.cpp in Sources */, + 9AF41624242CD75C00D2644C /* REFIT_MENU_SCREEN.cpp in Sources */, + 9AF41625242CD75C00D2644C /* LegacyBiosThunk.cpp in Sources */, + 9AF41626242CD75C00D2644C /* XUINTN_test.cpp in Sources */, + 9AF41627242CD75C00D2644C /* string.cpp in Sources */, + 9AF41628242CD75C00D2644C /* XStringW.cpp in Sources */, + 9AF41629242CD75C00D2644C /* lockedgraphics.cpp in Sources */, + 9AF4162A242CD75C00D2644C /* XString_test.cpp in Sources */, + 9AF4162B242CD75C00D2644C /* device_inject.cpp in Sources */, + 9AF4162C242CD75C00D2644C /* Settings.cpp in Sources */, + 9AF4162D242CD75C00D2644C /* legacy.cpp in Sources */, + 9AF4162E242CD75C00D2644C /* AcpiPatcher.cpp in Sources */, + 9AF4162F242CD75C00D2644C /* BdsConnect.cpp in Sources */, + 9AF41630242CD75C00D2644C /* poolprint-test.cpp in Sources */, + 9AF41631242CD75C00D2644C /* spd.cpp in Sources */, + 9AF41632242CD75C00D2644C /* printf_lite-test.cpp in Sources */, + 9AF41633242CD75C00D2644C /* kext_patcher.cpp in Sources */, + 9AF41634242CD75C00D2644C /* abort.cpp in Sources */, + 9AF41635242CD75C00D2644C /* gma.cpp in Sources */, + 9AF41636242CD75C00D2644C /* FloatLib.cpp in Sources */, + 9AF41637242CD75C00D2644C /* menu_items.cpp in Sources */, + 9AF41638242CD75C00D2644C /* lodepng.cpp in Sources */, + 9AF41639242CD75C00D2644C /* secureboot.cpp in Sources */, + 9AF4163A242CD75C00D2644C /* FixBiosDsdt.cpp in Sources */, + 9AF4163B242CD75C00D2644C /* BootLog.cpp in Sources */, + 9AF4163C242CD75C00D2644C /* icns.cpp in Sources */, + 9AF4163D242CD75C00D2644C /* strcmp_test.cpp in Sources */, + 9AF4163E242CD75C00D2644C /* nanosvgrast.cpp in Sources */, + 9AF4163F242CD75C00D2644C /* XStringWArray_test.cpp in Sources */, + 9AF41640242CD75C00D2644C /* main.cpp in Sources */, + 9AF41641242CD75C00D2644C /* nvidia.cpp in Sources */, + 9AF41642242CD75C00D2644C /* XString.cpp in Sources */, + 9AF41643242CD75C00D2644C /* plist.cpp in Sources */, + 9AF41644242CD75C00D2644C /* kernel_patcher.cpp in Sources */, + 9AF41645242CD75C00D2644C /* nanosvg.cpp in Sources */, + 9AF41646242CD75C00D2644C /* XToolsCommon.cpp in Sources */, + 9AF41647242CD75C00D2644C /* ati.cpp in Sources */, + 9AF41648242CD75C00D2644C /* Net.cpp in Sources */, + 9AF41649242CD75C00D2644C /* kext_inject.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 */, + 9AF41650242CD75C00D2644C /* unicode_conversions.cpp in Sources */, + 9AF41651242CD75C00D2644C /* StartupSound.cpp in Sources */, + 9AF41652242CD75C00D2644C /* globals_ctor.cpp in Sources */, + 9AF41653242CD75C00D2644C /* screen.cpp in Sources */, + 9AF41654242CD75C00D2644C /* VectorGraphics.cpp in Sources */, + 9AF41655242CD75C00D2644C /* common.cpp in Sources */, + 9AF41656242CD75C00D2644C /* egemb_icons.cpp in Sources */, + 9AF41657242CD75C00D2644C /* Edid.cpp in Sources */, + 9AF41658242CD75C00D2644C /* smbios.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + 9AF416C7242CDA5800D2644C /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 9AF416C8242CDA5800D2644C /* Hibernate.cpp in Sources */, + 9AF416C9242CDA5800D2644C /* wchar.cpp in Sources */, + 9AF416CA242CDA5800D2644C /* DataHubCpu.cpp in Sources */, + 9AF416CB242CDA5800D2644C /* hda.cpp in Sources */, + 9AF416CC242CDA5800D2644C /* egemb_icons_dark.cpp in Sources */, + 9AF416CD242CDA5800D2644C /* scroll_images.cpp in Sources */, + 9AF416CE242CDA5800D2644C /* XStringWArray.cpp in Sources */, + 9AF416CF242CDA5800D2644C /* PlatformDriverOverride.cpp in Sources */, + 9AF416D0242CDA5800D2644C /* HdaCodecDump.cpp in Sources */, + 9AF416D1242CDA5800D2644C /* Nvram.cpp in Sources */, + 9AF416D2242CDA5800D2644C /* BootOptions.cpp in Sources */, + 9AF416D3242CDA5800D2644C /* stdio.cpp in Sources */, + 9AF416D4242CDA5800D2644C /* operatorNewDelete.cpp in Sources */, + 9AF416D5242CDA5800D2644C /* securehash.cpp in Sources */, + 9AF416D6242CDA5800D2644C /* image.cpp in Sources */, + 9AF416D7242CDA5800D2644C /* Events.cpp in Sources */, + 9AF416D8242CDA5800D2644C /* libscreen.cpp in Sources */, + 9AF416D9242CDA5800D2644C /* strlen_test.cpp in Sources */, + 9AF416DA242CDA5800D2644C /* panic.cpp in Sources */, + 9AF416DB242CDA5800D2644C /* printlib-test.cpp in Sources */, + 9AF416DC242CDA5800D2644C /* XStringW_test.cpp in Sources */, + 9AF416DD242CDA5800D2644C /* tool.cpp in Sources */, + 9AF416DE242CDA5800D2644C /* lib.cpp in Sources */, + 9AF416DF242CDA5800D2644C /* Injectors.cpp in Sources */, + 9AF416E0242CDA5800D2644C /* menu.cpp in Sources */, + 9AF416E1242CDA5800D2644C /* b64cdecode.cpp in Sources */, + 9AF416E2242CDA5800D2644C /* globals_dtor.cpp in Sources */, + 9AF416E3242CDA5800D2644C /* DevicePath.cpp in Sources */, + 9AF416E4242CDA5800D2644C /* XArray_tests.cpp in Sources */, + 9AF416E5242CDA5800D2644C /* StateGenerator.cpp in Sources */, + 9AF416E6242CDA5800D2644C /* XImage.cpp in Sources */, + 9AF416E7242CDA5800D2644C /* platformdata.cpp in Sources */, + 9AF416E8242CDA5800D2644C /* strcmp.cpp in Sources */, + 9AF416E9242CDA5800D2644C /* XPointer.cpp in Sources */, + 9AF416EA242CDA5800D2644C /* strncmp_test.cpp in Sources */, + 9AF416EB242CDA5800D2644C /* list.cpp in Sources */, + 9AF416EC242CDA5800D2644C /* IO.cpp in Sources */, + 9AF416ED242CDA5800D2644C /* sound.cpp in Sources */, + 9AF416EE242CDA5800D2644C /* usbfix.cpp in Sources */, + 9AF416EF242CDA5800D2644C /* BmLib.cpp in Sources */, + 9AF416F0242CDA5800D2644C /* card_vlist.cpp in Sources */, + 9AF416F1242CDA5800D2644C /* global_test.cpp in Sources */, + 9AF416F2242CDA5800D2644C /* XTheme.cpp in Sources */, + 9AF416F3242CDA5800D2644C /* load_icns.cpp in Sources */, + 9AF416F4242CDA5800D2644C /* egemb_font.cpp in Sources */, + 9AF416F5242CDA5800D2644C /* securemenu.cpp in Sources */, + 9AF416F6242CDA5800D2644C /* text.cpp in Sources */, + 9AF416F7242CDA5800D2644C /* AmlGenerator.cpp in Sources */, + 9AF416F8242CDA5800D2644C /* all_tests.cpp in Sources */, + 9AF416F9242CDA5800D2644C /* securevars.cpp in Sources */, + 9AF416FB242CDA5800D2644C /* loader.cpp in Sources */, + 9AF416FC242CDA5800D2644C /* XObjArray_tests.cpp in Sources */, + 9AF416FD242CDA5800D2644C /* XStringWP.cpp in Sources */, + 9AF416FE242CDA5800D2644C /* memory.cpp in Sources */, + 9AF416FF242CDA5800D2644C /* cpu.cpp in Sources */, + 9AF41700242CDA5800D2644C /* LegacyBoot.cpp in Sources */, + 9AF41701242CDA5800D2644C /* REFIT_MENU_SCREEN.cpp in Sources */, + 9AF41702242CDA5800D2644C /* LegacyBiosThunk.cpp in Sources */, + 9AF41703242CDA5800D2644C /* XUINTN_test.cpp in Sources */, + 9AF41704242CDA5800D2644C /* string.cpp in Sources */, + 9AF41705242CDA5800D2644C /* XStringW.cpp in Sources */, + 9AF41706242CDA5800D2644C /* lockedgraphics.cpp in Sources */, + 9AF41707242CDA5800D2644C /* XString_test.cpp in Sources */, + 9AF41708242CDA5800D2644C /* device_inject.cpp in Sources */, + 9AF41709242CDA5800D2644C /* Settings.cpp in Sources */, + 9AF4170A242CDA5800D2644C /* legacy.cpp in Sources */, + 9AF4170B242CDA5800D2644C /* AcpiPatcher.cpp in Sources */, + 9AF4170C242CDA5800D2644C /* BdsConnect.cpp in Sources */, + 9AF4170D242CDA5800D2644C /* poolprint-test.cpp in Sources */, + 9AF4170E242CDA5800D2644C /* spd.cpp in Sources */, + 9AF4170F242CDA5800D2644C /* printf_lite-test.cpp in Sources */, + 9AF41710242CDA5800D2644C /* kext_patcher.cpp in Sources */, + 9AF41711242CDA5800D2644C /* abort.cpp in Sources */, + 9AF41712242CDA5800D2644C /* gma.cpp in Sources */, + 9AF41713242CDA5800D2644C /* FloatLib.cpp in Sources */, + 9AF41714242CDA5800D2644C /* menu_items.cpp in Sources */, + 9AF41715242CDA5800D2644C /* lodepng.cpp in Sources */, + 9AF41716242CDA5800D2644C /* secureboot.cpp in Sources */, + 9AF41717242CDA5800D2644C /* FixBiosDsdt.cpp in Sources */, + 9AF41718242CDA5800D2644C /* BootLog.cpp in Sources */, + 9AF41719242CDA5800D2644C /* icns.cpp in Sources */, + 9AF4171A242CDA5800D2644C /* strcmp_test.cpp in Sources */, + 9AF4171B242CDA5800D2644C /* nanosvgrast.cpp in Sources */, + 9AF4171C242CDA5800D2644C /* XStringWArray_test.cpp in Sources */, + 9AF4171D242CDA5800D2644C /* main.cpp in Sources */, + 9AF4171E242CDA5800D2644C /* nvidia.cpp in Sources */, + 9AF4171F242CDA5800D2644C /* XString.cpp in Sources */, + 9AF41720242CDA5800D2644C /* plist.cpp in Sources */, + 9AF41721242CDA5800D2644C /* kernel_patcher.cpp in Sources */, + 9AF41722242CDA5800D2644C /* nanosvg.cpp in Sources */, + 9AF41723242CDA5800D2644C /* XToolsCommon.cpp in Sources */, + 9AF41724242CDA5800D2644C /* ati.cpp in Sources */, + 9AF41725242CDA5800D2644C /* Net.cpp in Sources */, + 9AF41726242CDA5800D2644C /* kext_inject.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 */, + 9AF4172D242CDA5800D2644C /* unicode_conversions.cpp in Sources */, + 9AF4172E242CDA5800D2644C /* StartupSound.cpp in Sources */, + 9AF4172F242CDA5800D2644C /* globals_ctor.cpp in Sources */, + 9AF41730242CDA5800D2644C /* screen.cpp in Sources */, + 9AF41731242CDA5800D2644C /* VectorGraphics.cpp in Sources */, + 9AF41732242CDA5800D2644C /* common.cpp in Sources */, + 9AF41733242CDA5800D2644C /* egemb_icons.cpp in Sources */, + 9AF41734242CDA5800D2644C /* Edid.cpp in Sources */, + 9AF41735242CDA5800D2644C /* smbios.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ @@ -1091,11 +2045,13 @@ NO_MSABI_VA_FUNCS, ); HEADER_SEARCH_PATHS = ( - $PROJECT_DIR/../../rEFIt_UEFI/Platform/Posix, $PROJECT_DIR/../../Build/Clover/DEBUG_XCODE8/X64/rEFIt_UEFI/refit/DEBUG, - $PROJECT_DIR/../../rEFIt_UEFI, + $PROJECT_DIR/../../rEFIt_UEFI/Platform/Posix, $PROJECT_DIR/../../rEFIt_UEFI/Platform, + $PROJECT_DIR/../../rEFIt_UEFI/cpp_unit_test, + $PROJECT_DIR/../../rEFIt_UEFI, $PROJECT_DIR/../../Include, + $PROJECT_DIR/../../Include/Library, $PROJECT_DIR/../../IntelFrameworkModulePkg/Include, $PROJECT_DIR/../../IntelFrameworkPkg/Include, $PROJECT_DIR/../../MdePkg/Include, @@ -1135,11 +2091,13 @@ GCC_ENABLE_CPP_EXCEPTIONS = NO; GCC_ENABLE_CPP_RTTI = NO; HEADER_SEARCH_PATHS = ( - $PROJECT_DIR/../../rEFIt_UEFI/Platform/Posix, $PROJECT_DIR/../../Build/Clover/DEBUG_XCODE8/X64/rEFIt_UEFI/refit/DEBUG, - $PROJECT_DIR/../../rEFIt_UEFI, + $PROJECT_DIR/../../rEFIt_UEFI/Platform/Posix, $PROJECT_DIR/../../rEFIt_UEFI/Platform, + $PROJECT_DIR/../../rEFIt_UEFI/cpp_unit_test, + $PROJECT_DIR/../../rEFIt_UEFI, $PROJECT_DIR/../../Include, + $PROJECT_DIR/../../Include/Library, $PROJECT_DIR/../../IntelFrameworkModulePkg/Include, $PROJECT_DIR/../../IntelFrameworkPkg/Include, $PROJECT_DIR/../../MdePkg/Include, @@ -1284,6 +2242,234 @@ }; name = Release; }; + 9AF4165C242CD75C00D2644C /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_CXX_LIBRARY = "compiler-default"; + CLANG_ENABLE_OBJC_ARC = NO; + CLANG_ENABLE_OBJC_WEAK = NO; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_STYLE = Automatic; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = NO; + ENABLE_TESTABILITY = YES; + EXECUTABLE_PREFIX = lib; + GCC_C_LANGUAGE_STANDARD = c11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "JIEF_DEBUG=1", + "DEBUG_ALL=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = ""; + SKIP_INSTALL = YES; + }; + name = Debug; + }; + 9AF4165D242CD75C00D2644C /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_CXX_LIBRARY = "compiler-default"; + CLANG_ENABLE_OBJC_ARC = NO; + CLANG_ENABLE_OBJC_WEAK = NO; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_STYLE = Automatic; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = NO; + EXECUTABLE_PREFIX = lib; + GCC_C_LANGUAGE_STANDARD = c11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = ""; + SKIP_INSTALL = YES; + }; + name = Release; + }; + 9AF41739242CDA5800D2644C /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_CXX_LIBRARY = "compiler-default"; + CLANG_ENABLE_OBJC_ARC = NO; + CLANG_ENABLE_OBJC_WEAK = NO; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_STYLE = Automatic; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = NO; + ENABLE_TESTABILITY = YES; + EXECUTABLE_PREFIX = lib; + GCC_C_LANGUAGE_STANDARD = c11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "JIEF_DEBUG=1", + "DEBUG_ALL=2", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = ""; + SKIP_INSTALL = YES; + }; + name = Debug; + }; + 9AF4173A242CDA5800D2644C /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; + CLANG_CXX_LIBRARY = "compiler-default"; + CLANG_ENABLE_OBJC_ARC = NO; + CLANG_ENABLE_OBJC_WEAK = NO; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "-"; + CODE_SIGN_STYLE = Automatic; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = NO; + EXECUTABLE_PREFIX = lib; + GCC_C_LANGUAGE_STANDARD = c11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = ""; + SKIP_INSTALL = YES; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -1305,6 +2491,24 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 9AF4165B242CD75C00D2644C /* Build configuration list for PBXNativeTarget "CloverX64 DEBUG_ALL=1" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 9AF4165C242CD75C00D2644C /* Debug */, + 9AF4165D242CD75C00D2644C /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 9AF41738242CDA5800D2644C /* Build configuration list for PBXNativeTarget "CloverX64 DEBUG_ALL=2" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 9AF41739242CDA5800D2644C /* Debug */, + 9AF4173A242CDA5800D2644C /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; /* End XCConfigurationList section */ }; rootObject = 9AC77EB924176B08005CDD5C /* Project object */; diff --git a/Xcode/CloverX64/clang-slink b/Xcode/CloverX64/clang-slink index 3470acba8..bf859d30a 100755 --- a/Xcode/CloverX64/clang-slink +++ b/Xcode/CloverX64/clang-slink @@ -30,7 +30,7 @@ edk2config="DEBUG_XCODE8" # configuration name of edk2 build script (ie DEB echo edk2config=$edk2config #parameter 4 -libname=""$SCRIPT_DIR"/DerivedData/CloverX64/Build/Products/Debug/libCloverX64.a" # lib name generated by Xcode +libname="$1" # lib name generated by Xcode echo libname=$libname #parameter 5 diff --git a/Xcode/cpp_tests/cpp_tests.xcodeproj/project.pbxproj b/Xcode/cpp_tests/cpp_tests.xcodeproj/project.pbxproj index 097ea1ef2..4540a7976 100644 --- a/Xcode/cpp_tests/cpp_tests.xcodeproj/project.pbxproj +++ b/Xcode/cpp_tests/cpp_tests.xcodeproj/project.pbxproj @@ -91,6 +91,7 @@ 9ACAB117242623EE00BDB3CF /* printf_lite.c in Sources */ = {isa = PBXBuildFile; fileRef = 9ACAB116242623EE00BDB3CF /* printf_lite.c */; }; 9ACAB1192426255C00BDB3CF /* printf_lite.c in Sources */ = {isa = PBXBuildFile; fileRef = 9ACAB116242623EE00BDB3CF /* printf_lite.c */; }; 9ACAB11A2426255C00BDB3CF /* printf_lite.c in Sources */ = {isa = PBXBuildFile; fileRef = 9ACAB116242623EE00BDB3CF /* printf_lite.c */; }; + 9AF41576242CBE7600D2644C /* poolprint-test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9AF41571242CBE7600D2644C /* poolprint-test.cpp */; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -146,7 +147,6 @@ 9A0B08642403144C00E2B470 /* global_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = global_test.cpp; sourceTree = ""; }; 9A0B08862403B08400E2B470 /* cpp_tests UTF32 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "cpp_tests UTF32"; sourceTree = BUILT_PRODUCTS_DIR; }; 9A1A3FDC2424BC22008C89EB /* printf_lite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = printf_lite.h; sourceTree = ""; }; - 9A1A3FE52424BC51008C89EB /* printf_lite-test-cpp_conf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "printf_lite-test-cpp_conf.h"; sourceTree = ""; }; 9A28CD05241B8DD400F3D247 /* strncmp_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = strncmp_test.cpp; sourceTree = ""; }; 9A28CD06241B8DD400F3D247 /* strcmp_test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = strcmp_test.cpp; sourceTree = ""; }; 9A28CD07241B8DD400F3D247 /* strcmp_test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = strcmp_test.h; sourceTree = ""; }; @@ -186,6 +186,18 @@ 9AC780A62417DD2F005CDD5C /* panic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = panic.h; sourceTree = ""; }; 9ACAB116242623EE00BDB3CF /* printf_lite.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = printf_lite.c; sourceTree = ""; }; 9ACAB1182426240C00BDB3CF /* printf_lite.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = printf_lite.h; path = ../../Include/Library/printf_lite.h; sourceTree = ""; }; + 9AF4156B242CBB5600D2644C /* printf_lite-test-cpp_conf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "printf_lite-test-cpp_conf.h"; sourceTree = ""; }; + 9AF4156D242CBC4900D2644C /* printf_lite-conf.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "printf_lite-conf.h"; path = "../../Include/Library/printf_lite-conf.h"; sourceTree = ""; }; + 9AF4156E242CBC6000D2644C /* printf_lite-conf.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "printf_lite-conf.h"; sourceTree = ""; }; + 9AF4156F242CBE7500D2644C /* printlib-test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "printlib-test.h"; sourceTree = ""; }; + 9AF41570242CBE7500D2644C /* printlib-test-cpp_conf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "printlib-test-cpp_conf.h"; sourceTree = ""; }; + 9AF41571242CBE7600D2644C /* poolprint-test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "poolprint-test.cpp"; sourceTree = ""; }; + 9AF41572242CBE7600D2644C /* poolprint-test-cpp_conf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "poolprint-test-cpp_conf.h"; sourceTree = ""; }; + 9AF41573242CBE7600D2644C /* printlib-test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "printlib-test.cpp"; sourceTree = ""; }; + 9AF41574242CBE7600D2644C /* printf_lite-test-cpp_conf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "printf_lite-test-cpp_conf.h"; sourceTree = ""; }; + 9AF41575242CBE7600D2644C /* poolprint-test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "poolprint-test.h"; sourceTree = ""; }; + 9AF41578242CBED700D2644C /* poolprint-test-cpp_conf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "poolprint-test-cpp_conf.h"; sourceTree = ""; }; + 9AF41579242CBED700D2644C /* printlib-test-cpp_conf.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "printlib-test-cpp_conf.h"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -244,9 +256,15 @@ 9A0B08542402FE9B00E2B470 /* all_tests.h */, 9A0B08642403144C00E2B470 /* global_test.cpp */, 9A57C20A2418A1FD0029A39F /* global_test.h */, - 9A1A3FE52424BC51008C89EB /* printf_lite-test-cpp_conf.h */, + 9AF41572242CBE7600D2644C /* poolprint-test-cpp_conf.h */, + 9AF41571242CBE7600D2644C /* poolprint-test.cpp */, + 9AF41575242CBE7600D2644C /* poolprint-test.h */, + 9AF41574242CBE7600D2644C /* printf_lite-test-cpp_conf.h */, 9AA045892425F94D000D6970 /* printf_lite-test.cpp */, 9AA045882425F94D000D6970 /* printf_lite-test.h */, + 9AF41570242CBE7500D2644C /* printlib-test-cpp_conf.h */, + 9AF41573242CBE7600D2644C /* printlib-test.cpp */, + 9AF4156F242CBE7500D2644C /* printlib-test.h */, 9A28CD06241B8DD400F3D247 /* strcmp_test.cpp */, 9A28CD07241B8DD400F3D247 /* strcmp_test.h */, 9A28CD15241BACBB00F3D247 /* strlen_test.cpp */, @@ -275,6 +293,7 @@ 9A1A3FD82424BC22008C89EB /* MemLogLibDefault */ = { isa = PBXGroup; children = ( + 9AF4156D242CBC4900D2644C /* printf_lite-conf.h */, 9ACAB1182426240C00BDB3CF /* printf_lite.h */, 9ACAB116242623EE00BDB3CF /* printf_lite.c */, 9A1A3FDC2424BC22008C89EB /* printf_lite.h */, @@ -328,13 +347,17 @@ 9A92232F2402FD1000483CBA /* Main */ = { isa = PBXGroup; children = ( - 9AA045782425D44D000D6970 /* PoolPrint */, + 9AF41578242CBED700D2644C /* poolprint-test-cpp_conf.h */, + 9AF41579242CBED700D2644C /* printlib-test-cpp_conf.h */, 9A9223302402FD1000483CBA /* main.cpp */, - 9A92234D2402FD9500483CBA /* Platform.h */, 9A0B085D240300E000E2B470 /* Platform.cpp */, + 9A92234D2402FD9500483CBA /* Platform.h */, + 9AA045782425D44D000D6970 /* PoolPrint */, 9A28CD13241B9FEE00F3D247 /* posix.h */, - 9A28CD49241F437C00F3D247 /* xcode_utf16.h */, + 9AF4156E242CBC6000D2644C /* printf_lite-conf.h */, + 9AF4156B242CBB5600D2644C /* printf_lite-test-cpp_conf.h */, 9A28CD4A241F4CCE00F3D247 /* xcode_utf16.cpp */, + 9A28CD49241F437C00F3D247 /* xcode_utf16.h */, ); name = Main; path = src; @@ -534,6 +557,7 @@ 9A28CD0C241B8DD400F3D247 /* strcmp_test.cpp in Sources */, 9A28CD09241B8DD400F3D247 /* strncmp_test.cpp in Sources */, 9AA05BB7240FC78D008EA4F8 /* utf8Conversion.cpp in Sources */, + 9AF41576242CBE7600D2644C /* poolprint-test.cpp in Sources */, 9AC780AE2417DD2F005CDD5C /* panic.cpp in Sources */, 9A0B085F240308E400E2B470 /* XStringW.cpp in Sources */, 9A0B08592402FF8200E2B470 /* all_tests.cpp in Sources */, diff --git a/Xcode/cpp_tests/old/poolprintfloat-test-cpp_conf.h b/Xcode/cpp_tests/old/poolprintfloat-test-cpp_conf.h new file mode 100644 index 000000000..d111af183 --- /dev/null +++ b/Xcode/cpp_tests/old/poolprintfloat-test-cpp_conf.h @@ -0,0 +1,12 @@ + +#define F(x) x +#define LF(x) L##x +#define PRIF "%a" +#define PRILF "%s" + +#define loggf(...) DebugLog(2, __VA_ARGS__) +//#define loggf(...) printf(__VA_ARGS__) + +#define DISPLAY_ONLY_FAILED +//#define DISPLAY_START_INFO + diff --git a/Xcode/cpp_tests/old/poolprintfloat-test.cpp b/Xcode/cpp_tests/old/poolprintfloat-test.cpp new file mode 100644 index 000000000..45d99db56 --- /dev/null +++ b/Xcode/cpp_tests/old/poolprintfloat-test.cpp @@ -0,0 +1,135 @@ +// +// main.cpp +// Printf-UnitTests +// +// Created by Jief on 29/08/17. +// Copyright © 2017 Jief. All rights reserved. +// + +#include +#include +#include "unicode_conversions.h" +#include +#include "poolprint-test.h" + +static int nbTestFailed = 0; +#ifdef DISPLAY_ONLY_FAILED +static bool displayOnlyFailed = true; +#else +static bool displayOnlyFailed = false; +#endif + +/* + * Print wchar string as a utf8 string. + * This eliminate all problems about wprintf and compilation with short-wchar or long-wchar I had on macOs (2020-03) + */ +static void print_wchar_string(const wchar_t* s) +{ +// char utf8[wchar_len(s)*4+1]; +// some compiler doesn't like variable length array. +// use a fixed length instead. + char utf8[200]; + utf8_string_from_wchar_string(utf8, sizeof(utf8), s); + if ( strlen(utf8) > sizeof(utf8)-2 ) { + loggf("fixed size buf not big enough"); + abort(); + } + loggf("%s", utf8); +} + + +VOID +EFIAPI +_PoolCatPrint ( + IN CONST CHAR16 *fmt, + IN VA_LIST args, + IN OUT POOL_PRINT *spc, + IN EFI_STATUS + (EFIAPI + *Output) + ( + POOL_PRINT *context, + CHAR16 *str + ) + ); + +#include "../libeg/FloatLib.h" + +static int testPoolPrintFloat(const char* label, const wchar_t* expectResult, float param) +{ + wchar_t* wbuf = PoolPrintFloat(param); + if ( memcmp(wbuf, expectResult, wchar_len(expectResult)*sizeof(expectResult[0])) != 0 ) { +// loggf(F(" -> ERROR. Expect " PRILF " and get %ls\n"), expectResult, buf); +// not using wprintf, it crashes sometimes, it doesn't work for short-wchar + loggf(F("%s -> ERROR. Expect "), label); + print_wchar_string(expectResult); + loggf(F(" and get ")); + print_wchar_string(wbuf); + loggf("\n"); + nbTestFailed += 1; + wchar_t* wbuf2 = PoolPrintFloat(param); // for stepping with a debugger. + FreePool(wbuf2); + }else if ( !displayOnlyFailed ) { + loggf(F("%s : "), label); + print_wchar_string(wbuf); + loggf(F(" -> OK\n")); + } + FreePool(wbuf); + return 1; +} + + + +#define Test1arg(expectResult,param) \ +{ \ + char label[1024]; \ + snprintf(label, sizeof(label), F("testPoolPrintFloat(%s)"), F(#param)); \ + testPoolPrintFloat(label,L##expectResult,param); \ +} + +#define Test2arg(expectResult,format,c,d) \ +{ \ + char label[1024]; \ + snprintf(label, sizeof(label), F("Test swprintf(%s, %s, %s)"), F(#format), F(#c), F(#d)); \ + testWPrintf(label,L##expectResult,(int)wcslen(L##expectResult),L##format,c,d); \ +} + +#define Test5arg(expectResult,format,c,d,e,f,g) \ +{ \ + char label[1024]; \ + snprintf(label, sizeof(label), F("Test swprintf(%s, %s, %s, %s, %s, %s)"), F(#format), F(#c), F(#d), F(#e), F(#f), F(#g)); \ + testWPrintf(label,L##expectResult,(int)wcslen(L##expectResult),L##format,c,d,e,f,g); \ +} + + +int poolprintfloat_tests(void) +{ +#ifdef DISPLAY_START_INFO + loggf(F("\n")); + loggf(F("PoolPrintFloat unit test\n")); + loggf(F("\n")); + loggf(F("\n")); + + // These depends on the plateform. They are not printf unit test, but it's nice to check size of builtin type. + loggf(F("sizeof(float)=%lu\n"), sizeof(float)); + loggf(F("sizeof(double)=%zu\n"), sizeof(double)); + loggf(F("\n")); + +#endif + + Test1arg(F(" 0.000000"), 0.0); + Test1arg(F(" 0.123456"), 0.1234567890); + Test1arg(F("-0.123456"), -0.1234567890); + Test1arg(F(" 1.100000"), 1.1); + Test1arg(F(" -1.100000"), -1.1); + Test1arg(F(" 123.456787"), 123.456789); + Test1arg(F(" -123.456787"), -123.456789); + Test1arg(F(" 1234567936.000000"), 1234567890.456789); + Test1arg(F(" -1234567936.000000"), -1234567890.456789); + Test1arg(F(" 0.000000"), 12345678901234567890.456789); + Test1arg(F(" 0.000000"), -12345678901234567890.456789); + + + return nbTestFailed; +} + diff --git a/Xcode/cpp_tests/old/poolprintfloat-test.h b/Xcode/cpp_tests/old/poolprintfloat-test.h new file mode 100644 index 000000000..597f991e9 --- /dev/null +++ b/Xcode/cpp_tests/old/poolprintfloat-test.h @@ -0,0 +1 @@ +int poolprintfloat_tests(); diff --git a/Xcode/cpp_tests/src/panic.cpp b/Xcode/cpp_tests/src/panic.cpp deleted file mode 100644 index d5299492b..000000000 --- a/Xcode/cpp_tests/src/panic.cpp +++ /dev/null @@ -1,38 +0,0 @@ -#include "panic.h" -#include - -//extern "C" { -//#include // for CpuDeadLoop -//} - -bool stop_at_panic = true; -bool i_have_panicked = false; - -/* - * - * Function panic_ seems useless. It's same as panic(). It's to be able to put a breakpoint in gdb with br panic_(). This is done in gdb_launch script in Qemu - */ -void panic_(const char* s) -{ - if ( stop_at_panic ) { - if ( s ) DebugLog(2, "%a\n", s); - DebugLog(2, "A fatal error happened. System halted\n"); - CpuDeadLoop(); - }else{ -// if ( s ) DebugLog(2, "%a\n", s); -// DebugLog(2, "A fatal error happened. Continue for testing\n"); - i_have_panicked = true; - } -} - - -void panic(const char* s) -{ - panic_(s); -} - - -void panic(void) -{ - panic_(nullptr); -} diff --git a/Xcode/cpp_tests/src/panic.h b/Xcode/cpp_tests/src/panic.h deleted file mode 100644 index 6b2e7bc23..000000000 --- a/Xcode/cpp_tests/src/panic.h +++ /dev/null @@ -1,10 +0,0 @@ -#ifndef __PANIC_H__ -#define __PANIC_H__ - -extern bool stop_at_panic; -extern bool i_have_panicked; - -void panic(void); -void panic(const char* s); - -#endif diff --git a/Xcode/cpp_tests/src/poolprint-test-cpp_conf.h b/Xcode/cpp_tests/src/poolprint-test-cpp_conf.h new file mode 100644 index 000000000..8cf2b0001 --- /dev/null +++ b/Xcode/cpp_tests/src/poolprint-test-cpp_conf.h @@ -0,0 +1,13 @@ + +#include "../../Include/Library/printf_lite.h" +#define F(x) x +#define LF(x) L##x +#define PRIF "%a" +#define PRILF "%s" + +//#define loggf(...) DebugLog(2, __VA_ARGS__) +#define loggf(...) printf(__VA_ARGS__) + +//#define DISPLAY_ONLY_FAILED +#define DISPLAY_START_INFO + diff --git a/Xcode/cpp_tests/src/poolprintfloat-test-cpp_conf.h b/Xcode/cpp_tests/src/poolprintfloat-test-cpp_conf.h new file mode 100644 index 000000000..d111af183 --- /dev/null +++ b/Xcode/cpp_tests/src/poolprintfloat-test-cpp_conf.h @@ -0,0 +1,12 @@ + +#define F(x) x +#define LF(x) L##x +#define PRIF "%a" +#define PRILF "%s" + +#define loggf(...) DebugLog(2, __VA_ARGS__) +//#define loggf(...) printf(__VA_ARGS__) + +#define DISPLAY_ONLY_FAILED +//#define DISPLAY_START_INFO + diff --git a/Xcode/cpp_tests/src/posix.h b/Xcode/cpp_tests/src/posix.h index 13a47b8fc..ee11acbf0 100644 --- a/Xcode/cpp_tests/src/posix.h +++ b/Xcode/cpp_tests/src/posix.h @@ -48,7 +48,8 @@ #define MAX_INT32 ((INT32)0x7FFFFFFF) #define MAX_UINT32 ((UINT32)0xFFFFFFFF) #define MAX_INT64 ((INT64)0x7FFFFFFFFFFFFFFFULL) -#define MAX_UINT64 ((UINT64)0xFFFFFFFFFFFFFFFFULL) +//#define MAX_UINT64 ((UINT64)0xFFFFFFFFFFFFFFFFULL) +#define MAX_UINT64 0xFFFFFFFFFFFFFFFFULL #define UINTN uint64_t #define INTN int64_t diff --git a/Xcode/cpp_tests/src/printf_lite-conf.h b/Xcode/cpp_tests/src/printf_lite-conf.h new file mode 100755 index 000000000..d946fbfdd --- /dev/null +++ b/Xcode/cpp_tests/src/printf_lite-conf.h @@ -0,0 +1,36 @@ +// +// printf_lite.hpp +// +// Created by jief the 04 Apr 2019. +// Imported in CLover the 24 Feb 2020 +// +#ifndef __PRINTF_LITE_CONF_H__ +#define __PRINTF_LITE_CONF_H__ + +#include +#include // for size_t + +#ifndef __cplusplus + #ifdef _MSC_VER + typedef UINT16 wchar_t; + #endif + typedef UINT32 char32_t; + typedef UINT16 char16_t; +#endif + +#ifdef _MSC_VER +# define __attribute__(x) +#endif + +#ifdef DEBUG +#define DEFINE_SECTIONS 0 +#endif + + +#define PRINTF_CFUNCTION_PREFIX +#define PRINTF_CFUNCTION_SUFFIX fl +#define PRINTF_EMIT_CR 0 + + + +#endif // __PRINTF_LITE_CONF_H__ diff --git a/Xcode/cpp_tests/src/printf_lite-test-cpp_conf.h b/Xcode/cpp_tests/src/printf_lite-test-cpp_conf.h new file mode 100644 index 000000000..5de3d2a1e --- /dev/null +++ b/Xcode/cpp_tests/src/printf_lite-test-cpp_conf.h @@ -0,0 +1,12 @@ + +#define F(x) x +#define LF(x) L##x +#define PRIF "%s" +#define PRILF "%ls" + +#define loggf(...) DebugLog(2, __VA_ARGS__) +//#define loggf(...) printf(__VA_ARGS__) + +#define DISPLAY_ONLY_FAILED +//#define DISPLAY_START_INFO + diff --git a/Xcode/cpp_tests/src/printlib-test-cpp_conf.h b/Xcode/cpp_tests/src/printlib-test-cpp_conf.h new file mode 100644 index 000000000..625fcb015 --- /dev/null +++ b/Xcode/cpp_tests/src/printlib-test-cpp_conf.h @@ -0,0 +1,12 @@ + +#define F(x) x +#define LF(x) L##x +#define PRIF "%s" +#define PRILF "%ls" + +//#define loggf(...) DebugLog(2, __VA_ARGS__) +#define loggf(...) printf(__VA_ARGS__) + +//#define DISPLAY_ONLY_FAILED +#define DISPLAY_START_INFO + diff --git a/rEFIt_UEFI/Platform/BootLog.h b/rEFIt_UEFI/Platform/BootLog.h index 59959c122..2c077cc6d 100755 --- a/rEFIt_UEFI/Platform/BootLog.h +++ b/rEFIt_UEFI/Platform/BootLog.h @@ -38,7 +38,7 @@ VOID EFIAPI DebugLog ( IN INTN DebugMode, - IN CONST CHAR8 *FormatString, ...) __attribute__((format(printf, 2, 3)));; + IN CONST CHAR8 *FormatString, ...) __attribute__((format(printf, 2, 3))); #endif diff --git a/rEFIt_UEFI/Platform/Events.cpp b/rEFIt_UEFI/Platform/Events.cpp index 04e5992f3..94239cb0a 100644 --- a/rEFIt_UEFI/Platform/Events.cpp +++ b/rEFIt_UEFI/Platform/Events.cpp @@ -14,8 +14,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. //#include "device_tree.h" #include "kernel_patcher.h" +#ifndef DEBUG_ALL #define PATCH_DEBUG 0 #define MEM_DEB 0 +#else +#define PATCH_DEBUG DEBUG_ALL +#define MEM_DEB DEBUG_ALL +#endif #if PATCH_DEBUG #define DBG(...) Print(__VA_ARGS__); diff --git a/rEFIt_UEFI/Platform/FixBiosDsdt.cpp b/rEFIt_UEFI/Platform/FixBiosDsdt.cpp index 7c3d4a9e2..0f029cc99 100755 --- a/rEFIt_UEFI/Platform/FixBiosDsdt.cpp +++ b/rEFIt_UEFI/Platform/FixBiosDsdt.cpp @@ -662,7 +662,7 @@ VOID CheckHardware() #if DEBUG_FIX dadr1 = DisplayADR1[display]; dadr2 = DisplayADR2[display]; - DBG("DisplayADR1[%d] = 0x%X, DisplayADR2[%d] = 0x%X\n", display, dadr1, display, dadr2); + DBG("DisplayADR1[%llu] = 0x%X, DisplayADR2[%llu] = 0x%X\n", display, dadr1, display, dadr2); #endif // dadr2 = dadr1; //to avoid warning "unused variable" :( DisplayVendor[display] = Pci.Hdr.VendorId; @@ -749,7 +749,7 @@ VOID CheckHardware() USBIntel = (Pci.Hdr.VendorId == 0x8086); USBNForce = (Pci.Hdr.VendorId == 0x10de); GetPciADR(DevicePath, &USBADR[usb], &USBADR2[usb], &USBADR3[usb]); - DBG("USBADR[%d] = 0x%X and PCIe = 0x%X\n", usb, USBADR[usb], USBADR2[usb]); + DBG("USBADR[%llu] = 0x%X and PCIe = 0x%X\n", usb, USBADR[usb], USBADR2[usb]); if (USBIDFIX) { if (USBADR[usb] == 0x001D0000 && !NativeUSB(DID)) DID = 0x3a34; @@ -1492,7 +1492,7 @@ INTN ReplaceName(UINT8 *dsdt, UINT32 len, CONST CHAR8 *OldName, CONST CHAR8 *New if (OldName) { MsgLog("NewName %s already present, renaming impossible\n", NewName); } else { - DBG("name %s present at %X\n", NewName, i); + DBG("name %s present at %llX\n", NewName, i); } return -1; } @@ -2795,7 +2795,7 @@ UINT32 AddHDMI (UINT8 *dsdt, UINT32 len) } if (!PCISIZE) return len; //what is the bad DSDT ?! - DBG("Start HDMI%d Fix\n"); + DBG("Start HDMI Fix\n"); // Device Address for (i=0x20; len >= 10 && i < len - 10; i++) { if (CmpAdr(dsdt, i, HDMIADR1)) { @@ -5346,7 +5346,7 @@ VOID RenameDevices(UINT8* table) if (CmpFullName(table + k, len - k, Bridge)) { CopyMem(table + adr, Replace, 4); adr += 5; - DBG("found Bridge device begin=%X end=%X\n", k, k+size); + DBG("found Bridge device begin=%llX end=%llX\n", k, k+size); // DBG(" name copied\n"); Num++; break; //cancel search outer bridge, we found it. diff --git a/rEFIt_UEFI/Platform/LegacyBiosThunk.cpp b/rEFIt_UEFI/Platform/LegacyBiosThunk.cpp index 209bf58d1..16b3e2af7 100644 --- a/rEFIt_UEFI/Platform/LegacyBiosThunk.cpp +++ b/rEFIt_UEFI/Platform/LegacyBiosThunk.cpp @@ -13,6 +13,9 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. **/ #include "LegacyBiosThunk.h" +#include +#include "BootLog.h" // for DebugLog +#include "../refit/screen.h" // just for PauseForKey #ifndef DEBUG_ALL #define DEBUG_LBTHUNK 0 diff --git a/rEFIt_UEFI/Platform/Platform.h b/rEFIt_UEFI/Platform/Platform.h index dcb42d6c3..656d9671b 100755 --- a/rEFIt_UEFI/Platform/Platform.h +++ b/rEFIt_UEFI/Platform/Platform.h @@ -94,7 +94,9 @@ extern "C" { #include "../cpp_util/remove_ref.h" #endif +#include "BootLog.h" #include "../refit/lib.h" +#include "../refit/screen.h" // for PauseForKey #include "string.h" #include "boot.h" //#include "PiBootMode.h" diff --git a/rEFIt_UEFI/Platform/Posix/stdio.cpp b/rEFIt_UEFI/Platform/Posix/stdio.cpp index 61f99700e..8e00d5237 100755 --- a/rEFIt_UEFI/Platform/Posix/stdio.cpp +++ b/rEFIt_UEFI/Platform/Posix/stdio.cpp @@ -27,24 +27,24 @@ int printf(const char* format, ...) static XString stdio_static_buf; -char* strerror(EFI_STATUS Status) +const char* strerror(EFI_STATUS Status) { UINTN n = 0; do { stdio_static_buf.CheckSize(stdio_static_buf.length()+10); - n = AsciiSPrint(stdio_static_buf.data(), stdio_static_buf.m_allocatedSize, "%r", Status); - } while ( n > stdio_static_buf.m_allocatedSize - 2 ); + n = AsciiSPrint(stdio_static_buf.dataSized(0, stdio_static_buf.allocatedSize()), stdio_static_buf.allocatedSize(), "%r", Status); + } while ( n > stdio_static_buf.allocatedSize() - 2 ); return stdio_static_buf.data(); } -char* strguid(EFI_GUID* guid) +const char* strguid(EFI_GUID* guid) { UINTN n = 0; do { stdio_static_buf.CheckSize(stdio_static_buf.length()+10); - n = AsciiSPrint(stdio_static_buf.data(), stdio_static_buf.m_allocatedSize, "%g", guid); - } while ( n > stdio_static_buf.m_allocatedSize - 2 ); + n = AsciiSPrint(stdio_static_buf.dataSized(0, stdio_static_buf.allocatedSize()), stdio_static_buf.allocatedSize(), "%g", guid); + } while ( n > stdio_static_buf.allocatedSize() - 2 ); return stdio_static_buf.data(); } diff --git a/rEFIt_UEFI/Platform/Posix/stdio.h b/rEFIt_UEFI/Platform/Posix/stdio.h index 1e1139b8f..abf1016d4 100644 --- a/rEFIt_UEFI/Platform/Posix/stdio.h +++ b/rEFIt_UEFI/Platform/Posix/stdio.h @@ -16,8 +16,8 @@ int printf(const char* format, ...) __attribute__((format(printf, 1, 2))); //int snprintf(char* str, size_t size, const char* format, ...) __attribute__((format(printf, 1, 2)));; -char* strerror(EFI_STATUS errnum); -char* strguid(EFI_GUID* guid); +const char* strerror(EFI_STATUS errnum); +const char* strguid(EFI_GUID* guid); diff --git a/rEFIt_UEFI/Platform/gma.cpp b/rEFIt_UEFI/Platform/gma.cpp index 90b7ca30b..6832ec62b 100755 --- a/rEFIt_UEFI/Platform/gma.cpp +++ b/rEFIt_UEFI/Platform/gma.cpp @@ -995,45 +995,45 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) SetUGAWidth = TRUE; if(UGAHeight == 120) { SetUGAHeight = TRUE; - DBG (" Found quarter quarter VGA Display - 4:3 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found quarter quarter VGA Display - 4:3 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); } else { - DBG (" Found Unknown Resolution Display - ?:? :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Unknown Resolution Display - ?:? :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); } break; case 240: SetUGAWidth = TRUE; if(UGAHeight == 160) { SetUGAHeight = TRUE; - DBG (" Found Half quarter VGA Display - 3:2 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Half quarter VGA Display - 3:2 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); } else { - DBG (" Found Unknown Resolution Display - ?:? :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Unknown Resolution Display - ?:? :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); } break; case 320: SetUGAWidth = TRUE; if(UGAHeight == 240) { SetUGAHeight = TRUE; - DBG (" Found quarter VGA Display - 4:3 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found quarter VGA Display - 4:3 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); } else { - DBG (" Found Unknown Resolution Display - ?:? :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Unknown Resolution Display - ?:? :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); } break; case 400: SetUGAWidth = TRUE; if(UGAHeight == 240) { SetUGAHeight = TRUE; - DBG (" Found Wide quarter VGA Display - 5:3 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Wide quarter VGA Display - 5:3 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); } else { - DBG (" Found Unknown Resolution Display - ?:? :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Unknown Resolution Display - ?:? :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); } break; case 480: SetUGAWidth = TRUE; if(UGAHeight == 320) { SetUGAHeight = TRUE; - DBG (" Found Half-size VGA Display - 3:2 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Half-size VGA Display - 3:2 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); } else { - DBG (" Found Unknown Resolution Display - ?:? :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Unknown Resolution Display - ?:? :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); } break; case 640: @@ -1041,14 +1041,14 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) switch (UGAHeight) { case 360: SetUGAHeight = TRUE; - DBG (" Found one ninth of a Full HD Display - 16:9 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found one ninth of a Full HD Display - 16:9 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; case 480: SetUGAHeight = TRUE; - DBG (" Found VGA Display - 4:3 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found VGA Display - 4:3 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; default: - DBG (" Found Unknown Resolution Display - ?:? :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Unknown Resolution Display - ?:? :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; } break; @@ -1057,14 +1057,14 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) switch (UGAHeight) { case 480: SetUGAHeight = TRUE; - DBG (" Found Wide VGA Display - 5:3 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Wide VGA Display - 5:3 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; case 600: SetUGAHeight = TRUE; - DBG (" Found Super VGA Display - 4:3 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Super VGA Display - 4:3 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; default: - DBG (" Found Unknown Resolution Display - ?:? :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Unknown Resolution Display - ?:? :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; } break; @@ -1072,9 +1072,9 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) SetUGAWidth = TRUE; if(UGAHeight == 480) { SetUGAHeight = TRUE; - DBG (" Found Full Wide VGA Display - 16:9 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Full Wide VGA Display - 16:9 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); } else { - DBG (" Found Unknown Resolution Display - ?:? :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Unknown Resolution Display - ?:? :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); } break; case 960: @@ -1082,14 +1082,14 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) switch (UGAHeight) { case 540: SetUGAHeight = TRUE; - DBG (" Found one quarter of Full HD Display - 16:9 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found one quarter of Full HD Display - 16:9 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; case 640: SetUGAHeight = TRUE; - DBG (" Found Double-size VGA Display - 3:2 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Double-size VGA Display - 3:2 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; default: - DBG (" Found Unknown Resolution Display - ?:? :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Unknown Resolution Display - ?:? :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; } break; @@ -1098,18 +1098,18 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) switch (UGAHeight) { case 576: SetUGAHeight = TRUE; - DBG (" Found Wide Super VGA Display - 16:9 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Wide Super VGA Display - 16:9 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; case 600: SetUGAHeight = TRUE; - DBG (" Found Wide Super VGA Display - 17:10 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Wide Super VGA Display - 17:10 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; case 768: SetUGAHeight = TRUE; - DBG (" Found XGA Display - 4:3 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found XGA Display - 4:3 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; default: - DBG (" Found Unknown Resolution Display - ?:? :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Unknown Resolution Display - ?:? :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; } break; @@ -1117,9 +1117,9 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) SetUGAWidth = TRUE; if(UGAHeight == 864) { SetUGAHeight = TRUE; - DBG (" Found XGA Plus Display - 4:3 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found XGA Plus Display - 4:3 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); } else { - DBG (" Found Unknown Resolution Display - ?:? :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Unknown Resolution Display - ?:? :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); } break; case 1280: @@ -1127,22 +1127,22 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) switch (UGAHeight) { case 720: SetUGAHeight = TRUE; - DBG (" Found HD Display - 16:9 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found HD Display - 16:9 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; case 768: SetUGAHeight = TRUE; - DBG (" Found Wide XGA Display - 5:3 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Wide XGA Display - 5:3 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; case 800: SetUGAHeight = TRUE; - DBG (" Found Wide XGA Display - 16:10 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Wide XGA Display - 16:10 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; case 1024: SetUGAHeight = TRUE; - DBG (" Found Super XGA Display - 5:4 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Super XGA Display - 5:4 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; default: - DBG (" Found Unknown Resolution Display - ?:? :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Unknown Resolution Display - ?:? :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; } break; @@ -1150,27 +1150,27 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) SetUGAWidth = TRUE; if(UGAHeight == 768) { SetUGAHeight = TRUE; - DBG (" Found Full Wide XGA Display - 16:9 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Full Wide XGA Display - 16:9 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); } else { - DBG (" Found Unknown Resolution Display - ?:? :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Unknown Resolution Display - ?:? :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); } break; case 1400: SetUGAWidth = TRUE; if(UGAHeight == 1050) { SetUGAHeight = TRUE; - DBG (" Found Super XGA Plus Display - 4:3 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Super XGA Plus Display - 4:3 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); } else { - DBG (" Found Unknown Resolution Display - ?:? :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Unknown Resolution Display - ?:? :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); } break; case 1440: SetUGAWidth = TRUE; if(UGAHeight == 900) { SetUGAHeight = TRUE; - DBG (" Found Wide XGA Plus Display - 16:10 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Wide XGA Plus Display - 16:10 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); } else { - DBG (" Found Unknown Resolution Display - ?:? :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Unknown Resolution Display - ?:? :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); } break; case 1600: @@ -1178,14 +1178,14 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) switch (UGAHeight) { case 900: SetUGAHeight = TRUE; - DBG (" Found HD Plus Display - 16:9 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found HD Plus Display - 16:9 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; case 1200: SetUGAHeight = TRUE; - DBG (" Found Ultra XGA Display - 4:3 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Ultra XGA Display - 4:3 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; default: - DBG (" Found Unknown Resolution Display - ?:? :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Unknown Resolution Display - ?:? :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; } break; @@ -1194,10 +1194,10 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) switch (UGAHeight) { case 1050: SetUGAHeight = TRUE; - DBG (" Found Widescreen Super XGA Plus Display - 16:10 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Widescreen Super XGA Plus Display - 16:10 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; default: - DBG (" Found Unknown Resolution Display - ?:? :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Unknown Resolution Display - ?:? :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; } break; @@ -1206,14 +1206,14 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) switch (UGAHeight) { case 1080: SetUGAHeight = TRUE; - DBG (" Found Full HD Display - 16:9 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Full HD Display - 16:9 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; case 1200: SetUGAHeight = TRUE; - DBG (" Found Wide Ultra XGA Display - 16:10 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Wide Ultra XGA Display - 16:10 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; default: - DBG (" Found Unknown Resolution Display - ?:? :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Unknown Resolution Display - ?:? :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; } break; @@ -1222,14 +1222,14 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) switch (UGAHeight) { case 1152: SetUGAHeight = TRUE; - DBG (" Found Quad Wide XGA Display - 16:9 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Quad Wide XGA Display - 16:9 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; case 1536: SetUGAHeight = TRUE; - DBG (" Found Quad XGA Display - 4:3 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Quad XGA Display - 4:3 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; default: - DBG (" Found Unknown Resolution Display - ?:? :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Unknown Resolution Display - ?:? :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; } break; @@ -1238,18 +1238,18 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) switch (UGAHeight) { case 1440: SetUGAHeight = TRUE; - DBG (" Found Quad HD Display - 16:9 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Quad HD Display - 16:9 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; case 1600: SetUGAHeight = TRUE; - DBG (" Found Wide Quad XGA Display - 16:10 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Wide Quad XGA Display - 16:10 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; case 2048: SetUGAHeight = TRUE; - DBG (" Found Quad Wide XGA Display - 5:4 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Quad Wide XGA Display - 5:4 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; default: - DBG (" Found Unknown Resolution Display - ?:? :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Unknown Resolution Display - ?:? :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; } break; @@ -1257,9 +1257,9 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) SetUGAWidth = TRUE; if(UGAHeight == 1800) { SetUGAHeight = TRUE; - DBG (" Found Wide Quad XGA Display - 16:10 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Wide Quad XGA Display - 16:10 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); } else { - DBG (" Found Unknown Resolution Display - ?:? :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Unknown Resolution Display - ?:? :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); } break; case 3200: @@ -1267,18 +1267,18 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) switch (UGAHeight) { case 1800: SetUGAHeight = TRUE; - DBG (" Found Quad HD Plus Display - 16:9 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Quad HD Plus Display - 16:9 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; case 2048: SetUGAHeight = TRUE; - DBG (" Found Wide Quad Super XGA Display - 25:16 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Wide Quad Super XGA Display - 25:16 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; case 2400: SetUGAHeight = TRUE; - DBG (" Found Quad Ultra XGA Display - 4:3 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Quad Ultra XGA Display - 4:3 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; default: - DBG (" Found Unknown Resolution Display - ?:? :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Unknown Resolution Display - ?:? :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; } break; @@ -1287,14 +1287,14 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) switch (UGAHeight) { case 2160: SetUGAHeight = TRUE; - DBG (" Found Ultra HD, 4K Display - 16:9 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Ultra HD, 4K Display - 16:9 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; case 2400: SetUGAHeight = TRUE; - DBG (" Found Wide Quad Ultra XGA Display - 16:10 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Wide Quad Ultra XGA Display - 16:10 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; default: - DBG (" Found Unknown Resolution Display - ?:? :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Unknown Resolution Display - ?:? :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; } break; @@ -1302,9 +1302,9 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) SetUGAWidth = TRUE; if(UGAHeight == 3072) { SetUGAHeight = TRUE; - DBG (" Found Hex XGA Display - 4:3 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Hex XGA Display - 4:3 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); } else { - DBG (" Found Unknown Resolution Display - ?:? :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Unknown Resolution Display - ?:? :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); } break; case 5120: @@ -1312,18 +1312,18 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) switch (UGAHeight) { case 2880: SetUGAHeight = TRUE; - DBG (" Found Ultra HD Plus Display - 16:9 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Ultra HD Plus Display - 16:9 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; case 3200: SetUGAHeight = TRUE; - DBG (" Found Wide Hex XGA Display - 16:10 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Wide Hex XGA Display - 16:10 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; case 4096: SetUGAHeight = TRUE; - DBG (" Found Hex Super XGA Display - 5:4 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Hex Super XGA Display - 5:4 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; default: - DBG (" Found Unknown Resolution Display - ?:? :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Unknown Resolution Display - ?:? :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; } break; @@ -1332,14 +1332,14 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) switch (UGAHeight) { case 4096: SetUGAHeight = TRUE; - DBG (" Found Wide Hex Super XGA Display - 25:16 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Wide Hex Super XGA Display - 25:16 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; case 4800: SetUGAHeight = TRUE; - DBG (" Found Hex Ultra XGA Display - 4:3 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Hex Ultra XGA Display - 4:3 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; default: - DBG (" Found Unknown Resolution Display - ?:? :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Unknown Resolution Display - ?:? :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; } break; @@ -1348,19 +1348,19 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) switch (UGAHeight) { case 4320: SetUGAHeight = TRUE; - DBG (" Found Full Ultra HD Display - 16:9 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Full Ultra HD Display - 16:9 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; case 4800: SetUGAHeight = TRUE; - DBG (" Found Wide Hex Ultra XGA Display - 16:10 :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Wide Hex Ultra XGA Display - 16:10 :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; default: - DBG (" Found Unknown Resolution Display - ?:? :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Unknown Resolution Display - ?:? :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; } break; default: - DBG (" Found Unknown Resolution Display - ?:? :: Width=%d Height=%d\n", UGAWidth, UGAHeight); + DBG (" Found Unknown Resolution Display - ?:? :: Width=%lld Height=%lld\n", UGAWidth, UGAHeight); break; } @@ -1670,7 +1670,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x27AE: // "Intel GMA 950" // Mobile - Intel 945GM Express Chipset Family if (!SetFake) { FakeID = 0x27A28086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x27A28086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -1724,7 +1724,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0xA012: // "Intel GMA 3150" // Netbook - Intel NetBook Atom N4x0 if (!SetFake) { FakeID = 0x27A28086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x27A28086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -1788,7 +1788,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x2A13: // "Intel GMA X3100" // Mobile - Intel 965 Express Chipset Family if (!SetFake) { FakeID = 0x2A028086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x2A028086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -1864,14 +1864,14 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) switch (gma_dev->device_id) { case 0x0042: FakeID = 0x00428086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x00428086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); break; case 0x0046: FakeID = 0x00468086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x00468086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -1916,7 +1916,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) switch (gma_dev->device_id) { case 0x0116: FakeID = 0x01168086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x01168086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -1928,7 +1928,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x0122: case 0x0126: FakeID = 0x01268086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x01268086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2009,7 +2009,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x015A: if (!SetFake) { FakeID = 0x01528086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x01528086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2022,7 +2022,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x0156: if (!SetFake) { FakeID = 0x01568086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x01568086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2036,7 +2036,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x016A: if (!SetFake) { FakeID = 0x01628086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x01628086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2049,7 +2049,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x0166: if (!SetFake) { FakeID = 0x01668086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x01668086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2171,14 +2171,14 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x0D12: case 0x0D16: FakeID = 0x04128086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x04128086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); break; case 0x0A26: FakeID = 0x0A268086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x0A268086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2188,7 +2188,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x0A2B: case 0x0A2E: FakeID = 0x0A2E8086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x0A2E8086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2198,14 +2198,14 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x0D2B: case 0x0D2E: FakeID = 0x0D228086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x0D228086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); break; case 0x0D26: FakeID = 0x0D268086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x0D268086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2293,7 +2293,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x1612: if (!SetFake) { FakeID = 0x16128086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x16128086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2306,7 +2306,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x1616: if (!SetFake) { FakeID = 0x16168086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x16168086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2319,7 +2319,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x161E: if (!SetFake) { FakeID = 0x161E8086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x161E8086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2332,7 +2332,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x1626: if (!SetFake) { FakeID = 0x16268086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x16268086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2345,7 +2345,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x162B: if (!SetFake) { FakeID = 0x162B8086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x162B8086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2360,7 +2360,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x162D: if (!SetFake) { FakeID = 0x16228086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x16228086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2434,7 +2434,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x1906: if (!SetFake) { FakeID = 0x19028086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x19028086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2447,7 +2447,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x1912: if (!SetFake) { FakeID = 0x19128086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x19128086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2461,7 +2461,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x1921: if (!SetFake) { FakeID = 0x19168086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x19168086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2476,7 +2476,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x1923: if (!SetFake) { FakeID = 0x191B8086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x191B8086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2489,7 +2489,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x191E: if (!SetFake) { FakeID = 0x191E8086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x191E8086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2502,7 +2502,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x1926: if (!SetFake) { FakeID = 0x19268086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x19268086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2517,7 +2517,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x192D: if (!SetFake) { FakeID = 0x19278086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x19278086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2533,7 +2533,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x193D: if (!SetFake) { FakeID = 0x193B8086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x193B8086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2644,7 +2644,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) if (os_version < AsciiOSVersionToUint64("10.12.6")) { if (!SetFake) { FakeID = 0x19028086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x19028086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2656,7 +2656,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) } else { if (!SetFake) { FakeID = 0x59028086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x59028086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2671,7 +2671,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) if (os_version < AsciiOSVersionToUint64("10.12.6")) { if (!SetFake) { FakeID = 0x19128086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x19128086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2683,7 +2683,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) } else { if (!SetFake) { FakeID = 0x59128086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x59128086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2699,7 +2699,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) if (os_version < AsciiOSVersionToUint64("10.12.6")) { if (!SetFake) { FakeID = 0x19168086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x19168086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2711,7 +2711,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) } else { if (!SetFake) { FakeID = 0x59168086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x59168086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2728,7 +2728,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) if (os_version < AsciiOSVersionToUint64("10.12.6")) { if (!SetFake) { FakeID = 0x191B8086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x191B8086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2740,7 +2740,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) } else { if (!SetFake) { FakeID = 0x591B8086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x591B8086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2756,7 +2756,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) if (os_version < AsciiOSVersionToUint64("10.12.6")) { if (!SetFake) { FakeID = 0x191E8086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x191E8086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2768,7 +2768,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) } else { if (!SetFake) { FakeID = 0x591E8086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x591E8086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2783,7 +2783,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) if (os_version < AsciiOSVersionToUint64("10.12.6")) { if (!SetFake) { FakeID = 0x19168086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x19168086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2795,7 +2795,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) } else { if (!SetFake) { FakeID = 0x59238086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x59238086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2810,7 +2810,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) if (os_version < AsciiOSVersionToUint64("10.12.6")) { if (!SetFake) { FakeID = 0x19268086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x19268086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2822,7 +2822,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) } else { if (!SetFake) { FakeID = 0x59268086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x59268086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2837,7 +2837,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) if (os_version < AsciiOSVersionToUint64("10.12.6")) { if (!SetFake) { FakeID = 0x19278086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x19278086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2849,7 +2849,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) } else { if (!SetFake) { FakeID = 0x59278086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x59278086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2865,7 +2865,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) if (os_version < AsciiOSVersionToUint64("10.12.6")) { if (!SetFake) { FakeID = 0x191E8086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x191E8086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2877,7 +2877,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) } else if (os_version < AsciiOSVersionToUint64("10.14")) { if (!SetFake) { FakeID = 0x591E8086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x591E8086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -2889,7 +2889,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) } else { if (!SetFake) { FakeID = 0x87C08086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x87C08086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -3008,7 +3008,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) (AsciiStrStr(Entry->BuildVersion, "17G2") || FileExists(Entry->Volume->RootDir, CFLFBPath)))) { if (!SetFake) { FakeID = 0x3E908086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x3E908086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -3020,7 +3020,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) } else { if (!SetFake) { FakeID = 0x59028086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x59028086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -3036,7 +3036,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) (AsciiStrStr(Entry->BuildVersion, "17G2") || FileExists(Entry->Volume->RootDir, CFLFBPath)))) { if (!SetFake) { FakeID = 0x3E918086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x3E918086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -3048,7 +3048,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) } else { if (!SetFake) { FakeID = 0x59128086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x59128086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -3065,7 +3065,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) (AsciiStrStr(Entry->BuildVersion, "17G2") || FileExists(Entry->Volume->RootDir, CFLFBPath)))) { if (!SetFake) { FakeID = 0x3E928086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x3E928086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -3077,7 +3077,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) } else { if (!SetFake) { FakeID = 0x59128086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x59128086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -3096,7 +3096,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) (AsciiStrStr(Entry->BuildVersion, "17G2") || FileExists(Entry->Volume->RootDir, CFLFBPath)))) { if (!SetFake) { FakeID = 0x3E9B8086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x3E9B8086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -3108,7 +3108,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) } else { if (!SetFake) { FakeID = 0x591B8086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x591B8086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -3124,7 +3124,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) (AsciiStrStr(Entry->BuildVersion, "17G2") || FileExists(Entry->Volume->RootDir, CFLFBPath)))) { if (!SetFake) { FakeID = 0x3EA58086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x3EA58086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -3136,7 +3136,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) } else { if (!SetFake) { FakeID = 0x59278086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x59278086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -3222,7 +3222,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x0A01: if (!SetFake) { FakeID = 0x0A018086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x0A018086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -3235,7 +3235,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x5A40: if (!SetFake) { FakeID = 0x5A408086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x5A408086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -3248,7 +3248,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x5A41: if (!SetFake) { FakeID = 0x5A418086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x5A418086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -3261,7 +3261,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x5A49: if (!SetFake) { FakeID = 0x5A498086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x5A498086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -3274,7 +3274,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x5A50: if (!SetFake) { FakeID = 0x5A508086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x5A508086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -3287,7 +3287,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x5A51: if (!SetFake) { FakeID = 0x5A518086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x5A518086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -3301,7 +3301,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x5A54: if (!SetFake) { FakeID = 0x5A528086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x5A528086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); @@ -3314,7 +3314,7 @@ BOOLEAN setup_gma_devprop(LOADER_ENTRY *Entry, pci_dt_t *gma_dev) case 0x5A59: if (!SetFake) { FakeID = 0x5A598086 >> 16; - DBG(" Found FakeID Intel GFX = 0x%04lx8086\n", FakeID); + DBG(" Found FakeID Intel GFX = 0x%04x8086\n", FakeID); devprop_add_value(device, "device-id", (UINT8*)&FakeID, 4); FakeID = 0x5A598086 & 0xFFFF; devprop_add_value(device, "vendor-id", (UINT8*)&FakeID, 4); diff --git a/rEFIt_UEFI/Platform/kernel_patcher.cpp b/rEFIt_UEFI/Platform/kernel_patcher.cpp index c65f07254..3224de360 100644 --- a/rEFIt_UEFI/Platform/kernel_patcher.cpp +++ b/rEFIt_UEFI/Platform/kernel_patcher.cpp @@ -14,10 +14,15 @@ #include "sse3_patcher.h" #include "sse3_5_patcher.h" +#ifndef DEBUG_ALL #define KERNEL_DEBUG 0 +#else +#define KERNEL_DEBUG DEBUG_ALL +#endif + #if KERNEL_DEBUG -#define DBG(...) AsciiPrint(__VA_ARGS__); +#define DBG(...) printf(__VA_ARGS__); #else #define DBG(...) #endif @@ -325,7 +330,7 @@ VOID KernelPatcher_32(VOID* kernelData, CHAR8 *OSVersion) } if (!patchLocation) { - DBG("Can't find _cpuid_set_info _panic address, patch kernel abort.\n",i); + DBG("Can't find _cpuid_set_info _panic address, patch kernel abort.\n"/*,i*/); return; } @@ -1571,7 +1576,7 @@ VOID Get_PreLink() PrelinkTextSize = (UINT32)segCmd64->vmsize; PrelinkTextLoadCmdAddr = (UINT32)(UINTN)segCmd64; } - DBG("at %p: vmaddr = 0x%lx, vmsize = 0x%lx\n", segCmd64, segCmd64->vmaddr, segCmd64->vmsize); + DBG("at %p: vmaddr = 0x%llx, vmsize = 0x%llx\n", segCmd64, segCmd64->vmaddr, segCmd64->vmsize); DBG("PrelinkTextLoadCmdAddr = 0x%X, PrelinkTextAddr = 0x%X, PrelinkTextSize = 0x%X\n", PrelinkTextLoadCmdAddr, PrelinkTextAddr, PrelinkTextSize); //DBG("cmd = 0x%08X\n",segCmd64->cmd); @@ -1592,8 +1597,8 @@ VOID Get_PreLink() DBG("Found PRELINK_INFO, 64bit\n"); //DBG("cmd = 0x%08X\n",segCmd64->cmd); //DBG("cmdsize = 0x%08X\n",segCmd64->cmdsize); - DBG("vmaddr = 0x%08X\n",segCmd64->vmaddr); - DBG("vmsize = 0x%08X\n",segCmd64->vmsize); + DBG("vmaddr = 0x%08llX\n",segCmd64->vmaddr); + DBG("vmsize = 0x%08llX\n",segCmd64->vmsize); //DBG("fileoff = 0x%08X\n",segCmd64->fileoff); //DBG("filesize = 0x%08X\n",segCmd64->filesize); //DBG("maxprot = 0x%08X\n",segCmd64->maxprot); @@ -1614,7 +1619,7 @@ VOID Get_PreLink() PrelinkInfoAddr = (UINT32)(sect->addr ? sect->addr + KernelRelocBase : 0); PrelinkInfoSize = (UINT32)sect->size; } - DBG("__info found at %p: addr = 0x%lx, size = 0x%lx\n", sect, sect->addr, sect->size); + DBG("__info found at %p: addr = 0x%llx, size = 0x%llx\n", sect, sect->addr, sect->size); DBG("PrelinkInfoLoadCmdAddr = 0x%X, PrelinkInfoAddr = 0x%X, PrelinkInfoSize = 0x%X\n", PrelinkInfoLoadCmdAddr, PrelinkInfoAddr, PrelinkInfoSize); } @@ -1635,7 +1640,7 @@ VOID Get_PreLink() PrelinkTextSize = (UINT32)segCmd->vmsize; PrelinkTextLoadCmdAddr = (UINT32)(UINTN)segCmd; } - DBG("at %p: vmaddr = 0x%lx, vmsize = 0x%lx\n", segCmd, segCmd->vmaddr, segCmd->vmsize); + DBG("at %p: vmaddr = 0x%x, vmsize = 0x%x\n", segCmd, segCmd->vmaddr, segCmd->vmsize); DBG("PrelinkTextLoadCmdAddr = 0x%X, PrelinkTextAddr = 0x%X, PrelinkTextSize = 0x%X\n", PrelinkTextLoadCmdAddr, PrelinkTextAddr, PrelinkTextSize); //gBS->Stall(30*1000000); @@ -1668,7 +1673,7 @@ VOID Get_PreLink() PrelinkInfoAddr = (UINT32)(sect->addr ? sect->addr + KernelRelocBase : 0); PrelinkInfoSize = (UINT32)sect->size; } - DBG("__info found at %p: addr = 0x%lx, size = 0x%lx\n", sect, sect->addr, sect->size); + DBG("__info found at %p: addr = 0x%x, size = 0x%x\n", sect, sect->addr, sect->size); DBG("PrelinkInfoLoadCmdAddr = 0x%X, PrelinkInfoAddr = 0x%X, PrelinkInfoSize = 0x%X\n", PrelinkInfoLoadCmdAddr, PrelinkInfoAddr, PrelinkInfoSize); //gBS->Stall(30*1000000); @@ -1840,7 +1845,7 @@ KernelAndKextPatcherInit(IN LOADER_ENTRY *Entry) // KernelRelocBase will normally be 0 // but if OsxAptioFixDrv is used, then it will be > 0 SetKernelRelocBase(); - DBG("KernelRelocBase = %lx\n", KernelRelocBase); + DBG("KernelRelocBase = %llx\n", KernelRelocBase); // Find bootArgs - we need then for proper detection // of kernel Mach-O header diff --git a/rEFIt_UEFI/Platform/kext_inject.cpp b/rEFIt_UEFI/Platform/kext_inject.cpp index c5cf73293..1bb7c4459 100644 --- a/rEFIt_UEFI/Platform/kext_inject.cpp +++ b/rEFIt_UEFI/Platform/kext_inject.cpp @@ -1,11 +1,17 @@ #include "Platform.h" + +#ifndef DEBUG_ALL #define KEXT_INJECT_DEBUG 0 +#else +#define KEXT_INJECT_DEBUG DEBUG_ALL +#endif + #if KEXT_INJECT_DEBUG == 2 #define DBG(...) MsgLog(__VA_ARGS__) #elif KEXT_INJECT_DEBUG == 1 -#define DBG(...) AsciiPrint(__VA_ARGS__); +#define DBG(...) printf(__VA_ARGS__); #else #define DBG(...) #endif diff --git a/rEFIt_UEFI/Platform/kext_patcher.cpp b/rEFIt_UEFI/Platform/kext_patcher.cpp index f4eae68fc..cbbd510a5 100644 --- a/rEFIt_UEFI/Platform/kext_patcher.cpp +++ b/rEFIt_UEFI/Platform/kext_patcher.cpp @@ -9,10 +9,15 @@ #include "kernel_patcher.h" + +#ifndef DEBUG_ALL #define KEXT_DEBUG 0 +#else +#define KEXT_DEBUG DEBUG_ALL +#endif #if KEXT_DEBUG -#define DBG(...) Print(__VA_ARGS__); +#define DBG(...) printf(__VA_ARGS__); #else #define DBG(...) #endif @@ -1160,14 +1165,14 @@ UINT64 GetPlistHexValue(CONST CHAR8 *Plist, CONST CHAR8 *Key, CONST CHAR8 *Whole // search for "); if (Value == NULL) { - DBG(L"\nNo Value = AsciiStrStr(IntTag, " 8) { - DBG(L"\nIDLen too big\n"); + DBG("\nIDLen too big\n"); return 0; } AsciiStrCpyS(Buffer, 48, ""); if (Value == NULL) { - DBG(L"\nNo Pci.Read (PciIo, EfiPciIoWidthUint32, ExtendCap + 0x4, 1, &usblegctlsts); - DBG("usblegsup=%08X isOSowned=%d isBIOSowned=%d usblegctlsts=%08X\n", usblegsup, isOSowned, isBIOSowned, usblegctlsts); + DBG("usblegsup=%08X isOSowned=%llu isBIOSowned=%llu usblegctlsts=%08X\n", usblegsup, isOSowned, isBIOSowned, usblegctlsts); // // Disable the SMI in USBLEGCTLSTS firstly // @@ -216,7 +216,7 @@ FixOwnership(VOID) // read 32bit USBLEGCTLSTS (eecp+4) PciIo->Pci.Read (PciIo, EfiPciIoWidthUint32, ExtendCap + 0x4, 1, &usblegctlsts); - DBG("usblegsup=%08X isOSowned=%d isBIOSowned=%d usblegctlsts=%08X\n", usblegsup, isOSowned, isBIOSowned, usblegctlsts); + DBG("usblegsup=%08X isOSowned=%llu isBIOSowned=%llu usblegctlsts=%08X\n", usblegsup, isOSowned, isBIOSowned, usblegctlsts); MsgLog("Legacy USB Off Done\n"); diff --git a/rEFIt_UEFI/cpp_foundation/XString.cpp b/rEFIt_UEFI/cpp_foundation/XString.cpp index fb090e95f..b6c6a2094 100755 --- a/rEFIt_UEFI/cpp_foundation/XString.cpp +++ b/rEFIt_UEFI/cpp_foundation/XString.cpp @@ -33,13 +33,13 @@ const XString NullXString; void XString::Init(xsize aSize) { - c = (char*)malloc( (aSize+1)*sizeof(char) ); /* le 0 terminal n'est pas compté dans mSize */ - if ( !c ) { - DebugLog(2, "XString::Init(%d) : Xalloc returned NULL. Cpu halted\n", (aSize+1)*sizeof(char)); + m_data = (char*)malloc( (aSize+1)*sizeof(char) ); /* le 0 terminal n'est pas compté dans mSize */ + if ( !m_data ) { + DebugLog(2, "XString::Init(%llu) : Xalloc returned NULL. Cpu halted\n", (aSize+1)*sizeof(char)); panic(); } m_allocatedSize = aSize; - c[0] = 0; + m_data[0] = 0; } XString::XString() @@ -51,13 +51,13 @@ XString::XString() XString::~XString() { //Debugf("Destructeur :%s\n", c); - delete c; + delete m_data; } -void XString::SetLength(xsize len) +void XString::setLength(xsize len) { CheckSize(len); - c[len] = 0; + m_data[len] = 0; } /* CheckSize() */ @@ -67,14 +67,14 @@ char *XString::CheckSize(xsize nNewSize, xsize nGrowBy) { nNewSize += nGrowBy; - c = (char*)realloc(c, (nNewSize+1)*sizeof(char), m_allocatedSize*sizeof(wchar_t)); - if ( !c ) { + m_data = (char*)realloc(m_data, (nNewSize+1)*sizeof(char), m_allocatedSize*sizeof(wchar_t)); + if ( !m_data ) { DBG("XString::CheckSize(%d, %d) : Xrealloc(%d, %d, %d) returned NULL. System halted\n", nNewSize, nGrowBy, m_size, (nNewSize+1)*sizeof(char), c); panic(); } m_allocatedSize = nNewSize; } - return c; + return m_data; } void XString::StrnCpy(const char *buf, xsize len) @@ -82,11 +82,11 @@ void XString::StrnCpy(const char *buf, xsize len) if ( buf && *buf && len > 0 ) { CheckSize(len, 0); xsize idx = 0; - char* p = data(); + char* p = _data(0); while ( idx++ < len && (*p++ = *buf++) != 0 ); - SetLength(idx-1); /* SetLength fait _Data[len]=0 */ + setLength(idx-1); /* SetLength fait _Data[len]=0 */ }else{ - SetLength(0); /* SetLength fait _Data[len]=0 */ + setLength(0); /* SetLength fait _Data[len]=0 */ } } @@ -95,7 +95,7 @@ void XString::StrCpy(const char *buf) if ( buf && *buf ) { StrnCpy(buf, (xsize)strlen(buf)); // overflow ? }else{ - SetLength(0); /* SetLength fait _Data[len]=0 */ + setLength(0); /* SetLength fait _Data[len]=0 */ } } @@ -107,16 +107,16 @@ void XString::StrnCat(const char *buf, xsize len) if ( buf && *buf && len > 0 ) { NewLen = length()+len; CheckSize(NewLen, 0); - memcpy(data()+length(), buf, len); - SetLength(NewLen); /* SetLength fait data()[len]=0 */ + memcpy(_data(0)+length(), buf, len); + setLength(NewLen); /* SetLength fait data()[len]=0 */ } } void XString::Cat(const XString &uneXString) { CheckSize(length()+uneXString.length()); - memcpy(data()+length(), uneXString.c, uneXString.length()); - SetLength(length() + uneXString.length()); + memcpy(_data(0)+length(), uneXString.m_data, uneXString.length()); + setLength(length() + uneXString.length()); } void XString::StrCat(const char *buf) @@ -130,11 +130,11 @@ void XString::Delete(xsize pos, xsize count) { if ( pos < length() ) { if ( count != MAX_XSIZE && pos + count < length() ) { - memmove( data()+pos, data()+pos+count, length()-pos-count); - SetLength(length()-count); + memmove(_data(0)+pos, data()+pos+count, length()-pos-count); + setLength(length()-count); // data()[length()] = 0; fait dans setlength(); }else{ - SetLength(pos); + setLength(pos); // data()[length()] = 0; fait dans setlength(); } } @@ -144,8 +144,8 @@ void XString::Insert(xsize pos, const XString& Str) { if ( pos < length() ) { CheckSize(length()+Str.length()); - memmove(data()+pos+Str.length(), data()+pos, length()-pos+1); // +1 to copy the NULL terminator - memcpy(data()+pos, Str.data(), Str.length()); + memmove(_data(0)+pos+Str.length(), data()+pos, length()-pos+1); // +1 to copy the NULL terminator + memcpy(_data(0)+pos, Str.data(), Str.length()); }else{ StrCat(Str); } @@ -274,7 +274,7 @@ static void XString_transmitSPrintf(const char* buf, unsigned int nbchar, void* XString& XString::vSPrintf(const char* format, va_list va) { - SetLength(0); + setLength(0); // XString_sprintfBuf = this; vprintf_with_callback(format, va, XString_transmitSPrintf, this); @@ -316,7 +316,7 @@ XString& XString::SPrintf(const char *Format, ...) // Deactivate assignment during refactoring to avoid confusion XString XString::basename() const { - if ( LastChar() == PATH_SEPARATOR ) { + if ( lastChar() == PATH_SEPARATOR ) { DebugLog(2, "XString::basename() -> LastChar() == PATH_SEPARATOR"); panic(); } @@ -641,20 +641,20 @@ bool XString::IsLettersNoAccent() const } #endif -void XString::RemoveLastEspCtrl() +void XString::removeLastEspCtrl() { char *p; if ( length() > 0 ) { - p = data() + length() - 1; + p = _data(0) + length() - 1; if ( *p >= 0 && *p <= ' ' ) { p -= 1; while ( p>data() && *p >= 0 && *p <= ' ' ) p -= 1; if ( p>data() ) { - SetLength( (xsize)(p-data()+1) ); // safe (p-data()+1 < length() + setLength( (xsize)(p-data()+1) ); // safe (p-data()+1 < length() }else{ - if ( *p >= 0 && *p <= ' ' ) SetLength(0); - else SetLength(1); + if ( *p >= 0 && *p <= ' ' ) setLength(0); + else setLength(1); } } } diff --git a/rEFIt_UEFI/cpp_foundation/XString.h b/rEFIt_UEFI/cpp_foundation/XString.h index 7cc5b846d..b318b678a 100755 --- a/rEFIt_UEFI/cpp_foundation/XString.h +++ b/rEFIt_UEFI/cpp_foundation/XString.h @@ -22,11 +22,23 @@ class XStringW; class XString { protected: -// char *_Data; + char *m_data; + xsize m_allocatedSize; + + // convenience method. Did it this way to avoid #define in header. They can have an impact on other headers + xsize min(xsize x1, xsize x2) const { if ( x1 < x2 ) return x1; return x2; } + xsize max(xsize x1, xsize x2) const { if ( x1 > x2 ) return x1; return x2; } + +// Next 2 methods are protected intentionally. They are const method returning non-const pointer. That's intentional, but dangerous. Do not expose to public. +// It's better practice, if you need a non-const pointer for low-level access, to use dataSized and ahev to specify the size + char* _data(unsigned int ui) const { if ( ui >= m_allocatedSize ) panic("char* data(unsigned int ui=0) -> ui >= m_allocatedSize"); return m_data+ui; } + char* _data(int i) const { if ( i<0 ) panic("char* data(int i) -> i < 0"); if ( (unsigned int)i >= m_allocatedSize ) panic("char* data(int i) -> i >= m_allocatedSize"); return m_data+i; } + char* _data(unsigned long ui) const { if ( ui >= m_allocatedSize ) panic("char* data(unsigned long ui=0) -> ui >= m_allocatedSize"); return m_data+ui; } + char* _data(long i) const { if ( i<0 ) panic("char* data(long i) -> i < 0"); if ( (unsigned long)i >= m_allocatedSize ) panic("char* data(long i) -> i >= m_allocatedSize"); return m_data+i; } + char* _data(xsize ui) const { if ( ui >= m_allocatedSize ) panic("char* data(xsize ui=0) -> ui >= m_allocatedSize"); return m_data+ui; } + char* _data(xisize i) const { if ( i<0 ) panic("char* data(xisize i) -> i < 0"); if ( (xsize)i >= m_allocatedSize ) panic("char* data(xisize i) -> i >= m_allocatedSize"); return m_data+i; } public: - char *c; - xsize m_allocatedSize; void Init(xsize aSize=0); XString(); @@ -49,53 +61,47 @@ class XString char *CheckSize(xsize nNewSize, xsize nGrowBy = XStringGrowByDefault); public: - const char *data(xsize ui=0) const { return c+ui; } - const char *c_str() const { return c; } // same as std::string - char *data(xsize ui=0) { return (char*)(c+ui); } - char *data(int i) { if ( i<0 ) panic("const wchar_t *data(INTN i=0) const -> i < 0"); return c+i; } - char *DataWithSizeMin(xsize ui, xsize size, xsize nGrowBy=XStringGrowByDefault) { CheckSize(size, nGrowBy); return data(ui); } + const char* c_str() const { return m_data; } // same as std::string + const char* data(xsize ui=0) const { return _data(ui); } + const char* data(xisize i) const { return _data(i); } - xsize length() const { return strlen(c); } - xsize Size() const { return m_allocatedSize; } - void SetLength(xsize len); + char* dataSized(xsize ui, xsize sizeMin, xsize nGrowBy=XStringGrowByDefault) { CheckSize(ui+sizeMin, nGrowBy); return _data(ui); } + + xsize length() const { return strlen(m_data); } + xsize size() const { return strlen(m_data); } + xsize allocatedSize() const { return m_allocatedSize; } + void setLength(xsize len); /* IsNull ? */ - void setEmpty() { c[0] = 0; } + void setEmpty() { setLength(0); } bool isEmpty() const { return length() == 0; } /* Cast */ operator const char *() const { return data(); } // operator char *() { return data(); } - int ToInt() const; - UINTN ToUINTN() const; - - XStringW wcs(); +// int ToInt() const; +// UINTN ToUINTN() const; /* char [] */ - char operator [](int i) const { - #if defined __XTOOLS_INT_CHECK__ - if ( i < 0 ) DebugLog(2, "XString index cannot < 0"); - panic(); - #endif - return *data((unsigned int)i); - } - char operator [](xsize i) const { return *data(i); } + char operator [](int i) const { return *_data(i); } + char operator [](unsigned int ui) const { return *_data(ui); } + char operator [](long i) const { return *_data(i); } + char operator [](unsigned long ui) const { return *_data(ui); } + char operator [](xisize i) const { return *data(i); } + char operator [](xsize ui) const { return *data(ui); } /* char& [] */ - char& operator [](int i) { - #if defined __XTOOLS_INT_CHECK__ - if ( i < 0 ) DebugLog(2, "XString index cannot < 0"); - panic(); - #endif - return *data(i); - } - char& operator [](xsize i) { return *data(i); } + char& operator [](int i) { return *_data(i); } + char& operator [](unsigned int ui) { return *_data(ui); } + char& operator [](long i) { return *_data(i); } + char& operator [](unsigned long ui) { return *_data(ui); } + char& operator [](xisize i) { return *_data(i); } + char& operator [](xsize ui) { return *_data(ui); } - char LastChar() const { if ( length() > 0 ) return data()[length()-1]; else return 0; } - void RemoveLastEspCtrl(); + char lastChar() const { if ( length() > 0 ) return data()[length()-1]; else return 0; } + void removeLastEspCtrl(); - void SetNull() { SetLength(0); }; void StrCpy(const char *buf); void StrnCpy(const char *buf, xsize len); void StrnCat(const char *buf, xsize len); @@ -109,7 +115,7 @@ class XString XString& vSPrintf(const char *Format, va_list va); XString& SPrintf(const char *format, ...) #ifndef _MSC_VER - __attribute__((format (printf, 2, 3))) // 2 and 3 because of hidden parameter. + __attribute__((format (printf, 2, 3))) // 2 and 3 because of hidden parameter 'this'. #endif ; diff --git a/rEFIt_UEFI/cpp_foundation/XStringW.cpp b/rEFIt_UEFI/cpp_foundation/XStringW.cpp index 436400f97..1f67cedb4 100755 --- a/rEFIt_UEFI/cpp_foundation/XStringW.cpp +++ b/rEFIt_UEFI/cpp_foundation/XStringW.cpp @@ -32,7 +32,7 @@ void XStringW::Init(UINTN aSize) //DBG("Init aSize=%d\n", aSize); m_data = (wchar_t*)malloc( (aSize+1)*sizeof(wchar_t) ); /* le 0 terminal n'est pas compté dans mSize */ if ( !m_data ) { - DebugLog(2, "XStringW::Init(%d) : Xalloc returned NULL. Cpu halted\n", (aSize+1)*sizeof(wchar_t)); + DebugLog(2, "XStringW::Init(%llu) : Xalloc returned NULL. Cpu halted\n", (aSize+1)*sizeof(wchar_t)); panic(); } m_allocatedSize = aSize; @@ -193,7 +193,7 @@ void XStringW::StrnCat(const wchar_t *buf, UINTN len) if ( buf && *buf && len > 0 ) { NewLen = length()+len; CheckSize(NewLen, 0); - memmove(data(length()), buf, len*sizeof(wchar_t)); + memmove(_data(length()), buf, len*sizeof(wchar_t)); SetLength(NewLen); /* data()[NewLen]=0 done in SetLength */ } } @@ -214,7 +214,7 @@ void XStringW::Delete(UINTN pos, UINTN count) { if ( pos < length() ) { if ( count != MAX_XSIZE && pos + count < length() ) { - memmove( data(pos), data(pos+count), (length()-pos-count)*sizeof(wchar_t)); // memmove handles overlapping memory move + memmove( _data(pos), data(pos+count), (length()-pos-count)*sizeof(wchar_t)); // memmove handles overlapping memory move SetLength(length()-count);/* data()[length()-count]=0 done in SetLength */ }else{ SetLength(pos);/* data()[pos]=0 done in SetLength */ @@ -226,8 +226,8 @@ void XStringW::Insert(UINTN pos, const XStringW& Str) { if ( pos < length() ) { CheckSize(length()+Str.length()); - memmove(data(pos + Str.length()), data(pos), (length()-pos)*sizeof(wchar_t)); - memmove(data(pos), Str.data(), Str.length()*sizeof(wchar_t)); + memmove(_data(pos + Str.length()), data(pos), (length()-pos)*sizeof(wchar_t)); + memmove(_data(pos), Str.data(), Str.length()*sizeof(wchar_t)); SetLength(length()+Str.length()); }else{ StrCat(Str); @@ -238,7 +238,7 @@ void XStringW::Replace(wchar_t c1, wchar_t c2) { wchar_t* p; - p = data(); + p = _data(0); while ( *p ) { if ( *p == c1 ) *p = c2; p += 1; @@ -250,7 +250,7 @@ XStringW XStringW::SubStringReplace(wchar_t c1, wchar_t c2) wchar_t* p; XStringW Result; - p = data(); + p = _data(0); while ( *p ) { if ( *p == c1 ) Result += c2; else Result += *p; @@ -421,7 +421,7 @@ void XStringW::RemoveLastEspCtrl() wchar_t *p; if ( length() > 0 ) { - p = data() + length() - 1; + p = _data(0) + length() - 1; if ( *p >= 0 && *p <= ' ' ) { p -= 1; while ( p>data() && *p >= 0 && *p <= ' ' ) p -= 1; diff --git a/rEFIt_UEFI/cpp_foundation/XStringW.h b/rEFIt_UEFI/cpp_foundation/XStringW.h index a7945d0b6..8f8c667ec 100755 --- a/rEFIt_UEFI/cpp_foundation/XStringW.h +++ b/rEFIt_UEFI/cpp_foundation/XStringW.h @@ -24,8 +24,18 @@ protected: UINTN m_len; UINTN m_allocatedSize; - // convenience method. Did it this way to avoid #define in header. They can have an impact on other heade.rs + // convenience method. Did it this way to avoid #define in header. They can have an impact on other headers xsize min(xsize x1, xsize x2) const { if ( x1 < x2 ) return x1; return x2; } + xsize max(xsize x1, xsize x2) const { if ( x1 > x2 ) return x1; return x2; } + +// Next 2 methods are protected intentionally. They are const method returning non-const pointer. That's intentional, but dangerous. Do not expose to public. +// It's better practice, if you need a non-const pointer for low-level access, to use dataSized and ahev to specify the size + wchar_t* _data(unsigned int ui) const { if ( ui >= m_allocatedSize ) panic("wchar_t* data(unsigned int ui=0) -> ui >= m_allocatedSize"); return m_data+ui; } + wchar_t* _data(int i) const { if ( i<0 ) panic("wchar_t* data(int i) -> i < 0"); if ( (unsigned int)i >= m_allocatedSize ) panic("wchar_t* data(int i) -> i >= m_allocatedSize"); return m_data+i; } + wchar_t* _data(unsigned long ui) const { if ( ui >= m_allocatedSize ) panic("wchar_t* data(unsigned long ui=0) -> ui >= m_allocatedSize"); return m_data+ui; } + wchar_t* _data(long i) const { if ( i<0 ) panic("wchar_t* data(long i) -> i < 0"); if ( (unsigned long)i >= m_allocatedSize ) panic("wchar_t* data(long i) -> i >= m_allocatedSize"); return m_data+i; } + wchar_t* _data(xsize ui) const { if ( ui >= m_allocatedSize ) panic("wchar_t* data(xsize ui=0) -> ui >= m_allocatedSize"); return m_data+ui; } + wchar_t* _data(xisize i) const { if ( i<0 ) panic("wchar_t* data(xisize i) -> i < 0"); if ( (xsize)i >= m_allocatedSize ) panic("wchar_t* data(xisize i) -> i >= m_allocatedSize"); return m_data+i; } public: void Init(UINTN aSize=0); @@ -42,16 +52,13 @@ protected: wchar_t *CheckSize(UINTN nNewSize, UINTN nGrowBy = XStringWGrowByDefault); public: - const wchar_t *data(UINTN ui=0) const { return m_data+ui; } // do not multiply by sizeof(wchar_t), it's done by the compiler. - const wchar_t *data(INTN i) const { if ( i<0 ) panic("const wchar_t *data(INTN i=0) const -> i < 0"); return m_data+i; } // do not multiply by sizeof(wchar_t), it's done by the compiler. -// const wchar_t *data(int i=0) const { if ( i<0 ) panic("const wchar_t *data(int i=0) const -> i < 0"); return m_data+i; } // do not multiply by sizeof(wchar_t), it's done by the compiler. - wchar_t *data(UINTN ui=0) { return m_data+ui; } // do not multiply by sizeof(wchar_t), it's done by the compiler. - wchar_t *data(INTN i) { if ( i<0 ) panic("wchar_t *data(INTN i=0) -> i < 0"); return m_data+i; } // do not multiply by sizeof(wchar_t), it's done by the compiler. -// wchar_t *data(int i) { if ( i<0 ) panic("wchar_t *data(int i=0) -> i < 0"); return m_data+i; } // do not multiply by sizeof(wchar_t), it's done by the compiler. + const wchar_t* wc_str() const { return m_data; } // equivalent as std::string + const wchar_t *data(xsize ui=0) const { return m_data+ui; } // do not multiply by sizeof(wchar_t), it's done by the compiler. + const wchar_t *data(xisize i) const { if ( i<0 ) panic("const wchar_t *data(INTN i=0) const -> i < 0"); return m_data+i; } // do not multiply by sizeof(wchar_t), it's done by the compiler. - wchar_t *dataWithSizeMin(UINTN pos, UINTN sizeMin, UINTN nGrowBy=XStringWGrowByDefault) { CheckSize(sizeMin, nGrowBy); return data(pos); } - - wchar_t * forgetDataWithoutFreeing(); + wchar_t* dataSized(xsize ui, xsize sizeMin, xsize nGrowBy=XStringWGrowByDefault) { CheckSize(ui+sizeMin, nGrowBy); return _data(ui); } + wchar_t* dataSized(xisize i, xsize sizeMin, xsize nGrowBy=XStringWGrowByDefault) { if ( i<0 ) panic("wchar_t* dataSized(xisize i, xsize sizeMin, xsize nGrowBy) -> i < 0"); CheckSize((xsize)i+sizeMin, nGrowBy); return _data(i); } + wchar_t* forgetDataWithoutFreeing(); UINTN length() const { return m_len; } UINTN size() const { return m_len; } @@ -77,12 +84,21 @@ public: // XString mbs() const; - /* [] */ - wchar_t operator [](int i) const { return *data((INTN)i); } - wchar_t operator [](UINTN i) const { return *data(i); } + /* wchar_t [] */ + wchar_t operator [](int i) const { return *_data(i); } + wchar_t operator [](unsigned int ui) const { return *_data(ui); } + wchar_t operator [](long i) const { return *_data(i); } + wchar_t operator [](unsigned long ui) const { return *_data(ui); } + wchar_t operator [](xisize i) const { return *data(i); } + wchar_t operator [](xsize ui) const { return *data(ui); } - wchar_t& operator [](int i) { return *data((INTN)i); } - wchar_t& operator [](UINTN i) { return *data(i); } + /* wchar_t& [] */ + wchar_t& operator [](int i) { return *_data(i); } + wchar_t& operator [](unsigned int ui) { return *_data(ui); } + wchar_t& operator [](long i) { return *_data(i); } + wchar_t& operator [](unsigned long ui) { return *_data(ui); } + wchar_t& operator [](xisize i) { return *_data(i); } + wchar_t& operator [](xsize ui) { return *_data(ui); } wchar_t LastChar() const { if ( length() > 0 ) return data()[length()-1]; else return 0; } void RemoveLastEspCtrl(); diff --git a/rEFIt_UEFI/cpp_foundation/XToolsCommon.h b/rEFIt_UEFI/cpp_foundation/XToolsCommon.h index 82f752646..e8978f08c 100755 --- a/rEFIt_UEFI/cpp_foundation/XToolsCommon.h +++ b/rEFIt_UEFI/cpp_foundation/XToolsCommon.h @@ -5,7 +5,9 @@ #define xsize UINTN +#define xisize INTN #define MAX_XSIZE MAX_UINTN +#define MAX_XISIZE MAX_INTN extern xsize XArrayGrowByDefault; extern xsize XBufferGrowByDefault; @@ -40,11 +42,17 @@ extern "C" { // Declare here instead of include to avoid circular dependency. + +#ifdef _MSC_VER +#define __attribute__(x) +#endif + VOID EFIAPI DebugLog ( IN INTN DebugMode, - IN CONST CHAR8 *FormatString, ...); + IN CONST CHAR8 *FormatString, ...) __attribute__((format(printf, 2, 3)));; + #endif diff --git a/rEFIt_UEFI/cpp_unit_test/XStringW_test.cpp b/rEFIt_UEFI/cpp_unit_test/XStringW_test.cpp index d0a17d3dd..08f2f0cf3 100755 --- a/rEFIt_UEFI/cpp_unit_test/XStringW_test.cpp +++ b/rEFIt_UEFI/cpp_unit_test/XStringW_test.cpp @@ -9,105 +9,160 @@ int XStringW_tests() { -// -//#ifdef JIEF_DEBUG -//// DebugLog(2, "XStringW_tests -> Enter\n"); -//#endif -// -// if ( global_str3 != L"global_str3" ) return 1; -// if ( global_str4 != L"global_str4" ) return 2; -// -//#ifdef XSTRINGW_HAS_CTOR_LITTERAL -// XStringW str(L"1"); -// if ( str != L"1" ) return 3; -// str.StrCat(L"2"); -// if ( str != L"12" ) return 4; -//#endif -// -// XStringW str; -// str.takeValueFrom(L"12"); -// XStringW str2; -// if ( !str2.isEmpty() ) return 10; -// str2.StrnCpy(str.data(), 2); -// if ( str2 != L"12" ) return 11; -// str2.StrnCat(L"345", 2); -// if ( str2 != L"1234" ) return 12; -// str2.Insert(1, str); -// if ( str2 != L"112234" ) return 13; -// str2 += L"6"; -// if ( str2 != L"1122346" ) return 14; -// -////wchar_t c2 = L'Ň'; -////printf("1=%lc\n", c2); -////const char* s1 = "𐌾"; -// -// str2.SPrintf("%c", 'a'); // signle UTF8 ascii char -// if ( str2 != L"a" ) return 20; -// str2.takeValueFrom(L"ab"); // UTF16(32) string containing ascii char -// if ( str2 != L"ab" ) return 21; -//#ifdef _MSC_VER -// // IMPORTANT : you can't pass a litteral char in a vararg function with Visual Studio (Microsoft strikes again :-). -// // At least, you got a warning C4066 -// // IMPORTANT2 : Litteral string containing UTF16 char are WRONG. And you don't get a warning !!! If litteral is only ascii, it's ok. -// // Maybe it's compilation option butI didn't find them. -// wchar_t c = 'Ň'; // using an imtermediary var for Microsoft. -// -// -// wchar_t s[2]; // wchar_t s2[] = L"Ň"; -// s[0] = 'Ň'; -// s[1] = 0; -// -// str2.SPrintf("%lc", c); // UTF16(32) char. (2 bytes in total if UTF16) -// if (str2 != s) return 22; -// str2.takeValueFrom(""); -// if (str2.length() != 0) return 221; -// str2.takeValueFrom(s); // this is a UTF8 string 2 bytes long -// if (str2 != s) return 23; -//#else -// str2.SPrintf("%lc", L'Ň'); // signe UTF16(32) char. (2 bytes in total if UTF16) -// if ( str2 != L"Ň" ) return 22; -// str2.takeValueFrom(""); -// if (str2.length() != 0) return 221; -//#ifdef XSTRINGW_HAS_CTOR_LITTERAL -// str2.takeValueFrom("Ň"); // this is a UTF8 string 2 bytes long -// if (str2 != "Ň") return 23; // utf8 litteral are converted to an XStringW if ctor is available. -//#endif -// str2.takeValueFrom(""); -// if (str2.length() != 0) return 231; -//#ifdef XSTRINGW_HAS_CTOR_LITTERAL -// str2.takeValueFrom(L"Ň"); // this is a UTF8 string 2 bytes long -// if (str2 != "Ň") return 24; -//#endif -//#endif -// -//#if __WCHAR_MAX__ > 0xFFFFu -// str2.SPrintf("%lc", L'𐌾'); // L'𐌾' // this char cannot convert to an UTF16 char. So it doesn't compile with -fshort-wchar -// if ( str2 != L'𐌾' ) return 30; -//#endif -// -// -//#ifndef _MSC_VER -// // "𐌾" in UTF16 is 2 char : 0xd800, 0xdf3e -// -// str2.takeValueFrom(L"𐌾"); // this is a UTF8 string 4 bytes long -// if ( str2 != L"𐌾" ) return 31; -// str2.takeValueFrom(L"𐌾"); // this is a UTF16 or UTF32 string (depending of -fshort-wchar) -// if ( str2 != L"𐌾" ) return 32; -// -//#ifdef XSTRINGW_HAS_CTOR_LITTERAL -// { -// XStringW str3("a"); -// if ( str3 != L"a" ) return 40; -// XStringW str4("aŇ𐌾"); -// if ( str4 != L"aŇ𐌾" ) return 41; -// } -//#endif -//#endif -// -//// XStringW CommonName(L"EFI\\CLOVER\\misc\\screenshot"); -//// for (UINTN Index = 0; Index < 20; Index++) { -//// XStringW Name = CommonName + SPrintf("%lld", Index) + L".png"; -//// DebugLog(2, "XStringW_test shot: %s\n", Name.data()); -//// } + +#ifdef JIEF_DEBUG +// DebugLog(2, "XStringW_tests -> Enter\n"); +#endif + + if ( global_str3 != L"global_str3" ) return 1; + if ( global_str4 != L"global_str4" ) return 2; + + // Check default ctor + { + XStringW str; + if (str.length() != 0) return 3; + if (str.wc_str() == NULL) return 4; + } + + + // Check ctor with value (or check takeValueFrom while we are waiting to put back ctor(const char*) +#ifdef XSTRINGW_HAS_CTOR_LITTERAL + { + { + XStringW str(""); + if ( str != "" ) return 100; + } + { + XStringW str("1"); + if ( str != "1" ) return 101; + } + } +#else + { + XStringW str; + str.takeValueFrom(""); + if (str.length() != 0) return 110; + str.takeValueFrom("1"); + if ( str != L"1" ) return 111; + str.StrCat(L"2"); + if ( str != L"12" ) return 112; + } +#endif + + // check [] operator + { + XStringW str; + str.takeValueFrom("01234567890123456789"); + wchar_t c; + c = str[(char)1]; + if ( c != '1' ) return 201; + c = str[(unsigned char)2]; + if ( c != '2' ) return 202; + c = str[(short)3]; + if ( c != '3' ) return 203; + c = str[(unsigned short)4]; + if ( c != '4' ) return 204; + c = str[(int)5]; + if ( c != '5' ) return 205; + c = str[(unsigned int)6]; + if ( c != '6' ) return 206; + c = str[(long)7]; + if ( c != '7' ) return 207; + c = str[(unsigned long)8]; + if ( c != '8' ) return 208; + c = str[(long long)9]; + if ( c != '9' ) return 209; + c = str[(unsigned long long)10]; + if ( c != '0' ) return 210; + } + + // Quick check of StrnCpy,StrnCat,Insert,+= + { + XStringW str; + str.takeValueFrom(L"12"); + XStringW str2; + if ( !str2.isEmpty() ) return 10; + str2.StrnCpy(str.data(), 2); + if ( str2 != L"12" ) return 11; + str2.StrnCat(L"345", 2); + if ( str2 != L"1234" ) return 12; + str2.Insert(1, str); + if ( str2 != L"112234" ) return 13; + str2 += L"6"; + if ( str2 != L"1122346" ) return 14; + } + +//wchar_t c2 = L'Ň'; +//printf("1=%lc\n", c2); +//const char* s1 = "𐌾"; + XStringW str2; + str2.SPrintf("%c", 'a'); // signle UTF8 ascii char + if ( str2 != L"a" ) return 20; + str2.takeValueFrom(L"ab"); // UTF16(32) string containing ascii char + if ( str2 != L"ab" ) return 21; +#ifdef _MSC_VER + // IMPORTANT : you can't pass a litteral char in a vararg function with Visual Studio (Microsoft strikes again :-). + // At least, you got a warning C4066 + // IMPORTANT2 : Litteral string containing UTF16 char are WRONG. And you don't get a warning !!! If litteral is only ascii, it's ok. + // Maybe it's compilation option but I didn't find them. + wchar_t c = 'Ň'; // using an imtermediary var for Microsoft. + + + wchar_t s[2]; // wchar_t s2[] = L"Ň"; + s[0] = 'Ň'; + s[1] = 0; + + str2.SPrintf("%lc", c); // UTF16(32) char. (2 bytes in total if UTF16) + if (str2 != s) return 22; + str2.takeValueFrom(""); + if (str2.length() != 0) return 221; + str2.takeValueFrom(s); // this is a UTF8 string 2 bytes long + if (str2 != s) return 23; +#else + str2.SPrintf("%lc", L'Ň'); // signe UTF16(32) char. (2 bytes in total if UTF16) + if ( str2 != L"Ň" ) return 22; + str2.takeValueFrom(""); + if (str2.length() != 0) return 221; +#ifdef XSTRINGW_HAS_CTOR_LITTERAL + str2.takeValueFrom("Ň"); // this is a UTF8 string 2 bytes long + if (str2 != "Ň") return 23; // utf8 litteral are converted to an XStringW if ctor is available. +#endif + str2.takeValueFrom(""); + if (str2.length() != 0) return 231; +#ifdef XSTRINGW_HAS_CTOR_LITTERAL + str2.takeValueFrom(L"Ň"); // this is a UTF8 string 2 bytes long + if (str2 != "Ň") return 24; +#endif +#endif + +#if __WCHAR_MAX__ > 0xFFFFu + str2.SPrintf("%lc", L'𐌾'); // L'𐌾' // this char cannot convert to an UTF16 char. So it doesn't compile with -fshort-wchar + if ( str2 != L"𐌾" ) return 30; +#endif + + +#ifndef _MSC_VER + // "𐌾" in UTF16 is 2 char : 0xd800, 0xdf3e + + str2.takeValueFrom(L"𐌾"); // this is a UTF8 string 4 bytes long + if ( str2 != L"𐌾" ) return 31; + str2.takeValueFrom(L"𐌾"); // this is a UTF16 or UTF32 string (depending of -fshort-wchar) + if ( str2 != L"𐌾" ) return 32; + +#ifdef XSTRINGW_HAS_CTOR_LITTERAL + { + XStringW str3("a"); + if ( str3 != L"a" ) return 40; + XStringW str4("aŇ𐌾"); + if ( str4 != L"aŇ𐌾" ) return 41; + } +#endif +#endif + +// XStringW CommonName(L"EFI\\CLOVER\\misc\\screenshot"); +// for (UINTN Index = 0; Index < 20; Index++) { +// XStringW Name = CommonName + SPrintf("%lld", Index) + L".png"; +// DebugLog(2, "XStringW_test shot: %s\n", Name.data()); +// } return 0; } diff --git a/rEFIt_UEFI/cpp_unit_test/XString_test.cpp b/rEFIt_UEFI/cpp_unit_test/XString_test.cpp index b12ea2624..b89e85830 100755 --- a/rEFIt_UEFI/cpp_unit_test/XString_test.cpp +++ b/rEFIt_UEFI/cpp_unit_test/XString_test.cpp @@ -29,47 +29,76 @@ int XString_tests() { { XString str(""); - if ( str != "" ) return 10; + if ( str != "" ) return 100; + } + { + XString str("1"); + if ( str != "1" ) return 101; } - XString str("1"); - if ( str != "1" ) return 11; } #else { XString str; str.takeValueFrom(""); - if (str.length() != 0) return 10; + if (str.length() != 0) return 110; str.takeValueFrom("1"); - if ( str != "1" ) return 11; + if ( str != "1" ) return 111; str.StrCat("2"); - if ( str != "12" ) return 12; + if ( str != "12" ) return 112; } #endif + // check [] operator + { + XString str; + str.takeValueFrom("01234567890123456789"); + char c; + c = str[(char)1]; + if ( c != '1' ) return 201; + c = str[(unsigned char)2]; + if ( c != '2' ) return 202; + c = str[(short)3]; + if ( c != '3' ) return 203; + c = str[(unsigned short)4]; + if ( c != '4' ) return 204; + c = str[(int)5]; + if ( c != '5' ) return 205; + c = str[(unsigned int)6]; + if ( c != '6' ) return 206; + c = str[(long)7]; + if ( c != '7' ) return 207; + c = str[(unsigned long)8]; + if ( c != '8' ) return 208; + c = str[(long long)9]; + if ( c != '9' ) return 209; + c = str[(unsigned long long)10]; + if ( c != '0' ) return 210; + } + // Check StrCat. TODO more test, and test StrnCat { XString str; str.takeValueFrom("1"); str.StrCat("2"); - if ( str != "12" ) return 20; + if ( str != "12" ) return 50; } // check takeValueFrom from utf8 string XString str; str.takeValueFrom("Ň"); // this is a UTF8 string 2 bytes long - if (str != "Ň") return 30; // utf8 litteral are converted to an XStringW if ctor is available. + if (str != "Ň") return 80; // utf8 litteral are converted to an XStringW if ctor is available. str.takeValueFrom("𐌾"); // this is a UTF8 string 4 bytes long - if ( str != "𐌾" ) return 31; + if ( str != "𐌾" ) return 81; str.takeValueFrom("𐌾"); // this is a UTF16 or UTF32 string (depending of -fshort-wchar) - if ( str != "𐌾" ) return 32; + if ( str != "𐌾" ) return 82; // check takeValueFrom from UTF16 or 32 string str.takeValueFrom(L"Ň"); // this is a UTF8 string 2 bytes long - if (str != "Ň") return 33; // utf8 litteral are converted to an XStringW if ctor is available. + if (str != "Ň") return 83; // utf8 litteral are converted to an XStringW if ctor is available. str.takeValueFrom(L"𐌾"); // this is a UTF8 string 4 bytes long - if ( str != "𐌾" ) return 34; + if ( str != "𐌾" ) return 84; str.takeValueFrom(L"𐌾"); // this is a UTF16 or UTF32 string (depending of -fshort-wchar) - if ( str != "𐌾" ) return 35; + if ( str != "𐌾" ) return 85; // Quick check of StrnCpy,StrnCat,Insert,+= str.takeValueFrom("12"); @@ -93,7 +122,7 @@ int XString_tests() //wchar_t c2 = L'Ň'; //printf("1=%lc\n", c2); //const char* s1 = "𐌾"; - // Check SPrintf + // Check SPrintf str2.SPrintf("%c", 'a'); // single UTF8 ascii char if ( str2 != "a" ) return 200; #ifndef _MSC_VER diff --git a/rEFIt_UEFI/cpp_unit_test/all_tests.cpp b/rEFIt_UEFI/cpp_unit_test/all_tests.cpp index 11b43eb3d..6a0c3e72a 100644 --- a/rEFIt_UEFI/cpp_unit_test/all_tests.cpp +++ b/rEFIt_UEFI/cpp_unit_test/all_tests.cpp @@ -3,6 +3,8 @@ #include "../cpp_foundation/XArray.h" #include "../cpp_foundation/XObjArray.h" +#include "../refit/screen.h" // just for PauseForKey + #include "XArray_tests.h" #include "XObjArray_tests.h" #include "XStringWArray_test.h" @@ -23,16 +25,18 @@ bool all_tests() int ret; #ifdef JIEF_DEBUG - ret = printlib_tests(); - if ( ret != 0 ) { - DebugLog(2, "printf_lite_tests() failed at test %d\n", ret); - all_ok = false; - } - ret = poolprint_tests(); - if ( ret != 0 ) { - DebugLog(2, "printf_lite_tests() failed at test %d\n", ret); - all_ok = false; - } + #if defined(CLOVER_BUILD) + ret = printlib_tests(); + if ( ret != 0 ) { + DebugLog(2, "printlib_tests() failed at test %d\n", ret); + all_ok = false; + } + ret = poolprint_tests(); + if ( ret != 0 ) { + DebugLog(2, "poolprint_tests() failed at test %d\n", ret); + all_ok = false; + } + #endif #endif ret = printf_lite_tests(); if ( ret != 0 ) { diff --git a/rEFIt_UEFI/cpp_unit_test/poolprint-test-cpp_conf.h b/rEFIt_UEFI/cpp_unit_test/poolprint-test-cpp_conf.h index ff8429ed5..d111af183 100644 --- a/rEFIt_UEFI/cpp_unit_test/poolprint-test-cpp_conf.h +++ b/rEFIt_UEFI/cpp_unit_test/poolprint-test-cpp_conf.h @@ -1,5 +1,4 @@ -#include "../../Include/Library/printf_lite.h" #define F(x) x #define LF(x) L##x #define PRIF "%a" diff --git a/rEFIt_UEFI/cpp_unit_test/poolprint-test.cpp b/rEFIt_UEFI/cpp_unit_test/poolprint-test.cpp index 6206fff6c..e619d7313 100644 --- a/rEFIt_UEFI/cpp_unit_test/poolprint-test.cpp +++ b/rEFIt_UEFI/cpp_unit_test/poolprint-test.cpp @@ -9,7 +9,7 @@ #include #include #include "unicode_conversions.h" -#include "poolprint-test-cpp_conf.h" +#include #include "poolprint-test.h" static int nbTestFailed = 0; diff --git a/rEFIt_UEFI/cpp_unit_test/printf_lite-test-cpp_conf.h b/rEFIt_UEFI/cpp_unit_test/printf_lite-test-cpp_conf.h index 32e8def4a..5de3d2a1e 100644 --- a/rEFIt_UEFI/cpp_unit_test/printf_lite-test-cpp_conf.h +++ b/rEFIt_UEFI/cpp_unit_test/printf_lite-test-cpp_conf.h @@ -1,5 +1,4 @@ -#include "../../Include/Library/printf_lite.h" #define F(x) x #define LF(x) L##x #define PRIF "%s" diff --git a/rEFIt_UEFI/cpp_unit_test/printf_lite-test.cpp b/rEFIt_UEFI/cpp_unit_test/printf_lite-test.cpp index 3b6699846..aea81775f 100644 --- a/rEFIt_UEFI/cpp_unit_test/printf_lite-test.cpp +++ b/rEFIt_UEFI/cpp_unit_test/printf_lite-test.cpp @@ -9,8 +9,10 @@ #include #include #include "unicode_conversions.h" -#include "printf_lite-test-cpp_conf.h" +#include #include "printf_lite-test.h" +#include +#include "../../Include/Library/printf_lite.h" static int nbTestFailed = 0; #ifdef DISPLAY_ONLY_FAILED diff --git a/rEFIt_UEFI/cpp_unit_test/printlib-test-cpp_conf.h b/rEFIt_UEFI/cpp_unit_test/printlib-test-cpp_conf.h index 32e8def4a..5de3d2a1e 100644 --- a/rEFIt_UEFI/cpp_unit_test/printlib-test-cpp_conf.h +++ b/rEFIt_UEFI/cpp_unit_test/printlib-test-cpp_conf.h @@ -1,5 +1,4 @@ -#include "../../Include/Library/printf_lite.h" #define F(x) x #define LF(x) L##x #define PRIF "%s" diff --git a/rEFIt_UEFI/cpp_unit_test/printlib-test.cpp b/rEFIt_UEFI/cpp_unit_test/printlib-test.cpp index e294819f5..e45f2f8d1 100644 --- a/rEFIt_UEFI/cpp_unit_test/printlib-test.cpp +++ b/rEFIt_UEFI/cpp_unit_test/printlib-test.cpp @@ -9,7 +9,7 @@ #include #include #include "unicode_conversions.h" -#include "printlib-test-cpp_conf.h" +#include #include "printlib-test.h" static int nbTestFailed = 0; diff --git a/rEFIt_UEFI/libeg/FloatLib.cpp b/rEFIt_UEFI/libeg/FloatLib.cpp index 95ca0b427..13b2457af 100644 --- a/rEFIt_UEFI/libeg/FloatLib.cpp +++ b/rEFIt_UEFI/libeg/FloatLib.cpp @@ -334,36 +334,36 @@ VOID QuickSort(VOID* Array, INTN Low, INTN High, INTN Size, INTN (*compare)(CONS if (j > Low) QuickSort(Array, Low, j, Size, compare); if (High > i) QuickSort(Array, i, High, Size, compare); } - -//S must be allocated before use -VOID AsciiSPrintFloat(CHAR8* S, INTN N, CHAR8* F, float X) -{ - INTN I, Fract; - float D; - if (!S) { - return; - } - - I = (INTN)X; - D = (float)I; - Fract = fabsf((X - D) * 1000000.0f); - AsciiSPrint(S, N, "%D.%06D", I, (INTN)Fract); -} +// +////S must be allocated before use +//VOID AsciiSPrintFloat(CHAR8* S, INTN N, CHAR8* F, float X) +//{ +// INTN I, Fract; +// float D; +// if (!S) { +// return; +// } +// +// I = (INTN)X; +// D = (float)I; +// Fract = fabsf((X - D) * 1000000.0f); +// AsciiSPrint(S, N, "%D.%06D", I, (INTN)Fract); +//} #endif - -CHAR16* PoolPrintFloat(float X) -{ - INTN I, Fract; - CHAR8 S = ' '; - float D; - I = (INTN)X; - D = (float)I; - if (I == 0 && X < 0) { - S = '-'; - } - Fract = (INTN)fabsf((X - D) * 1000000.0f); - return PoolPrint(L"%c%d.%06d", S, I, Fract); -} +// +//CHAR16* PoolPrintFloat(float X) +//{ +// INTN I, Fract; +// CHAR8 S = ' '; +// float D; +// I = (INTN)X; +// D = (float)I; +// if (I == 0 && X < 0) { +// S = '-'; +// } +// Fract = (INTN)fabsf((X - D) * 1000000.0f); +// return PoolPrint(L"%c%d.%06d", S, I, Fract); +//} static UINT32 seed = 12345; float rndf() //expected 0..1 diff --git a/rEFIt_UEFI/libeg/FloatLib.h b/rEFIt_UEFI/libeg/FloatLib.h index 1d2d59783..c05af1ed4 100644 --- a/rEFIt_UEFI/libeg/FloatLib.h +++ b/rEFIt_UEFI/libeg/FloatLib.h @@ -52,11 +52,11 @@ AsciiStrToFloat(IN CONST CHAR8 *String, OUT CHAR8 **EndPointer, OPTIONAL OUT float *Data); #if 0 -VOID AsciiSPrintFloat(CHAR8* S, INTN N, CHAR8* F, float X); +//VOID AsciiSPrintFloat(CHAR8* S, INTN N, CHAR8* F, float X); VOID QuickSort(VOID* Array, INTN Low, INTN High, INTN Size, INTN (*compare)(CONST VOID* a, CONST VOID* b)); #endif -CHAR16* PoolPrintFloat(float X); +//CHAR16* PoolPrintFloat(float X); #endif /* FloatLib_h */ diff --git a/rEFIt_UEFI/libeg/VectorGraphics.cpp b/rEFIt_UEFI/libeg/VectorGraphics.cpp index 732adcc4a..aab0f0919 100755 --- a/rEFIt_UEFI/libeg/VectorGraphics.cpp +++ b/rEFIt_UEFI/libeg/VectorGraphics.cpp @@ -194,7 +194,7 @@ EFI_STATUS ParseSVGXIcon(NSVGparser *p, INTN Id, CONST CHAR8 *IconName, float S float Height = IconImage->height * Scale; float Width = IconImage->width * Scale; - // DBG("icon %s width=%ls height=%ls\n", IconName, PoolPrintFloat(Width), PoolPrintFloat(Height)); + // DBG("icon %s width=%ls height=%ls\n", IconName, Width, Height); int iWidth = (int)(Width + 0.5f); int iHeight = (int)(Height + 0.5f); // EG_IMAGE *NewImage = egCreateFilledImage(iWidth, iHeight, TRUE, &MenuBackgroundPixel); @@ -364,7 +364,7 @@ EFI_STATUS ParseSVGIcon(NSVGparser *p, INTN Id, CONST CHAR8 *IconName, float Sc float Height = IconImage->height * Scale; float Width = IconImage->width * Scale; -// DBG("icon %s width=%ls height=%ls\n", IconName, PoolPrintFloat(Width), PoolPrintFloat(Height)); +// DBG("icon %s width=%ls height=%ls\n", IconName, Width, Height); int iWidth = (int)(Width + 0.5f); int iHeight = (int)(Height + 0.5f); EG_IMAGE *NewImage = egCreateFilledImage(iWidth, iHeight, TRUE, &MenuBackgroundPixel); @@ -429,7 +429,7 @@ EFI_STATUS ParseSVGTheme(CONST CHAR8* buffer, TagPtr * dict) SVGimage->height = 768.f; //default height } Scale = UGAHeight / SVGimage->height; - DBG("using scale %ls\n", PoolPrintFloat(Scale)); + DBG("using scale %f\n", Scale); GlobalConfig.Scale = Scale; GlobalConfig.CentreShift = (vbx * Scale - (float)UGAWidth) * 0.5f; @@ -646,7 +646,7 @@ EFI_STATUS ParseSVGXTheme(CONST CHAR8* buffer, TagPtr * dict) SVGimage->height = 768.f; //default height } float Scale = UGAHeight / SVGimage->height; - DBG("using scale %ls\n", PoolPrintFloat(Scale)); + DBG("using scale %ls\n", Scale); ThemeX.Scale = Scale; ThemeX.CentreShift = (vbx * Scale - (float)UGAWidth) * 0.5f; @@ -711,7 +711,7 @@ VOID RenderSVGfont(NSVGfont *fontSVG, UINT32 color) fH = fontSVG->unitsPerEm; } FontScale = (float)FontHeight / fH; - DBG("font scale %ls\n", PoolPrintFloat(FontScale)); + DBG("font scale %ls\n", FontScale); FontWidth = (int)(fontSVG->horizAdvX * FontScale); INTN Width = FontWidth * (AsciiPageSize + GlobalConfig.CodepageSize); FontImage = egCreateImage(Width, Height, TRUE); @@ -836,7 +836,7 @@ INTN renderSVGtext(XImage& TextBufferXY, INTN posX, INTN posY, INTN textType, XS } float fH = fontSVG->bbox[3] - fontSVG->bbox[1]; //1250 if (fH == 0.f) { - DBG("wrong font: %ls\n", PoolPrintFloat(fontSVG->unitsPerEm)); + DBG("wrong font: %ls\n", fontSVG->unitsPerEm); DumpFloat2("Font bbox", fontSVG->bbox, 4); fH = fontSVG->unitsPerEm?fontSVG->unitsPerEm:1000.0f; //1000 } @@ -932,7 +932,7 @@ INTN renderSVGtext(EG_IMAGE* TextBufferXY, INTN posX, INTN posY, INTN textType, } float fH = fontSVG->bbox[3] - fontSVG->bbox[1]; //1250 if (fH == 0.f) { - DBG("wrong font: %ls\n", PoolPrintFloat(fontSVG->unitsPerEm)); + DBG("wrong font: %f\n", fontSVG->unitsPerEm); DumpFloat2("Font bbox", fontSVG->bbox, 4); fH = fontSVG->unitsPerEm?fontSVG->unitsPerEm:1000.0f; //1000 } @@ -958,18 +958,18 @@ INTN renderSVGtext(EG_IMAGE* TextBufferXY, INTN posX, INTN posY, INTN textType, addLetter(p, 0x5F, x, y, sy, color); } x = addLetter(p, letter, x, y, sy, color); -// DBG("next x=%ls\n", PoolPrintFloat(x)); +// DBG("next x=%ls\n", x); } //end of string p->image->realBounds[0] = fontSVG->bbox[0] * Scale; p->image->realBounds[1] = fontSVG->bbox[1] * Scale; p->image->realBounds[2] = fontSVG->bbox[2] * Scale + x; //last bound p->image->realBounds[3] = fontSVG->bbox[3] * Scale; -// DBG("internal Scale=%ls\n", PoolPrintFloat(Scale)); +// DBG("internal Scale=%ls\n", Scale); // DumpFloat2("text bounds", p->image->realBounds, 4); //We made an image, then rasterize it rast = nsvgCreateRasterizer(); -// DBG("begin raster text, scale=%ls\n", PoolPrintFloat(Scale)); +// DBG("begin raster text, scale=%ls\n", Scale); nsvgRasterize(rast, p->image, 0, 0, 1.f, 1.f, (UINT8*)TextBufferXY->PixelData, (int)TextBufferXY->Width, (int)TextBufferXY->Height, (int)(Width*4)); float RealWidth = p->image->realBounds[2] - p->image->realBounds[0]; @@ -1076,7 +1076,7 @@ VOID testSVG() Scale = (ScaleX > ScaleY)?ScaleY:ScaleX; float tx = 0; //-SVGimage->realBounds[0] * Scale; float ty = 0; //-SVGimage->realBounds[1] * Scale; - DBG("timing rasterize start tx=%ls ty=%ls\n", PoolPrintFloat(tx), PoolPrintFloat(ty)); + DBG("timing rasterize start tx=%f ty=%f\n", tx, ty); nsvgRasterize(rast, SVGimage, tx,ty,Scale,Scale, (UINT8*)NewImage->PixelData, (int)Width, (int)Height, (int)Width*4); DBG("timing rasterize end\n"); //now show it! diff --git a/rEFIt_UEFI/libeg/libscreen.cpp b/rEFIt_UEFI/libeg/libscreen.cpp index 750fb622d..c55d0a2ba 100644 --- a/rEFIt_UEFI/libeg/libscreen.cpp +++ b/rEFIt_UEFI/libeg/libscreen.cpp @@ -295,12 +295,12 @@ EFI_STATUS egSetMode(INT32 Next) return Status; } -EFI_STATUS egSetScreenResolution(IN CHAR16 *WidthHeight) +EFI_STATUS egSetScreenResolution(IN const CHAR16 *WidthHeight) { EFI_STATUS Status = EFI_UNSUPPORTED; UINT32 Width; UINT32 Height; - CHAR16 *HeightP; + const CHAR16 *HeightP; UINT32 MaxMode; UINT32 Mode; UINTN SizeOfInfo; @@ -388,7 +388,7 @@ VOID egInitScreen(IN BOOLEAN SetMaxResolution) // Resolution = PoolPrint(L"%dx%d",egScreenWidth,egScreenHeight); XStringW Resolution = WPrintf("%llux%llu", egScreenWidth, egScreenHeight); // if (Resolution) { //no sense - Status = egSetScreenResolution(Resolution.data()); + Status = egSetScreenResolution(Resolution.wc_str()); // FreePool(Resolution); if (!EFI_ERROR(Status)) { return; diff --git a/rEFIt_UEFI/libeg/load_icns.cpp b/rEFIt_UEFI/libeg/load_icns.cpp index 2d2b0d376..204913a01 100755 --- a/rEFIt_UEFI/libeg/load_icns.cpp +++ b/rEFIt_UEFI/libeg/load_icns.cpp @@ -136,7 +136,7 @@ VOID egDecompressIcnsRLE(IN OUT UINT8 **CompData, IN OUT UINTN *CompLen, IN UINT } if (pp_left > 0) { - DBG(" egDecompressIcnsRLE: still need %d bytes of pixel data\n", pp_left); + DBG(" egDecompressIcnsRLE: still need %llu bytes of pixel data\n", pp_left); } // record what's left of the compressed data stream @@ -255,7 +255,7 @@ EG_IMAGE * egDecodeICNS(IN UINT8 *FileData, IN UINTN FileDataLength, IN UINTN Ic egDecompressIcnsRLE(&CompData, &CompLen, PLPTR(NewImage, b), PixelCount); // possible assertion: CompLen == 0 if (CompLen > 0) { - DBG(" egLoadICNSIcon: %d bytes of compressed data left\n", CompLen); + DBG(" egLoadICNSIcon: %llu bytes of compressed data left\n", CompLen); } } else { diff --git a/rEFIt_UEFI/libeg/nanosvg.cpp b/rEFIt_UEFI/libeg/nanosvg.cpp index 1edcc96f4..73cddb38d 100644 --- a/rEFIt_UEFI/libeg/nanosvg.cpp +++ b/rEFIt_UEFI/libeg/nanosvg.cpp @@ -2753,15 +2753,15 @@ static void nsvg__parseTextSpan(NSVGparser* p, const char** dict) if (strcmp(dict[i], "x") == 0) { x = nsvg__parseCoordinate(p, dict[i+1], nsvg__actualOrigX(p), nsvg__actualWidth(p)); text->x = x; -// DBG("span posX=%ls\n", PoolPrintFloat(x)); +// DBG("span posX=%f\n", x); } else if (strcmp(dict[i], "y") == 0) { y = nsvg__parseCoordinate(p, dict[i+1], nsvg__actualOrigY(p), nsvg__actualHeight(p)); text->y = y; -// DBG("span posY=%ls\n", PoolPrintFloat(y)); +// DBG("span posY=%f\n", y); } else if (strcmp(dict[i], "font-size") == 0) { r = nsvg__parseCoordinate(p, dict[i+1], 0.0f, nsvg__actualHeight(p)); text->fontSize = r; -// DBG("span fontSize=%ls from=%s\n", PoolPrintFloat(r), dict[i+1]); +// DBG("span fontSize=%f from=%s\n", r, dict[i+1]); } else if (strcmp(dict[i], "font-style") == 0) { // DBG("span: attr=%s value=%s\n", dict[i], dict[i+1]); if (strstr(dict[i+1], "italic") != NULL) { @@ -2822,7 +2822,7 @@ static void nsvg__parseText(NSVGparser* p, const char** dict) nsvg__parseAttr(p, dict[i], dict[i + 1]); } } - DBG("text: x=%ls y=%ls attr:Style=%X, size=%ls, id=%s\n", PoolPrintFloat(x), PoolPrintFloat(y), attr->fontFace->fontStyle, PoolPrintFloat(attr->fontFace->fontSize), attr->id); + DBG("text: x=%f y=%f attr:Style=%X, size=%f, id=%s\n", x, y, attr->fontFace->fontStyle, attr->fontFace->fontSize, attr->id); text->x = x; text->y = y; text->fontSize = attr->fontFace->fontSize; @@ -2914,7 +2914,7 @@ static void nsvg__parseText(NSVGparser* p, const char** dict) textFace[1].size = (INTN)text->fontSize; textFace[1].color = text->fontColor; textFace[1].valid = TRUE; - DBG("set message->font=%s color=%X size=%ls as in MessageRow\n", fontSVG->fontFamily, text->fontColor, PoolPrintFloat(text->fontSize)); + DBG("set message->font=%s color=%X size=%f as in MessageRow\n", fontSVG->fontFamily, text->fontColor, text->fontSize); } break; } else if (!DayLight && strcmp(group->id, "MessageRow_night") == 0) { @@ -2926,7 +2926,7 @@ static void nsvg__parseText(NSVGparser* p, const char** dict) textFace[1].size = (INTN)text->fontSize; textFace[1].color = text->fontColor; textFace[1].valid = TRUE; - DBG("set message->font=%s color=%X size=%ls as in MessageRow\n", fontSVG->fontFamily, text->fontColor, PoolPrintFloat(text->fontSize)); + DBG("set message->font=%s color=%X size=%f as in MessageRow\n", fontSVG->fontFamily, text->fontColor, text->fontSize); break; } else if (strcmp(group->id, "MenuRows") == 0) { if (!textFace[2].valid) { @@ -2934,7 +2934,7 @@ static void nsvg__parseText(NSVGparser* p, const char** dict) textFace[2].size = (INTN)text->fontSize; textFace[2].color = text->fontColor; textFace[2].valid = TRUE; - DBG("set menu->font=%s color=%X size=%ls as in MenuRows\n", fontSVG->fontFamily, text->fontColor, PoolPrintFloat(text->fontSize)); + DBG("set menu->font=%s color=%X size=%f as in MenuRows\n", fontSVG->fontFamily, text->fontColor, text->fontSize); } break; } else if (!DayLight && strcmp(group->id, "MenuRows_night") == 0) { @@ -2949,7 +2949,7 @@ static void nsvg__parseText(NSVGparser* p, const char** dict) textFace[0].size = (INTN)text->fontSize; textFace[0].color = text->fontColor; textFace[0].valid = TRUE; - DBG("set help->font=%s color=%X size=%ls as in HelpRows\n", fontSVG->fontFamily, text->fontColor, PoolPrintFloat(text->fontSize)); + DBG("set help->font=%s color=%X size=%f as in HelpRows\n", fontSVG->fontFamily, text->fontColor, text->fontSize); } break; } else if (!DayLight && strstr(group->id, "HelpRows_night") != NULL) { @@ -2957,7 +2957,7 @@ static void nsvg__parseText(NSVGparser* p, const char** dict) textFace[0].size = (INTN)text->fontSize; textFace[0].color = text->fontColor; textFace[0].valid = TRUE; - DBG("set help->font=%s color=%X size=%ls as in HelpRows\n", fontSVG->fontFamily, text->fontColor, PoolPrintFloat(text->fontSize)); + DBG("set help->font=%s color=%X size=%f as in HelpRows\n", fontSVG->fontFamily, text->fontColor, text->fontSize); break; } group = group->next; @@ -4044,7 +4044,7 @@ float addLetter(NSVGparser* p, CHAR16 letter, float x, float y, float scale, UIN DBG("bbox3=%ls \n", PoolPrintFloat(p->text->font->bbox[3])); DumpFloat2("glyph xform:", shape->xform, 6); DBG("stroke-color=%X ", shape->stroke.color); - DBG("stroke-width=%ls\n", PoolPrintFloat(shape->strokeWidth)); + DBG("stroke-width=%ls\n", shape->strokeWidth); } */ //in glyph units @@ -4348,7 +4348,7 @@ NSVGparser* nsvgParse(char* input, /* const char* units,*/ float dpi, float opac p->image->width = bounds[2] - bounds[0]; p->image->height = bounds[3] - bounds[1]; #endif - DBG("scaled width=%ls height=%ls\n", PoolPrintFloat(p->image->width), + DBG("scaled width=%f height=%ls\n", p->image->width, PoolPrintFloat(p->image->height)); return p; } diff --git a/rEFIt_UEFI/libeg/nanosvgrast.cpp b/rEFIt_UEFI/libeg/nanosvgrast.cpp index 8dd7711b2..39f5f6954 100644 --- a/rEFIt_UEFI/libeg/nanosvgrast.cpp +++ b/rEFIt_UEFI/libeg/nanosvgrast.cpp @@ -1175,7 +1175,7 @@ static void nsvg__scanlineSolid(unsigned char* row, int count, unsigned char* co for (i = 0; i < count; i++) { int r,g,b,a,ia; gd = sqrtf(gx*gx + gy*gy); - // DBG("gx=%ls gy=%ls\n", PoolPrintFloat(gx), PoolPrintFloat(gy)); + // DBG("gx=%f gy=%f\n", gx, gy); int level = cache->coarse; c = cache->colors[dither(nsvg__clampf(gd*(255.0f-level*2), 0, (254.99f-level*2)), level)]; cr = (c) & 0xff; @@ -1775,7 +1775,7 @@ void nsvgRasterize(NSVGrasterizer* r, tx -= image->realBounds[0] * scalex; ty -= image->realBounds[1] * scaley; -// DBG(" image will be shifted by [%ls,%ls]\n", PoolPrintFloat(tx), PoolPrintFloat(ty)); +// DBG(" image will be shifted by [%f,%f]\n", tx, ty); // DumpFloat(" image real bounds ", image->realBounds, 4); nsvg__rasterizeClipPaths(r, image, w, h, tx, ty, scalex, scaley); diff --git a/rEFIt_UEFI/libeg/text.cpp b/rEFIt_UEFI/libeg/text.cpp index cafbb3ddd..68f1d70ee 100644 --- a/rEFIt_UEFI/libeg/text.cpp +++ b/rEFIt_UEFI/libeg/text.cpp @@ -129,9 +129,9 @@ EG_IMAGE * egLoadFontImage(IN BOOLEAN UseEmbedded, IN INTN Rows, IN INTN Cols) } ImageWidth = NewImage->Width; - DBG("ImageWidth=%d\n", ImageWidth); + DBG("ImageWidth=%lld\n", ImageWidth); ImageHeight = NewImage->Height; - DBG("ImageHeight=%d\n", ImageHeight); + DBG("ImageHeight=%lld\n", ImageHeight); PixelPtr = NewImage->PixelData; NewFontImage = egCreateImage(ImageWidth * Rows, ImageHeight / Rows, TRUE); @@ -223,7 +223,7 @@ VOID PrepareFont() } // TextHeight = FontHeight + TEXT_YMARGIN * 2; - DBG("Font %d prepared WxH=%dx%d CharWidth=%d\n", GlobalConfig.Font, FontWidth, FontHeight, GlobalConfig.CharWidth); + DBG("Font %d prepared WxH=%lldx%lld CharWidth=%lld\n", GlobalConfig.Font, FontWidth, FontHeight, GlobalConfig.CharWidth); } else { DBG("Failed to load font\n"); } diff --git a/rEFIt_UEFI/refit.inf b/rEFIt_UEFI/refit.inf index 17fa601f3..70be5fe38 100644 --- a/rEFIt_UEFI/refit.inf +++ b/rEFIt_UEFI/refit.inf @@ -35,6 +35,8 @@ # EfiLib/BmLib.c # Platform/DevicePath.c #included into GenericBdsLib Platform/BdsConnect.cpp #included into GenericBdsLib + ../Include/Library/printf_lite-conf.h + ../Include/Library/printf_lite.h refit/main.cpp refit/icns.cpp refit/lib.cpp diff --git a/rEFIt_UEFI/refit/lib.h b/rEFIt_UEFI/refit/lib.h index 01031dcf5..7b006559a 100644 --- a/rEFIt_UEFI/refit/lib.h +++ b/rEFIt_UEFI/refit/lib.h @@ -623,7 +623,7 @@ VOID UninitRefitLib(VOID); EFI_STATUS ReinitRefitLib(VOID); EFI_STATUS ReinitSelfLib(VOID); //extern EFI_STATUS FinishInitRefitLib(VOID); -- static -VOID PauseForKey(IN CONST CHAR16 *Msg); + BOOLEAN IsEmbeddedTheme(VOID); UINT8 GetOSTypeFromPath (IN CONST CHAR16 *Path); diff --git a/rEFIt_UEFI/refit/main.cpp b/rEFIt_UEFI/refit/main.cpp index 97f1c1fb6..3a719c5a2 100644 --- a/rEFIt_UEFI/refit/main.cpp +++ b/rEFIt_UEFI/refit/main.cpp @@ -930,7 +930,7 @@ static VOID StartLoader(IN LOADER_ENTRY *Entry) */ // DBG("BeginExternalScreen\n"); - BeginExternalScreen(OSFLAG_ISSET(Entry->Flags, OSFLAG_USEGRAPHICS), L"Booting OS"); + BeginExternalScreen(OSFLAG_ISSET(Entry->Flags, OSFLAG_USEGRAPHICS)/*, L"Booting OS"*/); if (!OSTYPE_IS_WINDOWS(Entry->LoaderType)) { if (OSFLAG_ISSET(Entry->Flags, OSFLAG_USEGRAPHICS)) { @@ -1031,7 +1031,7 @@ static VOID StartLegacy(IN LEGACY_ENTRY *Entry) } egClearScreen(&DarkBackgroundPixel); - BeginExternalScreen(TRUE, L"Booting Legacy OS"); + BeginExternalScreen(TRUE/*, L"Booting Legacy OS"*/); BootLogoImage = LoadOSIcon(Entry->Volume->LegacyOS->IconName, L"legacy", 128, TRUE, TRUE); if (BootLogoImage != NULL) { @@ -1077,7 +1077,7 @@ static VOID StartTool(IN REFIT_MENU_ENTRY_LOADER_TOOL *Entry) DBG("Start Tool: %ls\n", Entry->LoaderPath); egClearScreen(&DarkBackgroundPixel); // assumes "Start " as assigned below - BeginExternalScreen(OSFLAG_ISSET(Entry->Flags, OSFLAG_USEGRAPHICS), &Entry->Title[6]); // Shouldn't we check that length of Title is at least 6 ? + BeginExternalScreen(OSFLAG_ISSET(Entry->Flags, OSFLAG_USEGRAPHICS)/*, &Entry->Title[6]*/); // Shouldn't we check that length of Title is at least 6 ? StartEFIImage(Entry->DevicePath, Entry->LoadOptions, Basename(Entry->LoaderPath), Basename(Entry->LoaderPath), NULL, NULL); FinishExternalScreen(); //ReinitSelfLib(); @@ -2081,7 +2081,7 @@ RefitMain (IN EFI_HANDLE ImageHandle, DBG("Clover : Image base = 0x%llX\n", (uintptr_t)SelfLoadedImage->ImageBase); // do not change, it's used by grep to feed the debugger #ifdef JIEF_DEBUG - gBS->Stall(3000000); // to give time to gdb to connect + gBS->Stall(1500000); // to give time to gdb to connect // PauseForKey(L"press\n"); #endif diff --git a/rEFIt_UEFI/refit/screen.cpp b/rEFIt_UEFI/refit/screen.cpp index 89855b412..4ef7ae580 100644 --- a/rEFIt_UEFI/refit/screen.cpp +++ b/rEFIt_UEFI/refit/screen.cpp @@ -181,7 +181,7 @@ VOID FinishTextScreen(IN BOOLEAN WaitAlways) haveError = FALSE; } -VOID BeginExternalScreen(IN BOOLEAN UseGraphicsMode, IN CONST CHAR16 *Title) +VOID BeginExternalScreen(IN BOOLEAN UseGraphicsMode/*, IN CONST CHAR16 *Title*/) { if (!AllowGraphicsMode) { UseGraphicsMode = FALSE; diff --git a/rEFIt_UEFI/refit/screen.h b/rEFIt_UEFI/refit/screen.h index 5611b38e4..564c6754f 100644 --- a/rEFIt_UEFI/refit/screen.h +++ b/rEFIt_UEFI/refit/screen.h @@ -4,7 +4,7 @@ VOID InitScreen(IN BOOLEAN SetMaxResolution); VOID SetupScreen(VOID); VOID BeginTextScreen(IN CONST CHAR16 *Title); VOID FinishTextScreen(IN BOOLEAN WaitAlways); -VOID BeginExternalScreen(IN BOOLEAN UseGraphicsMode, IN CONST CHAR16 *Title); +VOID BeginExternalScreen(IN BOOLEAN UseGraphicsMode/*, IN CONST CHAR16 *Title*/); VOID FinishExternalScreen(VOID); VOID TerminateScreen(VOID); VOID SetNextScreenMode(INT32); @@ -27,3 +27,5 @@ VOID BltImageCompositeBadge(IN EG_IMAGE *BaseImage, IN EG_IMAGE *TopImage, IN EG INTN HybridRepositioning(INTN Edge, INTN Value, INTN ImageDimension, INTN ScreenDimension, INTN DesignScreenDimension); INTN CalculateNudgePosition(INTN Position, INTN NudgeValue, INTN ImageDimension, INTN ScreenDimension); + +VOID PauseForKey(CONST CHAR16* msg);