[ros-diffs] [akhaldi] 69985: [WINTRUST_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536

Author: akhaldi
Date: Sat Nov 21 09:52:21 2015
New Revision: 69985

URL: http://svn.reactos.org/svn/reactos?rev=69985&view=rev
Log:
[WINTRUST_WINETEST] Sync with Wine Staging 1.7.55. CORE-10536

Modified:
    trunk/rostests/winetests/wintrust/softpub.c

Modified: trunk/rostests/winetests/wintrust/softpub.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/softpub...
==============================================================================
--- trunk/rostests/winetests/wintrust/softpub.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/wintrust/softpub.c	[iso-8859-1] Sat Nov 21 09:52:21 2015
@@ -544,6 +544,7 @@
     CRYPT_PROVIDER_DATA data = { 0 };
     CRYPT_PROVIDER_SGNR sgnr = { sizeof(sgnr), { 0 } };
     HRESULT ret;
+    BOOL b;

if (!CertFreeCertificateChain_p)
     {
@@ -563,8 +564,8 @@
     ok(data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV] ==
      TRUST_E_NOSIGNATURE, "Expected TRUST_E_NOSIGNATURE, got %08x\n",
      data.padwTrustStepErrors[TRUSTERROR_STEP_FINAL_CERTPROV]);
-    ret = funcs->pfnAddSgnr2Chain(&data, FALSE, 0, &sgnr);
-    if (ret)
+    b = funcs->pfnAddSgnr2Chain(&data, FALSE, 0, &sgnr);
+    if (b)
     {
         PCCERT_CONTEXT cert;

@@ -577,8 +578,8 @@
         {
             WINTRUST_DATA wintrust_data = { 0 };

-            ret = funcs->pfnAddCert2Chain(&data, 0, FALSE, 0, cert);
-            ok(ret == S_FALSE, "Expected S_FALSE, got %08x\n", ret);
+            b = funcs->pfnAddCert2Chain(&data, 0, FALSE, 0, cert);
+            ok(b == TRUE, "Expected TRUE, got %d\n", b);

/* If pWintrustData isn't set, crashes attempting to access
              * pWintrustData->fdwRevocationChecks