Juan Lang : wintrust: Simplify error handling in SoftpubLoadSignature.

[Alexandre Julliard]

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

Author: Juan Lang 
Date:   Wed Jan 27 14:09:37 2010 -0800

wintrust: Simplify error handling in SoftpubLoadSignature.

---

dlls/wintrust/softpub.c |   22 +++++++++-------------
 1 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c
index 3fc14c2..c7d5f6a 100644
--- a/dlls/wintrust/softpub.c
+++ b/dlls/wintrust/softpub.c
@@ -560,7 +560,7 @@ static DWORD WINTRUST_VerifySigner(CRYPT_PROVIDER_DATA *data, DWORD signerIdx)

HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data)
 {
-    BOOL ret;
+    DWORD err;

TRACE("(%p)\n", data);

@@ -572,30 +572,26 @@ HRESULT WINAPI SoftpubLoadSignature(CRYPT_PROVIDER_DATA *data)
         DWORD signerCount, size;

size = sizeof(signerCount);
-        ret = CryptMsgGetParam(data->hMsg, CMSG_SIGNER_COUNT_PARAM, 0,
-         &signerCount, &size);
-        if (ret)
+        if (CryptMsgGetParam(data->hMsg, CMSG_SIGNER_COUNT_PARAM, 0,
+         &signerCount, &size))
         {
             DWORD i;
-            DWORD err = ERROR_SUCCESS;

+            err = ERROR_SUCCESS;
             for (i = 0; !err && i < signerCount; i++)
             {
                 if (!(err = WINTRUST_SaveSigner(data, i)))
                     err = WINTRUST_VerifySigner(data, i);
             }
-            if (err)
-                ret = FALSE;
         }
         else
-            SetLastError(TRUST_E_NOSIGNATURE);
+            err = TRUST_E_NOSIGNATURE;
     }
     else
-        ret = TRUE;
-    if (!ret)
-        data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_SIGPROV] =
-         GetLastError();
-    return ret ? S_OK : S_FALSE;
+        err = ERROR_SUCCESS;
+    if (err)
+        data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_SIGPROV] = err;
+    return !err ? S_OK : S_FALSE;
 }

static DWORD WINTRUST_TrustStatusToConfidence(DWORD errorStatus)