Ros-diffs March 2022

ros-diffs@reactos.org

20 participants
436 discussions

[reactos] 271/360: [WINESYNC] msi: Add support for ListView dialog control.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ba60287fcebec49f7e3c2… commit ba60287fcebec49f7e3c2cfa9fa59a35028207ea Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 19:08:19 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:27 2022 +0100 [WINESYNC] msi: Add support for ListView dialog control. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 76606eaea034c51a73190aac92e75d8b20e82164 by Dmitry Timoshkov <dmitry(a)baikal.ru> --- dll/win32/msi/dialog.c | 109 ++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 108 insertions(+), 1 deletion(-) diff --git a/dll/win32/msi/dialog.c b/dll/win32/msi/dialog.c index ca7ade83e42..58f0b236642 100644 --- a/dll/win32/msi/dialog.c +++ b/dll/win32/msi/dialog.c @@ -66,6 +66,7 @@ struct msi_control_tag LPWSTR value; HBITMAP hBitmap; HICON hIcon; + HIMAGELIST hImageList; LPWSTR tabnext; LPWSTR type; HMODULE hDll; @@ -159,6 +160,7 @@ static const WCHAR szVolumeSelectCombo[] = { 'V','o','l','u','m','e','S','e','l' static const WCHAR szSelectionDescription[] = {'S','e','l','e','c','t','i','o','n','D','e','s','c','r','i','p','t','i','o','n',0}; static const WCHAR szSelectionPath[] = {'S','e','l','e','c','t','i','o','n','P','a','t','h',0}; static const WCHAR szHyperLink[] = {'H','y','p','e','r','L','i','n','k',0}; +static const WCHAR szListView[] = {'L','i','s','t','V','i','e','w',0}; /* dialog sequencing */ @@ -401,6 +403,8 @@ static void msi_destroy_control( msi_control *t ) DeleteObject( t->hBitmap ); if( t->hIcon ) DestroyIcon( t->hIcon ); + if ( t->hImageList ) + ImageList_Destroy( t->hImageList ); msi_free( t->tabnext ); msi_free( t->type ); if (t->hDll) @@ -431,6 +435,7 @@ static msi_control *dialog_create_window( msi_dialog *dialog, MSIRECORD *rec, DW control->value = NULL; control->hBitmap = NULL; control->hIcon = NULL; + control->hImageList = NULL; control->hDll = NULL; control->tabnext = strdupW( MSI_RecordGetString( rec, 11) ); control->type = strdupW( MSI_RecordGetString( rec, 3 ) ); @@ -3522,6 +3527,107 @@ static UINT msi_dialog_hyperlink( msi_dialog *dialog, MSIRECORD *rec ) return ERROR_SUCCESS; } +/******************** ListView *****************************************/ + +struct listview_param +{ + msi_dialog *dialog; + msi_control *control; +}; + +static UINT msi_dialog_listview_handler( msi_dialog *dialog, msi_control *control, WPARAM param ) +{ + NMHDR *nmhdr = (NMHDR *)param; + + FIXME("code %#x (%d)\n", nmhdr->code, nmhdr->code); + + return ERROR_SUCCESS; +} + +static UINT msi_listview_add_item( MSIRECORD *rec, LPVOID param ) +{ + struct listview_param *lv_param = (struct listview_param *)param; + LPCWSTR text, binary; + LVITEMW item; + HICON hIcon; + + text = MSI_RecordGetString( rec, 4 ); + binary = MSI_RecordGetString( rec, 5 ); + hIcon = msi_load_icon( lv_param->dialog->package->db, binary, 0 ); + + TRACE("Adding: text %s, binary %s, icon %p\n", debugstr_w(text), debugstr_w(binary), hIcon); + + memset( &item, 0, sizeof(item) ); + item.mask = LVIF_TEXT | LVIF_IMAGE; + deformat_string( lv_param->dialog->package, text, &item.pszText ); + item.iImage = ImageList_AddIcon( lv_param->control->hImageList, hIcon ); + item.iItem = item.iImage; + SendMessageW( lv_param->control->hwnd, LVM_INSERTITEMW, 0, (LPARAM)&item ); + + DestroyIcon( hIcon ); + + return ERROR_SUCCESS; +} + +static UINT msi_listview_add_items( msi_dialog *dialog, msi_control *control ) +{ + static const WCHAR query[] = { + 'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ', + '`','L','i','s','t','V','i','e','w','`',' ','W','H','E','R','E',' ', + '`','P','r','o','p','e','r','t','y','`',' ','=',' ','\'','%','s','\'',' ', + 'O','R','D','E','R',' ','B','Y',' ','`','O','r','d','e','r','`',0}; + MSIQUERY *view; + struct listview_param lv_param = { dialog, control }; + + if (MSI_OpenQuery( dialog->package->db, &view, query, control->property ) == ERROR_SUCCESS) + { + MSI_IterateRecords( view, NULL, msi_listview_add_item, &lv_param ); + msiobj_release( &view->hdr ); + } + + return ERROR_SUCCESS; +} + +static UINT msi_dialog_listview( msi_dialog *dialog, MSIRECORD *rec ) +{ + msi_control *control; + LPCWSTR prop; + DWORD style, attributes; + LVCOLUMNW col; + RECT rc; + + style = LVS_REPORT | LVS_NOCOLUMNHEADER | LVS_SHAREIMAGELISTS | LVS_SINGLESEL | + LVS_SHOWSELALWAYS | WS_VSCROLL | WS_HSCROLL | WS_BORDER | WS_TABSTOP | WS_CHILD; + attributes = MSI_RecordGetInteger( rec, 8 ); + if ( ~attributes & msidbControlAttributesSorted ) + style |= LVS_SORTASCENDING; + control = msi_dialog_add_control( dialog, rec, WC_LISTVIEWW, style ); + if (!control) + return ERROR_FUNCTION_FAILED; + + prop = MSI_RecordGetString( rec, 9 ); + control->property = msi_dialog_dup_property( dialog, prop, FALSE ); + + control->hImageList = ImageList_Create( 16, 16, ILC_COLOR32, 0, 1); + SendMessageW( control->hwnd, LVM_SETIMAGELIST, LVSIL_SMALL, (LPARAM)control->hImageList ); + + col.mask = LVCF_FMT | LVCF_WIDTH; + col.fmt = LVCFMT_LEFT; + col.cx = 16; + SendMessageW( control->hwnd, LVM_INSERTCOLUMNW, 0, (LPARAM)&col ); + + GetClientRect( control->hwnd, &rc ); + col.cx = rc.right - 16; + SendMessageW( control->hwnd, LVM_INSERTCOLUMNW, 0, (LPARAM)&col ); + + if (control->property) + msi_listview_add_items( dialog, control ); + + control->handler = msi_dialog_listview_handler; + + return ERROR_SUCCESS; +} + static const struct control_handler msi_dialog_handler[] = { { szText, msi_dialog_text_control }, @@ -3544,7 +3650,8 @@ static const struct control_handler msi_dialog_handler[] = { szDirectoryList, msi_dialog_directory_list }, { szVolumeCostList, msi_dialog_volumecost_list }, { szVolumeSelectCombo, msi_dialog_volumeselect_combo }, - { szHyperLink, msi_dialog_hyperlink } + { szHyperLink, msi_dialog_hyperlink }, + { szListView, msi_dialog_listview } }; static UINT msi_dialog_create_controls( MSIRECORD *rec, LPVOID param )

2 years, 9 months

[reactos] 270/360: [WINESYNC] msi/tests: Fix some format-overflow warnings.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=484e828005ea4fffa8976… commit 484e828005ea4fffa8976ed830105e5b17790974 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 19:08:17 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:27 2022 +0100 [WINESYNC] msi/tests: Fix some format-overflow warnings. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id f961817710edd81b5d91bb7cb3f78975c307bfa2 by Rémi Bernon <rbernon(a)codeweavers.com> --- modules/rostests/winetests/msi/action.c | 2 +- modules/rostests/winetests/msi/install.c | 6 +++--- modules/rostests/winetests/msi/msi.c | 2 +- modules/rostests/winetests/msi/package.c | 20 ++++++++++---------- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/modules/rostests/winetests/msi/action.c b/modules/rostests/winetests/msi/action.c index 9d15c435ea3..cd4e2fd4c6c 100644 --- a/modules/rostests/winetests/msi/action.c +++ b/modules/rostests/winetests/msi/action.c @@ -4626,7 +4626,7 @@ error: static void test_move_files(void) { UINT r; - char props[MAX_PATH]; + char props[4 * MAX_PATH + 74]; if (is_process_limited()) { diff --git a/modules/rostests/winetests/msi/install.c b/modules/rostests/winetests/msi/install.c index f7fd83cfc08..99d53e56570 100644 --- a/modules/rostests/winetests/msi/install.c +++ b/modules/rostests/winetests/msi/install.c @@ -3816,7 +3816,7 @@ error: static void test_currentworkingdir(void) { UINT r; - CHAR drive[MAX_PATH], path[MAX_PATH]; + CHAR drive[MAX_PATH], path[MAX_PATH + 12]; LPSTR ptr; if (is_process_limited()) @@ -4778,7 +4778,7 @@ error: static void test_sourcedirprop(void) { UINT r; - CHAR props[MAX_PATH]; + CHAR props[MAX_PATH + 18]; if (is_process_limited()) { @@ -6112,7 +6112,7 @@ static void check_file_matches(const char *filename, const char *text) static void test_deferred_action(void) { - char path[200], file[200], buffer[200]; + char path[200], file[200], buffer[211]; UINT r; GetTempPathA(sizeof(path), path); diff --git a/modules/rostests/winetests/msi/msi.c b/modules/rostests/winetests/msi/msi.c index fbd1a7430fa..14d7ab1a2df 100644 --- a/modules/rostests/winetests/msi/msi.c +++ b/modules/rostests/winetests/msi/msi.c @@ -827,7 +827,7 @@ static UINT set_summary_info(MSIHANDLE hdb, LPSTR prodcode) static MSIHANDLE create_package_db(LPSTR prodcode) { MSIHANDLE hdb = 0; - CHAR query[MAX_PATH]; + CHAR query[MAX_PATH + 72]; UINT res; DeleteFileA(msifile); diff --git a/modules/rostests/winetests/msi/package.c b/modules/rostests/winetests/msi/package.c index 3b7b11d81e4..bf83c116fff 100644 --- a/modules/rostests/winetests/msi/package.c +++ b/modules/rostests/winetests/msi/package.c @@ -269,7 +269,7 @@ static void set_component_path(LPCSTR filename, MSIINSTALLCONTEXT context, WCHAR guidW[MAX_PATH]; WCHAR squashedW[MAX_PATH]; CHAR squashed[MAX_PATH]; - CHAR comppath[MAX_PATH]; + CHAR comppath[MAX_PATH + 81]; CHAR prodpath[MAX_PATH]; CHAR path[MAX_PATH]; LPCSTR prod = NULL; @@ -335,7 +335,7 @@ static void delete_component_path(LPCSTR guid, MSIINSTALLCONTEXT context, LPSTR WCHAR squashedW[MAX_PATH]; WCHAR substrW[MAX_PATH]; CHAR squashed[MAX_PATH]; - CHAR comppath[MAX_PATH]; + CHAR comppath[MAX_PATH + 81]; CHAR prodpath[MAX_PATH]; REGSAM access = KEY_ALL_ACCESS; @@ -1223,7 +1223,7 @@ static void query_file_path(MSIHANDLE hpkg, LPCSTR file, LPSTR buff) static void test_settargetpath(void) { - char tempdir[MAX_PATH+8], buffer[MAX_PATH], file[MAX_PATH]; + char tempdir[MAX_PATH+8], buffer[MAX_PATH], file[MAX_PATH + 20]; DWORD sz; MSIHANDLE hpkg; UINT r; @@ -2759,9 +2759,9 @@ static void test_formatrecord2(void) static void test_formatrecord_tables(void) { MSIHANDLE hdb, hrec, hpkg = 0; - CHAR buf[MAX_PATH]; + CHAR buf[MAX_PATH + 41]; CHAR curr_dir[MAX_PATH]; - CHAR expected[MAX_PATH]; + CHAR expected[MAX_PATH + 45]; CHAR root[MAX_PATH]; DWORD size; UINT r; @@ -4142,7 +4142,7 @@ done: static void test_appsearch_complocator(void) { MSIHANDLE hpkg, hdb; - char path[MAX_PATH], expected[MAX_PATH], prop[MAX_PATH]; + char path[MAX_PATH + 15], expected[MAX_PATH], prop[MAX_PATH]; LPSTR usersid; DWORD size; UINT r; @@ -4391,7 +4391,7 @@ error: static void test_appsearch_reglocator(void) { MSIHANDLE hpkg, hdb; - char path[MAX_PATH], expected[MAX_PATH], prop[MAX_PATH]; + char path[MAX_PATH + 20], expected[MAX_PATH], prop[MAX_PATH]; DWORD binary[2], size, val; BOOL space, version, is_64bit = sizeof(void *) > sizeof(int); HKEY hklm, classes, hkcu, users; @@ -4973,7 +4973,7 @@ static void delete_win_ini(LPCSTR file) static void test_appsearch_inilocator(void) { MSIHANDLE hpkg, hdb; - char path[MAX_PATH], expected[MAX_PATH], prop[MAX_PATH]; + char path[MAX_PATH + 14], expected[MAX_PATH], prop[MAX_PATH]; BOOL version; LPSTR ptr; DWORD size; @@ -5210,7 +5210,7 @@ static void search_absolute_directory(LPSTR absolute, LPCSTR relative) static void test_appsearch_drlocator(void) { MSIHANDLE hpkg, hdb; - char path[MAX_PATH], expected[MAX_PATH], prop[MAX_PATH]; + char path[MAX_PATH + 27], expected[MAX_PATH], prop[MAX_PATH]; BOOL version; DWORD size; UINT r; @@ -7968,7 +7968,7 @@ static void test_MsiGetProductProperty(void) MSIHANDLE hprod, hdb; CHAR val[MAX_PATH]; CHAR path[MAX_PATH]; - CHAR query[MAX_PATH]; + CHAR query[MAX_PATH + 17]; CHAR keypath[MAX_PATH*2]; CHAR prodcode[MAX_PATH]; WCHAR prodcodeW[MAX_PATH];

2 years, 9 months

[reactos] 269/360: [WINESYNC] msi: Change unknown platform enum entry name.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=98d8ddaaa03fbb1227d1a… commit 98d8ddaaa03fbb1227d1aea92a244bbfacd38b62 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 19:08:14 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:27 2022 +0100 [WINESYNC] msi: Change unknown platform enum entry name. Public shlwapi.h defines same name, it seems safer to rename internal type. 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 5aeb9ed82efd4a02d24eac4ffdb64e7badb5f8bd by Nikolay Sivov <nsivov(a)codeweavers.com> --- dll/win32/msi/msipriv.h | 2 +- dll/win32/msi/package.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dll/win32/msi/msipriv.h b/dll/win32/msi/msipriv.h index 82e2977f0d2..2832461528e 100644 --- a/dll/win32/msi/msipriv.h +++ b/dll/win32/msi/msipriv.h @@ -363,7 +363,7 @@ typedef struct msi_dialog_tag msi_dialog; enum platform { - PLATFORM_UNKNOWN, + PLATFORM_UNRECOGNIZED, PLATFORM_INTEL, PLATFORM_INTEL64, PLATFORM_X64, diff --git a/dll/win32/msi/package.c b/dll/win32/msi/package.c index f54352f4f23..4390a709ece 100644 --- a/dll/win32/msi/package.c +++ b/dll/win32/msi/package.c @@ -1209,7 +1209,7 @@ static enum platform parse_platform( const WCHAR *str ) else if (!wcscmp( str, szX64 ) || !wcscmp( str, szAMD64 )) return PLATFORM_X64; else if (!wcscmp( str, szARM )) return PLATFORM_ARM; else if (!wcscmp( str, szARM64 )) return PLATFORM_ARM64; - return PLATFORM_UNKNOWN; + return PLATFORM_UNRECOGNIZED; } static UINT parse_suminfo( MSISUMMARYINFO *si, MSIPACKAGE *package ) @@ -1237,13 +1237,13 @@ static UINT parse_suminfo( MSISUMMARYINFO *si, MSIPACKAGE *package ) platform = template; if ((q = wcschr( platform, ',' ))) *q = 0; package->platform = parse_platform( platform ); - while (package->platform == PLATFORM_UNKNOWN && q) + while (package->platform == PLATFORM_UNRECOGNIZED && q) { platform = q + 1; if ((q = wcschr( platform, ',' ))) *q = 0; package->platform = parse_platform( platform ); } - if (package->platform == PLATFORM_UNKNOWN) + if (package->platform == PLATFORM_UNRECOGNIZED) { WARN("unknown platform %s\n", debugstr_w(template)); msi_free( template );

2 years, 9 months

[reactos] 268/360: [WINESYNC] msi: Properly declare variables in msi/tests/utils.h as extern.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=3d671fafe315f3307e4c4… commit 3d671fafe315f3307e4c4d136a7ee2bb423bf1f3 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 19:08:13 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:26 2022 +0100 [WINESYNC] msi: Properly declare variables in msi/tests/utils.h as extern. Omitting the extern storage qualifier when declaring a global variable in a header file is mistake. If that header is included by several files it results in multiple definitions of the same variable (unless -fcommon is specified or assumed, the latter being the case for GCC 9.x and earlier). This fixes building with GCC 10. Signed-off-by: Gerald Pfeifer <gerald(a)pfeifer.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id ea032bb7f8daddfe308f86f52c54db5f657b658a by Gerald Pfeifer <gerald(a)pfeifer.com> --- modules/rostests/winetests/msi/utils.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/rostests/winetests/msi/utils.h b/modules/rostests/winetests/msi/utils.h index f16e2d5ff56..0880553863e 100644 --- a/modules/rostests/winetests/msi/utils.h +++ b/modules/rostests/winetests/msi/utils.h @@ -16,12 +16,12 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -char PROG_FILES_DIR[MAX_PATH]; -char PROG_FILES_DIR_NATIVE[MAX_PATH]; -char COMMON_FILES_DIR[MAX_PATH]; -char APP_DATA_DIR[MAX_PATH]; -char WINDOWS_DIR[MAX_PATH]; -char CURR_DIR[MAX_PATH]; +extern char PROG_FILES_DIR[MAX_PATH]; +extern char PROG_FILES_DIR_NATIVE[MAX_PATH]; +extern char COMMON_FILES_DIR[MAX_PATH]; +extern char APP_DATA_DIR[MAX_PATH]; +extern char WINDOWS_DIR[MAX_PATH]; +extern char CURR_DIR[MAX_PATH]; BOOL get_system_dirs(void); BOOL get_user_dirs(void);

2 years, 9 months

[reactos] 267/360: [WINESYNC] msi: Global variable compatibility update for gcc 10.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=5741562d55854ef89a9c6… commit 5741562d55854ef89a9c63943d2e00cfe21df295 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 19:05:10 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:26 2022 +0100 [WINESYNC] msi: Global variable compatibility update for gcc 10. Signed-off-by: Michael Cronenworth <mike(a)cchtml.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id cc7f698b8245a48669d248569e7589ff824f2c70 by Michael Cronenworth <mike(a)cchtml.com> --- dll/win32/msi/msi.c | 2 ++ dll/win32/msi/msipriv.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/dll/win32/msi/msi.c b/dll/win32/msi/msi.c index 24bcf9c4edf..00867b5f8ba 100644 --- a/dll/win32/msi/msi.c +++ b/dll/win32/msi/msi.c @@ -51,6 +51,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msi); +BOOL is_wow64; + static const WCHAR installerW[] = {'\\','I','n','s','t','a','l','l','e','r',0}; UINT msi_locate_product(LPCWSTR szProduct, MSIINSTALLCONTEXT *context) diff --git a/dll/win32/msi/msipriv.h b/dll/win32/msi/msipriv.h index feb76e77728..82e2977f0d2 100644 --- a/dll/win32/msi/msipriv.h +++ b/dll/win32/msi/msipriv.h @@ -42,7 +42,7 @@ #include "winemsi_s.h" static const BOOL is_64bit = sizeof(void *) > sizeof(int); -BOOL is_wow64 DECLSPEC_HIDDEN; +extern BOOL is_wow64 DECLSPEC_HIDDEN; #define MSI_DATASIZEMASK 0x00ff #define MSITYPE_VALID 0x0100

2 years, 9 months

[reactos] 266/360: [WINESYNC] msi: Add support for custom action type 7.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=373ffef2efe6e2a1bdb6d… commit 373ffef2efe6e2a1bdb6d220e3f123f8025bb0b0 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 19:05:10 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:26 2022 +0100 [WINESYNC] msi: Add support for custom action type 7. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44618 Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 54ef6e5e3932a5ce747fca717c697b67f2bd3e24 by Hans Leidekker <hans(a)codeweavers.com> --- dll/win32/msi/custom.c | 230 ++++++++++++++++++++++++++++++++++--------------- 1 file changed, 159 insertions(+), 71 deletions(-) diff --git a/dll/win32/msi/custom.c b/dll/win32/msi/custom.c index c3cb2416cfb..55504c2c737 100644 --- a/dll/win32/msi/custom.c +++ b/dll/win32/msi/custom.c @@ -965,13 +965,28 @@ static UINT HANDLE_CustomType19( MSIPACKAGE *package, const WCHAR *source, const return ERROR_INSTALL_FAILURE; } +static WCHAR *build_msiexec_args( const WCHAR *filename, const WCHAR *params ) +{ + UINT len_filename = lstrlenW( filename ), len_params = lstrlenW( params ); + UINT len = ARRAY_SIZE(L"/qb /i ") - 1; + WCHAR *ret; + + if (!(ret = msi_alloc( (len + len_filename + len_params + 4) * sizeof(WCHAR) ))) return NULL; + memcpy( ret, L"/qb /i ", sizeof(L"/qb /i ") ); + ret[len++] = '"'; + memcpy( ret + len, filename, len_filename * sizeof(WCHAR) ); + len += len_filename; + ret[len++] = '"'; + ret[len++] = ' '; + lstrcpyW( ret + len, params ); + return ret; +} + static UINT HANDLE_CustomType23( MSIPACKAGE *package, const WCHAR *source, const WCHAR *target, INT type, const WCHAR *action ) { - static const WCHAR msiexecW[] = {'m','s','i','e','x','e','c',0}; - static const WCHAR paramsW[] = {'/','q','b',' ','/','i',' '}; - WCHAR *dir, *arg, *p; - UINT len_src, len_dir, len_tgt, len = ARRAY_SIZE( paramsW ); + WCHAR *dir, *filename, *args, *p; + UINT len_dir, len_source = lstrlenW( source ); HANDLE handle; if (!(dir = msi_dup_property( package->db, szOriginalDatabase ))) return ERROR_OUTOFMEMORY; @@ -982,33 +997,104 @@ static UINT HANDLE_CustomType23( MSIPACKAGE *package, const WCHAR *source, const } *p = 0; len_dir = p - dir; - len_src = lstrlenW( source ); - len_tgt = lstrlenW( target ); - if (!(arg = msi_alloc( (len + len_dir + len_src + len_tgt + 5) * sizeof(WCHAR) ))) + if (!(filename = msi_alloc( (len_dir + len_source + 2) * sizeof(WCHAR) ))) + { + msi_free( dir ); + return ERROR_OUTOFMEMORY; + } + memcpy( filename, dir, len_dir * sizeof(WCHAR) ); + filename[len_dir++] = '\\'; + memcpy( filename + len_dir, source, len_source * sizeof(WCHAR) ); + filename[len_dir + len_source] = 0; + + if (!(args = build_msiexec_args( filename, target ))) { msi_free( dir ); return ERROR_OUTOFMEMORY; } - memcpy( arg, paramsW, sizeof(paramsW) ); - arg[len++] = '"'; - memcpy( arg + len, dir, len_dir * sizeof(WCHAR) ); - len += len_dir; - arg[len++] = '\\'; - memcpy( arg + len, source, len_src * sizeof(WCHAR) ); - len += len_src; - arg[len++] = '"'; - arg[len++] = ' '; - lstrcpyW( arg + len, target ); TRACE("installing %s concurrently\n", debugstr_w(source)); - handle = execute_command( msiexecW, arg, dir ); + handle = execute_command( L"msiexec", args, dir ); msi_free( dir ); - msi_free( arg ); + msi_free( args ); if (handle == INVALID_HANDLE_VALUE) return ERROR_SUCCESS; return wait_process_handle( package, type, handle, action ); } +static UINT write_substorage_to_file( MSIPACKAGE *package, const WCHAR *source, const WCHAR *filename ) +{ + IStorage *src = NULL, *dst = NULL; + UINT r = ERROR_FUNCTION_FAILED; + HRESULT hr; + + hr = StgCreateDocfile( filename, STGM_CREATE|STGM_TRANSACTED|STGM_WRITE|STGM_SHARE_EXCLUSIVE, 0, &dst ); + if (FAILED( hr )) + { + WARN( "can't open destination storage %s (%08x)\n", debugstr_w(filename), hr ); + goto done; + } + + hr = IStorage_OpenStorage( package->db->storage, source, NULL, STGM_SHARE_EXCLUSIVE, NULL, 0, &src ); + if (FAILED( hr )) + { + WARN( "can't open source storage %s (%08x)\n", debugstr_w(source), hr ); + goto done; + } + + hr = IStorage_CopyTo( src, 0, NULL, NULL, dst ); + if (FAILED( hr )) + { + ERR( "failed to copy storage %s (%08x)\n", debugstr_w(source), hr ); + goto done; + } + + hr = IStorage_Commit( dst, 0 ); + if (FAILED( hr )) + ERR( "failed to commit storage (%08x)\n", hr ); + else + r = ERROR_SUCCESS; + +done: + if (src) IStorage_Release( src ); + if (dst) IStorage_Release( dst ); + return r; +} + +static UINT HANDLE_CustomType7( MSIPACKAGE *package, const WCHAR *source, const WCHAR *target, + INT type, const WCHAR *action ) +{ + WCHAR *tmpfile, *args; + MSIBINARY *binary = NULL; + HANDLE handle; + UINT r; + + if (!(tmpfile = msi_create_temp_file( package->db ))) return ERROR_FUNCTION_FAILED; + + r = write_substorage_to_file( package, source, tmpfile ); + if (r != ERROR_SUCCESS) + goto error; + + if (!(binary = msi_alloc( sizeof(*binary) ))) goto error; + binary->source = NULL; + binary->tmpfile = tmpfile; + list_add_tail( &package->binaries, &binary->entry ); + + if (!(args = build_msiexec_args( tmpfile, target ))) return ERROR_OUTOFMEMORY; + + TRACE("installing %s concurrently\n", debugstr_w(source)); + + handle = execute_command( L"msiexec", args, L"C:\\" ); + msi_free( args ); + if (handle == INVALID_HANDLE_VALUE) return ERROR_SUCCESS; + return wait_process_handle( package, type, handle, action ); + +error: + DeleteFileW( tmpfile ); + msi_free( tmpfile ); + return ERROR_FUNCTION_FAILED; +} + static UINT HANDLE_CustomType50( MSIPACKAGE *package, const WCHAR *source, const WCHAR *target, INT type, const WCHAR *action ) { @@ -1393,66 +1479,68 @@ UINT ACTION_CustomAction(MSIPACKAGE *package, const WCHAR *action) switch (type & CUSTOM_ACTION_TYPE_MASK) { - case 1: /* DLL file stored in a Binary table stream */ - rc = HANDLE_CustomType1(package,source,target,type,action); - break; - case 2: /* EXE file stored in a Binary table stream */ - rc = HANDLE_CustomType2(package,source,target,type,action); - break; - case 18: /*EXE file installed with package */ - rc = HANDLE_CustomType18(package,source,target,type,action); - break; - case 19: /* Error that halts install */ - rc = HANDLE_CustomType19(package,source,target,type,action); - break; - case 17: - rc = HANDLE_CustomType17(package,source,target,type,action); - break; - case 23: /* installs another package in the source tree */ - deformat_string(package,target,&deformated); - rc = HANDLE_CustomType23(package,source,deformated,type,action); - msi_free(deformated); - break; - case 50: /*EXE file specified by a property value */ - rc = HANDLE_CustomType50(package,source,target,type,action); - break; - case 34: /*EXE to be run in specified directory */ - rc = HANDLE_CustomType34(package,source,target,type,action); - break; - case 35: /* Directory set with formatted text. */ - deformat_string(package,target,&deformated); - MSI_SetTargetPathW(package, source, deformated); - msi_free(deformated); - break; - case 51: /* Property set with formatted text. */ - if (!source) - break; - - len = deformat_string( package, target, &deformated ); - rc = msi_set_property( package->db, source, deformated, len ); - if (rc == ERROR_SUCCESS && !wcscmp( source, szSourceDir )) - msi_reset_source_folders( package ); - msi_free(deformated); - break; - case 37: /* JScript/VBScript text stored in target column. */ - case 38: - rc = HANDLE_CustomType37_38(package,source,target,type,action); + case 1: /* DLL file stored in a Binary table stream */ + rc = HANDLE_CustomType1( package, source, target, type, action ); + break; + case 2: /* EXE file stored in a Binary table stream */ + rc = HANDLE_CustomType2( package, source, target, type, action ); break; case 5: - case 6: /* JScript/VBScript file stored in a Binary table stream. */ - rc = HANDLE_CustomType5_6(package,source,target,type,action); + case 6: /* JScript/VBScript file stored in a Binary table stream */ + rc = HANDLE_CustomType5_6( package, source, target, type, action ); + break; + case 7: /* Concurrent install from substorage */ + deformat_string( package, target, &deformated ); + rc = HANDLE_CustomType7( package, source, target, type, action ); + msi_free( deformated ); + break; + case 17: + rc = HANDLE_CustomType17( package, source, target, type, action ); break; - case 21: /* JScript/VBScript file installed with the product. */ + case 18: /* EXE file installed with package */ + rc = HANDLE_CustomType18( package, source, target, type, action ); + break; + case 19: /* Error that halts install */ + rc = HANDLE_CustomType19( package, source, target, type, action ); + break; + case 21: /* JScript/VBScript file installed with the product */ case 22: - rc = HANDLE_CustomType21_22(package,source,target,type,action); + rc = HANDLE_CustomType21_22( package, source, target, type, action ); + break; + case 23: /* Installs another package in the source tree */ + deformat_string( package, target, &deformated ); + rc = HANDLE_CustomType23( package, source, deformated, type, action ); + msi_free( deformated ); + break; + case 34: /* EXE to be run in specified directory */ + rc = HANDLE_CustomType34( package, source, target, type, action ); + break; + case 35: /* Directory set with formatted text */ + deformat_string( package, target, &deformated ); + MSI_SetTargetPathW( package, source, deformated ); + msi_free( deformated ); + break; + case 37: /* JScript/VBScript text stored in target column */ + case 38: + rc = HANDLE_CustomType37_38( package, source, target, type, action ); + break; + case 50: /* EXE file specified by a property value */ + rc = HANDLE_CustomType50( package, source, target, type, action ); + break; + case 51: /* Property set with formatted text */ + if (!source) break; + len = deformat_string( package, target, &deformated ); + rc = msi_set_property( package->db, source, deformated, len ); + if (rc == ERROR_SUCCESS && !wcscmp( source, szSourceDir )) msi_reset_source_folders( package ); + msi_free( deformated ); break; - case 53: /* JScript/VBScript text specified by a property value. */ + case 53: /* JScript/VBScript text specified by a property value */ case 54: - rc = HANDLE_CustomType53_54(package,source,target,type,action); + rc = HANDLE_CustomType53_54( package, source, target, type, action ); break; default: - FIXME("unhandled action type %u (%s %s)\n", type & CUSTOM_ACTION_TYPE_MASK, - debugstr_w(source), debugstr_w(target)); + FIXME( "unhandled action type %u (%s %s)\n", type & CUSTOM_ACTION_TYPE_MASK, debugstr_w(source), + debugstr_w(target) ); } end:

2 years, 9 months

[reactos] 265/360: [WINESYNC] msi/tests: Fix a crash on Windows 10.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=be64b5c843d955566a191… commit be64b5c843d955566a1919fd3012d8c9845e1dce Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 19:05:09 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:26 2022 +0100 [WINESYNC] msi/tests: Fix a crash on Windows 10. 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 4661c8d45b8f4b4b2adfb157bb16ce3466bc00f0 by Zebediah Figura <z.figura12(a)gmail.com> --- modules/rostests/winetests/msi/install.c | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/modules/rostests/winetests/msi/install.c b/modules/rostests/winetests/msi/install.c index 0bd82a621fc..f7fd83cfc08 100644 --- a/modules/rostests/winetests/msi/install.c +++ b/modules/rostests/winetests/msi/install.c @@ -2744,15 +2744,14 @@ static void test_MsiInstallProduct(void) MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); - /* szPackagePath is NULL */ - r = MsiInstallProductA(NULL, "INSTALL=ALL"); - ok(r == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", r); - - /* both szPackagePath and szCommandLine are NULL */ - r = MsiInstallProductA(NULL, NULL); - ok(r == ERROR_INVALID_PARAMETER, - "Expected ERROR_INVALID_PARAMETER, got %d\n", r); + if (0) /* crashes on Win10 1709 */ + { + r = MsiInstallProductA(NULL, "INSTALL=ALL"); + ok(r == ERROR_INVALID_PARAMETER, "got %u\n", r); + + r = MsiInstallProductA(NULL, NULL); + ok(r == ERROR_INVALID_PARAMETER, "got %u\n", r); + } /* szPackagePath is empty */ r = MsiInstallProductA("", "INSTALL=ALL");

2 years, 9 months

[reactos] 264/360: [WINESYNC] msi/tests: Fix test_feature_override() to properly clean up its features on removal.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ea5d4e807ce1854cee5d9… commit ea5d4e807ce1854cee5d9ab8f60d0c3a901715e2 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 19:05:09 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:26 2022 +0100 [WINESYNC] msi/tests: Fix test_feature_override() to properly clean up its features on removal. This was leaving behind registry entries (as well as the already accounted-for program files), which apparently caused subsequent test failures when running msi:action. While Wine is not behaving exactly correctly here (i.e. and removing the feature anyway), I suspect it is not sufficiently interesting to test whether we behave correctly with what is essentially a buggy package. 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 932ed6bf84a96efa6e0169eb7c9414824eef195c by Zebediah Figura <z.figura12(a)gmail.com> --- modules/rostests/winetests/msi/install.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/modules/rostests/winetests/msi/install.c b/modules/rostests/winetests/msi/install.c index 365f1d3a756..0bd82a621fc 100644 --- a/modules/rostests/winetests/msi/install.c +++ b/modules/rostests/winetests/msi/install.c @@ -966,8 +966,8 @@ static const CHAR fo_feature_dat[] = "Feature\tFeature_Parent\tTitle\tDescriptio static const CHAR fo_condition_dat[] = "Feature_\tLevel\tCondition\n" "s38\ti2\tS255\n" "Condition\tFeature_\tLevel\n" - "preselected\t0\tPreselected\n" - "notpreselected\t0\tNOT Preselected\n"; + "preselected\t0\tPreselected AND NOT REMOVE\n" + "notpreselected\t0\tNOT Preselected AND NOT REMOVE\n"; static const CHAR fo_feature_comp_dat[] = "Feature_\tComponent_\n" "s38\ts72\n" @@ -5464,10 +5464,8 @@ static void test_feature_override(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(!delete_pf("msitest\\override.txt", TRUE), "file not removed\n"); - todo_wine { - ok(delete_pf("msitest\\preselected.txt", TRUE), "file removed\n"); - ok(delete_pf("msitest", FALSE), "directory removed\n"); - } + ok(!delete_pf("msitest\\preselected.txt", TRUE), "file not removed\n"); + ok(!delete_pf("msitest", FALSE), "directory not removed\n"); r = MsiInstallProductA(msifile, NULL); ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); @@ -5480,10 +5478,8 @@ static void test_feature_override(void) ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(!delete_pf("msitest\\override.txt", TRUE), "file not removed\n"); - todo_wine { - ok(delete_pf("msitest\\preselected.txt", TRUE), "file removed\n"); - ok(delete_pf("msitest", FALSE), "directory removed\n"); - } + ok(!delete_pf("msitest\\preselected.txt", TRUE), "file not removed\n"); + ok(!delete_pf("msitest", FALSE), "directory not removed\n"); delete_key(HKEY_LOCAL_MACHINE, "Software\\Wine\\msitest", access);

2 years, 9 months

[reactos] 263/360: [WINESYNC] msi/tests: Avoid test failure when running as an unprivileged user.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=fb0b52255cd52afcb9963… commit fb0b52255cd52afcb9963c94a37f27e175e3ecc4 Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 19:05:08 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:25 2022 +0100 [WINESYNC] msi/tests: Avoid test failure when running as an unprivileged user. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id 90422f9bb59d4a2e34ad9cffbb4f04b896ab7235 by Hans Leidekker <hans(a)codeweavers.com> --- modules/rostests/winetests/msi/package.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/rostests/winetests/msi/package.c b/modules/rostests/winetests/msi/package.c index 3c547bf04a0..3b7b11d81e4 100644 --- a/modules/rostests/winetests/msi/package.c +++ b/modules/rostests/winetests/msi/package.c @@ -4054,7 +4054,6 @@ static void test_appsearch(void) r = RegCreateKeyExA(HKEY_LOCAL_MACHINE, "Software\\Winetest_msi", 0, NULL, 0, KEY_ALL_ACCESS|KEY_WOW64_32KEY, NULL, &hkey, NULL); - ok( r == ERROR_SUCCESS, "Could not create key: %d.\n", r ); if (r == ERROR_ACCESS_DENIED) { skip("insufficient rights\n"); @@ -4063,6 +4062,7 @@ static void test_appsearch(void) DeleteFileA(msifile); return; } + ok( r == ERROR_SUCCESS, "Could not create key: %d.\n", r ); r = RegSetValueExA(hkey, NULL, 0, REG_SZ, (const BYTE *)"c:\\windows\\system32\\notepad.exe", sizeof("c:\\windows\\system32\\notepad.exe"));

2 years, 9 months

[reactos] 262/360: [WINESYNC] msi: Use %define api.pure instead of %pure-parser.

by winesync

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=ad8c894b8f9e211e33ec1… commit ad8c894b8f9e211e33ec177d1f8a7bf80a9c63ef Author: winesync <ros-dev(a)reactos.org> AuthorDate: Sun Mar 13 19:05:04 2022 +0100 Commit: Mark Jansen <mark.jansen(a)reactos.org> CommitDate: Sun Mar 20 19:28:25 2022 +0100 [WINESYNC] msi: Use %define api.pure instead of %pure-parser. The latter is deprecated and causes warnings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> wine commit id d977c55bb4b9c564f376c22b43c60c9be7dc782d by Alexandre Julliard <julliard(a)winehq.org> --- dll/win32/msi/cond.y | 2 +- dll/win32/msi/sql.y | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dll/win32/msi/cond.y b/dll/win32/msi/cond.y index 73aada5fad3..3cf63ff8986 100644 --- a/dll/win32/msi/cond.y +++ b/dll/win32/msi/cond.y @@ -115,7 +115,7 @@ static void value_free( struct value val ) %lex-param { COND_input *info } %parse-param { COND_input *info } -%pure-parser +%define api.pure %union { diff --git a/dll/win32/msi/sql.y b/dll/win32/msi/sql.y index 50092abacf9..8ffbcd4de58 100644 --- a/dll/win32/msi/sql.y +++ b/dll/win32/msi/sql.y @@ -58,7 +58,7 @@ static struct expr * EXPR_wildcard( void *info ); %lex-param { SQL_input *info } %parse-param { SQL_input *info } -%pure-parser +%define api.pure %union {

2 years, 9 months

← Newer
1
...
11
12
13
14
15
16
17
...
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