Juan Lang : wintrust: Return error directly from SOFTPUB_CreateStoreFromMessage.
Alexandre Julliard
julliard at winehq.org
Thu Jan 28 11:15:35 CST 2010
Module: wine
Branch: master
Commit: 8085ea5fe07afa67a16cfb76af45fbf70d7c5078
URL: http://source.winehq.org/git/wine.git/?a=commit;h=8085ea5fe07afa67a16cfb76af45fbf70d7c5078
Author: Juan Lang <juan.lang at gmail.com>
Date: Wed Jan 27 10:37:59 2010 -0800
wintrust: Return error directly from SOFTPUB_CreateStoreFromMessage.
---
dlls/wintrust/softpub.c | 25 ++++++++++++-------------
1 files changed, 12 insertions(+), 13 deletions(-)
diff --git a/dlls/wintrust/softpub.c b/dlls/wintrust/softpub.c
index 680afcd..a9f8f29 100644
--- a/dlls/wintrust/softpub.c
+++ b/dlls/wintrust/softpub.c
@@ -194,20 +194,23 @@ static DWORD SOFTPUB_GetMessageFromFile(CRYPT_PROVIDER_DATA *data, HANDLE file,
return err;
}
-static BOOL SOFTPUB_CreateStoreFromMessage(CRYPT_PROVIDER_DATA *data)
+static DWORD SOFTPUB_CreateStoreFromMessage(CRYPT_PROVIDER_DATA *data)
{
- BOOL ret = FALSE;
+ DWORD err = ERROR_SUCCESS;
HCERTSTORE store;
store = CertOpenStore(CERT_STORE_PROV_MSG, data->dwEncoding,
data->hProv, CERT_STORE_NO_CRYPT_RELEASE_FLAG, data->hMsg);
if (store)
{
- ret = data->psPfns->pfnAddStore2Chain(data, store);
+ if (!data->psPfns->pfnAddStore2Chain(data, store))
+ err = GetLastError();
CertCloseStore(store, 0);
}
- TRACE("returning %d\n", ret);
- return ret;
+ else
+ err = GetLastError();
+ TRACE("returning %d\n", err);
+ return err;
}
static DWORD SOFTPUB_DecodeInnerContent(CRYPT_PROVIDER_DATA *data)
@@ -341,11 +344,9 @@ static DWORD SOFTPUB_LoadFileMessage(CRYPT_PROVIDER_DATA *data)
data->pWintrustData->u.pFile->pcwszFilePath);
if (err)
goto error;
- if (!SOFTPUB_CreateStoreFromMessage(data))
- {
- err = GetLastError();
+ err = SOFTPUB_CreateStoreFromMessage(data);
+ if (err)
goto error;
- }
if (!SOFTPUB_DecodeInnerContent(data))
err = GetLastError();
error:
@@ -381,11 +382,9 @@ static DWORD SOFTPUB_LoadCatalogMessage(CRYPT_PROVIDER_DATA *data)
data->pWintrustData->u.pFile->pcwszFilePath);
if (err)
goto error;
- if (!SOFTPUB_CreateStoreFromMessage(data))
- {
- err = GetLastError();
+ err = SOFTPUB_CreateStoreFromMessage(data);
+ if (err)
goto error;
- }
if (!SOFTPUB_DecodeInnerContent(data))
err = GetLastError();
/* FIXME: this loads the catalog file, but doesn't validate the member. */
More information about the wine-cvs
mailing list