Merge branch 'main' into preview

neon-nyan · neon-nyan · commit 9fcf9046d8f7 · 2025-02-03T23:22:39.000+07:00
diff --git a/CollapseLauncher/Classes/RegistryMonitor/RegistryMonitor.cs b/CollapseLauncher/Classes/RegistryMonitor/RegistryMonitor.cs
@@ -253,7 +253,7 @@ public void Start()
                 }
 
                 _eventTerminate.Reset();
-                _thread              = new Thread(MonitorThread)
+                _thread = new Thread(MonitorThread)
                 {
                     IsBackground = true
                 };
@@ -296,36 +296,42 @@ private void MonitorThread()
 
         private void ThreadLoop()
         {
-            int result = PInvoke.RegOpenKeyEx(_registryHive, _registrySubName, 0,
+            int result = PInvoke.RegOpenKeyEx(_registryHive,
+                                              _registrySubName,
+                                              0,
                                               (uint)ACCESS_MASK.STANDARD_RIGHTS_READ | (uint)RegKeyAccess.KEY_QUERY_VALUE | (uint)RegKeyAccess.KEY_NOTIFY,
                                               out var registryKey);
             if (result != 0)
                 throw new Win32Exception(result);
 
-            WaitHandle[] waitHandles = null;
+            AutoResetEvent eventNotify = new AutoResetEvent(false);
             try
             {
-                AutoResetEvent eventNotify = new AutoResetEvent(false);
-                waitHandles = [eventNotify, _eventTerminate];
+                WaitHandle[] waitHandles = [eventNotify, _eventTerminate];
+
                 while (!_eventTerminate.WaitOne(0, true))
                 {
                     if (_disposed) break;
-#pragma warning disable CS0618 // Type or member is obsolete
-                    result = PInvoke.RegNotifyChangeKeyValue(registryKey, true, _regFilter, eventNotify.Handle, true);
-#pragma warning restore CS0618 // Type or member is obsolete
-                    if (result != 0)
-                        throw new Win32Exception(result);
-
-                    if (WaitHandle.WaitAny(waitHandles) != 0
-                        || _regFilter != RegChangeNotifyFilter.Value)
+
+                    int resultNotify = PInvoke.RegNotifyChangeKeyValue(registryKey,
+                                                                       true,
+                                                                       _regFilter,
+                                                                       eventNotify.SafeWaitHandle,
+                                                                       true);
+                    if (resultNotify != 0)
+                        throw new Win32Exception(resultNotify);
+
+                    int waitHandlerAny = WaitHandle.WaitAny(waitHandles);
+                    if (waitHandlerAny != 0)
                     {
                         continue;
                     }
-                #if DEBUG
+
+#if DEBUG
                     LogWriteLine($"[RegistryMonitor] Found change(s) in registry!\r\n" +
                                  $"  Hive: {_registryHive}\r\n" +
                                  $"  subName: {_registrySubName}", LogType.Debug, true);
-                #endif
+#endif
                     OnRegChanged();
                 }
             }
@@ -336,7 +342,7 @@ private void ThreadLoop()
                     ((HResult)PInvoke.RegCloseKey(registryKey)).ThrowOnFailure();
                 }
 
-                for (int i = 0; i < waitHandles?.Length; i++) waitHandles[i]?.Dispose();
+                eventNotify.Dispose();
             }
         }
     }
diff --git a/CollapseLauncher/XAMLs/MainApp/Pages/GameSettingsPages/GenshinGameSettingsPage.xaml.cs b/CollapseLauncher/XAMLs/MainApp/Pages/GameSettingsPages/GenshinGameSettingsPage.xaml.cs
@@ -95,9 +95,15 @@ public GenshinGameSettingsPage()
         private void ToggleRegistrySubscribe(bool doSubscribe)
         {
             if (doSubscribe)
+            {
                 RegistryWatcher.RegChanged += RegistryListener;
+                RegistryWatcher.Start();
+            }
             else
+            {
+                RegistryWatcher.Stop();
                 RegistryWatcher.RegChanged -= RegistryListener;
+            }
         }
 
         private void RegistryListener(object sender, EventArgs e)
