9.369.36

9 files changed, 79 insertions, 25 deletions

diff --git a/C/7zVersion.h b/C/7zVersion.h
index 75a768cf..ed0dd8c3 100644
--- a/C/7zVersion.h
+++ b/C/7zVersion.h
@@ -1,9 +1,9 @@
 #define MY_VER_MAJOR 9
-#define MY_VER_MINOR 35
+#define MY_VER_MINOR 36
 #define MY_VER_BUILD 00
-#define MY_VERSION "9.35 beta"
-// #define MY_7ZIP_VERSION "9.35"
-#define MY_DATE "2014-12-07"
+#define MY_VERSION "9.36 beta"
+// #define MY_7ZIP_VERSION "9.36"
+#define MY_DATE "2014-12-26"
 #undef MY_COPYRIGHT
 #undef MY_VERSION_COPYRIGHT_DATE
 #define MY_COPYRIGHT ": Igor Pavlov : Public domain"
diff --git a/CPP/7zip/Archive/Common/InStreamWithCRC.cpp b/CPP/7zip/Archive/Common/InStreamWithCRC.cpp
index 3f4dd3b8..a2d68832 100644
--- a/CPP/7zip/Archive/Common/InStreamWithCRC.cpp
+++ b/CPP/7zip/Archive/Common/InStreamWithCRC.cpp
@@ -9,9 +9,9 @@ STDMETHODIMP CSequentialInStreamWithCRC::Read(void *data, UInt32 size, UInt32 *p
   UInt32 realProcessed = 0;
   HRESULT result = S_OK;
   if (_stream)
-    _stream->Read(data, size, &realProcessed);
+    result = _stream->Read(data, size, &realProcessed);
   _size += realProcessed;
-  if (size > 0 && realProcessed == 0)
+  if (size != 0 && realProcessed == 0)
     _wasFinished = true;
   _crc = CrcUpdate(_crc, data, realProcessed);
   if (processedSize)
@@ -27,7 +27,7 @@ STDMETHODIMP CInStreamWithCRC::Read(void *data, UInt32 size, UInt32 *processedSi
     result = _stream->Read(data, size, &realProcessed);
   _size += realProcessed;
   /*
-  if (size > 0 && realProcessed == 0)
+  if (size != 0 && realProcessed == 0)
     _wasFinished = true;
   */
   _crc = CrcUpdate(_crc, data, realProcessed);
diff --git a/CPP/7zip/Archive/FlvHandler.cpp b/CPP/7zip/Archive/FlvHandler.cpp
index 3bb4620b..577224b2 100644
--- a/CPP/7zip/Archive/FlvHandler.cpp
+++ b/CPP/7zip/Archive/FlvHandler.cpp
@@ -337,7 +337,7 @@ HRESULT CHandler::Open2(IInStream *stream, IArchiveOpenCallback *callback)
         break;
       if (items.Size() >= kNumChunksMax)
         return S_FALSE;
-      Byte firstByte = buf[kTagHeaderSize];
+      Byte firstByte = item.Data[kTagHeaderSize];
       Byte subType, props;
       if (item.Type == kType_Audio)
       {
diff --git a/CPP/7zip/Archive/Rar/RarHandler.cpp b/CPP/7zip/Archive/Rar/RarHandler.cpp
index c4adee41..d54995ef 100644
--- a/CPP/7zip/Archive/Rar/RarHandler.cpp
+++ b/CPP/7zip/Archive/Rar/RarHandler.cpp
@@ -964,22 +964,21 @@ STDMETHODIMP CHandler::GetProperty(UInt32 index, PROPID propID, PROPVARIANT *val
     case kpidUnpackVer: prop = item.UnPackVersion; break;
     case kpidMethod:
     {
-      char temp[16];
-      char *s = temp;
-      if (item.Method >= (Byte)'0' && item.Method <= (Byte)'5')
+      char s[16];
+      Byte m = item.Method;
+      if (m < (Byte)'0' || m > (Byte)'5')
+        ConvertUInt32ToString(m, s);
+      else
       {
-        *s++ = 'm';
-        *s++ = (char)item.Method;
+        s[0] = 'm';
+        s[1] = (char)m;
+        s[2] = 0;
         if (!item.IsDir())
         {
-          *s++ = ':';
-          ConvertUInt32ToString(16 + item.GetDictSize(), s);
+          s[2] = ':';
+          ConvertUInt32ToString(16 + item.GetDictSize(), &s[3]);
         }
       }
-      else
-        ConvertUInt32ToString(item.Method, s);
-      s += MyStringLen(s);
-      *s = 0;
       prop = s;
       break;
     }
diff --git a/CPP/7zip/UI/Common/Update.cpp b/CPP/7zip/UI/Common/Update.cpp
index 2e095b06..b7128659 100644
--- a/CPP/7zip/UI/Common/Update.cpp
+++ b/CPP/7zip/UI/Common/Update.cpp
@@ -1216,10 +1216,10 @@ HRESULT UpdateArchive(
       createTempFile = true;
       ap.Temp = true;
       if (!options.WorkingDir.IsEmpty())
-      {
         ap.TempPrefix = options.WorkingDir;
-        NormalizeDirPathPrefix(ap.TempPrefix);
-      }
+      else
+        ap.TempPrefix = us2fs(ap.Prefix);
+      NormalizeDirPathPrefix(ap.TempPrefix);
     }
   }
 
diff --git a/DOC/7zip.inf b/DOC/7zip.inf
new file mode 100644
index 00000000..325b4870
--- /dev/null
+++ b/DOC/7zip.inf
@@ -0,0 +1,55 @@
+[CODE]
+
+[Version]
+Signature = "$Windows NT$"
+Provider = "7-zip.org"
+CESignature = "$Windows CE$"
+
+[CEStrings]
+AppName = "7-Zip"
+InstallDir = %CE1%\%AppName%
+
+[Strings]
+AppVer = "9.36"
+AppDate = "2014-12-26"
+
+[CEDevice]
+; ProcessorType = 2577 ; ARM
+VersionMin = 3.0
+BuildMin = 0.0
+VersionMax = 1000.0
+BuildMax = 0xE0000000
+
+[DefaultInstall]
+CopyFiles = CopyFilesSection,CopyFilesSection.Lang
+AddReg = RegSettings
+CEShortcuts = Shortcuts
+
+[SourceDisksNames]
+1 = ,"Common files",,"."
+2 = ,"Lang files",,"Lang"
+
+[SourceDisksFiles]
+7zFM.exe = 1
+7z.sfx = 1
+7zS2.sfx = 1
+ru.txt = 2
+
+[DestinationDirs]
+DefaultDestDir = ,%InstallDir%
+CopyFilesSection = ,%InstallDir%
+CopyFilesSection.Lang = ,"%InstallDir%\Lang"
+Shortcuts = ,%CE11%
+
+[CopyFilesSection]
+7zFM.exe
+7z.sfx
+7zS2.sfx
+
+[CopyFilesSection.Lang]
+ru.txt
+
+[RegSettings]
+
+[Shortcuts]
+7-Zip,0,7zFM.exe
diff --git a/DOC/7zip.nsi b/DOC/7zip.nsi
index 39701459..2b3eb12c 100644
--- a/DOC/7zip.nsi
+++ b/DOC/7zip.nsi
@@ -2,7 +2,7 @@
 ;Defines
 
 !define VERSION_MAJOR 9
-!define VERSION_MINOR 35
+!define VERSION_MINOR 36
 !define VERSION_POSTFIX_FULL " beta"
 !ifdef WIN64
 !ifdef IA64
diff --git a/DOC/7zip.wxs b/DOC/7zip.wxs
index d48e0c81..4e5375eb 100644
--- a/DOC/7zip.wxs
+++ b/DOC/7zip.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 
 <?define VerMajor = "9" ?>
-<?define VerMinor = "35" ?>
+<?define VerMinor = "36" ?>
 <?define VerBuild = "00" ?>
 <?define MmVer = "$(var.VerMajor).$(var.VerMinor)" ?>
 <?define MmHex = "0$(var.VerMajor)$(var.VerMinor)" ?>
diff --git a/DOC/readme.txt b/DOC/readme.txt
index bd677df5..a6b91182 100644
--- a/DOC/readme.txt
+++ b/DOC/readme.txt
@@ -1,4 +1,4 @@
-7-Zip 9.35 Sources
+7-Zip 9.36 Sources
 ------------------
 
 7-Zip is a file archiver for Windows.