Commit fab5674

committed

Init

1 parent 7507098 commit fab5674Copy full SHA for fab5674

File tree

4 files changed

+51

-35

lines changed

src
- Files.App.CsWin32
  - NativeMethods.txt
- Files.App.Storage/Windows/Managers
  - STATask.cs
- Files.App
  - Helpers/Win32
    - Win32PInvoke.Methods.cs
  - Program.cs

4 files changed

+51

-35

lines changed

`‎src/Files.App.CsWin32/NativeMethods.txt`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -269,3 +269,8 @@ HCERTSTORE`
`269`	`269`	`HCRYPTMSG`
`270`	`270`	`CERT_QUERY_ENCODING_TYPE`
`271`	`271`	`CertGetNameString`
	`272`	`+CreateEvent`
	`273`	`+SetEvent`
	`274`	`+CoWaitForMultipleObjects`
	`275`	`+CWMO_FLAGS`
	`276`	`+INFINITE`

`‎src/Files.App.Storage/Windows/Managers/STATask.cs`

Lines changed: 44 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,9 @@`
`3`	`3`
`4`	`4`	`using Microsoft.Extensions.Logging;`
`5`	`5`	`using Windows.Win32;`
	`6`	`+using Windows.Win32.Foundation;`
	`7`	`+using Windows.Win32.System.Com;`
	`8`	`+using Windows.Win32.Security;`
`6`	`9`
`7`	`10`	`namespace Files.App.Storage`
`8`	`11`	`{`
`@@ -140,5 +143,46 @@ public static Task Run(Func<Task> func, ILogger? logger = null)`
`140`	`143`
`141`	`144`	`return tcs.Task;`
`142`	`145`	`}`
	`146`	`+`
	`147`	`+ public unsafe static Task RunAsSync(Action action)`
	`148`	`+ {`
	`149`	`+ Debug.Assert(Thread.CurrentThread.GetApartmentState() is ApartmentState.STA);`
	`150`	`+`
	`151`	`+ HANDLE hEventHandle = PInvoke.CreateEvent((SECURITY_ATTRIBUTES*)null, true, false, default);`
	`152`	`+`
	`153`	`+ var tcs = new TaskCompletionSource();`
	`154`	`+`
	`155`	`+ Task.Run(() =>`
	`156`	`+ {`
	`157`	`+ try`
	`158`	`+ {`
	`159`	`+ action();`
	`160`	`+ tcs.SetResult();`
	`161`	`+ }`
	`162`	`+ catch (Exception ex)`
	`163`	`+ {`
	`164`	`+ tcs.SetException(ex);`
	`165`	`+ }`
	`166`	`+ finally`
	`167`	`+ {`
	`168`	`+ PInvoke.SetEvent(hEventHandle);`
	`169`	`+ }`
	`170`	`+ });`
	`171`	`+`
	`172`	`+ HANDLE* pEventHandles = stackalloc HANDLE[1];`
	`173`	`+ pEventHandles[0] = hEventHandle;`
	`174`	`+ uint dwIndex = 0u;`
	`175`	`+`
	`176`	`+ PInvoke.CoWaitForMultipleObjects(`
	`177`	`+ (uint)CWMO_FLAGS.CWMO_DEFAULT,`
	`178`	`+ PInvoke.INFINITE,`
	`179`	`+ 1u,`
	`180`	`+ pEventHandles,`
	`181`	`+ &dwIndex);`
	`182`	`+`
	`183`	`+ PInvoke.CloseHandle(hEventHandle);`
	`184`	`+`
	`185`	`+ return tcs.Task;`
	`186`	`+ }`
`143`	`187`	`}`
`144`	`188`	`}`

`‎src/Files.App/Helpers/Win32/Win32PInvoke.Methods.cs`

