Support Unicode archive names.

Components/Lzma2/Util/7z/7zMain.c

@@ -5,6 +5,7 @@
    -Don't include <stdio.h> but instead define fputs' prototype and a stdout dummy, allowing
     the test application code to be embedded in another application (which should implement fputs)
    -Use CP_UTF8 in PrintString
+   -Change main to mainW to support Unicode archive names
    Otherwise unchanged */
 
 #include "Precomp.h"
@@ -550,7 +551,7 @@ static void GetAttribString(UInt32 wa, BoolInt isDir, char *s)
 
 // #define NUM_PARENTS_MAX 128
 
-int Z7_CDECL main(int numargs, char *args[])
+int Z7_CDECL mainW(int numargs, WCHAR *args[])
 {
   ISzAlloc allocImp;
   ISzAlloc allocTempImp;
@@ -594,11 +595,7 @@ int Z7_CDECL main(int numargs, char *args[])
 
   {
     WRes wres =
-    #ifdef UNDER_CE
-      InFile_OpenW(&archiveStream.file, L"\test.7z"); // change it
-    #else
-      InFile_Open(&archiveStream.file, args[2]);
-    #endif
+      InFile_OpenW(&archiveStream.file, args[2]);
     if (wres != 0)
     {
       PrintError_WRes("cannot open input file", wres);
@@ -636,13 +633,13 @@ int Z7_CDECL main(int numargs, char *args[])
   
   if (res == SZ_OK)
   {
-    char *command = args[1];
+    WCHAR *command = args[1];
     int listCommand = 0, testCommand = 0, fullPaths = 0;
     
-    if (strcmp(command, "l") == 0) listCommand = 1;
-    else if (strcmp(command, "t") == 0) testCommand = 1;
-    else if (strcmp(command, "e") == 0) { }
-    else if (strcmp(command, "x") == 0) { fullPaths = 1; }
+    if (wcscmp(command, L"l") == 0) listCommand = 1;
+    else if (wcscmp(command, L"t") == 0) testCommand = 1;
+    else if (wcscmp(command, L"e") == 0) { }
+    else if (wcscmp(command, L"x") == 0) { fullPaths = 1; }
     else
     {
       PrintError("incorrect command");

Projects/Src/Compression.SevenZipDecoder.pas

@@ -12,7 +12,7 @@ unit Compression.SevenZipDecoder;
 
 interface
 
-procedure SevenZipDecode(const FileName: AnsiString; const DestDir: String;
+procedure SevenZipDecode(const FileName, DestDir: String;
   const FullPaths: Boolean);
 
 implementation
@@ -22,7 +22,7 @@ uses
 
 {$L Src\Compression.SevenZipDecoder\7ZipDecode\IS7ZipDec.obj}
 
-function IS_7ZipDec(const fileName: PAnsiChar; const fullPaths: Bool): Integer; cdecl; external name '_IS_7ZipDec';
+function IS_7ZipDec(const fileName: PChar; const fullPaths: Bool): Integer; cdecl; external name '_IS_7ZipDec';
 
 {.$DEFINE VISUALSTUDIO}
 
@@ -60,7 +60,7 @@ begin
     VirtualFree(address, 0, MEM_RELEASE);
 end;
 
-function _strcmp(string1, string2: PAnsiChar): Integer; cdecl;
+function _wcscmp(string1, string2: PChar): Integer; cdecl;
 begin
   Result := StrComp(string1, string2);
 end;
@@ -71,12 +71,12 @@ begin
   Result := 1;
 end;
 
-procedure SevenZipDecode(const FileName: AnsiString; const DestDir: String;
+procedure SevenZipDecode(const FileName, DestDir: String;
   const FullPaths: Boolean);
 begin
   var SaveCurDir := GetCurrentDir;
   SetCurrentDir(DestDir);
-  IS_7ZipDec(PAnsiChar(FileName), FullPaths);
+  IS_7ZipDec(PChar(FileName), FullPaths);
   SetCurrentDir(SaveCurDir);
 end;
 

Projects/Src/Compression.SevenZipDecoder/7ZipDecode/IS7ZipDec.c

@@ -20,11 +20,11 @@
 #include "../../../../Components/Lzma2/LzmaDec.c"
 #include "../../../../Components/Lzma2/Lzma2Dec.c"
 
-int IS_7ZipDec(char *fileName, BOOL fullPaths)
+int IS_7ZipDec(WCHAR *fileName, BOOL fullPaths)
 {
-  char* args[3];
-  args[0] = "";
-  args[1] = fullPaths?"x":"e";
+  WCHAR* args[3];
+  args[0] = L"";
+  args[1] = fullPaths?L"x":L"e";
   args[2] = fileName;
-  return main(3, args);
+  return mainW(3, args);
 }