September 2018 - Wine-Devel

[PATCH 2/2] msi: Skip publishing a local assembly with no corresponding file.

by Zebediah Figura

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45735 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/assembly.c | 10 ++++++++++ dlls/msi/tests/action.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index e3bd965..7857e8b 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -687,6 +687,11 @@ UINT ACTION_MsiPublishAssemblies( MSIPACKAGE *package ) if (assembly->application) { MSIFILE *file = msi_get_loaded_file( package, assembly->application ); + if (!file) + { + WARN("no matching file %s for local assembly\n", debugstr_w(assembly->application)); + continue; + } if ((res = open_local_assembly_key( package->Context, win32, file->TargetPath, &hkey ))) { WARN("failed to open local assembly key %d\n", res); @@ -744,6 +749,11 @@ UINT ACTION_MsiUnpublishAssemblies( MSIPACKAGE *package ) if (assembly->application) { MSIFILE *file = msi_get_loaded_file( package, assembly->application ); + if (!file) + { + WARN("no matching file %s for local assembly\n", debugstr_w(assembly->application)); + continue; + } if ((res = delete_local_assembly_key( package->Context, win32, file->TargetPath ))) WARN("failed to delete local assembly key %d\n", res); } diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index 57044bf..f7ef07d 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -1782,6 +1782,7 @@ static const char pa_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" "File\tFile\n" + "fake_local.txt\tfake_local\tfake_local.txt\t1000\t\t\t8192\t1\n" "win32.txt\twin32\twin32.txt\t1000\t\t\t8192\t1\n" "manifest.txt\twin32\tmanifest.txt\t1000\t\t\t8192\t1\n" "win32_local.txt\twin32_local\twin32_local.txt\t1000\t\t\t8192\t1\n" @@ -1801,6 +1802,7 @@ static const char pa_feature_comp_dat[] = "Feature_\tComponent_\n" "s38\ts72\n" "FeatureComponents\tFeature_\tComponent_\n" + "assembly\tfake_local\n" "assembly\twin32\n" "assembly\twin32_local\n" "assembly\tdotnet\n" @@ -1810,6 +1812,7 @@ static const char pa_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" "s72\tS38\ts72\ti2\tS255\tS72\n" "Component\tComponent\n" + "fake_local\t{F515549D-7E61-425D-AAC1-9BEF2E066D06}\tMSITESTDIR\t0\t\tfake_local.txt\n" "win32\t{F515549E-7E61-425D-AAC1-9BEF2E066D06}\tMSITESTDIR\t0\t\twin32.txt\n" "win32_local\t{D34D3FBA-6789-4E57-AD1A-1281297DC201}\tMSITESTDIR\t0\t\twin32_local.txt\n" "dotnet\t{8943164F-2B31-4C09-A894-493A8CBDE0A4}\tMSITESTDIR\t0\t\tdotnet.txt\n" @@ -1819,6 +1822,7 @@ static const char pa_msi_assembly_dat[] = "Component_\tFeature_\tFile_Manifest\tFile_Application\tAttributes\n" "s72\ts38\tS72\tS72\tI2\n" "MsiAssembly\tComponent_\n" + "fake_local\tassembly\t\tnonexistent.txt\t0\n" "win32\tassembly\tmanifest.txt\t\t1\n" "win32_local\tassembly\tmanifest_local.txt\tapplication_win32.txt\t1\n" "dotnet\tassembly\t\t\t0\n" @@ -1828,6 +1832,11 @@ static const char pa_msi_assembly_name_dat[] = "Component_\tName\tValue\n" "s72\ts255\ts255\n" "MsiAssemblyName\tComponent_\tName\n" + "fake_local\tName\tWine.Fake.Application.Assembly\n" + "fake_local\tprocessorArchitecture\tx86\n" + "fake_local\tpublicKeyToken\tabcdef0123456789\n" + "fake_local\ttype\twin32\n" + "fake_local\tversion\t1.0.0.0\n" "win32\tName\tWine.Win32.Assembly\n" "win32\tprocessorArchitecture\tx86\n" "win32\tpublicKeyToken\tabcdef0123456789\n" @@ -6131,6 +6140,10 @@ static void test_publish_assemblies(void) "Installer\\Assemblies\\C:|Program Files|msitest|application_dotnet.txt"; static const char classes_path_dotnet_local_wow64[] = "Installer\\Assemblies\\C:|Program Files (x86)|msitest|application_dotnet.txt"; + static const char classes_path_fake_local[] = + "Installer\\Assemblies\\C:|Program Files|msitest|nonexistent.txt"; + static const char classes_path_fake_local_wow64[] = + "Installer\\Assemblies\\C:|Program Files (x86)|msitest|nonexistent.txt"; static const char classes_path_win32[] = "Installer\\Win32Assemblies\\Global"; static const char classes_path_win32_local[] = @@ -6143,6 +6156,10 @@ static void test_publish_assemblies(void) "Software\\Microsoft\\Installer\\Assemblies\\C:|Program Files|msitest|application_dotnet.txt"; static const char path_dotnet_local_wow64[] = "Software\\Microsoft\\Installer\\Assemblies\\C:|Program Files (x86)|msitest|application_dotnet.txt"; + static const char path_fake_local[] = + "Software\\Microsoft\\Installer\\Assemblies\\C:|Program Files|msitest|nonexistent.txt"; + static const char path_fake_local_wow64[] = + "Software\\Microsoft\\Installer\\Assemblies\\C:|Program Files (x86)|msitest|nonexistent.txt"; static const char path_win32[] = "Software\\Microsoft\\Installer\\Win32Assemblies\\Global"; static const char path_win32_local[] = @@ -6182,6 +6199,7 @@ static void test_publish_assemblies(void) create_file_data("msitest\\manifest_local.txt", manifest_local, 0); create_file("msitest\\application_win32.txt", 1000); create_file("msitest\\application_dotnet.txt", 1000); + create_file("msitest\\fake_local.txt", 1000); create_database(msifile, pa_tables, ARRAY_SIZE(pa_tables)); MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); @@ -6216,6 +6234,11 @@ static void test_publish_assemblies(void) CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA(a)Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); RegCloseKey(hkey); + /* No registration is done for a local assembly with no matching file */ + path = (is_wow64 || is_64bit) ? path_fake_local_wow64 : path_fake_local; + res = RegOpenKeyA(HKEY_CURRENT_USER, path, &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -6275,6 +6298,11 @@ static void test_publish_assemblies(void) CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA(a)Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); RegCloseKey(hkey); + /* No registration is done for a local assembly with no matching file */ + path = (is_wow64 || is_64bit) ? classes_path_fake_local_wow64 : classes_path_fake_local; + res = RegOpenKeyExA(HKEY_CLASSES_ROOT, path, 0, access, &hkey); + ok(res == ERROR_FILE_NOT_FOUND, "got %u\n", res); + r = MsiInstallProductA(msifile, "REMOVE=ALL ALLUSERS=1"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -6311,6 +6339,7 @@ done: DeleteFileA("msitest\\manifest_local.txt"); DeleteFileA("msitest\\application_win32.txt"); DeleteFileA("msitest\\application_dotnet.txt"); + DeleteFileA("msitest\\fake_local.txt"); delete_test_files(); DeleteFileA(msifile); } -- 2.7.4

