Fix warnings generated by gcc for ia32 builds:

[mirror_edk2.git] / EdkNt32Pkg / Dxe / WinNtThunk / Bus / Gop / WinNtGopScreen.c

diff --git a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGopScreen.c b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGopScreen.c
index 76545110761cb3b45dbf016f749f5c492c10e220..1923c34972b969e4ae01af4e532371767f437021 100644 (file)
--- a/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGopScreen.c
+++ b/EdkNt32Pkg/Dxe/WinNtThunk/Bus/Gop/WinNtGopScreen.c
@@ -1,6 +1,6 @@
 /** @file
 
-Copyright (c) 2006, Intel Corporation
+Copyright (c) 2006 - 2007, Intel Corporation
 All rights reserved. This program and the accompanying materials
 are licensed and made available under the terms and conditions of the BSD License
 which accompanies this distribution.  The full text of the license may be found at
@@ -85,7 +85,6 @@ WinNtGopQuerytMode (
   OUT EFI_GRAPHICS_OUTPUT_MODE_INFORMATION  **Info
   )
 {
-  EFI_STATUS        Status;
   GOP_PRIVATE_DATA  *Private;
 
   Private = GOP_PRIVATE_DATA_FROM_THIS (This);
@@ -94,13 +93,9 @@ WinNtGopQuerytMode (
     return EFI_INVALID_PARAMETER;
   }
 
-  Status = gBS->AllocatePool (
-                  EfiBootServicesData,
-                  sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION),
-                  Info
-                  );
-  if (EFI_ERROR (Status)) {
-    return Status;
+  *Info = AllocatePool (sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION));
+  if (*Info == NULL) {
+    return EFI_OUT_OF_RESOURCES;
   }
 
   *SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);
@@ -242,17 +237,13 @@ WinNtGopSetMode (
 
   }
 
-  Status = gBS->AllocatePool (
-                  EfiBootServicesData,
-                  sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) * ModeData->HorizontalResolution,
-                  &NewFillLine
-                  );
-  if (EFI_ERROR (Status)) {
+  NewFillLine = AllocatePool (sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) * ModeData->HorizontalResolution);
+  if (NewFillLine == NULL) {
     return EFI_DEVICE_ERROR;
   }
 
   if (Private->FillLine != NULL) {
-    gBS->FreePool (Private->FillLine);
+    FreePool (Private->FillLine);
   }
 
   Private->FillLine             = NewFillLine;
@@ -636,6 +627,8 @@ WinNtGopThreadWindowProc (
     case VK_F7:   Key.ScanCode = SCAN_F7;   break;
     case VK_F8:   Key.ScanCode = SCAN_F8;   break;
     case VK_F9:   Key.ScanCode = SCAN_F9;   break;
+    case VK_F11:  Key.ScanCode = SCAN_F11;  break;
+    case VK_F12:  Key.ScanCode = SCAN_F12;  break;
     }
 
     if (Key.ScanCode != 0) {
@@ -842,7 +835,7 @@ WinNtGopStartWindow (
   // Register to be notified on exit boot services so we can destroy the window.
   //
   Status = gBS->CreateEvent (
-                  EVENT_SIGNAL_EXIT_BOOT_SERVICES,
+                  EVT_SIGNAL_EXIT_BOOT_SERVICES,
                   TPL_CALLBACK,
                   KillNtGopThread,
                   Private,
@@ -883,8 +876,6 @@ WinNtGopConstructor (
   GOP_PRIVATE_DATA    *Private
   )
 {
-  EFI_STATUS                             Status;
-
   Private->ModeData = mGopModeData;
 
   Private->GraphicsOutput.QueryMode = WinNtGopQuerytMode;
@@ -894,22 +885,15 @@ WinNtGopConstructor (
   //
   // Allocate buffer for Graphics Output Protocol mode information
   //
-  Status = gBS->AllocatePool (
-                EfiBootServicesData,
-                sizeof (EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE),
-                (VOID **) &Private->GraphicsOutput.Mode
-                );
-  if (EFI_ERROR (Status)) {
-    return Status;
+  Private->GraphicsOutput.Mode = AllocatePool (sizeof (EFI_GRAPHICS_OUTPUT_PROTOCOL_MODE));
+  if (Private->GraphicsOutput.Mode == NULL) {
+    return EFI_OUT_OF_RESOURCES;
   }
-  Status = gBS->AllocatePool (
-                EfiBootServicesData,
-                sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION),
-                (VOID **) &Private->GraphicsOutput.Mode->Info
-                );
-  if (EFI_ERROR (Status)) {
-    return Status;
+  Private->GraphicsOutput.Mode->Info = AllocatePool (sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION));
+  if (Private->GraphicsOutput.Mode->Info == NULL) {
+    return EFI_OUT_OF_RESOURCES;
   }
+
   Private->GraphicsOutput.Mode->MaxMode = sizeof(mGopModeData) / sizeof(GOP_MODE_DATA);
   //
   // Till now, we have no idea about the window size.
@@ -918,9 +902,9 @@ WinNtGopConstructor (
   Private->GraphicsOutput.Mode->Info->Version = 0;
   Private->GraphicsOutput.Mode->Info->HorizontalResolution = 0;
   Private->GraphicsOutput.Mode->Info->VerticalResolution = 0;
-  Private->GraphicsOutput.Mode->Info->PixelFormat = PixelBlueGreenRedReserved8BitPerColor;
+  Private->GraphicsOutput.Mode->Info->PixelFormat = PixelBltOnly;
   Private->GraphicsOutput.Mode->SizeOfInfo = sizeof (EFI_GRAPHICS_OUTPUT_MODE_INFORMATION);
-  Private->GraphicsOutput.Mode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) NULL;
+  Private->GraphicsOutput.Mode->FrameBufferBase = (EFI_PHYSICAL_ADDRESS) (UINTN) NULL;
   Private->GraphicsOutput.Mode->FrameBufferSize = 0;
 
   Private->HardwareNeedsStarting  = TRUE;
@@ -980,9 +964,9 @@ WinNtGopDestructor (
   //
   if (Private->GraphicsOutput.Mode != NULL) {
     if (Private->GraphicsOutput.Mode->Info != NULL) {
-        gBS->FreePool (Private->GraphicsOutput.Mode->Info);
+      FreePool (Private->GraphicsOutput.Mode->Info);
     }
-    gBS->FreePool (Private->GraphicsOutput.Mode);
+    FreePool (Private->GraphicsOutput.Mode);
   }
 
   return EFI_SUCCESS;