Rob Shearman : ntdll: Fix some test failures of RtlGUIDFromString and RtlStringFromGUID

Alexandre Julliard julliard at wine.codeweavers.com
Thu Jan 4 15:09:25 CST 2007


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

Author: Rob Shearman <rob at codeweavers.com>
Date:   Thu Jan  4 16:56:16 2007 +0000

ntdll: Fix some test failures of RtlGUIDFromString and RtlStringFromGUID
by setting the length correctly and by doing a case-insentive compare
on the GUID string that is returned.

---

 dlls/ntdll/tests/rtlstr.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dlls/ntdll/tests/rtlstr.c b/dlls/ntdll/tests/rtlstr.c
index cc1606a..5c70eda 100644
--- a/dlls/ntdll/tests/rtlstr.c
+++ b/dlls/ntdll/tests/rtlstr.c
@@ -1684,14 +1684,14 @@ static void test_RtlGUIDFromString(void)
   UNICODE_STRING str;
   NTSTATUS ret;
 
-  str.Length = str.MaximumLength = (sizeof(szGuid) - 1) / sizeof(WCHAR);
+  str.Length = str.MaximumLength = sizeof(szGuid) - sizeof(WCHAR);
   str.Buffer = (LPWSTR)szGuid;
 
   ret = pRtlGUIDFromString(&str, &guid);
   ok(ret == 0, "expected ret=0, got 0x%0x\n", ret);
   ok(memcmp(&guid, &IID_Endianess, sizeof(guid)) == 0, "Endianess broken\n");
 
-  str.Length = str.MaximumLength = (sizeof(szGuid2) - 1) / sizeof(WCHAR);
+  str.Length = str.MaximumLength = sizeof(szGuid2) - sizeof(WCHAR);
   str.Buffer = (LPWSTR)szGuid2;
 
   ret = pRtlGUIDFromString(&str, &guid);
@@ -1708,7 +1708,7 @@ static void test_RtlStringFromGUID(void)
 
   ret = pRtlStringFromGUID(&IID_Endianess, &str);
   ok(ret == 0, "expected ret=0, got 0x%0x\n", ret);
-  ok(str.Buffer && !lstrcmpW(str.Buffer, szGuid), "Endianess broken\n");
+  ok(str.Buffer && !lstrcmpiW(str.Buffer, szGuid), "Endianess broken\n");
 }
 
 START_TEST(rtlstr)




More information about the wine-cvs mailing list