Jeff Smith : crypt32: Fix CryptBinaryToString return value on short base64 buffer.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: e0708d06019584572cbd7c2fa7871ed8a112b57b
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=e0708d06019584572cbd7c2fa...

Author: Jeff Smith 
Date:   Wed Oct  9 12:53:54 2019 -0500

crypt32: Fix CryptBinaryToString return value on short base64 buffer.

Signed-off-by: Jeff Smith 
Signed-off-by: Alexandre Julliard

---

dlls/crypt32/base64.c       | 4 ++--
 dlls/crypt32/tests/base64.c | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/crypt32/base64.c b/dlls/crypt32/base64.c
index d158c1aceb..acd05ec1a5 100644
--- 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;
         }
     }
diff --git a/dlls/crypt32/tests/base64.c b/dlls/crypt32/tests/base64.c
index 3668543048..f2d16735ab 100644
--- 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)