February 2018 - Wine-commits

Jacek Caban : mshtml: Fixed error handling in IHTMLFormElement:: item in IE9+ mode.
by Alexandre Julliard 08 Feb '18

08 Feb '18

Module: wine Branch: master Commit: 7da84dfe97147fa2eb2e9b582975eec84fa4cc16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7da84dfe97147fa2eb2e9b58… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 8 20:53:48 2018 +0100 mshtml: Fixed error handling in IHTMLFormElement::item in IE9+ mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlform.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlform.c b/dlls/mshtml/htmlform.c index 2957ad1..51adc20 100644 --- a/dlls/mshtml/htmlform.c +++ b/dlls/mshtml/htmlform.c @@ -540,8 +540,11 @@ static HRESULT WINAPI HTMLFormElement_item(IHTMLFormElement *iface, VARIANT name *pdisp = NULL; if(V_VT(&name) == VT_I4) { - if(V_I4(&name) < 0) - return E_INVALIDARG; + if(V_I4(&name) < 0) { + *pdisp = NULL; + return dispex_compat_mode(&This->element.node.event_target.dispex) >= COMPAT_MODE_IE9 + ? S_OK : E_INVALIDARG; + } return htmlform_item(This, V_I4(&name), pdisp); }

1 0

Jacek Caban : mshtml: Fixed error handling in IHTMLElementCollection:: item in IE9+ mode.
by Alexandre Julliard 08 Feb '18

08 Feb '18

Module: wine Branch: master Commit: 9623fcb4747f252a54041a6fec7080e0faacbc1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=9623fcb4747f252a54041a6f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 8 20:53:55 2018 +0100 mshtml: Fixed error handling in IHTMLElementCollection::item in IE9+ mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelemcol.c | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/mshtml/htmlelemcol.c b/dlls/mshtml/htmlelemcol.c index 8407e02..c08a876 100644 --- a/dlls/mshtml/htmlelemcol.c +++ b/dlls/mshtml/htmlelemcol.c @@ -63,7 +63,7 @@ static inline HTMLElement *elem_from_HTMLDOMNode(HTMLDOMNode *iface) return CONTAINING_RECORD(iface, HTMLElement, node); } -static IHTMLElementCollection *HTMLElementCollection_Create(HTMLElement **elems, DWORD len); +static IHTMLElementCollection *HTMLElementCollection_Create(HTMLElement**,DWORD,compat_mode_t); static void elem_vector_add(elem_vector_t *buf, HTMLElement *elem) { @@ -421,7 +421,7 @@ static HRESULT WINAPI HTMLElementCollection_item(IHTMLElementCollection *iface, case VT_I4: case VT_INT: if(V_I4(&name) < 0) - return E_INVALIDARG; + return dispex_compat_mode(&This->dispex) < COMPAT_MODE_IE9 ? E_INVALIDARG : S_OK; hres = get_item_idx(This, V_I4(&name), pdisp); break; @@ -462,7 +462,8 @@ static HRESULT WINAPI HTMLElementCollection_item(IHTMLElementCollection *iface, if(buf.len > 1) { elem_vector_normalize(&buf); - *pdisp = (IDispatch*)HTMLElementCollection_Create(buf.buf, buf.len); + *pdisp = (IDispatch*)HTMLElementCollection_Create(buf.buf, buf.len, + dispex_compat_mode(&This->dispex)); }else { if(buf.len == 1) { /* Already AddRef-ed */ @@ -524,7 +525,8 @@ static HRESULT WINAPI HTMLElementCollection_tags(IHTMLElementCollection *iface, TRACE("fount %d tags\n", buf.len); - *pdisp = (IDispatch*)HTMLElementCollection_Create(buf.buf, buf.len); + *pdisp = (IDispatch*)HTMLElementCollection_Create(buf.buf, buf.len, + dispex_compat_mode(&This->dispex)); return S_OK; } @@ -677,7 +679,8 @@ IHTMLElementCollection *create_all_collection(HTMLDOMNode *node, BOOL include_ro create_all_list(node->doc, node, &buf); elem_vector_normalize(&buf); - return HTMLElementCollection_Create(buf.buf, buf.len); + return HTMLElementCollection_Create(buf.buf, buf.len, + dispex_compat_mode(&node->event_target.dispex)); } IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode *doc, nsIDOMNodeList *nslist) @@ -712,7 +715,7 @@ IHTMLElementCollection *create_collection_from_nodelist(HTMLDocumentNode *doc, n buf.buf = NULL; } - return HTMLElementCollection_Create(buf.buf, buf.len); + return HTMLElementCollection_Create(buf.buf, buf.len, doc->document_mode); } IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode *doc, nsIDOMHTMLCollection *nscol) @@ -748,7 +751,7 @@ IHTMLElementCollection *create_collection_from_htmlcol(HTMLDocumentNode *doc, ns return NULL; } - return HTMLElementCollection_Create(buf.buf, buf.len); + return HTMLElementCollection_Create(buf.buf, buf.len, doc->document_mode); } HRESULT get_elem_source_index(HTMLElement *elem, LONG *ret) @@ -820,7 +823,8 @@ HRESULT get_elem_source_index(HTMLElement *elem, LONG *ret) return S_OK; } -static IHTMLElementCollection *HTMLElementCollection_Create(HTMLElement **elems, DWORD len) +static IHTMLElementCollection *HTMLElementCollection_Create(HTMLElement **elems, DWORD len, + compat_mode_t compat_mode) { HTMLElementCollection *ret = heap_alloc_zero(sizeof(HTMLElementCollection)); @@ -832,8 +836,8 @@ static IHTMLElementCollection *HTMLElementCollection_Create(HTMLElement **elems, ret->elems = elems; ret->len = len; - init_dispex(&ret->dispex, (IUnknown*)&ret->IHTMLElementCollection_iface, - &HTMLElementCollection_dispex); + init_dispex_with_compat_mode(&ret->dispex, (IUnknown*)&ret->IHTMLElementCollection_iface, + &HTMLElementCollection_dispex, compat_mode); TRACE("ret=%p len=%d\n", ret, len);

1 0

Jacek Caban : mshtml/tests: Run form element tests in both quirks and IE9 compat mode.
by Alexandre Julliard 08 Feb '18

08 Feb '18

Module: wine Branch: master Commit: f7b95a77c30d1915f64ece310942844459db3e02 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7b95a77c30d1915f64ece31… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 8 20:54:09 2018 +0100 mshtml/tests: Run form element tests in both quirks and IE9 compat mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 95 ++++++++++++++++++++++++++++++------------------- 1 file changed, 59 insertions(+), 36 deletions(-) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 2ef7f38..f9d2690 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2752,7 +2752,10 @@ static void _test_elem_collection(unsigned line, IUnknown *unk, V_I4(&name) = -1; disp = (void*)0xdeadbeef; hres = IHTMLElementCollection_item(col, name, index, &disp); - ok_(__FILE__,line) (hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); + if(compat_mode < COMPAT_IE9) + ok_(__FILE__,line) (hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); + else + ok_(__FILE__,line) (hres == S_OK, "item failed: %08x\n", hres); ok_(__FILE__,line) (disp == NULL, "disp != NULL\n"); IHTMLElementCollection_Release(col); @@ -4577,8 +4580,9 @@ static void _test_form_put_encoding(unsigned line, IUnknown *unk, HRESULT exp_hr _test_form_encoding(line, unk, encoding); } -#define test_form_elements(a) _test_form_elements(__LINE__,a) -static void _test_form_elements(unsigned line, IUnknown *unk) +#define test_form_elements(a,b,c) _test_form_elements(__LINE__,a,b,c) +static void _test_form_elements(unsigned line, IUnknown *unk, const elem_type_t *elem_types, + LONG elem_types_cnt) { IHTMLFormElement *form = _get_form_iface(line, unk); IDispatch *disp; @@ -4588,7 +4592,10 @@ static void _test_form_elements(unsigned line, IUnknown *unk) hres = IHTMLFormElement_get_elements(form, &disp); ok_(__FILE__,line)(hres == S_OK, "get_elements failed: %08x\n", hres); ok_(__FILE__,line)(disp != NULL, "disp = NULL\n"); - ok_(__FILE__,line)(iface_cmp((IUnknown*)form, (IUnknown*)disp), "disp != form\n"); + if(compat_mode < COMPAT_IE9) + ok_(__FILE__,line)(iface_cmp((IUnknown*)form, (IUnknown*)disp), "disp != form\n"); + else + _test_elem_collection(line, (IUnknown*)disp, elem_types, elem_types_cnt); IDispatch_Release(disp); IHTMLFormElement_Release(form); @@ -4640,7 +4647,7 @@ static void test_select_form(IUnknown *uselect, IUnknown *uform) ok(form != NULL, "form == NULL\n"); test_form_length((IUnknown*)form, 2); - test_form_elements((IUnknown*)form); + test_form_elements((IUnknown*)form, NULL, 0); test_form_name((IUnknown*)form, "form_name"); ok(iface_cmp(uform, (IUnknown*)form), "Expected %p, got %p\n", uform, form); @@ -5378,7 +5385,10 @@ static void test_form_item(IHTMLElement *elem) V_I4(&name) = -1; disp = (void*)0xdeadbeef; hres = IHTMLFormElement_item(form, name, index, &disp); - ok(hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); + if(compat_mode < COMPAT_IE9) + ok(hres == E_INVALIDARG, "item failed: %08x, expected E_INVALIDARG\n", hres); + else + ok(hres == S_OK, "item failed: %08x\n", hres); ok(!disp, "disp = %p\n", disp); V_I4(&name) = 2; @@ -8882,7 +8892,7 @@ static void test_elems(IHTMLDocument2 *doc) ok(elem != NULL, "elem == NULL\n"); if(elem) { test_form_length((IUnknown*)elem, 0); - test_form_elements((IUnknown*)elem); + test_form_elements((IUnknown*)elem, NULL, 0); IHTMLElement_Release(elem); } @@ -9262,35 +9272,6 @@ static void test_elems2(IHTMLDocument2 *doc) test_insert_adjacent_elems(doc, div); test_elem_set_innerhtml((IUnknown*)div, - "<form id=\"form\"><input type=\"button\" /><div><input type=\"text\" id=\"inputid\"/></div></textarea>"); - elem = get_elem_by_id(doc, "form", TRUE); - if(elem) { - test_form_length((IUnknown*)elem, 2); - test_form_item(elem); - test_form_action((IUnknown*)elem, NULL); - test_form_put_action((IUnknown*)elem, "about:blank"); - test_form_method((IUnknown*)elem, "get"); - test_form_put_method((IUnknown*)elem, S_OK, "post"); - test_form_put_method((IUnknown*)elem, E_INVALIDARG, "put"); - test_form_method((IUnknown*)elem, "post"); - test_form_name((IUnknown*)elem, NULL); - test_form_put_name((IUnknown*)elem, "Name"); - test_form_encoding((IUnknown*)elem, "application/x-www-form-urlencoded"); - test_form_put_encoding((IUnknown*)elem, S_OK, "text/plain"); - test_form_put_encoding((IUnknown*)elem, S_OK, "multipart/form-data"); - test_form_put_encoding((IUnknown*)elem, E_INVALIDARG, "image/png"); - test_form_encoding((IUnknown*)elem, "multipart/form-data"); - test_form_elements((IUnknown*)elem); - test_form_reset((IUnknown*)elem); - test_form_target((IUnknown*)elem); - IHTMLElement_Release(elem); - - elem = get_elem_by_id(doc, "inputid", TRUE); - test_input_get_form((IUnknown*)elem, "form"); - IHTMLElement_Release(elem); - } - - test_elem_set_innerhtml((IUnknown*)div, "<form id=\"form\" name=\"form_name\"><select id=\"sform\"><option id=\"oform\"></option></select><button id=\"btnid\"></button></form>"); elem = get_elem_by_id(doc, "sform", TRUE); elem2 = get_elem_by_id(doc, "form", TRUE); @@ -9393,6 +9374,47 @@ static void test_textarea_element(IHTMLDocument2 *doc, IHTMLElement *parent) IHTMLElement_Release(elem); } +static void test_form_element(IHTMLDocument2 *doc, IHTMLElement *parent) +{ + IHTMLElement *elem, *input_elem; + + static const elem_type_t elems_textarea_input[] = { ET_TEXTAREA, ET_INPUT }; + + test_elem_set_innerhtml((IUnknown*)parent, + "<form id=\"form\">" + "<textarea></textarea>" + "<div><input type=\"text\" id=\"inputid\" /></div>" + "</form>"); + elem = get_elem_by_id(doc, "form", TRUE); + test_elem_type((IUnknown*)elem, ET_FORM); + + test_form_length((IUnknown*)elem, 2); + test_form_item(elem); + test_form_action((IUnknown*)elem, NULL); + test_form_put_action((IUnknown*)elem, "about:blank"); + test_form_method((IUnknown*)elem, "get"); + test_form_put_method((IUnknown*)elem, S_OK, "post"); + test_form_put_method((IUnknown*)elem, E_INVALIDARG, "put"); + test_form_method((IUnknown*)elem, "post"); + test_form_name((IUnknown*)elem, NULL); + test_form_put_name((IUnknown*)elem, "Name"); + test_form_encoding((IUnknown*)elem, "application/x-www-form-urlencoded"); + test_form_put_encoding((IUnknown*)elem, S_OK, "text/plain"); + test_form_put_encoding((IUnknown*)elem, S_OK, "multipart/form-data"); + test_form_put_encoding((IUnknown*)elem, E_INVALIDARG, "image/png"); + test_form_encoding((IUnknown*)elem, "multipart/form-data"); + test_form_elements((IUnknown*)elem, elems_textarea_input, + sizeof(elems_textarea_input)/sizeof(*elems_textarea_input)); + test_form_reset((IUnknown*)elem); + test_form_target((IUnknown*)elem); + + input_elem = get_elem_by_id(doc, "inputid", TRUE); + test_input_get_form((IUnknown*)input_elem, "form"); + IHTMLElement_Release(input_elem); + + IHTMLElement_Release(elem); +} + static void test_dom_elements(IHTMLDocument2 *doc) { IHTMLElement *body, *div; @@ -9402,6 +9424,7 @@ static void test_dom_elements(IHTMLDocument2 *doc) div = get_doc_elem_by_id(doc, "parentdiv"); test_textarea_element(doc, div); + test_form_element(doc, div); IHTMLElement_Release(body); IHTMLElement_Release(div);

1 0

Matteo Bruni : d3d10core/tests: Add tests for GenerateMips().
by Alexandre Julliard 08 Feb '18

08 Feb '18

Module: wine Branch: master Commit: 02e162eeea863cb8ecb057ffab1cefb8c51d01b4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=02e162eeea863cb8ecb057ff… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 6 19:36:13 2018 +0100 d3d10core/tests: Add tests for GenerateMips(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 463 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 463 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=02e162eeea863cb8ecb0…

1 0

Michael Stefaniuc : xmllite: Use the global HeapAlloc() wrappers.
by Alexandre Julliard 08 Feb '18

08 Feb '18

Module: wine Branch: master Commit: c9f1ada8e5d9134dc86271423409338b0370062a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c9f1ada8e5d9134dc8627142… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed Feb 7 00:20:06 2018 +0100 xmllite: Use the global HeapAlloc() wrappers. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xmllite/xmllite_private.h | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/xmllite/xmllite_private.h b/dlls/xmllite/xmllite_private.h index 702fadb..7884e27 100644 --- a/dlls/xmllite/xmllite_private.h +++ b/dlls/xmllite/xmllite_private.h @@ -21,22 +21,7 @@ #ifndef __XMLLITE_PRIVATE__ #define __XMLLITE_PRIVATE__ -/* memory allocation functions */ - -static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void* __WINE_ALLOC_SIZE(2) heap_realloc(void *mem, size_t size) -{ - return HeapReAlloc(GetProcessHeap(), 0, mem, size); -} - -static inline BOOL heap_free(void *mem) -{ - return HeapFree(GetProcessHeap(), 0, mem); -} +#include "wine/heap.h" static inline void *m_alloc(IMalloc *imalloc, size_t len) {

1 0

Andrey Gusev : api-ms-win-perf-legacy-l1-1-0: Add dll.
by Alexandre Julliard 08 Feb '18

08 Feb '18

Module: wine Branch: master Commit: 661d11d07161b29226becd053018626e338a73c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=661d11d07161b29226becd05… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu Feb 8 15:12:44 2018 +0200 api-ms-win-perf-legacy-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/api-ms-win-perf-legacy-l1-1-0/Makefile.in | 1 + .../api-ms-win-perf-legacy-l1-1-0.spec | 9 +++++++++ tools/make_specfiles | 1 + 5 files changed, 14 insertions(+) diff --git a/configure b/configure index 6b7f7d8..57577da 100755 --- a/configure +++ b/configure @@ -1055,6 +1055,7 @@ enable_api_ms_win_mm_mme_l1_1_0 enable_api_ms_win_mm_time_l1_1_0 enable_api_ms_win_ntuser_dc_access_l1_1_0 enable_api_ms_win_ntuser_rectangle_l1_1_0 +enable_api_ms_win_perf_legacy_l1_1_0 enable_api_ms_win_power_base_l1_1_0 enable_api_ms_win_power_setting_l1_1_0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 @@ -18487,6 +18488,7 @@ wine_fn_config_dll api-ms-win-mm-mme-l1-1-0 enable_api_ms_win_mm_mme_l1_1_0 wine_fn_config_dll api-ms-win-mm-time-l1-1-0 enable_api_ms_win_mm_time_l1_1_0 wine_fn_config_dll api-ms-win-ntuser-dc-access-l1-1-0 enable_api_ms_win_ntuser_dc_access_l1_1_0 wine_fn_config_dll api-ms-win-ntuser-rectangle-l1-1-0 enable_api_ms_win_ntuser_rectangle_l1_1_0 +wine_fn_config_dll api-ms-win-perf-legacy-l1-1-0 enable_api_ms_win_perf_legacy_l1_1_0 wine_fn_config_dll api-ms-win-power-base-l1-1-0 enable_api_ms_win_power_base_l1_1_0 wine_fn_config_dll api-ms-win-power-setting-l1-1-0 enable_api_ms_win_power_setting_l1_1_0 wine_fn_config_dll api-ms-win-rtcore-ntuser-private-l1-1-0 enable_api_ms_win_rtcore_ntuser_private_l1_1_0 diff --git a/configure.ac b/configure.ac index 016b9bf..58ce104 100644 --- a/configure.ac +++ b/configure.ac @@ -2968,6 +2968,7 @@ WINE_CONFIG_DLL(api-ms-win-mm-mme-l1-1-0) WINE_CONFIG_DLL(api-ms-win-mm-time-l1-1-0) WINE_CONFIG_DLL(api-ms-win-ntuser-dc-access-l1-1-0) WINE_CONFIG_DLL(api-ms-win-ntuser-rectangle-l1-1-0) +WINE_CONFIG_DLL(api-ms-win-perf-legacy-l1-1-0) WINE_CONFIG_DLL(api-ms-win-power-base-l1-1-0) WINE_CONFIG_DLL(api-ms-win-power-setting-l1-1-0) WINE_CONFIG_DLL(api-ms-win-rtcore-ntuser-private-l1-1-0) diff --git a/dlls/api-ms-win-perf-legacy-l1-1-0/Makefile.in b/dlls/api-ms-win-perf-legacy-l1-1-0/Makefile.in new file mode 100644 index 0000000..0328476 --- /dev/null +++ b/dlls/api-ms-win-perf-legacy-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = api-ms-win-perf-legacy-l1-1-0.dll diff --git a/dlls/api-ms-win-perf-legacy-l1-1-0/api-ms-win-perf-legacy-l1-1-0.spec b/dlls/api-ms-win-perf-legacy-l1-1-0/api-ms-win-perf-legacy-l1-1-0.spec new file mode 100644 index 0000000..9fe91d1 --- /dev/null +++ b/dlls/api-ms-win-perf-legacy-l1-1-0/api-ms-win-perf-legacy-l1-1-0.spec @@ -0,0 +1,9 @@ +@ stub PerfAddCounters +@ stub PerfCloseQueryHandle +@ stub PerfDeleteCounters +@ stub PerfEnumerateCounterSet +@ stub PerfEnumerateCounterSetInstances +@ stub PerfOpenQueryHandle +@ stub PerfQueryCounterData +@ stub PerfQueryCounterInfo +@ stub PerfQueryCounterSetRegistrationInfo diff --git a/tools/make_specfiles b/tools/make_specfiles index e5b2617..6b59b32 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -123,6 +123,7 @@ my @dll_groups = "api-ms-win-eventing-legacy-l1-1-0", "api-ms-win-eventing-provider-l1-1-0", "api-ms-win-eventlog-legacy-l1-1-0", + "api-ms-win-perf-legacy-l1-1-0", "api-ms-win-security-audit-l1-1-1", "api-ms-win-security-base-l1-2-0", "api-ms-win-security-base-private-l1-1-1",

1 0

Akihiro Sagawa : gdi32: Fix ABC width calculations when using vertical font.
by Alexandre Julliard 08 Feb '18

08 Feb '18

Module: wine Branch: master Commit: c17a8f32c412cf9d825da87f5ccf682d52f2b1ce URL: https://source.winehq.org/git/wine.git/?a=commit;h=c17a8f32c412cf9d825da87f… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Sun Feb 4 21:02:13 2018 +0900 gdi32: Fix ABC width calculations when using vertical font. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/freetype.c | 3 ++- dlls/gdi32/tests/font.c | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 7016095..3833147 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7050,6 +7050,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, pFT_Vector_Transform(&vec, &transMat); origin_x = (vec.x + left) & -64; origin_y = (vec.y + top + 63) & -64; + lsb -= metrics.horiBearingY; } else { @@ -7074,7 +7075,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, else abc->abcA = -((pFT_Vector_Length(&vec) + 63) >> 6); /* We use lsb again to avoid rounding errors */ - vec.x = lsb + metrics.width; + vec.x = lsb + (tategaki ? metrics.height : metrics.width); vec.y = 0; pFT_Vector_Transform(&vec, &transMatUnrotated); abc->abcB = ((pFT_Vector_Length(&vec) + 63) >> 6) - abc->abcA; diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index d5f04ff..d6fe9e3 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -5959,9 +5959,9 @@ static void check_vertical_metrics(const char *face) ok(ret != GDI_ERROR, "GetGlyphOutlineW failed\n"); ret = GetCharABCWidthsW(hdc, code, code, &vabc); ok(ret, "GetCharABCWidthsW failed\n"); - todo_wine ok(vabc.abcA == vgm.gmptGlyphOrigin.x, "expected %d, got %d\n", + ok(vabc.abcA == vgm.gmptGlyphOrigin.x, "expected %d, got %d\n", vabc.abcA, vgm.gmptGlyphOrigin.x); - todo_wine ok(vabc.abcB == vgm.gmBlackBoxX, "expected %d, got %d\n", + ok(vabc.abcB == vgm.gmBlackBoxX, "expected %d, got %d\n", vabc.abcB, vgm.gmBlackBoxX); ok(vabc.abcA + vabc.abcB + vabc.abcC == vgm.gmCellIncX, "expected %d, got %d\n",

1 0

Dmitry Timoshkov : kerberos: Slightly simplify name_sspi_to_gss.
by Alexandre Julliard 08 Feb '18

08 Feb '18

Module: wine Branch: master Commit: 0d44fc790492afb616727ca2f1991c9f193468c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0d44fc790492afb616727ca2… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 8 09:42:43 2018 +0800 kerberos: Slightly simplify name_sspi_to_gss. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index e3ede45..99673b0 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -748,10 +748,9 @@ static SECURITY_STATUS name_sspi_to_gss( const UNICODE_STRING *name_str, gss_nam gss_OID type = GSS_C_NO_OID; /* FIXME: detect the appropriate value for this ourselves? */ gss_buffer_desc buf; - buf.length = WideCharToMultiByte( CP_UNIXCP, 0, name_str->Buffer, name_str->Length / sizeof(WCHAR), NULL, 0, NULL, NULL ) + 1; + buf.length = WideCharToMultiByte( CP_UNIXCP, 0, name_str->Buffer, name_str->Length / sizeof(WCHAR), NULL, 0, NULL, NULL ); if (!(buf.value = heap_alloc( buf.length ))) return SEC_E_INSUFFICIENT_MEMORY; WideCharToMultiByte( CP_UNIXCP, 0, name_str->Buffer, name_str->Length / sizeof(WCHAR), buf.value, buf.length, NULL, NULL ); - buf.length--; ret = pgss_import_name( &minor_status, &buf, type, name ); TRACE( "gss_import_name returned %08x minor status %08x\n", ret, minor_status );

1 0

Hans Leidekker : secur32: Implement SECPKG_ATTR_NEGOTIATION_INFO for NTLM.
by Alexandre Julliard 08 Feb '18

08 Feb '18

Module: wine Branch: master Commit: 54dea1dc6a4b6a98c7b7e15ac6bda44872a362f3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=54dea1dc6a4b6a98c7b7e15a… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 8 11:53:56 2018 +0100 secur32: Implement SECPKG_ATTR_NEGOTIATION_INFO for NTLM. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/ntlm.c | 149 +++++++++++++++++++++++++++++++--------------- dlls/secur32/tests/ntlm.c | 2 - 2 files changed, 100 insertions(+), 51 deletions(-) diff --git a/dlls/secur32/ntlm.c b/dlls/secur32/ntlm.c index 94b94f4..6a94d42 100644 --- a/dlls/secur32/ntlm.c +++ b/dlls/secur32/ntlm.c @@ -1421,6 +1421,87 @@ SECURITY_STATUS SEC_ENTRY ntlm_DeleteSecurityContext(PCtxtHandle phContext) return SEC_E_OK; } +#define NTLM_COMMENT \ + { 'N', 'T', 'L', 'M', ' ', \ + 'S', 'e', 'c', 'u', 'r', 'i', 't', 'y', ' ', \ + 'P', 'a', 'c', 'k', 'a', 'g', 'e', 0} + +static CHAR ntlm_comment_A[] = NTLM_COMMENT; +static WCHAR ntlm_comment_W[] = NTLM_COMMENT; + +#define NTLM_NAME {'N', 'T', 'L', 'M', 0} + +static char ntlm_name_A[] = NTLM_NAME; +static WCHAR ntlm_name_W[] = NTLM_NAME; + +#define NTLM_CAPS ( \ + SECPKG_FLAG_INTEGRITY | \ + SECPKG_FLAG_PRIVACY | \ + SECPKG_FLAG_TOKEN_ONLY | \ + SECPKG_FLAG_CONNECTION | \ + SECPKG_FLAG_MULTI_REQUIRED | \ + SECPKG_FLAG_IMPERSONATION | \ + SECPKG_FLAG_ACCEPT_WIN32_NAME | \ + SECPKG_FLAG_NEGOTIABLE | \ + SECPKG_FLAG_LOGON | \ + SECPKG_FLAG_RESTRICTED_TOKENS ) + +static const SecPkgInfoW infoW = { + NTLM_CAPS, + 1, + RPC_C_AUTHN_WINNT, + NTLM_MAX_BUF, + ntlm_name_W, + ntlm_comment_W +}; + +static const SecPkgInfoA infoA = { + NTLM_CAPS, + 1, + RPC_C_AUTHN_WINNT, + NTLM_MAX_BUF, + ntlm_name_A, + ntlm_comment_A +}; + +SecPkgInfoA *ntlm_package_infoA = (SecPkgInfoA *)&infoA; +SecPkgInfoW *ntlm_package_infoW = (SecPkgInfoW *)&infoW; + +static SecPkgInfoW *build_package_infoW( const SecPkgInfoW *info ) +{ + SecPkgInfoW *ret; + DWORD size_name = (strlenW(info->Name) + 1) * sizeof(WCHAR); + DWORD size_comment = (strlenW(info->Comment) + 1) * sizeof(WCHAR); + + if (!(ret = HeapAlloc( GetProcessHeap(), 0, sizeof(*ret) + size_name + size_comment ))) return NULL; + ret->fCapabilities = info->fCapabilities; + ret->wVersion = info->wVersion; + ret->wRPCID = info->wRPCID; + ret->cbMaxToken = info->cbMaxToken; + ret->Name = (SEC_WCHAR *)(ret + 1); + memcpy( ret->Name, info->Name, size_name ); + ret->Comment = (SEC_WCHAR *)((char *)ret->Name + size_name); + memcpy( ret->Comment, info->Comment, size_comment ); + return ret; +} + +static SecPkgInfoA *build_package_infoA( const SecPkgInfoA *info ) +{ + SecPkgInfoA *ret; + DWORD size_name = strlen(info->Name) + 1, size_comment = strlen(info->Comment) + 1; + + if (!(ret = HeapAlloc( GetProcessHeap(), 0, sizeof(*ret) + size_name + size_comment ))) return NULL; + ret->fCapabilities = info->fCapabilities; + ret->wVersion = info->wVersion; + ret->wRPCID = info->wRPCID; + ret->cbMaxToken = info->cbMaxToken; + ret->Name = (SEC_CHAR *)(ret + 1); + memcpy( ret->Name, info->Name, size_name ); + ret->Comment = ret->Name + size_name; + memcpy( ret->Comment, info->Comment, size_comment ); + return ret; +} + /*********************************************************************** * QueryContextAttributesW */ @@ -1453,7 +1534,13 @@ SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesW(PCtxtHandle phContext, _x(SECPKG_ATTR_LIFESPAN); _x(SECPKG_ATTR_NAMES); _x(SECPKG_ATTR_NATIVE_NAMES); - _x(SECPKG_ATTR_NEGOTIATION_INFO); + case SECPKG_ATTR_NEGOTIATION_INFO: + { + SecPkgContext_NegotiationInfoW *info = (SecPkgContext_NegotiationInfoW *)pBuffer; + if (!(info->PackageInfo = build_package_infoW( &infoW ))) return SEC_E_INSUFFICIENT_MEMORY; + info->NegotiationState = SECPKG_NEGOTIATION_COMPLETE; + return SEC_E_OK; + } _x(SECPKG_ATTR_PACKAGE_INFO); _x(SECPKG_ATTR_PASSWORD_EXPIRY); _x(SECPKG_ATTR_SESSION_KEY); @@ -1482,7 +1569,18 @@ SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesW(PCtxtHandle phContext, SECURITY_STATUS SEC_ENTRY ntlm_QueryContextAttributesA(PCtxtHandle phContext, ULONG ulAttribute, void *pBuffer) { - return ntlm_QueryContextAttributesW(phContext, ulAttribute, pBuffer); + switch(ulAttribute) + { + case SECPKG_ATTR_NEGOTIATION_INFO: + { + SecPkgContext_NegotiationInfoA *info = (SecPkgContext_NegotiationInfoA *)pBuffer; + if (!(info->PackageInfo = build_package_infoA( &infoA ))) return SEC_E_INSUFFICIENT_MEMORY; + info->NegotiationState = SECPKG_NEGOTIATION_COMPLETE; + return SEC_E_OK; + } + default: + return ntlm_QueryContextAttributesW( phContext, ulAttribute, pBuffer ); + } } /*********************************************************************** @@ -1976,53 +2074,6 @@ static const SecurityFunctionTableW ntlmTableW = { NULL, /* SetContextAttributesW */ }; -#define NTLM_COMMENT \ - { 'N', 'T', 'L', 'M', ' ', \ - 'S', 'e', 'c', 'u', 'r', 'i', 't', 'y', ' ', \ - 'P', 'a', 'c', 'k', 'a', 'g', 'e', 0} - -static CHAR ntlm_comment_A[] = NTLM_COMMENT; -static WCHAR ntlm_comment_W[] = NTLM_COMMENT; - -#define NTLM_NAME {'N', 'T', 'L', 'M', 0} - -static char ntlm_name_A[] = NTLM_NAME; -static WCHAR ntlm_name_W[] = NTLM_NAME; - -/* According to Windows, NTLM has the following capabilities. */ -#define CAPS ( \ - SECPKG_FLAG_INTEGRITY | \ - SECPKG_FLAG_PRIVACY | \ - SECPKG_FLAG_TOKEN_ONLY | \ - SECPKG_FLAG_CONNECTION | \ - SECPKG_FLAG_MULTI_REQUIRED | \ - SECPKG_FLAG_IMPERSONATION | \ - SECPKG_FLAG_ACCEPT_WIN32_NAME | \ - SECPKG_FLAG_NEGOTIABLE | \ - SECPKG_FLAG_LOGON | \ - SECPKG_FLAG_RESTRICTED_TOKENS ) - -static const SecPkgInfoW infoW = { - CAPS, - 1, - RPC_C_AUTHN_WINNT, - NTLM_MAX_BUF, - ntlm_name_W, - ntlm_comment_W -}; - -static const SecPkgInfoA infoA = { - CAPS, - 1, - RPC_C_AUTHN_WINNT, - NTLM_MAX_BUF, - ntlm_name_A, - ntlm_comment_A -}; - -SecPkgInfoA *ntlm_package_infoA = (SecPkgInfoA *)&infoA; -SecPkgInfoW *ntlm_package_infoW = (SecPkgInfoW *)&infoW; - void SECUR32_initNTLMSP(void) { PNegoHelper helper; diff --git a/dlls/secur32/tests/ntlm.c b/dlls/secur32/tests/ntlm.c index c060420..b9fdf6f 100644 --- a/dlls/secur32/tests/ntlm.c +++ b/dlls/secur32/tests/ntlm.c @@ -916,12 +916,10 @@ static void testAuth(ULONG data_rep, BOOL fake) memset(&info, 0, sizeof(info)); sec_status = QueryContextAttributesA(&client.ctxt, SECPKG_ATTR_NEGOTIATION_INFO, &info); -todo_wine ok(sec_status == SEC_E_OK, "QueryContextAttributesA returned %08x\n", sec_status); pi = info.PackageInfo; ok(info.NegotiationState == SECPKG_NEGOTIATION_COMPLETE, "got %u\n", info.NegotiationState); -todo_wine ok(pi != NULL, "expected non-NULL PackageInfo\n"); if (pi) {

1 0

Hans Leidekker : kerberos: Don' t fail on caller supplied credentials in kerberos_SpAcquireCredentialsHandle.
by Alexandre Julliard 08 Feb '18

08 Feb '18

Module: wine Branch: master Commit: 574446923420a9ec23f6d73bedc216fe960b4060 URL: https://source.winehq.org/git/wine.git/?a=commit;h=574446923420a9ec23f6d73b… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Feb 8 11:53:57 2018 +0100 kerberos: Don't fail on caller supplied credentials in kerberos_SpAcquireCredentialsHandle. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 99673b0..78ec6d3 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -832,11 +832,7 @@ static NTSTATUS NTAPI kerberos_SpAcquireCredentialsHandle( TRACE( "(%s 0x%08x %p %p %p %p %p %p)\n", debugstr_us(principal_us), credential_use, logon_id, auth_data, get_key_fn, get_key_arg, credential, ts_expiry ); - if (auth_data) - { - FIXME( "specific credentials not supported\n" ); - return SEC_E_UNKNOWN_CREDENTIALS; - } + if (auth_data) FIXME( "specific credentials not supported\n" ); switch (credential_use) {

1 0