[ros-diffs] [akhaldi] 64623: [WINTRUST_WINETEST] * Sync with Wine 1.7.27. CORE-8540

[akhaldi]

Author: akhaldi
Date: Wed Oct  8 19:51:36 2014
New Revision: 64623

URL: http://svn.reactos.org/svn/reactos?rev=64623&view=rev
Log:
[WINTRUST_WINETEST]
* Sync with Wine 1.7.27.
CORE-8540

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

Modified: trunk/rostests/winetests/wintrust/crypt.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/crypt.c?rev=64623&r1=64622&r2=64623&view=diff
==============================================================================
--- trunk/rostests/winetests/wintrust/crypt.c   [iso-8859-1] (original)
+++ trunk/rostests/winetests/wintrust/crypt.c   [iso-8859-1] Wed Oct  8 
19:51:36 2014
@@ -239,7 +239,7 @@
      * FIXME:
      * We don't want to mess too much with these for now so we should delete 
only the ones
      * that shouldn't be there like the deadbeef ones. We first have to figure 
out if it's
-     * save to remove files and directories from CatRoot/CatRoot2.
+     * safe to remove files and directories from CatRoot/CatRoot2.
      */
 
     ret = pCryptCATAdminAcquireContext(&hca, &dummy, 0);
@@ -550,7 +550,9 @@
     hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, tmpfileW, basenameW, 1);
     error = GetLastError();
     ok(hcatinfo == NULL, "CryptCATAdminAddCatalog succeeded\n");
-    ok(error == ERROR_INVALID_PARAMETER, "got %u expected 
ERROR_INVALID_PARAMETER\n", GetLastError());
+    ok(error == ERROR_INVALID_PARAMETER ||
+       error == ERROR_BAD_FORMAT, /* win 8 */
+       "got %u\n", GetLastError());
 
     SetLastError(0xdeadbeef);
     hcatinfo = pCryptCATAdminAddCatalog(hcatadmin, tmpfileW, NULL, 0);

Modified: trunk/rostests/winetests/wintrust/softpub.c
URL: 
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/wintrust/softpub.c?rev=64623&r1=64622&r2=64623&view=diff
==============================================================================
--- trunk/rostests/winetests/wintrust/softpub.c [iso-8859-1] (original)
+++ trunk/rostests/winetests/wintrust/softpub.c [iso-8859-1] Wed Oct  8 
19:51:36 2014
@@ -222,6 +222,7 @@
         }
         else
             skip("CertCreateCertificateContext failed: %08x\n", 
GetLastError());
+        funcs->pfnFree(data.pasSigners);
     }
 }