Qt: Add steam shortcuts

Author: Megamouse

rpcs3/rpcs3.cpp

@@ -131,7 +131,7 @@ std::set<std::string> get_one_drive_paths()
 		do
 		{
 			path_buffer.resize(path_buffer.size() + MAX_PATH);
-			DWORD buffer_size = static_cast<DWORD>(path_buffer.size() - 1);
+			DWORD buffer_size = static_cast<DWORD>((path_buffer.size() - 1) * sizeof(wchar_t));
 			status = RegQueryValueExW(hkey, L"UserFolder", NULL, &type, reinterpret_cast<LPBYTE>(path_buffer.data()), &buffer_size);
 		}
 		while (status == ERROR_MORE_DATA);

rpcs3/rpcs3.vcxproj

@@ -891,6 +891,7 @@
     <ClCompile Include="rpcs3qt\shortcut_settings.cpp" />
     <ClCompile Include="rpcs3qt\shortcut_utils.cpp" />
     <ClCompile Include="rpcs3qt\skylander_dialog.cpp" />
+    <ClCompile Include="rpcs3qt\steam_utils.cpp" />
     <ClCompile Include="rpcs3qt\system_cmd_dialog.cpp" />
     <ClCompile Include="rpcs3qt\table_item_delegate.cpp" />
     <ClCompile Include="rpcs3qt\tooltips.cpp" />
@@ -1719,6 +1720,7 @@
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DMINIUPNP_STATICLIB -DHAVE_SDL3 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_CONCURRENT_LIB -DQT_MULTIMEDIA_LIB -DQT_MULTIMEDIAWIDGETS_LIB -DQT_SVG_LIB -D%(PreprocessorDefinitions) "-I.\..\3rdparty\SoundTouch\soundtouch\include" "-I.\..\3rdparty\cubeb\extra" "-I.\..\3rdparty\cubeb\cubeb\include" "-I.\..\3rdparty\protobuf\protobuf\src" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\libsdl-org\SDL\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
     </CustomBuild>
     <ClInclude Include="rpcs3qt\shortcut_utils.h" />
+    <ClInclude Include="rpcs3qt\steam_utils.h" />
     <ClInclude Include="rpcs3qt\stylesheets.h" />
     <CustomBuild Include="rpcs3qt\skylander_dialog.h">
       <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>

rpcs3/rpcs3.vcxproj.filters

@@ -1278,6 +1278,9 @@
     <ClCompile Include="rpcs3qt\log_level_dialog.cpp">
       <Filter>Gui\settings</Filter>
     </ClCompile>
+    <ClCompile Include="rpcs3qt\steam_utils.cpp">
+      <Filter>Gui\utils</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Input\ds4_pad_handler.h">
@@ -1523,6 +1526,9 @@
     <ClInclude Include="rpcs3qt\log_level_dialog.h">
       <Filter>Gui\settings</Filter>
     </ClInclude>
+    <ClInclude Include="rpcs3qt\steam_utils.h">
+      <Filter>Gui\utils</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="resource.h">

rpcs3/rpcs3qt/CMakeLists.txt

@@ -104,6 +104,7 @@ add_library(rpcs3_ui STATIC
     shortcut_settings.cpp
     skylander_dialog.cpp
     sound_effect_manager_dialog.cpp
+    steam_utils.cpp
     syntax_highlighter.cpp
     system_cmd_dialog.cpp
     table_item_delegate.cpp

rpcs3/rpcs3qt/debugger_frame.cpp

@@ -1093,7 +1093,7 @@ void debugger_frame::UpdateUnitList()
 			idm::select<named_thread<ppu_thread>>(on_select, idm::unlocked);
 		}
 
