[akhaldi] 74850: [URLMON_WINETEST] Sync with Wine Staging 2.9. CORE-13362

Author: akhaldi
Date: Sun Jun  4 01:46:38 2017
New Revision: 74850

URL: http://svn.reactos.org/svn/reactos?rev=74850&view=rev
Log:
[URLMON_WINETEST] Sync with Wine Staging 2.9. CORE-13362

Modified:
    trunk/rostests/winetests/urlmon/uri.c
    trunk/rostests/winetests/urlmon/url.c

Modified: trunk/rostests/winetests/urlmon/uri.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/uri.c?re…
==============================================================================
--- trunk/rostests/winetests/urlmon/uri.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/urlmon/uri.c	[iso-8859-1] Sun Jun  4 01:46:38 2017
@@ -7440,12 +7440,13 @@
     return ret;
 }
 
-static inline void *heap_alloc(size_t len)
+static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size)
 {
-    return HeapAlloc(GetProcessHeap(), 0, len);
+    return HeapAlloc(GetProcessHeap(), 0, size);
 }
 
-static inline BOOL heap_free(void* mem) {
+static inline BOOL heap_free(void *mem)
+{
     return HeapFree(GetProcessHeap(), 0, mem);
 }
 

Modified: trunk/rostests/winetests/urlmon/url.c
URL:
http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/urlmon/url.c?re…
==============================================================================
--- trunk/rostests/winetests/urlmon/url.c	[iso-8859-1] (original)
+++ trunk/rostests/winetests/urlmon/url.c	[iso-8859-1] Sun Jun  4 01:46:38 2017
@@ -190,6 +190,7 @@
 static BOOL have_IHttpNegotiate2, use_bscex, is_async_prot;
 static BOOL test_redirect, use_cache_file, callback_read, no_callback, test_abort;
 static WCHAR cache_file_name[MAX_PATH];
+static WCHAR http_cache_file[MAX_PATH];
 static BOOL only_check_prot_args = FALSE;
 static BOOL invalid_cn_accepted = FALSE;
 static BOOL abort_start = FALSE;
@@ -1935,6 +1936,14 @@
             ok( WaitForSingleObject(complete_event2, 90000) == WAIT_OBJECT_0, "wait
timed out\n" );
     }
 
+    if(test_protocol == HTTP_TEST && !emulate_protocol &&
http_cache_file[0]) {
+        HANDLE file = CreateFileW(http_cache_file, DELETE, FILE_SHARE_DELETE, NULL,
+                                  OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, NULL);
+        ok(file == INVALID_HANDLE_VALUE, "expected INVALID_HANDLE_VALUE, got
%p\n", file);
+        ok(GetLastError() == ERROR_SHARING_VIOLATION, "expected
ERROR_SHARING_VIOLATION, got %u\n", GetLastError());
+        http_cache_file[0] = 0;
+    }
+
     return S_OK;
 }
 
@@ -2091,6 +2100,8 @@
         else if(emulate_protocol)
             ok(!lstrcmpW(pstgmed->u.lpszFileName, cache_fileW),
                "unexpected file name %s\n",
wine_dbgstr_w(pstgmed->u.lpszFileName));
+        else if(test_protocol == HTTP_TEST)
+            lstrcpyW(http_cache_file, pstgmed->u.lpszFileName);
         else
             ok(pstgmed->u.lpszFileName != NULL, "lpszFileName == NULL\n");
     }