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

Jacek Caban : mshtml: Added HTMLHtmlElement object implementation.
by Alexandre Julliard March 31, 2016

March 31, 2016

Module: wine Branch: master Commit: baf9db63ed8f248c5674e408438dc6f28d70102d URL: http://source.winehq.org/git/wine.git/?a=commit;h=baf9db63ed8f248c5674e4084… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 31 14:51:08 2016 +0200 mshtml: Added HTMLHtmlElement object implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlelem.c | 2 + dlls/mshtml/htmlhead.c | 184 +++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 3 + dlls/mshtml/tests/dom.c | 11 ++- 4 files changed, 198 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlelem.c b/dlls/mshtml/htmlelem.c index ce1ed8a..ac077f7 100644 --- a/dlls/mshtml/htmlelem.c +++ b/dlls/mshtml/htmlelem.c @@ -46,6 +46,7 @@ static const WCHAR embedW[] = {'E','M','B','E','D',0}; static const WCHAR formW[] = {'F','O','R','M',0}; static const WCHAR frameW[] = {'F','R','A','M','E',0}; static const WCHAR headW[] = {'H','E','A','D',0}; +static const WCHAR htmlW[] = {'H','T','M','L',0}; static const WCHAR iframeW[] = {'I','F','R','A','M','E',0}; static const WCHAR imgW[] = {'I','M','G',0}; static const WCHAR inputW[] = {'I','N','P','U','T',0}; @@ -81,6 +82,7 @@ static const tag_desc_t tag_descs[] = { {formW, HTMLFormElement_Create}, {frameW, HTMLFrameElement_Create}, {headW, HTMLHeadElement_Create}, + {htmlW, HTMLHtmlElement_Create}, {iframeW, HTMLIFrame_Create}, {imgW, HTMLImgElement_Create}, {inputW, HTMLInputElement_Create}, diff --git a/dlls/mshtml/htmlhead.c b/dlls/mshtml/htmlhead.c index e64568c..fab6fa5 100644 --- a/dlls/mshtml/htmlhead.c +++ b/dlls/mshtml/htmlhead.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "winuser.h" #include "ole2.h" +#include "mshtmdid.h" #include "wine/debug.h" @@ -193,6 +194,189 @@ HRESULT HTMLTitleElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem typedef struct { HTMLElement element; + IHTMLHtmlElement IHTMLHtmlElement_iface; +} HTMLHtmlElement; + +static inline HTMLHtmlElement *impl_from_IHTMLHtmlElement(IHTMLHtmlElement *iface) +{ + return CONTAINING_RECORD(iface, HTMLHtmlElement, IHTMLHtmlElement_iface); +} + +static HRESULT WINAPI HTMLHtmlElement_QueryInterface(IHTMLHtmlElement *iface, + REFIID riid, void **ppv) +{ + HTMLHtmlElement *This = impl_from_IHTMLHtmlElement(iface); + + return IHTMLDOMNode_QueryInterface(&This->element.node.IHTMLDOMNode_iface, riid, ppv); +} + +static ULONG WINAPI HTMLHtmlElement_AddRef(IHTMLHtmlElement *iface) +{ + HTMLHtmlElement *This = impl_from_IHTMLHtmlElement(iface); + + return IHTMLDOMNode_AddRef(&This->element.node.IHTMLDOMNode_iface); +} + +static ULONG WINAPI HTMLHtmlElement_Release(IHTMLHtmlElement *iface) +{ + HTMLHtmlElement *This = impl_from_IHTMLHtmlElement(iface); + + return IHTMLDOMNode_Release(&This->element.node.IHTMLDOMNode_iface); +} + +static HRESULT WINAPI HTMLHtmlElement_GetTypeInfoCount(IHTMLHtmlElement *iface, UINT *pctinfo) +{ + HTMLHtmlElement *This = impl_from_IHTMLHtmlElement(iface); + + return IDispatchEx_GetTypeInfoCount(&This->element.node.event_target.dispex.IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI HTMLHtmlElement_GetTypeInfo(IHTMLHtmlElement *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLHtmlElement *This = impl_from_IHTMLHtmlElement(iface); + + return IDispatchEx_GetTypeInfo(&This->element.node.event_target.dispex.IDispatchEx_iface, iTInfo, lcid, + ppTInfo); +} + +static HRESULT WINAPI HTMLHtmlElement_GetIDsOfNames(IHTMLHtmlElement *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, + LCID lcid, DISPID *rgDispId) +{ + HTMLHtmlElement *This = impl_from_IHTMLHtmlElement(iface); + + return IDispatchEx_GetIDsOfNames(&This->element.node.event_target.dispex.IDispatchEx_iface, riid, rgszNames, + cNames, lcid, rgDispId); +} + +static HRESULT WINAPI HTMLHtmlElement_Invoke(IHTMLHtmlElement *iface, DISPID dispIdMember, + REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, + VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLHtmlElement *This = impl_from_IHTMLHtmlElement(iface); + + return IDispatchEx_Invoke(&This->element.node.event_target.dispex.IDispatchEx_iface, dispIdMember, riid, + lcid, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI HTMLHtmlElement_put_version(IHTMLHtmlElement *iface, BSTR v) +{ + HTMLHtmlElement *This = impl_from_IHTMLHtmlElement(iface); + FIXME("(%p)->(%s)\n", This, debugstr_w(v)); + return E_NOTIMPL; +} + +static HRESULT WINAPI HTMLHtmlElement_get_version(IHTMLHtmlElement *iface, BSTR *p) +{ + HTMLHtmlElement *This = impl_from_IHTMLHtmlElement(iface); + FIXME("(%p)->(%p)\n", This, p); + return E_NOTIMPL; +} + +static const IHTMLHtmlElementVtbl HTMLHtmlElementVtbl = { + HTMLHtmlElement_QueryInterface, + HTMLHtmlElement_AddRef, + HTMLHtmlElement_Release, + HTMLHtmlElement_GetTypeInfoCount, + HTMLHtmlElement_GetTypeInfo, + HTMLHtmlElement_GetIDsOfNames, + HTMLHtmlElement_Invoke, + HTMLHtmlElement_put_version, + HTMLHtmlElement_get_version +}; + +static inline HTMLHtmlElement *HTMLHtmlElement_from_HTMLDOMNode(HTMLDOMNode *iface) +{ + return CONTAINING_RECORD(iface, HTMLHtmlElement, element.node); +} + +static HRESULT HTMLHtmlElement_QI(HTMLDOMNode *iface, REFIID riid, void **ppv) +{ + HTMLHtmlElement *This = HTMLHtmlElement_from_HTMLDOMNode(iface); + + TRACE("(%p)->(%s %p)\n", This, debugstr_mshtml_guid(riid), ppv); + + if(IsEqualGUID(&IID_IHTMLHtmlElement, riid)) + *ppv = &This->IHTMLHtmlElement_iface; + else + return HTMLElement_QI(&This->element.node, riid, ppv); + + IUnknown_AddRef((IUnknown*)*ppv); + return S_OK; +} + +static void HTMLHtmlElement_destructor(HTMLDOMNode *iface) +{ + HTMLHtmlElement *This = HTMLHtmlElement_from_HTMLDOMNode(iface); + + HTMLElement_destructor(&This->element.node); +} + +static BOOL HTMLHtmlElement_is_settable(HTMLDOMNode *iface, DISPID dispid) +{ + switch(dispid) { + case DISPID_IHTMLELEMENT_OUTERTEXT: + return FALSE; + default: + return TRUE; + } +} + +static const NodeImplVtbl HTMLHtmlElementImplVtbl = { + HTMLHtmlElement_QI, + HTMLHtmlElement_destructor, + HTMLElement_cpc, + HTMLElement_clone, + HTMLElement_handle_event, + HTMLElement_get_attr_col, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + HTMLHtmlElement_is_settable +}; + +static const tid_t HTMLHtmlElement_iface_tids[] = { + HTMLELEMENT_TIDS, + IHTMLHtmlElement_tid, + 0 +}; +static dispex_static_data_t HTMLHtmlElement_dispex = { + NULL, + DispHTMLHtmlElement_tid, + NULL, + HTMLHtmlElement_iface_tids +}; + +HRESULT HTMLHtmlElement_Create(HTMLDocumentNode *doc, nsIDOMHTMLElement *nselem, HTMLElement **elem) +{ + HTMLHtmlElement *ret; + + ret = heap_alloc_zero(sizeof(*ret)); + if(!ret) + return E_OUTOFMEMORY; + + ret->IHTMLHtmlElement_iface.lpVtbl = &HTMLHtmlElementVtbl; + ret->element.node.vtbl = &HTMLHtmlElementImplVtbl; + + HTMLElement_Init(&ret->element, doc, nselem, &HTMLHtmlElement_dispex); + + *elem = &ret->element; + return S_OK; +} + +typedef struct { + HTMLElement element; + IHTMLHeadElement IHTMLHeadElement_iface; } HTMLHeadElement; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index fe69487..9fe8a75 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -94,6 +94,7 @@ typedef struct event_target_t event_target_t; XDIID(DispHTMLGenericElement) \ XDIID(DispHTMLFrameElement) \ XDIID(DispHTMLHeadElement) \ + XDIID(DispHTMLHtmlElement) \ XDIID(DispHTMLHistory) \ XDIID(DispHTMLIFrame) \ XDIID(DispHTMLImg) \ @@ -162,6 +163,7 @@ typedef struct event_target_t event_target_t; XIID(IHTMLFrameElement3) \ XIID(IHTMLGenericElement) \ XIID(IHTMLHeadElement) \ + XIID(IHTMLHtmlElement) \ XIID(IHTMLIFrameElement) \ XIID(IHTMLIFrameElement2) \ XIID(IHTMLIFrameElement3) \ @@ -968,6 +970,7 @@ HRESULT HTMLEmbedElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElement HRESULT HTMLFormElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElement**) DECLSPEC_HIDDEN; HRESULT HTMLFrameElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElement**) DECLSPEC_HIDDEN; HRESULT HTMLHeadElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElement**) DECLSPEC_HIDDEN; +HRESULT HTMLHtmlElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElement**) DECLSPEC_HIDDEN; HRESULT HTMLIFrame_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElement**) DECLSPEC_HIDDEN; HRESULT HTMLStyleElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElement**) DECLSPEC_HIDDEN; HRESULT HTMLImgElement_Create(HTMLDocumentNode*,nsIDOMHTMLElement*,HTMLElement**) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 81fbad9..9e8d8b5 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -328,6 +328,13 @@ static const IID * const frame_iids[] = { NULL }; +static const IID * const html_iids[] = { + ELEM_IFACES, + &IID_IHTMLHtmlElement, + &IID_IConnectionPointContainer, + NULL +}; + static const IID * const head_iids[] = { ELEM_IFACES, &IID_IHTMLHeadElement, @@ -449,7 +456,7 @@ typedef struct { static const elem_type_info_t elem_type_infos[] = { {"", none_iids, NULL}, - {"HTML", elem_iids, NULL}, + {"HTML", html_iids, &DIID_DispHTMLHtmlElement}, {"HEAD", head_iids, &DIID_DispHTMLHeadElement}, {"TITLE", title_iids, &DIID_DispHTMLTitleElement}, {"BODY", body_iids, &DIID_DispHTMLBody}, @@ -6353,7 +6360,7 @@ static void test_doc_elem(IHTMLDocument2 *doc) test_node_name((IUnknown*)elem, "HTML"); test_elem_tag((IUnknown*)elem, "HTML"); - todo_wine test_elem_set_outertext_fail(elem); + test_elem_set_outertext_fail(elem); doc_node = get_doc_node(doc); owner_doc = get_owner_doc((IUnknown*)elem);

