Sync all bug fixes between EDK1.04 and EDK1.06 into EdkCompatibilityPkg.

[mirror_edk2.git] / EdkCompatibilityPkg / Sample / Tools / Source / UefiStrGather / StringDB.c

diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/StringDB.c b/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/StringDB.c
index 563204bab98c604d1c92e0d5a24cd7e911315548..eaa15ad76304af2af7198c18affe36a2fee732a0 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/StringDB.c
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/UefiStrGather/StringDB.c
@@ -1,6 +1,6 @@
 /*++\r
 \r
-Copyright (c) 2004 - 2007, Intel Corporation. All rights reserved.<BR>\r
+Copyright (c) 2004 - 2010, Intel Corporation. All rights reserved.<BR>\r
 This program and the accompanying materials                          \r
 are licensed and made available under the terms and conditions of the BSD License         \r
 which accompanies this distribution.  The full text of the license may be found at        \r
@@ -2559,13 +2559,15 @@ ExportPackOut:
 \r
 STATUS\r
 StringDBCreateHiiExportPack (\r
-  INT8                        *FileName\r
+  INT8                        *FileName,\r
+  WCHAR_STRING_LIST           *LanguagesOfInterest\r
   )\r
 {\r
-  FILE                            *File       = NULL;\r
-  LANGUAGE_LIST                   *Lang       = NULL;\r
-  EFI_HII_STRING_PACKAGE_HDR      *StrPkgHdr  = NULL;\r
-  SPkgBlkBuffer                   *BlkList    = NULL;\r
+  FILE                            *File;\r
+  LANGUAGE_LIST                   *Lang;\r
+  EFI_HII_STRING_PACKAGE_HDR      *StrPkgHdr;\r
+  SPkgBlkBuffer                   *BlkList;\r
+  WCHAR_STRING_LIST               *LOIPtr;\r
 \r
   if (FileName == NULL) {\r
     return STATUS_ERROR;\r
@@ -2577,18 +2579,26 @@ StringDBCreateHiiExportPack (
   }\r
 \r
   for (Lang = mDBData.LanguageList; Lang != NULL; Lang = Lang->Next) {\r
-    if (StringDBGenStrPkgHdrAndBlkList(Lang, &StrPkgHdr, &BlkList) != STATUS_SUCCESS) {\r
-      fclose (File);\r
-      return STATUS_SUCCESS;\r
+    for (LOIPtr = LanguagesOfInterest; LOIPtr != NULL; LOIPtr = LOIPtr->Next) {\r
+      if (wcscmp (LOIPtr->Str, Lang->LanguageName) == 0) {\r
+        break;\r
+      }\r
     }\r
 \r
-    StrPkgWriteHdrBinary (File, StrPkgHdr);\r
-    StrPkgWriteBlkListBinary (File, BlkList);\r
+    if ((LanguagesOfInterest == NULL) ||\r
+        (LanguagesOfInterest != NULL && LOIPtr != NULL)) {\r
+      if (StringDBGenStrPkgHdrAndBlkList(Lang, &StrPkgHdr, &BlkList) != STATUS_SUCCESS) {\r
+        fclose (File);\r
+        return STATUS_SUCCESS;\r
+      }\r
 \r
-    StrPkgHdrFree (StrPkgHdr);\r
-    StrPkgBlkBufferListFree (BlkList);\r
-  }\r
+      StrPkgWriteHdrBinary (File, StrPkgHdr);\r
+      StrPkgWriteBlkListBinary (File, BlkList);\r
 \r
+      StrPkgHdrFree (StrPkgHdr);\r
+      StrPkgBlkBufferListFree (BlkList);\r
+    }\r
+  }\r
   fclose (File);\r
   return STATUS_SUCCESS;\r
 }\r
@@ -2605,16 +2615,18 @@ static const char *gSourceFileHeader[] = {
 STATUS\r
 StringDBDumpCStrings (\r
   INT8                            *BaseName,\r
-  INT8                            *FileName\r
+  INT8                            *FileName,\r
+  WCHAR_STRING_LIST               *LanguagesOfInterest\r
   )\r
 {\r
   EFI_STATUS                      Status;\r
-  FILE                            *File       = NULL;\r
-  LANGUAGE_LIST                   *Lang       = NULL;\r
-  EFI_HII_STRING_PACKAGE_HDR      **StrPkgHdr = NULL;\r
-  SPkgBlkBuffer                   **BlkList   = NULL;\r
+  FILE                            *File;\r
+  LANGUAGE_LIST                   *Lang;\r
+  EFI_HII_STRING_PACKAGE_HDR      **StrPkgHdr;\r
+  SPkgBlkBuffer                   **BlkList;\r
   UINT32                          Index;\r
-  UINT32                          LangNumber  = 0;\r
+  UINT32                          LangNumber;\r
+  WCHAR_STRING_LIST               *LOIPtr;\r
 \r
   if ((BaseName == NULL) || (FileName == NULL)) {\r
     return STATUS_ERROR;\r
@@ -2631,14 +2643,36 @@ StringDBDumpCStrings (
   BlkList = (SPkgBlkBuffer **) malloc (sizeof (SPkgBlkBuffer *) * LangNumber);\r
   for (Index = 0; Index < LangNumber; Index++) {\r
     StrPkgHdr[Index] = NULL;\r
-    BlkList[Index] = NULL;\r
+    BlkList[Index]   = NULL;\r
   }\r
 \r
-  for (Index = 0, Lang = mDBData.LanguageList; Lang != NULL; Lang = Lang->Next, Index++) {\r
-    Status = StringDBGenStrPkgHdrAndBlkList(Lang, &StrPkgHdr[Index], &BlkList[Index]);\r
-    if (EFI_ERROR(Status)) {\r
-      return Status;\r
+  for (Index = 0, Lang = mDBData.LanguageList; Lang != NULL; Lang = Lang->Next) {\r
+    for (LOIPtr = LanguagesOfInterest; LOIPtr != NULL; LOIPtr = LOIPtr->Next) {\r
+      if (wcscmp (LOIPtr->Str, Lang->LanguageName) == 0) {\r
+        break;\r
+      }\r
     }\r
+    if ((LanguagesOfInterest == NULL) ||\r
+        (LanguagesOfInterest != NULL && LOIPtr != NULL)) {\r
+      Status = StringDBGenStrPkgHdrAndBlkList(Lang, &StrPkgHdr[Index], &BlkList[Index]);\r
+      Index++;\r
+      if (EFI_ERROR(Status)) {\r
+        free (StrPkgHdr);\r
+        free (BlkList);\r
+        return STATUS_ERROR;\r
+      }\r
+    }\r
+  }\r
+\r
+  //\r
+  // Update LangNumber after filter\r
+  //\r
+  LangNumber = Index;\r
+\r
+  if (LangNumber == 0) {\r
+    free (StrPkgHdr);\r
+    free (BlkList);\r
+    return STATUS_SUCCESS;\r
   }\r
 \r
   if ((File = fopen (FileName, "w")) == NULL) {\r
@@ -2657,11 +2691,9 @@ StringDBDumpCStrings (
   //\r
   StrPkgWirteArrayLength (File, LangNumber, StrPkgHdr);\r
 \r
-  for (Index = 0, Lang = mDBData.LanguageList; Lang != NULL; Lang = Lang->Next, Index++) {\r
-    if (StrPkgHdr[Index] != NULL) {\r
-      StrPkgWriteHdrCFile (File, StrPkgHdr[Index]);\r
-      StrPkgWriteBlkListCFile (File, BlkList[Index], (Lang->Next == NULL) ? TRUE : FALSE);\r
-    }\r
+  for (Index = 0; Index < LangNumber; Index++) {\r
+    StrPkgWriteHdrCFile (File, StrPkgHdr[Index]);\r
+    StrPkgWriteBlkListCFile (File, BlkList[Index], (Index == LangNumber - 1) ? TRUE : FALSE);\r
 \r
     StrPkgHdrFree (StrPkgHdr[Index]);\r
     StrPkgBlkBufferListFree (BlkList[Index]);\r
@@ -2670,5 +2702,7 @@ StringDBDumpCStrings (
   fprintf (File, "\n};\n");\r
 \r
   fclose (File);\r
+  free (StrPkgHdr);\r
+  free (BlkList);\r
   return STATUS_SUCCESS;\r
 }\r