diff --git a/Xcode/CloverX64TestNewParser/CloverMock/rEFIt_UEFI/Platform/BootLog.cpp b/Xcode/CloverX64TestNewParser/CloverMock/rEFIt_UEFI/Platform/BootLog.cpp index a5c5ebb58..dd260fc91 100644 --- a/Xcode/CloverX64TestNewParser/CloverMock/rEFIt_UEFI/Platform/BootLog.cpp +++ b/Xcode/CloverX64TestNewParser/CloverMock/rEFIt_UEFI/Platform/BootLog.cpp @@ -59,19 +59,19 @@ PrintBytes(IN void *Bytes, IN UINTN Number) // DebugMode==2 Prints to msg log, DEBUG_LOG and display console void EFIAPI DebugLog(IN INTN DebugMode, IN CONST CHAR8 *FormatString, ...) { - VA_LIST Marker; - //UINTN offset = 0; - +// VA_LIST Marker; + va_list Marker; // Make sure the buffer is intact for writing if (FormatString == NULL || DebugMode < 0) { return; } // Print message to log buffer - VA_START(Marker, FormatString); +// VA_START(Marker, FormatString); + va_start(Marker, FormatString); #if __WCHAR_MAX__ < 0xffff #else - printf(FormatString, Marker); + vprintf(FormatString, Marker); #endif VA_END(Marker); } diff --git a/Xcode/CloverX64TestNewParser/CloverX64TestNewParser.xcodeproj/project.pbxproj b/Xcode/CloverX64TestNewParser/CloverX64TestNewParser.xcodeproj/project.pbxproj index e189d378c..84999dbc1 100644 --- a/Xcode/CloverX64TestNewParser/CloverX64TestNewParser.xcodeproj/project.pbxproj +++ b/Xcode/CloverX64TestNewParser/CloverX64TestNewParser.xcodeproj/project.pbxproj @@ -10,6 +10,31 @@ 9A0B085E240300E000E2B470 /* Platform.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A0B085D240300E000E2B470 /* Platform.cpp */; }; 9A28CD1F241BB61B00F3D247 /* abort.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A28CD1D241BB61B00F3D247 /* abort.cpp */; }; 9A28CD22241BB61B00F3D247 /* strlen.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A28CD1E241BB61B00F3D247 /* strlen.cpp */; }; + 9A358B2025CF115200A3850D /* Config_GUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A358AF425CF115100A3850D /* Config_GUI.cpp */; }; + 9A358B2125CF115200A3850D /* Config_RtVariables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A358AF525CF115100A3850D /* Config_RtVariables.cpp */; }; + 9A358B2225CF115200A3850D /* Config_SMBIOS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A358AF625CF115100A3850D /* Config_SMBIOS.cpp */; }; + 9A358B2325CF115200A3850D /* Config_Devices_Audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A358AF925CF115100A3850D /* Config_Devices_Audio.cpp */; }; + 9A358B2425CF115200A3850D /* Config_KernelAndKextPatches.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A358AFC25CF115100A3850D /* Config_KernelAndKextPatches.cpp */; }; + 9A358B2525CF115200A3850D /* Config_Quirks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A358AFD25CF115100A3850D /* Config_Quirks.cpp */; }; + 9A358B2625CF115200A3850D /* Config_CPU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A358B0025CF115100A3850D /* Config_CPU.cpp */; }; + 9A358B2725CF115200A3850D /* Config_Devices_FakeID.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A358B0325CF115100A3850D /* Config_Devices_FakeID.cpp */; }; + 9A358B2825CF115200A3850D /* Config_ACPI_SSDT.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A358B0625CF115100A3850D /* Config_ACPI_SSDT.cpp */; }; + 9A358B2925CF115200A3850D /* Config_Boot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A358B0725CF115100A3850D /* Config_Boot.cpp */; }; + 9A358B2A25CF115200A3850D /* Config_Devices_AddProperties.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A358B0825CF115100A3850D /* Config_Devices_AddProperties.cpp */; }; + 9A358B2B25CF115200A3850D /* ConfigPlist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A358B0A25CF115100A3850D /* ConfigPlist.cpp */; }; + 9A358B2C25CF115200A3850D /* Config_Devices_USB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A358B0B25CF115100A3850D /* Config_Devices_USB.cpp */; }; + 9A358B2D25CF115200A3850D /* Config_Devices.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A358B0C25CF115100A3850D /* Config_Devices.cpp */; }; + 9A358B2E25CF115200A3850D /* Config_ACPI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A358B0F25CF115100A3850D /* Config_ACPI.cpp */; }; + 9A358B2F25CF115200A3850D /* Config_Devices_Properties.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A358B1025CF115100A3850D /* Config_Devices_Properties.cpp */; }; + 9A358B3025CF115200A3850D /* Config_Graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A358B1225CF115100A3850D /* Config_Graphics.cpp */; }; + 9A358B3125CF115200A3850D /* Config_SystemParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A358B1525CF115100A3850D /* Config_SystemParameters.cpp */; }; + 9A358B3225CF115200A3850D /* CompareSettings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A358B1625CF115100A3850D /* CompareSettings.cpp */; }; + 9A358B3325CF115200A3850D /* Config_ACPI_DSDT.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A358B1725CF115100A3850D /* Config_ACPI_DSDT.cpp */; }; + 9A358B3425CF115200A3850D /* Config_BootGraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A358B1825CF115100A3850D /* Config_BootGraphics.cpp */; }; + 9A358B3525CF115200A3850D /* Config_Devices_Arbitrary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A358B1925CF115100A3850D /* Config_Devices_Arbitrary.cpp */; }; + 9A358B3D25CF117A00A3850D /* XmlLiteCompositeTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A358B3925CF117A00A3850D /* XmlLiteCompositeTypes.cpp */; }; + 9A358B3E25CF117A00A3850D /* XmlLiteParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A358B3A25CF117A00A3850D /* XmlLiteParser.cpp */; }; + 9A358B3F25CF117A00A3850D /* xmlLiteSimpleTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A358B3B25CF117A00A3850D /* xmlLiteSimpleTypes.cpp */; }; 9A36E4F024F3B537007A1107 /* TagString8.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A36E4DB24F3B536007A1107 /* TagString8.cpp */; }; 9A36E4F424F3B537007A1107 /* plist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A36E4DD24F3B536007A1107 /* plist.cpp */; }; 9A36E4F824F3B537007A1107 /* xml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A36E4DF24F3B536007A1107 /* xml.cpp */; }; @@ -32,6 +57,8 @@ 9A838CB425347C36008303F5 /* MemoryOperation.c in Sources */ = {isa = PBXBuildFile; fileRef = 9A838CB325347C36008303F5 /* MemoryOperation.c */; }; 9A838CBA25348237008303F5 /* BaseMemoryLib.c in Sources */ = {isa = PBXBuildFile; fileRef = 9A838CB925348237008303F5 /* BaseMemoryLib.c */; }; 9A838CC3253485DC008303F5 /* DebugLib.c in Sources */ = {isa = PBXBuildFile; fileRef = 9A838CC2253485DC008303F5 /* DebugLib.c */; }; + 9A9037E625CFE7D100F14179 /* xml_lite-test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037E325CFE7CD00F14179 /* xml_lite-test.cpp */; }; + 9A9037E725CFE7D100F14179 /* config-test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037E425CFE7D000F14179 /* config-test.cpp */; }; 9A9223312402FD1000483CBA /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9223302402FD1000483CBA /* main.cpp */; }; 9A9AEB8D243F73CE00FBD7D8 /* unicode_conversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9AEB8C243F73CE00FBD7D8 /* unicode_conversions.cpp */; }; 9AA3918F25CC75420099DC1F /* Settings.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A852C0E25CC39E900C5662E /* Settings.cpp */; }; @@ -244,6 +271,56 @@ 9A0B085D240300E000E2B470 /* Platform.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = Platform.cpp; sourceTree = ""; }; 9A28CD1D241BB61B00F3D247 /* abort.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = abort.cpp; sourceTree = ""; }; 9A28CD1E241BB61B00F3D247 /* strlen.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = strlen.cpp; sourceTree = ""; }; + 9A358AF425CF115100A3850D /* Config_GUI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_GUI.cpp; sourceTree = ""; }; + 9A358AF525CF115100A3850D /* Config_RtVariables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_RtVariables.cpp; sourceTree = ""; }; + 9A358AF625CF115100A3850D /* Config_SMBIOS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_SMBIOS.cpp; sourceTree = ""; }; + 9A358AF725CF115100A3850D /* Config_KernelAndKextPatches.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_KernelAndKextPatches.h; sourceTree = ""; }; + 9A358AF825CF115100A3850D /* Config_Graphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_Graphics.h; sourceTree = ""; }; + 9A358AF925CF115100A3850D /* Config_Devices_Audio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_Devices_Audio.cpp; sourceTree = ""; }; + 9A358AFA25CF115100A3850D /* Config_ACPI_DSDT.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_ACPI_DSDT.h; sourceTree = ""; }; + 9A358AFB25CF115100A3850D /* ConfigPlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConfigPlist.h; sourceTree = ""; }; + 9A358AFC25CF115100A3850D /* Config_KernelAndKextPatches.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_KernelAndKextPatches.cpp; sourceTree = ""; }; + 9A358AFD25CF115100A3850D /* Config_Quirks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_Quirks.cpp; sourceTree = ""; }; + 9A358AFE25CF115100A3850D /* CompareSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CompareSettings.h; sourceTree = ""; }; + 9A358AFF25CF115100A3850D /* Config_Devices_Audio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_Devices_Audio.h; sourceTree = ""; }; + 9A358B0025CF115100A3850D /* Config_CPU.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_CPU.cpp; sourceTree = ""; }; + 9A358B0125CF115100A3850D /* Config_Quirks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_Quirks.h; sourceTree = ""; }; + 9A358B0225CF115100A3850D /* Config_ACPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_ACPI.h; sourceTree = ""; }; + 9A358B0325CF115100A3850D /* Config_Devices_FakeID.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_Devices_FakeID.cpp; sourceTree = ""; }; + 9A358B0425CF115100A3850D /* Config_Devices_Properties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_Devices_Properties.h; sourceTree = ""; }; + 9A358B0525CF115100A3850D /* Config_Boot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_Boot.h; sourceTree = ""; }; + 9A358B0625CF115100A3850D /* Config_ACPI_SSDT.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_ACPI_SSDT.cpp; sourceTree = ""; }; + 9A358B0725CF115100A3850D /* Config_Boot.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_Boot.cpp; sourceTree = ""; }; + 9A358B0825CF115100A3850D /* Config_Devices_AddProperties.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_Devices_AddProperties.cpp; sourceTree = ""; }; + 9A358B0925CF115100A3850D /* Config_Devices_Arbitrary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_Devices_Arbitrary.h; sourceTree = ""; }; + 9A358B0A25CF115100A3850D /* ConfigPlist.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConfigPlist.cpp; sourceTree = ""; }; + 9A358B0B25CF115100A3850D /* Config_Devices_USB.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_Devices_USB.cpp; sourceTree = ""; }; + 9A358B0C25CF115100A3850D /* Config_Devices.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_Devices.cpp; sourceTree = ""; }; + 9A358B0D25CF115100A3850D /* Config_SystemParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_SystemParameters.h; sourceTree = ""; }; + 9A358B0E25CF115100A3850D /* Config_SMBIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_SMBIOS.h; sourceTree = ""; }; + 9A358B0F25CF115100A3850D /* Config_ACPI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_ACPI.cpp; sourceTree = ""; }; + 9A358B1025CF115100A3850D /* Config_Devices_Properties.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_Devices_Properties.cpp; sourceTree = ""; }; + 9A358B1125CF115100A3850D /* Config_Devices.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_Devices.h; sourceTree = ""; }; + 9A358B1225CF115100A3850D /* Config_Graphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_Graphics.cpp; sourceTree = ""; }; + 9A358B1325CF115100A3850D /* Config_CPU.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_CPU.h; sourceTree = ""; }; + 9A358B1425CF115100A3850D /* Config_BootGraphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_BootGraphics.h; sourceTree = ""; }; + 9A358B1525CF115100A3850D /* Config_SystemParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_SystemParameters.cpp; sourceTree = ""; }; + 9A358B1625CF115100A3850D /* CompareSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CompareSettings.cpp; sourceTree = ""; }; + 9A358B1725CF115100A3850D /* Config_ACPI_DSDT.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_ACPI_DSDT.cpp; sourceTree = ""; }; + 9A358B1825CF115100A3850D /* Config_BootGraphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_BootGraphics.cpp; sourceTree = ""; }; + 9A358B1925CF115100A3850D /* Config_Devices_Arbitrary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_Devices_Arbitrary.cpp; sourceTree = ""; }; + 9A358B1A25CF115100A3850D /* Config_ACPI_SSDT.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_ACPI_SSDT.h; sourceTree = ""; }; + 9A358B1B25CF115100A3850D /* Config_GUI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_GUI.h; sourceTree = ""; }; + 9A358B1C25CF115100A3850D /* Config_RtVariables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_RtVariables.h; sourceTree = ""; }; + 9A358B1D25CF115100A3850D /* Config_Devices_FakeID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_Devices_FakeID.h; sourceTree = ""; }; + 9A358B1E25CF115100A3850D /* Config_Devices_USB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_Devices_USB.h; sourceTree = ""; }; + 9A358B1F25CF115100A3850D /* Config_Devices_AddProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_Devices_AddProperties.h; sourceTree = ""; }; + 9A358B3725CF117A00A3850D /* XmlLiteParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XmlLiteParser.h; sourceTree = ""; }; + 9A358B3825CF117A00A3850D /* xmlLiteSimpleTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xmlLiteSimpleTypes.h; sourceTree = ""; }; + 9A358B3925CF117A00A3850D /* XmlLiteCompositeTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XmlLiteCompositeTypes.cpp; sourceTree = ""; }; + 9A358B3A25CF117A00A3850D /* XmlLiteParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XmlLiteParser.cpp; sourceTree = ""; }; + 9A358B3B25CF117A00A3850D /* xmlLiteSimpleTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xmlLiteSimpleTypes.cpp; sourceTree = ""; }; + 9A358B3C25CF117A00A3850D /* XmlLiteCompositeTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XmlLiteCompositeTypes.h; sourceTree = ""; }; 9A36E4DA24F3B536007A1107 /* TagBool.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TagBool.h; sourceTree = ""; }; 9A36E4DB24F3B536007A1107 /* TagString8.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = TagString8.cpp; sourceTree = ""; }; 9A36E4DC24F3B536007A1107 /* plist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = plist.h; sourceTree = ""; }; @@ -299,6 +376,10 @@ 9A838CC52534933F008303F5 /* Base.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Base.h; sourceTree = ""; }; 9A852C0D25CC39E900C5662E /* Settings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Settings.h; sourceTree = ""; }; 9A852C0E25CC39E900C5662E /* Settings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Settings.cpp; sourceTree = ""; }; + 9A9037E225CFE7CD00F14179 /* config-test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "config-test.h"; sourceTree = ""; }; + 9A9037E325CFE7CD00F14179 /* xml_lite-test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "xml_lite-test.cpp"; sourceTree = ""; }; + 9A9037E425CFE7D000F14179 /* config-test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "config-test.cpp"; sourceTree = ""; }; + 9A9037E525CFE7D000F14179 /* xml_lite-test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "xml_lite-test.h"; sourceTree = ""; }; 9A92232D2402FD1000483CBA /* CloverX64TestNewParser UTF16 signed char */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "CloverX64TestNewParser UTF16 signed char"; sourceTree = BUILT_PRODUCTS_DIR; }; 9A9223302402FD1000483CBA /* main.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = ""; }; 9A9AEB8B243F73CE00FBD7D8 /* unicode_conversions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unicode_conversions.h; sourceTree = ""; }; @@ -311,7 +392,6 @@ 9AA3911E25CC56E60099DC1F /* rename_helper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = rename_helper.h; sourceTree = ""; }; 9AA3911F25CC56E60099DC1F /* Handle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Handle.h; sourceTree = ""; }; 9AA3912025CC56E60099DC1F /* OneLinerMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OneLinerMacros.h; sourceTree = ""; }; - 9AA3912125CC56E60099DC1F /* OsType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OsType.h; sourceTree = ""; }; 9AA3912225CC56E60099DC1F /* Pci.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Pci.h; sourceTree = ""; }; 9AA3912325CC56E60099DC1F /* Efi.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Efi.h; sourceTree = ""; }; 9AA3912425CC56E60099DC1F /* OC.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OC.h; sourceTree = ""; }; @@ -4917,6 +4997,10 @@ 9AA9E51B25CD306700BD5E8B /* loader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = loader.cpp; sourceTree = ""; }; 9AA9E54B25CD41E900BD5E8B /* posix_additions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = posix_additions.h; sourceTree = ""; }; 9AA9E54C25CD41E900BD5E8B /* posix_additions.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = posix_additions.cpp; sourceTree = ""; }; + 9AB6EB9D25CF1FAC0001BDBB /* VolumeTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VolumeTypes.h; sourceTree = ""; }; + 9AB6EB9E25CF1FAD0001BDBB /* BootTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BootTypes.h; sourceTree = ""; }; + 9AB6EB9F25CF1FAD0001BDBB /* OSFlags.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OSFlags.h; sourceTree = ""; }; + 9AB6EBA025CF1FAD0001BDBB /* OSTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OSTypes.h; sourceTree = ""; }; 9AC790112452C45A0004FBE9 /* abort.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = abort.h; sourceTree = ""; }; 9AD0358A25C579B200E58351 /* PrintLib.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PrintLib.h; sourceTree = ""; }; 9AD0358B25C57A4500E58351 /* MemoryAllocationLib.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = MemoryAllocationLib.c; sourceTree = ""; }; @@ -5168,6 +5252,7 @@ 9A28CCAC241B816400F3D247 /* Platform */ = { isa = PBXGroup; children = ( + 9A358AF325CF115100A3850D /* ConfigPlist */, 9AA9240D25CD5B2D00BD5E8B /* AcpiPatcher.cpp */, 9AA9240825CD5B2C00BD5E8B /* AcpiPatcher.h */, 9AA923FB25CD5B2900BD5E8B /* AmlGenerator.cpp */, @@ -5284,6 +5369,70 @@ path = Posix; sourceTree = ""; }; + 9A358AF325CF115100A3850D /* ConfigPlist */ = { + isa = PBXGroup; + children = ( + 9A358B1625CF115100A3850D /* CompareSettings.cpp */, + 9A358AFE25CF115100A3850D /* CompareSettings.h */, + 9A358B1725CF115100A3850D /* Config_ACPI_DSDT.cpp */, + 9A358AFA25CF115100A3850D /* Config_ACPI_DSDT.h */, + 9A358B0625CF115100A3850D /* Config_ACPI_SSDT.cpp */, + 9A358B1A25CF115100A3850D /* Config_ACPI_SSDT.h */, + 9A358B0F25CF115100A3850D /* Config_ACPI.cpp */, + 9A358B0225CF115100A3850D /* Config_ACPI.h */, + 9A358B0725CF115100A3850D /* Config_Boot.cpp */, + 9A358B0525CF115100A3850D /* Config_Boot.h */, + 9A358B1825CF115100A3850D /* Config_BootGraphics.cpp */, + 9A358B1425CF115100A3850D /* Config_BootGraphics.h */, + 9A358B0025CF115100A3850D /* Config_CPU.cpp */, + 9A358B1325CF115100A3850D /* Config_CPU.h */, + 9A358B0825CF115100A3850D /* Config_Devices_AddProperties.cpp */, + 9A358B1F25CF115100A3850D /* Config_Devices_AddProperties.h */, + 9A358B1925CF115100A3850D /* Config_Devices_Arbitrary.cpp */, + 9A358B0925CF115100A3850D /* Config_Devices_Arbitrary.h */, + 9A358AF925CF115100A3850D /* Config_Devices_Audio.cpp */, + 9A358AFF25CF115100A3850D /* Config_Devices_Audio.h */, + 9A358B0325CF115100A3850D /* Config_Devices_FakeID.cpp */, + 9A358B1D25CF115100A3850D /* Config_Devices_FakeID.h */, + 9A358B1025CF115100A3850D /* Config_Devices_Properties.cpp */, + 9A358B0425CF115100A3850D /* Config_Devices_Properties.h */, + 9A358B0B25CF115100A3850D /* Config_Devices_USB.cpp */, + 9A358B1E25CF115100A3850D /* Config_Devices_USB.h */, + 9A358B0C25CF115100A3850D /* Config_Devices.cpp */, + 9A358B1125CF115100A3850D /* Config_Devices.h */, + 9A358B1225CF115100A3850D /* Config_Graphics.cpp */, + 9A358AF825CF115100A3850D /* Config_Graphics.h */, + 9A358AF425CF115100A3850D /* Config_GUI.cpp */, + 9A358B1B25CF115100A3850D /* Config_GUI.h */, + 9A358AFC25CF115100A3850D /* Config_KernelAndKextPatches.cpp */, + 9A358AF725CF115100A3850D /* Config_KernelAndKextPatches.h */, + 9A358AFD25CF115100A3850D /* Config_Quirks.cpp */, + 9A358B0125CF115100A3850D /* Config_Quirks.h */, + 9A358AF525CF115100A3850D /* Config_RtVariables.cpp */, + 9A358B1C25CF115100A3850D /* Config_RtVariables.h */, + 9A358AF625CF115100A3850D /* Config_SMBIOS.cpp */, + 9A358B0E25CF115100A3850D /* Config_SMBIOS.h */, + 9A358B1525CF115100A3850D /* Config_SystemParameters.cpp */, + 9A358B0D25CF115100A3850D /* Config_SystemParameters.h */, + 9A358B0A25CF115100A3850D /* ConfigPlist.cpp */, + 9A358AFB25CF115100A3850D /* ConfigPlist.h */, + ); + path = ConfigPlist; + sourceTree = ""; + }; + 9A358B3625CF117A00A3850D /* cpp_lib */ = { + isa = PBXGroup; + children = ( + 9A358B3725CF117A00A3850D /* XmlLiteParser.h */, + 9A358B3825CF117A00A3850D /* xmlLiteSimpleTypes.h */, + 9A358B3925CF117A00A3850D /* XmlLiteCompositeTypes.cpp */, + 9A358B3A25CF117A00A3850D /* XmlLiteParser.cpp */, + 9A358B3B25CF117A00A3850D /* xmlLiteSimpleTypes.cpp */, + 9A358B3C25CF117A00A3850D /* XmlLiteCompositeTypes.h */, + ); + path = cpp_lib; + sourceTree = ""; + }; 9A36E4D924F3B51C007A1107 /* plist */ = { isa = PBXGroup; children = ( @@ -5318,6 +5467,7 @@ 9A36E51C24F3B5B4007A1107 /* rEFIt_UEFI */ = { isa = PBXGroup; children = ( + 9A358B3625CF117A00A3850D /* cpp_lib */, 9AFDD05825CE730F00EEAF06 /* cpp_unit_test */, 9A0B08432402FE9300E2B470 /* cpp_foundation */, 9AA9E50525CD306700BD5E8B /* entry_scan */, @@ -5492,12 +5642,15 @@ 9AA3911925CC56E60099DC1F /* include */ = { isa = PBXGroup; children = ( + 9AB6EB9E25CF1FAD0001BDBB /* BootTypes.h */, + 9AB6EB9F25CF1FAD0001BDBB /* OSFlags.h */, + 9AB6EBA025CF1FAD0001BDBB /* OSTypes.h */, + 9AB6EB9D25CF1FAC0001BDBB /* VolumeTypes.h */, 9AA3911A25CC56E60099DC1F /* Devices.h */, 9AA3912325CC56E60099DC1F /* Efi.h */, 9AA3911F25CC56E60099DC1F /* Handle.h */, 9AA3912425CC56E60099DC1F /* OC.h */, 9AA3912025CC56E60099DC1F /* OneLinerMacros.h */, - 9AA3912125CC56E60099DC1F /* OsType.h */, 9AA3912225CC56E60099DC1F /* Pci.h */, 9AA3911D25CC56E60099DC1F /* printf_lite-test-cpp_conf.h */, 9AA3911B25CC56E60099DC1F /* printlib-test-cpp_conf.h */, @@ -15621,42 +15774,46 @@ 9AFDD05825CE730F00EEAF06 /* cpp_unit_test */ = { isa = PBXGroup; children = ( - 9AFDD05925CE730F00EEAF06 /* XToolsCommon_test.h */, - 9AFDD05A25CE730F00EEAF06 /* XString_test.h */, - 9AFDD05B25CE730F00EEAF06 /* plist_tests.h */, - 9AFDD05C25CE730F00EEAF06 /* global_test.cpp */, - 9AFDD05D25CE730F00EEAF06 /* strncmp_test.h */, - 9AFDD05E25CE730F00EEAF06 /* XBuffer_tests.h */, - 9AFDD05F25CE730F00EEAF06 /* strcmp_test.h */, - 9AFDD06025CE730F00EEAF06 /* XBuffer_tests.cpp */, - 9AFDD06125CE730F00EEAF06 /* LoadOptions_test.cpp */, - 9AFDD06225CE730F00EEAF06 /* find_replace_mask_OC_tests.h */, - 9AFDD06325CE730F00EEAF06 /* printf_lite-test.cpp */, - 9AFDD06425CE730F00EEAF06 /* XArray_tests.h */, - 9AFDD06525CE730F00EEAF06 /* global_test.h */, - 9AFDD06625CE730F00EEAF06 /* find_replace_mask_Clover_tests.h */, - 9AFDD06725CE730F00EEAF06 /* XStringArray_test.h */, - 9AFDD06825CE730F00EEAF06 /* plist_tests.cpp */, - 9AFDD06925CE730F00EEAF06 /* MacOsVersion_test.cpp */, - 9AFDD06A25CE730F00EEAF06 /* strcmp_test.cpp */, - 9AFDD06B25CE730F00EEAF06 /* printlib-test.cpp */, - 9AFDD06C25CE730F00EEAF06 /* XStringArray_test.cpp */, - 9AFDD06D25CE730F00EEAF06 /* XObjArray_tests.h */, - 9AFDD06E25CE730F00EEAF06 /* find_replace_mask_Clover_tests.cpp */, - 9AFDD06F25CE730F00EEAF06 /* MacOsVersion_test.h */, - 9AFDD07025CE730F00EEAF06 /* strlen_test.h */, 9AFDD07125CE730F00EEAF06 /* all_tests.cpp */, - 9AFDD07225CE730F00EEAF06 /* printlib-test.h */, - 9AFDD07325CE730F00EEAF06 /* XObjArray_tests.cpp */, - 9AFDD07425CE730F00EEAF06 /* XArray_tests.cpp */, - 9AFDD07525CE730F00EEAF06 /* strncmp_test.cpp */, - 9AFDD07625CE730F00EEAF06 /* printf_lite-test.h */, - 9AFDD07725CE730F00EEAF06 /* XString_test.cpp */, - 9AFDD07825CE730F00EEAF06 /* LoadOptions_test.h */, - 9AFDD07925CE730F00EEAF06 /* XToolsCommon_test.cpp */, 9AFDD07A25CE730F00EEAF06 /* all_tests.h */, - 9AFDD07B25CE730F00EEAF06 /* strlen_test.cpp */, + 9A9037E425CFE7D000F14179 /* config-test.cpp */, + 9A9037E225CFE7CD00F14179 /* config-test.h */, + 9AFDD06E25CE730F00EEAF06 /* find_replace_mask_Clover_tests.cpp */, + 9AFDD06625CE730F00EEAF06 /* find_replace_mask_Clover_tests.h */, 9AFDD07C25CE730F00EEAF06 /* find_replace_mask_OC_tests.cpp */, + 9AFDD06225CE730F00EEAF06 /* find_replace_mask_OC_tests.h */, + 9AFDD05C25CE730F00EEAF06 /* global_test.cpp */, + 9AFDD06525CE730F00EEAF06 /* global_test.h */, + 9AFDD06125CE730F00EEAF06 /* LoadOptions_test.cpp */, + 9AFDD07825CE730F00EEAF06 /* LoadOptions_test.h */, + 9AFDD06925CE730F00EEAF06 /* MacOsVersion_test.cpp */, + 9AFDD06F25CE730F00EEAF06 /* MacOsVersion_test.h */, + 9AFDD06825CE730F00EEAF06 /* plist_tests.cpp */, + 9AFDD05B25CE730F00EEAF06 /* plist_tests.h */, + 9AFDD06325CE730F00EEAF06 /* printf_lite-test.cpp */, + 9AFDD07625CE730F00EEAF06 /* printf_lite-test.h */, + 9AFDD06B25CE730F00EEAF06 /* printlib-test.cpp */, + 9AFDD07225CE730F00EEAF06 /* printlib-test.h */, + 9AFDD06A25CE730F00EEAF06 /* strcmp_test.cpp */, + 9AFDD05F25CE730F00EEAF06 /* strcmp_test.h */, + 9AFDD07B25CE730F00EEAF06 /* strlen_test.cpp */, + 9AFDD07025CE730F00EEAF06 /* strlen_test.h */, + 9AFDD07525CE730F00EEAF06 /* strncmp_test.cpp */, + 9AFDD05D25CE730F00EEAF06 /* strncmp_test.h */, + 9AFDD07425CE730F00EEAF06 /* XArray_tests.cpp */, + 9AFDD06425CE730F00EEAF06 /* XArray_tests.h */, + 9AFDD06025CE730F00EEAF06 /* XBuffer_tests.cpp */, + 9AFDD05E25CE730F00EEAF06 /* XBuffer_tests.h */, + 9A9037E325CFE7CD00F14179 /* xml_lite-test.cpp */, + 9AFDD07325CE730F00EEAF06 /* XObjArray_tests.cpp */, + 9AFDD06D25CE730F00EEAF06 /* XObjArray_tests.h */, + 9AFDD07725CE730F00EEAF06 /* XString_test.cpp */, + 9AFDD05A25CE730F00EEAF06 /* XString_test.h */, + 9AFDD06C25CE730F00EEAF06 /* XStringArray_test.cpp */, + 9AFDD06725CE730F00EEAF06 /* XStringArray_test.h */, + 9AFDD07925CE730F00EEAF06 /* XToolsCommon_test.cpp */, + 9A9037E525CFE7D000F14179 /* xml_lite-test.h */, + 9AFDD05925CE730F00EEAF06 /* XToolsCommon_test.h */, ); path = cpp_unit_test; sourceTree = ""; @@ -15724,6 +15881,7 @@ 9A36E50424F3B537007A1107 /* TagInt64.cpp in Sources */, 9A36E50024F3B537007A1107 /* TagDict.cpp in Sources */, 9A4C576B255AAD07004F0B21 /* MacOsVersion.cpp in Sources */, + 9A358B2325CF115200A3850D /* Config_Devices_Audio.cpp in Sources */, 9A36E50C24F3B537007A1107 /* TagData.cpp in Sources */, 9AD0358C25C57A4500E58351 /* MemoryAllocationLib.c in Sources */, 9AA9253025CD74CC00BD5E8B /* secureboot.cpp in Sources */, @@ -15735,6 +15893,7 @@ 9AA9246F25CD5B2E00BD5E8B /* KextList.cpp in Sources */, 9A36E53C24F3EDED007A1107 /* base64.cpp in Sources */, 9AFDD0BD25CE731000EEAF06 /* strlen_test.cpp in Sources */, + 9A358B3D25CF117A00A3850D /* XmlLiteCompositeTypes.cpp in Sources */, 9AA9250325CD5B2E00BD5E8B /* StateGenerator.cpp in Sources */, 9AA9253125CD74CC00BD5E8B /* securemenu.cpp in Sources */, 9AFDD0A525CE731000EEAF06 /* all_tests.cpp in Sources */, @@ -15745,6 +15904,7 @@ 9A28CD22241BB61B00F3D247 /* strlen.cpp in Sources */, 9AA9248325CD5B2E00BD5E8B /* Volumes.cpp in Sources */, 9AA9241F25CD5B2E00BD5E8B /* LegacyBiosThunk.cpp in Sources */, + 9A358B2125CF115200A3850D /* Config_RtVariables.cpp in Sources */, 9AA9246325CD5B2E00BD5E8B /* HdaCodecDump.cpp in Sources */, 9AA9259125CD770F00BD5E8B /* scroll_images.cpp in Sources */, 9AFDD05425CDBC1800EEAF06 /* printf_lite.c in Sources */, @@ -15754,17 +15914,22 @@ 9AFDD09525CE731000EEAF06 /* strcmp_test.cpp in Sources */, 9A36E52624F3BB6B007A1107 /* FloatLib.cpp in Sources */, 9AFDD09125CE731000EEAF06 /* MacOsVersion_test.cpp in Sources */, + 9A358B2525CF115200A3850D /* Config_Quirks.cpp in Sources */, 9AA924F725CD5B2E00BD5E8B /* DevicePath.cpp in Sources */, 9A838CB425347C36008303F5 /* MemoryOperation.c in Sources */, 9AA9252B25CD74CC00BD5E8B /* tool.cpp in Sources */, 9AA9241325CD5B2E00BD5E8B /* SelfOem.cpp in Sources */, + 9A358B2D25CF115200A3850D /* Config_Devices.cpp in Sources */, 9AA9252C25CD74CC00BD5E8B /* lockedgraphics.cpp in Sources */, + 9A358B2E25CF115200A3850D /* Config_ACPI.cpp in Sources */, 9AA9E4EE25CD283400BD5E8B /* XIcon.cpp in Sources */, 9AA9242725CD5B2E00BD5E8B /* smbios.cpp in Sources */, 9AFDD08525CE731000EEAF06 /* LoadOptions_test.cpp in Sources */, 9AA9247B25CD5B2E00BD5E8B /* platformdata.cpp in Sources */, 9AA9E4EA25CD283400BD5E8B /* XImage.cpp in Sources */, 9AA9241B25CD5B2E00BD5E8B /* Edid.cpp in Sources */, + 9A358B3F25CF117A00A3850D /* xmlLiteSimpleTypes.cpp in Sources */, + 9A358B3525CF115200A3850D /* Config_Devices_Arbitrary.cpp in Sources */, 9AA9252D25CD74CC00BD5E8B /* securehash.cpp in Sources */, 9AA9252E25CD74CC00BD5E8B /* legacy.cpp in Sources */, 9AA924A725CD5B2E00BD5E8B /* Self.cpp in Sources */, @@ -15783,10 +15948,13 @@ 9AA9247F25CD5B2E00BD5E8B /* sound.cpp in Sources */, 9AFDD0A125CE731000EEAF06 /* find_replace_mask_Clover_tests.cpp in Sources */, 9AA9249F25CD5B2E00BD5E8B /* nvidia.cpp in Sources */, + 9A358B3125CF115200A3850D /* Config_SystemParameters.cpp in Sources */, 9AA9249B25CD5B2E00BD5E8B /* APFS.cpp in Sources */, 9AA9257925CD770F00BD5E8B /* text.cpp in Sources */, + 9A9037E725CFE7D100F14179 /* config-test.cpp in Sources */, 9AA9E4DC25CD279200BD5E8B /* VersionString.cpp in Sources */, 9AA9252F25CD74CC00BD5E8B /* bootscreen.cpp in Sources */, + 9A358B2F25CF115200A3850D /* Config_Devices_Properties.cpp in Sources */, 9AA9241725CD5B2E00BD5E8B /* BdsConnect.cpp in Sources */, 9AFDD0B525CE731000EEAF06 /* XString_test.cpp in Sources */, 9AA925C425CD900800BD5E8B /* posix_additions.cpp in Sources */, @@ -15794,9 +15962,11 @@ 9AA9248B25CD5B2E00BD5E8B /* Nvram.cpp in Sources */, 9AA9253F25CD765000BD5E8B /* shared_with_menu.cpp in Sources */, 9AFDD0D825CEA94A00EEAF06 /* tmp.c in Sources */, + 9A358B3325CF115200A3850D /* Config_ACPI_DSDT.cpp in Sources */, 9AA924DB25CD5B2E00BD5E8B /* StartupSound.cpp in Sources */, 9AA9253B25CD764900BD5E8B /* REFIT_MENU_SCREEN.cpp in Sources */, 9AA9259D25CD770F00BD5E8B /* lodepng.cpp in Sources */, + 9A358B2225CF115200A3850D /* Config_SMBIOS.cpp in Sources */, 9AA925B325CD79AB00BD5E8B /* icns.cpp in Sources */, 9A36E4F424F3B537007A1107 /* plist.cpp in Sources */, 9AA924D325CD5B2E00BD5E8B /* Events.cpp in Sources */, @@ -15807,17 +15977,25 @@ 9A36E4F824F3B537007A1107 /* xml.cpp in Sources */, 9A9AEB8D243F73CE00FBD7D8 /* unicode_conversions.cpp in Sources */, 9AA9258125CD770F00BD5E8B /* nanosvgrast.cpp in Sources */, + 9A358B3225CF115200A3850D /* CompareSettings.cpp in Sources */, 9AA925B725CD79AB00BD5E8B /* menu.cpp in Sources */, 9AA9247725CD5B2E00BD5E8B /* kext_patcher.cpp in Sources */, 9AA925CA25CD91BC00BD5E8B /* OpenCore.c in Sources */, 9AA9253A25CD764900BD5E8B /* menu_items.cpp in Sources */, 9AA9257D25CD770F00BD5E8B /* libscreen.cpp in Sources */, 9AA925BB25CD79AB00BD5E8B /* screen.cpp in Sources */, + 9A358B2025CF115200A3850D /* Config_GUI.cpp in Sources */, + 9A9037E625CFE7D100F14179 /* xml_lite-test.cpp in Sources */, + 9A358B3E25CF117A00A3850D /* XmlLiteParser.cpp in Sources */, 9AA924AB25CD5B2E00BD5E8B /* Net.cpp in Sources */, 9AA9248F25CD5B2E00BD5E8B /* LegacyBoot.cpp in Sources */, 9AA924FF25CD5B2E00BD5E8B /* KERNEL_AND_KEXT_PATCHES.cpp in Sources */, + 9A358B3425CF115200A3850D /* Config_BootGraphics.cpp in Sources */, + 9A358B2C25CF115200A3850D /* Config_Devices_USB.cpp in Sources */, 9AA9253225CD74CC00BD5E8B /* securevars.cpp in Sources */, 9AFDD05025CDBAA700EEAF06 /* MemLogLib.c in Sources */, + 9A358B2425CF115200A3850D /* Config_KernelAndKextPatches.cpp in Sources */, + 9A358B2825CF115200A3850D /* Config_ACPI_SSDT.cpp in Sources */, 9AA9242325CD5B2E00BD5E8B /* PlatformDriverOverride.cpp in Sources */, 9AA918C725CD4CD300BD5E8B /* BmLib.cpp in Sources */, 9AA924E725CD5B2E00BD5E8B /* gma.cpp in Sources */, @@ -15827,13 +16005,18 @@ 9AA924EB25CD5B2E00BD5E8B /* kernel_patcher.cpp in Sources */, 9AA9253325CD74CC00BD5E8B /* common.cpp in Sources */, 9AFDD09925CE731000EEAF06 /* printlib-test.cpp in Sources */, + 9A358B2B25CF115200A3850D /* ConfigPlist.cpp in Sources */, + 9A358B2625CF115200A3850D /* Config_CPU.cpp in Sources */, 9AA9E50225CD2FF400BD5E8B /* Utils.cpp in Sources */, 9AFDD0B125CE731000EEAF06 /* strncmp_test.cpp in Sources */, 9AA925CE25CD94C600BD5E8B /* BootLog.cpp in Sources */, + 9A358B3025CF115200A3850D /* Config_Graphics.cpp in Sources */, 9A36E51024F3B537007A1107 /* TagArray.cpp in Sources */, 9AA918C125CD4B7900BD5E8B /* lib.cpp in Sources */, 9A36E4F024F3B537007A1107 /* TagString8.cpp in Sources */, 9AFDD08D25CE731000EEAF06 /* plist_tests.cpp in Sources */, + 9A358B2725CF115200A3850D /* Config_Devices_FakeID.cpp in Sources */, + 9A358B2925CF115200A3850D /* Config_Boot.cpp in Sources */, 9AA9E53D25CD306700BD5E8B /* loader.cpp in Sources */, 9AA924C725CD5B2E00BD5E8B /* Injectors.cpp in Sources */, 9AA9258925CD770F00BD5E8B /* load_icns.cpp in Sources */, @@ -15851,6 +16034,7 @@ 9AA925C025CD87B600BD5E8B /* BasicIO.cpp in Sources */, 9A838CBA25348237008303F5 /* BaseMemoryLib.c in Sources */, 9AA9259925CD770F00BD5E8B /* egemb_font.cpp in Sources */, + 9A358B2A25CF115200A3850D /* Config_Devices_AddProperties.cpp in Sources */, 9A36E51424F3B537007A1107 /* TagFloat.cpp in Sources */, 9AA9259525CD770F00BD5E8B /* image.cpp in Sources */, 9A0B085E240300E000E2B470 /* Platform.cpp in Sources */, @@ -15941,7 +16125,7 @@ GCC_WARN_SHADOW = YES; GCC_WARN_SIGN_COMPARE = YES; GCC_WARN_STRICT_SELECTOR_MATCH = YES; - GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO; + GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNKNOWN_PRAGMAS = YES; @@ -16054,7 +16238,7 @@ GCC_WARN_SHADOW = YES; GCC_WARN_SIGN_COMPARE = YES; GCC_WARN_STRICT_SELECTOR_MATCH = YES; - GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = NO; + GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; GCC_WARN_UNDECLARED_SELECTOR = YES; GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNKNOWN_PRAGMAS = YES; diff --git a/Xcode/CloverX64TestNewParser/OCMock/OpenCore.c b/Xcode/CloverX64TestNewParser/OCMock/OpenCore.c index 627c15065..0dd41f0af 100644 --- a/Xcode/CloverX64TestNewParser/OCMock/OpenCore.c +++ b/Xcode/CloverX64TestNewParser/OCMock/OpenCore.c @@ -11,5 +11,5 @@ #include #include "../../../rEFIt_UEFI/include/OC.h" -OC_GLOBAL_CONFIG mOpenCoreConfiguration = {0}; +OC_GLOBAL_CONFIG mOpenCoreConfiguration = {{{0},{0},{0},{0}},{{0},{0}},{{0},{0}},{{0},{0},{{0},{0}},{0},{0},{0},{{0},{0},0}},{{0},{{0},{0},0,0,0,0,0,0,0,0},{0},{{0},{0},{0},0,0,0,0,0,0,{0},{0},{0},0,0},{0},{0}},{{0},{0},{0},0,0,0},{0},{0}}; OC_STORAGE_CONTEXT mOpenCoreStorage = {0}; diff --git a/Xcode/CloverX64TestNewParser/src/ConfigSample1.h b/Xcode/CloverX64TestNewParser/src/ConfigSample1.h index de8d78c06..23d720fac 100644 --- a/Xcode/CloverX64TestNewParser/src/ConfigSample1.h +++ b/Xcode/CloverX64TestNewParser/src/ConfigSample1.h @@ -10,933 +10,924 @@ #define ConfigSample1_h #ifndef _MSC_VER -const char* configSample1 = -" \ - \ - \ - \ - Test null data \ - \ - \ - AutoMerge \ - \ - DSDT \ - \ - Debug \ - \ - DropOEM_DSM \ - \ - ATI \ - \ - Firewire \ - \ - HDA \ - \ - HDMI \ - \ - IDE \ - \ - IntelGFX \ - \ - LAN \ - \ - LPC \ - \ - NVidia \ - \ - SATA \ - \ - SmBUS \ - \ - USB \ - \ - WIFI \ - \ - \ - Fixes \ - \ - FixDarwin \ - \ - FixDisplay \ - \ - FixS3D \ - \ - \ - Name \ - aa \ - Patches \ - \ - \ - Comment \ - ACPI1 \ - Disabled \ - \ - Find \ - \ - AA== \ - \ - Replace \ - \ - AQ== \ - \ - \ - \ - Comment \ - ACPI2 \ - Disabled \ - \ - Find \ - \ - Ag== \ - \ - Replace \ - \ - Aw== \ - \ - \ - \ - Comment \ - change EHC1 to EH01 \ - Disabled \ - \ - Find \ - \ - RUhDMQ== \ - \ - Replace \ - \ - RUgwMQ== \ - \ - \ - \ - ReuseFFFF \ - \ - Rtc8Allowed \ - \ - SlpSmiAtWake \ - \ - SuspendOverride \ - \ - \ - DisableAPSNAPLF \ - \ - DisableASPM \ - \ - DisabledAML \ - \ - aa \ - bb \ - \ - DropTables \ - \ - \ - Signature \ - SSDT \ - TableId \ - CpuPm \ - \ - \ - HaltEnabler \ - \ - PatchAPIC \ - \ - ResetAddress \ - 01 \ - ResetValue \ - 02 \ - SortedOrder \ - \ - dd \ - cc \ - \ - smartUPS \ - \ - \ - Boot \ - \ - Arguments \ - -v arch=i386 slide=0 dart=0 -xcpm darkwake=1 npci=0x2000 cpus=1 debug=0x100 aa \ - BlackList \ - \ - hh \ - \ - CustomLogo \ - Apple \ - Debug \ - \ - DefaultLoader \ - ii \ - DefaultVolume \ - LastBootedVolume \ - DisableCloverHotkeys \ - \ - HibernationFixup \ - \ - Legacy \ - LegacyBiosDefault \ - LegacyBiosDefaultEntry \ - 12 \ - NeverDoRecovery \ - \ - NeverHibernate \ - \ - NoEarlyProgress \ - \ - Policy \ - Allow \ - Secure \ - \ - SignatureFixup \ - \ - SkipHibernateTimeout \ - \ - StrictHibernate \ - \ - Timeout \ - 2 \ - WhiteList \ - \ - ff \ - gg \ - \ - XMPDetection \ - 1 \ - \ - BootGraphics \ - \ - DefaultBackgroundColor \ - 0xF1F1F1 \ - EFILoginHiDPI \ - 2 \ - UIScale \ - 4 \ - flagstate \ - 3 \ - \ - CPU \ - \ - BusSpeedkHz \ - 800 \ - C2 \ - \ - C4 \ - \ - C6 \ - \ - FrequencyMHz \ - 2000 \ - HWPEnable \ - \ - HWPValue \ - 0x7 \ - Latency \ - 0x3 \ - QEMU \ - \ - QPI \ - 4 \ - TDP \ - 6 \ - TurboDisable \ - \ - Type \ - 0x5 \ - UseARTFrequency \ - \ - \ - Devices \ - \ - AddProperties \ - \ - \ - Device \ - SATA \ - Disabled \ - \ - Key \ - 10 \ - Value \ - 11 \ - \ - \ - Device \ - LPC \ - Disabled \ - \ - Key \ - 12 \ - Value \ - 13 \ - \ - \ - Device \ - SmBUS \ - Disabled \ - \ - Key \ - kk \ - Value \ - ll \ - \ - \ - Device \ - Firewire \ - Disabled \ - \ - Key \ - 14 \ - Value \ - \ - FQ== \ - \ - \ - \ - AirportBridgeDeviceName \ - airportbridge \ - Arbitrary \ - \ - \ - Comment \ - C1 \ - CustomProperties \ - \ - \ - Disabled \ - \ - Key \ - ll \ - Value \ - mm \ - \ - \ - Disabled \ - \ - Key \ - nn \ - Value \ - 1 \ - \ - \ - Disabled \ - \ - Key \ - oo \ - Value \ - \ - Ag== \ - \ - \ - \ - PciAddr \ - 00:00.01 \ - \ - \ - Audio \ - \ - AFGLowPowerState \ - \ - Inject \ - Detect \ - ResetHDA \ - \ - \ - DisableFunctions \ - \ - FakeID \ - \ - ATI \ - 0x22221002 \ - IMEI \ - 0x22221002 \ - IntelGFX \ - 0x22221002 \ - LAN \ - 0x22221002 \ - NVidia \ - 0x22221002 \ - SATA \ - 0x22221002 \ - WIFI \ - 0x22221002 \ - XHCI \ - 0x22221002 \ - \ - ForceHPET \ - \ - Inject \ - \ - IntelMaxValue \ - \ - LpcTune \ - \ - NoDefaultProperties \ - \ - Properties \ - jj \ -kk \ - SetIntelBacklight \ - \ - SetIntelMaxBacklight \ - \ - USB \ - \ - AddClockID \ - \ - FixOwnership \ - \ - HighCurrent \ - \ - Inject \ - \ - \ - UseIntelHDMI \ - \ - \ - DisableDrivers \ - \ - OsxAptioFixDrv \ - Ps2KeyboardDxe \ - Ps2MouseDxe \ - \ - GUI \ - \ - ConsoleMode \ - Max \ - Custom \ - \ - Entries \ - \ - \ - AddArguments \ - addarg \ - Arguments \ - arg \ - BootBgColor \ - bootbgcolor \ - Disabled \ - \ - DriveImage \ - driveimage \ - FullTitle \ - title \ - Hidden \ - \ - Hotkey \ - H \ - Ignore \ - \ - ImageData \ - 89 50 4E 47 0D 0A 1A 0A 00 00 00 0D 49 48 44 52 \ - 00 00 01 00 00 00 01 00 01 03 00 00 00 66 BC 3A \ - 25 00 00 00 03 50 4C 54 45 B5 D0 D0 63 04 16 EA \ - 00 00 00 1F 49 44 41 54 68 81 ED C1 01 0D 00 00 \ - 00 C2 A0 F7 4F 6D 0E 37 A0 00 00 00 00 00 00 00 \ - 00 BE 0D 21 00 00 01 9A 60 E1 D5 00 00 00 00 49 \ - 45 4E 44 AE 42 60 82 \ - xCustomLogo \ - foo \ - Path \ - CustomEntry1 \ - Settings \ - settings \ - SubEntries \ - \ - \ - AddArguments \ - arg2 \ - FullTitle \ - title1 \ - \ - \ - AddArguments \ - arg3 \ - Title \ - title2 \ - \ - \ - AddArguments \ - arg4 \ - FullTitle \ - title3 \ - \ - \ - AddArguments \ - arg5 \ - Title \ - title4 \ - \ - \ - Type \ - Oldest \ - Volume \ - v1 \ - VolumeType \ - Internal \ - \ - \ - Legacy \ - \ - \ - Disabled \ - \ - FullTitle \ - title \ - Hidden \ - \ - Hotkey \ - \ - Ignore \ - \ - Type \ - Windows \ - Volume \ - v2 \ - \ - \ - Tool \ - \ - \ - Arguments \ - b \ - Disabled \ - \ - Hidden \ - \ - Hotkey \ - b \ - Ignore \ - \ - Path \ - path \ - Title \ - title \ - Volume \ - tool1 \ - \ - \ - \ - CustomIcons \ - \ - Hide \ - \ - sdfsdfdf \ - sdfsfdf \ - \ - Language \ - es:0 \ - Mouse \ - \ - DoubleClick \ - 501 \ - Enabled \ - \ - Mirror \ - \ - Speed \ - 5 \ - \ - Scan \ - \ - Entries \ - \ - Kernel \ - First \ - Legacy \ - First \ - Linux \ - \ - Tool \ - \ - \ - ScreenResolution \ - 1366x768 \ - ShowOptimus \ - \ - TextOnly \ - \ - Theme \ - th \ - \ - Graphics \ - \ - ATI \ - \ - \ - IOPCIPrimaryMatch \ - 0x1002888 \ - IOPCISubDevId \ - 0x106B \ - LoadVBios \ - \ - Model \ - cc \ - VRAM \ - 2000 \ - VideoPorts \ - 3 \ - \ - \ - BootDisplay \ - 12 \ - DualLink \ - 1 \ - EDID \ - \ - Custom \ - \ - AQID \ - \ - Inject \ - \ - ProductID \ - 0x9777 \ - VendorID \ - 0x1007 \ - \ - FBName \ - Exmoor \ - Inject \ - \ - ATI \ - \ - Intel \ - \ - NVidia \ - \ - \ - LoadVBios \ - \ - NVCAP \ - 0304 \ - NVIDIA \ - \ - \ - IOPCIPrimaryMatch \ - 0x10DE999 \ - IOPCISubDevId \ - 0x106B \ - LoadVBios \ - \ - Model \ - aa \ - VRAM \ - 1000 \ - VideoPorts \ - 1 \ - \ - \ - IOPCIPrimaryMatch \ - 0x10DE999 \ - IOPCISubDevId \ - 0x106B \ - LoadVBios \ - \ - Model \ - bb \ - VRAM \ - 1000 \ - VideoPorts \ - 2 \ - \ - \ - NvidiaGeneric \ - \ - NvidiaNoEFI \ - \ - NvidiaSingle \ - \ - PatchVBios \ - \ - PatchVBiosBytes \ - \ - \ - Find \ - \ - AwQF \ - \ - Replace \ - \ - BgcI \ - \ - \ - \ - VRAM \ - 1500 \ - VideoPorts \ - 2 \ - display-cfg \ - 04 \ - ig-platform-id \ - 0x59230000 \ - \ - KernelAndKextPatches \ - \ - ATIConnectorsController \ - ATICtl \ - ATIConnectorsData \ - 111213 \ - ATIConnectorsPatch \ - 141516 \ - AppleIntelCPUPM \ - \ - AppleRTC \ - \ - BootPatches \ - \ - \ - Comment \ - c3 \ - Disabled \ - \ - Find \ - \ - MTI= \ - \ - MatchBuild \ - 10.12.6 \ - MatchOS \ - 10.12 \ - Replace \ - \ - MzQ= \ - \ - \ - \ - Debug \ - \ - DellSMBIOSPatch \ - \ - FakeCPUID \ - 0x0306D0 \ - ForceKextsToLoad \ - \ - ForceKext \ - \ - KernelCpu \ - \ - KernelLapic \ - \ - KernelPm \ - \ - KernelToPatch \ - \ - \ - Comment \ - c2 \ - Disabled \ - \ - Find \ - \ - ISI= \ - \ - MatchBuild \ - 10.13.6 \ - MatchOS \ - 10.13 \ - Replace \ - \ - IyQ= \ - \ - \ - \ - KernelXCPM \ - \ - KextsToPatch \ - \ - \ - Comment \ - c1 \ - Disabled \ - \ - Find \ - \ - AQ== \ - \ - InfoPlistPatch \ - \ - MatchBuild \ - 10.14.6 \ - MatchOS \ - 10.14 \ - Name \ - k1 \ - Replace \ - \ - Ag== \ - \ - \ - \ - Comment \ - IONVMeFamily IONameMatch \ - Disabled \ - \ - Find \ - \ - PHN0cmluZz5wY2kxNDRkLGE4MDQ8L3N0cmluZz4= \ - \ - InfoPlistPatch \ - \ - Name \ - IONVMeFamily \ - Replace \ - \ - PHN0cmluZz5wY2kxNDRkLGE4MDI8L3N0cmluZz4= \ - \ - \ - \ - \ - RtVariables \ - \ - BooterConfig \ - 0x1 \ - CsrActiveConfig \ - 0x2 \ - MLB \ - 12345678901234567 \ - ROM \ - \ - MBRwYnHo \ - \ - \ - SMBIOS \ - \ - BiosReleaseDate \ - 08/08/17 \ - BiosVendor \ - Apple Inc. \ - BiosVersion \ - MBP81.88Z.004D.B00.1708080655 \ - Board-ID \ - Mac-94245B3640C91C81 \ - BoardManufacturer \ - Apple Inc. \ - BoardSerialNumber \ - W89135306OPDM6CAD \ - BoardType \ - 10 \ - BoardVersion \ - 1.0 \ - ChassisAssetTag \ - MacBook-Aluminum \ - ChassisManufacturer \ - Apple Inc. \ - ChassisType \ - 0x0A \ - Family \ - MacBook Pro \ - FirmwareFeatures \ - 0xC00DE137 \ - FirmwareFeaturesMask \ - 0xFF1FFF3F \ - LocationInChassis \ - Part Component \ - Manufacturer \ - Apple Inc. \ - Memory \ - \ - Channels \ - 2 \ - Modules \ - \ - \ - Frequency \ - 333 \ - Part \ - Part1 \ - Serial \ - Ser1 \ - Size \ - 2048 \ - Slot \ - 1 \ - Type \ - DDR \ - Vendor \ - v1 \ - \ - \ - Frequency \ - 366 \ - Part \ - Part2 \ - Serial \ - Ser2 \ - Size \ - 4096 \ - Slot \ - 2 \ - Type \ - DDR2 \ - Vendor \ - v2 \ - \ - \ - SlotCount \ - 4 \ - \ - Mobile \ - \ - PlatformFeature \ - 0xFFFF \ - ProductName \ - MacBookPro8,1 \ - SerialNumber \ - W89G91VFDH2G \ - Slots \ - \ - \ - Device \ - NVidia \ - ID \ - 1 \ - Name \ - APPL,sdfsdf \ - Type \ - 1 \ - \ - \ - SmUUID \ - F1AB23C0-C35A-473E-BDB7-455C3A6271E8 \ - Version \ - 1.0 \ - \ - SystemParameters \ - \ - BacklightLevel \ - 2 \ - CustomUUID \ - 2926A57C-FF0E-4A64-980F-23483BD41969 \ - ExposeSysVariables \ - \ - InjectKexts \ - Yes \ - InjectSystemID \ - \ - NoCaches \ - \ - NvidiaWeb \ - \ - \ - CPU \ - \ - BacklightLevel \ - 2 \ - CustomUUID \ - 2926A57C-FF0E-4A64-980F-23483BD41969 \ - ExposeSysVariables \ - \ - InjectKexts \ - Yes \ - InjectSystemID \ - \ - NoCaches \ - \ - NvidiaWeb \ - \ - \ - \ +const char* configSample1 = "\n\n\n\n\n\n\n\n\n\n\n" +" \n\ + \n\ + \n\ + \n\ + ACPI \n\ + \n\ + AutoMerge \n\ + \n\ + DSDT \n\ + \n\ + Debug \n\ + \n\ + DropOEM_DSM \n\ + \n\ + ATI \n\ + \n\ + Firewire \n\ + \n\ + HDA \n\ + \n\ + HDMI \n\ + \n\ + IDE \n\ + \n\ + IntelGFX \n\ + \n\ + LAN \n\ + \n\ + LPC \n\ + \n\ + NVidia \n\ + \n\ + SATA \n\ + \n\ + SmBUS \n\ + \n\ + USB \n\ + \n\ + WIFI \n\ + \n\ + \n\ + Fixes \n\ + \n\ + FixDarwin \n\ + \n\ + FixDisplay \n\ + \n\ + FixS3D \n\ + \n\ + \n\ + Name \n\ + aa \n\ + Patches \n\ + \n\ + \n\ + Comment \n\ + ACPI1 \n\ + Disabled \n\ + \n\ + Find \n\ + \n\ + AA== \n\ + \n\ + Replace \n\ + \n\ + AQ== \n\ + \n\ + \n\ + \n\ + Comment \n\ + ACPI2 \n\ + Disabled \n\ + \n\ + Find \n\ + \n\ + Ag== \n\ + \n\ + Replace \n\ + \n\ + Aw== \n\ + \n\ + \n\ + \n\ + Comment \n\ + change EHC1 to EH01 \n\ + Disabled \n\ + \n\ + Find \n\ + \n\ + RUhDMQ== \n\ + \n\ + Replace \n\ + \n\ + RUgwMQ== \n\ + \n\ + \n\ + \n\ + ReuseFFFF \n\ + \n\ + Rtc8Allowed \n\ + \n\ + SlpSmiAtWake \n\ + \n\ + SuspendOverride \n\ + \n\ + \n\ + DisableAPSNAPLF \n\ + \n\ + DisableASPM \n\ + \n\ + DisabledAML \n\ + \n\ + aa \n\ + bb \n\ + \n\ + DropTables \n\ + \n\ + \n\ + Signature \n\ + SSDT \n\ + TableId \n\ + CpuPm \n\ + \n\ + \n\ + HaltEnabler \n\ + \n\ + PatchAPIC \n\ + \n\ + ResetAddress \n\ + 01 \n\ + ResetValue \n\ + 02 \n\ + SortedOrder \n\ + \n\ + dd \n\ + cc \n\ + \n\ + smartUPS \n\ + \n\ + \n\ + Boot \n\ + \n\ + Arguments \n\ + -v arch=i386 slide=0 dart=0 -xcpm darkwake=1 npci=0x2000 cpus=1 debug=0x100 aa \n\ + BlackList \n\ + \n\ + hh \n\ + \n\ + CustomLogo \n\ + Apple \n\ + Debug \n\ + \n\ + DefaultLoader \n\ + ii \n\ + DefaultVolume \n\ + LastBootedVolume \n\ + DisableCloverHotkeys \n\ + \n\ + HibernationFixup \n\ + \n\ + Legacy \n\ + LegacyBiosDefault \n\ + LegacyBiosDefaultEntry \n\ + 12 \n\ + NeverDoRecovery \n\ + \n\ + NeverHibernate \n\ + \n\ + NoEarlyProgress \n\ + \n\ + Policy \n\ + Allow \n\ + Secure \n\ + \n\ + SignatureFixup \n\ + \n\ + SkipHibernateTimeout \n\ + \n\ + StrictHibernate \n\ + \n\ + Timeout \n\ + 2 \n\ + WhiteList \n\ + \n\ + ff \n\ + gg \n\ + \n\ + XMPDetection \n\ + 1 \n\ + \n\ + BootGraphics \n\ + \n\ + DefaultBackgroundColor \n\ + 0xF1F1F1 \n\ + EFILoginHiDPI \n\ + 2 \n\ + UIScale \n\ + 4 \n\ + flagstate \n\ + 3 \n\ + \n\ + CPU \n\ + \n\ + BusSpeedkHz \n\ + 800 \n\ + C2 \n\ + \n\ + C4 \n\ + \n\ + C6 \n\ + \n\ + FrequencyMHz \n\ + 2000 \n\ + HWPEnable \n\ + \n\ + HWPValue \n\ + 0x7 \n\ + Latency \n\ + 0x3 \n\ + QEMU \n\ + \n\ + QPI \n\ + 4 \n\ + TDP \n\ + 6 \n\ + TurboDisable \n\ + \n\ + Type \n\ + 0x5 \n\ + UseARTFrequency \n\ + \n\ + \n\ + Devices \n\ + \n\ + AddProperties \n\ + \n\ + \n\ + Device \n\ + SATA \n\ + Disabled \n\ + \n\ + Key \n\ + 10 \n\ + Value \n\ + 11 \n\ + \n\ + \n\ + Device \n\ + LPC \n\ + Disabled \n\ + \n\ + Key \n\ + 12 \n\ + Value \n\ + 13 \n\ + \n\ + \n\ + Device \n\ + SmBUS \n\ + Disabled \n\ + \n\ + Key \n\ + kk \n\ + Value \n\ + ll \n\ + \n\ + \n\ + Device \n\ + Firewire \n\ + Disabled \n\ + \n\ + Key \n\ + 14 \n\ + Value \n\ + \n\ + FQ== \n\ + \n\ + \n\ + \n\ + AirportBridgeDeviceName \n\ + airportbridge \n\ + Arbitrary \n\ + \n\ + \n\ + Comment \n\ + C1 \n\ + CustomProperties \n\ + \n\ + \n\ + Disabled \n\ + \n\ + Key \n\ + ll \n\ + Value \n\ + mm \n\ + \n\ + \n\ + Disabled \n\ + \n\ + Key \n\ + nn \n\ + Value \n\ + 1 \n\ + \n\ + \n\ + Disabled \n\ + \n\ + Key \n\ + oo \n\ + Value \n\ + \n\ + Ag== \n\ + \n\ + \n\ + \n\ + PciAddr \n\ + 00:00.01 \n\ + \n\ + \n\ + Audio \n\ + \n\ + AFGLowPowerState \n\ + \n\ + Inject \n\ + Detect \n\ + ResetHDA \n\ + \n\ + \n\ + DisableFunctions \n\ + \n\ + FakeID \n\ + \n\ + ATI \n\ + 0x22221002 \n\ + IMEI \n\ + 0x22221002 \n\ + IntelGFX \n\ + 0x22221002 \n\ + LAN \n\ + 0x22221002 \n\ + NVidia \n\ + 0x22221002 \n\ + SATA \n\ + 0x22221002 \n\ + WIFI \n\ + 0x22221002 \n\ + XHCI \n\ + 0x22221002 \n\ + \n\ + ForceHPET \n\ + \n\ + Inject \n\ + \n\ + IntelMaxValue \n\ + \n\ + LpcTune \n\ + \n\ + NoDefaultProperties \n\ + \n\ + Properties \n\ + jj \n\ +kk \n\ + SetIntelBacklight \n\ + \n\ + SetIntelMaxBacklight \n\ + \n\ + USB \n\ + \n\ + AddClockID \n\ + \n\ + FixOwnership \n\ + \n\ + HighCurrent \n\ + \n\ + Inject \n\ + \n\ + \n\ + UseIntelHDMI \n\ + \n\ + \n\ + DisableDrivers \n\ + \n\ + OsxAptioFixDrv \n\ + Ps2KeyboardDxe \n\ + Ps2MouseDxe \n\ + \n\ + GUI \n\ + \n\ + ConsoleMode \n\ + Max \n\ + Custom \n\ + \n\ + Entries \n\ + \n\ + \n\ + AddArguments \n\ + addarg \n\ + Arguments \n\ + arg \n\ + BootBgColor \n\ + bootbgcolor \n\ + Disabled \n\ + \n\ + DriveImage \n\ + driveimage \n\ + FullTitle \n\ + title \n\ + Hidden \n\ + \n\ + Hotkey \n\ + H \n\ + Ignore \n\ + \n\ + ImageData \n\ + 89 50 4E 47 0D 0A 1A 0A 00 00 00 0D 49 48 44 52 \n\ + 00 00 01 00 00 00 01 00 01 03 00 00 00 66 BC 3A \n\ + 25 00 00 00 03 50 4C 54 45 B5 D0 D0 63 04 16 EA \n\ + 00 00 00 1F 49 44 41 54 68 81 ED C1 01 0D 00 00 \n\ + 00 C2 A0 F7 4F 6D 0E 37 A0 00 00 00 00 00 00 00 \n\ + 00 BE 0D 21 00 00 01 9A 60 E1 D5 00 00 00 00 49 \n\ + 45 4E 44 AE 42 60 82 \n\ + xCustomLogo \n\ + foo \n\ + Path \n\ + CustomEntry1 \n\ + Settings \n\ + settings \n\ + SubEntries \n\ + \n\ + \n\ + AddArguments \n\ + arg2 \n\ + FullTitle \n\ + title1 \n\ + \n\ + \n\ + AddArguments \n\ + arg3 \n\ + Title \n\ + title2 \n\ + \n\ + \n\ + AddArguments \n\ + arg4 \n\ + FullTitle \n\ + title3 \n\ + \n\ + \n\ + AddArguments \n\ + arg5 \n\ + Title \n\ + title4 \n\ + \n\ + \n\ + Type \n\ + Oldest \n\ + Volume \n\ + v1 \n\ + VolumeType \n\ + Internal \n\ + \n\ + \n\ + Legacy \n\ + \n\ + \n\ + Disabled \n\ + \n\ + FullTitle \n\ + title \n\ + Hidden \n\ + \n\ + Hotkey \n\ + \n\ + Ignore \n\ + \n\ + Type \n\ + Windows \n\ + Volume \n\ + v2 \n\ + \n\ + \n\ + Tool \n\ + \n\ + \n\ + Arguments \n\ + b \n\ + Disabled \n\ + \n\ + Hidden \n\ + \n\ + Hotkey \n\ + b \n\ + Ignore \n\ + \n\ + Path \n\ + path \n\ + Title \n\ + title \n\ + Volume \n\ + tool1 \n\ + \n\ + \n\ + \n\ + CustomIcons \n\ + \n\ + Hide \n\ + \n\ + sdfsdfdf \n\ + sdfsfdf \n\ + \n\ + Language \n\ + es:0 \n\ + Mouse \n\ + \n\ + DoubleClick \n\ + 501 \n\ + Enabled \n\ + \n\ + Mirror \n\ + \n\ + Speed \n\ + 5 \n\ + \n\ + Scan \n\ + \n\ + Entries \n\ + \n\ + Kernel \n\ + First \n\ + Legacy \n\ + First \n\ + Linux \n\ + \n\ + Tool \n\ + \n\ + \n\ + ScreenResolution \n\ + 1366x768 \n\ + ShowOptimus \n\ + \n\ + TextOnly \n\ + \n\ + Theme \n\ + th \n\ + \n\ + Graphics \n\ + \n\ + ATI \n\ + \n\ + \n\ + IOPCIPrimaryMatch \n\ + 0x1002888 \n\ + IOPCISubDevId \n\ + 0x106B \n\ + LoadVBios \n\ + \n\ + Model \n\ + cc \n\ + VRAM \n\ + 2000 \n\ + VideoPorts \n\ + 3 \n\ + \n\ + \n\ + BootDisplay \n\ + 12 \n\ + DualLink \n\ + 1 \n\ + EDID \n\ + \n\ + Custom \n\ + \n\ + AQID \n\ + \n\ + Inject \n\ + \n\ + ProductID \n\ + 0x9777 \n\ + VendorID \n\ + 0x1007 \n\ + \n\ + FBName \n\ + Exmoor \n\ + Inject \n\ + \n\ + ATI \n\ + \n\ + Intel \n\ + \n\ + NVidia \n\ + \n\ + \n\ + LoadVBios \n\ + \n\ + NVCAP \n\ + 0304 \n\ + NVIDIA \n\ + \n\ + \n\ + IOPCIPrimaryMatch \n\ + 0x10DE999 \n\ + IOPCISubDevId \n\ + 0x106B \n\ + LoadVBios \n\ + \n\ + Model \n\ + aa \n\ + VRAM \n\ + 1000 \n\ + VideoPorts \n\ + 1 \n\ + \n\ + \n\ + IOPCIPrimaryMatch \n\ + 0x10DE999 \n\ + IOPCISubDevId \n\ + 0x106B \n\ + LoadVBios \n\ + \n\ + Model \n\ + bb \n\ + VRAM \n\ + 1000 \n\ + VideoPorts \n\ + 2 \n\ + \n\ + \n\ + NvidiaGeneric \n\ + \n\ + NvidiaNoEFI \n\ + \n\ + NvidiaSingle \n\ + \n\ + PatchVBios \n\ + \n\ + PatchVBiosBytes \n\ + \n\ + \n\ + Find \n\ + \n\ + AwQF \n\ + \n\ + Replace \n\ + \n\ + BgcI \n\ + \n\ + \n\ + \n\ + VRAM \n\ + 1500 \n\ + VideoPorts \n\ + 2 \n\ + display-cfg \n\ + 04 \n\ + ig-platform-id \n\ + 0x59230000 \n\ + \n\ + KernelAndKextPatches \n\ + \n\ + ATIConnectorsController \n\ + ATICtl \n\ + ATIConnectorsData \n\ + 111213 \n\ + ATIConnectorsPatch \n\ + 141516 \n\ + AppleIntelCPUPM \n\ + \n\ + AppleRTC \n\ + \n\ + BootPatches \n\ + \n\ + \n\ + Comment \n\ + c3 \n\ + Disabled \n\ + \n\ + Find \n\ + \n\ + MTI= \n\ + \n\ + MatchBuild \n\ + 10.12.6 \n\ + MatchOS \n\ + 10.12 \n\ + Replace \n\ + \n\ + MzQ= \n\ + \n\ + \n\ + \n\ + Debug \n\ + \n\ + DellSMBIOSPatch \n\ + \n\ + FakeCPUID \n\ + 0x0306D0 \n\ + ForceKextsToLoad \n\ + \n\ + ForceKext \n\ + \n\ + KernelCpu \n\ + \n\ + KernelLapic \n\ + \n\ + KernelPm \n\ + \n\ + KernelToPatch \n\ + \n\ + \n\ + Comment \n\ + c2 \n\ + Disabled \n\ + \n\ + Find \n\ + \n\ + ISI= \n\ + \n\ + MatchBuild \n\ + 10.13.6 \n\ + MatchOS \n\ + 10.13 \n\ + Replace \n\ + \n\ + IyQ= \n\ + \n\ + \n\ + \n\ + KernelXCPM \n\ + \n\ + KextsToPatch \n\ + \n\ + \n\ + Comment \n\ + c1 \n\ + Disabled \n\ + \n\ + Find \n\ + \n\ + AQ== \n\ + \n\ + InfoPlistPatch \n\ + \n\ + MatchBuild \n\ + 10.14.6 \n\ + MatchOS \n\ + 10.14 \n\ + Name \n\ + k1 \n\ + Replace \n\ + \n\ + Ag== \n\ + \n\ + \n\ + \n\ + Comment \n\ + IONVMeFamily IONameMatch \n\ + Disabled \n\ + \n\ + Find \n\ + \n\ + PHN0cmluZz5wY2kxNDRkLGE4MDQ8L3N0cmluZz4= \n\ + \n\ + InfoPlistPatch \n\ + \n\ + Name \n\ + IONVMeFamily \n\ + Replace \n\ + \n\ + PHN0cmluZz5wY2kxNDRkLGE4MDI8L3N0cmluZz4= \n\ + \n\ + \n\ + \n\ + \n\ + RtVariables \n\ + \n\ + BooterConfig \n\ + 0x1 \n\ + CsrActiveConfig \n\ + 0x2 \n\ + MLB \n\ + 12345678901234567 \n\ + ROM \n\ + \n\ + MBRwYnHo \n\ + \n\ + \n\ + SMBIOS \n\ + \n\ + BiosReleaseDate \n\ + 08/08/17 \n\ + BiosVendor \n\ + Apple Inc. \n\ + BiosVersion \n\ + MBP81.88Z.004D.B00.1708080655 \n\ + Board-ID \n\ + Mac-94245B3640C91C81 \n\ + BoardManufacturer \n\ + Apple Inc. \n\ + BoardSerialNumber \n\ + W89135306OPDM6CAD \n\ + BoardType \n\ + 10 \n\ + BoardVersion \n\ + 1.0 \n\ + ChassisAssetTag \n\ + MacBook-Aluminum \n\ + ChassisManufacturer \n\ + Apple Inc. \n\ + ChassisType \n\ + 0x0A \n\ + Family \n\ + MacBook Pro \n\ + FirmwareFeatures \n\ + 0xC00DE137 \n\ + FirmwareFeaturesMask \n\ + 0xFF1FFF3F \n\ + LocationInChassis \n\ + Part Component \n\ + Manufacturer \n\ + Apple Inc. \n\ + Memory \n\ + \n\ + Channels \n\ + 2 \n\ + Modules \n\ + \n\ + \n\ + Frequency \n\ + 333 \n\ + Part \n\ + Part1 \n\ + Serial \n\ + Ser1 \n\ + Size \n\ + 2048 \n\ + Slot \n\ + 1 \n\ + Type \n\ + DDR \n\ + Vendor \n\ + v1 \n\ + \n\ + \n\ + Frequency \n\ + 366 \n\ + Part \n\ + Part2 \n\ + Serial \n\ + Ser2 \n\ + Size \n\ + 4096 \n\ + Slot \n\ + 2 \n\ + Type \n\ + DDR2 \n\ + Vendor \n\ + v2 \n\ + \n\ + \n\ + SlotCount \n\ + 4 \n\ + \n\ + Mobile \n\ + \n\ + PlatformFeature \n\ + 0xFFFF \n\ + ProductName \n\ + MacBookPro8,1 \n\ + SerialNumber \n\ + W89G91VFDH2G \n\ + Slots \n\ + \n\ + \n\ + Device \n\ + NVidia \n\ + ID \n\ + 1 \n\ + Name \n\ + APPL,sdfsdf \n\ + Type \n\ + 1 \n\ + \n\ + \n\ + SmUUID \n\ + F1AB23C0-C35A-473E-BDB7-455C3A6271E8 \n\ + Version \n\ + 1.0 \n\ + \n\ + SystemParameters \n\ + \n\ + BacklightLevel \n\ + 2 \n\ + CustomUUID \n\ + 2926A57C-FF0E-4A64-980F-23483BD41969 \n\ + ExposeSysVariables \n\ + \n\ + InjectKexts \n\ + Yes \n\ + InjectSystemID \n\ + \n\ + NoCaches \n\ + \n\ + NvidiaWeb \n\ + \n\ + \n\ + \n\ "; #endif //MSC_VER #endif /* ConfigSample1_h */ + + +/* + + Test null data \n\ + \n\ + + +*/ diff --git a/Xcode/CloverX64TestNewParser/src/main.cpp b/Xcode/CloverX64TestNewParser/src/main.cpp index 8e6403a7f..e1ca59682 100755 --- a/Xcode/CloverX64TestNewParser/src/main.cpp +++ b/Xcode/CloverX64TestNewParser/src/main.cpp @@ -16,6 +16,8 @@ #include "../../../../../cpp_tests/Include/xcode_utf_fixed.h" #include "ConfigSample1.h" +#include "../../../rEFIt_UEFI/Platform/ConfigPlist/ConfigPlist.h" +#include "../../../rEFIt_UEFI/Platform/ConfigPlist/CompareSettings.h" int test1() @@ -23,19 +25,37 @@ int test1() TagDict* dict = NULL; EFI_STATUS Status = ParseXML(configSample1, &dict, (UINT32)strlen(configSample1)); printf("ParseXML returns %s\n", efiStrError(Status)); - if ( !EFI_ERROR(Status) ) { + if ( EFI_ERROR(Status) ) { + return Status; + } // XString8 s; // dict->sprintf(0, &s); // printf("%s\n", s.c_str()); - SETTINGS_DATA settings; - Status = GetEarlyUserSettings(dict, settings); - printf("GetEarlyUserSettings returns %s\n", efiStrError(Status)); - Status = GetUserSettings(dict, settings); - printf("GetUserSettings returns %s\n", efiStrError(Status)); + SETTINGS_DATA settings; + Status = GetEarlyUserSettings(dict, settings); + printf("GetEarlyUserSettings returns %s\n", efiStrError(Status)); + Status = GetUserSettings(dict, settings); + printf("GetUserSettings returns %s\n", efiStrError(Status)); + + bool b; + ConfigPlist configPlist; + + XmlLiteParser xmlLiteParser; + xmlLiteParser.init(configSample1, strlen(configSample1)); + + b = configPlist.parse(&xmlLiteParser, LString8("")); +// for ( size_t idx = 0 ; idx < xmlLiteParser.getErrorsAndWarnings().size() ; idx++ ) { +// const XmlParserMessage& xmlMsg = xmlLiteParser.getErrorsAndWarnings()[idx]; +// printf("%s: %s\n", xmlMsg.isError ? "Error" : "Warning", xmlMsg.msg.c_str()); +// } + if ( b ) { + if ( xmlLiteParser.getErrorsAndWarnings().size() == 0 ) { + printf("Your plist looks so wonderful. Well done!\n"); + } } - return 0; + return CompareEarlyUserSettingsWithConfigPlist(settings, configPlist) ? 0 : -1; } @@ -54,7 +74,8 @@ extern "C" int main(int argc, const char * argv[]) xcode_utf_fixed_tests(); - test1(); + + return test1(); - return all_tests() ? 0 : -1 ; +// return all_tests() ? 0 : -1 ; } diff --git a/Xcode/cpp_tests/Include/XToolsConf.h b/Xcode/cpp_tests/Include/XToolsConf.h index 96cf9afe5..55060c675 100755 --- a/Xcode/cpp_tests/Include/XToolsConf.h +++ b/Xcode/cpp_tests/Include/XToolsConf.h @@ -1,6 +1,9 @@ #ifndef __XTOOLSCONF_H__ #define __XTOOLSCONF_H__ +#include +#include +#include "../../../rEFIt_UEFI/Platform/Posix/abort.h" #define xsize size_t //#define xisize INTN @@ -23,10 +26,4 @@ #define Xrealloc(ptr, newsize, oldsize) realloc(ptr, newsize) -//#include -#include -#include -#include "../../../rEFIt_UEFI/Platform/Posix/abort.h" -#include - #endif diff --git a/Xcode/cpp_tests/config-all-warnings.plist b/Xcode/cpp_tests/config-all-warnings.plist new file mode 100644 index 000000000..e5c5542f2 --- /dev/null +++ b/Xcode/cpp_tests/config-all-warnings.plist @@ -0,0 +1,1027 @@ + + + + + ACPI + + AutoMerge + + DSDT + + Debug + + Fixes + + AddDTGP_0001 + + AddHDMI_8000000 + + AddIMEI_80000 + + AddMCHC_0008 + + AddPNLF_1000000 + + DeleteUnused_400000 + + FIX_ACST_4000000 + + FIX_ADP1_800000 + + FIX_INTELGFX_100000 + + FIX_RTC_20000 + + FIX_S3D_2000000 + + FIX_TMR_40000 + + FIX_WAK_200000 + + FakeLPC_0020 + + FixAirport_4000 + + FixDarwin + + FixDarwin7_10000 + + FixDarwin_0002 + + FixDisplay + + FixDisplay_0100 + + FixFirewire_0800 + + FixHDA_8000 + + FixHPET_0010 + + FixHeaders_20000000 + + FixIDE_0200 + + FixIPIC_0040 + + FixLAN_2000 + + FixRegions_10000000 + + FixS3D + + FixSATA_0400 + + FixSBUS_0080 + + FixShutdown_0004 + + FixUSB_1000 + + + Name + aa + Patches + + + Comment + ACPI1 + Disabled + + Find + + AA== + + Replace + + AQ== + + + + Comment + ACPI2 + Disabled + + Find + + Ag== + + Replace + + Aw== + + + + Comment + change EHC1 to EH01 + Disabled + + Find + + RUhDMQ== + + Replace + + RUgwMQ== + + + + ReuseFFFF + + Rtc8Allowed + + SuspendOverride + + + DisableASPM + + DisabledAML + + aa + bb + + DropTables + + + Signature + SSDT + TableId + CpuPm + + + HaltEnabler + + PatchAPIC + + ResetAddress + -0 + ResetValue + 02 + SSDT + + C3Latency + 0xd + DoubleFirstState + + DropOem + + EnableC2 + + EnableC4 + + EnableC6 + + EnableC7 + + Generate + + CStates + + PStates + + + MaxMultiplier + 12 + MinMultiplier + 11 + PLimitDict + 2 + PluginType + 1 + UnderVoltStep + 5 + UseSystemIO + + + SortedOrder + + dd + cc + + smartUPS + + + Boot + + Arguments + -v arch=i386 slide=0 dart=0 -xcpm darkwake=1 npci=0x2000 nv_disable=1 cpus=1 rootless=0 debug=0x100 aa + BlackList + + hh + + CustomLogo + Apple + Debug + + DefaultLoader + ii + DefaultVolume + LastBootedVolume + DisableCloverHotkeys + + HibernationFixup + + Legacy + LegacyBiosDefault + LegacyBiosDefaultEntry + 12 + NeverDoRecovery + + NeverHibernate + + NoEarlyProgress + + Policy + Allow + Secure + + SignatureFixup + + SkipHibernateTimeout + + StrictHibernate + + Timeout + -1 + WhiteList + + ff + gg + + XMPDetection + 1 + + BootGraphics + + DefaultBackgroundColor + 0xF1F1F1 + EFILoginHiDPI + 2 + UIScale + 4 + flagstate + 3 + + CPU + + BusSpeedkHz + 800 + C2 + + C4 + + C6 + + FrequencyMHz + 2000 + HWPEnable + + HWPValue + 0x7 + Latency + 0x3 + QEMU + + QPI + 4 + TDP + 6 + TurboDisable + + Type + 0x5 + UseARTFrequency + + + Devices + + AddProperties + + + Device + SATA + Disabled + + Key + 10 + Value + 11 + + + Device + LPC + Disabled + + Key + 12 + Value + 13 + + + Device + SmBUS + Disabled + + Key + kk + Value + ll + + + Device + Firewire + Disabled + + Key + 14 + Value + + FQ== + + + + AirportBridgeDeviceName + airp + Arbitrary + + + Comment + C1 + CustomProperties + + + Disabled + + Key + ll + Value + mm + + + Disabled + + Key + nn + Value + 1 + + + Disabled + + Key + oo + Value + + Ag== + + + + PciAddr + 00:00.01 + + + Audio + + AFGLowPowerState + + Inject + Detect + ResetHDA + + + DisableFunctions + + FakeID + + ATI + 0x22221002 + IMEI + 0x22221002 + IntelGFX + 0x22221002 + LAN + 0x22221002 + NVidia + 0x22221002 + SATA + 0x22221002 + WIFI + 0x22221002 + XHCI + 0x22221002 + + ForceHPET + + Inject + + IntelMaxValue + + NoDefaultProperties + + Properties + 0001 + Properties + + PciRoot(0x0)/Pci(0x2,0x0) + + AAPL,GfxYTile + + AQAAAA== + + AAPL,ig-platform-id + + AAAbWQ== + + AAPL,slot-name + Internal@0,2,0 + device-id + + G1kAAA== + + device_type + VGA compatible controller + disable-external-gpu + + AQAAAA== + + enable-hdmi20 + + AQAAAA== + + framebuffer-con1-busid + + BQAAAA== + + framebuffer-con1-enable + + AQAAAA== + + framebuffer-con1-index + + AQAAAA== + + framebuffer-con1-pipe + + CQAAAA== + + framebuffer-con1-type + + AAgAAA== + + framebuffer-patch-enable + + AQAAAA== + + framebuffer-portcount + + BAAAAA== + + framebuffer-unifiedmem + + AAAAgA== + + hda-gfx + onboard-1 + model + Intel HD Graphics 630 + + + SetIntelBacklight + + SetIntelMaxBacklight + + USB + + AddClockID + + FixOwnership + + HighCurrent + + Inject + + + UseIntelHDMI + + + DisableDrivers + + Ps2KeyboardDxe + OsxAptioFixDrv + Ps2MouseDxe + + GUI + + ConsoleMode + Max + Custom + + Entries + + + AddArguments + addarg + Arguments + arg + BootBgColor + bootbgcolor + CustomLogo + Apple + Disabled + + DriveImage + driveimage + FullTitle + title + Hidden + + Hotkey + H + Ignore + + Image + image + Path + path + Settings + settings + SubEntries + + + AddArguments + arg2 + FullTitle + title1 + + + AddArguments + arg3 + Title + title2 + + + AddArguments + arg4 + FullTitle + title3 + + + AddArguments + arg5 + Title + title4 + + + Type + Oldest + Volume + v1 + VolumeType + Internal + + + Legacy + + + Disabled + + FullTitle + title + Hidden + + Hotkey + + Ignore + + Type + Windows + Volume + v2 + + + Tool + + + Arguments + b + Disabled + + Hidden + + Hotkey + b + Ignore + + Path + path + Title + title + Volume + tool1 + + + + CustomIcons + + Hide + + sdfsdfdf + sdfsfdf + + Language + es:0 + Mouse + + DoubleClick + 501 + Enabled + + Mirror + + Speed + 5 + + Scan + + Entries + + Kernel + First + Legacy + First + Linux + + Tool + + + ScreenResolution + 1366x768 + ShowOptimus + + TextOnly + + Theme + th + + Graphics + + ATI + + + IOPCIPrimaryMatch + 0x1002888 + IOPCISubDevId + 0x106B + LoadVBios + + Model + cc + VRAM + 2000 + VideoPorts + 3 + + + BootDisplay + 12 + DualLink + 1 + EDID + + Custom + + AQID + + Inject + + ProductID + 0x9777 + VendorID + 0x1007 + + FBName + Exmoor + Inject + + ATI + + Intel + + NVidia + + + LoadVBios + + NVCAP + 0304 + NVIDIA + + + IOPCIPrimaryMatch + 0x10DE999 + IOPCISubDevId + 0x106B + LoadVBios + + Model + aa + VRAM + 1000 + VideoPorts + 1 + + + IOPCIPrimaryMatch + 0x10DE999 + IOPCISubDevId + 0x106B + LoadVBios + + Model + bb + VRAM + 1000 + VideoPorts + 2 + + + NvidiaGeneric + + NvidiaNoEFI + + NvidiaSingle + + PatchVBios + + PatchVBiosBytes + + + Find + + AwQF + + Replace + + BgcI + + + + VRAM + 1500 + VideoPorts + 2 + display-cfg + 04 + ig-platform-id + 0x59230000 + + KernelAndKextPatches + + ATIConnectorsController + ATICtl + ATIConnectorsData + 111213 + ATIConnectorsPatch + 141516 + AppleIntelCPUPM + + AppleRTC + + BootPatches + + + Comment + c3 + Disabled + + Find + + MTI= + + MatchBuild + 10.12.6 + MatchOS + 10.12 + Replace + + MzQ= + + + + Debug + + DellSMBIOSPatch + + FakeCPUID + 0x0306D0 + ForceKextsToLoad + + ForceKext + + KernelCpu + + KernelLapic + + KernelPm + + KernelToPatch + + + Comment + c2 + Disabled + + Find + + ISI= + + MatchBuild + 10.13.6 + MatchOS + 10.13 + Replace + + IyQ= + + + + KernelXCPM + + KextsToPatch + + + Comment + c1 + Disabled + + Find + + AQ== + + InfoPlistPatch + + MatchBuild + 10.14.6 + MatchOS + 10.14 + Name + k1 + Replace + + Ag== + + + + Comment + IONVMeFamily IONameMatch + Disabled + + Find + + PHN0cmluZz5wY2kxNDRkLGE4MDQ8L3N0cmluZz4= + + InfoPlistPatch + + Name + IONVMeFamily + Replace + + PHN0cmluZz5wY2kxNDRkLGE4MDI8L3N0cmluZz4= + + + + + RtVariables + + BooterConfig + 0x1 + CsrActiveConfig + 0x2 + MLB + 12345678901234567 + ROM + + MBRwYnHo + + + SMBIOS + + BiosReleaseDate + 08/08/17 + BiosVendor + Apple Inc. + BiosVersion + MBP81.88Z.004D.B00.1708080655 + Board-ID + Mac-94245B3640C91C81 + BoardManufacturer + Apple Inc. + BoardSerialNumber + W89135306OPDM6CAD + BoardType + 10 + BoardVersion + 1.0 + ChassisAssetTag + MacBook-Aluminum + ChassisManufacturer + Apple Inc. + ChassisType + 0x0A + Family + MacBook Pro + FirmwareFeatures + 0xC00DE137 + FirmwareFeaturesMask + 0xFF1FFF3F + LocationInChassis + Part Component + Manufacturer + Apple Inc. + Memory + + Channels + 2 + Modules + + + Frequency + 333 + Part + Part1 + Serial + Ser1 + Size + 2048 + Slot + 1 + Type + DDR + Vendor + v1 + + + Frequency + 366 + Part + Part2 + Serial + Ser2 + Size + 4096 + Slot + 2 + Type + DDR2 + Vendor + v2 + + + SlotCount + 4 + + Mobile + + PlatformFeature + 0xFFFF + ProductName + MacBookPro8,1 + SerialNumber + W89G91VFDH2G + Slots + + + Device + NVidia + ID + 1 + Name + APPL,sdfsdf + Type + 1 + + + SmUUID + F1AB23C0-C35A-473E-BDB7-455C3A6271E8 + Version + 1.0 + + SystemParameters + + BacklightLevel + 2 + CustomUUID + 2926A57C-FF0E-4A64-980F-23483BD41969 + ExposeSysVariables + + InjectKexts + Yes + InjectSystemID + + NoCaches + + NvidiaWeb + + + + diff --git a/Xcode/cpp_tests/config-all.plist b/Xcode/cpp_tests/config-all.plist new file mode 100644 index 000000000..c278c2b06 --- /dev/null +++ b/Xcode/cpp_tests/config-all.plist @@ -0,0 +1,963 @@ + + + + + ACPI + + AutoMerge + + DSDT + + Debug + + Fixes + + AddDTGP_0001 + + AddHDMI_8000000 + + AddIMEI_80000 + + AddMCHC_0008 + + AddPNLF_1000000 + + DeleteUnused_400000 + + FIX_ACST_4000000 + + FIX_ADP1_800000 + + FIX_INTELGFX_100000 + + FIX_RTC_20000 + + FIX_S3D_2000000 + + FIX_TMR_40000 + + FIX_WAK_200000 + + FakeLPC_0020 + + FixAirport_4000 + + FixDarwin + + FixDarwin7_10000 + + FixDarwin_0002 + + FixDisplay + + FixDisplay_0100 + + FixFirewire_0800 + + FixHDA_8000 + + FixHPET_0010 + + FixHeaders_20000000 + + FixIDE_0200 + + FixIPIC_0040 + + FixLAN_2000 + + FixRegions_10000000 + + FixS3D + + FixSATA_0400 + + FixSBUS_0080 + + FixShutdown_0004 + + FixUSB_1000 + + + Name + aa + Patches + + + Comment + ACPI1 + Disabled + + Find + + AA== + + Replace + + AQ== + + + + Comment + ACPI2 + Disabled + + Find + + Ag== + + Replace + + Aw== + + + + Comment + change EHC1 to EH01 + Disabled + + Find + + RUhDMQ== + + Replace + + RUgwMQ== + + + + ReuseFFFF + + Rtc8Allowed + + SuspendOverride + + + DisableASPM + + DisabledAML + + aa + bb + + DropTables + + + Signature + SSDT + TableId + CpuPm + + + HaltEnabler + + PatchAPIC + + ResetAddress + -0 + ResetValue + 02 + SSDT + + C3Latency + 0xd + DoubleFirstState + + DropOem + + EnableC2 + + EnableC4 + + EnableC6 + + EnableC7 + + Generate + + CStates + + PStates + + + MaxMultiplier + 12 + MinMultiplier + 11 + PLimitDict + 2 + PluginType + 1 + UnderVoltStep + 5 + UseSystemIO + + + SortedOrder + + dd + cc + + smartUPS + + + Boot + + Arguments + -v arch=i386 slide=0 dart=0 -xcpm darkwake=1 npci=0x2000 nv_disable=1 cpus=1 rootless=0 debug=0x100 aa + BlackList + + hh + + CustomLogo + Apple + Debug + + DefaultLoader + ii + DefaultVolume + LastBootedVolume + DisableCloverHotkeys + + HibernationFixup + + Legacy + LegacyBiosDefault + LegacyBiosDefaultEntry + 12 + NeverDoRecovery + + NeverHibernate + + NoEarlyProgress + + Policy + Allow + Secure + + SignatureFixup + + SkipHibernateTimeout + + StrictHibernate + + Timeout + -1 + WhiteList + + ff + gg + + XMPDetection + 1 + + BootGraphics + + DefaultBackgroundColor + 0xF1F1F1 + EFILoginHiDPI + 2 + UIScale + 4 + flagstate + 3 + + CPU + + BusSpeedkHz + 800 + C2 + + C4 + + C6 + + FrequencyMHz + 2000 + HWPEnable + + HWPValue + 0x7 + Latency + 0x3 + QEMU + + QPI + 4 + TDP + 6 + TurboDisable + + Type + 0x5 + UseARTFrequency + + + Devices + + AddProperties + + + Device + SATA + Disabled + + Key + 10 + Value + 11 + + + Device + LPC + Disabled + + Key + 12 + Value + 13 + + + Device + SmBUS + Disabled + + Key + kk + Value + ll + + + Device + Firewire + Disabled + + Key + 14 + Value + + FQ== + + + + AirportBridgeDeviceName + airp + Arbitrary + + + Comment + C1 + CustomProperties + + + Disabled + + Key + ll + Value + mm + + + Disabled + + Key + nn + Value + 1 + + + Disabled + + Key + oo + Value + + Ag== + + + + PciAddr + 00:00.01 + + + Audio + + AFGLowPowerState + + Inject + Detect + ResetHDA + + + DisableFunctions + + FakeID + + ATI + 0x22221002 + IMEI + 0x22221002 + IntelGFX + 0x22221002 + LAN + 0x22221002 + NVidia + 0x22221002 + SATA + 0x22221002 + WIFI + 0x22221002 + XHCI + 0x22221002 + + ForceHPET + + Inject + + IntelMaxValue + + LpcTune + + NoDefaultProperties + + Properties + 0001 + SetIntelBacklight + + SetIntelMaxBacklight + + USB + + AddClockID + + FixOwnership + + HighCurrent + + Inject + + + UseIntelHDMI + + + DisableDrivers + + Ps2KeyboardDxe + OsxAptioFixDrv + Ps2MouseDxe + + GUI + + ConsoleMode + Max + Custom + + Entries + + + AddArguments + addarg + Arguments + arg + BootBgColor + bootbgcolor + CustomLogo + Apple + Disabled + + DriveImage + driveimage + FullTitle + title + Hidden + + Hotkey + H + Ignore + + Image + image + Path + path + Settings + settings + SubEntries + + + AddArguments + arg2 + FullTitle + title1 + + + AddArguments + arg3 + Title + title2 + + + AddArguments + arg4 + FullTitle + title3 + + + AddArguments + arg5 + Title + title4 + + + Type + Oldest + Volume + v1 + VolumeType + Internal + + + Legacy + + + Disabled + + FullTitle + title + Hidden + + Hotkey + + Ignore + + Type + Windows + Volume + v2 + + + Tool + + + Arguments + b + Disabled + + Hidden + + Hotkey + b + Ignore + + Path + path + Title + title + Volume + tool1 + + + + CustomIcons + + Hide + + sdfsdfdf + sdfsfdf + + Language + es:0 + Mouse + + DoubleClick + 501 + Enabled + + Mirror + + Speed + 5 + + Scan + + Entries + + Kernel + First + Legacy + First + Linux + + Tool + + + ScreenResolution + 1366x768 + ShowOptimus + + TextOnly + + Theme + th + + Graphics + + ATI + + + IOPCIPrimaryMatch + 0x1002888 + IOPCISubDevId + 0x106B + LoadVBios + + Model + cc + VRAM + 2000 + VideoPorts + 3 + + + BootDisplay + 12 + DualLink + 1 + EDID + + Custom + + AQID + + Inject + + ProductID + 0x9777 + VendorID + 0x1007 + + FBName + Exmoor + Inject + + ATI + + Intel + + NVidia + + + LoadVBios + + NVCAP + 0304 + NVIDIA + + + IOPCIPrimaryMatch + 0x10DE999 + IOPCISubDevId + 0x106B + LoadVBios + + Model + aa + VRAM + 1000 + VideoPorts + 1 + + + IOPCIPrimaryMatch + 0x10DE999 + IOPCISubDevId + 0x106B + LoadVBios + + Model + bb + VRAM + 1000 + VideoPorts + 2 + + + NvidiaGeneric + + NvidiaNoEFI + + NvidiaSingle + + PatchVBios + + PatchVBiosBytes + + + Find + + AwQF + + Replace + + BgcI + + + + VRAM + 1500 + VideoPorts + 2 + display-cfg + 04 + ig-platform-id + 0x59230000 + + KernelAndKextPatches + + ATIConnectorsController + ATICtl + ATIConnectorsData + 111213 + ATIConnectorsPatch + 141516 + AppleIntelCPUPM + + AppleRTC + + BootPatches + + + Comment + c3 + Disabled + + Find + + MTI= + + MatchBuild + 10.12.6 + MatchOS + 10.12 + Replace + + MzQ= + + + + Debug + + DellSMBIOSPatch + + FakeCPUID + 0x0306D0 + ForceKextsToLoad + + ForceKext + + KernelCpu + + KernelLapic + + KernelPm + + KernelToPatch + + + Comment + c2 + Disabled + + Find + + ISI= + + MatchBuild + 10.13.6 + MatchOS + 10.13 + Replace + + IyQ= + + + + KernelXCPM + + KextsToPatch + + + Comment + c1 + Disabled + + Find + + AQ== + + InfoPlistPatch + + MatchBuild + 10.14.6 + MatchOS + 10.14 + Name + k1 + Replace + + Ag== + + + + Comment + IONVMeFamily IONameMatch + Disabled + + Find + + PHN0cmluZz5wY2kxNDRkLGE4MDQ8L3N0cmluZz4= + + InfoPlistPatch + + Name + IONVMeFamily + Replace + + PHN0cmluZz5wY2kxNDRkLGE4MDI8L3N0cmluZz4= + + + + + RtVariables + + BooterConfig + 0x1 + CsrActiveConfig + 0x2 + MLB + 12345678901234567 + ROM + + MBRwYnHo + + + SMBIOS + + BiosReleaseDate + 08/08/17 + BiosVendor + Apple Inc. + BiosVersion + MBP81.88Z.004D.B00.1708080655 + Board-ID + Mac-94245B3640C91C81 + BoardManufacturer + Apple Inc. + BoardSerialNumber + W89135306OPDM6CAD + BoardType + 10 + BoardVersion + 1.0 + ChassisAssetTag + MacBook-Aluminum + ChassisManufacturer + Apple Inc. + ChassisType + 0x0A + Family + MacBook Pro + FirmwareFeatures + 0xC00DE137 + FirmwareFeaturesMask + 0xFF1FFF3F + LocationInChassis + Part Component + Manufacturer + Apple Inc. + Memory + + Channels + 2 + Modules + + + Frequency + 333 + Part + Part1 + Serial + Ser1 + Size + 2048 + Slot + 1 + Type + DDR + Vendor + v1 + + + Frequency + 366 + Part + Part2 + Serial + Ser2 + Size + 4096 + Slot + 2 + Type + DDR2 + Vendor + v2 + + + SlotCount + 4 + + Mobile + + PlatformFeature + 0xFFFF + ProductName + MacBookPro8,1 + SerialNumber + W89G91VFDH2G + Slots + + + Device + NVidia + ID + 1 + Name + APPL,sdfsdf + Type + 1 + + + SmUUID + F1AB23C0-C35A-473E-BDB7-455C3A6271E8 + Version + 1.0 + + SystemParameters + + BacklightLevel + 2 + CustomUUID + 2926A57C-FF0E-4A64-980F-23483BD41969 + ExposeSysVariables + + InjectKexts + Yes + InjectSystemID + + NoCaches + + NvidiaWeb + + + + diff --git a/Xcode/cpp_tests/cpp_tests.xcodeproj/project.pbxproj b/Xcode/cpp_tests/cpp_tests.xcodeproj/project.pbxproj index 577b42b81..84e1932fa 100644 --- a/Xcode/cpp_tests/cpp_tests.xcodeproj/project.pbxproj +++ b/Xcode/cpp_tests/cpp_tests.xcodeproj/project.pbxproj @@ -167,6 +167,110 @@ 9A838CBD25348530008303F5 /* BaseMemoryLib.c in Sources */ = {isa = PBXBuildFile; fileRef = 9A838CB925348237008303F5 /* BaseMemoryLib.c */; }; 9A838CC0253485C8008303F5 /* BaseLib.c in Sources */ = {isa = PBXBuildFile; fileRef = 9A838CBF253485C8008303F5 /* BaseLib.c */; }; 9A838CC3253485DC008303F5 /* DebugLib.c in Sources */ = {isa = PBXBuildFile; fileRef = 9A838CC2253485DC008303F5 /* DebugLib.c */; }; + 9A9037EC25D0010500F14179 /* xml_lite-test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037E925D0010500F14179 /* xml_lite-test.cpp */; }; + 9A9037ED25D0010500F14179 /* xml_lite-test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037E925D0010500F14179 /* xml_lite-test.cpp */; }; + 9A9037EE25D0010500F14179 /* xml_lite-test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037E925D0010500F14179 /* xml_lite-test.cpp */; }; + 9A9037EF25D0010500F14179 /* xml_lite-test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037E925D0010500F14179 /* xml_lite-test.cpp */; }; + 9A9037F025D0010500F14179 /* config-test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037EB25D0010500F14179 /* config-test.cpp */; }; + 9A9037F125D0010500F14179 /* config-test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037EB25D0010500F14179 /* config-test.cpp */; }; + 9A9037F225D0010500F14179 /* config-test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037EB25D0010500F14179 /* config-test.cpp */; }; + 9A9037F325D0010500F14179 /* config-test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037EB25D0010500F14179 /* config-test.cpp */; }; + 9A90382125D0024500F14179 /* Config_GUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037F525D0024500F14179 /* Config_GUI.cpp */; }; + 9A90382225D0024500F14179 /* Config_GUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037F525D0024500F14179 /* Config_GUI.cpp */; }; + 9A90382325D0024500F14179 /* Config_GUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037F525D0024500F14179 /* Config_GUI.cpp */; }; + 9A90382425D0024500F14179 /* Config_GUI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037F525D0024500F14179 /* Config_GUI.cpp */; }; + 9A90382525D0024500F14179 /* Config_RtVariables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037F625D0024500F14179 /* Config_RtVariables.cpp */; }; + 9A90382625D0024500F14179 /* Config_RtVariables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037F625D0024500F14179 /* Config_RtVariables.cpp */; }; + 9A90382725D0024500F14179 /* Config_RtVariables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037F625D0024500F14179 /* Config_RtVariables.cpp */; }; + 9A90382825D0024500F14179 /* Config_RtVariables.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037F625D0024500F14179 /* Config_RtVariables.cpp */; }; + 9A90382925D0024500F14179 /* Config_SMBIOS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037F725D0024500F14179 /* Config_SMBIOS.cpp */; }; + 9A90382A25D0024500F14179 /* Config_SMBIOS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037F725D0024500F14179 /* Config_SMBIOS.cpp */; }; + 9A90382B25D0024500F14179 /* Config_SMBIOS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037F725D0024500F14179 /* Config_SMBIOS.cpp */; }; + 9A90382C25D0024500F14179 /* Config_SMBIOS.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037F725D0024500F14179 /* Config_SMBIOS.cpp */; }; + 9A90382D25D0024500F14179 /* Config_Devices_Audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037FA25D0024500F14179 /* Config_Devices_Audio.cpp */; }; + 9A90382E25D0024500F14179 /* Config_Devices_Audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037FA25D0024500F14179 /* Config_Devices_Audio.cpp */; }; + 9A90382F25D0024500F14179 /* Config_Devices_Audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037FA25D0024500F14179 /* Config_Devices_Audio.cpp */; }; + 9A90383025D0024500F14179 /* Config_Devices_Audio.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037FA25D0024500F14179 /* Config_Devices_Audio.cpp */; }; + 9A90383125D0024500F14179 /* Config_KernelAndKextPatches.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037FD25D0024500F14179 /* Config_KernelAndKextPatches.cpp */; }; + 9A90383225D0024500F14179 /* Config_KernelAndKextPatches.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037FD25D0024500F14179 /* Config_KernelAndKextPatches.cpp */; }; + 9A90383325D0024500F14179 /* Config_KernelAndKextPatches.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037FD25D0024500F14179 /* Config_KernelAndKextPatches.cpp */; }; + 9A90383425D0024500F14179 /* Config_KernelAndKextPatches.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037FD25D0024500F14179 /* Config_KernelAndKextPatches.cpp */; }; + 9A90383525D0024500F14179 /* Config_Quirks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037FE25D0024500F14179 /* Config_Quirks.cpp */; }; + 9A90383625D0024500F14179 /* Config_Quirks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037FE25D0024500F14179 /* Config_Quirks.cpp */; }; + 9A90383725D0024500F14179 /* Config_Quirks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037FE25D0024500F14179 /* Config_Quirks.cpp */; }; + 9A90383825D0024500F14179 /* Config_Quirks.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9037FE25D0024500F14179 /* Config_Quirks.cpp */; }; + 9A90383925D0024500F14179 /* Config_CPU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380125D0024500F14179 /* Config_CPU.cpp */; }; + 9A90383A25D0024500F14179 /* Config_CPU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380125D0024500F14179 /* Config_CPU.cpp */; }; + 9A90383B25D0024500F14179 /* Config_CPU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380125D0024500F14179 /* Config_CPU.cpp */; }; + 9A90383C25D0024500F14179 /* Config_CPU.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380125D0024500F14179 /* Config_CPU.cpp */; }; + 9A90383D25D0024500F14179 /* Config_Devices_FakeID.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380425D0024500F14179 /* Config_Devices_FakeID.cpp */; }; + 9A90383E25D0024500F14179 /* Config_Devices_FakeID.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380425D0024500F14179 /* Config_Devices_FakeID.cpp */; }; + 9A90383F25D0024500F14179 /* Config_Devices_FakeID.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380425D0024500F14179 /* Config_Devices_FakeID.cpp */; }; + 9A90384025D0024500F14179 /* Config_Devices_FakeID.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380425D0024500F14179 /* Config_Devices_FakeID.cpp */; }; + 9A90384125D0024500F14179 /* Config_ACPI_SSDT.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380725D0024500F14179 /* Config_ACPI_SSDT.cpp */; }; + 9A90384225D0024500F14179 /* Config_ACPI_SSDT.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380725D0024500F14179 /* Config_ACPI_SSDT.cpp */; }; + 9A90384325D0024500F14179 /* Config_ACPI_SSDT.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380725D0024500F14179 /* Config_ACPI_SSDT.cpp */; }; + 9A90384425D0024500F14179 /* Config_ACPI_SSDT.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380725D0024500F14179 /* Config_ACPI_SSDT.cpp */; }; + 9A90384525D0024500F14179 /* Config_Boot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380825D0024500F14179 /* Config_Boot.cpp */; }; + 9A90384625D0024500F14179 /* Config_Boot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380825D0024500F14179 /* Config_Boot.cpp */; }; + 9A90384725D0024500F14179 /* Config_Boot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380825D0024500F14179 /* Config_Boot.cpp */; }; + 9A90384825D0024500F14179 /* Config_Boot.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380825D0024500F14179 /* Config_Boot.cpp */; }; + 9A90384925D0024500F14179 /* Config_Devices_AddProperties.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380925D0024500F14179 /* Config_Devices_AddProperties.cpp */; }; + 9A90384A25D0024500F14179 /* Config_Devices_AddProperties.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380925D0024500F14179 /* Config_Devices_AddProperties.cpp */; }; + 9A90384B25D0024500F14179 /* Config_Devices_AddProperties.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380925D0024500F14179 /* Config_Devices_AddProperties.cpp */; }; + 9A90384C25D0024500F14179 /* Config_Devices_AddProperties.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380925D0024500F14179 /* Config_Devices_AddProperties.cpp */; }; + 9A90384D25D0024500F14179 /* ConfigPlist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380B25D0024500F14179 /* ConfigPlist.cpp */; }; + 9A90384E25D0024500F14179 /* ConfigPlist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380B25D0024500F14179 /* ConfigPlist.cpp */; }; + 9A90384F25D0024500F14179 /* ConfigPlist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380B25D0024500F14179 /* ConfigPlist.cpp */; }; + 9A90385025D0024500F14179 /* ConfigPlist.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380B25D0024500F14179 /* ConfigPlist.cpp */; }; + 9A90385125D0024500F14179 /* Config_Devices_USB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380C25D0024500F14179 /* Config_Devices_USB.cpp */; }; + 9A90385225D0024500F14179 /* Config_Devices_USB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380C25D0024500F14179 /* Config_Devices_USB.cpp */; }; + 9A90385325D0024500F14179 /* Config_Devices_USB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380C25D0024500F14179 /* Config_Devices_USB.cpp */; }; + 9A90385425D0024500F14179 /* Config_Devices_USB.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380C25D0024500F14179 /* Config_Devices_USB.cpp */; }; + 9A90385525D0024500F14179 /* Config_Devices.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380D25D0024500F14179 /* Config_Devices.cpp */; }; + 9A90385625D0024500F14179 /* Config_Devices.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380D25D0024500F14179 /* Config_Devices.cpp */; }; + 9A90385725D0024500F14179 /* Config_Devices.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380D25D0024500F14179 /* Config_Devices.cpp */; }; + 9A90385825D0024500F14179 /* Config_Devices.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90380D25D0024500F14179 /* Config_Devices.cpp */; }; + 9A90385925D0024500F14179 /* Config_ACPI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90381025D0024500F14179 /* Config_ACPI.cpp */; }; + 9A90385A25D0024500F14179 /* Config_ACPI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90381025D0024500F14179 /* Config_ACPI.cpp */; }; + 9A90385B25D0024500F14179 /* Config_ACPI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90381025D0024500F14179 /* Config_ACPI.cpp */; }; + 9A90385C25D0024500F14179 /* Config_ACPI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90381025D0024500F14179 /* Config_ACPI.cpp */; }; + 9A90385D25D0024500F14179 /* Config_Devices_Properties.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90381125D0024500F14179 /* Config_Devices_Properties.cpp */; }; + 9A90385E25D0024500F14179 /* Config_Devices_Properties.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90381125D0024500F14179 /* Config_Devices_Properties.cpp */; }; + 9A90385F25D0024500F14179 /* Config_Devices_Properties.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90381125D0024500F14179 /* Config_Devices_Properties.cpp */; }; + 9A90386025D0024500F14179 /* Config_Devices_Properties.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90381125D0024500F14179 /* Config_Devices_Properties.cpp */; }; + 9A90386125D0024500F14179 /* Config_Graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90381325D0024500F14179 /* Config_Graphics.cpp */; }; + 9A90386225D0024500F14179 /* Config_Graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90381325D0024500F14179 /* Config_Graphics.cpp */; }; + 9A90386325D0024500F14179 /* Config_Graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90381325D0024500F14179 /* Config_Graphics.cpp */; }; + 9A90386425D0024500F14179 /* Config_Graphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90381325D0024500F14179 /* Config_Graphics.cpp */; }; + 9A90386525D0024500F14179 /* Config_SystemParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90381625D0024500F14179 /* Config_SystemParameters.cpp */; }; + 9A90386625D0024500F14179 /* Config_SystemParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90381625D0024500F14179 /* Config_SystemParameters.cpp */; }; + 9A90386725D0024500F14179 /* Config_SystemParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90381625D0024500F14179 /* Config_SystemParameters.cpp */; }; + 9A90386825D0024500F14179 /* Config_SystemParameters.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90381625D0024500F14179 /* Config_SystemParameters.cpp */; }; + 9A90386D25D0024500F14179 /* Config_ACPI_DSDT.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90381825D0024500F14179 /* Config_ACPI_DSDT.cpp */; }; + 9A90386E25D0024500F14179 /* Config_ACPI_DSDT.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90381825D0024500F14179 /* Config_ACPI_DSDT.cpp */; }; + 9A90386F25D0024500F14179 /* Config_ACPI_DSDT.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90381825D0024500F14179 /* Config_ACPI_DSDT.cpp */; }; + 9A90387025D0024500F14179 /* Config_ACPI_DSDT.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90381825D0024500F14179 /* Config_ACPI_DSDT.cpp */; }; + 9A90387125D0024500F14179 /* Config_BootGraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90381925D0024500F14179 /* Config_BootGraphics.cpp */; }; + 9A90387225D0024500F14179 /* Config_BootGraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90381925D0024500F14179 /* Config_BootGraphics.cpp */; }; + 9A90387325D0024500F14179 /* Config_BootGraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90381925D0024500F14179 /* Config_BootGraphics.cpp */; }; + 9A90387425D0024500F14179 /* Config_BootGraphics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90381925D0024500F14179 /* Config_BootGraphics.cpp */; }; + 9A90387525D0024500F14179 /* Config_Devices_Arbitrary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90381A25D0024500F14179 /* Config_Devices_Arbitrary.cpp */; }; + 9A90387625D0024500F14179 /* Config_Devices_Arbitrary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90381A25D0024500F14179 /* Config_Devices_Arbitrary.cpp */; }; + 9A90387725D0024500F14179 /* Config_Devices_Arbitrary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90381A25D0024500F14179 /* Config_Devices_Arbitrary.cpp */; }; + 9A90387825D0024500F14179 /* Config_Devices_Arbitrary.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90381A25D0024500F14179 /* Config_Devices_Arbitrary.cpp */; }; + 9A90388025D0026400F14179 /* XmlLiteCompositeTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90387C25D0026400F14179 /* XmlLiteCompositeTypes.cpp */; }; + 9A90388125D0026400F14179 /* XmlLiteCompositeTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90387C25D0026400F14179 /* XmlLiteCompositeTypes.cpp */; }; + 9A90388225D0026400F14179 /* XmlLiteCompositeTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90387C25D0026400F14179 /* XmlLiteCompositeTypes.cpp */; }; + 9A90388325D0026400F14179 /* XmlLiteCompositeTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90387C25D0026400F14179 /* XmlLiteCompositeTypes.cpp */; }; + 9A90388425D0026400F14179 /* XmlLiteParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90387D25D0026400F14179 /* XmlLiteParser.cpp */; }; + 9A90388525D0026400F14179 /* XmlLiteParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90387D25D0026400F14179 /* XmlLiteParser.cpp */; }; + 9A90388625D0026400F14179 /* XmlLiteParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90387D25D0026400F14179 /* XmlLiteParser.cpp */; }; + 9A90388725D0026400F14179 /* XmlLiteParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90387D25D0026400F14179 /* XmlLiteParser.cpp */; }; + 9A90388825D0026400F14179 /* xmlLiteSimpleTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90387E25D0026400F14179 /* xmlLiteSimpleTypes.cpp */; }; + 9A90388925D0026400F14179 /* xmlLiteSimpleTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90387E25D0026400F14179 /* xmlLiteSimpleTypes.cpp */; }; + 9A90388A25D0026400F14179 /* xmlLiteSimpleTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90387E25D0026400F14179 /* xmlLiteSimpleTypes.cpp */; }; + 9A90388B25D0026400F14179 /* xmlLiteSimpleTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A90387E25D0026400F14179 /* xmlLiteSimpleTypes.cpp */; }; 9A9223312402FD1000483CBA /* main.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9223302402FD1000483CBA /* main.cpp */; }; 9A9AEB8D243F73CE00FBD7D8 /* unicode_conversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9AEB8C243F73CE00FBD7D8 /* unicode_conversions.cpp */; }; 9A9AEB8E243F752C00FBD7D8 /* unicode_conversions.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9A9AEB8C243F73CE00FBD7D8 /* unicode_conversions.cpp */; }; @@ -343,6 +447,60 @@ 9A838CC425348610008303F5 /* OcMiscLib.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = OcMiscLib.h; sourceTree = ""; }; 9A838CC52534933F008303F5 /* Base.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Base.h; sourceTree = ""; }; 9A838CC62534946C008303F5 /* ProcessorBind.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ProcessorBind.h; sourceTree = ""; }; + 9A9037E825D0010500F14179 /* config-test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "config-test.h"; sourceTree = ""; }; + 9A9037E925D0010500F14179 /* xml_lite-test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "xml_lite-test.cpp"; sourceTree = ""; }; + 9A9037EA25D0010500F14179 /* xml_lite-test.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "xml_lite-test.h"; sourceTree = ""; }; + 9A9037EB25D0010500F14179 /* config-test.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = "config-test.cpp"; sourceTree = ""; }; + 9A9037F525D0024500F14179 /* Config_GUI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_GUI.cpp; sourceTree = ""; }; + 9A9037F625D0024500F14179 /* Config_RtVariables.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_RtVariables.cpp; sourceTree = ""; }; + 9A9037F725D0024500F14179 /* Config_SMBIOS.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_SMBIOS.cpp; sourceTree = ""; }; + 9A9037F825D0024500F14179 /* Config_KernelAndKextPatches.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_KernelAndKextPatches.h; sourceTree = ""; }; + 9A9037F925D0024500F14179 /* Config_Graphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_Graphics.h; sourceTree = ""; }; + 9A9037FA25D0024500F14179 /* Config_Devices_Audio.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_Devices_Audio.cpp; sourceTree = ""; }; + 9A9037FB25D0024500F14179 /* Config_ACPI_DSDT.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_ACPI_DSDT.h; sourceTree = ""; }; + 9A9037FC25D0024500F14179 /* ConfigPlist.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConfigPlist.h; sourceTree = ""; }; + 9A9037FD25D0024500F14179 /* Config_KernelAndKextPatches.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_KernelAndKextPatches.cpp; sourceTree = ""; }; + 9A9037FE25D0024500F14179 /* Config_Quirks.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_Quirks.cpp; sourceTree = ""; }; + 9A9037FF25D0024500F14179 /* CompareSettings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CompareSettings.h; sourceTree = ""; }; + 9A90380025D0024500F14179 /* Config_Devices_Audio.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_Devices_Audio.h; sourceTree = ""; }; + 9A90380125D0024500F14179 /* Config_CPU.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_CPU.cpp; sourceTree = ""; }; + 9A90380225D0024500F14179 /* Config_Quirks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_Quirks.h; sourceTree = ""; }; + 9A90380325D0024500F14179 /* Config_ACPI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_ACPI.h; sourceTree = ""; }; + 9A90380425D0024500F14179 /* Config_Devices_FakeID.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_Devices_FakeID.cpp; sourceTree = ""; }; + 9A90380525D0024500F14179 /* Config_Devices_Properties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_Devices_Properties.h; sourceTree = ""; }; + 9A90380625D0024500F14179 /* Config_Boot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_Boot.h; sourceTree = ""; }; + 9A90380725D0024500F14179 /* Config_ACPI_SSDT.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_ACPI_SSDT.cpp; sourceTree = ""; }; + 9A90380825D0024500F14179 /* Config_Boot.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_Boot.cpp; sourceTree = ""; }; + 9A90380925D0024500F14179 /* Config_Devices_AddProperties.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_Devices_AddProperties.cpp; sourceTree = ""; }; + 9A90380A25D0024500F14179 /* Config_Devices_Arbitrary.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_Devices_Arbitrary.h; sourceTree = ""; }; + 9A90380B25D0024500F14179 /* ConfigPlist.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConfigPlist.cpp; sourceTree = ""; }; + 9A90380C25D0024500F14179 /* Config_Devices_USB.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_Devices_USB.cpp; sourceTree = ""; }; + 9A90380D25D0024500F14179 /* Config_Devices.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_Devices.cpp; sourceTree = ""; }; + 9A90380E25D0024500F14179 /* Config_SystemParameters.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_SystemParameters.h; sourceTree = ""; }; + 9A90380F25D0024500F14179 /* Config_SMBIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_SMBIOS.h; sourceTree = ""; }; + 9A90381025D0024500F14179 /* Config_ACPI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_ACPI.cpp; sourceTree = ""; }; + 9A90381125D0024500F14179 /* Config_Devices_Properties.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_Devices_Properties.cpp; sourceTree = ""; }; + 9A90381225D0024500F14179 /* Config_Devices.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_Devices.h; sourceTree = ""; }; + 9A90381325D0024500F14179 /* Config_Graphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_Graphics.cpp; sourceTree = ""; }; + 9A90381425D0024500F14179 /* Config_CPU.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_CPU.h; sourceTree = ""; }; + 9A90381525D0024500F14179 /* Config_BootGraphics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_BootGraphics.h; sourceTree = ""; }; + 9A90381625D0024500F14179 /* Config_SystemParameters.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_SystemParameters.cpp; sourceTree = ""; }; + 9A90381725D0024500F14179 /* CompareSettings.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CompareSettings.cpp; sourceTree = ""; }; + 9A90381825D0024500F14179 /* Config_ACPI_DSDT.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_ACPI_DSDT.cpp; sourceTree = ""; }; + 9A90381925D0024500F14179 /* Config_BootGraphics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_BootGraphics.cpp; sourceTree = ""; }; + 9A90381A25D0024500F14179 /* Config_Devices_Arbitrary.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Config_Devices_Arbitrary.cpp; sourceTree = ""; }; + 9A90381B25D0024500F14179 /* Config_ACPI_SSDT.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_ACPI_SSDT.h; sourceTree = ""; }; + 9A90381C25D0024500F14179 /* Config_GUI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_GUI.h; sourceTree = ""; }; + 9A90381D25D0024500F14179 /* Config_RtVariables.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_RtVariables.h; sourceTree = ""; }; + 9A90381E25D0024500F14179 /* Config_Devices_FakeID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_Devices_FakeID.h; sourceTree = ""; }; + 9A90381F25D0024500F14179 /* Config_Devices_USB.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_Devices_USB.h; sourceTree = ""; }; + 9A90382025D0024500F14179 /* Config_Devices_AddProperties.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Config_Devices_AddProperties.h; sourceTree = ""; }; + 9A90387A25D0026400F14179 /* XmlLiteParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XmlLiteParser.h; sourceTree = ""; }; + 9A90387B25D0026400F14179 /* xmlLiteSimpleTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = xmlLiteSimpleTypes.h; sourceTree = ""; }; + 9A90387C25D0026400F14179 /* XmlLiteCompositeTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XmlLiteCompositeTypes.cpp; sourceTree = ""; }; + 9A90387D25D0026400F14179 /* XmlLiteParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = XmlLiteParser.cpp; sourceTree = ""; }; + 9A90387E25D0026400F14179 /* xmlLiteSimpleTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = xmlLiteSimpleTypes.cpp; sourceTree = ""; }; + 9A90387F25D0026400F14179 /* XmlLiteCompositeTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = XmlLiteCompositeTypes.h; sourceTree = ""; }; 9A92232D2402FD1000483CBA /* cpp_tests UTF16 signed char */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "cpp_tests UTF16 signed char"; sourceTree = BUILT_PRODUCTS_DIR; }; 9A9223302402FD1000483CBA /* main.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = ""; }; 9A9AEB8B243F73CE00FBD7D8 /* unicode_conversions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = unicode_conversions.h; sourceTree = ""; }; @@ -424,6 +582,8 @@ children = ( 9A0B08512402FE9B00E2B470 /* all_tests.cpp */, 9A0B08542402FE9B00E2B470 /* all_tests.h */, + 9A9037EB25D0010500F14179 /* config-test.cpp */, + 9A9037E825D0010500F14179 /* config-test.h */, 9A838CA0253423F0008303F5 /* find_replace_mask_Clover_tests.cpp */, 9A838CA2253423F0008303F5 /* find_replace_mask_Clover_tests.h */, 9A838CA3253423F0008303F5 /* find_replace_mask_OC_tests.cpp */, @@ -452,6 +612,8 @@ 9A0B084E2402FE9B00E2B470 /* XArray_tests.h */, 9A670D1B24E535AB00B5D780 /* XBuffer_tests.cpp */, 9A670D1A24E535AB00B5D780 /* XBuffer_tests.h */, + 9A9037E925D0010500F14179 /* xml_lite-test.cpp */, + 9A9037EA25D0010500F14179 /* xml_lite-test.h */, 9A0B08522402FE9B00E2B470 /* XObjArray_tests.cpp */, 9A0B08502402FE9B00E2B470 /* XObjArray_tests.h */, 9A4FFA802451C88D0050B38B /* XString_test.cpp */, @@ -478,6 +640,7 @@ 9A28CCAC241B816400F3D247 /* Platform */ = { isa = PBXGroup; children = ( + 9A9037F425D0024500F14179 /* ConfigPlist */, 9A4C5769255AAD07004F0B21 /* MacOsVersion.cpp */, 9A4C576A255AAD07004F0B21 /* MacOsVersion.h */, 9A838CB325347C36008303F5 /* MemoryOperation.c */, @@ -534,9 +697,10 @@ 9A36E51C24F3B5B4007A1107 /* rEFIt_UEFI */ = { isa = PBXGroup; children = ( - 9A36E52324F3BB52007A1107 /* libeg */, - 9A0B084C2402FE9B00E2B470 /* cpp_unit_test */, 9A0B08432402FE9300E2B470 /* cpp_foundation */, + 9A0B084C2402FE9B00E2B470 /* cpp_unit_test */, + 9A90387925D0026400F14179 /* cpp_lib */, + 9A36E52324F3BB52007A1107 /* libeg */, 9AD469462452B30500D6D0DB /* gui */, 9A28CCAC241B816400F3D247 /* Platform */, ); @@ -617,6 +781,70 @@ path = Library; sourceTree = ""; }; + 9A9037F425D0024500F14179 /* ConfigPlist */ = { + isa = PBXGroup; + children = ( + 9A90381725D0024500F14179 /* CompareSettings.cpp */, + 9A9037FF25D0024500F14179 /* CompareSettings.h */, + 9A90381825D0024500F14179 /* Config_ACPI_DSDT.cpp */, + 9A9037FB25D0024500F14179 /* Config_ACPI_DSDT.h */, + 9A90380725D0024500F14179 /* Config_ACPI_SSDT.cpp */, + 9A90381B25D0024500F14179 /* Config_ACPI_SSDT.h */, + 9A90381025D0024500F14179 /* Config_ACPI.cpp */, + 9A90380325D0024500F14179 /* Config_ACPI.h */, + 9A90380825D0024500F14179 /* Config_Boot.cpp */, + 9A90380625D0024500F14179 /* Config_Boot.h */, + 9A90381925D0024500F14179 /* Config_BootGraphics.cpp */, + 9A90381525D0024500F14179 /* Config_BootGraphics.h */, + 9A90380125D0024500F14179 /* Config_CPU.cpp */, + 9A90381425D0024500F14179 /* Config_CPU.h */, + 9A90380925D0024500F14179 /* Config_Devices_AddProperties.cpp */, + 9A90382025D0024500F14179 /* Config_Devices_AddProperties.h */, + 9A90381A25D0024500F14179 /* Config_Devices_Arbitrary.cpp */, + 9A90380A25D0024500F14179 /* Config_Devices_Arbitrary.h */, + 9A9037FA25D0024500F14179 /* Config_Devices_Audio.cpp */, + 9A90380025D0024500F14179 /* Config_Devices_Audio.h */, + 9A90380425D0024500F14179 /* Config_Devices_FakeID.cpp */, + 9A90381E25D0024500F14179 /* Config_Devices_FakeID.h */, + 9A90381125D0024500F14179 /* Config_Devices_Properties.cpp */, + 9A90380525D0024500F14179 /* Config_Devices_Properties.h */, + 9A90380C25D0024500F14179 /* Config_Devices_USB.cpp */, + 9A90381F25D0024500F14179 /* Config_Devices_USB.h */, + 9A90380D25D0024500F14179 /* Config_Devices.cpp */, + 9A90381225D0024500F14179 /* Config_Devices.h */, + 9A90381325D0024500F14179 /* Config_Graphics.cpp */, + 9A9037F925D0024500F14179 /* Config_Graphics.h */, + 9A9037F525D0024500F14179 /* Config_GUI.cpp */, + 9A90381C25D0024500F14179 /* Config_GUI.h */, + 9A9037FD25D0024500F14179 /* Config_KernelAndKextPatches.cpp */, + 9A9037F825D0024500F14179 /* Config_KernelAndKextPatches.h */, + 9A9037FE25D0024500F14179 /* Config_Quirks.cpp */, + 9A90380225D0024500F14179 /* Config_Quirks.h */, + 9A9037F625D0024500F14179 /* Config_RtVariables.cpp */, + 9A90381D25D0024500F14179 /* Config_RtVariables.h */, + 9A9037F725D0024500F14179 /* Config_SMBIOS.cpp */, + 9A90380F25D0024500F14179 /* Config_SMBIOS.h */, + 9A90381625D0024500F14179 /* Config_SystemParameters.cpp */, + 9A90380E25D0024500F14179 /* Config_SystemParameters.h */, + 9A90380B25D0024500F14179 /* ConfigPlist.cpp */, + 9A9037FC25D0024500F14179 /* ConfigPlist.h */, + ); + path = ConfigPlist; + sourceTree = ""; + }; + 9A90387925D0026400F14179 /* cpp_lib */ = { + isa = PBXGroup; + children = ( + 9A90387A25D0026400F14179 /* XmlLiteParser.h */, + 9A90387B25D0026400F14179 /* xmlLiteSimpleTypes.h */, + 9A90387C25D0026400F14179 /* XmlLiteCompositeTypes.cpp */, + 9A90387D25D0026400F14179 /* XmlLiteParser.cpp */, + 9A90387E25D0026400F14179 /* xmlLiteSimpleTypes.cpp */, + 9A90387F25D0026400F14179 /* XmlLiteCompositeTypes.h */, + ); + path = cpp_lib; + sourceTree = ""; + }; 9A9223242402FD1000483CBA = { isa = PBXGroup; children = ( @@ -773,44 +1001,70 @@ files = ( 9A36E50524F3B537007A1107 /* TagInt64.cpp in Sources */, 9A36E50124F3B537007A1107 /* TagDict.cpp in Sources */, + 9A90382E25D0024500F14179 /* Config_Devices_Audio.cpp in Sources */, + 9A90383E25D0024500F14179 /* Config_Devices_FakeID.cpp in Sources */, 9AFDD0CB25CE798300EEAF06 /* MemoryOperation.c in Sources */, 9A36E50D24F3B537007A1107 /* TagData.cpp in Sources */, 9AD0358D25C57AFA00E58351 /* MemoryAllocationLib.c in Sources */, + 9A90382225D0024500F14179 /* Config_GUI.cpp in Sources */, 9A4185B22439E4D600BEAFB8 /* LoadOptions_test.cpp in Sources */, + 9A90388125D0026400F14179 /* XmlLiteCompositeTypes.cpp in Sources */, 9A36E52D24F3C846007A1107 /* plist_tests.cpp in Sources */, 9A0B08732403B08400E2B470 /* XObjArray_tests.cpp in Sources */, + 9A90387625D0024500F14179 /* Config_Devices_Arbitrary.cpp in Sources */, 9A36E53D24F3EDED007A1107 /* base64.cpp in Sources */, + 9A90386E25D0024500F14179 /* Config_ACPI_DSDT.cpp in Sources */, + 9A90384E25D0024500F14179 /* ConfigPlist.cpp in Sources */, 9AD0359025C57BF700E58351 /* BaseLib.c in Sources */, + 9A90384625D0024500F14179 /* Config_Boot.cpp in Sources */, + 9A90383A25D0024500F14179 /* Config_CPU.cpp in Sources */, 9A28CD20241BB61B00F3D247 /* abort.cpp in Sources */, + 9A90383225D0024500F14179 /* Config_KernelAndKextPatches.cpp in Sources */, + 9A90388925D0026400F14179 /* xmlLiteSimpleTypes.cpp in Sources */, + 9A90385A25D0024500F14179 /* Config_ACPI.cpp in Sources */, 9A4FFA842451C9740050B38B /* XString.cpp in Sources */, 9A4FFA822451C88D0050B38B /* XString_test.cpp in Sources */, 9A36E51924F3B537007A1107 /* TagKey.cpp in Sources */, + 9A90382625D0024500F14179 /* Config_RtVariables.cpp in Sources */, 9A9EA7F9245AAB310076EC02 /* XToolsCommon_test.cpp in Sources */, 9A36E52724F3BB6B007A1107 /* FloatLib.cpp in Sources */, 9A4C576C255AAD07004F0B21 /* MacOsVersion.cpp in Sources */, 9A4C5772255AB280004F0B21 /* MacOsVersion_test.cpp in Sources */, + 9A90386625D0024500F14179 /* Config_SystemParameters.cpp in Sources */, + 9A90384225D0024500F14179 /* Config_ACPI_SSDT.cpp in Sources */, 9A838CB125345E93008303F5 /* find_replace_mask_Clover_tests.cpp in Sources */, 9A28CD23241BB61B00F3D247 /* strlen.cpp in Sources */, + 9A90384A25D0024500F14179 /* Config_Devices_AddProperties.cpp in Sources */, + 9A90383625D0024500F14179 /* Config_Quirks.cpp in Sources */, + 9A90385625D0024500F14179 /* Config_Devices.cpp in Sources */, 9A28CD4C241F4CCE00F3D247 /* xcode_utf_fixed.cpp in Sources */, + 9A90385E25D0024500F14179 /* Config_Devices_Properties.cpp in Sources */, 9A0B08742403B08400E2B470 /* main.cpp in Sources */, 9A28CD17241BACBB00F3D247 /* strlen_test.cpp in Sources */, 9A28CD0D241B8DD400F3D247 /* strcmp_test.cpp in Sources */, 9A28CD0A241B8DD400F3D247 /* strncmp_test.cpp in Sources */, 9A0B087A2403B08400E2B470 /* all_tests.cpp in Sources */, 9A9AEB8E243F752C00FBD7D8 /* unicode_conversions.cpp in Sources */, + 9A90385225D0024500F14179 /* Config_Devices_USB.cpp in Sources */, + 9A90386225D0024500F14179 /* Config_Graphics.cpp in Sources */, 9A0B087B2403B08400E2B470 /* global_test.cpp in Sources */, 9A36E4FD24F3B537007A1107 /* TagBool.cpp in Sources */, + 9A9037ED25D0010500F14179 /* xml_lite-test.cpp in Sources */, 9A36E4F524F3B537007A1107 /* plist.cpp in Sources */, 9ACAB1192426255C00BDB3CF /* printf_lite.c in Sources */, 9A838CA7253425A3008303F5 /* DataPatcher.c in Sources */, 9A36E4F924F3B537007A1107 /* xml.cpp in Sources */, + 9A90388525D0026400F14179 /* XmlLiteParser.cpp in Sources */, 9A0B087D2403B08400E2B470 /* XStringArray_test.cpp in Sources */, 9A36E51124F3B537007A1107 /* TagArray.cpp in Sources */, 9A36E4F124F3B537007A1107 /* TagString8.cpp in Sources */, 9A36E50924F3B537007A1107 /* TagDate.cpp in Sources */, 9AD0359525C57C8A00E58351 /* PrintLib.c in Sources */, 9A4185C12439F73A00BEAFB8 /* XStringArray.cpp in Sources */, + 9A9037F125D0010500F14179 /* config-test.cpp in Sources */, 9A36E52024F3B82A007A1107 /* b64cdecode.cpp in Sources */, + 9A90382A25D0024500F14179 /* Config_SMBIOS.cpp in Sources */, + 9A90387225D0024500F14179 /* Config_BootGraphics.cpp in Sources */, 9A0B087E2403B08400E2B470 /* XArray_tests.cpp in Sources */, 9A838CBB25348530008303F5 /* BaseMemoryLib.c in Sources */, 9A670D1D24E535AB00B5D780 /* XBuffer_tests.cpp in Sources */, @@ -827,44 +1081,70 @@ files = ( 9A36E50724F3B537007A1107 /* TagInt64.cpp in Sources */, 9A36E50324F3B537007A1107 /* TagDict.cpp in Sources */, + 9A90383025D0024500F14179 /* Config_Devices_Audio.cpp in Sources */, + 9A90384025D0024500F14179 /* Config_Devices_FakeID.cpp in Sources */, 9AFDD0CD25CE798300EEAF06 /* MemoryOperation.c in Sources */, 9A36E50F24F3B537007A1107 /* TagData.cpp in Sources */, 9AD0358F25C57AFB00E58351 /* MemoryAllocationLib.c in Sources */, + 9A90382425D0024500F14179 /* Config_GUI.cpp in Sources */, 9A2A7C6C24576CCE00422263 /* LoadOptions_test.cpp in Sources */, + 9A90388325D0026400F14179 /* XmlLiteCompositeTypes.cpp in Sources */, 9A36E52F24F3C846007A1107 /* plist_tests.cpp in Sources */, 9A2A7C6D24576CCE00422263 /* XObjArray_tests.cpp in Sources */, + 9A90387825D0024500F14179 /* Config_Devices_Arbitrary.cpp in Sources */, 9A36E53F24F3EDED007A1107 /* base64.cpp in Sources */, + 9A90387025D0024500F14179 /* Config_ACPI_DSDT.cpp in Sources */, + 9A90385025D0024500F14179 /* ConfigPlist.cpp in Sources */, 9AD0359225C57BF700E58351 /* BaseLib.c in Sources */, + 9A90384825D0024500F14179 /* Config_Boot.cpp in Sources */, + 9A90383C25D0024500F14179 /* Config_CPU.cpp in Sources */, 9A2A7C6E24576CCE00422263 /* abort.cpp in Sources */, + 9A90383425D0024500F14179 /* Config_KernelAndKextPatches.cpp in Sources */, + 9A90388B25D0026400F14179 /* xmlLiteSimpleTypes.cpp in Sources */, + 9A90385C25D0024500F14179 /* Config_ACPI.cpp in Sources */, 9A2A7C6F24576CCE00422263 /* XString.cpp in Sources */, 9A2A7C7024576CCE00422263 /* XString_test.cpp in Sources */, 9A36E51B24F3B537007A1107 /* TagKey.cpp in Sources */, + 9A90382825D0024500F14179 /* Config_RtVariables.cpp in Sources */, 9A9EA7FB245AAB310076EC02 /* XToolsCommon_test.cpp in Sources */, 9A36E52924F3BB6B007A1107 /* FloatLib.cpp in Sources */, 9A4C576E255AAD07004F0B21 /* MacOsVersion.cpp in Sources */, 9A4C5774255AB280004F0B21 /* MacOsVersion_test.cpp in Sources */, + 9A90386825D0024500F14179 /* Config_SystemParameters.cpp in Sources */, + 9A90384425D0024500F14179 /* Config_ACPI_SSDT.cpp in Sources */, 9A838CB225345E94008303F5 /* find_replace_mask_Clover_tests.cpp in Sources */, 9A2A7C7124576CCE00422263 /* strlen.cpp in Sources */, + 9A90384C25D0024500F14179 /* Config_Devices_AddProperties.cpp in Sources */, + 9A90383825D0024500F14179 /* Config_Quirks.cpp in Sources */, + 9A90385825D0024500F14179 /* Config_Devices.cpp in Sources */, 9A2A7C7224576CCE00422263 /* xcode_utf_fixed.cpp in Sources */, + 9A90386025D0024500F14179 /* Config_Devices_Properties.cpp in Sources */, 9A2A7C7324576CCE00422263 /* main.cpp in Sources */, 9A2A7C7424576CCE00422263 /* strlen_test.cpp in Sources */, 9A2A7C7524576CCE00422263 /* strcmp_test.cpp in Sources */, 9A2A7C7624576CCE00422263 /* strncmp_test.cpp in Sources */, 9A2A7C7724576CCE00422263 /* all_tests.cpp in Sources */, 9A2A7C7824576CCE00422263 /* unicode_conversions.cpp in Sources */, + 9A90385425D0024500F14179 /* Config_Devices_USB.cpp in Sources */, + 9A90386425D0024500F14179 /* Config_Graphics.cpp in Sources */, 9A2A7C7924576CCE00422263 /* global_test.cpp in Sources */, 9A36E4FF24F3B537007A1107 /* TagBool.cpp in Sources */, + 9A9037EF25D0010500F14179 /* xml_lite-test.cpp in Sources */, 9A36E4F724F3B537007A1107 /* plist.cpp in Sources */, 9A2A7C7A24576CCE00422263 /* printf_lite.c in Sources */, 9A838CA9253425A4008303F5 /* DataPatcher.c in Sources */, 9A36E4FB24F3B537007A1107 /* xml.cpp in Sources */, + 9A90388725D0026400F14179 /* XmlLiteParser.cpp in Sources */, 9A2A7C7B24576CCE00422263 /* XStringArray_test.cpp in Sources */, 9A36E51324F3B537007A1107 /* TagArray.cpp in Sources */, 9A36E4F324F3B537007A1107 /* TagString8.cpp in Sources */, 9A36E50B24F3B537007A1107 /* TagDate.cpp in Sources */, 9AD0359725C57C8A00E58351 /* PrintLib.c in Sources */, 9A2A7C7D24576CCE00422263 /* XStringArray.cpp in Sources */, + 9A9037F325D0010500F14179 /* config-test.cpp in Sources */, 9A36E52224F3B82A007A1107 /* b64cdecode.cpp in Sources */, + 9A90382C25D0024500F14179 /* Config_SMBIOS.cpp in Sources */, + 9A90387425D0024500F14179 /* Config_BootGraphics.cpp in Sources */, 9A2A7C7E24576CCE00422263 /* XArray_tests.cpp in Sources */, 9A838CBD25348530008303F5 /* BaseMemoryLib.c in Sources */, 9A670D1F24E535AB00B5D780 /* XBuffer_tests.cpp in Sources */, @@ -881,44 +1161,70 @@ files = ( 9A36E50624F3B537007A1107 /* TagInt64.cpp in Sources */, 9A36E50224F3B537007A1107 /* TagDict.cpp in Sources */, + 9A90382F25D0024500F14179 /* Config_Devices_Audio.cpp in Sources */, + 9A90383F25D0024500F14179 /* Config_Devices_FakeID.cpp in Sources */, 9AFDD0CC25CE798300EEAF06 /* MemoryOperation.c in Sources */, 9A36E50E24F3B537007A1107 /* TagData.cpp in Sources */, 9AD0358E25C57AFA00E58351 /* MemoryAllocationLib.c in Sources */, + 9A90382325D0024500F14179 /* Config_GUI.cpp in Sources */, 9A4185B32439E4D600BEAFB8 /* LoadOptions_test.cpp in Sources */, + 9A90388225D0026400F14179 /* XmlLiteCompositeTypes.cpp in Sources */, 9A36E52E24F3C846007A1107 /* plist_tests.cpp in Sources */, 9A57C21A2418B9A00029A39F /* XObjArray_tests.cpp in Sources */, + 9A90387725D0024500F14179 /* Config_Devices_Arbitrary.cpp in Sources */, 9A36E53E24F3EDED007A1107 /* base64.cpp in Sources */, + 9A90386F25D0024500F14179 /* Config_ACPI_DSDT.cpp in Sources */, + 9A90384F25D0024500F14179 /* ConfigPlist.cpp in Sources */, 9AD0359125C57BF700E58351 /* BaseLib.c in Sources */, + 9A90384725D0024500F14179 /* Config_Boot.cpp in Sources */, + 9A90383B25D0024500F14179 /* Config_CPU.cpp in Sources */, 9A28CD21241BB61B00F3D247 /* abort.cpp in Sources */, + 9A90383325D0024500F14179 /* Config_KernelAndKextPatches.cpp in Sources */, + 9A90388A25D0026400F14179 /* xmlLiteSimpleTypes.cpp in Sources */, + 9A90385B25D0024500F14179 /* Config_ACPI.cpp in Sources */, 9A4FFA852451C9740050B38B /* XString.cpp in Sources */, 9A4FFA832451C88D0050B38B /* XString_test.cpp in Sources */, 9A36E51A24F3B537007A1107 /* TagKey.cpp in Sources */, + 9A90382725D0024500F14179 /* Config_RtVariables.cpp in Sources */, 9A9EA7FA245AAB310076EC02 /* XToolsCommon_test.cpp in Sources */, 9A36E52824F3BB6B007A1107 /* FloatLib.cpp in Sources */, 9A4C576D255AAD07004F0B21 /* MacOsVersion.cpp in Sources */, 9A4C5773255AB280004F0B21 /* MacOsVersion_test.cpp in Sources */, + 9A90386725D0024500F14179 /* Config_SystemParameters.cpp in Sources */, + 9A90384325D0024500F14179 /* Config_ACPI_SSDT.cpp in Sources */, 9A838CB025345E93008303F5 /* find_replace_mask_Clover_tests.cpp in Sources */, 9A28CD24241BB61B00F3D247 /* strlen.cpp in Sources */, + 9A90384B25D0024500F14179 /* Config_Devices_AddProperties.cpp in Sources */, + 9A90383725D0024500F14179 /* Config_Quirks.cpp in Sources */, + 9A90385725D0024500F14179 /* Config_Devices.cpp in Sources */, 9A28CD4D241F4CCE00F3D247 /* xcode_utf_fixed.cpp in Sources */, + 9A90385F25D0024500F14179 /* Config_Devices_Properties.cpp in Sources */, 9A57C21B2418B9A00029A39F /* main.cpp in Sources */, 9A28CD18241BACBB00F3D247 /* strlen_test.cpp in Sources */, 9A28CD0E241B8DD400F3D247 /* strcmp_test.cpp in Sources */, 9A28CD0B241B8DD400F3D247 /* strncmp_test.cpp in Sources */, 9A57C2222418B9A00029A39F /* all_tests.cpp in Sources */, 9A9AEB8F243F752C00FBD7D8 /* unicode_conversions.cpp in Sources */, + 9A90385325D0024500F14179 /* Config_Devices_USB.cpp in Sources */, + 9A90386325D0024500F14179 /* Config_Graphics.cpp in Sources */, 9A57C2232418B9A00029A39F /* global_test.cpp in Sources */, 9A36E4FE24F3B537007A1107 /* TagBool.cpp in Sources */, + 9A9037EE25D0010500F14179 /* xml_lite-test.cpp in Sources */, 9A36E4F624F3B537007A1107 /* plist.cpp in Sources */, 9ACAB11A2426255C00BDB3CF /* printf_lite.c in Sources */, 9A838CA8253425A4008303F5 /* DataPatcher.c in Sources */, 9A36E4FA24F3B537007A1107 /* xml.cpp in Sources */, + 9A90388625D0026400F14179 /* XmlLiteParser.cpp in Sources */, 9A57C2252418B9A00029A39F /* XStringArray_test.cpp in Sources */, 9A36E51224F3B537007A1107 /* TagArray.cpp in Sources */, 9A36E4F224F3B537007A1107 /* TagString8.cpp in Sources */, 9A36E50A24F3B537007A1107 /* TagDate.cpp in Sources */, 9AD0359625C57C8A00E58351 /* PrintLib.c in Sources */, 9A4185C22439F73A00BEAFB8 /* XStringArray.cpp in Sources */, + 9A9037F225D0010500F14179 /* config-test.cpp in Sources */, 9A36E52124F3B82A007A1107 /* b64cdecode.cpp in Sources */, + 9A90382B25D0024500F14179 /* Config_SMBIOS.cpp in Sources */, + 9A90387325D0024500F14179 /* Config_BootGraphics.cpp in Sources */, 9A57C2272418B9A00029A39F /* XArray_tests.cpp in Sources */, 9A838CBC25348530008303F5 /* BaseMemoryLib.c in Sources */, 9A670D1E24E535AB00B5D780 /* XBuffer_tests.cpp in Sources */, @@ -936,21 +1242,38 @@ 9A36E50424F3B537007A1107 /* TagInt64.cpp in Sources */, 9A36E50024F3B537007A1107 /* TagDict.cpp in Sources */, 9A4C576B255AAD07004F0B21 /* MacOsVersion.cpp in Sources */, + 9A90383925D0024500F14179 /* Config_CPU.cpp in Sources */, 9A36E50C24F3B537007A1107 /* TagData.cpp in Sources */, + 9A90385925D0024500F14179 /* Config_ACPI.cpp in Sources */, 9AD0358C25C57A4500E58351 /* MemoryAllocationLib.c in Sources */, 9A0B085A2402FF8400E2B470 /* XObjArray_tests.cpp in Sources */, 9A7D518424FC32F700FA1CC3 /* XBuffer.cpp in Sources */, 9A36E52C24F3C846007A1107 /* plist_tests.cpp in Sources */, + 9A90385D25D0024500F14179 /* Config_Devices_Properties.cpp in Sources */, + 9A90385125D0024500F14179 /* Config_Devices_USB.cpp in Sources */, + 9A9037EC25D0010500F14179 /* xml_lite-test.cpp in Sources */, + 9A90388825D0026400F14179 /* xmlLiteSimpleTypes.cpp in Sources */, 9A28CD1F241BB61B00F3D247 /* abort.cpp in Sources */, 9A36E53C24F3EDED007A1107 /* base64.cpp in Sources */, + 9A90385525D0024500F14179 /* Config_Devices.cpp in Sources */, 9A4FFA7E2451C8330050B38B /* XString.cpp in Sources */, 9A4FFA812451C88D0050B38B /* XString_test.cpp in Sources */, + 9A90387525D0024500F14179 /* Config_Devices_Arbitrary.cpp in Sources */, 9A28CD22241BB61B00F3D247 /* strlen.cpp in Sources */, + 9A90384525D0024500F14179 /* Config_Boot.cpp in Sources */, 9A838CA6253425A3008303F5 /* DataPatcher.c in Sources */, + 9A90382525D0024500F14179 /* Config_RtVariables.cpp in Sources */, + 9A90382125D0024500F14179 /* Config_GUI.cpp in Sources */, 9A36E51824F3B537007A1107 /* TagKey.cpp in Sources */, + 9A90384125D0024500F14179 /* Config_ACPI_SSDT.cpp in Sources */, 9A9EA7F8245AAB310076EC02 /* XToolsCommon_test.cpp in Sources */, + 9A90383125D0024500F14179 /* Config_KernelAndKextPatches.cpp in Sources */, + 9A90383D25D0024500F14179 /* Config_Devices_FakeID.cpp in Sources */, + 9A90388025D0026400F14179 /* XmlLiteCompositeTypes.cpp in Sources */, 9A36E52624F3BB6B007A1107 /* FloatLib.cpp in Sources */, 9A838CB425347C36008303F5 /* MemoryOperation.c in Sources */, + 9A90387125D0024500F14179 /* Config_BootGraphics.cpp in Sources */, + 9A90386525D0024500F14179 /* Config_SystemParameters.cpp in Sources */, 9A838CC0253485C8008303F5 /* BaseLib.c in Sources */, 9A838CA4253423F0008303F5 /* find_replace_mask_Clover_tests.cpp in Sources */, 9A28CD4B241F4CCE00F3D247 /* xcode_utf_fixed.cpp in Sources */, @@ -959,10 +1282,14 @@ 9A28CD0C241B8DD400F3D247 /* strcmp_test.cpp in Sources */, 9A28CD09241B8DD400F3D247 /* strncmp_test.cpp in Sources */, 9A0B08592402FF8200E2B470 /* all_tests.cpp in Sources */, + 9A90384D25D0024500F14179 /* ConfigPlist.cpp in Sources */, + 9A90383525D0024500F14179 /* Config_Quirks.cpp in Sources */, + 9A9037F025D0010500F14179 /* config-test.cpp in Sources */, 9A0B08662403144C00E2B470 /* global_test.cpp in Sources */, 9A4185B12439E4D600BEAFB8 /* LoadOptions_test.cpp in Sources */, 9ACAB117242623EE00BDB3CF /* printf_lite.c in Sources */, 9A36E4FC24F3B537007A1107 /* TagBool.cpp in Sources */, + 9A90382D25D0024500F14179 /* Config_Devices_Audio.cpp in Sources */, 9A36E4F424F3B537007A1107 /* plist.cpp in Sources */, 9A0B08582402FF7F00E2B470 /* XStringArray_test.cpp in Sources */, 9A36E4F824F3B537007A1107 /* xml.cpp in Sources */, @@ -970,9 +1297,12 @@ 9A838CA5253423F0008303F5 /* find_replace_mask_OC_tests.cpp in Sources */, 9A7D518524FC32F700FA1CC3 /* XRBuffer.cpp in Sources */, 9A4185C02439F73A00BEAFB8 /* XStringArray.cpp in Sources */, + 9A90388425D0026400F14179 /* XmlLiteParser.cpp in Sources */, 9A36E51024F3B537007A1107 /* TagArray.cpp in Sources */, + 9A90382925D0024500F14179 /* Config_SMBIOS.cpp in Sources */, 9A36E4F024F3B537007A1107 /* TagString8.cpp in Sources */, 9A4C5771255AB280004F0B21 /* MacOsVersion_test.cpp in Sources */, + 9A90386125D0024500F14179 /* Config_Graphics.cpp in Sources */, 9A36E50824F3B537007A1107 /* TagDate.cpp in Sources */, 9AD0359425C57C8A00E58351 /* PrintLib.c in Sources */, 9A36E51F24F3B82A007A1107 /* b64cdecode.cpp in Sources */, @@ -982,6 +1312,8 @@ 9A670D1C24E535AB00B5D780 /* XBuffer_tests.cpp in Sources */, 9AA0458A2425F94D000D6970 /* printf_lite-test.cpp in Sources */, 9A36E51424F3B537007A1107 /* TagFloat.cpp in Sources */, + 9A90386D25D0024500F14179 /* Config_ACPI_DSDT.cpp in Sources */, + 9A90384925D0024500F14179 /* Config_Devices_AddProperties.cpp in Sources */, 9A0B085E240300E000E2B470 /* Platform.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1129,7 +1461,7 @@ GCC_PREFIX_HEADER = ""; GCC_PREPROCESSOR_DEFINITIONS = ( JIEF_DEBUG, - UNIT_TESTS, + UNIT_TESTS_MACOS, ); GCC_TREAT_IMPLICIT_FUNCTION_DECLARATIONS_AS_ERRORS = YES; GCC_TREAT_INCOMPATIBLE_POINTER_TYPE_WARNINGS_AS_ERRORS = YES; diff --git a/Xcode/cpp_tests/src/xcode_utf_fixed.cpp b/Xcode/cpp_tests/src/xcode_utf_fixed.cpp index a926e9b29..3b13fe908 100644 --- a/Xcode/cpp_tests/src/xcode_utf_fixed.cpp +++ b/Xcode/cpp_tests/src/xcode_utf_fixed.cpp @@ -29,7 +29,7 @@ #include #include //#include "../../../Include/Library/printf_lite.h" - +#include "../../../rEFIt_UEFI/Platform/BootLog.h" /* few tests for debug purpose */ extern "C" void xcode_utf_fixed_tests() @@ -55,6 +55,9 @@ extern "C" void xcode_utf_fixed_tests() wprintf(L"%ls\n", L"Hello world൧楔"); #endif + uint64_t uint64 = 1; + printf("Hello world൧楔 %llu error(s)\n", uint64); + DebugLog(2, "Hello world൧楔 %llu error(s)\n", uint64); size_t len1 = wcslen(L"Hell൧楔o world൧楔"); size_t len1f = wcslen_fixed(L"Hell൧楔o world൧楔"); @@ -71,6 +74,8 @@ extern "C" void xcode_utf_fixed_tests() printf("strstr1 = %ld, strstr1f = %ld\n", strstr1-str, strstr1f-str); } + printf("\n\n\n"); + // char32_t c32 = (int)-1; } @@ -216,6 +221,18 @@ extern "C" int printf(const char* format, ...) #endif return ret; } +extern "C" int vprintf(const char* format, va_list va) +{ + int ret; + #if __WCHAR_MAX__ <= 0xFFFF + char buf[4095]; + ret = PRINTF_FUNCTION_NAME(PRINTF_CFUNCTION_PREFIX, vsnprint, PRINTF_CFUNCTION_SUFFIX)(buf, sizeof(buf)-1, format, va); + write(1, buf, strlen(buf)); + #else + ret = vprintf(format, va); + #endif + return ret; +} #endif //extern "C" int snprintf(char * __restrict buf, size_t len, const char * __restrict format, ...) diff --git a/rEFIt_UEFI/Platform/AmlGenerator.cpp b/rEFIt_UEFI/Platform/AmlGenerator.cpp index 6994af3c0..9175e7c65 100644 --- a/rEFIt_UEFI/Platform/AmlGenerator.cpp +++ b/rEFIt_UEFI/Platform/AmlGenerator.cpp @@ -9,6 +9,7 @@ */ #include "AmlGenerator.h" +#include // Only use angled for Platform, else, xcode project won't compile BOOLEAN aml_add_to_parent(AML_CHUNK* parent, AML_CHUNK* node) { diff --git a/rEFIt_UEFI/Platform/AmlGenerator.h b/rEFIt_UEFI/Platform/AmlGenerator.h index a3d36b81b..fd76e39ae 100644 --- a/rEFIt_UEFI/Platform/AmlGenerator.h +++ b/rEFIt_UEFI/Platform/AmlGenerator.h @@ -10,7 +10,6 @@ #ifndef _AML_GENERATOR_H #define _AML_GENERATOR_H -#include // Only use angled for Platform, else, xcode project won't compile /* static inline BOOLEAN aml_isvalidchar(char c) diff --git a/rEFIt_UEFI/Platform/FixBiosDsdt.h b/rEFIt_UEFI/Platform/FixBiosDsdt.h index 6ad96bb3e..e134326e4 100644 --- a/rEFIt_UEFI/Platform/FixBiosDsdt.h +++ b/rEFIt_UEFI/Platform/FixBiosDsdt.h @@ -8,49 +8,13 @@ #ifndef PLATFORM_FIXBIOSDSDT_H_ #define PLATFORM_FIXBIOSDSDT_H_ -#include +extern "C" { +#include +} + #include "../cpp_foundation/XBuffer.h" #include "../Platform/MacOsVersion.h" -#include - - -//DSDT fixes MASK -//0x00FF -#define FIX_DTGP bit(0) -#define FIX_WARNING bit(1) -#define FIX_SHUTDOWN bit(2) -#define FIX_MCHC bit(3) -#define FIX_HPET bit(4) -#define FIX_LPC bit(5) -#define FIX_IPIC bit(6) -#define FIX_SBUS bit(7) -//0xFF00 -#define FIX_DISPLAY bit(8) -#define FIX_IDE bit(9) -#define FIX_SATA bit(10) -#define FIX_FIREWIRE bit(11) -#define FIX_USB bit(12) -#define FIX_LAN bit(13) -#define FIX_WIFI bit(14) -#define FIX_HDA bit(15) -//new bits 16-31 0xFFFF0000 -//#define FIX_NEW_WAY bit(31) will be reused -#define FIX_DARWIN bit(16) -#define FIX_RTC bit(17) -#define FIX_TMR bit(18) -#define FIX_IMEI bit(19) -#define FIX_INTELGFX bit(20) -#define FIX_WAK bit(21) -#define FIX_UNUSED bit(22) -#define FIX_ADP1 bit(23) -#define FIX_PNLF bit(24) -#define FIX_S3D bit(25) -#define FIX_ACST bit(26) -#define FIX_HDMI bit(27) -#define FIX_REGIONS bit(28) -#define FIX_HEADERS bit(29) -#define FIX_MUTEX bit(30) - +#include "../include/DsdtFixList.h" struct _oper_region { CHAR8 Name[8]; diff --git a/rEFIt_UEFI/Platform/MemoryOperation.c b/rEFIt_UEFI/Platform/MemoryOperation.c index 3b9730dd3..0ebdf731a 100644 --- a/rEFIt_UEFI/Platform/MemoryOperation.c +++ b/rEFIt_UEFI/Platform/MemoryOperation.c @@ -9,7 +9,7 @@ #include #ifndef DEBUG_MEMORYOPERATION -# ifdef UNIT_TESTS +# ifdef UNIT_TESTS_MACOS # define DEBUG_MEMORYOPERATION 0 # else # define DEBUG_MEMORYOPERATION 1 diff --git a/rEFIt_UEFI/Platform/Posix/abort.h b/rEFIt_UEFI/Platform/Posix/abort.h index fe1f8a96d..106966407 100755 --- a/rEFIt_UEFI/Platform/Posix/abort.h +++ b/rEFIt_UEFI/Platform/Posix/abort.h @@ -5,6 +5,10 @@ # define __attribute__(x) #endif +#ifndef __cplusplus // C doesn't know bool +#define bool unsigned char +#endif + extern bool stop_at_panic; extern bool i_have_panicked; diff --git a/rEFIt_UEFI/Platform/Posix/posix.h b/rEFIt_UEFI/Platform/Posix/posix.h index db6e322da..c83ab8c12 100755 --- a/rEFIt_UEFI/Platform/Posix/posix.h +++ b/rEFIt_UEFI/Platform/Posix/posix.h @@ -15,6 +15,7 @@ #include "stdarg.h" #include "stdlib.h" #include "string.h" +#include "strings.h" #include "wchar.h" #include "abort.h" #include "posix_additions.h" diff --git a/rEFIt_UEFI/Platform/Posix/strings.c b/rEFIt_UEFI/Platform/Posix/strings.c new file mode 100644 index 000000000..07d85f867 --- /dev/null +++ b/rEFIt_UEFI/Platform/Posix/strings.c @@ -0,0 +1,80 @@ +// +// strings.c +// CloverX64 +// +// Created by Jief on 01/02/2021. +// + +#include "strings.h" + + +/* + * This array is designed for mapping upper and lower case letter + * together for a case independent comparison. The mappings are + * based upon ascii character sequences. + */ +static const unsigned char charmap[] = { + '\000', '\001', '\002', '\003', '\004', '\005', '\006', '\007', + '\010', '\011', '\012', '\013', '\014', '\015', '\016', '\017', + '\020', '\021', '\022', '\023', '\024', '\025', '\026', '\027', + '\030', '\031', '\032', '\033', '\034', '\035', '\036', '\037', + '\040', '\041', '\042', '\043', '\044', '\045', '\046', '\047', + '\050', '\051', '\052', '\053', '\054', '\055', '\056', '\057', + '\060', '\061', '\062', '\063', '\064', '\065', '\066', '\067', + '\070', '\071', '\072', '\073', '\074', '\075', '\076', '\077', + '\100', '\141', '\142', '\143', '\144', '\145', '\146', '\147', + '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157', + '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167', + '\170', '\171', '\172', '\133', '\134', '\135', '\136', '\137', + '\140', '\141', '\142', '\143', '\144', '\145', '\146', '\147', + '\150', '\151', '\152', '\153', '\154', '\155', '\156', '\157', + '\160', '\161', '\162', '\163', '\164', '\165', '\166', '\167', + '\170', '\171', '\172', '\173', '\174', '\175', '\176', '\177', + '\200', '\201', '\202', '\203', '\204', '\205', '\206', '\207', + '\210', '\211', '\212', '\213', '\214', '\215', '\216', '\217', + '\220', '\221', '\222', '\223', '\224', '\225', '\226', '\227', + '\230', '\231', '\232', '\233', '\234', '\235', '\236', '\237', + '\240', '\241', '\242', '\243', '\244', '\245', '\246', '\247', + '\250', '\251', '\252', '\253', '\254', '\255', '\256', '\257', + '\260', '\261', '\262', '\263', '\264', '\265', '\266', '\267', + '\270', '\271', '\272', '\273', '\274', '\275', '\276', '\277', + '\300', '\341', '\342', '\343', '\344', '\345', '\346', '\347', + '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357', + '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367', + '\370', '\371', '\372', '\333', '\334', '\335', '\336', '\337', + '\340', '\341', '\342', '\343', '\344', '\345', '\346', '\347', + '\350', '\351', '\352', '\353', '\354', '\355', '\356', '\357', + '\360', '\361', '\362', '\363', '\364', '\365', '\366', '\367', + '\370', '\371', '\372', '\373', '\374', '\375', '\376', '\377', +}; + +int strncasecmp(const char* s1, const char* s2, size_t n) +{ + register unsigned char u1, u2; + for (; n != 0; --n) { + u1 = (unsigned char) *s1++; + u2 = (unsigned char) *s2++; + if (charmap[u1] != charmap[u2]) { + return charmap[u1] - charmap[u2]; + } + if (u1 == '\0') { + return 0; + } + } + return 0; +} + +int strcasecmp(const char* s1, const char* s2) +{ + register unsigned char u1, u2; + for (;;) { + u1 = (unsigned char) *s1++; + u2 = (unsigned char) *s2++; + if (charmap[u1] != charmap[u2]) { + return charmap[u1] - charmap[u2]; + } + if (u1 == '\0') { + return 0; + } + } +} diff --git a/rEFIt_UEFI/Platform/Posix/strings.h b/rEFIt_UEFI/Platform/Posix/strings.h new file mode 100644 index 000000000..3cd099c9e --- /dev/null +++ b/rEFIt_UEFI/Platform/Posix/strings.h @@ -0,0 +1,25 @@ +// +// strings.h +// CloverX64 +// +// Created by Jief on 01/02/2021. +// + +#ifndef strings_h +#define strings_h + +//#include +#include + +#ifdef __cplusplus +extern "C" { +#endif + +int strncasecmp(const char* s1, const char* s2, size_t n); +int strcasecmp(const char* s1, const char* s2); + +#ifdef __cplusplus +} +#endif + +#endif /* strings_h */ diff --git a/rEFIt_UEFI/Platform/Self.h b/rEFIt_UEFI/Platform/Self.h index bcec3d763..98e573f93 100644 --- a/rEFIt_UEFI/Platform/Self.h +++ b/rEFIt_UEFI/Platform/Self.h @@ -8,11 +8,12 @@ #ifndef PLATFORM_SELF_H_ #define PLATFORM_SELF_H_ -#include +#include "../cpp_foundation/XString.h" extern "C" { #include #include #include +#include } class Self diff --git a/rEFIt_UEFI/Platform/SelfOem.h b/rEFIt_UEFI/Platform/SelfOem.h index acfbd2c0d..95e864d2e 100644 --- a/rEFIt_UEFI/Platform/SelfOem.h +++ b/rEFIt_UEFI/Platform/SelfOem.h @@ -8,7 +8,6 @@ #ifndef PLATFORM_SELFOEM_H_ #define PLATFORM_SELFOEM_H_ -#include #include "Self.h" class SelfOem diff --git a/rEFIt_UEFI/Platform/Settings.cpp b/rEFIt_UEFI/Platform/Settings.cpp index 07348e0d1..7aef60df7 100755 --- a/rEFIt_UEFI/Platform/Settings.cpp +++ b/rEFIt_UEFI/Platform/Settings.cpp @@ -2193,6 +2193,10 @@ GetEarlyUserSettings ( // GetLegacyLanAddress = IsPropertyTrue(Prop); // Secure boot + /* this parameter, which should be called SecureBootSetupMode, is ignored if : + * it is true + * SecureBoot is already true. + */ Prop = BootDict->propertyForKey("Secure"); if (Prop != NULL) { if ( Prop->isFalse() ) { @@ -2276,6 +2280,10 @@ GetEarlyUserSettings ( } // XMP memory profiles + // -1 = do not detect + // 0 = Detect the better XMP profile + // 1 = Use first profile if present + // 2 = Use second profile Prop = BootDict->propertyForKey("XMPDetection"); if (Prop != NULL) { settingsData.Boot.XMPDetection = 0; diff --git a/rEFIt_UEFI/Platform/StateGenerator.cpp b/rEFIt_UEFI/Platform/StateGenerator.cpp index 94c993c20..01126a9e7 100644 --- a/rEFIt_UEFI/Platform/StateGenerator.cpp +++ b/rEFIt_UEFI/Platform/StateGenerator.cpp @@ -3,6 +3,7 @@ * 2010 mojodojo, 2012 slice */ +#include // Only use angled for Platform, else, xcode project won't compile #include "StateGenerator.h" #include "cpu.h" #include "smbios.h" diff --git a/rEFIt_UEFI/Platform/ati.h b/rEFIt_UEFI/Platform/ati.h index a7c055744..37d968db8 100644 --- a/rEFIt_UEFI/Platform/ati.h +++ b/rEFIt_UEFI/Platform/ati.h @@ -7,8 +7,6 @@ * big thank to Islam M. Ahmed Zaid for the updating the collection */ -//#include // Only use angled for Platform, else, xcode project won't compile //this include needed for Uefi types -//#include "ati_reg.h" #include "../include/Pci.h" #include "device_inject.h" class LOADER_ENTRY; diff --git a/rEFIt_UEFI/Platform/b64cdecode.cpp b/rEFIt_UEFI/Platform/b64cdecode.cpp index f2c6d7ad9..2ae2483ce 100755 --- a/rEFIt_UEFI/Platform/b64cdecode.cpp +++ b/rEFIt_UEFI/Platform/b64cdecode.cpp @@ -93,20 +93,16 @@ long base64_decode_block(const char* code_in, const int length_in, char* plainte * If DecodedSize != NULL, then size od decoded data is put there. * If return value is not NULL, DecodedSize IS > 0 */ -UINT8 *Base64DecodeClover(IN CONST CHAR8 *EncodedData, OUT UINTN *DecodedSize) +UINT8 *Base64DecodeClover(IN CONST CHAR8 *EncodedData, UINTN EncodedSize, OUT UINTN *DecodedSize) { - UINTN EncodedSize; INTN DecodedSizeInternal; UINT8 *DecodedData; base64_decodestate state_in; - if (EncodedData == NULL) { - return NULL; - } - EncodedSize = strlen(EncodedData); - if (EncodedSize == 0) { + if (EncodedData == NULL || EncodedSize == 0 ) { return NULL; } + // to simplify, we'll allocate the same size, although smaller size is needed DecodedData = (__typeof__(DecodedData))AllocateZeroPool(EncodedSize); @@ -125,3 +121,17 @@ UINT8 *Base64DecodeClover(IN CONST CHAR8 *EncodedData, OUT UINTN *DecodedSize) return DecodedData; } + + +/** UEFI interface to base54 decode. + * Decodes EncodedData into a new allocated buffer and returns it. Caller is responsible to FreePool() it. + * If DecodedSize != NULL, then size od decoded data is put there. + * If return value is not NULL, DecodedSize IS > 0 + */ +UINT8 *Base64DecodeClover(IN CONST CHAR8 *EncodedData, OUT UINTN *DecodedSize) +{ + if (EncodedData == NULL) { + return NULL; + } + return Base64DecodeClover(EncodedData, strlen(EncodedData), DecodedSize); +} diff --git a/rEFIt_UEFI/Platform/b64cdecode.h b/rEFIt_UEFI/Platform/b64cdecode.h index 04b64987f..440ef4d05 100644 --- a/rEFIt_UEFI/Platform/b64cdecode.h +++ b/rEFIt_UEFI/Platform/b64cdecode.h @@ -51,11 +51,8 @@ int base64_decode_value(char value_in); long base64_decode_block(const char* code_in, const int length_in, char* plaintext_out, base64_decodestate* state_in); -UINT8 -*Base64DecodeClover ( - IN CONST CHAR8 *EncodedData, - OUT UINTN *DecodedSize - ); +UINT8 *Base64DecodeClover(IN CONST CHAR8 *EncodedData, UINTN EncodedSize, OUT UINTN *DecodedSize); +UINT8 *Base64DecodeClover(IN CONST CHAR8 *EncodedData, OUT UINTN *DecodedSize); #endif /* BASE64_CDECODE_H */ diff --git a/rEFIt_UEFI/Platform/platformdata.h b/rEFIt_UEFI/Platform/platformdata.h index 537c074a7..dbfaea2e6 100644 --- a/rEFIt_UEFI/Platform/platformdata.h +++ b/rEFIt_UEFI/Platform/platformdata.h @@ -9,7 +9,7 @@ #define PLATFORM_PLATFORMDATA_H_ - +#include "../cpp_foundation/XString.h" typedef enum { diff --git a/rEFIt_UEFI/Platform/plist/TagDict.h b/rEFIt_UEFI/Platform/plist/TagDict.h index cb2a18ffc..bf97c3ea8 100644 --- a/rEFIt_UEFI/Platform/plist/TagDict.h +++ b/rEFIt_UEFI/Platform/plist/TagDict.h @@ -8,7 +8,6 @@ #ifndef __TagDict_h__ #define __TagDict_h__ -#include #include "plist.h" class TagDict : public TagStruct diff --git a/rEFIt_UEFI/cpp_foundation/unicode_conversions.cpp b/rEFIt_UEFI/cpp_foundation/unicode_conversions.cpp index cfef7f49c..de70d9e53 100755 --- a/rEFIt_UEFI/cpp_foundation/unicode_conversions.cpp +++ b/rEFIt_UEFI/cpp_foundation/unicode_conversions.cpp @@ -1,5 +1,5 @@ // -// utf8Conversion.hpp +// unicode_conversions.cpp // // Created by jief the 24 Feb 2020. // diff --git a/rEFIt_UEFI/cpp_foundation/unicode_conversions.h b/rEFIt_UEFI/cpp_foundation/unicode_conversions.h index 5b134019c..52a8d6109 100644 --- a/rEFIt_UEFI/cpp_foundation/unicode_conversions.h +++ b/rEFIt_UEFI/cpp_foundation/unicode_conversions.h @@ -1,5 +1,5 @@ // -// utf8Conversion.hpp +// unicode_conversions.h // // Created by jief the 24 Feb 2020. // @@ -440,4 +440,4 @@ inline size_t utf_string_from_utf_string_len(wchar_t* dst, size_t dst_max_size, #undef wchar_cast -#endif /* utf816Conversion_hpp */ +#endif /* __unicode_conversions_h__ */ diff --git a/rEFIt_UEFI/cpp_unit_test/all_tests.cpp b/rEFIt_UEFI/cpp_unit_test/all_tests.cpp index 723d7b14e..9203c9630 100755 --- a/rEFIt_UEFI/cpp_unit_test/all_tests.cpp +++ b/rEFIt_UEFI/cpp_unit_test/all_tests.cpp @@ -19,6 +19,8 @@ #include "find_replace_mask_Clover_tests.h" #include "find_replace_mask_OC_tests.h" #include "MacOsVersion_test.h" +#include "xml_lite-test.h" +#include "config-test.h" #if defined(JIEF_DEBUG) && defined(CLOVER_BUILD) #include "printlib-test.h" @@ -36,45 +38,27 @@ bool all_tests() bool all_ok = true; int ret; -// ret = XString_tests(); +#if defined(JIEF_DEBUG) + ret = xml_lite_tests(); + if ( ret != 0 ) { + printf("xml_lite_tests() failed at test %d\n", ret); + all_ok = false; + } +// ret = config_plist_tests(); // if ( ret != 0 ) { -// printf("XString16_tests() failed at test %d\n", ret); +// printf("config_plist_tests() failed at test %d\n", ret); // all_ok = false; // } -#if defined(JIEF_DEBUG) - ret = MacOsVersion_tests(); - if ( ret != 0 ) { - printf("MacOsVersion_tests() failed at test %d\n", ret); - all_ok = false; - } - ret = find_replace_mask_Clover_tests(); - if ( ret != 0 ) { - printf("xml_lite_tests() failed at test %d\n", ret); - all_ok = false; - } - ret = find_replace_mask_OC_tests(); - if ( ret != 0 ) { - printf("xml_lite_tests() failed at test %d\n", ret); - all_ok = false; - } -// return 1; - ret = printf_lite_tests(); - if ( ret != 0 ) { - printf("printf_lite_tests() failed at test %d\n", ret); - all_ok = false; - } -// ret = XBuffer_tests(); +// +// ret = XUINTN_tests(); // if ( ret != 0 ) { -// printf("XBuffer_tests() failed at test %d\n", ret); +// printf("XUINTN_tests() failed at test %d\n", ret); // all_ok = false; // } -//return ret; -// ret = XUINTN_tests(); -// if ( ret != 0 ) { -// printf("XUINTN_tests() failed at test %d\n", ret); -// all_ok = false; -// } #endif + +#if defined(JIEF_DEBUG) + #if defined(JIEF_DEBUG) && defined(CLOVER_BUILD) ret = printlib_tests(); if ( ret != 0 ) { @@ -149,6 +133,18 @@ bool all_tests() printf("xml_lite_tests() failed at test %d\n", ret); all_ok = false; } + ret = ParseXML_tests(); + if ( ret != 0 ) { + printf("plist_tests() failed at test %d\n", ret); + all_ok = false; + } + ret = MacOsVersion_tests(); + if ( ret != 0 ) { + printf("MacOsVersion_tests() failed at test %d\n", ret); + all_ok = false; + } + +#endif if ( !all_ok ) { printf("A test failed\n"); diff --git a/rEFIt_UEFI/cpp_unit_test/config-test.cpp b/rEFIt_UEFI/cpp_unit_test/config-test.cpp new file mode 100755 index 000000000..62d47f861 --- /dev/null +++ b/rEFIt_UEFI/cpp_unit_test/config-test.cpp @@ -0,0 +1,923 @@ +#include // Only use angled for Platform, else, xcode project won't compile +#include "../cpp_foundation/XString.h" +#include "../cpp_foundation/XStringArray.h" +#include "../cpp_foundation/unicode_conversions.h" +#include "../Platform/plist/plist.h" +#include "../cpp_lib/xmlLiteSimpleTypes.h" +#include "../cpp_lib/XmlLiteParser.h" +#include "../Platform/ConfigPlist/ConfigPlist.h" + + +static const char* config_all = "\n\n\n\n\n\n\n\n\n\n\n" +"\r\n\ +\r\n\ +\r\n\ +\r\n\ + ACPI\r\n\ + \r\n\ + AutoMerge\r\n\ + \r\n\ + #AutoMerge1\r\n\ + \r\n\ + ##AutoMerge2\r\n\ + \r\n\ + DSDT\r\n\ + \r\n\ + Debug\r\n\ + \r\n\ + Fixes\r\n\ + \r\n\ + FixDarwin\r\n\ + \r\n\ + FixDisplay\r\n\ + \r\n\ + FixS3D\r\n\ + \r\n\ + \r\n\ + Name\r\n\ + aa\r\n\ + Patches\r\n\ + \r\n\ + \r\n\ + Comment\r\n\ + ACPI1\r\n\ + Disabled\r\n\ + \r\n\ + Find\r\n\ + \r\n\ + AA==\r\n\ + \r\n\ + Replace\r\n\ + \r\n\ + AQ==\r\n\ + \r\n\ + \r\n\ + \r\n\ + Comment\r\n\ + ACPI2\r\n\ + Disabled\r\n\ + \r\n\ + Find\r\n\ + \r\n\ + Ag==\r\n\ + \r\n\ + Replace\r\n\ + \r\n\ + Aw==\r\n\ + \r\n\ + \r\n\ + \r\n\ + Comment\r\n\ + change EHC1 to EH01\r\n\ + Disabled\r\n\ + \r\n\ + Find\r\n\ + \r\n\ + RUhDMQ==\r\n\ + \r\n\ + Replace\r\n\ + \r\n\ + RUgwMQ==\r\n\ + \r\n\ + \r\n\ + \r\n\ + ReuseFFFF\r\n\ + \r\n\ + Rtc8Allowed\r\n\ + \r\n\ + SuspendOverride\r\n\ + \r\n\ + \r\n\ + DisableASPM\r\n\ + \r\n\ + DisabledAML\r\n\ + \r\n\ + aa\r\n\ + bb\r\n\ + \r\n\ + DropTables\r\n\ + \r\n\ + \r\n\ + Signature\r\n\ + SSDT\r\n\ + TableId\r\n\ + CpuPm\r\n\ + \r\n\ + \r\n\ + HaltEnabler\r\n\ + \r\n\ + PatchAPIC\r\n\ + \r\n\ + ResetAddress\r\n\ + 01\r\n\ + ResetValue\r\n\ + 02\r\n\ + SortedOrder\r\n\ + \r\n\ + dd\r\n\ + cc\r\n\ + \r\n\ + smartUPS\r\n\ + \r\n\ + \r\n\ + Boot\r\n\ + \r\n\ + Arguments\r\n\ + -v arch=i386 slide=0 dart=0 -xcpm darkwake=1 npci=0x2000 cpus=1 debug=0x100 aa\r\n\ + BlackList\r\n\ + \r\n\ + hh\r\n\ + \r\n\ + CustomLogo\r\n\ + Apple\r\n\ + Debug\r\n\ + \r\n\ + DefaultLoader\r\n\ + ii\r\n\ + DefaultVolume\r\n\ + LastBootedVolume\r\n\ + DisableCloverHotkeys\r\n\ + \r\n\ + HibernationFixup\r\n\ + \r\n\ + Legacy\r\n\ + LegacyBiosDefault\r\n\ + LegacyBiosDefaultEntry\r\n\ + 12\r\n\ + NeverDoRecovery\r\n\ + \r\n\ + NeverHibernate\r\n\ + \r\n\ + NoEarlyProgress\r\n\ + \r\n\ + Policy\r\n\ + Allow\r\n\ + Secure\r\n\ + \r\n\ + SignatureFixup\r\n\ + \r\n\ + SkipHibernateTimeout\r\n\ + \r\n\ + StrictHibernate\r\n\ + \r\n\ + Timeout\r\n\ + 2\r\n\ + WhiteList\r\n\ + \r\n\ + ff\r\n\ + gg\r\n\ + \r\n\ + XMPDetection\r\n\ + 1\r\n\ + \r\n\ + BootGraphics\r\n\ + \r\n\ + DefaultBackgroundColor\r\n\ + 0xF1F1F1\r\n\ + EFILoginHiDPI\r\n\ + 2\r\n\ + UIScale\r\n\ + 4\r\n\ + flagstate\r\n\ + 3\r\n\ + \r\n\ + CPU\r\n\ + \r\n\ + BusSpeedkHz\r\n\ + 800\r\n\ + C2\r\n\ + \r\n\ + C4\r\n\ + \r\n\ + C6\r\n\ + \r\n\ + FrequencyMHz\r\n\ + 2000\r\n\ + HWPEnable\r\n\ + \r\n\ + HWPValue\r\n\ + 0x7\r\n\ + Latency\r\n\ + 0x3\r\n\ + QEMU\r\n\ + \r\n\ + QPI\r\n\ + 4\r\n\ + TDP\r\n\ + 6\r\n\ + TurboDisable\r\n\ + \r\n\ + Type\r\n\ + 0x5\r\n\ + UseARTFrequency\r\n\ + \r\n\ + \r\n\ + Devices\r\n\ + \r\n\ + AddProperties\r\n\ + \r\n\ + \r\n\ + Device\r\n\ + SATA\r\n\ + Disabled\r\n\ + \r\n\ + Key\r\n\ + 10\r\n\ + Value\r\n\ + 11\r\n\ + \r\n\ + \r\n\ + Device\r\n\ + LPC\r\n\ + Disabled\r\n\ + \r\n\ + Key\r\n\ + 12\r\n\ + Value\r\n\ + 13\r\n\ + \r\n\ + \r\n\ + Device\r\n\ + SmBUS\r\n\ + Disabled\r\n\ + \r\n\ + Key\r\n\ + kk\r\n\ + Value\r\n\ + ll\r\n\ + \r\n\ + \r\n\ + Device\r\n\ + Firewire\r\n\ + Disabled\r\n\ + \r\n\ + Key\r\n\ + 14\r\n\ + Value\r\n\ + \r\n\ + FQ==\r\n\ + \r\n\ + \r\n\ + \r\n\ + AirportBridgeDeviceName\r\n\ + airportbridge\r\n\ + Arbitrary\r\n\ + \r\n\ + \r\n\ + Comment\r\n\ + C1\r\n\ + CustomProperties\r\n\ + \r\n\ + \r\n\ + Disabled\r\n\ + \r\n\ + Key\r\n\ + ll\r\n\ + Value\r\n\ + mm\r\n\ + \r\n\ + \r\n\ + Disabled\r\n\ + \r\n\ + Key\r\n\ + nn\r\n\ + Value\r\n\ + 1\r\n\ + \r\n\ + \r\n\ + Disabled\r\n\ + \r\n\ + Key\r\n\ + oo\r\n\ + Value\r\n\ + \r\n\ + Ag==\r\n\ + \r\n\ + \r\n\ + \r\n\ + PciAddr\r\n\ + 00:00.01\r\n\ + \r\n\ + \r\n\ + Audio\r\n\ + \r\n\ + AFGLowPowerState\r\n\ + \r\n\ + Inject\r\n\ + Detect\r\n\ + ResetHDA\r\n\ + \r\n\ + \r\n\ + DisableFunctions\r\n\ + 2\r\n\ + FakeID\r\n\ + \r\n\ + ATI\r\n\ + 0x22221002\r\n\ + IMEI\r\n\ + 0x22221002\r\n\ + IntelGFX\r\n\ + 0x22221002\r\n\ + LAN\r\n\ + 0x22221002\r\n\ + NVidia\r\n\ + 0x22221002\r\n\ + SATA\r\n\ + 0x22221002\r\n\ + WIFI\r\n\ + 0x22221002\r\n\ + XHCI\r\n\ + 0x22221002\r\n\ + \r\n\ + ForceHPET\r\n\ + \r\n\ + Inject\r\n\ + \r\n\ + IntelMaxValue\r\n\ + 1\r\n\ + NoDefaultProperties\r\n\ + \r\n\ + Properties\r\n\ + jj\r\n\ +kk\r\n\ + SetIntelBacklight\r\n\ + \r\n\ + SetIntelMaxBacklight\r\n\ + \r\n\ + USB\r\n\ + \r\n\ + AddClockID\r\n\ + \r\n\ + FixOwnership\r\n\ + \r\n\ + HighCurrent\r\n\ + \r\n\ + Inject\r\n\ + \r\n\ + \r\n\ + UseIntelHDMI\r\n\ + \r\n\ + \r\n\ + DisableDrivers\r\n\ + \r\n\ + OsxAptioFixDrv\r\n\ + Ps2KeyboardDxe\r\n\ + Ps2MouseDxe\r\n\ + \r\n\ + GUI\r\n\ + \r\n\ + ConsoleMode\r\n\ + Max\r\n\ + Custom\r\n\ + \r\n\ + Entries\r\n\ + \r\n\ + \r\n\ + AddArguments\r\n\ + addarg\r\n\ + Arguments\r\n\ + arg\r\n\ + BootBgColor\r\n\ + bootbgcolor\r\n\ + CustomLogo\r\n\ + Apple\r\n\ + Disabled\r\n\ + \r\n\ + DriveImage\r\n\ + driveimage\r\n\ + Title\r\n\ + title\r\n\ + FullTitle\r\n\ + title\r\n\ + Hidden\r\n\ + \r\n\ + Hotkey\r\n\ + H\r\n\ + Image\r\n\ + image\r\n\ + Path\r\n\ + path\r\n\ + Settings\r\n\ + settings\r\n\ + SubEntries\r\n\ + \r\n\ + \r\n\ + AddArguments\r\n\ + arg2\r\n\ + FullTitle\r\n\ + title1\r\n\ + \r\n\ + \r\n\ + AddArguments\r\n\ + arg3\r\n\ + Title\r\n\ + title2\r\n\ + \r\n\ + \r\n\ + AddArguments\r\n\ + arg4\r\n\ + FullTitle\r\n\ + title3\r\n\ + \r\n\ + \r\n\ + AddArguments\r\n\ + arg5\r\n\ + Title\r\n\ + title4\r\n\ + \r\n\ + \r\n\ + Type\r\n\ + Oldest\r\n\ + Volume\r\n\ + v1\r\n\ + VolumeType\r\n\ + Internal\r\n\ + \r\n\ + \r\n\ + Legacy\r\n\ + \r\n\ + \r\n\ + Disabled\r\n\ + \r\n\ + FullTitle\r\n\ + title\r\n\ + Hidden\r\n\ + \r\n\ + Hotkey\r\n\ + a\r\n\ + Type\r\n\ + Windows\r\n\ + Volume\r\n\ + v2\r\n\ + \r\n\ + \r\n\ + Tool\r\n\ + \r\n\ + \r\n\ + Arguments\r\n\ + b\r\n\ + Disabled\r\n\ + \r\n\ + Hidden\r\n\ + \r\n\ + Hotkey\r\n\ + b\r\n\ + Path\r\n\ + path\r\n\ + Title\r\n\ + title\r\n\ + Volume\r\n\ + tool1\r\n\ + \r\n\ + \r\n\ + \r\n\ + CustomIcons\r\n\ + \r\n\ + Hide\r\n\ + \r\n\ + sdfsdfdf\r\n\ + sdfsfdf\r\n\ + \r\n\ + Language\r\n\ + es:0\r\n\ + Mouse\r\n\ + \r\n\ + Enabled\r\n\ + \r\n\ + Mirror\r\n\ + \r\n\ + Speed\r\n\ + 5\r\n\ + \r\n\ + Scan\r\n\ + \r\n\ + Entries\r\n\ + \r\n\ + Kernel\r\n\ + First\r\n\ + Legacy\r\n\ + First\r\n\ + Linux\r\n\ + \r\n\ + Tool\r\n\ + \r\n\ + \r\n\ + ScreenResolution\r\n\ + 1366x768\r\n\ + ShowOptimus\r\n\ + \r\n\ + TextOnly\r\n\ + \r\n\ + Theme\r\n\ + th\r\n\ + \r\n\ + Graphics\r\n\ + \r\n\ + ATI\r\n\ + \r\n\ + \r\n\ + IOPCIPrimaryMatch\r\n\ + 0x1002888\r\n\ + IOPCISubDevId\r\n\ + 0x106B\r\n\ + LoadVBios\r\n\ + \r\n\ + Model\r\n\ + cc\r\n\ + VRAM\r\n\ + 2000\r\n\ + VideoPorts\r\n\ + 3\r\n\ + \r\n\ + \r\n\ + BootDisplay\r\n\ + 12\r\n\ + DualLink\r\n\ + 1\r\n\ + EDID\r\n\ + \r\n\ + Custom\r\n\ + \r\n\ + AQID\r\n\ + \r\n\ + Inject\r\n\ + \r\n\ + ProductID\r\n\ + 0x9777\r\n\ + VendorID\r\n\ + 0x1007\r\n\ + \r\n\ + FBName\r\n\ + Exmoor\r\n\ + Inject\r\n\ + \r\n\ + ATI\r\n\ + \r\n\ + Intel\r\n\ + \r\n\ + NVidia\r\n\ + \r\n\ + \r\n\ + LoadVBios\r\n\ + \r\n\ + NVCAP\r\n\ + 0304\r\n\ + NVIDIA\r\n\ + \r\n\ + \r\n\ + IOPCIPrimaryMatch\r\n\ + 0x10DE999\r\n\ + IOPCISubDevId\r\n\ + 0x106B\r\n\ + LoadVBios\r\n\ + \r\n\ + Model\r\n\ + aa\r\n\ + VRAM\r\n\ + 1000\r\n\ + VideoPorts\r\n\ + 1\r\n\ + \r\n\ + \r\n\ + IOPCIPrimaryMatch\r\n\ + 0x10DE999\r\n\ + IOPCISubDevId\r\n\ + 0x106B\r\n\ + LoadVBios\r\n\ + \r\n\ + Model\r\n\ + bb\r\n\ + VRAM\r\n\ + 1000\r\n\ + VideoPorts\r\n\ + 2\r\n\ + \r\n\ + \r\n\ + NvidiaGeneric\r\n\ + \r\n\ + NvidiaNoEFI\r\n\ + \r\n\ + NvidiaSingle\r\n\ + \r\n\ + PatchVBios\r\n\ + \r\n\ + PatchVBiosBytes\r\n\ + \r\n\ + \r\n\ + Find\r\n\ + \r\n\ + AwQF\r\n\ + \r\n\ + Replace\r\n\ + \r\n\ + BgcI\r\n\ + \r\n\ + \r\n\ + \r\n\ + VRAM\r\n\ + 1500\r\n\ + VideoPorts\r\n\ + 2\r\n\ + display-cfg\r\n\ + 04\r\n\ + ig-platform-id\r\n\ + 0x59230000\r\n\ + \r\n\ + KernelAndKextPatches\r\n\ + \r\n\ + ATIConnectorsController\r\n\ + ATICtl\r\n\ + ATIConnectorsData\r\n\ + 111213\r\n\ + ATIConnectorsPatch\r\n\ + 141516\r\n\ + AppleIntelCPUPM\r\n\ + \r\n\ + AppleRTC\r\n\ + \r\n\ + BootPatches\r\n\ + \r\n\ + \r\n\ + Comment\r\n\ + c3\r\n\ + Disabled\r\n\ + \r\n\ + Find\r\n\ + \r\n\ + MTI=\r\n\ + \r\n\ + MatchBuild\r\n\ + 10.12.6\r\n\ + MatchOS\r\n\ + 10.12\r\n\ + Replace\r\n\ + \r\n\ + MzQ=\r\n\ + \r\n\ + \r\n\ + \r\n\ + Debug\r\n\ + \r\n\ + DellSMBIOSPatch\r\n\ + \r\n\ + FakeCPUID\r\n\ + 0x0306D0\r\n\ + ForceKextsToLoad\r\n\ + \r\n\ + ForceKext\r\n\ + \r\n\ + KernelLapic\r\n\ + \r\n\ + KernelPm\r\n\ + \r\n\ + KernelToPatch\r\n\ + \r\n\ + \r\n\ + Comment\r\n\ + c2\r\n\ + Disabled\r\n\ + \r\n\ + Find\r\n\ + \r\n\ + ISI=\r\n\ + \r\n\ + MatchBuild\r\n\ + 10.13.6\r\n\ + MatchOS\r\n\ + 10.13\r\n\ + Replace\r\n\ + \r\n\ + IyQ=\r\n\ + \r\n\ + \r\n\ + \r\n\ + KernelXCPM\r\n\ + \r\n\ + KextsToPatch\r\n\ + \r\n\ + \r\n\ + Comment\r\n\ + c1\r\n\ + Disabled\r\n\ + \r\n\ + Find\r\n\ + \r\n\ + AQ==\r\n\ + \r\n\ + InfoPlistPatch\r\n\ + \r\n\ + MatchBuild\r\n\ + 10.14.6\r\n\ + MatchOS\r\n\ + 10.14\r\n\ + Name\r\n\ + k1\r\n\ + Replace\r\n\ + \r\n\ + Ag==\r\n\ + \r\n\ + \r\n\ + \r\n\ + Comment\r\n\ + IONVMeFamily IONameMatch\r\n\ + Disabled\r\n\ + \r\n\ + Find\r\n\ + \r\n\ + PHN0cmluZz5wY2kxNDRkLGE4MDQ8L3N0cmluZz4=\r\n\ + \r\n\ + InfoPlistPatch\r\n\ + \r\n\ + Name\r\n\ + IONVMeFamily\r\n\ + Replace\r\n\ + \r\n\ + PHN0cmluZz5wY2kxNDRkLGE4MDI8L3N0cmluZz4=\r\n\ + \r\n\ + \r\n\ + \r\n\ + \r\n\ + RtVariables\r\n\ + \r\n\ + BooterConfig\r\n\ + 0x1\r\n\ + CsrActiveConfig\r\n\ + 0x2\r\n\ + MLB\r\n\ + 12345678901234567\r\n\ + ROM\r\n\ + \r\n\ + MBRwYnHo\r\n\ + \r\n\ + \r\n\ + SMBIOS\r\n\ + \r\n\ + BiosReleaseDate\r\n\ + 08/08/17\r\n\ + BiosVendor\r\n\ + Apple Inc.\r\n\ + BiosVersion\r\n\ + MBP81.88Z.004D.B00.1708080655\r\n\ + Board-ID\r\n\ + Mac-94245B3640C91C81\r\n\ + BoardManufacturer\r\n\ + Apple Inc.\r\n\ + BoardSerialNumber\r\n\ + W89135306OPDM6CAD\r\n\ + BoardType\r\n\ + 10\r\n\ + BoardVersion\r\n\ + 1.0\r\n\ + ChassisAssetTag\r\n\ + MacBook-Aluminum\r\n\ + ChassisManufacturer\r\n\ + Apple Inc.\r\n\ + ChassisType\r\n\ + 0x0A\r\n\ + Family\r\n\ + MacBook Pro\r\n\ + FirmwareFeatures\r\n\ + 0xC00DE137\r\n\ + FirmwareFeaturesMask\r\n\ + 0xFF1FFF3F\r\n\ + LocationInChassis\r\n\ + Part Component\r\n\ + Manufacturer\r\n\ + Apple Inc.\r\n\ + Memory\r\n\ + \r\n\ + Channels\r\n\ + 2\r\n\ + Modules\r\n\ + \r\n\ + \r\n\ + Frequency\r\n\ + 333\r\n\ + Part\r\n\ + Part1\r\n\ + Serial\r\n\ + Ser1\r\n\ + Size\r\n\ + 2048\r\n\ + Slot\r\n\ + 1\r\n\ + Type\r\n\ + DDR\r\n\ + Vendor\r\n\ + v1\r\n\ + \r\n\ + \r\n\ + Frequency\r\n\ + 366\r\n\ + Part\r\n\ + Part2\r\n\ + Serial\r\n\ + Ser2\r\n\ + Size\r\n\ + 4096\r\n\ + Slot\r\n\ + 2\r\n\ + Type\r\n\ + DDR2\r\n\ + Vendor\r\n\ + v2\r\n\ + \r\n\ + \r\n\ + SlotCount\r\n\ + 4\r\n\ + \r\n\ + Mobile\r\n\ + \r\n\ + PlatformFeature\r\n\ + 0xFFFF\r\n\ + ProductName\r\n\ + MacBookPro8,1\r\n\ + SerialNumber\r\n\ + W89G91VFDH2G\r\n\ + Slots\r\n\ + \r\n\ + \r\n\ + Device\r\n\ + NVidia\r\n\ + ID\r\n\ + 1\r\n\ + Name\r\n\ + APPL,sdfsdf\r\n\ + Type\r\n\ + 1\r\n\ + \r\n\ + \r\n\ + SmUUID\r\n\ + F1AB23C0-C35A-473E-BDB7-455C3A6271E8\r\n\ + Version\r\n\ + 1.0\r\n\ + \r\n\ + SystemParameters\r\n\ + \r\n\ + BacklightLevel\r\n\ + 2\r\n\ + CustomUUID\r\n\ + 2926A57C-FF0E-4A64-980F-23483BD41969\r\n\ + InjectKexts\r\n\ + Yes\r\n\ + InjectSystemID\r\n\ + \r\n\ + NoCaches\r\n\ + \r\n\ + NvidiaWeb\r\n\ + \r\n\ + \r\n\ +\r\n\ +"; + + +static const char* config_test = +"\r\n\ +\r\n\ +\r\n\ +\r\n\ + ACPI\r\n\ + \r\n\ + AutoMerge\r\n\ + 0\r\n\ + \r\n\ +\r\n\ +"; + + + +#define RETURN_IF_FALSE(Expression) do { bool b = Expression; if ( !b ) return false; } while (0); + +static int breakpoint(int i) +{ + return i; +} + +int config_plist_tests() +{ + (void)config_all; +// int ret; +// +// const char* tag; +// size_t length; +// bool isOpeningTag, isClosingTag; + bool b; + ConfigPlist configPlistTest; + + XmlLiteParser xmlLiteParser; +// xmlLiteParser.init(config_all, strlen(config_all)); + xmlLiteParser.init(config_test, strlen(config_test)); + + b = configPlistTest.parse(&xmlLiteParser, LString8("main")); + for ( size_t idx = 0 ; idx < xmlLiteParser.getErrorsAndWarnings().size() ; idx++ ) { + if ( !xmlLiteParser.getErrorsAndWarnings()[idx].isError) printf("Warning: %s\n", xmlLiteParser.getErrorsAndWarnings()[idx].msg.c_str()); + if ( xmlLiteParser.getErrorsAndWarnings()[idx].isError) printf("Error: %s\n", xmlLiteParser.getErrorsAndWarnings()[idx].msg.c_str()); + } + if ( !b ) { + return breakpoint(102); + } +// if ( !configPlistTest.validate(xmlLiteParser, subXmlPath, pos, generateErrors) ) { + + + return 0; +} diff --git a/rEFIt_UEFI/cpp_unit_test/config-test.h b/rEFIt_UEFI/cpp_unit_test/config-test.h new file mode 100755 index 000000000..18bc2908e --- /dev/null +++ b/rEFIt_UEFI/cpp_unit_test/config-test.h @@ -0,0 +1 @@ +int config_plist_tests(); diff --git a/rEFIt_UEFI/cpp_unit_test/plist_tests.cpp b/rEFIt_UEFI/cpp_unit_test/plist_tests.cpp index 54706ba9a..322288ffc 100755 --- a/rEFIt_UEFI/cpp_unit_test/plist_tests.cpp +++ b/rEFIt_UEFI/cpp_unit_test/plist_tests.cpp @@ -4,7 +4,7 @@ #include "../Platform/plist/plist.h" #ifndef _MSC_VER -const char* config_all = +static const char* config_all = " \ \ \ @@ -908,7 +908,7 @@ kk \ \ "; -int plist_tests() +int ParseXML_tests() { TagDict* dict = NULL; EFI_STATUS Status = ParseXML(config_all, &dict, (UINT32)strlen(config_all)); @@ -929,7 +929,7 @@ int plist_tests() } #else -int plist_tests() +int ParseXML_tests() { // TODO with VS, I get a string too big. return 0; diff --git a/rEFIt_UEFI/cpp_unit_test/plist_tests.h b/rEFIt_UEFI/cpp_unit_test/plist_tests.h index f11a1edef..3e9e5493f 100755 --- a/rEFIt_UEFI/cpp_unit_test/plist_tests.h +++ b/rEFIt_UEFI/cpp_unit_test/plist_tests.h @@ -1 +1 @@ -int plist_tests(); +int ParseXML_tests(); diff --git a/rEFIt_UEFI/cpp_unit_test/printf_lite-test.cpp b/rEFIt_UEFI/cpp_unit_test/printf_lite-test.cpp index 662c5e243..a053fd502 100755 --- a/rEFIt_UEFI/cpp_unit_test/printf_lite-test.cpp +++ b/rEFIt_UEFI/cpp_unit_test/printf_lite-test.cpp @@ -227,20 +227,21 @@ int printf_lite_tests(void) // Check %s with width specifier - Test1arg(F("|a|"), F("|%.4s|"), "a"); - Test1arg(F("|aa|"), F("|%.4s|"), "aa"); - Test1arg(F("|aaa|"), F("|%.4s|"), "aaa"); - Test1arg(F("|aaaa|"), F("|%.4s|"), "aaaa"); - Test1arg(F("|aaaa|"), F("|%.4s|"), "aaaaa"); - Test1arg(F("|aaaa|"), F("|%.4s|"), "aaaaaa"); + // 2020-10 Doesn't work yet. +// Test1arg(F("|a|"), F("|%4s|"), "a"); +// Test1arg(F("|aa|"), F("|%4s|"), "aa"); +// Test1arg(F("|aaa|"), F("|%4s|"), "aaa"); +// Test1arg(F("|aaaa|"), F("|%4s|"), "aaaa"); +// Test1arg(F("|aaaa|"), F("|%4s|"), "aaaaa"); +// Test1arg(F("|aaaa|"), F("|%4s|"), "aaaaaa"); - // Check %ls with width specifier - Test1arg(F("|a|"), F("|%.4ls|"), L"a"); - Test1arg(F("|aa|"), F("|%.4ls|"), L"aa"); - Test1arg(F("|aaa|"), F("|%.4ls|"), L"aaa"); - Test1arg(F("|aaaa|"), F("|%.4ls|"), L"aaaa"); - Test1arg(F("|aaaa|"), F("|%.4ls|"), L"aaaaa"); - Test1arg(F("|aaaa|"), F("|%.4ls|"), L"aaaaaa"); + // Check %s with precision specifier + Test1arg(F("|a|"), F("|%.2s|"), "a"); + Test1arg(F("|aa|"), F("|%.2s|"), "aa"); + Test1arg(F("|aa|"), F("|%.2s|"), "aaa"); + Test1arg(F("|aa|"), F("|%.2s|"), "aaaa"); + Test1arg(F("|aa|"), F("|%.2s|"), "aaaaa"); + Test1arg(F("|aa|"), F("|%.2s|"), "aaaaaa"); // These must always works. It also test that integer type are well defined @@ -267,6 +268,7 @@ int printf_lite_tests(void) Test1arg(F("12.987654"), F("%lf"), 12.987654); // Test rounding + Test1arg(F("10.499900"), F("%1lf"), 10.4999); // no precision specifier means 6 Test1arg(F("10"), F("%1.0lf"), 10.4999); Test1arg(F("11"), F("%1.0lf"), 10.5001); Test1arg(F("10.5"), F("%1.1lf"), 10.5499); diff --git a/rEFIt_UEFI/cpp_unit_test/xml_lite-test.cpp b/rEFIt_UEFI/cpp_unit_test/xml_lite-test.cpp new file mode 100755 index 000000000..3aae761d5 --- /dev/null +++ b/rEFIt_UEFI/cpp_unit_test/xml_lite-test.cpp @@ -0,0 +1,461 @@ +#include // Only use angled for Platform, else, xcode project won't compile +#include "../cpp_foundation/XString.h" +#include "../cpp_foundation/XStringArray.h" +//#include "../cpp_foundation/unicode_conversions.h" +//#include "../Platform/plist/plist.h" + +#include "../cpp_lib/xmlLiteSimpleTypes.h" +#include "../cpp_lib/XmlLiteCompositeTypes.h" +#include "../cpp_lib/XmlLiteParser.h" + + +static int breakpoint(int i) +{ + return i; +} + + +static XmlLiteParser gXmlLiteParser; + + + + + +int move_tests() +{ + gXmlLiteParser.init("\n\n\n\n \n\n"); + while ( gXmlLiteParser.getLine() < 4 && gXmlLiteParser.moveForward() ) ; + while ( gXmlLiteParser.moveBackward() ); + if ( gXmlLiteParser.getPosition().getLine() != 1 || gXmlLiteParser.getPosition().getCol() != 1 ) return 1; + + return 0; +} + +int getNextTag_tests() +{ + const char* tag; + size_t tagLength; + bool isOpeningTag, isClosingTag; + bool b; + + gXmlLiteParser.init(""); + b = gXmlLiteParser.getNextTag(&tag, &tagLength, &isOpeningTag, &isClosingTag); + if ( !b ) return breakpoint(1); + if ( !isOpeningTag ) return breakpoint(2); + if ( isClosingTag ) return breakpoint(3); + if ( gXmlLiteParser.getchar() != 0 ) return breakpoint(4); + + + gXmlLiteParser.init(""); + b = gXmlLiteParser.getNextTag(&tag, &tagLength, &isOpeningTag, &isClosingTag); + if ( !b ) return breakpoint(5); + if ( isOpeningTag ) return breakpoint(6); + if ( !isClosingTag ) return breakpoint(7); + if ( gXmlLiteParser.getchar() != 0 ) return breakpoint(8); + + + gXmlLiteParser.init(""); + b = gXmlLiteParser.getNextTag(&tag, &tagLength, &isOpeningTag, &isClosingTag); + if ( !b ) return breakpoint(10); + if ( !isOpeningTag ) return breakpoint(11); + if ( isClosingTag ) return breakpoint(12); + b = gXmlLiteParser.getNextTag(&tag, &tagLength, &isOpeningTag, &isClosingTag); + if ( !b ) return breakpoint(13); + if ( isOpeningTag ) return breakpoint(14); + if ( !isClosingTag ) return breakpoint(15); + + // + // Test xmlLiteParser.getErrorsAndWarnings() + // + gXmlLiteParser.init("foo1\n foo2"); + gXmlLiteParser.moveForwardUntil(0); + b = gXmlLiteParser.getNextTag(&tag, &tagLength, &isOpeningTag, &isClosingTag); + if ( b ) return breakpoint(13); + if ( gXmlLiteParser.getErrorsAndWarnings().size() != 1 ) return breakpoint(13); + if ( !gXmlLiteParser.getErrorsAndWarnings()[0].msg.contains("line 2 col 7") ) return breakpoint(14); + + gXmlLiteParser.init("foo1\n bar1"); + gXmlLiteParser.moveForwardUntil('b'); + b = gXmlLiteParser.getNextTag(&tag, &tagLength, &isOpeningTag, &isClosingTag); + if ( b ) return breakpoint(13); + if ( gXmlLiteParser.getErrorsAndWarnings().size() != 1 ) return breakpoint(13); + if ( !gXmlLiteParser.getErrorsAndWarnings()[0].msg.contains("line 2 col 3") ) return breakpoint(14); + + gXmlLiteParser.init("foo1\n "); + gXmlLiteParser.moveForwardUntil('<'); + b = gXmlLiteParser.getNextTag(&tag, &tagLength, &isOpeningTag, &isClosingTag); + if ( b ) return breakpoint(13); + if ( gXmlLiteParser.getErrorsAndWarnings().size() != 1 ) return breakpoint(13); + if ( !gXmlLiteParser.getErrorsAndWarnings()[0].msg.contains("line 2 col 9") ) return breakpoint(14); + + gXmlLiteParser.init("foo1\n "); + gXmlLiteParser.moveForwardUntil('<'); + b = gXmlLiteParser.getNextTag(&tag, &tagLength, &isOpeningTag, &isClosingTag); + if ( b ) return breakpoint(13); + if ( gXmlLiteParser.getErrorsAndWarnings().size() != 1 ) return breakpoint(13); + if ( !gXmlLiteParser.getErrorsAndWarnings()[0].msg.contains("line 2 col 13") ) return breakpoint(14); + + gXmlLiteParser.init("foo1\n\nkv"); + b = gXmlLiteParser.getSimpleTag(&tag, &tagLength, &value, &valueLength, "key", true); + if ( !b ) return breakpoint(1); + if ( !strnIsEqual(tag, tagLength, "key") ) return breakpoint(2); + if ( !strnIsEqual(value, valueLength, "k") ) return breakpoint(3); + + gXmlLiteParser.init(""); + b = gXmlLiteParser.getSimpleTag(&tag, &tagLength, &value, &valueLength, "key", true); + if ( !b ) return breakpoint(1); + if ( value != NULL ) return breakpoint(3); + if ( valueLength != 0 ) return breakpoint(3); + + gXmlLiteParser.init(""); + b = gXmlLiteParser.getSimpleTag(&tag, &tagLength, &value, &valueLength, "key", true); + if ( !b ) return breakpoint(1); + if ( value != NULL ) return breakpoint(3); + if ( valueLength != 0 ) return breakpoint(3); + + gXmlLiteParser.init(""); + b = gXmlLiteParser.getSimpleTag(&tag, &tagLength, &value, &valueLength, "true", true); + if ( !b ) return breakpoint(1); + if ( !strnIsEqual(tag, tagLength, "true") ) return breakpoint(2); + if ( value != NULL ) return breakpoint(3); + if ( valueLength != 0 ) return breakpoint(3); + + gXmlLiteParser.init("kvk"); + b = gXmlLiteParser.getSimpleTag(&tag, &tagLength, &value, &valueLength, "key", true); + if ( b ) return breakpoint(4); + + // + // Test xmlLiteParser.getErrorsAndWarnings() + // + gXmlLiteParser.init("\n\n k"); + gXmlLiteParser.moveForwardUntilSignificant(); + b = gXmlLiteParser.getSimpleTag(&tag, &tagLength, &value, &valueLength, "key", true); + if ( b ) return breakpoint(4); + if ( gXmlLiteParser.getErrorsAndWarnings().size() != 1 ) return breakpoint(13); + if ( !gXmlLiteParser.getErrorsAndWarnings()[0].msg.contains("line 3 col 3") ) return breakpoint(14); + + gXmlLiteParser.init("\n\n k"); + gXmlLiteParser.moveForwardUntilSignificant(); + b = gXmlLiteParser.getSimpleTag(&tag, &tagLength, &value, &valueLength, "key", true); + if ( b ) return breakpoint(4); + if ( gXmlLiteParser.getErrorsAndWarnings().size() != 1 ) return breakpoint(13); + if ( !gXmlLiteParser.getErrorsAndWarnings()[0].msg.contains("line 3 col 5") ) return breakpoint(14); + + gXmlLiteParser.init("\n\n "); + gXmlLiteParser.moveForwardUntilSignificant(); + b = gXmlLiteParser.getSimpleTag(&tag, &tagLength, &value, &valueLength, "key", true); + if ( !b ) return breakpoint(4); + if ( value != NULL ) return breakpoint(3); + if ( valueLength != 0 ) return breakpoint(3); + + gXmlLiteParser.init("\n\n v"); + gXmlLiteParser.moveForwardUntilSignificant(); + b = gXmlLiteParser.getSimpleTag(&tag, &tagLength, &value, &valueLength, "key", true); + if ( b ) return breakpoint(4); + if ( gXmlLiteParser.getErrorsAndWarnings().size() != 1 ) return breakpoint(13); + if ( !gXmlLiteParser.getErrorsAndWarnings()[0].msg.contains("line 3 col 11") ) return breakpoint(14); + + gXmlLiteParser.init("\n\n v"); + gXmlLiteParser.moveForwardUntilSignificant(); + b = gXmlLiteParser.getSimpleTag(&tag, &tagLength, &value, &valueLength, "key", true); + if ( b ) return breakpoint(4); + if ( gXmlLiteParser.getErrorsAndWarnings().size() != 1 ) return breakpoint(13); + if ( !gXmlLiteParser.getErrorsAndWarnings()[0].msg.contains("line 3 col 11") ) return breakpoint(14); + + return 0; +} + +int getKey_tests() +{ + const char* tag; + size_t length; + bool b; + XmlParserPosition xmlParserPosition; + + gXmlLiteParser.init("v"); + b = gXmlLiteParser.getKeyTagValue(&tag, &length, &xmlParserPosition, true); + if ( b ) return breakpoint(3); + + gXmlLiteParser.init(" v"); + b = gXmlLiteParser.getKeyTagValue(&tag, &length, &xmlParserPosition, true); + if ( b ) return breakpoint(4); + + gXmlLiteParser.init("av"); + b = gXmlLiteParser.getKeyTagValue(&tag, &length, &xmlParserPosition, true); + if ( !b ) return breakpoint(5); + if ( !strnIsEqual(tag, length, "a") ) return breakpoint(6); + + gXmlLiteParser.init(" a v"); + b = gXmlLiteParser.getKeyTagValue(&tag, &length, &xmlParserPosition, true); + if ( !b ) return breakpoint(6); + if ( !strnIsEqual(tag, length, "a") ) return breakpoint(6); + + gXmlLiteParser.init(" a v"); + b = gXmlLiteParser.getKeyTagValue(&tag, &length, &xmlParserPosition, true); + if ( !b ) return breakpoint(7); + if ( !strnIsEqual(tag, length, "a") ) return breakpoint(6); + + gXmlLiteParser.init("a v"); + b = gXmlLiteParser.getKeyTagValue(&tag, &length, &xmlParserPosition, true); + if ( !b ) return breakpoint(8); + if ( !strnIsEqual(tag, length, "a") ) return breakpoint(6); + + gXmlLiteParser.init(" av"); + b = gXmlLiteParser.getKeyTagValue(&tag, &length, &xmlParserPosition, true); + if ( !b ) return breakpoint(9); + if ( !strnIsEqual(tag, length, "a") ) return breakpoint(6); + + return 0; +} + +int skip_tests() +{ + bool b; + + gXmlLiteParser.init("kv"); + b = gXmlLiteParser.skipUntilClosingTag("key", strlen("key"), true); + if ( !b ) return breakpoint(1); + if ( !strnIsEqual(gXmlLiteParser.getcharPtr(), strlen(gXmlLiteParser.getcharPtr()), "v") ) return breakpoint(2); + + gXmlLiteParser.init("vfoo"); // 'foo' is text after closing tag -> fail + b = gXmlLiteParser.skipUntilClosingTag("key", strlen("key"), true); + if ( b ) return breakpoint(1); + if ( gXmlLiteParser.getErrorsAndWarnings().size() != 1 ) return breakpoint(13); + if ( !gXmlLiteParser.getErrorsAndWarnings()[0].msg.contains("line 1 col 25") ) return breakpoint(14); + + gXmlLiteParser.init("v"); // is the next tag -> success + b = gXmlLiteParser.skipUntilClosingTag("key", strlen("key"), true); + if ( !b ) return breakpoint(1); + if ( !strnIsEqual(gXmlLiteParser.getcharPtr(), strlen(gXmlLiteParser.getcharPtr()), "") ) return breakpoint(2); + + gXmlLiteParser.init("v"); // end of file just after skipped tag -> success + b = gXmlLiteParser.skipUntilClosingTag("key", strlen("key"), true); + if ( !b ) return breakpoint(1); + if ( gXmlLiteParser.getchar() != 0 ) return breakpoint(2); + + gXmlLiteParser.init("vbar11bar2"); + b = gXmlLiteParser.skipUntilClosingTag("key", strlen("key"), true); + if ( !b ) return breakpoint(1); + if ( !strnIsEqual(gXmlLiteParser.getcharPtr(), strlen(gXmlLiteParser.getcharPtr()), "") ) return breakpoint(2); + + // Cannot have a tag containing chars AND subtag + gXmlLiteParser.init("\n\n\nkv"); + gXmlLiteParser.moveForwardUntil('k'); + b = gXmlLiteParser.skipUntilClosingTag("key", strlen("key"), true); + if ( b ) return breakpoint(2); + if ( gXmlLiteParser.getErrorsAndWarnings().size() != 1 ) return breakpoint(13); + if ( !gXmlLiteParser.getErrorsAndWarnings()[0].msg.contains("line 4 col 2") ) return breakpoint(14); + + // Cannot have a tag containing chars AND subtag + gXmlLiteParser.init("vk"); + b = gXmlLiteParser.skipUntilClosingTag("key", strlen("key"), true); + if ( b ) return breakpoint(2); + if ( gXmlLiteParser.getErrorsAndWarnings().size() != 1 ) return breakpoint(13); + if ( !gXmlLiteParser.getErrorsAndWarnings()[0].msg.contains("line 1 col 19") ) return breakpoint(14); + + + // Cannot have a tag containing chars AND subtag + gXmlLiteParser.init("\n vk"); + gXmlLiteParser.moveForwardUntil('<'); + b = gXmlLiteParser.skipNextTag(true); + if ( b ) return breakpoint(2); + if ( gXmlLiteParser.getErrorsAndWarnings().size() != 1 ) return breakpoint(13); + if ( !gXmlLiteParser.getErrorsAndWarnings()[0].msg.contains("line 2 col 2") ) return breakpoint(14); + + return 0; +} + +int xml_integer_tests() +{ +// XmlAbstractType xml_int8; +// bool b; +// UINTN result; +// bool negative; +// XString8 s; +// +// xmlLiteParser.init("10"); +// b = xml_int8.XmlInteger::parseFromXmlLite(&xmlLiteParser, "xmlpath"_XS8, &result, &negative, 0, 12); +// if ( !b ) return breakpoint(1); +// if ( result != 10 ) return breakpoint(2); +// if ( negative ) return breakpoint(3); +// +// xmlLiteParser.init("0"); +// b = xml_int8.XmlInteger::parseFromXmlLite(&xmlLiteParser, "xmlpath"_XS8, &result, &negative, -2, 12); +// if ( !b ) return breakpoint(10); +// if ( result != 0 ) return breakpoint(11); +// if ( negative ) return breakpoint(12); +// +// xmlLiteParser.init("-0"); +// b = xml_int8.XmlInteger::parseFromXmlLite(&xmlLiteParser, "xmlpath"_XS8, &result, &negative, 0, 0); +// if ( !b ) return breakpoint(20); +// if ( result != 0 ) return breakpoint(21); +// if ( negative ) return breakpoint(22); +// +// xmlLiteParser.init("10"); +// b = xml_int8.XmlInteger::parseFromXmlLite(&xmlLiteParser, "xmlpath"_XS8, &result, &negative, 0, UINT64_MAX); +// if ( !b ) return breakpoint(30); +// if ( result != 10 ) return breakpoint(31); +// if ( negative ) return breakpoint(32); +// +// xmlLiteParser.init("10"); +// b = xml_int8.XmlInteger::parseFromXmlLite(&xmlLiteParser, "xmlpath"_XS8, &result, &negative, 0, 12); +// if ( !b ) return breakpoint(40); +// if ( result != 10 ) return breakpoint(41); +// if ( negative ) return breakpoint(42); +// +// s = S8Printf("%llu", UINT64_MAX); +// xmlLiteParser.init(s.c_str()); +// b = xml_int8.XmlInteger::parseFromXmlLite(&xmlLiteParser, "xmlpath"_XS8, &result, &negative, 0, UINT64_MAX); +// if ( !b ) return breakpoint(50); +// if ( result != UINT64_MAX ) return breakpoint(51); +// if ( negative ) return breakpoint(52); +// +// s = S8Printf("%lld", INT64_MIN); +// xmlLiteParser.init(s.c_str()); +// b = xml_int8.XmlInteger::parseFromXmlLite(&xmlLiteParser, "xmlpath"_XS8, &result, &negative, INT64_MIN, UINT64_MAX); +// if ( !b ) return breakpoint(60); +// if ( result != (UINT64)INT64_MIN ) return breakpoint(61); +// if ( !negative ) return breakpoint(62); +// +// +// xmlLiteParser.init("-1000"); +// b = xml_int8.XmlInteger::parseFromXmlLite(&xmlLiteParser, "xmlpath"_XS8, &result, &negative, -1000, 0); +// if ( !b ) return breakpoint(70); +// if ( result != 1000 ) return breakpoint(71); +// if ( !negative ) return breakpoint(72); +// +// +// xmlLiteParser.init("-1001"); +// xmlLiteParser.init(s.c_str()); +// b = xml_int8.XmlInteger::parseFromXmlLite(&xmlLiteParser, "xmlpath"_XS8, &result, &negative, -1000, 0); +// if ( b ) return breakpoint(80); + + return 0; +} + +class Dict1_Class : public XmlDict +{ +public: + class Test1Bool: public XmlBool + { + public: + virtual bool validate(XmlLiteParser* xmlLiteParser, const XString8& xmlPath, const XmlParserPosition& keyPos, bool generateErrors) override { + RETURN_IF_FALSE( XmlBool::validate(xmlLiteParser, xmlPath, keyPos, generateErrors) ); + xmlLiteParser->addWarning(generateErrors, S8Printf("Test1Bool tag '%s:%d'.", xmlPath.c_str(), keyPos.getLine())); + return false; // parsing can continue. + } + } test1Bool = Test1Bool(); + + XmlDictField m_fields[1] = { + {"test1Bool", test1Bool}, + }; + virtual void getFields(XmlDictField** fields, size_t* nb) override { *fields = m_fields; *nb = sizeof(m_fields)/sizeof(m_fields[0]); }; +}; + +class MainDict_Class : public XmlDict +{ +public: + Dict1_Class dict1 = Dict1_Class(); + + virtual bool validate(XmlLiteParser* xmlLiteParser, const XString8& xmlPath, const XmlParserPosition& keyPos, bool generateErrors) override { + RETURN_IF_FALSE( XmlDict::validate(xmlLiteParser, xmlPath, keyPos, generateErrors) ); + xmlLiteParser->addWarning(generateErrors, S8Printf("Test1Bool tag '%s:%d'.", xmlPath.c_str(), keyPos.getLine())); + return false; // parsing can continue. + } + + XmlDictField m_fields[1] = { + {"dict1", dict1}, +}; + +public: + MainDict_Class() {}; + virtual void getFields(XmlDictField** fields, size_t* nb) override { *fields = m_fields; *nb = sizeof(m_fields)/sizeof(m_fields[0]); }; +} mainDict; + +static const char* config_test = + "\r\n\ + dict1\r\n\ + \r\n\ + test1Bool\r\n\ + \r\n\ + \r\n\ + \r\n\ +"; + +int xml_lite_tests() +{ + + int ret; + +// XmlLiteParser xmlLiteParser; + bool b; + + gXmlLiteParser.init(config_test); + b = mainDict.parseFromXmlLite(&gXmlLiteParser, ""_XS8, true); + for ( size_t idx = 0 ; idx < gXmlLiteParser.getErrorsAndWarnings().size() ; idx++ ) { + if ( !gXmlLiteParser.getErrorsAndWarnings()[idx].isError) printf("Warning: %s\n", gXmlLiteParser.getErrorsAndWarnings()[idx].msg.c_str()); + if ( gXmlLiteParser.getErrorsAndWarnings()[idx].isError) printf("Error: %s\n", gXmlLiteParser.getErrorsAndWarnings()[idx].msg.c_str()); + } + if ( !b ) return breakpoint(1); + + + + + + + ret = xml_integer_tests(); + if ( ret ) return ret; + + + ret = move_tests(); + if ( ret ) return ret; + + ret = getNextTag_tests(); + if ( ret ) return ret; + + ret = getSimpleTag_tests(); + if ( ret ) return ret; + + ret = getKey_tests(); + if ( ret ) return ret; + + ret = skip_tests(); + if ( ret ) return ret; + + return 0; +} diff --git a/rEFIt_UEFI/cpp_unit_test/xml_lite-test.h b/rEFIt_UEFI/cpp_unit_test/xml_lite-test.h new file mode 100755 index 000000000..89e7f9e09 --- /dev/null +++ b/rEFIt_UEFI/cpp_unit_test/xml_lite-test.h @@ -0,0 +1 @@ +int xml_lite_tests(); diff --git a/rEFIt_UEFI/entry_scan/bootscreen.cpp b/rEFIt_UEFI/entry_scan/bootscreen.cpp index 92c0bdb5e..4531eb46f 100644 --- a/rEFIt_UEFI/entry_scan/bootscreen.cpp +++ b/rEFIt_UEFI/entry_scan/bootscreen.cpp @@ -32,6 +32,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include // Only use angled for Platform, else, xcode project won't compile #include "entry_scan.h" #include "../refit/screen.h" #include "../libeg/XImage.h" diff --git a/rEFIt_UEFI/entry_scan/bootscreen.h b/rEFIt_UEFI/entry_scan/bootscreen.h index fde151520..8fe48e907 100644 --- a/rEFIt_UEFI/entry_scan/bootscreen.h +++ b/rEFIt_UEFI/entry_scan/bootscreen.h @@ -12,4 +12,5 @@ InitBootScreen ( //CONST CHAR8 *CustomBootModeToStr(IN UINT8 Mode); -#endif //__bootscreen_h__ \ No newline at end of file +#endif //__bootscreen_h__ + diff --git a/rEFIt_UEFI/entry_scan/entry_scan.h b/rEFIt_UEFI/entry_scan/entry_scan.h index 29e5824ab..61d97db53 100644 --- a/rEFIt_UEFI/entry_scan/entry_scan.h +++ b/rEFIt_UEFI/entry_scan/entry_scan.h @@ -33,7 +33,6 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include // Only use angled for Platform, else, xcode project won't compile #include "../gui/menu_items/menu_items.h" extern REFIT_MENU_ITEM_RETURN MenuEntryReturn; diff --git a/rEFIt_UEFI/entry_scan/legacy.cpp b/rEFIt_UEFI/entry_scan/legacy.cpp index bd7a88f78..62f16b471 100755 --- a/rEFIt_UEFI/entry_scan/legacy.cpp +++ b/rEFIt_UEFI/entry_scan/legacy.cpp @@ -33,6 +33,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include // Only use angled for Platform, else, xcode project won't compile #include "entry_scan.h" #include "../refit/screen.h" #include "../refit/menu.h" diff --git a/rEFIt_UEFI/entry_scan/secureboot.cpp b/rEFIt_UEFI/entry_scan/secureboot.cpp index ab67e50ea..61182bdca 100644 --- a/rEFIt_UEFI/entry_scan/secureboot.cpp +++ b/rEFIt_UEFI/entry_scan/secureboot.cpp @@ -63,7 +63,7 @@ void EnableSecureBoot(void) UINTN CloverSignatureSize = 0; void *CloverSignature = NULL; // Check in setup mode - if (gSettings.Boot.SecureBoot || !gSettings.Boot.SecureBootSetupMode) { + if (GlobalConfig.Boot.SecureBoot || !gSettings.Boot.SecureBootSetupMode) { return; } // Ask user if they want to use default keys @@ -148,7 +148,7 @@ CONST CHAR16 *SecureBootPolicyToStr(IN UINTN Policy) STATIC void PrintSecureBootInfo(void) { // Nothing to do if secure boot is disabled or in setup mode - if (!gSettings.Boot.SecureBoot) { + if (!GlobalConfig.Boot.SecureBoot) { DBG("Secure Boot: %s\n", (gSettings.Boot.SecureBootSetupMode ? "Setup" : "Disabled")); } else { // Secure boot is enabled @@ -178,7 +178,7 @@ void DisableSecureBoot(void) EFI_STATUS Status; CHAR16 *ErrorString = NULL; // Check in user mode - if (gSettings.Boot.SecureBootSetupMode || !gSettings.Boot.SecureBoot) { + if (gSettings.Boot.SecureBootSetupMode || !GlobalConfig.Boot.SecureBoot) { return; } UninstallSecureBoot(); @@ -421,7 +421,7 @@ EFI_STATUS InstallSecureBoot(void) } PrintSecureBootInfo(); // Nothing to do if secure boot is disabled or in setup mode - if (!gSettings.Boot.SecureBoot || gSettings.Boot.SecureBootSetupMode) { + if (!GlobalConfig.Boot.SecureBoot || gSettings.Boot.SecureBootSetupMode) { return EFI_SUCCESS; } // Locate security protocols @@ -473,14 +473,14 @@ void InitializeSecureBoot(void) // Set secure boot variables to firmware values UINTN Size = sizeof(gSettings.Boot.SecureBootSetupMode); gRT->GetVariable(L"SetupMode", &gEfiGlobalVariableGuid, NULL, &Size, &gSettings.Boot.SecureBootSetupMode); - Size = sizeof(gSettings.Boot.SecureBoot); - gRT->GetVariable(L"SecureBoot", &gEfiGlobalVariableGuid, NULL, &Size, &gSettings.Boot.SecureBoot); + Size = sizeof(GlobalConfig.Boot.SecureBoot); + gRT->GetVariable(L"SecureBoot", &gEfiGlobalVariableGuid, NULL, &Size, &GlobalConfig.Boot.SecureBoot); // Make sure that secure boot is disabled if in setup mode, this will // allow us to specify later in settings that we want to override // setup mode and pretend like we are in secure boot mode to enforce // secure boot policy even when secure boot is not present/disabled. if (gSettings.Boot.SecureBootSetupMode) { - gSettings.Boot.SecureBoot = 0; + GlobalConfig.Boot.SecureBoot = 0; } } diff --git a/rEFIt_UEFI/entry_scan/securemenu.cpp b/rEFIt_UEFI/entry_scan/securemenu.cpp index cbe87d716..212ae9582 100644 --- a/rEFIt_UEFI/entry_scan/securemenu.cpp +++ b/rEFIt_UEFI/entry_scan/securemenu.cpp @@ -61,10 +61,10 @@ void AddSecureBootTool(void) { LOADER_ENTRY *Entry; // If in forced mode or no secure boot then don't add tool - if (!gSettings.Boot.SecureBoot && !gSettings.Boot.SecureBootSetupMode) { + if (!GlobalConfig.Boot.SecureBoot && !gSettings.Boot.SecureBootSetupMode) { return; } - if (gSettings.Boot.SecureBoot) { + if (GlobalConfig.Boot.SecureBoot) { Entry = new REFIT_MENU_ENTRY_SECURE_BOOT(); Entry->Title.SWPrintf("Clover Secure Boot Configuration"); // Entry->Tag = TAG_SECURE_BOOT_CONFIG; @@ -492,7 +492,7 @@ BOOLEAN ConfigureSecureBoot(void) if (YesNoMessage(L"Disable Secure Boot", L"Are you sure you want to disable secure boot?")) { DBG("User disabled secure boot\n"); DisableSecureBoot(); - if (!gSettings.Boot.SecureBoot) { + if (!GlobalConfig.Boot.SecureBoot) { return TRUE; } AlertMessage(L"Disable Secure Boot", L"Disabling secure boot failed!\nClover does not appear to own the PK"); diff --git a/rEFIt_UEFI/entry_scan/securevars.cpp b/rEFIt_UEFI/entry_scan/securevars.cpp index e205918c8..f7f78739a 100644 --- a/rEFIt_UEFI/entry_scan/securevars.cpp +++ b/rEFIt_UEFI/entry_scan/securevars.cpp @@ -504,8 +504,8 @@ EFI_STATUS SetSignatureDatabase(IN CHAR16 *DatabaseName, { EFI_STATUS Status; // Check is valid to set database - if ((gSettings.Boot.SecureBoot && gSettings.Boot.SecureBootSetupMode) || - (!gSettings.Boot.SecureBoot && !gSettings.Boot.SecureBootSetupMode)) { + if ((GlobalConfig.Boot.SecureBoot && gSettings.Boot.SecureBootSetupMode) || + (!GlobalConfig.Boot.SecureBoot && !gSettings.Boot.SecureBootSetupMode)) { return EFI_NOT_FOUND; } // Erase database diff --git a/rEFIt_UEFI/entry_scan/tool.cpp b/rEFIt_UEFI/entry_scan/tool.cpp index 423fa2d5d..87e1a5528 100644 --- a/rEFIt_UEFI/entry_scan/tool.cpp +++ b/rEFIt_UEFI/entry_scan/tool.cpp @@ -33,6 +33,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ +#include // Only use angled for Platform, else, xcode project won't compile #include "entry_scan.h" #include "../refit/menu.h" #include "../refit/screen.h" diff --git a/rEFIt_UEFI/include/DsdtFixList.h b/rEFIt_UEFI/include/DsdtFixList.h new file mode 100644 index 000000000..70415e8f8 --- /dev/null +++ b/rEFIt_UEFI/include/DsdtFixList.h @@ -0,0 +1,54 @@ +/* + * DsdtFixList.h + * + * Created on: Feb 6, 2021 + * Author: jief + */ + +#ifndef INCLUDE_DSDTFIXLIST_H_ +#define INCLUDE_DSDTFIXLIST_H_ + +#include "../include/OneLinerMacros.h" + + +//DSDT fixes MASK +//0x00FF +#define FIX_DTGP bit(0) +#define FIX_WARNING bit(1) +#define FIX_SHUTDOWN bit(2) +#define FIX_MCHC bit(3) +#define FIX_HPET bit(4) +#define FIX_LPC bit(5) +#define FIX_IPIC bit(6) +#define FIX_SBUS bit(7) +//0xFF00 +#define FIX_DISPLAY bit(8) +#define FIX_IDE bit(9) +#define FIX_SATA bit(10) +#define FIX_FIREWIRE bit(11) +#define FIX_USB bit(12) +#define FIX_LAN bit(13) +#define FIX_WIFI bit(14) +#define FIX_HDA bit(15) +//new bits 16-31 0xFFFF0000 +//#define FIX_NEW_WAY bit(31) will be reused +#define FIX_DARWIN bit(16) +#define FIX_RTC bit(17) +#define FIX_TMR bit(18) +#define FIX_IMEI bit(19) +#define FIX_INTELGFX bit(20) +#define FIX_WAK bit(21) +#define FIX_UNUSED bit(22) +#define FIX_ADP1 bit(23) +#define FIX_PNLF bit(24) +#define FIX_S3D bit(25) +#define FIX_ACST bit(26) +#define FIX_HDMI bit(27) +#define FIX_REGIONS bit(28) +#define FIX_HEADERS bit(29) +#define FIX_MUTEX bit(30) + + + + +#endif /* INCLUDE_DSDTFIXLIST_H_ */ diff --git a/rEFIt_UEFI/include/Efi.h b/rEFIt_UEFI/include/Efi.h index cfd0b45de..58e9de281 100644 --- a/rEFIt_UEFI/include/Efi.h +++ b/rEFIt_UEFI/include/Efi.h @@ -14,7 +14,7 @@ extern "C" { #endif -#include +//#include #include #include diff --git a/rEFIt_UEFI/libeg/XImage.cpp b/rEFIt_UEFI/libeg/XImage.cpp index 756d53931..7bddad16e 100644 --- a/rEFIt_UEFI/libeg/XImage.cpp +++ b/rEFIt_UEFI/libeg/XImage.cpp @@ -1,3 +1,4 @@ +#include // Only use angled for Platform, else, xcode project won't compile #include "XImage.h" #include "lodepng.h" #include "nanosvg.h" @@ -383,17 +384,25 @@ void XImage::FlipRB() * The function converted plain array into XImage object * Error = 0 - Success * Error = 28 - invalid signature + * Image is emptied if there is an error. */ EFI_STATUS XImage::FromPNG(const UINT8 * Data, UINTN Length) { // DBG("XImage len=%llu\n", Length); - if (Data == NULL) return EFI_INVALID_PARAMETER; + if (Data == NULL) { + setEmpty(); // to be 100% sure + return EFI_INVALID_PARAMETER; + } UINT8 * PixelPtr; // = (UINT8 *)&PixelData[0]; unsigned Error = eglodepng_decode(&PixelPtr, &Width, &Height, Data, Length); if (Error != 0 && Error != 28) { + setEmpty(); // to be 100% sure return EFI_NOT_FOUND; } - if ( !PixelPtr ) return EFI_UNSUPPORTED; // It's possible to get error 28 and PixelPtr == NULL + if ( !PixelPtr ) { + setEmpty(); // to be 100% sure + return EFI_UNSUPPORTED; // It's possible to get error 28 and PixelPtr == NULL + } setSizeInPixels(Width, Height); //now we have a new pointer and want to move data INTN NewLength = Width * Height * sizeof(EFI_GRAPHICS_OUTPUT_BLT_PIXEL); diff --git a/rEFIt_UEFI/libeg/XPointer.cpp b/rEFIt_UEFI/libeg/XPointer.cpp index 52e48e735..2da541df4 100644 --- a/rEFIt_UEFI/libeg/XPointer.cpp +++ b/rEFIt_UEFI/libeg/XPointer.cpp @@ -124,7 +124,7 @@ void XPointer::KillMouse() SimplePointerProtocol = NULL; } -void XPointer::UpdatePointer(bool daylight) +void XPointer::UpdatePointer(bool isDaylight) // cannot be called daylight because of a global var on macOS { UINT64 Now; EFI_STATUS Status; @@ -133,7 +133,7 @@ void XPointer::UpdatePointer(bool daylight) INTN ScreenRelX; INTN ScreenRelY; - night = !daylight; + night = !isDaylight; // Now = gRT->GetTime(&Now, NULL); Now = AsmReadTsc(); diff --git a/rEFIt_UEFI/libeg/XTheme.cpp b/rEFIt_UEFI/libeg/XTheme.cpp index 12a81876f..5fe019509 100644 --- a/rEFIt_UEFI/libeg/XTheme.cpp +++ b/rEFIt_UEFI/libeg/XTheme.cpp @@ -2,6 +2,8 @@ * a class to keep definitions for all theme settings */ +#include // Only use angled for Platform, else, xcode project won't compile + extern "C" { #include } diff --git a/rEFIt_UEFI/libeg/libegint.h b/rEFIt_UEFI/libeg/libegint.h index ff40816fe..321bf49f4 100644 --- a/rEFIt_UEFI/libeg/libegint.h +++ b/rEFIt_UEFI/libeg/libegint.h @@ -41,7 +41,6 @@ //#include //#include -#include // Only use angled for Platform, else, xcode project won't compile #if defined(_MSC_VER) diff --git a/rEFIt_UEFI/libeg/nanosvg.cpp b/rEFIt_UEFI/libeg/nanosvg.cpp index fbc2b3465..344f51969 100644 --- a/rEFIt_UEFI/libeg/nanosvg.cpp +++ b/rEFIt_UEFI/libeg/nanosvg.cpp @@ -41,6 +41,9 @@ #include "XImage.h" #include "../refit/lib.h" #include "../libeg/XTheme.h" +//#include "../include/OneLinerMacros.h" +#include "../Platform/Utils.h" +#include "BmLib.h" #ifndef DEBUG_ALL #define DEBUG_SVG 0 diff --git a/rEFIt_UEFI/libeg/nanosvg.h b/rEFIt_UEFI/libeg/nanosvg.h index 9b5e6b48f..247c292eb 100644 --- a/rEFIt_UEFI/libeg/nanosvg.h +++ b/rEFIt_UEFI/libeg/nanosvg.h @@ -45,8 +45,6 @@ extern "C" { #include } -#include // Only use angled for Platform, else, xcode project won't compile -//TODO exclude intersection between libeg and platform #include "libeg.h" #define NANOSVG_ALL_COLOR_KEYWORDS 1 diff --git a/rEFIt_UEFI/libeg/text.cpp b/rEFIt_UEFI/libeg/text.cpp index eb56c0c40..3e8b579bd 100644 --- a/rEFIt_UEFI/libeg/text.cpp +++ b/rEFIt_UEFI/libeg/text.cpp @@ -39,6 +39,7 @@ extern "C" { #include } +#include // Only use angled for Platform, else, xcode project won't compile #include "libegint.h" #include "nanosvg.h" #include "VectorGraphics.h" diff --git a/rEFIt_UEFI/refit/menu.cpp b/rEFIt_UEFI/refit/menu.cpp index 580ca3669..807bd814b 100644 --- a/rEFIt_UEFI/refit/menu.cpp +++ b/rEFIt_UEFI/refit/menu.cpp @@ -54,7 +54,7 @@ #include "../Platform/platformdata.h" #include "../Platform/cpu.h" #include "../Platform/Nvram.h" -#include "../Platform/FixBiosDsdt.h" +#include "../include/DsdtFixList.h" #include "../include/Devices.h" #include "../Platform/boot.h" #include "../Platform/Injectors.h"