August 2008 - Wine-Commits - list.winehq.org

James Hawkins : msi: Use MsiQueryComponent state to determine the component 's state.
by Alexandre Julliard Aug. 19, 2008

Aug. 19, 2008

Module: wine Branch: master Commit: 42115638c8096e1238da435824e5554648b9e073 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42115638c8096e1238da43582… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 18 23:14:19 2008 -0500 msi: Use MsiQueryComponent state to determine the component's state. --- dlls/msi/action.c | 23 +++++++++++++++-------- dlls/msi/tests/package.c | 9 ++++++--- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index a375000..b2fdbea 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1693,19 +1693,26 @@ static UINT ACTION_FileCost(MSIPACKAGE *package) static void ACTION_GetComponentInstallStates(MSIPACKAGE *package) { MSICOMPONENT *comp; + INSTALLSTATE state; + UINT r; - LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) - { - INSTALLSTATE res; + state = MsiQueryProductStateW(package->ProductCode); + LIST_FOR_EACH_ENTRY(comp, &package->components, MSICOMPONENT, entry) + { if (!comp->ComponentId) continue; - res = MsiGetComponentPathW( package->ProductCode, - comp->ComponentId, NULL, NULL); - if (res < 0) - res = INSTALLSTATE_ABSENT; - comp->Installed = res; + if (state != INSTALLSTATE_LOCAL && state != INSTALLSTATE_DEFAULT) + comp->Installed = INSTALLSTATE_ABSENT; + else + { + r = MsiQueryComponentStateW(package->ProductCode, NULL, + package->Context, comp->ComponentId, + &comp->Installed); + if (r != ERROR_SUCCESS) + comp->Installed = INSTALLSTATE_ABSENT; + } } } diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index f3f75ad..c27e2fe 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -3794,7 +3794,10 @@ static void test_states(void) action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "five", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); + todo_wine + { + ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); + } ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); state = 0xdeadbee; @@ -4592,9 +4595,9 @@ static void test_states(void) action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "five", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); todo_wine { + ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); } @@ -5393,9 +5396,9 @@ static void test_states(void) action = 0xdeadbee; r = MsiGetFeatureState(hpkg, "five", &state, &action); ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); - ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); todo_wine { + ok( state == INSTALLSTATE_ABSENT, "Expected INSTALLSTATE_ABSENT, got %d\n", state); ok( action == INSTALLSTATE_UNKNOWN, "Expected INSTALLSTATE_UNKNOWN, got %d\n", action); }

1 0

James Hawkins : msi: Add more tests for feature and component states.
by Alexandre Julliard Aug. 19, 2008

Aug. 19, 2008

Module: wine Branch: master Commit: 7fbce31ef7387c4e48884eeb90927e7811e64f0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7fbce31ef7387c4e48884eeb9… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 18 23:12:38 2008 -0500 msi: Add more tests for feature and component states. --- dlls/msi/tests/package.c | 1613 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 1610 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7fbce31ef7387c4e48884…

1 0

James Hawkins : msi: Base removal of a file on the component's action, not the file's state.
by Alexandre Julliard Aug. 19, 2008

Aug. 19, 2008

