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

Józef Kucia : d3d11: Validate "ViewDimension" field in D3D11_RENDER_TARGET_VIEW_DESC.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: 215d9299a463e3512a2cf1c9bcdb4fe95b9e4964 URL: http://source.winehq.org/git/wine.git/?a=commit;h=215d9299a463e3512a2cf1c9b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 16 11:59:39 2016 +0200 d3d11: Validate "ViewDimension" field in D3D11_RENDER_TARGET_VIEW_DESC. 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/d3d11/view.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 50 insertions(+), 8 deletions(-) diff --git a/dlls/d3d11/view.c b/dlls/d3d11/view.c index 2210394..c5263ef 100644 --- a/dlls/d3d11/view.c +++ b/dlls/d3d11/view.c @@ -211,7 +211,7 @@ static HRESULT set_rtdesc_from_resource(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3 ID3D11Resource_GetType(resource, &dimension); - switch(dimension) + switch (dimension) { case D3D11_RESOURCE_DIMENSION_TEXTURE1D: { @@ -323,7 +323,7 @@ static HRESULT set_rtdesc_from_resource(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3 } } -static void normalize_rtv_desc(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Resource *resource) +static HRESULT normalize_rtv_desc(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Resource *resource) { D3D11_RESOURCE_DIMENSION dimension; unsigned int layer_count; @@ -332,14 +332,46 @@ static void normalize_rtv_desc(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Resour ID3D11Resource_GetType(resource, &dimension); switch (dimension) { + case D3D11_RESOURCE_DIMENSION_BUFFER: + { + if (desc->ViewDimension != D3D11_RTV_DIMENSION_BUFFER) + { + WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); + return E_INVALIDARG; + } + return S_OK; + } + + case D3D11_RESOURCE_DIMENSION_TEXTURE1D: + { + if (desc->ViewDimension != D3D11_RTV_DIMENSION_TEXTURE1D + && desc->ViewDimension != D3D11_RTV_DIMENSION_TEXTURE1DARRAY) + { + WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); + return E_INVALIDARG; + } + + FIXME("Unhandled 1D texture resource.\n"); + return S_OK; + } + case D3D11_RESOURCE_DIMENSION_TEXTURE2D: { const struct d3d_texture2d *texture; + if (desc->ViewDimension != D3D11_RTV_DIMENSION_TEXTURE2D + && desc->ViewDimension != D3D11_RTV_DIMENSION_TEXTURE2DARRAY + && desc->ViewDimension != D3D11_RTV_DIMENSION_TEXTURE2DMS + && desc->ViewDimension != D3D11_RTV_DIMENSION_TEXTURE2DMSARRAY) + { + WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); + return E_INVALIDARG; + } + if (!(texture = unsafe_impl_from_ID3D11Texture2D((ID3D11Texture2D *)resource))) { ERR("Cannot get implementation from ID3D11Texture2D.\n"); - return; + return E_FAIL; } format = texture->desc.Format; @@ -351,10 +383,16 @@ static void normalize_rtv_desc(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Resour { const struct d3d_texture3d *texture; + if (desc->ViewDimension != D3D11_RTV_DIMENSION_TEXTURE3D) + { + WARN("Incompatible dimensions %#x, %#x.\n", dimension, desc->ViewDimension); + return E_INVALIDARG; + } + if (!(texture = unsafe_impl_from_ID3D11Texture3D((ID3D11Texture3D *)resource))) { ERR("Cannot get implementation from ID3D11Texture3D.\n"); - return; + return E_FAIL; } format = texture->desc.Format; @@ -363,7 +401,8 @@ static void normalize_rtv_desc(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Resour } default: - return; + ERR("Unhandled resource dimension %#x.\n", dimension); + return E_FAIL; } if (desc->Format == DXGI_FORMAT_UNKNOWN) @@ -395,6 +434,8 @@ static void normalize_rtv_desc(D3D11_RENDER_TARGET_VIEW_DESC *desc, ID3D11Resour default: break; } + + return S_OK; } static HRESULT set_srdesc_from_resource(D3D11_SHADER_RESOURCE_VIEW_DESC *desc, ID3D11Resource *resource) @@ -1425,14 +1466,15 @@ static HRESULT d3d_rendertarget_view_init(struct d3d_rendertarget_view *view, st if (!desc) { - if (FAILED(hr = set_rtdesc_from_resource(&view->desc, resource))) - return hr; + hr = set_rtdesc_from_resource(&view->desc, resource); } else { view->desc = *desc; - normalize_rtv_desc(&view->desc, resource); + hr = normalize_rtv_desc(&view->desc, resource); } + if (FAILED(hr)) + return hr; wined3d_mutex_lock(); if (!(wined3d_resource = wined3d_resource_from_d3d11_resource(resource)))

