Ros-diffs March 2022

ros-diffs@reactos.org

20 participants
436 discussions

[reactos] 341/360: [WINESYNC] msi/tests: Add tests for MsiViewFetch wraparound behaviour.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=47b3e61d6217d8bd52a31… commit 47b3e61d6217d8bd52a31d3be4fe4ff3ca404b35 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Mon Mar 14 00:16:44 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:42 2022 +0100 [WINESYNC] msi/tests: Add tests for MsiViewFetch wraparound behaviour. Signed-off-by: Jinoh Kang <jinoh.kang.kr(a)gmail.com> Signed-off-by: Hans Leidekker … [View More]<hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id f26a9d093dff052e1db0c68db8801219d409cb3f by Jinoh Kang <jinoh.kang.kr(a)gmail.com> --- modules/rostests/winetests/msi/db.c | 83 +++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/modules/rostests/winetests/msi/db.c b/modules/rostests/winetests/msi/db.c index b42cc90a955..eb087eb9711 100644 --- a/modules/rostests/winetests/msi/db.c +++ b/modules/rostests/winetests/msi/db.c @@ -9293,6 +9293,88 @@ static void test_view_get_error(void) DeleteFileA(msifile); } +static void test_viewfetch_wraparound(void) +{ + MSIHANDLE db = 0, view = 0, rec = 0; + UINT r, i, idset, tries; + const char *query; + + DeleteFileA(msifile); + + /* just MsiOpenDatabase should not create a file */ + r = MsiOpenDatabaseW( msifileW, MSIDBOPEN_CREATE, &db ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + + query = "CREATE TABLE `phone` ( " + "`id` INT, `name` CHAR(32), `number` CHAR(32) " + "PRIMARY KEY `id`)"; + r = run_query( db, 0, query ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + + query = "INSERT INTO `phone` ( `id`, `name`, `number` )" + "VALUES('1', 'Alan', '5030581')"; + r = run_query( db, 0, query ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + + query = "INSERT INTO `phone` ( `id`, `name`, `number` )" + "VALUES('2', 'Barry', '928440')"; + r = run_query( db, 0, query ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + + query = "INSERT INTO `phone` ( `id`, `name`, `number` )" + "VALUES('3', 'Cindy', '2937550')"; + r = run_query( db, 0, query ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + + query = "SELECT * FROM `phone`"; + r = MsiDatabaseOpenViewA( db, query, &view ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + + r = MsiViewExecute( view, 0 ); + ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + + for (tries = 0; tries < 3; tries++) + { + winetest_push_context( "Wraparound attempt #%d", tries ); + idset = 0; + + for (i = 0; i < 3; i++) + { + winetest_push_context( "Record #%d", i ); + + r = MsiViewFetch( view, &rec ); + todo_wine_if(tries > 0) ok( r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", r ); + if (r != ERROR_SUCCESS) + { + winetest_pop_context(); + break; + } + + r = MsiRecordGetInteger(rec, 1); + ok(r >= 1 && r <= 3, "Expected 1 <= id <= 3, got %d\n", r); + if (r < sizeof(idset) * 8) + { + ok(!(idset & (1 << r)), "Duplicate id %d\n", r); + idset |= 1 << r; + } + + MsiCloseHandle(rec); + + winetest_pop_context(); + } + + r = MsiViewFetch(view, &rec); + ok(r == ERROR_NO_MORE_ITEMS, "Expected ERROR_NO_MORE_ITEMS, got %d\n", r); + + winetest_pop_context(); + } + + MsiViewClose(view); + MsiCloseHandle(view); + MsiCloseHandle(db); + DeleteFileA(msifile); +} + START_TEST(db) { test_msidatabase(); @@ -9352,4 +9434,5 @@ START_TEST(db) test_viewmodify_merge(); test_viewmodify_insert(); test_view_get_error(); + test_viewfetch_wraparound(); } [View Less]

3 years, 4 months

[reactos] 340/360: [WINESYNC] makefiles: Directly generate resources also for non-registered typelibs.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=91f589bceae4f26fbc9ba… commit 91f589bceae4f26fbc9baa05646f901c410380fb Author: winesync <ros-dev(a)reactos.org> AuthorDate: Mon Mar 14 00:04:07 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:41 2022 +0100 [WINESYNC] makefiles: Directly generate resources also for non-registered typelibs. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine … [View More]

3 years, 4 months

[reactos] 339/360: [WINESYNC] msiexec: Append .msi extension to file name if file is not found.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6eaaa698cd058eb289841… commit 6eaaa698cd058eb28984140b67d8d2ff505480f2 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 23:59:56 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:41 2022 +0100 [WINESYNC] msiexec: Append .msi extension to file name if file is not found. Fixes Stellaris failing to install launcher at start. Signed-off-by: Paul … [View More]Gofman <pgofman(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id fd5d942a733bf35b7c6b6644d2aed571c185baba by Paul Gofman <pgofman(a)codeweavers.com> --- base/system/msiexec/msiexec.c | 44 +++++++++++++++++++++++++++++++++++-- modules/rostests/winetests/msi/db.c | 18 +++++++++++++++ 2 files changed, 60 insertions(+), 2 deletions(-) diff --git a/base/system/msiexec/msiexec.c b/base/system/msiexec/msiexec.c index 5e0e1b107e8..2ee7d05427c 100644 --- a/base/system/msiexec/msiexec.c +++ b/base/system/msiexec/msiexec.c @@ -588,6 +588,31 @@ static BOOL process_args_from_reg( const WCHAR *ident, int *pargc, WCHAR ***parg return ret; } +static WCHAR *get_path_with_extension(const WCHAR *package_name) +{ + static const WCHAR ext[] = L".msi"; + unsigned int p; + WCHAR *path; + + if (!(path = heap_alloc(lstrlenW(package_name) * sizeof(WCHAR) + sizeof(ext)))) + { + WINE_ERR("No memory.\n"); + return NULL; + } + + lstrcpyW(path, package_name); + p = lstrlenW(path); + while (p && path[p] != '.' && path[p] != L'\\' && path[p] != '/') + --p; + if (path[p] == '.') + { + heap_free(path); + return NULL; + } + lstrcatW(path, ext); + return path; +} + int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { int i; @@ -626,6 +651,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine DWORD ReturnCode; int argc; LPWSTR *argvW = NULL; + WCHAR *path; InitCommonControls(); @@ -1040,14 +1066,28 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine if(IsProductCode(PackageName)) ReturnCode = MsiConfigureProductExW(PackageName, 0, INSTALLSTATE_DEFAULT, Properties); else - ReturnCode = MsiInstallProductW(PackageName, Properties); + { + if ((ReturnCode = MsiInstallProductW(PackageName, Properties)) == ERROR_FILE_NOT_FOUND + && (path = get_path_with_extension(PackageName))) + { + ReturnCode = MsiInstallProductW(path, Properties); + heap_free(path); + } + } } else if(FunctionRepair) { if(IsProductCode(PackageName)) WINE_FIXME("Product code treatment not implemented yet\n"); else - ReturnCode = MsiReinstallProductW(PackageName, RepairMode); + { + if ((ReturnCode = MsiReinstallProductW(PackageName, RepairMode)) == ERROR_FILE_NOT_FOUND + && (path = get_path_with_extension(PackageName))) + { + ReturnCode = MsiReinstallProductW(path, RepairMode); + heap_free(path); + } + } } else if(FunctionAdvertise) { diff --git a/modules/rostests/winetests/msi/db.c b/modules/rostests/winetests/msi/db.c index eedfcac486d..b42cc90a955 100644 --- a/modules/rostests/winetests/msi/db.c +++ b/modules/rostests/winetests/msi/db.c @@ -64,6 +64,8 @@ static void WINAPIV check_record_(int line, MSIHANDLE rec, UINT count, ...) static void test_msidatabase(void) { MSIHANDLE hdb = 0, hdb2 = 0; + WCHAR path[MAX_PATH]; + DWORD len; UINT res; DeleteFileW(msifileW); @@ -162,6 +164,22 @@ static void test_msidatabase(void) res = MsiCloseHandle( hdb ); ok( res == ERROR_SUCCESS , "Failed to close database\n" ); + res = GetCurrentDirectoryW(ARRAY_SIZE(path), path); + ok ( res, "Got zero res.\n" ); + lstrcatW( path, L"\\"); + lstrcatW( path, msifileW); + len = lstrlenW(path); + path[len - 4] = 0; + + res = MsiOpenDatabaseW( path, MSIDBOPEN_READONLY, &hdb ); + ok( res != ERROR_SUCCESS , "Got unexpected res %u.\n", res ); + + lstrcpyW( path, msifileW ); + path[lstrlenW(path) - 4] = 0; + + res = MsiOpenDatabaseW( path, MSIDBOPEN_READONLY, &hdb ); + ok( res != ERROR_SUCCESS , "Got unexpected res %u.\n", res ); + res = DeleteFileA( msifile2 ); ok( res == TRUE, "Failed to delete database\n" ); [View Less]

3 years, 4 months

[reactos] 338/360: [WINESYNC] msi: Use the standard va_list instead of __ms_va_list.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=f56eca297ac4748385847… commit f56eca297ac47483858479d28f49ffee4ca1dd1e Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 23:59:52 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:41 2022 +0100 [WINESYNC] msi: Use the standard va_list instead of __ms_va_list. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id … [View More]523553512a580a885b1783c773699dfe0928e3b6 by Alexandre Julliard <julliard(a)winehq.org> --- dll/win32/msi/msiquery.c | 12 ++++++------ modules/rostests/winetests/msi/custom.c | 6 +++--- modules/rostests/winetests/msi/db.c | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/dll/win32/msi/msiquery.c b/dll/win32/msi/msiquery.c index 5298073bfb6..2f04d441717 100644 --- a/dll/win32/msi/msiquery.c +++ b/dll/win32/msi/msiquery.c @@ -146,11 +146,11 @@ UINT WINAPIV MSI_OpenQuery( MSIDATABASE *db, MSIQUERY **view, LPCWSTR fmt, ... ) /* construct the string */ for (;;) { - __ms_va_list va; + va_list va; query = msi_alloc( size*sizeof(WCHAR) ); - __ms_va_start(va, fmt); + va_start(va, fmt); res = vswprintf(query, size, fmt, va); - __ms_va_end(va); + va_end(va); if (res == -1) size *= 2; else if (res >= size) size = res + 1; else break; @@ -211,11 +211,11 @@ MSIRECORD * WINAPIV MSI_QueryGetRecord( MSIDATABASE *db, LPCWSTR fmt, ... ) /* construct the string */ for (;;) { - __ms_va_list va; + va_list va; query = msi_alloc( size*sizeof(WCHAR) ); - __ms_va_start(va, fmt); + va_start(va, fmt); res = vswprintf(query, size, fmt, va); - __ms_va_end(va); + va_end(va); if (res == -1) size *= 2; else if (res >= size) size = res + 1; else break; diff --git a/modules/rostests/winetests/msi/custom.c b/modules/rostests/winetests/msi/custom.c index d74d0a2d097..75e234c6583 100644 --- a/modules/rostests/winetests/msi/custom.c +++ b/modules/rostests/winetests/msi/custom.c @@ -38,11 +38,11 @@ static void WINAPIV ok_(MSIHANDLE hinst, int todo, const char *file, int line, i { static char buffer[2000]; MSIHANDLE record; - __ms_va_list valist; + va_list valist; - __ms_va_start(valist, msg); + va_start(valist, msg); vsprintf(buffer, msg, valist); - __ms_va_end(valist); + va_end(valist); record = MsiCreateRecord(5); MsiRecordSetInteger(record, 1, todo); diff --git a/modules/rostests/winetests/msi/db.c b/modules/rostests/winetests/msi/db.c index 4ffd30f0376..eedfcac486d 100644 --- a/modules/rostests/winetests/msi/db.c +++ b/modules/rostests/winetests/msi/db.c @@ -38,13 +38,13 @@ static const WCHAR msifile2W[] = L"winetst2-db.msi"; static void WINAPIV check_record_(int line, MSIHANDLE rec, UINT count, ...) { - __ms_va_list args; + va_list args; UINT i; ok_(__FILE__, line)(count == MsiRecordGetFieldCount(rec), "expected %u fields, got %u\n", count, MsiRecordGetFieldCount(rec)); - __ms_va_start(args, count); + va_start(args, count); for (i = 1; i <= count; ++i) { @@ -57,7 +57,7 @@ static void WINAPIV check_record_(int line, MSIHANDLE rec, UINT count, ...) "field %u: expected \"%s\", got \"%s\"\n", i, expect, buffer); } - __ms_va_end(args); + va_end(args); } #define check_record(rec, ...) check_record_(__LINE__, rec, __VA_ARGS__) [View Less]

3 years, 4 months

[reactos] 337/360: [WINESYNC] msi: Pass size in bytes to RegQueryValueExW().

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8c1eae241a7703f28a5f7… commit 8c1eae241a7703f28a5f7c3703a0a65343ccb97e Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 23:59:51 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:41 2022 +0100 [WINESYNC] msi: Pass size in bytes to RegQueryValueExW(). Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)… [View More]codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 6a6bdd2cee87bb076d57aaa013b2492d8b70506f by Zhiyi Zhang <zzhang(a)codeweavers.com> --- dll/win32/msi/package.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dll/win32/msi/package.c b/dll/win32/msi/package.c index 7e28e111b7b..fda1622f666 100644 --- a/dll/win32/msi/package.c +++ b/dll/win32/msi/package.c @@ -534,7 +534,7 @@ static LPWSTR get_fusion_filename(MSIPACKAGE *package) if (!RegCreateKeyExW(netsetup, L"v4\\Client", 0, NULL, 0, KEY_QUERY_VALUE, NULL, &hkey, NULL)) { - size = ARRAY_SIZE(path); + size = sizeof(path); if (!RegQueryValueExW(hkey, L"InstallPath", NULL, &type, (BYTE *)path, &size)) { len = lstrlenW(path) + lstrlenW(L"fusion.dll") + 2; @@ -789,12 +789,12 @@ static VOID set_installer_properties(MSIPACKAGE *package) PathAddBackslashW( pth ); msi_set_property( package->db, L"SystemFolder", pth, -1 ); - len = MAX_PATH; + len = sizeof(pth); RegQueryValueExW(hkey, L"ProgramFilesDir", 0, &type, (BYTE *)pth, &len); PathAddBackslashW( pth ); msi_set_property( package->db, L"ProgramFilesFolder", pth, -1 ); - len = MAX_PATH; + len = sizeof(pth); RegQueryValueExW(hkey, L"CommonFilesDir", 0, &type, (BYTE *)pth, &len); PathAddBackslashW( pth ); msi_set_property( package->db, L"CommonFilesFolder", pth, -1 ); @@ -813,22 +813,22 @@ static VOID set_installer_properties(MSIPACKAGE *package) PathAddBackslashW( pth ); msi_set_property( package->db, L"SystemFolder", pth, -1 ); - len = MAX_PATH; + len = sizeof(pth); RegQueryValueExW(hkey, L"ProgramFilesDir", 0, &type, (BYTE *)pth, &len); PathAddBackslashW( pth ); msi_set_property( package->db, L"ProgramFiles64Folder", pth, -1 ); - len = MAX_PATH; + len = sizeof(pth); RegQueryValueExW(hkey, L"ProgramFilesDir (x86)", 0, &type, (BYTE *)pth, &len); PathAddBackslashW( pth ); msi_set_property( package->db, L"ProgramFilesFolder", pth, -1 ); - len = MAX_PATH; + len = sizeof(pth); RegQueryValueExW(hkey, L"CommonFilesDir", 0, &type, (BYTE *)pth, &len); PathAddBackslashW( pth ); msi_set_property( package->db, L"CommonFiles64Folder", pth, -1 ); - len = MAX_PATH; + len = sizeof(pth); RegQueryValueExW(hkey, L"CommonFilesDir (x86)", 0, &type, (BYTE *)pth, &len); PathAddBackslashW( pth ); msi_set_property( package->db, L"CommonFilesFolder", pth, -1 ); [View Less]

3 years, 4 months

[reactos] 336/360: [WINESYNC] include: Use the standard va_list instead of __ms_va_list when building with msvcrt.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=00510cf555e99028ea845… commit 00510cf555e99028ea8454a211935d09bed0e340 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 23:58:56 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:41 2022 +0100 [WINESYNC] include: Use the standard va_list instead of __ms_va_list when building with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> … [View More]

3 years, 4 months

[reactos] 335/360: [WINESYNC] msi: Fixup Installer\\Patches\\<...> key path (Coverity).

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d749abb725eace3c0bc44… commit d749abb725eace3c0bc44e0a41e1aacd2e13ff27 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 23:57:54 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:40 2022 +0100 [WINESYNC] msi: Fixup Installer\\Patches\\<...> key path (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans … [View More]

3 years, 4 months

[reactos] 334/360: [WINESYNC] msi: Set dialog as parent in subsequent dialog.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a966ff82332956e53a07a… commit a966ff82332956e53a07a32b957f50f9308db969 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 23:53:18 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:40 2022 +0100 [WINESYNC] msi: Set dialog as parent in subsequent dialog. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51576 Signed-off-by: Fabian Maurer <dark.… [View More]

3 years, 4 months

[reactos] 333/360: [WINESYNC] msi: Don't leak the file handle on error in cabinet_close_file_info().

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=e097431ffcfad9b8fa8c2… commit e097431ffcfad9b8fa8c29155833001d4f102589 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 23:53:17 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:40 2022 +0100 [WINESYNC] msi: Don't leak the file handle on error in cabinet_close_file_info(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: … [View More]

3 years, 4 months

[reactos] 332/360: [WINESYNC] msiexec: Add system DPI awareness settings to the application manifest.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=bdddd677344c2ef2f40eb… commit bdddd677344c2ef2f40eb38dc814c62426bf76c7 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 23:53:16 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:40 2022 +0100 [WINESYNC] msiexec: Add system DPI awareness settings to the application manifest. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: … [View More]

3 years, 4 months

← Newer
1
...
4
5
6
7
8
9
10
...
44
Older →

Jump to page:

2025

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