Paul Vriens : crypt32: Remove bogus tests.

Alexandre Julliard julliard at wine.codeweavers.com
Tue Oct 3 10:04:46 CDT 2006


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

Author: Paul Vriens <Paul.Vriens at xs4all.nl>
Date:   Tue Oct  3 14:37:41 2006 +0200

crypt32: Remove bogus tests.

---

 dlls/crypt32/tests/sip.c |   31 ++++++-------------------------
 1 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c
index afdaf1a..3b57f43 100644
--- a/dlls/crypt32/tests/sip.c
+++ b/dlls/crypt32/tests/sip.c
@@ -291,43 +291,24 @@ static void test_SIPLoad(void)
             "Expected TRUST_E_SUBJECT_FORM_UNKNOWN, got 0x%08x\n", GetLastError());
     ok( sdi.pfGet == (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected no change to the function pointer\n");
 
-    /* cbSize not initialized */
-    SetLastError(0xdeadbeef);
-    memset(&sdi, 0, sizeof(SIP_DISPATCH_INFO));
-    sdi.pfGet = (pCryptSIPGetSignedDataMsg)0xdeadbeef;
-    ret = CryptSIPLoad(&dummySubject, 0, &sdi);
-    ok ( !ret, "Expected CryptSIPLoad to fail\n");
-    todo_wine
-        ok ( GetLastError() == TRUST_E_SUBJECT_FORM_UNKNOWN,
-            "Expected TRUST_E_SUBJECT_FORM_UNKNOWN, got 0x%08x\n", GetLastError());
-    ok( sdi.pfGet == (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected no change to the function pointer\n");
-
-    /* cbSize not initialized, but valid subject (named unknown but registered by wintrust) */
+    /* All OK */
     SetLastError(0xdeadbeef);
     memset(&sdi, 0, sizeof(SIP_DISPATCH_INFO));
+    sdi.cbSize = sizeof(SIP_DISPATCH_INFO);
     sdi.pfGet = (pCryptSIPGetSignedDataMsg)0xdeadbeef;
     ret = CryptSIPLoad(&unknown, 0, &sdi);
     todo_wine
     {
         ok ( ret, "Expected CryptSIPLoad to succeed\n");
+        /* This error will always be there as native searches for the function DllCanUnloadNow
+         * in WINTRUST.DLL (in this case). This function is not available in WINTRUST.DLL.
+         * For now there's no need to implement this is Wine.
+         */
         ok ( GetLastError() == ERROR_PROC_NOT_FOUND,
             "Expected ERROR_PROC_NOT_FOUND, got 0x%08x\n", GetLastError());
         ok( sdi.pfGet != (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected a function pointer to be loaded.\n");
     }
 
-    /* All OK */
-    SetLastError(0xdeadbeef);
-    memset(&sdi, 0, sizeof(SIP_DISPATCH_INFO));
-    sdi.cbSize = sizeof(SIP_DISPATCH_INFO);
-    sdi.pfGet = (pCryptSIPGetSignedDataMsg)0xdeadbeef;
-    ret = CryptSIPLoad(&unknown, 0, &sdi);
-    todo_wine
-        ok ( ret, "Expected CryptSIPLoad to succeed\n");
-    ok ( GetLastError() == 0xdeadbeef,
-        "Expected 0xdeadbeef, got 0x%08x\n", GetLastError());
-    todo_wine
-        ok( sdi.pfGet != (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected a function pointer to be loaded.\n");
-
     /* The function addresses returned by CryptSIPLoad are actually the addresses of
      * crypt32's own functions. A function calling these addresses will end up first
      * calling crypt32 functions which in it's turn call the equivalent in the SIP




More information about the wine-cvs mailing list