diff -uNr unrar/archive.cpp unrar/archive.cpp

--- unrar/archive.cpp   2008-02-26 14:28:59.000000000 +0100

+++ unrar/archive.cpp   2008-10-24 06:44:47.000000000 +0200

@@ -57,7 +57,7 @@

   if (!IsArchive(EnableBroken))

   {

     Log(FileName,St(MBadArc),FileName);

-    ErrHandler.Exit(RAR_FATAL_ERROR);

+    ErrHandler.Exit(FATAL_ERROR);

   }

 }

 #endif

@@ -186,7 +186,7 @@

 #ifdef RARDLL

     Cmd->DllError=ERAR_UNKNOWN_FORMAT;

 #else

-    ErrHandler.SetErrorCode(RAR_WARNING);

+    ErrHandler.SetErrorCode(WARNING);

   #if !defined(SILENT) && !defined(SFX_MODULE)

       Log(FileName,St(MUnknownMeth),FileName);

       Log(FileName,St(MVerRequired),NewMhd.EncryptVer/10,NewMhd.EncryptVer%10);

diff -uNr unrar/archive.hpp unrar/archive.hpp

--- unrar/archive.hpp   2008-02-26 14:28:59.000000000 +0100

+++ unrar/archive.hpp   2008-10-24 06:44:48.000000000 +0200

@@ -14,7 +14,6 @@

     void ConvertNameCase(wchar *Name);

     void ConvertUnknownHeader();

     int ReadOldHeader();

-    void PrepareExtraTime(FileHeader *hd,EXTTIME_MODE etm,EXTTIME_MODE etc,EXTTIME_MODE eta,EXTTIME_MODE etarc,Array<byte> &TimeData);

 #if !defined(SHELL_EXT) && !defined(NOCRYPT)

     CryptData HeadersCrypt;

diff -uNr unrar/arcread.cpp unrar/arcread.cpp

--- unrar/arcread.cpp   2008-02-26 14:28:59.000000000 +0100

+++ unrar/arcread.cpp   2008-10-24 06:44:47.000000000 +0200

@@ -52,17 +52,17 @@

     if (*Cmd->Password==0)

 #ifdef RARDLL

       if (Cmd->Callback==NULL ||

-          Cmd->Callback(UCM_NEEDPASSWORD,Cmd->UserData,(LONG)Cmd->Password,sizeof(Cmd->Password))==-1)

+          Cmd->Callback(UCM_NEEDPASSWORD,Cmd->UserData,(LPARAM)Cmd->Password,sizeof(Cmd->Password))==-1)

       {

         Close();

-        ErrHandler.Exit(RAR_USER_BREAK);

+        ErrHandler.Exit(USER_BREAK);

       }

 #else

       if (!GetPassword(PASSWORD_ARCHIVE,FileName,Cmd->Password,sizeof(Cmd->Password)))

       {

         Close();

-        ErrHandler.Exit(RAR_USER_BREAK);

+        ErrHandler.Exit(USER_BREAK);

       }

 #endif

     HeadersCrypt.SetCryptKeys(Cmd->Password,HeadersSalt,false,false,NewMhd.EncryptVer>=36);

@@ -79,7 +79,7 @@

   #ifndef SHELL_EXT

       Log(FileName,St(MLogUnexpEOF));

   #endif

-      ErrHandler.SetErrorCode(RAR_WARNING);

+      ErrHandler.SetErrorCode(WARNING);

     }

     return(0);

   }

@@ -96,7 +96,7 @@

     Log(FileName,St(MLogFileHead),"???");

 #endif

     BrokenFileHeader=true;

-    ErrHandler.SetErrorCode(RAR_CRC_ERROR);

+    ErrHandler.SetErrorCode(CRC_ERROR);

     return(0);

   }

@@ -261,7 +261,7 @@

           if (hd->HeadType==NEWSUB_HEAD)

             strcat(hd->FileName,"- ???");

           BrokenFileHeader=true;

-          ErrHandler.SetErrorCode(RAR_WARNING);

+          ErrHandler.SetErrorCode(WARNING);

 #ifndef SHELL_EXT

           Log(Archive::FileName,St(MLogFileHead),IntNameToExt(hd->FileName));

           Alarm();

@@ -370,6 +370,8 @@

       bool Recovered=false;

       if (ShortBlock.HeadType==ENDARC_HEAD && (EndArcHead.Flags & EARC_REVSPACE)!=0)

       {

+        // Last 7 bytes of recovered volume can contain zeroes, because

+        // REV files store its own information (volume number, etc.) here.

         SaveFilePos SavePos(*this);

         Int64 Length=Tell();

         Seek(Length-7,SEEK_SET);

@@ -386,9 +388,9 @@

         Close();

         BrokenFileHeader=true;

-        ErrHandler.SetErrorCode(RAR_CRC_ERROR);

+        ErrHandler.SetErrorCode(CRC_ERROR);

         return(0);

-//        ErrHandler.Exit(RAR_CRC_ERROR);

+//        ErrHandler.Exit(CRC_ERROR);

       }

     }

   }

@@ -399,7 +401,7 @@

     Log(FileName,St(MLogFileHead),"???");

 #endif

     BrokenFileHeader=true;

-    ErrHandler.SetErrorCode(RAR_CRC_ERROR);

+    ErrHandler.SetErrorCode(CRC_ERROR);

     return(0);

   }

   return(Raw.Size());

@@ -582,10 +584,34 @@

     if ((byte)*s<32 || (byte)*s>127)

       *s='_';

 #endif

+

+#if defined(_WIN_32) || defined(_EMX)

+    // ':' in file names is allowed in Unix, but not in Windows.

+    // Even worse, file data will be written to NTFS stream on NTFS,

+    // so automatic name correction on file create error in extraction 

+    // routine does not work. In Windows and DOS versions we better 

+    // replace ':' now.

+    if (*s==':')

+      *s='_';

+#endif

+

   }

+

   for (wchar *s=NewLhd.FileNameW;*s!=0;s++)

+  {

     if (*s=='/' || *s=='\\')

       *s=CPATHDIVIDER;

+

+#if defined(_WIN_32) || defined(_EMX)

+    // ':' in file names is allowed in Unix, but not in Windows.

+    // Even worse, file data will be written to NTFS stream on NTFS,

+    // so automatic name correction on file create error in extraction 

+    // routine does not work. In Windows and DOS versions we better 

+    // replace ':' now.

+    if (*s==':')

+      *s='_';

+#endif

+  }

 }

@@ -597,7 +623,7 @@

 #ifndef SHELL_EXT

     Log(FileName,St(MSubHeadCorrupt));

 #endif

-    ErrHandler.SetErrorCode(RAR_CRC_ERROR);

+    ErrHandler.SetErrorCode(CRC_ERROR);

     return(false);

   }

   if (SubHead.Method<0x30 || SubHead.Method>0x35 || SubHead.UnpVer>/*PACK_VER*/36)

@@ -643,7 +669,7 @@

 #ifndef SHELL_EXT

     Log(FileName,St(MSubHeadDataCRC),SubHead.FileName);

 #endif

-    ErrHandler.SetErrorCode(RAR_CRC_ERROR);

+    ErrHandler.SetErrorCode(CRC_ERROR);

     if (UnpData!=NULL)

       UnpData->Reset();

     return(false);

diff -uNr unrar/beosea.cpp unrar/beosea.cpp

--- unrar/beosea.cpp    2008-02-26 14:28:59.000000000 +0100

+++ unrar/beosea.cpp    2008-10-24 06:44:47.000000000 +0200

