Ros-diffs March 2022

ros-diffs@reactos.org

20 participants
436 discussions

[reactos] 221/360: [WINESYNC] msi: Return ERROR_INVALID_HANDLE when MsiOpenPackage() is called from a custom action.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=b720e4c0e237911235a48… commit b720e4c0e237911235a482bcf7a1b840d1d98e19 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 01:21:42 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:17 2022 +0100 [WINESYNC] msi: Return ERROR_INVALID_HANDLE when MsiOpenPackage() is called from a custom action. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id b2d3567c1b4846905f01612d8f499f45ed9d24ac by Zebediah Figura <z.figura12(a)gmail.com> --- dll/win32/msi/package.c | 14 ++------------ modules/rostests/winetests/msi/custom.c | 2 +- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/dll/win32/msi/package.c b/dll/win32/msi/package.c index e2334895931..a634a101961 100644 --- a/dll/win32/msi/package.c +++ b/dll/win32/msi/package.c @@ -1471,18 +1471,8 @@ UINT MSI_OpenPackageW(LPCWSTR szPackage, DWORD dwOptions, MSIPACKAGE **pPackage) if( szPackage[0] == '#' ) { handle = atoiW(&szPackage[1]); - db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE ); - if( !db ) - { - MSIHANDLE remote; - - if (!(remote = msi_get_remote(handle))) - return ERROR_INVALID_HANDLE; - - WARN("MsiOpenPackage not allowed during a custom action!\n"); - - return ERROR_FUNCTION_FAILED; - } + if (!(db = msihandle2msiinfo(handle, MSIHANDLETYPE_DATABASE))) + return ERROR_INVALID_HANDLE; } else { diff --git a/modules/rostests/winetests/msi/custom.c b/modules/rostests/winetests/msi/custom.c index 454966e9148..43b8369b17f 100644 --- a/modules/rostests/winetests/msi/custom.c +++ b/modules/rostests/winetests/msi/custom.c @@ -1154,7 +1154,7 @@ static void test_invalid_functions(MSIHANDLE hinst) sprintf(package_name, "#%u", db); r = MsiOpenPackageA(package_name, &package); - todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); MsiCloseHandle(db); }

2 years, 9 months

[reactos] 220/360: [WINESYNC] msi: Return ERROR_INVALID_HANDLE when MsiEnableUIPreview() is called from a custom action.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=df4fa37bf91a33be390b0… commit df4fa37bf91a33be390b0832d2ab766c12667601 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 01:21:41 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:17 2022 +0100 [WINESYNC] msi: Return ERROR_INVALID_HANDLE when MsiEnableUIPreview() is called from a custom action. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 4bb40d1a95e525c63f1f6f1f20f0c054d46f2fff by Zebediah Figura <z.figura12(a)gmail.com> --- dll/win32/msi/dialog.c | 14 ++------------ modules/rostests/winetests/msi/custom.c | 2 +- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/dll/win32/msi/dialog.c b/dll/win32/msi/dialog.c index 864f488d9c1..d11f09c12cf 100644 --- a/dll/win32/msi/dialog.c +++ b/dll/win32/msi/dialog.c @@ -4219,19 +4219,9 @@ UINT WINAPI MsiEnableUIPreview( MSIHANDLE hdb, MSIHANDLE *phPreview ) TRACE("%d %p\n", hdb, phPreview); - db = msihandle2msiinfo( hdb, MSIHANDLETYPE_DATABASE ); - if (!db) - { - MSIHANDLE remote_database = msi_get_remote( hdb ); - if (!remote_database) - return ERROR_INVALID_HANDLE; - - *phPreview = 0; - - WARN("MsiEnableUIPreview not allowed during a custom action!\n"); + if (!(db = msihandle2msiinfo(hdb, MSIHANDLETYPE_DATABASE))) + return ERROR_INVALID_HANDLE; - return ERROR_FUNCTION_FAILED; - } preview = MSI_EnableUIPreview( db ); if (preview) { diff --git a/modules/rostests/winetests/msi/custom.c b/modules/rostests/winetests/msi/custom.c index b8da55e1ce1..454966e9148 100644 --- a/modules/rostests/winetests/msi/custom.c +++ b/modules/rostests/winetests/msi/custom.c @@ -1150,7 +1150,7 @@ static void test_invalid_functions(MSIHANDLE hinst) ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r); r = MsiEnableUIPreview(db, &preview); - todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); sprintf(package_name, "#%u", db); r = MsiOpenPackageA(package_name, &package);

