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

Stefan Dösinger : ddraw/tests: P8 color keying does not work on WARP.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: 6ffa32b8b3c1c597dc0ef53d4ee2326c71f1f89e URL: http://source.winehq.org/git/wine.git/?a=commit;h=6ffa32b8b3c1c597dc0ef53d4… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Wed Jun 29 22:46:50 2016 +0100 ddraw/tests: P8 color keying does not work on WARP. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 28 +++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw2.c | 28 +++++++++++++++++++++++++++- dlls/ddraw/tests/ddraw4.c | 24 +++++++++++++++++++++++- dlls/ddraw/tests/ddraw7.c | 24 +++++++++++++++++++++++- 4 files changed, 100 insertions(+), 4 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=6ffa32b8b3c1c597dc0ef…

1 0

Francois Gouget : d3drm/tests: Fix typos in a couple of ok() messages.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: 4046616efdf3c800e37b83ed00840b7689ad2ef1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4046616efdf3c800e37b83ed0… Author: Francois Gouget <fgouget(a)free.fr> Date: Sat Jul 2 11:58:47 2016 +0200 d3drm/tests: Fix typos in a couple of ok() messages. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 0a95afc..a685b1e 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -3983,7 +3983,7 @@ static void test_create_device_from_d3d1(void) hr = IDirect3DRMDevice_GetDirect3DDevice(device1, &d3drm_d3ddevice1); ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice interface (hr = %x).\n", hr); - ok(d3ddevice1 == d3drm_d3ddevice1, "Expected Immediate Mode deivce created == %p, got %p.\n", d3ddevice1, d3drm_d3ddevice1); + ok(d3ddevice1 == d3drm_d3ddevice1, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice1, d3drm_d3ddevice1); /* Check properties of render target and depth surfaces */ hr = IDirect3DDevice_QueryInterface(d3drm_d3ddevice1, &IID_IDirectDrawSurface, (void **)&surface); @@ -4174,7 +4174,7 @@ static void test_create_device_from_d3d2(void) hr = IDirect3DRMDevice2_GetDirect3DDevice2(device2, &d3drm_d3ddevice2); ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr); - ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode deivce created == %p, got %p.\n", d3ddevice2, d3drm_d3ddevice2); + ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice2, d3drm_d3ddevice2); /* Check properties of render target and depth surfaces */ hr = IDirect3DDevice2_GetRenderTarget(d3drm_d3ddevice2, &surface); @@ -4300,7 +4300,7 @@ static void test_create_device_from_d3d3(void) hr = IDirect3DRMDevice3_GetDirect3DDevice2(device3, &d3drm_d3ddevice2); ok(hr == D3DRM_OK, "Cannot get IDirect3DDevice2 interface (hr = %x).\n", hr); - ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode deivce created == %p, got %p.\n", d3ddevice2, d3drm_d3ddevice2); + ok(d3ddevice2 == d3drm_d3ddevice2, "Expected Immediate Mode device created == %p, got %p.\n", d3ddevice2, d3drm_d3ddevice2); /* Check properties of render target and depth surfaces */ hr = IDirect3DDevice2_GetRenderTarget(d3drm_d3ddevice2, &surface);

1 0

Michael Stefaniuc : ddraw: Get rid of a cast from a COM object to an iface.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: 36a1bc1f0451064cc36209496ad58da432d4966e URL: http://source.winehq.org/git/wine.git/?a=commit;h=36a1bc1f0451064cc36209496… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Fri Jul 1 10:22:57 2016 +0200 ddraw: Get rid of a cast from a COM object to an iface. Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 1cbd6c3..398a3ec 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -4289,7 +4289,7 @@ static HRESULT WINAPI ddraw_surface7_GetClipper(IDirectDrawSurface7 *iface, IDir return DDERR_NOCLIPPERATTACHED; } - *Clipper = (IDirectDrawClipper *)surface->clipper; + *Clipper = &surface->clipper->IDirectDrawClipper_iface; IDirectDrawClipper_AddRef(*Clipper); wined3d_mutex_unlock();

1 0