-		m_hw_ppu_idx = cpu_list.size() + 1; // Account for NoThreadString thread
+		m_hw_ppu_idx = ::size32(cpu_list) + 1; // Account for NoThreadString thread
 
 		for (u32 i = 0; i < g_cfg.core.ppu_threads + 0u; i++)
 		{

rpcs3/rpcs3qt/game_list_actions.cpp

@@ -1507,7 +1507,7 @@ void game_list_actions::CreateShortcuts(const std::vector<game_info>& games, con
 			continue;
 		}
 
-		for (const gui::utils::shortcut_location& location : locations)
+		for (gui::utils::shortcut_location location : locations)
 		{
 			std::string destination;
 
@@ -1519,6 +1519,9 @@ void game_list_actions::CreateShortcuts(const std::vector<game_info>& games, con
 			case gui::utils::shortcut_location::applications:
 				destination = "application menu";
 				break;
+			case gui::utils::shortcut_location::steam:
+				destination = "Steam";
+				break;
 #ifdef _WIN32
 			case gui::utils::shortcut_location::rpcs3_shortcuts:
 				destination = "/games/shortcuts/";

rpcs3/rpcs3qt/game_list_context_menu.cpp

@@ -6,6 +6,7 @@
 #include "input_dialog.h"
 #include "qt_utils.h"
 #include "shortcut_utils.h"
+#include "steam_utils.h"
 #include "settings_dialog.h"
 #include "pad_settings_dialog.h"
 #include "patch_manager_dialog.h"
@@ -273,6 +274,7 @@ void game_list_context_menu::show_single_selection_context_menu(const game_info&
 	{
 		m_game_list_actions->CreateShortcuts({gameinfo}, {gui::utils::shortcut_location::desktop});
 	});
+
 #ifdef _WIN32
 	QAction* create_start_menu_shortcut = manage_game_menu->addAction(tr("&Create Start Menu Shortcut"));
 #elif defined(__APPLE__)
@@ -285,6 +287,16 @@ void game_list_context_menu::show_single_selection_context_menu(const game_info&
 		m_game_list_actions->CreateShortcuts({gameinfo}, {gui::utils::shortcut_location::applications});
 	});
 
+	if constexpr (gui::utils::steam_supported())
+	{
+		QAction* create_steam_shortcut = manage_game_menu->addAction(tr("&Create Steam Shortcut"));
+		connect(create_steam_shortcut, &QAction::triggered, this, [this, gameinfo]()
+		{
+			m_game_list_actions->CreateShortcuts({gameinfo}, {gui::utils::shortcut_location::steam});
+		});
+		create_steam_shortcut->setEnabled(gui::utils::steam_shortcut::steam_installed());
+	}
+
 	manage_game_menu->addSeparator();
 
 	// Hide/rename game in game list
@@ -843,6 +855,16 @@ void game_list_context_menu::show_multi_selection_context_menu(const std::vector
 		m_game_list_actions->CreateShortcuts(games, {gui::utils::shortcut_location::applications});
 	});
 
+	if constexpr (gui::utils::steam_supported())
+	{
+		QAction* create_steam_shortcut = manage_game_menu->addAction(tr("&Create Steam Shortcut"));
+		connect(create_steam_shortcut, &QAction::triggered, this, [this, games]()
+		{
+			m_game_list_actions->CreateShortcuts(games, {gui::utils::shortcut_location::steam});
+		});
+		create_steam_shortcut->setEnabled(gui::utils::steam_shortcut::steam_installed());
+	}
+
 	manage_game_menu->addSeparator();
 
 	// Hide game in game list

rpcs3/rpcs3qt/main_window.cpp

@@ -35,9 +35,9 @@
 #include "camera_settings_dialog.h"
 #include "ps_move_tracker_dialog.h"
 #include "ipc_settings_dialog.h"
-#include "shortcut_utils.h"
 #include "config_checker.h"
 #include "shortcut_dialog.h"
+#include "steam_utils.h"
 #include "system_cmd_dialog.h"
 #include "emulated_pad_settings_dialog.h"
 #include "emulated_logitech_g27_settings_dialog.h"
@@ -935,9 +935,8 @@ bool main_window::HandlePackageInstallation(QStringList file_paths, bool from_bo
 	}
 
 	std::vector<compat::package_info> packages;
+	std::set<gui::utils::shortcut_location> shortcut_locations;
 	bool precompile_caches = false;
-	bool create_desktop_shortcuts = false;
-	bool create_app_shortcut = false;
 	bool canceled = false;
 
 	game_compatibility* compat = m_game_list_frame ? m_game_list_frame->GetGameCompatibility() : nullptr;
@@ -954,8 +953,15 @@ bool main_window::HandlePackageInstallation(QStringList file_paths, bool from_bo
 
 		packages = dlg.get_paths_to_install();
 		precompile_caches = dlg.precompile_caches();
-		create_desktop_shortcuts = dlg.create_desktop_shortcuts();
-		create_app_shortcut = dlg.create_app_shortcut();
+
+		if (dlg.create_desktop_shortcuts())
+			shortcut_locations.insert(gui::utils::shortcut_location::desktop);
+
+		if (dlg.create_app_shortcut())
+			shortcut_locations.insert(gui::utils::shortcut_location::applications);
+
+		if (dlg.create_steam_shortcut())
+			shortcut_locations.insert(gui::utils::shortcut_location::steam);
 	});
 	dlg.exec();
 