diff --git a/CollapseLauncher/XAMLs/MainApp/Pages/GameSettingsPages/HonkaiGameSettingsPage.xaml.cs b/CollapseLauncher/XAMLs/MainApp/Pages/GameSettingsPages/HonkaiGameSettingsPage.xaml.cs
@@ -53,9 +53,15 @@ public HonkaiGameSettingsPage()
         private void ToggleRegistrySubscribe(bool doSubscribe)
         {
             if (doSubscribe)
+            {
                 RegistryWatcher.RegChanged += RegistryListener;
+                RegistryWatcher.Start();
+            }
             else
+            {
+                RegistryWatcher.Stop();
                 RegistryWatcher.RegChanged -= RegistryListener;
+            }
         }
 
         private void RegistryListener(object sender, EventArgs e)
diff --git a/CollapseLauncher/XAMLs/MainApp/Pages/GameSettingsPages/StarRailGameSettingsPage.xaml.cs b/CollapseLauncher/XAMLs/MainApp/Pages/GameSettingsPages/StarRailGameSettingsPage.xaml.cs
@@ -59,9 +59,15 @@ public StarRailGameSettingsPage()
         private void ToggleRegistrySubscribe(bool doSubscribe)
         {
             if (doSubscribe)
+            {
                 RegistryWatcher.RegChanged += RegistryListener;
+                RegistryWatcher.Start();
+            }
             else
+            {
+                RegistryWatcher.Stop();
                 RegistryWatcher.RegChanged -= RegistryListener;
+            }
         }
 
         private void RegistryListener(object sender, EventArgs e)
diff --git a/CollapseLauncher/XAMLs/MainApp/Pages/GameSettingsPages/ZenlessGameSettingsPage.xaml.cs b/CollapseLauncher/XAMLs/MainApp/Pages/GameSettingsPages/ZenlessGameSettingsPage.xaml.cs
@@ -62,9 +62,15 @@ public ZenlessGameSettingsPage()
         private void ToggleRegistrySubscribe(bool doSubscribe)
         {
             if (doSubscribe)
+            {
                 RegistryWatcher.RegChanged += RegistryListener;
+                RegistryWatcher.Start();
+            }
             else
+            {
+                RegistryWatcher.Stop();
                 RegistryWatcher.RegChanged -= RegistryListener;
+            }
         }
 
         private void RegistryListener(object sender, EventArgs e)
diff --git a/CollapseLauncher/XAMLs/MainApp/Pages/HomePage.xaml.cs b/CollapseLauncher/XAMLs/MainApp/Pages/HomePage.xaml.cs
@@ -1178,7 +1178,7 @@ private async void CheckRunningGameInstance(CancellationToken token)
         #region Community Button
         private void OpenCommunityButtonLink(object sender, RoutedEventArgs e)
         {
-            DispatcherQueue?.TryEnqueue(CommunityToolsBtn.Flyout.Hide);
+            CommunityToolsBtn.Flyout.Hide();
             OpenButtonLinkFromTag(sender, e);
         }
         #endregion
