February 2018 - Wine-commits

Dmitry Timoshkov : include: Add IADsADSystemInfo definition.
by Alexandre Julliard 16 Feb '18

16 Feb '18

Module: wine Branch: master Commit: b66da4565750ffefff41194fede01c328ce19c72 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b66da4565750ffefff41194f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 9 12:15:25 2018 +0800 include: Add IADsADSystemInfo definition. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/iads.idl | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) diff --git a/include/iads.idl b/include/iads.idl index dcaf133..6931b6f 100644 --- a/include/iads.idl +++ b/include/iads.idl @@ -18,6 +18,12 @@ import "oaidl.idl"; +#ifndef __WIDL__ +#define threading(model) +#define progid(str) +#define vi_progid(str) +#endif + [ helpstring("Active DS Type Library"), uuid(97d25db0-0363-11cf-abc4-02608c9e7553), @@ -788,4 +794,55 @@ interface IDirectorySearch : IUnknown HRESULT CloseSearchHandle([in] ADS_SEARCH_HANDLE hSearchResult); } +/***************************************************************************** + * IADsADSystemInfo interface + */ +[ + odl, + uuid(5bb11929-afd1-11d2-9cb9-0000f87a369e), + dual, + oleautomation +] +interface IADsADSystemInfo : IDispatch +{ + [id(0x00000002), propget] + HRESULT UserName([out, retval] BSTR *retval); + [id(0x00000003), propget] + HRESULT ComputerName([out, retval] BSTR *retval); + [id(0x00000004), propget] + HRESULT SiteName([out, retval] BSTR *retval); + [id(0x00000005), propget] + HRESULT DomainShortName([out, retval] BSTR *retval); + [id(0x00000006), propget] + HRESULT DomainDNSName([out, retval] BSTR *retval); + [id(0x00000007), propget] + HRESULT ForestDNSName([out, retval] BSTR *retval); + [id(0x00000008), propget] + HRESULT PDCRoleOwner([out, retval] BSTR *retval); + [id(0x00000009), propget] + HRESULT SchemaRoleOwner([out, retval] BSTR *retval); + [id(0x0000000a), propget] + HRESULT IsNativeMode([out, retval] VARIANT_BOOL *retval); + [id(0x0000000b)] + HRESULT GetAnyDCName([out, retval] BSTR *retval); + [id(0x0000000c)] + HRESULT GetDCSiteName([in] BSTR server, [out, retval] BSTR *retval); + [id(0x0000000d)] + HRESULT RefreshSchemaCache(); + [id(0x0000000e)] + HRESULT GetTrees([out, retval] VARIANT *retval); +} + +[ + helpstring("AD System Info Object"), + uuid(50b6327f-afd1-11d2-9cb9-0000f87a369e), + progid("ADSystemInfo"), + version(1.0) +] +coclass ADSystemInfo +{ + [default] interface IADsADSystemInfo; + interface IDispatch; +} + } /* library */

1 0

Dmitry Timoshkov : adsldp: Add a stub for IADsADSystemInfo.
by Alexandre Julliard 16 Feb '18

16 Feb '18

Module: wine Branch: master Commit: 0509b9a4571263a6b34c0ac76be2c0958568d874 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0509b9a4571263a6b34c0ac7… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Fri Feb 9 12:15:34 2018 +0800 adsldp: Add a stub for IADsADSystemInfo. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/adsldp/Makefile.in | 7 + dlls/adsldp/adsldp.c | 358 ++++++++++++++++++++++++++++++++++++++++++++++++ dlls/adsldp/adsldp.idl | 28 ++++ dlls/adsldp/adsldp.spec | 4 + 6 files changed, 400 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0509b9a4571263a6b34c…

1 0

Jacek Caban : mshtml: Added IDOMMouseEvent:: buttons property implementation.
by Alexandre Julliard 15 Feb '18

15 Feb '18

Module: wine Branch: master Commit: 5896677d9e28f79305810d2af3d398fd4efbda6c URL: https://source.winehq.org/git/wine.git/?a=commit;h=5896677d9e28f79305810d2a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 15 17:05:07 2018 +0100 mshtml: Added IDOMMouseEvent::buttons property implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 13 +++++++++++-- dlls/mshtml/tests/events.js | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 382ed6d..094ae05 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1515,8 +1515,17 @@ static HRESULT WINAPI DOMMouseEvent_getModifierState(IDOMMouseEvent *iface, BSTR static HRESULT WINAPI DOMMouseEvent_get_buttons(IDOMMouseEvent *iface, USHORT *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + UINT16 r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMMouseEvent_GetButtons(This->mouse_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = r; + return S_OK; } static HRESULT WINAPI DOMMouseEvent_get_fromElement(IDOMMouseEvent *iface, IHTMLElement **p) diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index fe21efe..9fe4895 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -642,6 +642,7 @@ function test_mouse_event() { ok(e.shiftKey === false, "shiftKey = " + e.shiftKey); ok(e.metaKey === false, "metaKey = " + e.metaKey); ok(e.button === 1, "button = " + e.button); + ok(e.buttons === 0, "buttons = " + e.buttons); e.initMouseEvent("test", false, false, window, 9, 8, 7, 6, 5, true, true, true, true, 127, document); ok(e.type === "test", "type = " + e.type);

1 0

Jacek Caban : mshtml: Added IDOMEvent:: pageX and pageY properties implementation.
by Alexandre Julliard 15 Feb '18

15 Feb '18

