SF.net SVN: edk2-buildtools:[2217] trunk/BaseTools/Source/C/VfrCompile

[<yd...@us...>]

Revision: 2217
          http://edk2-buildtools.svn.sourceforge.net/edk2-buildtools/?rev=2217&view=rev
Author:   ydong10
Date:     2011-07-15 15:31:45 +0000 (Fri, 15 Jul 2011)

Log Message:
-----------
Fix GCC64 build fail

Signed-off-by: ydong10

Modified Paths:
--------------
    trunk/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp
    trunk/BaseTools/Source/C/VfrCompile/VfrUtilityLib.h

Modified: trunk/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp
===================================================================
--- trunk/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp	2011-07-15 05:46:35 UTC (rev 2216)
+++ trunk/BaseTools/Source/C/VfrCompile/VfrUtilityLib.cpp	2011-07-15 15:31:45 UTC (rev 2217)
@@ -3182,22 +3182,22 @@
 CVfrStringDB::FindStringBlock (
   IN  CHAR8                           *StringData,
   IN  EFI_STRING_ID                   StringId,
-  OUT UINTN                           *StringTextOffset,
+  OUT UINT32                          *StringTextOffset,
   OUT UINT8                           *BlockType
   )
 {
   CHAR8                                *BlockHdr;
   EFI_STRING_ID                        CurrentStringId;
-  UINTN                                BlockSize;
-  UINTN                                Index;
+  UINT32                               BlockSize;
+  UINT32                               Index;
   CHAR8                                *StringTextPtr;
-  UINTN                                Offset;
+  UINT32                               Offset;
   UINT16                               StringCount;
   UINT16                               SkipCount;
   UINT8                                Length8;
   EFI_HII_SIBT_EXT2_BLOCK              Ext2;
   UINT32                               Length32;
-  UINTN                                StringSize;
+  UINT32                               StringSize;
   
   CurrentStringId = 1;
 
@@ -3414,10 +3414,10 @@
 CVfrStringDB::GetUnicodeStringTextOrSize (
   OUT EFI_STRING       StringDest, OPTIONAL
   IN  CHAR8            *StringSrc,
-  IN  OUT UINTN        *BufferSize
+  IN  OUT UINT32       *BufferSize
   )
 {
-  UINTN  StringSize;
+  UINT32 StringSize;
   CHAR16 *StringPtr;
 
   StringSize = sizeof (CHAR16);

Modified: trunk/BaseTools/Source/C/VfrCompile/VfrUtilityLib.h
===================================================================
--- trunk/BaseTools/Source/C/VfrCompile/VfrUtilityLib.h	2011-07-15 05:46:35 UTC (rev 2216)
+++ trunk/BaseTools/Source/C/VfrCompile/VfrUtilityLib.h	2011-07-15 15:31:45 UTC (rev 2217)
@@ -431,14 +431,14 @@
   EFI_STATUS FindStringBlock (
     IN  CHAR8            *StringData,
     IN  EFI_STRING_ID    StringId,
-    OUT UINTN            *StringTextOffset,
+    OUT UINT32           *StringTextOffset,
     OUT UINT8            *BlockType
     );
 
   EFI_STATUS GetUnicodeStringTextOrSize (
     OUT EFI_STRING       StringDest, OPTIONAL
     IN  CHAR8            *StringSrc,
-    IN  OUT UINTN        *BufferSize
+    IN  OUT UINT32       *BufferSize
     );
 
 public:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.