[Wine-devel] Eter's patch is applied to winehq repo 11/25/10

[builder на builder.office.etersoft.ru]

New Etersoft's patches since last build time:
commit f48b0aa6a2f75763a5ea1c092abc29109446a4cf
Author: Alexander Morozov <amorozov на etersoft.ru>

    crypt32/tests: Fix test failures on some Win95 and some NT4.

commit b9c122f15e3aea9c481815a12b207711275b54a7
Author: Alexander Morozov <amorozov на etersoft.ru>

    crypt32/tests: Skip more tests.

---

commit f48b0aa6a2f75763a5ea1c092abc29109446a4cf
Author: Alexander Morozov <amorozov на etersoft.ru>
Date:   Thu Nov 25 17:38:59 2010 +0300

    crypt32/tests: Fix test failures on some Win95 and some NT4.

diff --git a/dlls/crypt32/tests/message.c b/dlls/crypt32/tests/message.c
index 392ec47..69049b1 100644
--- a/dlls/crypt32/tests/message.c
+++ b/dlls/crypt32/tests/message.c
@@ -1322,10 +1322,15 @@ static void test_encrypt_message(void)
             ret = CryptEncryptMessage(&para, 0, NULL, blob, sizeof(blob),
              encryptedBlob, &encryptedBlobSize);
 	    todo_wine
-            ok(ret, "CryptEncryptMessage failed: %08x\n", GetLastError());
-	    todo_wine
-            ok(encryptedBlobSize == 55,
-             "unexpected size of encrypted blob %d\n", encryptedBlobSize);
+            ok(ret ||
+             broken(!ret && GetLastError() == NTE_PERM), /* some NT4 */
+             "CryptEncryptMessage failed: %08x\n", GetLastError());
+            if (ret)
+            {
+                todo_wine
+                ok(encryptedBlobSize == 55,
+                 "unexpected size of encrypted blob %d\n", encryptedBlobSize);
+            }
             CryptMemFree(encryptedBlob);
         }
     }
@@ -1345,7 +1350,9 @@ static void test_encrypt_message(void)
             ret = CryptEncryptMessage(&para, 2, certs, blob, sizeof(blob),
              encryptedBlob, &encryptedBlobSize);
 	    todo_wine
-            ok(ret, "CryptEncryptMessage failed: %08x\n", GetLastError());
+            ok(ret ||
+             broken(!ret), /* some Win95 and some NT4 */
+             "CryptEncryptMessage failed: %08x\n", GetLastError());
             CryptMemFree(encryptedBlob);
         }
     }

commit b9c122f15e3aea9c481815a12b207711275b54a7
Author: Alexander Morozov <amorozov на etersoft.ru>
Date:   Thu Nov 25 01:06:32 2010 +0300

    crypt32/tests: Skip more tests.

diff --git a/dlls/crypt32/tests/msg.c b/dlls/crypt32/tests/msg.c
index 898b10c..d8b1b94 100644
--- a/dlls/crypt32/tests/msg.c
+++ b/dlls/crypt32/tests/msg.c
@@ -2078,7 +2078,6 @@ static void test_enveloped_msg_open(void)
          "expected E_INVALIDARG, got %08x\n", GetLastError());
     }
 
-    SetLastError(0xdeadbeef);
     context = CertCreateCertificateContext(X509_ASN_ENCODING,
      v1CertWithValidPubKey, sizeof(v1CertWithValidPubKey));
     if (context)
@@ -2090,23 +2089,21 @@ static void test_enveloped_msg_open(void)
         todo_wine
         ok(msg != NULL, "CryptMsgOpenToEncode failed: %08x\n", GetLastError());
         CryptMsgClose(msg);
+        SetLastError(0xdeadbeef);
+        ret = pCryptAcquireContextA(&envelopedInfo.hCryptProv, NULL, NULL,
+         PROV_RSA_FULL, CRYPT_VERIFYCONTEXT);
+        ok(ret, "CryptAcquireContextA failed: %08x\n", GetLastError());
+        SetLastError(0xdeadbeef);
+        msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED,
+         &envelopedInfo, NULL, NULL);
+        todo_wine
+        ok(msg != NULL, "CryptMsgOpenToEncode failed: %08x\n", GetLastError());
+        CryptMsgClose(msg);
+        CryptReleaseContext(envelopedInfo.hCryptProv, 0);
+        CertFreeCertificateContext(context);
     }
     else
-        win_skip("failed to create certificate context, skipping a test\n");
-
-    SetLastError(0xdeadbeef);
-    ret = pCryptAcquireContextA(&envelopedInfo.hCryptProv, NULL, NULL,
-     PROV_RSA_FULL, CRYPT_VERIFYCONTEXT);
-    ok(ret, "CryptAcquireContextA failed: %08x\n", GetLastError());
-    SetLastError(0xdeadbeef);
-    msg = CryptMsgOpenToEncode(PKCS_7_ASN_ENCODING, 0, CMSG_ENVELOPED,
-     &envelopedInfo, NULL, NULL);
-    todo_wine
-    ok(msg != NULL, "CryptMsgOpenToEncode failed: %08x\n", GetLastError());
-    CryptMsgClose(msg);
-
-    CryptReleaseContext(envelopedInfo.hCryptProv, 0);
-    CertFreeCertificateContext(context);
+        win_skip("failed to create certificate context, skipping tests\n");
 }
 
 static void test_enveloped_msg_update(void)