Module: wine Branch: master Commit: 10a2a5effeabfa60855f90873bf4c577c07225b0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10a2a5effeabfa60855f90873… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 18 23:13:43 2008 -0500 msi: Base removal of a file on the component's action, not the file's state. --- dlls/msi/files.c | 2 +- dlls/msi/tests/install.c | 22 +++++++++++++++++----- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index f826806..3c8ac60 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -537,7 +537,7 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) if ( file->state == msifs_installed ) ERR("removing installed file %s\n", debugstr_w(file->TargetPath)); - if ( file->state != msifs_present ) + if ( file->Component->ActionRequest != INSTALLSTATE_ABSENT ) continue; /* don't remove a file if the old file diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index a60b3ab..390d481 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3199,7 +3199,10 @@ static void test_publish(void) r = MsiInstallProductA(msifile, "FULL=1 REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(pf_exists("msitest\\maximus"), "File deleted\n"); + todo_wine + { + ok(pf_exists("msitest\\maximus"), "File deleted\n"); + } ok(pf_exists("msitest"), "File deleted\n"); state = MsiQueryProductState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); @@ -4168,7 +4171,10 @@ static void test_removefiles(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(!pf_exists("msitest\\hydrogen"), "File not deleted\n"); ok(!pf_exists("msitest\\helium"), "File not deleted\n"); - ok(delete_pf("msitest\\lithium", TRUE), "File deleted\n"); + todo_wine + { + ok(delete_pf("msitest\\lithium", TRUE), "File deleted\n"); + } ok(delete_pf("msitest", FALSE), "File deleted\n"); create_pf("msitest", FALSE); @@ -4186,8 +4192,11 @@ static void test_removefiles(void) r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(!pf_exists("msitest\\hydrogen"), "File not deleted\n"); - ok(delete_pf("msitest\\helium", TRUE), "File deleted\n"); - ok(delete_pf("msitest\\lithium", TRUE), "File deleted\n"); + todo_wine + { + ok(delete_pf("msitest\\helium", TRUE), "File deleted\n"); + ok(delete_pf("msitest\\lithium", TRUE), "File deleted\n"); + } ok(delete_pf("msitest", FALSE), "File deleted\n"); create_pf("msitest", FALSE); @@ -4228,7 +4237,10 @@ static void test_removefiles(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(!delete_pf("msitest\\hydrogen", TRUE), "File not deleted\n"); ok(!delete_pf("msitest\\helium", TRUE), "File not deleted\n"); - ok(delete_pf("msitest\\lithium", TRUE), "File deleted\n"); + todo_wine + { + ok(delete_pf("msitest\\lithium", TRUE), "File deleted\n"); + } ok(delete_pf("msitest\\furlong", TRUE), "File deleted\n"); ok(delete_pf("msitest\\firkin", TRUE), "File deleted\n"); ok(delete_pf("msitest\\fortnight", TRUE), "File deleted\n");

1 0

James Hawkins : ole32: Storage sharing should be implemented in ole32, not the lower-level file API.
by Alexandre Julliard Aug. 19, 2008

Aug. 19, 2008

Module: wine Branch: master Commit: 5ea0d9d807fa99202791a2afebf37c349c716df3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ea0d9d807fa99202791a2afe… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 18 23:33:09 2008 -0500 ole32: Storage sharing should be implemented in ole32, not the lower-level file API. --- dlls/msi/tests/package.c | 145 +++++++++++++------------------ dlls/ole32/storage32.c | 5 +- dlls/ole32/tests/storage32.c | 201 ++++++++++++++++++++++++------------------ 3 files changed, 182 insertions(+), 169 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5ea0d9d807fa99202791a…

1 0

James Hawkins : msi: Test the file access and share modes of MsiOpenDatabase.
by Alexandre Julliard Aug. 19, 2008

Aug. 19, 2008

Module: wine Branch: master Commit: 0e6bfb3b43eb51388bd9ebdf6581d8260df9b29c URL: http://source.winehq.org/git/wine.git/?a=commit;h=0e6bfb3b43eb51388bd9ebdf6… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 18 23:04:16 2008 -0500 msi: Test the file access and share modes of MsiOpenDatabase. --- dlls/msi/tests/package.c | 171 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 171 insertions(+), 0 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index 3eca228..1755d9b 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -6358,6 +6358,176 @@ static void test_sourcedir(void) DeleteFileA(msifile); } +struct access_res +{ + BOOL gothandle; + DWORD lasterr; + BOOL todo; +}; + +struct access_res create[16] = +{ + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { TRUE, ERROR_SUCCESS, TRUE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { TRUE, ERROR_SUCCESS, TRUE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { TRUE, ERROR_SUCCESS, TRUE } +}; + +struct access_res create_commit[16] = +{ + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { TRUE, ERROR_SUCCESS, TRUE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { TRUE, ERROR_SUCCESS, TRUE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { FALSE, ERROR_SHARING_VIOLATION, FALSE }, + { TRUE, ERROR_SUCCESS, TRUE } +}; + +struct access_res create_close[16] = +{ + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE }, + { TRUE, ERROR_SUCCESS, FALSE } +}; + +static void _test_file_access(LPCSTR file, struct access_res *ares, DWORD line) +{ + DWORD access = 0, share = 0; + DWORD lasterr; + HANDLE hfile; + int i, j, idx = 0; + + for (i = 0; i < 4; i++) + { + if (i == 0) access = 0; + if (i == 1) access = GENERIC_READ; + if (i == 2) access = GENERIC_WRITE; + if (i == 3) access = GENERIC_READ | GENERIC_WRITE; + + for (j = 0; j < 4; j++) + { + if (j == 0) share = 0; + if (j == 1) share = FILE_SHARE_READ; + if (j == 2) share = FILE_SHARE_WRITE; + if (j == 3) share = FILE_SHARE_READ | FILE_SHARE_WRITE; + + SetLastError(0xdeadbeef); + hfile = CreateFileA(file, access, share, NULL, OPEN_EXISTING, + FILE_ATTRIBUTE_NORMAL, 0); + lasterr = GetLastError(); + if (ares[idx].todo) + { + todo_wine + { + ok((hfile != INVALID_HANDLE_VALUE) == ares[idx].gothandle, + "(%d, handle, %d): Expected %d, got %d\n", + line, idx, ares[idx].gothandle, + (hfile != INVALID_HANDLE_VALUE)); + } + } + else + ok((hfile != INVALID_HANDLE_VALUE) == ares[idx].gothandle, + "(%d, handle, %d): Expected %d, got %d\n", + line, idx, ares[idx].gothandle, + (hfile != INVALID_HANDLE_VALUE)); + + if (ares[idx].todo) + { + todo_wine + { + ok(lasterr == ares[idx].lasterr, + "(%d, lasterr, %d): Expected %d, got %d\n", + line, idx, ares[idx].lasterr, lasterr); + } + } + else + { + ok(lasterr == ares[idx].lasterr, + "(%d, lasterr, %d): Expected %d, got %d\n", + line, idx, ares[idx].lasterr, lasterr); + } + + CloseHandle(hfile); + idx++; + } + } +} + +#define test_file_access(file, ares) _test_file_access(file, ares, __LINE__) + +static void test_access(void) +{ + MSIHANDLE hdb; + UINT r; + + r = MsiOpenDatabaseA(msifile, MSIDBOPEN_CREATE, &hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + test_file_access(msifile, create); + + r = MsiDatabaseCommit(hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + test_file_access(msifile, create_commit); + + MsiCloseHandle(hdb); + + test_file_access(msifile, create_close); + + DeleteFileA(msifile); + + r = MsiOpenDatabaseA(msifile, MSIDBOPEN_CREATEDIRECT, &hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + test_file_access(msifile, create); + + r = MsiDatabaseCommit(hdb); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + + test_file_access(msifile, create_commit); + + MsiCloseHandle(hdb); + + test_file_access(msifile, create_close); + + DeleteFileA(msifile); +} + START_TEST(package) { GetCurrentDirectoryA(MAX_PATH, CURR_DIR); @@ -6383,4 +6553,5 @@ START_TEST(package) test_MsiGetSourcePath(); test_shortlongsource(); test_sourcedir(); + test_access(); }

1 0

James Hawkins : msi: Remove misc files from the RemoveFile table.
by Alexandre Julliard Aug. 19, 2008

Aug. 19, 2008

Module: wine Branch: master Commit: e64a699b07a73c5f360c1a8d14b7fdf6ad0ac436 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e64a699b07a73c5f360c1a8d1… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 18 23:03:00 2008 -0500 msi: Remove misc files from the RemoveFile table. --- dlls/msi/files.c | 90 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/msi/tests/install.c | 26 +++++-------- include/msidefs.h | 7 ++++ 3 files changed, 107 insertions(+), 16 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 521cdb3..f826806 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -435,9 +435,99 @@ UINT ACTION_DuplicateFiles(MSIPACKAGE *package) return rc; } +static BOOL verify_comp_for_removal(MSICOMPONENT *comp, UINT install_mode) +{ + INSTALLSTATE request = comp->ActionRequest; + + if (install_mode == msidbRemoveFileInstallModeOnInstall && + (request == INSTALLSTATE_LOCAL || request == INSTALLSTATE_SOURCE)) + return TRUE; + + if (request == INSTALLSTATE_ABSENT) + { + if (!comp->ComponentId) + return FALSE; + + if (install_mode == msidbRemoveFileInstallModeOnRemove) + return TRUE; + } + + if (install_mode == msidbRemoveFileInstallModeOnBoth) + return TRUE; + + return FALSE; +} + +static UINT ITERATE_RemoveFiles(MSIRECORD *row, LPVOID param) +{ + MSIPACKAGE *package = (MSIPACKAGE*)param; + MSICOMPONENT *comp; + LPCWSTR component, filename, dirprop; + UINT install_mode; + LPWSTR dir = NULL, path = NULL; + DWORD size; + UINT r; + + component = MSI_RecordGetString(row, 2); + filename = MSI_RecordGetString(row, 3); + dirprop = MSI_RecordGetString(row, 4); + install_mode = MSI_RecordGetInteger(row, 5); + + comp = get_loaded_component(package, component); + if (!comp) + { + ERR("Invalid component: %s\n", debugstr_w(component)); + return ERROR_FUNCTION_FAILED; + } + + if (!verify_comp_for_removal(comp, install_mode)) + { + TRACE("Skipping removal due to missing conditions\n"); + comp->Action = comp->Installed; + return ERROR_SUCCESS; + } + + dir = msi_dup_property(package, dirprop); + if (!dir) + return ERROR_OUTOFMEMORY; + + size = lstrlenW(filename) + lstrlenW(dir) + 2; + path = msi_alloc(size * sizeof(WCHAR)); + if (!path) + { + r = ERROR_OUTOFMEMORY; + goto done; + } + + lstrcpyW(path, dir); + lstrcatW(path, filename); + + TRACE("Deleting misc file: %s\n", debugstr_w(path)); + if (!DeleteFileW(path)) + TRACE("DeleteFileW failed: %d\n", GetLastError()); + +done: + msi_free(path); + msi_free(dir); + return ERROR_SUCCESS; +} + UINT ACTION_RemoveFiles( MSIPACKAGE *package ) { + MSIQUERY *view; MSIFILE *file; + UINT r; + + static const WCHAR query[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','R','e','m','o','v','e','F','i','l','e','`',0}; + + r = MSI_DatabaseOpenViewW(package->db, query, &view); + if (r == ERROR_SUCCESS) + { + MSI_IterateRecords(view, NULL, ITERATE_RemoveFiles, package); + msiobj_release(&view->hdr); + } LIST_FOR_EACH_ENTRY( file, &package->files, MSIFILE, entry ) { diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 04f9e4b..a60b3ab 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -4206,19 +4206,16 @@ static void test_removefiles(void) ok(pf_exists("msitest\\hydrogen"), "File not installed\n"); ok(!pf_exists("msitest\\helium"), "File installed\n"); ok(pf_exists("msitest\\lithium"), "File not installed\n"); + ok(!pf_exists("msitest\\furlong"), "File not deleted\n"); + ok(!pf_exists("msitest\\firkin"), "File not deleted\n"); + ok(!pf_exists("msitest\\fortnight"), "File not deleted\n"); ok(pf_exists("msitest\\becquerel"), "File not installed\n"); ok(pf_exists("msitest\\dioptre"), "File not installed\n"); ok(pf_exists("msitest\\attoparsec"), "File not installed\n"); + ok(!pf_exists("msitest\\storeys"), "File not deleted\n"); + ok(!pf_exists("msitest\\block"), "File not deleted\n"); + ok(!pf_exists("msitest\\siriometer"), "File not deleted\n"); ok(pf_exists("msitest"), "File not installed\n"); - todo_wine - { - ok(!pf_exists("msitest\\firkin"), "File not deleted\n"); - ok(!pf_exists("msitest\\fortnight"), "File not deleted\n"); - ok(!pf_exists("msitest\\furlong"), "File not deleted\n"); - ok(!pf_exists("msitest\\storeys"), "File not deleted\n"); - ok(!pf_exists("msitest\\block"), "File not deleted\n"); - ok(!pf_exists("msitest\\siriometer"), "File not deleted\n"); - } create_pf("msitest\\furlong", TRUE); create_pf("msitest\\firkin", TRUE); @@ -4235,15 +4232,12 @@ static void test_removefiles(void) ok(delete_pf("msitest\\furlong", TRUE), "File deleted\n"); ok(delete_pf("msitest\\firkin", TRUE), "File deleted\n"); ok(delete_pf("msitest\\fortnight", TRUE), "File deleted\n"); + ok(!delete_pf("msitest\\becquerel", TRUE), "File not deleted\n"); + ok(!delete_pf("msitest\\dioptre", TRUE), "File not deleted\n"); ok(delete_pf("msitest\\attoparsec", TRUE), "File deleted\n"); + ok(!delete_pf("msitest\\storeys", TRUE), "File not deleted\n"); + ok(!delete_pf("msitest\\block", TRUE), "File not deleted\n"); ok(delete_pf("msitest\\siriometer", TRUE), "File deleted\n"); - todo_wine - { - ok(!delete_pf("msitest\\becquerel", TRUE), "File not deleted\n"); - ok(!delete_pf("msitest\\dioptre", TRUE), "File not deleted\n"); - ok(!delete_pf("msitest\\storeys", TRUE), "File not deleted\n"); - ok(!delete_pf("msitest\\block", TRUE), "File not deleted\n"); - } ok(delete_pf("msitest", FALSE), "File deleted\n"); DeleteFile(msifile); diff --git a/include/msidefs.h b/include/msidefs.h index 141e203..d87569f 100644 --- a/include/msidefs.h +++ b/include/msidefs.h @@ -215,6 +215,13 @@ enum msidbSumInfoSourceType msidbSumInfoSourceTypeLUAPackage = 0x00000008, }; +enum msidbRemoveFileInstallMode +{ + msidbRemoveFileInstallModeOnInstall = 0x00000001, + msidbRemoveFileInstallModeOnRemove = 0x00000002, + msidbRemoveFileInstallModeOnBoth = 0x00000003, +}; + /* * Windows SDK braindamage alert *

1 0

James Hawkins : msi: A file's component' s state does not determine file removal.
by Alexandre Julliard Aug. 19, 2008

Aug. 19, 2008

Module: wine Branch: master Commit: a00bdc117805608310e1139ac9ee700773ed0246 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a00bdc117805608310e1139ac… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 18 23:02:24 2008 -0500 msi: A file's component's state does not determine file removal. --- dlls/msi/files.c | 3 -- dlls/msi/tests/install.c | 62 ++++++++++++++++++++------------------------- 2 files changed, 28 insertions(+), 37 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index e69c879..521cdb3 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -444,9 +444,6 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) MSIRECORD *uirow; LPWSTR uipath, p; - if ( file->Component->Installed == INSTALLSTATE_LOCAL ) - continue; - if ( file->state == msifs_installed ) ERR("removing installed file %s\n", debugstr_w(file->TargetPath)); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 0580c18..04f9e4b 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3274,9 +3274,9 @@ static void test_publish(void) /* no UnpublishFeatures */ r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!pf_exists("msitest\\maximus"), "File deleted\n"); todo_wine { - ok(!pf_exists("msitest\\maximus"), "File deleted\n"); ok(!pf_exists("msitest"), "File deleted\n"); } @@ -3352,7 +3352,7 @@ static void test_publish(void) /* UnpublishFeatures, only feature removed. Only works when entire product is removed */ r = MsiInstallProductA(msifile, "UNPUBLISH_FEATURES=1 REMOVE=feature"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); - ok(pf_exists("msitest\\maximus"), "File deleted\n"); + todo_wine ok(pf_exists("msitest\\maximus"), "File deleted\n"); ok(pf_exists("msitest"), "File deleted\n"); state = MsiQueryProductState("{7DF88A48-996F-4EC8-A022-BF956F9B2CBB}"); @@ -3456,9 +3456,9 @@ static void test_publish(void) /* UnpublishFeatures, both features removed */ r = MsiInstallProductA(msifile, "UNPUBLISH_FEATURES=1 REMOVE=feature,montecristo"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!pf_exists("msitest\\maximus"), "File not deleted\n"); todo_wine { - ok(!pf_exists("msitest\\maximus"), "File not deleted\n"); ok(!pf_exists("msitest"), "File not deleted\n"); } @@ -3534,9 +3534,9 @@ static void test_publish(void) /* complete uninstall */ r = MsiInstallProductA(msifile, "FULL=1 REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!pf_exists("msitest\\maximus"), "File not deleted\n"); todo_wine { - ok(!pf_exists("msitest\\maximus"), "File not deleted\n"); ok(!pf_exists("msitest"), "File not deleted\n"); } @@ -3735,9 +3735,9 @@ static void test_publishsourcelist(void) /* complete uninstall */ r = MsiInstallProductA(msifile, "FULL=1 REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!pf_exists("msitest\\maximus"), "File not deleted\n"); todo_wine { - ok(!pf_exists("msitest\\maximus"), "File not deleted\n"); ok(!pf_exists("msitest"), "File not deleted\n"); } @@ -4166,13 +4166,10 @@ static void test_removefiles(void) r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(!pf_exists("msitest\\hydrogen"), "File not deleted\n"); ok(!pf_exists("msitest\\helium"), "File not deleted\n"); ok(delete_pf("msitest\\lithium", TRUE), "File deleted\n"); - todo_wine - { - ok(!pf_exists("msitest\\hydrogen"), "File not deleted\n"); - ok(delete_pf("msitest", FALSE), "File deleted\n"); - } + ok(delete_pf("msitest", FALSE), "File deleted\n"); create_pf("msitest", FALSE); create_pf("msitest\\hydrogen", TRUE); @@ -4188,13 +4185,10 @@ static void test_removefiles(void) r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(!pf_exists("msitest\\hydrogen"), "File not deleted\n"); ok(delete_pf("msitest\\helium", TRUE), "File deleted\n"); ok(delete_pf("msitest\\lithium", TRUE), "File deleted\n"); - todo_wine - { - ok(!pf_exists("msitest\\hydrogen"), "File not deleted\n"); - ok(delete_pf("msitest", FALSE), "File deleted\n"); - } + ok(delete_pf("msitest", FALSE), "File deleted\n"); create_pf("msitest", FALSE); create_pf("msitest\\furlong", TRUE); @@ -4235,6 +4229,7 @@ static void test_removefiles(void) r = MsiInstallProductA(msifile, "REMOVE=ALL"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(!delete_pf("msitest\\hydrogen", TRUE), "File not deleted\n"); ok(!delete_pf("msitest\\helium", TRUE), "File not deleted\n"); ok(delete_pf("msitest\\lithium", TRUE), "File deleted\n"); ok(delete_pf("msitest\\furlong", TRUE), "File deleted\n"); @@ -4244,7 +4239,6 @@ static void test_removefiles(void) ok(delete_pf("msitest\\siriometer", TRUE), "File deleted\n"); todo_wine { - ok(!delete_pf("msitest\\hydrogen", TRUE), "File not deleted\n"); ok(!delete_pf("msitest\\becquerel", TRUE), "File not deleted\n"); ok(!delete_pf("msitest\\dioptre", TRUE), "File not deleted\n"); ok(!delete_pf("msitest\\storeys", TRUE), "File not deleted\n"); @@ -5082,11 +5076,11 @@ static void test_MsiConfigureProductEx(void) INSTALLLEVEL_DEFAULT, INSTALLSTATE_ABSENT, "PROPVAR=42"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!delete_pf("msitest\\hydrogen", TRUE), "File not removed\n"); + ok(!delete_pf("msitest\\helium", TRUE), "File not removed\n"); + ok(!delete_pf("msitest\\lithium", TRUE), "File not removed\n"); todo_wine { - ok(!delete_pf("msitest\\hydrogen", TRUE), "File not removed\n"); - ok(!delete_pf("msitest\\helium", TRUE), "File not removed\n"); - ok(!delete_pf("msitest\\lithium", TRUE), "File not removed\n"); ok(!delete_pf("msitest", FALSE), "File not removed\n"); } @@ -5110,11 +5104,11 @@ static void test_MsiConfigureProductEx(void) INSTALLLEVEL_DEFAULT, INSTALLSTATE_ABSENT, "PROPVAR=42"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!delete_pf("msitest\\hydrogen", TRUE), "File not removed\n"); + ok(!delete_pf("msitest\\helium", TRUE), "File not removed\n"); + ok(!delete_pf("msitest\\lithium", TRUE), "File not removed\n"); todo_wine { - ok(!delete_pf("msitest\\hydrogen", TRUE), "File not removed\n"); - ok(!delete_pf("msitest\\helium", TRUE), "File not removed\n"); - ok(!delete_pf("msitest\\lithium", TRUE), "File not removed\n"); ok(!delete_pf("msitest", FALSE), "File not removed\n"); } @@ -5140,11 +5134,11 @@ static void test_MsiConfigureProductEx(void) INSTALLLEVEL_DEFAULT, INSTALLSTATE_ABSENT, "PROPVAR=42"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!delete_pf("msitest\\hydrogen", TRUE), "File not removed\n"); + ok(!delete_pf("msitest\\helium", TRUE), "File not removed\n"); + ok(!delete_pf("msitest\\lithium", TRUE), "File not removed\n"); todo_wine { - ok(!delete_pf("msitest\\hydrogen", TRUE), "File not removed\n"); - ok(!delete_pf("msitest\\helium", TRUE), "File not removed\n"); - ok(!delete_pf("msitest\\lithium", TRUE), "File not removed\n"); ok(!delete_pf("msitest", FALSE), "File not removed\n"); } @@ -5190,11 +5184,11 @@ static void test_MsiConfigureProductEx(void) INSTALLLEVEL_DEFAULT, INSTALLSTATE_ABSENT, "PROPVAR=42"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!delete_pf("msitest\\hydrogen", TRUE), "File not removed\n"); + ok(!delete_pf("msitest\\helium", TRUE), "File not removed\n"); + ok(!delete_pf("msitest\\lithium", TRUE), "File not removed\n"); todo_wine { - ok(!delete_pf("msitest\\hydrogen", TRUE), "File not removed\n"); - ok(!delete_pf("msitest\\helium", TRUE), "File not removed\n"); - ok(!delete_pf("msitest\\lithium", TRUE), "File not removed\n"); ok(!delete_pf("msitest", FALSE), "File not removed\n"); } @@ -5254,11 +5248,11 @@ static void test_MsiConfigureProductEx(void) INSTALLLEVEL_DEFAULT, INSTALLSTATE_ABSENT, "PROPVAR=42"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r); + ok(!delete_pf("msitest\\hydrogen", TRUE), "File not removed\n"); + ok(!delete_pf("msitest\\helium", TRUE), "File not removed\n"); + ok(!delete_pf("msitest\\lithium", TRUE), "File not removed\n"); todo_wine { - ok(!delete_pf("msitest\\hydrogen", TRUE), "File not removed\n"); - ok(!delete_pf("msitest\\helium", TRUE), "File not removed\n"); - ok(!delete_pf("msitest\\lithium", TRUE), "File not removed\n"); ok(!delete_pf("msitest", FALSE), "File not removed\n"); } @@ -5295,12 +5289,12 @@ static void test_missingcomponent(void) r = MsiInstallProductA(msifile, "REMOVE=ALL INSTALLLEVEL=10 PROPVAR=42"); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(!delete_pf("msitest\\hydrogen", TRUE), "File not removed\n"); + ok(!delete_pf("msitest\\helium", TRUE), "File not removed\n"); + ok(!delete_pf("msitest\\lithium", TRUE), "File not removed\n"); ok(!pf_exists("msitest\\beryllium"), "File installed\n"); todo_wine { - ok(!delete_pf("msitest\\hydrogen", TRUE), "File not removed\n"); - ok(!delete_pf("msitest\\helium", TRUE), "File not removed\n"); - ok(!delete_pf("msitest\\lithium", TRUE), "File not removed\n"); ok(!delete_pf("msitest", FALSE), "File not removed\n"); }

