Change UINAME to CName of GUID/PPI/Protocol in all Msa file and change tool to support it.

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

3 files changed, 24 insertions, 24 deletions

diff --git a/EdkNt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.msa b/EdkNt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.msa
index 7bbaa8f194..ad96863f3f 100644
--- a/EdkNt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.msa
+++ b/EdkNt32Pkg/Library/DxeWinNtLib/DxeWinNtLib.msa
@@ -8,11 +8,11 @@
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>

     <Description>FIX ME!</Description>

     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>

-    <License>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

-      http://opensource.org/licenses/bsd-license.php

-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+    <License>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
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
       WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>

     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

   </MsaHeader>

@@ -42,7 +42,7 @@
   </PackageDependencies>

   <Protocols>

     <Protocol Usage="ALWAYS_CONSUMED">

-      <ProtocolCName>WinNtThunk</ProtocolCName>

+      <ProtocolCName>gEfiWinNtThunkProtocolGuid</ProtocolCName>

     </Protocol>

   </Protocols>

   <Externs>

diff --git a/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa b/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa
index 06b2c0438e..c0e117afef 100644
--- a/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa
+++ b/EdkNt32Pkg/Library/EdkGenericBdsLib/EdkGenericBdsLib.msa
@@ -8,11 +8,11 @@
     <Abstract>Component description file for the entry point to a EFIDXE Drivers</Abstract>

     <Description>FIX ME!</Description>

     <Copyright>Copyright (c) 2004-2006, Intel Corporation</Copyright>

-    <License>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

-      http://opensource.org/licenses/bsd-license.php

-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+    <License>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
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
       WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>

     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

   </MsaHeader>

@@ -78,27 +78,27 @@
   </PackageDependencies>

   <Protocols>

     <Protocol Usage="ALWAYS_CONSUMED">

-      <ProtocolCName>LoadedImage</ProtocolCName>

+      <ProtocolCName>gEfiLoadedImageProtocolGuid</ProtocolCName>

     </Protocol>

     <Protocol Usage="ALWAYS_CONSUMED">

-      <ProtocolCName>FirmwareVolume</ProtocolCName>

+      <ProtocolCName>gEfiFirmwareVolumeProtocolGuid</ProtocolCName>

     </Protocol>

     <Protocol Usage="ALWAYS_CONSUMED">

-      <ProtocolCName>AcpiS3Save</ProtocolCName>

+      <ProtocolCName>gEfiAcpiS3SaveProtocolGuid</ProtocolCName>

     </Protocol>

     <Protocol Usage="ALWAYS_CONSUMED">

-      <ProtocolCName>SimpleTextOut</ProtocolCName>

+      <ProtocolCName>gEfiSimpleTextOutProtocolGuid</ProtocolCName>

     </Protocol>

     <Protocol Usage="ALWAYS_CONSUMED">

-      <ProtocolCName>SimpleTextIn</ProtocolCName>

+      <ProtocolCName>gEfiSimpleTextInProtocolGuid</ProtocolCName>

     </Protocol>

     <Protocol Usage="ALWAYS_CONSUMED">

-      <ProtocolCName>SimpleNetwork</ProtocolCName>

+      <ProtocolCName>gEfiSimpleNetworkProtocolGuid</ProtocolCName>

     </Protocol>

   </Protocols>

   <Guids>

     <GuidCNames Usage="ALWAYS_CONSUMED">

-      <GuidCName>ShellFile</GuidCName>

+      <GuidCName>gEfiShellFileGuid</GuidCName>

     </GuidCNames>

   </Guids>

   <Externs>

diff --git a/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.msa b/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.msa
index d58ee88883..268342c06b 100644
--- a/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.msa
+++ b/EdkNt32Pkg/Library/EdkNt32PeiPeCoffGetEntryPointLib/EdkNt32PeiPeCoffGetEntryPointLib.msa
@@ -8,11 +8,11 @@
     <Abstract>Component description file for the PEI library.</Abstract>

     <Description>FIX ME!</Description>

     <Copyright>Copyright (c) 2004 - 2005, Intel Corporation</Copyright>

-    <License>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

-      http://opensource.org/licenses/bsd-license.php

-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,

+    <License>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
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
       WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>

     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>

   </MsaHeader>

@@ -38,7 +38,7 @@
   </PackageDependencies>

   <PPIs>

     <Ppi Usage="ALWAYS_CONSUMED">

-      <PpiCName>NtPeiLoadFile</PpiCName>

+      <PpiCName>gNtPeiLoadFilePpiGuid</PpiCName>

     </Ppi>

   </PPIs>

   <Externs>