Merge branch 'master' into master

3 files changed, 38 insertions, 30 deletions

diff --git a/TimeHACK.Engine/DesktopController.cs b/TimeHACK.Engine/DesktopController.cs
index db84bf8..2cfdcf3 100644
--- a/TimeHACK.Engine/DesktopController.cs
+++ b/TimeHACK.Engine/DesktopController.cs
@@ -15,8 +15,7 @@ namespace TimeHACK.Engine
         {
             string Val = "";
             string directoryFileInfo = File.ReadAllText(Path.Combine(reqDirectory, "_data.info"));
-            FileSystemFolderInfo toRead = new FileSystemFolderInfo();
-            toRead = JsonConvert.DeserializeObject<FileSystemFolderInfo>(directoryFileInfo);
+            FileSystemFolderInfo toRead = JsonConvert.DeserializeObject<FileSystemFolderInfo>(directoryFileInfo);
 
             if (returnYesIfProtected == true)
             {
diff --git a/TimeHACK.Engine/SaveSystem.cs b/TimeHACK.Engine/SaveSystem.cs
index 691e06d..f7dc954 100644
--- a/TimeHACK.Engine/SaveSystem.cs
+++ b/TimeHACK.Engine/SaveSystem.cs
@@ -89,7 +89,7 @@ namespace TimeHACK.Engine
         {
             get
             {
-                return Path.Combine(ProfileMyComputerDirectory, "Settings");
+                return Path.Combine(ProfileMyComputerDirectory, "Documents and Settings");
             }
         }
 
@@ -97,7 +97,7 @@ namespace TimeHACK.Engine
         {
             get
             {
-                return Path.Combine(ProfileMyComputerDirectory, "Doc");                
+                return Path.Combine(ProfileMyComputerDirectory, "My Documents");                
             }
         }
 
@@ -105,7 +105,7 @@ namespace TimeHACK.Engine
         {
             get
             {
-                return Path.Combine(ProfileMyComputerDirectory, "Prog");
+                return Path.Combine(ProfileMyComputerDirectory, "Program Files");
             }
         }
 
@@ -113,7 +113,7 @@ namespace TimeHACK.Engine
         {
             get
             {
-                return Path.Combine(ProfileMyComputerDirectory, "Win");
+                return Path.Combine(ProfileMyComputerDirectory, "Windows");
             }
         }
 
@@ -160,13 +160,13 @@ namespace TimeHACK.Engine
 
             SaveDirectoryInfo(ProfileDirectory, "folders", false, "My Computer", false);            
             SaveDirectoryInfo(ProfileFileSystemDirectory, "CDrive", false, "C:", true);
-            if (CurrentSave.CurrentOS == "95" || CurrentSave.CurrentOS == "98") SaveDirectoryInfo(ProfileMyComputerDirectory, "Doc", false, "My Documents", true);
-            if (CurrentSave.CurrentOS == "2000" || CurrentSave.CurrentOS == "ME") SaveDirectoryInfo(ProfileMyComputerDirectory, "Settings", false, "Documents and Settings", true);                    
-            SaveDirectoryInfo(ProfileMyComputerDirectory, "Prog", true, "Program Files", true);
+            if (CurrentSave.CurrentOS == "95" || CurrentSave.CurrentOS == "98") SaveDirectoryInfo(ProfileMyComputerDirectory, "My Documents", false, "My Documents", true);
+            if (CurrentSave.CurrentOS == "2000" || CurrentSave.CurrentOS == "ME") SaveDirectoryInfo(ProfileMyComputerDirectory, "Documents and Settings", false, "Documents and Settings", true);                    
+            SaveDirectoryInfo(ProfileMyComputerDirectory, "Program Files", true, "Program Files", true);
             SaveDirectoryInfo(ProfileProgramsDirectory, "Accessories", false, "Accessories", true);
             SaveDirectoryInfo(ProfileProgramsDirectory, "Internet Explorer", true, "Internet Explorer", true);
             SaveDirectoryInfo(ProfileProgramsDirectory, "The Microsoft Network", true, "The Microsoft Network", true);
-            SaveDirectoryInfo(ProfileMyComputerDirectory, "Win", true, "Windows", true);
+            SaveDirectoryInfo(ProfileMyComputerDirectory, "Windows", true, "Windows", true);
 
             CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "Accessories"), "wordpad.exe", "wordpad");
             CreateWindowsFile(Path.Combine(ProfileProgramsDirectory, "Internet Explorer"), "ie20.exe", "ie");
@@ -186,9 +186,14 @@ namespace TimeHACK.Engine
             SaveDirectoryInfo(ProfileWindowsDirectory, "Temp", true, "Temp", true);
             SaveDirectoryInfo(ProfileWindowsDirectory, "Desktop", true, "Desktop", true);
 
