[CABMAN]

[reactos.git] / reactos / tools / cabman / cabinet.cxx

diff --git a/reactos/tools/cabman/cabinet.cxx b/reactos/tools/cabman/cabinet.cxx
index fe0bd4d..0f23b07 100644 (file)
--- a/reactos/tools/cabman/cabinet.cxx
+++ b/reactos/tools/cabman/cabinet.cxx
@@ -607,7 +607,7 @@ bool CCabinet::SetCompressionCodec(char* CodecName)
         SelectCodec(CAB_CODEC_MSZIP);
     else
     {
-        printf("Invalid codec specified!\n");
+        printf("ERROR: Invalid codec specified!\n");
         return false;
     }
 
@@ -634,22 +634,26 @@ bool CCabinet::SetCabinetReservedFile(char* FileName)
 {
     FILEHANDLE FileHandle;
     ULONG BytesRead;
+    char* ConvertedFileName;
 
+    ConvertedFileName = ConvertPath(FileName, true);
 #if defined(_WIN32)
-    FileHandle = CreateFile(ConvertPath(FileName, true),  // Open this file
+    FileHandle = CreateFile(ConvertedFileName,  // Open this file
         GENERIC_READ,                    // Open for reading
         FILE_SHARE_READ,                 // Share for reading
         NULL,                            // No security
         OPEN_EXISTING,                   // Existing file only
         FILE_ATTRIBUTE_NORMAL,           // Normal file
         NULL);                           // No attribute template
+    free(ConvertedFileName);
     if (FileHandle == INVALID_HANDLE_VALUE)
     {
         DPRINT(MID_TRACE, ("Cannot open cabinet reserved file.\n"));
         return false;
     }
 #else /* !_WIN32 */
-    FileHandle = fopen(ConvertPath(FileName, true), "rb");
+    FileHandle = fopen(ConvertedFileName, "rb");
+    free(ConvertedFileName);
     if (FileHandle == NULL)
     {
         DPRINT(MID_TRACE, ("Cannot open cabinet reserved file.\n"));