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

5 files changed, 15 insertions, 15 deletions

diff --git a/MdePkg/Include/Library/BaseMemoryLib.h b/MdePkg/Include/Library/BaseMemoryLib.h
index af3e1ecfaf..66051525ec 100644
--- a/MdePkg/Include/Library/BaseMemoryLib.h
+++ b/MdePkg/Include/Library/BaseMemoryLib.h
@@ -45,7 +45,7 @@ CopyMem (
   Fills a target buffer with a byte value, and returns the target buffer.

 

   This function fills Length bytes of Buffer with Value, and returns Buffer.

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

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

 

   @param  Buffer    Memory to set.

   @param  Length    Number of bytes to set.

@@ -148,7 +148,7 @@ SetMem64 (
 

   This function fills Length bytes of Buffer with zeros, and returns Buffer.

   If Length > 0 and Buffer is NULL, then ASSERT().

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

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

 

   @param  Buffer      Pointer to the target buffer to fill with zeros.

   @param  Length      Number of bytes in Buffer to fill with zeros.

@@ -201,7 +201,7 @@ CompareMem (
   then a pointer to the matching byte in the target buffer is returned.  If no match is found,

   then NULL is returned.  If Length is 0, then NULL is returned.

   If Length > 0 and Buffer is NULL, then ASSERT().

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

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

 

   @param  Buffer      Pointer to the target buffer to scan.

   @param  Length      Number of bytes in Buffer to scan.

@@ -229,7 +229,7 @@ ScanMem8 (
   If Length > 0 and Buffer is NULL, then ASSERT().

   If Buffer is not aligned on a 16-bit boundary, then ASSERT().

   If Length is not aligned on a 16-bit boundary, then ASSERT().

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

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

 

   @param  Buffer      Pointer to the target buffer to scan.

   @param  Length      Number of bytes in Buffer to scan.

@@ -257,7 +257,7 @@ ScanMem16 (
   If Length > 0 and Buffer is NULL, then ASSERT().

   If Buffer is not aligned on a 32-bit boundary, then ASSERT().

   If Length is not aligned on a 32-bit boundary, then ASSERT().

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

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

 

   @param  Buffer      Pointer to the target buffer to scan.

   @param  Length      Number of bytes in Buffer to scan.

@@ -285,7 +285,7 @@ ScanMem32 (
   If Length > 0 and Buffer is NULL, then ASSERT().

   If Buffer is not aligned on a 64-bit boundary, then ASSERT().

   If Length is not aligned on a 64-bit boundary, then ASSERT().

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

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

 

   @param  Buffer      Pointer to the target buffer to scan.

   @param  Length      Number of bytes in Buffer to scan.

@@ -357,7 +357,7 @@ CompareGuid (
   If Length > 0 and Buffer is NULL, then ASSERT().

   If Buffer is not aligned on a 32-bit boundary, then ASSERT().

   If Length is not aligned on a 128-bit boundary, then ASSERT().

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

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

 

   @param  Buffer  Pointer to the target buffer to scan.

   @param  Length  Number of bytes in Buffer to scan.

diff --git a/MdePkg/Include/Library/MemoryAllocationLib.h b/MdePkg/Include/Library/MemoryAllocationLib.h
index d8bbe38387..a2aafcfd7a 100644
--- a/MdePkg/Include/Library/MemoryAllocationLib.h
+++ b/MdePkg/Include/Library/MemoryAllocationLib.h
@@ -306,7 +306,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  AllocationSize        The number of bytes to allocate and zero.

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

@@ -329,7 +329,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.

@@ -352,7 +352,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.

diff --git a/MdePkg/Include/Library/UefiDecompressLib.h b/MdePkg/Include/Library/UefiDecompressLib.h
index f744abc7eb..d08a6eb3a0 100644
--- a/MdePkg/Include/Library/UefiDecompressLib.h
+++ b/MdePkg/Include/Library/UefiDecompressLib.h
@@ -64,7 +64,7 @@ UefiDecompressGetInfo (
 

   This function is designed so that the decompression algorithm can be implemented

   without using any memory services.  As a result, this function is not allowed to

-  call any memory allocation services in its implementation.  It is the caller¡¯s r

+  call any memory allocation services in its implementation.  It is the caller's r

   esponsibility to allocate and free the Destination and Scratch buffers.

   If the compressed source data specified by Source is sucessfully decompressed 

   into Destination, then RETURN_SUCCESS is returned.  If the compressed source data 

diff --git a/MdePkg/Include/Library/UefiLib.h b/MdePkg/Include/Library/UefiLib.h
index dd27078396..18be1b6347 100644
--- a/MdePkg/Include/Library/UefiLib.h
+++ b/MdePkg/Include/Library/UefiLib.h
@@ -189,7 +189,7 @@ EfiInitializeLock (
 

 

 /**

-  This function raises the system¡¯s current task priority level to the task 

+  This function raises the system's current task priority level to the task 

   priority level of the mutual exclusion lock.  Then, it places the lock in the 

   acquired state.

 

@@ -203,7 +203,7 @@ EfiAcquireLock (
   );

 

 /**

-  This function raises the system¡¯s current task priority level to the task 

+  This function raises the system's current task priority level to the task 

   priority level of the mutual exclusion lock.  Then, it attempts to place the 

   lock in the acquired state.

 

@@ -221,7 +221,7 @@ EfiAcquireLockOrFail (
 

 /**

   This function transitions a mutual exclusion lock from the acquired state to 

-  the released state, and restores the system¡¯s task priority level to its 

+  the released state, and restores the system's task priority level to its 

   previous level.

 

   @param  Lock  A pointer to the lock to release.

diff --git a/MdePkg/Include/Library/UefiRuntimeLib.h b/MdePkg/Include/Library/UefiRuntimeLib.h
index 921b959548..b1d6af43da 100644
--- a/MdePkg/Include/Library/UefiRuntimeLib.h
+++ b/MdePkg/Include/Library/UefiRuntimeLib.h
@@ -55,7 +55,7 @@ EfiGoneVirtual (
   capabilities of hardware platform.

 

   @param  Time         A pointer to storage to receive a snapshot of the current time.

-  @param  Capabilities An optional pointer to a buffer to receive the real time clock device¡¯s

+  @param  Capabilities An optional pointer to a buffer to receive the real time clock device's

                        capabilities.

  

   @retval  EFI_SUCCESS  Success to execute the function.