Library reference and methods

Author: ferrariofilippo

src/Files.App.CsWin32/NativeMethods.txt

@@ -268,3 +268,4 @@ WINTRUST_DATA
 HCERTSTORE
 HCRYPTMSG
 CERT_QUERY_ENCODING_TYPE
+CertGetNameString

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

@@ -5,7 +5,6 @@
 using System.Runtime.InteropServices;
 using System.Text;
 using Windows.Win32.Foundation;
-using Windows.Win32.Security.Cryptography;
 using Windows.Win32.System.Com;
 
 namespace Files.App.Helpers
@@ -348,17 +347,6 @@ public static extern int SHGetKnownFolderPath(
 			out IntPtr pszPath
 		);
 
-		// crypt32.dll
-		[DllImport("crypt32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-		public unsafe static extern uint CertGetNameStringA(
-			CERT_CONTEXT* pCertContext,
-			uint dwType,
-			uint dwFlags,
-			void* pvTypePara,
-			PCSTR pszNameString,
-			uint cchNameString
-		);
-
 		// cryptui.dll
 		[DllImport("cryptui.dll", SetLastError = true, CharSet = CharSet.Auto)]
 		public unsafe static extern bool CryptUIDlgViewSignerInfo(CRYPTUI_VIEWSIGNERINFO_STRUCT* pViewInfo);

src/Files.App/Utils/Signatures/DigitalSignaturesUtil.cs

@@ -681,34 +681,34 @@ ref lengthFound
 
 		private unsafe static bool GetStringFromCertContext(CERT_CONTEXT* pCertContext, uint dwType, uint flag, CertNodeInfoItem info)
 		{
-			var data = CertGetNameStringA(pCertContext, dwType, flag, null, (PCSTR)null, 0);
+			var data = PInvoke.CertGetNameString(pCertContext, dwType, flag, null, (PWSTR)null, 0);
 			if (data == 0)
 			{
 				PInvoke.CertFreeCertificateContext(pCertContext);
 				return false;
 			}
 
-			var pszTempName = (PCSTR)NativeMemory.Alloc(data);
+			var pszTempName = (PWSTR)NativeMemory.Alloc(data * sizeof(char));
 			if (pszTempName.Value is null)
 			{
 				PInvoke.CertFreeCertificateContext(pCertContext);
+				NativeMemory.Free(pszTempName);
 				return false;
 			}
 
-			data = CertGetNameStringA(pCertContext, dwType, flag, null, pszTempName, data);
+			data = PInvoke.CertGetNameString(pCertContext, dwType, flag, null, pszTempName, data);
 			if (data == 0)
 			{
 				NativeMemory.Free(pszTempName);
 				return false;
 			}
 
-			var tmpName = new string((sbyte*)(byte*)pszTempName);
+			var name = pszTempName.AsSpan().ToString();
+			NativeMemory.Free(pszTempName);
 			if (flag == 0)
-				info.IssuedTo = StripString(tmpName);
+				info.IssuedTo = StripString(name);
 			else
-				info.IssuedBy = StripString(tmpName);
-
-			NativeMemory.Free(pszTempName);
+				info.IssuedBy = StripString(name);
 
 			return true;
 		}

src/Files.App/ViewModels/Settings/AboutViewModel.cs

@@ -79,6 +79,7 @@ public AboutViewModel()
 				new ("https://github.com/microsoft/CsWinRT", "CsWinRT"),
 				new ("https://github.com/GihanSoft/NaturalStringComparer", "NaturalStringComparer"),
 				new ("https://github.com/dongle-the-gadget/GuidRVAGen", "Dongle.GuidRVAGen"),
+				new ("https://github.com/leeqwind/PESignAnalyzer", "PESignAnalyzer"),
 			];
 
 			CopyAppVersionCommand = new RelayCommand(CopyAppVersion);

src/Files.App/Views/Settings/AboutPage.xaml

@@ -188,7 +188,7 @@
 							<ItemsRepeater.Layout>
 								<UniformGridLayout
 									ItemsStretch="Fill"
-									MaximumRowsOrColumns="6"
+									MaximumRowsOrColumns="4"
 									MinColumnSpacing="8"
 									MinItemWidth="200"
 									MinRowSpacing="8"