Revert "Add CPU affinity setting & fix process related settings (#4096)"

This reverts commit 77b8998.

Author: Dutchman101

Client/core/CClientVariables.cpp

@@ -357,7 +357,6 @@ void CClientVariables::LoadDefaults()
     DEFAULT("discord_rpc_share_data", false);                                         // Consistent Rich Presence data sharing
     DEFAULT("discord_rpc_share_data_firsttime", false);                               // Display the user data sharing consent dialog box - for the first time
     DEFAULT("browser_enable_gpu", true);                                              // Enable GPU in CEF? (allows stuff like WebGL to function)
-    DEFAULT("process_cpu_affinity", true);                                            // Set CPU 0 affinity to improve game performance and fix the known issue in single-threaded games
 
     if (!Exists("locale"))
     {

Client/core/CCore.cpp

@@ -1795,17 +1795,6 @@ void CCore::ApplyCoreInitSettings()
 
         SetApplicationSettingInt("reset-settings-revision", 21486);
     }
-
-    // Set process settings
-    HANDLE currProc = GetCurrentProcess();
-
-    // Process priority
-    int PriorityClassList[] = {NORMAL_PRIORITY_CLASS, ABOVE_NORMAL_PRIORITY_CLASS, HIGH_PRIORITY_CLASS};
-    SetPriorityClass(currProc, PriorityClassList[CVARS_GET_VALUE<int>("process_priority") % 3]);
-
-    // Process CPU affinity
-    if (CVARS_GET_VALUE<bool>("process_cpu_affinity"))
-        SetProcessAffinityMask(currProc, 1 << 0);
 }
 
 //

Client/core/CSettings.cpp

@@ -1207,12 +1207,6 @@ void CSettings::CreateGUI()
     m_pPhotoSavingCheckbox->AutoSize(NULL, 20.0f);
     vecTemp.fY += fLineHeight;
 
-    // Process affinity
-    m_pProcessAffinityCheckbox = reinterpret_cast<CGUICheckBox*>(pManager->CreateCheckBox(pTabAdvanced, _("Set CPU 0 affinity to improve game performance"), true));
-    m_pProcessAffinityCheckbox->SetPosition(CVector2D(vecTemp.fX, vecTemp.fY));
-    m_pProcessAffinityCheckbox->AutoSize(nullptr, 20.0f);
-    vecTemp.fY += fLineHeight;
-
     // Auto updater section label
     m_pAdvancedUpdaterLabel = reinterpret_cast<CGUILabel*>(pManager->CreateLabel(pTabAdvanced, _("Auto updater")));
     m_pAdvancedUpdaterLabel->SetPosition(CVector2D(vecTemp.fX - 10.0f, vecTemp.fY));
@@ -3234,22 +3228,6 @@ void CSettings::LoadData()
     CVARS_GET("photosaving", bVar);
     m_pPhotoSavingCheckbox->SetSelected(bVar);
 
-    // Process CPU Affinity
-    CVARS_GET("process_cpu_affinity", bVar);
-    m_pProcessAffinityCheckbox->SetSelected(bVar);
-
-    DWORD_PTR affinityMask = 0;
-    if (bVar)
-        affinityMask = 1 << 0; // CPU 0 only
-    else
-    {
-        SYSTEM_INFO sysInfo;
-        GetSystemInfo(&sysInfo);
-
-        affinityMask = (1 << sysInfo.dwNumberOfProcessors) - 1; // All cores (default)
-    }
-    SetProcessAffinityMask(GetCurrentProcess(), affinityMask);
-
     // Update build type
     CVARS_GET("update_build_type", iVar);
     if (iVar == 0 || iVar == 1)
@@ -3646,22 +3624,6 @@ void CSettings::SaveData()
     CVARS_SET("photosaving", photoSaving);
     CScreenShot::SetPhotoSavingInsideDocuments(photoSaving);
 
-    // Process CPU Affinity
-    bool cpuAffinity = m_pProcessAffinityCheckbox->GetSelected();
-    CVARS_SET("process_cpu_affinity", cpuAffinity);
-
-    DWORD_PTR affinityMask = 0;
-    if (cpuAffinity)
-        affinityMask = 1 << 0;  // CPU 0 only
-    else
-    {
-        SYSTEM_INFO sysInfo;
-        GetSystemInfo(&sysInfo);
-
-        affinityMask = (1 << sysInfo.dwNumberOfProcessors) - 1; // All cores (default)
-    }
-    SetProcessAffinityMask(GetCurrentProcess(), affinityMask);
-
     // Debug setting
     if (CGUIListItem* pSelected = m_pDebugSettingCombo->GetSelectedItem())
     {

Client/core/CSettings.h

@@ -216,7 +216,6 @@ class CSettings
     CGUICheckBox*  m_pWin8ColorCheckBox;
     CGUICheckBox*  m_pWin8MouseCheckBox;
     CGUICheckBox*  m_pPhotoSavingCheckbox;
-    CGUICheckBox*  m_pProcessAffinityCheckbox;
     CGUILabel*     m_pUpdateBuildTypeLabel;
     CGUIComboBox*  m_pUpdateBuildTypeCombo;
     CGUILabel*     m_pUpdateAutoInstallLabel;