Ros-diffs March 2022

ros-diffs@reactos.org

20 participants
436 discussions

[reactos] 171/360: [WINESYNC] msi/tests: Use more reasonable buffer sizes for guid strings (Coverity).

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=609c0596470229e0aec2f… commit 609c0596470229e0aec2f9d1028a9dbedb204e85 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 00:16:20 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:07 2022 +0100 [WINESYNC] msi/tests: Use more reasonable buffer sizes for guid strings (Coverity). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id a853bb6d0a91e5766ff1afbfaf1fcb9b8d27fc76 by Nikolay Sivov <nsivov(a)codeweavers.com> --- modules/rostests/winetests/msi/msi.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/modules/rostests/winetests/msi/msi.c b/modules/rostests/winetests/msi/msi.c index eccd651aa45..cf7649a0219 100644 --- a/modules/rostests/winetests/msi/msi.c +++ b/modules/rostests/winetests/msi/msi.c @@ -34,6 +34,9 @@ #include "wine/test.h" #include "utils.h" +#define GUID_SIZE (39) +#define SQUASHED_GUID_SIZE (33) + static BOOL is_wow64; static const char msifile[] = "winetest.msi"; static const WCHAR msifileW[] = {'w','i','n','e','t','e','s','t','.','m','s','i',0}; @@ -1224,8 +1227,8 @@ static BOOL squash_guid(LPCWSTR in, LPWSTR out) static void create_test_guid(LPSTR prodcode, LPSTR squashed) { - WCHAR guidW[MAX_PATH]; - WCHAR squashedW[MAX_PATH]; + WCHAR guidW[GUID_SIZE]; + WCHAR squashedW[SQUASHED_GUID_SIZE]; GUID guid; HRESULT hr; int size; @@ -1233,14 +1236,14 @@ static void create_test_guid(LPSTR prodcode, LPSTR squashed) hr = CoCreateGuid(&guid); ok(hr == S_OK, "Expected S_OK, got %d\n", hr); - size = StringFromGUID2(&guid, guidW, MAX_PATH); - ok(size == 39, "Expected 39, got %d\n", hr); + size = StringFromGUID2(&guid, guidW, ARRAY_SIZE(guidW)); + ok(size == GUID_SIZE, "Expected %d, got %d.\n", GUID_SIZE, size); - WideCharToMultiByte(CP_ACP, 0, guidW, size, prodcode, MAX_PATH, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, guidW, size, prodcode, GUID_SIZE, NULL, NULL); if (squashed) { squash_guid(guidW, squashedW); - WideCharToMultiByte(CP_ACP, 0, squashedW, -1, squashed, MAX_PATH, NULL, NULL); + WideCharToMultiByte(CP_ACP, 0, squashedW, -1, squashed, SQUASHED_GUID_SIZE, NULL, NULL); } }

2 years, 7 months

[reactos] 170/360: [WINESYNC] msi: Return an error code instead of a button id in msi_change_media().

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=6e5382cc5a83640cf5b08… commit 6e5382cc5a83640cf5b089a436f8d8aa4554224a Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 00:16:20 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:06 2022 +0100 [WINESYNC] msi: Return an error code instead of a button id in msi_change_media(). Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id a47343b97369e5f64bb78a7421f2d75258da282a by Alexandre Julliard <julliard(a)winehq.org> --- dll/win32/msi/media.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/msi/media.c b/dll/win32/msi/media.c index 3d4a8c09eb6..5f8c26a3443 100644 --- a/dll/win32/msi/media.c +++ b/dll/win32/msi/media.c @@ -97,7 +97,7 @@ static UINT msi_change_media(MSIPACKAGE *package, MSIMEDIAINFO *mi) msiobj_release(&record->hdr); msi_free(source_dir); - return r; + return r == IDRETRY ? ERROR_SUCCESS : ERROR_INSTALL_SOURCE_ABSENT; } static MSICABINETSTREAM *msi_get_cabinet_stream( MSIPACKAGE *package, UINT disk_id )

2 years, 7 months