@@ -5,7 +5,7 @@

   if (Arc.HeaderCRC!=Arc.EAHead.HeadCRC)

   {

     Log(Arc.FileName,St(MEABroken),FileName);

-    ErrHandler.SetErrorCode(RAR_CRC_ERROR);

+    ErrHandler.SetErrorCode(CRC_ERROR);

     return;

   }

   if (Arc.EAHead.Method<0x31 || Arc.EAHead.Method>0x35 || Arc.EAHead.UnpVer>PACK_VER)

@@ -29,14 +29,14 @@

   if (Arc.EAHead.EACRC!=~DataIO.UnpFileCRC)

   {

     Log(Arc.FileName,St(MEABroken),FileName);

-    ErrHandler.SetErrorCode(RAR_CRC_ERROR);

+    ErrHandler.SetErrorCode(CRC_ERROR);

     return;

   }

   int fd = open(FileName,O_WRONLY);

   if (fd==-1)

   {

     Log(Arc.FileName,St(MCannotSetEA),FileName);

-    ErrHandler.SetErrorCode(RAR_WARNING);

+    ErrHandler.SetErrorCode(WARNING);

     return;

   }

@@ -51,7 +51,7 @@

     if (NameSize>=sizeof(Name))

     {

       Log(Arc.FileName,St(MCannotSetEA),FileName);

-      ErrHandler.SetErrorCode(RAR_WARNING);

+      ErrHandler.SetErrorCode(WARNING);

       break;

     }

     memcpy(Name,CurItem+10,NameSize);

@@ -59,7 +59,7 @@

     if (fs_write_attr(fd,Name,Type,0,CurItem+10+NameSize,Size)==-1)

     {

       Log(Arc.FileName,St(MCannotSetEA),FileName);

-      ErrHandler.SetErrorCode(RAR_WARNING);

+      ErrHandler.SetErrorCode(WARNING);

       break;

     }

     AttrPos+=10+NameSize+Size;

@@ -79,7 +79,7 @@

   if (fd==-1)

   {

     Log(Arc.FileName,St(MCannotSetEA),FileName);

-    ErrHandler.SetErrorCode(RAR_WARNING);

+    ErrHandler.SetErrorCode(WARNING);

     return;

   }

@@ -94,7 +94,7 @@

     if (NameSize>=sizeof(Name))

     {

       Log(Arc.FileName,St(MCannotSetEA),FileName);

-      ErrHandler.SetErrorCode(RAR_WARNING);

+      ErrHandler.SetErrorCode(WARNING);

       break;

     }

     memcpy(Name,CurItem+10,NameSize);

@@ -102,7 +102,7 @@

     if (fs_write_attr(fd,Name,Type,0,CurItem+10+NameSize,Size)==-1)

     {

       Log(Arc.FileName,St(MCannotSetEA),FileName);

-      ErrHandler.SetErrorCode(RAR_WARNING);

+      ErrHandler.SetErrorCode(WARNING);

       break;

     }

     AttrPos+=10+NameSize+Size;

diff -uNr unrar/cmddata.cpp unrar/cmddata.cpp

--- unrar/cmddata.cpp   2008-02-26 14:28:59.000000000 +0100

+++ unrar/cmddata.cpp   2008-10-24 06:44:47.000000000 +0200

@@ -51,7 +51,7 @@

     if (Arg[1]=='-')

       NoMoreSwitches=true;

     else

-      ProcessSwitch(&Arg[1]);

+      ProcessSwitch(&Arg[1],(ArgW!=NULL && *ArgW!=0 ? &ArgW[1]:NULL));

   else

     if (*Command==0)

     {

@@ -81,8 +81,8 @@

       }

       else

       {

-        int Length=strlen(Arg);

-        char EndChar=Arg[Length-1];

+        size_t Length=strlen(Arg);

+        char EndChar=Length==0 ? 0:Arg[Length-1];

         char CmdChar=etoupper(*Command);

         bool Add=strchr("AFUM",CmdChar)!=NULL;

         bool Extract=CmdChar=='X' || CmdChar=='E';

@@ -113,7 +113,7 @@

                 Charset=RCH_OEM;

 #endif

-              ReadTextFile(Arg+1,FileArgs,false,true,Charset,true,true);

+              ReadTextFile(Arg+1,FileArgs,false,true,Charset,true,true,true);

             }

             else

               if (Found && FileData.IsDir && Extract && *ExtrPath==0)

@@ -226,7 +226,7 @@

 #if !defined(SFX_MODULE)

-void CommandData::ProcessSwitch(char *Switch)

+void CommandData::ProcessSwitch(char *Switch,wchar *SwitchW)

 {

   switch(etoupper(Switch[0]))

@@ -375,6 +375,8 @@

           break;

         case 'P':

           strcpy(ArcPath,Switch+2);

+          if (SwitchW!=NULL && *SwitchW!=0)

+            strcpyw(ArcPathW,SwitchW+2);

           break;

         case 'S':

           SyncFiles=true;

@@ -408,6 +410,9 @@

         case '-':

           Overwrite=OVERWRITE_NONE;

           break;

+        case 0:

+          Overwrite=OVERWRITE_FORCE_ASK;

+          break;

         case 'R':

           Overwrite=OVERWRITE_AUTORENAME;

           break;

@@ -480,7 +485,7 @@

             Charset=RCH_OEM;

 #endif

-          ReadTextFile(Switch+2,Args,false,true,Charset,true,true);

+          ReadTextFile(Switch+2,Args,false,true,Charset,true,true,true);

         }

         else

           Args->AddString(Switch+1);