2 years, 9 months

[reactos] 219/360: [WINESYNC] msi: Return ERROR_INVALID_HANDLE when MsiDatabaseImport() is called from a custom action.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6d0c1c59ca5f486e55427… commit 6d0c1c59ca5f486e554272b512be3bc36eabf814 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 01:21:41 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:17 2022 +0100 [WINESYNC] msi: Return ERROR_INVALID_HANDLE when MsiDatabaseImport() is called from a custom action. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 19420f5f7c146f0ade010b9fbfaf21f926ef10a8 by Zebediah Figura <z.figura12(a)gmail.com> --- dll/win32/msi/database.c | 13 ++----------- modules/rostests/winetests/msi/custom.c | 2 +- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dll/win32/msi/database.c b/dll/win32/msi/database.c index d0399039447..11ed27d9f20 100644 --- a/dll/win32/msi/database.c +++ b/dll/win32/msi/database.c @@ -870,17 +870,8 @@ UINT WINAPI MsiDatabaseImportW(MSIHANDLE handle, LPCWSTR szFolder, LPCWSTR szFil TRACE("%x %s %s\n",handle,debugstr_w(szFolder), debugstr_w(szFilename)); - db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE ); - if( !db ) - { - MSIHANDLE remote_database = msi_get_remote( handle ); - if ( !remote_database ) - return ERROR_INVALID_HANDLE; - - WARN("MsiDatabaseImport not allowed during a custom action!\n"); - - return ERROR_SUCCESS; - } + if (!(db = msihandle2msiinfo(handle, MSIHANDLETYPE_DATABASE))) + return ERROR_INVALID_HANDLE; r = MSI_DatabaseImport( db, szFolder, szFilename ); msiobj_release( &db->hdr ); diff --git a/modules/rostests/winetests/msi/custom.c b/modules/rostests/winetests/msi/custom.c index d9d4689c4e7..b8da55e1ce1 100644 --- a/modules/rostests/winetests/msi/custom.c +++ b/modules/rostests/winetests/msi/custom.c @@ -1138,7 +1138,7 @@ static void test_invalid_functions(MSIHANDLE hinst) ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); r = MsiDatabaseImportA(db, path, "bogus.idt"); - todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); r = MsiDatabaseCommit(db); ok(hinst, r == ERROR_SUCCESS, "got %u\n", r);

2 years, 9 months

[reactos] 218/360: [WINESYNC] msi: Return ERROR_INVALID_HANDLE when MsiDatabaseExport() is called from a custom action.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0b31064d1b3d00b66c2f8… commit 0b31064d1b3d00b66c2f8f8cb05396c6f308388d Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 01:21:40 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:16 2022 +0100 [WINESYNC] msi: Return ERROR_INVALID_HANDLE when MsiDatabaseExport() is called from a custom action. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 3ff7d30520e4450fd9efbf5569eb28b82fb81aeb by Zebediah Figura <z.figura12(a)gmail.com> --- dll/win32/msi/database.c | 13 ++----------- modules/rostests/winetests/msi/custom.c | 2 +- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/dll/win32/msi/database.c b/dll/win32/msi/database.c index 19926619225..d0399039447 100644 --- a/dll/win32/msi/database.c +++ b/dll/win32/msi/database.c @@ -1194,17 +1194,8 @@ UINT WINAPI MsiDatabaseExportW( MSIHANDLE handle, LPCWSTR szTable, TRACE("%x %s %s %s\n", handle, debugstr_w(szTable), debugstr_w(szFolder), debugstr_w(szFilename)); - db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE ); - if( !db ) - { - MSIHANDLE remote_database = msi_get_remote(handle); - if ( !remote_database ) - return ERROR_INVALID_HANDLE; - - WARN("MsiDatabaseExport not allowed during a custom action!\n"); - - return ERROR_SUCCESS; - } + if (!(db = msihandle2msiinfo(handle, MSIHANDLETYPE_DATABASE))) + return ERROR_INVALID_HANDLE; r = MSI_DatabaseExport( db, szTable, szFolder, szFilename ); msiobj_release( &db->hdr ); diff --git a/modules/rostests/winetests/msi/custom.c b/modules/rostests/winetests/msi/custom.c index 526c4a211d2..d9d4689c4e7 100644 --- a/modules/rostests/winetests/msi/custom.c +++ b/modules/rostests/winetests/msi/custom.c @@ -1135,7 +1135,7 @@ static void test_invalid_functions(MSIHANDLE hinst) GetCurrentDirectoryA(sizeof(path), path); r = MsiDatabaseExportA(db, "Test", path, "bogus.idt"); - todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); r = MsiDatabaseImportA(db, path, "bogus.idt"); todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r);

