July 2018 - Wine-devel - list.winehq.org

[PATCH v2 1/8] comctl32/taskdialog: Update vertical layout only when expando button clicked.
by Zhiyi Zhang 13 Aug '18

13 Aug '18

Update vertical layout only to improve efficiency. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> --- dlls/comctl32/taskdialog.c | 57 +++++++++++++++++++++++++++++++++++++- 1 file changed, 56 insertions(+), 1 deletion(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 457a5ff9d0..c6a3aa7ae5 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -232,11 +232,66 @@ static HRESULT taskdialog_notify(struct taskdialog_info *dialog_info, UINT notif : S_OK; } +static void taskdialog_move_controls_vertically(HWND parent, HWND *controls, INT count, INT offset) +{ + RECT rect; + POINT pt; + INT i; + + for (i = 0; i < count; i++) + { + if (!controls[i]) continue; + + GetWindowRect(controls[i], &rect); + pt.x = rect.left; + pt.y = rect.top; + MapWindowPoints(HWND_DESKTOP, parent, &pt, 1); + SetWindowPos(controls[i], 0, pt.x, pt.y + offset, 0, 0, SWP_NOSIZE | SWP_NOZORDER); + } +} + static void taskdialog_toggle_expando_control(struct taskdialog_info *dialog_info) { + const TASKDIALOGCONFIG *taskconfig = dialog_info->taskconfig; + const WCHAR *text; + RECT info_rect, rect; + INT height, offset; + dialog_info->expanded = !dialog_info->expanded; + text = dialog_info->expanded ? dialog_info->expanded_text : dialog_info->collapsed_text; + SendMessageW(dialog_info->expando_button, WM_SETTEXT, 0, (LPARAM)text); ShowWindow(dialog_info->expanded_info, dialog_info->expanded ? SW_SHOWDEFAULT : SW_HIDE); - taskdialog_layout(dialog_info); + + GetWindowRect(dialog_info->expanded_info, &info_rect); + /* If expanded information starts up not expanded, call taskdialog_layout() + * to to set size for expanded information control at least once */ + if (IsRectEmpty(&info_rect)) + { + taskdialog_layout(dialog_info); + return; + } + height = info_rect.bottom - info_rect.top + dialog_info->m.v_spacing; + offset = dialog_info->expanded ? height : -height; + + /* Update vertical layout, move all controls after expanded information */ + /* Move dialog */ + GetWindowRect(dialog_info->hwnd, &rect); + SetWindowPos(dialog_info->hwnd, 0, 0, 0, rect.right - rect.left, rect.bottom - rect.top + offset, + SWP_NOMOVE | SWP_NOZORDER); + /* Move controls */ + if (!(taskconfig->dwFlags & TDF_EXPAND_FOOTER_AREA)) + { + taskdialog_move_controls_vertically(dialog_info->hwnd, &dialog_info->progress_bar, 1, offset); + taskdialog_move_controls_vertically(dialog_info->hwnd, &dialog_info->expando_button, 1, offset); + taskdialog_move_controls_vertically(dialog_info->hwnd, &dialog_info->verification_box, 1, offset); + taskdialog_move_controls_vertically(dialog_info->hwnd, &dialog_info->footer_icon, 1, offset); + taskdialog_move_controls_vertically(dialog_info->hwnd, &dialog_info->footer_text, 1, offset); + taskdialog_move_controls_vertically(dialog_info->hwnd, dialog_info->buttons, dialog_info->button_count, offset); + taskdialog_move_controls_vertically(dialog_info->hwnd, dialog_info->radio_buttons, + dialog_info->radio_button_count, offset); + taskdialog_move_controls_vertically(dialog_info->hwnd, dialog_info->command_links, + dialog_info->command_link_count, offset); + } } static void taskdialog_on_button_click(struct taskdialog_info *dialog_info, HWND hwnd) -- 2.18.0

2 1

[PATCH] msacm32: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msacm32/filter.c | 4 ++-- dlls/msacm32/format.c | 18 +++++++++--------- dlls/msacm32/internal.c | 14 +++++++------- dlls/msacm32/pcmconverter.c | 15 +++++++-------- dlls/msacm32/tests/msacm.c | 2 +- 5 files changed, 26 insertions(+), 27 deletions(-) diff --git a/dlls/msacm32/filter.c b/dlls/msacm32/filter.c index 53db82777d..8d5abced9d 100644 --- a/dlls/msacm32/filter.c +++ b/dlls/msacm32/filter.c @@ -361,8 +361,8 @@ MMRESULT WINAPI acmFilterTagDetailsW(HACMDRIVER had, PACMFILTERTAGDETAILSW paftd if (mmr == MMSYSERR_NOERROR && paftd->dwFilterTag == WAVE_FORMAT_PCM && paftd->szFilterTag[0] == 0) - MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFilterTag, - sizeof(paftd->szFilterTag)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_ACP, 0, "PCM", -1, paftd->szFilterTag, + ARRAY_SIZE(paftd->szFilterTag)); return mmr; } diff --git a/dlls/msacm32/format.c b/dlls/msacm32/format.c index b3d2900393..fcc0d9b1c6 100644 --- a/dlls/msacm32/format.c +++ b/dlls/msacm32/format.c @@ -503,9 +503,9 @@ MMRESULT WINAPI acmFormatDetailsW(HACMDRIVER had, PACMFORMATDETAILSW pafd, DWORD wsprintfW(pafd->szFormat + lstrlenW(pafd->szFormat), fmt2, pafd->pwfx->wBitsPerSample); } - MultiByteToWideChar( CP_ACP, 0, (pafd->pwfx->nChannels == 1) ? "; Mono" : "; Stereo", -1, - pafd->szFormat + strlenW(pafd->szFormat), - sizeof(pafd->szFormat)/sizeof(WCHAR) - strlenW(pafd->szFormat) ); + MultiByteToWideChar(CP_ACP, 0, (pafd->pwfx->nChannels == 1) ? "; Mono" : "; Stereo", -1, + pafd->szFormat + strlenW(pafd->szFormat), + ARRAY_SIZE(pafd->szFormat) - strlenW(pafd->szFormat)); } TRACE("=> %d\n", mmr); @@ -929,8 +929,8 @@ MMRESULT WINAPI acmFormatTagDetailsW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd if (mmr == MMSYSERR_NOERROR && paftd->dwFormatTag == WAVE_FORMAT_PCM && paftd->szFormatTag[0] == 0) - MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag, - sizeof(paftd->szFormatTag)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_ACP, 0, "PCM", -1, paftd->szFormatTag, + ARRAY_SIZE(paftd->szFormatTag)); return mmr; } @@ -1036,8 +1036,8 @@ MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, (LPARAM)paftd, ACM_FORMATTAGDETAILSF_INDEX) == MMSYSERR_NOERROR) { if (paftd->dwFormatTag == WAVE_FORMAT_PCM) { if (paftd->szFormatTag[0] == 0) - MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag, - sizeof(paftd->szFormatTag)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_ACP, 0, "PCM", -1, paftd->szFormatTag, + ARRAY_SIZE(paftd->szFormatTag)); /* (WS) I'm preserving this PCM hack since it seems to be * correct. Please notice this block was borrowed from * below. @@ -1062,8 +1062,8 @@ MMRESULT WINAPI acmFormatTagEnumW(HACMDRIVER had, PACMFORMATTAGDETAILSW paftd, (LPARAM)paftd, ACM_FORMATTAGDETAILSF_INDEX) == MMSYSERR_NOERROR) { if (paftd->dwFormatTag == WAVE_FORMAT_PCM) { if (paftd->szFormatTag[0] == 0) - MultiByteToWideChar( CP_ACP, 0, "PCM", -1, paftd->szFormatTag, - sizeof(paftd->szFormatTag)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_ACP, 0, "PCM", -1, paftd->szFormatTag, + ARRAY_SIZE(paftd->szFormatTag)); /* FIXME (EPP): I'm not sure this is the correct * algorithm (should make more sense to apply the same * for all already loaded formats, but this will do diff --git a/dlls/msacm32/internal.c b/dlls/msacm32/internal.c index 7bafcaad5e..aad071e8ad 100644 --- a/dlls/msacm32/internal.c +++ b/dlls/msacm32/internal.c @@ -72,7 +72,7 @@ PWINE_ACMDRIVERID MSACM_RegisterDriverFromRegistry(LPCWSTR pszRegEntry) /* The requested registry entry must have the format msacm.XXXXX in order to be recognized in any future sessions of msacm */ - if (0 == strncmpiW(pszRegEntry, msacmW, sizeof(msacmW)/sizeof(WCHAR))) { + if (0 == strncmpiW(pszRegEntry, msacmW, ARRAY_SIZE(msacmW))) { lRet = RegOpenKeyExW(HKEY_LOCAL_MACHINE, drvkey, 0, KEY_QUERY_VALUE, &hKey); if (lRet != ERROR_SUCCESS) { WARN("unable to open registry key - 0x%08x\n", lRet); @@ -373,31 +373,31 @@ void MSACM_RegisterAllDrivers(void) if (lRet == ERROR_SUCCESS) { RegQueryInfoKeyW( hKey, 0, 0, 0, &cnt, 0, 0, 0, 0, 0, 0, 0); for (i = 0; i < cnt; i++) { - bufLen = sizeof(buf) / sizeof(buf[0]); + bufLen = ARRAY_SIZE(buf); lRet = RegEnumKeyExW(hKey, i, buf, &bufLen, 0, 0, 0, &lastWrite); if (lRet != ERROR_SUCCESS) continue; - if (strncmpiW(buf, msacmW, sizeof(msacmW)/sizeof(msacmW[0]))) continue; + if (strncmpiW(buf, msacmW, ARRAY_SIZE(msacmW))) continue; if (!(name = strchrW(buf, '='))) continue; *name = 0; MSACM_RegisterDriver(buf, name + 1, 0); } i = 0; - cnt = sizeof(valname) / sizeof(*valname); + cnt = ARRAY_SIZE(valname); bufLen = sizeof(buf); while(RegEnumValueW(hKey, i, valname, &cnt, 0, &type, (BYTE*)buf, &bufLen) == ERROR_SUCCESS){ - if(!strncmpiW(valname, msacmW, sizeof(msacmW) / sizeof(*msacmW))) + if (!strncmpiW(valname, msacmW, ARRAY_SIZE(msacmW))) MSACM_RegisterDriver(valname, buf, 0); ++i; } RegCloseKey( hKey ); } - if (GetPrivateProfileSectionW(drv32, buf, sizeof(buf)/sizeof(buf[0]), sys)) + if (GetPrivateProfileSectionW(drv32, buf, ARRAY_SIZE(buf), sys)) { for(s = buf; *s; s += strlenW(s) + 1) { - if (strncmpiW(s, msacmW, sizeof(msacmW)/sizeof(msacmW[0]))) continue; + if (strncmpiW(s, msacmW, ARRAY_SIZE(msacmW))) continue; if (!(name = strchrW(s, '='))) continue; *name = 0; MSACM_RegisterDriver(s, name + 1, 0); diff --git a/dlls/msacm32/pcmconverter.c b/dlls/msacm32/pcmconverter.c index f26f125fcd..dc10f11e7a 100644 --- a/dlls/msacm32/pcmconverter.c +++ b/dlls/msacm32/pcmconverter.c @@ -984,14 +984,13 @@ static LRESULT PCM_DriverDetails(PACMDRIVERDETAILSW add) add->cFormatTags = 1; add->cFilterTags = 0; add->hicon = NULL; - MultiByteToWideChar( CP_ACP, 0, "MS-PCM", -1, - add->szShortName, sizeof(add->szShortName)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, "Wine PCM converter", -1, - add->szLongName, sizeof(add->szLongName)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, "Brought to you by the Wine team...", -1, - add->szCopyright, sizeof(add->szCopyright)/sizeof(WCHAR) ); - MultiByteToWideChar( CP_ACP, 0, "Refer to LICENSE file", -1, - add->szLicensing, sizeof(add->szLicensing)/sizeof(WCHAR) ); + MultiByteToWideChar(CP_ACP, 0, "MS-PCM", -1, add->szShortName, ARRAY_SIZE(add->szShortName)); + MultiByteToWideChar(CP_ACP, 0, "Wine PCM converter", -1, + add->szLongName, ARRAY_SIZE(add->szLongName)); + MultiByteToWideChar(CP_ACP, 0, "Brought to you by the Wine team...", -1, + add->szCopyright, ARRAY_SIZE(add->szCopyright)); + MultiByteToWideChar(CP_ACP, 0, "Refer to LICENSE file", -1, + add->szLicensing, ARRAY_SIZE(add->szLicensing) ); add->szFeatures[0] = 0; return MMSYSERR_NOERROR; diff --git a/dlls/msacm32/tests/msacm.c b/dlls/msacm32/tests/msacm.c index 959ec7f0c0..180639fa54 100644 --- a/dlls/msacm32/tests/msacm.c +++ b/dlls/msacm32/tests/msacm.c @@ -1106,7 +1106,7 @@ static void test_convert(void) MMRESULT mmr; unsigned i; - for (i = 0; i < sizeof(expected_output)/sizeof(struct stream_output); i++) + for (i = 0; i < ARRAY_SIZE(expected_output); i++) { mmr = acmStreamOpen(&has, NULL, (WAVEFORMATEX *)&expected_output[i].src, (WAVEFORMATEX *)&expected_output[i].dst, NULL, 0, 0, 0); ok(mmr == MMSYSERR_NOERROR, "#%d: open failed: 0x%x\n", i, mmr); -- 2.14.4

2 1

[PATCH] midimap: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/midimap/midimap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/midimap/midimap.c b/dlls/midimap/midimap.c index 1b35da7609..290300a55a 100644 --- a/dlls/midimap/midimap.c +++ b/dlls/midimap/midimap.c @@ -172,7 +172,7 @@ static BOOL MIDIMAP_LoadSettingsScheme(MIDIMAPDATA* mom, const WCHAR* scheme) return FALSE; } - for (idx = 0; !RegEnumKeyW(hKey, idx, buffer, sizeof(buffer)/sizeof(buffer[0])); idx++) + for (idx = 0; !RegEnumKeyW(hKey, idx, buffer, ARRAY_SIZE(buffer)); idx++) { if (RegOpenKeyW(hKey, buffer, &hPortKey)) continue; -- 2.14.4

2 1

[PATCH] mciwave: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 10 Aug '18

10 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/mciwave/mciwave.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mciwave/mciwave.c b/dlls/mciwave/mciwave.c index fd4d6f6728..0fa9b204f8 100644 --- a/dlls/mciwave/mciwave.c +++ b/dlls/mciwave/mciwave.c @@ -427,7 +427,7 @@ static DWORD create_tmp_file(HMMIO* hFile, LPWSTR* pszTmpFileName) szPrefix[2] = 'I'; szPrefix[3] = '\0'; - if (!GetTempPathW(sizeof(szTmpPath)/sizeof(szTmpPath[0]), szTmpPath)) { + if (!GetTempPathW(ARRAY_SIZE(szTmpPath), szTmpPath)) { WARN("can't retrieve temp path!\n"); *pszTmpFileName = NULL; return MCIERR_FILE_NOT_FOUND; -- 2.14.4

2 1

[PATCH] msi: Generate unique names for 32- and 64-bit custom action server pipes.
by Zebediah Figura 07 Aug '18

07 Aug '18

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- Observed with the Microsoft Office 2010 installer. Probably also fixes bugs 45483, 45509, and 45537. dlls/msi/custom.c | 6 ++++-- programs/msiexec/msiexec.c | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 1a8a982..51755f2 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -590,7 +590,7 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid) static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch) { - static const WCHAR pipe_name[] = {'\\','\\','.','\\','p','i','p','e','\\','m','s','i','c','a','_','%','x',0}; + static const WCHAR pipe_name[] = {'\\','\\','.','\\','p','i','p','e','\\','m','s','i','c','a','_','%','x','_','%','d',0}; static const WCHAR msiexecW[] = {'\\','m','s','i','e','x','e','c','.','e','x','e',0}; static const WCHAR argsW[] = {'%','s',' ','-','E','m','b','e','d','d','i','n','g',' ','%','d',0}; @@ -606,9 +606,11 @@ static DWORD custom_start_server(MSIPACKAGE *package, DWORD arch) (arch == SCS_64BIT_BINARY && package->custom_server_64_process)) return ERROR_SUCCESS; - sprintfW(buffer, pipe_name, GetCurrentProcessId()); + sprintfW(buffer, pipe_name, GetCurrentProcessId(), arch == SCS_32BIT_BINARY ? 32 : 64); pipe = CreateNamedPipeW(buffer, PIPE_ACCESS_DUPLEX, 0, 1, sizeof(DWORD64), sizeof(GUID), 0, NULL); + if (pipe == INVALID_HANDLE_VALUE) + ERR("Failed to create custom action client pipe: %u\n", GetLastError()); if (sizeof(void *) == 8 && arch == SCS_32BIT_BINARY) GetSystemWow64DirectoryW(path, MAX_PATH - sizeof(msiexecW)/sizeof(WCHAR)); diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 5a471a2..c5f9979 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -406,7 +406,7 @@ static DWORD CALLBACK custom_action_thread(void *arg) static int custom_action_server(const WCHAR *arg) { - static const WCHAR pipe_name[] = {'\\','\\','.','\\','p','i','p','e','\\','m','s','i','c','a','_','%','x',0}; + static const WCHAR pipe_name[] = {'\\','\\','.','\\','p','i','p','e','\\','m','s','i','c','a','_','%','x','_','%','d',0}; DWORD client_pid = atoiW(arg); DWORD64 thread64; WCHAR buffer[24]; @@ -423,7 +423,7 @@ static int custom_action_server(const WCHAR *arg) return 1; } - sprintfW(buffer, pipe_name, client_pid); + sprintfW(buffer, pipe_name, client_pid, sizeof(void *) * 8); pipe = CreateFileW(buffer, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL); if (pipe == INVALID_HANDLE_VALUE) { -- 2.7.4

2 1

[PATCH resend] msi: Implement deferral for standard and custom actions.
by Zebediah Figura 07 Aug '18

07 Aug '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- Resent now that bug 45317 is fixed. dlls/msi/action.c | 89 ++++++++++++++++++++++++++++++++++++++++++++++-- dlls/msi/assembly.c | 6 ++++ dlls/msi/classes.c | 24 +++++++++++++ dlls/msi/custom.c | 1 + dlls/msi/files.c | 18 ++++++++++ dlls/msi/font.c | 6 ++++ dlls/msi/msipriv.h | 1 + dlls/msi/tests/custom.c | 70 +------------------------------------ dlls/msi/tests/install.c | 1 - 9 files changed, 143 insertions(+), 73 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 15f1876..bc18982 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -105,8 +105,6 @@ static const WCHAR szIsolateComponents[] = {'I','s','o','l','a','t','e','C','o','m','p','o','n','e','n','t','s',0}; static const WCHAR szMigrateFeatureStates[] = {'M','i','g','r','a','t','e','F','e','a','t','u','r','e','S','t','a','t','e','s',0}; -static const WCHAR szMsiUnpublishAssemblies[] = - {'M','s','i','U','n','p','u','b','l','i','s','h','A','s','s','e','m','b','l','i','e','s',0}; static const WCHAR szInstallODBC[] = {'I','n','s','t','a','l','l','O','D','B','C',0}; static const WCHAR szInstallServices[] = @@ -858,6 +856,9 @@ static UINT ACTION_CreateFolders(MSIPACKAGE *package) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szCreateFolders); + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -937,6 +938,9 @@ static UINT ACTION_RemoveFolders( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRemoveFolders); + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -3011,6 +3015,9 @@ static UINT ACTION_WriteRegistryValues(MSIPACKAGE *package) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szWriteRegistryValues); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -3245,6 +3252,9 @@ static UINT ACTION_RemoveRegistryValues( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRemoveRegistryValues); + rc = MSI_DatabaseOpenViewW( package->db, registry_query, &view ); if (rc == ERROR_SUCCESS) { @@ -3563,9 +3573,13 @@ static UINT ACTION_ProcessComponents(MSIPACKAGE *package) TRACE("\n"); - squash_guid( package->ProductCode, squashed_pc ); msi_set_sourcedir_props(package, FALSE); + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szProcessComponents); + + squash_guid( package->ProductCode, squashed_pc ); + LIST_FOR_EACH_ENTRY( comp, &package->components, MSICOMPONENT, entry ) { MSIRECORD *uirow; @@ -3839,6 +3853,9 @@ static UINT ACTION_RegisterTypeLibraries(MSIPACKAGE *package) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRegisterTypeLibraries); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -3900,6 +3917,9 @@ static UINT ACTION_UnregisterTypeLibraries( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szUnregisterTypeLibraries); + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -4084,6 +4104,9 @@ static UINT ACTION_CreateShortcuts(MSIPACKAGE *package) HRESULT res; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szCreateShortcuts); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -4137,6 +4160,9 @@ static UINT ACTION_RemoveShortcuts( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRemoveShortcuts); + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -4509,6 +4535,9 @@ static UINT ACTION_PublishProduct(MSIPACKAGE *package) MSIRECORD *uirow; BOOL republish = FALSE; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szPublishProduct); + if (!list_empty(&package->patches)) { rc = msi_publish_patches(package); @@ -4706,6 +4735,9 @@ static UINT ACTION_WriteIniValues(MSIPACKAGE *package) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szWriteIniValues); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -4849,6 +4881,9 @@ static UINT ACTION_RemoveIniValues( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRemoveIniValues); + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); if (rc == ERROR_SUCCESS) { @@ -4934,6 +4969,9 @@ static UINT ACTION_SelfRegModules(MSIPACKAGE *package) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szSelfRegModules); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -4984,6 +5022,9 @@ static UINT ACTION_SelfUnregModules( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szSelfUnregModules); + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -4999,6 +5040,9 @@ static UINT ACTION_PublishFeatures(MSIPACKAGE *package) UINT rc; HKEY hkey = NULL, userdata = NULL; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szPublishFeatures); + if (!msi_check_publish(package)) return ERROR_SUCCESS; @@ -5139,6 +5183,9 @@ static UINT ACTION_UnpublishFeatures(MSIPACKAGE *package) { MSIFEATURE *feature; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szUnpublishFeatures); + if (!msi_check_unpublish(package)) return ERROR_SUCCESS; @@ -5291,6 +5338,9 @@ static UINT ACTION_RegisterProduct(MSIPACKAGE *package) HKEY hkey, props, upgrade_key; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRegisterProduct); + /* FIXME: also need to publish if the product is in advertise mode */ if (!msi_get_property_int( package->db, szProductToBeRegistered, 0 ) && !msi_check_publish(package)) @@ -5609,6 +5659,9 @@ static UINT ACTION_RegisterUser(MSIPACKAGE *package) {0}, }; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRegisterUser); + if (msi_check_unpublish(package)) { MSIREG_DeleteUserDataProductKey(package->ProductCode, package->Context); @@ -5931,6 +5984,9 @@ static UINT ACTION_PublishComponents(MSIPACKAGE *package) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szPublishComponents); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -6003,6 +6059,9 @@ static UINT ACTION_UnpublishComponents( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szUnpublishComponents); + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -6151,6 +6210,9 @@ static UINT ACTION_InstallServices( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szInstallServices); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -6322,6 +6384,9 @@ static UINT ACTION_StartServices( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szStartServices); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -6485,6 +6550,9 @@ static UINT ACTION_StopServices( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szStopServices); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -6568,6 +6636,9 @@ static UINT ACTION_DeleteServices( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szDeleteServices); + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -6838,6 +6909,9 @@ static UINT ACTION_InstallODBC( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szInstallODBC); + rc = MSI_DatabaseOpenViewW(package->db, driver_query, &view); if (rc == ERROR_SUCCESS) { @@ -7016,6 +7090,9 @@ static UINT ACTION_RemoveODBC( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRemoveODBC); + rc = MSI_DatabaseOpenViewW( package->db, driver_query, &view ); if (rc == ERROR_SUCCESS) { @@ -7362,6 +7439,9 @@ static UINT ACTION_WriteEnvironmentStrings( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szWriteEnvironmentStrings); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -7504,6 +7584,9 @@ static UINT ACTION_RemoveEnvironmentStrings( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRemoveEnvironmentStrings); + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; diff --git a/dlls/msi/assembly.c b/dlls/msi/assembly.c index bccd114..59fd332 100644 --- a/dlls/msi/assembly.c +++ b/dlls/msi/assembly.c @@ -652,6 +652,9 @@ UINT ACTION_MsiPublishAssemblies( MSIPACKAGE *package ) { MSICOMPONENT *comp; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szMsiPublishAssemblies); + LIST_FOR_EACH_ENTRY(comp, &package->components, MSICOMPONENT, entry) { LONG res; @@ -717,6 +720,9 @@ UINT ACTION_MsiUnpublishAssemblies( MSIPACKAGE *package ) { MSICOMPONENT *comp; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szMsiUnpublishAssemblies); + LIST_FOR_EACH_ENTRY(comp, &package->components, MSICOMPONENT, entry) { LONG res; diff --git a/dlls/msi/classes.c b/dlls/msi/classes.c index 60cc3c1..293aa10 100644 --- a/dlls/msi/classes.c +++ b/dlls/msi/classes.c @@ -753,6 +753,9 @@ UINT ACTION_RegisterClassInfo(MSIPACKAGE *package) MSICLASS *cls; UINT r; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRegisterClassInfo); + r = load_classes_and_such( package ); if (r != ERROR_SUCCESS) return r; @@ -918,6 +921,9 @@ UINT ACTION_UnregisterClassInfo( MSIPACKAGE *package ) HKEY hkey, hkey2; UINT r; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szUnregisterClassInfo); + r = load_classes_and_such( package ); if (r != ERROR_SUCCESS) return r; @@ -1083,6 +1089,9 @@ UINT ACTION_RegisterProgIdInfo(MSIPACKAGE *package) MSIRECORD *uirow; UINT r; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRegisterProgIdInfo); + r = load_classes_and_such( package ); if (r != ERROR_SUCCESS) return r; @@ -1143,6 +1152,9 @@ UINT ACTION_UnregisterProgIdInfo( MSIPACKAGE *package ) LONG res; UINT r; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szUnregisterProgIdInfo); + r = load_classes_and_such( package ); if (r != ERROR_SUCCESS) return r; @@ -1255,6 +1267,9 @@ UINT ACTION_RegisterExtensionInfo(MSIPACKAGE *package) LONG res; UINT r; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRegisterExtensionInfo); + r = load_classes_and_such( package ); if (r != ERROR_SUCCESS) return r; @@ -1363,6 +1378,9 @@ UINT ACTION_UnregisterExtensionInfo( MSIPACKAGE *package ) LONG res; UINT r; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szUnregisterExtensionInfo); + r = load_classes_and_such( package ); if (r != ERROR_SUCCESS) return r; @@ -1446,6 +1464,9 @@ UINT ACTION_RegisterMIMEInfo(MSIPACKAGE *package) MSIMIME *mt; UINT r; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRegisterMIMEInfo); + r = load_classes_and_such( package ); if (r != ERROR_SUCCESS) return r; @@ -1500,6 +1521,9 @@ UINT ACTION_UnregisterMIMEInfo( MSIPACKAGE *package ) MSIMIME *mime; UINT r; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szUnregisterMIMEInfo); + r = load_classes_and_such( package ); if (r != ERROR_SUCCESS) return r; diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 1a8a982..66f9dca 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -1246,6 +1246,7 @@ static BOOL action_type_matches_script( UINT type, UINT script ) switch (script) { case SCRIPT_NONE: + return FALSE; case SCRIPT_INSTALL: return !(type & msidbCustomActionTypeCommit) && !(type & msidbCustomActionTypeRollback); case SCRIPT_COMMIT: diff --git a/dlls/msi/files.c b/dlls/msi/files.c index f6cf3e7..5a88c14 100644 --- a/dlls/msi/files.c +++ b/dlls/msi/files.c @@ -359,6 +359,9 @@ UINT ACTION_InstallFiles(MSIPACKAGE *package) msi_set_sourcedir_props(package, FALSE); + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szInstallFiles); + schedule_install_files(package); mi = msi_alloc_zero( sizeof(MSIMEDIAINFO) ); @@ -584,6 +587,9 @@ UINT ACTION_PatchFiles( MSIPACKAGE *package ) TRACE("%p\n", package); + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szPatchFiles); + mi = msi_alloc_zero( sizeof(MSIMEDIAINFO) ); TRACE("extracting files\n"); @@ -1002,6 +1008,9 @@ UINT ACTION_MoveFiles( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szMoveFiles); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -1134,6 +1143,9 @@ UINT ACTION_DuplicateFiles(MSIPACKAGE *package) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szDuplicateFiles); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -1210,6 +1222,9 @@ UINT ACTION_RemoveDuplicateFiles( MSIPACKAGE *package ) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRemoveDuplicateFiles); + rc = MSI_DatabaseOpenViewW( package->db, query, &view ); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -1350,6 +1365,9 @@ UINT ACTION_RemoveFiles( MSIPACKAGE *package ) MSIFILE *file; UINT r; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRemoveFiles); + r = MSI_DatabaseOpenViewW(package->db, query, &view); if (r == ERROR_SUCCESS) { diff --git a/dlls/msi/font.c b/dlls/msi/font.c index 5c1e59d..fc05006 100644 --- a/dlls/msi/font.c +++ b/dlls/msi/font.c @@ -294,6 +294,9 @@ UINT ACTION_RegisterFonts(MSIPACKAGE *package) MSIQUERY *view; UINT rc; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szRegisterFonts); + rc = MSI_DatabaseOpenViewW(package->db, query, &view); if (rc != ERROR_SUCCESS) return ERROR_SUCCESS; @@ -374,6 +377,9 @@ UINT ACTION_UnregisterFonts( MSIPACKAGE *package ) MSIQUERY *view; UINT r; + if (package->script == SCRIPT_NONE) + return msi_schedule_action(package, SCRIPT_INSTALL, szUnregisterFonts); + r = MSI_DatabaseOpenViewW( package->db, query, &view ); if (r != ERROR_SUCCESS) return ERROR_SUCCESS; diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 7a65e1a..34bc490 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1190,6 +1190,7 @@ static const WCHAR szWow6432NodeCLSID[] = {'W','o','w','6','4','3','2','N','o',' 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}; static const WCHAR szMsiPublishAssemblies[] = {'M','s','i','P','u','b','l','i','s','h','A','s','s','e','m','b','l','i','e','s',0}; +static const WCHAR szMsiUnpublishAssemblies[] = {'M','s','i','U','n','p','u','b','l','i','s','h','A','s','s','e','m','b','l','i','e','s',0}; static const WCHAR szCostingComplete[] = {'C','o','s','t','i','n','g','C','o','m','p','l','e','t','e',0}; static const WCHAR szTempFolder[] = {'T','e','m','p','F','o','l','d','e','r',0}; static const WCHAR szDatabase[] = {'D','A','T','A','B','A','S','E',0}; diff --git a/dlls/msi/tests/custom.c b/dlls/msi/tests/custom.c index 59a69ee..3989ca8 100644 --- a/dlls/msi/tests/custom.c +++ b/dlls/msi/tests/custom.c @@ -1182,52 +1182,42 @@ static BOOL pf_exists(const char *file) UINT WINAPI cf_present(MSIHANDLE hinst) { -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { ok(hinst, pf_exists("msitest\\first"), "folder absent\n"); ok(hinst, pf_exists("msitest\\second"), "folder absent\n"); ok(hinst, pf_exists("msitest\\third"), "folder absent\n"); -} return ERROR_SUCCESS; } UINT WINAPI cf_absent(MSIHANDLE hinst) { -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { ok(hinst, !pf_exists("msitest\\first"), "folder present\n"); ok(hinst, !pf_exists("msitest\\second"), "folder present\n"); ok(hinst, !pf_exists("msitest\\third"), "folder present\n"); -} return ERROR_SUCCESS; } UINT WINAPI file_present(MSIHANDLE hinst) { -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { ok(hinst, pf_exists("msitest\\first\\one.txt"), "file absent\n"); ok(hinst, pf_exists("msitest\\second\\two.txt"), "file absent\n"); -} return ERROR_SUCCESS; } UINT WINAPI file_absent(MSIHANDLE hinst) { -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { ok(hinst, !pf_exists("msitest\\first\\one.txt"), "file present\n"); ok(hinst, !pf_exists("msitest\\second\\two.txt"), "file present\n"); -} return ERROR_SUCCESS; } UINT WINAPI crs_present(MSIHANDLE hinst) { -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, pf_exists("msitest\\shortcut.lnk"), "shortcut absent\n"); return ERROR_SUCCESS; } UINT WINAPI crs_absent(MSIHANDLE hinst) { -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, !pf_exists("msitest\\shortcut.lnk"), "shortcut present\n"); return ERROR_SUCCESS; } @@ -1237,7 +1227,6 @@ UINT WINAPI sds_present(MSIHANDLE hinst) SC_HANDLE manager, service; manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); service = OpenServiceA(manager, "TestService3", GENERIC_ALL); -todo_wine ok(hinst, !!service, "service absent: %u\n", GetLastError()); CloseServiceHandle(service); CloseServiceHandle(manager); @@ -1271,7 +1260,6 @@ UINT WINAPI sis_absent(MSIHANDLE hinst) SC_HANDLE manager, service; manager = OpenSCManagerA(NULL, NULL, SC_MANAGER_ALL_ACCESS); service = OpenServiceA(manager, "TestService", GENERIC_ALL); -todo_wine ok(hinst, !service, "service present\n"); if (service) CloseServiceHandle(service); CloseServiceHandle(manager); @@ -1288,7 +1276,6 @@ UINT WINAPI sss_started(MSIHANDLE hinst) service = OpenServiceA(manager, "Spooler", SC_MANAGER_ALL_ACCESS); ret = QueryServiceStatus(service, &status); ok(hinst, ret, "QueryServiceStatus failed: %u\n", GetLastError()); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, status.dwCurrentState == SERVICE_RUNNING, "got %u\n", status.dwCurrentState); CloseServiceHandle(service); @@ -1315,10 +1302,8 @@ UINT WINAPI sss_stopped(MSIHANDLE hinst) UINT WINAPI rd_present(MSIHANDLE hinst) { -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { ok(hinst, pf_exists("msitest\\original2.txt"), "file absent\n"); ok(hinst, pf_exists("msitest\\duplicate.txt"), "file absent\n"); -} ok(hinst, !pf_exists("msitest\\original3.txt"), "file present\n"); ok(hinst, !pf_exists("msitest\\duplicate2.txt"), "file present\n"); return ERROR_SUCCESS; @@ -1326,10 +1311,8 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { UINT WINAPI rd_absent(MSIHANDLE hinst) { -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { ok(hinst, !pf_exists("msitest\\original2.txt"), "file present\n"); ok(hinst, !pf_exists("msitest\\duplicate.txt"), "file present\n"); -} ok(hinst, !pf_exists("msitest\\original3.txt"), "file present\n"); ok(hinst, !pf_exists("msitest\\duplicate2.txt"), "file present\n"); return ERROR_SUCCESS; @@ -1352,10 +1335,8 @@ UINT WINAPI odbc_present(MSIHANDLE hinst) if (!strcmp(p, "ODBC test driver2")) gotdriver2 = 1; } -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { ok(hinst, gotdriver, "driver absent\n"); ok(hinst, gotdriver2, "driver 2 absent\n"); -} return ERROR_SUCCESS; } @@ -1376,10 +1357,8 @@ UINT WINAPI odbc_absent(MSIHANDLE hinst) if (!strcmp(p, "ODBC test driver2")) gotdriver2 = 1; } -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { ok(hinst, !gotdriver, "driver present\n"); ok(hinst, !gotdriver2, "driver 2 present\n"); -} return ERROR_SUCCESS; } @@ -1392,10 +1371,8 @@ UINT WINAPI mov_present(MSIHANDLE hinst) UINT WINAPI mov_absent(MSIHANDLE hinst) { -todo_wine { ok(hinst, !pf_exists("msitest\\canada"), "file present\n"); ok(hinst, !pf_exists("msitest\\dominica"), "file present\n"); -} return ERROR_SUCCESS; } @@ -1429,9 +1406,7 @@ UINT WINAPI pa_present(MSIHANDLE hinst) res = RegOpenKeyA(HKEY_CURRENT_USER, path_dotnet, &key); ok(hinst, !res, "got %d\n", res); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { check_reg_str(hinst, key, name_dotnet, "rcHQPHq?CA(a)Uv-XqMI1e>Z'q,T*76M@=YEg6My?~]"); -} RegCloseKey(key); return ERROR_SUCCESS; @@ -1446,9 +1421,7 @@ UINT WINAPI pa_absent(MSIHANDLE hinst) ok(hinst, !res || res == ERROR_FILE_NOT_FOUND, "got %d\n", res); if (!res) { -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { check_reg_str(hinst, key, name_dotnet, NULL); -} RegCloseKey(key); } return ERROR_SUCCESS; @@ -1481,7 +1454,6 @@ UINT WINAPI ppc_absent(MSIHANDLE hinst) UINT r; r = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ppc_key, 0, KEY_QUERY_VALUE | KEY_WOW64_64KEY, &key); -todo_wine ok(hinst, r == ERROR_FILE_NOT_FOUND, "got %u\n", r); return ERROR_SUCCESS; } @@ -1493,12 +1465,10 @@ UINT WINAPI pub_present(MSIHANDLE hinst) HKEY key; LONG res; -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyA(HKEY_CURRENT_USER, pub_key, &key); ok(hinst, !res, "got %u\n", res); res = RegQueryValueExA(key, "english.txt", NULL, NULL, NULL, NULL); ok(hinst, !res, "got %u\n", res); -} RegCloseKey(key); return ERROR_SUCCESS; } @@ -1509,7 +1479,6 @@ UINT WINAPI pub_absent(MSIHANDLE hinst) LONG res; res = RegOpenKeyA(HKEY_CURRENT_USER, pub_key, &key); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); return ERROR_SUCCESS; } @@ -1523,7 +1492,6 @@ UINT WINAPI pf_present(MSIHANDLE hinst) HKEY key; LONG res; -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyExA(HKEY_CLASSES_ROOT, pf_classkey, 0, KEY_READ | KEY_WOW64_64KEY, &key); ok(hinst, !res, "got %u\n", res); check_reg_str(hinst, key, "feature", ""); @@ -1535,7 +1503,6 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { check_reg_str(hinst, key, "feature", "VGtfp^p+,?82(a)JU1j_KE"); check_reg_str(hinst, key, "montecristo", "VGtfp^p+,?82(a)JU1j_KE"); RegCloseKey(key); -} return ERROR_SUCCESS; } @@ -1546,11 +1513,9 @@ UINT WINAPI pf_absent(MSIHANDLE hinst) LONG res; res = RegOpenKeyExA(HKEY_CLASSES_ROOT, pf_classkey, 0, KEY_READ | KEY_WOW64_64KEY, &key); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, pf_userkey, 0, KEY_READ | KEY_WOW64_64KEY, &key); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); return ERROR_SUCCESS; @@ -1579,7 +1544,6 @@ UINT WINAPI pp_absent(MSIHANDLE hinst) LONG res; res = RegOpenKeyExA(HKEY_CLASSES_ROOT, pp_prodkey, 0, KEY_READ | KEY_WOW64_64KEY, &key); -todo_wine ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); return ERROR_SUCCESS; @@ -1590,7 +1554,6 @@ UINT WINAPI rci_present(MSIHANDLE hinst) HKEY key; LONG res; -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", 0, KEY_READ | KEY_WOW64_32KEY, &key); ok(hinst, !res, "got %u\n", res); @@ -1603,7 +1566,6 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyA(HKEY_CLASSES_ROOT, "AppID\\{CFCC3B38-E683-497D-9AB4-CB40AAFE307F}", &key); ok(hinst, !res, "got %u\n", res); RegCloseKey(key); -} return ERROR_SUCCESS; } @@ -1613,7 +1575,6 @@ UINT WINAPI rci_absent(MSIHANDLE hinst) HKEY key; LONG res; -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", 0, KEY_READ | KEY_WOW64_32KEY, &key); ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); @@ -1623,7 +1584,6 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyA(HKEY_CLASSES_ROOT, "AppID\\{CFCC3B38-E683-497D-9AB4-CB40AAFE307F}", &key); ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); -} return ERROR_SUCCESS; } @@ -1633,7 +1593,6 @@ UINT WINAPI rei_present(MSIHANDLE hinst) HKEY key; LONG res; -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyA(HKEY_CLASSES_ROOT, ".extension", &key); ok(hinst, !res, "got %u\n", res); RegCloseKey(key); @@ -1641,7 +1600,6 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Prog.Id.1\\shell\\Open\\command", &key); ok(hinst, !res, "got %u\n", res); RegCloseKey(key); -} return ERROR_SUCCESS; } @@ -1651,13 +1609,11 @@ UINT WINAPI rei_absent(MSIHANDLE hinst) HKEY key; LONG res; -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyA(HKEY_CLASSES_ROOT, ".extension", &key); ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Prog.Id.1\\shell\\Open\\command", &key); ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); -} return ERROR_SUCCESS; } @@ -1672,7 +1628,6 @@ UINT WINAPI font_present(MSIHANDLE hinst) res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, font_key, 0, KEY_QUERY_VALUE | KEY_WOW64_64KEY, &key); ok(hinst, !res, "got %u\n", res); res = RegQueryValueExA(key, "msi test font", NULL, NULL, NULL, NULL); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, !res, "got %u\n", res); RegCloseKey(key); @@ -1686,9 +1641,7 @@ UINT WINAPI font_absent(MSIHANDLE hinst) res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, font_key, 0, KEY_QUERY_VALUE | KEY_WOW64_64KEY, &key); ok(hinst, !res, "got %u\n", res); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { check_reg_str(hinst, key, "msi test font", NULL); -} RegCloseKey(key); return ERROR_SUCCESS; @@ -1700,7 +1653,6 @@ UINT WINAPI rmi_present(MSIHANDLE hinst) LONG res; res = RegOpenKeyA(HKEY_CLASSES_ROOT, "MIME\\Database\\Content Type\\mime/type", &key); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, !res, "got %u\n", res); return ERROR_SUCCESS; @@ -1712,7 +1664,6 @@ UINT WINAPI rmi_absent(MSIHANDLE hinst) LONG res; res = RegOpenKeyA(HKEY_CLASSES_ROOT, "MIME\\Database\\Content Type\\mime/type", &key); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); return ERROR_SUCCESS; @@ -1740,7 +1691,6 @@ UINT WINAPI rp_absent(MSIHANDLE hinst) LONG res; res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, rp_key, 0, KEY_READ | KEY_WOW64_32KEY, &key); -todo_wine ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); return ERROR_SUCCESS; @@ -1751,7 +1701,6 @@ UINT WINAPI rpi_present(MSIHANDLE hinst) HKEY key; LONG res; -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", 0, KEY_READ | KEY_WOW64_32KEY, &key); ok(hinst, !res, "got %u\n", res); @@ -1768,7 +1717,6 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Winetest.Class.2", &key); ok(hinst, !res, "got %u\n", res); RegCloseKey(key); -} return ERROR_SUCCESS; } @@ -1778,7 +1726,6 @@ UINT WINAPI rpi_absent(MSIHANDLE hinst) HKEY key; LONG res; -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyExA(HKEY_CLASSES_ROOT, "CLSID\\{110913E7-86D1-4BF3-9922-BA103FCDDDFA}", 0, KEY_READ | KEY_WOW64_32KEY, &key); ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); @@ -1791,7 +1738,6 @@ todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { res = RegOpenKeyA(HKEY_CLASSES_ROOT, "Winetest.Class.2", &key); ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); -} return ERROR_SUCCESS; } @@ -1818,7 +1764,6 @@ UINT WINAPI ru_absent(MSIHANDLE hinst) LONG res; res = RegOpenKeyExA(HKEY_LOCAL_MACHINE, ru_key, 0, KEY_READ | KEY_WOW64_64KEY, &key); -todo_wine ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); return ERROR_SUCCESS; @@ -1833,10 +1778,8 @@ UINT WINAPI tl_present(MSIHANDLE hinst) HRESULT hr; hr = LoadRegTypeLib(&LIBID_register_test, 7, 1, 0, &tlb); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, hr == S_OK, "got %#x\n", hr); - if (tlb) - ITypeLib_Release(tlb); + ITypeLib_Release(tlb); return ERROR_SUCCESS; } @@ -1847,7 +1790,6 @@ UINT WINAPI tl_absent(MSIHANDLE hinst) HRESULT hr; hr = LoadRegTypeLib(&LIBID_register_test, 7, 1, 0, &tlb); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, hr == TYPE_E_LIBNOTREGISTERED, "got %#x\n", hr); return ERROR_SUCCESS; @@ -1859,7 +1801,6 @@ UINT WINAPI sr_present(MSIHANDLE hinst) LONG res; res = RegOpenKeyA(HKEY_CLASSES_ROOT, "selfreg_test", &key); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, !res, "got %u\n", res); RegCloseKey(key); @@ -1872,7 +1813,6 @@ UINT WINAPI sr_absent(MSIHANDLE hinst) LONG res; res = RegOpenKeyA(HKEY_CLASSES_ROOT, "selfreg_test", &key); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, res == ERROR_FILE_NOT_FOUND, "got %u\n", res); return ERROR_SUCCESS; @@ -1885,10 +1825,8 @@ UINT WINAPI env_present(MSIHANDLE hinst) res = RegOpenKeyA(HKEY_CURRENT_USER, "Environment", &key); ok(hinst, !res, "got %u\n", res); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { check_reg_str(hinst, key, "MSITESTVAR3", "1"); check_reg_str(hinst, key, "MSITESTVAR4", "1"); -} RegCloseKey(key); return ERROR_SUCCESS; @@ -1901,10 +1839,8 @@ UINT WINAPI env_absent(MSIHANDLE hinst) res = RegOpenKeyA(HKEY_CURRENT_USER, "Environment", &key); ok(hinst, !res, "got %u\n", res); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) { check_reg_str(hinst, key, "MSITESTVAR3", NULL); check_reg_str(hinst, key, "MSITESTVAR4", NULL); -} RegCloseKey(key); return ERROR_SUCCESS; @@ -1920,7 +1856,6 @@ UINT WINAPI ini_present(MSIHANDLE hinst) strcat(path, "\\msitest\\test.ini"); len = GetPrivateProfileStringA("section1", "key1", NULL, buf, sizeof(buf), path); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, len == 6, "got %u\n", len); return ERROR_SUCCESS; @@ -1936,7 +1871,6 @@ UINT WINAPI ini_absent(MSIHANDLE hinst) strcat(path, "\\msitest\\test.ini"); len = GetPrivateProfileStringA("section1", "key1", NULL, buf, sizeof(buf), path); -todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) ok(hinst, !len, "got %u\n", len); return ERROR_SUCCESS; @@ -1949,7 +1883,6 @@ UINT WINAPI wrv_present(MSIHANDLE hinst) res = RegOpenKeyA(HKEY_CURRENT_USER, "msitest", &key); ok(hinst, !res, "got %u\n", res); - todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) check_reg_str(hinst, key, "sz", "string"); RegCloseKey(key); @@ -1963,7 +1896,6 @@ UINT WINAPI wrv_absent(MSIHANDLE hinst) res = RegOpenKeyA(HKEY_CURRENT_USER, "msitest", &key); ok(hinst, !res, "got %u\n", res); - todo_wine_if(!MsiGetMode(hinst, MSIRUNMODE_SCHEDULED)) check_reg_str(hinst, key, "sz", NULL); RegCloseKey(key); diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 80137c1..e147df6 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -6086,7 +6086,6 @@ static void test_deferred_action(void) } ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); -todo_wine check_file_matches(file, "onetwo"); ok(DeleteFileA(file), "Directory not created\n"); -- 2.7.4

