AIO: Merge Vista/7/10, don't delete existing config when updating

source-code/source/plugins/Launcher/ConfigOption.h

@@ -927,10 +927,15 @@ public:
 		int width = GetPrivateProfileIntW(_iniSectionName, _iniVarName, -39, _iniFilePath);
 		int height = GetPrivateProfileIntW(_iniSectionName, _iniVarName2, -39, _iniFilePath);
 		if (width == -39 || height == -39) {
-			tempSysStr = Convert::ToInt32(_defaultVal.width).ToString() + L"x" + Convert::ToInt32(_defaultVal.height).ToString();
-			combobox->Text = tempSysStr;
+			if (_defaultVal.width == -1 || _defaultVal.height == -1)
+				width = -1;
+			else
+			{
+				tempSysStr = Convert::ToInt32(_defaultVal.width).ToString() + L"x" + Convert::ToInt32(_defaultVal.height).ToString();
+				combobox->Text = tempSysStr;
+			}
 		}
-		else if (width == -1 || height == -1) { // -1 -> Match window/screen
+		if (width == -1 || height == -1) { // -1 -> Match window/screen
 			if (_opts & RESOPT_INCLUDE_MATCH_WINDOW)
 				combobox->Text = RESOPT_MATCH_WINDOW_TEXT;
 			else if (_opts & RESOPT_INCLUDE_MATCH_SCREEN)

source-code/source/plugins/Launcher/framework.h

@@ -273,9 +273,7 @@ ConfigOptionBase* componentsArray[] = {
 
 	new BooleanOption(L"player_data_manager", COMPONENTS_SECTION, COMPONENTS_FILE, L"Player Data Manager", L"Loads user-defined values into the PlayerData struct.\nRequired for modules and game mode modifiers.", false, true),
 
-	new BooleanOption(L"frame_rate_manager", COMPONENTS_SECTION, COMPONENTS_FILE, L"Frame Rate Manager", L"Adjusts animations to the correct speed at different frame rates.\nOnly needed when FPS isn't locket at 60.", false, true),
-
-	new BooleanOption(L"stage_manager", COMPONENTS_SECTION, COMPONENTS_FILE, L"Stage Manager", L"Allows for playing unlimited songs per session.", false, true),
+	new BooleanOption(L"frame_rate_manager", COMPONENTS_SECTION, COMPONENTS_FILE, L"Frame Rate Manager", L"Adjusts animations to the correct speed at different frame rates.\nOnly needed when FPS isn't locked at 60.", false, true),
 
 	new BooleanOption(L"fast_loader", COMPONENTS_SECTION, COMPONENTS_FILE, L"Fast Loader", L"Skip or speed up unnecessary loading steps.", false, true),
 

source-code/source/plugins/Launcher/ui.h

@@ -33,17 +33,18 @@ namespace Launcher {
 			this->ClientSize = Drawing::Size(444, 323);
 			TabPadding^ tabpad = gcnew TabPadding(tabControl);
 
-
 			// if components.ini has no section name, add one
 			if (!IsLineInFile("[components]", COMPONENTS_FILE))
 			{
 				PrependFile("[components]\n", COMPONENTS_FILE);
+				*ComponentsConfigChanged = true;
 			}
 
 			// if playerdata.ini has no section name, add one
 			if (!IsLineInFile("[playerdata]", PLAYERDATA_FILE))
 			{
 				PrependFile("[playerdata]\n", PLAYERDATA_FILE);
+				*PlayerdataConfigChanged = true;
 			}
 
 			// if keyconfig.ini has no section name, add one

source-code/source/plugins/TLAC/Components/ComponentsManager.cpp

@@ -7,7 +7,6 @@
 #include "PlayerDataManager.h"
 #include "FrameRateManager.h"
 #include "FastLoader.h"
-#include "StageManager.h"
 #include "CameraController.h"
 #include "DebugComponent.h"
 #include "ScaleComponent.h"
@@ -43,7 +42,6 @@ namespace TLAC::Components
 			new FastLoader(),
 			new ScaleComponent(),
 			new ScoreSaver(),
-			new StageManager(),
 			new CameraController(),
 			new DebugComponent(),
 		};

source-code/source/plugins/TLAC/Components/StageManager.cpp

@@ -1,41 +0,0 @@
-#include "StageManager.h"
-#include "../Constants.h"
-#include <windows.h>
-
-namespace TLAC::Components
-{
-	StageManager::StageManager()
-	{
-	}
-
-	StageManager::~StageManager()
-	{
-	}
-
-	const char* StageManager::GetDisplayName()
-	{
-		return "stage_manager";
-	}
-
-	void StageManager::Initialize(ComponentsManager*)
-	{
-		// add the offset between moving 2 into ebx and the start of the function
-		int32_t* playCount = (int32_t*)(((uint8_t*)PLAYS_PER_SESSION_GETTER_ADDRESS) + 0x7);
-
-		DWORD oldProtect;
-		VirtualProtect(playCount, sizeof(int32_t), PAGE_EXECUTE_READWRITE, &oldProtect);
-
-		// set ’Ê�탂�[ƒh per session play count
-		*playCount = GetPlayCount();
-	}
-
-	void StageManager::Update()
-	{
-		return;
-	}
-
-	int32_t StageManager::GetPlayCount()
-	{
-		return INT32_MAX;
-	}
-}

source-code/source/plugins/TLAC/Components/StageManager.h

@@ -1,21 +0,0 @@
-#pragma once
-#include "EmulatorComponent.h"
-#include <stdint.h>
-
-namespace TLAC::Components
-{
-	class StageManager : public EmulatorComponent
-	{
-	public:
-		StageManager();
-		~StageManager();
-
-		virtual const char* GetDisplayName() override;
-
-		virtual void Initialize(ComponentsManager*) override;
-		virtual void Update() override;
-
-	private:
-		int32_t GetPlayCount();
-	};
-}

source-code/source/plugins/TLAC/Input/DirectInput/GenericUsb/GenericUsbInput.cpp

@@ -5,7 +5,7 @@
 #include "../../../FileSystem/ConfigFile.h"
 #include <stdio.h>
 
-const std::string GU_CONFIG_FILE_NAME = "genericusbinput.ini";
+const std::string GU_CONFIG_FILE_NAME = "keyconfig.ini";
 
 namespace TLAC::Input
 {

source-code/source/plugins/TLAC/TLAC.vcxproj

@@ -133,7 +133,6 @@
     <ClInclude Include="Components\PlayerDataManager.h" />
     <ClInclude Include="Components\ScaleComponent.h" />
     <ClInclude Include="Components\ScoreSaver.h" />
-    <ClInclude Include="Components\StageManager.h" />
     <ClInclude Include="Constants.h" />
     <ClInclude Include="FileSystem\ConfigFile.h" />
     <ClInclude Include="FileSystem\TextFile.h" />
@@ -192,7 +191,6 @@
     <ClCompile Include="Components\PlayerDataManager.cpp" />
     <ClCompile Include="Components\ScaleComponent.cpp" />
     <ClCompile Include="Components\ScoreSaver.cpp" />
-    <ClCompile Include="Components\StageManager.cpp" />
     <ClCompile Include="dllmain.cpp" />
     <ClCompile Include="FileSystem\ConfigFile.cpp" />
     <ClCompile Include="FileSystem\TextFile.cpp" />

source-code/source/plugins/TLAC/TLAC.vcxproj.filters

@@ -51,9 +51,6 @@
     <ClInclude Include="Components\PlayerDataManager.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="Components\StageManager.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="Components\Input\InputBufferType.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -245,9 +242,6 @@
     <ClCompile Include="Components\PlayerDataManager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="Components\StageManager.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="Components\Input\InputEmulator.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>