Add x64 target support

shadowsocks-csharp/Encryption/MbedTLS.cs

@@ -20,7 +20,11 @@ namespace Shadowsocks.Encryption
             string dllPath = Utils.GetTempPath("libsscrypto.dll");
             try
             {
+#if _X64
+                FileManager.UncompressFile(dllPath, Resources.libsscrypto64_dll);
+#else
                 FileManager.UncompressFile(dllPath, Resources.libsscrypto_dll);
+#endif
             }
             catch (IOException)
             {

shadowsocks-csharp/Encryption/Sodium.cs

@@ -17,7 +17,11 @@ namespace Shadowsocks.Encryption
             string dllPath = Utils.GetTempPath("libsscrypto.dll");
             try
             {
+#if _X64
+                FileManager.UncompressFile(dllPath, Resources.libsscrypto64_dll);
+#else
                 FileManager.UncompressFile(dllPath, Resources.libsscrypto_dll);
+#endif
             }
             catch (IOException)
             {

shadowsocks-csharp/Properties/Resources.Designer.cs

@@ -111,6 +111,16 @@ namespace Shadowsocks.Properties {
             }
         }
         
+        /// <summary>
+        ///   查找 System.Byte[] 类型的本地化资源。
+        /// </summary>
+        internal static byte[] libsscrypto64_dll {
+            get {
+                object obj = ResourceManager.GetObject("libsscrypto64_dll", resourceCulture);
+                return ((byte[])(obj));
+            }
+        }
+        
         /// <summary>
         ///   查找 System.Byte[] 类型的本地化资源。
         /// </summary>
@@ -227,29 +237,29 @@ namespace Shadowsocks.Properties {
         }
         
         /// <summary>
-        ///   查找类似 # translation for Traditional Chinese
+        ///   查找类似 # translation for Traditional Chinese
-        ///
+        ///
-        ///Shadowsocks=Shadowsocks
+        ///Shadowsocks=Shadowsocks
-        ///
+        ///
-        ///# Menu items
+        ///# Menu items
-        ///
+        ///
-        ///Enable System Proxy=啟用系統代理
+        ///Enable System Proxy=啟用系統代理
-        ///Mode=系統代理模式
+        ///Mode=系統代理模式
-        ///PAC=PAC 模式
+        ///PAC=PAC 模式
-        ///Global=全局模式
+        ///Global=全局模式
-        ///Servers=伺服器
+        ///Servers=伺服器
-        ///Edit Servers...=編輯伺服器...
+        ///Edit Servers...=編輯伺服器...
-        ///Statistics Config...=統計配置...
+        ///Statistics Config...=統計配置...
-        ///Start on Boot=開機啟動
+        ///Start on Boot=開機啟動
-        ///Forward Proxy...=正向代理設置...
+        ///Forward Proxy...=正向代理設置...
-        ///Allow Clients from LAN=允許來自區域網路的連接
+        ///Allow Clients from LAN=允許來自區域網路的連接
-        ///Local PAC=使用本地 PAC
+        ///Local PAC=使用本地 PAC
-        ///Online PAC=使用在線 PAC
+        ///Online PAC=使用在線 PAC
-        ///Edit Local PAC File...=編輯本地 PAC 文件...
+        ///Edit Local PAC File...=編輯本地 PAC 文件...
-        ///Update Local PAC from GFWList=從 GFWList 更新本地 PAC
+        ///Update Local PAC from GFWList=從 GFWList 更新本地 PAC
-        ///Edit User Rule for GFWList...=編輯 GFWList 的用戶規則...
+        ///Edit User Rule for GFWList...=編輯 GFWList 的用戶規則...
-        ///Show QRCode...=顯示 QR 碼...
+        ///Show QRCode...=顯示 QR 碼...
-        ///Scan QRCode from Screen [字符串的其余部分被截断]&quot;; 的本地化字符串。
+        ///S [字符串的其余部分被截断]&quot;; 的本地化字符串。
         /// </summary>
         internal static string zh_tw {
             get {

shadowsocks-csharp/Properties/Resources.resx

@@ -124,8 +124,11 @@
   <data name="cn" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\data\cn.txt;System.String, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089;utf-8</value>
   </data>
+  <data name="libsscrypto64_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Data\libsscrypto64.dll.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="libsscrypto_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\data\libsscrypto.dll.gz;System.Byte[], mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Data\libsscrypto.dll.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="mgwz_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\data\mgwz.dll.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

shadowsocks-csharp/Util/SystemProxy/WinINet.cs

@@ -93,7 +93,7 @@ namespace Shadowsocks.Util.SystemProxy
             foreach (INTERNET_PER_CONN_OPTION eachOption in _optionlist)
             {
                 Marshal.StructureToPtr(eachOption, current, false);
-                current = (IntPtr)((int)current + Marshal.SizeOf(eachOption));
+                current = (IntPtr)(current.ToInt64() + Marshal.SizeOf(eachOption));
             }
 
             // Initialize a INTERNET_PER_CONN_OPTION_LIST instance.

shadowsocks-csharp/shadowsocks-csharp.csproj

@@ -23,6 +23,8 @@
     <OldToolsVersion>3.5</OldToolsVersion>
     <TargetFrameworkProfile>
     </TargetFrameworkProfile>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
     <InstallFrom>Disk</InstallFrom>
@@ -37,8 +39,6 @@
     <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -65,6 +65,25 @@
   <PropertyGroup>
     <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;_X64</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE;_X64</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x64</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>ManagedMinimumRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="GlobalHotKey, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>3rd\GlobalHotKey.1.1.0\lib\GlobalHotKey.dll</HintPath>
@@ -286,6 +305,7 @@
     </None>
     <None Include="Data\abp.js.gz" />
     <None Include="Data\libsscrypto.dll.gz" />
+    <None Include="Data\libsscrypto64.dll.gz" />
     <None Include="Data\mgwz.dll.gz" />
     <None Include="Data\privoxy.exe.gz" />
     <None Include="Data\proxy.pac.txt.gz" />

shadowsocks-windows.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.24720.0
+VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "shadowsocks-csharp", "shadowsocks-csharp\shadowsocks-csharp.csproj", "{8C02D2F7-7CDB-4D55-9F25-CD03EF4AA062}"
 EndProject
@@ -12,17 +12,27 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "test", "test\test.csproj",
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
 		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{8C02D2F7-7CDB-4D55-9F25-CD03EF4AA062}.Debug|x64.ActiveCfg = Debug|x64
+		{8C02D2F7-7CDB-4D55-9F25-CD03EF4AA062}.Debug|x64.Build.0 = Debug|x64
 		{8C02D2F7-7CDB-4D55-9F25-CD03EF4AA062}.Debug|x86.ActiveCfg = Debug|x86
 		{8C02D2F7-7CDB-4D55-9F25-CD03EF4AA062}.Debug|x86.Build.0 = Debug|x86
 		{8C02D2F7-7CDB-4D55-9F25-CD03EF4AA062}.Debug|x86.Deploy.0 = Debug|x86
+		{8C02D2F7-7CDB-4D55-9F25-CD03EF4AA062}.Release|x64.ActiveCfg = Release|x64
+		{8C02D2F7-7CDB-4D55-9F25-CD03EF4AA062}.Release|x64.Build.0 = Release|x64
 		{8C02D2F7-7CDB-4D55-9F25-CD03EF4AA062}.Release|x86.ActiveCfg = Release|x86
 		{8C02D2F7-7CDB-4D55-9F25-CD03EF4AA062}.Release|x86.Build.0 = Release|x86
+		{45913187-0685-4903-B250-DCEF0479CD86}.Debug|x64.ActiveCfg = Debug|x64
+		{45913187-0685-4903-B250-DCEF0479CD86}.Debug|x64.Build.0 = Debug|x64
 		{45913187-0685-4903-B250-DCEF0479CD86}.Debug|x86.ActiveCfg = Debug|x86
 		{45913187-0685-4903-B250-DCEF0479CD86}.Debug|x86.Build.0 = Debug|x86
+		{45913187-0685-4903-B250-DCEF0479CD86}.Release|x64.ActiveCfg = Release|x64
+		{45913187-0685-4903-B250-DCEF0479CD86}.Release|x64.Build.0 = Release|x64
 		{45913187-0685-4903-B250-DCEF0479CD86}.Release|x86.ActiveCfg = Release|x86
 		{45913187-0685-4903-B250-DCEF0479CD86}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection

test/test.csproj

@@ -34,6 +34,20 @@
   <PropertyGroup>
     <StartupObject />
   </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\x64\Debug\</OutputPath>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
+    <PlatformTarget>x64</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
+    <OutputPath>bin\x64\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <PlatformTarget>x64</PlatformTarget>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="GlobalHotKey, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\shadowsocks-csharp\3rd\GlobalHotKey.1.1.0\lib\GlobalHotKey.dll</HintPath>