Juan Lang : tools/wine.inf: Register msisip.dll.

[Alexandre Julliard]

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

Author: Juan Lang 
Date:   Thu Jul 31 10:22:01 2008 -0700

tools/wine.inf: Register msisip.dll.

---

dlls/crypt32/tests/sip.c |   35 ++++++++++++++++-------------------
 tools/wine.inf.in        |    1 +
 2 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/dlls/crypt32/tests/sip.c b/dlls/crypt32/tests/sip.c
index 80a1323..7ffa2b9 100644
--- a/dlls/crypt32/tests/sip.c
+++ b/dlls/crypt32/tests/sip.c
@@ -310,7 +310,7 @@ static void test_SIPLoad(void)
     static GUID dummySubject = { 0xdeadbeef, 0xdead, 0xbeef, { 0xde,0xad,0xbe,0xef,0xde,0xad,0xbe,0xef }};
     static GUID unknown      = { 0xC689AABA, 0x8E78, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; /* WINTRUST.DLL */
     static GUID unknown2     = { 0xDE351A43, 0x8E59, 0x11D0, { 0x8C,0x47,0x00,0xC0,0x4F,0xC2,0x95,0xEE }}; /* WINTRUST.DLL */
-    /* The next SIP is available on Windows (not on a clean Wine install) */
+    /* The next SIP is available on Windows and on Wine */
     static GUID unknown3     = { 0x000C10F1, 0x0000, 0x0000, { 0xC0,0x00,0x00,0x00,0x00,0x00,0x00,0x46 }}; /* MSISIP.DLL */
     SIP_DISPATCH_INFO sdi;
     HMODULE hCrypt;
@@ -403,24 +403,21 @@ static void test_SIPLoad(void)
         /* As msisip.dll is not checked yet by any of the previous calls, the
          * function DllCanUnloadNow will be checked again in msisip.dll (it's not present)
          */
-        todo_wine
-        {
-            ok( sdi.pfGet != (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected a function pointer to be loaded.\n");
-
-            /* This is another SIP but this test proves the function addresses are the same as
-             * in the previous test.
-             */
-            if (funcCryptSIPGetSignedDataMsg && funcCryptSIPPutSignedDataMsg && funcCryptSIPCreateIndirectData &&
-                funcCryptSIPVerifyIndirectData && funcCryptSIPRemoveSignedDataMsg)
-                ok (sdi.pfGet == funcCryptSIPGetSignedDataMsg &&
-                    sdi.pfPut == funcCryptSIPPutSignedDataMsg &&
-                    sdi.pfCreate == funcCryptSIPCreateIndirectData &&
-                    sdi.pfVerify == funcCryptSIPVerifyIndirectData &&
-                    sdi.pfRemove == funcCryptSIPRemoveSignedDataMsg,
-                    "Expected function addresses to be from crypt32\n");
-            else
-                trace("Couldn't load function pointers\n");
-        }
+        ok( sdi.pfGet != (pCryptSIPGetSignedDataMsg)0xdeadbeef, "Expected a function pointer to be loaded.\n");
+
+        /* This is another SIP but this test proves the function addresses are the same as
+         * in the previous test.
+         */
+        if (funcCryptSIPGetSignedDataMsg && funcCryptSIPPutSignedDataMsg && funcCryptSIPCreateIndirectData &&
+            funcCryptSIPVerifyIndirectData && funcCryptSIPRemoveSignedDataMsg)
+            ok (sdi.pfGet == funcCryptSIPGetSignedDataMsg &&
+                sdi.pfPut == funcCryptSIPPutSignedDataMsg &&
+                sdi.pfCreate == funcCryptSIPCreateIndirectData &&
+                sdi.pfVerify == funcCryptSIPVerifyIndirectData &&
+                sdi.pfRemove == funcCryptSIPRemoveSignedDataMsg,
+                "Expected function addresses to be from crypt32\n");
+        else
+            trace("Couldn't load function pointers\n");
     }

/* Reserved parameter not 0 */
diff --git a/tools/wine.inf.in b/tools/wine.inf.in
index 0d116df..4d10778 100644
--- a/tools/wine.inf.in
+++ b/tools/wine.inf.in
@@ -2213,6 +2213,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G"
 11,,msi.dll,1
 11,,msiexec.exe,1
 11,,msimtf.dll,1
+11,,msisip.dll,1
 11,,mstask.dll,1
 11,,msxml3.dll,1
 11,,objsel.dll,1