James Hawkins : msi: Overwrite an existing read-only file when copying the install file.
Module: wine Branch: master Commit: ba40c463d76235474249b92654d3f9caee5778b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ba40c463d76235474249b92654...
Author: James Hawkins truiken@gmail.com Date: Mon Feb 26 04:28:58 2007 -0600
msi: Overwrite an existing read-only file when copying the install file.
---
dlls/msi/files.c | 28 +++++++++++--- dlls/msi/tests/install.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 110 insertions(+), 6 deletions(-)
diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 61992a3..eb5e456 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -638,13 +638,9 @@ static void schedule_install_files(MSIPACKAGE *package) } }
-static UINT copy_install_file(MSIFILE *file) +static UINT copy_file(MSIFILE *file) { BOOL ret; - UINT gle; - - TRACE("Copying %s to %s\n", debugstr_w(file->SourcePath), - debugstr_w(file->TargetPath));
ret = CopyFileW(file->SourcePath, file->TargetPath, FALSE); if (ret) @@ -653,7 +649,20 @@ static UINT copy_install_file(MSIFILE *file) return ERROR_SUCCESS; }
- gle = GetLastError(); + return GetLastError(); +} + +static UINT copy_install_file(MSIFILE *file) +{ + UINT gle; + + TRACE("Copying %s to %s\n", debugstr_w(file->SourcePath), + debugstr_w(file->TargetPath)); + + gle = copy_file(file); + if (gle == ERROR_SUCCESS) + return gle; + if (gle == ERROR_ALREADY_EXISTS && file->state == msifs_overwrite) { TRACE("overwriting existing file\n"); @@ -665,6 +674,13 @@ static UINT copy_install_file(MSIFILE *file) TRACE("Source file not found\n"); gle = ERROR_SUCCESS; } + else if (gle == ERROR_ACCESS_DENIED) + { + SetFileAttributesW(file->TargetPath, FILE_ATTRIBUTE_NORMAL); + + gle = copy_file(file); + TRACE("Overwriting existing file: %d\n", gle); + } else if (!(file->Attributes & msidbFileAttributesVital)) { TRACE("Ignoring error for nonvital\n"); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 3bea451..534a64a 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -241,6 +241,31 @@ static const CHAR ui_custom_action_dat[] = "Action\tType\tSource\tTarget\tISComm "CustomAction\tAction\n" "SetUIProperty\t51\tHASUIRUN\t1\t\n";
+static const CHAR rof_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "maximus\t\tMSITESTDIR\t0\t1\tmaximus\n"; + +static const CHAR rof_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescription\tDisplay\tLevel\tDirectory_\tAttributes\n" + "s38\tS38\tL64\tL255\tI2\ti2\tS72\ti2\n" + "Feature\tFeature\n" + "feature\t\t\t\t2\t1\tTARGETDIR\t0"; + +static const CHAR rof_feature_comp_dat[] = "Feature_\tComponent_\n" + "s38\ts72\n" + "FeatureComponents\tFeature_\tComponent_\n" + "feature\tmaximus"; + +static const CHAR rof_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "maximus\tmaximus\tmaximus\t500\t\t\t8192\t1"; + +static const CHAR rof_media_dat[] = "DiskId\tLastSequence\tDiskPrompt\tCabinet\tVolumeLabel\tSource\n" + "i2\ti4\tL64\tS255\tS32\tS72\n" + "Media\tDiskId\n" + "1\t1\t\t\tDISK1\t\n"; + typedef struct _msi_table { const CHAR *filename; @@ -339,6 +364,18 @@ static const msi_table ui_tables[] = ADD_TABLE(property), };
+static const msi_table rof_tables[] = +{ + ADD_TABLE(rof_component), + ADD_TABLE(directory), + ADD_TABLE(rof_feature), + ADD_TABLE(rof_feature_comp), + ADD_TABLE(rof_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(rof_media), + ADD_TABLE(property), +}; + /* cabinet definitions */
/* make the max size large so there is only one cab file */ @@ -1120,6 +1157,56 @@ static void test_uiLevelFlags(void) DeleteFile(msifile); }
+static BOOL file_matches(LPSTR path) +{ + CHAR buf[MAX_PATH]; + HANDLE file; + DWORD size; + + file = CreateFile(path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, OPEN_EXISTING, 0, NULL); + + ZeroMemory(buf, MAX_PATH); + ReadFile(file, buf, 15, &size, NULL); + CloseHandle(file); + + return !lstrcmp(buf, "msitest\maximus"); +} + +static void test_readonlyfile(void) +{ + UINT r; + DWORD size; + HANDLE file; + CHAR path[MAX_PATH]; + + CreateDirectoryA("msitest", NULL); + create_file("msitest\maximus", 500); + create_database(msifile, rof_tables, sizeof(rof_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + lstrcpy(path, PROG_FILES_DIR); + lstrcat(path, "\msitest"); + CreateDirectory(path, NULL); + + lstrcat(path, "\maximus"); + file = CreateFile(path, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE, + NULL, CREATE_NEW, FILE_ATTRIBUTE_READONLY, NULL); + if (file == INVALID_HANDLE_VALUE) printf("didnt work here: %d\n", GetLastError()); + + WriteFile(file, "readonlyfile", 20, &size, NULL); + CloseHandle(file); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(file_matches(path), "Expected file to be overwritten\n"); + ok(delete_pf("msitest\maximus", TRUE), "File not installed\n"); + ok(delete_pf("msitest", FALSE), "File not installed\n"); + + DeleteFile(msifile); +} + START_TEST(install) { DWORD len; @@ -1145,6 +1232,7 @@ START_TEST(install) test_mixedmedia(); test_samesequence(); test_uiLevelFlags(); + test_readonlyfile();
SetCurrentDirectoryA(prev_path); }
-
Alexandre Julliard