1 0

James Hawkins : msi: Don' t remove a file if the old file is strictly newer than the version to be installed .
by Alexandre Julliard Aug. 19, 2008

Aug. 19, 2008

Module: wine Branch: master Commit: f33ef6ac3bbd5b02fd1e2d496fcc413e30ca4f71 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f33ef6ac3bbd5b02fd1e2d496… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 18 23:01:36 2008 -0500 msi: Don't remove a file if the old file is strictly newer than the version to be installed. --- dlls/msi/files.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 32334cd..e69c879 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -453,10 +453,10 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) if ( file->state != msifs_present ) continue; - /* only remove a file if the version to be installed - * is strictly newer than the old file + /* don't remove a file if the old file + * is strictly newer than the version to be installed */ - if ( msi_compare_file_version( file ) >= 0 ) + if ( msi_compare_file_version( file ) < 0 ) continue; TRACE("removing %s\n", debugstr_w(file->File) );

1 0

James Hawkins : msi: Don't check for a NULL component, as the component is guaranteed to exist.
by Alexandre Julliard Aug. 19, 2008

Aug. 19, 2008

Module: wine Branch: master Commit: ca4b17efe800bb4f06392aa55a6d8f4d2efccd47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ca4b17efe800bb4f06392aa55… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 18 23:01:00 2008 -0500 msi: Don't check for a NULL component, as the component is guaranteed to exist. --- dlls/msi/files.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/msi/files.c b/dlls/msi/files.c index 08e8ec8..32334cd 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -444,8 +444,6 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) MSIRECORD *uirow; LPWSTR uipath, p; - if ( !file->Component ) - continue; if ( file->Component->Installed == INSTALLSTATE_LOCAL ) continue;

