wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

Dmitry Timoshkov : comctl32: Always call BeginPaint/ EndPaint when handling a WM_PAINT message for the button.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 59cca65ce0edd88b65a55a847468761e11dfab0b URL: http://source.winehq.org/git/wine.git/?a=commit;h=59cca65ce0edd88b65a55a847… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Oct 20 21:56:15 2015 +0800 comctl32: Always call BeginPaint/EndPaint when handling a WM_PAINT message for the button. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/theme_button.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/dlls/comctl32/theme_button.c b/dlls/comctl32/theme_button.c index 327c76b..edb31e6 100644 --- a/dlls/comctl32/theme_button.c +++ b/dlls/comctl32/theme_button.c @@ -319,9 +319,6 @@ static BOOL BUTTON_Paint(HTHEME theme, HWND hwnd, HDC hParamDC) ButtonState drawState; pfThemedPaint paint = btnThemedPaintFunc[ dwStyle & BUTTON_TYPE ]; - if(!paint) - return FALSE; - if(IsWindowEnabled(hwnd)) { if(state & BST_PUSHED) drawState = STATE_PRESSED; @@ -332,7 +329,7 @@ static BOOL BUTTON_Paint(HTHEME theme, HWND hwnd, HDC hParamDC) else drawState = STATE_DISABLED; hDC = hParamDC ? hParamDC : BeginPaint(hwnd, &ps); - paint(theme, hwnd, hDC, drawState, dtFlags, state & BST_FOCUS); + if (paint) paint(theme, hwnd, hDC, drawState, dtFlags, state & BST_FOCUS); if (!hParamDC) EndPaint(hwnd, &ps); return TRUE; }

1 0

Michael Stefaniuc : gdiplus/tests: Test the return of GdipImageSelectActiveFrame().
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 3708d5337391b4da0686757a81bfadb2a280d45a URL: http://source.winehq.org/git/wine.git/?a=commit;h=3708d5337391b4da0686757a8… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 20 09:50:08 2015 +0200 gdiplus/tests: Test the return of GdipImageSelectActiveFrame(). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 51b99a3..6fc208e 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -2700,6 +2700,7 @@ static void test_multiframegif(void) expect(0, color); stat = GdipImageSelectActiveFrame((GpImage*)bmp, &dimension, 3); + expect(Ok, stat); stat = GdipBitmapGetPixel(bmp, 2, 0, &color); expect(Ok, stat); ok(color==0 || broken(color==0xff0000ff), "color = %x\n", color);

1 0

Józef Kucia : d3d10_1/tests: Port test_create_blend_state() from d3d11.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: fe0b2e131a6d796d5fb4be0886b8680f22f8932a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fe0b2e131a6d796d5fb4be088… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 20 01:46:46 2015 +0200 d3d10_1/tests: Port test_create_blend_state() from d3d11. 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/d3d10_1/tests/d3d10_1.c | 231 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 231 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fe0b2e131a6d796d5fb4b…

1 0