3 2

[PATCH] msiexec: Use the ARRAY_SIZE() macro
by Michael Stefaniuc 07 Aug '18

07 Aug '18

Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- programs/msiexec/msiexec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/msiexec/msiexec.c b/programs/msiexec/msiexec.c index 5a471a2184..47cef7e0fa 100644 --- a/programs/msiexec/msiexec.c +++ b/programs/msiexec/msiexec.c @@ -71,11 +71,11 @@ static void ShowUsage(int ExitCode) /* MsiGetFileVersion need the full path */ *filename = 0; - res = GetModuleFileNameW(hmsi, filename, sizeof(filename) / sizeof(filename[0])); + res = GetModuleFileNameW(hmsi, filename, ARRAY_SIZE(filename)); if (!res) WINE_ERR("GetModuleFileName failed: %d\n", GetLastError()); - len = sizeof(msiexec_version) / sizeof(msiexec_version[0]); + len = ARRAY_SIZE(msiexec_version); *msiexec_version = 0; res = MsiGetFileVersionW(filename, msiexec_version, &len, NULL, NULL); if (res) -- 2.14.4

2 1

[PATCH] msi: do not free hPackage twice or uninitialized (Coverity)
by Marcus Meissner 07 Aug '18

07 Aug '18

1438056 Uninitialized scalar variable Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> --- dlls/msi/custom.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/msi/custom.c b/dlls/msi/custom.c index 1a8a982e48..0d683d5a80 100644 --- a/dlls/msi/custom.c +++ b/dlls/msi/custom.c @@ -581,7 +581,6 @@ UINT CDECL __wine_msi_call_dll_function(const GUID *guid) FreeLibrary(hModule); - MsiCloseHandle(hPackage); midl_user_free(dll); midl_user_free(proc); -- 2.18.0

