Merger trackers #7807 and #8372.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@4153 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c b/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c
index 6e1c3f82a81eddeb44e460bc56577dee136a4d7e..50eb1f56bc0d58f18ddbb84f6b6eb39bf97666c0 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c
+++ b/IntelFrameworkModulePkg/Library/GraphicsLib/Graphics.c
@@ -34,7 +34,7 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 #include <Library/BaseLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r
 #include <Library/BaseLib.h>\r
 #include <Library/MemoryAllocationLib.h>\r
 #include <Library/UefiBootServicesTableLib.h>\r

-\r
+#include <Library/DebugLib.h>\r

 \r
 EFI_STATUS\r
 GetGraphicsBitMapFromFV (\r
 \r
 EFI_STATUS\r
 GetGraphicsBitMapFromFV (\r


@@ -133,8 +133,8 @@ ConvertBmpToGopBlt (
 \r
 Routine Description:\r
 \r
 \r
 Routine Description:\r
 \r

-  Convert a *.BMP graphics image to a UGA blt buffer. If a NULL UgaBlt buffer\r
-  is passed in a UgaBlt buffer will be allocated by this routine. If a UgaBlt\r
+  Convert a *.BMP graphics image to a GOP/UGA blt buffer. If a NULL Blt buffer\r
+  is passed in a GopBlt buffer will be allocated by this routine. If a GopBlt\r

   buffer is passed in it will be used if it is big enough.\r
 \r
 Arguments:\r
   buffer is passed in it will be used if it is big enough.\r
 \r
 Arguments:\r


@@ -143,21 +143,21 @@ Arguments:
 \r
   BmpImageSize  - Number of bytes in BmpImage\r
 \r
 \r
   BmpImageSize  - Number of bytes in BmpImage\r
 \r

-  UgaBlt        - Buffer containing UGA version of BmpImage.\r
+  GopBlt        - Buffer containing GOP version of BmpImage.\r

 \r
 \r

-  UgaBltSize    - Size of UgaBlt in bytes.\r
+  GopBltSize    - Size of GopBlt in bytes.\r

 \r
 \r

-  PixelHeight   - Height of UgaBlt/BmpImage in pixels\r
+  PixelHeight   - Height of GopBlt/BmpImage in pixels\r

 \r
 \r

-  PixelWidth    - Width of UgaBlt/BmpImage in pixels\r
+  PixelWidth    - Width of GopBlt/BmpImage in pixels\r

 \r
 \r
 Returns:\r
 \r
 \r
 \r
 Returns:\r
 \r

-  EFI_SUCCESS           - UgaBlt and UgaBltSize are returned.\r
+  EFI_SUCCESS           - GopBlt and GopBltSize are returned.\r

   EFI_UNSUPPORTED       - BmpImage is not a valid *.BMP image\r
   EFI_UNSUPPORTED       - BmpImage is not a valid *.BMP image\r

-  EFI_BUFFER_TOO_SMALL  - The passed in UgaBlt buffer is not big enough.\r
-                          UgaBltSize will contain the required size.\r
+  EFI_BUFFER_TOO_SMALL  - The passed in GopBlt buffer is not big enough.\r
+                          GopBltSize will contain the required size.\r

   EFI_OUT_OF_RESOURCES  - No enough buffer to allocate\r
 \r
 --*/\r
   EFI_OUT_OF_RESOURCES  - No enough buffer to allocate\r
 \r
 --*/\r


@@ -575,8 +575,8 @@ DisableQuietBoot (
 \r
 Routine Description:\r
 \r
 \r
 Routine Description:\r
 \r

-  Use Console Control to turn on UGA based Simple Text Out consoles. The UGA\r
-  Simple Text Out screens will now be synced up with all non UGA output devices\r
+  Use Console Control to turn on GOP/UGA based Simple Text Out consoles. The GOP/UGA\r
+  Simple Text Out screens will now be synced up with all non GOP/UGA output devices\r

 \r
 Arguments:\r
 \r
 \r
 Arguments:\r
 \r


@@ -584,7 +584,7 @@ Arguments:
 \r
 Returns:\r
 \r
 \r
 Returns:\r
 \r

-  EFI_SUCCESS           - UGA devices are back in text mode and synced up.\r
+  EFI_SUCCESS           - GOP/UGA devices are back in text mode and synced up.\r

   EFI_UNSUPPORTED       - Logo not found\r
 \r
 --*/\r
   EFI_UNSUPPORTED       - Logo not found\r
 \r
 --*/\r


@@ -665,21 +665,23 @@ Returns:
 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r

-  VOID              *Buffer;\r
-  EFI_STATUS        Status;\r
-  UINT16            GlyphWidth;\r
-  UINT32            GlyphStatus;\r
-  UINT16            StringIndex;\r
-  UINTN             Index;\r
-  CHAR16            *UnicodeWeight;\r
-  EFI_NARROW_GLYPH  *Glyph;\r
-  EFI_HII_PROTOCOL  *Hii;\r
-  EFI_GRAPHICS_OUTPUT_BLT_PIXEL     *LineBuffer;\r
-  UINT32            HorizontalResolution;\r
-  UINT32            VerticalResolution;\r
-  UINT32            ColorDepth;\r
-  UINT32            RefreshRate;\r
-  UINTN             BufferGlyphWidth;\r
+  VOID                           *Buffer;\r
+  EFI_STATUS                     Status;\r
+  UINT16                         GlyphWidth;\r
+  UINT32                         GlyphStatus;\r
+  UINT16                         StringIndex;\r
+  UINTN                          Index;\r
+  CHAR16                         *UnicodeWeight;\r
+  EFI_NARROW_GLYPH               *Glyph;\r
+  EFI_HII_PROTOCOL               *Hii;\r
+  EFI_GRAPHICS_OUTPUT_BLT_PIXEL  *LineBuffer;\r
+  UINT32                         HorizontalResolution;\r
+  UINT32                         VerticalResolution;\r
+  UINT32                         ColorDepth;\r
+  UINT32                         RefreshRate;\r
+  UINTN                          BufferLen;\r
+  UINTN                          LineBufferLen;\r
+  UINTN                          BufferGlyphWidth;\r

 \r
   GlyphStatus = 0;\r
 \r
 \r
   GlyphStatus = 0;\r
 \r


@@ -700,8 +702,10 @@ Returns:
     //\r
     UgaDraw->GetMode (UgaDraw, &HorizontalResolution, &VerticalResolution, &ColorDepth, &RefreshRate);\r
   }\r
     //\r
     UgaDraw->GetMode (UgaDraw, &HorizontalResolution, &VerticalResolution, &ColorDepth, &RefreshRate);\r
   }\r

+  ASSERT ((HorizontalResolution != 0) && (VerticalResolution !=0));\r

 \r
 \r

-  LineBuffer = AllocatePool (sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) * HorizontalResolution * GLYPH_WIDTH * GLYPH_HEIGHT);\r
+  LineBufferLen = sizeof (EFI_GRAPHICS_OUTPUT_BLT_PIXEL) * HorizontalResolution * GLYPH_HEIGHT;\r
+  LineBuffer = AllocatePool (LineBufferLen);\r

   if (LineBuffer == NULL) {\r
     gBS->FreePool (Buffer);\r
     return EFI_OUT_OF_RESOURCES;\r
   if (LineBuffer == NULL) {\r
     gBS->FreePool (Buffer);\r
     return EFI_OUT_OF_RESOURCES;\r


@@ -724,7 +728,14 @@ Returns:
     }\r
   }\r
 \r
     }\r
   }\r
 \r

