[Workspaces] Saving app properties on launch and recapture

.github/actions/spell-check/expect.txt

@@ -768,6 +768,7 @@ LOWORD
 lparam
 LPBITMAPINFOHEADER
 LPCITEMIDLIST
+LPCLSID
 lpcmi
 LPCMINVOKECOMMANDINFO
 LPCREATESTRUCT

src/modules/Workspaces/WindowProperties/WorkspacesWindowPropertyUtils.h

@@ -7,10 +7,34 @@ namespace WorkspacesWindowProperties
     namespace Properties
     {
         const wchar_t LaunchedByWorkspacesID[] = L"PowerToys_LaunchedByWorkspaces";
+        const wchar_t WorkspacesAppID[] = L"PowerToys_WorkspacesAppId";
     }
 
-    inline void StampWorkspacesLaunchedProperty(HWND window)
+    inline void StampWorkspacesLaunchedProperty(HWND window, const std::wstring appId)
     {
         ::SetPropW(window, Properties::LaunchedByWorkspacesID, reinterpret_cast<HANDLE>(1));
+
+        GUID guid;
+        HRESULT hr = CLSIDFromString(appId.c_str(), static_cast<LPCLSID> (&guid));
+        if (hr != S_OK)
+        {
+            return;
+        }
+
+        const size_t workspacesAppIDLength = wcslen(Properties::WorkspacesAppID);
+        wchar_t* workspacesAppIDPart = new wchar_t[workspacesAppIDLength + 2];
+        std::memcpy(&workspacesAppIDPart[0], &Properties::WorkspacesAppID, workspacesAppIDLength * sizeof(wchar_t));
+        workspacesAppIDPart[workspacesAppIDLength + 1] = 0;
+
+        // the size of the HANDLE type can vary on different systems: 4 or 8 bytes. As we can set only a HANDLE as a property, we need more properties (2 or 4) to be able to store a GUID (16 bytes)
+        const int numberOfProperties = sizeof(GUID) / sizeof(HANDLE);
+
+        uint64_t parts[numberOfProperties];
+        std::memcpy(&parts[0], &guid, sizeof(GUID));
+        for (unsigned char partIndex = 0; partIndex < numberOfProperties; partIndex++)
+        {
+            workspacesAppIDPart[workspacesAppIDLength] = '0' + partIndex;
+            ::SetPropW(window, workspacesAppIDPart, reinterpret_cast<HANDLE>(parts[partIndex]));
+        }
     }
 }

src/modules/Workspaces/WorkspacesEditor/Models/Project.cs

@@ -342,12 +342,23 @@ private Rectangle GetCommonBounds()
             return new Rectangle((int)minX, (int)minY, (int)(maxX - minX), (int)(maxY - minY));
         }
 
-        public void UpdateAfterLaunchAndEdit(Project other)
+        public void UpdateAfterLaunchAndEdit(Project projectBeforeLaunch)
         {
-            Id = other.Id;
-            Name = other.Name;
+            Id = projectBeforeLaunch.Id;
+            Name = projectBeforeLaunch.Name;
             IsRevertEnabled = true;
-            MoveExistingWindows = other.MoveExistingWindows;
+            MoveExistingWindows = projectBeforeLaunch.MoveExistingWindows;
+            foreach (Application app in Applications)
+            {
+                var sameAppBefore = projectBeforeLaunch.Applications.Where(x => x.Id.Equals(app.Id, StringComparison.OrdinalIgnoreCase));
+                if (sameAppBefore.Any())
+                {
+                    var appBefore = sameAppBefore.FirstOrDefault();
+                    app.CommandLineArguments = appBefore.CommandLineArguments;
+                    app.IsElevated = appBefore.IsElevated;
+                    app.PwaAppId = appBefore.PwaAppId;
+                }
+            }
         }
 
         internal void CloseExpanders()

src/modules/Workspaces/WorkspacesLib/AppUtils.cpp

@@ -34,6 +34,8 @@ namespace Utils
 
             constexpr const wchar_t* EdgeFilename = L"msedge.exe";
             constexpr const wchar_t* ChromeFilename = L"chrome.exe";
+
+            const wchar_t WorkspacesAppID[] = L"PowerToys_WorkspacesAppId";
         }
 
         AppList IterateAppsFolder()
