Added target Wizard which just relies on the SurfaceArea. Also fixed the echo messages.

[mirror_edk2.git] / Tools / Source / TianoTools / StrGather / StringDB.c

diff --git a/Tools/Source/TianoTools/StrGather/StringDB.c b/Tools/Source/TianoTools/StrGather/StringDB.c
index 353fabb68226f42b0158ff6c140f19bf2cb4d5e4..16ef0526d756c7ee9b3a3c435ff6f6e8addc391c 100644 (file)
--- a/Tools/Source/TianoTools/StrGather/StringDB.c
+++ b/Tools/Source/TianoTools/StrGather/StringDB.c
@@ -23,18 +23,17 @@ Abstract:
 #include <stdlib.h>\r
 #include <string.h>\r
 #include <ctype.h>  // for tolower()\r
-#include <Base.h>\r
-#include <UefiBaseTypes.h>\r
-#include <MultiPhase.h>\r
-#include <BaseLib.h>\r
+\r
+#include <Common/UefiBaseTypes.h>\r
+#include <Common/MultiPhase.h>\r
+#include <Common/InternalFormRepresentation.h>\r
+#include <Protocol/UgaDraw.h>  // for EFI_UGA_PIXEL definition\r
+#include <Protocol/Hii.h>\r
+\r
 #include "EfiUtilityMsgs.h"\r
 #include "StrGather.h"\r
 #include "StringDB.h"\r
-#include "InternalFormRepresentation.h"\r
 \r
-// #include EFI_PROTOCOL_DEFINITION (Hii)\r
-#include <UgaDraw.h>\r
-#include <Hii.h>\r
 \r
 #define STRING_OFFSET RELOFST\r
 \r
@@ -176,7 +175,7 @@ StringDBWriteStandardFileHeader (
 static\r
 WCHAR                 *\r
 AsciiToWchar (\r
-  INT8 *Str\r
+  CHAR8 *Str\r
   );\r
 \r
 static\r
@@ -377,8 +376,8 @@ Notes:
 --*/\r
 STATUS\r
 StringDBDumpCStrings (\r
-  INT8                        *FileName,\r
-  INT8                        *BaseName,\r
+  CHAR8                       *FileName,\r
+  CHAR8                       *BaseName,\r
   WCHAR_STRING_LIST           *LanguagesOfInterest,\r
   WCHAR_MATCHING_STRING_LIST  *IndirectionList\r
   )\r
@@ -794,16 +793,16 @@ Returns:
 --*/\r
 STATUS\r
 StringDBDumpStringDefines (\r
-  INT8 *FileName,\r
-  INT8 *BaseName\r
+  CHAR8 *FileName,\r
+  CHAR8 *BaseName\r
   )\r
 {\r
   FILE              *Fptr;\r
   STRING_IDENTIFIER *Identifier;\r
-  INT8              CopyBaseName[100];\r
+  CHAR8             CopyBaseName[100];\r
   WCHAR             Line[200];\r
   UINT32            Index;\r
-  const INT8        *StrDefHeader[] = {\r
+  const CHAR8       *StrDefHeader[] = {\r
     "#ifndef _%s_STRINGS_DEFINE_H_\n",\r
     "#define _%s_STRINGS_DEFINE_H_\n\n",\r
     NULL\r
@@ -1486,7 +1485,7 @@ StringDBFormatString (
 /*****************************************************************************/\r
 STATUS\r
 StringDBReadDatabase (\r
-  INT8    *DBFileName,\r
+  CHAR8   *DBFileName,\r
   BOOLEAN IgnoreIfNotExist,\r
   BOOLEAN Verbose\r
   )\r
@@ -1597,7 +1596,7 @@ Returns:
 --*/\r
 STATUS\r
 StringDBWriteDatabase (\r
-  INT8    *DBFileName,\r
+  CHAR8   *DBFileName,\r
   BOOLEAN Verbose\r
   )\r
 {\r
@@ -1685,7 +1684,7 @@ StringDBWriteDatabase (
 \r
 STATUS\r
 StringDBSetStringReferenced (\r
-  INT8      *StringIdentifierName,\r
+  CHAR8     *StringIdentifierName,\r
   BOOLEAN   IgnoreNotFound\r
   )\r
 {\r
@@ -1739,8 +1738,8 @@ Notes:
 --*/\r
 STATUS\r
 StringDBDumpDatabase (\r
-  INT8                *DBFileName,\r
-  INT8                *OutputFileName,\r
+  CHAR8               *DBFileName,\r
+  CHAR8               *OutputFileName,\r
   BOOLEAN             Verbose\r
   )\r
 {\r
@@ -2423,7 +2422,7 @@ DuplicateString (
 static\r
 WCHAR *\r
 AsciiToWchar (\r
-  INT8 *Str\r
+  CHAR8 *Str\r
   )\r
 {\r
   UINT32  Len;\r
@@ -2460,7 +2459,7 @@ Returns:
 --*/\r
 STATUS\r
 StringDBCreateHiiExportPack (\r
-  INT8                        *FileName\r
+  CHAR8                       *FileName\r
   )\r
 {\r
   FILE                        *Fptr;\r