Archives
/
SCJMapper-V2
mirror of https://github.com/SCToolsfactory/SCJMapper-V2
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

V 2.24 - BETA Build 58

Browse Source 
- fix - some trouble in SC path finding #44
pull/104/head v2.24beta
bm98 8 years ago
parent a7a21aae43
commit f60c49ccc8
6 changed files with 187 additions and 107 deletions
Show Stats Download Patch File Download Diff File

8
Form1.cs
Unescape Escape View File

@ -160,15 +160,15 @@ namespace SCJMapper_V2
private void MainForm_Deactivate( object sender, EventArgs e )
{
timer1.Enabled = false;
m_Joystick.Deactivate( );
m_Keyboard.Deactivate( );
if ( m_Joystick!=null) m_Joystick.Deactivate( );
if ( m_Keyboard != null ) m_Keyboard.Deactivate( );
}
private void MainForm_Activated( object sender, EventArgs e )
{
timer1.Enabled = true;
m_Joystick.Activate( );
m_Keyboard.Activate( );
if ( m_Joystick != null ) m_Joystick.Activate( );
if ( m_Keyboard != null ) m_Keyboard.Activate( );
}

4
Properties/AssemblyInfo.cs
Unescape Escape View File

@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion( "2.23.0.57" )]
[assembly: AssemblyFileVersion( "2.23.0.57" )]
[assembly: AssemblyVersion( "2.24.0.58" )]
[assembly: AssemblyFileVersion( "2.24.0.58" )]

2
SC/SCDefaultProfile.cs
Unescape Escape View File