Sept. 4, 2018

[PATCH 1/2] msi/tests: Remove some workarounds in test_publish_assemblies().

by Zebediah Figura

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/msi/tests/action.c | 29 ++++++++--------------------- 1 file changed, 8 insertions(+), 21 deletions(-) diff --git a/dlls/msi/tests/action.c b/dlls/msi/tests/action.c index cb8514d..57044bf 100644 --- a/dlls/msi/tests/action.c +++ b/dlls/msi/tests/action.c @@ -6192,11 +6192,6 @@ static void test_publish_assemblies(void) skip("Not enough rights to perform tests\n"); goto done; } - if (r == ERROR_INSTALL_FAILURE) - { - skip("No support for installing side-by-side assemblies\n"); - goto done; - } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); res = RegOpenKeyA(HKEY_CURRENT_USER, path_dotnet, &hkey); @@ -6211,23 +6206,20 @@ static void test_publish_assemblies(void) RegCloseKey(hkey); res = RegOpenKeyA(HKEY_CURRENT_USER, path_win32, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, - "Expected ERROR_SUCCESS, got %d\n", res); - if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA(a)Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA(a)Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); RegCloseKey(hkey); path = (is_wow64 || is_64bit) ? path_win32_local_wow64 : path_win32_local; res = RegOpenKeyA(HKEY_CURRENT_USER, path, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, - "Expected ERROR_SUCCESS, got %d\n", res); - if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA(a)Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA(a)Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); RegCloseKey(hkey); r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); res = RegOpenKeyA(HKEY_CURRENT_USER, path_dotnet, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %d\n", res); if (res == ERROR_SUCCESS) { res = RegDeleteValueA(hkey, name_dotnet); @@ -6240,7 +6232,6 @@ static void test_publish_assemblies(void) ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); res = RegOpenKeyA(HKEY_CURRENT_USER, path_win32, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %d\n", res); if (res == ERROR_SUCCESS) { res = RegDeleteValueA(hkey, name_win32); @@ -6274,23 +6265,20 @@ static void test_publish_assemblies(void) RegCloseKey(hkey); res = RegOpenKeyExA(HKEY_CLASSES_ROOT, classes_path_win32, 0, access, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, - "Expected ERROR_SUCCESS, got %d\n", res); - if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA(a)Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + CHECK_REG_STR(hkey, name_win32, "rcHQPHq?CA(a)Uv-XqMI1e>}NJjwR'%D9v1p!v{WV(%"); RegCloseKey(hkey); path = (is_wow64 || is_64bit) ? classes_path_win32_local_wow64 : classes_path_win32_local; res = RegOpenKeyExA(HKEY_CLASSES_ROOT, path, 0, access, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND /* win2k without sxs support */, - "Expected ERROR_SUCCESS, got %d\n", res); - if (res == ERROR_SUCCESS) CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA(a)Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + CHECK_REG_STR(hkey, name_win32_local, "rcHQPHq?CA(a)Uv-XqMI1e>C)Uvlj*53A)u(QQ9=)X!"); RegCloseKey(hkey); r = MsiInstallProductA(msifile, "REMOVE=ALL ALLUSERS=1"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); res = RegOpenKeyA(HKEY_CLASSES_ROOT, classes_path_dotnet, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %d\n", res); if (res == ERROR_SUCCESS) { res = RegDeleteValueA(hkey, name_dotnet); @@ -6303,7 +6291,6 @@ static void test_publish_assemblies(void) ok(res == ERROR_FILE_NOT_FOUND, "Expected ERROR_FILE_NOT_FOUND, got %d\n", res); res = RegOpenKeyA(HKEY_CLASSES_ROOT, classes_path_win32, &hkey); - ok(res == ERROR_SUCCESS || res == ERROR_FILE_NOT_FOUND, "got %d\n", res); if (res == ERROR_SUCCESS) { res = RegDeleteValueA(hkey, name_win32); -- 2.7.4

Sept. 4, 2018

Re: [PATCH] dxgi: Implement Map()/Unmap().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Sept. 3, 2018

[PATCH] dxgi: Implement Map()/Unmap().

by Nikolay Sivov

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/dxgi/surface.c | 35 +++++++++++++++++++++++++++++++---- 1 file changed, 31 insertions(+), 4 deletions(-) diff --git a/dlls/dxgi/surface.c b/dlls/dxgi/surface.c index 1f53b25a91..4b1b83b84a 100644 --- a/dlls/dxgi/surface.c +++ b/dlls/dxgi/surface.c @@ -182,16 +182,43 @@ static HRESULT STDMETHODCALLTYPE dxgi_surface_GetDesc(IDXGISurface1 *iface, DXGI static HRESULT STDMETHODCALLTYPE dxgi_surface_Map(IDXGISurface1 *iface, DXGI_MAPPED_RECT *mapped_rect, UINT flags) { - FIXME("iface %p, mapped_rect %p, flags %#x stub!\n", iface, mapped_rect, flags); + struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); + struct wined3d_map_desc wined3d_map_desc; + DWORD wined3d_map_flags = 0; + HRESULT hr; + + TRACE("iface %p, mapped_rect %p, flags %#x.\n", iface, mapped_rect, flags); + + if (flags & DXGI_MAP_READ) + wined3d_map_flags |= WINED3D_MAP_READ; + if (flags & DXGI_MAP_WRITE) + wined3d_map_flags |= WINED3D_MAP_WRITE; + if (flags & DXGI_MAP_DISCARD) + wined3d_map_flags |= WINED3D_MAP_DISCARD; + + wined3d_mutex_lock(); + if (SUCCEEDED(hr = wined3d_resource_map(wined3d_texture_get_resource(surface->wined3d_texture), 0, + &wined3d_map_desc, NULL, wined3d_map_flags))) + { + mapped_rect->Pitch = wined3d_map_desc.row_pitch; + mapped_rect->pBits = wined3d_map_desc.data; + } + wined3d_mutex_unlock(); - return E_NOTIMPL; + return hr; } static HRESULT STDMETHODCALLTYPE dxgi_surface_Unmap(IDXGISurface1 *iface) { - FIXME("iface %p stub!\n", iface); + struct dxgi_surface *surface = impl_from_IDXGISurface1(iface); + + TRACE("iface %p.\n", iface); - return E_NOTIMPL; + wined3d_mutex_lock(); + wined3d_resource_unmap(wined3d_texture_get_resource(surface->wined3d_texture), 0); + wined3d_mutex_unlock(); + + return S_OK; } /* IDXGISurface1 methods */ -- 2.18.0

Sept. 3, 2018

Re: [PATCH] wined3d: Use raw blit for supported depth-stencil blits.

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>

Sept. 3, 2018

[PATCH] xmllite: Prefere builtin version.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/xmllite/Makefile.in | 3 +-- dlls/xmllite/xmllite_main.c | 45 --------------------------------------------- 2 files changed, 1 insertion(+), 47 deletions(-) delete mode 100644 dlls/xmllite/xmllite_main.c

Sept. 3, 2018

[PATCH] server: Support ObjectTypeInformation in pipe objects.

by Jacek Caban

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45743 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/om.c | 28 +++++++++++++++++++++++++++- server/named_pipe.c | 12 ++++++++++-- 2 files changed, 37 insertions(+), 3 deletions(-)

Sept. 3, 2018

[PATCH 3/3 v3] kernel32: Correct ReplaceFileW behaviour

by Brock York

ReplaceFileW should fail with ERROR_ACCESS_DENIED when either the replaced or replacement file is set to read only using SetFileAttributes. Testing for the return values of ReplaceFileW was performed on a Windows XP SP3 and Windows 10 vm. Remove GENERIC_WRITE flag when opening replaced file ReplaceFileW will fail when called to replace the current executable. This is not the same behaviour as tested on Windows 7, 10 and XP this is because the "replaced" file is opened with the GENERIC_WRITE flag. The MSDN also mentions that the replaced file is only opened with GENERIC_READ, DELETE and SYNCHRONIZE. This patch will fix the following bug once it is merged into Wine-Staging as the WarFrame launcher requires patches from Wine-Staging to work. Wine-Bug:https://bugs.winehq.org/show_bug.cgi?id=33845 Signed-off-by: Brock York <twunknown(a)gmail.com> --- dlls/kernel32/file.c | 19 ++++++++++++++++++- dlls/kernel32/tests/file.c | 4 ++-- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index b558f8e205..1858866cf3 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -1738,6 +1738,7 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa NTSTATUS status; IO_STATUS_BLOCK io; OBJECT_ATTRIBUTES attr; + DWORD fattribs; TRACE("%s %s %s 0x%08x %p %p\n", debugstr_w(lpReplacedFileName), debugstr_w(lpReplacementFileName), debugstr_w(lpBackupFileName), @@ -1772,7 +1773,7 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa } replaced_flags = lpBackupFileName ? FILE_OPEN : FILE_OPEN_IF; attr.ObjectName = &nt_replaced_name; - status = NtOpenFile(&hReplaced, GENERIC_READ|GENERIC_WRITE|DELETE|SYNCHRONIZE, + status = NtOpenFile(&hReplaced, GENERIC_READ|DELETE|SYNCHRONIZE, &attr, &io, FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_SYNCHRONOUS_IO_NONALERT|FILE_NON_DIRECTORY_FILE); @@ -1788,6 +1789,14 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa goto fail; } + /* Replacement should fail if replaced is READ_ONLY */ + fattribs = GetFileAttributesW(lpReplacedFileName); + if (fattribs & FILE_ATTRIBUTE_READONLY) + { + error = ERROR_ACCESS_DENIED; + goto fail; + } + /* * Open the replacement file for reading, writing, and deleting * (writing and deleting are needed when finished) @@ -1811,6 +1820,14 @@ BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName, LPCWSTR lpReplacementFileNa goto fail; } + /* Replacement should fail if replacement is READ_ONLY */ + fattribs = GetFileAttributesW(lpReplacementFileName); + if (fattribs & FILE_ATTRIBUTE_READONLY) + { + error = ERROR_ACCESS_DENIED; + goto fail; + } + /* If the user wants a backup then that needs to be performed first */ if (lpBackupFileName) { diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 33cae4b7c4..8e4a994142 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3666,7 +3666,7 @@ static void test_ReplaceFileA(void) */ SetLastError(0xdeadbeef); ret = pReplaceFileA(replaced, replacement, backup, 0, 0, 0); - todo_wine ok(ret == 0 && GetLastError() == ERROR_ACCESS_DENIED, "ReplaceFileA: unexpected error %d\n", GetLastError()); + ok(ret == 0 && GetLastError() == ERROR_ACCESS_DENIED, "ReplaceFileA: unexpected error %d\n", GetLastError()); /* make sure that the replacement file still exists */ hReplacementFile = CreateFileA(replacement, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); ok(hReplacementFile != INVALID_HANDLE_VALUE || @@ -3698,7 +3698,7 @@ static void test_ReplaceFileA(void) "unexpected error, replaced file should be able to be opened %d\n", GetLastError()); /*Calling ReplaceFileA on an exe should succeed*/ ret = pReplaceFileA(replaced, replacement, NULL, 0, 0, 0); - todo_wine ok(ret, "ReplaceFileA: unexpected error %d\n", GetLastError()); + ok(ret, "ReplaceFileA: unexpected error %d\n", GetLastError()); CloseHandle(hReplacedFile); /* replacement file still exists, make pass w/o "replaced" */ -- 2.18.0

Sept. 3, 2018

[PATCH 2/3 resend] kernel32/tests: Correct ReplaceFileW error checking

by Brock York

Check that ReplaceFileW returned 0 indicating failure and that the error code was access denied. This corrects the error checking for the test case where ReplaceFileW should fail with ACCESS_DENIED on a file with the READ_ONLY attribute set. Tested on a Windows 10 and Windows XP vm and also passed on all vm's on the wine test bot Signed-off-by: Brock York <twunknown(a)gmail.com> --- dlls/kernel32/tests/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 2e2c55bcc9..33cae4b7c4 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3666,7 +3666,7 @@ static void test_ReplaceFileA(void) */ SetLastError(0xdeadbeef); ret = pReplaceFileA(replaced, replacement, backup, 0, 0, 0); - ok(ret != ERROR_UNABLE_TO_REMOVE_REPLACED, "ReplaceFileA: unexpected error %d\n", GetLastError()); + todo_wine ok(ret == 0 && GetLastError() == ERROR_ACCESS_DENIED, "ReplaceFileA: unexpected error %d\n", GetLastError()); /* make sure that the replacement file still exists */ hReplacementFile = CreateFileA(replacement, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); ok(hReplacementFile != INVALID_HANDLE_VALUE || -- 2.18.0

Sept. 3, 2018

[PATCH 1/3 resend] kernel32/tests: Test ReplaceFileW on open "exe"

by Brock York

Replicate the scenario of an exe calling ReplaceFileW on itself. An exe calling ReplaceFileW on itself will fail in Wine currently but succeed in Windows 7. This seems to be the problem seen in bug 33845 where the WarFrame launcher will keep relaunching itself because the launcher failed to replace itself with the new version. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=33845 Signed-off-by: Brock York <twunknown(a)gmail.com> --- dlls/kernel32/tests/file.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 1c4157279b..2e2c55bcc9 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3677,6 +3677,30 @@ static void test_ReplaceFileA(void) ok(ret || GetLastError() == ERROR_ACCESS_DENIED, "SetFileAttributesA: error setting to normal %d\n", GetLastError()); + /* re-create replacement file for pass w/ replaced opened with + * the same permissions as an exe (Replicating an exe trying to + * replace itself) + */ + ret = GetTempFileNameA(temp_path, prefix, 0, replacement); + ok(ret != 0, "GetTempFileNameA error (replacement) %d\n", GetLastError()); + + SetLastError(0xdeadbeef); + /* make sure that the replacement file still exists */ + hReplacementFile = CreateFileA(replacement, GENERIC_READ, FILE_SHARE_READ, NULL, OPEN_EXISTING, 0, 0); + ok(hReplacementFile != INVALID_HANDLE_VALUE || + broken(GetLastError() == ERROR_FILE_NOT_FOUND), /* win2k */ + "unexpected error, replacement file should still exist %d\n", GetLastError()); + CloseHandle(hReplacementFile); + + /* make sure that the replaced file is opened like an exe*/ + hReplacedFile = CreateFileA(replaced, GENERIC_READ | SYNCHRONIZE, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, OPEN_EXISTING, 0, 0); + ok(hReplacedFile != INVALID_HANDLE_VALUE, + "unexpected error, replaced file should be able to be opened %d\n", GetLastError()); + /*Calling ReplaceFileA on an exe should succeed*/ + ret = pReplaceFileA(replaced, replacement, NULL, 0, 0, 0); + todo_wine ok(ret, "ReplaceFileA: unexpected error %d\n", GetLastError()); + CloseHandle(hReplacedFile); + /* replacement file still exists, make pass w/o "replaced" */ ret = DeleteFileA(replaced); ok(ret || GetLastError() == ERROR_ACCESS_DENIED, -- 2.18.0

Sept. 3, 2018