- Merge from trunk up to r45543

[reactos.git] / boot / freeldr / freeldr / ui / ui.c

diff --git a/boot/freeldr/freeldr/ui/ui.c b/boot/freeldr/freeldr/ui/ui.c
index ce66c81..9a6a237 100644 (file)
--- a/boot/freeldr/freeldr/ui/ui.c
+++ b/boot/freeldr/freeldr/ui/ui.c
@@ -12,11 +12,11 @@
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *
  *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  *  GNU General Public License for more details.
  *

- *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ *  You should have received a copy of the GNU General Public License along
+ *  with this program; if not, write to the Free Software Foundation, Inc.,
+ *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.

  */
  */

-
+#ifndef _M_ARM

 #include <freeldr.h>
 #include <debug.h>
 
 #include <freeldr.h>
 #include <debug.h>
 


@@ -94,8 +94,8 @@ BOOLEAN UiInitialize(BOOLEAN ShowGui)
                return TRUE;
        }
 
                return TRUE;
        }
 

-       DbgPrint((DPRINT_UI, "Initializing User Interface.\n"));
-       DbgPrint((DPRINT_UI, "Reading in UI settings from [Display] section.\n"));
+       DPRINTM(DPRINT_UI, "Initializing User Interface.\n");
+       DPRINTM(DPRINT_UI, "Reading in UI settings from [Display] section.\n");

 
        DisplayModeText[0] = '\0';
        if (IniOpenSection("Display", &SectionId))
 
        DisplayModeText[0] = '\0';
        if (IniOpenSection("Display", &SectionId))


@@ -219,7 +219,7 @@ BOOLEAN UiInitialize(BOOLEAN ShowGui)
        // Draw the backdrop and fade it in if special effects are enabled
        UiFadeInBackdrop();
 
        // Draw the backdrop and fade it in if special effects are enabled
        UiFadeInBackdrop();
 

-       DbgPrint((DPRINT_UI, "UiInitialize() returning TRUE.\n"));
+       DPRINTM(DPRINT_UI, "UiInitialize() returning TRUE.\n");

        return TRUE;
 }
 
        return TRUE;
 }
 


@@ -256,7 +256,7 @@ BOOLEAN SetupUiInitialize(VOID)
        UiVtbl.DrawText(4, 1, "ReactOS " KERNEL_VERSION_STR " Setup", ATTR(COLOR_GRAY, UiBackdropBgColor));
        UiVtbl.DrawText(3, 2, DisplayModeText, ATTR(COLOR_GRAY, UiBackdropBgColor));
 
        UiVtbl.DrawText(4, 1, "ReactOS " KERNEL_VERSION_STR " Setup", ATTR(COLOR_GRAY, UiBackdropBgColor));
        UiVtbl.DrawText(3, 2, DisplayModeText, ATTR(COLOR_GRAY, UiBackdropBgColor));
 

-       DbgPrint((DPRINT_UI, "UiInitialize() returning TRUE.\n"));
+       DPRINTM(DPRINT_UI, "UiInitialize() returning TRUE.\n");

 
        return TRUE;
 }
 
        return TRUE;
 }


@@ -412,8 +412,6 @@ VOID UiShowMessageBoxesInSection(PCSTR SectionName)
 
        if (!IniOpenSection(SectionName, &SectionId))
        {
 
        if (!IniOpenSection(SectionName, &SectionId))
        {

-               sprintf(SettingName, "Section %s not found in freeldr.ini.\n", SectionName);
-               UiMessageBox(SettingName);

                return;
        }
 
                return;
        }
 


@@ -498,3 +496,4 @@ BOOLEAN UiEditBox(PCSTR MessageText, PCHAR EditTextBuffer, ULONG Length)
 {
        return UiVtbl.EditBox(MessageText, EditTextBuffer, Length);
 }
 {
        return UiVtbl.EditBox(MessageText, EditTextBuffer, Length);
 }

+#endif