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

Jacek Caban : mshtml.idl: Added IHTMLHtmlElement declaration.
by Alexandre Julliard 31 Mar '16

31 Mar '16

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

Jacek Caban : mshtml: Added HTMLHtmlElement object implementation.
by Alexandre Julliard 31 Mar '16

31 Mar '16

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 31 Mar '16

31 Mar '16

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

Nikolay Sivov : fontsub: Added CreateFontPackage() stub.
by Alexandre Julliard 31 Mar '16

31 Mar '16

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

Sebastian Lackner : include: Add definition for TP_CALLBACK_ENVIRON_V3.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: eb5f4b86d5676700447bd1cfd630122e1d242e07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb5f4b86d5676700447bd1cfd… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 31 04:52:14 2016 +0200 include: Add definition for TP_CALLBACK_ENVIRON_V3. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winnt.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/include/winnt.h b/include/winnt.h index 559a719..5ece0f7 100644 --- a/include/winnt.h +++ b/include/winnt.h @@ -5936,6 +5936,29 @@ typedef struct _TP_CALLBACK_ENVIRON_V1 } u; } TP_CALLBACK_ENVIRON_V1; +typedef struct _TP_CALLBACK_ENVIRON_V3 +{ + TP_VERSION Version; + PTP_POOL Pool; + PTP_CLEANUP_GROUP CleanupGroup; + PTP_CLEANUP_GROUP_CANCEL_CALLBACK CleanupGroupCancelCallback; + PVOID RaceDll; + struct _ACTIVATION_CONTEXT *ActivationContext; + PTP_SIMPLE_CALLBACK FinalizationCallback; + union + { + DWORD Flags; + struct + { + DWORD LongFunction:1; + DWORD Persistent:1; + DWORD Private:30; + } s; + } u; + TP_CALLBACK_PRIORITY CallbackPriority; + DWORD Size; +} TP_CALLBACK_ENVIRON_V3; + typedef struct _TP_WORK TP_WORK, *PTP_WORK; typedef struct _TP_TIMER TP_TIMER, *PTP_TIMER;

1 0

