From 83eaf4cbacbb5e143b970dc6e6d593df89cd1b3b Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Sun, 4 Jun 2017 01:46:38 +0000 Subject: [PATCH] [URLMON_WINETEST] Sync with Wine Staging 2.9. CORE-13362 svn path=/trunk/; revision=74850 --- rostests/winetests/urlmon/uri.c | 7 ++++--- rostests/winetests/urlmon/url.c | 11 +++++++++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/rostests/winetests/urlmon/uri.c b/rostests/winetests/urlmon/uri.c index 318727d8c18..fb9a7d08f60 100644 --- a/rostests/winetests/urlmon/uri.c +++ b/rostests/winetests/urlmon/uri.c @@ -7440,12 +7440,13 @@ static inline LPWSTR a2w(LPCSTR str) { 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); } diff --git a/rostests/winetests/urlmon/url.c b/rostests/winetests/urlmon/url.c index 1cc886379ea..e71774d826e 100644 --- a/rostests/winetests/urlmon/url.c +++ b/rostests/winetests/urlmon/url.c @@ -190,6 +190,7 @@ static HRESULT abort_hres; 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 @@ static HRESULT WINAPI statusclb_OnStopBinding(IBindStatusCallbackEx *iface, HRES 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 @@ static HRESULT WINAPI statusclb_OnDataAvailable(IBindStatusCallbackEx *iface, DW 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"); } -- 2.17.1