September 2017 - Wine-Commits

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

Sept. 14, 2017

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 Sept. 14, 2017

Sept. 14, 2017

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 Sept. 14, 2017

Sept. 14, 2017

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

Dmitry Timoshkov : windowscodecs: Implement IWICBitmapDecoder:: CopyPalette in TIFF decoder.
by Alexandre Julliard Sept. 14, 2017

Sept. 14, 2017

Module: wine Branch: master Commit: 730f2bd132cd9b71a6635022f48f9836f0858610 URL: http://source.winehq.org/git/wine.git/?a=commit;h=730f2bd132cd9b71a6635022f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 13 15:12:40 2017 -0500 windowscodecs: Implement IWICBitmapDecoder::CopyPalette in TIFF decoder. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tiffformat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/tiffformat.c b/dlls/windowscodecs/tiffformat.c index b613409..d14a4b0 100644 --- a/dlls/windowscodecs/tiffformat.c +++ b/dlls/windowscodecs/tiffformat.c @@ -683,10 +683,10 @@ static HRESULT WINAPI TiffDecoder_GetDecoderInfo(IWICBitmapDecoder *iface, } static HRESULT WINAPI TiffDecoder_CopyPalette(IWICBitmapDecoder *iface, - IWICPalette *pIPalette) + IWICPalette *palette) { - FIXME("(%p,%p): stub\n", iface, pIPalette); - return E_NOTIMPL; + TRACE("(%p,%p)\n", iface, palette); + return WINCODEC_ERR_PALETTEUNAVAILABLE; } static HRESULT WINAPI TiffDecoder_GetMetadataQueryReader(IWICBitmapDecoder *iface,

1 0

Dmitry Timoshkov : windowscodecs: Implement IWICBitmapFrameEncode:: SetPalette in BMP encoder.
by Alexandre Julliard Sept. 14, 2017

Sept. 14, 2017