Module: wine Branch: master Commit: 881ba0627b4a13d56925301ab3777511e3bc7ed5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=881ba0627b4a13d56925301a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 15 17:05:13 2018 +0100 mshtml: Added IDOMEvent::pageX and pageY properties implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmlevent.c | 26 ++++++++++++++++++++++---- dlls/mshtml/tests/events.js | 3 +++ 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index 094ae05..413ca2d 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1573,15 +1573,33 @@ static HRESULT WINAPI DOMMouseEvent_get_offsetY(IDOMMouseEvent *iface, LONG *p) static HRESULT WINAPI DOMMouseEvent_get_pageX(IDOMMouseEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + INT32 r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMMouseEvent_GetPageX(This->mouse_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = r; + return S_OK; } static HRESULT WINAPI DOMMouseEvent_get_pageY(IDOMMouseEvent *iface, LONG *p) { DOMEvent *This = impl_from_IDOMMouseEvent(iface); - FIXME("(%p)->(%p)\n", This, p); - return E_NOTIMPL; + INT32 r; + nsresult nsres; + + TRACE("(%p)->(%p)\n", This, p); + + nsres = nsIDOMMouseEvent_GetPageY(This->mouse_event, &r); + if(NS_FAILED(nsres)) + return E_FAIL; + + *p = r; + return S_OK; } static HRESULT WINAPI DOMMouseEvent_get_layerX(IDOMMouseEvent *iface, LONG *p) diff --git a/dlls/mshtml/tests/events.js b/dlls/mshtml/tests/events.js index 9fe4895..c5030d0 100644 --- a/dlls/mshtml/tests/events.js +++ b/dlls/mshtml/tests/events.js @@ -625,6 +625,9 @@ function test_mouse_event() { ok(e.shiftKey === false, "shiftKey = " + e.shiftKey); ok(e.metaKey === false, "metaKey = " + e.metaKey); ok(e.button === 0, "button = " + e.button); + ok(e.buttons === 0, "buttons = " + e.buttons); + ok(e.pageX === 0, "pageX = " + e.pageX); + ok(e.pageY === 0, "pageY = " + e.pageY); e.initMouseEvent("test", true, true, window, 1, 2, 3, 4, 5, false, false, false, false, 1, document); ok(e.type === "test", "type = " + e.type);

1 0

Alex Henrie : oleaut32/tests: Mark some tmarshal tests as todo on x64 and ARM.
by Alexandre Julliard 15 Feb '18

15 Feb '18

Module: wine Branch: master Commit: 96e9da5c8797ff6c7fd7f93f54ac252ee862a466 URL: https://source.winehq.org/git/wine.git/?a=commit;h=96e9da5c8797ff6c7fd7f93f… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Tue Feb 13 09:19:05 2018 -0700 oleaut32/tests: Mark some tmarshal tests as todo on x64 and ARM. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/tmarshal.c | 31 +++++++++++++++++++++++++++++-- 1 file changed, 29 insertions(+), 2 deletions(-) diff --git a/dlls/oleaut32/tests/tmarshal.c b/dlls/oleaut32/tests/tmarshal.c index 67b8e22..00cb464 100644 --- a/dlls/oleaut32/tests/tmarshal.c +++ b/dlls/oleaut32/tests/tmarshal.c @@ -34,6 +34,12 @@ static HRESULT (WINAPI *pVarAdd)(LPVARIANT,LPVARIANT,LPVARIANT); #define ok_ole_success(hr, func) ok(hr == S_OK, #func " failed with error 0x%08x\n", hr) +#ifdef __i386__ +static const int tmarshal_todo = 0; +#else +static const int tmarshal_todo = 1; +#endif + /* ULL suffix is not portable */ #define ULL_CONST(dw1, dw2) ((((ULONGLONG)dw1) << 32) | (ULONGLONG)dw2) @@ -1305,6 +1311,7 @@ static void test_typelibmarshal(void) IStream_Seek(pStream, ullZero, STREAM_SEEK_SET, NULL); hr = CoUnmarshalInterface(pStream, &IID_IKindaEnumWidget, (void **)&pKEW); + todo_wine_if(tmarshal_todo) ok_ole_success(hr, CoUnmarshalInterface); IStream_Release(pStream); @@ -1331,6 +1338,7 @@ static void test_typelibmarshal(void) VariantInit(&varresult); hr = IDispatch_Invoke(pDispatch, DISPID_TM_NAME, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYPUT, &dispparams, &varresult, &excepinfo, NULL); ok_ole_success(hr, IDispatch_Invoke); + todo_wine_if(tmarshal_todo) ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", excepinfo.wCode, excepinfo.scode); @@ -1350,6 +1358,7 @@ static void test_typelibmarshal(void) VariantInit(&varresult); hr = IDispatch_Invoke(pDispatch, DISPID_TM_NAME, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL); ok_ole_success(hr, IDispatch_Invoke); + todo_wine_if(tmarshal_todo) ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", excepinfo.wCode, excepinfo.scode); @@ -1481,6 +1490,7 @@ static void test_typelibmarshal(void) hr = IDispatch_Invoke(pDispatch, DISPID_TM_CLONEDISPATCH, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL); ok_ole_success(hr, IDispatch_Invoke); + todo_wine_if(tmarshal_todo) ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", excepinfo.wCode, excepinfo.scode); @@ -1498,6 +1508,7 @@ static void test_typelibmarshal(void) hr = IDispatch_Invoke(pDispatch, DISPID_TM_CLONECOCLASS, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL); ok_ole_success(hr, IDispatch_Invoke); + todo_wine_if(tmarshal_todo) ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", excepinfo.wCode, excepinfo.scode); @@ -1514,6 +1525,7 @@ static void test_typelibmarshal(void) VariantInit(&varresult); hr = IDispatch_Invoke(pDispatch, DISPID_TM_COCLASS, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); todo_wine ok_ole_success(hr, IDispatch_Invoke); + todo_wine_if(tmarshal_todo) ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", excepinfo.wCode, excepinfo.scode); @@ -1533,6 +1545,7 @@ static void test_typelibmarshal(void) hr = IDispatch_Invoke(pDispatch, DISPID_VALUE, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_PROPERTYGET, &dispparams, &varresult, &excepinfo, NULL); ok_ole_success(hr, IDispatch_Invoke); + todo_wine_if(tmarshal_todo) ok(excepinfo.wCode == 0x0 && excepinfo.scode == S_OK, "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", excepinfo.wCode, excepinfo.scode); @@ -1588,9 +1601,9 @@ static void test_typelibmarshal(void) V_I4(&vararg[1]) = 2; hr = IWidget_VariantCArray(pWidget, 2, vararg); ok_ole_success(hr, IWidget_VariantCArray); - todo_wine + todo_wine_if(!tmarshal_todo) ok(V_VT(&vararg[0]) == VT_I4 && V_I4(&vararg[0]) == 2, "vararg[0] = %d[%d]\n", V_VT(&vararg[0]), V_I4(&vararg[0])); - todo_wine + todo_wine_if(!tmarshal_todo) ok(V_VT(&vararg[1]) == VT_I4 && V_I4(&vararg[1]) == 3, "vararg[1] = %d[%d]\n", V_VT(&vararg[1]), V_I4(&vararg[1])); /* call VarArg */ @@ -1661,6 +1674,7 @@ static void test_typelibmarshal(void) VariantInit(&varresult); hr = IDispatch_Invoke(pDispatch, DISPID_TM_ERROR, &IID_NULL, LOCALE_NEUTRAL, DISPATCH_METHOD, &dispparams, NULL, &excepinfo, NULL); ok(hr == DISP_E_EXCEPTION, "IDispatch_Invoke should have returned DISP_E_EXCEPTION instead of 0x%08x\n", hr); + todo_wine_if(tmarshal_todo) ok(excepinfo.wCode == 0x0 && excepinfo.scode == E_NOTIMPL, "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", excepinfo.wCode, excepinfo.scode); @@ -1687,6 +1701,7 @@ static void test_typelibmarshal(void) hr = ITypeInfo_Invoke(pTypeInfo, &NonOleAutomation, DISPID_NOA_ERROR, DISPATCH_METHOD, &dispparams, &varresult, &excepinfo, NULL); ok(hr == DISP_E_EXCEPTION, "ITypeInfo_Invoke should have returned DISP_E_EXCEPTION instead of 0x%08x\n", hr); ok(V_VT(&varresult) == VT_EMPTY, "V_VT(&varresult) should be VT_EMPTY instead of %d\n", V_VT(&varresult)); + todo_wine_if(tmarshal_todo) ok(excepinfo.wCode == 0x0 && excepinfo.scode == E_NOTIMPL, "EXCEPINFO differs from expected: wCode = 0x%x, scode = 0x%08x\n", excepinfo.wCode, excepinfo.scode); @@ -1998,6 +2013,7 @@ static void test_external_connection(void) IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); hres = CoUnmarshalInterface(stream, &IID_ItestDual, (void**)&iface); + todo_wine_if(tmarshal_todo) ok(hres == S_OK, "CoUnmarshalInterface failed: %08x\n", hres); ok(external_connections == 1, "external_connections = %d\n", external_connections); @@ -2006,6 +2022,7 @@ static void test_external_connection(void) /* Creating a stub for new iface causes new external connection. */ hres = ItestDual_QueryInterface(iface, &IID_ITestSecondDisp, (void**)&second); + todo_wine_if(tmarshal_todo) ok(hres == S_OK, "Could not get ITestSecondDisp iface: %08x\n", hres); todo_wine ok(external_connections == 2, "external_connections = %d\n", external_connections); @@ -2017,6 +2034,7 @@ static void test_external_connection(void) expect_last_release_closes = TRUE; ItestDual_Release(iface); + todo_wine_if(tmarshal_todo) ok(external_connections == 0, "external_connections = %d\n", external_connections); end_host_object(tid, thread); @@ -2028,12 +2046,14 @@ static void test_external_connection(void) expect_last_release_closes = FALSE; hres = CoMarshalInterface(stream, &IID_ItestDual, (IUnknown*)&TestDual, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); ok(hres == S_OK, "CoMarshalInterface failed: %08x\n", hres); + todo_wine_if(tmarshal_todo) ok(external_connections == 1, "external_connections = %d\n", external_connections); expect_last_release_closes = TRUE; IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); hres = CoReleaseMarshalData(stream); ok(hres == S_OK, "CoReleaseMarshalData failed: %08x\n", hres); + todo_wine_if(tmarshal_todo) ok(external_connections == 0, "external_connections = %d\n", external_connections); /* Two separated marshal data are still one external connection. */ @@ -2044,21 +2064,25 @@ static void test_external_connection(void) IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); hres = CoMarshalInterface(stream, &IID_ItestDual, (IUnknown*)&TestDual, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); ok(hres == S_OK, "CoMarshalInterface failed: %08x\n", hres); + todo_wine_if(tmarshal_todo) ok(external_connections == 1, "external_connections = %d\n", external_connections); hres = CoMarshalInterface(stream2, &IID_ItestDual, (IUnknown*)&TestDual, MSHCTX_INPROC, NULL, MSHLFLAGS_NORMAL); ok(hres == S_OK, "CoMarshalInterface failed: %08x\n", hres); + todo_wine_if(tmarshal_todo) ok(external_connections == 1, "external_connections = %d\n", external_connections); IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); hres = CoReleaseMarshalData(stream); ok(hres == S_OK, "CoReleaseMarshalData failed: %08x\n", hres); + todo_wine_if(tmarshal_todo) ok(external_connections == 1, "external_connections = %d\n", external_connections); expect_last_release_closes = TRUE; IStream_Seek(stream2, zero, STREAM_SEEK_SET, NULL); hres = CoReleaseMarshalData(stream2); ok(hres == S_OK, "CoReleaseMarshalData failed: %08x\n", hres); + todo_wine_if(tmarshal_todo) ok(external_connections == 0, "external_connections = %d\n", external_connections); IStream_Release(stream); @@ -2070,17 +2094,20 @@ static void test_external_connection(void) hres = CoMarshalInterface(stream, &IID_ItestDual, (IUnknown*)&TestDual, MSHCTX_INPROC, NULL, MSHLFLAGS_TABLEWEAK); ok(hres == S_OK, "CoMarshalInterface failed: %08x\n", hres); + todo_wine_if(tmarshal_todo) ok(external_connections == 0, "external_connections = %d\n", external_connections); IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); hres = CoUnmarshalInterface(stream, &IID_ItestDual, (void**)&iface); ok(hres == S_OK, "CoUnmarshalInterface failed: %08x\n", hres); + todo_wine_if(tmarshal_todo) ok(external_connections == 0, "external_connections = %d\n", external_connections); ItestDual_Release(iface); IStream_Seek(stream, zero, STREAM_SEEK_SET, NULL); hres = CoReleaseMarshalData(stream); ok(hres == S_OK, "CoReleaseMarshalData failed: %08x\n", hres); + todo_wine_if(tmarshal_todo) ok(external_connections == 0, "external_connections = %d\n", external_connections); IStream_Release(stream);

1 0

Andrey Gusev : amstream: Return S_OK in IDirectDrawStreamSampleImpl_Update.
by Alexandre Julliard 15 Feb '18

15 Feb '18

Module: wine Branch: master Commit: 65989f2ace1b06617638e31cb7ba56deb38fe690 URL: https://source.winehq.org/git/wine.git/?a=commit;h=65989f2ace1b06617638e31c… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue Feb 13 14:11:27 2018 +0200 amstream: Return S_OK in IDirectDrawStreamSampleImpl_Update. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/mediastream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 53556af..7a2e013 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -929,7 +929,7 @@ static HRESULT WINAPI IDirectDrawStreamSampleImpl_Update(IDirectDrawStreamSample { FIXME("(%p)->(%x,%p,%p,%u): stub\n", iface, flags, event, func_APC, APC_data); - return E_NOTIMPL; + return S_OK; } static HRESULT WINAPI IDirectDrawStreamSampleImpl_CompletionStatus(IDirectDrawStreamSample *iface, DWORD flags, DWORD milliseconds)

1 0

Aric Stewart : winebus.sys: Be more specific as to what we offer as IG_ enumerated devices.
by Alexandre Julliard 15 Feb '18

15 Feb '18

Module: wine Branch: master Commit: e48296c2f02081d224505c90e645985f95b30d1d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e48296c2f02081d224505c90… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 14 12:24:27 2018 -0600 winebus.sys: Be more specific as to what we offer as IG_ enumerated devices. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winebus.sys/bus.h | 1 + dlls/winebus.sys/bus_iohid.c | 48 +++++++++++++++++++++++++-- dlls/winebus.sys/bus_udev.c | 79 +++++++++++++++++++++++++++++++++----------- dlls/winebus.sys/main.c | 29 ++++++++++++++++ 4 files changed, 135 insertions(+), 22 deletions(-) diff --git a/dlls/winebus.sys/bus.h b/dlls/winebus.sys/bus.h index 34783f2..141e6d6 100644 --- a/dlls/winebus.sys/bus.h +++ b/dlls/winebus.sys/bus.h @@ -49,3 +49,4 @@ DEVICE_OBJECT* bus_enumerate_hid_devices(const platform_vtbl *vtbl, enum_func fu /* General Bus Functions */ DWORD check_bus_option(UNICODE_STRING *registry_path, const UNICODE_STRING *option, DWORD default_value) DECLSPEC_HIDDEN; +BOOL is_xbox_gamepad(WORD vid, WORD pid) DECLSPEC_HIDDEN; diff --git a/dlls/winebus.sys/bus_iohid.c b/dlls/winebus.sys/bus_iohid.c index 10635f8..501a40d 100644 --- a/dlls/winebus.sys/bus_iohid.c +++ b/dlls/winebus.sys/bus_iohid.c @@ -287,7 +287,7 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * DWORD vid, pid, version; CFStringRef str = NULL; WCHAR serial_string[256]; - BOOL is_gamepad; + BOOL is_gamepad = FALSE; TRACE("OS/X IOHID Device Added %p\n", IOHIDDevice); @@ -297,8 +297,50 @@ static void handle_DeviceMatchingCallback(void *context, IOReturn result, void * str = IOHIDDeviceGetProperty(IOHIDDevice, CFSTR(kIOHIDSerialNumberKey)); if (str) CFStringToWSTR(str, serial_string, sizeof(serial_string) / sizeof(WCHAR)); - is_gamepad = (IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad) || - IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick)); + if (IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_GamePad) || + IOHIDDeviceConformsTo(IOHIDDevice, kHIDPage_GenericDesktop, kHIDUsage_GD_Joystick)) + { + if (is_xbox_gamepad(vid, pid)) + is_gamepad = TRUE; + else + { + int axes=0, buttons=0; + CFArrayRef element_array = IOHIDDeviceCopyMatchingElements( + IOHIDDevice, NULL, kIOHIDOptionsTypeNone); + + if (element_array) { + CFIndex index; + CFIndex count = CFArrayGetCount(element_array); + for (index = 0; index < count; index++) + { + IOHIDElementRef element = (IOHIDElementRef)CFArrayGetValueAtIndex(element_array, index); + if (element) + { + int type = IOHIDElementGetType(element); + if (type == kIOHIDElementTypeInput_Button) buttons++; + if (type == kIOHIDElementTypeInput_Axis) axes++; + if (type == kIOHIDElementTypeInput_Misc) + { + uint32_t usage = IOHIDElementGetUsage(element); + switch (usage) + { + case kHIDUsage_GD_X: + case kHIDUsage_GD_Y: + case kHIDUsage_GD_Z: + case kHIDUsage_GD_Rx: + case kHIDUsage_GD_Ry: + case kHIDUsage_GD_Rz: + case kHIDUsage_GD_Slider: + axes ++; + } + } + } + } + CFRelease(element_array); + } + is_gamepad = (axes == 6 && buttons >= 14); + } + } device = bus_create_hid_device(iohid_driver_obj, busidW, vid, pid, version, 0, str?serial_string:NULL, is_gamepad, &GUID_DEVCLASS_IOHID, &iohid_vtbl, sizeof(struct platform_private)); if (!device) diff --git a/dlls/winebus.sys/bus_udev.c b/dlls/winebus.sys/bus_udev.c index f80c5d7..18e1854 100644 --- a/dlls/winebus.sys/bus_udev.c +++ b/dlls/winebus.sys/bus_udev.c @@ -439,13 +439,55 @@ static void set_rel_axis_value(struct wine_input_private *ext, int code, int val } } +static INT count_buttons(int device_fd, BYTE *map) +{ + int i; + int button_count = 0; + BYTE keybits[(KEY_MAX+7)/8]; + + if (ioctl(device_fd, EVIOCGBIT(EV_KEY, sizeof(keybits)), keybits) == -1) + { + WARN("ioctl(EVIOCGBIT, EV_KEY) failed: %d %s\n", errno, strerror(errno)); + return FALSE; + } + + for (i = BTN_MISC; i < KEY_MAX; i++) + { + if (test_bit(keybits, i)) + { + if (map) map[i] = button_count; + button_count++; + } + } + return button_count; +} + +static INT count_abs_axis(int device_fd) +{ + BYTE absbits[(ABS_MAX+7)/8]; + int abs_count = 0; + int i; + + if (ioctl(device_fd, EVIOCGBIT(EV_ABS, sizeof(absbits)), absbits) == -1) + { + WARN("ioctl(EVIOCGBIT, EV_ABS) failed: %d %s\n", errno, strerror(errno)); + return 0; + } + + for (i = 0; i < HID_ABS_MAX; i++) + if (test_bit(absbits, i) && + (ABS_TO_HID_MAP[i][1] >= HID_USAGE_GENERIC_X && + ABS_TO_HID_MAP[i][1] <= HID_USAGE_GENERIC_WHEEL)) + abs_count++; + return abs_count; +} + static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_device *dev) { int abs_pages[TOP_ABS_PAGE][HID_ABS_MAX+1]; int rel_pages[TOP_REL_PAGE][HID_REL_MAX+1]; BYTE absbits[(ABS_MAX+7)/8]; BYTE relbits[(REL_MAX+7)/8]; - BYTE keybits[(KEY_MAX+7)/8]; BYTE *report_ptr; INT i, descript_size; INT report_size; @@ -462,25 +504,12 @@ static BOOL build_report_descriptor(struct wine_input_private *ext, struct udev_ WARN("ioctl(EVIOCGBIT, EV_ABS) failed: %d %s\n", errno, strerror(errno)); return FALSE; } - if (ioctl(ext->base.device_fd, EVIOCGBIT(EV_KEY, sizeof(keybits)), keybits) == -1) - { - WARN("ioctl(EVIOCGBIT, EV_KEY) failed: %d %s\n", errno, strerror(errno)); - return FALSE; - } descript_size = sizeof(REPORT_HEADER) + sizeof(REPORT_TAIL); report_size = 0; /* For now lump all buttons just into incremental usages, Ignore Keys */ - button_count = 0; - for (i = BTN_MISC; i < KEY_MAX; i++) - { - if (test_bit(keybits, i)) - { - ext->button_map[i] = button_count; - button_count++; - } - } + button_count = count_buttons(ext->base.device_fd, ext->button_map); if (button_count) { descript_size += sizeof(REPORT_BUTTONS); @@ -1138,7 +1167,7 @@ static void try_add_device(struct udev_device *dev) const char *subsystem; const char *devnode; WCHAR *serial = NULL; - const char* gamepad = NULL; + BOOL is_gamepad = FALSE; int fd; if (!(devnode = udev_device_get_devnode(dev))) @@ -1188,7 +1217,6 @@ static void try_add_device(struct udev_device *dev) if (ioctl(fd, EVIOCGUNIQ(254), device_uid) >= 0 && device_uid[0]) serial = strdupAtoW(device_uid); - gamepad = udev_device_get_property_value(dev, "ID_INPUT_JOYSTICK"); vid = device_id.vendor; pid = device_id.product; version = device_id.version; @@ -1198,18 +1226,31 @@ static void try_add_device(struct udev_device *dev) WARN("Could not get device to query VID, PID, Version and Serial\n"); #endif + if (is_xbox_gamepad(vid, pid)) + is_gamepad = TRUE; +#ifdef HAS_PROPER_INPUT_HEADER + else + { + int axes=0, buttons=0; + axes = count_abs_axis(fd); + buttons = count_buttons(fd, NULL); + is_gamepad = (axes == 6 && buttons >= 14); + } +#endif + + TRACE("Found udev device %s (vid %04x, pid %04x, version %u, serial %s)\n", debugstr_a(devnode), vid, pid, version, debugstr_w(serial)); if (strcmp(subsystem, "hidraw") == 0) { - device = bus_create_hid_device(udev_driver_obj, hidraw_busidW, vid, pid, version, 0, serial, FALSE, + device = bus_create_hid_device(udev_driver_obj, hidraw_busidW, vid, pid, version, 0, serial, is_gamepad, &GUID_DEVCLASS_HIDRAW, &hidraw_vtbl, sizeof(struct platform_private)); } #ifdef HAS_PROPER_INPUT_HEADER else if (strcmp(subsystem, "input") == 0) { - device = bus_create_hid_device(udev_driver_obj, lnxev_busidW, vid, pid, version, 0, serial, (gamepad != NULL), + device = bus_create_hid_device(udev_driver_obj, lnxev_busidW, vid, pid, version, 0, serial, is_gamepad, &GUID_DEVCLASS_LINUXEVENT, &lnxev_vtbl, sizeof(struct wine_input_private)); } #endif diff --git a/dlls/winebus.sys/main.c b/dlls/winebus.sys/main.c index 87d05f0..6334477 100644 --- a/dlls/winebus.sys/main.c +++ b/dlls/winebus.sys/main.c @@ -43,6 +43,22 @@ WINE_DEFAULT_DEBUG_CHANNEL(plugplay); WINE_DECLARE_DEBUG_CHANNEL(hid_report); +#define VID_MICROSOFT 0x045e + +static const WORD PID_XBOX_CONTROLLERS[] = { + 0x0202, /* Xbox Controller */ + 0x0285, /* Xbox Controller S */ + 0x0289, /* Xbox Controller S */ + 0x028e, /* Xbox360 Controller */ + 0x028f, /* Xbox360 Wireless Controller */ + 0x02d1, /* Xbox One Controller */ + 0x02dd, /* Xbox One Controller (Covert Forces/Firmware 2015) */ + 0x02e3, /* Xbox One Elite Controller */ + 0x02e6, /* Wireless XBox Controller Dongle */ + 0x02ea, /* Xbox One S Controller */ + 0x0719, /* Xbox 360 Wireless Adapter */ +}; + struct pnp_device { struct list entry; @@ -673,6 +689,19 @@ DWORD check_bus_option(UNICODE_STRING *registry_path, const UNICODE_STRING *opti return output; } +BOOL is_xbox_gamepad(WORD vid, WORD pid) +{ + int i; + + if (vid != VID_MICROSOFT) + return FALSE; + + for (i = 0; i < sizeof(PID_XBOX_CONTROLLERS)/sizeof(*PID_XBOX_CONTROLLERS); i++) + if (pid == PID_XBOX_CONTROLLERS[i]) return TRUE; + + return FALSE; +} + NTSTATUS WINAPI DriverEntry( DRIVER_OBJECT *driver, UNICODE_STRING *path ) { static const WCHAR udevW[] = {'\\','D','r','i','v','e','r','\\','U','D','E','V',0};

1 0

Aric Stewart : xinput: Detect and setup HID gamepads.
by Alexandre Julliard 15 Feb '18

15 Feb '18

Module: wine Branch: master Commit: 755422a2be2db4641ad33c9d41d5d0f0e9226e48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=755422a2be2db4641ad33c9d… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 14 12:40:59 2018 -0600 xinput: Detect and setup HID gamepads. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_1/Makefile.in | 2 + dlls/xinput1_2/Makefile.in | 2 + dlls/xinput1_3/Makefile.in | 2 + dlls/xinput1_3/hid.c | 331 ++++++++++++++++++++++++++++++++++++++++ dlls/xinput1_3/xinput_main.c | 27 ++-- dlls/xinput1_3/xinput_private.h | 30 ++++ dlls/xinput1_4/Makefile.in | 2 + dlls/xinput9_1_0/Makefile.in | 2 + 8 files changed, 387 insertions(+), 11 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=755422a2be2db4641ad3…

1 0

Aric Stewart : xinput: Update state of HID device.
by Alexandre Julliard 15 Feb '18

15 Feb '18

Module: wine Branch: master Commit: 9e321a6f96714111c51466303caed89c9fabacf0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e321a6f96714111c5146630… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 14 12:41:33 2018 -0600 xinput: Update state of HID device. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/hid.c | 94 ++++++++++++++++++++++++++++++++++++++--- dlls/xinput1_3/xinput_main.c | 14 +++--- dlls/xinput1_3/xinput_private.h | 1 + 3 files changed, 96 insertions(+), 13 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index 32a7ef5..5d82f05 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -66,9 +66,9 @@ struct hid_platform_private { CRITICAL_SECTION crit; - CHAR *last_report; - CHAR *current_report; DWORD report_length; + BYTE current_report; + CHAR *reports[2]; LONG ThumbLXRange[3]; LONG ThumbLYRange[3]; @@ -201,8 +201,9 @@ static void build_private(struct hid_platform_private *private, PHIDP_PREPARSED_ private->ppd = ppd; private->device = device; private->report_length = caps->InputReportByteLength + 1; - private->current_report = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, private->report_length); - private->last_report = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, private->report_length); + private->current_report = 0; + private->reports[0] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, private->report_length); + private->reports[1] = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, private->report_length); size = (strlenW(path) + 1) * sizeof(WCHAR); private->device_path = HeapAlloc(GetProcessHeap(), 0, size); memcpy(private->device_path, path, size); @@ -309,8 +310,8 @@ static void remove_gamepad(xinput_controller *device) EnterCriticalSection(&private->crit); CloseHandle(private->device); - HeapFree(GetProcessHeap(), 0, private->current_report); - HeapFree(GetProcessHeap(), 0, private->last_report); + HeapFree(GetProcessHeap(), 0, private->reports[0]); + HeapFree(GetProcessHeap(), 0, private->reports[1]); HeapFree(GetProcessHeap(), 0, private->device_path); HidD_FreePreparsedData(private->ppd); device->platform_private = NULL; @@ -329,3 +330,84 @@ void HID_destroy_gamepads(xinput_controller *devices) remove_gamepad(&devices[i]); LeaveCriticalSection(&hid_xinput_crit); } + +#define SIGN(v,b) ((b==8)?(BYTE)v:(b==16)?(SHORT)v:(INT)v) +#define SCALE_SHORT(v,r) (SHORT)((((0xffff)*(SIGN(v,r[1]) - r[0]))/r[2])-32767) +#define SCALE_BYTE(v,r) (BYTE)((((0xff)*(SIGN(v,r[1]) - r[0]))/r[2])) + +void HID_update_state(xinput_controller* device) +{ + struct hid_platform_private *private = device->platform_private; + int i; + CHAR *report = private->reports[(private->current_report)%2]; + CHAR *target_report = private->reports[(private->current_report+1)%2]; + + USAGE buttons[15]; + ULONG button_length; + ULONG value; + + EnterCriticalSection(&private->crit); + if (!HidD_GetInputReport(private->device, target_report, private->report_length)) + { + if (GetLastError() == ERROR_ACCESS_DENIED || GetLastError() == ERROR_INVALID_HANDLE) + remove_gamepad(device); + else + ERR("Failed to get Input Report (%x)\n", GetLastError()); + LeaveCriticalSection(&private->crit); + return; + } + if (memcmp(report, target_report, private->report_length) == 0) + { + LeaveCriticalSection(&private->crit); + return; + } + + private->current_report = (private->current_report+1)%2; + + device->state.dwPacketNumber++; + button_length = 15; + HidP_GetUsages(HidP_Input, HID_USAGE_PAGE_BUTTON, 0, buttons, &button_length, private->ppd, target_report, private->report_length); + + device->state.Gamepad.wButtons = 0; + for (i = 0; i < button_length; i++) + { + switch (buttons[i]) + { + case 1: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_A; break; + case 2: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_B; break; + case 3: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_X; break; + case 4: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_Y; break; + case 5: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_LEFT_SHOULDER; break; + case 6: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_RIGHT_SHOULDER; break; + case 7: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_LEFT_THUMB; break; + case 8: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_RIGHT_THUMB; break; + + case 9: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_START; break; + case 10: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_BACK; break; + case 11: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_GUIDE; break; + case 12: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_UP; break; + case 13: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_DOWN; break; + case 14: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_LEFT; break; + case 15: device->state.Gamepad.wButtons |= XINPUT_GAMEPAD_DPAD_RIGHT; break; + } + } + + HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_X, &value, private->ppd, target_report, private->report_length); + device->state.Gamepad.sThumbLX = SCALE_SHORT(value, private->ThumbLXRange); + + HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Y, &value, private->ppd, target_report, private->report_length); + device->state.Gamepad.sThumbLY = -SCALE_SHORT(value, private->ThumbLYRange); + + HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RX, &value, private->ppd, target_report, private->report_length); + device->state.Gamepad.sThumbRX = SCALE_SHORT(value, private->ThumbRXRange); + + HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RY, &value, private->ppd, target_report, private->report_length); + device->state.Gamepad.sThumbRY = -SCALE_SHORT(value, private->ThumbRYRange); + + HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_RZ, &value, private->ppd, target_report, private->report_length); + device->state.Gamepad.bRightTrigger = SCALE_BYTE(value, private->RightTriggerRange); + + HidP_GetUsageValue(HidP_Input, HID_USAGE_PAGE_GENERIC, 0, HID_USAGE_GENERIC_Z, &value, private->ppd, target_report, private->report_length); + device->state.Gamepad.bLeftTrigger = SCALE_BYTE(value, private->LeftTriggerRange); + LeaveCriticalSection(&private->crit); +} diff --git a/dlls/xinput1_3/xinput_main.c b/dlls/xinput1_3/xinput_main.c index a796688..83ecb71 100644 --- a/dlls/xinput1_3/xinput_main.c +++ b/dlls/xinput1_3/xinput_main.c @@ -76,10 +76,8 @@ DWORD WINAPI XInputSetState(DWORD index, XINPUT_VIBRATION* vibration) DWORD WINAPI DECLSPEC_HOTPATCH XInputGetState(DWORD index, XINPUT_STATE* state) { DWORD ret; - static int warn_once; - if (!warn_once++) - FIXME("(index %u, state %p) Stub!\n", index, state); + TRACE("(index %u, state %p)!\n", index, state); ret = XInputGetStateEx(index, state); if (ret != ERROR_SUCCESS) @@ -93,17 +91,19 @@ DWORD WINAPI DECLSPEC_HOTPATCH XInputGetState(DWORD index, XINPUT_STATE* state) DWORD WINAPI DECLSPEC_HOTPATCH XInputGetStateEx(DWORD index, XINPUT_STATE* state) { - static int warn_once; + TRACE("(index %u, state %p)!\n", index, state); - if (!warn_once++) - FIXME("(index %u, state %p) Stub!\n", index, state); + HID_find_gamepads(controllers); if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; if (!controllers[index].connected) return ERROR_DEVICE_NOT_CONNECTED; - return ERROR_NOT_SUPPORTED; + HID_update_state(&controllers[index]); + memcpy(state, &controllers[index].state, sizeof(XINPUT_STATE)); + + return ERROR_SUCCESS; } DWORD WINAPI XInputGetKeystroke(DWORD index, DWORD reserved, PXINPUT_KEYSTROKE keystroke) diff --git a/dlls/xinput1_3/xinput_private.h b/dlls/xinput1_3/xinput_private.h index 35414ac..67ddbe4 100644 --- a/dlls/xinput1_3/xinput_private.h +++ b/dlls/xinput1_3/xinput_private.h @@ -28,3 +28,4 @@ typedef struct _xinput_controller void HID_find_gamepads(xinput_controller *devices) DECLSPEC_HIDDEN; void HID_destroy_gamepads(xinput_controller *devices) DECLSPEC_HIDDEN; +void HID_update_state(xinput_controller* device) DECLSPEC_HIDDEN;