[reactos] 169/360: [WINESYNC] msi: Turn several variables and constants into static constants.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d5012ca368144ac91ac60… commit d5012ca368144ac91ac608cc8880eee3db6fb8a8 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 00:16:18 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:06 2022 +0100 [WINESYNC] msi: Turn several variables and constants into static constants. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 6a833ce0b39ae9f57162f6ffd3ff55f19f3ba540 by Alex Henrie <alexhenrie24(a)gmail.com> --- dll/win32/msi/action.c | 4 ++-- dll/win32/msi/database.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dll/win32/msi/action.c b/dll/win32/msi/action.c index 1be0a4ce52c..ad2f40cd78f 100644 --- a/dll/win32/msi/action.c +++ b/dll/win32/msi/action.c @@ -167,7 +167,7 @@ struct dummy_thread static INT ui_actionstart(MSIPACKAGE *package, LPCWSTR action, LPCWSTR description, LPCWSTR template) { - WCHAR query[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + static const WCHAR query[] = {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', '`','A','c','t','i','o','n','T','e','x','t','`',' ','W','H','E','R','E',' ', '`','A','c','t','i','o','n','`',' ','=',' ','\'','%','s','\'',0}; MSIRECORD *row, *textrow; @@ -3553,7 +3553,7 @@ static WCHAR *build_full_keypath( MSIPACKAGE *package, MSICOMPONENT *comp ) { if (comp->assembly) { - const WCHAR prefixW[] = {'<','\\',0}; + static const WCHAR prefixW[] = {'<','\\',0}; DWORD len = strlenW( prefixW ) + strlenW( comp->assembly->display_name ); WCHAR *keypath = msi_alloc( (len + 1) * sizeof(WCHAR) ); diff --git a/dll/win32/msi/database.c b/dll/win32/msi/database.c index 91e5e96832b..49fa16c5d81 100644 --- a/dll/win32/msi/database.c +++ b/dll/win32/msi/database.c @@ -1445,7 +1445,7 @@ static LPWSTR get_key_value(MSIQUERY *view, LPCWSTR key, MSIRECORD *rec) if (MSI_RecordGetString(rec, i)) /* check record field is a string */ { /* quote string record fields */ - const WCHAR szQuote[] = {'\'', 0}; + static const WCHAR szQuote[] = {'\'', 0}; sz += 2; val = msi_alloc(sz*sizeof(WCHAR)); if (!val)

2 years, 7 months

[reactos] 168/360: [WINESYNC] msi: Set stale function pointers to NULL.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=0d13a87670e4584c01460… commit 0d13a87670e4584c01460e9b9f76c692d76292ba Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 00:16:17 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:06 2022 +0100 [WINESYNC] msi: Set stale function pointers to NULL. A crash occurs during install of dotnet35 on a 64-bit prefix as when msi_destroy_assembly_caches is called, the mscoree library is unloaded but the function pointers are not set back to NULL. Signed-off-by: Brendan McGrath <brendan(a)redmandi.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 256ca317a2871c62ca121e49f29fc37a64b4fb64 by Brendan McGrath <brendan(a)redmandi.com> --- dll/win32/msi/assembly.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dll/win32/msi/assembly.c b/dll/win32/msi/assembly.c index 7857e8b687f..f46ff02eeb6 100644 --- a/dll/win32/msi/assembly.c +++ b/dll/win32/msi/assembly.c @@ -36,7 +36,6 @@ static HRESULT (WINAPI *pCreateAssemblyCacheNet11)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheNet20)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheNet40)( IAssemblyCache **, DWORD ); static HRESULT (WINAPI *pCreateAssemblyCacheSxs)( IAssemblyCache **, DWORD ); -static HRESULT (WINAPI *pLoadLibraryShim)( LPCWSTR, LPCWSTR, LPVOID, HMODULE * ); static HRESULT (WINAPI *pGetFileVersion)( LPCWSTR, LPWSTR, DWORD, DWORD * ); static HRESULT (WINAPI *pCreateAssemblyNameObject)( IAssemblyName **, LPCWSTR, DWORD, LPVOID ); static HRESULT (WINAPI *pCreateAssemblyEnum)( IAssemblyEnum **, IUnknown *, IAssemblyName *, DWORD, LPVOID ); @@ -52,6 +51,7 @@ static BOOL init_function_pointers( void ) static const WCHAR szVersion11[] = {'v','1','.','1','.','4','3','2','2',0}; static const WCHAR szVersion20[] = {'v','2','.','0','.','5','0','7','2','7',0}; static const WCHAR szVersion40[] = {'v','4','.','0','.','3','0','3','1','9',0}; + HRESULT (WINAPI *pLoadLibraryShim)( LPCWSTR, LPCWSTR, LPVOID, HMODULE * ); WCHAR path[MAX_PATH]; DWORD len = GetSystemDirectoryW( path, MAX_PATH ); @@ -121,6 +121,9 @@ void msi_destroy_assembly_caches( MSIPACKAGE *package ) pCreateAssemblyCacheNet11 = NULL; pCreateAssemblyCacheNet20 = NULL; pCreateAssemblyCacheNet40 = NULL; + pGetFileVersion = NULL; + pCreateAssemblyNameObject = NULL; + pCreateAssemblyEnum = NULL; FreeLibrary( hfusion10 ); FreeLibrary( hfusion11 ); FreeLibrary( hfusion20 );

2 years, 7 months

[reactos] 167/360: [WINESYNC] msi: Increase MSI_INITIAL_MEDIA_TRANSFORM_DISKID to avoid conflicts.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=537188d7643645abed151… commit 537188d7643645abed151c9857e5d3c74bcf355b Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 00:16:16 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:06 2022 +0100 [WINESYNC] msi: Increase MSI_INITIAL_MEDIA_TRANSFORM_DISKID to avoid conflicts. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 49e9fa376ca1ab251a0b5ccc506b255a93071bc2 by Hans Leidekker <hans(a)codeweavers.com> --- dll/win32/msi/msipriv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dll/win32/msi/msipriv.h b/dll/win32/msi/msipriv.h index b7897df904b..c59ce940c6d 100644 --- a/dll/win32/msi/msipriv.h +++ b/dll/win32/msi/msipriv.h @@ -81,7 +81,7 @@ struct tagMSIOBJECTHDR }; #define MSI_INITIAL_MEDIA_TRANSFORM_OFFSET 10000 -#define MSI_INITIAL_MEDIA_TRANSFORM_DISKID 30000 +#define MSI_INITIAL_MEDIA_TRANSFORM_DISKID 32000 typedef struct tagMSISTREAM {

2 years, 7 months

[reactos] 166/360: [WINESYNC] msi: Allow ARM64 installations.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=de59794f369377e95fa9d… commit de59794f369377e95fa9dfef05ac7cc6dca1b3be Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 00:16:15 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:06 2022 +0100 [WINESYNC] msi: Allow ARM64 installations. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id d5a169463b30af229368a5559b20f9ae415c3048 by André Hentschel <nerv(a)dawncrow.de> --- dll/win32/msi/msipriv.h | 4 +++- dll/win32/msi/package.c | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/dll/win32/msi/msipriv.h b/dll/win32/msi/msipriv.h index 304dab049e4..b7897df904b 100644 --- a/dll/win32/msi/msipriv.h +++ b/dll/win32/msi/msipriv.h @@ -361,7 +361,8 @@ enum platform PLATFORM_INTEL, PLATFORM_INTEL64, PLATFORM_X64, - PLATFORM_ARM + PLATFORM_ARM, + PLATFORM_ARM64 }; enum clr_version @@ -1186,6 +1187,7 @@ static const WCHAR szIntel64[] = {'I','n','t','e','l','6','4',0}; static const WCHAR szX64[] = {'x','6','4',0}; static const WCHAR szAMD64[] = {'A','M','D','6','4',0}; static const WCHAR szARM[] = {'A','r','m',0}; +static const WCHAR szARM64[] = {'A','r','m','6','4',0}; static const WCHAR szWow6432NodeCLSID[] = {'W','o','w','6','4','3','2','N','o','d','e','\\','C','L','S','I','D',0}; static const WCHAR szStreams[] = {'_','S','t','r','e','a','m','s',0}; static const WCHAR szStorages[] = {'_','S','t','o','r','a','g','e','s',0}; diff --git a/dll/win32/msi/package.c b/dll/win32/msi/package.c index 43af32acf14..1211f104c78 100644 --- a/dll/win32/msi/package.c +++ b/dll/win32/msi/package.c @@ -1208,6 +1208,7 @@ static enum platform parse_platform( const WCHAR *str ) else if (!strcmpW( str, szIntel64 )) return PLATFORM_INTEL64; else if (!strcmpW( str, szX64 ) || !strcmpW( str, szAMD64 )) return PLATFORM_X64; else if (!strcmpW( str, szARM )) return PLATFORM_ARM; + else if (!strcmpW( str, szARM64 )) return PLATFORM_ARM64; return PLATFORM_UNKNOWN; } @@ -1289,6 +1290,10 @@ static UINT validate_package( MSIPACKAGE *package ) #ifndef __arm__ if (package->platform == PLATFORM_ARM) return ERROR_INSTALL_PLATFORM_UNSUPPORTED; +#endif +#ifndef __aarch64__ + if (package->platform == PLATFORM_ARM64) + return ERROR_INSTALL_PLATFORM_UNSUPPORTED; #endif if (package->platform == PLATFORM_X64) {