@@ -1136,7 +1142,7 @@ bool main_window::HandlePackageInstallation(QStringList file_paths, bool from_bo
 
 		if (!bootable_paths_installed.empty())
 		{
-			m_game_list_frame->AddRefreshedSlot([this, create_desktop_shortcuts, precompile_caches, create_app_shortcut, paths = std::move(bootable_paths_installed)](std::set<std::string>& claimed_paths) mutable
+			m_game_list_frame->AddRefreshedSlot([this, shortcut_locations, precompile_caches, paths = std::move(bootable_paths_installed)](std::set<std::string>& claimed_paths) mutable
 			{
 				// Try to claim operations on ID
 				for (auto it = paths.begin(); it != paths.end();)
@@ -1154,7 +1160,7 @@ bool main_window::HandlePackageInstallation(QStringList file_paths, bool from_bo
 					}
 				}
 
-				CreateShortCuts(paths, create_desktop_shortcuts, create_app_shortcut);
+				CreateShortCuts(paths, shortcut_locations);
 
 				if (precompile_caches)
 				{
@@ -2370,6 +2376,7 @@ void main_window::ShowOptionalGamePreparations(const QString& title, const QStri
 #else
 	QCheckBox* quick_check = new QCheckBox(tr("Add launcher shortcut(s)"));
 #endif
+	QCheckBox* steam_check = nullptr;
 	QLabel* label = new QLabel(tr("%1\nWould you like to precompile caches and install shortcuts to the installed software? (%2 new software detected)\n\n").arg(message).arg(bootable_paths.size()), dlg);
 
 	vlayout->addWidget(label);
@@ -2381,6 +2388,13 @@ void main_window::ShowOptionalGamePreparations(const QString& title, const QStri
 	vlayout->addWidget(quick_check);
 	vlayout->addStretch(3);
 
+	if constexpr (gui::utils::steam_supported())
+	{
+		steam_check = new QCheckBox(tr("Add Steam shortcut(s)"));
+		vlayout->addWidget(steam_check);
+		vlayout->addStretch(3);
+	}
+
 	QDialogButtonBox* btn_box = new QDialogButtonBox(QDialogButtonBox::Ok);
 
 	vlayout->addWidget(btn_box);
@@ -2389,13 +2403,22 @@ void main_window::ShowOptionalGamePreparations(const QString& title, const QStri
 	connect(btn_box, &QDialogButtonBox::accepted, this, [=, this, paths = std::move(bootable_paths)]()
 	{
 		const bool precompile_caches = precompile_check->isChecked();
-		const bool create_desktop_shortcuts = desk_check->isChecked();
-		const bool create_app_shortcut = quick_check->isChecked();
+
+		std::set<gui::utils::shortcut_location> shortcut_locations;
+
+		if (desk_check->isChecked())
+			shortcut_locations.insert(gui::utils::shortcut_location::desktop);
+
+		if (quick_check->isChecked())
+			shortcut_locations.insert(gui::utils::shortcut_location::applications);
+
+		if (steam_check && steam_check->isChecked())
+			shortcut_locations.insert(gui::utils::shortcut_location::steam);
 
 		dlg->hide();
 		dlg->accept();
 
-		CreateShortCuts(paths, create_desktop_shortcuts, create_app_shortcut);
+		CreateShortCuts(paths, shortcut_locations);
 
 		if (precompile_caches)
 		{
@@ -2407,52 +2430,40 @@ void main_window::ShowOptionalGamePreparations(const QString& title, const QStri
 	dlg->open();
 }
 
-void main_window::CreateShortCuts(const std::map<std::string, QString>& paths, bool create_desktop_shortcuts, bool create_app_shortcut)
+void main_window::CreateShortCuts(const std::map<std::string, QString>& paths, std::set<gui::utils::shortcut_location> locations)
 {
 	if (paths.empty()) return;
 
-	std::set<gui::utils::shortcut_location> locations;
-
 #ifdef _WIN32
 	locations.insert(gui::utils::shortcut_location::rpcs3_shortcuts);
-#endif
-	if (create_desktop_shortcuts)
+#else
+	if (locations.empty())
 	{
-		locations.insert(gui::utils::shortcut_location::desktop);
+		return;
 	}
+#endif
 
-	if (create_app_shortcut)
-	{
-		locations.insert(gui::utils::shortcut_location::applications);
-	}
+	std::vector<game_info> game_data_shortcuts;
 
-	if (!locations.empty())
+	for (const auto& [boot_path, title_id] : paths)
 	{
-		std::vector<game_info> game_data_shortcuts;
-
-		for (const auto& [boot_path, title_id] : paths)
+		for (const game_info& gameinfo : m_game_list_frame->GetGameInfo())
 		{
-			for (const game_info& gameinfo : m_game_list_frame->GetGameInfo())
+			if (gameinfo && gameinfo->info.serial == title_id.toStdString())
 			{
-				if (gameinfo && gameinfo->info.serial == title_id.toStdString())
+				if (Emu.IsPathInsideDir(boot_path, gameinfo->info.path))
 				{
-					if (Emu.IsPathInsideDir(boot_path, gameinfo->info.path))
-					{
-						if (!locations.empty())
-						{
-							game_data_shortcuts.push_back(gameinfo);
-						}
-					}
-
-					break;
+					game_data_shortcuts.push_back(gameinfo);
 				}
+
+				break;
 			}
 		}
+	}
 
-		if (!game_data_shortcuts.empty() && !locations.empty())
-		{
-			m_game_list_frame->actions()->CreateShortcuts(game_data_shortcuts, locations);
-		}
+	if (!game_data_shortcuts.empty())
+	{
+		m_game_list_frame->actions()->CreateShortcuts(game_data_shortcuts, locations);
 	}
 }
 

rpcs3/rpcs3qt/main_window.h

@@ -10,6 +10,7 @@
 #include "update_manager.h"
 #include "settings.h"
 #include "shortcut_handler.h"
+#include "shortcut_utils.h"
 #include "Emu/config_mode.h"
 #include "Emu/System.h"
 
@@ -145,7 +146,7 @@ private Q_SLOTS:
 	static bool InstallFileInExData(const std::string& extension, const QString& path, const std::string& filename);
 
 	bool HandlePackageInstallation(QStringList file_paths, bool from_boot);
-	void CreateShortCuts(const std::map<std::string, QString>& paths, bool create_desktop_shortcuts, bool create_app_shortcut);
+	void CreateShortCuts(const std::map<std::string, QString>& paths, std::set<gui::utils::shortcut_location> locations);
 
 	void HandlePupInstallation(const QString& file_path, const QString& dir_path = "");
 	void ExtractPup();

rpcs3/rpcs3qt/pkg_install_dialog.cpp

@@ -3,6 +3,7 @@
 #include "numbered_widget_item.h"
 #include "richtext_item_delegate.h"
 #include "qt_utils.h"
+#include "steam_utils.h"
 
 #include "Emu/system_utils.hpp"
 #include "Utilities/File.h"
@@ -186,6 +187,13 @@ pkg_install_dialog::pkg_install_dialog(const QStringList& paths, game_compatibil
 #endif
 	connect(quick_check, &QCheckBox::checkStateChanged, this, [this](Qt::CheckState state){ m_create_app_shortcut = state != Qt::CheckState::Unchecked; });
 
+	QCheckBox* steam_check = nullptr;
+	if constexpr (gui::utils::steam_supported())
+	{
+		steam_check = new QCheckBox(tr("Add Steam shortcut(s)"));
+		connect(steam_check, &QCheckBox::checkStateChanged, this, [this](Qt::CheckState state){ m_create_steam_shortcut = state != Qt::CheckState::Unchecked; });
+	}
+
 	QVBoxLayout* vbox = new QVBoxLayout;
 	vbox->addWidget(description);
 	if (hbox) vbox->addLayout(hbox);
@@ -194,6 +202,10 @@ pkg_install_dialog::pkg_install_dialog(const QStringList& paths, game_compatibil
 	vbox->addWidget(precompile_check);
 	vbox->addWidget(desk_check);
 	vbox->addWidget(quick_check);
+	if (steam_check)
+	{
+		vbox->addWidget(steam_check);
+	}
 	vbox->addWidget(installation_info);
 	vbox->addWidget(buttons);