[PATCH 1/2] urlmon/tests: Add test for opening cache file with DELETE access.

[Zebediah Figura]

From: Sebastian Lackner <sebastian(a)fds-team.de>

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
---
 dlls/urlmon/tests/url.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/dlls/urlmon/tests/url.c b/dlls/urlmon/tests/url.c
index 893632fd2e..ada78c930b 100644
--- a/dlls/urlmon/tests/url.c
+++ b/dlls/urlmon/tests/url.c
@@ -182,6 +182,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;
@@ -1927,6 +1928,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_READ | FILE_SHARE_WRITE | 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;
 }
 
@@ -2083,6 +2092,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.14.1

[PATCH 2/2] appwiz.cpl: Copy addons to cache instead of moving.

[Zebediah Figura]

From: Sebastian Lackner <sebastian(a)fds-team.de>

This leaves behind entries in wininet's own cache. That these are created in
the first place is probably less than desirable, but that seems best
addressed after code freeze.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46364
Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com>
---
 dlls/appwiz.cpl/addons.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dlls/appwiz.cpl/addons.c b/dlls/appwiz.cpl/addons.c
index c34101f3d8..79f667bbeb 100644
--- a/dlls/appwiz.cpl/addons.c
+++ b/dlls/appwiz.cpl/addons.c
@@ -513,7 +513,7 @@ static HRESULT WINAPI InstallCallback_OnStopBinding(IBindStatusCallback *iface,
 
         cache_file_name = get_cache_file_name(TRUE);
         if(cache_file_name) {
-            MoveFileW(msi_file, cache_file_name);
+            CopyFileW(msi_file, cache_file_name, FALSE);
             heap_free(cache_file_name);
         }
     }else {
-- 
2.14.1

[Marvin]

Hi,

While running your changed tests on Windows, I think I found new failures.
Being a bot and all I'm not very good at pattern recognition, so I might be
wrong, but could you please double-check?

Full results can be found at:
https://testbot.winehq.org/JobDetails.pl?Key=45957

Your paranoid android.


=== w7u (32 bit report) ===

urlmon:
url.c:3691: Test failed: CreateFile failed
url.c:1551: Test failed: unexpected call QueryInterface_IWindowForBindingUI
url.c:1421: Test failed: unexpected call QueryService_IWindowForBindingUI
url.c:1351: Test failed: unexpected call GetWindow_ICodeInstall
url.c:1878: Test failed: binding failed: 80040154, expected 00000000
url.c:3441: Test failed: expected Obj_OnProgress_CLASSIDAVAILABLE
url.c:3450: Test failed: expected OnObjectAvailable