Juan Lang : crypt32: Set save function in switch statement rather than with trinary conditional operator .
Alexandre Julliard
julliard at winehq.org
Tue Jan 27 09:06:54 CST 2009
Module: wine
Branch: master
Commit: 6917fdd3a85b10c6d6e2eaa5fa12699656a70d54
URL: http://source.winehq.org/git/wine.git/?a=commit;h=6917fdd3a85b10c6d6e2eaa5fa12699656a70d54
Author: Juan Lang <juan.lang at gmail.com>
Date: Sat Jan 24 13:07:02 2009 -0800
crypt32: Set save function in switch statement rather than with trinary conditional operator.
---
dlls/crypt32/serialize.c | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/dlls/crypt32/serialize.c b/dlls/crypt32/serialize.c
index 32a9ca0..af36441 100644
--- a/dlls/crypt32/serialize.c
+++ b/dlls/crypt32/serialize.c
@@ -841,7 +841,16 @@ BOOL WINAPI CertSaveStore(HCERTSTORE hCertStore, DWORD dwMsgAndCertEncodingType,
switch (dwSaveAs)
{
case CERT_STORE_SAVE_AS_STORE:
+ if (dwSaveTo == CERT_STORE_SAVE_TO_MEMORY)
+ saveFunc = CRYPT_SaveSerializedToMem;
+ else
+ saveFunc = CRYPT_SaveSerializedToFile;
+ break;
case CERT_STORE_SAVE_AS_PKCS7:
+ if (dwSaveTo == CERT_STORE_SAVE_TO_MEMORY)
+ saveFunc = CRYPT_SavePKCSToMem;
+ else
+ saveFunc = CRYPT_SavePKCSToFile;
break;
default:
WARN("unimplemented for %d\n", dwSaveAs);
@@ -852,25 +861,17 @@ BOOL WINAPI CertSaveStore(HCERTSTORE hCertStore, DWORD dwMsgAndCertEncodingType,
{
case CERT_STORE_SAVE_TO_FILE:
handle = pvSaveToPara;
- saveFunc = dwSaveAs == CERT_STORE_SAVE_AS_STORE ?
- CRYPT_SaveSerializedToFile : CRYPT_SavePKCSToFile;
break;
case CERT_STORE_SAVE_TO_FILENAME_A:
handle = CreateFileA((LPCSTR)pvSaveToPara, GENERIC_WRITE, 0, NULL,
CREATE_ALWAYS, 0, NULL);
- saveFunc = dwSaveAs == CERT_STORE_SAVE_AS_STORE ?
- CRYPT_SaveSerializedToFile : CRYPT_SavePKCSToFile;
break;
case CERT_STORE_SAVE_TO_FILENAME_W:
handle = CreateFileW((LPCWSTR)pvSaveToPara, GENERIC_WRITE, 0, NULL,
CREATE_ALWAYS, 0, NULL);
- saveFunc = dwSaveAs == CERT_STORE_SAVE_AS_STORE ?
- CRYPT_SaveSerializedToFile : CRYPT_SavePKCSToFile;
break;
case CERT_STORE_SAVE_TO_MEMORY:
handle = pvSaveToPara;
- saveFunc = dwSaveAs == CERT_STORE_SAVE_AS_STORE ?
- CRYPT_SaveSerializedToMem : CRYPT_SavePKCSToMem;
break;
default:
WARN("unimplemented for %d\n", dwSaveTo);
More information about the wine-cvs
mailing list