@@ -398,5 +400,37 @@ namespace Utils
             return installPath.ends_with(NonLocalizable::ChromeFilename);
         }
 
+        const std::wstring GetGuidFromHwnd(HWND window)
+        {
+            const size_t workspacesAppIDLength = wcslen(NonLocalizable::WorkspacesAppID);
+            wchar_t* workspacesAppIDPart = new wchar_t[workspacesAppIDLength + 2];
+            std::memcpy(&workspacesAppIDPart[0], &NonLocalizable::WorkspacesAppID, workspacesAppIDLength * sizeof(wchar_t));
+            workspacesAppIDPart[workspacesAppIDLength + 1] = 0;
+
+            // the size of the HANDLE type can vary on different systems: 4 or 8 bytes. As we can set only a HANDLE as a property, we need more properties (2 or 4) to be able to store a GUID (16 bytes)
+            const int numberOfProperties = sizeof(GUID) / sizeof(HANDLE);
+
+            uint64_t parts[numberOfProperties];
+            for (unsigned char partIndex = 0; partIndex < numberOfProperties; partIndex++)
+            {
+                workspacesAppIDPart[workspacesAppIDLength] = '0' + partIndex;
+                HANDLE rawData = GetPropW(window, workspacesAppIDPart);
+                if (rawData)
+                {
+                    parts[partIndex] = reinterpret_cast<uint64_t>(rawData);
+                }
+                else
+                {
+                    return L"";
+                }
+            }
+
+            GUID guid;
+            std::memcpy(&guid, &parts[0], sizeof(GUID));
+            WCHAR* guidString;
+            StringFromCLSID(guid, &guidString);
+
+            return guidString;
+        }
     }
 }

src/modules/Workspaces/WorkspacesLib/AppUtils.h

@@ -24,6 +24,8 @@ namespace Utils
         const std::wstring& GetCurrentFolder();
         const std::wstring& GetCurrentFolderUpper();
 
+        const std::wstring GetGuidFromHwnd(HWND window);
+
         AppList GetAppsList();
         std::optional<AppData> GetApp(const std::wstring& appPath, DWORD pid, const AppList& apps);
         std::optional<AppData> GetApp(HWND window, const AppList& apps);

src/modules/Workspaces/WorkspacesSnapshotTool/SnapshotUtils.cpp

@@ -157,7 +157,10 @@ namespace SnapshotUtils
                 rect.bottom = monitorRect.top + monitorRect.height;
             }
 
+            std::wstring guid = Utils::Apps::GetGuidFromHwnd(window);
+
             WorkspacesData::WorkspacesProject::Application app{
+                .id = guid,
                 .name = appData.name,
                 .title = title,
                 .path = appData.installPath,

src/modules/Workspaces/WorkspacesWindowArranger/WindowArranger.cpp

@@ -459,7 +459,7 @@ bool WindowArranger::moveWindow(HWND window, const WorkspacesData::WorkspacesPro
 
     if (PlacementHelper::SizeWindowToRect(window, currentMonitor, launchMinimized, launchMaximized, rect))
     {
-        WorkspacesWindowProperties::StampWorkspacesLaunchedProperty(window);
+        WorkspacesWindowProperties::StampWorkspacesLaunchedProperty(window, app.id);
         Logger::trace(L"Placed {} to ({},{}) [{}x{}]", app.name, rect.left, rect.top, rect.right - rect.left, rect.bottom - rect.top);
         return true;
     }

src/modules/fancyzones/FancyZonesTests/UnitTests/WindowProcessingTests.Spec.cpp

@@ -211,7 +211,7 @@ namespace FancyZonesUnitTests
         TEST_METHOD (LaunchedByWorkspaces)
         {
             HWND window = Mocks::WindowCreate(hInst, L"", L"", 0, WS_TILEDWINDOW);
-            WorkspacesWindowProperties::StampWorkspacesLaunchedProperty(window);
+            WorkspacesWindowProperties::StampWorkspacesLaunchedProperty(window, L"");
 
             Assert::AreEqual(FancyZonesWindowProcessing::ProcessabilityType::Processable, FancyZonesWindowProcessing::DefineWindowType(window));
             Assert::IsFalse(FancyZonesWindowProcessing::IsProcessableAutomatically(window));