[PATCH 01/21] dlls/ncrypt: enable compilation with long types

Eric Pouech eric.pouech at gmail.com
Wed Feb 16 01:10:46 CST 2022


Signed-off-by: Eric Pouech <eric.pouech at gmail.com>

---
 dlls/ncrypt/Makefile.in |    1 -
 dlls/ncrypt/main.c      |   30 +++++++++++++++---------------
 2 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/dlls/ncrypt/Makefile.in b/dlls/ncrypt/Makefile.in
index 120187ef61c..ad3ed409961 100644
--- a/dlls/ncrypt/Makefile.in
+++ b/dlls/ncrypt/Makefile.in
@@ -1,4 +1,3 @@
-EXTRADEFS = -DWINE_NO_LONG_TYPES
 IMPORTLIB = ncrypt
 MODULE    = ncrypt.dll
 
diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c
index f23b239d93f..28f46ac0af9 100644
--- a/dlls/ncrypt/main.c
+++ b/dlls/ncrypt/main.c
@@ -31,7 +31,7 @@ SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCR
                                                 const WCHAR *algid, const WCHAR *name, DWORD keyspec,
                                                 DWORD flags)
 {
-    FIXME("(0x%lx, %p, %s, %s, 0x%08x, 0x%08x): stub\n", provider, key, wine_dbgstr_w(algid),
+    FIXME("(0x%Ix, %p, %s, %s, 0x%08lx, 0x%08lx): stub\n", provider, key, wine_dbgstr_w(algid),
                                                          wine_dbgstr_w(name), keyspec, flags);
     return NTE_NOT_SUPPORTED;
 }
@@ -39,21 +39,21 @@ SECURITY_STATUS WINAPI NCryptCreatePersistedKey(NCRYPT_PROV_HANDLE provider, NCR
 SECURITY_STATUS WINAPI NCryptDecrypt(NCRYPT_KEY_HANDLE key, BYTE *input, DWORD insize, void *padding,
                                      BYTE *output, DWORD outsize, DWORD *result, DWORD flags)
 {
-    FIXME("(0x%lx, %p, %u, %p, %p, %u, %p, 0x%08x): stub\n", key, input, insize, padding,
+    FIXME("(0x%Ix, %p, %lu, %p, %p, %lu, %p, 0x%08lx): stub\n", key, input, insize, padding,
                                                              output, outsize, result, flags);
     return NTE_NOT_SUPPORTED;
 }
 
 SECURITY_STATUS WINAPI NCryptDeleteKey(NCRYPT_KEY_HANDLE key, DWORD flags)
 {
-    FIXME("(0x%lx, 0x%08x): stub\n", key, flags);
+    FIXME("(0x%Ix, 0x%08lx): stub\n", key, flags);
     return NTE_NOT_SUPPORTED;
 }
 
 SECURITY_STATUS WINAPI NCryptEncrypt(NCRYPT_KEY_HANDLE key, BYTE *input, DWORD insize, void *padding,
                                      BYTE *output, DWORD outsize, DWORD *result, DWORD flags)
 {
-    FIXME("(0x%lx, %p, %u, %p, %p, %u, %p, 0x%08x): stub\n", key, input, insize, padding,
+    FIXME("(0x%Ix, %p, %lu, %p, %p, %lu, %p, 0x%08lx): stub\n", key, input, insize, padding,
                                                              output, outsize, result, flags);
     return NTE_NOT_SUPPORTED;
 }
@@ -62,20 +62,20 @@ SECURITY_STATUS WINAPI NCryptEnumAlgorithms(NCRYPT_PROV_HANDLE provider, DWORD a
                                             DWORD *alg_count, NCryptAlgorithmName **alg_list,
                                             DWORD flags)
 {
-    FIXME("(0x%lx, 0x%08x, %p, %p, 0x%08x): stub\n", provider, alg_ops, alg_count, alg_list, flags);
+    FIXME("(0x%Ix, 0x%08lx, %p, %p, 0x%08lx): stub\n", provider, alg_ops, alg_count, alg_list, flags);
     return NTE_NOT_SUPPORTED;
 }
 
 SECURITY_STATUS WINAPI NCryptEnumKeys(NCRYPT_PROV_HANDLE provider, const WCHAR *scope,
                                       NCryptKeyName **key_name, PVOID *enum_state, DWORD flags)
 {
-    FIXME("(0x%lx, %p, %p, %p, 0x%08x): stub\n", provider, scope, key_name, enum_state, flags);
+    FIXME("(0x%Ix, %p, %p, %p, 0x%08lx): stub\n", provider, scope, key_name, enum_state, flags);
     return NTE_NOT_SUPPORTED;
 }
 
 SECURITY_STATUS WINAPI NCryptFinalizeKey(NCRYPT_KEY_HANDLE key, DWORD flags)
 {
-    FIXME("(0x%lx, 0x%08x): stub\n", key, flags);
+    FIXME("(0x%Ix, 0x%08lx): stub\n", key, flags);
     return NTE_NOT_SUPPORTED;
 }
 
@@ -87,14 +87,14 @@ SECURITY_STATUS WINAPI NCryptFreeBuffer(PVOID buf)
 
 SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE object)
 {
-    FIXME("(0x%lx): stub\n", object);
+    FIXME("(0x%Ix): stub\n", object);
     return NTE_NOT_SUPPORTED;
 }
 
 SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE object, const WCHAR *property, PBYTE output,
                                          DWORD outsize, DWORD *result, DWORD flags)
 {
-    FIXME("(0x%lx, %s, %p, %u, %p, 0x%08x): stub\n", object, wine_dbgstr_w(property), output, outsize,
+    FIXME("(0x%Ix, %s, %p, %lu, %p, 0x%08lx): stub\n", object, wine_dbgstr_w(property), output, outsize,
                                                          result, flags);
     return NTE_NOT_SUPPORTED;
 }
@@ -103,7 +103,7 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H
                                        const WCHAR *type, NCryptBufferDesc *params, NCRYPT_KEY_HANDLE *key,
                                        PBYTE data, DWORD datasize, DWORD flags)
 {
-    FIXME("(0x%lx, 0x%lx, %s, %p, %p, %p, %u, 0x%08x): stub\n", provider, decrypt_key,
+    FIXME("(0x%Ix, 0x%Ix, %s, %p, %p, %p, %lu, 0x%08lx): stub\n", provider, decrypt_key,
                                                                 wine_dbgstr_w(type), params,
                                                                 key, data, datasize, flags);
     return NTE_NOT_SUPPORTED;
@@ -112,33 +112,33 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H
 SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE provider, const WCHAR *algid,
                                             DWORD flags)
 {
-    FIXME("(0x%lx, %s, 0x%08x): stub\n", provider, wine_dbgstr_w(algid), flags);
+    FIXME("(0x%Ix, %s, 0x%08lx): stub\n", provider, wine_dbgstr_w(algid), flags);
     return NTE_NOT_SUPPORTED;
 }
 
 BOOL WINAPI NCryptIsKeyHandle(NCRYPT_KEY_HANDLE hKey)
 {
-    FIXME("(0x%lx): stub\n", hKey);
+    FIXME("(0x%Ix): stub\n", hKey);
     return FALSE;
 }
 
 SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key,
                                      const WCHAR *name, DWORD keyspec, DWORD flags)
 {
-    FIXME("(0x%lx, %p, %s, 0x%08x, 0x%08x): stub\n", provider, key, wine_dbgstr_w(name), keyspec, flags);
+    FIXME("(0x%Ix, %p, %s, 0x%08lx, 0x%08lx): stub\n", provider, key, wine_dbgstr_w(name), keyspec, flags);
     return NTE_NOT_SUPPORTED;
 }
 
 SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *provider, const WCHAR *name, DWORD flags)
 {
-    FIXME("(%p, %s, %u): stub\n", provider, wine_dbgstr_w(name), flags);
+    FIXME("(%p, %s, %lu): stub\n", provider, wine_dbgstr_w(name), flags);
     return NTE_NOT_SUPPORTED;
 }
 
 SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE object, const WCHAR *property,
                                          PBYTE input, DWORD insize, DWORD flags)
 {
-    FIXME("(%lx, %s, %p, %u, 0x%08x): stub\n", object, wine_dbgstr_w(property), input, insize,
+    FIXME("(%Ix, %s, %p, %lu, 0x%08lx): stub\n", object, wine_dbgstr_w(property), input, insize,
                                                flags);
     return NTE_NOT_SUPPORTED;
 }




More information about the wine-devel mailing list