From 313b3c129b788ffc26031418ae104c9832606b20 Mon Sep 17 00:00:00 2001
From: soukoku <yinchun.wang@gmail.com>
Date: Sat, 29 Nov 2014 22:16:19 -0500
Subject: [PATCH] Fixed wrong location for old twain_32.dll.

---
 NTwain.Net35/NTwain.Net35.csproj            |  4 +--
 NTwain/Internals/WrappedManualResetEvent.cs | 30 ++++++++++-----------
 NTwain/PlatformInfo.cs                      |  6 ++++-
 NTwain/Properties/VersionInfo.cs            |  2 +-
 4 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/NTwain.Net35/NTwain.Net35.csproj b/NTwain.Net35/NTwain.Net35.csproj
index 444e373..efa01ff 100644
--- a/NTwain.Net35/NTwain.Net35.csproj
+++ b/NTwain.Net35/NTwain.Net35.csproj
@@ -18,7 +18,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>..\NTwain\bin\Debug\Net35\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG;NET35</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
@@ -26,7 +26,7 @@
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>..\NTwain\bin\Release\Net35\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;NET35</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DocumentationFile>..\NTwain\bin\Release\Net35\NTwain.XML</DocumentationFile>
diff --git a/NTwain/Internals/WrappedManualResetEvent.cs b/NTwain/Internals/WrappedManualResetEvent.cs
index a263bc8..a99a401 100644
--- a/NTwain/Internals/WrappedManualResetEvent.cs
+++ b/NTwain/Internals/WrappedManualResetEvent.cs
@@ -8,36 +8,36 @@ namespace NTwain.Internals
 
     class WrappedManualResetEvent : IDisposable
     {
-#if NET4
-        ManualResetEventSlim _slim;
-#else
+#if NET35
         ManualResetEvent _mre;
+#else
+        ManualResetEventSlim _slim;
 #endif
 
         public WrappedManualResetEvent()
         {
-#if NET4
-            _slim = new ManualResetEventSlim();
-#else
+#if NET35
             _mre = new ManualResetEvent(false);
+#else
+            _slim = new ManualResetEventSlim();
 #endif
         }
 
         public void Wait()
         {
-#if NET4
-            _slim.Wait();
-#else
+#if NET35
             _mre.WaitOne();
+#else
+            _slim.Wait();
 #endif
         }
 
         public void Set()
         {
-#if NET4
-            _slim.Set();
-#else
+#if NET35
             _mre.Set();
+#else
+            _slim.Set();
 #endif
         }
 
@@ -45,10 +45,10 @@ namespace NTwain.Internals
 
         public void Dispose()
         {
-#if NET4
-            _slim.Dispose();
-#else
+#if NET35
             _mre.Close();
+#else
+            _slim.Dispose();
 #endif
         }
 
diff --git a/NTwain/PlatformInfo.cs b/NTwain/PlatformInfo.cs
index 8194d5e..f94f8d6 100644
--- a/NTwain/PlatformInfo.cs
+++ b/NTwain/PlatformInfo.cs
@@ -34,7 +34,11 @@ namespace NTwain
             if (IsWindows)
             {
                 var newDsmPath = Path.Combine(Environment.SystemDirectory, Dsm.WIN_NEW_DSM_NAME);
-                var oldDsmPath = Path.Combine(Environment.SystemDirectory, Dsm.WIN_OLD_DSM_NAME);
+#if NET35
+                var oldDsmPath = Path.Combine(Environment.GetEnvironmentVariable("windir"), Dsm.WIN_OLD_DSM_NAME);
+#else
+                var oldDsmPath = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), Dsm.WIN_OLD_DSM_NAME);
+#endif
 
                 if (IsApp64Bit)
                 {
diff --git a/NTwain/Properties/VersionInfo.cs b/NTwain/Properties/VersionInfo.cs
index 2abbd90..6f7a16f 100644
--- a/NTwain/Properties/VersionInfo.cs
+++ b/NTwain/Properties/VersionInfo.cs
@@ -23,7 +23,7 @@ namespace NTwain
         /// <summary>
         /// The build release version number.
         /// </summary>
-        public const string Build = "3.2.1"; // change this for each nuget release
+        public const string Build = "3.2.3"; // change this for each nuget release
 
 
     }