2 years, 9 months

[reactos] 217/360: [WINESYNC] msi: Return ERROR_INVALID_HANDLE when MsiDatabaseApplyTransform() is called from a custom action.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=115d04ba20272d1ec1a91… commit 115d04ba20272d1ec1a9108afc75ec3855581863 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 01:21:39 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:16 2022 +0100 [WINESYNC] msi: Return ERROR_INVALID_HANDLE when MsiDatabaseApplyTransform() is called from a custom action. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id ed5f4bd14f5cece4bca63918b924606a09a3300d by Zebediah Figura <z.figura12(a)gmail.com> --- dll/win32/msi/msiquery.c | 14 ++------------ modules/rostests/winetests/msi/custom.c | 2 +- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/dll/win32/msi/msiquery.c b/dll/win32/msi/msiquery.c index 50cc97745b6..9f4c5975306 100644 --- a/dll/win32/msi/msiquery.c +++ b/dll/win32/msi/msiquery.c @@ -884,18 +884,8 @@ UINT WINAPI MsiDatabaseApplyTransformW( MSIHANDLE hdb, const WCHAR *transform, i if (error_cond) FIXME( "ignoring error conditions\n" ); - db = msihandle2msiinfo( hdb, MSIHANDLETYPE_DATABASE ); - if (!db) - { - MSIHANDLE remote; - - if (!(remote = msi_get_remote(hdb))) - return ERROR_INVALID_HANDLE; - - WARN("MsiDatabaseApplyTransform not allowed during a custom action!\n"); - - return ERROR_SUCCESS; - } + if (!(db = msihandle2msiinfo(hdb, MSIHANDLETYPE_DATABASE))) + return ERROR_INVALID_HANDLE; r = MSI_DatabaseApplyTransformW( db, transform, error_cond ); msiobj_release( &db->hdr ); diff --git a/modules/rostests/winetests/msi/custom.c b/modules/rostests/winetests/msi/custom.c index 9e9e2bf938a..526c4a211d2 100644 --- a/modules/rostests/winetests/msi/custom.c +++ b/modules/rostests/winetests/msi/custom.c @@ -1128,7 +1128,7 @@ static void test_invalid_functions(MSIHANDLE hinst) todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); r = MsiDatabaseApplyTransformA(db, "bogus.mst", 0); - todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); r = MsiCreateTransformSummaryInfoA(db, db, "bogus.mst", 0, 0); todo_wine ok(hinst, r == ERROR_INSTALL_PACKAGE_OPEN_FAILED, "got %u\n", r);

2 years, 9 months

[reactos] 216/360: [WINESYNC] msi: Return MSIDBSTATE_ERROR when MsiGetDatabaseState() is called from a custom action.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=72c4091cef278b10423d1… commit 72c4091cef278b10423d151560f330c579e5ee56 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 01:19:31 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:16 2022 +0100 [WINESYNC] msi: Return MSIDBSTATE_ERROR when MsiGetDatabaseState() is called from a custom action. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46812 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 60b1fd7e8764ab63d79382c1805d4c007a6be332 by Zebediah Figura <z.figura12(a)gmail.com> --- dll/win32/msi/database.c | 12 ++---------- modules/rostests/winetests/msi/custom.c | 4 ++-- 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dll/win32/msi/database.c b/dll/win32/msi/database.c index 8e2d1bcf035..19926619225 100644 --- a/dll/win32/msi/database.c +++ b/dll/win32/msi/database.c @@ -1993,16 +1993,8 @@ MSIDBSTATE WINAPI MsiGetDatabaseState( MSIHANDLE handle ) TRACE("%d\n", handle); - db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE ); - if( !db ) - { - MSIHANDLE remote_database = msi_get_remote(handle); - if ( !remote_database ) - return MSIDBSTATE_ERROR; - - WARN("MsiGetDatabaseState not allowed during a custom action!\n"); - return MSIDBSTATE_READ; - } + if (!(db = msihandle2msiinfo( handle, MSIHANDLETYPE_DATABASE ))) + return MSIDBSTATE_ERROR; if (db->mode != MSIDBOPEN_READONLY ) ret = MSIDBSTATE_WRITE; diff --git a/modules/rostests/winetests/msi/custom.c b/modules/rostests/winetests/msi/custom.c index 6ae5bfc30a9..9e9e2bf938a 100644 --- a/modules/rostests/winetests/msi/custom.c +++ b/modules/rostests/winetests/msi/custom.c @@ -1119,7 +1119,7 @@ static void test_invalid_functions(MSIHANDLE hinst) UINT r; r = MsiGetDatabaseState(hinst); - todo_wine ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r); + ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r); db = MsiGetActiveDatabase(hinst); ok(hinst, db, "MsiGetActiveDatabase failed\n"); @@ -1147,7 +1147,7 @@ static void test_invalid_functions(MSIHANDLE hinst) ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); r = MsiGetDatabaseState(db); - todo_wine ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r); + ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r); r = MsiEnableUIPreview(db, &preview); todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r);

