[akhaldi] 67397: [SHDOCVW_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

Author: akhaldi
Date: Sat Apr 25 10:56:44 2015
New Revision: 67397

URL: http://svn.reactos.org/svn/reactos?rev=67397&view=rev
Log:
[SHDOCVW_WINETEST] Sync with Wine Staging 1.7.37. CORE-9246

Modified:
    trunk/rostests/winetests/shdocvw/shdocvw.c

Modified: trunk/rostests/winetests/shdocvw/shdocvw.c
URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shdocvw/shdocvw....
==============================================================================
--- trunk/rostests/winetests/shdocvw/shdocvw.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/shdocvw/shdocvw.c	[iso-8859-1] Sat Apr 25 10:56:44 2015
@@ -212,13 +212,13 @@
         buffer[sizeof(buffer)-1] = '\0';
         len = sizeof(buffer);
         dummy = 0;
-        /* on success, len+1 is returned. No idea, if someone depend on this */
+        /* on success, string size including terminating 0 is returned for ansi version */
         res = pParseURLFromOutsideSourceA(ParseURL_table[i].url, buffer, &len, &dummy);
         /* len does not include the terminating 0, when buffer is large enough */
-        ok( res != 0 && len == ParseURL_table[i].len &&
+        ok( res == (ParseURL_table[i].len+1) && len == ParseURL_table[i].len &&
             !lstrcmpA(buffer, ParseURL_table[i].newurl),
-            "#%d: got %d and %d with '%s' (expected '!=0' and %d with '%s')\n",
-            i, res, len, buffer, ParseURL_table[i].len, ParseURL_table[i].newurl);
+            "#%d: got %d and %d with '%s' (expected %d and %d with '%s')\n",
+            i, res, len, buffer, ParseURL_table[i].len+1, ParseURL_table[i].len, ParseURL_table[i].newurl);

/* use the size test only for the first examples */
@@ -308,11 +308,12 @@
     /* len is in characters */
     len = sizeof(bufferW)/sizeof(bufferW[0]);
     dummy = 0;
+    /* on success, 1 is returned for unicode version */
     res = pParseURLFromOutsideSourceW(urlW, bufferW, &len, &dummy);
     WideCharToMultiByte(CP_ACP, 0, bufferW, -1, bufferA, sizeof(bufferA), NULL, NULL);
-    ok( res != 0 && len == ParseURL_table[0].len &&
+    ok( res == 1 && len == ParseURL_table[0].len &&
         !lstrcmpA(bufferA, ParseURL_table[0].newurl),
-        "got %d and %d with '%s' (expected '!=0' and %d with '%s')\n",
+        "got %d and %d with '%s' (expected 1 and %d with '%s')\n",
         res, len, bufferA, ParseURL_table[0].len, ParseURL_table[0].newurl);