Marko Nikolic : advapi32/ tests Fixed test macro in ConvertSecurityDescriptorToString.

[Alexandre Julliard]

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

Author: Marko Nikolic <grkoma(a)gmail.com>
Date:   Fri Jun 18 22:44:45 2010 +0200

advapi32/tests Fixed test macro in ConvertSecurityDescriptorToString.

---

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

diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
index ba139ce..2b14ae5 100644
--- a/dlls/advapi32/tests/security.c
+++ b/dlls/advapi32/tests/security.c
@@ -2812,7 +2812,7 @@ static void test_ConvertSecurityDescriptorToString(void)
 
 #define CHECK_ONE_OF_AND_FREE(exp_str1, exp_str2) \
     ok(strcmp(string, (exp_str1)) == 0 || strcmp(string, (exp_str2)) == 0, "String mismatch (expected\n\"%s\" or\n\"%s\", got\n\"%s\")\n", (exp_str1), (exp_str2), string); \
-    ok(len >= (strlen(string) + 1), "Length mismatch (expected %d, got %d)\n", lstrlen(string) + 1, len); \
+    ok(len >= (strlen(exp_str1) + 1) || len >= (strlen(exp_str2) + 1), "Length mismatch (expected %d or %d, got %d)\n", lstrlen(exp_str1) + 1, lstrlen(exp_str2) + 1, len); \
     LocalFree(string);
 
     InitializeSecurityDescriptor(&desc, SECURITY_DESCRIPTOR_REVISION);