Module: wine Branch: master Commit: f515878cad07f3e5f41411cd75eff5326e644fd0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f515878cad07f3e5f41411cd7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Sep 13 15:12:39 2017 -0500 windowscodecs: Implement IWICBitmapFrameEncode::SetPalette in BMP encoder. Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/bmpencode.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/windowscodecs/bmpencode.c b/dlls/windowscodecs/bmpencode.c index c09b542..48a8e27 100644 --- a/dlls/windowscodecs/bmpencode.c +++ b/dlls/windowscodecs/bmpencode.c @@ -67,6 +67,8 @@ typedef struct BmpFrameEncode { double xres, yres; UINT lineswritten; UINT stride; + WICColor palette[256]; + UINT colors; BOOL committed; } BmpFrameEncode; @@ -197,10 +199,18 @@ static HRESULT WINAPI BmpFrameEncode_SetColorContexts(IWICBitmapFrameEncode *ifa } static HRESULT WINAPI BmpFrameEncode_SetPalette(IWICBitmapFrameEncode *iface, - IWICPalette *pIPalette) + IWICPalette *palette) { - FIXME("(%p,%p): stub\n", iface, pIPalette); - return WINCODEC_ERR_UNSUPPORTEDOPERATION; + BmpFrameEncode *This = impl_from_IWICBitmapFrameEncode(iface); + + TRACE("(%p,%p)\n", iface, palette); + + if (!palette) return E_INVALIDARG; + + if (!This->initialized) + return WINCODEC_ERR_NOTINITIALIZED; + + return IWICPalette_GetColors(palette, 256, This->palette, &This->colors); } static HRESULT WINAPI BmpFrameEncode_SetThumbnail(IWICBitmapFrameEncode *iface, @@ -520,6 +530,7 @@ static HRESULT WINAPI BmpEncoder_CreateNewFrame(IWICBitmapEncoder *iface, encode->xres = 0.0; encode->yres = 0.0; encode->lineswritten = 0; + encode->colors = 0; encode->committed = FALSE; *ppIFrameEncode = &encode->IWICBitmapFrameEncode_iface;

1 0

Jacek Caban : mshtml: Forward IHTMLElement6:: get_tagName to IHTMLElement implementation.
by Alexandre Julliard Sept. 13, 2017

Sept. 13, 2017

Module: wine Branch: master Commit: a3ba3ac48e3759d2d5d834a2610cc4def9f0709b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a3ba3ac48e3759d2d5d834a26… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 13 12:52:18 2017 +0200 mshtml: Forward IHTMLElement6::get_tagName to IHTMLElement implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 6 ++++-- dlls/mshtml/tests/dom.c | 15 +++++++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index 59484e7..ee0c6d5 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -4092,8 +4092,10 @@ static HRESULT WINAPI HTMLElement6_getElementsByTagNameNS(IHTMLElement6 *iface, static HRESULT WINAPI HTMLElement6_get_tagName(IHTMLElement6 *iface, BSTR *p) { HTMLElement *This = impl_from_IHTMLElement6(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + + TRACE("(%p)->(%p)\n", This, p); + + return IHTMLElement_get_tagName(&This->IHTMLElement_iface, p); } static HRESULT WINAPI HTMLElement6_get_nodeName(IHTMLElement6 *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index cd006e2..aca64c1 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -1168,15 +1168,26 @@ static IHTMLDOMNode *_clone_node(unsigned line, IUnknown *unk, VARIANT_BOOL deep static void _test_elem_tag(unsigned line, IUnknown *unk, const char *extag) { IHTMLElement *elem = _get_elem_iface(line, unk); + IHTMLElement6 *elem6; BSTR tag; HRESULT hres; hres = IHTMLElement_get_tagName(elem, &tag); - IHTMLElement_Release(elem); ok_(__FILE__, line) (hres == S_OK, "get_tagName failed: %08x\n", hres); ok_(__FILE__, line) (!strcmp_wa(tag, extag), "got tag: %s, expected %s\n", wine_dbgstr_w(tag), extag); - SysFreeString(tag); + + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLElement6, (void**)&elem6); + if(SUCCEEDED(hres)) { + hres = IHTMLElement6_get_tagName(elem6, &tag); + ok_(__FILE__, line)(hres == S_OK, "(elem6) get_tagName failed: %08x\n", hres); + ok_(__FILE__, line)(!strcmp_wa(tag, extag), "(elem6) got tag: %s, expected %s\n", + wine_dbgstr_w(tag), extag); + SysFreeString(tag); + IHTMLElement6_Release(elem6); + } + + IHTMLElement_Release(elem); } #define test_elem_type(ifc,t) _test_elem_type(__LINE__,ifc,t)

1 0

Jacek Caban : mshtml: Expose IHTMLElement6 to scripts.
by Alexandre Julliard Sept. 13, 2017

Sept. 13, 2017

Module: wine Branch: master Commit: c16ef729db50209a626b743f5847a24dff5688a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c16ef729db50209a626b743f5… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 13 12:52:40 2017 +0200 mshtml: Expose IHTMLElement6 to scripts. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 4 +++- dlls/mshtml/tests/documentmode.js | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index d2afdf6..782a632 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -5349,8 +5349,10 @@ void HTMLElement_init_dispex_info(dispex_data_t *info, compat_mode_t mode) if(mode >= COMPAT_MODE_IE8) dispex_info_add_interface(info, IElementSelector_tid, NULL); - if(mode >= COMPAT_MODE_IE9) + if(mode >= COMPAT_MODE_IE9) { + dispex_info_add_interface(info, IHTMLElement6_tid, NULL); dispex_info_add_interface(info, IElementTraversal_tid, NULL); + } } static const tid_t HTMLElement_iface_tids[] = { diff --git a/dlls/mshtml/tests/documentmode.js b/dlls/mshtml/tests/documentmode.js index 20b5882..77f6993 100644 --- a/dlls/mshtml/tests/documentmode.js +++ b/dlls/mshtml/tests/documentmode.js @@ -35,6 +35,9 @@ function test_elem_props() { test_exposed("textContent", v >= 9); test_exposed("prefix", v >= 9); test_exposed("firstElementChild", v >= 9); + test_exposed("onsubmit", v >= 9); + test_exposed("getElementsByClassName", v >= 9); + test_exposed("removeAttributeNS", v >= 9); next_test(); }

1 0

Jacek Caban : mshtml: Forward attributes functions from IHTMLElement6 to older interfaces.
by Alexandre Julliard Sept. 13, 2017

Sept. 13, 2017

Module: wine Branch: master Commit: e391872ee061db51fb2cfd85b7b390cbfdc32a14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e391872ee061db51fb2cfd85b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Sep 13 12:52:29 2017 +0200 mshtml: Forward attributes functions from IHTMLElement6 to older interfaces. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 59 +++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 49 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index ee0c6d5..d2afdf6 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -4036,36 +4036,75 @@ static HRESULT WINAPI HTMLElement6_hasAttributeNS(IHTMLElement6 *iface, VARIANT static HRESULT WINAPI HTMLElement6_getAttribute(IHTMLElement6 *iface, BSTR strAttributeName, VARIANT *AttributeValue) { HTMLElement *This = impl_from_IHTMLElement6(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(strAttributeName), AttributeValue); - return E_NOTIMPL; + + WARN("(%p)->(%s %p) forwarding to IHTMLElement\n", This, debugstr_w(strAttributeName), AttributeValue); + + return IHTMLElement_getAttribute(&This->IHTMLElement_iface, strAttributeName, 0, AttributeValue); } static HRESULT WINAPI HTMLElement6_setAttribute(IHTMLElement6 *iface, BSTR strAttributeName, VARIANT *pvarAttributeValue) { HTMLElement *This = impl_from_IHTMLElement6(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(strAttributeName), pvarAttributeValue); - return E_NOTIMPL; + + WARN("(%p)->(%s %p) forwarding to IHTMLElement\n", This, debugstr_w(strAttributeName), pvarAttributeValue); + + return IHTMLElement_setAttribute(&This->IHTMLElement_iface, strAttributeName, *pvarAttributeValue, 0); } static HRESULT WINAPI HTMLElement6_removeAttribute(IHTMLElement6 *iface, BSTR strAttributeName) { HTMLElement *This = impl_from_IHTMLElement6(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(strAttributeName)); - return E_NOTIMPL; + VARIANT_BOOL success; + + WARN("(%p)->(%s) forwarding to IHTMLElement\n", This, debugstr_w(strAttributeName)); + + return IHTMLElement_removeAttribute(&This->IHTMLElement_iface, strAttributeName, 0, &success); } static HRESULT WINAPI HTMLElement6_getAttributeNode(IHTMLElement6 *iface, BSTR strAttributeName, IHTMLDOMAttribute2 **ppretAttribute) { HTMLElement *This = impl_from_IHTMLElement6(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(strAttributeName), ppretAttribute); - return E_NOTIMPL; + IHTMLDOMAttribute *attr; + HRESULT hres; + + WARN("(%p)->(%s %p) forwarding to IHTMLElement4\n", This, debugstr_w(strAttributeName), ppretAttribute); + + hres = IHTMLElement4_getAttributeNode(&This->IHTMLElement4_iface, strAttributeName, &attr); + if(FAILED(hres)) + return hres; + + if(attr) { + hres = IHTMLDOMAttribute_QueryInterface(attr, &IID_IHTMLDOMAttribute2, (void**)ppretAttribute); + IHTMLDOMAttribute_Release(attr); + }else { + *ppretAttribute = NULL; + } + return hres; } static HRESULT WINAPI HTMLElement6_setAttributeNode(IHTMLElement6 *iface, IHTMLDOMAttribute2 *pattr, IHTMLDOMAttribute2 **ppretAttribute) { HTMLElement *This = impl_from_IHTMLElement6(iface); - FIXME("(%p)->(%p %p)\n", This, pattr, ppretAttribute); - return E_NOTIMPL; + IHTMLDOMAttribute *attr, *ret_attr; + HRESULT hres; + + WARN("(%p)->(%p %p) forwarding to IHTMLElement4\n", This, pattr, ppretAttribute); + + hres = IHTMLDOMAttribute2_QueryInterface(pattr, &IID_IHTMLDOMAttribute, (void**)&attr); + if(FAILED(hres)) + return hres; + + hres = IHTMLElement4_setAttributeNode(&This->IHTMLElement4_iface, attr, &ret_attr); + if(FAILED(hres)) + return hres; + + if(ret_attr) { + hres = IHTMLDOMAttribute_QueryInterface(ret_attr, &IID_IHTMLDOMAttribute2, (void**)ppretAttribute); + IHTMLDOMAttribute_Release(ret_attr); + }else { + *ppretAttribute = NULL; + } + return hres; } static HRESULT WINAPI HTMLElement6_removeAttributeNode(IHTMLElement6 *iface, IHTMLDOMAttribute2 *pattr, IHTMLDOMAttribute2 **ppretAttribute)

1 0

Nikolay Sivov : shell32: Implement Application() property for Folder and FolderItems.
by Alexandre Julliard Sept. 13, 2017

Sept. 13, 2017

Module: wine Branch: master Commit: a05d2b76b98c59b16e6ea37a2c45c4a45fb29695 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a05d2b76b98c59b16e6ea37a2… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Sep 13 13:58:32 2017 +0300 shell32: Implement Application() property for Folder and FolderItems. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shelldispatch.c | 64 +++++++++++++++++------------------ dlls/shell32/tests/shelldispatch.c | 68 +++++++++++++++++++++++++++++++++----- 2 files changed, 91 insertions(+), 41 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a05d2b76b98c59b16e6ea…

1 0

Alexandre Julliard : ntdll: Don' t use the mapping handle to detect file mappings.
by Alexandre Julliard Sept. 13, 2017

Sept. 13, 2017

Module: wine Branch: master Commit: bf8e71bcab96598013f18502b7f46c6772d54bae URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf8e71bcab96598013f18502b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 13 11:48:57 2017 +0200 ntdll: Don't use the mapping handle to detect file mappings. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/virtual.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index b08bde7..e4896ea 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -2000,7 +2000,8 @@ void VIRTUAL_SetForceExec( BOOL enable ) WINE_RB_FOR_EACH_ENTRY( view, &views_tree, struct file_view, entry ) { - BYTE commit = view->mapping ? VPROT_COMMITTED : 0; /* file mappings are always accessible */ + /* file mappings are always accessible */ + BYTE commit = is_view_valloc( view ) ? 0 : VPROT_COMMITTED; mprotect_range( view, view->base, view->size, commit, 0 ); }

1 0