1 0

Aric Stewart : xinput: Implement XInputSetState.
by Alexandre Julliard 15 Feb '18

15 Feb '18

Module: wine Branch: master Commit: f3391311f3f1b730df97b65cf5650301c5714d16 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3391311f3f1b730df97b65c… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Feb 14 12:41:44 2018 -0600 xinput: Implement XInputSetState. Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xinput1_3/hid.c | 42 +++++++++++++++++++++++++++++++++++++++++ dlls/xinput1_3/xinput_main.c | 6 ++++-- dlls/xinput1_3/xinput_private.h | 1 + include/xinput.h | 2 ++ 4 files changed, 49 insertions(+), 2 deletions(-) diff --git a/dlls/xinput1_3/hid.c b/dlls/xinput1_3/hid.c index 5d82f05..33a92e1 100644 --- a/dlls/xinput1_3/hid.c +++ b/dlls/xinput1_3/hid.c @@ -192,6 +192,11 @@ static BOOL VerifyGamepad(PHIDP_PREPARSED_DATA ppd, XINPUT_CAPABILITIES *xinput_ xinput_caps->Type = XINPUT_DEVTYPE_GAMEPAD; xinput_caps->SubType = XINPUT_DEVSUBTYPE_GAMEPAD; + + value_caps_count = caps->NumberOutputValueCaps; + if (value_caps_count > 0) + xinput_caps->Flags |= XINPUT_CAPS_FFB_SUPPORTED; + return TRUE; } @@ -411,3 +416,40 @@ void HID_update_state(xinput_controller* device) device->state.Gamepad.bLeftTrigger = SCALE_BYTE(value, private->LeftTriggerRange); LeaveCriticalSection(&private->crit); } + +DWORD HID_set_state(xinput_controller* device, XINPUT_VIBRATION* state) +{ + struct hid_platform_private *private = device->platform_private; + + struct { + BYTE report; + BYTE pad1[2]; + BYTE left; + BYTE right; + BYTE pad2[3]; + } report; + + if (device->caps.Flags & XINPUT_CAPS_FFB_SUPPORTED) + { + BOOLEAN rc; + + device->caps.Vibration.wLeftMotorSpeed = state->wLeftMotorSpeed; + device->caps.Vibration.wRightMotorSpeed = state->wRightMotorSpeed; + + report.report = 0; + report.pad1[0] = 0x8; + report.pad1[1] = 0x0; + report.left = (BYTE)(state->wLeftMotorSpeed / 255); + report.right = (BYTE)(state->wRightMotorSpeed / 255); + memset(&report.pad2, 0, sizeof(report.pad2)); + + EnterCriticalSection(&private->crit); + rc = HidD_SetOutputReport(private->device, &report, sizeof(report)); + LeaveCriticalSection(&private->crit); + if (rc) + return ERROR_SUCCESS; + return GetLastError(); + } + + return ERROR_NOT_SUPPORTED; +} diff --git a/dlls/xinput1_3/xinput_main.c b/dlls/xinput1_3/xinput_main.c index 83ecb71..680aba3 100644 --- a/dlls/xinput1_3/xinput_main.c +++ b/dlls/xinput1_3/xinput_main.c @@ -63,14 +63,16 @@ void WINAPI DECLSPEC_HOTPATCH XInputEnable(BOOL enable) DWORD WINAPI XInputSetState(DWORD index, XINPUT_VIBRATION* vibration) { - FIXME("(index %u, vibration %p) Stub!\n", index, vibration); + TRACE("(index %u, vibration %p)\n", index, vibration); + + HID_find_gamepads(controllers); if (index >= XUSER_MAX_COUNT) return ERROR_BAD_ARGUMENTS; if (!controllers[index].connected) return ERROR_DEVICE_NOT_CONNECTED; - return ERROR_NOT_SUPPORTED; + return HID_set_state(&controllers[index], vibration); } DWORD WINAPI DECLSPEC_HOTPATCH XInputGetState(DWORD index, XINPUT_STATE* state) diff --git a/dlls/xinput1_3/xinput_private.h b/dlls/xinput1_3/xinput_private.h index 67ddbe4..c10f869 100644 --- a/dlls/xinput1_3/xinput_private.h +++ b/dlls/xinput1_3/xinput_private.h @@ -29,3 +29,4 @@ typedef struct _xinput_controller void HID_find_gamepads(xinput_controller *devices) DECLSPEC_HIDDEN; void HID_destroy_gamepads(xinput_controller *devices) DECLSPEC_HIDDEN; void HID_update_state(xinput_controller* device) DECLSPEC_HIDDEN; +DWORD HID_set_state(xinput_controller* device, XINPUT_VIBRATION* state) DECLSPEC_HIDDEN; diff --git a/include/xinput.h b/include/xinput.h index 99ff0cc..dae8cad 100644 --- a/include/xinput.h +++ b/include/xinput.h @@ -156,6 +156,8 @@ #define XUSER_MAX_COUNT 4 #define XUSER_INDEX_ANY 0x000000FF +#define XINPUT_CAPS_FFB_SUPPORTED 0x0001 + /* * Defines the structure of an xbox 360 joystick. */

1 0