wine-commits October 2015

wine-commits@winehq.org

2 participants
749 discussions

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

13 Oct '15

Module: wine Branch: master Commit: 702e536ca494083f9f3358f7997e1adc9e5a4c84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=702e536ca494083f9f3358f79… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 13 09:13:33 2015 +0200 d3d11: Implement d3d11_sampler_state_GetDesc(). 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 | 6 +++--- dlls/d3d11/state.c | 54 ++++++++++++++++++++++------------------------ 3 files changed, 31 insertions(+), 33 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 56ba560..02fa1dc 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -336,13 +336,13 @@ struct d3d_sampler_state struct wined3d_private_store private_store; struct wined3d_sampler *wined3d_sampler; - D3D10_SAMPLER_DESC desc; + D3D11_SAMPLER_DESC desc; struct wine_rb_entry entry; ID3D11Device *device; }; HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_device *device, - const D3D10_SAMPLER_DESC *desc) DECLSPEC_HIDDEN; + const D3D11_SAMPLER_DESC *desc) DECLSPEC_HIDDEN; struct d3d_sampler_state *unsafe_impl_from_ID3D10SamplerState(ID3D10SamplerState *iface) DECLSPEC_HIDDEN; /* ID3D10Query */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4358fb3a..f649d6b 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3567,7 +3567,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device1 * if (!object) return E_OUTOFMEMORY; - if (FAILED(hr = d3d_sampler_state_init(object, device, desc))) + if (FAILED(hr = d3d_sampler_state_init(object, device, (const D3D11_SAMPLER_DESC *)desc))) { WARN("Failed to initialize sampler state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -4112,8 +4112,8 @@ static void d3d_rb_free(void *ptr) static int d3d_sampler_state_compare(const void *key, const struct wine_rb_entry *entry) { - const D3D10_SAMPLER_DESC *ka = key; - const D3D10_SAMPLER_DESC *kb = &WINE_RB_ENTRY_VALUE(entry, const struct d3d_sampler_state, entry)->desc; + const D3D11_SAMPLER_DESC *ka = key; + const D3D11_SAMPLER_DESC *kb = &WINE_RB_ENTRY_VALUE(entry, const struct d3d_sampler_state, entry)->desc; return memcmp(ka, kb, sizeof(*ka)); } diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index f989495..2151389 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -24,12 +24,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d11); -#define D3D10_FILTER_MIP_MASK 0x01 -#define D3D10_FILTER_MAG_MASK 0x04 -#define D3D10_FILTER_MIN_MASK 0x10 -#define D3D10_FILTER_ANISO_MASK 0x40 -#define D3D10_FILTER_COMPARE_MASK 0x80 - /* ID3D11BlendState methods */ static inline struct d3d_blend_state *impl_from_ID3D11BlendState(ID3D11BlendState *iface) @@ -981,7 +975,11 @@ static HRESULT STDMETHODCALLTYPE d3d11_sampler_state_SetPrivateDataInterface(ID3 static void STDMETHODCALLTYPE d3d11_sampler_state_GetDesc(ID3D11SamplerState *iface, D3D11_SAMPLER_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d_sampler_state *state = impl_from_ID3D11SamplerState(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = state->desc; } static const struct ID3D11SamplerStateVtbl d3d11_sampler_state_vtbl = @@ -1088,7 +1086,7 @@ static void STDMETHODCALLTYPE d3d10_sampler_state_GetDesc(ID3D10SamplerState *if TRACE("iface %p, desc %p.\n", iface, desc); - *desc = state->desc; + memcpy(desc, &state->desc, sizeof(*desc)); } static const struct ID3D10SamplerStateVtbl d3d10_sampler_state_vtbl = @@ -1106,44 +1104,44 @@ static const struct ID3D10SamplerStateVtbl d3d10_sampler_state_vtbl = d3d10_sampler_state_GetDesc, }; -static enum wined3d_texture_address wined3d_texture_address_from_d3d10core(enum D3D10_TEXTURE_ADDRESS_MODE t) +static enum wined3d_texture_address wined3d_texture_address_from_d3d11(enum D3D11_TEXTURE_ADDRESS_MODE t) { return (enum wined3d_texture_address)t; } -static enum wined3d_texture_filter_type wined3d_texture_filter_mip_from_d3d10core(enum D3D10_FILTER f) +static enum wined3d_texture_filter_type wined3d_texture_filter_mip_from_d3d11(enum D3D11_FILTER f) { - if (f & D3D10_FILTER_MIP_MASK) + if (D3D11_DECODE_MIP_FILTER(f) == D3D11_FILTER_TYPE_LINEAR) return WINED3D_TEXF_LINEAR; return WINED3D_TEXF_POINT; } -static enum wined3d_texture_filter_type wined3d_texture_filter_mag_from_d3d10core(enum D3D10_FILTER f) +static enum wined3d_texture_filter_type wined3d_texture_filter_mag_from_d3d11(enum D3D11_FILTER f) { - if (f & D3D10_FILTER_MAG_MASK) + if (D3D11_DECODE_MAG_FILTER(f) == D3D11_FILTER_TYPE_LINEAR) return WINED3D_TEXF_LINEAR; return WINED3D_TEXF_POINT; } -static enum wined3d_texture_filter_type wined3d_texture_filter_min_from_d3d10core(enum D3D10_FILTER f) +static enum wined3d_texture_filter_type wined3d_texture_filter_min_from_d3d11(enum D3D11_FILTER f) { - if (f & D3D10_FILTER_MIN_MASK) + if (D3D11_DECODE_MIN_FILTER(f) == D3D11_FILTER_TYPE_LINEAR) return WINED3D_TEXF_LINEAR; return WINED3D_TEXF_POINT; } -static BOOL wined3d_texture_compare_from_d3d10core(enum D3D10_FILTER f) +static BOOL wined3d_texture_compare_from_d3d11(enum D3D11_FILTER f) { - return f & D3D10_FILTER_COMPARE_MASK; + return D3D11_DECODE_IS_COMPARISON_FILTER(f); } -static enum wined3d_cmp_func wined3d_cmp_func_from_d3d10core(D3D10_COMPARISON_FUNC f) +static enum wined3d_cmp_func wined3d_cmp_func_from_d3d11(D3D11_COMPARISON_FUNC f) { return (enum wined3d_cmp_func)f; } HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_device *device, - const D3D10_SAMPLER_DESC *desc) + const D3D11_SAMPLER_DESC *desc) { struct wined3d_sampler_desc wined3d_desc; HRESULT hr; @@ -1155,19 +1153,19 @@ HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_devic wined3d_private_store_init(&state->private_store); state->desc = *desc; - wined3d_desc.address_u = wined3d_texture_address_from_d3d10core(desc->AddressU); - wined3d_desc.address_v = wined3d_texture_address_from_d3d10core(desc->AddressV); - wined3d_desc.address_w = wined3d_texture_address_from_d3d10core(desc->AddressW); + wined3d_desc.address_u = wined3d_texture_address_from_d3d11(desc->AddressU); + wined3d_desc.address_v = wined3d_texture_address_from_d3d11(desc->AddressV); + wined3d_desc.address_w = wined3d_texture_address_from_d3d11(desc->AddressW); memcpy(wined3d_desc.border_color, desc->BorderColor, sizeof(wined3d_desc.border_color)); - wined3d_desc.mag_filter = wined3d_texture_filter_mag_from_d3d10core(desc->Filter); - wined3d_desc.min_filter = wined3d_texture_filter_min_from_d3d10core(desc->Filter); - wined3d_desc.mip_filter = wined3d_texture_filter_mip_from_d3d10core(desc->Filter); + wined3d_desc.mag_filter = wined3d_texture_filter_mag_from_d3d11(desc->Filter); + wined3d_desc.min_filter = wined3d_texture_filter_min_from_d3d11(desc->Filter); + wined3d_desc.mip_filter = wined3d_texture_filter_mip_from_d3d11(desc->Filter); wined3d_desc.lod_bias = desc->MipLODBias; wined3d_desc.min_lod = desc->MinLOD; wined3d_desc.max_lod = desc->MaxLOD; - wined3d_desc.max_anisotropy = desc->Filter & D3D10_FILTER_ANISO_MASK ? desc->MaxAnisotropy : 1; - wined3d_desc.compare = wined3d_texture_compare_from_d3d10core(desc->Filter); - wined3d_desc.comparison_func = wined3d_cmp_func_from_d3d10core(desc->ComparisonFunc); + wined3d_desc.max_anisotropy = D3D11_DECODE_IS_ANISOTROPIC_FILTER(desc->Filter) ? desc->MaxAnisotropy : 1; + wined3d_desc.compare = wined3d_texture_compare_from_d3d11(desc->Filter); + wined3d_desc.comparison_func = wined3d_cmp_func_from_d3d11(desc->ComparisonFunc); wined3d_desc.srgb_decode = FALSE; if (FAILED(hr = wined3d_sampler_create(device->wined3d_device, &wined3d_desc, state, &state->wined3d_sampler)))

1 0

Józef Kucia : d3d11: Implement ID3D11SamplerState interface.
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: 038cb1a6912d87ced31a7038dfd8b3461a08383c URL: http://source.winehq.org/git/wine.git/?a=commit;h=038cb1a6912d87ced31a7038d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 13 09:13:32 2015 +0200 d3d11: Implement ID3D11SamplerState 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 | 5 +- dlls/d3d11/state.c | 149 +++++++++++++++++++++++++++++++++++++++------ 2 files changed, 132 insertions(+), 22 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 1be1702..56ba560 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -327,9 +327,10 @@ HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d const D3D11_RASTERIZER_DESC *desc) DECLSPEC_HIDDEN; struct d3d_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) DECLSPEC_HIDDEN; -/* ID3D10SamplerState */ +/* ID3D11SamplerState, ID3D10SamplerState */ struct d3d_sampler_state { + ID3D11SamplerState ID3D11SamplerState_iface; ID3D10SamplerState ID3D10SamplerState_iface; LONG refcount; @@ -337,7 +338,7 @@ struct d3d_sampler_state struct wined3d_sampler *wined3d_sampler; D3D10_SAMPLER_DESC desc; struct wine_rb_entry entry; - ID3D10Device1 *device; + ID3D11Device *device; }; HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_device *device, diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 3b52374..f989495 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -867,58 +867,68 @@ struct d3d_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10Raster return impl_from_ID3D10RasterizerState(iface); } -static inline struct d3d_sampler_state *impl_from_ID3D10SamplerState(ID3D10SamplerState *iface) +/* ID3D11SampleState methods */ + +static inline struct d3d_sampler_state *impl_from_ID3D11SamplerState(ID3D11SamplerState *iface) { - return CONTAINING_RECORD(iface, struct d3d_sampler_state, ID3D10SamplerState_iface); + return CONTAINING_RECORD(iface, struct d3d_sampler_state, ID3D11SamplerState_iface); } -/* IUnknown methods */ - -static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_QueryInterface(ID3D10SamplerState *iface, +static HRESULT STDMETHODCALLTYPE d3d11_sampler_state_QueryInterface(ID3D11SamplerState *iface, REFIID riid, void **object) { + struct d3d_sampler_state *state = impl_from_ID3D11SamplerState(iface); + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); - if (IsEqualGUID(riid, &IID_ID3D10SamplerState) - || IsEqualGUID(riid, &IID_ID3D10DeviceChild) + if (IsEqualGUID(riid, &IID_ID3D11SamplerState) + || IsEqualGUID(riid, &IID_ID3D11DeviceChild) || IsEqualGUID(riid, &IID_IUnknown)) { - IUnknown_AddRef(iface); + ID3D11SamplerState_AddRef(iface); *object = iface; return S_OK; } + if (IsEqualGUID(riid, &IID_ID3D10SamplerState) + || IsEqualGUID(riid, &IID_ID3D10DeviceChild)) + { + ID3D10SamplerState_AddRef(&state->ID3D10SamplerState_iface); + *object = &state->ID3D10SamplerState_iface; + return S_OK; + } + WARN("%s not implemented, returning E_NOINTERFACE.\n", debugstr_guid(riid)); *object = NULL; return E_NOINTERFACE; } -static ULONG STDMETHODCALLTYPE d3d10_sampler_state_AddRef(ID3D10SamplerState *iface) +static ULONG STDMETHODCALLTYPE d3d11_sampler_state_AddRef(ID3D11SamplerState *iface) { - struct d3d_sampler_state *This = impl_from_ID3D10SamplerState(iface); - ULONG refcount = InterlockedIncrement(&This->refcount); + struct d3d_sampler_state *state = impl_from_ID3D11SamplerState(iface); + ULONG refcount = InterlockedIncrement(&state->refcount); - TRACE("%p increasing refcount to %u.\n", This, refcount); + TRACE("%p increasing refcount to %u.\n", state, refcount); return refcount; } -static ULONG STDMETHODCALLTYPE d3d10_sampler_state_Release(ID3D10SamplerState *iface) +static ULONG STDMETHODCALLTYPE d3d11_sampler_state_Release(ID3D11SamplerState *iface) { - struct d3d_sampler_state *state = impl_from_ID3D10SamplerState(iface); + struct d3d_sampler_state *state = impl_from_ID3D11SamplerState(iface); ULONG refcount = InterlockedDecrement(&state->refcount); TRACE("%p decreasing refcount to %u.\n", state, refcount); if (!refcount) { - struct d3d_device *device = impl_from_ID3D10Device(state->device); + struct d3d_device *device = impl_from_ID3D11Device(state->device); wined3d_mutex_lock(); wined3d_sampler_decref(state->wined3d_sampler); wine_rb_remove(&device->sampler_states, &state->desc); - ID3D10Device1_Release(state->device); + ID3D11Device_Release(state->device); wined3d_private_store_cleanup(&state->private_store); wined3d_mutex_unlock(); HeapFree(GetProcessHeap(), 0, state); @@ -927,6 +937,105 @@ static ULONG STDMETHODCALLTYPE d3d10_sampler_state_Release(ID3D10SamplerState *i return refcount; } +static void STDMETHODCALLTYPE d3d11_sampler_state_GetDevice(ID3D11SamplerState *iface, + ID3D11Device **device) +{ + struct d3d_sampler_state *state = impl_from_ID3D11SamplerState(iface); + + TRACE("iface %p, device %p.\n", iface, device); + + *device = state->device; + ID3D11Device_AddRef(*device); +} + +static HRESULT STDMETHODCALLTYPE d3d11_sampler_state_GetPrivateData(ID3D11SamplerState *iface, + REFGUID guid, UINT *data_size, void *data) +{ + struct d3d_sampler_state *state = impl_from_ID3D11SamplerState(iface); + + TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_get_private_data(&state->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_sampler_state_SetPrivateData(ID3D11SamplerState *iface, + REFGUID guid, UINT data_size, const void *data) +{ + struct d3d_sampler_state *state = impl_from_ID3D11SamplerState(iface); + + TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); + + return d3d_set_private_data(&state->private_store, guid, data_size, data); +} + +static HRESULT STDMETHODCALLTYPE d3d11_sampler_state_SetPrivateDataInterface(ID3D11SamplerState *iface, + REFGUID guid, const IUnknown *data) +{ + struct d3d_sampler_state *state = impl_from_ID3D11SamplerState(iface); + + TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); + + return d3d_set_private_data_interface(&state->private_store, guid, data); +} + +static void STDMETHODCALLTYPE d3d11_sampler_state_GetDesc(ID3D11SamplerState *iface, + D3D11_SAMPLER_DESC *desc) +{ + FIXME("iface %p, desc %p stub!\n", iface, desc); +} + +static const struct ID3D11SamplerStateVtbl d3d11_sampler_state_vtbl = +{ + /* IUnknown methods */ + d3d11_sampler_state_QueryInterface, + d3d11_sampler_state_AddRef, + d3d11_sampler_state_Release, + /* ID3D11DeviceChild methods */ + d3d11_sampler_state_GetDevice, + d3d11_sampler_state_GetPrivateData, + d3d11_sampler_state_SetPrivateData, + d3d11_sampler_state_SetPrivateDataInterface, + /* ID3D11SamplerState methods */ + d3d11_sampler_state_GetDesc, +}; + +/* ID3D10SamplerState methods */ + +static inline struct d3d_sampler_state *impl_from_ID3D10SamplerState(ID3D10SamplerState *iface) +{ + return CONTAINING_RECORD(iface, struct d3d_sampler_state, ID3D10SamplerState_iface); +} + +/* IUnknown methods */ + +static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_QueryInterface(ID3D10SamplerState *iface, + REFIID riid, void **object) +{ + struct d3d_sampler_state *state = impl_from_ID3D10SamplerState(iface); + + TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), object); + + return d3d11_sampler_state_QueryInterface(&state->ID3D11SamplerState_iface, riid, object); +} + +static ULONG STDMETHODCALLTYPE d3d10_sampler_state_AddRef(ID3D10SamplerState *iface) +{ + struct d3d_sampler_state *state = impl_from_ID3D10SamplerState(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_sampler_state_AddRef(&state->ID3D11SamplerState_iface); +} + +static ULONG STDMETHODCALLTYPE d3d10_sampler_state_Release(ID3D10SamplerState *iface) +{ + struct d3d_sampler_state *state = impl_from_ID3D10SamplerState(iface); + + TRACE("iface %p.\n", iface); + + return d3d11_sampler_state_Release(&state->ID3D11SamplerState_iface); +} + /* ID3D10DeviceChild methods */ static void STDMETHODCALLTYPE d3d10_sampler_state_GetDevice(ID3D10SamplerState *iface, ID3D10Device **device) @@ -935,8 +1044,7 @@ static void STDMETHODCALLTYPE d3d10_sampler_state_GetDevice(ID3D10SamplerState * TRACE("iface %p, device %p.\n", iface, device); - *device = (ID3D10Device *)state->device; - ID3D10Device_AddRef(*device); + ID3D11Device_QueryInterface(state->device, &IID_ID3D10Device, (void **)device); } static HRESULT STDMETHODCALLTYPE d3d10_sampler_state_GetPrivateData(ID3D10SamplerState *iface, @@ -1040,6 +1148,7 @@ HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_devic struct wined3d_sampler_desc wined3d_desc; HRESULT hr; + state->ID3D11SamplerState_iface.lpVtbl = &d3d11_sampler_state_vtbl; state->ID3D10SamplerState_iface.lpVtbl = &d3d10_sampler_state_vtbl; state->refcount = 1; wined3d_mutex_lock(); @@ -1079,8 +1188,8 @@ HRESULT d3d_sampler_state_init(struct d3d_sampler_state *state, struct d3d_devic } wined3d_mutex_unlock(); - state->device = &device->ID3D10Device1_iface; - ID3D10Device1_AddRef(state->device); + state->device = &device->ID3D11Device_iface; + ID3D11Device_AddRef(state->device); return S_OK; }

1 0

Józef Kucia : d3d11: Rename d3d10_sampler_state to d3d_sampler_state.
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: 4270030c8b10e0cf20ae0158a0e32238ff335a24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4270030c8b10e0cf20ae0158a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 13 09:13:31 2015 +0200 d3d11: Rename d3d10_sampler_state to d3d_sampler_state. 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 | 6 +++--- dlls/d3d11/device.c | 28 ++++++++++++++-------------- dlls/d3d11/state.c | 22 +++++++++++----------- 3 files changed, 28 insertions(+), 28 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=4270030c8b10e0cf20ae0…

1 0

Józef Kucia : d3d11: Rename d3d10_wined3d_device_parent_ops to d3d_wined3d_device_parent_ops.
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: 1d8aa72650b160f52104aa54b9fe8828e950ce3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1d8aa72650b160f52104aa54b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 13 09:13:30 2015 +0200 d3d11: Rename d3d10_wined3d_device_parent_ops to d3d_wined3d_device_parent_ops. 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index db67f74..89b5d06 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -4084,7 +4084,7 @@ static HRESULT CDECL device_parent_create_swapchain(struct wined3d_device_parent return S_OK; } -static const struct wined3d_device_parent_ops d3d10_wined3d_device_parent_ops = +static const struct wined3d_device_parent_ops d3d_wined3d_device_parent_ops = { device_parent_wined3d_device_created, device_parent_mode_changed, @@ -4182,7 +4182,7 @@ HRESULT d3d_device_init(struct d3d_device *device, void *outer_unknown) device->ID3D10Device1_iface.lpVtbl = &d3d10_device1_vtbl; device->ID3D10Multithread_iface.lpVtbl = &d3d10_multithread_vtbl; device->IWineDXGIDeviceParent_iface.lpVtbl = &d3d_dxgi_device_parent_vtbl; - device->device_parent.ops = &d3d10_wined3d_device_parent_ops; + device->device_parent.ops = &d3d_wined3d_device_parent_ops; device->refcount = 1; /* COM aggregation always takes place */ device->outer_unk = outer_unknown;

1 0

Józef Kucia : d3d11: Rename d3d10_dxgi_device_parent_vtbl to d3d_dxgi_device_parent_vtbl.
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: 113a94a45d51a2612b87f11d4694586acb7d9663 URL: http://source.winehq.org/git/wine.git/?a=commit;h=113a94a45d51a2612b87f11d4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Oct 13 09:13:29 2015 +0200 d3d11: Rename d3d10_dxgi_device_parent_vtbl to d3d_dxgi_device_parent_vtbl. 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 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 389d81e..db67f74 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3952,7 +3952,7 @@ static struct wined3d_device_parent * STDMETHODCALLTYPE dxgi_device_parent_get_w return &device->device_parent; } -static const struct IWineDXGIDeviceParentVtbl d3d10_dxgi_device_parent_vtbl = +static const struct IWineDXGIDeviceParentVtbl d3d_dxgi_device_parent_vtbl = { /* IUnknown methods */ dxgi_device_parent_QueryInterface, @@ -4181,7 +4181,7 @@ HRESULT d3d_device_init(struct d3d_device *device, void *outer_unknown) device->ID3D11Device_iface.lpVtbl = &d3d11_device_vtbl; device->ID3D10Device1_iface.lpVtbl = &d3d10_device1_vtbl; device->ID3D10Multithread_iface.lpVtbl = &d3d10_multithread_vtbl; - device->IWineDXGIDeviceParent_iface.lpVtbl = &d3d10_dxgi_device_parent_vtbl; + device->IWineDXGIDeviceParent_iface.lpVtbl = &d3d_dxgi_device_parent_vtbl; device->device_parent.ops = &d3d10_wined3d_device_parent_ops; device->refcount = 1; /* COM aggregation always takes place */

1 0

Michael Stefaniuc : comctl32/tests: IDI_APPLICATION is already an INTRESOURCE (PVS-Studio).
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: 88531272ce276a9183baa0f33cbb366d3752a081 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88531272ce276a9183baa0f33… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 13 00:32:36 2015 +0200 comctl32/tests: IDI_APPLICATION is already an INTRESOURCE (PVS-Studio). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/misc.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/misc.c b/dlls/comctl32/tests/misc.c index ffd0dca..9a4b902 100644 --- a/dlls/comctl32/tests/misc.c +++ b/dlls/comctl32/tests/misc.c @@ -267,7 +267,7 @@ static void test_LoadIconWithScaleDown(void) /* invalid arguments */ icon = (HICON)0x1234; - hr = pLoadIconMetric(NULL, MAKEINTRESOURCEW(IDI_APPLICATION), 0x100, &icon); + hr = pLoadIconMetric(NULL, (LPWSTR)IDI_APPLICATION, 0x100, &icon); ok(hr == E_INVALIDARG, "Expected E_INVALIDARG, got %x\n", hr); ok(icon == NULL, "Expected NULL, got %p\n", icon); @@ -302,7 +302,7 @@ static void test_LoadIconWithScaleDown(void) "Expected HRESULT_FROM_WIN32(ERROR_RESOURCE_TYPE_NOT_FOUND), got %x\n", hr); /* load icon using predefined identifier */ - hr = pLoadIconMetric(NULL, MAKEINTRESOURCEW(IDI_APPLICATION), LIM_SMALL, &icon); + hr = pLoadIconMetric(NULL, (LPWSTR)IDI_APPLICATION, LIM_SMALL, &icon); ok(hr == S_OK, "Expected S_OK, got %x\n", hr); res = GetIconInfo(icon, &info); ok(res, "Failed to get icon info, error %u\n", GetLastError()); @@ -312,7 +312,7 @@ static void test_LoadIconWithScaleDown(void) ok(bmp.bmHeight == GetSystemMetrics(SM_CYSMICON), "Wrong icon height %d\n", bmp.bmHeight); DestroyIcon(icon); - hr = pLoadIconMetric(NULL, MAKEINTRESOURCEW(IDI_APPLICATION), LIM_LARGE, &icon); + hr = pLoadIconMetric(NULL, (LPWSTR)IDI_APPLICATION, LIM_LARGE, &icon); ok(hr == S_OK, "Expected S_OK, got %x\n", hr); res = GetIconInfo(icon, &info); ok(res, "Failed to get icon info, error %u\n", GetLastError()); @@ -322,7 +322,7 @@ static void test_LoadIconWithScaleDown(void) ok(bmp.bmHeight == GetSystemMetrics(SM_CYICON), "Wrong icon height %d\n", bmp.bmHeight); DestroyIcon(icon); - hr = pLoadIconWithScaleDown(NULL, MAKEINTRESOURCEW(IDI_APPLICATION), 42, 42, &icon); + hr = pLoadIconWithScaleDown(NULL, (LPWSTR)IDI_APPLICATION, 42, 42, &icon); ok(hr == S_OK, "Expected S_OK, got %x\n", hr); res = GetIconInfo(icon, &info); ok(res, "Failed to get icon info, error %u\n", GetLastError());

1 0

Michael Stefaniuc : comctl32/tests: WC_DIALOG is already an INTATOM ( PVS-Studio).
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: a16a27075138e84cd8ebac640930e89b8928a98a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a16a27075138e84cd8ebac640… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 13 00:31:43 2015 +0200 comctl32/tests: WC_DIALOG is already an INTATOM (PVS-Studio). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/propsheet.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/propsheet.c b/dlls/comctl32/tests/propsheet.c index 9a422f1..6594298 100644 --- a/dlls/comctl32/tests/propsheet.c +++ b/dlls/comctl32/tests/propsheet.c @@ -300,7 +300,7 @@ static LRESULT CALLBACK hook_proc( int code, WPARAM wp, LPARAM lp ) CBT_CREATEWNDW *c = (CBT_CREATEWNDW *)lp; /* The first dialog created will be the parent dialog */ - if (!done && c->lpcs->lpszClass == MAKEINTRESOURCEW(WC_DIALOG)) + if (!done && c->lpcs->lpszClass == (LPWSTR)WC_DIALOG) { old_nav_dialog_proc = (WNDPROC)SetWindowLongPtrW( (HWND)wp, GWLP_WNDPROC, (LONG_PTR)new_nav_dialog_proc ); done = TRUE;

1 0

Michael Stefaniuc : dplayx: Avoid shadowing a variable used in loop control (PVS-Studio).
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: 9f6bf52ff181b5682ce757c58e03c9fa1b8b90ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f6bf52ff181b5682ce757c58… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 13 00:31:26 2015 +0200 dplayx: Avoid shadowing a variable used in loop control (PVS-Studio). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dplayx/dplobby.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/dlls/dplayx/dplobby.c b/dlls/dplayx/dplobby.c index 2b4b554..2cf342f 100644 --- a/dlls/dplayx/dplobby.c +++ b/dlls/dplayx/dplobby.c @@ -762,8 +762,6 @@ static HRESULT WINAPI IDirectPlayLobby3AImpl_EnumAddressTypes( IDirectPlayLobby3 DWORD dwAtIndex; LPCSTR atKey = "Address Types"; LPCSTR guidDataSubKey = "Guid"; - FILETIME filetime; - TRACE(" this time through: %s\n", subKeyName );

1 0

Michael Stefaniuc : hidclass.sys: Fix a misplaced closing bracket ( PVS-Studio).
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: 428925eeeea23366ce6346d473c47fdd7a6302d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=428925eeeea23366ce6346d47… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Oct 13 00:28:11 2015 +0200 hidclass.sys: Fix a misplaced closing bracket (PVS-Studio). Signed-off-by: Michael Stefaniuc <mstefani(a)redhat.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index ac9b047..13ac99b 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -964,7 +964,7 @@ WINE_HIDP_PREPARSED_DATA* build_PreparseData( if (feature_features[i]->caps.ReportID != wine_report->reportID) { wine_report->dwSize += (sizeof(WINE_HID_ELEMENT) * wine_report->elementCount); - wine_report = (WINE_HID_REPORT*)((BYTE*)wine_report)+wine_report->dwSize; + wine_report = (WINE_HID_REPORT*)((BYTE*)wine_report+wine_report->dwSize); new_report(wine_report, feature_features[i]); data->dwFeatureReportCount++; bitLength = max(bitOffset, bitLength);

1 0

Matteo Bruni : d3d8/tests: Use the new readback helpers in test_pointsize( ).
by Alexandre Julliard 13 Oct '15

13 Oct '15

Module: wine Branch: master Commit: 2e4aee0ee74a19f77fce15250ba0d9eade11456c URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e4aee0ee74a19f77fce15250… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Oct 12 23:17:07 2015 +0200 d3d8/tests: Use the new readback helpers in test_pointsize(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/visual.c | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index 772fd96..2748445 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -7197,31 +7197,36 @@ static void test_pointsize(void) } else { - color = getPixelColor(device, 64 - size / 2 + 1, 64 - size / 2 + 1); + struct surface_readback rb; + + get_rt_readback(rt, &rb); + color = get_readback_color(&rb, 64 - size / 2 + 1, 64 - size / 2 + 1); ok(color_match(color, 0x00ff0000, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 + size / 2 - 1, 64 - size / 2 + 1); + color = get_readback_color(&rb, 64 + size / 2 - 1, 64 - size / 2 + 1); ok(color_match(color, 0x00ffff00, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 - size / 2 + 1, 64 + size / 2 - 1); + color = get_readback_color(&rb, 64 - size / 2 + 1, 64 + size / 2 - 1); ok(color_match(color, 0x00000000, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 + size / 2 - 1, 64 + size / 2 - 1); + color = get_readback_color(&rb, 64 + size / 2 - 1, 64 + size / 2 - 1); ok(color_match(color, 0x0000ff00, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 - size / 2 - 1, 64 - size / 2 - 1); - ok(color_match(color, 0x0000ffff, 0), + color = get_readback_color(&rb, 64 - size / 2 - 1, 64 - size / 2 - 1); + ok(color_match(color, 0xff00ffff, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 + size / 2 + 1, 64 - size / 2 - 1); - ok(color_match(color, 0x0000ffff, 0), + color = get_readback_color(&rb, 64 + size / 2 + 1, 64 - size / 2 - 1); + ok(color_match(color, 0xff00ffff, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 - size / 2 - 1, 64 + size / 2 + 1); - ok(color_match(color, 0x0000ffff, 0), + color = get_readback_color(&rb, 64 - size / 2 - 1, 64 + size / 2 + 1); + ok(color_match(color, 0xff00ffff, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); - color = getPixelColor(device, 64 + size / 2 + 1, 64 + size / 2 + 1); - ok(color_match(color, 0x0000ffff, 0), + color = get_readback_color(&rb, 64 + size / 2 + 1, 64 + size / 2 + 1); + ok(color_match(color, 0xff00ffff, 0), "Got unexpected color 0x%08x (case %u, %u, size %u).\n", color, i, j, size); + + release_surface_readback(&rb); } } IDirect3DDevice8_SetVertexShader(device, 0);

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
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