[PATCH 4/6] ncrypt: NCryptGetProperty should always fill result size.

Santino Mazza mazzasantino1206 at gmail.com
Wed Feb 16 20:16:54 CST 2022


Signed-off-by: Santino Mazza <mazzasantino1206 at gmail.com>
---
 dlls/ncrypt/main.c         | 7 ++-----
 dlls/ncrypt/tests/ncrypt.c | 2 --
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c
index 5098fd0d8ea..a487c2f6059 100644
--- a/dlls/ncrypt/main.c
+++ b/dlls/ncrypt/main.c
@@ -165,11 +165,8 @@ SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE handle, const WCHAR *name
     if (flags) FIXME("flags %#lx not supported\n", flags);
 
     if (!(property = get_object_property(object, name))) return NTE_INVALID_PARAMETER;
-    if (!output)
-    {
-        *result = property->value_size;
-        return ERROR_SUCCESS;
-    }
+    *result = property->value_size;
+    if (!output) return ERROR_SUCCESS;
     if (outsize < property->value_size) return NTE_BUFFER_TOO_SMALL;
 
     memcpy(output, property->value, property->value_size);
diff --git a/dlls/ncrypt/tests/ncrypt.c b/dlls/ncrypt/tests/ncrypt.c
index b7ffd5dc0a3..61f9684a3c0 100644
--- a/dlls/ncrypt/tests/ncrypt.c
+++ b/dlls/ncrypt/tests/ncrypt.c
@@ -185,9 +185,7 @@ static void test_get_property(void)
     size = 0;
     ret = NCryptGetProperty(key, NCRYPT_ALGORITHM_GROUP_PROPERTY, (BYTE *)value, sizeof(value), &size, 0);
     ok(ret == ERROR_SUCCESS, "got %#lx\n", ret);
-    todo_wine {
     ok(size == 8, "got %lu\n", size);
-    }
     ok(!lstrcmpW(value, L"RSA"), "The string doesn't match with 'RSA'\n");
 
     ret = NCryptGetProperty(key, NCRYPT_LENGTH_PROPERTY, NULL, 0, &size, 0);
-- 
2.32.0




More information about the wine-devel mailing list