Lines changed: 0 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -68,15 +68,6 @@ public static extern bool SetEvent(`
`68`	`68`	`IntPtr hEvent`
`69`	`69`	`);`
`70`	`70`
`71`		`- [DllImport("ole32.dll")]`
`72`		`- public static extern uint CoWaitForMultipleObjects(`
`73`		`- uint dwFlags,`
`74`		`- uint dwMilliseconds,`
`75`		`- ulong nHandles,`
`76`		`- IntPtr[] pHandles,`
`77`		`- out uint dwIndex`
`78`		`- );`
`79`		`-`
`80`	`71`	`[DllImport("shell32.dll")]`
`81`	`72`	`public static extern IntPtr SHBrowseForFolder(`
`82`	`73`	`ref BROWSEINFO lpbi`

`‎src/Files.App/Program.cs`

Lines changed: 2 additions & 26 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,6 @@`
`9`	`9`	`using System.Text;`
`10`	`10`	`using Windows.ApplicationModel.Activation;`
`11`	`11`	`using Windows.Storage;`
`12`		`-using static Files.App.Helpers.Win32PInvoke;`
`13`	`12`
`14`	`13`	`namespace Files.App`
`15`	`14`	`{`
`@@ -21,9 +20,6 @@ namespace Files.App`
`21`	`20`	`/// </remarks>`
`22`	`21`	`internal sealed class Program`
`23`	`22`	`{`
`24`		`- private const uint CWMO_DEFAULT = 0;`
`25`		`- private const uint INFINITE = 0xFFFFFFFF;`
`26`		`-`
`27`	`23`	`public static Semaphore? Pool { get; set; }`
`28`	`24`
`29`	`25`	`static Program()`
`@@ -250,20 +246,10 @@ private static async void OnActivated(object? sender, AppActivationArguments arg`
`250`	`246`	`/// </remarks>`
`251`	`247`	`public static void RedirectActivationTo(AppInstance keyInstance, AppActivationArguments args)`
`252`	`248`	`{`
`253`		`- IntPtr eventHandle = CreateEvent(IntPtr.Zero, true, false, null);`
`254`		`-`
`255`		`- Task.Run(() =>`
	`249`	`+ STATask.RunAsSync(() =>`
`256`	`250`	`{`
`257`	`251`	`keyInstance.RedirectActivationToAsync(args).AsTask().Wait();`
`258`		`- SetEvent(eventHandle);`
`259`	`252`	`});`
`260`		`-`
`261`		`- _ = CoWaitForMultipleObjects(`
`262`		`- CWMO_DEFAULT,`
`263`		`- INFINITE,`
`264`		`- 1,`
`265`		`- [eventHandle],`
`266`		`- out uint handleIndex);`
`267`	`253`	`}`
`268`	`254`
`269`	`255`	`public static void OpenShellCommandInExplorer(string shellCommand, int pid)`
`@@ -273,20 +259,10 @@ public static void OpenShellCommandInExplorer(string shellCommand, int pid)`
`273`	`259`
`274`	`260`	`public static void OpenFileFromTile(string filePath)`
`275`	`261`	`{`
`276`		`- IntPtr eventHandle = CreateEvent(IntPtr.Zero, true, false, null);`
`277`		`-`
`278`		`- Task.Run(() =>`
	`262`	`+ STATask.RunAsSync(() =>`
`279`	`263`	`{`
`280`	`264`	`LaunchHelper.LaunchAppAsync(filePath, null, null).Wait();`
`281`		`- SetEvent(eventHandle);`
`282`	`265`	`});`
`283`		`-`
`284`		`- _ = CoWaitForMultipleObjects(`
`285`		`- CWMO_DEFAULT,`
`286`		`- INFINITE,`
`287`		`- 1,`
`288`		`- [eventHandle],`
`289`		`- out uint handleIndex);`
`290`	`266`	`}`
`291`	`267`	`}`
`292`	`268`	`}`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit fab5674

File tree

4 files changed

4 files changed

`‎src/Files.App.CsWin32/NativeMethods.txt`

`‎src/Files.App.Storage/Windows/Managers/STATask.cs`

`‎src/Files.App/Helpers/Win32/Win32PInvoke.Methods.cs`

`‎src/Files.App/Program.cs`

0 commit comments