Stefan Dösinger : wined3d: Avoid reading freed memory when destroying shader resource views.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: 80348ec5b47dd0de18105fc50e0cf940601bfdda URL: http://source.winehq.org/git/wine.git/?a=commit;h=80348ec5b47dd0de18105fc50… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Jul 3 16:49:33 2016 +0100 wined3d: Avoid reading freed memory when destroying shader resource views. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index e39f6f8..5318a5d 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -228,13 +228,14 @@ ULONG CDECL wined3d_shader_resource_view_decref(struct wined3d_shader_resource_v if (!refcount) { - struct wined3d_device *device = view->resource->device; + struct wined3d_resource *resource = view->resource; + struct wined3d_device *device = resource->device; /* Call wined3d_object_destroyed() before releasing the resource, * since releasing the resource may end up destroying the parent. */ view->parent_ops->wined3d_object_destroyed(view->parent); - wined3d_resource_decref(view->resource); wined3d_cs_emit_destroy_object(device->cs, wined3d_shader_resource_view_destroy_object, view); + wined3d_resource_decref(resource); } return refcount;

1 0

Stefan Dösinger : wined3d: Destroy the resource after view in wined3d_unordered_access_view_decref.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: 4c71e37bbd13349665b1f219d10ed0bbb93b4fe3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c71e37bbd13349665b1f219d… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Jul 3 16:49:34 2016 +0100 wined3d: Destroy the resource after view in wined3d_unordered_access_view_decref. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 5318a5d..985c343 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -439,13 +439,14 @@ ULONG CDECL wined3d_unordered_access_view_decref(struct wined3d_unordered_access if (!refcount) { - struct wined3d_device *device = view->resource->device; + struct wined3d_resource *resource = view->resource; + struct wined3d_device *device = resource->device; /* Call wined3d_object_destroyed() before releasing the resource, * since releasing the resource may end up destroying the parent. */ view->parent_ops->wined3d_object_destroyed(view->parent); - wined3d_resource_decref(view->resource); wined3d_cs_emit_destroy_object(device->cs, wined3d_unordered_access_view_destroy_object, view); + wined3d_resource_decref(resource); } return refcount;

1 0

Stefan Dösinger : wined3d: Destroy the resource after view in wined3d_rendertarget_view_decref.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: d8da1db891c3cb33c16ccfbfbaf48cfeefc7b020 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8da1db891c3cb33c16ccfbfb… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Sun Jul 3 16:49:35 2016 +0100 wined3d: Destroy the resource after view in wined3d_rendertarget_view_decref. Signed-off-by: Stefan Dösinger <stefandoesinger(a)gmx.at> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/view.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/view.c b/dlls/wined3d/view.c index 985c343..7f07d57 100644 --- a/dlls/wined3d/view.c +++ b/dlls/wined3d/view.c @@ -46,13 +46,14 @@ ULONG CDECL wined3d_rendertarget_view_decref(struct wined3d_rendertarget_view *v if (!refcount) { - struct wined3d_device *device = view->resource->device; + struct wined3d_resource *resource = view->resource; + struct wined3d_device *device = resource->device; /* Call wined3d_object_destroyed() before releasing the resource, * since releasing the resource may end up destroying the parent. */ view->parent_ops->wined3d_object_destroyed(view->parent); - wined3d_resource_decref(view->resource); wined3d_cs_emit_destroy_object(device->cs, wined3d_rendertarget_view_destroy_object, view); + wined3d_resource_decref(resource); } return refcount;

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_OMGetBlendState().
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: fd4f1d9c48f10ca7b08f850ba395d7b4c56e6ddb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fd4f1d9c48f10ca7b08f850ba… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 4 12:26:20 2016 +0200 d3d11: Implement d3d11_immediate_context_OMGetBlendState(). 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/d3d11_private.h | 5 +++++ dlls/d3d11/device.c | 25 ++++++++++++++++++------- dlls/d3d11/state.c | 5 ----- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index bd43aa6..0dee4a1 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -359,6 +359,11 @@ struct d3d_blend_state ID3D11Device *device; }; +static inline struct d3d_blend_state *impl_from_ID3D11BlendState(ID3D11BlendState *iface) +{ + return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D11BlendState_iface); +} + HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *device, const D3D11_BLEND_DESC *desc) DECLSPEC_HIDDEN; struct d3d_blend_state *unsafe_impl_from_ID3D11BlendState(ID3D11BlendState *iface) DECLSPEC_HIDDEN; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 03fafc6..867b294 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1655,8 +1655,17 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetRenderTargetsAndUnord static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetBlendState(ID3D11DeviceContext *iface, ID3D11BlendState **blend_state, FLOAT blend_factor[4], UINT *sample_mask) { - FIXME("iface %p, blend_state %p, blend_factor %p, sample_mask %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + + TRACE("iface %p, blend_state %p, blend_factor %p, sample_mask %p.\n", iface, blend_state, blend_factor, sample_mask); + + if ((*blend_state = device->blend_state ? &device->blend_state->ID3D11BlendState_iface : NULL)) + ID3D11BlendState_AddRef(*blend_state); + wined3d_mutex_lock(); + memcpy(blend_factor, device->blend_factor, 4 * sizeof(*blend_factor)); + *sample_mask = wined3d_device_get_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEMASK); + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetDepthStencilState(ID3D11DeviceContext *iface, @@ -4063,16 +4072,18 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetBlendState(ID3D10Device1 *iface, ID3D10BlendState **blend_state, FLOAT blend_factor[4], UINT *sample_mask) { struct d3d_device *device = impl_from_ID3D10Device(iface); + ID3D11BlendState *d3d11_blend_state; TRACE("iface %p, blend_state %p, blend_factor %p, sample_mask %p.\n", iface, blend_state, blend_factor, sample_mask); - if ((*blend_state = device->blend_state ? (ID3D10BlendState *)&device->blend_state->ID3D10BlendState1_iface : NULL)) - ID3D10BlendState_AddRef(*blend_state); - wined3d_mutex_lock(); - memcpy(blend_factor, device->blend_factor, 4 * sizeof(*blend_factor)); - *sample_mask = wined3d_device_get_render_state(device->wined3d_device, WINED3D_RS_MULTISAMPLEMASK); - wined3d_mutex_unlock(); + d3d11_immediate_context_OMGetBlendState(&device->immediate_context.ID3D11DeviceContext_iface, + &d3d11_blend_state, blend_factor, sample_mask); + + if (d3d11_blend_state) + *blend_state = (ID3D10BlendState *)&impl_from_ID3D11BlendState(d3d11_blend_state)->ID3D10BlendState1_iface; + else + *blend_state = NULL; } static void STDMETHODCALLTYPE d3d10_device_OMGetDepthStencilState(ID3D10Device1 *iface, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 665d142..ba90664 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -26,11 +26,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); /* ID3D11BlendState methods */ -static inline struct d3d_blend_state *impl_from_ID3D11BlendState(ID3D11BlendState *iface) -{ - return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D11BlendState_iface); -} - static HRESULT STDMETHODCALLTYPE d3d11_blend_state_QueryInterface(ID3D11BlendState *iface, REFIID riid, void **object) {

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_OMGetDepthStencilState().
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: 006ff5aa3a1ec5684cffefbc715ec81366382a14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=006ff5aa3a1ec5684cffefbc7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 4 12:26:21 2016 +0200 d3d11: Implement d3d11_immediate_context_OMGetDepthStencilState(). 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/d3d11_private.h | 5 +++++ dlls/d3d11/device.c | 22 +++++++++++++++++----- dlls/d3d11/state.c | 5 ----- 3 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 0dee4a1..55cd579 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -382,6 +382,11 @@ struct d3d_depthstencil_state ID3D11Device *device; }; +static inline struct d3d_depthstencil_state *impl_from_ID3D11DepthStencilState(ID3D11DepthStencilState *iface) +{ + return CONTAINING_RECORD(iface, struct d3d_depthstencil_state, ID3D11DepthStencilState_iface); +} + HRESULT d3d_depthstencil_state_init(struct d3d_depthstencil_state *state, struct d3d_device *device, const D3D11_DEPTH_STENCIL_DESC *desc) DECLSPEC_HIDDEN; struct d3d_depthstencil_state *unsafe_impl_from_ID3D11DepthStencilState( diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 867b294..74a6055 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -1671,7 +1671,15 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetBlendState(ID3D11Devi static void STDMETHODCALLTYPE d3d11_immediate_context_OMGetDepthStencilState(ID3D11DeviceContext *iface, ID3D11DepthStencilState **depth_stencil_state, UINT *stencil_ref) { - FIXME("iface %p, depth_stencil_state %p, stencil_ref %p stub!\n", iface, depth_stencil_state, stencil_ref); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + + TRACE("iface %p, depth_stencil_state %p, stencil_ref %p.\n", + iface, depth_stencil_state, stencil_ref); + + if ((*depth_stencil_state = device->depth_stencil_state + ? &device->depth_stencil_state->ID3D11DepthStencilState_iface : NULL)) + ID3D11DepthStencilState_AddRef(*depth_stencil_state); + *stencil_ref = device->stencil_ref; } static void STDMETHODCALLTYPE d3d11_immediate_context_SOGetTargets(ID3D11DeviceContext *iface, @@ -4090,14 +4098,18 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetDepthStencilState(ID3D10Device1 ID3D10DepthStencilState **depth_stencil_state, UINT *stencil_ref) { struct d3d_device *device = impl_from_ID3D10Device(iface); + ID3D11DepthStencilState *d3d11_iface; TRACE("iface %p, depth_stencil_state %p, stencil_ref %p.\n", iface, depth_stencil_state, stencil_ref); - if ((*depth_stencil_state = device->depth_stencil_state - ? &device->depth_stencil_state->ID3D10DepthStencilState_iface : NULL)) - ID3D10DepthStencilState_AddRef(*depth_stencil_state); - *stencil_ref = device->stencil_ref; + d3d11_immediate_context_OMGetDepthStencilState(&device->immediate_context.ID3D11DeviceContext_iface, + &d3d11_iface, stencil_ref); + + if (d3d11_iface) + *depth_stencil_state = &impl_from_ID3D11DepthStencilState(d3d11_iface)->ID3D10DepthStencilState_iface; + else + *depth_stencil_state = NULL; } static void STDMETHODCALLTYPE d3d10_device_SOGetTargets(ID3D10Device1 *iface, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index ba90664..68ad1bd 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -328,11 +328,6 @@ struct d3d_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *ifac /* ID3D11DepthStencilState methods */ -static inline struct d3d_depthstencil_state *impl_from_ID3D11DepthStencilState(ID3D11DepthStencilState *iface) -{ - return CONTAINING_RECORD(iface, struct d3d_depthstencil_state, ID3D11DepthStencilState_iface); -} - static HRESULT STDMETHODCALLTYPE d3d11_depthstencil_state_QueryInterface(ID3D11DepthStencilState *iface, REFIID riid, void **object) {

1 0

Józef Kucia : d3d11: Implement ID3D11UnorderedAccessView interface.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: 80334776b3d56d6d3d8572e758dfbcdfc319ebd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=80334776b3d56d6d3d8572e75… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 4 12:26:22 2016 +0200 d3d11: Implement ID3D11UnorderedAccessView interface. 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/d3d11_private.h | 16 ++ dlls/d3d11/device.c | 13 +- dlls/d3d11/view.c | 442 +++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 469 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=80334776b3d56d6d3d857…

1 0

Józef Kucia : d3d11/tests: Avoid using -1 in place of unsigned integer.
by Alexandre Julliard 04 Jul '16

04 Jul '16

Module: wine Branch: master Commit: 0aa14512fb4126c45ca32ce2df93cef3d642ef33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0aa14512fb4126c45ca32ce2d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Jul 4 12:26:23 2016 +0200 d3d11/tests: Avoid using -1 in place of unsigned integer. 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 | 258 +++++++++++++++++++++++------------------------ 1 file changed, 129 insertions(+), 129 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0aa14512fb4126c45ca32…

1 0