Fix several Unicode issues that fails VS2005.

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

diff --git a/ShellPkg/Include/Library/FileHandleLib.h b/ShellPkg/Include/Library/FileHandleLib.h
index 8140dae32fae26a803d19800be62aea691fc260b..3d2bbd1535d692417a172a4410df211e9369bd31 100644 (file)
--- a/ShellPkg/Include/Library/FileHandleLib.h
+++ b/ShellPkg/Include/Library/FileHandleLib.h
@@ -23,8 +23,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   This function will retrieve the information about the file for the handle \r
   specified and store it in allocated pool memory.\r
 \r
   This function will retrieve the information about the file for the handle \r
   specified and store it in allocated pool memory.\r
 \r

-  This function allocates a buffer to store the file\92s information. It is the \r
-  caller\92s responsibility to free the buffer\r
+  This function allocates a buffer to store the file's information. It is the \r
+  caller's responsibility to free the buffer\r

 \r
   @param  FileHandle  The file handle of the file for which information is \r
   being requested.\r
 \r
   @param  FileHandle  The file handle of the file for which information is \r
   being requested.\r


@@ -68,11 +68,11 @@ FileHandleSetInfo (
   This function reads information from an opened file.\r
 \r
   If FileHandle is not a directory, the function reads the requested number of \r
   This function reads information from an opened file.\r
 \r
   If FileHandle is not a directory, the function reads the requested number of \r

-  bytes from the file at the file\92s current position and returns them in Buffer. \r
+  bytes from the file at the file's current position and returns them in Buffer. \r

   If the read goes beyond the end of the file, the read length is truncated to the\r
   If the read goes beyond the end of the file, the read length is truncated to the\r

-  end of the file. The file\92s current position is increased by the number of bytes \r
+  end of the file. The file's current position is increased by the number of bytes \r

   returned.  If FileHandle is a directory, the function reads the directory entry \r
   returned.  If FileHandle is a directory, the function reads the directory entry \r

-  at the file\92s current position and returns the entry in Buffer. If the Buffer \r
+  at the file's current position and returns the entry in Buffer. If the Buffer \r

   is not large enough to hold the current directory entry, then \r
   EFI_BUFFER_TOO_SMALL is returned and the current file position is not updated. \r
   BufferSize is set to be the size of the buffer needed to read the entry. On \r
   is not large enough to hold the current directory entry, then \r
   EFI_BUFFER_TOO_SMALL is returned and the current file position is not updated. \r
   BufferSize is set to be the size of the buffer needed to read the entry. On \r


@@ -107,7 +107,7 @@ FileHandleRead(
   This function writes the specified number of bytes to the file at the current \r
   file position. The current file position is advanced the actual number of bytes \r
   written, which is returned in BufferSize. Partial writes only occur when there \r
   This function writes the specified number of bytes to the file at the current \r
   file position. The current file position is advanced the actual number of bytes \r
   written, which is returned in BufferSize. Partial writes only occur when there \r

-  has been a data error during the write attempt (such as \93volume space full\94). \r
+  has been a data error during the write attempt (such as "volume space full"). \r

   The file is automatically grown to hold the data if required. Direct writes to \r
   opened directories are not supported.\r
 \r
   The file is automatically grown to hold the data if required. Direct writes to \r
   opened directories are not supported.\r
 \r


@@ -136,7 +136,7 @@ FileHandleWrite(
 /** \r
   Close an open file handle.\r
 \r
 /** \r
   Close an open file handle.\r
 \r

-  This function closes a specified file handle. All \93dirty\94 cached file data is \r
+  This function closes a specified file handle. All "dirty" cached file data is \r

   flushed to the device, and the file is closed. In all cases the handle is \r
   closed.\r
 \r
   flushed to the device, and the file is closed. In all cases the handle is \r
   closed.\r
 \r


@@ -260,7 +260,7 @@ FileHandleIsDirectory (
 /**\r
   Retrieves the first file from a directory\r
 \r
 /**\r
   Retrieves the first file from a directory\r
 \r

-  This function opens a directory and gets the first file\92s info in the \r
+  This function opens a directory and gets the first file's info in the \r

   directory. Caller can use FileHandleFindNextFile() to get other files.  When \r
   complete the caller is responsible for calling FreePool() on *Buffer.\r
 \r
   directory. Caller can use FileHandleFindNextFile() to get other files.  When \r
   complete the caller is responsible for calling FreePool() on *Buffer.\r
 \r


@@ -314,7 +314,7 @@ FileHandleFindNextFile(
   if FileHandle is NULL then ASSERT()\r
   if Size is NULL then ASSERT()\r
 \r
   if FileHandle is NULL then ASSERT()\r
   if Size is NULL then ASSERT()\r
 \r

-  This function extracts the file size info from the FileHandle\92s EFI_FILE_INFO \r
+  This function extracts the file size info from the FileHandle's EFI_FILE_INFO \r

   data.\r
 \r
   @param FileHandle             file handle from which size is retrieved\r
   data.\r
 \r
   @param FileHandle             file handle from which size is retrieved\r

diff --git a/ShellPkg/Include/Library/ShellLib.h b/ShellPkg/Include/Library/ShellLib.h
index 5614d7174f59063620b081aad3bbe57cc7d9a3ef..ad3cc01f424d789d335e1272496f6725c75e79f1 100644 (file)
--- a/ShellPkg/Include/Library/ShellLib.h
+++ b/ShellPkg/Include/Library/ShellLib.h
@@ -22,8 +22,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   This function will retrieve the information about the file for the handle \r
   specified and store it in allocated pool memory.\r
 \r
   This function will retrieve the information about the file for the handle \r
   specified and store it in allocated pool memory.\r
 \r

-  This function allocates a buffer to store the file\92s information. It is the \r
-  caller\92s responsibility to free the buffer\r
+  This function allocates a buffer to store the file's information. It is the \r
+  caller's responsibility to free the buffer\r

 \r
   @param  FileHandle  The file handle of the file for which information is \r
                       being requested.\r
 \r
   @param  FileHandle  The file handle of the file for which information is \r
                       being requested.\r


@@ -106,7 +106,7 @@ ShellOpenFileByDevicePath(
 /**\r
   This function will open a file or directory referenced by filename.\r
 \r
 /**\r
   This function will open a file or directory referenced by filename.\r
 \r

-  If return is EFI_SUCCESS, the Filehandle is the opened file\92s handle; \r
+  If return is EFI_SUCCESS, the Filehandle is the opened file's handle; \r

   otherwise, the Filehandle is NULL. The Attributes is valid only for \r
   EFI_FILE_MODE_CREATE.\r
 \r
   otherwise, the Filehandle is NULL. The Attributes is valid only for \r
   EFI_FILE_MODE_CREATE.\r
 \r


@@ -179,11 +179,11 @@ ShellCreateDirectory(
   This function reads information from an opened file.\r
 \r
   If FileHandle is not a directory, the function reads the requested number of \r
   This function reads information from an opened file.\r
 \r
   If FileHandle is not a directory, the function reads the requested number of \r

-  bytes from the file at the file\92s current position and returns them in Buffer. \r
+  bytes from the file at the file's current position and returns them in Buffer. \r

   If the read goes beyond the end of the file, the read length is truncated to the\r
   If the read goes beyond the end of the file, the read length is truncated to the\r

-  end of the file. The file\92s current position is increased by the number of bytes \r
+  end of the file. The file's current position is increased by the number of bytes \r

   returned.  If FileHandle is a directory, the function reads the directory entry \r
   returned.  If FileHandle is a directory, the function reads the directory entry \r

-  at the file\92s current position and returns the entry in Buffer. If the Buffer \r
+  at the file's current position and returns the entry in Buffer. If the Buffer \r

   is not large enough to hold the current directory entry, then \r
   EFI_BUFFER_TOO_SMALL is returned and the current file position is not updated. \r
   BufferSize is set to be the size of the buffer needed to read the entry. On \r
   is not large enough to hold the current directory entry, then \r
   EFI_BUFFER_TOO_SMALL is returned and the current file position is not updated. \r
   BufferSize is set to be the size of the buffer needed to read the entry. On \r


@@ -220,7 +220,7 @@ ShellReadFile(
   This function writes the specified number of bytes to the file at the current \r
   file position. The current file position is advanced the actual number of bytes \r
   written, which is returned in BufferSize. Partial writes only occur when there \r
   This function writes the specified number of bytes to the file at the current \r
   file position. The current file position is advanced the actual number of bytes \r
   written, which is returned in BufferSize. Partial writes only occur when there \r

-  has been a data error during the write attempt (such as \93volume space full\94). \r
+  has been a data error during the write attempt (such as "volume space full"). \r

   The file is automatically grown to hold the data if required. Direct writes to \r
   opened directories are not supported.\r
 \r
   The file is automatically grown to hold the data if required. Direct writes to \r
   opened directories are not supported.\r
 \r


@@ -251,7 +251,7 @@ ShellWriteFile(
 /** \r
   Close an open file handle.\r
 \r
 /** \r
   Close an open file handle.\r
 \r

-  This function closes a specified file handle. All \93dirty\94 cached file data is \r
+  This function closes a specified file handle. All "dirty" cached file data is \r

   flushed to the device, and the file is closed. In all cases the handle is \r
   closed.\r
 \r
   flushed to the device, and the file is closed. In all cases the handle is \r
   closed.\r
 \r


@@ -411,7 +411,7 @@ ShellFindNextFile(
 /**\r
   Retrieve the size of a file.\r
 \r
 /**\r
   Retrieve the size of a file.\r
 \r

-  This function extracts the file size info from the FileHandle\92s EFI_FILE_INFO \r
+  This function extracts the file size info from the FileHandle's EFI_FILE_INFO \r

   data.\r
 \r
   @param FileHandle             file handle from which size is retrieved\r
   data.\r
 \r
   @param FileHandle             file handle from which size is retrieved\r


@@ -527,7 +527,7 @@ ShellExecute (
 /**\r
   Retreives the current directory path\r
 \r
 /**\r
   Retreives the current directory path\r
 \r

-  If the DeviceName is NULL, it returns the current device\92s current directory \r
+  If the DeviceName is NULL, it returns the current device's current directory \r

   name. If the DeviceName is not NULL, it returns the current directory name \r
   on specified drive.\r
 \r
   name. If the DeviceName is not NULL, it returns the current directory name \r
   on specified drive.\r
 \r

diff --git a/ShellPkg/Include/Protocol/EfiShell.h b/ShellPkg/Include/Protocol/EfiShell.h
index bd0aebe1d8a7b83de22910e77c5254056963985b..d19f3b005faf24731374ef6d7041b1e783b9201b 100644 (file)
--- a/ShellPkg/Include/Protocol/EfiShell.h
+++ b/ShellPkg/Include/Protocol/EfiShell.h
@@ -315,11 +315,11 @@ typedef UINT32 EFI_SHELL_DEVICE_NAME_FLAGS;
   NULL and EFI_NOT_FOUND will be returned.\r
 \r
   If EFI_DEVICE_NAME_USE_COMPONENT_NAME is set, then the function will return the\r
   NULL and EFI_NOT_FOUND will be returned.\r
 \r
   If EFI_DEVICE_NAME_USE_COMPONENT_NAME is set, then the function will return the\r

-  device\92s name using the EFI_COMPONENT_NAME2_PROTOCOL, if present on\r
+  device's name using the EFI_COMPONENT_NAME2_PROTOCOL, if present on\r

   DeviceHandle.\r
 \r
   If EFI_DEVICE_NAME_USE_DEVICE_PATH is set, then the function will return the\r
   DeviceHandle.\r
 \r
   If EFI_DEVICE_NAME_USE_DEVICE_PATH is set, then the function will return the\r

-  device\92s name using the EFI_DEVICE_PATH_PROTOCOL, if present on DeviceHandle.\r
+  device's name using the EFI_DEVICE_PATH_PROTOCOL, if present on DeviceHandle.\r

   If both EFI_DEVICE_NAME_USE_COMPONENT_NAME and\r
   EFI_DEVICE_NAME_USE_DEVICE_PATH are set, then\r
   EFI_DEVICE_NAME_USE_COMPONENT_NAME will have higher priority.\r
   If both EFI_DEVICE_NAME_USE_COMPONENT_NAME and\r
   EFI_DEVICE_NAME_USE_DEVICE_PATH are set, then\r
   EFI_DEVICE_NAME_USE_COMPONENT_NAME will have higher priority.\r

diff --git a/ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.c b/ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.c
index 6822b748b478cfb6265e9b55a3013213f4eadf9c..87b57724886281775a4c10be87ab43024ab9ac17 100644 (file)
--- a/ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.c
+++ b/ShellPkg/Library/BaseFileHandleLib/BaseFileHandleLib.c
@@ -27,8 +27,8 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
   This function will retrieve the information about the file for the handle \r
   specified and store it in allocated pool memory.\r
 \r
   This function will retrieve the information about the file for the handle \r
   specified and store it in allocated pool memory.\r
 \r

-  This function allocates a buffer to store the file\92s information. It is the \r
-  caller\92s responsibility to free the buffer\r
+  This function allocates a buffer to store the file's information. It is the \r
+  caller's responsibility to free the buffer\r

 \r
   @param  FileHandle  The file handle of the file for which information is \r
   being requested.\r
 \r
   @param  FileHandle  The file handle of the file for which information is \r
   being requested.\r


@@ -133,11 +133,11 @@ FileHandleSetInfo (
   This function reads information from an opened file.\r
 \r
   If FileHandle is not a directory, the function reads the requested number of \r
   This function reads information from an opened file.\r
 \r
   If FileHandle is not a directory, the function reads the requested number of \r

-  bytes from the file at the file\92s current position and returns them in Buffer. \r
+  bytes from the file at the file's current position and returns them in Buffer. \r

   If the read goes beyond the end of the file, the read length is truncated to the\r
   If the read goes beyond the end of the file, the read length is truncated to the\r

-  end of the file. The file\92s current position is increased by the number of bytes \r
+  end of the file. The file's current position is increased by the number of bytes \r

   returned.  If FileHandle is a directory, the function reads the directory entry \r
   returned.  If FileHandle is a directory, the function reads the directory entry \r

-  at the file\92s current position and returns the entry in Buffer. If the Buffer \r
+  at the file's current position and returns the entry in Buffer. If the Buffer \r

   is not large enough to hold the current directory entry, then \r
   EFI_BUFFER_TOO_SMALL is returned and the current file position is not updated. \r
   BufferSize is set to be the size of the buffer needed to read the entry. On \r
   is not large enough to hold the current directory entry, then \r
   EFI_BUFFER_TOO_SMALL is returned and the current file position is not updated. \r
   BufferSize is set to be the size of the buffer needed to read the entry. On \r


@@ -184,7 +184,7 @@ FileHandleRead(
   This function writes the specified number of bytes to the file at the current \r
   file position. The current file position is advanced the actual number of bytes \r
   written, which is returned in BufferSize. Partial writes only occur when there \r
   This function writes the specified number of bytes to the file at the current \r
   file position. The current file position is advanced the actual number of bytes \r
   written, which is returned in BufferSize. Partial writes only occur when there \r

-  has been a data error during the write attempt (such as \93volume space full\94). \r
+  has been a data error during the write attempt (such as "volume space full"). \r

   The file is automatically grown to hold the data if required. Direct writes to \r
   opened directories are not supported.\r
 \r
   The file is automatically grown to hold the data if required. Direct writes to \r
   opened directories are not supported.\r
 \r


@@ -223,7 +223,7 @@ FileHandleWrite(
 /** \r
   Close an open file handle.\r
 \r
 /** \r
   Close an open file handle.\r
 \r

-  This function closes a specified file handle. All \93dirty\94 cached file data is \r
+  This function closes a specified file handle. All "dirty" cached file data is \r

   flushed to the device, and the file is closed. In all cases the handle is \r
   closed.\r
 \r
   flushed to the device, and the file is closed. In all cases the handle is \r
   closed.\r
 \r


@@ -436,7 +436,7 @@ FileHandleIsDirectory (
 /**\r
   Retrieves the first file from a directory\r
 \r
 /**\r
   Retrieves the first file from a directory\r
 \r

-  This function opens a directory and gets the first file\92s info in the \r
+  This function opens a directory and gets the first file's info in the \r

   directory. Caller can use FileHandleFindNextFile() to get other files.  When \r
   complete the caller is responsible for calling FreePool() on Buffer.\r
 \r
   directory. Caller can use FileHandleFindNextFile() to get other files.  When \r
   complete the caller is responsible for calling FreePool() on Buffer.\r
 \r


@@ -577,7 +577,7 @@ FileHandleFindNextFile(
   if FileHandle is NULL then ASSERT()\r
   if Size is NULL then ASSERT()\r
 \r
   if FileHandle is NULL then ASSERT()\r
   if Size is NULL then ASSERT()\r
 \r

-  This function extracts the file size info from the FileHandle\92s EFI_FILE_INFO \r
+  This function extracts the file size info from the FileHandle's EFI_FILE_INFO \r

   data.\r
 \r
   @param FileHandle             file handle from which size is retrieved\r
   data.\r
 \r
   @param FileHandle             file handle from which size is retrieved\r

diff --git a/ShellPkg/Library/BaseShellLib/BaseShellLib.c b/ShellPkg/Library/BaseShellLib/BaseShellLib.c
index a0e2e492e11028a2d9ab912f67dc53a088924d3a..a43966083fc3d99ad8d37845d19b73ce687381f1 100644 (file)
--- a/ShellPkg/Library/BaseShellLib/BaseShellLib.c
+++ b/ShellPkg/Library/BaseShellLib/BaseShellLib.c
@@ -329,8 +329,8 @@ ShellInitialize (
   This function will retrieve the information about the file for the handle \r
   specified and store it in allocated pool memory.\r
 \r
   This function will retrieve the information about the file for the handle \r
   specified and store it in allocated pool memory.\r
 \r

-  This function allocates a buffer to store the file\92s information. It is the \r
-  caller\92s responsibility to free the buffer\r
+  This function allocates a buffer to store the file's information. It is the \r
+  caller's responsibility to free the buffer\r

 \r
   @param  FileHandle  The file handle of the file for which information is \r
   being requested.\r
 \r
   @param  FileHandle  The file handle of the file for which information is \r
   being requested.\r


@@ -530,7 +530,7 @@ ShellOpenFileByDevicePath(
 /**\r
   This function will open a file or directory referenced by filename.\r
 \r
 /**\r
   This function will open a file or directory referenced by filename.\r
 \r

-  If return is EFI_SUCCESS, the Filehandle is the opened file\92s handle; \r
+  If return is EFI_SUCCESS, the Filehandle is the opened file's handle; \r

   otherwise, the Filehandle is NULL. The Attributes is valid only for \r
   EFI_FILE_MODE_CREATE.\r
 \r
   otherwise, the Filehandle is NULL. The Attributes is valid only for \r
   EFI_FILE_MODE_CREATE.\r
 \r


@@ -650,11 +650,11 @@ ShellCreateDirectory(
   This function reads information from an opened file.\r
 \r
   If FileHandle is not a directory, the function reads the requested number of \r
   This function reads information from an opened file.\r
 \r
   If FileHandle is not a directory, the function reads the requested number of \r

-  bytes from the file at the file\92s current position and returns them in Buffer. \r
+  bytes from the file at the file's current position and returns them in Buffer. \r

   If the read goes beyond the end of the file, the read length is truncated to the\r
   If the read goes beyond the end of the file, the read length is truncated to the\r

-  end of the file. The file\92s current position is increased by the number of bytes \r
+  end of the file. The file's current position is increased by the number of bytes \r

   returned.  If FileHandle is a directory, the function reads the directory entry \r
   returned.  If FileHandle is a directory, the function reads the directory entry \r

-  at the file\92s current position and returns the entry in Buffer. If the Buffer \r
+  at the file's current position and returns the entry in Buffer. If the Buffer \r

   is not large enough to hold the current directory entry, then \r
   EFI_BUFFER_TOO_SMALL is returned and the current file position is not updated. \r
   BufferSize is set to be the size of the buffer needed to read the entry. On \r
   is not large enough to hold the current directory entry, then \r
   EFI_BUFFER_TOO_SMALL is returned and the current file position is not updated. \r
   BufferSize is set to be the size of the buffer needed to read the entry. On \r


@@ -693,7 +693,7 @@ ShellReadFile(
   This function writes the specified number of bytes to the file at the current \r
   file position. The current file position is advanced the actual number of bytes \r
   written, which is returned in BufferSize. Partial writes only occur when there \r
   This function writes the specified number of bytes to the file at the current \r
   file position. The current file position is advanced the actual number of bytes \r
   written, which is returned in BufferSize. Partial writes only occur when there \r

-  has been a data error during the write attempt (such as \93volume space full\94). \r
+  has been a data error during the write attempt (such as "volume space full"). \r

   The file is automatically grown to hold the data if required. Direct writes to \r
   opened directories are not supported.\r
 \r
   The file is automatically grown to hold the data if required. Direct writes to \r
   opened directories are not supported.\r
 \r


@@ -725,7 +725,7 @@ ShellWriteFile(
 /** \r
   Close an open file handle.\r
 \r
 /** \r
   Close an open file handle.\r
 \r

-  This function closes a specified file handle. All \93dirty\94 cached file data is \r
+  This function closes a specified file handle. All "dirty" cached file data is \r

   flushed to the device, and the file is closed. In all cases the handle is \r
   closed.\r
 \r
   flushed to the device, and the file is closed. In all cases the handle is \r
   closed.\r
 \r


@@ -844,7 +844,7 @@ ShellFlushFile (
 /**\r
   Retrieves the first file from a directory\r
 \r
 /**\r
   Retrieves the first file from a directory\r
 \r

-  This function opens a directory and gets the first file\92s info in the \r
+  This function opens a directory and gets the first file's info in the \r

   directory. Caller can use ShellFindNextFile() to get other files.  When \r
   complete the caller is responsible for calling FreePool() on Buffer.\r
 \r
   directory. Caller can use ShellFindNextFile() to get other files.  When \r
   complete the caller is responsible for calling FreePool() on Buffer.\r
 \r


@@ -909,7 +909,7 @@ ShellFindNextFile(
   if FileHandle is NULL then ASSERT()\r
   if Size is NULL then ASSERT()\r
 \r
   if FileHandle is NULL then ASSERT()\r
   if Size is NULL then ASSERT()\r
 \r

-  This function extracts the file size info from the FileHandle\92s EFI_FILE_INFO \r
+  This function extracts the file size info from the FileHandle's EFI_FILE_INFO \r

   data.\r
 \r
   @param FileHandle             file handle from which size is retrieved\r
   data.\r
 \r
   @param FileHandle             file handle from which size is retrieved\r


@@ -1100,7 +1100,7 @@ ShellExecute (
 /**\r
   Retreives the current directory path\r
 \r
 /**\r
   Retreives the current directory path\r
 \r

-  If the DeviceName is NULL, it returns the current device\92s current directory \r
+  If the DeviceName is NULL, it returns the current device's current directory \r

   name. If the DeviceName is not NULL, it returns the current directory name \r
   on specified drive.\r
 \r
   name. If the DeviceName is not NULL, it returns the current directory name \r
   on specified drive.\r
 \r