Juan Lang : cryptui: Improve parameter checking.

Alexandre Julliard julliard at winehq.org
Mon Oct 27 08:02:57 CDT 2008


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

Author: Juan Lang <juan.lang at gmail.com>
Date:   Fri Oct 24 14:34:52 2008 -0700

cryptui: Improve parameter checking.

---

 dlls/cryptui/main.c          |    3 ++-
 dlls/cryptui/tests/cryptui.c |    1 -
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/cryptui/main.c b/dlls/cryptui/main.c
index b31763d..065bd6d 100644
--- a/dlls/cryptui/main.c
+++ b/dlls/cryptui/main.c
@@ -117,7 +117,8 @@ BOOL WINAPI CryptUIWizImport(DWORD dwFlags, HWND hwndParent, LPCWSTR pwszWizardT
 
     if (!(dwFlags & CRYPTUI_WIZ_NO_UI)) FIXME("UI not implemented\n");
 
-    if (!pImportSrc)
+    if (!pImportSrc ||
+     pImportSrc->dwSize != sizeof(CRYPTUI_WIZ_IMPORT_SRC_INFO))
     {
         SetLastError(E_INVALIDARG);
         return FALSE;
diff --git a/dlls/cryptui/tests/cryptui.c b/dlls/cryptui/tests/cryptui.c
index d2d4c6f..75e78be 100644
--- a/dlls/cryptui/tests/cryptui.c
+++ b/dlls/cryptui/tests/cryptui.c
@@ -197,7 +197,6 @@ static void test_crypt_ui_wiz_import(void)
     memset(&info, 0, sizeof(info));
     SetLastError(0xdeadbeef);
     ret = pCryptUIWizImport(CRYPTUI_WIZ_NO_UI, 0, NULL, &info, NULL);
-    todo_wine
     ok(!ret && GetLastError() == E_INVALIDARG,
      "expected E_INVALIDARG, got %08x\n", GetLastError());
     info.dwSize = sizeof(info);




More information about the wine-cvs mailing list