Józef Kucia : d3d11/tests: Check that blend states implement ID3D10BlendState.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 5323dd88364cd11281dee304a776a3d3a74688b7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5323dd88364cd11281dee304a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 20 01:46:45 2015 +0200 d3d11/tests: Check that blend states implement ID3D10BlendState. 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 | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 4a9d12d..bd9ad64 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1874,6 +1874,7 @@ static void test_create_blend_state(void) ULONG refcount, expected_refcount; ID3D11Device *device, *tmp; unsigned int i, j; + IUnknown *iface; HRESULT hr; if (!(device = create_device(NULL))) @@ -1946,6 +1947,15 @@ static void test_create_blend_state(void) obtained_desc.RenderTarget[0].RenderTargetWriteMask, i); } + hr = ID3D11BlendState_QueryInterface(blend_state1, &IID_ID3D10BlendState, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Blend state should implement ID3D10BlendState.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + hr = ID3D11BlendState_QueryInterface(blend_state1, &IID_ID3D10BlendState1, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Blend state should implement ID3D10BlendState1.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + refcount = ID3D11BlendState_Release(blend_state1); ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); refcount = ID3D11BlendState_Release(blend_state2);

1 0

Józef Kucia : d3d10core/tests: Check that blend states implement ID3D10BlendState1.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: dcdef7effcb664e4e869a5836e5959bcbdb22c2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=dcdef7effcb664e4e869a5836… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 20 01:46:44 2015 +0200 d3d10core/tests: Check that blend states implement ID3D10BlendState1. 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/d3d10core/tests/device.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index dadf113..de9eee1 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -1435,6 +1435,7 @@ static void test_create_blend_state(void) D3D10_BLEND_DESC blend_desc; ID3D11Device *d3d11_device; ID3D10Device *device, *tmp; + IUnknown *iface; unsigned int i; HRESULT hr; @@ -1476,6 +1477,11 @@ static void test_create_blend_state(void) ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); ID3D10Device_Release(tmp); + hr = ID3D10BlendState_QueryInterface(blend_state1, &IID_ID3D10BlendState1, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Blend state should implement ID3D10BlendState1.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + hr = ID3D10Device_QueryInterface(device, &IID_ID3D11Device, (void **)&d3d11_device); ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, "Device should implement ID3D11Device.\n");

1 0