2 years, 9 months

[reactos] 215/360: [WINESYNC] msi/tests: Test calling more functions from custom actions.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f7e42b9b96b950be925d9… commit f7e42b9b96b950be925d95d2ff9c88dae775e4d2 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 01:19:31 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:16 2022 +0100 [WINESYNC] msi/tests: Test calling more functions from custom actions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id ae0298d46e8d4b7b689783b9c459ceafc3631780 by Zebediah Figura <z.figura12(a)gmail.com> --- modules/rostests/winetests/msi/custom.c | 54 +++++++++++++++++++++++++++++---- 1 file changed, 48 insertions(+), 6 deletions(-) diff --git a/modules/rostests/winetests/msi/custom.c b/modules/rostests/winetests/msi/custom.c index c7ce4d20aeb..6ae5bfc30a9 100644 --- a/modules/rostests/winetests/msi/custom.c +++ b/modules/rostests/winetests/msi/custom.c @@ -1112,11 +1112,57 @@ static void test_costs(MSIHANDLE hinst) ok(hinst, sz == 2, "got size %u\n", sz); } +static void test_invalid_functions(MSIHANDLE hinst) +{ + char path[MAX_PATH], package_name[20]; + MSIHANDLE db, preview, package; + UINT r; + + r = MsiGetDatabaseState(hinst); + todo_wine ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r); + + db = MsiGetActiveDatabase(hinst); + ok(hinst, db, "MsiGetActiveDatabase failed\n"); + + r = MsiDatabaseGenerateTransformA(db, db, "bogus.mst", 0, 0); + todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + r = MsiDatabaseApplyTransformA(db, "bogus.mst", 0); + todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + r = MsiCreateTransformSummaryInfoA(db, db, "bogus.mst", 0, 0); + todo_wine ok(hinst, r == ERROR_INSTALL_PACKAGE_OPEN_FAILED, "got %u\n", r); + + GetCurrentDirectoryA(sizeof(path), path); + r = MsiDatabaseExportA(db, "Test", path, "bogus.idt"); + todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + r = MsiDatabaseImportA(db, path, "bogus.idt"); + todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + r = MsiDatabaseCommit(db); + ok(hinst, r == ERROR_SUCCESS, "got %u\n", r); + + r = MsiDatabaseMergeA(db, db, "MergeErrors"); + ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + r = MsiGetDatabaseState(db); + todo_wine ok(hinst, r == MSIDBSTATE_ERROR, "got %u\n", r); + + r = MsiEnableUIPreview(db, &preview); + todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + sprintf(package_name, "#%u", db); + r = MsiOpenPackageA(package_name, &package); + todo_wine ok(hinst, r == ERROR_INVALID_HANDLE, "got %u\n", r); + + MsiCloseHandle(db); +} + /* Main test. Anything that doesn't depend on a specific install configuration * or have undesired side effects should go here. */ UINT WINAPI main_test(MSIHANDLE hinst) { - UINT res; IUnknown *unk = NULL; HRESULT hr; @@ -1131,11 +1177,6 @@ UINT WINAPI main_test(MSIHANDLE hinst) ok(hinst, hr == S_OK, "got %#x\n", hr); CoUninitialize(); - /* Test MsiGetDatabaseState() */ - res = MsiGetDatabaseState(hinst); - todo_wine - ok(hinst, res == MSIDBSTATE_ERROR, "expected MSIDBSTATE_ERROR, got %u\n", res); - test_props(hinst); test_db(hinst); test_doaction(hinst); @@ -1144,6 +1185,7 @@ UINT WINAPI main_test(MSIHANDLE hinst) test_feature_states(hinst); test_format_record(hinst); test_costs(hinst); + test_invalid_functions(hinst); return ERROR_SUCCESS; }

