crypt32: Fix CryptBinaryToString return value on short base64 buffer.

Signed-off-by: Jeff Smith <whydoubt@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

crypt32: Fix CryptBinaryToString return value on short base64 buffer.
e0708d06 · Jeff Smith · Alexandre Julliard · 6cbedfa6 · e0708d06 · e0708d06
Commit e0708d06 authored Oct 09, 2019 by Jeff Smith Committed by Alexandre Julliard Oct 09, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

base64.c dlls/crypt32/base64.c +2 -2

base64.c dlls/crypt32/tests/base64.c +0 -2

No files found.
--- a/dlls/crypt32/base64.c
+++ b/dlls/crypt32/base64.c
@@ -240,7 +240,7 @@ static BOOL BinaryToBase64A(const BYTE *pbBinary,
        else
        {
            *pcchString = charsNeeded;
-            SetLastError(ERROR_INSUFFICIENT_BUFFER);
+            SetLastError(ERROR_MORE_DATA);
            ret = FALSE;
        }
    }
@@ -460,7 +460,7 @@ static BOOL BinaryToBase64W(const BYTE *pbBinary,
        else
        {
            *pcchString = charsNeeded;
-            SetLastError(ERROR_INSUFFICIENT_BUFFER);
+            SetLastError(ERROR_MORE_DATA);
            ret = FALSE;
        }
    }

--- a/dlls/crypt32/tests/base64.c
+++ b/dlls/crypt32/tests/base64.c
@@ -134,7 +134,6 @@ static void encodeAndCompareBase64_A(const BYTE *toEncode, DWORD toEncodeLen,
    strLen2 = strLen - 1;
    str[0] = 0x12;
    ret = CryptBinaryToStringA(toEncode, toEncodeLen, format, str, &strLen2);
-todo_wine
    ok((!ret && GetLastError() == ERROR_MORE_DATA) || broken(ret) /* XP */, "CryptBinaryToStringA failed %d, error %d.\n",
        ret, GetLastError());
    ok(strLen2 == strLen || broken(strLen2 == strLen - 1), "Expected length %d, got %d\n", strLen, strLen2);
@@ -207,7 +206,6 @@ static void encode_compare_base64_W(const BYTE *toEncode, DWORD toEncodeLen, DWO
    strLen2 = strLen - 1;
    strW[0] = 0x1234;
    ret = CryptBinaryToStringW(toEncode, toEncodeLen, format, strW, &strLen2);
-todo_wine
    ok((!ret && GetLastError() == ERROR_MORE_DATA) || broken(ret) /* XP */, "CryptBinaryToStringW failed, %d, error %d\n",
        ret, GetLastError());
    if (headerW)