Moved Interop Locations For System.IO.Compression.Brotli (dotnet/core…

…fx#36614) * MovedInteropLocationForBrotli * Combined Brotli Files Commit migrated from dotnet/corefx@e5fddbc
waiyiptam · Apr 7, 2019 · 7e12e6e · 7e12e6e
1 parent ef7956b
commit 7e12e6e
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 35 deletions.
diff --git a/...tli/src/Interop/Interop.Brotli.Encoder.cs → ...ries/Common/src/Interop/Interop.Brotli.cs b/...tli/src/Interop/Interop.Brotli.Encoder.cs → ...ries/Common/src/Interop/Interop.Brotli.cs
@@ -10,8 +10,25 @@
 
 internal static partial class Interop
 {
-    internal static partial class Brotli
+    internal static class Brotli
     {
+        [DllImport(Libraries.CompressionNative)]
+        internal static extern SafeBrotliDecoderHandle BrotliDecoderCreateInstance(IntPtr allocFunc, IntPtr freeFunc, IntPtr opaque);
+
+        [DllImport(Libraries.CompressionNative)]
+        internal static extern unsafe int BrotliDecoderDecompressStream(
+            SafeBrotliDecoderHandle state, ref size_t availableIn, byte** nextIn,
+            ref size_t availableOut, byte** nextOut, out size_t totalOut);
+
+        [DllImport(Libraries.CompressionNative)]
+        internal static extern unsafe bool BrotliDecoderDecompress(size_t availableInput, byte* inBytes, ref size_t availableOutput, byte* outBytes);
+
+        [DllImport(Libraries.CompressionNative)]
+        internal static extern void BrotliDecoderDestroyInstance(IntPtr state);
+
+        [DllImport(Libraries.CompressionNative)]
+        internal static extern bool BrotliDecoderIsFinished(SafeBrotliDecoderHandle state);
+
         [DllImport(Libraries.CompressionNative)]
         internal static extern SafeBrotliEncoderHandle BrotliEncoderCreateInstance(IntPtr allocFunc, IntPtr freeFunc, IntPtr opaque);
 

diff --git a/src/libraries/System.IO.Compression.Brotli/src/Interop/Interop.Brotli.Decoder.cs b/src/libraries/System.IO.Compression.Brotli/src/Interop/Interop.Brotli.Decoder.cs
diff --git a/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj b/src/libraries/System.IO.Compression.Brotli/src/System.IO.Compression.Brotli.csproj
@@ -9,8 +9,7 @@
   <!-- Default configurations to help VS understand the options -->
   <!-- Platform agnostic files -->
   <ItemGroup>
-    <Compile Include="Interop\Interop.Brotli.Encoder.cs" />
-    <Compile Include="Interop\Interop.Brotli.Decoder.cs" />
+    <Compile Include="$(CommonPath)\Interop\Interop.Brotli.cs" />
     <Compile Include="System\IO\Compression\enc\BrotliStream.Compress.cs" />
     <Compile Include="System\IO\Compression\dec\BrotliStream.Decompress.cs" />
     <Compile Include="System\IO\Compression\BrotliUtils.cs" />