wine-commits September 2017

wine-commits@winehq.org

2 participants
446 discussions

Huw Davies : riched20: Don't special case the non-stretching case.
by Alexandre Julliard 14 Sep '17

14 Sep '17

Module: wine Branch: master Commit: e5345825558973f47c6300800e85e48ab2953261 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5345825558973f47c6300800… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 14 12:51:03 2017 +0100 riched20: Don't special case the non-stretching case. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/richole.c | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 335b244..0a8a32a 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -5339,16 +5339,9 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) sz.cx = MulDiv(sz.cx, c->editor->nZoomNumerator, c->editor->nZoomDenominator); sz.cy = MulDiv(sz.cy, c->editor->nZoomNumerator, c->editor->nZoomDenominator); } - if (sz.cx == dibsect.dsBm.bmWidth && sz.cy == dibsect.dsBm.bmHeight) - { - BitBlt(c->hDC, x, y - sz.cy, - dibsect.dsBm.bmWidth, dibsect.dsBm.bmHeight, - hMemDC, 0, 0, SRCCOPY); - } else { - StretchBlt(c->hDC, x, y - sz.cy, sz.cx, sz.cy, - hMemDC, 0, 0, dibsect.dsBm.bmWidth, - dibsect.dsBm.bmHeight, SRCCOPY); - } + StretchBlt(c->hDC, x, y - sz.cy, sz.cx, sz.cy, + hMemDC, 0, 0, dibsect.dsBm.bmWidth, dibsect.dsBm.bmHeight, SRCCOPY); + SelectObject(hMemDC, old_bm); DeleteDC(hMemDC); break;

1 0

Huw Davies : riched20: Correctly release the STGMEDIUM.
by Alexandre Julliard 14 Sep '17

14 Sep '17

Module: wine Branch: master Commit: 9249f7c4e709dab009d2c87a0826c7ffb7f31b6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=9249f7c4e709dab009d2c87a0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 14 12:51:02 2017 +0100 riched20: Correctly release the STGMEDIUM. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/richole.c | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index 98cee74..335b244 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -5257,6 +5257,7 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) return; } } + IDataObject_Release(ido); switch (stgm.tymed) { @@ -5264,19 +5265,17 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) GetObjectW(stgm.u.hBitmap, sizeof(dibsect), &dibsect); pSize->cx = dibsect.dsBm.bmWidth; pSize->cy = dibsect.dsBm.bmHeight; - if (!stgm.pUnkForRelease) DeleteObject(stgm.u.hBitmap); break; case TYMED_ENHMF: GetEnhMetaFileHeader(stgm.u.hEnhMetaFile, sizeof(emh), &emh); pSize->cx = emh.rclBounds.right - emh.rclBounds.left; pSize->cy = emh.rclBounds.bottom - emh.rclBounds.top; - if (!stgm.pUnkForRelease) DeleteEnhMetaFile(stgm.u.hEnhMetaFile); break; default: FIXME("Unsupported tymed %d\n", stgm.tymed); break; } - IDataObject_Release(ido); + ReleaseStgMedium(&stgm); if (c->editor->nZoomNumerator != 0) { pSize->cx = MulDiv(pSize->cx, c->editor->nZoomNumerator, c->editor->nZoomDenominator); @@ -5294,6 +5293,7 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) HDC hMemDC; SIZE sz; BOOL has_size; + HBITMAP old_bm; assert(run->nFlags & MERF_GRAPHICS); assert(run->ole_obj); @@ -5319,12 +5319,14 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) return; } } + IDataObject_Release(ido); + switch (stgm.tymed) { case TYMED_GDI: GetObjectW(stgm.u.hBitmap, sizeof(dibsect), &dibsect); hMemDC = CreateCompatibleDC(c->hDC); - SelectObject(hMemDC, stgm.u.hBitmap); + old_bm = SelectObject(hMemDC, stgm.u.hBitmap); if (has_size) { convert_sizel(c, &run->ole_obj->sizel, &sz); @@ -5347,8 +5349,8 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) hMemDC, 0, 0, dibsect.dsBm.bmWidth, dibsect.dsBm.bmHeight, SRCCOPY); } + SelectObject(hMemDC, old_bm); DeleteDC(hMemDC); - if (!stgm.pUnkForRelease) DeleteObject(stgm.u.hBitmap); break; case TYMED_ENHMF: GetEnhMetaFileHeader(stgm.u.hEnhMetaFile, sizeof(emh), &emh); @@ -5374,16 +5376,16 @@ void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) rc.bottom = y; PlayEnhMetaFile(c->hDC, stgm.u.hEnhMetaFile, &rc); } - if (!stgm.pUnkForRelease) DeleteEnhMetaFile(stgm.u.hEnhMetaFile); break; default: FIXME("Unsupported tymed %d\n", stgm.tymed); selected = FALSE; break; } + ReleaseStgMedium(&stgm); + if (selected && !c->editor->bHideSelection) PatBlt(c->hDC, x, y - sz.cy, sz.cx, sz.cy, DSTINVERT); - IDataObject_Release(ido); } void ME_DeleteReObject(REOBJECT* reo)

