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

[mirror_edk2.git] / EdkCompatibilityPkg / Sample / Tools / Source / VfrCompile / VfrServices.cpp

diff --git a/EdkCompatibilityPkg/Sample/Tools/Source/VfrCompile/VfrServices.cpp b/EdkCompatibilityPkg/Sample/Tools/Source/VfrCompile/VfrServices.cpp
index 4d3ba3d3189d4298356cb3fa884292bba51cbd9d..8555f2eb73c3181be75192c9c78c115651e17989 100644 (file)
--- a/EdkCompatibilityPkg/Sample/Tools/Source/VfrCompile/VfrServices.cpp
+++ b/EdkCompatibilityPkg/Sample/Tools/Source/VfrCompile/VfrServices.cpp
@@ -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
@@ -220,7 +220,7 @@ Returns:
   //\r
   if (GetUtilityStatus () != STATUS_ERROR) {\r
     if ((IfrBinFptr = fopen (gOptions.IfrOutputFileName, "w")) == NULL) {\r
-      Error (PROGRAM_NAME, 0, 0, gOptions.IfrOutputFileName, "could not open file for writing");\r
+      Error (UTILITY_NAME, 0, 0, gOptions.IfrOutputFileName, "could not open file for writing");\r
       return;\r
     }\r
     //\r
@@ -290,7 +290,7 @@ Returns:
       strcat (gOptions.IfrOutputFileName, ".hpk");\r
     }\r
     if ((IfrBinFptr = fopen (gOptions.IfrOutputFileName, "wb")) == NULL) {\r
-      Error (PROGRAM_NAME, 0, 0, gOptions.IfrOutputFileName, "could not open file for writing");\r
+      Error (UTILITY_NAME, 0, 0, gOptions.IfrOutputFileName, "could not open file for writing");\r
       return;\r
     }\r
     //\r
@@ -329,10 +329,10 @@ Returns:
     // Open the input VFR file and the output list file\r
     //\r
     if ((InFptr = fopen (gOptions.PreprocessorOutputFileName, "r")) == NULL) {\r
-      Warning (PROGRAM_NAME, 0, 0, gOptions.PreprocessorOutputFileName, "could not open file for creating a list file");\r
+      Warning (UTILITY_NAME, 0, 0, gOptions.PreprocessorOutputFileName, "could not open file for creating a list file");\r
     } else {\r
       if ((OutFptr = fopen (gOptions.VfrListFileName, "w")) == NULL) {\r
-        Warning (PROGRAM_NAME, 0, 0, gOptions.VfrListFileName, "could not open output list file for writing");\r
+        Warning (UTILITY_NAME, 0, 0, gOptions.VfrListFileName, "could not open output list file for writing");\r
         fclose (InFptr);\r
         InFptr = NULL;\r
       } else {\r
@@ -350,7 +350,7 @@ Returns:
     //\r
     // Write out the VFR compiler version\r
     //\r
-    fprintf (OutFptr, "//\n//  VFR compiler version " VFR_COMPILER_VERSION "\n//\n");\r
+    fprintf (OutFptr, "//\n//  VFR compiler version " UTILITY_VERSION "\n//\n");\r
     Curr = mIfrBytes;\r
     while (Curr != NULL) {\r
       //\r
@@ -590,7 +590,7 @@ Returns:
   // Check for buffer overflow\r
   //\r
   if (mQueuedByteCount >= MAX_QUEUE_COUNT) {\r
-    Error (PROGRAM_NAME, 0, 0, NULL, "opcode queue overflow");\r
+    Error (UTILITY_NAME, 0, 0, NULL, "opcode queue overflow");\r
   } else {\r
     mQueuedBytes[mQueuedByteCount]    = ByteVal;\r
     mQueuedKeyBytes[mQueuedByteCount] = KeyByte;\r
@@ -750,5 +750,5 @@ Returns:
   //\r
   // Write out the VFR compiler version\r
   //\r
-  fprintf (OutFptr, "//  VFR compiler version " VFR_COMPILER_VERSION "\n//\n");\r
+  fprintf (OutFptr, "//  VFR compiler version " UTILITY_VERSION "\n//\n");\r
 }\r