clean debug messages

Signed-off-by: Slice <sergey.slice@gmail.com>

Author: SergeySlice

rEFIt_UEFI/Settings/ConfigManager.cpp

@@ -599,8 +599,7 @@ EFI_STATUS ConfigManager::LoadSMBIOSPlist(const XStringW& ConfName)
 void ConfigManager::ReloadSmbios(XStringW& str)  // searches for SMBIOS by system name
 {
   size_t N = SmbiosList.size();
-DBG("search SMBIOS for %ls\n", str.wc_str());
-DBG("at Reload OldChosenSmbios =%lld list size=%zu\n", OldChosenSmbios, N);
+//DBG("search SMBIOS for %ls\n", str.wc_str());
   if (OldChosenSmbios == 0) {  // this is auto fill by OSName
     for (size_t i=1; i<N; i++) {
       if (SmbiosList[i].contains(str)) {

rEFIt_UEFI/entry_scan/loader.cpp

@@ -1290,10 +1290,10 @@ STATIC LOADER_ENTRY *CreateLoaderEntry(
     Entry->LoaderType = OSTYPE_OTHER;
     break;
   }
-  DBG("OSIconName=%ls \n", OSIconName.wc_str());
+//  DBG("OSIconName=%ls \n", OSIconName.wc_str());
   Entry->OSName = OSIconName.subString(0, OSIconName.indexOf(',')); // TODO
   //  SmbiosList.AddReference(OSName.forgetDataWithoutFreeing(), true);
-DBG("OSName=%ls\n", Entry->OSName.wc_str());
+
   Entry->Title = FullTitle;
   if (Entry->Title.isEmpty() && Volume->VolLabel.notEmpty()) {
     if (Volume->VolLabel[0] == L'#') {
@@ -1337,7 +1337,7 @@ DBG("OSName=%ls\n", Entry->OSName.wc_str());
               : BasenameXW.wc_str());
     }
   }
-  DBG("check Entry->Title \n");
+ // DBG("check Entry->Title \n");
   if (Entry->Title.isEmpty()) {
     //   DBG("encounter LoaderTitle ==%ls and Entry->VolName ==%ls\n",
     //   LoaderTitle.wc_str(), Entry->VolName);
@@ -1503,7 +1503,7 @@ void LOADER_ENTRY::AddDefaultMenu() {
     SubEntry->Title.SWPrintf("Boot %s with selected options", macOS);
     SubScreen->AddMenuEntry(SubEntry, true);
     SubScreen->AddMenuEntry(SubMenuKextInjectMgmt(), true);
-    SubScreen->AddMenuInfo_f("=== boot-args ===");DBG("ADM:10\n");
+    SubScreen->AddMenuInfo_f("=== boot-args ===");
     if (!KernelIs64BitOnly) {
       if (macOSVersion.notEmpty() && macOSVersion < MacOsVersion("10.8"_XS8)) {
         SubScreen->AddMenuCheck("Mac OS X 32bit", OPT_I386, 68);
@@ -2545,9 +2545,10 @@ void ScanLoader(void)
   DBG("Entries list before ordering\n");
   for (size_t idx = 0; idx < MainMenu.Entries.sizeIncludingHidden(); idx++) {
     if (MainMenu.Entries.ElementAt(idx).getLOADER_ENTRY()) {
-      DBG("    Entry %zd : %ls%s\n", idx,
+      DBG("    Entry %zd : %ls%s \n", idx,
           MainMenu.Entries.ElementAt(idx).Title.wc_str(),
-          MainMenu.Entries.ElementAt(idx).Hidden ? " (hidden)" : "");
+          MainMenu.Entries.ElementAt(idx).Hidden ? " (hidden)" : ""
+		  );
     } else {
       DBG("    Entry %zd : %ls%s\n", idx,
           MainMenu.Entries.ElementAt(idx).Title.wc_str(),

rEFIt_UEFI/gui/menu_items/menu_items.cpp

@@ -92,11 +92,11 @@ LOADER_ENTRY *LOADER_ENTRY::getPartiallyDuplicatedEntry() const {
   DuplicateEntry->BuildVersion = BuildVersion;
   DuplicateEntry->Title = Title;
   DuplicateEntry->OSName = OSName;
-//DBG("gPDE:13\n");
+
   //  CopyKernelAndKextPatches(&DuplicateEntry->KernelAndKextPatches,
   //  &KernelAndKextPatches);
   //DuplicateEntry->KernelAndKextPatches = KernelAndKextPatches;
   //DuplicateEntry->KernelAndKextPatches.takeValueFrom(KernelAndKextPatches);
-//DBG("gPDE:14\n");
+
   return DuplicateEntry;
 }

rEFIt_UEFI/gui/menu_items/menu_items.h

@@ -104,6 +104,7 @@ class SIDELOAD_KEXT;
 class REFIT_ABSTRACT_MENU_ENTRY {
 public:
   XStringW Title = XStringW();
+  XStringW OSName = XStringW();
   XBool Hidden = false;
   UINTN Row = 0;
   wchar_t ShortcutDigit = 0;
@@ -312,7 +313,7 @@ class REFIT_MENU_ITEM_ABSTRACT_ENTRY_LOADER : public REFIT_ABSTRACT_MENU_ENTRY {
   XStringW DevicePathString;
   XString8Array LoadOptions; // moved here for compatibility with legacy
   XStringW LoaderPath;
-  XStringW OSName; 
+  //XStringW OSName; // at super
   XIcon DriveImage;
   XIcon BadgeImage;
 

rEFIt_UEFI/refit/main.cpp

@@ -1009,15 +1009,15 @@ void LOADER_ENTRY::DelegateKernelPatches() {
   }
 }
 
-void LOADER_ENTRY::StartLoader() {
+void LOADER_ENTRY::StartLoader()
+{
   EFI_STATUS Status;
   EFI_TEXT_STRING ConOutOutputString = 0;
   EFI_HANDLE ImageHandle = NULL;
   EFI_LOADED_IMAGE *LoadedImage = NULL;
   CONST CHAR8 *InstallerVersion;
 
   DbgHeader("StartLoader");
-
   DBG("Starting %ls\n", FileDevicePathToXStringW(DevicePath).wc_str());
 #ifdef JIEF_DEBUG
   displayFreeMemory("LOADER_ENTRY::StartLoader()"_XS8);
@@ -1077,7 +1077,6 @@ void LOADER_ENTRY::StartLoader() {
 #ifdef JIEF_DEBUG
   displayFreeMemory("LOADER_ENTRY::StartLoader() atfer ThemeX deleted"_XS8);
 #endif
-
   if (OSTYPE_IS_OSX(LoaderType) || OSTYPE_IS_OSX_RECOVERY(LoaderType) ||
       OSTYPE_IS_OSX_INSTALLER(LoaderType)) {
 
@@ -1364,7 +1363,6 @@ void LOADER_ENTRY::StartLoader() {
         gSettings.Quirks.OcKernelQuirks.XhciPortLimit;
     mOpenCoreConfiguration.Kernel.Quirks.ProvideCurrentCpuInfo =
         gSettings.Quirks.OcKernelQuirks.ProvideCurrentCpuInfo;
-
     // Experimental: Auto-detect and apply quirks for modern CPUs
 #ifdef ENABLE_MODERN_CPU_QUIRKS
     if (gSettings.Quirks.OcKernelQuirks.AutoModernCPUQuirks) {
@@ -1981,7 +1979,6 @@ void LOADER_ENTRY::StartLoader() {
       }
       BuildVersion.setEmpty();
     }
-
     if (BuildVersion.notEmpty()) {
       DBG(" %s (%s)\n", macOSVersion.asString().c_str(), BuildVersion.c_str());
     } else {
@@ -2002,10 +1999,7 @@ void LOADER_ENTRY::StartLoader() {
         !BooterPatch((UINT8 *)LoadedImage->ImageBase, LoadedImage->ImageSize)) {
       DBG("Will not patch boot.efi\n");
     }
-XStringW OSName_real = this->OSName;
-//DBG("OS Version=%s\n", macOSVersion.asString().c_str());
-DBG("OSName=%ls\n", OSName_real.wc_str());
-    gConf.ReloadSmbios(OSName_real);
+    gConf.ReloadSmbios(OSName);
     DelegateKernelPatches();
 
     // Set boot argument for kernel if no caches, this should force kernel
@@ -2937,7 +2931,7 @@ static void LoadDrivers(void) {
     gDriversFlags.VideoLoaded = true;
     DriversToConnectNum++;
   }
-DBG("UninitRefitLib Num=%llu\n", DriversToConnectNum);
+//DBG("UninitRefitLib Num=%llu\n", DriversToConnectNum);
   UninitRefitLib();
   if (DriversToConnectNum > 0) {
     DBG("%llu drivers needs connecting ...\n", DriversToConnectNum);
@@ -4012,6 +4006,8 @@ DBG("strlen '<' =%ld or %lld\n", L_STR_LEN("<"), AsciiStrLen("<"));
           HelpRefit();
           break;
       */
+//	LOADER_ENTRY* CE = ChosenEntry->getLOADER_ENTRY();
+
       if (ChosenEntry->getLOADER_ENTRY()) { // Boot OS via .EFI loader
         SetBootCurrent(ChosenEntry->getLOADER_ENTRY());
         ChosenEntry->StartLoader();