March 2019 - Wine-Commits - list.winehq.org

Isira Seneviratne : kernel32/nls: Change Sinhala sublang identifier to SUBLANG_SINHALESE_SRI_LANKA.
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: eb3988f080b85dce5dae66c5e667724683945c6e URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb3988f080b85dce5dae66c5… Author: Isira Seneviratne <isirasen96(a)gmail.com> Date: Tue Mar 26 19:56:27 2019 +0530 kernel32/nls: Change Sinhala sublang identifier to SUBLANG_SINHALESE_SRI_LANKA. Signed-off-by: Isira Seneviratne <isirasen96(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/nls/sin.nls | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/kernel32/nls/sin.nls b/dlls/kernel32/nls/sin.nls index 36dd281..033dbc0 100644 --- a/dlls/kernel32/nls/sin.nls +++ b/dlls/kernel32/nls/sin.nls @@ -20,7 +20,7 @@ #pragma code_page(65001) /* UTF-8 */ -STRINGTABLE LANGUAGE LANG_SINHALESE, SUBLANG_DEFAULT +STRINGTABLE LANGUAGE LANG_SINHALESE, SUBLANG_SINHALESE_SRI_LANKA { LOCALE_FONTSIGNATURE L"\x002f\x8010\x3808\x0000\x0000\x0000\x0000\x0000\x0001\x0000\x0000\x4000\x0003\x0000\x0000\xc5d4" LOCALE_ICALENDARTYPE "1"

1 0

Sebastian Lackner : wintrust/tests: Add some additional tests.
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: 0e8401076679f337655e72fa1726f05fcd89e069 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e8401076679f337655e72fa… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Fri Mar 22 10:27:17 2019 +0100 wintrust/tests: Add some additional tests. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/tests/softpub.c | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/dlls/wintrust/tests/softpub.c b/dlls/wintrust/tests/softpub.c index c1cb959..5d6d62c 100644 --- a/dlls/wintrust/tests/softpub.c +++ b/dlls/wintrust/tests/softpub.c @@ -1150,6 +1150,16 @@ static void test_wintrust_digest(void) { CERT_E_CHAINING, TRUE }, { S_OK, FALSE } }, { + {{ SelfSignedFile32, sizeof(SelfSignedFile32) }, + { Dummy, sizeof(Dummy) }}, + { TRUST_E_NOSIGNATURE, TRUE }, { TRUST_E_NOSIGNATURE, TRUE } + }, + { + {{ Dummy, sizeof(Dummy) }, + { SelfSignedFile32 + sizeof(Dummy), sizeof(SelfSignedFile32) - sizeof(Dummy) }}, + { TRUST_E_SUBJECT_FORM_UNKNOWN, FALSE }, { TRUST_E_NOSIGNATURE, TRUE } + }, + { {{ SelfSignedFile32, 19 }, { Dummy, sizeof(Dummy) }, { SelfSignedFile32 + 19 + sizeof(Dummy), sizeof(SelfSignedFile32) - 19 - sizeof(Dummy) }}, @@ -1170,6 +1180,16 @@ static void test_wintrust_digest(void) { CERT_E_CHAINING, TRUE }, { S_OK, FALSE } }, { + {{ SelfSignedFile64, sizeof(SelfSignedFile64) }, + { Dummy, sizeof(Dummy) }}, + { TRUST_E_NOSIGNATURE, TRUE }, { TRUST_E_NOSIGNATURE, TRUE } + }, + { + {{ Dummy, sizeof(Dummy) }, + { SelfSignedFile64 + sizeof(Dummy), sizeof(SelfSignedFile64) - sizeof(Dummy) }}, + { TRUST_E_SUBJECT_FORM_UNKNOWN, FALSE }, { TRUST_E_NOSIGNATURE, TRUE } + }, + { {{ SelfSignedFile64, 19 }, { Dummy, sizeof(Dummy) }, { SelfSignedFile64 + 19 + sizeof(Dummy), sizeof(SelfSignedFile64) - 19 - sizeof(Dummy) }},

1 0

Aurimas Fišeras : po: Update Lithuanian translation.
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: 8236c7a8c50b6160ce0863a98f27fb78e0580e6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=8236c7a8c50b6160ce0863a9… Author: Aurimas Fišeras <aurimas(a)members.fsf.org> Date: Wed Mar 27 10:41:38 2019 +0200 po: Update Lithuanian translation. Signed-off-by: Aurimas Fišeras <aurimas(a)members.fsf.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/lt.po | 56 +------------------------------------------------------- 1 file changed, 1 insertion(+), 55 deletions(-) diff --git a/po/lt.po b/po/lt.po index 2485a8f..dedbf52 100644 --- a/po/lt.po +++ b/po/lt.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: https://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2019-03-19 21:12+0300\n" +"PO-Revision-Date: 2019-03-27 10:40+0300\n" "Last-Translator: Aurimas Fišeras <aurimas(a)members.fsf.org>\n" "Language-Team: Lithuanian <komp_lt(a)konf.lt>\n" "Language: lt\n" @@ -10897,10 +10897,6 @@ msgstr "" "kartu." #: winmm.rc:128 -#, fuzzy -#| msgid "" -#| "The specified MIDI port is already in use. Wait until it is free; then " -#| "try again." msgid "" "The specified MIDI port is already in use. Wait until it is free, and then " "try again." @@ -10921,10 +10917,6 @@ msgid "An error occurred with the specified port." msgstr "Įvyko klaida su nurodytu prievadu." #: winmm.rc:133 -#, fuzzy -#| msgid "" -#| "All multimedia timers are being used by other applications. Quit one of " -#| "these applications; then, try again." msgid "" "All multimedia timers are being used by other applications. Quit one of " "these applications, and then try again." @@ -15245,10 +15237,6 @@ msgid "Drive configuration" msgstr "Diskų konfigūravimas" #: winecfg.rc:233 -#, fuzzy -#| msgid "" -#| "Failed to connect to the mount manager, the drive configuration cannot be " -#| "edited." msgid "" "Failed to connect to the mount manager; the drive configuration cannot be " "edited." @@ -15540,12 +15528,6 @@ msgid "System drive" msgstr "Sisteminis diskas" #: winecfg.rc:76 -#, fuzzy -#| msgid "" -#| "Are you sure you want to delete drive C?\n" -#| "\n" -#| "Most Windows applications expect drive C to exist, and will die messily " -#| "if it doesn't. If you proceed remember to recreate it!" msgid "" "Are you sure you want to delete drive C?\n" "\n" @@ -16832,42 +16814,6 @@ msgid "D" msgstr "K" #: xcopy.rc:81 -#, fuzzy -#| msgid "" -#| "XCOPY - Copies source files or directory trees to a destination.\n" -#| "\n" -#| "Syntax:\n" -#| "XCOPY source [destination] [/I] [/S] [/Q] [/F] [/L] [/W] [/T] [/N] [/U]\n" -#| "\t [/R] [/H] [/C] [/P] [/A] [/M] [/E] [/D] [/Y] [/-Y]\n" -#| "\n" -#| "Where:\n" -#| "\n" -#| "[/I] Assume directory if destination does not exist and copying two or\n" -#| "\tmore files.\n" -#| "[/S] Copy directories and subdirectories.\n" -#| "[/E] Copy directories and subdirectories, including any empty ones.\n" -#| "[/Q] Do not list names during copy, that is be quiet.\n" -#| "[/F] Show full source and destination names during copy.\n" -#| "[/L] Simulate operation, showing names which would be copied.\n" -#| "[/W] Prompts before beginning the copy operation.\n" -#| "[/T] Creates empty directory structure but does not copy files.\n" -#| "[/Y] Suppress prompting when overwriting files.\n" -#| "[/-Y] Enable prompting when overwriting files.\n" -#| "[/P] Prompts on each source file before copying.\n" -#| "[/N] Copy using short names.\n" -#| "[/U] Copy only files which already exist in destination.\n" -#| "[/R] Overwrite any read only files.\n" -#| "[/H] Include hidden and system files in the copy.\n" -#| "[/C] Continue even if an error occurs during the copy.\n" -#| "[/A] Only copy files with archive attribute set.\n" -#| "[/M] Only copy files with archive attribute set, removes the\n" -#| "\tarchive attribute.\n" -#| "[/K] Copy file attributes, without this attributes are not preserved.\n" -#| "[/D | /D:m-d-y] Copy new files or those modified after the supplied " -#| "date.\n" -#| "\t\tIf no date is supplied, only copy if destination is older\n" -#| "\t\tthan source.\n" -#| "\n" msgid "" "XCOPY - Copies source files or directory trees to a destination.\n" "\n"

1 0

Mark Jansen : wintrust/tests: Add tests for WinVerifyTrust.
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: eaf68e99ba70c5bd144e66118e2751dca4433a75 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eaf68e99ba70c5bd144e6611… Author: Mark Jansen <learn0more+wine(a)gmail.com> Date: Fri Mar 22 10:27:16 2019 +0100 wintrust/tests: Add tests for WinVerifyTrust. Includes various improvements by Sebastian Lackner <sebastian(a)fds-team.de>. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wintrust/tests/softpub.c | 352 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 352 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=eaf68e99ba70c5bd144e…

1 0

Vijay Kiran Kamuju : imagehlp/tests: Add initial tests for CheckSumMappedFile.
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: 602ff38cdd41f42b0d1f4a2cecf2043b2a30f037 URL: https://source.winehq.org/git/wine.git/?a=commit;h=602ff38cdd41f42b0d1f4a2c… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Sun Mar 24 12:25:47 2019 +0100 imagehlp/tests: Add initial tests for CheckSumMappedFile. Based on a patch by Michael Müller. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/imagehlp/modify.c | 36 ++------- dlls/imagehlp/tests/integrity.c | 164 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 170 insertions(+), 30 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=602ff38cdd41f42b0d1f…

1 0

Henri Verbeet : wined3d: Also update the "src_texture_gl" pointer when using a staging texture in the blitter.
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: a5279a5fba452d779cafc2cbd3098e9ed81598d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5279a5fba452d779cafc2cb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 27 15:46:32 2019 +0430 wined3d: Also update the "src_texture_gl" pointer when using a staging texture in the blitter. Astutely spotted by Józef Kucia. This fixes a regression introduced by commit 961a94ac046644004718c56bfeeb81740cb73793. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/surface.c | 1 + 3 files changed, 3 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 05bd55a..92c6e47 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -7841,6 +7841,7 @@ static DWORD arbfp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bl src_texture, src_sub_resource_idx, &upload_box); src_texture = staging_texture; + src_texture_gl = wined3d_texture_gl(src_texture); src_sub_resource_idx = 0; } else if (wined3d_settings.offscreen_rendering_mode != ORM_FBO diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 55d99ab..5844b0c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -13258,6 +13258,7 @@ static DWORD glsl_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_bli src_texture, src_sub_resource_idx, &upload_box); src_texture = staging_texture; + src_texture_gl = wined3d_texture_gl(src_texture); src_sub_resource_idx = 0; } else if (wined3d_settings.offscreen_rendering_mode != ORM_FBO diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 11d0255..48ca35b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2213,6 +2213,7 @@ static DWORD ffp_blitter_blit(struct wined3d_blitter *blitter, enum wined3d_blit src_texture, src_sub_resource_idx, &upload_box); src_texture = staging_texture; + src_texture_gl = wined3d_texture_gl(src_texture); src_sub_resource_idx = 0; } else

