Perfected MSA files.

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

6 files changed, 26 insertions, 24 deletions

diff --git a/EdkNt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.msa b/EdkNt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.msa
index 463c607375..394fc24654 100644
--- a/EdkNt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.msa
+++ b/EdkNt32Pkg/Library/DxeNt32OemHookStatusCodeLib/DxeNt32OemHookStatusCodeLib.msa
@@ -51,11 +51,11 @@
     <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>

   </PackageDependencies>

-  <Protocols>

-    <Protocol Usage="ALWAYS_CONSUMED">

-      <ProtocolCName>gEfiWinNtThunkProtocolGuid</ProtocolCName>

-    </Protocol>

-  </Protocols>

+  <Hobs>

+    <HobTypes HobGuidCName="gEfiWinNtThunkProtocolGuid" Usage="ALWAYS_CONSUMED">

+      <HobType>GUID_EXTENSION</HobType>

+    </HobTypes>

+  </Hobs>

   <Guids>

     <GuidCNames Usage="ALWAYS_CONSUMED">

       <GuidCName>gEfiStatusCodeSpecificDataGuid</GuidCName>

diff --git a/EdkNt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.msa b/EdkNt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.msa
index 4ae0d0c10c..562616c1d1 100644
--- a/EdkNt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.msa
+++ b/EdkNt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.msa
@@ -39,11 +39,11 @@
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

     <Package PackageGuid="0fb2aa2d-10d5-40a5-a9dc-060c12a4a3f3"/>

   </PackageDependencies>

-  <Protocols>

-    <Protocol Usage="ALWAYS_CONSUMED">

-      <ProtocolCName>gEfiWinNtThunkProtocolGuid</ProtocolCName>

-    </Protocol>

-  </Protocols>

+  <Hobs>

+    <HobTypes HobGuidCName="gEfiWinNtThunkProtocolGuid" Usage="ALWAYS_CONSUMED">

+      <HobType>GUID_EXTENSION</HobType>

+    </HobTypes>

+  </Hobs>

   <Externs>

     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

diff --git a/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c b/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c
index e0b5d08c96..b8be94e74d 100644
--- a/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c
+++ b/EdkNt32Pkg/Library/EdkGenericBdsLib/BdsMisc.c
@@ -1012,6 +1012,8 @@ Returns:
                       &Browser

                       );

 

+      ASSERT (Status != EFI_SUCCESS);

+

       StringBuffer1 = AllocateZeroPool (MAX_STRING_LEN * sizeof (CHAR16));

       ASSERT (StringBuffer1 != NULL);

       StringBuffer2 = AllocateZeroPool (MAX_STRING_LEN * sizeof (CHAR16));

diff --git a/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa b/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa
index d9420e4385..062660218a 100644
--- a/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa
+++ b/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa
@@ -86,19 +86,19 @@
     <Protocol Usage="ALWAYS_CONSUMED">

       <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

+    <Protocol Usage="SOMETIMES_CONSUMED">

       <ProtocolCName>gEfiFirmwareVolumeProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

+    <Protocol Usage="SOMETIMES_CONSUMED">

       <ProtocolCName>gEfiAcpiS3SaveProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

+    <Protocol Usage="SOMETIMES_CONSUMED">

       <ProtocolCName>gEfiSimpleTextOutProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

+    <Protocol Usage="SOMETIMES_CONSUMED">

       <ProtocolCName>gEfiSimpleTextInProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

+    <Protocol Usage="SOMETIMES_CONSUMED">

       <ProtocolCName>gEfiSimpleNetworkProtocolGuid</ProtocolCName>

     </Protocol>

     <Protocol Usage="ALWAYS_CONSUMED">

@@ -113,16 +113,16 @@
     <Protocol Usage="ALWAYS_CONSUMED">

       <ProtocolCName>gEfiBlockIoProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

+    <Protocol Usage="SOMETIMES_CONSUMED">

       <ProtocolCName>gEfiDriverBindingProtocolGuid</ProtocolCName>

     </Protocol>

     <Protocol Usage="ALWAYS_CONSUMED">

       <ProtocolCName>gEfiFormBrowserProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

+    <Protocol Usage="SOMETIMES_CONSUMED">

       <ProtocolCName>gEfiLoadFileProtocolGuid</ProtocolCName>

     </Protocol>

-    <Protocol Usage="ALWAYS_CONSUMED">

+    <Protocol Usage="SOMETIMES_CONSUMED">

       <ProtocolCName>gEfiSimpleFileSystemProtocolGuid</ProtocolCName>

     </Protocol>

   </Protocols>

diff --git a/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.msa b/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.msa
index 1a76e04341..1759b4b89c 100644
--- a/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.msa
+++ b/EdkNt32Pkg/Library/Nt32PeCoffLoaderLib/Nt32PeCoffLoaderLib.msa
@@ -33,11 +33,11 @@
     <Package PackageGuid="5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"/>

     <Package PackageGuid="68169ab0-d41b-4009-9060-292c253ac43d"/>

   </PackageDependencies>

-  <Guids>

-    <GuidCNames Usage="SOMETIMES_CONSUMED">

-      <GuidCName>gEfiPeiPeCoffLoaderGuid</GuidCName>

-    </GuidCNames>

-  </Guids>

+  <PPIs>

+    <Ppi Usage="ALWAYS_CONSUMED">

+      <PpiCName>gEfiPeiPeCoffLoaderGuid</PpiCName>

+    </Ppi>

+  </PPIs>

   <Externs>

     <Specification>EFI_SPECIFICATION_VERSION 0x00020000</Specification>

     <Specification>EDK_RELEASE_VERSION 0x00020000</Specification>

diff --git a/EdkNt32Pkg/Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.msa b/EdkNt32Pkg/Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.msa
index 3fd99ae784..b9c3a56fe2 100644
--- a/EdkNt32Pkg/Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.msa
+++ b/EdkNt32Pkg/Library/PeiNt32OemHookStatusCodeLib/PeiNt32OemHookStatusCodeLib.msa
@@ -57,7 +57,7 @@
     </Ppi>

   </PPIs>

   <Guids>

-    <GuidCNames Usage="ALWAYS_CONSUMED">

+    <GuidCNames Usage="SOMETIMES_CONSUMED">

       <GuidCName>gEfiStatusCodeSpecificDataGuid</GuidCName>

     </GuidCNames>

   </Guids>