78607: Subject: advapi32: Correct test for NT4 prior to sp4

[buildbot at kegel.com]

This is an experimental automated build and test service.
Please feel free to ignore this email while we work the kinks out.

The Buildbot has detected a failed build on builder runtests-gcc295 while building Wine.
Full details are available at: http://buildbot.kegel.com/builders/runtests-gcc295/builds/18 (though maybe not for long, as I'm still reinstalling the buildbot periodically while experimenting)
BUILD FAILED: failed shell_2


For more info about this message, see http://wiki.winehq.org/BuildBot


-------------- next part --------------
From: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Subject: advapi32: Correct test for NT4 prior to sp4
Message-Id: <4E69F8AE.5040003 at hotmail.com>
Date: Fri, 09 Sep 2011 21:29:50 +1000

Hi,
Thanks Francois for testing this patch.

Changelog:
     advapi32: Correct test for NT4 prior to sp4


Best Regards
  Alistair Leslie-Hughes

From 6e3a4adc4cd1f8e241a2340afe7dda8b76a4d28a Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair at hotmail.com>
Date: Fri, 9 Sep 2011 19:31:02 +1000
Subject: [PATCH] Correct test for NT4 prior to sp4
To: wine-patches <wine-patches at winehq.org>

---
 dlls/advapi32/tests/security.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index 336cc9c..4cc1402 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -2913,8 +2913,8 @@ static void test_SetEntriesInAclA(void)
     ExplicitAccess.Trustee.TrusteeType = TRUSTEE_IS_WELL_KNOWN_GROUP;
     ExplicitAccess.Trustee.TrusteeForm = TRUSTEE_IS_SID;
     ExplicitAccess.Trustee.ptstrName = EveryoneSid;
-    ExplicitAccess.Trustee.MultipleTrusteeOperation = 0xDEADBEEF;
-    ExplicitAccess.Trustee.pMultipleTrustee = (PVOID)0xDEADBEEF;
+    ExplicitAccess.Trustee.MultipleTrusteeOperation = NO_MULTIPLE_TRUSTEE;
+    ExplicitAccess.Trustee.pMultipleTrustee = NULL;
     res = pSetEntriesInAclA(1, &ExplicitAccess, OldAcl, &NewAcl);
     ok(res == ERROR_SUCCESS, "SetEntriesInAclA failed: %u\n", res);
     ok(NewAcl != NULL, "returned acl was NULL\n");
-- 
1.7.4.1