From 036a986ce1f56e6cda0617e6e574a875b847911b Mon Sep 17 00:00:00 2001 From: lempamo Date: Thu, 13 Apr 2017 14:04:41 -0400 Subject: WebChat1998 crash works! --- TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs | 15 +++++++ TimeHACK.Main/Program.cs | 3 +- TimeHACK.Main/TitleScreen.cs | 44 ++++++++++++++++++--- TimeHACK.Main/bin/Release/TimeHACK.Engine.dll | Bin 131584 -> 164864 bytes TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb | Bin 38400 -> 46592 bytes TimeHACK.Main/bin/Release/TimeHACK.application | 2 +- TimeHACK.Main/bin/Release/TimeHACK.exe | Bin 6092288 -> 6123008 bytes TimeHACK.Main/bin/Release/TimeHACK.exe.manifest | 8 ++-- TimeHACK.Main/bin/Release/TimeHACK.pdb | Bin 134656 -> 136704 bytes .../bin/Release/TimeHACK.vshost.application | 2 +- .../bin/Release/TimeHACK.vshost.exe.manifest | 8 ++-- TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe | Bin 6092288 -> 6123008 bytes .../bin/Release/windows_command_prompt.ttf | Bin 0 -> 29616 bytes .../TimeHACK.Main.csproj.GenerateResource.Cache | Bin 4611 -> 4667 bytes ...eHACK.Main.csprojResolveAssemblyReference.cache | Bin 16573 -> 16573 bytes .../TimeHACK.Properties.Resources.resources | Bin 4711950 -> 4741628 bytes TimeHACK.Main/obj/Release/TimeHACK.application | 2 +- TimeHACK.Main/obj/Release/TimeHACK.exe | Bin 6092288 -> 6123008 bytes TimeHACK.Main/obj/Release/TimeHACK.exe.manifest | 8 ++-- TimeHACK.Main/obj/Release/TimeHACK.pdb | Bin 134656 -> 136704 bytes 20 files changed, 71 insertions(+), 21 deletions(-) create mode 100644 TimeHACK.Main/bin/Release/windows_command_prompt.ttf (limited to 'TimeHACK.Main') diff --git a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs index 85ac07c..afca54c 100644 --- a/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs +++ b/TimeHACK.Main/OS/Win95/Win95Apps/WebChat1998.cs @@ -11,6 +11,7 @@ using TimeHACK.Engine; using System.Threading; using System.Media; using System.IO; +using TimeHACK.Engine.Template; namespace TimeHACK.OS.Win95.Win95Apps { @@ -28,9 +29,14 @@ namespace TimeHACK.OS.Win95.Win95Apps SoundPlayer receive = new SoundPlayer(Properties.Resources.AIMmessagereceived); SoundPlayer file = new SoundPlayer(Properties.Resources.AIMfile); + BSODCreator bc = new BSODCreator(); + Win9XBSOD bsod = null; + public WebChat1998() { InitializeComponent(); + bsod = bc.throw9XBSOD(false, BSODCreator.BSODCauses.ExitChat98Early); + bsod.Hide(); } private void WebChat1998_Load(object sender, EventArgs e) { @@ -63,6 +69,7 @@ namespace TimeHACK.OS.Win95.Win95Apps case "addsh": listBox1.Items.Add("SkyHigh"); join.Play(); + this.ParentForm.FormClosing += WebChatClosing; break; case "nameguess": typechat.Hide(); @@ -85,6 +92,7 @@ namespace TimeHACK.OS.Win95.Win95Apps case "addpadams": listBox1.Items.Add("12padams"); join.Play(); + ((WinClassic)this.ParentForm).closeDisabled = true; break; default: receive.Play(); @@ -109,6 +117,13 @@ namespace TimeHACK.OS.Win95.Win95Apps chat_index++; } + private void WebChatClosing(object sender, FormClosingEventArgs e) + { + bsod.FormClosing += new FormClosingEventHandler(Program.title.BSODRewind); + bsod.Show(); + bsod.BringToFront(); + } + private void Button2_Click(object sender, EventArgs e) { if (typechat.Text != "") history.AppendText(TitleScreen.username + ": " + typechat.Text + Environment.NewLine); diff --git a/TimeHACK.Main/Program.cs b/TimeHACK.Main/Program.cs index 5c3d46d..1c66b45 100644 --- a/TimeHACK.Main/Program.cs +++ b/TimeHACK.Main/Program.cs @@ -13,6 +13,7 @@ namespace TimeHACK { internal static bool nightly = true; internal static string gameID; + internal static TitleScreen title = null; /// /// The main entry point for the application. @@ -43,7 +44,7 @@ namespace TimeHACK } Application.EnableVisualStyles(); Application.SetCompatibleTextRenderingDefault(false); - Application.Run(new TitleScreen()); + Application.Run(title = new TitleScreen()); } } } diff --git a/TimeHACK.Main/TitleScreen.cs b/TimeHACK.Main/TitleScreen.cs index 7feb510..a5cdade 100644 --- a/TimeHACK.Main/TitleScreen.cs +++ b/TimeHACK.Main/TitleScreen.cs @@ -12,6 +12,7 @@ namespace TimeHACK public static System.Drawing.Text.PrivateFontCollection pfc = new System.Drawing.Text.PrivateFontCollection(); public static Windows95 frm95; public static string username; + public static string progress = "95"; public TitleScreen() { @@ -111,15 +112,48 @@ namespace TimeHACK else { // Generate desktop with size entered by user - Windows95 frm = new Windows95(); - frm.FormBorderStyle = FormBorderStyle.None; - frm.Size = new Size(Convert.ToInt32(VM_Width.Text), Convert.ToInt32(VM_Height.Text)); - frm.FormBorderStyle = FormBorderStyle.Fixed3D; - frm.Show(); + frm95 = new Windows95(); + frm95.FormBorderStyle = FormBorderStyle.None; + frm95.Size = new Size(Convert.ToInt32(VM_Width.Text), Convert.ToInt32(VM_Height.Text)); + frm95.FormBorderStyle = FormBorderStyle.Fixed3D; + frm95.Show(); Hide(); } } + + public void BSODRewind(object sender, EventArgs e) + { + if (progress == "95") + { + frm95.Close(); + frm95 = null; + + // If VM Mode is not enabled + if (vm_mode.Checked != true) + { + // Generate fullscreen desktop + frm95 = new Windows95(); + frm95.TopMost = true; + frm95.FormBorderStyle = FormBorderStyle.None; + frm95.WindowState = FormWindowState.Maximized; + frm95.Show(); + Hide(); + } + // If VM Mode is enabled + else + { + // Generate desktop with size entered by user + frm95 = new Windows95(); + frm95.FormBorderStyle = FormBorderStyle.None; + frm95.Size = new Size(Convert.ToInt32(VM_Width.Text), Convert.ToInt32(VM_Height.Text)); + frm95.FormBorderStyle = FormBorderStyle.Fixed3D; + frm95.Show(); + Hide(); + } + } + } + private void NewGame_MouseEnter(object sender, EventArgs e) { NewGame.Image = Resources.MSNewGame; diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll index 4a6f36a..6cbffa8 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll and b/TimeHACK.Main/bin/Release/TimeHACK.Engine.dll differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb b/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb index 71b6806..f410e47 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb and b/TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.application b/TimeHACK.Main/bin/Release/TimeHACK.application index e9c20f5..e6ec21d 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.application @@ -14,7 +14,7 @@ - VduLlSoD7d0MBYc1ho+HDfMuZ/uzQE4he8sPzCKxwaU= + 4RJxw03br+02dW7jp/y7zHQVuVqcJmxeHNyeolzflek= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe b/TimeHACK.Main/bin/Release/TimeHACK.exe index b5ec3b6..06a2beb 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.exe and b/TimeHACK.Main/bin/Release/TimeHACK.exe differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest index 420c0ed..5843c47 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.exe.manifest @@ -56,26 +56,26 @@ - + - UkmrYxv85vpTsQ+6g/iPFw+8iMnrvOXqq5OzuLErkFw= + XzGyLNLUI8xxaFC/WQkrVvjTa+n1zH1fDVgt9LI1Ti4= - + - Y2hqc/D9+y2kNC0cEsVNkOzAx4u8XplC/WkJHwrHczE= + RaVKLDtR2Irzt5BzJ26m/EQk5rBJQj/W7mmhGLfilus= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.pdb b/TimeHACK.Main/bin/Release/TimeHACK.pdb index 1581c9d..4abf160 100644 Binary files a/TimeHACK.Main/bin/Release/TimeHACK.pdb and b/TimeHACK.Main/bin/Release/TimeHACK.pdb differ diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application index e9c20f5..e6ec21d 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.application +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.application @@ -14,7 +14,7 @@ - VduLlSoD7d0MBYc1ho+HDfMuZ/uzQE4he8sPzCKxwaU= + 4RJxw03br+02dW7jp/y7zHQVuVqcJmxeHNyeolzflek= diff --git a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest index 420c0ed..5843c47 100644 --- a/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest +++ b/TimeHACK.Main/bin/Release/TimeHACK.vshost.exe.manifest @@ -56,26 +56,26 @@ - + - UkmrYxv85vpTsQ+6g/iPFw+8iMnrvOXqq5OzuLErkFw= + XzGyLNLUI8xxaFC/WQkrVvjTa+n1zH1fDVgt9LI1Ti4= - + - Y2hqc/D9+y2kNC0cEsVNkOzAx4u8XplC/WkJHwrHczE= + RaVKLDtR2Irzt5BzJ26m/EQk5rBJQj/W7mmhGLfilus= diff --git a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe index b5ec3b6..06a2beb 100644 Binary files a/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe and b/TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe differ diff --git a/TimeHACK.Main/bin/Release/windows_command_prompt.ttf b/TimeHACK.Main/bin/Release/windows_command_prompt.ttf new file mode 100644 index 0000000..b771b3a Binary files /dev/null and b/TimeHACK.Main/bin/Release/windows_command_prompt.ttf differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache index b4da58d..8947af0 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache and b/TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache index 5f74b53..324e2c5 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache and b/TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources b/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources index d0339c0..19903fa 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources and b/TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.application b/TimeHACK.Main/obj/Release/TimeHACK.application index e9c20f5..e6ec21d 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.application +++ b/TimeHACK.Main/obj/Release/TimeHACK.application @@ -14,7 +14,7 @@ - VduLlSoD7d0MBYc1ho+HDfMuZ/uzQE4he8sPzCKxwaU= + 4RJxw03br+02dW7jp/y7zHQVuVqcJmxeHNyeolzflek= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe b/TimeHACK.Main/obj/Release/TimeHACK.exe index b5ec3b6..06a2beb 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.exe and b/TimeHACK.Main/obj/Release/TimeHACK.exe differ diff --git a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest index 420c0ed..5843c47 100644 --- a/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest +++ b/TimeHACK.Main/obj/Release/TimeHACK.exe.manifest @@ -56,26 +56,26 @@ - + - UkmrYxv85vpTsQ+6g/iPFw+8iMnrvOXqq5OzuLErkFw= + XzGyLNLUI8xxaFC/WQkrVvjTa+n1zH1fDVgt9LI1Ti4= - + - Y2hqc/D9+y2kNC0cEsVNkOzAx4u8XplC/WkJHwrHczE= + RaVKLDtR2Irzt5BzJ26m/EQk5rBJQj/W7mmhGLfilus= diff --git a/TimeHACK.Main/obj/Release/TimeHACK.pdb b/TimeHACK.Main/obj/Release/TimeHACK.pdb index 1581c9d..4abf160 100644 Binary files a/TimeHACK.Main/obj/Release/TimeHACK.pdb and b/TimeHACK.Main/obj/Release/TimeHACK.pdb differ -- cgit v1.2.3