Sebastian Lackner : ntdll/tests: Add test for threadpool environment version 3.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: 18ea2e5f884e60c87bf49f264c1510ff677816d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=18ea2e5f884e60c87bf49f264… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 31 04:53:25 2016 +0200 ntdll/tests: Add test for threadpool environment version 3. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/threadpool.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/ntdll/tests/threadpool.c b/dlls/ntdll/tests/threadpool.c index 304fe91..1d8b1f9 100644 --- a/dlls/ntdll/tests/threadpool.c +++ b/dlls/ntdll/tests/threadpool.c @@ -477,6 +477,7 @@ static void CALLBACK simple2_cb(TP_CALLBACK_INSTANCE *instance, void *userdata) static void test_tp_simple(void) { TP_CALLBACK_ENVIRON environment; + TP_CALLBACK_ENVIRON_V3 environment3; TP_CLEANUP_GROUP *group; HANDLE semaphore; NTSTATUS status; @@ -512,6 +513,17 @@ static void test_tp_simple(void) result = WaitForSingleObject(semaphore, 1000); ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + /* test with environment version 3 */ + memset(&environment3, 0, sizeof(environment3)); + environment3.Version = 3; + environment3.Pool = pool; + environment3.CallbackPriority = TP_CALLBACK_PRIORITY_NORMAL; + environment3.Size = sizeof(environment3); + status = pTpSimpleTryPost(simple_cb, semaphore, (TP_CALLBACK_ENVIRON *)&environment3); + ok(!status, "TpSimpleTryPost failed with status %x\n", status); + result = WaitForSingleObject(semaphore, 1000); + ok(result == WAIT_OBJECT_0, "WaitForSingleObject returned %u\n", result); + /* test with invalid version number */ memset(&environment, 0, sizeof(environment)); environment.Version = 9999;

1 0

Sebastian Lackner : ntdll: Don' t warn about unsupported environment version 3.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: a919a02ac335094b8f2ff1007faf4002fbd0da62 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a919a02ac335094b8f2ff1007… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 31 04:53:51 2016 +0200 ntdll: Don't warn about unsupported environment version 3. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/threadpool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index 9c98040..781750b 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -1845,7 +1845,7 @@ static void tp_object_initialize( struct threadpool_object *object, struct threa if (environment) { - if (environment->Version != 1) + if (environment->Version != 1 && environment->Version != 3) FIXME( "unsupported environment version %u\n", environment->Version ); object->group = impl_from_TP_CLEANUP_GROUP( environment->CleanupGroup );

1 0

Sebastian Lackner : kernel32: Fix handling of GetOverlappedResult when status remains STATUS_PENDING.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: 455e6c64ae8751e185820820c4adc5edddab861a URL: http://source.winehq.org/git/wine.git/?a=commit;h=455e6c64ae8751e185820820c… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 31 05:19:43 2016 +0200 kernel32: Fix handling of GetOverlappedResult when status remains STATUS_PENDING. Spotted by Michael Müller. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/file.c | 2 ++ dlls/kernel32/tests/file.c | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index b6dba6a..a518e08 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -625,7 +625,9 @@ BOOL WINAPI GetOverlappedResult(HANDLE hFile, LPOVERLAPPED lpOverlapped, if (WaitForSingleObject( lpOverlapped->hEvent ? lpOverlapped->hEvent : hFile, INFINITE ) == WAIT_FAILED) return FALSE; + status = lpOverlapped->Internal; + if (status == STATUS_PENDING) status = STATUS_SUCCESS; } *lpTransferred = lpOverlapped->InternalHigh; diff --git a/dlls/kernel32/tests/file.c b/dlls/kernel32/tests/file.c index 8353c21..a066692 100644 --- a/dlls/kernel32/tests/file.c +++ b/dlls/kernel32/tests/file.c @@ -3361,6 +3361,11 @@ static void test_overlapped(void) "wrong error %u\n", GetLastError() ); ok( r == FALSE, "should return false\n"); + r = GetOverlappedResult( 0, &ov, &result, TRUE ); + ok( r == TRUE, "should return TRUE\n" ); + ok( result == 0xabcd, "wrong result %u\n", result ); + ok( ov.Internal == STATUS_PENDING, "expected STATUS_PENDING, got %08lx\n", ov.Internal ); + ResetEvent( ov.hEvent ); SetLastError( 0xb00 );

1 0

Bernhard Übelacker : dinput: Implement device property DIPROP_USERNAME.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: fbc85ddc28a3ad6002cd415552684bd8c5b27bf2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fbc85ddc28a3ad6002cd41555… Author: Bernhard Übelacker <bernhardu(a)vr-web.de> Date: Thu Mar 31 05:39:21 2016 +0200 dinput: Implement device property DIPROP_USERNAME. Signed-off-by: Bernhard Übelacker <bernhardu(a)vr-web.de> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 29 +++++++++++++++++++++++++++++ dlls/dinput/device_private.h | 1 + dlls/dinput8/tests/device.c | 29 +++++++++++++++++++++++++++-- 3 files changed, 57 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index e525f01..0b08e15 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -783,6 +783,7 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L DIOBJECTDATAFORMAT *obj_df = NULL; DIPROPDWORD dp; DIPROPRANGE dpr; + DIPROPSTRING dps; WCHAR username[MAX_PATH]; DWORD username_size = MAX_PATH; int i, action = 0, num_actions = 0; @@ -863,6 +864,16 @@ HRESULT _set_action_map(LPDIRECTINPUTDEVICE8W iface, LPDIACTIONFORMATW lpdiaf, L else lstrcpynW(username, lpszUserName, MAX_PATH); + dps.diph.dwSize = sizeof(dps); + dps.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dps.diph.dwObj = 0; + dps.diph.dwHow = DIPH_DEVICE; + if (dwFlags & DIDSAM_NOUSER) + dps.wsz[0] = '\0'; + else + lstrcpynW(dps.wsz, username, sizeof(dps.wsz)/sizeof(WCHAR)); + IDirectInputDevice8_SetProperty(iface, DIPROP_USERNAME, &dps.diph); + /* Save the settings to disk */ save_mapping_settings(iface, lpdiaf, username); @@ -1251,6 +1262,15 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetProperty(LPDIRECTINPUTDEVICE8W iface, TRACE("buffersize = %d\n", pd->dwData); break; } + case (DWORD_PTR) DIPROP_USERNAME: + { + LPDIPROPSTRING ps = (LPDIPROPSTRING)pdiph; + + if (pdiph->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM; + + lstrcpynW(ps->wsz, This->username, sizeof(ps->wsz)/sizeof(WCHAR)); + break; + } case (DWORD_PTR) DIPROP_VIDPID: FIXME("DIPROP_VIDPID not implemented\n"); return DIERR_UNSUPPORTED; @@ -1324,6 +1344,15 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SetProperty( LeaveCriticalSection(&This->crit); break; } + case (DWORD_PTR) DIPROP_USERNAME: + { + LPCDIPROPSTRING ps = (LPCDIPROPSTRING)pdiph; + + if (pdiph->dwSize != sizeof(DIPROPSTRING)) return DIERR_INVALIDPARAM; + + lstrcpynW(This->username, ps->wsz, sizeof(This->username)/sizeof(WCHAR)); + break; + } default: WARN("Unknown property %s\n", debugstr_guid(rguid)); return DIERR_UNSUPPORTED; diff --git a/dlls/dinput/device_private.h b/dlls/dinput/device_private.h index 52bbec4..c4fbe85 100644 --- a/dlls/dinput/device_private.h +++ b/dlls/dinput/device_private.h @@ -81,6 +81,7 @@ struct IDirectInputDeviceImpl /* Action mapping */ int num_actions; /* number of actions mapped */ ActionMap *action_map; /* array of mappings */ + WCHAR username[MAX_PATH]; }; extern BOOL get_app_key(HKEY*, HKEY*) DECLSPEC_HIDDEN; diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 6495559..fc415b7 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -223,8 +223,8 @@ static BOOL CALLBACK enumeration_callback(const DIDEVICEINSTANCEA *lpddi, IDirec dps.wsz[0] = '\0'; hr = IDirectInputDevice_GetProperty(lpdid, DIPROP_USERNAME, &dps.diph); - todo_wine ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr); - todo_wine ok (!lstrcmpW(usernameW, dps.wsz), "Username not set correctly expected=%s, got=%s\n", wine_dbgstr_wn(usernameW, -1), wine_dbgstr_wn(dps.wsz, -1)); + ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr); + ok (!lstrcmpW(usernameW, dps.wsz), "Username not set correctly expected=%s, got=%s\n", wine_dbgstr_w(usernameW), wine_dbgstr_w(dps.wsz)); /* Test buffer size */ memset(&dp, 0, sizeof(dp)); @@ -275,6 +275,7 @@ static void test_action_mapping(void) HINSTANCE hinst = GetModuleHandleA(NULL); IDirectInput8A *pDI = NULL; DIACTIONFORMATA af; + DIPROPSTRING dps; struct enum_data data = {pDI, &af, NULL, NULL, NULL, 0}; HWND hwnd; @@ -342,6 +343,30 @@ static void test_action_mapping(void) af.dwDataSize = 4 * sizeof(actionMapping) / sizeof(actionMapping[0]); af.dwNumActions = sizeof(actionMapping) / sizeof(actionMapping[0]); + + /* test DIDSAM_NOUSER */ + dps.diph.dwSize = sizeof(dps); + dps.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dps.diph.dwObj = 0; + dps.diph.dwHow = DIPH_DEVICE; + dps.wsz[0] = '\0'; + + hr = IDirectInputDevice_GetProperty(data.keyboard, DIPROP_USERNAME, &dps.diph); + ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr); + ok (dps.wsz[0] != 0, "Expected any username, got=%s\n", wine_dbgstr_w(dps.wsz)); + + hr = IDirectInputDevice8_SetActionMap(data.keyboard, data.lpdiaf, NULL, DIDSAM_NOUSER); + ok (SUCCEEDED(hr), "SetActionMap failed hr=%08x\n", hr); + + dps.diph.dwSize = sizeof(dps); + dps.diph.dwHeaderSize = sizeof(DIPROPHEADER); + dps.diph.dwObj = 0; + dps.diph.dwHow = DIPH_DEVICE; + dps.wsz[0] = '\0'; + + hr = IDirectInputDevice_GetProperty(data.keyboard, DIPROP_USERNAME, &dps.diph); + ok (SUCCEEDED(hr), "GetProperty failed hr=%08x\n", hr); + ok (dps.wsz[0] == 0, "Expected empty username, got=%s\n", wine_dbgstr_w(dps.wsz)); } if (data.mouse != NULL)

1 0

Sebastian Lackner : user32: Set %ecx to address of rect in EnumDisplayMonitors callback.
by Alexandre Julliard 31 Mar '16

31 Mar '16

Module: wine Branch: master Commit: 11f6df13eb23260331d9ca8412b9323dbe942885 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11f6df13eb23260331d9ca841… Author: Sebastian Lackner <sebastian(a)fds-team.de> Date: Thu Mar 31 05:51:41 2016 +0200 user32: Set %ecx to address of rect in EnumDisplayMonitors callback. Signed-off-by: Sebastian Lackner <sebastian(a)fds-team.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/misc.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c index 109809f..4faea6b 100644 --- a/dlls/user32/misc.c +++ b/dlls/user32/misc.c @@ -471,6 +471,7 @@ BOOL WINAPI GetMonitorInfoW(HMONITOR hMonitor, LPMONITORINFO lpMonitorInfo) #ifdef __i386__ /* Some apps pass a non-stdcall callback to EnumDisplayMonitors, * so we need a small assembly wrapper to call it. + * MJ's Help Diagnostic expects that %ecx contains the address to the rect. */ struct enumdisplaymonitors_lparam { @@ -491,6 +492,7 @@ __ASM_STDCALL_FUNC( enumdisplaymonitors_callback_wrapper, 16, "pushl 16(%ebp)\n\t" "pushl 12(%ebp)\n\t" "pushl 8(%ebp)\n\t" + "movl 16(%ebp),%ecx\n\t" "call *(%eax)\n\t" /* call orig->proc */ "leave\n\t" __ASM_CFI(".cfi_def_cfa %esp,4\n\t")

1 0