Juan Lang : wintrust: Separate loading a message from a WINTRUST_FILE_INFO into a helper function .

[Alexandre Julliard]

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

Author: Juan Lang <juan.lang(a)gmail.com>
Date:   Thu Oct 23 13:42:08 2008 -0700

wintrust: Separate loading a message from a WINTRUST_FILE_INFO into a helper function.

---

 dlls/wintrust/softpub.c |   54 +++++++++++++++++++++++++++--------------------
 1 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c
index 72d223c..d110e2c 100644
--- a/dlls/wintrust/softpub.c
+++ b/dlls/wintrust/softpub.c
@@ -298,6 +298,36 @@ static BOOL SOFTPUB_LoadCertMessage(CRYPT_PROVIDER_DATA *data)
     return ret;
 }
 
+static BOOL SOFTPUB_LoadFileMessage(CRYPT_PROVIDER_DATA *data)
+{
+    BOOL ret;
+
+    if (!data->pWintrustData->u.pFile)
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        ret = FALSE;
+        goto error;
+    }
+    ret = SOFTPUB_OpenFile(data);
+    if (!ret)
+        goto error;
+    ret = SOFTPUB_GetFileSubject(data);
+    if (!ret)
+        goto error;
+    ret = SOFTPUB_GetSIP(data);
+    if (!ret)
+        goto error;
+    ret = SOFTPUB_GetMessageFromFile(data);
+    if (!ret)
+        goto error;
+    ret = SOFTPUB_CreateStoreFromMessage(data);
+    if (!ret)
+        goto error;
+    ret = SOFTPUB_DecodeInnerContent(data);
+error:
+    return ret;
+}
+
 HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *data)
 {
     BOOL ret;
@@ -313,28 +343,7 @@ HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *data)
         ret = SOFTPUB_LoadCertMessage(data);
         break;
     case WTD_CHOICE_FILE:
-        if (!data->pWintrustData->u.pFile)
-        {
-            SetLastError(ERROR_INVALID_PARAMETER);
-            ret = FALSE;
-            goto error;
-        }
-        ret = SOFTPUB_OpenFile(data);
-        if (!ret)
-            goto error;
-        ret = SOFTPUB_GetFileSubject(data);
-        if (!ret)
-            goto error;
-        ret = SOFTPUB_GetSIP(data);
-        if (!ret)
-            goto error;
-        ret = SOFTPUB_GetMessageFromFile(data);
-        if (!ret)
-            goto error;
-        ret = SOFTPUB_CreateStoreFromMessage(data);
-        if (!ret)
-            goto error;
-        ret = SOFTPUB_DecodeInnerContent(data);
+        ret = SOFTPUB_LoadFileMessage(data);
         break;
     default:
         FIXME("unimplemented for %d\n", data->pWintrustData->dwUnionChoice);
@@ -342,7 +351,6 @@ HRESULT WINAPI SoftpubLoadMessage(CRYPT_PROVIDER_DATA *data)
         ret = FALSE;
     }
 
-error:
     if (!ret)
         data->padwTrustStepErrors[TRUSTERROR_STEP_FINAL_OBJPROV] =
          GetLastError();