Use CsWin32

Author: ferrariofilippo

src/Files.App.CsWin32/NativeMethods.txt

@@ -236,3 +236,35 @@ GetMenuItemCount
 GetMenuItemInfo
 IsWow64Process2
 GetCurrentProcess
+CertFreeCertificateContext
+CryptMsgGetParam
+CryptMsgClose
+CryptMsgOpenToDecode
+CryptMsgUpdate
+CertOpenStore
+CryptDecodeObject
+CertFindCertificateInStore
+CertComparePublicKeyInfo
+CryptQueryObject
+CertCloseStore
+WinVerifyTrust
+FileTimeToSystemTime
+FileTimeToLocalFileTime
+SystemTimeToFileTime
+CRYPTOAPI_BLOB
+CMSG_SIGNER_INFO
+SignDataHandle
+CRYPT_ATTRIBUTE
+FILETIME
+CRYPT_BIT_BLOB
+CERT_ALT_NAME_INFO
+CERT_CONTEXT
+CERT_INFO
+CRYPT_ALGORITHM_IDENTIFIER
+CERT_PUBLIC_KEY_INFO
+CATALOG_INFO
+WINTRUST_FILE_INFO
+WINTRUST_DATA
+HCERTSTORE
+HCRYPTMSG
+CERT_QUERY_ENCODING_TYPE

src/Files.App/Data/Models/SignatureInfoItem.cs

@@ -3,14 +3,15 @@
 
 using Files.App.Utils.Signatures;
 using System.Windows.Input;