1 0

Jacek Caban : mshtml: Add IHTMLElement::getClientRects implementation.
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: 454a53235909e4a750955c154fff1b165a1b9761 URL: https://source.winehq.org/git/wine.git/?a=commit;h=454a53235909e4a750955c15… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 18:52:48 2019 +0100 mshtml: Add IHTMLElement::getClientRects implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 170 ++++++++++++++++++++++++++++++++++++++++++- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/nsiface.idl | 12 ++- dlls/mshtml/tests/dom.c | 8 ++ 4 files changed, 188 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index d490030..b14ecc1 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -553,6 +553,144 @@ static HRESULT create_html_rect(nsIDOMClientRect *nsrect, IHTMLRect **ret) return S_OK; } +typedef struct { + DispatchEx dispex; + IHTMLRectCollection IHTMLRectCollection_iface; + + LONG ref; + + nsIDOMClientRectList *rect_list; +} HTMLRectCollection; + +static inline HTMLRectCollection *impl_from_IHTMLRectCollection(IHTMLRectCollection *iface) +{ + return CONTAINING_RECORD(iface, HTMLRectCollection, IHTMLRectCollection_iface); +} + +static HRESULT WINAPI HTMLRectCollection_QueryInterface(IHTMLRectCollection *iface, REFIID riid, void **ppv) +{ + HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + if(IsEqualGUID(&IID_IUnknown, riid)) { + *ppv = &This->IHTMLRectCollection_iface; + }else if(IsEqualGUID(&IID_IHTMLRectCollection, riid)) { + *ppv = &This->IHTMLRectCollection_iface; + }else if(dispex_query_interface(&This->dispex, riid, ppv)) { + return *ppv ? S_OK : E_NOINTERFACE; + }else { + FIXME("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + *ppv = NULL; + return E_NOINTERFACE; + } + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static ULONG WINAPI HTMLRectCollection_AddRef(IHTMLRectCollection *iface) +{ + HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); + LONG ref = InterlockedIncrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + return ref; +} + +static ULONG WINAPI HTMLRectCollection_Release(IHTMLRectCollection *iface) +{ + HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); + LONG ref = InterlockedDecrement(&This->ref); + + TRACE("(%p) ref=%d\n", This, ref); + + if(!ref) { + if(This->rect_list) + nsIDOMClientRectList_Release(This->rect_list); + release_dispex(&This->dispex); + heap_free(This); + } + + return ref; +} + +static HRESULT WINAPI HTMLRectCollection_GetTypeInfoCount(IHTMLRectCollection *iface, UINT *pctinfo) +{ + HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); + FIXME("(%p)->(%p)\n", This, pctinfo); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLRectCollection_GetTypeInfo(IHTMLRectCollection *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); + return IDispatchEx_GetTypeInfo(&This->dispex.IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI HTMLRectCollection_GetIDsOfNames(IHTMLRectCollection *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); + return IDispatchEx_GetIDsOfNames(&This->dispex.IDispatchEx_iface, riid, rgszNames, cNames, + lcid, rgDispId); +} + +static HRESULT WINAPI HTMLRectCollection_Invoke(IHTMLRectCollection *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); + return IDispatchEx_Invoke(&This->dispex.IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLRectCollection_get_length(IHTMLRectCollection *iface, LONG *p) +{ + HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLRectCollection_get__newEnum(IHTMLRectCollection *iface, IUnknown **p) +{ + HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLRectCollection_item(IHTMLRectCollection *iface, VARIANT *index, VARIANT *result) +{ + HTMLRectCollection *This = impl_from_IHTMLRectCollection(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_variant(index), result); + return E_NOTIMPL; +} + +static const IHTMLRectCollectionVtbl HTMLRectCollectionVtbl = { + HTMLRectCollection_QueryInterface, + HTMLRectCollection_AddRef, + HTMLRectCollection_Release, + HTMLRectCollection_GetTypeInfoCount, + HTMLRectCollection_GetTypeInfo, + HTMLRectCollection_GetIDsOfNames, + HTMLRectCollection_Invoke, + HTMLRectCollection_get_length, + HTMLRectCollection_get__newEnum, + HTMLRectCollection_item +}; + +static const tid_t HTMLRectCollection_iface_tids[] = { + IHTMLRectCollection_tid, + 0 +}; +static dispex_static_data_t HTMLRectCollection_dispex = { + NULL, + IHTMLRectCollection_tid, + HTMLRectCollection_iface_tids +}; + static HRESULT WINAPI HTMLElement_QueryInterface(IHTMLElement *iface, REFIID riid, void **ppv) { @@ -2448,8 +2586,36 @@ static HRESULT WINAPI HTMLElement2_get_onpropertychange(IHTMLElement2 *iface, VA static HRESULT WINAPI HTMLElement2_getClientRects(IHTMLElement2 *iface, IHTMLRectCollection **pRectCol) { HTMLElement *This = impl_from_IHTMLElement2(iface); - FIXME("(%p)->(%p)\n", This, pRectCol); - return E_NOTIMPL; + nsIDOMClientRectList *rect_list; + HTMLRectCollection *rects; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, pRectCol); + + if(!This->dom_element) { + FIXME("comment element\n"); + return E_NOTIMPL; + } + + nsres = nsIDOMElement_GetClientRects(This->dom_element, &rect_list); + if(NS_FAILED(nsres)) { + WARN("GetClientRects failed: %08x\n", nsres); + return map_nsresult(nsres); + } + + rects = heap_alloc_zero(sizeof(*rects)); + if(!rects) { + nsIDOMClientRectList_Release(rect_list); + return E_OUTOFMEMORY; + } + + rects->IHTMLRectCollection_iface.lpVtbl = &HTMLRectCollectionVtbl; + rects->ref = 1; + rects->rect_list = rect_list; + init_dispex(&rects->dispex, (IUnknown*)&rects->IHTMLRectCollection_iface, &HTMLRectCollection_dispex); + + *pRectCol = &rects->IHTMLRectCollection_iface; + return S_OK; } static HRESULT WINAPI HTMLElement2_getBoundingClientRect(IHTMLElement2 *iface, IHTMLRect **pRect) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 967fda2..26037f0 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -210,6 +210,7 @@ typedef struct EventTarget EventTarget; XIID(IHTMLPerformanceTiming) \ XIID(IHTMLPluginsCollection) \ XIID(IHTMLRect) \ + XIID(IHTMLRectCollection) \ XIID(IHTMLScreen) \ XIID(IHTMLScriptElement) \ XIID(IHTMLSelectElement) \ diff --git a/dlls/mshtml/nsiface.idl b/dlls/mshtml/nsiface.idl index f9d8909..560fcd1 100644 --- a/dlls/mshtml/nsiface.idl +++ b/dlls/mshtml/nsiface.idl @@ -147,7 +147,6 @@ typedef nsISupports nsISupportsArray; typedef nsISupports nsIContentFilter; typedef nsISupports nsIDOMMediaList; typedef nsISupports nsIDOMHTMLTableSectionElement; -typedef nsISupports nsIDOMClientRectList; typedef nsISupports nsINode; typedef nsISupports nsIDOMUserDataHandler; typedef nsISupports nsISHEntry; @@ -1015,6 +1014,17 @@ interface nsIDOMClientRect : nsISupports [ object, + uuid(f474c567-cbcb-458f-abad-ae42363da287), + local +] +interface nsIDOMClientRectList : nsISupports +{ + nsresult GetLength(uint32_t *aLength); + nsresult Item(UINT32 index, nsIDOMClientRect **_retval); +} + +[ + object, uuid(6289999b-1008-4269-b42a-413ec5a9d3f4), local ] diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 7475c8f..19d7b11 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -5161,6 +5161,7 @@ static void _test_doc_set_title(unsigned line, IHTMLDocument2 *doc, const char * static void test_elem_bounding_client_rect(IUnknown *unk) { + IHTMLRectCollection *rects; IHTMLRect *rect, *rect2; IHTMLElement2 *elem2; LONG l; @@ -5199,6 +5200,13 @@ static void test_elem_bounding_client_rect(IUnknown *unk) ok(l != 0xdeadbeef, "l = 0xdeadbeef\n"); IHTMLRect_Release(rect); + + hres = IHTMLElement2_getClientRects(elem2, &rects); + ok(hres == S_OK, "getClientRects failed: %08x\n", hres); + + test_disp((IUnknown*)rects, &IID_IHTMLRectCollection, NULL, "[object]"); + + IHTMLRectCollection_Release(rects); } static void test_elem_col_item(IHTMLElementCollection *col, const char *n,