2 1

[PATCH] hidclass.sys: Unload all devices before unloading a minidriver
by Aric Stewart 04 Aug '18

04 Aug '18

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/hidclass.sys/hid.h | 8 ++++++++ dlls/hidclass.sys/main.c | 8 ++++++++ dlls/hidclass.sys/pnp.c | 35 +++++++++++++++++++++++++++++++---- 3 files changed, 47 insertions(+), 4 deletions(-)

2 1

[PATCH v2] winmm: Don't crash in waveOutOpen when nSamplesPerSec is 0 and add tests
by Fabian Maurer 02 Aug '18

02 Aug '18

Fixes bug 45530 v2: Fix test for XP and older Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> --- dlls/winmm/tests/wave.c | 38 ++++++++++++++++++++++++++++++++++++++ dlls/winmm/waveform.c | 6 ++++++ 2 files changed, 44 insertions(+) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index b402e21917..cfc4c726be 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1708,6 +1708,43 @@ static void test_PlaySound(void) DeleteFileA(test_file); } +static void test_waveOutOpen_invalid_parameter(void) +{ + HWAVEOUT handle; + MMRESULT ret; + WAVEFORMATEX wfx; + WAVEFORMATEX const const_wfx = { + .wFormatTag = WAVE_FORMAT_PCM, + .nChannels = 1, + .nSamplesPerSec = 11025, + .nBlockAlign = 1, + .nAvgBytesPerSec = 11025 * 1, + .wBitsPerSample = 8, + .cbSize = 0 + }; + + ret = waveOutOpen(&handle, 0, &const_wfx, 0, 0, 0); + if (ret != MMSYSERR_NOERROR) + { + skip("Could not to invalid parameter test\n"); + return; + } + waveOutClose(handle); + + /* Start actual tests */ + + wfx = const_wfx; + wfx.nAvgBytesPerSec = 0; + ret = waveOutOpen(&handle, 0, &wfx, 0, 0, 0); + ok(ret == MMSYSERR_NOERROR, "Got %d\n", ret); + waveOutClose(handle); + + wfx = const_wfx; + wfx.nSamplesPerSec = 0; + ret = waveOutOpen(&handle, 0, &wfx, 0, 0, 0); + ok(ret == MMSYSERR_INVALPARAM || ret == WAVERR_BADFORMAT, "Got %d\n", ret); /* XP and lower return WAVERR_BADFORMAT */ +} + START_TEST(wave) { test_multiple_waveopens(); @@ -1715,4 +1752,5 @@ START_TEST(wave) test_sndPlaySound(); test_fragmentsize(); test_PlaySound(); + test_waveOutOpen_invalid_parameter(); } diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index 045bf4ac20..58f830dad9 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -1106,6 +1106,12 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_OpenInfo *info, WARN("Fixing bad nAvgBytesPerSec (%u)\n", device->orig_fmt->nAvgBytesPerSec); device->orig_fmt->nAvgBytesPerSec = device->orig_fmt->nSamplesPerSec * device->orig_fmt->nBlockAlign; } + + if (info->format->nSamplesPerSec == 0) + { + ret = MMSYSERR_INVALPARAM; + goto error; + } }else{ device->orig_fmt = HeapAlloc(GetProcessHeap(), 0, sizeof(WAVEFORMATEX) + info->format->cbSize); -- 2.18.0

2 2