https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d3f4d62dde2e4854aa89d99ce8bd4d7f214421e4
commit d3f4d62dde2e4854aa89d99ce8bd4d7f214421e4 Author: Amine Khaldi <[email protected]> AuthorDate: Sat Jan 20 13:19:06 2018 +0100 Commit: Amine Khaldi <[email protected]> CommitDate: Sat Jan 20 13:19:06 2018 +0100 [SHDOCVW_WINETEST] Sync with Wine 3.0. CORE-14225 --- modules/rostests/winetests/shdocvw/shdocvw.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/modules/rostests/winetests/shdocvw/shdocvw.c b/modules/rostests/winetests/shdocvw/shdocvw.c index 50ee9a3863..3bdceb5728 100644 --- a/modules/rostests/winetests/shdocvw/shdocvw.c +++ b/modules/rostests/winetests/shdocvw/shdocvw.c @@ -212,13 +212,13 @@ static void test_ParseURLFromOutsideSourceA(void) buffer[sizeof(buffer)-1] = '\0'; len = sizeof(buffer); dummy = 0; - /* on success, string size including terminating 0 is returned for ansi version */ + /* on success, len+1 is returned. No idea, if someone depend on this */ res = pParseURLFromOutsideSourceA(ParseURL_table[i].url, buffer, &len, &dummy); /* len does not include the terminating 0, when buffer is large enough */ - ok( res == (ParseURL_table[i].len+1) && len == ParseURL_table[i].len && + ok( res != 0 && len == ParseURL_table[i].len && !lstrcmpA(buffer, 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); + "#%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); /* use the size test only for the first examples */ @@ -308,12 +308,11 @@ static void test_ParseURLFromOutsideSourceW(void) /* 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 == 1 && len == ParseURL_table[0].len && + ok( res != 0 && len == ParseURL_table[0].len && !lstrcmpA(bufferA, ParseURL_table[0].newurl), - "got %d and %d with '%s' (expected 1 and %d with '%s')\n", + "got %d and %d with '%s' (expected '!=0' and %d with '%s')\n", res, len, bufferA, ParseURL_table[0].len, ParseURL_table[0].newurl);
