Applied patch 14085 (14517 is a duplicate of earlier patches). Reworked the modified code. Fixed most of the hints of VS 2012. Code is successfully built.

git-svn-id: https://sevenzipsharp.svn.codeplex.com/svn@84075 9b283d60-5439-405e-af05-b73fd8c4d996

Author: SND\markhor_cp

SevenZip/ArchiveUpdateCallback.cs

@@ -780,7 +780,7 @@ public void Dispose()
 
         private void IntEventArgsHandler(object sender, IntEventArgs e)
         {
-            lock (this)
+            lock (_files)
             {
                 var pold = (byte) ((_bytesWrittenOld*100)/_bytesCount);
                 _bytesWritten += e.Value;

SevenZip/LibraryManager.cs

@@ -39,7 +39,12 @@ namespace SevenZip
     /// 7-zip library low-level wrapper.
     /// </summary>
     internal static class SevenZipLibraryManager
-    {        
+    {
+        /// <summary>
+        /// Synchronization root for all locking.
+        /// </summary>
+        private static readonly object _syncRoot = new object();
+
 #if !WINCE && !MONO
         /// <summary>
         /// Path to the 7-zip dll.
@@ -120,7 +125,7 @@ private static void Init()
         /// <param name="format">Archive format</param>
         public static void LoadLibrary(object user, Enum format)
         {
-            lock (_libraryFileName)
+            lock (_syncRoot)
             {
                 if (_inArchives == null
 #if COMPRESS
@@ -164,7 +169,6 @@ public static void LoadLibrary(object user, Enum format)
                     "Enum " + format + " is not a valid archive format attribute!");
             }
         }
-        }
 
         /*/// <summary>
         /// Gets the native 7zip library version string.
@@ -192,7 +196,7 @@ public static bool ModifyCapable
         {
             get
             {
-                lock (_libraryFileName)
+                lock (_syncRoot)
                 {
                     if (!_modifyCapabale.HasValue)
                     {
@@ -256,7 +260,7 @@ public static LibraryFeature CurrentLibraryFeatures
         {
             get
             {
-                lock (_libraryFileName)
+                lock (_syncRoot)
                 {
                     if (_features != null && _features.HasValue)
                     {
@@ -360,7 +364,7 @@ public static void FreeLibrary(object user, Enum format)
             var sp = new SecurityPermission(SecurityPermissionFlag.UnmanagedCode);
             sp.Demand();
 #endif
-            lock (_libraryFileName)
+            lock (_syncRoot)
 			{
                 if (_modulePtr != IntPtr.Zero)
             {
@@ -434,7 +438,7 @@ public static void FreeLibrary(object user, Enum format)
         /// <param name="user">Archive format user.</param>
         public static IInArchive InArchive(InArchiveFormat format, object user)
         {
-            lock (_libraryFileName)
+            lock (_syncRoot)
             {
                 if (_inArchives[user][format] == null)
                 {
@@ -498,7 +502,7 @@ public static IInArchive InArchive(InArchiveFormat format, object user)
         /// <param name="user">Archive format user.</param>
         public static IOutArchive OutArchive(OutArchiveFormat format, object user)
         {
-            lock (_libraryFileName)
+            lock (_syncRoot)
             {
                 if (_outArchives[user][format] == null)
                 {

SevenZip/SevenZip2010.csproj

@@ -46,6 +46,7 @@
     <WarningLevel>4</WarningLevel>
     <RegisterForComInterop>false</RegisterForComInterop>
     <DocumentationFile>bin\Debug\SevenZipSharp.xml</DocumentationFile>
+    <RunCodeAnalysis>true</RunCodeAnalysis>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>

SevenZip/SevenZipCompressor.cs

@@ -1099,7 +1099,7 @@ public void CompressFilesEncrypted(
             _archiveName = archiveName;
             using (FileStream fs = GetArchiveFileStream(archiveName))
             {
-                if (fs == null)
+                if (fs == null && _volumeSize == 0)
                 {
                     return;
                 }
@@ -1514,7 +1514,7 @@ public void CompressFileDictionary(
             _archiveName = archiveName;
             using (FileStream fs = GetArchiveFileStream(archiveName))
             {
-                if (fs == null)
+                if (fs == null && _volumeSize == 0)
                 {
                     return;
                 }
@@ -1625,7 +1625,7 @@ public void CompressStreamDictionary(
             _archiveName = archiveName;
             using (FileStream fs = GetArchiveFileStream(archiveName))
             {
-                if (fs == null)
+                if (fs == null && _volumeSize == 0)
                 {
                     return;
                 }

SevenZip/SevenZipExtractor.cs

@@ -323,11 +323,8 @@ public bool IsSolid
                 {
                     GetArchiveInfo(true);
                 }
-                if (_isSolid != null)
-                {
-                    return _isSolid.Value;
-                }
-                throw new SevenZipException("_isSolid == null");
+                Debug.Assert(_isSolid != null);
+                return _isSolid.Value;
             }
         }
 
@@ -344,11 +341,8 @@ public uint FilesCount
                 {
                     GetArchiveInfo(true);
                 }
-                if (_filesCount != null)
-                {
-                    return _filesCount.Value;
-                }
-                throw new SevenZipException("_filesCount == null");
+                Debug.Assert(_filesCount != null);
+                return _filesCount.Value;                
             }
         }
 
@@ -766,6 +760,7 @@ private void CommonDispose()
             _archiveFileData = null;
             _archiveProperties = null;
             _archiveFileInfoCollection = null;
+            _inStream.Dispose();
             _inStream = null;
             if (_openCallback != null)
             {

SevenZip/sdk/ICoder.cs

@@ -31,6 +31,7 @@ public DataErrorException() : base("Data Error") {}
     /// <summary>
     /// The exception that is thrown when the value of an argument is outside the allowable range.
     /// </summary>
+    [Serializable]
     internal class InvalidParamException : ApplicationException
     {
         public InvalidParamException() : base("Invalid Parameter") {}