[akhaldi] 71741: [SHLWAPI_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368

Author: akhaldi
Date: Sat Jul  2 13:17:08 2016
New Revision: 71741

URL: http://svn.reactos.org/svn/reactos?rev=71741&view=rev
Log:
[SHLWAPI_WINETEST] Sync with Wine Staging 1.9.11. CORE-11368

Modified:
    trunk/rostests/winetests/shlwapi/assoc.c
    trunk/rostests/winetests/shlwapi/istream.c
    trunk/rostests/winetests/shlwapi/path.c
    trunk/rostests/winetests/shlwapi/url.c

Modified: trunk/rostests/winetests/shlwapi/assoc.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/assoc.c…
==============================================================================
--- trunk/rostests/winetests/shlwapi/assoc.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/shlwapi/assoc.c	[iso-8859-1] Sat Jul  2 13:17:08 2016
@@ -108,9 +108,11 @@
     hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotBad, open, NULL, &len);
     ok(hr == E_FAIL ||
        hr == HRESULT_FROM_WIN32(ERROR_NO_ASSOCIATION) /* Win9x/WinMe/NT4/W2K/Vista/W2K8
*/ ||
-       hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND), /* Win8 */
-       "Unexpected result : %08x\n", hr);
-    ok(len == 0xdeadbeef, "got %u\n", len);
+       hr == HRESULT_FROM_WIN32(ERROR_NOT_FOUND) /* Win8 */ ||
+       hr == S_FALSE, /* Win10 */
+       "Unexpected result : %08x\n", hr);
+    ok((hr == S_FALSE && len < sizeof(buf)/sizeof(buf[0])) || len ==
0xdeadbeef,
+       "got hr=%08x and len=%u\n", hr, len);
 
     len = 0xdeadbeef;
     hr = pAssocQueryStringW(0, ASSOCSTR_FRIENDLYAPPNAME, dotHtml, invalid, NULL,
&len);

Modified: trunk/rostests/winetests/shlwapi/istream.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/istream…
==============================================================================
--- trunk/rostests/winetests/shlwapi/istream.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/shlwapi/istream.c	[iso-8859-1] Sat Jul  2 13:17:08 2016
@@ -253,11 +253,24 @@
     }
     else
     {
-todo_wine
         ok(ret == S_FALSE, "expected S_FALSE, got %#x (access %#x, written
%u)\n", ret, mode, written);
         ok(count == 0, "expected 0, got %u\n", count);
     }
 
+    ret = stream->lpVtbl->Seek(stream, start, STREAM_SEEK_SET, NULL);
+    ok(ret == S_OK, "Seek error %#x\n", ret);
+
+    count = 0xdeadbeaf;
+    ret = stream->lpVtbl->Read(stream, buf, 0, &count);
+    ok(ret == S_OK, "IStream_Read error %#x (access %#x, written %u)\n", ret,
mode, written);
+    ok(count == 0, "expected 0, got %u\n", count);
+
+    count = 0xdeadbeaf;
+    ret = stream->lpVtbl->Read(stream, buf, sizeof(buf), &count);
+    ok(ret == S_FALSE, "expected S_FALSE, got %#x (access %#x, written %u)\n",
ret, mode, written);
+    ok(count == written, "expected %u, got %u\n", written, count);
+    if (count)
+        ok(buf[0] == 0x5e && buf[1] == 0xa7, "expected 5ea7, got
%02x%02x\n", buf[0], buf[1]);
 }
 
 static void test_SHCreateStreamOnFileA(DWORD mode, DWORD stgm)

Modified: trunk/rostests/winetests/shlwapi/path.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/path.c?…
==============================================================================
--- trunk/rostests/winetests/shlwapi/path.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/shlwapi/path.c	[iso-8859-1] Sat Jul  2 13:17:08 2016
@@ -291,9 +291,7 @@
     for(i = 0; i < sizeof(TEST_PATHFROMURL) / sizeof(TEST_PATHFROMURL[0]); i++) {
         len = INTERNET_MAX_URL_LENGTH;
         ret = pPathCreateFromUrlA(TEST_PATHFROMURL[i].url, ret_path, &len, 0);
-        if (!(TEST_PATHFROMURL[i].todo & 0x1))
-            ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url %s\n", ret,
TEST_PATHFROMURL[i].url);
-        else todo_wine
+        todo_wine_if (TEST_PATHFROMURL[i].todo & 0x1)
             ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url %s\n", ret,
TEST_PATHFROMURL[i].url);
         if(SUCCEEDED(ret) && TEST_PATHFROMURL[i].path) {
             if(!(TEST_PATHFROMURL[i].todo & 0x2)) {
@@ -310,9 +308,7 @@
             urlW = GetWideString(TEST_PATHFROMURL[i].url);
             ret = pPathCreateFromUrlW(urlW, ret_pathW, &len, 0);
             WideCharToMultiByte(CP_ACP, 0, ret_pathW, -1, ret_path,
sizeof(ret_path),NULL,NULL);
-            if (!(TEST_PATHFROMURL[i].todo & 0x1))
-                ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url
L\"%s\"\n", ret, TEST_PATHFROMURL[i].url);
-            else todo_wine
+            todo_wine_if (TEST_PATHFROMURL[i].todo & 0x1)
                 ok(ret == TEST_PATHFROMURL[i].ret, "ret %08x from url
L\"%s\"\n", ret, TEST_PATHFROMURL[i].url);
             if(SUCCEEDED(ret) && TEST_PATHFROMURL[i].path) {
                 if(!(TEST_PATHFROMURL[i].todo & 0x2)) {
@@ -331,9 +327,7 @@
                 len2 = 2;
                 ret = pPathCreateFromUrlW(urlW, ret_pathW, &len2, 0);
                 ok(ret == E_POINTER, "ret %08x, expected E_POINTER from url
%s\n", ret, TEST_PATHFROMURL[i].url);
-                if(!(TEST_PATHFROMURL[i].todo & 0x4))
-                    ok(len2 == len + 1, "got len = %d expected %d from url
%s\n", len2, len + 1, TEST_PATHFROMURL[i].url);
-                else todo_wine
+                todo_wine_if (TEST_PATHFROMURL[i].todo & 0x4)
                     ok(len2 == len + 1, "got len = %d expected %d from url
%s\n", len2, len + 1, TEST_PATHFROMURL[i].url);
             }
 

Modified: trunk/rostests/winetests/shlwapi/url.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/shlwapi/url.c?r…
==============================================================================
--- trunk/rostests/winetests/shlwapi/url.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/shlwapi/url.c	[iso-8859-1] Sat Jul  2 13:17:08 2016
@@ -861,10 +861,7 @@
     ok(ret == dwExpectReturn || ret == dwExpectReturnAlt,
        "UrlCanonicalizeA failed: expected=0x%08x or 0x%08x, got=0x%08x, index
%d\n",
        dwExpectReturn, dwExpectReturnAlt, ret, index);
-    if (todo)
-        todo_wine
-        ok(strcmp(szReturnUrl,szExpectUrl)==0, "UrlCanonicalizeA dwFlags 0x%08x url
'%s' Expected \"%s\", but got \"%s\", index %d\n",
dwFlags, szUrl, szExpectUrl, szReturnUrl, index);
-    else
+    todo_wine_if (todo)
         ok(strcmp(szReturnUrl,szExpectUrl)==0, "UrlCanonicalizeA dwFlags 0x%08x url
'%s' Expected \"%s\", but got \"%s\", index %d\n",
dwFlags, szUrl, szExpectUrl, szReturnUrl, index);
 
     if (pUrlCanonicalizeW) {