Qt: add (very basic) system command utility

rpcs3/Emu/Cell/Modules/cellNetCtl.cpp

@@ -90,6 +90,23 @@ void fmt_class_string<CellNetCtlState>::format(std::string& out, u64 arg)
 	});
 }
 
+struct CellGameUpdateResult
+{
+	be_t<s32> status; // CellGameUpdateResultStatus
+	be_t<s32> error_code;
+	char app_ver[CELL_GAME_SYSP_APP_VER_SIZE];
+	char padding[2];
+};
+
+struct CellGameUpdateParam
+{
+	be_t<u32> size;
+	be_t<u32> cid;
+};
+
+using CellGameUpdateCallback = void(s32 status, s32 error_code, vm::ptr<void> userdata);
+using CellGameUpdateCallbackEx = void(vm::ptr<CellGameUpdateResult> result, vm::ptr<void> userdata);
+
 error_code cellNetCtlInit()
 {
 	cellNetCtl.warning("cellNetCtlInit()");

rpcs3/Emu/Cell/Modules/cellNetCtl.h

@@ -1,7 +1,5 @@
 #pragma once
 
-#include "cellGame.h"
-
 #include "Emu/Memory/vm_ptr.h"
 
 // Error Codes
@@ -335,20 +333,3 @@ enum
 	CELL_GAMEUPDATE_RESULT_STATUS_ABORTED              = 6,
 	CELL_GAMEUPDATE_RESULT_STATUS_SYSTEM_UPDATE_NEEDED = 7
 };
-
-struct CellGameUpdateResult
-{
-	be_t<s32> status; // CellGameUpdateResultStatus
-	be_t<s32> error_code;
-	char app_ver[CELL_GAME_SYSP_APP_VER_SIZE];
-	char padding[2];
-};
-
-struct CellGameUpdateParam
-{
-	be_t<u32> size;
-	be_t<u32> cid;
-};
-
-using CellGameUpdateCallback = void(s32 status, s32 error_code, vm::ptr<void> userdata);
-using CellGameUpdateCallbackEx = void(vm::ptr<CellGameUpdateResult> result, vm::ptr<void> userdata);

rpcs3/rpcs3.vcxproj

@@ -377,6 +377,9 @@
     <ClCompile Include="QTGeneratedFiles\Debug\moc_syntax_highlighter.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="QTGeneratedFiles\Debug\moc_system_cmd_dialog.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Debug\moc_tooltips.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
     </ClCompile>
@@ -611,6 +614,9 @@
     <ClCompile Include="QTGeneratedFiles\Release\moc_syntax_highlighter.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
+    <ClCompile Include="QTGeneratedFiles\Release\moc_system_cmd_dialog.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="QTGeneratedFiles\Release\moc_tooltips.cpp">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
     </ClCompile>
@@ -689,6 +695,7 @@
     <ClCompile Include="rpcs3qt\shortcut_settings.cpp" />
     <ClCompile Include="rpcs3qt\shortcut_utils.cpp" />
     <ClCompile Include="rpcs3qt\skylander_dialog.cpp" />
+    <ClCompile Include="rpcs3qt\system_cmd_dialog.cpp" />
     <ClCompile Include="rpcs3qt\tooltips.cpp" />
     <ClCompile Include="rpcs3qt\update_manager.cpp" />
     <ClCompile Include="rpcs3qt\qt_camera_video_surface.cpp" />
@@ -1354,6 +1361,16 @@
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
       <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 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -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\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
     </CustomBuild>
+    <CustomBuild Include="rpcs3qt\system_cmd_dialog.h">
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Moc%27ing %(Identity)...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">"$(QTDIR)\bin\moc.exe"  "%(FullPath)" -o ".\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp"  -D_WINDOWS -DUNICODE -DWIN32 -DWIN64 -DWIN32_LEAN_AND_MEAN -DHAVE_VULKAN -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DQT_WINEXTRAS_LIB -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\flatbuffers\include" "-I.\..\3rdparty\wolfssl\wolfssl" "-I.\..\3rdparty\curl\curl\include" "-I.\..\3rdparty\libusb\libusb\libusb" "-I$(VULKAN_SDK)\Include" "-I.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\debug" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
+      <AdditionalInputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(QTDIR)\bin\moc.exe;%(FullPath)</AdditionalInputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Moc%27ing %(Identity)...</Message>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">.\QTGeneratedFiles\$(ConfigurationName)\moc_%(Filename).cpp</Outputs>
+      <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 -DHAVE_SDL2 -DWITH_DISCORD_RPC -DQT_NO_DEBUG -DQT_WIDGETS_LIB -DQT_GUI_LIB -DQT_CORE_LIB -DNDEBUG -DQT_WINEXTRAS_LIB -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\flatbuffers\include" "-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.\..\3rdparty\XAudio2Redist\include" "-I$(QTDIR)\include" "-I$(QTDIR)\include\QtWidgets" "-I$(QTDIR)\include\QtGui" "-I$(QTDIR)\include\QtANGLE" "-I$(QTDIR)\include\QtCore" "-I.\release" "-I$(QTDIR)\mkspecs\win32-msvc2015" "-I.\QTGeneratedFiles\$(ConfigurationName)" "-I.\QTGeneratedFiles" "-I$(QTDIR)\include\QtWinExtras" "-I$(QTDIR)\include\QtConcurrent" "-I$(QTDIR)\include\QtMultimedia" "-I$(QTDIR)\include\QtMultimediaWidgets" "-I$(QTDIR)\include\QtSvg"</Command>
+    </CustomBuild>
     <ClInclude Include="rpcs3qt\uuid.h" />
     <ClInclude Include="rpcs3qt\_discord_utils.h" />
     <CustomBuild Include="rpcs3qt\find_dialog.h">

