diff --git a/Xcode/Clover/Clover.xcodeproj/project.pbxproj b/Xcode/Clover/Clover.xcodeproj/project.pbxproj index f5259e885..756d7bce0 100644 --- a/Xcode/Clover/Clover.xcodeproj/project.pbxproj +++ b/Xcode/Clover/Clover.xcodeproj/project.pbxproj @@ -129,6 +129,8 @@ A59F3B9E25CC691D0018CBCE /* shared_ptr.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A59F3B9D25CC691D0018CBCE /* shared_ptr.cpp */; }; A59F3BA225CC69EB0018CBCE /* XIcon.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A59F3BA025CC69EA0018CBCE /* XIcon.cpp */; }; A5C219B7243ED7AA00036F7B /* XCinema.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5C219B5243ED7AA00036F7B /* XCinema.cpp */; }; + A5C68C11260BB781007DA1E2 /* REFIT_MAINMENU_SCREEN.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5C68C10260BB780007DA1E2 /* REFIT_MAINMENU_SCREEN.cpp */; }; + A5C68C1A260BCDA4007DA1E2 /* Utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5C68C19260BCDA4007DA1E2 /* Utils.cpp */; }; A5D12C22243A0B6500DFA98A /* LoadOptions_test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5D12C20243A0B6400DFA98A /* LoadOptions_test.cpp */; }; A5D12C2D243A0B7900DFA98A /* printlib-test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5D12C26243A0B7700DFA98A /* printlib-test.cpp */; }; A5D12C2E243A0B7900DFA98A /* printf_lite-test.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A5D12C28243A0B7700DFA98A /* printf_lite-test.cpp */; }; @@ -7611,6 +7613,11 @@ A5C619C526071AFA001856DF /* ControlMsrE2.inf */ = {isa = PBXFileReference; lastKnownFileType = text; path = ControlMsrE2.inf; sourceTree = ""; }; A5C619C626071AFA001856DF /* ControlMsrE2.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = ControlMsrE2.h; sourceTree = ""; }; A5C619C726071AFA001856DF /* VerifyMsrE2.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = VerifyMsrE2.c; sourceTree = ""; }; + A5C68C0F260BB780007DA1E2 /* REFIT_MAINMENU_SCREEN.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = REFIT_MAINMENU_SCREEN.h; sourceTree = ""; }; + A5C68C10260BB780007DA1E2 /* REFIT_MAINMENU_SCREEN.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = REFIT_MAINMENU_SCREEN.cpp; sourceTree = ""; }; + A5C68C17260BCC84007DA1E2 /* Languages.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = Languages.h; sourceTree = ""; }; + A5C68C18260BCDA3007DA1E2 /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Utils.h; sourceTree = ""; }; + A5C68C19260BCDA4007DA1E2 /* Utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Utils.cpp; sourceTree = ""; }; A5D12C1C243A0B0B00DFA98A /* bootscreen.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = bootscreen.h; sourceTree = ""; }; A5D12C1D243A0B1B00DFA98A /* common.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = common.h; sourceTree = ""; }; A5D12C1E243A0B2700DFA98A /* loader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = loader.h; sourceTree = ""; }; @@ -7801,6 +7808,7 @@ A569B6A525D038C10001B011 /* DsdtFixList.h */, A52313172448B1E500421FB2 /* Efi.h */, 126151491A15BBB000903E7B /* Handle.h */, + A5C68C17260BCC84007DA1E2 /* Languages.h */, A513868425CFB26000F3E345 /* OC.h */, A52313182448B1ED00421FB2 /* OneLinerMacros.h */, A513868625CFB26D00F3E345 /* OSFlags.h */, @@ -7957,6 +7965,8 @@ A5456D1523FC5AF3000BF18C /* StateGenerator.h */, A5456D1B23FC5AF5000BF18C /* usbfix.cpp */, A523133A2448B3F400421FB2 /* usbfix.h */, + A5C68C19260BCDA4007DA1E2 /* Utils.cpp */, + A5C68C18260BCDA3007DA1E2 /* Utils.h */, A52313392448B3F300421FB2 /* VersionString.cpp */, A52313382448B3F200421FB2 /* VersionString.h */, A59F3B9725CC66170018CBCE /* Volumes.cpp */, @@ -9231,6 +9241,8 @@ isa = PBXGroup; children = ( A570FB01240BA5340057F26D /* menu_items */, + A5C68C10260BB780007DA1E2 /* REFIT_MAINMENU_SCREEN.cpp */, + A5C68C0F260BB780007DA1E2 /* REFIT_MAINMENU_SCREEN.h */, A5816DF72418104F003BA66C /* REFIT_MENU_SCREEN.cpp */, A5816DF82418104F003BA66C /* REFIT_MENU_SCREEN.h */, A52313132448B1C400421FB2 /* shared_with_menu.cpp */, @@ -14267,110 +14279,110 @@ A5814D872538171100CF4451 /* Library */ = { isa = PBXGroup; children = ( - A5814D882538171100CF4451 /* PeiServicesTablePointerLibIdt */, - A5814D8C2538171100CF4451 /* StandaloneMmServicesTableLib */, - A5814D902538171100CF4451 /* PeiPciLibPciCfg2 */, - A5814D942538171100CF4451 /* PeiSmbusLibSmbus2Ppi */, - A5814D9A2538171100CF4451 /* BaseDebugPrintErrorLevelLib */, A5814D9E2538171100CF4451 /* BaseCacheMaintenanceLib */, - A5814DA42538171100CF4451 /* DxeIoLibCpuIo2 */, - A5814DAB2538171100CF4451 /* BasePciLibCf8 */, - A5814DAF2538171100CF4451 /* PeiServicesTablePointerLib */, - A5814DB32538171100CF4451 /* BaseDebugLibNull */, - A5814DB72538171100CF4451 /* UefiPciSegmentLibPciRootBridgeIo */, - A5814DBC2538171100CF4451 /* PeiServicesLib */, - A5814DC02538171100CF4451 /* BasePciExpressLib */, - A5814DC42538171100CF4451 /* BaseS3SmbusLib */, - A5814DC82538171100CF4451 /* DxeServicesLib */, - A5814DCF2538171100CF4451 /* SecPeiDxeTimerLibCpu */, - A5814DD32538171100CF4451 /* StandaloneMmDriverEntryPoint */, - A5814DD72538171100CF4451 /* SmmPciLibPciRootBridgeIo */, - A5814DDB2538171100CF4451 /* BaseLib */, - A5814F562538171200CF4451 /* BaseMemoryLibRepStr */, - A5814F812538171200CF4451 /* BaseSynchronizationLib */, - A5814FA72538171200CF4451 /* UefiMemoryLib */, - A5814FBA2538171200CF4451 /* PciSegmentLibSegmentInfo */, A5814FC32538171200CF4451 /* BaseCpuLib */, - A5814FDC2538171200CF4451 /* PeiExtractGuidedSectionLib */, - A5814FE02538171200CF4451 /* UefiDriverEntryPoint */, - A5814FE42538171200CF4451 /* UefiDebugLibDebugPortProtocol */, - A5814FE92538171200CF4451 /* SmmPciExpressLib */, - A5814FEC2538171200CF4451 /* DxeRuntimePciExpressLib */, - A5814FF02538171200CF4451 /* BaseMemoryLibOptDxe */, - A581502E2538171200CF4451 /* BasePerformanceLibNull */, - A58150322538171200CF4451 /* BasePciSegmentLibPci */, - A58150362538171200CF4451 /* PeiDxePostCodeLibReportStatusCode */, - A581503A2538171200CF4451 /* BasePcdLibNull */, - A581503E2538171200CF4451 /* BaseStackCheckLib */, - A58150432538171200CF4451 /* BaseRngLib */, - A58150472538171200CF4451 /* DxeCoreEntryPoint */, - A581504B2538171200CF4451 /* BasePostCodeLibPort80 */, - A581504F2538171200CF4451 /* PeiCoreEntryPoint */, - A58150532538171200CF4451 /* BasePeCoffLib */, - A581505B2538171200CF4451 /* SmmLibNull */, - A581505F2538171200CF4451 /* BasePciCf8Lib */, - A58150632538171200CF4451 /* MmServicesTableLib */, - A58150672538171200CF4451 /* BaseSafeIntLib */, - A581506D2538171200CF4451 /* SmmServicesTableLib */, - A58150712538171200CF4451 /* DxeExtractGuidedSectionLib */, - A58150752538171200CF4451 /* UefiApplicationEntryPoint */, - A58150792538171200CF4451 /* BaseMemoryLib */, - A581508D2538171200CF4451 /* SmmIoLibSmmCpuIo2 */, - A58150942538171200CF4451 /* DxeSmbusLib */, - A581509A2538171200CF4451 /* BaseSmbusLibNull */, - A581509E2538171200CF4451 /* BaseTimerLibNullTemplate */, - A58150A22538171200CF4451 /* BaseS3IoLib */, + A5814DB32538171100CF4451 /* BaseDebugLibNull */, A58150A62538171200CF4451 /* BaseDebugLibSerialPort */, - A58150AA2538171200CF4451 /* BaseMemoryLibSse2 */, - A58150D52538171200CF4451 /* BaseUefiDecompressLib */, - A58150DC2538171200CF4451 /* BaseSerialPortLibNull */, - A58150E02538171200CF4451 /* BaseS3BootScriptLibNull */, - A58150E42538171200CF4451 /* DxePcdLib */, - A58150E82538171200CF4451 /* SmmPeriodicSmiLib */, - A58150EC2538171200CF4451 /* UefiScsiLib */, - A58150F02538171200CF4451 /* PeiResourcePublicationLib */, - A58150F42538171200CF4451 /* DxeHobLib */, - A58150F82538171200CF4451 /* BaseS3PciSegmentLib */, - A58150FC2538171200CF4451 /* BasePciSegmentInfoLibNull */, - A58151002538171200CF4451 /* SmmMemoryAllocationLib */, + A5814D9A2538171100CF4451 /* BaseDebugPrintErrorLevelLib */, A58151042538171200CF4451 /* BaseExtractGuidedSectionLib */, - A58151082538171300CF4451 /* UefiBootServicesTableLib */, - A581510C2538171300CF4451 /* UefiDebugLibStdErr */, - A58151112538171300CF4451 /* PeiMemoryAllocationLib */, - A58151152538171300CF4451 /* UefiDevicePathLib */, - A58151202538171300CF4451 /* PeiHobLib */, - A58151242538171300CF4451 /* PeiMemoryLib */, A58151372538171300CF4451 /* BaseIoLibIntrinsic */, - A58151522538171300CF4451 /* PeiPciSegmentLibPciCfg2 */, - A58151562538171300CF4451 /* BasePeCoffGetEntryPointLib */, - A581515A2538171300CF4451 /* UefiDevicePathLibDevicePathProtocol */, - A581515E2538171300CF4451 /* SmmIoLib */, - A58151622538171300CF4451 /* DxeCoreHobLib */, - A58151662538171300CF4451 /* UefiRuntimeServicesTableLib */, - A581516A2538171300CF4451 /* PeiPcdLib */, - A581516E2538171300CF4451 /* SmmMemLib */, - A58151722538171300CF4451 /* UefiFileHandleLib */, - A58151762538171300CF4451 /* DxeRuntimeDebugLibSerialPort */, + A5814DDB2538171100CF4451 /* BaseLib */, + A58150792538171200CF4451 /* BaseMemoryLib */, A581517A2538171300CF4451 /* BaseMemoryLibMmx */, - A58151A52538171300CF4451 /* BaseOrderedCollectionRedBlackTreeLib */, - A58151A92538171300CF4451 /* UefiMemoryAllocationLib */, - A58151AD2538171300CF4451 /* UefiRuntimeLib */, - A58151B12538171300CF4451 /* UefiDebugLibConOut */, - A58151B62538171300CF4451 /* BasePciLibPciExpress */, - A58151BA2538171300CF4451 /* UefiLib */, - A58151C42538171300CF4451 /* DxeHstiLib */, - A58151CA2538171300CF4451 /* BasePostCodeLibDebug */, - A58151CE2538171300CF4451 /* BaseS3StallLib */, + A5814FF02538171200CF4451 /* BaseMemoryLibOptDxe */, A58151D22538171300CF4451 /* BaseMemoryLibOptPei */, - A58151FD2538171300CF4451 /* UefiPciLibPciRootBridgeIo */, - A58152012538171300CF4451 /* PeimEntryPoint */, - A58152052538171300CF4451 /* SmiHandlerProfileLibNull */, - A58152092538171300CF4451 /* BaseS3PciLib */, - A581520D2538171300CF4451 /* BasePrintLib */, - A58152132538171300CF4451 /* PeiIoLibCpuIo */, - A58152192538171300CF4451 /* BaseReportStatusCodeLibNull */, - A581521D2538171300CF4451 /* DxeServicesTableLib */, + A5814F562538171200CF4451 /* BaseMemoryLibRepStr */, + A58150AA2538171200CF4451 /* BaseMemoryLibSse2 */, + A58151A52538171300CF4451 /* BaseOrderedCollectionRedBlackTreeLib */, + A581503A2538171200CF4451 /* BasePcdLibNull */, + A581505F2538171200CF4451 /* BasePciCf8Lib */, + A5814DC02538171100CF4451 /* BasePciExpressLib */, + A5814DAB2538171100CF4451 /* BasePciLibCf8 */, + A58151B62538171300CF4451 /* BasePciLibPciExpress */, + A58150FC2538171200CF4451 /* BasePciSegmentInfoLibNull */, + A58150322538171200CF4451 /* BasePciSegmentLibPci */, A58152212538171300CF4451 /* BasePeCoffExtraActionLibNull */, + A58151562538171300CF4451 /* BasePeCoffGetEntryPointLib */, + A58150532538171200CF4451 /* BasePeCoffLib */, + A581502E2538171200CF4451 /* BasePerformanceLibNull */, + A58151CA2538171300CF4451 /* BasePostCodeLibDebug */, + A581504B2538171200CF4451 /* BasePostCodeLibPort80 */, + A581520D2538171300CF4451 /* BasePrintLib */, + A58152192538171300CF4451 /* BaseReportStatusCodeLibNull */, + A58150432538171200CF4451 /* BaseRngLib */, + A58150E02538171200CF4451 /* BaseS3BootScriptLibNull */, + A58150A22538171200CF4451 /* BaseS3IoLib */, + A58152092538171300CF4451 /* BaseS3PciLib */, + A58150F82538171200CF4451 /* BaseS3PciSegmentLib */, + A5814DC42538171100CF4451 /* BaseS3SmbusLib */, + A58151CE2538171300CF4451 /* BaseS3StallLib */, + A58150672538171200CF4451 /* BaseSafeIntLib */, + A58150DC2538171200CF4451 /* BaseSerialPortLibNull */, + A581509A2538171200CF4451 /* BaseSmbusLibNull */, + A581503E2538171200CF4451 /* BaseStackCheckLib */, + A5814F812538171200CF4451 /* BaseSynchronizationLib */, + A581509E2538171200CF4451 /* BaseTimerLibNullTemplate */, + A58150D52538171200CF4451 /* BaseUefiDecompressLib */, + A58150472538171200CF4451 /* DxeCoreEntryPoint */, + A58151622538171300CF4451 /* DxeCoreHobLib */, + A58150712538171200CF4451 /* DxeExtractGuidedSectionLib */, + A58150F42538171200CF4451 /* DxeHobLib */, + A58151C42538171300CF4451 /* DxeHstiLib */, + A5814DA42538171100CF4451 /* DxeIoLibCpuIo2 */, + A58150E42538171200CF4451 /* DxePcdLib */, + A58151762538171300CF4451 /* DxeRuntimeDebugLibSerialPort */, + A5814FEC2538171200CF4451 /* DxeRuntimePciExpressLib */, + A5814DC82538171100CF4451 /* DxeServicesLib */, + A581521D2538171300CF4451 /* DxeServicesTableLib */, + A58150942538171200CF4451 /* DxeSmbusLib */, + A58150632538171200CF4451 /* MmServicesTableLib */, + A5814FBA2538171200CF4451 /* PciSegmentLibSegmentInfo */, + A581504F2538171200CF4451 /* PeiCoreEntryPoint */, + A58150362538171200CF4451 /* PeiDxePostCodeLibReportStatusCode */, + A5814FDC2538171200CF4451 /* PeiExtractGuidedSectionLib */, + A58151202538171300CF4451 /* PeiHobLib */, + A58152132538171300CF4451 /* PeiIoLibCpuIo */, + A58151112538171300CF4451 /* PeiMemoryAllocationLib */, + A58151242538171300CF4451 /* PeiMemoryLib */, + A58152012538171300CF4451 /* PeimEntryPoint */, + A581516A2538171300CF4451 /* PeiPcdLib */, + A5814D902538171100CF4451 /* PeiPciLibPciCfg2 */, + A58151522538171300CF4451 /* PeiPciSegmentLibPciCfg2 */, + A58150F02538171200CF4451 /* PeiResourcePublicationLib */, + A5814DBC2538171100CF4451 /* PeiServicesLib */, + A5814DAF2538171100CF4451 /* PeiServicesTablePointerLib */, + A5814D882538171100CF4451 /* PeiServicesTablePointerLibIdt */, + A5814D942538171100CF4451 /* PeiSmbusLibSmbus2Ppi */, + A5814DCF2538171100CF4451 /* SecPeiDxeTimerLibCpu */, + A58152052538171300CF4451 /* SmiHandlerProfileLibNull */, + A581515E2538171300CF4451 /* SmmIoLib */, + A581508D2538171200CF4451 /* SmmIoLibSmmCpuIo2 */, + A581505B2538171200CF4451 /* SmmLibNull */, + A581516E2538171300CF4451 /* SmmMemLib */, + A58151002538171200CF4451 /* SmmMemoryAllocationLib */, + A5814FE92538171200CF4451 /* SmmPciExpressLib */, + A5814DD72538171100CF4451 /* SmmPciLibPciRootBridgeIo */, + A58150E82538171200CF4451 /* SmmPeriodicSmiLib */, + A581506D2538171200CF4451 /* SmmServicesTableLib */, + A5814DD32538171100CF4451 /* StandaloneMmDriverEntryPoint */, + A5814D8C2538171100CF4451 /* StandaloneMmServicesTableLib */, + A58150752538171200CF4451 /* UefiApplicationEntryPoint */, + A58151082538171300CF4451 /* UefiBootServicesTableLib */, + A58151B12538171300CF4451 /* UefiDebugLibConOut */, + A5814FE42538171200CF4451 /* UefiDebugLibDebugPortProtocol */, + A581510C2538171300CF4451 /* UefiDebugLibStdErr */, + A58151152538171300CF4451 /* UefiDevicePathLib */, + A581515A2538171300CF4451 /* UefiDevicePathLibDevicePathProtocol */, + A5814FE02538171200CF4451 /* UefiDriverEntryPoint */, + A58151722538171300CF4451 /* UefiFileHandleLib */, + A58151BA2538171300CF4451 /* UefiLib */, + A58151A92538171300CF4451 /* UefiMemoryAllocationLib */, + A5814FA72538171200CF4451 /* UefiMemoryLib */, + A58151FD2538171300CF4451 /* UefiPciLibPciRootBridgeIo */, + A5814DB72538171100CF4451 /* UefiPciSegmentLibPciRootBridgeIo */, + A58151AD2538171300CF4451 /* UefiRuntimeLib */, + A58151662538171300CF4451 /* UefiRuntimeServicesTableLib */, + A58150EC2538171200CF4451 /* UefiScsiLib */, A58152252538171300CF4451 /* UefiUsbLib */, ); path = Library; @@ -23699,6 +23711,7 @@ A52313152448B1C500421FB2 /* shared_with_menu.cpp in Sources */, A513867825CFB19300F3E345 /* KERNEL_AND_KEXT_PATCHES.cpp in Sources */, A57AD76C254356C4001B1DC1 /* SelfOem.cpp in Sources */, + A5C68C1A260BCDA4007DA1E2 /* Utils.cpp in Sources */, A5D12C34243A0BDA00DFA98A /* XStringArray.cpp in Sources */, A529343B24FB92BD004241C3 /* XStringArray_test.cpp in Sources */, A5456D5223FC5B08000BF18C /* ati.cpp in Sources */, @@ -23741,6 +23754,7 @@ A5456D0323FC5AB8000BF18C /* egemb_icons.cpp in Sources */, A529343624FB92AD004241C3 /* XBuffer_tests.cpp in Sources */, A5456D5C23FC5B08000BF18C /* AmlGenerator.cpp in Sources */, + A5C68C11260BB781007DA1E2 /* REFIT_MAINMENU_SCREEN.cpp in Sources */, A5456CFC23FC5AB8000BF18C /* egemb_font.cpp in Sources */, A59CB66921BC14AB0054A7CF /* SmbiosGen.c in Sources */, A5456D6F23FC5B08000BF18C /* DevicePath.cpp in Sources */, diff --git a/rEFIt_UEFI/cpp_foundation/XRBuffer.h b/rEFIt_UEFI/cpp_foundation/XRBuffer.h index 9c915b01d..210a7a6d4 100755 --- a/rEFIt_UEFI/cpp_foundation/XRBuffer.h +++ b/rEFIt_UEFI/cpp_foundation/XRBuffer.h @@ -68,7 +68,7 @@ class XRBuffer #ifdef DEBUG panic("XBuffer::setIndex : Idx < 0. System halted\n"); #else - return; + _Index = 0; #endif } _Index = Idx; diff --git a/rEFIt_UEFI/gui/REFIT_MAINMENU_SCREEN.cpp b/rEFIt_UEFI/gui/REFIT_MAINMENU_SCREEN.cpp index b0b6840a6..a14ed7b7d 100644 --- a/rEFIt_UEFI/gui/REFIT_MAINMENU_SCREEN.cpp +++ b/rEFIt_UEFI/gui/REFIT_MAINMENU_SCREEN.cpp @@ -760,23 +760,23 @@ UINTN REFIT_MAINMENU_SCREEN::RunMainMenu(IN INTN DefaultSelection, OUT REFIT_ABS SubMenuIndex = -1; gSettings.OptionsBits = EncodeOptions(TmpArgs); -// DBG("main OptionsBits = 0x%X\n", gSettings.OptionsBits); + DBG("main OptionsBits = 0x%X\n", gSettings.OptionsBits); if (MainChosenEntry->getLOADER_ENTRY()) { gSettings.OptionsBits |= EncodeOptions(MainChosenEntry->getLOADER_ENTRY()->LoadOptions); -// DBG("add OptionsBits = 0x%X\n", gSettings.OptionsBits); + DBG("add OptionsBits = 0x%X\n", gSettings.OptionsBits); } if (MainChosenEntry->getREFIT_MENU_ITEM_BOOTNUM()) { DecodeOptions(MainChosenEntry->getREFIT_MENU_ITEM_BOOTNUM()); } -// DBG(" enter menu with LoadOptions: %ls\n", ((LOADER_ENTRY*)MainChosenEntry)->LoadOptions); - + // DBG(" enter menu with LoadOptions: %s\n", ((LOADER_ENTRY*)MainChosenEntry)->LoadOptions.c_str()); + DBG(" enter menu with LoadOptions: \n"); if (MainChosenEntry->getLOADER_ENTRY()) { // Only for non-legacy entries, as LEGACY_ENTRY doesn't have Flags gSettings.FlagsBits = MainChosenEntry->getLOADER_ENTRY()->Flags; } -// DBG(" MainChosenEntry with FlagsBits = 0x%X\n", gSettings.FlagsBits); + DBG(" MainChosenEntry with FlagsBits = 0x%X\n", gSettings.FlagsBits); SubMenuExit = 0; while (!SubMenuExit) { @@ -784,7 +784,7 @@ UINTN REFIT_MAINMENU_SCREEN::RunMainMenu(IN INTN DefaultSelection, OUT REFIT_ABS //running details menu // SubMenuExit = MainChosenEntry->SubScreen->RunGenericMenu(&SubMenuIndex, &TempChosenEntry); - + DBG("SubMenuExit=%lld\n", SubMenuExit); if (SubMenuExit == MENU_EXIT_ESCAPE || TempChosenEntry->getREFIT_MENU_ITEM_RETURN() ) { SubMenuExit = MENU_EXIT_ENTER; MenuExit = 0; @@ -794,21 +794,21 @@ UINTN REFIT_MAINMENU_SCREEN::RunMainMenu(IN INTN DefaultSelection, OUT REFIT_ABS if (MainChosenEntry->getREFIT_MENU_ENTRY_CLOVER()) { MainChosenEntry->getREFIT_MENU_ENTRY_CLOVER()->LoadOptions = (((REFIT_MENU_ENTRY_CLOVER*)TempChosenEntry)->LoadOptions); } - + DBG("got options\n"); if (SubMenuExit == MENU_EXIT_DETAILS) { SubMenuExit = 0; continue; } - // DBG(" exit menu with LoadOptions: %ls\n", ((LOADER_ENTRY*)MainChosenEntry)->LoadOptions); - + // DBG(" exit menu with LoadOptions: %s\n", ((LOADER_ENTRY*)MainChosenEntry)->LoadOptions.c_str()); + DBG(" exit menu with LoadOptions: \n"); if (SubMenuExit == MENU_EXIT_ENTER && MainChosenEntry->getLOADER_ENTRY() && TempChosenEntry->getLOADER_ENTRY()) { // Only for non-legacy entries, as LEGACY_ENTRY doesn't have Flags/Options MainChosenEntry->getLOADER_ENTRY()->Flags = TempChosenEntry->getLOADER_ENTRY()->Flags; DBG(" get MainChosenEntry FlagsBits = 0x%X\n", ((LOADER_ENTRY*)MainChosenEntry)->Flags); if (OSFLAG_ISUNSET(TempChosenEntry->getLOADER_ENTRY()->Flags, OSFLAG_NODEFAULTARGS)) { DecodeOptions(TempChosenEntry->getLOADER_ENTRY()); -// DBG("get OptionsBits = 0x%X\n", gSettings.OptionsBits); -// DBG(" TempChosenEntry FlagsBits = 0x%X\n", ((LOADER_ENTRY*)TempChosenEntry)->Flags); + DBG("get OptionsBits = 0x%X\n", gSettings.OptionsBits); + DBG(" TempChosenEntry FlagsBits = 0x%X\n", ((LOADER_ENTRY*)TempChosenEntry)->Flags); } // copy also loadoptions from subentry to mainentry MainChosenEntry->getLOADER_ENTRY()->LoadOptions = TempChosenEntry->getLOADER_ENTRY()->LoadOptions; diff --git a/rEFIt_UEFI/gui/REFIT_MENU_SCREEN.cpp b/rEFIt_UEFI/gui/REFIT_MENU_SCREEN.cpp index 86ffb4d99..26cc3e014 100644 --- a/rEFIt_UEFI/gui/REFIT_MENU_SCREEN.cpp +++ b/rEFIt_UEFI/gui/REFIT_MENU_SCREEN.cpp @@ -1844,6 +1844,7 @@ void REFIT_MENU_SCREEN::GraphicsMenuStyle(IN UINTN Function, IN CONST CHAR16 *Pa UINTN REFIT_MENU_SCREEN::RunMenu(OUT REFIT_ABSTRACT_MENU_ENTRY **ChosenEntry) { INTN Index = -1; + return RunGenericMenu(&Index, ChosenEntry); }