@ -56,7 +56,7 @@ namespace SCJMapper_V2.SC
}
}
// second try to get the SC defaultProfile from the GameData.pak
// second try to get the SC defaultProfile from the DataXML.pak
retVal = ExtractDefaultBinProfile( defaultProfileName );
if ( !String.IsNullOrEmpty( retVal ) ) {
UsedDefProfile = "DataXML defaultProfile";

266
SC/SCPath.cs
Unescape Escape View File

@ -22,16 +22,14 @@ namespace SCJMapper_V2.SC
/// </summary>
static private String SCLauncherFile1
{
get
{
get {
log.Debug( "SCLauncherFile1 - Entry" );
String scLauncher = ( String )Registry.GetValue( @"HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\App Paths\StarCitizen Launcher.exe", "", null );
if ( scLauncher != null ) {
log.Info( "SCLauncherFile1 - Found HKLM - AppPath - Launcher.exe" );
if ( File.Exists( scLauncher ) ) {
return scLauncher;
}
else {
} else {
log.WarnFormat( "SCLauncherFile1 - file does not exist: {0}", scLauncher );
return "";
}
@ -46,16 +44,14 @@ namespace SCJMapper_V2.SC
/// </summary>
static private String SCLauncherFile2
{
get
{
get {
log.Debug( "SCLauncherFile2 - Entry" );
String scLauncher = ( String )Registry.GetValue( @"HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Uninstall\StarCitizen", "DisplayIcon", null );
if ( scLauncher != null ) {
log.Info( "SCLauncherFile2 - Found HKLM - Uninstall - StarCitizen" );
if ( File.Exists( scLauncher ) ) {
return scLauncher;
}
else {
} else {
log.WarnFormat( "SCLauncherFile2 - file does not exist: {0}", scLauncher );
return "";
}
@ -71,16 +67,14 @@ namespace SCJMapper_V2.SC
/// </summary>
static private String SCLauncherFile3
{
get
{
get {
log.Debug( "SCLauncherFile3 - Entry" );
String scLauncher = ( String )Registry.GetValue( @"HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Cloud Imperium Games\StarCitizen Launcher.exe", "", null );
if ( scLauncher != null ) {
log.Info( "SCLauncherFile3 - Found HKLM - CIG - Launcher.exe" );
if ( File.Exists( scLauncher ) ) {
return scLauncher;
}
else {
} else {
log.WarnFormat( "SCLauncherFile3 - file does not exist: {0}", scLauncher );
return "";
}
@ -96,16 +90,14 @@ namespace SCJMapper_V2.SC
/// </summary>
static private String SCLauncherFile4
{
get
{
get {
log.Debug( "SCLauncherFile4 - Entry" );
String scLauncher = ( String )Registry.GetValue( @"HKEY_CURRENT_USER\Software\Microsoft\Windows\CurrentVersion\App Paths\CIGLauncher.exe", "", null );
if ( scLauncher != null ) {
log.Info( "SCLauncherFile4 - Found HKCU - CIGLauncher.exe" );
if ( File.Exists( scLauncher ) ) {
return scLauncher;
}
else {
} else {
log.WarnFormat( "SCLauncherFile4 - file does not exist: {0}", scLauncher );
return "";
}
@ -115,13 +107,17 @@ namespace SCJMapper_V2.SC
}
}
// one more would be here
// HKEY_CURRENT_USER\Software\Cloud Imperium Games\StarCitizen UninstallString e.g. E:\G\StarCitizen\uninst.exe
/// <summary>
/// Returns the base SC install path from something like "E:\G\StarCitizen\Launcher\StarCitizenLauncher.exe"
/// </summary>
static private String SCBasePath
{
get
{
get {
log.Debug( "SCBasePath - Entry" );
appSettings.Reload( ); // local instance - reload as it might be changed outside
String scp = "";
@ -130,48 +126,96 @@ namespace SCJMapper_V2.SC
// User has priority
scp = appSettings.UserSCPath;
log.InfoFormat( "SCBasePath - user defined folder given: {0}", scp );
if ( !Directory.Exists( scp ) ) {
log.WarnFormat( "SCBasePath - user defined folder does not exist: {0}", scp );
string issue = string.Format( "Cannot find the user defined SC Installation Path !!\n\n" +
"Enter the folder where CIGLauncher.exe is located");
if ( !hasInformed ) System.Windows.Forms.MessageBox.Show( issue, "Cannot find the user defined SC Installation Path !!", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Exclamation );
hasInformed = true;
return ""; // sorry path does not exist
#if DEBUG
//***************************************
//scp = ""; // TEST not found (COMMENT OUT FOR PRODUCTIVE BUILD)
//***************************************
#endif
if ( Directory.Exists( scp ) ) {
return scp;
}
}
else {
// start the registry search - turn sequence to 4..1 to get the newest method first
// not found
log.WarnFormat( "SCBasePath - user defined folder does not exist: {0}", scp );
string issue = string.Format( "Cannot find the user defined SC Installation Path ({0})!!\n\n" +
"Enter the folder where CIGLauncher.exe is located", scp);
if ( !hasInformed )
System.Windows.Forms.MessageBox.Show( issue, "Cannot find the user defined SC Installation Path !!",
System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Exclamation );
hasInformed = true;
return ""; // sorry path does not exist
} else {
// start the registry search - sequence 4..1 to get the newest method first
scp = SCLauncherFile4;
if ( String.IsNullOrEmpty( scp ) ) {
scp = SCLauncherFile3;
if ( String.IsNullOrEmpty( scp ) ) {
scp = SCLauncherFile2;
if ( String.IsNullOrEmpty( scp ) ) {
scp = SCLauncherFile1;
if ( String.IsNullOrEmpty( scp ) ) {
log.Warn( "SCBasePath - cannot find any valid SC path" );
// Issue a warning here to let the user know
string issue = string.Format( "Cannot find the SC Installation Path !!\n\n" +
"Use Settings to provide the path manually (don't forget to Check the Box left of the path to use it)\n\n" +
"Enter the folder where CIGLauncher.exe is located");
#if DEBUG
//***************************************
//scp = ""; // TEST not found (COMMENT OUT FOR PRODUCTIVE BUILD)
//***************************************
#endif
if ( !string.IsNullOrEmpty( scp ) ) {
// AC 1.1.6 path OK - this one needs no adjustments anymore but removing the filename
scp = Path.GetDirectoryName( scp ); // "E:\G\StarCitizen"
return scp;
}
if ( !hasInformed ) System.Windows.Forms.MessageBox.Show( issue, "Cannot find SC Installation Path !!", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Exclamation );
hasInformed = true;
scp = SCLauncherFile3;
#if DEBUG
//***************************************
//scp = ""; // TEST not found (COMMENT OUT FOR PRODUCTIVE BUILD)
//***************************************
#endif
if ( !string.IsNullOrEmpty( scp ) ) {
// found the launcher.exe file - path adjust for the old subdir (may be remove path find 1..3 later)
scp = Path.GetDirectoryName( scp ); // "E:\G\StarCitizen\Launcher"
scp = Path.GetDirectoryName( scp ); // "E:\G\StarCitizen"
return scp;
}
return ""; // sorry did not found a thing..
}
}
}
scp = SCLauncherFile2;
#if DEBUG
//***************************************
//scp = ""; // TEST not found (COMMENT OUT FOR PRODUCTIVE BUILD)
//***************************************
#endif
if ( !string.IsNullOrEmpty( scp ) ) {
// found the launcher.exe file - path adjust for the old subdir (may be remove path find 1..3 later)
scp = Path.GetDirectoryName( scp ); // "E:\G\StarCitizen\Launcher"
scp = Path.GetDirectoryName( scp ); // "E:\G\StarCitizen"
return scp;
}
// AC 1.1.6 path OK - this one needs no adjustments anymore but removing the filename
scp = Path.GetDirectoryName( scp ); // "E:\G\StarCitizen"
scp = SCLauncherFile1;
#if DEBUG
//***************************************
//scp = ""; // TEST not found (COMMENT OUT FOR PRODUCTIVE BUILD)
//***************************************
#endif
if ( !string.IsNullOrEmpty( scp ) ) {
// found the launcher.exe file - path adjust for the old subdir (may be remove path find 1..3 later)
scp = Path.GetDirectoryName( scp ); // "E:\G\StarCitizen\Launcher"
scp = Path.GetDirectoryName( scp ); // "E:\G\StarCitizen"
return scp;
}
// nothing found
log.Warn( "SCBasePath - cannot find any valid SC path" );
// Issue a warning here to let the user know
string issue = string.Format( "Cannot find the SC Installation Path !!\n\n" +
"Use Settings to provide the path manually (don't forget to Check the Box left of the path to use it)\n\n" +
"Enter the folder where CIGLauncher.exe is located");
if ( !hasInformed )
System.Windows.Forms.MessageBox.Show( issue, "Cannot find SC Installation Path !!",
System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Exclamation );
hasInformed = true;
}
return ""; // sorry did not found a thing..
}// get
return scp;
}
}
@ -181,14 +225,14 @@ namespace SCJMapper_V2.SC
/// </summary>
static public String SCInstallPath
{
get
{
get {
log.Debug( "SCInstallPath - Entry" );
return SCBasePath;
}
}
/// <summary>
/// Returns the SC Client path
/// AC 1.1.6: E:\G\StarCitizen\StarCitizen\Public
@ -197,38 +241,55 @@ namespace SCJMapper_V2.SC
/// </summary>
static public String SCClientPath
{
get
{
get {
log.Debug( "SCClientPath - Entry" );
String scp = SCBasePath;
#if DEBUG
//***************************************
// scp += "X"; // TEST not found (COMMENT OUT FOR PRODUCTIVE BUILD)
//***************************************
#endif
string issue = "";
if ( String.IsNullOrEmpty( scp ) ) return ""; // no valid one can be found
//
//
scp = Path.Combine( scp, "StarCitizen" );
string scpX = "";
if ( appSettings.UsePTU ) {
scpX = Path.Combine( scp, "Test" );
if ( Directory.Exists( scp ) ) return scpX;
if ( Directory.Exists( scpX ) ) return scpX;
// else not found PTU
// Issue a warning here to let the user know
issue = string.Format( "Cannot find the SC Client Path !!\n\n" +
"Tried to look for:\n" +
"{0}\\Test (PTU was enabled)\n\n" +
"The program cannot load or save in GameFolders\n\n" +
"Please submit a bug report, adding your complete SC game folder structure", scp );
} else {
// regular game folder
scpX = Path.Combine( scp, "Public" );
if ( Directory.Exists( scp ) ) return scpX;
if ( Directory.Exists( scpX ) ) return scpX;
// SC 2.2.2+ did not found it so try Live now
scpX = Path.Combine( scp, "Live" );
if ( Directory.Exists( scp ) ) return scpX;
}
if ( Directory.Exists( scpX ) ) return scpX;
log.WarnFormat( "SCClientDataPath - StarCitizen\\Public, StarCitizen\\Live or for PTU \\Test subfolder does not exist: {0}", scp );
// Issue a warning here to let the user know
string issue = string.Format( "Cannot find the SC Client Path !!\n\n" +
// else not found regular one
// Issue a warning here to let the user know
issue = string.Format( "Cannot find the SC Client Path !!\n\n" +
"Tried to look for:\n" +
"{0}\\Public or \n" +
"{0}\\Live or \n" +
"{0}\\Test (if PTU was enabled)\n\n" +
"{0}\\Live \n" +
"The program cannot load or save in GameFolders\n\n" +
"Please submit a bug report, adding your complete SC game folder structure");
"Please submit a bug report, adding your complete SC game folder structure", scp );
}
log.WarnFormat( "SCClientPath - StarCitizen\\Public, StarCitizen\\Live or for PTU \\Test subfolder does not exist: {0}", scp );
if (!hasInformed) System.Windows.Forms.MessageBox.Show( issue, "Cannot find SC Client Path !!", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Exclamation );
// Issue a warning here to let the user know
if ( !hasInformed ) System.Windows.Forms.MessageBox.Show( issue, "Cannot find SC Client Path !!", System.Windows.Forms.MessageBoxButtons.OK, System.Windows.Forms.MessageBoxIcon.Exclamation );
hasInformed = true;
return "";
@ -242,13 +303,17 @@ namespace SCJMapper_V2.SC
/// </summary>
static public String SCClientDataPath
{
get
{
get {
log.Debug( "SCClientDataPath - Entry" );
String scp = SCClientPath;
if ( String.IsNullOrEmpty( scp ) ) return ""; // no valid one can be found
//
scp = Path.Combine( scp, "Data" );
#if DEBUG
//***************************************
// scp += "X"; // TEST not found (COMMENT OUT FOR PRODUCTIVE BUILD)
//***************************************
#endif
if ( Directory.Exists( scp ) ) return scp;
log.WarnFormat( "SCClientDataPath - StarCitizen\\Public\\Data subfolder does not exist: {0}", scp );
@ -263,13 +328,17 @@ namespace SCJMapper_V2.SC
/// </summary>
static public String SCClientUSERPath
{
get
{
get {
log.Debug( "SCClientUSERPath - Entry" );
String scp = SCClientPath;
if ( String.IsNullOrEmpty( scp ) ) return "";
//
scp = Path.Combine( scp, "USER" );
#if DEBUG
//***************************************
// scp += "X"; // TEST not found (COMMENT OUT FOR PRODUCTIVE BUILD)
//***************************************
#endif
if ( Directory.Exists( scp ) ) return scp;
log.WarnFormat( "SCClientUSERPath - StarCitizen\\Public\\USER subfolder does not exist: {0}", scp );
@ -284,13 +353,15 @@ namespace SCJMapper_V2.SC
/// </summary>
static public String SCClientLogsPath
{
get
{
get {
log.Debug( "SCClientLogsPath - Entry" );
String scp = SCClientPath;
if ( String.IsNullOrEmpty( scp ) ) return "";
//
//scp = Path.Combine( scp, "logs" );
#if DEBUG
//***************************************
// scp += "X"; // TEST not found (COMMENT OUT FOR PRODUCTIVE BUILD)
//***************************************
#endif
if ( Directory.Exists( scp ) ) return scp;
log.WarnFormat( "SCClientLogsPath - StarCitizen\\Public subfolder does not exist: {0}", scp );
@ -305,14 +376,18 @@ namespace SCJMapper_V2.SC
/// </summary>
static public String SCClientMappingPath
{
get
{
get {
log.Debug( "SCClientMappingPath - Entry" );
String scp = SCClientUSERPath; // AC1.03 new here
if ( String.IsNullOrEmpty( scp ) ) return "";
//
scp = Path.Combine( scp, "Controls" );
scp = Path.Combine( scp, "Mappings" );
#if DEBUG
//***************************************
// scp += "X"; // TEST not found (COMMENT OUT FOR PRODUCTIVE BUILD)
//***************************************
#endif
if ( Directory.Exists( scp ) ) return scp;
log.WarnFormat( "SCClientMappingPath - StarCitizen\\Public\\USER\\Controls\\Mappings subfolder does not exist: {0}", scp );
@ -327,13 +402,17 @@ namespace SCJMapper_V2.SC
/// </summary>
static public String SCGameData_pak
{
get
{
get {
log.Debug( "SCGameData_pak - Entry" );
String scp = SCClientDataPath;
if ( String.IsNullOrEmpty( scp ) ) return "";
//
scp = Path.Combine( scp, "GameData.pak" );
#if DEBUG
//***************************************
// scp += "X"; // TEST not found (COMMENT OUT FOR PRODUCTIVE BUILD)
//***************************************
#endif
if ( File.Exists( scp ) ) return scp;
log.WarnFormat( "SCGameData_pak - StarCitizen\\Public\\Data\\GameData.pak file does not exist: {0}", scp );
@ -348,13 +427,17 @@ namespace SCJMapper_V2.SC
/// </summary>
static public String SCDataXML_pak
{
get
{
get {
log.Debug( "SCDataXML_pak - Entry" );
String scp = SCClientDataPath;
if ( String.IsNullOrEmpty( scp ) ) return "";
//
scp = Path.Combine( scp, "DataXML.pak" );
#if DEBUG
//***************************************
// scp += "X"; // TEST not found (COMMENT OUT FOR PRODUCTIVE BUILD)
//***************************************
#endif
if ( File.Exists( scp ) ) return scp;
log.WarnFormat( "SCDataXML_pak - StarCitizen\\Public\\Data\\DataXML.pak file does not exist: {0}", scp );
@ -369,8 +452,7 @@ namespace SCJMapper_V2.SC
/// </summary>
static public String SCLastLog
{
get
{
get {
log.Debug( "SCLastLog - Entry" );
String scp = SCClientLogsPath;
if ( String.IsNullOrEmpty( scp ) ) return "";
@ -385,13 +467,11 @@ namespace SCJMapper_V2.SC
if ( finfo.LastWriteTime > newestT ) {
newestF = f; newestT = finfo.LastWriteTime;
}
}
catch {
} catch {
}
}
return newestF;
}
catch {
} catch {
}
return "";
}
@ -404,8 +484,7 @@ namespace SCJMapper_V2.SC
/// </summary>
static public String DefaultProfilePath_rel
{
get
{
get {
log.Debug( "DefaultProfilePath_rel - Entry" );
return @"Libs\Config";
}
@ -417,8 +496,7 @@ namespace SCJMapper_V2.SC
/// </summary>
static public String DefaultProfileName
{
get
{
get {
log.Debug( "DefaultProfileName - Entry" );
return @"defaultProfile";
}

4
SCJMapper-V2.csproj
Unescape Escape View File

@ -26,8 +26,8 @@
<UpdatePeriodically>false</UpdatePeriodically>
<UpdateRequired>false</UpdateRequired>
<MapFileExtensions>true</MapFileExtensions>
<ApplicationRevision>56</ApplicationRevision>
<ApplicationVersion>2.22.0.%2a</ApplicationVersion>
<ApplicationRevision>58</ApplicationRevision>
<ApplicationVersion>2.24.0.%2a</ApplicationVersion>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>

10
doc/ReadMe.txt
Unescape Escape View File

@ -1,10 +1,10 @@
SC Joystick Mapper V 2.23 - Build 57 BETA
(c) Cassini, StandardToaster - 27-May-2016
SC Joystick Mapper V 2.24 - Build 58 BETA
(c) Cassini, StandardToaster - 31-May-2016
Contains 9 files:
SCJMapper.exe The program (V2.23)
SCJMapper.exe.config Program config (V2.23) - MUST be in the same folder as the Exe file
SCJMapper.exe The program (V2.24)
SCJMapper.exe.config Program config (V2.24) - MUST be in the same folder as the Exe file
SharpDX.DirectInput.dll Managed DirectInput Assembly - MUST be in the same folder as the Exe file
SharpDX.dll Managed DirectX Assembly - MUST be in the same folder as the Exe file
OpenTK.dll Managed OpenGL Assembly - MUST be in the same folder as the Exe file
@ -29,6 +29,8 @@ Scanned for viruses before packing...
cassini@burri-web.org
Changelog:
V 2.24 - BETA Build 58
- fix - some trouble in SC path finding
V 2.23 - BETA Build 57
- update - Using .Net 4.5.2 Now (seems to handle some scaling issues WinForm apps)
- update - Try to find the SC path also as StarCitizen\Live (instead of Public) was mentioned for SC2.2.2 onwards ???

Write Preview
Loading…
Cancel
Save