Fix a bug to print correct message to ConOut and StdErr as they accept unicode string...

[mirror_edk2.git] / MdePkg / Library / BaseMemoryLibSse2 / MemLibGuid.c

diff --git a/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c b/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c
index 243435801703e321420b6171b3f5fd867c880019..c13cd462e4ef92c42a6e52d0bade16bae2cb1d07 100644 (file)
--- a/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c
+++ b/MdePkg/Library/BaseMemoryLibSse2/MemLibGuid.c
@@ -10,8 +10,6 @@
   THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
   WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
 \r
-  Module Name:  MemLibGuid.c\r
-\r
   The following BaseMemoryLib instances share the same version of this file:\r
 \r
     BaseMemoryLib\r
@@ -26,7 +24,7 @@
 //\r
 // Include common header file for this module.\r
 //\r
-#include "CommonHeader.h"\r
+#include "MemLibInternals.h"\r
 \r
 /**\r
   Copies a source GUID to a destination GUID.\r
@@ -82,11 +80,21 @@ CompareGuid (
   IN CONST GUID  *Guid2\r
   )\r
 {\r
-  return (BOOLEAN)(\r
-           ReadUnaligned64 ((CONST UINT64*)Guid1)\r
-             == ReadUnaligned64 ((CONST UINT64*)Guid2) &&\r
-           ReadUnaligned64 ((CONST UINT64*)Guid1 + 1)\r
-             == ReadUnaligned64 ((CONST UINT64*)Guid2 + 1)\r
+  UINT64 Guid1ValueLo;\r
+  UINT64 Guid1ValueHi;\r
+  UINT64 Guid2ValueLo;\r
+  UINT64 Guid2ValueHi;\r
+\r
+  Guid1ValueLo = ReadUnaligned64 ((CONST UINT64*)Guid1);\r
+  Guid2ValueLo = ReadUnaligned64 ((CONST UINT64*)Guid2);\r
+\r
+  Guid1ValueHi = ReadUnaligned64 ((CONST UINT64*)Guid1 + 1);\r
+  Guid2ValueHi = ReadUnaligned64 ((CONST UINT64*)Guid2 + 1);\r
+\r
+\r
+  return (BOOLEAN)\r
+           ((Guid1ValueLo == Guid2ValueLo) &&\r
+            (Guid1ValueHi == Guid2ValueHi)\r
            );\r
 }\r
 \r