diff --git a/Hi3Helper.Win32 b/Hi3Helper.Win32
@@ -1 +1 @@
-Subproject commit 00ad94c9dad3a74375892a1fe6a65932106bb734
+Subproject commit 7f78a6a29fd3e4dd3d3be51de2afc181ca2bc5ba

Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ public void Start()`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`_eventTerminate.Reset();`
`256`		`- _thread = new Thread(MonitorThread)`
	`256`	`+ _thread = new Thread(MonitorThread)`
`257`	`257`	`{`
`258`	`258`	`IsBackground = true`
`259`	`259`	`};`
`@@ -296,36 +296,42 @@ private void MonitorThread()`
`296`	`296`
`297`	`297`	`private void ThreadLoop()`
`298`	`298`	`{`
`299`		`- int result = PInvoke.RegOpenKeyEx(_registryHive, _registrySubName, 0,`
	`299`	`+ int result = PInvoke.RegOpenKeyEx(_registryHive,`
	`300`	`+ _registrySubName,`
	`301`	`+ 0,`
`300`	`302`	`(uint)ACCESS_MASK.STANDARD_RIGHTS_READ \| (uint)RegKeyAccess.KEY_QUERY_VALUE \| (uint)RegKeyAccess.KEY_NOTIFY,`
`301`	`303`	`out var registryKey);`
`302`	`304`	`if (result != 0)`
`303`	`305`	`throw new Win32Exception(result);`
`304`	`306`
`305`		`- WaitHandle[] waitHandles = null;`
	`307`	`+ AutoResetEvent eventNotify = new AutoResetEvent(false);`
`306`	`308`	`try`
`307`	`309`	`{`
`308`		`- AutoResetEvent eventNotify = new AutoResetEvent(false);`
`309`		`- waitHandles = [eventNotify, _eventTerminate];`
	`310`	`+ WaitHandle[] waitHandles = [eventNotify, _eventTerminate];`
	`311`	`+`
`310`	`312`	`while (!_eventTerminate.WaitOne(0, true))`
`311`	`313`	`{`
`312`	`314`	`if (_disposed) break;`
`313`		`-#pragma warning disable CS0618 // Type or member is obsolete`
`314`		`- result = PInvoke.RegNotifyChangeKeyValue(registryKey, true, _regFilter, eventNotify.Handle, true);`
`315`		`-#pragma warning restore CS0618 // Type or member is obsolete`
`316`		`- if (result != 0)`
`317`		`- throw new Win32Exception(result);`
`318`		`-`
`319`		`- if (WaitHandle.WaitAny(waitHandles) != 0`
`320`		`- \|\| _regFilter != RegChangeNotifyFilter.Value)`
	`315`	`+`
	`316`	`+ int resultNotify = PInvoke.RegNotifyChangeKeyValue(registryKey,`
	`317`	`+ true,`
	`318`	`+ _regFilter,`
	`319`	`+ eventNotify.SafeWaitHandle,`
	`320`	`+ true);`
	`321`	`+ if (resultNotify != 0)`
	`322`	`+ throw new Win32Exception(resultNotify);`
	`323`	`+`
	`324`	`+ int waitHandlerAny = WaitHandle.WaitAny(waitHandles);`
	`325`	`+ if (waitHandlerAny != 0)`
`321`	`326`	`{`
`322`	`327`	`continue;`
`323`	`328`	`}`
`324`		`- #if DEBUG`
	`329`	`+`
	`330`	`+#if DEBUG`
`325`	`331`	`LogWriteLine($"[RegistryMonitor] Found change(s) in registry!\r\n" +`
`326`	`332`	`$" Hive: {_registryHive}\r\n" +`
`327`	`333`	`$" subName: {_registrySubName}", LogType.Debug, true);`
`328`		`- #endif`
	`334`	`+#endif`
`329`	`335`	`OnRegChanged();`
`330`	`336`	`}`
`331`	`337`	`}`
`@@ -336,7 +342,7 @@ private void ThreadLoop()`
`336`	`342`	`((HResult)PInvoke.RegCloseKey(registryKey)).ThrowOnFailure();`
`337`	`343`	`}`
`338`	`344`
`339`		`- for (int i = 0; i < waitHandles?.Length; i++) waitHandles[i]?.Dispose();`
	`345`	`+ eventNotify.Dispose();`
`340`	`346`	`}`
`341`	`347`	`}`
`342`	`348`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1178,7 +1178,7 @@ private async void CheckRunningGameInstance(CancellationToken token)`
`1178`	`1178`	`#region Community Button`
`1179`	`1179`	`private void OpenCommunityButtonLink(object sender, RoutedEventArgs e)`
`1180`	`1180`	`{`
`1181`		`- DispatcherQueue?.TryEnqueue(CommunityToolsBtn.Flyout.Hide);`
	`1181`	`+ CommunityToolsBtn.Flyout.Hide();`
`1182`	`1182`	`OpenButtonLinkFromTag(sender, e);`
`1183`	`1183`	`}`
`1184`	`1184`	`#endregion`