1 0

James Hawkins : msi: Ignore a file that has a missing component.
by Alexandre Julliard Aug. 19, 2008

Aug. 19, 2008

Module: wine Branch: master Commit: 9a8d2f3f5cbd4aca1042ec2bfbde2fa58c4d97a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a8d2f3f5cbd4aca1042ec2bf… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 18 23:00:20 2008 -0500 msi: Ignore a file that has a missing component. --- dlls/msi/action.c | 7 ++++- dlls/msi/tests/install.c | 63 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 9e6c267..a375000 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -1457,7 +1457,12 @@ static UINT load_file(MSIRECORD *row, LPVOID param) file->Component = get_loaded_component( package, component ); if (!file->Component) - ERR("Unfound Component %s\n",debugstr_w(component)); + { + WARN("Component not found: %s\n", debugstr_w(component)); + msi_free(file->File); + msi_free(file); + return ERROR_SUCCESS; + } file->FileName = msi_dup_record_field( row, 3 ); reduce_to_longfilename( file->FileName ); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 6f15720..0580c18 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -726,6 +726,14 @@ static const CHAR mcp_feature_comp_dat[] = "Feature_\tComponent_\n" "heliox\thelium\n" "lithia\tlithium"; +static const CHAR mcomp_file_dat[] = "File\tComponent_\tFileName\tFileSize\tVersion\tLanguage\tAttributes\tSequence\n" + "s72\ts72\tl255\ti4\tS72\tS20\tI2\ti2\n" + "File\tFile\n" + "hydrogen\thydrogen\thydrogen\t0\t\t\t8192\t1\n" + "helium\thelium\thelium\t0\t\t\t8192\t1\n" + "lithium\tlithium\tlithium\t0\t\t\t8192\t1\n" + "beryllium\tmissingcomp\tberyllium\t0\t\t\t8192\t1"; + typedef struct _msi_table { const CHAR *filename; @@ -1100,6 +1108,18 @@ static const msi_table mcp_tables[] = ADD_TABLE(property), }; +static const msi_table mcomp_tables[] = +{ + ADD_TABLE(mcp_component), + ADD_TABLE(directory), + ADD_TABLE(mcp_feature), + ADD_TABLE(mcp_feature_comp), + ADD_TABLE(mcomp_file), + ADD_TABLE(rem_install_exec_seq), + ADD_TABLE(rof_media), + ADD_TABLE(property), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -4131,6 +4151,7 @@ static void test_removefiles(void) create_file("msitest\\hydrogen", 500); create_file("msitest\\helium", 500); create_file("msitest\\lithium", 500); + create_file("msitest\\beryllium", 500); create_database(msifile, rem_tables, sizeof(rem_tables) / sizeof(msi_table)); @@ -5250,6 +5271,47 @@ static void test_MsiConfigureProductEx(void) RemoveDirectoryA("msitest"); } +static void test_missingcomponent(void) +{ + UINT r; + + CreateDirectoryA("msitest", NULL); + create_file("msitest\\hydrogen", 500); + create_file("msitest\\helium", 500); + create_file("msitest\\lithium", 500); + create_file("beryllium", 500); + + create_database(msifile, mcomp_tables, sizeof(mcomp_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, "INSTALLLEVEL=10 PROPVAR=42"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(pf_exists("msitest\\hydrogen"), "File not installed\n"); + ok(pf_exists("msitest\\helium"), "File not installed\n"); + ok(pf_exists("msitest\\lithium"), "File not installed\n"); + ok(!pf_exists("msitest\\beryllium"), "File installed\n"); + ok(pf_exists("msitest"), "File not installed\n"); + + r = MsiInstallProductA(msifile, "REMOVE=ALL INSTALLLEVEL=10 PROPVAR=42"); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(!pf_exists("msitest\\beryllium"), "File installed\n"); + todo_wine + { + ok(!delete_pf("msitest\\hydrogen", TRUE), "File not removed\n"); + ok(!delete_pf("msitest\\helium", TRUE), "File not removed\n"); + ok(!delete_pf("msitest\\lithium", TRUE), "File not removed\n"); + ok(!delete_pf("msitest", FALSE), "File not removed\n"); + } + + DeleteFileA(msifile); + DeleteFileA("msitest\\hydrogen"); + DeleteFileA("msitest\\helium"); + DeleteFileA("msitest\\lithium"); + DeleteFileA("beryllium"); + RemoveDirectoryA("msitest"); +} + START_TEST(install) { DWORD len; @@ -5303,6 +5365,7 @@ START_TEST(install) test_installstate(); test_sourcepath(); test_MsiConfigureProductEx(); + test_missingcomponent(); SetCurrentDirectoryA(prev_path); }

1 0