1 0

Huw Davies : riched20: Remove an unused parameter.
by Alexandre Julliard 14 Sep '17

14 Sep '17

Module: wine Branch: master Commit: 3cc1ef6bcae68fbc2bc3c46ce3b9f6cf36d176d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3cc1ef6bcae68fbc2bc3c46ce… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Sep 14 12:51:01 2017 +0100 riched20: Remove an unused parameter. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/editor.h | 2 +- dlls/riched20/paint.c | 2 +- dlls/riched20/richole.c | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 53c41a9..aba3026 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -248,7 +248,7 @@ int ME_GetParaBorderWidth(const ME_Context *c, int flags) DECLSPEC_HIDDEN; /* richole.c */ LRESULT CreateIRichEditOle(IUnknown *outer_unk, ME_TextEditor *editor, LPVOID *ppvObj) DECLSPEC_HIDDEN; -void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run* run, ME_Paragraph *para, BOOL selected) DECLSPEC_HIDDEN; +void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run* run, BOOL selected) DECLSPEC_HIDDEN; void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) DECLSPEC_HIDDEN; void ME_CopyReObject(REOBJECT* dst, const REOBJECT* src) DECLSPEC_HIDDEN; void ME_DeleteReObject(REOBJECT* reo) DECLSPEC_HIDDEN; diff --git a/dlls/riched20/paint.c b/dlls/riched20/paint.c index 41b3896..b4b6697 100644 --- a/dlls/riched20/paint.c +++ b/dlls/riched20/paint.c @@ -481,7 +481,7 @@ static void ME_DrawRun(ME_Context *c, int x, int y, ME_DisplayItem *rundi, ME_Pa } if (run->nFlags & MERF_GRAPHICS) - ME_DrawOLE(c, x, y, run, para, (runofs >= nSelFrom) && (runofs < nSelTo)); + ME_DrawOLE(c, x, y, run, (runofs >= nSelFrom) && (runofs < nSelTo)); else { ME_DrawTextWithStyle(c, run, x, y, nSelFrom - runofs, nSelTo - runofs, diff --git a/dlls/riched20/richole.c b/dlls/riched20/richole.c index dbb21b2..98cee74 100644 --- a/dlls/riched20/richole.c +++ b/dlls/riched20/richole.c @@ -5284,8 +5284,7 @@ void ME_GetOLEObjectSize(const ME_Context *c, ME_Run *run, SIZE *pSize) } } -void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, - ME_Paragraph *para, BOOL selected) +void ME_DrawOLE(ME_Context *c, int x, int y, ME_Run *run, BOOL selected) { IDataObject* ido; FORMATETC fmt;

1 0

Alexandre Julliard : kernel32/tests: Avoid some delays in the process test.
by Alexandre Julliard 14 Sep '17

14 Sep '17

Module: wine Branch: master Commit: 47ddc57571f549128773888cc1c8cb3d7304b920 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47ddc57571f549128773888cc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 14 17:31:55 2017 +0200 kernel32/tests: Avoid some delays in the process test. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/process.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c index c480a27..7e8ef16 100644 --- a/dlls/kernel32/tests/process.c +++ b/dlls/kernel32/tests/process.c @@ -1382,7 +1382,7 @@ static void test_SuspendFlag(void) ok(CreateProcessA(NULL, buffer, NULL, NULL, FALSE, CREATE_SUSPENDED, NULL, NULL, &startup, &info), "CreateProcess\n"); ok(GetExitCodeThread(info.hThread, &exit_status) && exit_status == STILL_ACTIVE, "thread still running\n"); - Sleep(8000); + Sleep(1000); ok(GetExitCodeThread(info.hThread, &exit_status) && exit_status == STILL_ACTIVE, "thread still running\n"); ok(ResumeThread(info.hThread) == 1, "Resuming thread\n"); @@ -1652,6 +1652,9 @@ static void test_Console(void) ok(ReadFile(hParentIn, buffer, sizeof(buffer), &w, NULL), "Reading from child\n"); ok(strcmp(buffer, msg) == 0, "Should have received '%s'\n", msg); + /* the child may also send the final "n tests executed" string, so read it to avoid a deadlock */ + ReadFile(hParentIn, buffer, sizeof(buffer), &w, NULL); + /* wait for child to terminate */ ok(WaitForSingleObject(info.hProcess, 30000) == WAIT_OBJECT_0, "Child process termination\n"); /* child process has changed result file, so let profile functions know about it */

1 0

Nikolay Sivov : dwrite/tests: Added a helper to initialize test text source.
by Alexandre Julliard 14 Sep '17

14 Sep '17

Module: wine Branch: master Commit: 39dbf09b3fe28ac8aaf31bd35ea569ca6478991e URL: http://source.winehq.org/git/wine.git/?a=commit;h=39dbf09b3fe28ac8aaf31bd35… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Sep 14 11:40:10 2017 +0300 dwrite/tests: Added a helper to initialize test text source. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/tests/analyzer.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/dwrite/tests/analyzer.c b/dlls/dwrite/tests/analyzer.c index 2e2a2e9..c5a0b09 100644 --- a/dlls/dwrite/tests/analyzer.c +++ b/dlls/dwrite/tests/analyzer.c @@ -367,9 +367,18 @@ struct testanalysissource { IDWriteTextAnalysisSource IDWriteTextAnalysisSource_iface; const WCHAR *text; + UINT32 text_length; DWRITE_READING_DIRECTION direction; }; +static void init_textsource(struct testanalysissource *source, const WCHAR *text, + DWRITE_READING_DIRECTION direction) +{ + source->text = text; + source->text_length = lstrlenW(text); + source->direction = direction; +}; + static inline struct testanalysissource *impl_from_IDWriteTextAnalysisSource(IDWriteTextAnalysisSource *iface) { return CONTAINING_RECORD(iface, struct testanalysissource, IDWriteTextAnalysisSource_iface); @@ -380,7 +389,7 @@ static HRESULT WINAPI analysissource_GetTextAtPosition(IDWriteTextAnalysisSource { struct testanalysissource *source = impl_from_IDWriteTextAnalysisSource(iface); - if (position >= lstrlenW(source->text)) + if (position >= source->text_length) { *text = NULL; *text_len = 0; @@ -388,7 +397,7 @@ static HRESULT WINAPI analysissource_GetTextAtPosition(IDWriteTextAnalysisSource else { *text = source->text + position; - *text_len = lstrlenW(source->text) - position; + *text_len = source->text_length - position; } return S_OK; @@ -998,7 +1007,7 @@ static void get_script_analysis(const WCHAR *str, DWRITE_SCRIPT_ANALYSIS *sa) IDWriteTextAnalyzer *analyzer; HRESULT hr; - analysissource.text = str; + init_textsource(&analysissource, str, DWRITE_READING_DIRECTION_LEFT_TO_RIGHT); hr = IDWriteFactory_CreateTextAnalyzer(factory, &analyzer); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1020,7 +1029,7 @@ static void test_AnalyzeScript(void) while (*ptr->string) { - analysissource.text = ptr->string; + init_textsource(&analysissource, ptr->string, DWRITE_READING_DIRECTION_LEFT_TO_RIGHT); init_expected_sa(expected_seq, ptr); hr = IDWriteTextAnalyzer_AnalyzeScript(analyzer, &analysissource.IDWriteTextAnalysisSource_iface, 0, @@ -1122,7 +1131,7 @@ static void test_AnalyzeLineBreakpoints(void) hr = IDWriteFactory_CreateTextAnalyzer(factory, &analyzer); ok(hr == S_OK, "got 0x%08x\n", hr); - analysissource.text = emptyW; + init_textsource(&analysissource, emptyW, DWRITE_READING_DIRECTION_LEFT_TO_RIGHT); hr = IDWriteTextAnalyzer_AnalyzeLineBreakpoints(analyzer, &analysissource.IDWriteTextAnalysisSource_iface, 0, 0, &analysissink); ok(hr == S_OK, "got 0x%08x\n", hr); @@ -1131,9 +1140,9 @@ static void test_AnalyzeLineBreakpoints(void) { UINT32 len; - analysissource.text = ptr->text; - len = lstrlenW(ptr->text); + init_textsource(&analysissource, ptr->text, DWRITE_READING_DIRECTION_LEFT_TO_RIGHT); + len = lstrlenW(ptr->text); if (len > BREAKPOINT_COUNT) { ok(0, "test %u: increase BREAKPOINT_COUNT to at least %u\n", i, len); i++; @@ -2414,10 +2423,9 @@ static void test_AnalyzeBidi(void) { UINT32 len; - analysissource.text = ptr->text; - len = lstrlenW(ptr->text); - analysissource.direction = ptr->direction; + init_textsource(&analysissource, ptr->text, ptr->direction); + len = lstrlenW(ptr->text); if (len > BIDI_LEVELS_COUNT) { ok(0, "test %u: increase BIDI_LEVELS_COUNT to at least %u\n", i, len); i++;

1 0

Zebediah Figura : msi/tests: Add external UI tests for top-level actions.
by Alexandre Julliard 14 Sep '17

14 Sep '17

Module: wine Branch: master Commit: 042de13cff79e97eda9a3d95ea7d5ed84f11c6d6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=042de13cff79e97eda9a3d95e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 14 01:03:57 2017 -0500 msi/tests: Add external UI tests for top-level actions. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/tests/package.c | 270 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 270 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=042de13cff79e97eda9a3…

1 0

Zebediah Figura : msi/tests: Some cleanup for external UI tests.
by Alexandre Julliard 14 Sep '17

14 Sep '17

Module: wine Branch: master Commit: 13cb6a5b781cddd78ead55666a74733d08305dd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13cb6a5b781cddd78ead55666… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 14 01:03:56 2017 -0500 msi/tests: Some cleanup for external UI tests. 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> --- dlls/msi/tests/package.c | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) diff --git a/dlls/msi/tests/package.c b/dlls/msi/tests/package.c index c00ed61..c11da0f 100644 --- a/dlls/msi/tests/package.c +++ b/dlls/msi/tests/package.c @@ -9301,7 +9301,7 @@ static void ok_sequence_(const struct externalui_message *expected, const char * { if (expected->message == actual->message) { - if (expected->field_count != actual->field_count) + if (expected->field_count < actual->field_count) { todo_wine_if (todo) ok_(file, line) (FALSE, "%s: in msg 0x%08x expecting field count %d got %d\n", @@ -9323,6 +9323,10 @@ static void ok_sequence_(const struct externalui_message *expected, const char * expected++; actual++; } + else if (expected->optional) + { + expected++; + } else { todo_wine_if (todo) @@ -9357,6 +9361,26 @@ done: #define ok_sequence(exp, contx, todo) \ ok_sequence_((exp), (contx), (todo), __FILE__, __LINE__) +/* don't use PROGRESS, which is timing-dependent, + * or SHOWDIALOG, which due to a bug causes a hang on XP */ +static const INSTALLLOGMODE MSITEST_INSTALLLOGMODE = + INSTALLLOGMODE_FATALEXIT | + INSTALLLOGMODE_ERROR | + INSTALLLOGMODE_WARNING | + INSTALLLOGMODE_USER | + INSTALLLOGMODE_INFO | + INSTALLLOGMODE_FILESINUSE | + INSTALLLOGMODE_RESOLVESOURCE | + INSTALLLOGMODE_OUTOFDISKSPACE | + INSTALLLOGMODE_ACTIONSTART | + INSTALLLOGMODE_ACTIONDATA | + INSTALLLOGMODE_COMMONDATA | + INSTALLLOGMODE_INITIALIZE | + INSTALLLOGMODE_TERMINATE | + INSTALLLOGMODE_RMFILESINUSE | + INSTALLLOGMODE_INSTALLSTART | + INSTALLLOGMODE_INSTALLEND; + static const struct externalui_message empty_sequence[] = { {0} }; @@ -9534,9 +9558,8 @@ static void test_externalui_message(void) MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); - /* processing SHOWDIALOG with a record handler causes a crash on XP */ MsiSetExternalUIA(externalui_message_string_callback, INSTALLLOGMODE_SHOWDIALOG, &retval); - r = MsiSetExternalUIRecord(externalui_message_callback, 0xffffffff ^ INSTALLLOGMODE_PROGRESS ^ INSTALLLOGMODE_SHOWDIALOG, &retval, &prev); + r = MsiSetExternalUIRecord(externalui_message_callback, MSITEST_INSTALLLOGMODE, &retval, &prev); flush_sequence(); @@ -9759,9 +9782,8 @@ static void test_controlevent(void) MsiSetInternalUI(INSTALLUILEVEL_FULL, NULL); - /* processing SHOWDIALOG with a record handler causes a crash on XP */ MsiSetExternalUIA(externalui_message_string_callback, INSTALLLOGMODE_SHOWDIALOG, NULL); - r = MsiSetExternalUIRecord(externalui_message_callback, 0xffffffff ^ INSTALLLOGMODE_PROGRESS ^ INSTALLLOGMODE_SHOWDIALOG, NULL, &prev); + r = MsiSetExternalUIRecord(externalui_message_callback, MSITEST_INSTALLLOGMODE, NULL, &prev); flush_sequence();

1 0

Zebediah Figura : msi: Perform the given action, or INSTALL, from MsiInstallProduct().
by Alexandre Julliard 14 Sep '17

14 Sep '17

Module: wine Branch: master Commit: 92118091f8ef9e5993d82bf1d83f639d25ae3d93 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92118091f8ef9e5993d82bf1d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 14 01:03:55 2017 -0500 msi: Perform the given action, or INSTALL, from MsiInstallProduct(). The removed code to re-run all actions after InstallValidate is old and not supported by tests. 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> --- dlls/msi/action.c | 49 ++++++++++++------------------------------------ dlls/msi/tests/install.c | 1 + 2 files changed, 13 insertions(+), 37 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 26acd51..24ada64 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -546,22 +546,15 @@ UINT MSI_Sequence( MSIPACKAGE *package, LPCWSTR table ) return r; } -static UINT ACTION_ProcessExecSequence(MSIPACKAGE *package, BOOL UIran) +static UINT ACTION_ProcessExecSequence(MSIPACKAGE *package) { static const WCHAR query[] = { 'S','E','L','E','C','T',' ','*',' ', 'F','R','O','M',' ', '`','I','n','s','t','a','l','l','E','x','e','c','u','t','e', 'S','e','q','u','e','n','c','e','`',' ', 'W','H','E','R','E',' ', - '`','S','e','q','u','e','n','c','e','`',' ', '>',' ','%','i',' ', + '`','S','e','q','u','e','n','c','e','`',' ', '>',' ','0',' ', 'O','R','D','E','R',' ', 'B','Y',' ','`','S','e','q','u','e','n','c','e','`',0}; - static const WCHAR query_validate[] = { - 'S','E','L','E','C','T',' ','`','S','e','q','u','e','n','c','e','`', - ' ', 'F','R','O','M',' ','`','I','n','s','t','a','l','l', - 'E','x','e','c','u','t','e','S','e','q','u','e','n','c','e','`',' ', - 'W','H','E','R','E',' ','`','A','c','t','i','o','n','`',' ','=', - ' ','\'', 'I','n','s','t','a','l','l','V','a','l','i','d','a','t','e','\'',0}; MSIQUERY *view; - INT seq = 0; UINT rc; if (package->script->ExecuteSequenceRun) @@ -572,15 +565,7 @@ static UINT ACTION_ProcessExecSequence(MSIPACKAGE *package, BOOL UIran) package->script->ExecuteSequenceRun = TRUE; - /* get the sequence number */ - if (UIran) - { - MSIRECORD *row = MSI_QueryGetRecord(package->db, query_validate); - if (!row) return ERROR_FUNCTION_FAILED; - seq = MSI_RecordGetInteger(row,1); - msiobj_release(&row->hdr); - } - rc = MSI_OpenQuery(package->db, &view, query, seq); + rc = MSI_OpenQuery(package->db, &view, query); if (rc == ERROR_SUCCESS) { TRACE("Running the actions\n"); @@ -5633,7 +5618,7 @@ static UINT ACTION_ExecuteAction(MSIPACKAGE *package) /* Perform the installation. Always use the ExecuteSequence. */ package->script->InWhatSequence |= SEQUENCE_EXEC; - rc = ACTION_ProcessExecSequence(package, FALSE); + rc = ACTION_ProcessExecSequence(package); /* Send return value and INSTALLEND. */ ui_actioninfo(package, szINSTALL, FALSE, !rc); @@ -7970,12 +7955,9 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, { static const WCHAR szDisableRollback[] = {'D','I','S','A','B','L','E','R','O','L','L','B','A','C','K',0}; static const WCHAR szAction[] = {'A','C','T','I','O','N',0}; - static const WCHAR szInstall[] = {'I','N','S','T','A','L','L',0}; - WCHAR *reinstall, *remove, *patch, *productcode; - BOOL ui_exists; + WCHAR *reinstall, *remove, *patch, *productcode, *action; UINT rc; - - msi_set_property( package->db, szAction, szInstall, -1 ); + DWORD len = 0; package->script->InWhatSequence = SEQUENCE_INSTALL; @@ -8031,6 +8013,10 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, msi_set_property( package->db, szReinstall, szAll, -1 ); package->full_reinstall = 1; } + if (msi_get_property( package->db, szAction, NULL, &len )) + msi_set_property( package->db, szAction, szINSTALL, -1 ); + action = msi_dup_property( package->db, szAction ); + CharUpperW(action); msi_set_original_database_property( package->db, szPackagePath ); msi_parse_command_line( package, szCommandLine, FALSE ); @@ -8052,19 +8038,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, msi_set_property( package->db, szRollbackDisabled, szOne, -1 ); } - if (needs_ui_sequence( package)) - { - package->script->InWhatSequence |= SEQUENCE_UI; - rc = ACTION_ProcessUISequence(package); - ui_exists = ui_sequence_exists(package); - if (rc == ERROR_SUCCESS || !ui_exists) - { - package->script->InWhatSequence |= SEQUENCE_EXEC; - rc = ACTION_ProcessExecSequence(package, ui_exists); - } - } - else - rc = ACTION_ProcessExecSequence(package, FALSE); + rc = ACTION_PerformAction(package, action, SCRIPT_NONE); /* process the ending type action */ if (rc == ERROR_SUCCESS) @@ -8093,6 +8067,7 @@ UINT MSI_InstallPackage( MSIPACKAGE *package, LPCWSTR szPackagePath, msi_free( reinstall ); msi_free( remove ); msi_free( patch ); + msi_free( action ); if (rc == ERROR_SUCCESS && package->need_reboot_at_end) return ERROR_SUCCESS_REBOOT_REQUIRED; diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index 9d4fecc..dd3e6a3 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -3860,6 +3860,7 @@ static void test_admin(void) ok(!RemoveDirectoryA("c:\\msitest"), "File installed\n"); r = MsiInstallProductA(msifile, "ACTION=ADMIN"); + todo_wine ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); ok(!delete_pf("msitest\\augustus", TRUE), "File installed\n"); ok(!delete_pf("msitest", FALSE), "Directory created\n");

1 0

Zebediah Figura : msi: Implement the INSTALL top-level action.
by Alexandre Julliard 14 Sep '17

14 Sep '17

Module: wine Branch: master Commit: 26493d316c16406539d2836e9d748fd50d6440db URL: http://source.winehq.org/git/wine.git/?a=commit;h=26493d316c16406539d2836e9… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 14 01:03:54 2017 -0500 msi: Implement the INSTALL top-level action. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/action.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index eee9ba8..26acd51 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -5681,6 +5681,18 @@ end: return rc; } +static UINT ACTION_INSTALL(MSIPACKAGE *package) +{ + msi_set_property(package->db, szEXECUTEACTION, szINSTALL, -1); + if (needs_ui_sequence(package) && ui_sequence_exists(package)) + { + package->script->InWhatSequence |= SEQUENCE_UI; + return ACTION_ProcessUISequence(package); + } + else + return ACTION_ExecuteAction(package); +} + WCHAR *msi_create_component_advertise_string( MSIPACKAGE *package, MSICOMPONENT *component, const WCHAR *feature ) { static const WCHAR fmt[] = {'%','s','%','s','%','c','%','s',0}; @@ -7832,6 +7844,7 @@ StandardActions[] = { szWriteEnvironmentStrings, IDS_DESC_WRITEENVIRONMENTSTRINGS, IDS_TEMP_WRITEENVIRONMENTSTRINGS, ACTION_WriteEnvironmentStrings, szRemoveEnvironmentStrings }, { szWriteIniValues, IDS_DESC_WRITEINIVALUES, IDS_TEMP_WRITEINIVALUES, ACTION_WriteIniValues, szRemoveIniValues }, { szWriteRegistryValues, IDS_DESC_WRITEREGISTRYVALUES, IDS_TEMP_WRITEREGISTRYVALUES, ACTION_WriteRegistryValues, szRemoveRegistryValues }, + { szINSTALL, 0, 0, ACTION_INSTALL, NULL }, { 0 } };

1 0

Zebediah Figura : msi: More fully implement the ExecuteAction action.
by Alexandre Julliard 14 Sep '17

14 Sep '17

Module: wine Branch: master Commit: 5c39852c1e708cb7b76da5c1230810999aea7420 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c39852c1e708cb7b76da5c12… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Sep 14 01:03:53 2017 -0500 msi: More fully implement the ExecuteAction action. Major changes are adding several new UI messages (many of obscure purpose), and executing the action given in the EXECUTEACTION property rather than always running the InstallExecuteSequence table. 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> --- dlls/msi/action.c | 115 ++++++++++++++++++++++++++++++++++++++++++++++++++++- dlls/msi/msipriv.h | 1 + dlls/msi/package.c | 2 + 3 files changed, 116 insertions(+), 2 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index c4b35cc..eee9ba8 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -157,6 +157,8 @@ static const WCHAR szValidateProductID[] = {'V','a','l','i','d','a','t','e','P','r','o','d','u','c','t','I','D',0}; static const WCHAR szWriteEnvironmentStrings[] = {'W','r','i','t','e','E','n','v','i','r','o','n','m','e','n','t','S','t','r','i','n','g','s',0}; +static const WCHAR szINSTALL[] = + {'I','N','S','T','A','L','L',0}; static INT ui_actionstart(MSIPACKAGE *package, LPCWSTR action, LPCWSTR description, LPCWSTR template) { @@ -5560,13 +5562,122 @@ end: return rc; } +static UINT iterate_properties(MSIRECORD *record, void *param) +{ + static const WCHAR prop_template[] = + {'P','r','o','p','e','r','t','y','(','S',')',':',' ','[','1',']',' ','=',' ','[','2',']',0}; + MSIRECORD *uirow; + + uirow = MSI_CloneRecord(record); + if (!uirow) return ERROR_OUTOFMEMORY; + MSI_RecordSetStringW(uirow, 0, prop_template); + MSI_ProcessMessage(param, INSTALLMESSAGE_INFO|MB_ICONHAND, uirow); + msiobj_release(&uirow->hdr); + + return ERROR_SUCCESS; +} + static UINT ACTION_ExecuteAction(MSIPACKAGE *package) { + static const WCHAR prop_query[] = + {'S','E','L','E','C','T',' ','*',' ','F','R','O','M',' ','`','_','P','r','o','p','e','r','t','y','`',0}; + WCHAR *productname; + WCHAR *action; + MSIQUERY *view; + MSIRECORD *uirow; UINT rc; - package->script->InWhatSequence |= SEQUENCE_EXEC; - rc = ACTION_ProcessExecSequence(package,FALSE); + /* Send COMMONDATA and INFO messages. */ + /* FIXME: when should these messages be sent? [see also MsiOpenPackage()] */ + uirow = MSI_CreateRecord(3); + if (!uirow) return ERROR_OUTOFMEMORY; + MSI_RecordSetStringW(uirow, 0, NULL); + MSI_RecordSetInteger(uirow, 1, 0); + MSI_RecordSetInteger(uirow, 2, package->num_langids ? package->langids[0] : 0); + MSI_RecordSetInteger(uirow, 3, msi_get_string_table_codepage(package->db->strings)); + MSI_ProcessMessageVerbatim(package, INSTALLMESSAGE_COMMONDATA, uirow); + /* FIXME: send INSTALLMESSAGE_PROGRESS */ + MSI_ProcessMessageVerbatim(package, INSTALLMESSAGE_COMMONDATA, uirow); + MSI_ProcessMessage(package, INSTALLMESSAGE_COMMONDATA, uirow); + + productname = msi_dup_property(package->db, INSTALLPROPERTY_PRODUCTNAMEW); + MSI_RecordSetInteger(uirow, 1, 1); + MSI_RecordSetStringW(uirow, 2, productname); + MSI_RecordSetStringW(uirow, 3, NULL); + MSI_ProcessMessage(package, INSTALLMESSAGE_COMMONDATA, uirow); + msiobj_release(&uirow->hdr); + + package->LastActionResult = MSI_NULL_INTEGER; + + action = msi_dup_property(package->db, szEXECUTEACTION); + if (!action) action = msi_strdupW(szINSTALL, strlenW(szINSTALL)); + + /* Perform the action. Top-level actions trigger a sequence. */ + if (!strcmpW(action, szINSTALL)) + { + /* Send ACTIONSTART/INFO and INSTALLSTART. */ + ui_actionstart(package, szINSTALL, NULL, NULL); + ui_actioninfo(package, szINSTALL, TRUE, 0); + uirow = MSI_CreateRecord(2); + if (!uirow) + { + rc = ERROR_OUTOFMEMORY; + goto end; + } + MSI_RecordSetStringW(uirow, 0, NULL); + MSI_RecordSetStringW(uirow, 1, productname); + MSI_RecordSetStringW(uirow, 2, package->ProductCode); + MSI_ProcessMessage(package, INSTALLMESSAGE_INSTALLSTART, uirow); + msiobj_release(&uirow->hdr); + + /* Perform the installation. Always use the ExecuteSequence. */ + package->script->InWhatSequence |= SEQUENCE_EXEC; + rc = ACTION_ProcessExecSequence(package, FALSE); + + /* Send return value and INSTALLEND. */ + ui_actioninfo(package, szINSTALL, FALSE, !rc); + uirow = MSI_CreateRecord(3); + if (!uirow) + { + rc = ERROR_OUTOFMEMORY; + goto end; + } + MSI_RecordSetStringW(uirow, 0, NULL); + MSI_RecordSetStringW(uirow, 1, productname); + MSI_RecordSetStringW(uirow, 2, package->ProductCode); + MSI_RecordSetInteger(uirow, 3, !rc); + MSI_ProcessMessage(package, INSTALLMESSAGE_INSTALLEND, uirow); + msiobj_release(&uirow->hdr); + } + else + rc = ACTION_PerformAction(package, action, SCRIPT_NONE); + + /* Send all set properties. */ + if (!MSI_OpenQuery(package->db, &view, prop_query)) + { + MSI_IterateRecords(view, NULL, iterate_properties, package); + msiobj_release(&view->hdr); + } + + /* And finally, toggle the cancel off and on. */ + uirow = MSI_CreateRecord(2); + if (!uirow) + { + rc = ERROR_OUTOFMEMORY; + goto end; + } + MSI_RecordSetStringW(uirow, 0, NULL); + MSI_RecordSetInteger(uirow, 1, 2); + MSI_RecordSetInteger(uirow, 2, 0); + MSI_ProcessMessageVerbatim(package, INSTALLMESSAGE_COMMONDATA, uirow); + MSI_RecordSetInteger(uirow, 2, 1); + MSI_ProcessMessageVerbatim(package, INSTALLMESSAGE_COMMONDATA, uirow); + msiobj_release(&uirow->hdr); + +end: + msi_free(productname); + msi_free(action); return rc; } diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 9b3d77c..a25ea31 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -1203,6 +1203,7 @@ static const WCHAR szLangResource[] = {'\\','V','a','r','F','i','l','e','I','n', static const WCHAR szInstallLocation[] = {'I','n','s','t','a','l','l','L','o','c','a','t','i','o','n',0}; static const WCHAR szProperty[] = {'P','r','o','p','e','r','t','y',0}; static const WCHAR szUninstallable[] = {'U','n','i','n','s','t','a','l','l','a','b','l','e',0}; +static const WCHAR szEXECUTEACTION[] = {'E','X','E','C','U','T','E','A','C','T','I','O','N',0}; /* memory allocation macro functions */ static void *msi_alloc( size_t len ) __WINE_ALLOC_SIZE(1); diff --git a/dlls/msi/package.c b/dlls/msi/package.c index 3673069..7c6ca84 100644 --- a/dlls/msi/package.c +++ b/dlls/msi/package.c @@ -1763,6 +1763,8 @@ static INT internal_ui_handler(MSIPACKAGE *package, INSTALLMESSAGE eMessageType, case INSTALLMESSAGE_INFO: case INSTALLMESSAGE_INITIALIZE: case INSTALLMESSAGE_TERMINATE: + case INSTALLMESSAGE_INSTALLSTART: + case INSTALLMESSAGE_INSTALLEND: return 0; case INSTALLMESSAGE_SHOWDIALOG: {

1 0

← Newer
1
...
25
26
27
28
29
30
31
...
45
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits September 2017