1 0

Józef Kucia : d3d11/tests: Add test for invalid DSV descriptions.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: 8f01ae6cd78bab9a83412ffe1e36a32a4fff5f81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8f01ae6cd78bab9a83412ffe1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 16 11:59:40 2016 +0200 d3d11/tests: Add test for invalid DSV descriptions. 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/d3d11/tests/d3d11.c | 139 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 115 insertions(+), 24 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8f01ae6cd78bab9a83412…

1 0

Józef Kucia : d3d11/tests: Add test for invalid RTV descriptions.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: 2b221b3f9cd272a7541c9b569911e3146d6c3390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b221b3f9cd272a7541c9b569… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Jun 16 11:59:41 2016 +0200 d3d11/tests: Add test for invalid RTV descriptions. 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/d3d11/tests/d3d11.c | 157 +++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 144 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=2b221b3f9cd272a7541c9…

1 0

Andrew Eikum : dsound: Capture all available data on each period callback.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: 7300f1b75d048eea00cbc2a5000da0fb7d4c4172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7300f1b75d048eea00cbc2a50… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Wed Jun 15 08:44:42 2016 -0500 dsound: Capture all available data on each period callback. Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dsound/capture.c | 82 +++++++++++++++++++++++++++------------------------ 1 file changed, 43 insertions(+), 39 deletions(-) diff --git a/dlls/dsound/capture.c b/dlls/dsound/capture.c index 412b59e..30870ae 100644 --- a/dlls/dsound/capture.c +++ b/dlls/dsound/capture.c @@ -876,11 +876,6 @@ static ULONG DirectSoundCaptureDevice_Release( static HRESULT DSOUND_capture_data(DirectSoundCaptureDevice *device) { - HRESULT hr; - UINT32 packet_frames, packet_bytes, avail_bytes, skip_bytes = 0; - DWORD flags; - BYTE *buf; - if(!device->capture_buffer || device->state == STATE_STOPPED) return S_FALSE; @@ -892,45 +887,54 @@ static HRESULT DSOUND_capture_data(DirectSoundCaptureDevice *device) if(device->state == STATE_STARTING) device->state = STATE_CAPTURING; - hr = IAudioCaptureClient_GetBuffer(device->capture, &buf, &packet_frames, - &flags, NULL, NULL); - if(FAILED(hr)){ - WARN("GetBuffer failed: %08x\n", hr); - return hr; - } + while(1){ + HRESULT hr; + UINT32 packet_frames, packet_bytes, avail_bytes, skip_bytes = 0; + DWORD flags; + BYTE *buf; + + hr = IAudioCaptureClient_GetBuffer(device->capture, &buf, &packet_frames, + &flags, NULL, NULL); + if(FAILED(hr)){ + WARN("GetBuffer failed: %08x\n", hr); + return hr; + } + if(hr == AUDCLNT_S_BUFFER_EMPTY) + break; - packet_bytes = packet_frames * device->pwfx->nBlockAlign; - if(packet_bytes > device->buflen){ - TRACE("audio glitch: dsound buffer too small for data\n"); - skip_bytes = packet_bytes - device->buflen; - packet_bytes = device->buflen; - } + packet_bytes = packet_frames * device->pwfx->nBlockAlign; + if(packet_bytes > device->buflen){ + TRACE("audio glitch: dsound buffer too small for data\n"); + skip_bytes = packet_bytes - device->buflen; + packet_bytes = device->buflen; + } - avail_bytes = device->buflen - device->write_pos_bytes; - if(avail_bytes > packet_bytes) - avail_bytes = packet_bytes; - - memcpy(device->buffer + device->write_pos_bytes, buf + skip_bytes, avail_bytes); - capture_CheckNotify(device->capture_buffer, device->write_pos_bytes, avail_bytes); - - packet_bytes -= avail_bytes; - if(packet_bytes > 0){ - if(device->capture_buffer->flags & DSCBSTART_LOOPING){ - memcpy(device->buffer, buf + skip_bytes + avail_bytes, packet_bytes); - capture_CheckNotify(device->capture_buffer, 0, packet_bytes); - }else{ - device->state = STATE_STOPPED; - capture_CheckNotify(device->capture_buffer, 0, 0); + avail_bytes = device->buflen - device->write_pos_bytes; + if(avail_bytes > packet_bytes) + avail_bytes = packet_bytes; + + memcpy(device->buffer + device->write_pos_bytes, buf + skip_bytes, avail_bytes); + capture_CheckNotify(device->capture_buffer, device->write_pos_bytes, avail_bytes); + + packet_bytes -= avail_bytes; + if(packet_bytes > 0){ + if(device->capture_buffer->flags & DSCBSTART_LOOPING){ + memcpy(device->buffer, buf + skip_bytes + avail_bytes, packet_bytes); + capture_CheckNotify(device->capture_buffer, 0, packet_bytes); + }else{ + device->state = STATE_STOPPED; + capture_CheckNotify(device->capture_buffer, 0, 0); + } } - } - device->write_pos_bytes += avail_bytes + packet_bytes; - device->write_pos_bytes %= device->buflen; + device->write_pos_bytes += avail_bytes + packet_bytes; + device->write_pos_bytes %= device->buflen; - hr = IAudioCaptureClient_ReleaseBuffer(device->capture, packet_frames); - if(FAILED(hr)){ - WARN("ReleaseBuffer failed: %08x\n", hr); - return hr; + hr = IAudioCaptureClient_ReleaseBuffer(device->capture, packet_frames); + if(FAILED(hr)){ + WARN("ReleaseBuffer failed: %08x\n", hr); + return hr; + } } return S_OK;

1 0

David Lawrie : winejoystick.drv: Fix Ry/Rx -> U/V axes mapping.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: 5ea6200fc8c2ed69f9fac2095a2b7aa816ad0fd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ea6200fc8c2ed69f9fac2095… Author: David Lawrie <david.dljunk(a)gmail.com> Date: Tue Jun 14 20:33:48 2016 -0700 winejoystick.drv: Fix Ry/Rx -> U/V axes mapping. Signed-off-by: David Lawrie <david.dljunk(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winejoystick.drv/joystick_osx.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/winejoystick.drv/joystick_osx.c b/dlls/winejoystick.drv/joystick_osx.c index a58c9cf..42046a4 100644 --- a/dlls/winejoystick.drv/joystick_osx.c +++ b/dlls/winejoystick.drv/joystick_osx.c @@ -9,6 +9,7 @@ * Copyright 2002 David Hagood * Copyright 2009 CodeWeavers, Aric Stewart * Copyright 2015 Ken Thomases for CodeWeavers Inc. + * Copyright 2016 David Lawrie * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -94,12 +95,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(joystick); enum { - AXIS_X, - AXIS_Y, - AXIS_Z, - AXIS_RX, - AXIS_RY, - AXIS_RZ, + AXIS_X, /* Winmm X */ + AXIS_Y, /* Winmm Y */ + AXIS_Z, /* Winmm Z */ + AXIS_RX, /* Winmm V */ + AXIS_RY, /* Winmm U */ + AXIS_RZ, /* Winmm R */ NUM_AXES }; @@ -617,8 +618,8 @@ LRESULT driver_joyGetDevCaps(DWORD_PTR device_id, JOYCAPSW* caps, DWORD size) switch (i) { case AXIS_Z: caps->wCaps |= JOYCAPS_HASZ; break; - case AXIS_RX: caps->wCaps |= JOYCAPS_HASU; break; - case AXIS_RY: caps->wCaps |= JOYCAPS_HASV; break; + case AXIS_RX: caps->wCaps |= JOYCAPS_HASV; break; + case AXIS_RY: caps->wCaps |= JOYCAPS_HASU; break; case AXIS_RZ: caps->wCaps |= JOYCAPS_HASR; break; } } @@ -664,8 +665,8 @@ LRESULT driver_joyGetPosEx(DWORD_PTR device_id, JOYINFOEX* info) { JOY_RETURNX, FIELD_OFFSET(JOYINFOEX, dwXpos) }, { JOY_RETURNY, FIELD_OFFSET(JOYINFOEX, dwYpos) }, { JOY_RETURNZ, FIELD_OFFSET(JOYINFOEX, dwZpos) }, - { JOY_RETURNU, FIELD_OFFSET(JOYINFOEX, dwUpos) }, { JOY_RETURNV, FIELD_OFFSET(JOYINFOEX, dwVpos) }, + { JOY_RETURNU, FIELD_OFFSET(JOYINFOEX, dwUpos) }, { JOY_RETURNR, FIELD_OFFSET(JOYINFOEX, dwRpos) }, };

1 0

David Lawrie : winejoystick.drv: Fix Slider mapping.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: f457f25b711873cb206662b9b9cc98b0eacfa840 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f457f25b711873cb206662b9b… Author: David Lawrie <david.dljunk(a)gmail.com> Date: Tue Jun 14 20:33:49 2016 -0700 winejoystick.drv: Fix Slider mapping. Sliders, Dials, and Wheels now map to Z, U (Ry), or V (Rx) depending on availability. Thus, also add support for up to 3 such HID elements. Signed-off-by: David Lawrie <david.dljunk(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winejoystick.drv/joystick_osx.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/dlls/winejoystick.drv/joystick_osx.c b/dlls/winejoystick.drv/joystick_osx.c index 42046a4..1edd8e9 100644 --- a/dlls/winejoystick.drv/joystick_osx.c +++ b/dlls/winejoystick.drv/joystick_osx.c @@ -442,8 +442,25 @@ static void collect_joystick_elements(joystick_t* joystick, IOHIDElementRef coll break; } case kHIDUsage_GD_Slider: - TRACE("kIOHIDElementTypeInput_Misc / kHIDUsage_GD_Slider; ignoring\n"); + case kHIDUsage_GD_Dial: + case kHIDUsage_GD_Wheel: + { + /* if one axis is taken, fall to the next until axes are filled */ + int possible_axes[3] = {AXIS_Z,AXIS_RY,AXIS_RX}; + int axis = 0; + while(axis < 3 && joystick->axes[possible_axes[axis]].element) + axis++; + if (axis == 3) + TRACE("kIOHIDElementTypeInput_Misc / kHIDUsage_GD_<axis> (%d)\n ignoring\n", usage); + else + { + TRACE("kIOHIDElementTypeInput_Misc / kHIDUsage_GD_<axis> (%d) axis %d\n", usage, possible_axes[axis]); + joystick->axes[possible_axes[axis]].element = (IOHIDElementRef)CFRetain(child); + joystick->axes[possible_axes[axis]].min_value = IOHIDElementGetLogicalMin(child); + joystick->axes[possible_axes[axis]].max_value = IOHIDElementGetLogicalMax(child); + } break; + } default: FIXME("kIOHIDElementTypeInput_Misc / Unhandled usage %d\n", usage); break;

1 0

David Lawrie : winejoystick.drv: Add sim page element controls.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: dd37dc4a3eeb4949c305fb594287c480db339660 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dd37dc4a3eeb4949c305fb594… Author: David Lawrie <david.dljunk(a)gmail.com> Date: Tue Jun 14 20:33:50 2016 -0700 winejoystick.drv: Add sim page element controls. Support for input features defined by HID Simulation page: Rudder (Rz), Throttle (Z), Steering (X), Accelerator (Y), Brake (Rz). Signed-off-by: David Lawrie <david.dljunk(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winejoystick.drv/joystick_osx.c | 139 ++++++++++++++++++++++++----------- 1 file changed, 95 insertions(+), 44 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=dd37dc4a3eeb4949c305f…

1 0

David Lawrie : winejoystick.drv: Remove ignore axis input type.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: 9dcfb97515b894d229a707c8374fd0391379e6b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9dcfb97515b894d229a707c83… Author: David Lawrie <david.dljunk(a)gmail.com> Date: Tue Jun 14 20:33:51 2016 -0700 winejoystick.drv: Remove ignore axis input type. In case Sim page Throttle, Brake, etc ... are type Axis not Misc, no longer ignoring Axis type. Signed-off-by: David Lawrie <david.dljunk(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winejoystick.drv/joystick_osx.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/dlls/winejoystick.drv/joystick_osx.c b/dlls/winejoystick.drv/joystick_osx.c index 4a89a45..ad82dd7 100644 --- a/dlls/winejoystick.drv/joystick_osx.c +++ b/dlls/winejoystick.drv/joystick_osx.c @@ -417,10 +417,6 @@ static void collect_joystick_elements(joystick_t* joystick, IOHIDElementRef coll break; } case kIOHIDElementTypeInput_Axis: - { - TRACE("kIOHIDElementTypeInput_Axis; ignoring\n"); - break; - } case kIOHIDElementTypeInput_Misc: { uint32_t usage = IOHIDElementGetUsage( child ); @@ -432,7 +428,7 @@ static void collect_joystick_elements(joystick_t* joystick, IOHIDElementRef coll { case kHIDUsage_GD_Hatswitch: { - TRACE("kIOHIDElementTypeInput_Misc / kHIDUsage_GD_Hatswitch\n"); + TRACE("kIOHIDElementTypeInput_Axis/Misc / kHIDUsage_GD_Hatswitch\n"); if (joystick->hatswitch) TRACE(" ignoring additional hatswitch\n"); else @@ -447,7 +443,7 @@ static void collect_joystick_elements(joystick_t* joystick, IOHIDElementRef coll case kHIDUsage_GD_Rz: { int axis = axis_for_usage_GD(usage); - TRACE("kIOHIDElementTypeInput_Misc / kHIDUsage_GD_<axis> (%d) axis %d\n", usage, axis); + TRACE("kIOHIDElementTypeInput_Axis/Misc / kHIDUsage_GD_<axis> (%d) axis %d\n", usage, axis); if (axis < 0 || joystick->axes[axis].element) TRACE(" ignoring\n"); else @@ -468,10 +464,10 @@ static void collect_joystick_elements(joystick_t* joystick, IOHIDElementRef coll while(axis < 3 && joystick->axes[possible_axes[axis]].element) axis++; if (axis == 3) - TRACE("kIOHIDElementTypeInput_Misc / kHIDUsage_GD_<axis> (%d)\n ignoring\n", usage); + TRACE("kIOHIDElementTypeInput_Axis/Misc / kHIDUsage_GD_<axis> (%d)\n ignoring\n", usage); else { - TRACE("kIOHIDElementTypeInput_Misc / kHIDUsage_GD_<axis> (%d) axis %d\n", usage, possible_axes[axis]); + TRACE("kIOHIDElementTypeInput_Axis/Misc / kHIDUsage_GD_<axis> (%d) axis %d\n", usage, possible_axes[axis]); joystick->axes[possible_axes[axis]].element = (IOHIDElementRef)CFRetain(child); joystick->axes[possible_axes[axis]].min_value = IOHIDElementGetLogicalMin(child); joystick->axes[possible_axes[axis]].max_value = IOHIDElementGetLogicalMax(child); @@ -479,7 +475,7 @@ static void collect_joystick_elements(joystick_t* joystick, IOHIDElementRef coll break; } default: - FIXME("kIOHIDElementTypeInput_Misc / Unhandled GD Page usage %d\n", usage); + FIXME("kIOHIDElementTypeInput_Axis/Misc / Unhandled GD Page usage %d\n", usage); break; } break; @@ -495,7 +491,7 @@ static void collect_joystick_elements(joystick_t* joystick, IOHIDElementRef coll case kHIDUsage_Sim_Brake: { int axis = axis_for_usage_Sim(usage); - TRACE("kIOHIDElementTypeInput_Misc / kHIDUsage_Sim_<axis> (%d) axis %d\n", usage, axis); + TRACE("kIOHIDElementTypeInput_Axis/Misc / kHIDUsage_Sim_<axis> (%d) axis %d\n", usage, axis); if (axis < 0 || joystick->axes[axis].element) TRACE(" ignoring\n"); else @@ -507,13 +503,13 @@ static void collect_joystick_elements(joystick_t* joystick, IOHIDElementRef coll break; } default: - FIXME("kIOHIDElementTypeInput_Misc / Unhandled Sim Page usage %d\n", usage); + FIXME("kIOHIDElementTypeInput_Axis/Misc / Unhandled Sim Page usage %d\n", usage); break; } break; } default: - FIXME("kIOHIDElementTypeInput_Misc / Unhandled Usage Page %d\n", usage_page); + FIXME("kIOHIDElementTypeInput_Axis/Misc / Unhandled Usage Page %d\n", usage_page); break; } break;

1 0

David Lawrie : winejoystick.drv: Ignore feature elements.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: fe88161a2a464672f3e27d4da42a68e411f0acd7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe88161a2a464672f3e27d4da… Author: David Lawrie <david.dljunk(a)gmail.com> Date: Tue Jun 14 20:33:52 2016 -0700 winejoystick.drv: Ignore feature elements. "Describes input and output elements not intended for consumption by the end user." Ignore, as otherwise, comes up as a FIXME in Trace logs. Signed-off-by: David Lawrie <david.dljunk(a)gmail.com> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winejoystick.drv/joystick_osx.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winejoystick.drv/joystick_osx.c b/dlls/winejoystick.drv/joystick_osx.c index ad82dd7..12ccff7 100644 --- a/dlls/winejoystick.drv/joystick_osx.c +++ b/dlls/winejoystick.drv/joystick_osx.c @@ -514,6 +514,9 @@ static void collect_joystick_elements(joystick_t* joystick, IOHIDElementRef coll } break; } + case kIOHIDElementTypeFeature: + /* Describes input and output elements not intended for consumption by the end user. Ignoring. */ + break; default: FIXME("Unhandled type %i\n",type); break;

1 0

Jacek Caban : mshtml: Added IDocumentSelector stub implementation.
by Alexandre Julliard 16 Jun '16

16 Jun '16

Module: wine Branch: master Commit: 5dddf32c2039bc1b2e6b4c10f20e007b97873548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5dddf32c2039bc1b2e6b4c10f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Jun 15 17:44:00 2016 +0200 mshtml: Added IDocumentSelector stub implementation. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 82 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 2 ++ 2 files changed, 84 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 04e5280..1bf3323 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4001,6 +4001,84 @@ static const IHTMLDocument7Vtbl HTMLDocument7Vtbl = { HTMLDocument7_get_head }; +static inline HTMLDocument *impl_from_IDocumentSelector(IDocumentSelector *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IDocumentSelector_iface); +} + +static HRESULT WINAPI DocumentSelector_QueryInterface(IDocumentSelector *iface, REFIID riid, void **ppv) +{ + HTMLDocument *This = impl_from_IDocumentSelector(iface); + return htmldoc_query_interface(This, riid, ppv); +} + +static ULONG WINAPI DocumentSelector_AddRef(IDocumentSelector *iface) +{ + HTMLDocument *This = impl_from_IDocumentSelector(iface); + return htmldoc_addref(This); +} + +static ULONG WINAPI DocumentSelector_Release(IDocumentSelector *iface) +{ + HTMLDocument *This = impl_from_IDocumentSelector(iface); + return htmldoc_release(This); +} + +static HRESULT WINAPI DocumentSelector_GetTypeInfoCount(IDocumentSelector *iface, UINT *pctinfo) +{ + HTMLDocument *This = impl_from_IDocumentSelector(iface); + return IDispatchEx_GetTypeInfoCount(&This->IDispatchEx_iface, pctinfo); +} + +static HRESULT WINAPI DocumentSelector_GetTypeInfo(IDocumentSelector *iface, UINT iTInfo, + LCID lcid, ITypeInfo **ppTInfo) +{ + HTMLDocument *This = impl_from_IDocumentSelector(iface); + return IDispatchEx_GetTypeInfo(&This->IDispatchEx_iface, iTInfo, lcid, ppTInfo); +} + +static HRESULT WINAPI DocumentSelector_GetIDsOfNames(IDocumentSelector *iface, REFIID riid, + LPOLESTR *rgszNames, UINT cNames, LCID lcid, DISPID *rgDispId) +{ + HTMLDocument *This = impl_from_IDocumentSelector(iface); + return IDispatchEx_GetIDsOfNames(&This->IDispatchEx_iface, riid, rgszNames, cNames, lcid, + rgDispId); +} + +static HRESULT WINAPI DocumentSelector_Invoke(IDocumentSelector *iface, DISPID dispIdMember, REFIID riid, + LCID lcid, WORD wFlags, DISPPARAMS *pDispParams, VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *puArgErr) +{ + HTMLDocument *This = impl_from_IDocumentSelector(iface); + return IDispatchEx_Invoke(&This->IDispatchEx_iface, dispIdMember, riid, lcid, wFlags, + pDispParams, pVarResult, pExcepInfo, puArgErr); +} + +static HRESULT WINAPI DocumentSelector_querySelector(IDocumentSelector *iface, BSTR v, IHTMLElement **pel) +{ + HTMLDocument *This = impl_from_IDocumentSelector(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(v), pel); + return E_NOTIMPL; +} + +static HRESULT WINAPI DocumentSelector_querySelectorAll(IDocumentSelector *iface, BSTR v, IHTMLDOMChildrenCollection **pel) +{ + HTMLDocument *This = impl_from_IDocumentSelector(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(v), pel); + return E_NOTIMPL; +} + +static const IDocumentSelectorVtbl DocumentSelectorVtbl = { + DocumentSelector_QueryInterface, + DocumentSelector_AddRef, + DocumentSelector_Release, + DocumentSelector_GetTypeInfoCount, + DocumentSelector_GetTypeInfo, + DocumentSelector_GetIDsOfNames, + DocumentSelector_Invoke, + DocumentSelector_querySelector, + DocumentSelector_querySelectorAll +}; + static void HTMLDocument_on_advise(IUnknown *iface, cp_static_data_t *cp) { HTMLDocument *This = impl_from_IHTMLDocument2((IHTMLDocument2*)iface); @@ -4326,6 +4404,8 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) *ppv = &This->IHTMLDocument6_iface; else if(IsEqualGUID(&IID_IHTMLDocument7, riid)) *ppv = &This->IHTMLDocument7_iface; + else if(IsEqualGUID(&IID_IDocumentSelector, riid)) + *ppv = &This->IDocumentSelector_iface; else if(IsEqualGUID(&IID_IPersist, riid)) *ppv = &This->IPersistFile_iface; else if(IsEqualGUID(&IID_IPersistMoniker, riid)) @@ -4426,6 +4506,7 @@ static void init_doc(HTMLDocument *doc, IUnknown *unk_impl, IDispatchEx *dispex) doc->IHTMLDocument6_iface.lpVtbl = &HTMLDocument6Vtbl; doc->IHTMLDocument7_iface.lpVtbl = &HTMLDocument7Vtbl; doc->IDispatchEx_iface.lpVtbl = &DocDispatchExVtbl; + doc->IDocumentSelector_iface.lpVtbl = &DocumentSelectorVtbl; doc->ISupportErrorInfo_iface.lpVtbl = &SupportErrorInfoVtbl; doc->IProvideClassInfo_iface.lpVtbl = &ProvideClassInfoVtbl; @@ -4644,6 +4725,7 @@ static const tid_t HTMLDocumentNode_iface_tids[] = { IHTMLDocument3_tid, IHTMLDocument4_tid, IHTMLDocument5_tid, + IDocumentSelector_tid, 0 }; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 095b9dc..c1816bf 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -124,6 +124,7 @@ typedef struct event_target_t event_target_t; XDIID(DispHTMLXMLHttpRequest) \ XDIID(HTMLDocumentEvents) \ XDIID(HTMLElementEvents2) \ + XIID(IDocumentSelector) \ XIID(IHTMLAnchorElement) \ XIID(IHTMLAreaElement) \ XIID(IHTMLAttributeCollection) \ @@ -530,6 +531,7 @@ struct HTMLDocument { IHTMLDocument5 IHTMLDocument5_iface; IHTMLDocument6 IHTMLDocument6_iface; IHTMLDocument7 IHTMLDocument7_iface; + IDocumentSelector IDocumentSelector_iface; IPersistMoniker IPersistMoniker_iface; IPersistFile IPersistFile_iface; IPersistHistory IPersistHistory_iface;

1 0