1 0

Austin English : setupapi: Add SetupDiSetDeviceInstallParamsW stub.
by Alexandre Julliard March 31, 2016

March 31, 2016

Module: wine Branch: master Commit: f820c0942854c14fcd063c83225af03e73286334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f820c0942854c14fcd063c832… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Dec 15 21:32:38 2015 -0600 setupapi: Add SetupDiSetDeviceInstallParamsW stub. Signed-off-by: Austin English <austinenglish(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/setupapi/devinst.c | 13 +++++++++++++ dlls/setupapi/setupapi.spec | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 318dcdf..2669544 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3712,6 +3712,19 @@ BOOL WINAPI SetupDiSetDeviceInstallParamsA( return TRUE; } +/*********************************************************************** + * SetupDiSetDeviceInstallParamsW (SETUPAPI.@) + */ +BOOL WINAPI SetupDiSetDeviceInstallParamsW( + HDEVINFO DeviceInfoSet, + PSP_DEVINFO_DATA DeviceInfoData, + PSP_DEVINSTALL_PARAMS_W DeviceInstallParams) +{ + FIXME("(%p, %p, %p) stub\n", DeviceInfoSet, DeviceInfoData, DeviceInstallParams); + + return TRUE; +} + static HKEY SETUPDI_OpenDevKey(struct DeviceInfo *devInfo, REGSAM samDesired) { HKEY enumKey, key = INVALID_HANDLE_VALUE; diff --git a/dlls/setupapi/setupapi.spec b/dlls/setupapi/setupapi.spec index 4486994..9bfaadd 100644 --- a/dlls/setupapi/setupapi.spec +++ b/dlls/setupapi/setupapi.spec @@ -387,7 +387,7 @@ @ stdcall SetupDiSetClassInstallParamsA(ptr ptr ptr long) @ stdcall SetupDiSetClassInstallParamsW(ptr ptr ptr long) @ stdcall SetupDiSetDeviceInstallParamsA(ptr ptr ptr) -@ stub SetupDiSetDeviceInstallParamsW +@ stdcall SetupDiSetDeviceInstallParamsW(ptr ptr ptr) @ stdcall SetupDiSetDeviceRegistryPropertyA(ptr ptr long ptr ptr) @ stdcall SetupDiSetDeviceRegistryPropertyW(ptr ptr long ptr ptr) @ stub SetupDiSetDriverInstallParamsA

1 0

Jacek Caban : mshtml.idl: Added IHTMLHtmlElement declaration.
by Alexandre Julliard March 31, 2016

March 31, 2016

Module: wine Branch: master Commit: a02edb12c3c1b297f1d5476282e4849748e71ffe URL: http://source.winehq.org/git/wine.git/?a=commit;h=a02edb12c3c1b297f1d547628… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 31 14:50:54 2016 +0200 mshtml.idl: Added IHTMLHtmlElement declaration. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/mshtmdid.h | 3 +++ include/mshtml.idl | 38 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/include/mshtmdid.h b/include/mshtmdid.h index 7e010c6..ac0a5e2 100644 --- a/include/mshtmdid.h +++ b/include/mshtmdid.h @@ -2684,6 +2684,9 @@ /* IHTMLSelectElement4 */ #define DISPID_IHTMLSELECTELEMENT4_NAMEDITEM DISPID_COLLECTION+6 +/* IHTMLHtmlElement */ +#define DISPID_IHTMLHTMLELEMENT_VERSION DISPID_HEDELEMS+1 + /* IHTMLHeadElement */ #define DISPID_IHTMLHEADELEMENT_PROFILE DISPID_HEDELEMS+1 diff --git a/include/mshtml.idl b/include/mshtml.idl index 05f79ef..e068912 100644 --- a/include/mshtml.idl +++ b/include/mshtml.idl @@ -10724,6 +10724,24 @@ methods: } /***************************************************************************** + * IHTMLHtmlElement interface + */ +[ + odl, + oleautomation, + dual, + uuid(3050f81c-98b5-11cf-bb82-00aa00bdce0b) +] +interface IHTMLHtmlElement : IDispatch +{ + [propput, id(DISPID_IHTMLHTMLELEMENT_VERSION), displaybind, bindable] + HRESULT version([in] BSTR v); + + [propget, id(DISPID_IHTMLHTMLELEMENT_VERSION), displaybind, bindable] + HRESULT version([out, retval] BSTR *p); +} + +/***************************************************************************** * IHTMLHeadElement interface */ [ @@ -10856,6 +10874,26 @@ interface IHTMLMetaElement3 : IDispatch } /***************************************************************************** + * DispHTMLHtmlElement interface + */ +[ + hidden, + uuid(3050f560-98b5-11cf-bb82-00aa00bdce0b) +] +dispinterface DispHTMLHtmlElement +{ +properties: +methods: + WINE_HTMLELEMENT_DISPINTERFACE_DECL; + + [propput, id(DISPID_IHTMLHTMLELEMENT_VERSION), displaybind, bindable] + void version(BSTR v); + + [propget, id(DISPID_IHTMLHTMLELEMENT_VERSION), displaybind, bindable] + BSTR version(); +} + +/***************************************************************************** * DispHTMLHeadElement interface */ [

1 0

Daniel Lehman : msvcr120: Add asinh.
by Alexandre Julliard March 31, 2016

March 31, 2016

Module: wine Branch: master Commit: e084240415f8f1b31362b1519675b4613d4afded URL: http://source.winehq.org/git/wine.git/?a=commit;h=e084240415f8f1b31362b1519… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Mar 28 12:00:35 2016 -0700 msvcr120: Add asinh. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 2 ++ .../api-ms-win-crt-math-l1-1-0.spec | 6 ++-- dlls/msvcr120/msvcr120.spec | 6 ++-- dlls/msvcr120_app/msvcr120_app.spec | 6 ++-- dlls/msvcrt/math.c | 34 ++++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 6 ++-- include/config.h.in | 6 ++++ 8 files changed, 56 insertions(+), 12 deletions(-) diff --git a/configure b/configure index c1abf1f..27afbc0 100755 --- a/configure +++ b/configure @@ -16858,6 +16858,8 @@ $as_echo "#define HAVE_ISNAN 1" >>confdefs.h fi for ac_func in \ + asinh \ + asinhf \ cbrt \ cbrtf \ erf \ diff --git a/configure.ac b/configure.ac index c89aa08..20478df 100644 --- a/configure.ac +++ b/configure.ac @@ -2516,6 +2516,8 @@ then fi AC_CHECK_FUNCS(\ + asinh \ + asinhf \ cbrt \ cbrtf \ erf \ diff --git a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec index 1ea4f2d..fcfc8b4 100644 --- a/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec +++ b/dlls/api-ms-win-crt-math-l1-1-0/api-ms-win-crt-math-l1-1-0.spec @@ -129,9 +129,9 @@ @ stub acoshl @ cdecl asin(double) ucrtbase.asin @ cdecl -arch=arm,x86_64 asinf(float) ucrtbase.asinf -@ stub asinh -@ stub asinhf -@ stub asinhl +@ cdecl asinh(double double) ucrtbase.asinh +@ cdecl asinhf(float float) ucrtbase.asinhf +@ cdecl asinhl(double double) ucrtbase.asinhl @ cdecl atan(double) ucrtbase.atan @ cdecl atan2(double double) ucrtbase.atan2 @ cdecl -arch=arm,x86_64 atan2f(float float) ucrtbase.atan2f diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index dee7fd5..dc0c266 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2018,9 +2018,9 @@ @ cdecl asctime_s(ptr long ptr) MSVCRT_asctime_s @ cdecl asin(double) MSVCRT_asin @ cdecl -arch=arm,x86_64 asinf(float) MSVCRT_asinf -@ stub asinh -@ stub asinhf -@ stub asinhl +@ cdecl asinh(double double) MSVCR120_asinh +@ cdecl asinhf(float float) MSVCR120_asinhf +@ cdecl asinhl(double double) MSVCR120_asinhl @ cdecl atan(double) MSVCRT_atan @ cdecl -arch=arm,x86_64 atanf(float) MSVCRT_atanf @ cdecl atan2(double double) MSVCRT_atan2 diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index f5dba67..c7810cd 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1684,9 +1684,9 @@ @ cdecl asctime_s(ptr long ptr) msvcr120.asctime_s @ cdecl asin(double) msvcr120.asin @ cdecl -arch=arm,x86_64 asinf(float) msvcr120.asinf -@ stub asinh -@ stub asinhf -@ stub asinhl +@ cdecl asinh(double double) msvcr120.asinh +@ cdecl asinhf(float float) msvcr120.asinhf +@ cdecl asinhl(double double) msvcr120.asinhl @ cdecl atan(double) msvcr120.atan @ cdecl -arch=arm,x86_64 atanf(float) msvcr120.atanf @ cdecl atan2(double double) msvcr120.atan2 diff --git a/dlls/msvcrt/math.c b/dlls/msvcrt/math.c index 0a3f2da..4150cfc 100644 --- a/dlls/msvcrt/math.c +++ b/dlls/msvcrt/math.c @@ -2743,3 +2743,37 @@ double CDECL MSVCR120_fmin(double x, double y) return signbit(x) ? x : y; return x<y ? x : y; } + +/********************************************************************* + * asinh (MSVCR120.@) + */ +double CDECL MSVCR120_asinh(double x) +{ +#ifdef HAVE_ASINH + return asinh(x); +#else + FIXME( "not implemented\n" ); + return 0.0; +#endif +} + +/********************************************************************* + * asinhf (MSVCR120.@) + */ +float CDECL MSVCR120_asinhf(float x) +{ +#ifdef HAVE_ASINHF + return asinhf(x); +#else + FIXME( "not implemented\n" ); + return 0.0f; +#endif +} + +/********************************************************************* + * asinhl (MSVCR120.@) + */ +LDOUBLE CDECL MSVCR120_asinhl(LDOUBLE x) +{ + return MSVCR120_asinh(x); +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 3bbab33..16bc133 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2160,9 +2160,9 @@ @ cdecl asctime_s(ptr long ptr) MSVCRT_asctime_s @ cdecl asin(double) MSVCRT_asin @ cdecl -arch=arm,x86_64 asinf(float) MSVCRT_asinf -@ stub asinh -@ stub asinhf -@ stub asinhl +@ cdecl asinh(double double) MSVCR120_asinh +@ cdecl asinhf(float float) MSVCR120_asinhf +@ cdecl asinhl(double double) MSVCR120_asinhl @ cdecl atan(double) MSVCRT_atan @ cdecl atan2(double double) MSVCRT_atan2 @ cdecl -arch=arm,x86_64 atan2f(float float) MSVCRT_atan2f diff --git a/include/config.h.in b/include/config.h.in index 86da1a5..cb0ddd6 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -32,6 +32,12 @@ /* Define to 1 if you have the `asctime_r' function. */ #undef HAVE_ASCTIME_R +/* Define to 1 if you have the `asinh' function. */ +#undef HAVE_ASINH + +/* Define to 1 if you have the `asinhf' function. */ +#undef HAVE_ASINHF + /* Define to 1 if you have the <asm/types.h> header file. */ #undef HAVE_ASM_TYPES_H

1 0

Michael Müller : kernel32: Set ERROR_DLL_NOT_FOUND as error code in load_library for Win 9x compatibility.
by Alexandre Julliard March 31, 2016

March 31, 2016

Module: wine Branch: master Commit: bd17022c90466cf06392e9ffac905b8b0b7e2cd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd17022c90466cf06392e9ffa… Author: Michael Müller <michael(a)fds-team.de> Date: Thu Mar 31 06:04:14 2016 +0200 kernel32: Set ERROR_DLL_NOT_FOUND as error code in load_library for Win 9x compatibility. Newer operating systems return ERROR_MOD_NOT_FOUND. Signed-off-by: Michael Müller <michael(a)fds-team.de> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/module.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/module.c b/dlls/kernel32/module.c index dac66c1..badfe1d 100644 --- a/dlls/kernel32/module.c +++ b/dlls/kernel32/module.c @@ -948,7 +948,10 @@ static HMODULE load_library( const UNICODE_STRING *libname, DWORD flags ) if (nts != STATUS_SUCCESS) { hModule = 0; - SetLastError( RtlNtStatusToDosError( nts ) ); + if (nts == STATUS_DLL_NOT_FOUND && (GetVersion() & 0x80000000)) + SetLastError( ERROR_DLL_NOT_FOUND ); + else + SetLastError( RtlNtStatusToDosError( nts ) ); } done: HeapFree( GetProcessHeap(), 0, load_path );

1 0

Jacek Caban : mshtml: Added IHTMLElement::outerText tests.
by Alexandre Julliard March 31, 2016

March 31, 2016

Module: wine Branch: master Commit: e35a84360cad8a536877352a40b4be24284d7b0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35a84360cad8a536877352a4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 31 14:50:42 2016 +0200 mshtml: Added IHTMLElement::outerText tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/tests/dom.c | 53 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 53 insertions(+) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index dcff793..81fbad9 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -2804,6 +2804,44 @@ static void _test_elem_set_innertext(unsigned line, IHTMLElement *elem, const ch } +#define test_elem_outertext(e,t) _test_elem_outertext(__LINE__,e,t) +static void _test_elem_outertext(unsigned line, IHTMLElement *elem, const char *extext) +{ + BSTR text = NULL; + HRESULT hres; + + hres = IHTMLElement_get_outerText(elem, &text); + ok_(__FILE__,line) (hres == S_OK, "get_outerText failed: %08x\n", hres); + if(extext) + ok_(__FILE__,line) (!strcmp_wa(text, extext), "get_outerText returned %s expected %s\n", + wine_dbgstr_w(text), extext); + else + ok_(__FILE__,line) (!text, "get_outerText returned %s expected NULL\n", wine_dbgstr_w(text)); + SysFreeString(text); +} + +#define test_elem_set_outertext(e,t) _test_elem_set_outertext(__LINE__,e,t) +static void _test_elem_set_outertext(unsigned line, IHTMLElement *elem, const char *text) +{ + BSTR str = a2bstr(text); + HRESULT hres; + + hres = IHTMLElement_put_outerText(elem, str); + ok_(__FILE__,line) (hres == S_OK, "put_outerText failed: %08x\n", hres); + SysFreeString(str); +} + +#define test_elem_set_outertext_fail(a) _test_elem_set_outertext_fail(__LINE__,a) +static void _test_elem_set_outertext_fail(unsigned line, IHTMLElement *elem) +{ + BSTR str = a2bstr("test"); + HRESULT hres; + + hres = IHTMLElement_put_outerText(elem, str); + ok_(__FILE__,line) (hres == 0x800a0258, "put_outerText failed: %08x\n", hres); + SysFreeString(str); +} + #define test_elem_innerhtml(e,t) _test_elem_innerhtml(__LINE__,e,t) static void _test_elem_innerhtml(unsigned line, IUnknown *unk, const char *inner_html) { @@ -6315,6 +6353,7 @@ static void test_doc_elem(IHTMLDocument2 *doc) test_node_name((IUnknown*)elem, "HTML"); test_elem_tag((IUnknown*)elem, "HTML"); + todo_wine test_elem_set_outertext_fail(elem); doc_node = get_doc_node(doc); owner_doc = get_owner_doc((IUnknown*)elem); @@ -6727,6 +6766,8 @@ static void test_defaults(IHTMLDocument2 *doc) test_body_funs(body); IHTMLBodyElement_Release(body); + test_elem_set_outertext_fail(elem); + test_elem_istextedit(elem, VARIANT_TRUE); hres = IHTMLElement_get_style(elem, &style); @@ -8911,6 +8952,18 @@ static void test_elems2(IHTMLDocument2 *doc) IHTMLElement_Release(elem2); } + test_elem_set_innerhtml((IUnknown*)div, "<div id=\"elemid\">test</div>"); + elem = get_elem_by_id(doc, "elemid", TRUE); + if(elem) { + test_elem_outertext(elem, "test"); + test_elem_set_outertext(elem, "outer text"); + test_elem_outertext(elem, NULL); + test_elem_all((IUnknown*)div, NULL, 0); + elem2 = test_elem_get_parent((IUnknown*)elem); + ok(!elem2, "parent != NULL\n"); + IHTMLElement_Release(elem); + } + test_attr(doc, div); test_blocked(doc, div); test_elem_names(doc);

1 0

Jacek Caban : mshtml: Return NULL instead of empty string in get_node_text.
by Alexandre Julliard March 31, 2016

March 31, 2016

Module: wine Branch: master Commit: 386042fbdf9fd85468634669e1e53b09f724440d URL: http://source.winehq.org/git/wine.git/?a=commit;h=386042fbdf9fd85468634669e… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Mar 31 14:50:03 2016 +0200 mshtml: Return NULL instead of empty string in get_node_text. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/txtrange.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/mshtml/txtrange.c b/dlls/mshtml/txtrange.c index b8103ce..4757215 100644 --- a/dlls/mshtml/txtrange.c +++ b/dlls/mshtml/txtrange.c @@ -535,7 +535,7 @@ HRESULT get_node_text(HTMLDOMNode *node, BSTR *ret) if (!wstrbuf_init(&buf)) return E_OUTOFMEMORY; wstrbuf_append_node_rec(&buf, node->nsnode); - if(buf.buf) { + if(buf.buf && *buf.buf) { *ret = SysAllocString(buf.buf); if(!*ret) hres = E_OUTOFMEMORY;

1 0

Józef Kucia : wined3d: Improve wined3d_sysval_semantic enum values naming.
by Alexandre Julliard March 31, 2016

March 31, 2016

Module: wine Branch: master Commit: e2f4aaa65abc44b173d865fa12fb032b6fe7a246 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e2f4aaa65abc44b173d865fa1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 31 10:54:39 2016 +0200 wined3d: Improve wined3d_sysval_semantic enum values naming. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 2 +- dlls/wined3d/shader.c | 8 ++++---- include/wine/wined3d.h | 34 +++++++++++++++++----------------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 5af7ae8..6bb0a2a 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1898,7 +1898,7 @@ static void shader_generate_glsl_declarations(const struct wined3d_context *cont for (i = 0; i < shader->input_signature.element_count; ++i) { const struct wined3d_shader_signature_element *e = &shader->input_signature.elements[i]; - if (e->sysval_semantic == WINED3D_SV_INSTANCEID) + if (e->sysval_semantic == WINED3D_SV_INSTANCE_ID) shader_addline(buffer, "vec4 %s_in%u = vec4(intBitsToFloat(gl_InstanceID), 0.0, 0.0, 0.0);\n", prefix, e->register_idx); else diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b64b726..6347fa0 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -223,10 +223,10 @@ static const struct sysval_semantic_names[] = { {WINED3D_SV_POSITION, "SV_Position"}, - {WINED3D_SV_INSTANCEID, "SV_InstanceID"}, - {WINED3D_SV_PRIMITIVEID, "SV_PrimitiveID"}, - {WINED3D_SV_ISFRONTFACE, "SV_IsFrontFace"}, - {WINED3D_SV_SAMPLEINDEX, "SV_SampleIndex"}, + {WINED3D_SV_INSTANCE_ID, "SV_InstanceID"}, + {WINED3D_SV_PRIMITIVE_ID, "SV_PrimitiveID"}, + {WINED3D_SV_IS_FRONT_FACE, "SV_IsFrontFace"}, + {WINED3D_SV_SAMPLE_INDEX, "SV_SampleIndex"}, {WINED3D_SV_QUAD_U0_TESS_FACTOR, "finalQuadUeq0EdgeTessFactor"}, {WINED3D_SV_QUAD_V0_TESS_FACTOR, "finalQuadVeq0EdgeTessFactor"}, {WINED3D_SV_QUAD_U1_TESS_FACTOR, "finalQuadUeq1EdgeTessFactor"}, diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 7fbfe9d..9bdd16d 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -747,23 +747,23 @@ enum wined3d_decl_usage enum wined3d_sysval_semantic { - WINED3D_SV_POSITION = 1, - WINED3D_SV_PRIMITIVEID = 7, - WINED3D_SV_INSTANCEID = 8, - WINED3D_SV_ISFRONTFACE = 9, - WINED3D_SV_SAMPLEINDEX = 10, - WINED3D_SV_QUAD_U0_TESS_FACTOR = 11, - WINED3D_SV_QUAD_V0_TESS_FACTOR = 12, - WINED3D_SV_QUAD_U1_TESS_FACTOR = 13, - WINED3D_SV_QUAD_V1_TESS_FACTOR = 14, - WINED3D_SV_QUAD_U_INNER_TESS_FACTOR = 15, - WINED3D_SV_QUAD_V_INNER_TESS_FACTOR = 16, - WINED3D_SV_TRIANGLE_U_TESS_FACTOR = 17, - WINED3D_SV_TRIANGLE_V_TESS_FACTOR = 18, - WINED3D_SV_TRIANGLE_W_TESS_FACTOR = 19, - WINED3D_SV_TRIANGLE_INNER_TESS_FACTOR = 20, - WINED3D_SV_LINE_DETAIL_TESS_FACTOR = 21, - WINED3D_SV_LINE_DENSITY_TESS_FACTOR = 22, + WINED3D_SV_POSITION = 1, + WINED3D_SV_PRIMITIVE_ID = 7, + WINED3D_SV_INSTANCE_ID = 8, + WINED3D_SV_IS_FRONT_FACE = 9, + WINED3D_SV_SAMPLE_INDEX = 10, + WINED3D_SV_QUAD_U0_TESS_FACTOR = 11, + WINED3D_SV_QUAD_V0_TESS_FACTOR = 12, + WINED3D_SV_QUAD_U1_TESS_FACTOR = 13, + WINED3D_SV_QUAD_V1_TESS_FACTOR = 14, + WINED3D_SV_QUAD_U_INNER_TESS_FACTOR = 15, + WINED3D_SV_QUAD_V_INNER_TESS_FACTOR = 16, + WINED3D_SV_TRIANGLE_U_TESS_FACTOR = 17, + WINED3D_SV_TRIANGLE_V_TESS_FACTOR = 18, + WINED3D_SV_TRIANGLE_W_TESS_FACTOR = 19, + WINED3D_SV_TRIANGLE_INNER_TESS_FACTOR = 20, + WINED3D_SV_LINE_DETAIL_TESS_FACTOR = 21, + WINED3D_SV_LINE_DENSITY_TESS_FACTOR = 22, }; enum wined3d_scanline_ordering

1 0

Nikolay Sivov : fontsub: Added CreateFontPackage() stub.
by Alexandre Julliard March 31, 2016

March 31, 2016

Module: wine Branch: master Commit: 72da5888e9e96e9cfc09c4d5a0e4ab0ecea8f64d URL: http://source.winehq.org/git/wine.git/?a=commit;h=72da5888e9e96e9cfc09c4d5a… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Wed Mar 30 16:27:19 2016 +0300 fontsub: Added CreateFontPackage() stub. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/fontsub/fontsub.spec | 2 +- dlls/fontsub/main.c | 14 ++++++++++++++ include/Makefile.in | 1 + include/fontsub.h | 42 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 58 insertions(+), 1 deletion(-) diff --git a/dlls/fontsub/fontsub.spec b/dlls/fontsub/fontsub.spec index dfb47fb..61b7fd3 100644 --- a/dlls/fontsub/fontsub.spec +++ b/dlls/fontsub/fontsub.spec @@ -1,2 +1,2 @@ -@ stub CreateFontPackage +@ cdecl CreateFontPackage(ptr long ptr ptr ptr long long long long long long ptr long ptr ptr ptr ptr) @ stub MergeFontPackage diff --git a/dlls/fontsub/main.c b/dlls/fontsub/main.c index 515c2d3..b78bd58 100644 --- a/dlls/fontsub/main.c +++ b/dlls/fontsub/main.c @@ -19,6 +19,7 @@ #include <stdarg.h> #include "windef.h" #include "winbase.h" +#include "fontsub.h" #include "wine/debug.h" @@ -38,3 +39,16 @@ BOOL WINAPI DllMain (HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved) return TRUE; } + +ULONG __cdecl CreateFontPackage(const unsigned char *src, const ULONG src_len, unsigned char **dest, + ULONG *dest_len, ULONG *written, const unsigned short flags, const unsigned short face_index, + const unsigned short format, const unsigned short lang, const unsigned short platform, const unsigned short encoding, + const unsigned short *keep_list, const unsigned short keep_len, CFP_ALLOCPROC allocproc, + CFP_REALLOCPROC reallocproc, CFP_FREEPROC freeproc, void *reserved) +{ + FIXME("(%p %u %p %p %p %#x %u %u %u %u %u %p %u %p %p %p %p): stub\n", src, src_len, dest, dest_len, + written, flags, face_index, format, lang, platform, encoding, keep_list, keep_len, allocproc, + reallocproc, freeproc, reserved); + + return ERR_GENERIC; +} diff --git a/include/Makefile.in b/include/Makefile.in index 8283616..6e9803c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -355,6 +355,7 @@ HEADER_SRCS = \ fdi.h \ fileapi.h \ fltdefs.h \ + fontsub.h \ gdiplus.h \ gdipluscolor.h \ gdipluscolormatrix.h \ diff --git a/include/fontsub.h b/include/fontsub.h new file mode 100644 index 0000000..6fc7793 --- /dev/null +++ b/include/fontsub.h @@ -0,0 +1,42 @@ +/* + * Copyright 2016 Nikolay Sivov for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_FONTSUB_H +#define __WINE_FONTSUB_H + +#ifdef __cplusplus +extern "C" { +#endif + +typedef void *(__cdecl *CFP_ALLOCPROC)(size_t); +typedef void *(__cdecl *CFP_REALLOCPROC)(void *, size_t); +typedef void (__cdecl *CFP_FREEPROC)(void *); + +ULONG __cdecl CreateFontPackage(const unsigned char *src, const ULONG src_len, unsigned char **dest, + ULONG *dest_len, ULONG *written, const unsigned short flags, const unsigned short face_index, + const unsigned short format, const unsigned short lang, const unsigned short platform, + const unsigned short encoding, const unsigned short *keep_list, const unsigned short keep_len, + CFP_ALLOCPROC allocproc, CFP_REALLOCPROC reallocproc, CFP_FREEPROC freeproc, void *reserved); + +#define ERR_GENERIC 1000 + +#ifdef __cplusplus +} +#endif + +#endif

1 0

Huw Davies : wineqtdecoder: Use thread-safe initialization.
by Alexandre Julliard March 31, 2016

March 31, 2016

Module: wine Branch: master Commit: ea7825edfa0c863849065f6c0001ab58eee17b67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea7825edfa0c863849065f6c0… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Mar 31 13:16:04 2016 +0100 wineqtdecoder: Use thread-safe initialization. Since commit 46d5973961fe2266074ac2855368c3fcf987c1b5 QuickTime can be called from background threads, so use the thread-safe initialization / destruction routines. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/qtsplitter.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wineqtdecoder/qtsplitter.c b/dlls/wineqtdecoder/qtsplitter.c index 2aafdb4..4e12242 100644 --- a/dlls/wineqtdecoder/qtsplitter.c +++ b/dlls/wineqtdecoder/qtsplitter.c @@ -250,7 +250,7 @@ IUnknown * CALLBACK QTSplitter_create(IUnknown *punkout, HRESULT *phr) QTSplitter *This; static const WCHAR wcsInputPinName[] = {'I','n','p','u','t',' ','P','i','n',0}; - EnterMovies(); + EnterMoviesOnThread(0); RegisterWineDataHandler(); @@ -324,7 +324,7 @@ static void QT_Destroy(QTSplitter *This) if (This->aSession) MovieAudioExtractionEnd(This->aSession); - ExitMovies(); + ExitMoviesOnThread(); LeaveCriticalSection(&This->csReceive); if (This->loaderThread)

1 0