diff --git a/.vs/wtfpsbooster/v16/.suo b/.vs/wtfpsbooster/v16/.suo index acb304c..022fad0 100644 Binary files a/.vs/wtfpsbooster/v16/.suo and b/.vs/wtfpsbooster/v16/.suo differ diff --git a/ControlMyCores.v11.suo b/ControlMyCores.v11.suo deleted file mode 100644 index d8b49c4..0000000 Binary files a/ControlMyCores.v11.suo and /dev/null differ diff --git a/SECURITY.md b/SECURITY.md index c31d409..f9beaed 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -6,7 +6,8 @@ Supported security updates. | Version | Supported | | ------- | ------------------ | -| 1.99.1.39 | :white_check_mark: | +| 2.7.0.x | :white_check_mark: | +| 1.99.1.39 | :x: | | 1.95.0.139 | :x: | | 1.95.0.137 | :x: | | 1.89.1.120 | :x: | diff --git a/wtfpsbooster/Form1.Designer.vb b/wtfpsbooster/Form1.Designer.vb index 29c5134..f9ebaeb 100644 --- a/wtfpsbooster/Form1.Designer.vb +++ b/wtfpsbooster/Form1.Designer.vb @@ -50,6 +50,7 @@ Partial Class Form1 Me.Button1 = New System.Windows.Forms.Button() Me.PictureBox1 = New System.Windows.Forms.PictureBox() Me.BoostWorker_New_25 = New System.ComponentModel.BackgroundWorker() + Me.WatchDogWaiter = New System.Windows.Forms.Timer(Me.components) Me.MainControlPanel.SuspendLayout() Me.TabPage1.SuspendLayout() Me.TabPage2.SuspendLayout() @@ -63,9 +64,11 @@ Partial Class Form1 ' Me.GroupBox1.BackColor = System.Drawing.Color.SkyBlue Me.GroupBox1.Dock = System.Windows.Forms.DockStyle.Fill - Me.GroupBox1.Location = New System.Drawing.Point(3, 3) + Me.GroupBox1.Location = New System.Drawing.Point(4, 5) + Me.GroupBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(737, 318) + Me.GroupBox1.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.GroupBox1.Size = New System.Drawing.Size(1110, 495) Me.GroupBox1.TabIndex = 3 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Boost or Restore" @@ -75,12 +78,13 @@ Partial Class Form1 Me.InfoBox.BackColor = System.Drawing.Color.Linen Me.InfoBox.Dock = System.Windows.Forms.DockStyle.Fill Me.InfoBox.Font = New System.Drawing.Font("Microsoft Sans Serif", 13.0!) - Me.InfoBox.Location = New System.Drawing.Point(0, 150) + Me.InfoBox.Location = New System.Drawing.Point(0, 231) + Me.InfoBox.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.InfoBox.Multiline = True Me.InfoBox.Name = "InfoBox" Me.InfoBox.ReadOnly = True Me.InfoBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical - Me.InfoBox.Size = New System.Drawing.Size(322, 325) + Me.InfoBox.Size = New System.Drawing.Size(483, 500) Me.InfoBox.TabIndex = 9 Me.InfoBox.Text = resources.GetString("InfoBox.Text") ' @@ -93,31 +97,35 @@ Partial Class Form1 Me.BoostBtn.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer)) Me.BoostBtn.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(255, Byte), Integer)) Me.BoostBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.BoostBtn.Font = New System.Drawing.Font("Rockwell", 14.25!, System.Drawing.FontStyle.Bold) + Me.BoostBtn.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold) Me.BoostBtn.Location = New System.Drawing.Point(0, 0) + Me.BoostBtn.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.BoostBtn.Name = "BoostBtn" - Me.BoostBtn.Size = New System.Drawing.Size(322, 50) + Me.BoostBtn.Size = New System.Drawing.Size(483, 77) Me.BoostBtn.TabIndex = 8 - Me.BoostBtn.Text = "Boost" + Me.BoostBtn.Text = "Re-Boost" Me.BoostBtn.UseVisualStyleBackColor = False + Me.BoostBtn.Visible = False ' 'wtstatus ' Me.wtstatus.AutoSize = True - Me.wtstatus.Font = New System.Drawing.Font("Rockwell", 24.0!, System.Drawing.FontStyle.Bold) + Me.wtstatus.Font = New System.Drawing.Font("Microsoft Sans Serif", 24.0!, System.Drawing.FontStyle.Bold) Me.wtstatus.ForeColor = System.Drawing.SystemColors.ControlText - Me.wtstatus.Location = New System.Drawing.Point(328, 431) + Me.wtstatus.Location = New System.Drawing.Point(492, 663) + Me.wtstatus.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.wtstatus.Name = "wtstatus" - Me.wtstatus.Size = New System.Drawing.Size(469, 39) + Me.wtstatus.Size = New System.Drawing.Size(654, 55) Me.wtstatus.TabIndex = 6 Me.wtstatus.Text = "Checking for War Thunder..." ' 'pcstatus_txt ' - Me.pcstatus_txt.Font = New System.Drawing.Font("Rockwell", 24.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.pcstatus_txt.Location = New System.Drawing.Point(328, 9) + Me.pcstatus_txt.Font = New System.Drawing.Font("Microsoft Sans Serif", 24.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.pcstatus_txt.Location = New System.Drawing.Point(492, 14) + Me.pcstatus_txt.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.pcstatus_txt.Name = "pcstatus_txt" - Me.pcstatus_txt.Size = New System.Drawing.Size(625, 286) + Me.pcstatus_txt.Size = New System.Drawing.Size(938, 440) Me.pcstatus_txt.TabIndex = 6 Me.pcstatus_txt.Text = "PC Status: Normal" ' @@ -130,10 +138,11 @@ Partial Class Form1 Me.RestoreBtn.FlatAppearance.MouseDownBackColor = System.Drawing.Color.FromArgb(CType(CType(255, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(0, Byte), Integer)) Me.RestoreBtn.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(255, Byte), Integer)) Me.RestoreBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.RestoreBtn.Font = New System.Drawing.Font("Rockwell", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.RestoreBtn.Location = New System.Drawing.Point(0, 100) + Me.RestoreBtn.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.RestoreBtn.Location = New System.Drawing.Point(0, 154) + Me.RestoreBtn.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.RestoreBtn.Name = "RestoreBtn" - Me.RestoreBtn.Size = New System.Drawing.Size(322, 50) + Me.RestoreBtn.Size = New System.Drawing.Size(483, 77) Me.RestoreBtn.TabIndex = 4 Me.RestoreBtn.Text = "Remove Boost" Me.RestoreBtn.UseVisualStyleBackColor = False @@ -142,20 +151,22 @@ Partial Class Form1 ' Me.MainControlPanel.Controls.Add(Me.TabPage1) Me.MainControlPanel.Controls.Add(Me.TabPage2) - Me.MainControlPanel.Location = New System.Drawing.Point(973, 537) + Me.MainControlPanel.Location = New System.Drawing.Point(1460, 826) + Me.MainControlPanel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.MainControlPanel.Name = "MainControlPanel" Me.MainControlPanel.SelectedIndex = 0 - Me.MainControlPanel.Size = New System.Drawing.Size(751, 350) + Me.MainControlPanel.Size = New System.Drawing.Size(1126, 538) Me.MainControlPanel.TabIndex = 5 Me.MainControlPanel.Visible = False ' 'TabPage1 ' Me.TabPage1.Controls.Add(Me.GroupBox1) - Me.TabPage1.Location = New System.Drawing.Point(4, 22) + Me.TabPage1.Location = New System.Drawing.Point(4, 29) + Me.TabPage1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.TabPage1.Name = "TabPage1" - Me.TabPage1.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage1.Size = New System.Drawing.Size(743, 324) + Me.TabPage1.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.TabPage1.Size = New System.Drawing.Size(1118, 505) Me.TabPage1.TabIndex = 0 Me.TabPage1.Text = "Main Settings" Me.TabPage1.UseVisualStyleBackColor = True @@ -164,10 +175,11 @@ Partial Class Form1 ' Me.TabPage2.Controls.Add(Me.GroupBox4) Me.TabPage2.Controls.Add(Me.GroupBox3) - Me.TabPage2.Location = New System.Drawing.Point(4, 22) + Me.TabPage2.Location = New System.Drawing.Point(4, 29) + Me.TabPage2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.TabPage2.Name = "TabPage2" - Me.TabPage2.Padding = New System.Windows.Forms.Padding(3) - Me.TabPage2.Size = New System.Drawing.Size(743, 324) + Me.TabPage2.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.TabPage2.Size = New System.Drawing.Size(1118, 505) Me.TabPage2.TabIndex = 1 Me.TabPage2.Text = "Advanced Settings" Me.TabPage2.UseVisualStyleBackColor = True @@ -178,9 +190,11 @@ Partial Class Form1 Me.GroupBox4.Controls.Add(Me.pclist) Me.GroupBox4.Controls.Add(Me.rfspcl) Me.GroupBox4.Dock = System.Windows.Forms.DockStyle.Fill - Me.GroupBox4.Location = New System.Drawing.Point(3, 118) + Me.GroupBox4.Location = New System.Drawing.Point(4, 182) + Me.GroupBox4.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.GroupBox4.Name = "GroupBox4" - Me.GroupBox4.Size = New System.Drawing.Size(737, 203) + Me.GroupBox4.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.GroupBox4.Size = New System.Drawing.Size(1110, 318) Me.GroupBox4.TabIndex = 2 Me.GroupBox4.TabStop = False Me.GroupBox4.Text = "Select Which Programs to force onto the cores chosen." @@ -190,18 +204,20 @@ Partial Class Form1 Me.pclist.BackColor = System.Drawing.Color.SkyBlue Me.pclist.Dock = System.Windows.Forms.DockStyle.Fill Me.pclist.FormattingEnabled = True - Me.pclist.Location = New System.Drawing.Point(3, 16) + Me.pclist.Location = New System.Drawing.Point(4, 24) + Me.pclist.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.pclist.Name = "pclist" - Me.pclist.Size = New System.Drawing.Size(731, 161) + Me.pclist.Size = New System.Drawing.Size(1102, 254) Me.pclist.Sorted = True Me.pclist.TabIndex = 0 ' 'rfspcl ' Me.rfspcl.Dock = System.Windows.Forms.DockStyle.Bottom - Me.rfspcl.Location = New System.Drawing.Point(3, 177) + Me.rfspcl.Location = New System.Drawing.Point(4, 278) + Me.rfspcl.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.rfspcl.Name = "rfspcl" - Me.rfspcl.Size = New System.Drawing.Size(731, 23) + Me.rfspcl.Size = New System.Drawing.Size(1102, 35) Me.rfspcl.TabIndex = 1 Me.rfspcl.Text = "Refresh Process List" Me.rfspcl.UseVisualStyleBackColor = True @@ -212,9 +228,11 @@ Partial Class Form1 Me.GroupBox3.Controls.Add(Me.cs) Me.GroupBox3.Controls.Add(Me.fcp2) Me.GroupBox3.Dock = System.Windows.Forms.DockStyle.Top - Me.GroupBox3.Location = New System.Drawing.Point(3, 3) + Me.GroupBox3.Location = New System.Drawing.Point(4, 5) + Me.GroupBox3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.GroupBox3.Name = "GroupBox3" - Me.GroupBox3.Size = New System.Drawing.Size(737, 115) + Me.GroupBox3.Padding = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.GroupBox3.Size = New System.Drawing.Size(1110, 177) Me.GroupBox3.TabIndex = 1 Me.GroupBox3.TabStop = False Me.GroupBox3.Text = "Select Cores to Use" @@ -224,18 +242,20 @@ Partial Class Form1 Me.cs.BackColor = System.Drawing.Color.SkyBlue Me.cs.Dock = System.Windows.Forms.DockStyle.Fill Me.cs.FormattingEnabled = True - Me.cs.Location = New System.Drawing.Point(3, 16) + Me.cs.Location = New System.Drawing.Point(4, 24) + Me.cs.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.cs.MultiColumn = True Me.cs.Name = "cs" - Me.cs.Size = New System.Drawing.Size(731, 73) + Me.cs.Size = New System.Drawing.Size(1102, 113) Me.cs.TabIndex = 0 ' 'fcp2 ' Me.fcp2.Dock = System.Windows.Forms.DockStyle.Bottom - Me.fcp2.Location = New System.Drawing.Point(3, 89) + Me.fcp2.Location = New System.Drawing.Point(4, 137) + Me.fcp2.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.fcp2.Name = "fcp2" - Me.fcp2.Size = New System.Drawing.Size(731, 23) + Me.fcp2.Size = New System.Drawing.Size(1102, 35) Me.fcp2.TabIndex = 1 Me.fcp2.Text = "Force Checked Processes" Me.fcp2.UseVisualStyleBackColor = True @@ -261,8 +281,9 @@ Partial Class Form1 Me.LeftPanel.Controls.Add(Me.BoostBtn) Me.LeftPanel.Dock = System.Windows.Forms.DockStyle.Left Me.LeftPanel.Location = New System.Drawing.Point(0, 0) + Me.LeftPanel.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.LeftPanel.Name = "LeftPanel" - Me.LeftPanel.Size = New System.Drawing.Size(322, 475) + Me.LeftPanel.Size = New System.Drawing.Size(483, 731) Me.LeftPanel.TabIndex = 6 ' 'ExtraBoost @@ -274,10 +295,11 @@ Partial Class Form1 Me.ExtraBoost.FlatAppearance.MouseDownBackColor = System.Drawing.Color.Goldenrod Me.ExtraBoost.FlatAppearance.MouseOverBackColor = System.Drawing.Color.FromArgb(CType(CType(128, Byte), Integer), CType(CType(128, Byte), Integer), CType(CType(255, Byte), Integer)) Me.ExtraBoost.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.ExtraBoost.Font = New System.Drawing.Font("Rockwell", 14.25!, System.Drawing.FontStyle.Bold) - Me.ExtraBoost.Location = New System.Drawing.Point(0, 50) + Me.ExtraBoost.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold) + Me.ExtraBoost.Location = New System.Drawing.Point(0, 77) + Me.ExtraBoost.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.ExtraBoost.Name = "ExtraBoost" - Me.ExtraBoost.Size = New System.Drawing.Size(322, 50) + Me.ExtraBoost.Size = New System.Drawing.Size(483, 77) Me.ExtraBoost.TabIndex = 10 Me.ExtraBoost.Text = "Extra Boost" Me.ExtraBoost.UseVisualStyleBackColor = False @@ -291,10 +313,11 @@ Partial Class Form1 Me.Button3.FlatAppearance.BorderColor = System.Drawing.Color.Red Me.Button3.FlatAppearance.BorderSize = 2 Me.Button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button3.Font = New System.Drawing.Font("Rockwell", 14.25!, System.Drawing.FontStyle.Bold) - Me.Button3.Location = New System.Drawing.Point(999, 0) + Me.Button3.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold) + Me.Button3.Location = New System.Drawing.Point(1498, 0) + Me.Button3.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Button3.Name = "Button3" - Me.Button3.Size = New System.Drawing.Size(38, 37) + Me.Button3.Size = New System.Drawing.Size(49, 47) Me.Button3.TabIndex = 7 Me.Button3.Text = "X" Me.Button3.TextAlign = System.Drawing.ContentAlignment.TopCenter @@ -302,16 +325,17 @@ Partial Class Form1 ' 'WatchDog ' - Me.WatchDog.Interval = 20000 + Me.WatchDog.Interval = 10000 ' 'WatchDogTxt ' Me.WatchDogTxt.AutoSize = True - Me.WatchDogTxt.Font = New System.Drawing.Font("Rockwell", 24.0!, System.Drawing.FontStyle.Bold) + Me.WatchDogTxt.Font = New System.Drawing.Font("Microsoft Sans Serif", 24.0!, System.Drawing.FontStyle.Bold) Me.WatchDogTxt.ForeColor = System.Drawing.SystemColors.ControlText - Me.WatchDogTxt.Location = New System.Drawing.Point(381, 392) + Me.WatchDogTxt.Location = New System.Drawing.Point(572, 603) + Me.WatchDogTxt.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.WatchDogTxt.Name = "WatchDogTxt" - Me.WatchDogTxt.Size = New System.Drawing.Size(219, 39) + Me.WatchDogTxt.Size = New System.Drawing.Size(316, 55) Me.WatchDogTxt.TabIndex = 6 Me.WatchDogTxt.Text = "Watch Dog: -" ' @@ -323,10 +347,11 @@ Partial Class Form1 Me.Button1.FlatAppearance.BorderColor = System.Drawing.Color.Chartreuse Me.Button1.FlatAppearance.BorderSize = 2 Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat - Me.Button1.Font = New System.Drawing.Font("Rockwell", 14.25!, System.Drawing.FontStyle.Bold) - Me.Button1.Location = New System.Drawing.Point(959, 0) + Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold) + Me.Button1.Location = New System.Drawing.Point(1438, 0) + Me.Button1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(34, 37) + Me.Button1.Size = New System.Drawing.Size(46, 47) Me.Button1.TabIndex = 8 Me.Button1.Text = "_" Me.Button1.TextAlign = System.Drawing.ContentAlignment.TopCenter @@ -335,9 +360,10 @@ Partial Class Form1 'PictureBox1 ' Me.PictureBox1.Image = Global.wtfpsbooster.My.Resources.Resources.gearcog - Me.PictureBox1.Location = New System.Drawing.Point(335, 392) + Me.PictureBox1.Location = New System.Drawing.Point(502, 603) + Me.PictureBox1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.PictureBox1.Name = "PictureBox1" - Me.PictureBox1.Size = New System.Drawing.Size(40, 36) + Me.PictureBox1.Size = New System.Drawing.Size(60, 55) Me.PictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom Me.PictureBox1.TabIndex = 9 Me.PictureBox1.TabStop = False @@ -345,12 +371,16 @@ Partial Class Form1 'BoostWorker_New_25 ' ' + 'WatchDogWaiter + ' + Me.WatchDogWaiter.Interval = 1000 + ' 'Form1 ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.BackColor = System.Drawing.SystemColors.MenuHighlight - Me.ClientSize = New System.Drawing.Size(1037, 475) + Me.ClientSize = New System.Drawing.Size(1556, 731) Me.Controls.Add(Me.PictureBox1) Me.Controls.Add(Me.Button1) Me.Controls.Add(Me.Button3) @@ -361,8 +391,9 @@ Partial Class Form1 Me.Controls.Add(Me.pcstatus_txt) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon) + Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.MaximizeBox = False - Me.MinimumSize = New System.Drawing.Size(765, 329) + Me.MinimumSize = New System.Drawing.Size(1148, 506) Me.Name = "Form1" Me.Opacity = 0.95R Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen @@ -405,4 +436,5 @@ Partial Class Form1 Friend WithEvents Button1 As Button Friend WithEvents PictureBox1 As PictureBox Friend WithEvents BoostWorker_New_25 As System.ComponentModel.BackgroundWorker + Friend WithEvents WatchDogWaiter As Timer End Class diff --git a/wtfpsbooster/Form1.resx b/wtfpsbooster/Form1.resx index d451c9d..cdb4280 100644 --- a/wtfpsbooster/Form1.resx +++ b/wtfpsbooster/Form1.resx @@ -142,11 +142,14 @@ If you find that boost impacts your gameplay, click restore, finish your gamepla 219, 17 - 352, 17 + 903, 17 461, 17 + + 1043, 17 + diff --git a/wtfpsbooster/Form1.vb b/wtfpsbooster/Form1.vb index b943e00..1ef435c 100644 --- a/wtfpsbooster/Form1.vb +++ b/wtfpsbooster/Form1.vb @@ -1,5 +1,4 @@ Imports System.Runtime.InteropServices -Imports System.Threading Public Class Form1 Dim corecount As Integer Dim status As String @@ -15,6 +14,7 @@ Public Class Form1 Dim DidWtClose As Boolean Dim ExBoost As Boolean Dim WatchDogTimer As Integer + Dim wdtimer_counter As Integer Public Const WM_NCLBUTTONDOWN As Integer = &HA1 Public Const HT_CAPTION As Integer = &H2 @@ -34,26 +34,44 @@ Public Class Form1 End If End Sub - Private Sub frmCustomerDetails_Load(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles MyBase.Load - ' When the form loads, the KeyPreview property is set to True. - ' This lets the form capture keyboard events before - ' any other element in the form. - Me.KeyPreview = True - End Sub + ' ---------------------------------- + ' Not needed any more. + ' ---------------------------------- + + 'Private Sub FrmCustomerDetails_Load(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles MyBase.Load + ' ' When the form loads, the KeyPreview property is set to True. + ' ' This lets the form capture keyboard events before + ' ' any other element in the form. + ' Me.KeyPreview = True + 'End Sub - ' ------------------------------- - ' Use this form loading - ' ------------------------------- + ' ---------------------------------- + ' Use this form loading for code + ' ---------------------------------- Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load + + Me.KeyPreview = True + corecount = 0 While corecount <= System.Environment.ProcessorCount.ToString - 1 corecount += 1 cs.Items.Add(corecount - 1) End While MainControlPanel.TabPages.Remove(TabPage2) + + + ' ------------------------------------------------ + ' Watch Dog Timer settings and waiter settings + ' ------------------------------------------------ WatchDog_Settings.WDS_Num.Value = My.Settings.watchdog_timer.ToString WatchDog.Interval = My.Settings.watchdog_timer + + + ' --------------------------------------------------------------- + ' Lazy Check for file name tampering, prevents code breaking + ' --------------------------------------------------------------- + If Application.ExecutablePath.Contains("wtfpsbooster.exe") = False Then MessageBox.Show("It seems like the file name was changed, please rename back to: wtfpsbooster.exe" & vbNewLine & "The name is hard coded to the filename and this helps makes things easier, You can always make a shortcut though :)") Application.Exit() @@ -129,78 +147,81 @@ Public Class Form1 Try ' Exclusion List BoostWorker.ReportProgress(67, "Modifying System" & vbNewLine & "Please don't exit the app.") - If proc.ToString.Contains("aces" Or "launcher" Or "explorer" Or "wtfpsbooster" Or "EasyAntiCheat" Or "audiodg" Or "eac_launcher") Then - proc.ProcessorAffinity = New IntPtr(n - 1) - End If - ' Compress into one line. - 'If proc.ToString.Contains("launcher") Then - ' proc.ProcessorAffinity = New IntPtr(n - 1) - 'End If - 'If proc.ToString.Contains("explorer") Then - ' proc.ProcessorAffinity = New IntPtr(n - 1) - 'End If - 'If proc.ToString.Contains("wtfpsbooster") Then - ' proc.ProcessorAffinity = New IntPtr(n - 1) - 'End If - 'If proc.ToString.Contains("EasyAntiCheat") Then - ' proc.ProcessorAffinity = New IntPtr(n - 1) - 'End If - 'If proc.ToString.Contains("audiodg") Then + 'If proc.ToString.Contains("aces" Or "launcher" Or "explorer" Or "wtfpsbooster" Or "EasyAntiCheat" Or "audiodg" Or "eac_launcher") Then ' proc.ProcessorAffinity = New IntPtr(n - 1) 'End If + ' Compress into one line. + If proc.ToString.Contains("aces") Then + proc.ProcessorAffinity = New IntPtr(n - 1) + End If + If proc.ToString.Contains("launcher") Then + proc.ProcessorAffinity = New IntPtr(n - 1) + End If + If proc.ToString.Contains("explorer") Then + proc.ProcessorAffinity = New IntPtr(n - 1) + End If + If proc.ToString.Contains("wtfpsbooster") Then + proc.ProcessorAffinity = New IntPtr(n - 1) + End If + If proc.ToString.Contains("EasyAntiCheat") Then + proc.ProcessorAffinity = New IntPtr(n - 1) + End If + If proc.ToString.Contains("audiodg") Then + proc.ProcessorAffinity = New IntPtr(n - 1) + End If If ExBoost = False Then - If proc.ToString.Contains("Discord" Or "ts3client_win64" Or "GameOverlayUI" Or "Steam" Or "SteamService" Or "steamwebhelper" Or "Dxtory" Or "Dxtory64" Or "nvcontainer" Or "NVDisplay.Container" Or "NVIDIA RTX Voice" Or "NVIDIA Share" Or "nvsphelper64" Or "voicemeter" Or "voicemeter8" Or "conhost") Then - proc.ProcessorAffinity = New IntPtr(n - 1) - End If - ' compress into one line - 'If proc.ToString.Contains("ts3client_win64") Then - ' proc.ProcessorAffinity = New IntPtr(n - 1) - 'End If - 'If proc.ToString.Contains("GameOverlayUI") Then - ' proc.ProcessorAffinity = New IntPtr(n - 1) - 'End If - 'If proc.ToString.Contains("Steam") Then - ' proc.ProcessorAffinity = New IntPtr(n - 1) - 'End If - 'If proc.ToString.Contains("SteamService") Then - ' proc.ProcessorAffinity = New IntPtr(n - 1) - 'End If - 'If proc.ToString.Contains("steamwebhelper") Then - ' proc.ProcessorAffinity = New IntPtr(n - 1) - 'End If - 'If proc.ToString.Contains("Dxtory") Then - ' proc.ProcessorAffinity = New IntPtr(n - 1) - 'End If - 'If proc.ToString.Contains("Dxtory64") Then - ' proc.ProcessorAffinity = New IntPtr(n - 1) - 'End If - 'If proc.ToString.Contains("nvcontainer") Then - ' proc.ProcessorAffinity = New IntPtr(n - 1) - 'End If - 'If proc.ToString.Contains("NVDisplay.Container") Then - ' proc.ProcessorAffinity = New IntPtr(n - 1) - 'End If - 'If proc.ToString.Contains("NVIDIA RTX Voice") Then - ' proc.ProcessorAffinity = New IntPtr(n - 1) - 'End If - 'If proc.ToString.Contains("NVIDIA Share") Then - ' proc.ProcessorAffinity = New IntPtr(n - 1) - 'End If - 'If proc.ToString.Contains("NVIDIA Web Helper") Then - ' proc.ProcessorAffinity = New IntPtr(n - 1) - 'End If - 'If proc.ToString.Contains("nvsphelper64") Then - ' proc.ProcessorAffinity = New IntPtr(n - 1) - 'End If - 'If proc.ToString.Contains("voicemeter") Then - ' proc.ProcessorAffinity = New IntPtr(n - 1) - 'End If - 'If proc.ToString.Contains("voicemeter8") Then - ' proc.ProcessorAffinity = New IntPtr(n - 1) - 'End If - 'If proc.ToString.Contains("conhost") Then + 'If proc.ToString.Contains("Discord" Or "ts3client_win64" Or "GameOverlayUI" Or "Steam" Or "SteamService" Or "steamwebhelper" Or "Dxtory" Or "Dxtory64" Or "nvcontainer" Or "NVDisplay.Container" Or "NVIDIA RTX Voice" Or "NVIDIA Share" Or "nvsphelper64" Or "voicemeter" Or "voicemeter8" Or "conhost") Then ' proc.ProcessorAffinity = New IntPtr(n - 1) 'End If + '' compress into one line + If proc.ToString.Contains("ts3client_win64") Then + proc.ProcessorAffinity = New IntPtr(n - 1) + End If + If proc.ToString.Contains("GameOverlayUI") Then + proc.ProcessorAffinity = New IntPtr(n - 1) + End If + If proc.ToString.Contains("Steam") Then + proc.ProcessorAffinity = New IntPtr(n - 1) + End If + If proc.ToString.Contains("SteamService") Then + proc.ProcessorAffinity = New IntPtr(n - 1) + End If + If proc.ToString.Contains("steamwebhelper") Then + proc.ProcessorAffinity = New IntPtr(n - 1) + End If + If proc.ToString.Contains("Dxtory") Then + proc.ProcessorAffinity = New IntPtr(n - 1) + End If + If proc.ToString.Contains("Dxtory64") Then + proc.ProcessorAffinity = New IntPtr(n - 1) + End If + If proc.ToString.Contains("nvcontainer") Then + proc.ProcessorAffinity = New IntPtr(n - 1) + End If + If proc.ToString.Contains("NVDisplay.Container") Then + proc.ProcessorAffinity = New IntPtr(n - 1) + End If + If proc.ToString.Contains("NVIDIA RTX Voice") Then + proc.ProcessorAffinity = New IntPtr(n - 1) + End If + If proc.ToString.Contains("NVIDIA Share") Then + proc.ProcessorAffinity = New IntPtr(n - 1) + End If + If proc.ToString.Contains("NVIDIA Web Helper") Then + proc.ProcessorAffinity = New IntPtr(n - 1) + End If + If proc.ToString.Contains("nvsphelper64") Then + proc.ProcessorAffinity = New IntPtr(n - 1) + End If + If proc.ToString.Contains("voicemeter") Then + proc.ProcessorAffinity = New IntPtr(n - 1) + End If + If proc.ToString.Contains("voicemeter8") Then + proc.ProcessorAffinity = New IntPtr(n - 1) + End If + If proc.ToString.Contains("conhost") Then + proc.ProcessorAffinity = New IntPtr(n - 1) + End If End If Catch ex As Exception @@ -247,7 +268,7 @@ Public Class Form1 End Try End Sub - Private Sub rfspcl_Click(sender As Object, e As EventArgs) Handles rfspcl.Click + Private Sub Rfspcl_Click(sender As Object, e As EventArgs) Handles rfspcl.Click pclist.Items.Clear() For Each proc In Process.GetProcesses Try @@ -259,7 +280,7 @@ Public Class Form1 End Try Next End Sub - Private Sub fcp2_Click(sender As Object, e As EventArgs) Handles fcp2.Click + Private Sub Fcp2_Click(sender As Object, e As EventArgs) Handles fcp2.Click Dim total As Integer total = 0 For Each item In cs.CheckedItems @@ -396,18 +417,22 @@ Public Class Form1 If proc.ProcessName = "aces" Then If proc.Responding = False Then ' attempt to kill the process - proc.Kill() + + 'proc.Kill() If ExBoost = True Then - MessageBox.Show("Seems like War Thunder had a Panic Attack, we forced it closed. It also seems like the extra boost isnt working out for your pc, please disable.") + MessageBox.Show("Seems like War Thunder had a Panic Attack, I forced it closed. It also seems like the extra boost isnt working out for your pc, please disable.") Else - MessageBox.Show("Seems like War Thunder had a Panic Attack, we forced it closed.") + MessageBox.Show("Seems like War Thunder had a Panic Attack, I forced it closed.") End If End If End If Next End Sub + Private Sub WatchDogWaiter_Tick(sender As Object, e As EventArgs) Handles WatchDogWaiter.Tick + WatchDogTxt.Text = "Watch Dog: Frozen | Waiting before panic attac: " & wdtimer_counter.ToString + End Sub Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click Me.WindowState = System.Windows.Forms.FormWindowState.Minimized End Sub diff --git a/wtfpsbooster/My Project/AssemblyInfo.vb b/wtfpsbooster/My Project/AssemblyInfo.vb index 7cc3a94..4255669 100644 --- a/wtfpsbooster/My Project/AssemblyInfo.vb +++ b/wtfpsbooster/My Project/AssemblyInfo.vb @@ -1,7 +1,5 @@ -Imports System.Resources - -Imports System -Imports System.Reflection +Imports System.Reflection +Imports System.Resources Imports System.Runtime.InteropServices ' General Information about an assembly is controlled through the following @@ -15,9 +13,9 @@ Imports System.Runtime.InteropServices - + - + 'The following GUID is for the ID of the typelib if this project is exposed to COM @@ -36,4 +34,4 @@ Imports System.Runtime.InteropServices - \ No newline at end of file + \ No newline at end of file diff --git a/wtfpsbooster/WatchDog_Settings.Designer.vb b/wtfpsbooster/WatchDog_Settings.Designer.vb index fa44f91..f482feb 100644 --- a/wtfpsbooster/WatchDog_Settings.Designer.vb +++ b/wtfpsbooster/WatchDog_Settings.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class WatchDog_Settings Inherits System.Windows.Forms.Form 'Form overrides dispose to clean up the component list. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,7 +20,7 @@ Partial Class WatchDog_Settings 'NOTE: The following procedure is required by the Windows Form Designer 'It can be modified using the Windows Form Designer. 'Do not modify it using the code editor. - _ + Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(WatchDog_Settings)) Me.Label1 = New System.Windows.Forms.Label() @@ -28,47 +28,52 @@ Partial Class WatchDog_Settings Me.WDS_Num = New System.Windows.Forms.NumericUpDown() Me.Label3 = New System.Windows.Forms.Label() Me.Button1 = New System.Windows.Forms.Button() + Me.wdgod_settings_exit_btn = New System.Windows.Forms.Button() CType(Me.WDS_Num, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'Label1 ' Me.Label1.AutoSize = True - Me.Label1.Font = New System.Drawing.Font("Rockwell", 24.0!, System.Drawing.FontStyle.Bold) - Me.Label1.Location = New System.Drawing.Point(-4, -4) + Me.Label1.Font = New System.Drawing.Font("Microsoft Sans Serif", 24.0!, System.Drawing.FontStyle.Bold) + Me.Label1.Location = New System.Drawing.Point(-6, -6) + Me.Label1.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(321, 39) + Me.Label1.Size = New System.Drawing.Size(466, 55) Me.Label1.TabIndex = 0 Me.Label1.Text = "Watch Dog Settings" ' 'Label2 ' Me.Label2.AutoSize = True - Me.Label2.Font = New System.Drawing.Font("Rockwell", 12.0!, System.Drawing.FontStyle.Bold) - Me.Label2.Location = New System.Drawing.Point(-1, 35) + Me.Label2.Font = New System.Drawing.Font("Microsoft Sans Serif", 12.0!, System.Drawing.FontStyle.Bold) + Me.Label2.Location = New System.Drawing.Point(-2, 54) + Me.Label2.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(373, 95) + Me.Label2.Size = New System.Drawing.Size(545, 145) Me.Label2.TabIndex = 1 Me.Label2.Text = resources.GetString("Label2.Text") ' 'WDS_Num ' - Me.WDS_Num.Font = New System.Drawing.Font("Rockwell", 16.0!, System.Drawing.FontStyle.Bold) - Me.WDS_Num.Location = New System.Drawing.Point(144, 154) + Me.WDS_Num.Font = New System.Drawing.Font("Microsoft Sans Serif", 16.0!, System.Drawing.FontStyle.Bold) + Me.WDS_Num.Location = New System.Drawing.Point(216, 237) + Me.WDS_Num.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.WDS_Num.Maximum = New Decimal(New Integer() {60000, 0, 0, 0}) Me.WDS_Num.Minimum = New Decimal(New Integer() {10000, 0, 0, 0}) Me.WDS_Num.Name = "WDS_Num" - Me.WDS_Num.Size = New System.Drawing.Size(113, 33) + Me.WDS_Num.Size = New System.Drawing.Size(170, 44) Me.WDS_Num.TabIndex = 2 Me.WDS_Num.Value = New Decimal(New Integer() {20000, 0, 0, 0}) ' 'Label3 ' Me.Label3.AutoSize = True - Me.Label3.Font = New System.Drawing.Font("Rockwell", 10.0!, System.Drawing.FontStyle.Bold) - Me.Label3.Location = New System.Drawing.Point(12, 154) + Me.Label3.Font = New System.Drawing.Font("Microsoft Sans Serif", 10.0!, System.Drawing.FontStyle.Bold) + Me.Label3.Location = New System.Drawing.Point(18, 237) + Me.Label3.Margin = New System.Windows.Forms.Padding(4, 0, 4, 0) Me.Label3.Name = "Label3" - Me.Label3.Size = New System.Drawing.Size(281, 108) + Me.Label3.Size = New System.Drawing.Size(393, 150) Me.Label3.TabIndex = 3 Me.Label3.Text = "Watch Dog Clock" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "1 Second = 1000" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Min: 10 Seconds | Max 60 Seconds" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Anything over" & " 60 is a sign of no return." & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "Default is 20 Seconds, Older PCs might" & Global.Microsoft.VisualBasic.ChrW(13) & Global.Microsoft.VisualBasic.ChrW(10) & "want to use" & @@ -78,26 +83,53 @@ Partial Class WatchDog_Settings ' Me.Button1.AutoSize = True Me.Button1.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink - Me.Button1.Font = New System.Drawing.Font("Rockwell", 13.0!, System.Drawing.FontStyle.Bold) - Me.Button1.Location = New System.Drawing.Point(263, 154) + Me.Button1.BackColor = System.Drawing.Color.Green + Me.Button1.Dock = System.Windows.Forms.DockStyle.Bottom + Me.Button1.FlatAppearance.BorderColor = System.Drawing.Color.Green + Me.Button1.FlatAppearance.BorderSize = 2 + Me.Button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.Button1.Font = New System.Drawing.Font("Microsoft Sans Serif", 13.0!, System.Drawing.FontStyle.Bold) + Me.Button1.Location = New System.Drawing.Point(0, 436) + Me.Button1.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Button1.Name = "Button1" - Me.Button1.Size = New System.Drawing.Size(61, 32) + Me.Button1.Size = New System.Drawing.Size(568, 44) Me.Button1.TabIndex = 4 Me.Button1.Text = "Save" - Me.Button1.UseVisualStyleBackColor = True + Me.Button1.UseVisualStyleBackColor = False + ' + 'wdgod_settings_exit_btn + ' + Me.wdgod_settings_exit_btn.AutoSize = True + Me.wdgod_settings_exit_btn.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink + Me.wdgod_settings_exit_btn.BackColor = System.Drawing.Color.Red + Me.wdgod_settings_exit_btn.Dock = System.Windows.Forms.DockStyle.Bottom + Me.wdgod_settings_exit_btn.FlatAppearance.BorderColor = System.Drawing.Color.Red + Me.wdgod_settings_exit_btn.FlatAppearance.BorderSize = 2 + Me.wdgod_settings_exit_btn.FlatStyle = System.Windows.Forms.FlatStyle.Flat + Me.wdgod_settings_exit_btn.Font = New System.Drawing.Font("Microsoft Sans Serif", 14.25!, System.Drawing.FontStyle.Bold) + Me.wdgod_settings_exit_btn.Location = New System.Drawing.Point(0, 480) + Me.wdgod_settings_exit_btn.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) + Me.wdgod_settings_exit_btn.Name = "wdgod_settings_exit_btn" + Me.wdgod_settings_exit_btn.Size = New System.Drawing.Size(568, 47) + Me.wdgod_settings_exit_btn.TabIndex = 8 + Me.wdgod_settings_exit_btn.Text = "Close without saving" + Me.wdgod_settings_exit_btn.TextAlign = System.Drawing.ContentAlignment.TopCenter + Me.wdgod_settings_exit_btn.UseVisualStyleBackColor = False ' 'WatchDog_Settings ' - Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) - Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.AutoScaleDimensions = New System.Drawing.SizeF(144.0!, 144.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi Me.BackColor = System.Drawing.SystemColors.ActiveCaption - Me.ClientSize = New System.Drawing.Size(379, 279) + Me.ClientSize = New System.Drawing.Size(568, 527) Me.Controls.Add(Me.Button1) + Me.Controls.Add(Me.wdgod_settings_exit_btn) Me.Controls.Add(Me.WDS_Num) Me.Controls.Add(Me.Label2) Me.Controls.Add(Me.Label1) Me.Controls.Add(Me.Label3) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None + Me.Margin = New System.Windows.Forms.Padding(4, 5, 4, 5) Me.Name = "WatchDog_Settings" Me.Opacity = 0.9R Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent @@ -113,4 +145,5 @@ Partial Class WatchDog_Settings Friend WithEvents WDS_Num As NumericUpDown Friend WithEvents Label3 As Label Friend WithEvents Button1 As Button + Friend WithEvents wdgod_settings_exit_btn As Button End Class diff --git a/wtfpsbooster/WatchDog_Settings.vb b/wtfpsbooster/WatchDog_Settings.vb index bab186a..abd30fc 100644 --- a/wtfpsbooster/WatchDog_Settings.vb +++ b/wtfpsbooster/WatchDog_Settings.vb @@ -10,4 +10,9 @@ Private Sub WatchDog_Settings_Load(sender As Object, e As EventArgs) Handles MyBase.Load WDS_Num.Value = My.Settings.watchdog_timer.ToString End Sub + + Private Sub Button3_Click(sender As Object, e As EventArgs) Handles wdgod_settings_exit_btn.Click + Me.Close() + WDS_Num.Value = My.Settings.watchdog_timer + End Sub End Class \ No newline at end of file diff --git a/wtfpsbooster/wtfpsbooster.vbproj b/wtfpsbooster/wtfpsbooster.vbproj index a0fd702..8a4a2f5 100644 --- a/wtfpsbooster/wtfpsbooster.vbproj +++ b/wtfpsbooster/wtfpsbooster.vbproj @@ -24,8 +24,8 @@ false false true - 28 - 2.1.0.%2a + 122 + 2.7.0.%2a false true true @@ -66,10 +66,10 @@ My Project\app.manifest - 3E37D8E0B61F0718D83DCD41FCFCD9C7020E06AD + CFDF2752512CEFB2150408F49C326256C5D2BCA5 - wtfpsbooster_1_TemporaryKey.pfx + wtfpsbooster_2_TemporaryKey.pfx false @@ -196,7 +196,6 @@ true - @@ -290,6 +289,7 @@ + diff --git a/wtfpsbooster/wtfpsbooster_2_TemporaryKey.pfx b/wtfpsbooster/wtfpsbooster_2_TemporaryKey.pfx new file mode 100644 index 0000000..081bf73 Binary files /dev/null and b/wtfpsbooster/wtfpsbooster_2_TemporaryKey.pfx differ