1 0

Jacek Caban : mshtml: Add IHTMLWindow7::getComputedStyle implementation.
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: 08939329709c3436ce7b3563b1b20c108241fac6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=08939329709c3436ce7b3563… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 18:52:14 2019 +0100 mshtml: Add IHTMLWindow7::getComputedStyle implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlstyle.c | 22 ++++++++++++++++++++++ dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/htmlwindow.c | 39 +++++++++++++++++++++++++++++++++++++-- dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 30 ++++++++++++++++++++++++++++++ 5 files changed, 91 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlstyle.c b/dlls/mshtml/htmlstyle.c index 7f99c89..441346b 100644 --- a/dlls/mshtml/htmlstyle.c +++ b/dlls/mshtml/htmlstyle.c @@ -10236,6 +10236,28 @@ HRESULT HTMLStyle_Create(HTMLElement *elem, HTMLStyle **ret) return S_OK; } +static const tid_t HTMLW3CComputedStyle_iface_tids[] = { + 0 +}; +static dispex_static_data_t HTMLW3CComputedStyle_dispex = { + &CSSStyle_dispex_vtbl, + DispHTMLW3CComputedStyle_tid, + HTMLW3CComputedStyle_iface_tids, + CSSStyle_init_dispex_info +}; + +HRESULT create_computed_style(nsIDOMCSSStyleDeclaration *nsstyle, IHTMLCSSStyleDeclaration **p) +{ + CSSStyle *style; + + if(!(style = heap_alloc_zero(sizeof(*style)))) + return E_OUTOFMEMORY; + + init_css_style(style, nsstyle, NULL, &HTMLW3CComputedStyle_dispex, COMPAT_MODE_IE11); + *p = &style->IHTMLCSSStyleDeclaration_iface; + return S_OK; +} + HRESULT get_elem_style(HTMLElement *elem, styleid_t styleid, BSTR *ret) { nsIDOMCSSStyleDeclaration *style; diff --git a/dlls/mshtml/htmlstyle.h b/dlls/mshtml/htmlstyle.h index 2c4b76b..9dcf3d9 100644 --- a/dlls/mshtml/htmlstyle.h +++ b/dlls/mshtml/htmlstyle.h @@ -137,6 +137,7 @@ typedef enum { } styleid_t; HRESULT HTMLStyle_Create(HTMLElement*,HTMLStyle**) DECLSPEC_HIDDEN; +HRESULT create_computed_style(nsIDOMCSSStyleDeclaration*,IHTMLCSSStyleDeclaration**) DECLSPEC_HIDDEN; void init_css_style(CSSStyle*,nsIDOMCSSStyleDeclaration*,style_qi_t, dispex_static_data_t*,compat_mode_t) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/htmlwindow.c b/dlls/mshtml/htmlwindow.c index 926ebb9..55c03df 100644 --- a/dlls/mshtml/htmlwindow.c +++ b/dlls/mshtml/htmlwindow.c @@ -38,6 +38,7 @@ #include "mshtml_private.h" #include "htmlevent.h" #include "htmlscript.h" +#include "htmlstyle.h" #include "pluginhost.h" #include "binding.h" #include "resource.h" @@ -2322,8 +2323,42 @@ static HRESULT WINAPI HTMLWindow7_getComputedStyle(IHTMLWindow7 *iface, IHTMLDOM BSTR pseudo_elt, IHTMLCSSStyleDeclaration **p) { HTMLWindow *This = impl_from_IHTMLWindow7(iface); - FIXME("(%p)->(%p %s %p)\n", This, node, debugstr_w(pseudo_elt), p); - return E_NOTIMPL; + nsIDOMCSSStyleDeclaration *nsstyle; + nsAString pseudo_elt_str; + HTMLElement *element; + IHTMLElement *elem; + nsresult nsres; + HRESULT hres; + + TRACE("(%p)->(%p %s %p)\n", This, node, debugstr_w(pseudo_elt), p); + + if(!This->outer_window) + return E_UNEXPECTED; + + hres = IHTMLDOMNode_QueryInterface(node, &IID_IHTMLElement, (void**)&elem); + if(FAILED(hres)) + return hres; + + element = unsafe_impl_from_IHTMLElement(elem); + if(!element) { + WARN("Not our element\n"); + IHTMLElement_Release(elem); + return E_INVALIDARG; + } + + nsAString_Init(&pseudo_elt_str, NULL); + nsres = nsIDOMWindow_GetComputedStyle(This->outer_window->nswindow, element->dom_element, + &pseudo_elt_str, &nsstyle); + IHTMLElement_Release(elem); + nsAString_Finish(&pseudo_elt_str); + if(NS_FAILED(nsres)) { + FIXME("GetComputedStyle failed: %08x\n", nsres); + return E_FAIL; + } + + hres = create_computed_style(nsstyle, p); + nsIDOMCSSStyleDeclaration_Release(nsstyle); + return hres; } static HRESULT WINAPI HTMLWindow7_get_styleMedia(IHTMLWindow7 *iface, IHTMLStyleMedia **p) diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index a2b05e7..967fda2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -128,6 +128,7 @@ typedef struct EventTarget EventTarget; XDIID(DispHTMLTextAreaElement) \ XDIID(DispHTMLTitleElement) \ XDIID(DispHTMLUnknownElement) \ + XDIID(DispHTMLW3CComputedStyle) \ XDIID(DispHTMLWindow2) \ XDIID(DispHTMLXMLHttpRequest) \ XDIID(HTMLDocumentEvents) \ diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index bf23163..7475c8f 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -463,6 +463,14 @@ static const IID * const cstyle_iids[] = { NULL }; +static const IID * const computed_style_iids[] = { + &IID_IUnknown, + &IID_IDispatch, + &IID_IDispatchEx, + &IID_IHTMLCSSStyleDeclaration, + NULL +}; + static const IID * const img_factory_iids[] = { &IID_IUnknown, &IID_IDispatch, @@ -6879,7 +6887,10 @@ static void test_window(IHTMLDocument2 *doc) hres = IHTMLWindow2_QueryInterface(window, &IID_IHTMLWindow7, (void**)&window7); if(SUCCEEDED(hres)) { + IHTMLCSSStyleDeclaration *computed_style; IHTMLPerformance *performance; + IHTMLDOMNode *node; + IHTMLElement *elem; ok(window7 != NULL, "window7 == NULL\n"); @@ -6907,6 +6918,25 @@ static void test_window(IHTMLDocument2 *doc) IHTMLWindow7_Release(window7); } + + hres = IHTMLDocument2_get_body(doc, &elem); + ok(hres == S_OK, "get_body failed: %08x\n", hres); + + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLDOMNode, (void**)&node); + ok(hres == S_OK, "Could not get IHTMLDOMNode iface: %08x\n", hres); + + hres = IHTMLWindow7_getComputedStyle(window7, node, NULL, &computed_style); + ok(hres == S_OK, "getComputedStyle failed: %08x\n", hres); + + test_disp((IUnknown*)computed_style, &DIID_DispHTMLW3CComputedStyle, NULL, "[object]"); + test_ifaces((IUnknown*)computed_style, computed_style_iids); + + test_read_only_style(computed_style); + + IHTMLCSSStyleDeclaration_Release(computed_style); + + IHTMLDOMNode_Release(node); + IHTMLElement_Release(elem); }else { win_skip("IHTMLWindow7 not supported\n"); }

1 0

Piotr Caban : kernel32: Don't use toupper.
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: 342ccda6ed28efc69071660f22ddde4e7ae94d87 URL: https://source.winehq.org/git/wine.git/?a=commit;h=342ccda6ed28efc69071660f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 14:08:06 2019 +0100 kernel32: Don't use toupper. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/lzexpand.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/lzexpand.c b/dlls/kernel32/lzexpand.c index 319c1c8..4b2ec2e 100644 --- a/dlls/kernel32/lzexpand.c +++ b/dlls/kernel32/lzexpand.c @@ -46,6 +46,7 @@ #include "windef.h" #include "winbase.h" +#include "winternl.h" #include "lzexpand.h" #include "wine/unicode.h" @@ -285,7 +286,7 @@ INT WINAPI GetExpandedNameA( LPSTR in, LPSTR out ) if (fnislowercased) head.lastchar=tolower(head.lastchar); else - head.lastchar=toupper(head.lastchar); + head.lastchar=RtlUpperChar(head.lastchar); } /* now look where to replace the last character */

1 0

Piotr Caban : ntdll: Use RtlUpperChar in _strupr implementation.
by Alexandre Julliard March 27, 2019

March 27, 2019

Module: wine Branch: master Commit: 09e6aa4b889eb8c157dc8f4ef3f789ed9ce3bd50 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09e6aa4b889eb8c157dc8f4e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 14:08:02 2019 +0100 ntdll: Use RtlUpperChar in _strupr implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/string.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 853bed6..1d6af85 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -306,7 +306,7 @@ int __cdecl _stricmp( LPCSTR str1, LPCSTR str2 ) LPSTR __cdecl _strupr( LPSTR str ) { LPSTR ret = str; - for ( ; *str; str++) *str = toupper(*str); + for ( ; *str; str++) *str = RtlUpperChar(*str); return ret; }

1 0