@@ -794,7 +799,7 @@

             break;

           case 'C':

             {

-              RAR_CHARSET rch;

+              RAR_CHARSET rch=RCH_DEFAULT;

               switch(etoupper(Switch[2]))

               {

                 case 'A':

@@ -874,7 +879,7 @@

 void CommandData::BadSwitch(char *Switch)

 {

   mprintf(St(MUnknownOption),Switch);

-  ErrHandler.Exit(RAR_USER_ERROR);

+  ErrHandler.Exit(USER_ERROR);

 }

 #endif

@@ -908,6 +913,18 @@

 #endif

+inline bool CmpMSGID(MSGID i1,MSGID i2)

+{

+#ifdef MSGID_INT

+  return(i1==i2);

+#else

+  // If MSGID is const char*, we cannot compare pointers only.

+  // Pointers to different instances of same strings can differ,

+  // so we need to compare complete strings.

+  return(strcmp(i1,i2)==0);

+#endif

+}

+

 void CommandData::OutHelp()

 {

 #if !defined(GUI) && !defined(SILENT)

@@ -916,12 +933,13 @@

 #ifdef SFX_MODULE

     MCHelpCmd,MSHelpCmdE,MSHelpCmdT,MSHelpCmdV

 #elif defined(UNRAR)

-    MUNRARTitle1,MRARTitle2,MCHelpCmd,MCHelpCmdE,MCHelpCmdL,MCHelpCmdP,

-    MCHelpCmdT,MCHelpCmdV,MCHelpCmdX,MCHelpSw,MCHelpSwm,MCHelpSwAC,MCHelpSwAD,

-    MCHelpSwAP,MCHelpSwAVm,MCHelpSwCm,MCHelpSwCFGm,MCHelpSwCL,MCHelpSwCU,

+    MUNRARTitle1,MRARTitle2,MCHelpCmd,MCHelpCmdE,MCHelpCmdL,

+    MCHelpCmdP,MCHelpCmdT,MCHelpCmdV,MCHelpCmdX,MCHelpSw,

+    MCHelpSwm,MCHelpSwAC,MCHelpSwAD,MCHelpSwAP,

+    MCHelpSwCm,MCHelpSwCFGm,MCHelpSwCL,MCHelpSwCU,

     MCHelpSwDH,MCHelpSwEP,MCHelpSwEP3,MCHelpSwF,MCHelpSwIDP,MCHelpSwIERR,

     MCHelpSwINUL,MCHelpSwIOFF,MCHelpSwKB,MCHelpSwN,MCHelpSwNa,MCHelpSwNal,

-    MCHelpSwOp,MCHelpSwOm,MCHelpSwOC,MCHelpSwOR,MCHelpSwOW,MCHelpSwP,

+    MCHelpSwO,MCHelpSwOC,MCHelpSwOR,MCHelpSwOW,MCHelpSwP,

     MCHelpSwPm,MCHelpSwR,MCHelpSwRI,MCHelpSwSL,MCHelpSwSM,MCHelpSwTA,

     MCHelpSwTB,MCHelpSwTN,MCHelpSwTO,MCHelpSwTS,MCHelpSwU,MCHelpSwVUnr,

     MCHelpSwVER,MCHelpSwVP,MCHelpSwX,MCHelpSwXa,MCHelpSwXal,MCHelpSwY

@@ -932,13 +950,13 @@

     MCHelpCmdRN,MCHelpCmdRR,MCHelpCmdRV,MCHelpCmdS,MCHelpCmdT,MCHelpCmdU,

     MCHelpCmdV,MCHelpCmdX,MCHelpSw,MCHelpSwm,MCHelpSwAC,MCHelpSwAD,MCHelpSwAG,

     MCHelpSwAO,MCHelpSwAP,MCHelpSwAS,MCHelpSwAV,MCHelpSwAVm,MCHelpSwCm,

-    MCHelpSwCFGm,MCHelpSwCL,MCHelpSwCU,MCHelpSwDF,MCHelpSwDH,MCHelpSwDS,

-    MCHelpSwEa,MCHelpSwED,MCHelpSwEE,MCHelpSwEN,MCHelpSwEP,MCHelpSwEP1,

-    MCHelpSwEP2,MCHelpSwEP3,MCHelpSwF,MCHelpSwHP,MCHelpSwIDP,

-    MCHelpSwIEML,MCHelpSwIERR,MCHelpSwILOG,MCHelpSwINUL,MCHelpSwIOFF,

-    MCHelpSwISND,MCHelpSwK,MCHelpSwKB,MCHelpSwMn,MCHelpSwMC,MCHelpSwMD,

-    MCHelpSwMS,MCHelpSwMT,MCHelpSwN,MCHelpSwNa,MCHelpSwNal,MCHelpSwOp,

-    MCHelpSwOm,MCHelpSwOC,MCHelpSwOL,MCHelpSwOR,MCHelpSwOS,MCHelpSwOW,

+    MCHelpSwCFGm,MCHelpSwCL,MCHelpSwCU,MCHelpSwDF,MCHelpSwDH,MCHelpSwDR,

+    MCHelpSwDS,MCHelpSwDW,MCHelpSwEa,MCHelpSwED,MCHelpSwEE,MCHelpSwEN,

+    MCHelpSwEP,MCHelpSwEP1,MCHelpSwEP2,MCHelpSwEP3,MCHelpSwF,MCHelpSwHP,

+    MCHelpSwIDP,MCHelpSwIEML,MCHelpSwIERR,MCHelpSwILOG,MCHelpSwINUL,

+    MCHelpSwIOFF,MCHelpSwISND,MCHelpSwK,MCHelpSwKB,MCHelpSwMn,MCHelpSwMC,

+    MCHelpSwMD,MCHelpSwMS,MCHelpSwMT,MCHelpSwN,MCHelpSwNa,MCHelpSwNal,

+    MCHelpSwO,MCHelpSwOC,MCHelpSwOL,MCHelpSwOR,MCHelpSwOS,MCHelpSwOW,

     MCHelpSwP,MCHelpSwPm,MCHelpSwR,MCHelpSwR0,MCHelpSwRI,MCHelpSwRR,

     MCHelpSwRV,MCHelpSwS,MCHelpSwSm,MCHelpSwSC,MCHelpSwSFX,MCHelpSwSI,

     MCHelpSwSL,MCHelpSwSM,MCHelpSwT,MCHelpSwTA,MCHelpSwTB,MCHelpSwTK,

@@ -958,11 +976,11 @@

 #ifndef _WIN_32

     static MSGID Win32Only[]={

       MCHelpSwIEML,MCHelpSwVD,MCHelpSwAO,MCHelpSwOS,MCHelpSwIOFF,

-      MCHelpSwEP2,MCHelpSwOC

+      MCHelpSwEP2,MCHelpSwOC,MCHelpSwDR,MCHelpSwRI

     };

     bool Found=false;

     for (int J=0;J<sizeof(Win32Only)/sizeof(Win32Only[0]);J++)

-      if (Help[I]==Win32Only[J])

+      if (CmpMSGID(Help[I],Win32Only[J]))

       {

         Found=true;

         break;

@@ -971,27 +989,23 @@

       continue;

 #endif

 #if !defined(_UNIX) && !defined(_WIN_32)

-    if (Help[I]==MCHelpSwOW)

+    if (CmpMSGID(Help[I],MCHelpSwOW))

       continue;

 #endif

 #if !defined(_WIN_32) && !defined(_EMX)

-    if (Help[I]==MCHelpSwAC)

+    if (CmpMSGID(Help[I],MCHelpSwAC))

       continue;

 #endif

 #ifndef SAVE_LINKS

-    if (Help[I]==MCHelpSwOL)

-      continue;

-#endif

-#ifndef _WIN_32

-    if (Help[I]==MCHelpSwRI)

+    if (CmpMSGID(Help[I],MCHelpSwOL))

       continue;

 #endif

 #ifndef PACK_SMP

-    if (Help[I]==MCHelpSwMT)

+    if (CmpMSGID(Help[I],MCHelpSwMT))

       continue;

 #endif

 #ifndef _BEOS

-    if (Help[I]==MCHelpSwEE)

+    if (CmpMSGID(Help[I],MCHelpSwEE))

     {

 #if defined(_EMX) && !defined(_DJGPP)

       if (_osmode != OS2_MODE)

@@ -1005,7 +1019,7 @@

     mprintf(St(Help[I]));

   }

   mprintf("\n");

-  ErrHandler.Exit(RAR_USER_ERROR);

+  ErrHandler.Exit(USER_ERROR);

 #endif

 }

diff -uNr unrar/cmddata.hpp unrar/cmddata.hpp

--- unrar/cmddata.hpp   2008-02-26 14:28:59.000000000 +0100

+++ unrar/cmddata.hpp   2008-10-24 06:44:48.000000000 +0200

@@ -7,7 +7,7 @@

 {

   private:

     void ProcessSwitchesString(char *Str);

-    void ProcessSwitch(char *Switch);

+    void ProcessSwitch(char *Switch,wchar *SwitchW=NULL);

     void BadSwitch(char *Switch);

     bool ExclCheckArgs(StringList *Args,char *CheckName,bool CheckFullPath,int MatchMode);

     uint GetExclAttr(char *Str);

diff -uNr unrar/consio.cpp unrar/consio.cpp

--- unrar/consio.cpp    2008-02-26 14:28:59.000000000 +0100

+++ unrar/consio.cpp    2008-10-24 06:44:47.000000000 +0200

@@ -4,8 +4,11 @@

 #include "log.cpp"

 #endif

+static int KbdAnsi(char *Addr,int Size);

+

 #if !defined(GUI) && !defined(SILENT)

 static void RawPrint(char *Msg,MESSAGE_TYPE MessageType);

+static uint GetKey();

 #endif

 static MESSAGE_TYPE MsgStream=MSG_STDOUT;

@@ -133,27 +136,6 @@

 #endif

-#if !defined(GUI) && !defined(SILENT)

-unsigned int GetKey()

-{

-#ifdef SILENT

-  return(0);

-#else

-  char Str[80];

-#ifdef __GNUC__

-  fgets(Str,sizeof(Str),stdin);

-  return(Str[0]);

-#else

-  File SrcFile;

-  SrcFile.SetHandleType(FILE_HANDLESTD);

-  SrcFile.Read(Str,sizeof(Str));

-  return(Str[0]);

-#endif

-#endif

-}

-#endif

-

-

 #ifndef SILENT

 bool GetPassword(PASSWORD_TYPE Type,const char *FileName,char *Password,int MaxLength)

 {

@@ -199,6 +181,29 @@

 #if !defined(GUI) && !defined(SILENT)

+uint GetKey()

+{

+  char Str[80];

+  bool EndOfFile;

+#if defined(__GNUC__) || defined(sun)

+  EndOfFile=(fgets(Str,sizeof(Str),stdin)==NULL);

+#else

+  File SrcFile;

+  SrcFile.SetHandleType(FILE_HANDLESTD);

+  EndOfFile=(SrcFile.Read(Str,sizeof(Str))==0);

+#endif

+  if (EndOfFile)

+  {

+    // Looks like stdin is a null device. We can enter to infinite loop

+    // calling Ask(), so let's better exit.

+    ErrHandler.Exit(USER_BREAK);

+  }

+  return(Str[0]);

+}

+#endif

+

+

+#if !defined(GUI) && !defined(SILENT)

 int Ask(const char *AskStr)

 {

   const int MaxItems=10;

diff -uNr unrar/consio.hpp unrar/consio.hpp

--- unrar/consio.hpp    2008-02-26 14:28:59.000000000 +0100

+++ unrar/consio.hpp    2008-10-24 06:44:48.000000000 +0200

@@ -12,12 +12,10 @@

 void eprintf(const char *fmt,...);

 void Alarm();

 void GetPasswordText(char *Str,int MaxLength);

-unsigned int GetKey();

 bool GetPassword(PASSWORD_TYPE Type,const char *FileName,char *Password,int MaxLength);

 int Ask(const char *AskStr);

 #endif

-int KbdAnsi(char *Addr,int Size);

 void OutComment(char *Comment,int Size);

 #ifdef SILENT

diff -uNr unrar/crc.cpp unrar/crc.cpp

--- unrar/crc.cpp   2008-02-26 14:28:59.000000000 +0100

+++ unrar/crc.cpp   2008-10-24 06:44:47.000000000 +0200

@@ -14,12 +14,18 @@

 }

-uint CRC(uint StartCRC,const void *Addr,uint Size)

+uint CRC(uint StartCRC,const void *Addr,size_t Size)

 {

   if (CRCTab[1]==0)

     InitCRC();

   byte *Data=(byte *)Addr;

 #if defined(LITTLE_ENDIAN) && defined(PRESENT_INT32) && defined(ALLOW_NOT_ALIGNED_INT)

+

+#ifdef _MSC_VER

+  // avoid a warning about 'Data' pointer truncation in 64 bit mode

+  #pragma warning( disable : 4311 )

+#endif

+

   while (Size>0 && ((long)Data & 7))

   {

     StartCRC=CRCTab[(byte)(StartCRC^Data[0])]^(StartCRC>>8);

@@ -42,16 +48,16 @@

     Size-=8;

   }

 #endif

-  for (int I=0;I<Size;I++)

+  for (size_t I=0;I<Size;I++)

     StartCRC=CRCTab[(byte)(StartCRC^Data[I])]^(StartCRC>>8);

   return(StartCRC);

 }

 #ifndef SFX_MODULE

-ushort OldCRC(ushort StartCRC,const void *Addr,uint Size)

+ushort OldCRC(ushort StartCRC,const void *Addr,size_t Size)

 {

   byte *Data=(byte *)Addr;

-  for (int I=0;I<Size;I++)

+  for (size_t I=0;I<Size;I++)

   {

     StartCRC=(StartCRC+Data[I])&0xffff;

     StartCRC=((StartCRC<<1)|(StartCRC>>15))&0xffff;

diff -uNr unrar/crc.hpp unrar/crc.hpp

--- unrar/crc.hpp   2008-02-26 14:28:59.000000000 +0100

+++ unrar/crc.hpp   2008-10-24 06:44:48.000000000 +0200

@@ -4,7 +4,7 @@

 extern uint CRCTab[256];

 void InitCRC();

-uint CRC(uint StartCRC,const void *Addr,uint Size);

-ushort OldCRC(ushort StartCRC,const void *Addr,uint Size);

+uint CRC(uint StartCRC,const void *Addr,size_t Size);

+ushort OldCRC(ushort StartCRC,const void *Addr,size_t Size);

 #endif

diff -uNr unrar/dll.cpp unrar/dll.cpp

--- unrar/dll.cpp   2008-02-26 14:28:59.000000000 +0100

+++ unrar/dll.cpp   2008-10-24 06:44:47.000000000 +0200

@@ -221,9 +221,10 @@

   try

   {

     Data->Cmd.DllError=0;

-    if (Data->OpenMode==RAR_OM_LIST || Operation==RAR_SKIP && !Data->Arc.Solid)

+    if (Data->OpenMode==RAR_OM_LIST || Data->OpenMode==RAR_OM_LIST_INCSPLIT ||

+        Operation==RAR_SKIP && !Data->Arc.Solid)

     {

-      if (/*Data->OpenMode==RAR_OM_LIST && */Data->Arc.Volume &&

+      if (Data->Arc.Volume &&

           Data->Arc.GetHeaderType()==FILE_HEAD &&

           (Data->Arc.NewLhd.Flags & LHD_SPLIT_AFTER)!=0)

         if (MergeArchive(Data->Arc,NULL,false,'L'))

@@ -265,6 +266,9 @@

         strncpyw(Data->Cmd.ExtrPathW,NullToEmpty(DestPathW),NM-2);

         AddEndSlash(Data->Cmd.ExtrPathW);

         strncpyw(Data->Cmd.DllDestNameW,NullToEmpty(DestNameW),NM-1);

+

+        if (*Data->Cmd.DllDestNameW!=0 && *Data->Cmd.DllDestName==0)

+          WideToChar(Data->Cmd.DllDestNameW,Data->Cmd.DllDestName);

       }

       else

       {

@@ -312,7 +316,7 @@

 }

-void PASCAL RARSetCallback(HANDLE hArcData,UNRARCALLBACK Callback,LONG UserData)

+void PASCAL RARSetCallback(HANDLE hArcData,UNRARCALLBACK Callback,LPARAM UserData)

 {

   DataSet *Data=(DataSet *)hArcData;

   Data->Cmd.Callback=Callback;

@@ -345,19 +349,19 @@

 {

   switch(ErrCode)

   {

-    case RAR_FATAL_ERROR:

+    case FATAL_ERROR:

       return(ERAR_EREAD);

-    case RAR_CRC_ERROR:

+    case CRC_ERROR:

       return(ERAR_BAD_DATA);

-    case RAR_WRITE_ERROR:

+    case WRITE_ERROR:

       return(ERAR_EWRITE);

-    case RAR_OPEN_ERROR:

+    case OPEN_ERROR:

       return(ERAR_EOPEN);

-    case RAR_CREATE_ERROR:

+    case CREATE_ERROR:

       return(ERAR_ECREATE);

-    case RAR_MEMORY_ERROR:

+    case MEMORY_ERROR:

       return(ERAR_NO_MEMORY);

-    case RAR_SUCCESS:

+    case SUCCESS:

       return(0);

     default:

       return(ERAR_UNKNOWN);

diff -uNr unrar/dll.hpp unrar/dll.hpp

--- unrar/dll.hpp   2008-02-26 14:28:59.000000000 +0100

+++ unrar/dll.hpp   2008-10-24 06:44:48.000000000 +0200

@@ -15,8 +15,9 @@

 #define ERAR_UNKNOWN            21

 #define ERAR_MISSING_PASSWORD   22

-#define RAR_OM_LIST           0

-#define RAR_OM_EXTRACT        1

+#define RAR_OM_LIST              0

+#define RAR_OM_EXTRACT           1

+#define RAR_OM_LIST_INCSPLIT     2

 #define RAR_SKIP              0

 #define RAR_TEST              1

@@ -32,6 +33,7 @@

 #define PASCAL

 #define LONG long

 #define HANDLE void *

+#define LPARAM long

 #define UINT unsigned int

 #endif

@@ -109,7 +111,7 @@

   UCM_CHANGEVOLUME,UCM_PROCESSDATA,UCM_NEEDPASSWORD

 };

-typedef int (CALLBACK *UNRARCALLBACK)(UINT msg,LONG UserData,LONG P1,LONG P2);

+typedef int (CALLBACK *UNRARCALLBACK)(UINT msg,LPARAM UserData,LPARAM P1,LPARAM P2);

 typedef int (PASCAL *CHANGEVOLPROC)(char *ArcName,int Mode);

 typedef int (PASCAL *PROCESSDATAPROC)(unsigned char *Addr,int Size);

@@ -125,7 +127,7 @@

 int    PASCAL RARReadHeaderEx(HANDLE hArcData,struct RARHeaderDataEx *HeaderData);

 int    PASCAL RARProcessFile(HANDLE hArcData,int Operation,char *DestPath,char *DestName);

 int    PASCAL RARProcessFileW(HANDLE hArcData,int Operation,wchar_t *DestPath,wchar_t *DestName);

-void   PASCAL RARSetCallback(HANDLE hArcData,UNRARCALLBACK Callback,LONG UserData);

+void   PASCAL RARSetCallback(HANDLE hArcData,UNRARCALLBACK Callback,LPARAM UserData);

 void   PASCAL RARSetChangeVolProc(HANDLE hArcData,CHANGEVOLPROC ChangeVolProc);

 void   PASCAL RARSetProcessDataProc(HANDLE hArcData,PROCESSDATAPROC ProcessDataProc);

 void   PASCAL RARSetPassword(HANDLE hArcData,char *Password);

diff -uNr unrar/errhnd.cpp unrar/errhnd.cpp

--- unrar/errhnd.cpp    2008-02-26 14:28:59.000000000 +0100

+++ unrar/errhnd.cpp    2008-10-24 06:44:47.000000000 +0200

@@ -11,7 +11,7 @@

 void ErrorHandler::Clean()

 {

-  ExitCode=RAR_SUCCESS;

+  ExitCode=SUCCESS;

   ErrCount=0;

   EnableBreak=true;

   Silent=false;

@@ -22,7 +22,7 @@

 void ErrorHandler::MemoryError()

 {

   MemoryErrorMsg();

-  Throw(RAR_MEMORY_ERROR);

+  Throw(MEMORY_ERROR);

 }

@@ -30,7 +30,7 @@

 {

 #ifndef SILENT

   OpenErrorMsg(FileName);

-  Throw(RAR_OPEN_ERROR);

+  Throw(OPEN_ERROR);

 #endif

 }

@@ -45,7 +45,7 @@

   }

 #endif

 #if !defined(SILENT) || defined(RARDLL)

-  Throw(RAR_FATAL_ERROR);

+  Throw(FATAL_ERROR);

 #endif

 }

@@ -56,7 +56,7 @@

   ReadErrorMsg(NULL,FileName);

 #endif

 #if !defined(SILENT) || defined(RARDLL)

-  Throw(RAR_FATAL_ERROR);

+  Throw(FATAL_ERROR);

 #endif

 }

@@ -81,7 +81,7 @@

   WriteErrorMsg(ArcName,FileName);

 #endif

 #if !defined(SILENT) || defined(RARDLL)

-  Throw(RAR_WRITE_ERROR);

+  Throw(WRITE_ERROR);

 #endif

 }

@@ -94,7 +94,7 @@

   ErrMsg(NULL,St(MNTFSRequired),FileName);

 #endif

 #if !defined(SILENT) && !defined(SFX_MODULE) || defined(RARDLL)

-  Throw(RAR_WRITE_ERROR);

+  Throw(WRITE_ERROR);

 #endif

 }

 #endif

@@ -124,7 +124,7 @@

   }

 #endif

 #if !defined(SILENT) || defined(RARDLL)

-  Throw(RAR_FATAL_ERROR);

+  Throw(FATAL_ERROR);

 #endif

 }

@@ -247,14 +247,14 @@

 {

   switch(Code)

   {

-    case RAR_WARNING:

-    case RAR_USER_BREAK:

-      if (ExitCode==RAR_SUCCESS)

+    case WARNING:

+    case USER_BREAK:

+      if (ExitCode==SUCCESS)

         ExitCode=Code;

       break;

-    case RAR_FATAL_ERROR:

-      if (ExitCode==RAR_SUCCESS || ExitCode==RAR_WARNING)

-        ExitCode=RAR_FATAL_ERROR;

+    case FATAL_ERROR:

+      if (ExitCode==SUCCESS || ExitCode==WARNING)

+        ExitCode=FATAL_ERROR;

       break;

     default:

       ExitCode=Code;

@@ -289,8 +289,9 @@

 #if defined(USE_RC) && !defined(SFX_MODULE) && !defined(_WIN_CE)

   ExtRes.UnloadDLL();

 #endif

-  exit(RAR_USER_BREAK);

-#ifdef _WIN_32

+  exit(USER_BREAK);

+#if defined(_WIN_32) && !defined(_MSC_VER)

+  // never reached, just to avoid a compiler warning

   return(TRUE);

 #endif

 }

@@ -314,7 +315,7 @@

 void ErrorHandler::Throw(int Code)

 {

-  if (Code==RAR_USER_BREAK && !EnableBreak)

+  if (Code==USER_BREAK && !EnableBreak)

     return;

   ErrHandler.SetErrorCode(Code);

 #ifdef ALLOW_EXCEPTIONS

diff -uNr unrar/errhnd.hpp unrar/errhnd.hpp

--- unrar/errhnd.hpp    2008-02-26 14:28:59.000000000 +0100

+++ unrar/errhnd.hpp    2008-10-24 06:44:48.000000000 +0200

@@ -12,11 +12,12 @@

 #define rarrealloc realloc

 #define rarfree free

 #define rarstrdup strdup

+#define rarstrdupw strdupw

-enum { RAR_SUCCESS,RAR_WARNING,RAR_FATAL_ERROR,RAR_CRC_ERROR,RAR_LOCK_ERROR,RAR_WRITE_ERROR,

-       RAR_OPEN_ERROR,RAR_USER_ERROR,RAR_MEMORY_ERROR,RAR_CREATE_ERROR,RAR_USER_BREAK=255};

+enum { SUCCESS,WARNING,FATAL_ERROR,CRC_ERROR,LOCK_ERROR,WRITE_ERROR,

+       OPEN_ERROR,USER_ERROR,MEMORY_ERROR,CREATE_ERROR,USER_BREAK=255};

 class ErrorHandler

 {

diff -uNr unrar/extract.cpp unrar/extract.cpp

--- unrar/extract.cpp   2008-02-26 14:28:59.000000000 +0100

+++ unrar/extract.cpp   2008-10-24 06:44:47.000000000 +0200

@@ -25,6 +25,7 @@

   while (Cmd->GetArcName(ArcName,ArcNameW,sizeof(ArcName)))

     if (FindFile::FastFind(ArcName,ArcNameW,&FD))

       DataIO.TotalArcSize+=FD.Size;

+

   Cmd->ArcNames->Rewind();

   while (Cmd->GetArcName(ArcName,ArcNameW,sizeof(ArcName)))

   {

@@ -35,10 +36,8 @@

       EXTRACT_ARC_CODE Code=ExtractArchive(Cmd);

-/*

-      restore Cmd->Password which could be changed in IsArchive() call

-      for next header encrypted archive

-*/

+      // restore Cmd->Password which could be changed in IsArchive() call

+      // for next header encrypted archive

       strcpy(Cmd->Password,PrevCmdPassword);

       if (Code!=EXTRACT_ARC_REPEAT)

@@ -54,7 +53,7 @@

     {

       mprintf(St(MExtrNoFiles));

     }

-    ErrHandler.SetErrorCode(RAR_WARNING);

+    ErrHandler.SetErrorCode(WARNING);

   }

 #ifndef GUI

   else

@@ -90,6 +89,8 @@

   SignatureFound=false;

   AllMatchesExact=true;

   ReconstructDone=false;

+

+  StartTime.SetCurrentTime();

 }

@@ -98,7 +99,7 @@

   Archive Arc(Cmd);

   if (!Arc.WOpen(ArcName,ArcNameW))

   {

-    ErrHandler.SetErrorCode(RAR_OPEN_ERROR);

+    ErrHandler.SetErrorCode(OPEN_ERROR);

     return(EXTRACT_ARC_NEXT);

   }

@@ -108,10 +109,11 @@

     mprintf(St(MNotRAR),ArcName);

 #endif

     if (CmpExt(ArcName,"rar"))

-      ErrHandler.SetErrorCode(RAR_WARNING);

+      ErrHandler.SetErrorCode(WARNING);

     return(EXTRACT_ARC_NEXT);

   }

+  // archive with corrupt encrypted header can be closed in IsArchive() call

   if (!Arc.IsOpened())

     return(EXTRACT_ARC_NEXT);

@@ -119,13 +121,42 @@

   if (Arc.Volume && Arc.NotFirstVolume)

   {

     char FirstVolName[NM];

-

     VolNameToFirstName(ArcName,FirstVolName,(Arc.NewMhd.Flags & MHD_NEWNUMBERING));

+

+    // If several volume names from same volume set are specified

+    // and current volume is not first in set and first volume is present

+    // and specified too, let's skip the current volume.

     if (stricomp(ArcName,FirstVolName)!=0 && FileExist(FirstVolName) &&

         Cmd->ArcNames->Search(FirstVolName,NULL,false))

       return(EXTRACT_ARC_NEXT);

   }

 #endif

+

+  if (Arc.Volume)

+  {

+    // Calculate the total size of all accessible volumes.

+    // This size is necessary to display the correct total progress indicator.

+

+    char NextName[NM];

+    wchar NextNameW[NM];

+

+    strcpy(NextName,Arc.FileName);

+    strcpyw(NextNameW,Arc.FileNameW);

+

+    while (true)

+    {

+      // First volume is already added to DataIO.TotalArcSize 

+      // in initial TotalArcSize calculation in DoExtract.

+      // So we skip it and start from second volume.

+      NextVolumeName(NextName,NextNameW,ASIZE(NextName),(Arc.NewMhd.Flags & MHD_NEWNUMBERING)==0 || Arc.OldFormat);

+      struct FindData FD;

+      if (FindFile::FastFind(NextName,NextNameW,&FD))

+        DataIO.TotalArcSize+=FD.Size;

+      else

+        break;

+    }

+  }

+

   ExtractArchiveInit(Cmd,Arc);

   if (*Cmd->Command=='T' || *Cmd->Command=='I')

@@ -174,9 +205,9 @@

 #ifdef NOVOLUME

       return(false);

 #else

-      if (!MergeArchive(Arc,NULL,false,Command))

+      if (!MergeArchive(Arc,&DataIO,false,Command))

       {

-        ErrHandler.SetErrorCode(RAR_WARNING);

+        ErrHandler.SetErrorCode(WARNING);

         return(false);

       }

       SignatureFound=false;

@@ -206,9 +237,9 @@

       if (Arc.EndArcHead.Flags & EARC_NEXT_VOLUME)

       {

 #ifndef NOVOLUME

-        if (!MergeArchive(Arc,NULL,false,Command))

+        if (!MergeArchive(Arc,&DataIO,false,Command))

         {

-          ErrHandler.SetErrorCode(RAR_WARNING);

+          ErrHandler.SetErrorCode(WARNING);

           return(false);

         }

         SignatureFound=false;

@@ -352,7 +383,7 @@

 #ifdef RARDLL

       Cmd->DllError=ERAR_BAD_DATA;

 #endif

-      ErrHandler.SetErrorCode(RAR_WARNING);

+      ErrHandler.SetErrorCode(OPEN_ERROR);

     }

     ExactMatch=false;

   }

@@ -370,7 +401,7 @@

 #ifdef RARDLL

         if (*Cmd->Password==0)

           if (Cmd->Callback==NULL ||

-              Cmd->Callback(UCM_NEEDPASSWORD,Cmd->UserData,(LONG)Cmd->Password,sizeof(Cmd->Password))==-1)

+              Cmd->Callback(UCM_NEEDPASSWORD,Cmd->UserData,(LPARAM)Cmd->Password,sizeof(Cmd->Password))==-1)

             return(false);

         strcpy(Password,Cmd->Password);

@@ -390,7 +421,7 @@

           switch(Cmd->AllYes ? 1:Ask(St(MYesNoAll)))

           {

             case -1:

-              ErrHandler.Exit(RAR_USER_BREAK);

+              ErrHandler.Exit(USER_BREAK);

             case 2:

               if (!GetPassword(PASSWORD_FILE,ArcFileName,Password,sizeof(Password)))

               {

@@ -488,7 +519,7 @@

       if (Length>0)

       {

         wchar ArcPathW[NM];

-        CharToWide(Cmd->ArcPath,ArcPathW);

+        GetWideName(Cmd->ArcPath,Cmd->ArcPathW,ArcPathW);

         Length=strlenw(ArcPathW);

       }

       ExtrNameW+=Length;

@@ -518,7 +549,16 @@

       if (FindFile::FastFind(DestFileName,DestNameW,&FD))

       {

         if (FD.mtime >= Arc.NewLhd.mtime)

-          ExtrFile=false;

+        {

+          // If directory already exists and its modification time is newer 

+          // than start of extraction, it is likely it was created 

+          // when creating a path to one of already extracted items. 

+          // In such case we'll better update its time even if archived 

+          // directory is older.

+

+          if (!FD.IsDir || FD.mtime<StartTime)

+            ExtrFile=false;

+        }

       }

       else

         if (Cmd->FreshFiles)

@@ -528,7 +568,7 @@

     // skip encrypted file if no password is specified

     if ((Arc.NewLhd.Flags & LHD_PASSWORD)!=0 && *Password==0)

     {

-      ErrHandler.SetErrorCode(RAR_WARNING);

+      ErrHandler.SetErrorCode(WARNING);

 #ifdef RARDLL

       Cmd->DllError=ERAR_MISSING_PASSWORD;

 #endif

@@ -566,7 +606,7 @@

 #endif

 #endif

       ExtrFile=false;

-      ErrHandler.SetErrorCode(RAR_WARNING);

+      ErrHandler.SetErrorCode(WARNING);

 #ifdef RARDLL

       Cmd->DllError=ERAR_UNKNOWN_FORMAT;

 #endif

@@ -630,16 +670,16 @@

 #ifdef RARDLL

             Cmd->DllError=ERAR_ECREATE;

 #endif

-            ErrHandler.SetErrorCode(RAR_CREATE_ERROR);

+            ErrHandler.SetErrorCode(CREATE_ERROR);

           }

         if (PrevExtracted)

         {

 #if defined(_WIN_32) && !defined(_WIN_CE) && !defined(SFX_MODULE)

           if (Cmd->SetCompressedAttr &&

               (Arc.NewLhd.FileAttr & FILE_ATTRIBUTE_COMPRESSED)!=0 && WinNT())

-            SetFileCompression(DestFileName,DestFileNameW,true);

+            SetFileCompression(DestFileName,DestNameW,true);

 #endif

-          SetDirTime(DestFileName,

+          SetDirTime(DestFileName,DestNameW,

             Cmd->xmtime==EXTTIME_NONE ? NULL:&Arc.NewLhd.mtime,

             Cmd->xctime==EXTTIME_NONE ? NULL:&Arc.NewLhd.ctime,

             Cmd->xatime==EXTTIME_NONE ? NULL:&Arc.NewLhd.atime);

@@ -663,7 +703,7 @@

             if (!UserReject)

             {

               ErrHandler.CreateErrorMsg(Arc.FileName,DestFileName);

-              ErrHandler.SetErrorCode(RAR_CREATE_ERROR);

+              ErrHandler.SetErrorCode(CREATE_ERROR);

 #ifdef RARDLL

               Cmd->DllError=ERAR_ECREATE;

 #endif

@@ -796,7 +836,7 @@

             Log(BadArcName,St(MCRCFailed),ArcFileName);

           }

           BrokenFile=true;

-          ErrHandler.SetErrorCode(RAR_CRC_ERROR);

+          ErrHandler.SetErrorCode(CRC_ERROR);

 #ifdef RARDLL

           Cmd->DllError=ERAR_BAD_DATA;

 #endif

diff -uNr unrar/extract.hpp unrar/extract.hpp

--- unrar/extract.hpp   2008-02-26 14:28:59.000000000 +0100

+++ unrar/extract.hpp   2008-10-24 06:44:48.000000000 +0200

@@ -7,6 +7,7 @@

 {

   private:

     EXTRACT_ARC_CODE ExtractArchive(CommandData *Cmd);

+    RarTime StartTime; // time when extraction started

     ComprDataIO DataIO;

     Unpack *Unp;

diff -uNr unrar/filcreat.cpp unrar/filcreat.cpp

--- unrar/filcreat.cpp  2008-02-26 14:28:59.000000000 +0100

+++ unrar/filcreat.cpp  2008-10-24 06:44:47.000000000 +0200

@@ -30,7 +30,7 @@

 #endif

     if (Cmd->AllYes || Mode==OVERWRITE_ALL)

       break;

-    if (Mode==OVERWRITE_ASK)

+    if (Mode==OVERWRITE_DEFAULT || Mode==OVERWRITE_FORCE_ASK)

     {

       eprintf(St(MFileExists),Name);

       int Choice=Ask(St(MYesNoAllRenQ));

@@ -78,7 +78,7 @@

         continue;

       }

       if (Choice==6)

-        ErrHandler.Exit(RAR_USER_BREAK);

+        ErrHandler.Exit(USER_BREAK);

     }

     if (Mode==OVERWRITE_AUTORENAME)

     {

@@ -88,7 +88,7 @@

           *NameW=0;

       }

       else

-        Mode=OVERWRITE_ASK;

+        Mode=OVERWRITE_DEFAULT;

       continue;

     }

   }

diff -uNr unrar/file.cpp unrar/file.cpp

--- unrar/file.cpp  2008-02-26 14:28:59.000000000 +0100

+++ unrar/file.cpp  2008-10-24 06:44:47.000000000 +0200

@@ -121,7 +121,7 @@

 void File::TOpen(const char *Name,const wchar *NameW)

 {

   if (!WOpen(Name,NameW))

-    ErrHandler.Exit(RAR_OPEN_ERROR);

+    ErrHandler.Exit(OPEN_ERROR);

 }

 #endif

@@ -135,14 +135,15 @@

 }

-bool File::Create(const char *Name,const wchar *NameW)

+bool File::Create(const char *Name,const wchar *NameW,bool ShareRead)

 {

 #ifdef _WIN_32

+  DWORD ShareMode=(ShareRead || File::OpenShared) ? FILE_SHARE_READ:0;

   if (WinNT() && NameW!=NULL && *NameW!=0)

-    hFile=CreateFileW(NameW,GENERIC_READ|GENERIC_WRITE,FILE_SHARE_READ,NULL,

+    hFile=CreateFileW(NameW,GENERIC_READ|GENERIC_WRITE,ShareMode,NULL,

                       CREATE_ALWAYS,0,NULL);

   else

-    hFile=CreateFile(Name,GENERIC_READ|GENERIC_WRITE,FILE_SHARE_READ,NULL,

+    hFile=CreateFile(Name,GENERIC_READ|GENERIC_WRITE,ShareMode,NULL,

                      CREATE_ALWAYS,0,NULL);

 #else

   hFile=fopen(Name,CREATEBINARY);

@@ -176,19 +177,19 @@

 #if !defined(SHELL_EXT) && !defined(SFX_MODULE)

-void File::TCreate(const char *Name,const wchar *NameW)

+void File::TCreate(const char *Name,const wchar *NameW,bool ShareRead)

 {

-  if (!WCreate(Name,NameW))

-    ErrHandler.Exit(RAR_FATAL_ERROR);

+  if (!WCreate(Name,NameW,ShareRead))

+    ErrHandler.Exit(FATAL_ERROR);

 }

 #endif

-bool File::WCreate(const char *Name,const wchar *NameW)

+bool File::WCreate(const char *Name,const wchar *NameW,bool ShareRead)

 {

-  if (Create(Name,NameW))

+  if (Create(Name,NameW,ShareRead))

     return(true);

-  ErrHandler.SetErrorCode(RAR_CREATE_ERROR);

+  ErrHandler.SetErrorCode(CREATE_ERROR);

   ErrHandler.CreateErrorMsg(Name);

   return(false);

 }

@@ -248,15 +249,21 @@

 }

-bool File::Rename(const char *NewName)

+bool File::Rename(const char *NewName,const wchar *NewNameW)

 {

+  // we do not need to rename if names are already same

   bool Success=strcmp(FileName,NewName)==0;

+  if (Success && *FileNameW!=0 && *NullToEmpty(NewNameW)!=0)

+    Success=strcmpw(FileNameW,NewNameW)==0;

+

   if (!Success)

-    Success=rename(FileName,NewName)==0;

+    Success=RenameFile(FileName,FileNameW,NewName,NewNameW);

+

   if (Success)

   {

+    // renamed successfully, storing the new name

     strcpy(FileName,NewName);

-    *FileNameW=0;

+    strcpyw(FileNameW,NullToEmpty(NewNameW));

   }

   return(Success);

 }

@@ -288,11 +295,12 @@

 #endif

   while (1)

   {

-    bool Success;

+    bool Success=false;

 #ifdef _WIN_32

-    DWORD Written;

+    DWORD Written=0;

     if (HandleType!=FILE_HANDLENORMAL)

     {

+      // writing to stdout can fail in old Windows if data block is too large

       const int MaxSize=0x4000;

       for (int I=0;I<Size;I+=MaxSize)

         if (!(Success=WriteFile(hFile,(byte *)Data+I,Min(Size-I,MaxSize),&Written,NULL)))

@@ -333,7 +341,8 @@

 int File::Read(void *Data,int Size)

 {

-  Int64 FilePos;

+  Int64 FilePos=0; //initialized only to suppress some compilers warning

+

   if (IgnoreReadErrors)

     FilePos=Tell();

   int ReadSize;

diff -uNr unrar/filefn.cpp unrar/filefn.cpp

--- unrar/filefn.cpp    2008-02-26 14:28:59.000000000 +0100

+++ unrar/filefn.cpp    2008-10-24 06:44:47.000000000 +0200

@@ -31,9 +31,9 @@

   return(errno==ENOENT ? MKDIR_BADPATH:MKDIR_ERROR);

 #endif

 #ifdef _UNIX

-  int prevmask=umask(0);

+//  int prevmask=umask(0);

   int ErrCode=Name==NULL ? -1:mkdir(Name,(mode_t)Attr);

-  umask(prevmask);

+//  umask(prevmask);

   if (ErrCode==-1)

     return(errno==ENOENT ? MKDIR_BADPATH:MKDIR_ERROR);

   return(MKDIR_SUCCESS);

@@ -109,7 +109,7 @@

 }

-void SetDirTime(const char *Name,RarTime *ftm,RarTime *ftc,RarTime *fta)

+void SetDirTime(const char *Name,const wchar *NameW,RarTime *ftm,RarTime *ftc,RarTime *fta)

 {

 #ifdef _WIN_32

   if (!WinNT())

@@ -119,11 +119,14 @@

   bool sc=ftc!=NULL && ftc->IsSet();

   bool sa=fta!=NULL && fta->IsSet();

-  unsigned int DirAttr=GetFileAttr(Name);

+  unsigned int DirAttr=GetFileAttr(Name,NameW);

   bool ResetAttr=(DirAttr!=0xffffffff && (DirAttr & FA_RDONLY)!=0);

   if (ResetAttr)

-    SetFileAttr(Name,NULL,0);

-  HANDLE hFile=CreateFile(Name,GENERIC_WRITE,FILE_SHARE_READ|FILE_SHARE_WRITE,

+    SetFileAttr(Name,NameW,0);

+

+  wchar DirNameW[NM];

+  GetWideName(Name,NameW,DirNameW);

+  HANDLE hFile=CreateFileW(DirNameW,GENERIC_WRITE,FILE_SHARE_READ|FILE_SHARE_WRITE,

                           NULL,OPEN_EXISTING,FILE_FLAG_BACKUP_SEMANTICS,NULL);

   if (hFile==INVALID_HANDLE_VALUE)

     return;

@@ -137,7 +140,7 @@

   SetFileTime(hFile,sc ? &fc:NULL,sa ? &fa:NULL,sm ? &fm:NULL);

   CloseHandle(hFile);

   if (ResetAttr)

-    SetFileAttr(Name,NULL,DirAttr);

+    SetFileAttr(Name,NameW,DirAttr);

 #endif

 #if defined(_UNIX) || defined(_EMX)

   File::SetCloseFileTimeByName(Name,ftm,fta);

@@ -455,7 +458,7 @@

 #ifndef SFX_MODULE

 char *MkTemp(char *Name)

 {

-  int Length=strlen(Name);

+  size_t Length=strlen(Name);

   if (Length<=6)

     return(NULL);

   int Random=clock();

@@ -550,7 +553,7 @@

 }

-#if defined(_WIN_32) && !defined(_WIN_CE)

+#if defined(_WIN_32) && !defined(_WIN_CE) && !defined(SFX_MODULE)

 bool SetFileCompression(char *Name,wchar *NameW,bool State)

 {

   wchar FileNameW[NM];

@@ -568,3 +571,9 @@

   return(RetCode!=0);

 }

 #endif

+

+

+

+

+

+

diff -uNr unrar/filefn.hpp unrar/filefn.hpp

--- unrar/filefn.hpp    2008-02-26 14:28:59.000000000 +0100

+++ unrar/filefn.hpp    2008-10-24 06:44:48.000000000 +0200

@@ -5,7 +5,7 @@

 MKDIR_CODE MakeDir(const char *Name,const wchar *NameW,uint Attr);

 bool CreatePath(const char *Path,const wchar *PathW,bool SkipLastName);

-void SetDirTime(const char *Name,RarTime *ftm,RarTime *ftc,RarTime *fta);

+void SetDirTime(const char *Name,const wchar *NameW,RarTime *ftm,RarTime *ftc,RarTime *fta);

 bool IsRemovable(const char *Name);

 Int64 GetFreeDisk(const char *Name);

 bool FileExist(const char *Name,const wchar *NameW=NULL);

@@ -38,4 +38,7 @@

 bool SetFileCompression(char *Name,wchar *NameW,bool State);

 #endif

+

+

+

 #endif

diff -uNr unrar/file.hpp unrar/file.hpp

--- unrar/file.hpp  2008-02-26 14:28:59.000000000 +0100

+++ unrar/file.hpp  2008-10-24 06:44:48.000000000 +0200

@@ -56,13 +56,13 @@

     bool Open(const char *Name,const wchar *NameW=NULL,bool OpenShared=false,bool Update=false);

     void TOpen(const char *Name,const wchar *NameW=NULL);

     bool WOpen(const char *Name,const wchar *NameW=NULL);

-    bool Create(const char *Name,const wchar *NameW=NULL);

-    void TCreate(const char *Name,const wchar *NameW=NULL);

-    bool WCreate(const char *Name,const wchar *NameW=NULL);

+    bool Create(const char *Name,const wchar *NameW=NULL,bool ShareRead=true);

+    void TCreate(const char *Name,const wchar *NameW=NULL,bool ShareRead=true);

+    bool WCreate(const char *Name,const wchar *NameW=NULL,bool ShareRead=true);

     bool Close();

     void Flush();

     bool Delete();

-    bool Rename(const char *NewName);

+    bool Rename(const char *NewName,const wchar *NewNameW=NULL);

     void Write(const void *Data,int Size);

     int Read(void *Data,int Size);

     int DirectRead(void *Data,int Size);

diff -uNr unrar/filestr.cpp unrar/filestr.cpp

--- unrar/filestr.cpp   2008-02-26 14:28:59.000000000 +0100

+++ unrar/filestr.cpp   2008-10-24 06:44:47.000000000 +0200

@@ -3,7 +3,8 @@

 static bool IsUnicode(byte *Data,int Size);

 bool ReadTextFile(char *Name,StringList *List,bool Config,bool AbortOnError,

-                  RAR_CHARSET SrcCharset,bool Unquote,bool SkipComments)

+                  RAR_CHARSET SrcCharset,bool Unquote,bool SkipComments,

+                  bool ExpandEnvStr)

 {

   char FileName[NM];

   if (Config)

@@ -19,7 +20,7 @@

     if (!OpenCode)

     {

       if (AbortOnError)

-        ErrHandler.Exit(RAR_OPEN_ERROR);

+        ErrHandler.Exit(OPEN_ERROR);

       return(false);

     }

   }

@@ -79,7 +80,28 @@

           CurStr++;

         }

         WideToChar(CurStr,&AnsiName[0],AnsiName.Size());

-        List->AddString(&AnsiName[0],CurStr);

+

+        bool Expanded=false;

+#if defined(_WIN_32) && !defined(_WIN_CE)

+        if (ExpandEnvStr && *CurStr=='%')

+        {

+          // expanding environment variables in Windows version

+

+          char ExpName[NM];

+          wchar ExpNameW[NM];

+          *ExpNameW=0;

+          int ret,retw=1;

+          ret=ExpandEnvironmentStrings(&AnsiName[0],ExpName,ASIZE(ExpName));

+          if (ret!=0 && WinNT())

+            retw=ExpandEnvironmentStringsW(CurStr,ExpNameW,ASIZE(ExpNameW));

+          Expanded=ret!=0 && ret<ASIZE(ExpName) &&

+                   retw!=0 && retw<ASIZE(ExpNameW);

+          if (Expanded)

+            List->AddString(ExpName,ExpNameW);

+        }

+#endif

+        if (!Expanded)

+          List->AddString(&AnsiName[0],CurStr);

       }

       CurStr=NextStr+1;

       while (*CurStr=='\r' || *CurStr=='\n')

@@ -112,7 +134,7 @@

       {

         if (Unquote && *CurStr=='\"')

         {

-          int Length=strlen(CurStr);

+          size_t Length=strlen(CurStr);

           if (CurStr[Length-1]=='\"')

           {

             CurStr[Length-1]=0;

@@ -123,7 +145,22 @@