Project: Convert to .NET 5.0

7zip/Compress/LZMA/LzmaDecoder.cs

@@ -5,6 +5,7 @@ using System;
 namespace SevenZip.Compression.LZMA
 {
     using RangeCoder;
+    using System.Threading;
 
     public class Decoder : ICoder, ISetDecoderProperties // ,System.IO.Stream
     {
@@ -228,7 +229,7 @@ namespace SevenZip.Compression.LZMA
         }
 
         public void Code(System.IO.Stream inStream, System.IO.Stream outStream,
-            Int64 inSize, Int64 outSize, ICodeProgress progress)
+            Int64 inSize, Int64 outSize, ICodeProgress progress, CancellationToken? token = null)
         {
             Init(inStream, outStream);
 
@@ -247,100 +248,111 @@ namespace SevenZip.Compression.LZMA
                 m_OutWindow.PutByte(b);
                 nowPos64++;
             }
-            while (nowPos64 < outSize64)
+
+            try
             {
-                // UInt64 next = Math.Min(nowPos64 + (1 << 18), outSize64);
+                while (nowPos64 < outSize64)
-                // while(nowPos64 < next)
                 {
-                    uint posState = (uint)nowPos64 & m_PosStateMask;
+                    token?.ThrowIfCancellationRequested();
-                    if (m_IsMatchDecoders[(state.Index << Base.kNumPosStatesBitsMax) + posState].Decode(m_RangeDecoder) == 0)
+
+                    // UInt64 next = Math.Min(nowPos64 + (1 << 18), outSize64);
+                    // while(nowPos64 < next)
                     {
-                        byte b;
+                        uint posState = (uint)nowPos64 & m_PosStateMask;
-                        byte prevByte = m_OutWindow.GetByte(0);
+                        if (m_IsMatchDecoders[(state.Index << Base.kNumPosStatesBitsMax) + posState].Decode(m_RangeDecoder) == 0)
-                        if (!state.IsCharState())
-                            b = m_LiteralDecoder.DecodeWithMatchByte(m_RangeDecoder,
-                                (uint)nowPos64, prevByte, m_OutWindow.GetByte(rep0));
-                        else
-                            b = m_LiteralDecoder.DecodeNormal(m_RangeDecoder, (uint)nowPos64, prevByte);
-                        m_OutWindow.PutByte(b);
-                        state.UpdateChar();
-                        nowPos64++;
-                    }
-                    else
-                    {
-                        uint len;
-                        if (m_IsRepDecoders[state.Index].Decode(m_RangeDecoder) == 1)
                         {
-                            if (m_IsRepG0Decoders[state.Index].Decode(m_RangeDecoder) == 0)
+                            byte b;
-                            {
+                            byte prevByte = m_OutWindow.GetByte(0);
-                                if (m_IsRep0LongDecoders[(state.Index << Base.kNumPosStatesBitsMax) + posState].Decode(m_RangeDecoder) == 0)
+                            if (!state.IsCharState())
-                                {
+                                b = m_LiteralDecoder.DecodeWithMatchByte(m_RangeDecoder,
-                                    state.UpdateShortRep();
+                                    (uint)nowPos64, prevByte, m_OutWindow.GetByte(rep0));
-                                    m_OutWindow.PutByte(m_OutWindow.GetByte(rep0));
-                                    nowPos64++;
-                                    continue;
-                                }
-                            }
                             else
+                                b = m_LiteralDecoder.DecodeNormal(m_RangeDecoder, (uint)nowPos64, prevByte);
+                            m_OutWindow.PutByte(b);
+                            state.UpdateChar();
+                            nowPos64++;
+                        }
+                        else
+                        {
+                            uint len;
+                            if (m_IsRepDecoders[state.Index].Decode(m_RangeDecoder) == 1)
                             {
-                                UInt32 distance;
+                                if (m_IsRepG0Decoders[state.Index].Decode(m_RangeDecoder) == 0)
-                                if (m_IsRepG1Decoders[state.Index].Decode(m_RangeDecoder) == 0)
                                 {
-                                    distance = rep1;
+                                    if (m_IsRep0LongDecoders[(state.Index << Base.kNumPosStatesBitsMax) + posState].Decode(m_RangeDecoder) == 0)
+                                    {
+                                        state.UpdateShortRep();
+                                        m_OutWindow.PutByte(m_OutWindow.GetByte(rep0));
+                                        nowPos64++;
+                                        continue;
+                                    }
                                 }
                                 else
                                 {
-                                    if (m_IsRepG2Decoders[state.Index].Decode(m_RangeDecoder) == 0)
+                                    UInt32 distance;
-                                        distance = rep2;
+                                    if (m_IsRepG1Decoders[state.Index].Decode(m_RangeDecoder) == 0)
+                                    {
+                                        distance = rep1;
+                                    }
                                     else
                                     {
-                                        distance = rep3;
+                                        if (m_IsRepG2Decoders[state.Index].Decode(m_RangeDecoder) == 0)
-                                        rep3 = rep2;
+                                            distance = rep2;
+                                        else
+                                        {
+                                            distance = rep3;
+                                            rep3 = rep2;
+                                        }
+                                        rep2 = rep1;
                                     }
-                                    rep2 = rep1;
+                                    rep1 = rep0;
-                                }
+                                    rep0 = distance;
-                                rep1 = rep0;
-                                rep0 = distance;
-                            }
-                            len = m_RepLenDecoder.Decode(m_RangeDecoder, posState) + Base.kMatchMinLen;
-                            state.UpdateRep();
-                        }
-                        else
-                        {
-                            rep3 = rep2;
-                            rep2 = rep1;
-                            rep1 = rep0;
-                            len = Base.kMatchMinLen + m_LenDecoder.Decode(m_RangeDecoder, posState);
-                            state.UpdateMatch();
-                            uint posSlot = m_PosSlotDecoder[Base.GetLenToPosState(len)].Decode(m_RangeDecoder);
-                            if (posSlot >= Base.kStartPosModelIndex)
-                            {
-                                int numDirectBits = (int)((posSlot >> 1) - 1);
-                                rep0 = ((2 | (posSlot & 1)) << numDirectBits);
-                                if (posSlot < Base.kEndPosModelIndex)
-                                    rep0 += BitTreeDecoder.ReverseDecode(m_PosDecoders,
-                                            rep0 - posSlot - 1, m_RangeDecoder, numDirectBits);
-                                else
-                                {
-                                    rep0 += (m_RangeDecoder.DecodeDirectBits(
-                                        numDirectBits - Base.kNumAlignBits) << Base.kNumAlignBits);
-                                    rep0 += m_PosAlignDecoder.ReverseDecode(m_RangeDecoder);
                                 }
+                                len = m_RepLenDecoder.Decode(m_RangeDecoder, posState) + Base.kMatchMinLen;
+                                state.UpdateRep();
                             }
                             else
-                                rep0 = posSlot;
+                            {
+                                rep3 = rep2;
+                                rep2 = rep1;
+                                rep1 = rep0;
+                                len = Base.kMatchMinLen + m_LenDecoder.Decode(m_RangeDecoder, posState);
+                                state.UpdateMatch();
+                                uint posSlot = m_PosSlotDecoder[Base.GetLenToPosState(len)].Decode(m_RangeDecoder);
+                                if (posSlot >= Base.kStartPosModelIndex)
+                                {
+                                    int numDirectBits = (int)((posSlot >> 1) - 1);
+                                    rep0 = ((2 | (posSlot & 1)) << numDirectBits);
+                                    if (posSlot < Base.kEndPosModelIndex)
+                                        rep0 += BitTreeDecoder.ReverseDecode(m_PosDecoders,
+                                                rep0 - posSlot - 1, m_RangeDecoder, numDirectBits);
+                                    else
+                                    {
+                                        rep0 += (m_RangeDecoder.DecodeDirectBits(
+                                            numDirectBits - Base.kNumAlignBits) << Base.kNumAlignBits);
+                                        rep0 += m_PosAlignDecoder.ReverseDecode(m_RangeDecoder);
+                                    }
+                                }
+                                else
+                                    rep0 = posSlot;
+                            }
+                            if (rep0 >= m_OutWindow.TrainSize + nowPos64 || rep0 >= m_DictionarySizeCheck)
+                            {
+                                if (rep0 == 0xFFFFFFFF)
+                                    break;
+                                throw new DataErrorException();
+                            }
+                            m_OutWindow.CopyBlock(rep0, len);
+                            nowPos64 += len;
                         }
-                        if (rep0 >= m_OutWindow.TrainSize + nowPos64 || rep0 >= m_DictionarySizeCheck)
-                        {
-                            if (rep0 == 0xFFFFFFFF)
-                                break;
-                            throw new DataErrorException();
-                        }
-                        m_OutWindow.CopyBlock(rep0, len);
-                        nowPos64 += len;
                     }
                 }
             }