2 years, 9 months

[reactos] 214/360: [WINESYNC] msi: Avoid a crash in RemoveFiles if the component directory is invalid.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=af2abfcb7a03d7aeb3001… commit af2abfcb7a03d7aeb3001d641ef41130c3a19116 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 01:19:31 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:15 2022 +0100 [WINESYNC] msi: Avoid a crash in RemoveFiles if the component directory is invalid. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46907 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id c7f323107b3b956d206d8d0ee28851d60f19841c by Hans Leidekker <hans(a)codeweavers.com> --- dll/win32/msi/files.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/msi/files.c b/dll/win32/msi/files.c index 92a98f1eca0..68b8954f57f 100644 --- a/dll/win32/msi/files.c +++ b/dll/win32/msi/files.c @@ -1645,7 +1645,7 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) else { MSIFOLDER *folder = msi_get_loaded_folder( package, comp->Directory ); - remove_folder( folder ); + if (folder) remove_folder( folder ); } } return ERROR_SUCCESS;

2 years, 9 months

[reactos] 213/360: [WINESYNC] msi: Append the custom action client PID to the endpoint name.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=c611d50ecc1e0c3e98cce… commit c611d50ecc1e0c3e98cce8970f4f9ae0386f27e0 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 01:17:51 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:15 2022 +0100 [WINESYNC] msi: Append the custom action client PID to the endpoint name. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46833 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 27a7952a84d157caed21a663dd827728a02c443e by Zebediah Figura <z.figura12(a)gmail.com> --- base/system/msiexec/msiexec.c | 9 +++++---- dll/win32/msi/custom.c | 14 ++++++++++---- dll/win32/msi/msi.spec | 2 +- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/base/system/msiexec/msiexec.c b/base/system/msiexec/msiexec.c index efbcb5c7f4d..3340ade7760 100644 --- a/base/system/msiexec/msiexec.c +++ b/base/system/msiexec/msiexec.c @@ -397,19 +397,20 @@ static DWORD DoUnregServer(void) return ret; } -extern UINT CDECL __wine_msi_call_dll_function(GUID *guid); +extern UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid); + +static DWORD client_pid; static DWORD CALLBACK custom_action_thread(void *arg) { GUID guid = *(GUID *)arg; heap_free(arg); - return __wine_msi_call_dll_function(&guid); + return __wine_msi_call_dll_function(client_pid, &guid); } static int custom_action_server(const WCHAR *arg) { static const WCHAR pipe_name[] = {'\\','\\','.','\\','p','i','p','e','\\','m','s','i','c','a','_','%','x','_','%','d',0}; - DWORD client_pid = atoiW(arg); GUID guid, *thread_guid; DWORD64 thread64; WCHAR buffer[24]; @@ -419,7 +420,7 @@ static int custom_action_server(const WCHAR *arg) TRACE("%s\n", debugstr_w(arg)); - if (!client_pid) + if (!(client_pid = atoiW(arg))) { ERR("Invalid parameter %s\n", debugstr_w(arg)); return 1; diff --git a/dll/win32/msi/custom.c b/dll/win32/msi/custom.c index b35226d696c..cde14ff34a8 100644 --- a/dll/win32/msi/custom.c +++ b/dll/win32/msi/custom.c @@ -478,7 +478,7 @@ static void handle_msi_break(LPCSTR target) } static WCHAR ncalrpcW[] = {'n','c','a','l','r','p','c',0}; -static WCHAR endpoint_lrpcW[] = {'m','s','i',0}; +static WCHAR endpoint_fmtW[] = {'m','s','i','%','x',0}; #if defined __i386__ && defined _MSC_VER __declspec(naked) UINT custom_proc_wrapper(MsiCustomActionEntryPoint entry, MSIHANDLE hinst) @@ -517,7 +517,7 @@ static UINT custom_proc_wrapper( MsiCustomActionEntryPoint entry, MSIHANDLE hins } #endif -UINT CDECL __wine_msi_call_dll_function(const GUID *guid) +UINT CDECL __wine_msi_call_dll_function(DWORD client_pid, const GUID *guid) { MsiCustomActionEntryPoint fn; MSIHANDLE remote_package = 0; @@ -534,7 +534,10 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid) if (!rpc_handle) { - status = RpcStringBindingComposeW(NULL, ncalrpcW, NULL, endpoint_lrpcW, NULL, &binding_str); + WCHAR endpoint[12]; + + sprintfW(endpoint, endpoint_fmtW, client_pid); + status = RpcStringBindingComposeW(NULL, ncalrpcW, NULL, endpoint, NULL, &binding_str); if (status != RPC_S_OK) { ERR("RpcStringBindingCompose failed: %#x\n", status); @@ -755,8 +758,11 @@ static msi_custom_action_info *do_msidbCustomActionTypeDll( if (!package->rpc_server_started) { + WCHAR endpoint[12]; + + sprintfW(endpoint, endpoint_fmtW, GetCurrentProcessId()); status = RpcServerUseProtseqEpW(ncalrpcW, RPC_C_PROTSEQ_MAX_REQS_DEFAULT, - endpoint_lrpcW, NULL); + endpoint, NULL); if (status != RPC_S_OK) { ERR("RpcServerUseProtseqEp failed: %#x\n", status); diff --git a/dll/win32/msi/msi.spec b/dll/win32/msi/msi.spec index aecba1b1b38..eeb9ea757c0 100644 --- a/dll/win32/msi/msi.spec +++ b/dll/win32/msi/msi.spec @@ -295,4 +295,4 @@ @ stdcall -private DllRegisterServer() @ stdcall -private DllUnregisterServer() -@ cdecl __wine_msi_call_dll_function(ptr) +@ cdecl __wine_msi_call_dll_function(long ptr)

2 years, 9 months

[reactos] 212/360: [WINESYNC] msi: Don't fail the BindImage action if the BindImage table is absent.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e89ff1f99ba97d46bb2bd… commit e89ff1f99ba97d46bb2bd914373e07e79fbff761 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 01:17:51 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:15 2022 +0100 [WINESYNC] msi: Don't fail the BindImage action if the BindImage table is absent. This fixes a regression introduced with 15f852015a0332313821804cc1fbad79216408c6 and observable with several installers, including dotnet472. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46885 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id a3dfd2f251f336f1cc570863edb60251227cdf5d by Zebediah Figura <z.figura12(a)gmail.com> --- dll/win32/msi/action.c | 4 ++-- modules/rostests/winetests/msi/install.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dll/win32/msi/action.c b/dll/win32/msi/action.c index 38ce1d0a62f..626e6c9032d 100644 --- a/dll/win32/msi/action.c +++ b/dll/win32/msi/action.c @@ -7827,10 +7827,10 @@ static UINT ACTION_BindImage( MSIPACKAGE *package ) r = MSI_DatabaseOpenViewW( package->db, query, &view ); if (r == ERROR_SUCCESS) { - r = MSI_IterateRecords( view, NULL, ITERATE_BindImage, package ); + MSI_IterateRecords( view, NULL, ITERATE_BindImage, package ); msiobj_release( &view->hdr ); } - return r; + return ERROR_SUCCESS; } static UINT msi_unimplemented_action_stub( MSIPACKAGE *package, LPCSTR action, LPCWSTR table ) diff --git a/modules/rostests/winetests/msi/install.c b/modules/rostests/winetests/msi/install.c index 9c8652b353c..27dc83f87e2 100644 --- a/modules/rostests/winetests/msi/install.c +++ b/modules/rostests/winetests/msi/install.c @@ -135,6 +135,7 @@ static const CHAR install_exec_seq_dat[] = "Action\tCondition\tSequence\n" "ResolveSource\t\t950\n" "MoveFiles\t\t1700\n" "InstallFiles\t\t4000\n" + "BindImage\t\t4100\n" "DuplicateFiles\t\t4500\n" "WriteEnvironmentStrings\t\t4550\n" "CreateShortcuts\t\t4600\n"

2 years, 9 months

← Newer
1
...
16
17
18
19
20
21
22
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs March 2022