commit c8da5149d0c14efc3d30f2bb25e44d65a1cdb6e4
author Paul Vriens <paul.vriens.wine@gmail.com> Mon Oct 30 12:10:37 2006 +0100
committer Alexandre Julliard <julliard@winehq.org> Mon Oct 30 17:43:47 2006 +0100
tree 300fd16dac3a58568361f18ece148c6aafef0a31
parent 93825eab3e0938f65e9bdcc14519a05cc3def4a4

crypt32: Input parameter checking.

dlls/crypt32/sip.c

diff --git a/dlls/crypt32/sip.c b/dlls/crypt32/sip.c
index 8fe4b07..87fcc07 100644
--- a/dlls/crypt32/sip.c
+++ b/dlls/crypt32/sip.c
@@ -383,6 +383,13 @@
        (const GUID *pgSubject, DWORD dwFlags, SIP_DISPATCH_INFO *pSipDispatch)
 {
     FIXME("(%s %d %p) stub!\n", debugstr_guid(pgSubject), dwFlags, pSipDispatch);
+
+    if (!pgSubject || dwFlags != 0 || !pSipDispatch)
+    {
+        SetLastError(ERROR_INVALID_PARAMETER);
+        return FALSE;
+    }
+
     return FALSE;
 }
 

dlls/crypt32/tests/sip.c

diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c
index 231b852..e34221f 100644
--- a/dlls/crypt32/tests/sip.c
+++ b/dlls/crypt32/tests/sip.c
@@ -272,17 +272,15 @@
     SetLastError(0xdeadbeef);
     ret = CryptSIPLoad(NULL, 0, NULL);
     ok ( !ret, "Expected CryptSIPLoad to fail\n");
-    todo_wine
-        ok ( GetLastError() == ERROR_INVALID_PARAMETER,
-            "Expected ERROR_INVALID_PARAMETER, got 0x%08x\n", GetLastError());
+    ok ( GetLastError() == ERROR_INVALID_PARAMETER,
+        "Expected ERROR_INVALID_PARAMETER, got 0x%08x\n", GetLastError());
 
     /* Only pSipDispatch NULL */
     SetLastError(0xdeadbeef);
     ret = CryptSIPLoad(&subject, 0, NULL);
     ok ( !ret, "Expected CryptSIPLoad to fail\n");
-    todo_wine
-        ok ( GetLastError() == ERROR_INVALID_PARAMETER,
-            "Expected ERROR_INVALID_PARAMETER, got 0x%08x\n", GetLastError());
+    ok ( GetLastError() == ERROR_INVALID_PARAMETER,
+        "Expected ERROR_INVALID_PARAMETER, got 0x%08x\n", GetLastError());
 
     /* No NULLs, but nonexistent pgSubject */
     SetLastError(0xdeadbeef);
@@ -405,9 +403,8 @@
     sdi.pfGet = (pCryptSIPGetSignedDataMsg)0xdeadbeef;
     ret = CryptSIPLoad(&unknown, 1, &sdi);
     ok ( !ret, "Expected CryptSIPLoad to fail\n");
-    todo_wine
-        ok ( GetLastError() == ERROR_INVALID_PARAMETER,
-            "Expected ERROR_INVALID_PARAMETER, got 0x%08x\n", GetLastError());
+    ok ( GetLastError() == ERROR_INVALID_PARAMETER,
+        "Expected ERROR_INVALID_PARAMETER, got 0x%08x\n", GetLastError());
     ok( sdi.pfGet == (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected no change to the function pointer\n");
 }