Józef Kucia : d3d11: Implement d3d10_device_CreateBlendState1().
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 8c6faa29a534d9b15a6653128ca9e073a9777681 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c6faa29a534d9b15a6653128… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 20 01:46:43 2015 +0200 d3d11: Implement d3d10_device_CreateBlendState1(). 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/device.c | 62 +++++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 30 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index e0f5f4d..e031e24 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3566,47 +3566,57 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreatePixelShader(ID3D10Device1 *i return S_OK; } -static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState(ID3D10Device1 *iface, - const D3D10_BLEND_DESC *desc, ID3D10BlendState **blend_state) +static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState1(ID3D10Device1 *iface, + const D3D10_BLEND_DESC1 *desc, ID3D10BlendState1 **blend_state) { struct d3d_device *device = impl_from_ID3D10Device(iface); ID3D11BlendState *d3d11_blend_state; - D3D11_BLEND_DESC d3d11_desc; - unsigned int i; HRESULT hr; TRACE("iface %p, desc %p, blend_state %p.\n", iface, desc, blend_state); + if (FAILED(hr = d3d11_device_CreateBlendState(&device->ID3D11Device_iface, (D3D11_BLEND_DESC *)desc, + &d3d11_blend_state))) + return hr; + + hr = ID3D11BlendState_QueryInterface(d3d11_blend_state, &IID_ID3D10BlendState1, (void **)blend_state); + ID3D11BlendState_Release(d3d11_blend_state); + return hr; +} + +static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState(ID3D10Device1 *iface, + const D3D10_BLEND_DESC *desc, ID3D10BlendState **blend_state) +{ + D3D10_BLEND_DESC1 d3d10_1_desc; + unsigned int i; + + TRACE("iface %p, desc %p, blend_state %p.\n", iface, desc, blend_state); + if (!desc) return E_INVALIDARG; - d3d11_desc.AlphaToCoverageEnable = desc->AlphaToCoverageEnable; - d3d11_desc.IndependentBlendEnable = FALSE; + d3d10_1_desc.AlphaToCoverageEnable = desc->AlphaToCoverageEnable; + d3d10_1_desc.IndependentBlendEnable = FALSE; for (i = 0; i < D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT - 1; ++i) { if (desc->BlendEnable[i] != desc->BlendEnable[i + 1] || desc->RenderTargetWriteMask[i] != desc->RenderTargetWriteMask[i + 1]) - d3d11_desc.IndependentBlendEnable = TRUE; + d3d10_1_desc.IndependentBlendEnable = TRUE; } - for (i = 0; i < D3D11_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) + for (i = 0; i < D3D10_SIMULTANEOUS_RENDER_TARGET_COUNT; ++i) { - d3d11_desc.RenderTarget[i].BlendEnable = desc->BlendEnable[i]; - d3d11_desc.RenderTarget[i].SrcBlend = desc->SrcBlend; - d3d11_desc.RenderTarget[i].DestBlend = desc->DestBlend; - d3d11_desc.RenderTarget[i].BlendOp = desc->BlendOp; - d3d11_desc.RenderTarget[i].SrcBlendAlpha = desc->SrcBlendAlpha; - d3d11_desc.RenderTarget[i].DestBlendAlpha = desc->DestBlendAlpha; - d3d11_desc.RenderTarget[i].BlendOpAlpha = desc->BlendOpAlpha; - d3d11_desc.RenderTarget[i].RenderTargetWriteMask = desc->RenderTargetWriteMask[i]; + d3d10_1_desc.RenderTarget[i].BlendEnable = desc->BlendEnable[i]; + d3d10_1_desc.RenderTarget[i].SrcBlend = desc->SrcBlend; + d3d10_1_desc.RenderTarget[i].DestBlend = desc->DestBlend; + d3d10_1_desc.RenderTarget[i].BlendOp = desc->BlendOp; + d3d10_1_desc.RenderTarget[i].SrcBlendAlpha = desc->SrcBlendAlpha; + d3d10_1_desc.RenderTarget[i].DestBlendAlpha = desc->DestBlendAlpha; + d3d10_1_desc.RenderTarget[i].BlendOpAlpha = desc->BlendOpAlpha; + d3d10_1_desc.RenderTarget[i].RenderTargetWriteMask = desc->RenderTargetWriteMask[i]; } - if (FAILED(hr = d3d11_device_CreateBlendState(&device->ID3D11Device_iface, &d3d11_desc, &d3d11_blend_state))) - return hr; - - hr = ID3D11BlendState_QueryInterface(d3d11_blend_state, &IID_ID3D10BlendState, (void **)blend_state); - ID3D11BlendState_Release(d3d11_blend_state); - return hr; + return d3d10_device_CreateBlendState1(iface, &d3d10_1_desc, (ID3D10BlendState1 **)blend_state); } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateDepthStencilState(ID3D10Device1 *iface, @@ -3793,14 +3803,6 @@ static void STDMETHODCALLTYPE d3d10_device_GetTextFilterSize(ID3D10Device1 *ifac FIXME("iface %p, width %p, height %p stub!\n", iface, width, height); } -static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState1(ID3D10Device1 *iface, - const D3D10_BLEND_DESC1 *desc, ID3D10BlendState1 **blend_state) -{ - FIXME("iface %p, desc %p, blend_state %p stub!\n", iface, desc, blend_state); - - return E_NOTIMPL; -} - static D3D10_FEATURE_LEVEL1 STDMETHODCALLTYPE d3d10_device_GetFeatureLevel(ID3D10Device1 *iface) { FIXME("iface %p stub!\n", iface);

1 0

Józef Kucia : d3d11: Implement ID3D10BlendState1 interface.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 0912adee670dc8846897af99e61b4a4918974bcc URL: http://source.winehq.org/git/wine.git/?a=commit;h=0912adee670dc8846897af99e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 20 01:46:42 2015 +0200 d3d11: Implement ID3D10BlendState1 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 | 4 ++-- dlls/d3d11/device.c | 2 +- dlls/d3d11/state.c | 47 ++++++++++++++++++++++++++++------------------ 3 files changed, 32 insertions(+), 21 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 39236ab..b8df609 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -279,11 +279,11 @@ struct d3d_pixel_shader *unsafe_impl_from_ID3D10PixelShader(ID3D10PixelShader *i HRESULT shader_parse_signature(const char *data, DWORD data_size, struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; void shader_free_signature(struct wined3d_shader_signature *s) DECLSPEC_HIDDEN; -/* ID3D11BlendState, ID3D10BlendState */ +/* ID3D11BlendState, ID3D10BlendState1 */ struct d3d_blend_state { ID3D11BlendState ID3D11BlendState_iface; - ID3D10BlendState ID3D10BlendState_iface; + ID3D10BlendState1 ID3D10BlendState1_iface; LONG refcount; struct wined3d_private_store private_store; diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index c471810..e0f5f4d 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3042,7 +3042,7 @@ static void STDMETHODCALLTYPE d3d10_device_OMGetBlendState(ID3D10Device1 *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->ID3D10BlendState_iface : NULL)) + 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)); diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 2151389..502ed9a 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -47,11 +47,12 @@ static HRESULT STDMETHODCALLTYPE d3d11_blend_state_QueryInterface(ID3D11BlendSta return S_OK; } - if (IsEqualGUID(riid, &IID_ID3D10BlendState) + if (IsEqualGUID(riid, &IID_ID3D10BlendState1) + || IsEqualGUID(riid, &IID_ID3D10BlendState) || IsEqualGUID(riid, &IID_ID3D10DeviceChild)) { - ID3D10BlendState_AddRef(&state->ID3D10BlendState_iface); - *object = &state->ID3D10BlendState_iface; + ID3D10BlendState1_AddRef(&state->ID3D10BlendState1_iface); + *object = &state->ID3D10BlendState1_iface; return S_OK; } @@ -159,14 +160,14 @@ static const struct ID3D11BlendStateVtbl d3d11_blend_state_vtbl = /* ID3D10BlendState methods */ -static inline struct d3d_blend_state *impl_from_ID3D10BlendState(ID3D10BlendState *iface) +static inline struct d3d_blend_state *impl_from_ID3D10BlendState(ID3D10BlendState1 *iface) { - return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D10BlendState_iface); + return CONTAINING_RECORD(iface, struct d3d_blend_state, ID3D10BlendState1_iface); } /* IUnknown methods */ -static HRESULT STDMETHODCALLTYPE d3d10_blend_state_QueryInterface(ID3D10BlendState *iface, +static HRESULT STDMETHODCALLTYPE d3d10_blend_state_QueryInterface(ID3D10BlendState1 *iface, REFIID riid, void **object) { struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); @@ -176,7 +177,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_QueryInterface(ID3D10BlendSta return d3d11_blend_state_QueryInterface(&state->ID3D11BlendState_iface, riid, object); } -static ULONG STDMETHODCALLTYPE d3d10_blend_state_AddRef(ID3D10BlendState *iface) +static ULONG STDMETHODCALLTYPE d3d10_blend_state_AddRef(ID3D10BlendState1 *iface) { struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); @@ -185,7 +186,7 @@ static ULONG STDMETHODCALLTYPE d3d10_blend_state_AddRef(ID3D10BlendState *iface) return d3d11_blend_state_AddRef(&state->ID3D11BlendState_iface); } -static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState *iface) +static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState1 *iface) { struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); @@ -196,7 +197,7 @@ static ULONG STDMETHODCALLTYPE d3d10_blend_state_Release(ID3D10BlendState *iface /* ID3D10DeviceChild methods */ -static void STDMETHODCALLTYPE d3d10_blend_state_GetDevice(ID3D10BlendState *iface, ID3D10Device **device) +static void STDMETHODCALLTYPE d3d10_blend_state_GetDevice(ID3D10BlendState1 *iface, ID3D10Device **device) { struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); @@ -205,7 +206,7 @@ static void STDMETHODCALLTYPE d3d10_blend_state_GetDevice(ID3D10BlendState *ifac ID3D11Device_QueryInterface(state->device, &IID_ID3D10Device, (void **)device); } -static HRESULT STDMETHODCALLTYPE d3d10_blend_state_GetPrivateData(ID3D10BlendState *iface, +static HRESULT STDMETHODCALLTYPE d3d10_blend_state_GetPrivateData(ID3D10BlendState1 *iface, REFGUID guid, UINT *data_size, void *data) { struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); @@ -216,7 +217,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_GetPrivateData(ID3D10BlendSta return d3d_get_private_data(&state->private_store, guid, data_size, data); } -static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateData(ID3D10BlendState *iface, +static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateData(ID3D10BlendState1 *iface, REFGUID guid, UINT data_size, const void *data) { struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); @@ -227,7 +228,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateData(ID3D10BlendSta return d3d_set_private_data(&state->private_store, guid, data_size, data); } -static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateDataInterface(ID3D10BlendState *iface, +static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateDataInterface(ID3D10BlendState1 *iface, REFGUID guid, const IUnknown *data) { struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); @@ -239,8 +240,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_blend_state_SetPrivateDataInterface(ID3D1 /* ID3D10BlendState methods */ -static void STDMETHODCALLTYPE d3d10_blend_state_GetDesc(ID3D10BlendState *iface, - D3D10_BLEND_DESC *desc) +static void STDMETHODCALLTYPE d3d10_blend_state_GetDesc(ID3D10BlendState1 *iface, D3D10_BLEND_DESC *desc) { struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); const D3D11_BLEND_DESC *d3d11_desc = &state->desc; @@ -262,7 +262,16 @@ static void STDMETHODCALLTYPE d3d10_blend_state_GetDesc(ID3D10BlendState *iface, } } -static const struct ID3D10BlendStateVtbl d3d10_blend_state_vtbl = +static void STDMETHODCALLTYPE d3d10_blend_state_GetDesc1(ID3D10BlendState1 *iface, D3D10_BLEND_DESC1 *desc) +{ + struct d3d_blend_state *state = impl_from_ID3D10BlendState(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + memcpy(desc, &state->desc, sizeof(*desc)); +} + +static const struct ID3D10BlendState1Vtbl d3d10_blend_state_vtbl = { /* IUnknown methods */ d3d10_blend_state_QueryInterface, @@ -275,13 +284,15 @@ static const struct ID3D10BlendStateVtbl d3d10_blend_state_vtbl = d3d10_blend_state_SetPrivateDataInterface, /* ID3D10BlendState methods */ d3d10_blend_state_GetDesc, + /* ID3D10BlendState1 methods */ + d3d10_blend_state_GetDesc1, }; HRESULT d3d_blend_state_init(struct d3d_blend_state *state, struct d3d_device *device, const D3D11_BLEND_DESC *desc) { state->ID3D11BlendState_iface.lpVtbl = &d3d11_blend_state_vtbl; - state->ID3D10BlendState_iface.lpVtbl = &d3d10_blend_state_vtbl; + state->ID3D10BlendState1_iface.lpVtbl = &d3d10_blend_state_vtbl; state->refcount = 1; wined3d_mutex_lock(); wined3d_private_store_init(&state->private_store); @@ -306,9 +317,9 @@ struct d3d_blend_state *unsafe_impl_from_ID3D10BlendState(ID3D10BlendState *ifac { if (!iface) return NULL; - assert(iface->lpVtbl == &d3d10_blend_state_vtbl); + assert(iface->lpVtbl == (ID3D10BlendStateVtbl *)&d3d10_blend_state_vtbl); - return impl_from_ID3D10BlendState(iface); + return impl_from_ID3D10BlendState((ID3D10BlendState1 *)iface); } /* ID3D11DepthStencilState methods */

1 0

Józef Kucia : d3d10_1/tests: Port test_create_shader_resource_view() from d3d10core.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 22c05cb59f706f59f25dce66e51f303990f9c0e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22c05cb59f706f59f25dce66e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 20 01:46:41 2015 +0200 d3d10_1/tests: Port test_create_shader_resource_view() from d3d10core. 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> --- configure | 1 + configure.ac | 1 + dlls/d3d10_1/tests/Makefile.in | 5 ++ dlls/d3d10_1/tests/d3d10_1.c | 153 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 160 insertions(+) diff --git a/configure b/configure index 900c9a6..533bf15 100755 --- a/configure +++ b/configure @@ -17353,6 +17353,7 @@ wine_fn_config_test dlls/d2d1/tests d2d1_test wine_fn_config_dll d3d10 enable_d3d10 implib wine_fn_config_test dlls/d3d10/tests d3d10_test wine_fn_config_dll d3d10_1 enable_d3d10_1 implib +wine_fn_config_test dlls/d3d10_1/tests d3d10_1_test wine_fn_config_dll d3d10core enable_d3d10core implib wine_fn_config_test dlls/d3d10core/tests d3d10core_test wine_fn_config_dll d3d11 enable_d3d11 implib diff --git a/configure.ac b/configure.ac index de8cde5..5ab2d69 100644 --- a/configure.ac +++ b/configure.ac @@ -2864,6 +2864,7 @@ WINE_CONFIG_TEST(dlls/d2d1/tests) WINE_CONFIG_DLL(d3d10,,[implib]) WINE_CONFIG_TEST(dlls/d3d10/tests) WINE_CONFIG_DLL(d3d10_1,,[implib]) +WINE_CONFIG_TEST(dlls/d3d10_1/tests) WINE_CONFIG_DLL(d3d10core,,[implib]) WINE_CONFIG_TEST(dlls/d3d10core/tests) WINE_CONFIG_DLL(d3d11,,[implib]) diff --git a/dlls/d3d10_1/tests/Makefile.in b/dlls/d3d10_1/tests/Makefile.in new file mode 100644 index 0000000..f6f17bd --- /dev/null +++ b/dlls/d3d10_1/tests/Makefile.in @@ -0,0 +1,5 @@ +TESTDLL = d3d10_1.dll +IMPORTS = d3d10_1 + +C_SRCS = \ + d3d10_1.c diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c new file mode 100644 index 0000000..f346cdf --- /dev/null +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -0,0 +1,153 @@ +/* + * Copyright 2008 Henri Verbeet for CodeWeavers + * Copyright 2015 Józef Kucia 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 + */ + +#define COBJMACROS +#include "initguid.h" +#include "d3d11.h" +#include "wine/test.h" + +static ULONG get_refcount(IUnknown *iface) +{ + IUnknown_AddRef(iface); + return IUnknown_Release(iface); +} + +static ID3D10Device1 *create_device(D3D10_FEATURE_LEVEL1 feature_level) +{ + ID3D10Device1 *device; + + if (SUCCEEDED(D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_HARDWARE, NULL, 0, feature_level, D3D10_1_SDK_VERSION, + &device))) + return device; + if (SUCCEEDED(D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_WARP, NULL, 0, feature_level, D3D10_1_SDK_VERSION, + &device))) + return device; + if (SUCCEEDED(D3D10CreateDevice1(NULL, D3D10_DRIVER_TYPE_REFERENCE, NULL, 0, feature_level, D3D10_1_SDK_VERSION, + &device))) + return device; + + return NULL; +} + +static void test_create_shader_resource_view(void) +{ + D3D10_SHADER_RESOURCE_VIEW_DESC1 srv_desc; + D3D10_TEXTURE2D_DESC texture_desc; + ULONG refcount, expected_refcount; + ID3D10ShaderResourceView1 *srview; + D3D10_BUFFER_DESC buffer_desc; + ID3D10Texture2D *texture; + ID3D10Device *tmp_device; + ID3D10Device1 *device; + ID3D10Buffer *buffer; + IUnknown *iface; + HRESULT hr; + + if (!(device = create_device(D3D10_FEATURE_LEVEL_10_1))) + { + skip("Failed to create device.\n"); + return; + } + + buffer_desc.ByteWidth = 1024; + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + + hr = ID3D10Device1_CreateBuffer(device, &buffer_desc, NULL, &buffer); + ok(SUCCEEDED(hr), "Failed to create a buffer, hr %#x\n", hr); + + hr = ID3D10Device1_CreateShaderResourceView1(device, (ID3D10Resource *)buffer, NULL, &srview); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + srv_desc.Format = DXGI_FORMAT_R32G32B32A32_FLOAT; + srv_desc.ViewDimension = D3D10_1_SRV_DIMENSION_BUFFER; + U(srv_desc).Buffer.ElementOffset = 0; + U(srv_desc).Buffer.ElementWidth = 64; + + expected_refcount = get_refcount((IUnknown *)device) + 1; + hr = ID3D10Device1_CreateShaderResourceView1(device, (ID3D10Resource *)buffer, &srv_desc, &srview); + ok(SUCCEEDED(hr), "Failed to create a shader resource view, hr %#x\n", hr); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp_device = NULL; + expected_refcount = refcount + 1; + ID3D10ShaderResourceView1_GetDevice(srview, &tmp_device); + ok(tmp_device == (ID3D10Device *)device, "Got unexpected device %p, expected %p.\n", tmp_device, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D10Device_Release(tmp_device); + + hr = ID3D10ShaderResourceView1_QueryInterface(srview, &IID_ID3D10ShaderResourceView, (void **)&iface); + ok(SUCCEEDED(hr), "Shader resource view should implement ID3D10ShaderResourceView.\n"); + IUnknown_Release(iface); + hr = ID3D10ShaderResourceView1_QueryInterface(srview, &IID_ID3D11ShaderResourceView, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Shader resource view should implement ID3D11ShaderResourceView.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + ID3D10ShaderResourceView1_Release(srview); + ID3D10Buffer_Release(buffer); + + texture_desc.Width = 512; + texture_desc.Height = 512; + texture_desc.MipLevels = 0; + texture_desc.ArraySize = 1; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_SHADER_RESOURCE; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + hr = ID3D10Device1_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Failed to create a 2d texture, hr %#x\n", hr); + + hr = ID3D10Device1_CreateShaderResourceView1(device, (ID3D10Resource *)texture, NULL, &srview); + ok(SUCCEEDED(hr), "Failed to create a shader resource view, hr %#x\n", hr); + + ID3D10ShaderResourceView1_GetDesc1(srview, &srv_desc); + ok(srv_desc.Format == texture_desc.Format, "Got unexpected format %#x.\n", srv_desc.Format); + ok(srv_desc.ViewDimension == D3D10_1_SRV_DIMENSION_TEXTURE2D, + "Got unexpected view dimension %#x.\n", srv_desc.ViewDimension); + ok(U(srv_desc).Texture2D.MostDetailedMip == 0, "Got unexpected MostDetailedMip %u.\n", + U(srv_desc).Texture2D.MostDetailedMip); + ok(U(srv_desc).Texture2D.MipLevels == 10, "Got unexpected MipLevels %u.\n", U(srv_desc).Texture2D.MipLevels); + + hr = ID3D10ShaderResourceView1_QueryInterface(srview, &IID_ID3D10ShaderResourceView, (void **)&iface); + ok(SUCCEEDED(hr), "Shader resource view should implement ID3D10ShaderResourceView.\n"); + IUnknown_Release(iface); + hr = ID3D10ShaderResourceView1_QueryInterface(srview, &IID_ID3D11ShaderResourceView, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Shader resource view should implement ID3D11ShaderResourceView.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + ID3D10ShaderResourceView1_Release(srview); + ID3D10Texture2D_Release(texture); + + refcount = ID3D10Device1_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + +START_TEST(d3d10_1) +{ + test_create_shader_resource_view(); +}

1 0

Józef Kucia : d3d11: Implement d3d10_device_CreateShaderResourceView1().
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: b90215f3508b82e85951a54c7800ac660843ba81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b90215f3508b82e85951a54c7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 20 01:46:40 2015 +0200 d3d11: Implement d3d10_device_CreateShaderResourceView1(). 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/device.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 981266f..c471810 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3380,8 +3380,8 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateTexture3D(ID3D10Device1 *ifa return S_OK; } -static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Device1 *iface, - ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC *desc, ID3D10ShaderResourceView **view) +static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView1(ID3D10Device1 *iface, + ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC1 *desc, ID3D10ShaderResourceView1 **view) { struct d3d_device *device = impl_from_ID3D10Device(iface); struct d3d_shader_resource_view *object; @@ -3402,11 +3402,20 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Dev if (FAILED(hr)) return hr; - *view = (ID3D10ShaderResourceView *)&object->ID3D10ShaderResourceView1_iface; + *view = &object->ID3D10ShaderResourceView1_iface; return S_OK; } +static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView(ID3D10Device1 *iface, + ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC *desc, ID3D10ShaderResourceView **view) +{ + TRACE("iface %p, resource %p, desc %p, view %p.\n", iface, resource, desc, view); + + return d3d10_device_CreateShaderResourceView1(iface, resource, + (const D3D10_SHADER_RESOURCE_VIEW_DESC1 *)desc, (ID3D10ShaderResourceView1 **)view); +} + static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRenderTargetView(ID3D10Device1 *iface, ID3D10Resource *resource, const D3D10_RENDER_TARGET_VIEW_DESC *desc, ID3D10RenderTargetView **view) { @@ -3784,14 +3793,6 @@ static void STDMETHODCALLTYPE d3d10_device_GetTextFilterSize(ID3D10Device1 *ifac FIXME("iface %p, width %p, height %p stub!\n", iface, width, height); } -static HRESULT STDMETHODCALLTYPE d3d10_device_CreateShaderResourceView1(ID3D10Device1 *iface, - ID3D10Resource *resource, const D3D10_SHADER_RESOURCE_VIEW_DESC1 *desc, ID3D10ShaderResourceView1 **view) -{ - FIXME("iface %p, resource %p, desc %p, view %p stub!\n", iface, resource, desc, view); - - return E_NOTIMPL; -} - static HRESULT STDMETHODCALLTYPE d3d10_device_CreateBlendState1(ID3D10Device1 *iface, const D3D10_BLEND_DESC1 *desc, ID3D10BlendState1 **blend_state) {

1 0

Riccardo Bortolato : d3d9: Replace wined3d_surface_blt with wined3d_texture_blt in d3d9_device_StretchRect.
by Alexandre Julliard 20 Oct '15

20 Oct '15

Module: wine Branch: master Commit: 1da007e75d8daf00233b344e07527a8f33df8753 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1da007e75d8daf00233b344e0… Author: Riccardo Bortolato <rikyz619(a)gmail.com> Date: Mon Oct 19 19:07:35 2015 +0200 d3d9: Replace wined3d_surface_blt with wined3d_texture_blt in d3d9_device_StretchRect. Signed-off-by: Riccardo Bortolato <rikyz619(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 821aa4f..f8ce284 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1349,7 +1349,8 @@ static HRESULT WINAPI d3d9_device_StretchRect(IDirect3DDevice9Ex *iface, IDirect } } - hr = wined3d_surface_blt(dst->wined3d_surface, dst_rect, src->wined3d_surface, src_rect, 0, NULL, filter); + hr = wined3d_texture_blt(dst->wined3d_texture, dst->sub_resource_idx, dst_rect, + src->wined3d_texture, src->sub_resource_idx, src_rect, 0, NULL, filter); if (hr == WINEDDERR_INVALIDRECT) hr = D3DERR_INVALIDCALL;

1 0

← Newer
1
...
21
22
23
24
25
26
27
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2015