rpcs3/rpcs3.vcxproj.filters

@@ -927,6 +927,15 @@
     <ClCompile Include="rpcs3qt\progress_indicator.cpp">
       <Filter>Gui\progress</Filter>
     </ClCompile>
+    <ClCompile Include="rpcs3qt\system_cmd_dialog.cpp">
+      <Filter>Gui\dev tools</Filter>
+    </ClCompile>
+    <ClCompile Include="QTGeneratedFiles\Debug\moc_system_cmd_dialog.cpp">
+      <Filter>Generated Files\Debug</Filter>
+    </ClCompile>
+    <ClCompile Include="QTGeneratedFiles\Release\moc_system_cmd_dialog.cpp">
+      <Filter>Generated Files\Release</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="Input\ds4_pad_handler.h">
@@ -1372,6 +1381,9 @@
     <CustomBuild Include="rpcs3qt\shortcut_dialog.ui">
       <Filter>Form Files</Filter>
     </CustomBuild>
+    <CustomBuild Include="rpcs3qt\system_cmd_dialog.h">
+      <Filter>Gui\dev tools</Filter>
+    </CustomBuild>
   </ItemGroup>
   <ItemGroup>
     <Image Include="rpcs3.ico" />

rpcs3/rpcs3qt/CMakeLists.txt

@@ -80,6 +80,7 @@ set(SRC_FILES
     shortcut_settings.cpp
     skylander_dialog.cpp
     syntax_highlighter.cpp
+    system_cmd_dialog.cpp
     tooltips.cpp
     trophy_manager_dialog.cpp
     trophy_notification_frame.cpp

rpcs3/rpcs3qt/main_window.cpp

@@ -33,6 +33,7 @@
 #include "shortcut_utils.h"
 #include "config_checker.h"
 #include "shortcut_dialog.h"
+#include "system_cmd_dialog.h"
 
 #include <thread>
 #include <charconv>
@@ -1867,11 +1868,6 @@ void main_window::OnEmuStop()
 	ui->actionManage_Users->setEnabled(true);
 	ui->confCamerasAct->setEnabled(true);
 
-	if (std::exchange(m_sys_menu_opened, false))
-	{
-		ui->sysSendOpenMenuAct->setText(tr("Send open system menu cmd"));
-	}
-
 	// Refresh game list in order to update time played
 	if (m_game_list_frame)
 	{
@@ -1883,6 +1879,12 @@ void main_window::OnEmuStop()
 	{
 		m_kernel_explorer->close();
 	}
+
+	// Close systen command dialog if running
+	if (m_system_cmd_dialog)
+	{
+		m_system_cmd_dialog->close();
+	}
 }
 
 void main_window::OnEmuReady() const
@@ -1925,14 +1927,12 @@ void main_window::EnableMenus(bool enabled) const
 	ui->sysStopAct->setEnabled(enabled);
 	ui->sysRebootAct->setEnabled(enabled);
 
-	// PS3 Commands
-	ui->sysSendOpenMenuAct->setEnabled(enabled);
-
 	// Tools
 	ui->toolskernel_explorerAct->setEnabled(enabled);
 	ui->toolsmemory_viewerAct->setEnabled(enabled);
 	ui->toolsRsxDebuggerAct->setEnabled(enabled);
 	ui->toolsStringSearchAct->setEnabled(enabled);
+	ui->toolsSystemCommandsAct->setEnabled(enabled);
 	ui->actionCreate_RSX_Capture->setEnabled(enabled);
 	ui->actionCreate_Savestate->setEnabled(enabled);
 }
@@ -2259,7 +2259,7 @@ void main_window::CreateConnects()
 	{
 		// Enable/Disable Recent Games List
 		const bool stopped = Emu.IsStopped();
-		for (auto act : ui->bootRecentMenu->actions())
+		for (QAction* act : ui->bootRecentMenu->actions())
 		{
 			if (act != ui->freezeRecentAct && act != ui->clearRecentAct)
 			{
@@ -2275,7 +2275,7 @@ void main_window::CreateConnects()
 			return;
 		}
 		m_rg_entries.clear();
-		for (auto act : m_recent_game_acts)
+		for (QAction* act : m_recent_game_acts)
 		{
 			ui->bootRecentMenu->removeAction(act);
 		}
@@ -2344,16 +2344,6 @@ void main_window::CreateConnects()
 		m_gui_settings->SetValue(gui::fd_insert_disc, QFileInfo(dir_path).path());
 	});
 
-	connect(ui->sysSendOpenMenuAct, &QAction::triggered, this, [this]()
-	{
-		if (Emu.IsStopped()) return;
-
-		gui_log.notice("User triggered \"Send %s system menu command\" action in menu bar", m_sys_menu_opened ? "close" : "open");
-		sysutil_send_system_cmd(m_sys_menu_opened ? 0x0132 /* CELL_SYSUTIL_SYSTEM_MENU_CLOSE */ : 0x0131 /* CELL_SYSUTIL_SYSTEM_MENU_OPEN */, 0);
-		m_sys_menu_opened ^= true;
-		ui->sysSendOpenMenuAct->setText(tr("Send &%0 system menu cmd").arg(m_sys_menu_opened ? tr("close") : tr("open")));
-	});
-
 	const auto open_settings = [this](int tabIndex)
 	{
 		settings_dialog dlg(m_gui_settings, m_emu_settings, tabIndex, this);
@@ -2557,6 +2547,17 @@ void main_window::CreateConnects()
 			idm::make<memory_searcher_handle>(this, make_basic_ppu_disasm());
 	});
 
+	connect(ui->toolsSystemCommandsAct, &QAction::triggered, this, [this]
+	{
+		if (Emu.IsStopped()) return;
+		if (!m_system_cmd_dialog)
+		{
+			m_system_cmd_dialog = new system_cmd_dialog(this);
+			connect(m_system_cmd_dialog, &QDialog::finished, this, [this]() { m_system_cmd_dialog = nullptr; });
+		}
+		m_system_cmd_dialog->show();
+	});
+
 	connect(ui->toolsDecryptSprxLibsAct, &QAction::triggered, this, &main_window::DecryptSPRXLibraries);
 
 	connect(ui->toolsExtractMSELFAct, &QAction::triggered, this, &main_window::ExtractMSELF);

rpcs3/rpcs3qt/main_window.h

@@ -24,6 +24,7 @@ class gui_settings;
 class emu_settings;
 class persistent_settings;
 class kernel_explorer;
+class system_cmd_dialog;
 
 struct gui_game_info;
 
@@ -45,7 +46,6 @@ class main_window : public QMainWindow
 
 	std::unique_ptr<Ui::main_window> ui;
 
-	bool m_sys_menu_opened = false;
 	bool m_is_list_mode = true;
 	bool m_save_slider_pos = false;
 	int m_other_slider_pos = 0;
@@ -183,6 +183,7 @@ private Q_SLOTS:
 	debugger_frame* m_debugger_frame = nullptr;
 	game_list_frame* m_game_list_frame = nullptr;
 	kernel_explorer* m_kernel_explorer = nullptr;
+	system_cmd_dialog* m_system_cmd_dialog = nullptr;
 	std::shared_ptr<gui_settings> m_gui_settings;
 	std::shared_ptr<emu_settings> m_emu_settings;
 	std::shared_ptr<persistent_settings> m_persistent_settings;

rpcs3/rpcs3qt/main_window.ui

@@ -225,8 +225,6 @@
     <addaction name="separator"/>
     <addaction name="insertDiscAct"/>
     <addaction name="ejectDiscAct"/>
-    <addaction name="separator"/>
-    <addaction name="sysSendOpenMenuAct"/>
    </widget>
    <widget class="QMenu" name="menuConfiguration">
     <property name="title">
@@ -277,6 +275,7 @@
     <addaction name="toolsmemory_viewerAct"/>
     <addaction name="toolsRsxDebuggerAct"/>
     <addaction name="toolsStringSearchAct"/>
+    <addaction name="toolsSystemCommandsAct"/>
     <addaction name="patchCreatorAct"/>
     <addaction name="separator"/>
     <addaction name="toolsDecryptSprxLibsAct"/>
@@ -1247,6 +1246,14 @@
     <string>Shortcuts</string>
    </property>
   </action>
+  <action name="toolsSystemCommandsAct">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="text">
+    <string>System Commands</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="6" margin="11"/>
  <resources>