1. Add the fix for the following Bugs:

i)	BMM_FAKE_NV_DATA definition inconsistent in bm.vfr and BootMain.h
        (EdkNt32Pkg\Dxe\PlatformBdsDxe\Generic\BootMaint\BootMain.h)
ii)	Change some files’ EOL(end of line) format to DOS. Some file use even mixed style EOL.
   (EdkModulePkg\Universal\DevicePath\Dxe\DevicePath.c, DevicepathFromText.c, DevicePathUtilities.c;
EdkModulePkg\Universal\Disk\DiskIo\Dxe\diskIo.c; MdePkg\Library\UefiLib\UefiNotTiano.c)
iii)    Change some illegal characters in many files, the problem is mainly connected with people using Chinese Input method to input symbols such as ' " - ?, etc. Multiple files are influenced.

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

1 files changed, 4 insertions, 4 deletions

diff --git a/MdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLib.c b/MdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLib.c
index b4f84cb4d..ae3481d19 100644
--- a/MdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLib.c
+++ b/MdePkg/Library/PeiMemoryAllocationLib/MemoryAllocationLib.c
@@ -508,7 +508,7 @@ AllocateReservedZeroPool (
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there

   is not enough memory remaining to satisfy the request, then NULL is returned.

   If Buffer is NULL, then ASSERT().

-  If AllocationSize is greater than (MAX_ADDRESS – Buffer + 1), then ASSERT(). 

+  If AllocationSize is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). 

 

   @param  PoolType              The type of pool to allocate.

   @param  AllocationSize        The number of bytes to allocate and zero.

@@ -544,7 +544,7 @@ InternalAllocateCopyPool (
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there

   is not enough memory remaining to satisfy the request, then NULL is returned.

   If Buffer is NULL, then ASSERT().

-  If AllocationSize is greater than (MAX_ADDRESS – Buffer + 1), then ASSERT(). 

+  If AllocationSize is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). 

 

   @param  AllocationSize        The number of bytes to allocate and zero.

   @param  Buffer                The buffer to copy to the allocated buffer.

@@ -579,7 +579,7 @@ AllocateCopyPool (
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there

   is not enough memory remaining to satisfy the request, then NULL is returned.

   If Buffer is NULL, then ASSERT().

-  If AllocationSize is greater than (MAX_ADDRESS – Buffer + 1), then ASSERT(). 

+  If AllocationSize is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). 

 

   @param  AllocationSize        The number of bytes to allocate and zero.

   @param  Buffer                The buffer to copy to the allocated buffer.

@@ -605,7 +605,7 @@ AllocateRuntimeCopyPool (
   allocated buffer.  If AllocationSize is 0, then a valid buffer of 0 size is returned.  If there

   is not enough memory remaining to satisfy the request, then NULL is returned.

   If Buffer is NULL, then ASSERT().

-  If AllocationSize is greater than (MAX_ADDRESS – Buffer + 1), then ASSERT(). 

+  If AllocationSize is greater than (MAX_ADDRESS ? Buffer + 1), then ASSERT(). 

 

   @param  AllocationSize        The number of bytes to allocate and zero.

   @param  Buffer                The buffer to copy to the allocated buffer.