+            catch (OperationCanceledException)
+            {
+
+            }
+
             m_OutWindow.Flush();
             m_OutWindow.ReleaseStream();
             m_RangeDecoder.ReleaseStream();

7zip/Compress/LZMA/LzmaEncoder.cs

@@ -5,6 +5,7 @@ using System;
 namespace SevenZip.Compression.LZMA
 {
     using RangeCoder;
+    using System.Threading;
 
     public class Encoder : ICoder, ISetCoderProperties, IWriteCoderProperties
     {
@@ -1271,7 +1272,7 @@ namespace SevenZip.Compression.LZMA
 
 
         public void Code(System.IO.Stream inStream, System.IO.Stream outStream,
-            Int64 inSize, Int64 outSize, ICodeProgress progress)
+            Int64 inSize, Int64 outSize, ICodeProgress progress, CancellationToken? token = null)
         {
             _needReleaseMFStream = false;
             try
@@ -1279,6 +1280,7 @@ namespace SevenZip.Compression.LZMA
                 SetStreams(inStream, outStream, inSize, outSize);
                 while (true)
                 {
+                    token?.ThrowIfCancellationRequested();
                     Int64 processedInSize;
                     Int64 processedOutSize;
                     bool finished;

7zip/ICoder.cs

@@ -1,6 +1,7 @@
 // ICoder.h
 
 using System;
+using System.Threading;
 
 namespace SevenZip
 {
@@ -58,7 +59,7 @@ namespace SevenZip
         /// if input stream is not valid
         /// </exception>
         void Code(System.IO.Stream inStream, System.IO.Stream outStream,
-            Int64 inSize, Int64 outSize, ICodeProgress progress);
+            Int64 inSize, Int64 outSize, ICodeProgress progress, CancellationToken? token = null);
     };
 
     /*

DiscUtils/Fat/FatFileSystemOptions.cs

@@ -34,6 +34,7 @@ namespace DiscUtils.Fat
 
         internal FatFileSystemOptions()
         {
+            Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
             FileNameEncoding = Encoding.GetEncoding(437);
         }
 
@@ -45,6 +46,7 @@ namespace DiscUtils.Fat
             }
             else
             {
+                Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
                 FileNameEncoding = Encoding.GetEncoding(437);
             }
         }

FilePickerControl.xaml.cs

@@ -166,7 +166,8 @@ namespace WPinternals
                 FlowDirection.LeftToRight,
                 new Typeface(PathTextBlock.FontFamily, PathTextBlock.FontStyle, PathTextBlock.FontWeight, PathTextBlock.FontStretch),
                 FontSize,
-                Foreground
+                Foreground,
+                VisualTreeHelper.GetDpi(this).PixelsPerDip
             );
 #endif
 
@@ -198,7 +199,8 @@ namespace WPinternals
                 FlowDirection.LeftToRight,
                 new Typeface(CaptionTextBlock.FontFamily, CaptionTextBlock.FontStyle, CaptionTextBlock.FontWeight, CaptionTextBlock.FontStretch),
                 FontSize,
-                Foreground
+                Foreground,
+                VisualTreeHelper.GetDpi(this).PixelsPerDip
                 );
 #endif
             double CaptionWidth = formatted.Width;
@@ -238,7 +240,8 @@ namespace WPinternals
                         FlowDirection.LeftToRight,
                         new Typeface(PathTextBlock.FontFamily, PathTextBlock.FontStyle, PathTextBlock.FontWeight, PathTextBlock.FontStretch),
                         FontSize,
-                        Foreground
+                        Foreground,
+                        VisualTreeHelper.GetDpi(this).PixelsPerDip
                         );
 #endif
             if (NewWidth < 0)
@@ -321,7 +324,8 @@ namespace WPinternals
                         FlowDirection.LeftToRight,
                         new Typeface(PathTextBlock.FontFamily, PathTextBlock.FontStyle, PathTextBlock.FontWeight, PathTextBlock.FontStretch),
                         FontSize,
-                        Foreground
+                        Foreground,
+                        VisualTreeHelper.GetDpi(this).PixelsPerDip
                         );
 #endif
 

Models/GPT.cs

@@ -375,18 +375,18 @@ namespace WPinternals
                     HasChanged = true;
                 }
 
-                if ((NewPartition.PartitionGuid == null) || (NewPartition.PartitionGuid != CurrentPartition.PartitionGuid))
+                if ((NewPartition.PartitionGuid != Guid.Empty) || (NewPartition.PartitionGuid != CurrentPartition.PartitionGuid))
                     HasChanged = true;
-                if (NewPartition.PartitionGuid != null)
+                if (NewPartition.PartitionGuid != Guid.Empty)
                     CurrentPartition.PartitionGuid = NewPartition.PartitionGuid;
-                if (CurrentPartition.PartitionGuid == null)
+                if (CurrentPartition.PartitionGuid != Guid.Empty)
                     CurrentPartition.PartitionGuid = Guid.NewGuid();
 
-                if ((NewPartition.PartitionTypeGuid == null) || (NewPartition.PartitionTypeGuid != CurrentPartition.PartitionTypeGuid))
+                if ((NewPartition.PartitionTypeGuid != Guid.Empty) || (NewPartition.PartitionTypeGuid != CurrentPartition.PartitionTypeGuid))
                     HasChanged = true;
-                if (NewPartition.PartitionTypeGuid != null)
+                if (NewPartition.PartitionTypeGuid != Guid.Empty)
                     CurrentPartition.PartitionTypeGuid = NewPartition.PartitionTypeGuid;
-                if (CurrentPartition.PartitionTypeGuid == null)
+                if (CurrentPartition.PartitionTypeGuid != Guid.Empty)
                     CurrentPartition.PartitionTypeGuid = Guid.NewGuid();
 
                 for (int i = this.Partitions.Count - 1; i >= 0; i--)

Models/LZMA.cs

@@ -92,6 +92,8 @@ namespace WPinternals
         private Stream stream;
         private bool LeaveOpen;
         private Thread WorkThread;
+        private CancellationTokenSource source;
+        private CancellationToken token;
 
         public LZMACompressionStream(Stream stream, CompressionMode mode, bool LeaveOpen, int DictionarySize, int PosStateBits,
            int LitContextBits, int LitPosBits, int Algorithm, int NumFastBytes, string MatchFinder, bool EndMarker)
@@ -99,6 +101,8 @@ namespace WPinternals
             this.stream = stream;
             this.LeaveOpen = LeaveOpen;
             BufferStream = new PumpStream();
+            source = new CancellationTokenSource();
+            token = source.Token;
 
             if (mode == CompressionMode.Compress)
             {
@@ -130,14 +134,14 @@ namespace WPinternals
 
         private void Encode()
         {
-            Encoder.Code(BufferStream, stream, -1, -1, null);
+            Encoder.Code(BufferStream, stream, -1, -1, null, token);
             if (LeaveOpen == false)
                 stream.Close();
         }
 
         private void Decode()
         {
-            Decoder.Code(stream, BufferStream, -1, -1, null);
+            Decoder.Code(stream, BufferStream, -1, -1, null, token);
             BufferStream.Close();
             if (LeaveOpen == false)
                 stream.Close();
@@ -148,7 +152,11 @@ namespace WPinternals
             if (Encoder != null)
                 BufferStream.Close();
             else if (WorkThread.IsAlive)
-                WorkThread.Abort();
+            {
+                if (source != null)
+                    source.Cancel();
+                WorkThread.Join();
+            }
         }
 
         public override int Read(byte[] buffer, int offset, int count)

Models/NativeMethods.cs

@@ -118,14 +118,12 @@ namespace WPinternals
         [DllImport(
              KERNEL32,
              SetLastError = true)]
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
         internal static extern bool CloseHandle(IntPtr handle);
 
         [DllImport(
              ADVAPI32,
              CharSet = CharSet.Unicode,
              SetLastError = true)]
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
         internal static extern bool AdjustTokenPrivileges(
             [In]     SafeTokenHandle TokenHandle,
             [In]     bool DisableAllPrivileges,
@@ -138,7 +136,6 @@ namespace WPinternals
              ADVAPI32,
              CharSet = CharSet.Auto,
              SetLastError = true)]
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
         internal static extern
         bool RevertToSelf();
 
@@ -147,7 +144,6 @@ namespace WPinternals
              EntryPoint = "LookupPrivilegeValueW",
              CharSet = CharSet.Auto,
              SetLastError = true)]
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
         internal static extern
         bool LookupPrivilegeValue(
             [In]     string lpSystemName,
@@ -158,7 +154,6 @@ namespace WPinternals
              KERNEL32,
              CharSet = CharSet.Auto,
              SetLastError = true)]
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
         internal static extern
         IntPtr GetCurrentProcess();
 
@@ -166,7 +161,6 @@ namespace WPinternals
              KERNEL32,
              CharSet = CharSet.Auto,
              SetLastError = true)]
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
         internal static extern
             IntPtr GetCurrentThread();
 
@@ -174,7 +168,6 @@ namespace WPinternals
              ADVAPI32,
              CharSet = CharSet.Unicode,
              SetLastError = true)]
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
         internal static extern
         bool OpenProcessToken(
             [In]     IntPtr ProcessToken,
@@ -185,7 +178,6 @@ namespace WPinternals
              (ADVAPI32,
              CharSet = CharSet.Unicode,
              SetLastError = true)]
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
         internal static extern
         bool OpenThreadToken(
             [In]     IntPtr ThreadToken,
@@ -197,7 +189,6 @@ namespace WPinternals
             (ADVAPI32,
              CharSet = CharSet.Unicode,
              SetLastError = true)]
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
         internal static extern
         bool DuplicateTokenEx(
             [In]    SafeTokenHandle ExistingToken,
@@ -211,7 +202,6 @@ namespace WPinternals
              (ADVAPI32,
              CharSet = CharSet.Unicode,
              SetLastError = true)]
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
         internal static extern
         bool SetThreadToken(
             [In]    IntPtr Thread,
@@ -301,8 +291,7 @@ namespace WPinternals
         }
 
         [DllImport(NativeMethods.KERNEL32, SetLastError = true),
-         SuppressUnmanagedCodeSecurity,
+         SuppressUnmanagedCodeSecurity]
-         ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
         private static extern bool CloseHandle(IntPtr handle);
 
         override protected bool ReleaseHandle()

Models/Privileges.cs

@@ -20,8 +20,6 @@
 
 using System;
 using System.Collections.Specialized;
-using System.Runtime.CompilerServices;
-using System.Runtime.ConstrainedExecution;
 using System.Runtime.InteropServices;
 using System.Threading;
 
@@ -93,7 +91,6 @@ namespace WPinternals
         // of privilege names to luids
         //
 
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
         private static Luid LuidFromPrivilege(string privilege)
         {
             Luid luid;
@@ -104,8 +101,6 @@ namespace WPinternals
             // Look up the privilege LUID inside the cache
             //
 
-            RuntimeHelpers.PrepareConstrainedRegions();
-
             try
             {
                 privilegeLock.AcquireReaderLock(Timeout.Infinite);
@@ -206,8 +201,6 @@ namespace WPinternals
                     }
                 }
 
-                RuntimeHelpers.PrepareConstrainedRegions();
-
                 try
                 {
                     // Open the thread token; if there is no thread token,
@@ -382,19 +375,16 @@ namespace WPinternals
         #endregion
 
         #region Public methods and properties
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
         public void Enable()
         {
             this.ToggleState(true);
         }
 
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
         public void Disable()
         {
             this.ToggleState(false);
         }
 
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
         public void Revert()
         {
             int error = 0;
@@ -413,8 +403,6 @@ namespace WPinternals
 
             // This code must be eagerly prepared and non-interruptible.
 
-            RuntimeHelpers.PrepareConstrainedRegions();
-
             try
             {
                 // The payload is entirely in the finally block
@@ -492,8 +480,6 @@ namespace WPinternals
 
             Privilege p = new Privilege(privilege);
 
-            RuntimeHelpers.PrepareConstrainedRegions();
-
             try
             {
                 if (enabled)
@@ -520,7 +506,6 @@ namespace WPinternals
         #endregion
 
         #region Private implementation
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.MayFail)]
         private void ToggleState(bool enable)
         {
             int error = 0;
@@ -542,8 +527,6 @@ namespace WPinternals
             // Need to make this block of code non-interruptible so that it would preserve
             // consistency of thread oken state even in the face of catastrophic exceptions
 
-            RuntimeHelpers.PrepareConstrainedRegions();
-
             try
             {
                 // The payload is entirely in the finally block
@@ -635,11 +618,8 @@ namespace WPinternals
             }
         }
 
-        [ReliabilityContract(Consistency.WillNotCorruptState, Cer.Success)]
         private void Reset()
         {
-            RuntimeHelpers.PrepareConstrainedRegions();
-
             try
             {
                 // Payload is in the finally block