Juan Lang : crypt32: Don't set ret to TRUE when it already is.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0170a41e69fca2f6599f4f2a228b8d739119bcaf
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0170a41e69fca2f6599f4f2a22...

Author: Juan Lang <juan_lang(a)yahoo.com>
Date:   Mon May 14 18:04:51 2007 -0700

crypt32: Don't set ret to TRUE when it already is.

Set it to FALSE when it needs to be.

---

 dlls/crypt32/cert.c |   11 +----------
 dlls/crypt32/crl.c  |    5 +----
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/dlls/crypt32/cert.c b/dlls/crypt32/cert.c
index 100abaa..8abca01 100644
--- a/dlls/crypt32/cert.c
+++ b/dlls/crypt32/cert.c
@@ -185,20 +185,17 @@ static BOOL WINAPI CertContext_GetProperty(void *context, DWORD dwPropId,
     if (ret)
     {
         if (!pvData)
-        {
             *pcbData = blob.cbData;
-            ret = TRUE;
-        }
         else if (*pcbData < blob.cbData)
         {
             SetLastError(ERROR_MORE_DATA);
             *pcbData = blob.cbData;
+            ret = FALSE;
         }
         else
         {
             memcpy(pvData, blob.pbData, blob.cbData);
             *pcbData = blob.cbData;
-            ret = TRUE;
         }
     }
     else
@@ -320,10 +317,7 @@ BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext,
         if (ret)
         {
             if (!pvData)
-            {
                 *pcbData = sizeof(HCRYPTPROV);
-                ret = TRUE;
-            }
             else if (*pcbData < sizeof(HCRYPTPROV))
             {
                 SetLastError(ERROR_MORE_DATA);
@@ -331,10 +325,7 @@ BOOL WINAPI CertGetCertificateContextProperty(PCCERT_CONTEXT pCertContext,
                 ret = FALSE;
             }
             else
-            {
                 *(HCRYPTPROV *)pvData = keyContext.hCryptProv;
-                ret = TRUE;
-            }
         }
         break;
     }
diff --git a/dlls/crypt32/crl.c b/dlls/crypt32/crl.c
index 32c4f3a..aa94f39 100644
--- a/dlls/crypt32/crl.c
+++ b/dlls/crypt32/crl.c
@@ -302,20 +302,17 @@ static BOOL WINAPI CRLContext_GetProperty(void *context, DWORD dwPropId,
     if (ret)
     {
         if (!pvData)
-        {
             *pcbData = blob.cbData;
-            ret = TRUE;
-        }
         else if (*pcbData < blob.cbData)
         {
             SetLastError(ERROR_MORE_DATA);
             *pcbData = blob.cbData;
+            ret = FALSE;
         }
         else
         {
             memcpy(pvData, blob.pbData, blob.cbData);
             *pcbData = blob.cbData;
-            ret = TRUE;
         }
     }
     else