+using Windows.Win32.Foundation;
 
 namespace Files.App.Data.Models
 {
 	public sealed partial class SignatureInfoItem : ObservableObject
 	{
 		private readonly string _fileName;
 
-		private readonly IntPtr _hwndParent;
+		private readonly HWND _hwndParent;
 
 		private readonly int _index;
 
@@ -73,7 +74,7 @@ public bool Verified
 
 		public ICommand OpenDetailsCommand { get; }
 
-		public SignatureInfoItem(string fileName, int index, IntPtr hWnd, List<CertNodeInfoItem> chain)
+		public SignatureInfoItem(string fileName, int index, HWND hWnd, List<CertNodeInfoItem> chain)
 		{
 			_fileName = fileName;
 			_hwndParent = hWnd;

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

@@ -5,6 +5,7 @@
 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
@@ -349,138 +350,17 @@ out IntPtr pszPath
 
 		// crypt32.dll
 		[DllImport("crypt32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-		public static extern uint CertGetNameStringA(
-			IntPtr pCertContext,
+		public unsafe static extern uint CertGetNameStringA(
+			CERT_CONTEXT* pCertContext,
 			uint dwType,
 			uint dwFlags,
-			IntPtr pvTypePara,
-			IntPtr pszNameString,
+			void* pvTypePara,
+			PCSTR pszNameString,
 			uint cchNameString
 		);
 
-		[DllImport("crypt32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-		public static extern bool CertFreeCertificateContext(
-			IntPtr pCertContext
-		);
-
-		[DllImport("crypt32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-		public static extern bool CryptMsgGetParam(
-			IntPtr hCryptMsg,
-			uint dwParamType,
-			uint dwIndex,
-			IntPtr pParam,
-			ref uint dwOutSize
-		);
-
-		[DllImport("crypt32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-		public static extern bool CryptMsgClose(
-			IntPtr hCryptMsg
-		);
-
-		[DllImport("crypt32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-		public static extern IntPtr CryptMsgOpenToDecode(
-			uint dwMsgEncodingType,
-			uint dwFlags,
-			uint dwMsgType,
-			IntPtr hCryptProv,
-			IntPtr pRecipientInfo,
-			IntPtr pStreamInfo
-		);
-
-		[DllImport("crypt32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-		public static extern bool CryptMsgUpdate(
-			IntPtr hCryptMsg,
-			IntPtr pbData,
-			uint cbDatam,
-			bool fFinal
-		);
-
-		[DllImport("crypt32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-		public static extern IntPtr CertOpenStore(
-			IntPtr lpszStoreProvider,
-			uint dwEncodingType,
-			IntPtr hCryptProv,
-			uint dwFlags,
-			IntPtr pvPara
-		);
-
-		[DllImport("crypt32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-		public static extern bool CryptDecodeObject(
-			uint dwCertEncodingType,
-			IntPtr lpszStructType,
-			IntPtr pbEncoded,
-			uint cbEncoded,
-			uint dwFlags,
-			IntPtr pvStructInfo,
-			ref uint pcbStructInfo
-		);
-
-		[DllImport("crypt32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-		public static extern IntPtr CertFindCertificateInStore(
-			IntPtr hCertStore,
-			uint dwCertEncodingType,
-			uint dwFindFlags,
-			uint dwFindType,
-			IntPtr pvFindPara,
-			IntPtr pPrevCertContext
-		);
-
-		[DllImport("crypt32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-		public static extern bool CertComparePublicKeyInfo(
-			uint dwCertEncodingType,
-			IntPtr pPublicKey1,
-			IntPtr pPublicKey2
-		);
-
-		[DllImport("crypt32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-		public static extern bool CryptQueryObject(
-			uint dwObjectType,
-			IntPtr pvObject,
-			uint dwExpectedContentTypeFlags,
-			uint dwExpectedFormatTypeFlags,
-			uint dwFlags,
-			ref uint pdwMsgAndCertEncodingType,
-			ref uint pdwContentType,
-			ref uint pdwFormatType,
-			ref IntPtr phCertStore,
-			ref IntPtr phMsg,
-			ref IntPtr ppvContext
-		);
-
-		[DllImport("crypt32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-		public static extern bool CertCloseStore(
-			IntPtr hCertStore,
-			uint dwFlags
-		);
-
-		[DllImport("wintrust.dll")]
-		public static extern long WinVerifyTrust(
-			IntPtr hwnd,
-			IntPtr pgActionID,
-			IntPtr pWVTData
-		);
-
-		// kernel32.dll
-		[DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-		public static extern bool FileTimeToSystemTime(
-			IntPtr lpFileTime,
-			IntPtr lpSystemTime
-		);
-
-		[DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-		public static extern bool FileTimeToLocalFileTime(
-			IntPtr lpFileTime,
-			IntPtr lpLocalFileTime
-		);
-
-		[DllImport("kernel32.dll", SetLastError = true, CharSet = CharSet.Unicode)]
-		public static extern bool SystemTimeToFileTime(
-			IntPtr lpSystemTime,
-			IntPtr lpFileTime
-		);
-
 		// cryptui.dll
 		[DllImport("cryptui.dll", SetLastError = true, CharSet = CharSet.Auto)]
-		public static extern bool CryptUIDlgViewSignerInfo(IntPtr pViewInfo);
+		public unsafe static extern bool CryptUIDlgViewSignerInfo(CRYPTUI_VIEWSIGNERINFO_STRUCT* pViewInfo);
 	}
 }

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

@@ -3,6 +3,8 @@
 
 using System.IO;
 using System.Runtime.InteropServices;
+using Windows.Win32.Foundation;
+using Windows.Win32.Security.Cryptography;
 
 namespace Files.App.Helpers
 {
@@ -199,159 +201,35 @@ public struct WIN32_FIND_DATA
 		}
 
 		[StructLayout(LayoutKind.Sequential)]
-		public struct CRYPTOAPI_BLOB
-		{
-			public uint cbData;
-			public IntPtr pbData;
-		}
-
-		[StructLayout(LayoutKind.Sequential)]
-		public struct CMSG_SIGNER_INFO
-		{
-			public uint dwVersion;
-			public CRYPTOAPI_BLOB Issuer;
-			public CRYPTOAPI_BLOB SerialNumber;
-			public CRYPT_ALGORITHM_IDENTIFIER HashAlgorithm;
-			public CRYPT_ALGORITHM_IDENTIFIER HashEncryptionAlgorithm;
-			public CRYPTOAPI_BLOB EncryptedHash;
-			public CRYPTOAPI_BLOB AuthAttrs;
-			public CRYPTOAPI_BLOB UnauthAttrs;
-		}
-
-		[StructLayout(LayoutKind.Sequential)]
-		public struct SignDataHandle
+		public unsafe struct SignDataHandle
 		{
 			public uint dwObjSize;
-			public IntPtr pSignerInfo;
-			public IntPtr hCertStoreHandle;
+			public CMSG_SIGNER_INFO* pSignerInfo;
+			public HCERTSTORE hCertStoreHandle;
 		}
 
 		[StructLayout(LayoutKind.Sequential)]
-		public struct CRYPT_ATTRIBUTE
+		public unsafe struct CRYPTOAPI_BLOB
 		{
-			[MarshalAs(UnmanagedType.LPStr)]
-			public string pszObjId;
-			public uint cValue;
-			public IntPtr rgValue;
-		}
-
-		[StructLayout(LayoutKind.Sequential)]
-		public struct FILETIME
-		{
-			public uint dwLowDateTime;
-			public uint dwHighDateTime;
-		}
-
-		[StructLayout(LayoutKind.Sequential)]
-		public struct CRYPT_BIT_BLOB
-		{
-			private readonly uint cbData;
-			private readonly IntPtr pbData;
-			private readonly uint cUnusedBits;
-		}
-
-		[StructLayout(LayoutKind.Sequential)]
-		public struct CERT_ALT_NAME_INFO
-		{
-			public uint cAltEntry;
-			public IntPtr rgAltEntry;
-		}
-
-		[StructLayout(LayoutKind.Sequential)]
-		public struct CERT_CONTEXT
-		{
-			public uint dwCertEncodingType;
-			public IntPtr pbCertEncoded;
-			public uint cbCertEncoded;
-			public IntPtr pCertInfo;
-			public IntPtr hCertStore;
-		}
-
-		[StructLayout(LayoutKind.Sequential)]
-		public struct CERT_INFO
-		{
-			public uint dwVersion;
-			public CRYPTOAPI_BLOB SerialNumber;
-			public CRYPT_ALGORITHM_IDENTIFIER SignatureAlgorithm;
-			public CRYPTOAPI_BLOB Issuer;
-			public FILETIME NotBefore;
-			public FILETIME NotAfter;
-			public CRYPTOAPI_BLOB Subject;
-			public CERT_PUBLIC_KEY_INFO SubjectPublicKeyInfo;
-			public CRYPT_BIT_BLOB IssuerUniqueId;
-			public CRYPT_BIT_BLOB SubjectUniqueId;
-			public uint cExtension;
-			public IntPtr rgExtension;
-		}
-
-		[StructLayout(LayoutKind.Sequential)]
-		public struct CRYPT_ALGORITHM_IDENTIFIER
-		{
-			[MarshalAs(UnmanagedType.LPStr)]
-			public string pszObjId;
-			public CRYPTOAPI_BLOB Parameters;
-		}
-
-		[StructLayout(LayoutKind.Sequential)]
-		public struct CERT_PUBLIC_KEY_INFO
-		{
-			public CRYPT_ALGORITHM_IDENTIFIER Algorithm;
-			public CRYPTOAPI_BLOB PublicKey;
-		}
-
-		[StructLayout(LayoutKind.Sequential)]
-		public struct CATALOG_INFO
-		{
-			public uint cbStruct;
-			public char[] wszCatalogFile = new char[256];
-
-			public CATALOG_INFO()
-			{
-			}
-		}
-
-		[StructLayout(LayoutKind.Sequential)]
-		public struct WINTRUST_FILE_INFO
-		{
-			public uint cbStruct;
-			public IntPtr pcwszFilePath;
-			public IntPtr hFile;
-			public IntPtr pgKnownSubject;
-		}
-
-		[StructLayout(LayoutKind.Sequential)]
-		public struct WINTRUST_DATA
-		{
-			public uint cbStruct;
-			public IntPtr pPolicyCallbackData;
-			public IntPtr pSIPClientData;
-			public uint dwUIChoice;
-			public uint fdwRevocationChecks;
-			public uint dwUnionChoice;
-			public IntPtr pFile;
-			public uint dwStateAction;
-			public IntPtr hVWTStateData;
-			public IntPtr pwszURLReference;
-			public uint dwProvFlags;
-			public uint dwUIContext;
-			public IntPtr pSignatureSettings;
+			public uint cbData;
+			public void* pbData;
 		}
 
 		[StructLayout(LayoutKind.Sequential, CharSet = CharSet.Auto)]
-		public struct CRYPTUI_VIEWSIGNERINFO_STRUCT
+		public unsafe struct CRYPTUI_VIEWSIGNERINFO_STRUCT
 		{
 			public uint dwSize;
-			public IntPtr hwndParent;
+			public HWND hwndParent;
 			public uint dwFlags;
-			public IntPtr szTitle;
-			public IntPtr pSignerInfo;
-			public IntPtr hMsg;
-			public IntPtr pszOID;
+			public PCSTR szTitle;
+			public CMSG_SIGNER_INFO* pSignerInfo;
+			public void* hMsg;
+			public PCSTR pszOID;
 			public uint? dwReserved;
 			public uint cStores;
-			public IntPtr rghStores;
+			public HCERTSTORE* rghStores;
 			public uint cPropPages;
-			public IntPtr rgPropPages;
+			public void* rgPropPages;
 		}
 	}
 }