-            CreateWindowsFile(ProfileWindowsDirectory, "calc.exe", "calc", 10, 59392);
-            CreateWindowsFile(ProfileWindowsDirectory, "explorer.exe", "explorer", 10, 204288);
-            CreateWindowsFile(ProfileWindowsDirectory, "notepad.exe", "notepad", 12, 34034);
+            CreateWindowsFile(ProfileWindowsDirectory, "c", "", 8, 515);
+            CreateWindowsFile(ProfileWindowsDirectory, "calc.exe", "calc", 13, 59392);
+            CreateWindowsFile(ProfileWindowsDirectory, "emm386.exe", "emm386", 10, 125495);
+            CreateWindowsFile(ProfileWindowsDirectory, "explorer.exe", "explorer", 0, 204288);
+            CreateWindowsFile(ProfileWindowsDirectory, "notepad.exe", "notepad", 14, 34034);
+            CreateWindowsFile(ProfileWindowsDirectory, "regedit.exe", "regedit", 15, 120320);
+            CreateWindowsFile(ProfileWindowsDirectory, "win.com", "", 10, 22679);
+            CreateWindowsFile(ProfileWindowsDirectory, "write.exe", "wordpad", 16, 5120);
         }
 
         public static void CreateWindowsFile(string filepath, string filename, string contents, int fileicon = 8, int bytes = 512)
@@ -205,18 +210,22 @@ namespace TimeHACK.Engine
         public static void UpdateDirectoryInfo(string path, THFileInfo newfile)
         {
             newfile.DOSName = newfile.Name.ToUpper().Replace("*", "").Replace("+", "").Replace(":", "").Replace(";", "").Replace(" ", "");
-            string[] dos = newfile.DOSName.Split('.');
-
-            if (dos.Count() > 2)
+            if (newfile.DOSName.Contains("."))
             {
-                List<string> dosb = dos.ToList();
-                dosb.RemoveRange(1, dos.Count() - 2);
-                dos = dosb.ToArray();
-            }
-            dos[1] = dos[1].Substring(0, 3);
-            if (dos[0].Length > 8) dos[0] = dos[0].Substring(0, 6) + "~1";
+                string[] dos = newfile.DOSName.Split('.');
+
+                if (dos.Count() > 2)
+                {
+                    List<string> dosb = dos.ToList();
+                    dosb.RemoveRange(1, dos.Count() - 2);
+                    dos = dosb.ToArray();
+                }
+                dos[1] = dos[1].Substring(0, 3);
+                if (dos[0].Length > 8) dos[0] = dos[0].Substring(0, 6) + "~1";
 
-            newfile.DOSName = dos[0] + "." + dos[1];
+                newfile.DOSName = dos[0] + "." + dos[1];
+            }
+            else if (newfile.DOSName.Length > 8) newfile.DOSName = newfile.DOSName.Substring(0, 6) + "~1";
 
             if (File.ReadAllText(Path.Combine(path, "_data.info")).Contains(newfile.DOSName)) return;
             FileSystemFolderInfo fsfi = JsonConvert.DeserializeObject<FileSystemFolderInfo>(File.ReadAllText(Path.Combine(path, "_data.info")));
diff --git a/TimeHACK.Engine/Template/Infobox95.Designer.cs b/TimeHACK.Engine/Template/Infobox95.Designer.cs
index 56d6568..f9d89c7 100644
--- a/TimeHACK.Engine/Template/Infobox95.Designer.cs
+++ b/TimeHACK.Engine/Template/Infobox95.Designer.cs
@@ -51,7 +51,7 @@
             this.programContent.Dock = System.Windows.Forms.DockStyle.Fill;
             this.programContent.Location = new System.Drawing.Point(0, 0);
             this.programContent.Name = "programContent";
-            this.programContent.Size = new System.Drawing.Size(413, 138);
+            this.programContent.Size = new System.Drawing.Size(413, 118);
             this.programContent.TabIndex = 10;
             this.programContent.Tag = "gnoreFormOnTaskbar";
             // 
@@ -61,7 +61,7 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.button1.Location = new System.Drawing.Point(150, 104);
+            this.button1.Location = new System.Drawing.Point(150, 84);
             this.button1.Name = "button1";
             this.button1.Size = new System.Drawing.Size(80, 23);
             this.button1.TabIndex = 5;
@@ -75,7 +75,7 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.button3.Location = new System.Drawing.Point(323, 104);
+            this.button3.Location = new System.Drawing.Point(323, 84);
             this.button3.Name = "button3";
             this.button3.Size = new System.Drawing.Size(80, 23);
             this.button3.TabIndex = 4;
@@ -99,7 +99,7 @@
             this.panel1.Controls.Add(this.infoText);
             this.panel1.Location = new System.Drawing.Point(62, 16);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(341, 82);
+            this.panel1.Size = new System.Drawing.Size(341, 62);
             this.panel1.TabIndex = 2;
             // 
             // infoText
@@ -107,7 +107,7 @@
             this.infoText.Dock = System.Windows.Forms.DockStyle.Fill;
             this.infoText.Location = new System.Drawing.Point(0, 0);
             this.infoText.Name = "infoText";
-            this.infoText.Size = new System.Drawing.Size(341, 82);
+            this.infoText.Size = new System.Drawing.Size(341, 62);
             this.infoText.TabIndex = 0;
             this.infoText.Text = "label1";
             // 
@@ -117,7 +117,7 @@
             | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
             this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-            this.button2.Location = new System.Drawing.Point(236, 104);
+            this.button2.Location = new System.Drawing.Point(236, 84);
             this.button2.Name = "button2";
             this.button2.Size = new System.Drawing.Size(80, 23);
             this.button2.TabIndex = 1;
@@ -131,7 +131,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.programContent);
             this.Name = "Infobox95";
-            this.Size = new System.Drawing.Size(413, 138);
+            this.Size = new System.Drawing.Size(413, 118);
             this.programContent.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit();
             this.panel1.ResumeLayout(false);