2 years, 7 months

[reactos] 165/360: [WINESYNC] msi: Support substorage transforms in MsiDatabaseApplyTransform.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3dfa0cce097c4e59c0798… commit 3dfa0cce097c4e59c0798d5b8a895de0f1181dc6 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 00:16:14 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:05 2022 +0100 [WINESYNC] msi: Support substorage transforms in MsiDatabaseApplyTransform. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=40206 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id ef86011ba40ef90eefb5e54059d907753ec8d694 by Hans Leidekker <hans(a)codeweavers.com> --- dll/win32/msi/msiquery.c | 68 +++++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/dll/win32/msi/msiquery.c b/dll/win32/msi/msiquery.c index 6ecbbcdf63c..036328e0491 100644 --- a/dll/win32/msi/msiquery.c +++ b/dll/win32/msi/msiquery.c @@ -824,50 +824,55 @@ MSIHANDLE WINAPI MsiGetLastErrorRecord( void ) return 0; } -UINT MSI_DatabaseApplyTransformW( MSIDATABASE *db, - LPCWSTR szTransformFile, int iErrorCond ) +UINT MSI_DatabaseApplyTransformW( MSIDATABASE *db, const WCHAR *transform, int error_cond ) { - HRESULT r; + HRESULT hr; UINT ret = ERROR_FUNCTION_FAILED; - IStorage *stg = NULL; + IStorage *stg; STATSTG stat; - TRACE("%p %s %d\n", db, debugstr_w(szTransformFile), iErrorCond); + TRACE( "%p %s %08x\n", db, debugstr_w(transform), error_cond ); - r = StgOpenStorage( szTransformFile, NULL, - STGM_DIRECT|STGM_READ|STGM_SHARE_DENY_WRITE, NULL, 0, &stg); - if ( FAILED(r) ) + if (*transform == ':') { - WARN("failed to open transform 0x%08x\n", r); - return ret; + hr = IStorage_OpenStorage( db->storage, transform + 1, NULL, STGM_SHARE_EXCLUSIVE, NULL, 0, &stg ); + if (FAILED( hr )) + { + WARN( "failed to open substorage transform 0x%08x\n", hr ); + return ERROR_FUNCTION_FAILED; + } + } + else + { + hr = StgOpenStorage( transform, NULL, STGM_DIRECT|STGM_READ|STGM_SHARE_DENY_WRITE, NULL, 0, &stg ); + if (FAILED( hr )) + { + WARN( "failed to open file transform 0x%08x\n", hr ); + return ERROR_FUNCTION_FAILED; + } } - r = IStorage_Stat( stg, &stat, STATFLAG_NONAME ); - if ( FAILED( r ) ) - goto end; - - if ( !IsEqualGUID( &stat.clsid, &CLSID_MsiTransform ) ) - goto end; - - if( TRACE_ON( msi ) ) - enum_stream_names( stg ); + hr = IStorage_Stat( stg, &stat, STATFLAG_NONAME ); + if (FAILED( hr )) goto end; + if (!IsEqualGUID( &stat.clsid, &CLSID_MsiTransform )) goto end; + if (TRACE_ON( msi )) enum_stream_names( stg ); ret = msi_table_apply_transform( db, stg ); end: IStorage_Release( stg ); - return ret; } -UINT WINAPI MsiDatabaseApplyTransformW( MSIHANDLE hdb, - LPCWSTR szTransformFile, int iErrorCond) +UINT WINAPI MsiDatabaseApplyTransformW( MSIHANDLE hdb, const WCHAR *transform, int error_cond ) { MSIDATABASE *db; UINT r; + if (error_cond) FIXME( "ignoring error conditions\n" ); + db = msihandle2msiinfo( hdb, MSIHANDLETYPE_DATABASE ); - if( !db ) + if (!db) { MSIHANDLE remote; @@ -879,27 +884,24 @@ UINT WINAPI MsiDatabaseApplyTransformW( MSIHANDLE hdb, return ERROR_SUCCESS; } - r = MSI_DatabaseApplyTransformW( db, szTransformFile, iErrorCond ); + r = MSI_DatabaseApplyTransformW( db, transform, error_cond ); msiobj_release( &db->hdr ); return r; } -UINT WINAPI MsiDatabaseApplyTransformA( MSIHANDLE hdb, - LPCSTR szTransformFile, int iErrorCond) +UINT WINAPI MsiDatabaseApplyTransformA( MSIHANDLE hdb, const char *transform, int error_cond ) { - LPWSTR wstr; + WCHAR *wstr; UINT ret; - TRACE("%d %s %d\n", hdb, debugstr_a(szTransformFile), iErrorCond); + TRACE( "%d %s %08x\n", hdb, debugstr_a(transform), error_cond ); - wstr = strdupAtoW( szTransformFile ); - if( szTransformFile && !wstr ) + wstr = strdupAtoW( transform ); + if (transform && !wstr) return ERROR_NOT_ENOUGH_MEMORY; - ret = MsiDatabaseApplyTransformW( hdb, wstr, iErrorCond); - + ret = MsiDatabaseApplyTransformW( hdb, wstr, error_cond ); msi_free( wstr ); - return ret; }

2 years, 7 months

[reactos] 164/360: [WINESYNC] msi: Don't consider read-only drives when enumerating volumes.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=182a2d623e408c6857ac1… commit 182a2d623e408c6857ac1ce10157a665b8a5823c Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 00:14:01 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:05 2022 +0100 [WINESYNC] msi: Don't consider read-only drives when enumerating volumes. Signed-off-by: Pierre Schweitzer <pierre(a)reactos.org> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 0dd0d879a1c487dcefedd44762d4ea0fcebd98fe by Pierre Schweitzer <pierre(a)reactos.org> --- dll/win32/msi/dialog.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/msi/dialog.c b/dll/win32/msi/dialog.c index 29e016d9f7b..c09d3d1c695 100644 --- a/dll/win32/msi/dialog.c +++ b/dll/win32/msi/dialog.c @@ -3289,7 +3289,7 @@ static void msi_dialog_vcl_add_drives( msi_dialog *dialog, msi_control *control WCHAR cost_text[MAX_PATH]; LPWSTR drives, ptr; LVITEMW lvitem; - DWORD size; + DWORD size, flags; int i = 0; cost = msi_vcl_get_cost(dialog); @@ -3306,13 +3306,13 @@ static void msi_dialog_vcl_add_drives( msi_dialog *dialog, msi_control *control ptr = drives; while (*ptr) { -#ifdef __REACTOS__ - if (GetDriveTypeW(ptr) != DRIVE_FIXED) + if (GetVolumeInformationW(ptr, NULL, 0, NULL, 0, &flags, NULL, 0) && + flags & FILE_READ_ONLY_VOLUME) { ptr += lstrlenW(ptr) + 1; continue; } -#endif + lvitem.mask = LVIF_TEXT; lvitem.iItem = i; lvitem.iSubItem = 0;

2 years, 7 months

[reactos] 163/360: [WINESYNC] msi: In dialogs show titlebar buttons.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=8e17398c2639c41691a95… commit 8e17398c2639c41691a9598b2fa9d3c0c1074a23 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 00:08:20 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:05 2022 +0100 [WINESYNC] msi: In dialogs show titlebar buttons. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46080 Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 84e6b331918d57f39e20a3063b67eb7fc0876288 by Fabian Maurer <dark.shadow4(a)web.de>

2 years, 7 months

[reactos] 162/360: [WINESYNC] msi: Avoid duplicate product codes in FindRelatedProducts.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=d30e40fc22cded0407682… commit d30e40fc22cded04076824ff8ea80d55a2a7c581 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 00:08:20 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:05 2022 +0100 [WINESYNC] msi: Avoid duplicate product codes in FindRelatedProducts. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id b33b8cab0dbef9571553a814c7bff501ae0a5b48 by Hans Leidekker <hans(a)codeweavers.com> --- dll/win32/msi/upgrade.c | 68 +++++++++++++++++++++++++++++-------------------- 1 file changed, 41 insertions(+), 27 deletions(-) diff --git a/dll/win32/msi/upgrade.c b/dll/win32/msi/upgrade.c index 36d65be8fe9..034d891c1f9 100644 --- a/dll/win32/msi/upgrade.c +++ b/dll/win32/msi/upgrade.c @@ -55,45 +55,59 @@ static BOOL check_language(DWORD lang1, LPCWSTR lang2, DWORD attributes) return (lang1 == langdword); } -static void append_productcode(MSIPACKAGE* package, LPCWSTR action_property, - LPCWSTR productid) +static BOOL find_product( const WCHAR *list, const WCHAR *product ) { - LPWSTR prop; - LPWSTR newprop; - DWORD len; - UINT r; - - prop = msi_dup_property(package->db, action_property ); - if (prop) - len = strlenW(prop); - else - len = 0; + const WCHAR *p = list, *q; - /*separator*/ - len ++; + if (!list) return FALSE; + for (;;) + { + while (*p && *p != '{') p++; + if (*p != '{') return FALSE; + q = p; + while (*q && *q != '}') q++; + if (*q != '}') return FALSE; + q++; + if (q - p < strlenW( product )) return FALSE; + if (!memcmp( p, product, (q - p) * sizeof(WCHAR) )) return TRUE; + p = q + 1; + while (*p && *p != ';') p++; + if (*p != ';') break; + } - len += strlenW(productid); + return FALSE; +} - /*null*/ - len++; +static void append_productcode( MSIPACKAGE *package, const WCHAR *action_prop, const WCHAR *product ) +{ + WCHAR *prop, *newprop; + DWORD len = 0; + UINT r; - newprop = msi_alloc( len*sizeof(WCHAR) ); + prop = msi_dup_property( package->db, action_prop ); + if (find_product( prop, product )) + { + TRACE( "related product property %s already contains %s\n", debugstr_w(action_prop), debugstr_w(product) ); + msi_free( prop ); + return; + } + if (prop) len += strlenW( prop ); + len += strlenW( product ) + 2; + if (!(newprop = msi_alloc( len * sizeof(WCHAR) ))) return; if (prop) { - strcpyW(newprop,prop); - strcatW(newprop,szSemiColon); + strcpyW( newprop, prop ); + strcatW( newprop, szSemiColon ); } - else - newprop[0] = 0; - strcatW(newprop,productid); + else newprop[0] = 0; + strcatW( newprop, product ); - r = msi_set_property( package->db, action_property, newprop, -1 ); - if (r == ERROR_SUCCESS && !strcmpW( action_property, szSourceDir )) + r = msi_set_property( package->db, action_prop, newprop, -1 ); + if (r == ERROR_SUCCESS && !strcmpW( action_prop, szSourceDir )) msi_reset_source_folders( package ); - TRACE("Found Related Product... %s now %s\n", - debugstr_w(action_property), debugstr_w(newprop)); + TRACE( "related product property %s now %s\n", debugstr_w(action_prop), debugstr_w(newprop) ); msi_free( prop ); msi_free( newprop );

2 years, 7 months

← Newer
1
...
21
22
23
24
25
26
27
...
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