Huge bug fixes

This commit fixes some major bugs, atleast I hope so, that caused
ShiftOS to be unplayable. The bugs I'm talking about are the inability
to find the xulrunner, MichaelsMovableControls.dll, and
SkyBound.Gecko.dll files.

I also fixed a minor bug where when .smf files are loaded in the File
Skimmer or Desktop, the modloader would read the code rather than
opening the file.
This commit is contained in:
TheUltimateHacker 2015-04-06 11:11:57 -04:00
parent ecb1dbd33a
commit 3519e197a2
2 changed files with 152 additions and 212 deletions

View file

@ -623,84 +623,98 @@ Public Class File_Skimmer
End If End If
End Sub End Sub
'Used for Desktop.
Public Sub OpenFile(path As String) Public Sub OpenFile(path As String)
'Check if file exists 'Check if selected item is a file or folder. It it's a folder check its extension
If My.Computer.FileSystem.FileExists(path) Or My.Computer.FileSystem.DirectoryExists(path) Then
'Check if selected item is a file or folder. It it's a file check its extention If path Like "*.owd" Then
If ShiftOSDesktop.boughtorcwrite = True Then
Dim sr As New IO.StreamReader(Path)
OrcWrite.RichTextBox1.Rtf = sr.ReadToEnd()
sr.Close()
OrcWrite.Show()
OrcWrite.TopMost = True
Else
infobox.showinfo("Application Not Found", "ShiftOS could not find an application able the open .owd files.")
End If
ElseIf path Like "*.txt" Then
If TextPad.needtosave = False Then
TextPad.Show()
TextPad.txtuserinput.Text = My.Computer.FileSystem.ReadAllText(path)
TextPad.needtosave = False
Else
infobox.title = "Textpad - Save?"
infobox.textinfo = "It appears that your text document currently contains unsaved changes." & Environment.NewLine & Environment.NewLine & "Are you sure you want to load a file without saving the changes?"
infobox.Show()
infobox.showyesno()
infobox.sendyesno = "fileskimmertextpad"
End If
If path Like "*.owd" Then ElseIf path Like "*.pic" Then
If ShiftOSDesktop.installedorcwrite = True Then If ArtPad.needtosave = False Then
Dim sr As New IO.StreamReader(path) ArtPad.Show()
OrcWrite.RichTextBox1.Rtf = sr.ReadToEnd() ArtPad.savelocation = (path)
ArtPad.openpic()
ArtPad.needtosave = False
Else
infobox.title = "Artpad - Save?"
infobox.textinfo = "It appears that your canvas currently contains unsaved changes." & Environment.NewLine & Environment.NewLine & "Are you sure you want to open a different canvas without saving the changes?"
infobox.Show()
infobox.showyesno()
infobox.sendyesno = "fileskimmerartpad"
End If
ElseIf path Like "*.sft" Then
infobox.title = "File Skimmer - Warning!"
infobox.textinfo = "This file appears to be encrypted or may be critical for stable system operation." & Environment.NewLine & Environment.NewLine & "Access to this file has been blocked to protect the system from potential damage."
infobox.Show()
ElseIf path Like "*.lst" Then
infobox.title = "File Skimmer - Warning!"
infobox.textinfo = "This file appears to be encrypted or may be critical for stable system operation." & Environment.NewLine & Environment.NewLine & "Access to this file has been blocked to protect the system from potential damage."
infobox.Show()
ElseIf path Like "*.dri" Then
infobox.title = "File Skimmer - Warning!"
infobox.textinfo = "This file appears to be encrypted or may be critical for stable system operation." & Environment.NewLine & Environment.NewLine & "Access to this file has been blocked to protect the system from potential damage."
infobox.Show()
ElseIf path Like "*.lang" Then
infobox.title = "File Skimmer - Warning!"
infobox.textinfo = "This file appears to be encrypted or may be critical for stable system operation." & Environment.NewLine & Environment.NewLine & "Access to this file has been blocked to protect the system from potential damage."
infobox.Show()
ElseIf path Like "*.skn" Then
If ShiftOSDesktop.boughtskinning Then
Skin_Loader.Show()
Skin_Loader.loadingsknversion = ""
If My.Computer.FileSystem.DirectoryExists(ShiftOSPath + "Shiftum42\Skins\Preview\") Then My.Computer.FileSystem.DeleteDirectory(ShiftOSPath + "Shiftum42\Skins\Preview\", FileIO.DeleteDirectoryOption.DeleteAllContents)
System.IO.Compression.ZipFile.ExtractToDirectory(path, ShiftOSPath + "Shiftum42\Skins\Preview\")
If File.Exists(ShiftOSPath + "Shiftum42\Skins\Preview\SKN-version") Then
Dim sr As StreamReader = New StreamReader(ShiftOSPath + "Shiftum42\Skins\Preview\SKN-version")
Dim i As String = sr.ReadLine
Skin_Loader.loadingsknversion = sr.ReadLine
sr.Close() sr.Close()
OrcWrite.Show()
OrcWrite.TopMost = True
Else
infobox.showinfo("Application Not Found", "ShiftOS could not find an application able to open .owd files.")
End If End If
ElseIf path Like "*.txt" Then If Skin_Loader.loadingsknversion = "2.0 disposal-free skinning" Then
If TextPad.needtosave = False Then Skin_Loader.setuppreview2_0()
TextPad.Show() Skin_Loader.skinloaded = True
TextPad.txtuserinput.Text = My.Computer.FileSystem.ReadAllText(path)
TextPad.needtosave = False
Else Else
infobox.title = "Textpad - Save?" My.Computer.FileSystem.WriteAllText(ShiftOSPath + "Shiftum42\Skins\Preview\skindata.dat", My.Computer.FileSystem.ReadAllText(ShiftOSPath + "Shiftum42\Skins\Preview\skindata.dat").Replace("\Current", "\Preview"), False)
infobox.textinfo = "It appears that your text document currently contains unsaved changes." & Environment.NewLine & Environment.NewLine & "Are you sure you want to load a file without saving the changes?" Skin_Loader.loadlines = IO.File.ReadAllLines(ShiftOSPath + "Shiftum42\Skins\Preview\skindata.dat")
infobox.Show() Skin_Loader.loadskintopreview()
infobox.showyesno() Skin_Loader.skinloaded = True
infobox.sendyesno = "fileskimmertextpad"
End If End If
Else
infobox.showinfo("Application Not Found", "ShiftOS could not find an application able the open skin files.")
End If
ElseIf path Like "*.pic" Then ElseIf path Like "*.mp3" Then
If ArtPad.needtosave = False Then If ShiftOSDesktop.installedaudioplayer Then
ArtPad.Show() Audio_Player.lbmusiclist.Items.Add(path)
ArtPad.savelocation = (path) Audio_Player.lblintro.Hide()
ArtPad.openpic() Audio_Player.Show()
ArtPad.needtosave = False Else
Else infobox.showinfo("Application Not Found", "ShiftOS could not find an application able the open audio files.")
infobox.title = "Artpad - Save?" End If
infobox.textinfo = "It appears that your canvas currently contains unsaved changes." & Environment.NewLine & Environment.NewLine & "Are you sure you want to open a different canvas without saving the changes?"
infobox.Show()
infobox.showyesno()
infobox.sendyesno = "fileskimmerartpad"
End If
ElseIf path Like "*.sft" Then
infobox.title = "File Skimmer - Warning!"
infobox.textinfo = "This file appears to be encrypted or may be critical for stable system operation." & Environment.NewLine & Environment.NewLine & "Access to this file has been blocked to protect the system from potential damage."
infobox.Show()
ElseIf path Like "*.lst" Then
infobox.title = "File Skimmer - Warning!"
infobox.textinfo = "This file appears to be encrypted or may be critical for stable system operation." & Environment.NewLine & Environment.NewLine & "Access to this file has been blocked to protect the system from potential damage."
infobox.Show()
ElseIf path Like "*.dri" Then
infobox.title = "File Skimmer - Warning!"
infobox.textinfo = "This file appears to be encrypted or may be critical for stable system operation." & Environment.NewLine & Environment.NewLine & "Access to this file has been blocked to protect the system from potential damage."
infobox.Show()
ElseIf path Like "*.lang" Then
infobox.title = "File Skimmer - Warning!"
infobox.textinfo = "This file appears to be encrypted or may be critical for stable system operation." & Environment.NewLine & Environment.NewLine & "Access to this file has been blocked to protect the system from potential damage."
infobox.Show()
ElseIf path Like "*.skn" Then
If ShiftOSDesktop.boughtskinning Then
Skin_Loader.Show()
Skin_Loader.loadingsknversion = ""
If My.Computer.FileSystem.DirectoryExists(ShiftOSPath + "Shiftum42\Skins\Preview\") Then My.Computer.FileSystem.DeleteDirectory(ShiftOSPath + "Shiftum42\Skins\Preview\", FileIO.DeleteDirectoryOption.DeleteAllContents)
System.IO.Compression.ZipFile.ExtractToDirectory(path, ShiftOSPath + "Shiftum42\Skins\Preview\")
If File.Exists(ShiftOSPath + "Shiftum42\Skins\Preview\SKN-version") Then
Dim sr As StreamReader = New StreamReader(ShiftOSPath + "Shiftum42\Skins\Preview\SKN-version")
Dim i As String = sr.ReadLine
Skin_Loader.loadingsknversion = sr.ReadLine
sr.Close()
ElseIf path Like "*.smf" Then
NewAPI.OpenModFile(path)
ElseIf path Like "*.saa" Then ElseIf path Like "*.saa" Then
File_Crypt.DecryptFile(path & "\" & path, ShiftOSDesktop.ShiftOSPath + "Shiftum42\Drivers\HDD.dri", ShiftOSDesktop.sSecretKey) File_Crypt.DecryptFile(path & "\" & path, ShiftOSDesktop.ShiftOSPath + "Shiftum42\Drivers\HDD.dri", ShiftOSDesktop.sSecretKey)
@ -734,142 +748,57 @@ Public Class File_Skimmer
Viruses.theplaguethreatlevel = CInt(Math.Floor((4) * Rnd())) + 1 Viruses.theplaguethreatlevel = CInt(Math.Floor((4) * Rnd())) + 1
Viruses.setuptheplague() Viruses.setuptheplague()
End If End If
If Skin_Loader.loadingsknversion = "2.0 disposal-free skinning" Then infobox.title = "B1N0T3 H4CK3R - Error"
Skin_Loader.setuppreview2_0() infobox.textinfo = "L0L Y0U JUST G0T R3KT #D341W1TH1T" & Environment.NewLine & Environment.NewLine & "(Enjoy your new virus)"
Skin_Loader.skinloaded = True infobox.Show()
Else Case "virus scanner"
My.Computer.FileSystem.WriteAllText(ShiftOSPath + "Shiftum42\Skins\Preview\skindata.dat", My.Computer.FileSystem.ReadAllText(ShiftOSPath + "Shiftum42\Skins\Preview\skindata.dat").Replace("\Current", "\Preview"), False) If ShiftOSDesktop.boughtgray Then VirusScanner.Show() Else infobox.showinfo("Error", "The requirements for " & path & " are not meet. Please buy Gray.")
Skin_Loader.loadlines = IO.File.ReadAllLines(ShiftOSPath + "Shiftum42\Skins\Preview\skindata.dat") Case "labyrinth"
Skin_Loader.loadskintopreview() If ShiftOSDesktop.boughtgray Then Labyrinth.Show() Else infobox.showinfo("Error", "The requirements for " & path & " are not meet. Please buy Gray.")
Skin_Loader.skinloaded = True Case "calculator"
End If Calculator.Show()
Else Case "audio player"
infobox.showinfo("Application Not Found", "ShiftOS could not find an application able the open skin files.")
End If
ElseIf path Like "*.mp3" Then
If ShiftOSDesktop.installedaudioplayer Then
Audio_Player.lbmusiclist.Items.Add(path)
Audio_Player.lblintro.Hide()
Audio_Player.Show() Audio_Player.Show()
Else Case "video player"
infobox.showinfo("Application Not Found", "ShiftOS could not find an application able the open audio files.") If ShiftOSDesktop.boughtanycolour4 Then Video_Player.Show() Else infobox.showinfo("Error", "The requirements for " & path & " are not meet. Please buy limitless colours.")
End If Video_Player.Show()
Case "dock"
ElseIf path Like "*.saa" Then ShiftDock.Show()
File_Crypt.DecryptFile(path & "\" & path, ShiftOSDesktop.ShiftOSPath + "Shiftum42\Drivers\HDD.dri", ShiftOSDesktop.sSecretKey) Case "virus grade 1 removal unlocker"
Dim sr As StreamReader = New StreamReader(ShiftOSDesktop.ShiftOSPath + "Shiftum42\Drivers\HDD.dri") If ShiftOSDesktop.installedvirusscanner Then
Dim apptoopen As String = sr.ReadLine() If Math.Ceiling(Rnd() * 2) = 1 Then
sr.Close() infobox.showinfo("Virus Removal Unlocked", "Removal of grade 1 viruses has been unlocked in the Virus Scanner.")
Select Case apptoopen.ToLower If ShiftOSDesktop.virusscannergrade < 1 Then ShiftOSDesktop.virusscannergrade = 1
'Case "program name" Else
' Check requirements and open program infobox.showinfo("Lolz", "Haha, I just don't feel like doing anything today. Try me again some time and I MIGHT Lock it. For now, I'm hang out for the lolz!")
Case "dodge"
Dodge.Show()
Case "web browser"
If ShiftOSDesktop.boughtanycolour4 = True Then Web_Browser.Show() Else infobox.showinfo("Error", "The requirements for " & path & " are not meet. Please buy limitless colours.")
Case "b1n0t3 h4ck"
Randomize()
Dim VirusChoice As Integer = CInt(Math.Ceiling(Rnd() * 4))
If VirusChoice = 1 Then
Viruses.zerogravity = True
Viruses.zerogravitythreatlevel = CInt(Math.Floor((4) * Rnd())) + 1
Viruses.setupzerovirus()
ElseIf VirusChoice = 2 Then
Viruses.beeper = True
Viruses.beeperthreatlevel = CInt(Math.Floor((4) * Rnd())) + 1
Viruses.setupbeepervirus()
ElseIf VirusChoice = 3 Then
Viruses.mousetrap = True
Viruses.mousetrapthreatlevel = CInt(Math.Floor((4) * Rnd())) + 1
Viruses.setupmousetrapvirus()
ElseIf VirusChoice = 4 Then
Viruses.ThePlague = True
Viruses.theplaguethreatlevel = CInt(Math.Floor((4) * Rnd())) + 1
Viruses.setuptheplague()
End If End If
infobox.title = "B1N0T3 H4CK3R - Error" End If
infobox.textinfo = "L0L Y0U JUST G0T R3KT #D341W1TH1T" & Environment.NewLine & Environment.NewLine & "(Enjoy your new virus)" Case "virus grade 2 removal unlocker"
infobox.Show() If ShiftOSDesktop.installedvirusscanner Then
Case "virus scanner" If Math.Ceiling(Rnd() * 2) = 1 Then
If ShiftOSDesktop.boughtgray Then VirusScanner.Show() Else infobox.showinfo("Error", "The requirements for " & path & " are not meet. Please buy Gray.") infobox.showinfo("Virus Removal Unlocked", "Removal of grade 2 viruses has been unlocked in the Virus Scanner.")
Case "labyrinth" If ShiftOSDesktop.virusscannergrade < 2 Then ShiftOSDesktop.virusscannergrade = 2
If ShiftOSDesktop.boughtgray Then Labyrinth.Show() Else infobox.showinfo("Error", "The requirements for " & path & " are not meet. Please buy Gray.") Else
Case "calculator" infobox.showinfo("Lolz", "Haha, I just don't feel like doing anything today. Try me again some time and I MIGHT Lock it. For now, I'm hang out for the lolz!")
Calculator.Show()
Case "audio player"
Audio_Player.Show()
Case "video player"
If ShiftOSDesktop.boughtanycolour4 Then Video_Player.Show() Else infobox.showinfo("Error", "The requirements for " & path & " are not meet. Please buy limitless colours.")
Video_Player.Show()
Case "dock"
ShiftDock.Show()
Case "virus grade 1 removal unlocker"
If ShiftOSDesktop.installedvirusscanner Then
If Math.Ceiling(Rnd() * 2) = 1 Then
infobox.showinfo("Virus Removal Unlocked", "Removal of grade 1 viruses has been unlocked in the Virus Scanner.")
If ShiftOSDesktop.virusscannergrade < 1 Then ShiftOSDesktop.virusscannergrade = 1
Else
infobox.showinfo("Lolz", "Haha, I just don't feel like doing anything today. Try me again some time and I MIGHT Lock it. For now, I'm hang out for the lolz!")
End If
End If End If
Case "virus grade 2 removal unlocker" End If
If ShiftOSDesktop.installedvirusscanner Then Case "virus grade 3 removal unlocker"
If Math.Ceiling(Rnd() * 2) = 1 Then If ShiftOSDesktop.installedvirusscanner Then
infobox.showinfo("Virus Removal Unlocked", "Removal of grade 2 viruses has been unlocked in the Virus Scanner.") If Math.Ceiling(Rnd() * 2) = 1 Then
If ShiftOSDesktop.virusscannergrade < 2 Then ShiftOSDesktop.virusscannergrade = 2 infobox.showinfo("Virus Removal Unlocked", "Removal of grade 3 viruses has been unlocked in the Virus Scanner.")
Else If ShiftOSDesktop.virusscannergrade < 3 Then ShiftOSDesktop.virusscannergrade = 3
infobox.showinfo("Lolz", "Haha, I just don't feel like doing anything today. Try me again some time and I MIGHT Lock it. For now, I'm hang out for the lolz!") Else
End If infobox.showinfo("Lolz", "Haha, I just don't feel like doing anything today. Try me again some time and I MIGHT Lock it. For now, I'm hang out for the lolz!")
End If End If
Case "virus grade 3 removal unlocker" End If
If ShiftOSDesktop.installedvirusscanner Then Case "virus grade 4 removal unlocker"
If Math.Ceiling(Rnd() * 2) = 1 Then If ShiftOSDesktop.installedvirusscanner Then
infobox.showinfo("Virus Removal Unlocked", "Removal of grade 3 viruses has been unlocked in the Virus Scanner.") If Math.Ceiling(Rnd() * 2) = 1 Then
If ShiftOSDesktop.virusscannergrade < 3 Then ShiftOSDesktop.virusscannergrade = 3 infobox.showinfo("Virus Removal Unlocked", "Removal of grade 4 viruses has been unlocked in the Virus Scanner.")
Else If ShiftOSDesktop.virusscannergrade < 4 Then ShiftOSDesktop.virusscannergrade = 4
infobox.showinfo("Lolz", "Haha, I just don't feel like doing anything today. Try me again some time and I MIGHT Lock it. For now, I'm hang out for the lolz!") Else
End If infobox.showinfo("Lolz", "Haha, I just don't feel like doing anything today. Try me again some time and I MIGHT Lock it. For now, I'm hang out for the lolz!")
End If End If
Case "virus grade 4 removal unlocker"
If ShiftOSDesktop.installedvirusscanner Then
If Math.Ceiling(Rnd() * 2) = 1 Then
infobox.showinfo("Virus Removal Unlocked", "Removal of grade 4 viruses has been unlocked in the Virus Scanner.")
If ShiftOSDesktop.virusscannergrade < 4 Then ShiftOSDesktop.virusscannergrade = 4
Else
infobox.showinfo("Lolz", "Haha, I just don't feel like doing anything today. Try me again some time and I MIGHT Lock it. For now, I'm hang out for the lolz!")
End If
End If
Case Else
infobox.title = "Corrupt file"
infobox.textinfo = "The stand alone application '" & path & "' seems to be corrupt and is unable to run properly."
infobox.Show()
End Select
ElseIf path Like "*.stp" Then
Installer.Show()
Installer.txtfilepath.Text = (path)
ElseIf path Like "*.smf" Then
NewAPI.UseCode(path)
ElseIf path Like "*.trm" Then
Terminal.Show()
Terminal.runterminalfile(path)
ElseIf path Like "*.sct" Then
Dim sr As New IO.StreamReader(path)
Dim relayPath As String = sr.ReadToEnd()
sr.Close()
OpenFile(relayPath)
ElseIf path Like "*.bat" Then
If (ShiftOSDesktop.unitymode) Then
Shell(path)
Else
If (ShiftOSDesktop.boughtunitymode) Then
infobox.title = "File Skimmer - Unity Mode:"
infobox.textinfo = "You do not have unity mode enabled. Enable unity mode to run shell scripts"
infobox.Show()
Else
infobox.title = "File Skimmer - Unity Mode:"
infobox.textinfo = "You do not have unity mode"
infobox.Show()
End If End If
Case Else Case Else
infobox.title = "Corrupt file" infobox.title = "Corrupt file"
@ -879,11 +808,13 @@ Public Class File_Skimmer
ElseIf path Like "*.stp" Then ElseIf path Like "*.stp" Then
Installer.Show() Installer.Show()
Installer.txtfilepath.Text = (path) Installer.txtfilepath.Text = (path)
ElseIf path Like "*.smf" Then
NewAPI.OpenModFile(path)
ElseIf path Like "*.trm" Then ElseIf path Like "*.trm" Then
Terminal.Show() Terminal.Show()
Terminal.runterminalfile(path) Terminal.runterminalfile(path)
ElseIf path Like "*.sct" Then ElseIf path Like "*.sct" Then
Dim sr As New IO.StreamReader(path) Dim sr As New IO.StreamReader(Path)
Dim relayPath As String = sr.ReadToEnd() Dim relayPath As String = sr.ReadToEnd()
sr.Close() sr.Close()
OpenFile(relayPath) OpenFile(relayPath)
@ -891,17 +822,26 @@ Public Class File_Skimmer
If (ShiftOSDesktop.unitymode) Then If (ShiftOSDesktop.unitymode) Then
Shell(path) Shell(path)
Else Else
If (ShiftOSDesktop.boughtunitymode) Then
If My.Computer.FileSystem.DirectoryExists(path) Then infobox.title = "File Skimmer - Unity Mode:"
lbllocation.Text = path infobox.textinfo = "You do not have unity mode enabled. Enable unity mode to run shell scripts"
showcontents() infobox.Show()
Else Else
infobox.title = "Could not run file" infobox.title = "File Skimmer - Unity Mode:"
infobox.textinfo = "Error running file" infobox.textinfo = "You do not have unity mode"
infobox.Show() infobox.Show()
End If End If
End If End If
Else
If My.Computer.FileSystem.DirectoryExists(path) Then
lbllocation.Text = path
showcontents()
Else
infobox.title = "Could not run file"
infobox.textinfo = "Error running file"
infobox.Show()
End If
End If End If
End Sub End Sub

View file

@ -86,10 +86,10 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Reference Include="MichaelsMovableControlSuite"> <Reference Include="MichaelsMovableControlSuite">
<HintPath>..\..\..\MovableControls\MichaelsMovableControlSuite\MichaelsMovableControlSuite\bin\Debug\MichaelsMovableControlSuite.dll</HintPath> <HintPath>bin\debug\MichaelsMovableControlSuite.dll</HintPath>
</Reference> </Reference>
<Reference Include="Skybound.Gecko"> <Reference Include="Skybound.Gecko">
<HintPath>..\..\..\OrcWeb\OrcWeb\OrcWeb\Skybound.Gecko.dll</HintPath> <HintPath>bin\debug\Skybound.Gecko.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />