Launch installer on Windows

add_install_dlg_derived.cpp, interface_derived.hpp
+ correctly execute process to invoke UAC

globals.hpp
- disable DPI scaling due to Windows.h lunacy

Author: Ravbug

source/add_install_dlg_derived.cpp

@@ -9,13 +9,16 @@
 using namespace std;
 #define UPDATEEVT 2004
 #define REENABLEEVT 2005
+#define EXECUTEEVT 2006
 wxDEFINE_EVENT(updateEvt, wxCommandEvent);
 wxDEFINE_EVENT(reenableEvt, wxCommandEvent);
+wxDEFINE_EVENT(executeEvt, wxCommandEvent);
 
 //Declare events here
 wxBEGIN_EVENT_TABLE(AddNewInstallDlg, wxDialog)
 EVT_COMMAND(UPDATEEVT, updateEvt, AddNewInstallDlg::PopulateTable)
 EVT_COMMAND(REENABLEEVT, reenableEvt, AddNewInstallDlg::Reenable)
+EVT_COMMAND(EXECUTEEVT, executeEvt, AddNewInstallDlg::ExecuteProc)
 EVT_BUTTON(wxID_FILE,AddNewInstallDlg::InstallSelected)
 EVT_BUTTON(INSTALLVIAHUB,AddNewInstallDlg::InstallSelectedWithHub)
 EVT_SEARCHCTRL_SEARCH_BTN(wxID_FIND,AddNewInstallDlg::Filter)
@@ -172,12 +175,20 @@ void AddNewInstallDlg::InstallSelected(wxCommandEvent&){
             }
             else{
                 // write the file to temp location
-                auto outpath = fmt::format("{}{}{}{}.{}", cachedir,dirsep,"UnityDownloadAssistant",data.hashcode,installerExt);
+                auto outpath = fmt::format("{}{}{}.{}", cachedir,"UnityDownloadAssistant",data.hashcode,installerExt);
                 ofstream outfile(outpath, std::ios::binary);
                 outfile.write(r.text.c_str(),r.text.size());
 
                 // open the file
-                launch_process(fmt::format("open \"{}\"", outpath));
+                wxCommandEvent lnevt(executeEvt);
+#ifdef __APPLE__
+                lnevt.SetString(fmt::format("open \"{}\"", outpath));
+#elif defined _WIN32
+                lnevt.SetString(fmt::format("\"{}\"", outpath));
+#endif
+                lnevt.SetId(EXECUTEEVT);
+                wxPostEvent(this,lnevt);
+
                 wxCommandEvent evt(reenableEvt);
                 evt.SetId(REENABLEEVT);
                 wxPostEvent(this, evt);
@@ -206,3 +217,13 @@ void AddNewInstallDlg::Reenable(wxCommandEvent &){
     installViaHubBtn->Enable();
     installBtn->SetLabel("Install Selected");
 }
+
+void AddNewInstallDlg::ExecuteProc(wxCommandEvent& evt)
+{
+    auto cmd = evt.GetString();
+#ifdef _WIN32
+    ShellExecute(0, 0, cmd.c_str(), NULL, 0, SW_SHOW);
+#else
+    launch_process(cmd.ToStdString());
+#endif
+}

source/globals.h

@@ -28,7 +28,7 @@ struct editor{
 	static const std::string datapath = getpwuid(getuid())->pw_dir + std::string("/Library/Application Support/UnityHubNative");
 	static const char dirsep = '/';
 
-    static const std::string cachedir = getpwuid(getuid())->pw_dir + std::string("/Library/Caches/com.ravbug.UnityHubNative");
+    static const std::string cachedir = getpwuid(getuid())->pw_dir + std::string("/Library/Caches/com.ravbug.UnityHubNative/");
 	static const std::string installerExt = "dmg";
 
 	//where to find various Unity things on macOS
@@ -46,8 +46,6 @@ struct editor{
 #define popen _popen
 #define pclose _pclose
 #define mkdir _mkdir
-#include <Windows.h>
-#include <gdiplus.h>	
 #include <wx/wx.h>
 	static const std::string datapath = getenv("HOMEPATH") + std::string("\\AppData\\Roaming\\UnityHubNative");
 	static const char dirsep = '\\';
@@ -66,11 +64,13 @@ struct editor{
 	@returns the calculated display scale factor using GDI+
 	*/
 	inline float get_WIN_dpi_multiple() {
+		return 1;
+		/*
 		FLOAT dpiX;
 		HDC screen = GetDC(0);
 		dpiX = static_cast<FLOAT>(GetDeviceCaps(screen, LOGPIXELSX));
 		ReleaseDC(0, screen);
-		return dpiX / 96;
+		return dpiX / 96;*/
 	}
 
 	/**
@@ -157,15 +157,15 @@ inline bool file_exists(const std::string& name){
  @param command the shell command to run on the system
  @note The command passed to this function must be correct for the system it is running on. If it is not correct, the function will appear to do nothing.
  */
-inline void launch_process(const std::string& command) {
+inline void launch_process(const std::string& command, int flags = 0) {
 #if defined __APPLE__ || defined __linux__
 	//the '&' runs the command nonblocking, and >/dev/null 2>&1 destroys output
 	FILE* stream = popen(std::string(command + null_device + " &").c_str(), "r");
 	pclose(stream);
 
 #elif _WIN32
 	//call wxExecute with the Async flag
-	wxExecute(wxString(command),0);
+	wxExecute(wxString(command),flags);
 
 #endif
 }

source/interface_derived.hpp

@@ -239,6 +239,7 @@ class AddNewInstallDlg : AddNewInstallDlgBase{
     void InstallSelectedWithHub(wxCommandEvent&);
     void Filter(wxCommandEvent&);
     void Reenable(wxCommandEvent&);
+	void ExecuteProc(wxCommandEvent&);
 
     void PopulateWithFilter(const std::function<bool(const version&)>);
     wxDECLARE_EVENT_TABLE();