Juan Lang : cryptui: Always initialize export wizard's export options.

[Alexandre Julliard]

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

Author: Juan Lang <juan.lang at gmail.com>
Date:   Sat Jan 24 11:46:30 2009 -0800

cryptui: Always initialize export wizard's export options.

---

 dlls/cryptui/main.c |   12 +++++-------
 1 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c
index 61554b7..21c04e0 100644
--- a/dlls/cryptui/main.c
+++ b/dlls/cryptui/main.c
@@ -6268,18 +6268,16 @@ static BOOL show_export_ui(DWORD dwFlags, HWND hwndParent,
     data.dwFlags = dwFlags;
     data.pwszWizardTitle = pwszWizardTitle;
     data.pExportInfo = pExportInfo;
+    data.contextInfo.dwSize = sizeof(data.contextInfo);
+    data.contextInfo.dwExportFormat = 0;
+    data.contextInfo.fExportChain = FALSE;
+    data.contextInfo.fStrongEncryption = FALSE;
+    data.contextInfo.fExportPrivateKeys = FALSE;
     if (pExportInfo->dwSubjectChoice == CRYPTUI_WIZ_EXPORT_CERT_CONTEXT &&
      pvoid)
         memcpy(&data.contextInfo, pvoid,
          min(((PCCRYPTUI_WIZ_EXPORT_CERTCONTEXT_INFO)pvoid)->dwSize,
          sizeof(data.contextInfo)));
-    else
-    {
-        data.contextInfo.dwExportFormat = 0;
-        data.contextInfo.fExportChain = FALSE;
-        data.contextInfo.fStrongEncryption = FALSE;
-        data.contextInfo.fExportPrivateKeys = FALSE;
-    }
     data.fileName = NULL;
     data.file = INVALID_HANDLE_VALUE;
     data.success = FALSE;