-  for (Index = 0; Index < StrLen (Buffer); Index++) {\r
+  BufferLen = StrLen (Buffer);\r
+\r
+  if (GLYPH_WIDTH * GLYPH_HEIGHT * sizeof(EFI_GRAPHICS_OUTPUT_BLT_PIXEL) * BufferLen > LineBufferLen) {\r
+     Status = EFI_INVALID_PARAMETER;\r
+     goto Error;\r
+  }\r
+\r
+  for (Index = 0; Index < BufferLen; Index++) {\r

     StringIndex = (UINT16) Index;\r
     Status      = Hii->GetGlyph (Hii, UnicodeWeight, &StringIndex, (UINT8 **) &Glyph, &GlyphWidth, &GlyphStatus);\r
     if (EFI_ERROR (Status)) {\r
     StringIndex = (UINT16) Index;\r
     Status      = Hii->GetGlyph (Hii, UnicodeWeight, &StringIndex, (UINT8 **) &Glyph, &GlyphWidth, &GlyphStatus);\r
     if (EFI_ERROR (Status)) {\r


@@ -737,7 +748,7 @@ Returns:
                       (UINT8 *) Glyph,\r
                       mEfiColors[Sto->Mode->Attribute & 0x0f],\r
                       mEfiColors[Sto->Mode->Attribute >> 4],\r
                       (UINT8 *) Glyph,\r
                       mEfiColors[Sto->Mode->Attribute & 0x0f],\r
                       mEfiColors[Sto->Mode->Attribute >> 4],\r

-                      StrLen (Buffer),\r
+                      BufferLen,\r

                       GlyphWidth,\r
                       GLYPH_HEIGHT,\r
                       &LineBuffer[Index * GLYPH_WIDTH]\r
                       GlyphWidth,\r
                       GLYPH_HEIGHT,\r
                       &LineBuffer[Index * GLYPH_WIDTH]\r


@@ -748,7 +759,7 @@ Returns:
                       (UINT8 *) Glyph,\r
                       *Foreground,\r
                       *Background,\r
                       (UINT8 *) Glyph,\r
                       *Foreground,\r
                       *Background,\r

-                      StrLen (Buffer),\r
+                      BufferLen,\r

                       GlyphWidth,\r
                       GLYPH_HEIGHT,\r
                       &LineBuffer[Index * GLYPH_WIDTH]\r
                       GlyphWidth,\r
                       GLYPH_HEIGHT,\r
                       &LineBuffer[Index * GLYPH_WIDTH]\r


@@ -759,7 +770,7 @@ Returns:
   //\r
   // Blt a character to the screen\r
   //\r
   //\r
   // Blt a character to the screen\r
   //\r

-  BufferGlyphWidth = GLYPH_WIDTH * StrLen (Buffer);\r
+  BufferGlyphWidth = GLYPH_WIDTH * BufferLen;\r

   if (GraphicsOutput != NULL) {\r
     Status = GraphicsOutput->Blt (\r
                         GraphicsOutput,\r
   if (GraphicsOutput != NULL) {\r
     Status = GraphicsOutput->Blt (\r
                         GraphicsOutput,\r

diff --git a/IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf b/IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf
index ad7a5d81d7473893d220f90d171b718dc77134ed..a25ed94bf8bf7b151778350a96cb33b6db223de4 100644 (file)
--- a/IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf
+++ b/IntelFrameworkModulePkg/Library/GraphicsLib/GraphicsLib.inf
@@ -45,7 +45,7 @@
   MemoryAllocationLib\r
   BaseLib\r
   PrintLib\r
   MemoryAllocationLib\r
   BaseLib\r
   PrintLib\r

-\r
+  DebugLib\r

 \r
 [Protocols]\r
   gEfiHiiProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED\r
 \r
 [Protocols]\r
   gEfiHiiProtocolGuid                           # PROTOCOL ALWAYS_CONSUMED\r

diff --git a/MdeModulePkg/Core/RuntimeDxe/Runtime.h b/MdeModulePkg/Core/RuntimeDxe/Runtime.h
index 7154b53cdf93aa125cd6fbb838fddb6112427b0b..0078da2b9102d54c61fc163cd64b2e80c8ea8c5f 100644 (file)
--- a/MdeModulePkg/Core/RuntimeDxe/Runtime.h
+++ b/MdeModulePkg/Core/RuntimeDxe/Runtime.h
@@ -1,13 +1,13 @@
 /*++\r
 \r
 /*++\r
 \r

-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
+Copyright (c) 2006, Intel Corporation\r
+All rights reserved. This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r

                                                                                           \r
                                                                                           \r

-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 Module Name:\r
 \r
 \r
 Module Name:\r
 \r


@@ -27,7 +27,6 @@ Abstract:
 #include <PiDxe.h>\r
 #include <Protocol/LoadedImage.h>\r
 #include <Protocol/Runtime.h>\r
 #include <PiDxe.h>\r
 #include <Protocol/LoadedImage.h>\r
 #include <Protocol/Runtime.h>\r

-#include <Protocol/UgaIo.h>\r

 #include <Library/BaseLib.h>\r
 #include <Library/UefiDriverEntryPoint.h>\r
 #include <Library/DebugLib.h>\r
 #include <Library/BaseLib.h>\r
 #include <Library/UefiDriverEntryPoint.h>\r
 #include <Library/DebugLib.h>\r


@@ -65,7 +64,7 @@ Arguments:
 Returns:\r
 \r
   EFI_SUCCESS           - The CRC32 for target data is calculated successfully.\r
 Returns:\r
 \r
   EFI_SUCCESS           - The CRC32 for target data is calculated successfully.\r

-  EFI_INVALID_PARAMETER - Some parameter is not valid, so the CRC32 is not \r
+  EFI_INVALID_PARAMETER - Some parameter is not valid, so the CRC32 is not\r

                           calculated.\r
 \r
 --*/\r
                           calculated.\r
 \r
 --*/\r


@@ -84,7 +83,7 @@ Routine Description:
   Determines the new virtual address that is to be used on subsequent memory accesses.\r
 \r
 Arguments:\r
   Determines the new virtual address that is to be used on subsequent memory accesses.\r
 \r
 Arguments:\r

-  \r
+\r

   DebugDisposition    - Supplies type information for the pointer being converted.\r
   ConvertAddress      - A pointer to a pointer that is to be fixed to be the value needed\r
                         for the new virtual address mappings being applied.\r
   DebugDisposition    - Supplies type information for the pointer being converted.\r
   ConvertAddress      - A pointer to a pointer that is to be fixed to be the value needed\r
                         for the new virtual address mappings being applied.\r


@@ -114,7 +113,7 @@ Routine Description:
   Changes the runtime addressing mode of EFI firmware from physical to virtual.\r
 \r
 Arguments:\r
   Changes the runtime addressing mode of EFI firmware from physical to virtual.\r
 \r
 Arguments:\r

-  \r
+\r

   MemoryMapSize     - The size in bytes of VirtualMap.\r
   DescriptorSize    - The size in bytes of an entry in the VirtualMap.\r
   DescriptorVersion - The version of the structure entries in VirtualMap.\r
   MemoryMapSize     - The size in bytes of VirtualMap.\r
   DescriptorSize    - The size in bytes of an entry in the VirtualMap.\r
   DescriptorVersion - The version of the structure entries in VirtualMap.\r


@@ -166,11 +165,11 @@ RuntimeDriverInitialize (
 \r
 Routine Description:\r
 \r
 \r
 Routine Description:\r
 \r

-  Install Runtime AP. This code includes the EfiRuntimeLib, but it only \r
-  functions at RT in physical mode. \r
+  Install Runtime AP. This code includes the EfiRuntimeLib, but it only\r
+  functions at RT in physical mode.\r

 \r
 Arguments:\r
 \r
 Arguments:\r

-  \r
+\r

   ImageHandle   - Image handle of this driver.\r
   SystemTable   - Pointer to the EFI System Table.\r
 \r
   ImageHandle   - Image handle of this driver.\r
   SystemTable   - Pointer to the EFI System Table.\r
 \r

diff --git a/MdeModulePkg/Include/Protocol/ConsoleControl.h b/MdeModulePkg/Include/Protocol/ConsoleControl.h
index c894302c66cf264ae5a414b0fb474133de2d8264..75de391a40d78578a46e028b5d44fd221083dc7c 100644 (file)
--- a/MdeModulePkg/Include/Protocol/ConsoleControl.h
+++ b/MdeModulePkg/Include/Protocol/ConsoleControl.h
@@ -1,6 +1,6 @@
 /*++ \r
 \r
 /*++ \r
 \r

-Copyright (c) 2006, Intel Corporation                                                         \r
+Copyright (c) 2006 - 2007, Intel Corporation                                                         \r

 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
 All rights reserved. This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r


@@ -15,7 +15,7 @@ Module Name:
 \r
 Abstract:\r
 \r
 \r
 Abstract:\r
 \r

-  Abstraction of a Text mode or UGA screen\r
+  Abstraction of a Text mode or GOP/UGA screen\r

 \r
 --*/\r
 \r
 \r
 --*/\r
 \r


@@ -40,20 +40,21 @@ EFI_STATUS
 (EFIAPI *EFI_CONSOLE_CONTROL_PROTOCOL_GET_MODE) (\r
   IN  EFI_CONSOLE_CONTROL_PROTOCOL      *This,\r
   OUT EFI_CONSOLE_CONTROL_SCREEN_MODE   *Mode,\r
 (EFIAPI *EFI_CONSOLE_CONTROL_PROTOCOL_GET_MODE) (\r
   IN  EFI_CONSOLE_CONTROL_PROTOCOL      *This,\r
   OUT EFI_CONSOLE_CONTROL_SCREEN_MODE   *Mode,\r

-  OUT BOOLEAN                           *UgaExists,   OPTIONAL  \r
-  OUT BOOLEAN                           *StdInLocked  OPTIONAL\r
+  OUT BOOLEAN                           *GopUgaExists,  OPTIONAL  \r
+  OUT BOOLEAN                           *StdInLocked    OPTIONAL\r

   )\r
 /*++\r
 \r
   Routine Description:\r
     Return the current video mode information. Also returns info about existence\r
   )\r
 /*++\r
 \r
   Routine Description:\r
     Return the current video mode information. Also returns info about existence\r

-    of UGA Draw devices in system, and if the Std In device is locked. All the\r
-    arguments are optional and only returned if a non NULL pointer is passed in.\r
+    of Graphics Output devices or UGA Draw devices in system, and if the Std In\r
+    device is locked. All the arguments are optional and only returned if a non\r
+    NULL pointer is passed in.\r

 \r
   Arguments:\r
     This - Protocol instance pointer.\r
     Mode        - Are we in text of grahics mode.\r
 \r
   Arguments:\r
     This - Protocol instance pointer.\r
     Mode        - Are we in text of grahics mode.\r

-    UgaExists   - TRUE if UGA Spliter has found a UGA device\r
+    GopUgaExists - TRUE if Console Spliter has found a GOP or UGA device\r

     StdInLocked - TRUE if StdIn device is keyboard locked\r
 \r
   Returns:\r
     StdInLocked - TRUE if StdIn device is keyboard locked\r
 \r
   Returns:\r

diff --git a/Nt32Pkg/Include/Protocol/WinNtIo.h b/Nt32Pkg/Include/Protocol/WinNtIo.h
index f407e78856a3eae40dd0ed8e4e59792c3e6236ed..91d112bd54a3e7e427571bb409da4bf96903b15b 100644 (file)
--- a/Nt32Pkg/Include/Protocol/WinNtIo.h
+++ b/Nt32Pkg/Include/Protocol/WinNtIo.h
@@ -1,13 +1,13 @@
 /*++\r
 \r
 /*++\r
 \r

-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+Copyright (c) 2006, Intel Corporation\r
+All rights reserved. This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 Module Name:\r
 \r
 \r
 Module Name:\r
 \r


@@ -59,16 +59,6 @@ extern EFI_GUID gEfiWinNtVirtualDisksGuid;
 \r
 extern EFI_GUID gEfiWinNtPhysicalDisksGuid;\r
 \r
 \r
 extern EFI_GUID gEfiWinNtPhysicalDisksGuid;\r
 \r

-//\r
-// EFI_WIN_NT_GOP_GUID\r
-//\r
-#define EFI_WIN_NT_GOP_GUID \\r
-  { \\r
-    0x4e11e955, 0xccca, 0x11d4, {0xbd, 0x0d, 0x00, 0x80, 0xc7, 0x3c, 0x88, 0x81} \\r
-  }\r
-\r
-extern EFI_GUID gEfiWinNtGopGuid;\r
-\r

 //\r
 // EFI_WIN_NT_FILE_SYSTEM\r
 //\r
 //\r
 // EFI_WIN_NT_FILE_SYSTEM\r
 //\r


@@ -99,6 +89,16 @@ extern EFI_GUID gEfiWinNtSerialPortGuid;
 \r
 extern EFI_GUID gEfiWinNtUgaGuid;\r
 \r
 \r
 extern EFI_GUID gEfiWinNtUgaGuid;\r
 \r

+//\r
+// EFI_WIN_NT_GOP\r
+//\r
+#define EFI_WIN_NT_GOP_GUID \\r
+  { \\r
+    0x4e11e955, 0xccca, 0x11d4, 0xbd, 0xd, 0x0, 0x80, 0xc7, 0x3c, 0x88, 0x81 \\r
+  }\r
+\r
+extern EFI_GUID gEfiWinNtGopGuid;\r
+\r

 //\r
 // EFI_WIN_NT_CONSOLE\r
 //\r
 //\r
 // EFI_WIN_NT_CONSOLE\r
 //\r

diff --git a/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c b/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c
index 9ed9bfd38c7c85ed6d0ab59e27713d315f602710..2ab8bb85971ad55eece599db4ac60a2f13a65f5e 100644 (file)
--- a/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c
+++ b/Nt32Pkg/PlatformBdsDxe/Generic/FrontPage.c
@@ -65,13 +65,13 @@ Returns:
 \r
 --*/\r
 {\r
 \r
 --*/\r
 {\r

-  CHAR16        *LanguageString;\r
-  UINTN         Count;\r
-  CHAR16        UnicodeLang[3];\r
-  CHAR8         Lang[3];\r
-  EFI_STATUS    Status;\r
-  UINTN         Index;\r
-  CHAR16        *TmpStr;\r
+  CHAR16                        *LanguageString;\r
+  UINTN                         Count;\r
+  CHAR16                        UnicodeLang[3];\r
+  CHAR8                         Lang[3];\r
+  EFI_STATUS                    Status;\r
+  UINTN                         Index;\r
+  CHAR16                        *TmpStr;\r

   EFI_GRAPHICS_OUTPUT_BLT_PIXEL Foreground;\r
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL Background;\r
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL Color;\r
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL Foreground;\r
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL Background;\r
   EFI_GRAPHICS_OUTPUT_BLT_PIXEL Color;\r

diff --git a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.c b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.c
index 932f7edb67def00e968a404768816a5114cecefe..951e8c88fd65131b9b897d0c1040624c280504c7 100644 (file)
--- a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.c
+++ b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.c
@@ -26,7 +26,7 @@ EFI_WIN_NT_PHYSICAL_DISKS - maps to drives on your system
 EFI_WIN_NT_VIRTUAL_DISKS  - maps to a device emulated by a file\r
 EFI_WIN_NT_FILE_SYSTEM    - mouts a directory as a file system\r
 EFI_WIN_NT_CONSOLE        - make a logical comand line window (only one!)\r
 EFI_WIN_NT_VIRTUAL_DISKS  - maps to a device emulated by a file\r
 EFI_WIN_NT_FILE_SYSTEM    - mouts a directory as a file system\r
 EFI_WIN_NT_CONSOLE        - make a logical comand line window (only one!)\r

-EFI_WIN_NT_UGA            - Builds UGA Windows of Width and Height\r
+EFI_WIN_NT_GOP            - Builds GOP Windows of Width and Height\r

 EFI_WIN_NT_SERIAL_PORT    - maps physical serial ports\r
 \r
  <F>ixed       - Fixed disk like a hard drive.\r
 EFI_WIN_NT_SERIAL_PORT    - maps physical serial ports\r
 \r
  <F>ixed       - Fixed disk like a hard drive.\r


@@ -76,11 +76,11 @@ EFI_WIN_NT_SERIAL_PORT    - maps physical serial ports
    Declaring a text console window with the title "My EFI Console" woild look like:\r
    EFI_WIN_NT_CONSOLE=My EFI Console\r
 \r
    Declaring a text console window with the title "My EFI Console" woild look like:\r
    EFI_WIN_NT_CONSOLE=My EFI Console\r
 \r

- EFI_WIN_NT_UGA =\r
+ EFI_WIN_NT_GOP =\r

    <width> <height>[!...]\r
 \r
    <width> <height>[!...]\r
 \r

-   Declaring a two UGA windows with resolutions of 800x600 and 1024x768 would look like:\r
-   Example : EFI_WIN_NT_UGA=800 600!1024 768\r
+   Declaring a two GOP windows with resolutions of 800x600 and 1024x768 would look like:\r
+   Example : EFI_WIN_NT_GOP=800 600!1024 768\r

 \r
  EFI_WIN_NT_SERIAL_PORT =\r
    <port name>[!...]\r
 \r
  EFI_WIN_NT_SERIAL_PORT =\r
    <port name>[!...]\r


@@ -156,9 +156,9 @@ static NT_PCD_ENTRY  mPcdEnvironment[] = {
 /**\r
   The user Entry Point for module WinNtBusDriver. The user code starts with this function.\r
 \r
 /**\r
   The user Entry Point for module WinNtBusDriver. The user code starts with this function.\r
 \r

-  @param[in] ImageHandle    The firmware allocated handle for the EFI image.  \r
+  @param[in] ImageHandle    The firmware allocated handle for the EFI image.\r

   @param[in] SystemTable    A pointer to the EFI System Table.\r
   @param[in] SystemTable    A pointer to the EFI System Table.\r

-  \r
+\r

   @retval EFI_SUCCESS       The entry point is executed successfully.\r
   @retval other             Some error occurs when executing this entry point.\r
 \r
   @retval EFI_SUCCESS       The entry point is executed successfully.\r
   @retval other             Some error occurs when executing this entry point.\r
 \r

diff --git a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.h b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.h
index b2a009bf0faa888169ff5acfecd55de88fa1346b..f15430ff3de16fee5282e065391b6d2237648acf 100644 (file)
--- a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.h
+++ b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriver.h
@@ -1,13 +1,13 @@
 /*++\r
 \r
 /*++\r
 \r

-Copyright (c) 2006, Intel Corporation                                                         \r
-All rights reserved. This program and the accompanying materials                          \r
-are licensed and made available under the terms and conditions of the BSD License         \r
-which accompanies this distribution.  The full text of the license may be found at        \r
-http://opensource.org/licenses/bsd-license.php                                            \r
-                                                                                          \r
-THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     \r
-WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             \r
+Copyright (c) 2006, Intel Corporation\r
+All rights reserved. This program and the accompanying materials\r
+are licensed and made available under the terms and conditions of the BSD License\r
+which accompanies this distribution.  The full text of the license may be found at\r
+http://opensource.org/licenses/bsd-license.php\r
+\r
+THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
+WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r

 \r
 Module Name:\r
 \r
 \r
 Module Name:\r
 \r


@@ -15,18 +15,18 @@ Module Name:
 \r
 Abstract:\r
 \r
 \r
 Abstract:\r
 \r

-This following section documents the envirnoment variables for the Win NT \r
-build.  These variables are used to define the (virtual) hardware \r
+This following section documents the envirnoment variables for the Win NT\r
+build.  These variables are used to define the (virtual) hardware\r

 configuration of the NT environment\r
 \r
 configuration of the NT environment\r
 \r

-A ! can be used to seperate multiple instances in a variable. Each \r
-instance represents a seperate hardware device. \r
+A ! can be used to seperate multiple instances in a variable. Each\r
+instance represents a seperate hardware device.\r

 \r
 EFI_WIN_NT_PHYSICAL_DISKS - maps to drives on your system\r
 EFI_WIN_NT_VIRTUAL_DISKS  - maps to a device emulated by a file\r
 EFI_WIN_NT_FILE_SYSTEM    - mouts a directory as a file system\r
 EFI_WIN_NT_CONSOLE        - make a logical comand line window (only one!)\r
 \r
 EFI_WIN_NT_PHYSICAL_DISKS - maps to drives on your system\r
 EFI_WIN_NT_VIRTUAL_DISKS  - maps to a device emulated by a file\r
 EFI_WIN_NT_FILE_SYSTEM    - mouts a directory as a file system\r
 EFI_WIN_NT_CONSOLE        - make a logical comand line window (only one!)\r

-EFI_WIN_NT_UGA            - Builds UGA Windows of Width and Height\r
+EFI_WIN_NT_GOP            - Builds GOP Windows of Width and Height\r

 EFI_WIN_NT_SERIAL_PORT    - maps physical serial ports\r
 EFI_WIN_NT_PASS_THRU      - associates a device with our PCI support\r
 \r
 EFI_WIN_NT_SERIAL_PORT    - maps physical serial ports\r
 EFI_WIN_NT_PASS_THRU      - associates a device with our PCI support\r
 \r


@@ -37,20 +37,20 @@ EFI_WIN_NT_PASS_THRU      - associates a device with our PCI support
  <block count> - Decimal number of blocks a device supports.\r
  <block size>  - Decimal number of bytes per block.\r
 \r
  <block count> - Decimal number of blocks a device supports.\r
  <block size>  - Decimal number of bytes per block.\r
 \r

- NT envirnonment variable contents. '<' and '>' are not part of the variable, \r
- they are just used to make this help more readable. There should be no \r
- spaces between the ';'. Extra spaces will break the variable. A '!' is  \r
+ NT envirnonment variable contents. '<' and '>' are not part of the variable,\r
+ they are just used to make this help more readable. There should be no\r
+ spaces between the ';'. Extra spaces will break the variable. A '!' is\r

  used to seperate multiple devices in a variable.\r
 \r
  used to seperate multiple devices in a variable.\r
 \r

- EFI_WIN_NT_VIRTUAL_DISKS = \r
+ EFI_WIN_NT_VIRTUAL_DISKS =\r

    <F | R><O | W>;<block count>;<block size>[!...]\r
 \r
  EFI_WIN_NT_PHYSICAL_DISKS =\r
    <drive letter>:<F | R><O | W>;<block count>;<block size>[!...]\r
 \r
  Virtual Disks: These devices use a file to emulate a hard disk or removable\r
    <F | R><O | W>;<block count>;<block size>[!...]\r
 \r
  EFI_WIN_NT_PHYSICAL_DISKS =\r
    <drive letter>:<F | R><O | W>;<block count>;<block size>[!...]\r
 \r
  Virtual Disks: These devices use a file to emulate a hard disk or removable\r

-                media device. \r
-                \r
+                media device.\r
+\r

    Thus a 20 MB emulated hard drive would look like:\r
    EFI_WIN_NT_VIRTUAL_DISKS=FW;40960;512\r
 \r
    Thus a 20 MB emulated hard drive would look like:\r
    EFI_WIN_NT_VIRTUAL_DISKS=FW;40960;512\r
 \r


@@ -65,25 +65,25 @@ EFI_WIN_NT_PASS_THRU      - associates a device with our PCI support
    Thus a standard CD-ROM floppy would look like:\r
    EFI_WIN_NT_PHYSICAL_DISKS=Z:RO;307200;2048\r
 \r
    Thus a standard CD-ROM floppy would look like:\r
    EFI_WIN_NT_PHYSICAL_DISKS=Z:RO;307200;2048\r
 \r

- EFI_WIN_NT_FILE_SYSTEM = \r
+ EFI_WIN_NT_FILE_SYSTEM =\r

    <directory path>[!...]\r
 \r
    Mounting the two directories C:\FOO and C:\BAR would look like:\r
    EFI_WIN_NT_FILE_SYSTEM=c:\foo!c:\bar\r
 \r
    <directory path>[!...]\r
 \r
    Mounting the two directories C:\FOO and C:\BAR would look like:\r
    EFI_WIN_NT_FILE_SYSTEM=c:\foo!c:\bar\r
 \r

- EFI_WIN_NT_CONSOLE = \r
+ EFI_WIN_NT_CONSOLE =\r

    <window title>\r
 \r
    Declaring a text console window with the title "My EFI Console" woild look like:\r
    EFI_WIN_NT_CONSOLE=My EFI Console\r
 \r
    <window title>\r
 \r
    Declaring a text console window with the title "My EFI Console" woild look like:\r
    EFI_WIN_NT_CONSOLE=My EFI Console\r
 \r

- EFI_WIN_NT_UGA = \r
+ EFI_WIN_NT_GOP =\r

    <width> <height>[!...]\r
 \r
    <width> <height>[!...]\r
 \r

-   Declaring a two UGA windows with resolutions of 800x600 and 1024x768 would look like:\r
-   Example : EFI_WIN_NT_UGA=800 600!1024 768\r
+   Declaring a two GOP windows with resolutions of 800x600 and 1024x768 would look like:\r
+   Example : EFI_WIN_NT_GOP=800 600!1024 768\r

 \r
 \r

- EFI_WIN_NT_SERIAL_PORT = \r
+ EFI_WIN_NT_SERIAL_PORT =\r

    <port name>[!...]\r
 \r
    Declaring two serial ports on COM1 and COM2 would look like:\r
    <port name>[!...]\r
 \r
    Declaring two serial ports on COM1 and COM2 would look like:\r

diff --git a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf
index d9165139cf9153e86d5e604c118713575f0ef8b1..0518a963b426b2de58c2576697629b0e67ec6b97 100644 (file)
--- a/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf
+++ b/Nt32Pkg/WinNtBusDriverDxe/WinNtBusDriverDxe.inf
@@ -32,8 +32,8 @@
 #\r
 #  VALID_ARCHITECTURES           = IA32\r
 #\r
 #\r
 #  VALID_ARCHITECTURES           = IA32\r
 #\r

-#  DRIVER_BINDING                =  gWinNtBusDriverBinding                       \r
-#  COMPONENT_NAME                =  gWinNtBusDriverComponentName                 \r
+#  DRIVER_BINDING                =  gWinNtBusDriverBinding\r
+#  COMPONENT_NAME                =  gWinNtBusDriverComponentName\r

 #\r
 \r
 [Sources.common]\r
 #\r
 \r
 [Sources.common]\r