Determine DLL platform in runtime

Author: borzunov

.gitignore

@@ -19,8 +19,6 @@
 [Dd]ebugPublic/
 [Rr]elease/
 [Rr]eleases/
-x64/
-x86/
 bld/
 [Bb]in/
 [Oo]bj/

ZstdNet.Tests/ZstdNet.Tests.csproj

@@ -38,15 +38,15 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;BUILD64</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;BUILD64</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x64</PlatformTarget>
@@ -58,7 +58,7 @@
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>

ZstdNet/CompressionOptions.cs

@@ -1,9 +1,5 @@
 using System;
-#if BUILD64
-using size_t = System.UInt64;
-#else
-using size_t = System.UInt32;
-#endif
+using size_t = System.UIntPtr;
 
 namespace ZstdNet
 {

ZstdNet/Compressor.cs

@@ -1,9 +1,5 @@
 using System;
-#if BUILD64
-using size_t = System.UInt64;
-#else
-using size_t = System.UInt32;
-#endif
+using size_t = System.UIntPtr;
 
 namespace ZstdNet
 {

ZstdNet/DecompressionOptions.cs

@@ -1,9 +1,5 @@
 using System;
-#if BUILD64
-using size_t = System.UInt64;
-#else
-using size_t = System.UInt32;
-#endif
+using size_t = System.UIntPtr;
 
 namespace ZstdNet
 {

ZstdNet/Decompressor.cs

@@ -1,9 +1,5 @@
 using System;
-#if BUILD64
-using size_t = System.UInt64;
-#else
-using size_t = System.UInt32;
-#endif
+using size_t = System.UIntPtr;
 
 namespace ZstdNet
 {
@@ -43,20 +39,20 @@ private void Dispose(bool disposing)
 
 		private bool disposed = false;
 
-		public byte[] Unwrap(byte[] src, size_t maxDecompressedSize = size_t.MaxValue)
+		public byte[] Unwrap(byte[] src, int maxDecompressedSize = int.MaxValue)
 		{
 			return Unwrap(new ArraySegment<byte>(src), maxDecompressedSize);
 		}
 
-		public byte[] Unwrap(ArraySegment<byte> src, size_t maxDecompressedSize = size_t.MaxValue)
+		public byte[] Unwrap(ArraySegment<byte> src, int maxDecompressedSize = int.MaxValue)
 		{
 			if(src.Count == 0)
 				return new byte[0];
 
 			var expectedDstSize = GetDecompressedSize(src);
 			if(expectedDstSize == 0)
 				throw new ZstdException("Can't create buffer for data with unspecified decompressed size (provide your own buffer to Unwrap instead)");
-			if(expectedDstSize > maxDecompressedSize)
+			if(expectedDstSize > (ulong)maxDecompressedSize)
 				throw new ArgumentOutOfRangeException(string.Format("Decompressed size is too big ({0} bytes > authorized {1} bytes)", expectedDstSize, maxDecompressedSize));
 			var dst = new byte[expectedDstSize];
 

ZstdNet/DictBuilder.cs

@@ -1,11 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-#if BUILD64
-using size_t = System.UInt64;
-#else
-using size_t = System.UInt32;
-#endif
+using size_t = System.UIntPtr;
 
 namespace ZstdNet
 {
@@ -16,12 +12,12 @@ public static byte[] TrainFromBuffer(ICollection<byte[]> samples, int dictCapaci
 			var samplesBuffer = samples.SelectMany(sample => sample).ToArray();
 			var samplesSizes = samples.Select(sample => (size_t)sample.Length).ToArray();
 			var dictBuffer = new byte[dictCapacity];
-			var dictSize = ExternMethods.ZDICT_trainFromBuffer(dictBuffer, (size_t)dictCapacity, samplesBuffer, samplesSizes, (uint)samples.Count).EnsureZdictSuccess();
+			var dictSize = (int)ExternMethods.ZDICT_trainFromBuffer(dictBuffer, (size_t)dictCapacity, samplesBuffer, samplesSizes, (uint)samples.Count).EnsureZdictSuccess();
 
-			if (dictCapacity == (int)dictSize)
+			if (dictCapacity == dictSize)
 				return dictBuffer;
 			var result = new byte[dictSize];
-			Array.Copy(dictBuffer, result, (int)dictSize);
+			Array.Copy(dictBuffer, result, dictSize);
 			return result;
 		}
 

ZstdNet/ExternMethods.cs

@@ -1,20 +1,29 @@
 using System;
+using System.IO;
+using System.Reflection;
 using System.Runtime.InteropServices;
-#if BUILD64
-using size_t = System.UInt64;
-#else
-using size_t = System.UInt32;
-#endif
+using size_t = System.UIntPtr;
 
 namespace ZstdNet
 {
 	internal static class ExternMethods
 	{
-#if BUILD64
-		private const string DllName = "zstdlib_x64.dll";
-#else
-		private const string DllName = "zstdlib_x86.dll";
-#endif
+		static ExternMethods()
+		{
+			var assemblyPath = Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location);
+			if (assemblyPath == null)
+				throw new InvalidOperationException("Failed to get assembly directory");
+			var platform = Environment.Is64BitProcess ? "x64" : "x86";
+
+			var ok = SetDllDirectory(Path.Combine(assemblyPath, platform));
+			if (!ok)
+				throw new InvalidOperationException("Failed to set DLL directory");
+		}
+
+		[DllImport("kernel32.dll", CharSet = CharSet.Auto, SetLastError = true)]
+		private static extern bool SetDllDirectory(string path);
+
+		private const string DllName = "zstdlib.dll";
 
 		[DllImport(DllName, CallingConvention = CallingConvention.Cdecl)]
 		public static extern size_t ZDICT_trainFromBuffer(byte[] dictBuffer, size_t dictBufferCapacity, byte[] samplesBuffer, size_t[] samplesSizes, uint nbSamples);

ZstdNet/ThrowHelper.cs

@@ -1,10 +1,6 @@
 using System;
 using System.Runtime.InteropServices;
-#if BUILD64
-using size_t = System.UInt64;
-#else
-using size_t = System.UInt32;
-#endif
+using size_t = System.UIntPtr;
 
 namespace ZstdNet
 {
@@ -26,14 +22,15 @@ public static size_t EnsureZstdSuccess(this size_t returnValue)
 
 		private static void ThrowException(size_t returnValue, string message)
 		{
-			if(unchecked(0 - returnValue) == ZSTD_error_dstSize_tooSmall)
+			var code = unchecked(0 - (uint) (ulong) returnValue); // Negate returnValue (UintPtr)
+			if (code == ZSTD_error_dstSize_tooSmall)
 				throw new InsufficientMemoryException(message);
 			throw new ZstdException(message);
 		}
 
 		// ReSharper disable once InconsistentNaming
 		// NOTE that this const may change on zstdlib update
-		private const size_t ZSTD_error_dstSize_tooSmall = 11;
+		private const int ZSTD_error_dstSize_tooSmall = 11;
 
 		public static IntPtr EnsureZstdSuccess(this IntPtr returnValue)
 		{

ZstdNet/ZstdNet.csproj

@@ -15,15 +15,15 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;BUILD64</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\x64\Release\</OutputPath>
-    <DefineConstants>TRACE;BUILD64</DefineConstants>
+    <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>x64</PlatformTarget>
@@ -53,7 +53,7 @@
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x86</PlatformTarget>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
@@ -81,12 +81,12 @@
     <Compile Include="ThrowHelper.cs" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="build\zstdlib_x64.dll" Condition="'$(Platform)' == 'x64'">
-      <Link>%(FileName)%(Extension)</Link>
+    <None Include="build\x64\zstdlib.dll" Condition="'$(Platform)' == 'x64' OR '$(Platform)' == 'AnyCPU'">
+      <Link>x64\%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="build\zstdlib_x86.dll" Condition="'$(Platform)' != 'x64'">
-      <Link>%(FileName)%(Extension)</Link>
+    <None Include="build\x86\zstdlib.dll" Condition="'$(Platform)' == 'x86' OR '$(Platform)' == 'AnyCPU'">
+      <Link>x86\%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

ZstdNet/build/ZstdNet.targets

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)\zstdlib_x64.dll" Condition="'$(Platform)' == 'x64'">
-      <Link>%(FileName)%(Extension)</Link>
+    <None Include="$(MSBuildThisFileDirectory)x64\zstdlib.dll" Condition="'$(Platform)' == 'x64' OR '$(Platform)' == 'AnyCPU'">
+      <Link>x64\%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="$(MSBuildThisFileDirectory)\zstdlib_x86.dll" Condition="'$(Platform)' != 'x64'">
-      <Link>%(FileName)%(Extension)</Link>
+    <None Include="$(MSBuildThisFileDirectory)x86\zstdlib.dll" Condition="'$(Platform)' == 'x86' OR '$(Platform)' == 'AnyCPU'">
+      <Link>x86\%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>