October 2015 - Wine-commits

Józef Kucia : d3d11: Rename d3d10_rasterizer_state to d3d_rasterizer_state.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 84efabb6c37d8456a0eb83b22f808d18d839edb5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84efabb6c37d8456a0eb83b22… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 27 18:49:54 2015 +0200 d3d11: Rename d3d10_rasterizer_state to d3d_rasterizer_state. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 8 ++++---- dlls/d3d11/device.c | 16 ++++++++-------- dlls/d3d11/state.c | 22 +++++++++++----------- 3 files changed, 23 insertions(+), 23 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index e76ce6d..13126a1 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -307,7 +307,7 @@ struct d3d10_depthstencil_state *unsafe_impl_from_ID3D10DepthStencilState( ID3D10DepthStencilState *iface) DECLSPEC_HIDDEN; /* ID3D10RasterizerState */ -struct d3d10_rasterizer_state +struct d3d_rasterizer_state { ID3D10RasterizerState ID3D10RasterizerState_iface; LONG refcount; @@ -318,9 +318,9 @@ struct d3d10_rasterizer_state ID3D10Device1 *device; }; -HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, struct d3d_device *device, +HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d_device *device, const D3D10_RASTERIZER_DESC *desc) DECLSPEC_HIDDEN; -struct d3d10_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) DECLSPEC_HIDDEN; +struct d3d_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) DECLSPEC_HIDDEN; /* ID3D10SamplerState */ struct d3d10_sampler_state @@ -378,7 +378,7 @@ struct d3d_device float blend_factor[4]; struct d3d10_depthstencil_state *depth_stencil_state; UINT stencil_ref; - struct d3d10_rasterizer_state *rasterizer_state; + struct d3d_rasterizer_state *rasterizer_state; }; static inline struct d3d_device *impl_from_ID3D10Device(ID3D10Device1 *iface) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index eb605aa..ee492ca 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2439,7 +2439,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device const D3D10_RASTERIZER_DESC *desc, ID3D10RasterizerState **rasterizer_state) { struct d3d_device *device = impl_from_ID3D10Device(iface); - struct d3d10_rasterizer_state *object; + struct d3d_rasterizer_state *object; struct wine_rb_entry *entry; HRESULT hr; @@ -2451,7 +2451,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device wined3d_mutex_lock(); if ((entry = wine_rb_get(&device->rasterizer_states, desc))) { - object = WINE_RB_ENTRY_VALUE(entry, struct d3d10_rasterizer_state, entry); + object = WINE_RB_ENTRY_VALUE(entry, struct d3d_rasterizer_state, entry); TRACE("Returning existing rasterizer state %p.\n", object); *rasterizer_state = &object->ID3D10RasterizerState_iface; @@ -2466,7 +2466,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device if (!object) return E_OUTOFMEMORY; - if (FAILED(hr = d3d10_rasterizer_state_init(object, device, desc))) + if (FAILED(hr = d3d_rasterizer_state_init(object, device, desc))) { WARN("Failed to initialize rasterizer state, hr %#x.\n", hr); HeapFree(GetProcessHeap(), 0, object); @@ -3102,20 +3102,20 @@ static const struct wine_rb_functions d3d10_depthstencil_state_rb_ops = d3d10_depthstencil_state_compare, }; -static int d3d10_rasterizer_state_compare(const void *key, const struct wine_rb_entry *entry) +static int d3d_rasterizer_state_compare(const void *key, const struct wine_rb_entry *entry) { const D3D10_RASTERIZER_DESC *ka = key; - const D3D10_RASTERIZER_DESC *kb = &WINE_RB_ENTRY_VALUE(entry, const struct d3d10_rasterizer_state, entry)->desc; + const D3D10_RASTERIZER_DESC *kb = &WINE_RB_ENTRY_VALUE(entry, const struct d3d_rasterizer_state, entry)->desc; return memcmp(ka, kb, sizeof(*ka)); } -static const struct wine_rb_functions d3d10_rasterizer_state_rb_ops = +static const struct wine_rb_functions d3d_rasterizer_state_rb_ops = { d3d10_rb_alloc, d3d10_rb_realloc, d3d10_rb_free, - d3d10_rasterizer_state_compare, + d3d_rasterizer_state_compare, }; HRESULT d3d10_device_init(struct d3d_device *device, void *outer_unknown) @@ -3147,7 +3147,7 @@ HRESULT d3d10_device_init(struct d3d_device *device, void *outer_unknown) return E_FAIL; } - if (wine_rb_init(&device->rasterizer_states, &d3d10_rasterizer_state_rb_ops) == -1) + if (wine_rb_init(&device->rasterizer_states, &d3d_rasterizer_state_rb_ops) == -1) { WARN("Failed to initialize rasterizer state rbtree.\n"); wine_rb_destroy(&device->depthstencil_states, NULL, NULL); diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index 000e367..0ab9e98 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -354,9 +354,9 @@ struct d3d10_depthstencil_state *unsafe_impl_from_ID3D10DepthStencilState(ID3D10 return impl_from_ID3D10DepthStencilState(iface); } -static inline struct d3d10_rasterizer_state *impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) +static inline struct d3d_rasterizer_state *impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) { - return CONTAINING_RECORD(iface, struct d3d10_rasterizer_state, ID3D10RasterizerState_iface); + return CONTAINING_RECORD(iface, struct d3d_rasterizer_state, ID3D10RasterizerState_iface); } /* IUnknown methods */ @@ -383,7 +383,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_QueryInterface(ID3D10Ras static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_AddRef(ID3D10RasterizerState *iface) { - struct d3d10_rasterizer_state *This = impl_from_ID3D10RasterizerState(iface); + struct d3d_rasterizer_state *This = impl_from_ID3D10RasterizerState(iface); ULONG refcount = InterlockedIncrement(&This->refcount); TRACE("%p increasing refcount to %u.\n", This, refcount); @@ -393,7 +393,7 @@ static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_AddRef(ID3D10RasterizerSta static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_Release(ID3D10RasterizerState *iface) { - struct d3d10_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); ULONG refcount = InterlockedDecrement(&state->refcount); TRACE("%p decreasing refcount to %u.\n", state, refcount); @@ -416,7 +416,7 @@ static ULONG STDMETHODCALLTYPE d3d10_rasterizer_state_Release(ID3D10RasterizerSt static void STDMETHODCALLTYPE d3d10_rasterizer_state_GetDevice(ID3D10RasterizerState *iface, ID3D10Device **device) { - struct d3d10_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); TRACE("iface %p, device %p.\n", iface, device); @@ -427,7 +427,7 @@ static void STDMETHODCALLTYPE d3d10_rasterizer_state_GetDevice(ID3D10RasterizerS static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_GetPrivateData(ID3D10RasterizerState *iface, REFGUID guid, UINT *data_size, void *data) { - struct d3d10_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); TRACE("iface %p, guid %s, data_size %p, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -438,7 +438,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_GetPrivateData(ID3D10Ras static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_SetPrivateData(ID3D10RasterizerState *iface, REFGUID guid, UINT data_size, const void *data) { - struct d3d10_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); TRACE("iface %p, guid %s, data_size %u, data %p.\n", iface, debugstr_guid(guid), data_size, data); @@ -449,7 +449,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_SetPrivateData(ID3D10Ras static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_SetPrivateDataInterface(ID3D10RasterizerState *iface, REFGUID guid, const IUnknown *data) { - struct d3d10_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); TRACE("iface %p, guid %s, data %p.\n", iface, debugstr_guid(guid), data); @@ -461,7 +461,7 @@ static HRESULT STDMETHODCALLTYPE d3d10_rasterizer_state_SetPrivateDataInterface( static void STDMETHODCALLTYPE d3d10_rasterizer_state_GetDesc(ID3D10RasterizerState *iface, D3D10_RASTERIZER_DESC *desc) { - struct d3d10_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); + struct d3d_rasterizer_state *state = impl_from_ID3D10RasterizerState(iface); TRACE("iface %p, desc %p.\n", iface, desc); @@ -483,7 +483,7 @@ static const struct ID3D10RasterizerStateVtbl d3d10_rasterizer_state_vtbl = d3d10_rasterizer_state_GetDesc, }; -HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, struct d3d_device *device, +HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d_device *device, const D3D10_RASTERIZER_DESC *desc) { state->ID3D10RasterizerState_iface.lpVtbl = &d3d10_rasterizer_state_vtbl; @@ -507,7 +507,7 @@ HRESULT d3d10_rasterizer_state_init(struct d3d10_rasterizer_state *state, struct return S_OK; } -struct d3d10_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) +struct d3d_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) { if (!iface) return NULL;

1 0

Józef Kucia : d3d11: Rename d3d10_rb_{alloc, realloc, free} to d3d_rb_{alloc, realloc, free}.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 3068f0470d978d353b1c6e73ccb7434f14948d5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=3068f0470d978d353b1c6e73c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 27 18:49:55 2015 +0200 d3d11: Rename d3d10_rb_{alloc, realloc, free} to d3d_rb_{alloc, realloc, free}. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/device.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index ee492ca..73ff58e 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3038,17 +3038,17 @@ static const struct wined3d_device_parent_ops d3d10_wined3d_device_parent_ops = device_parent_create_swapchain, }; -static void *d3d10_rb_alloc(size_t size) +static void *d3d_rb_alloc(size_t size) { return HeapAlloc(GetProcessHeap(), 0, size); } -static void *d3d10_rb_realloc(void *ptr, size_t size) +static void *d3d_rb_realloc(void *ptr, size_t size) { return HeapReAlloc(GetProcessHeap(), 0, ptr, size); } -static void d3d10_rb_free(void *ptr) +static void d3d_rb_free(void *ptr) { HeapFree(GetProcessHeap(), 0, ptr); } @@ -3063,9 +3063,9 @@ static int d3d10_sampler_state_compare(const void *key, const struct wine_rb_ent static const struct wine_rb_functions d3d10_sampler_state_rb_ops = { - d3d10_rb_alloc, - d3d10_rb_realloc, - d3d10_rb_free, + d3d_rb_alloc, + d3d_rb_realloc, + d3d_rb_free, d3d10_sampler_state_compare, }; @@ -3079,9 +3079,9 @@ static int d3d10_blend_state_compare(const void *key, const struct wine_rb_entry static const struct wine_rb_functions d3d10_blend_state_rb_ops = { - d3d10_rb_alloc, - d3d10_rb_realloc, - d3d10_rb_free, + d3d_rb_alloc, + d3d_rb_realloc, + d3d_rb_free, d3d10_blend_state_compare, }; @@ -3096,9 +3096,9 @@ static int d3d10_depthstencil_state_compare(const void *key, const struct wine_r static const struct wine_rb_functions d3d10_depthstencil_state_rb_ops = { - d3d10_rb_alloc, - d3d10_rb_realloc, - d3d10_rb_free, + d3d_rb_alloc, + d3d_rb_realloc, + d3d_rb_free, d3d10_depthstencil_state_compare, }; @@ -3112,9 +3112,9 @@ static int d3d_rasterizer_state_compare(const void *key, const struct wine_rb_en static const struct wine_rb_functions d3d_rasterizer_state_rb_ops = { - d3d10_rb_alloc, - d3d10_rb_realloc, - d3d10_rb_free, + d3d_rb_alloc, + d3d_rb_realloc, + d3d_rb_free, d3d_rasterizer_state_compare, };

1 0

Józef Kucia : d3d11: Implement ID3D11RasterizerState interface.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: e006be15b9694a15d03fe03d7fac9c12ab9b2921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e006be15b9694a15d03fe03d7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 27 18:49:56 2015 +0200 d3d11: Implement ID3D11RasterizerState interface. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 10 ++- dlls/d3d11/device.c | 5 -- dlls/d3d11/state.c | 149 +++++++++++++++++++++++++++++++++++++++------ 3 files changed, 137 insertions(+), 27 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e006be15b9694a15d03fe…

1 0

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

01 Oct '15

Module: wine Branch: master Commit: b8bcac51003f45f21a54fc16b5f4c78d466c5086 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b8bcac51003f45f21a54fc16b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 27 18:49:57 2015 +0200 d3d11: Implement d3d11_device_CreateRasterizerState(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/d3d11_private.h | 4 +-- dlls/d3d11/device.c | 84 ++++++++++++++++++++++++++-------------------- dlls/d3d11/state.c | 10 ++++-- 3 files changed, 56 insertions(+), 42 deletions(-) diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 0743123..671a5b5 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -314,13 +314,13 @@ struct d3d_rasterizer_state LONG refcount; struct wined3d_private_store private_store; - D3D10_RASTERIZER_DESC desc; + D3D11_RASTERIZER_DESC desc; struct wine_rb_entry entry; ID3D11Device *device; }; HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d_device *device, - const D3D10_RASTERIZER_DESC *desc) DECLSPEC_HIDDEN; + const D3D11_RASTERIZER_DESC *desc) DECLSPEC_HIDDEN; struct d3d_rasterizer_state *unsafe_impl_from_ID3D10RasterizerState(ID3D10RasterizerState *iface) DECLSPEC_HIDDEN; /* ID3D10SamplerState */ diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 4d4cd6c..ed45ebe 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -309,9 +309,44 @@ static HRESULT STDMETHODCALLTYPE d3d11_device_CreateDepthStencilState(ID3D11Devi static HRESULT STDMETHODCALLTYPE d3d11_device_CreateRasterizerState(ID3D11Device *iface, const D3D11_RASTERIZER_DESC *desc, ID3D11RasterizerState **rasterizer_state) { - FIXME("iface %p, desc %p, rasterizer_state %p stub!\n", iface, desc, rasterizer_state); + struct d3d_device *device = impl_from_ID3D11Device(iface); + struct d3d_rasterizer_state *object; + struct wine_rb_entry *entry; + HRESULT hr; - return E_NOTIMPL; + TRACE("iface %p, desc %p, rasterizer_state %p.\n", iface, desc, rasterizer_state); + + if (!desc) + return E_INVALIDARG; + + wined3d_mutex_lock(); + if ((entry = wine_rb_get(&device->rasterizer_states, desc))) + { + object = WINE_RB_ENTRY_VALUE(entry, struct d3d_rasterizer_state, entry); + + TRACE("Returning existing rasterizer state %p.\n", object); + *rasterizer_state = &object->ID3D11RasterizerState_iface; + ID3D11RasterizerState_AddRef(*rasterizer_state); + wined3d_mutex_unlock(); + + return S_OK; + } + wined3d_mutex_unlock(); + + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + return E_OUTOFMEMORY; + + if (FAILED(hr = d3d_rasterizer_state_init(object, device, desc))) + { + WARN("Failed to initialize rasterizer state, hr %#x.\n", hr); + HeapFree(GetProcessHeap(), 0, object); + return hr; + } + + TRACE("Created rasterizer state %p.\n", object); + *rasterizer_state = &object->ID3D11RasterizerState_iface; + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d11_device_CreateSamplerState(ID3D11Device *iface, @@ -1106,7 +1141,7 @@ static void STDMETHODCALLTYPE d3d10_device_DrawAuto(ID3D10Device1 *iface) static void STDMETHODCALLTYPE d3d10_device_RSSetState(ID3D10Device1 *iface, ID3D10RasterizerState *rasterizer_state) { struct d3d_device *device = impl_from_ID3D10Device(iface); - const D3D10_RASTERIZER_DESC *desc; + const D3D11_RASTERIZER_DESC *desc; TRACE("iface %p, rasterizer_state %p.\n", iface, rasterizer_state); @@ -2434,44 +2469,19 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_CreateRasterizerState(ID3D10Device const D3D10_RASTERIZER_DESC *desc, ID3D10RasterizerState **rasterizer_state) { struct d3d_device *device = impl_from_ID3D10Device(iface); - struct d3d_rasterizer_state *object; - struct wine_rb_entry *entry; + ID3D11RasterizerState *d3d11_rasterizer_state; HRESULT hr; TRACE("iface %p, desc %p, rasterizer_state %p.\n", iface, desc, rasterizer_state); - if (!desc) - return E_INVALIDARG; - - wined3d_mutex_lock(); - if ((entry = wine_rb_get(&device->rasterizer_states, desc))) - { - object = WINE_RB_ENTRY_VALUE(entry, struct d3d_rasterizer_state, entry); - - TRACE("Returning existing rasterizer state %p.\n", object); - *rasterizer_state = &object->ID3D10RasterizerState_iface; - ID3D10RasterizerState_AddRef(*rasterizer_state); - wined3d_mutex_unlock(); - - return S_OK; - } - wined3d_mutex_unlock(); - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)); - if (!object) - return E_OUTOFMEMORY; - - if (FAILED(hr = d3d_rasterizer_state_init(object, device, desc))) - { - WARN("Failed to initialize rasterizer state, hr %#x.\n", hr); - HeapFree(GetProcessHeap(), 0, object); + if (FAILED(hr = d3d11_device_CreateRasterizerState(&device->ID3D11Device_iface, + (const D3D11_RASTERIZER_DESC *)desc, &d3d11_rasterizer_state))) return hr; - } - TRACE("Created rasterizer state %p.\n", object); - *rasterizer_state = &object->ID3D10RasterizerState_iface; - - return S_OK; + hr = ID3D11RasterizerState_QueryInterface(d3d11_rasterizer_state, + &IID_ID3D10RasterizerState, (void **)rasterizer_state); + ID3D11RasterizerState_Release(d3d11_rasterizer_state); + return hr; } static HRESULT STDMETHODCALLTYPE d3d10_device_CreateSamplerState(ID3D10Device1 *iface, @@ -3099,8 +3109,8 @@ static const struct wine_rb_functions d3d10_depthstencil_state_rb_ops = static int d3d_rasterizer_state_compare(const void *key, const struct wine_rb_entry *entry) { - const D3D10_RASTERIZER_DESC *ka = key; - const D3D10_RASTERIZER_DESC *kb = &WINE_RB_ENTRY_VALUE(entry, const struct d3d_rasterizer_state, entry)->desc; + const D3D11_RASTERIZER_DESC *ka = key; + const D3D11_RASTERIZER_DESC *kb = &WINE_RB_ENTRY_VALUE(entry, const struct d3d_rasterizer_state, entry)->desc; return memcmp(ka, kb, sizeof(*ka)); } diff --git a/dlls/d3d11/state.c b/dlls/d3d11/state.c index ac50acf..1adcdbd 100644 --- a/dlls/d3d11/state.c +++ b/dlls/d3d11/state.c @@ -466,7 +466,11 @@ static HRESULT STDMETHODCALLTYPE d3d11_rasterizer_state_SetPrivateDataInterface( static void STDMETHODCALLTYPE d3d11_rasterizer_state_GetDesc(ID3D11RasterizerState *iface, D3D11_RASTERIZER_DESC *desc) { - FIXME("iface %p, desc %p stub!\n", iface, desc); + struct d3d_rasterizer_state *state = impl_from_ID3D11RasterizerState(iface); + + TRACE("iface %p, desc %p.\n", iface, desc); + + *desc = state->desc; } static const struct ID3D11RasterizerStateVtbl d3d11_rasterizer_state_vtbl = @@ -573,7 +577,7 @@ static void STDMETHODCALLTYPE d3d10_rasterizer_state_GetDesc(ID3D10RasterizerSta TRACE("iface %p, desc %p.\n", iface, desc); - *desc = state->desc; + memcpy(desc, &state->desc, sizeof(*desc)); } static const struct ID3D10RasterizerStateVtbl d3d10_rasterizer_state_vtbl = @@ -592,7 +596,7 @@ static const struct ID3D10RasterizerStateVtbl d3d10_rasterizer_state_vtbl = }; HRESULT d3d_rasterizer_state_init(struct d3d_rasterizer_state *state, struct d3d_device *device, - const D3D10_RASTERIZER_DESC *desc) + const D3D11_RASTERIZER_DESC *desc) { state->ID3D11RasterizerState_iface.lpVtbl = &d3d11_rasterizer_state_vtbl; state->ID3D10RasterizerState_iface.lpVtbl = &d3d10_rasterizer_state_vtbl;

1 0

Józef Kucia : d3d11/tests: Port test_create_rasterizer_state() from d3d10core.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 934e4d1852dcadf0fa80d798ccb5ff7cf345ecfa URL: http://source.winehq.org/git/wine.git/?a=commit;h=934e4d1852dcadf0fa80d798c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 27 18:49:58 2015 +0200 d3d11/tests: Port test_create_rasterizer_state() from d3d10core. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/tests/d3d11.c | 81 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index d5b46a4..d2deffd 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -1469,6 +1469,86 @@ static void test_create_shader(void) } } +static void test_create_rasterizer_state(void) +{ + ID3D11RasterizerState *rast_state1, *rast_state2; + ID3D10RasterizerState *d3d10_rast_state; + ULONG refcount, expected_refcount; + D3D10_RASTERIZER_DESC d3d10_desc; + D3D11_RASTERIZER_DESC desc; + ID3D11Device *device, *tmp; + HRESULT hr; + + if (!(device = create_device(NULL))) + { + skip("Failed to create device.\n"); + return; + } + + hr = ID3D11Device_CreateRasterizerState(device, NULL, &rast_state1); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + desc.FillMode = D3D11_FILL_SOLID; + desc.CullMode = D3D11_CULL_BACK; + desc.FrontCounterClockwise = FALSE; + desc.DepthBias = 0; + desc.DepthBiasClamp = 0.0f; + desc.SlopeScaledDepthBias = 0.0f; + desc.DepthClipEnable = TRUE; + desc.ScissorEnable = FALSE; + desc.MultisampleEnable = FALSE; + desc.AntialiasedLineEnable = FALSE; + + expected_refcount = get_refcount((IUnknown *)device) + 1; + hr = ID3D11Device_CreateRasterizerState(device, &desc, &rast_state1); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + hr = ID3D11Device_CreateRasterizerState(device, &desc, &rast_state2); + ok(SUCCEEDED(hr), "Failed to create rasterizer state, hr %#x.\n", hr); + ok(rast_state1 == rast_state2, "Got different rasterizer state objects.\n"); + refcount = get_refcount((IUnknown *)device); + ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); + tmp = NULL; + expected_refcount = refcount + 1; + ID3D11RasterizerState_GetDevice(rast_state1, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); + ID3D11Device_Release(tmp); + + hr = ID3D11RasterizerState_QueryInterface(rast_state1, &IID_ID3D10RasterizerState, (void **)&d3d10_rast_state); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Rasterizer state should implement ID3D10RasterizerState.\n"); + if (SUCCEEDED(hr)) + { + ID3D10RasterizerState_GetDesc(d3d10_rast_state, &d3d10_desc); + ok(d3d10_desc.FillMode == D3D10_FILL_SOLID, "Got unexpected fill mode %u.\n", d3d10_desc.FillMode); + ok(d3d10_desc.CullMode == D3D10_CULL_BACK, "Got unexpected cull mode %u.\n", d3d10_desc.CullMode); + ok(!d3d10_desc.FrontCounterClockwise, "Got unexpected front counter clockwise %#x.\n", + d3d10_desc.FrontCounterClockwise); + ok(!d3d10_desc.DepthBias, "Got unexpected depth bias %d.\n", d3d10_desc.DepthBias); + ok(!d3d10_desc.DepthBiasClamp, "Got unexpected depth bias clamp %f.\n", d3d10_desc.DepthBiasClamp); + ok(!d3d10_desc.SlopeScaledDepthBias, "Got unexpected slope scaled depth bias %f.\n", + d3d10_desc.SlopeScaledDepthBias); + ok(!!d3d10_desc.DepthClipEnable, "Got unexpected depth clip enable %#x.\n", d3d10_desc.DepthClipEnable); + ok(!d3d10_desc.ScissorEnable, "Got unexpected scissor enable %#x.\n", d3d10_desc.ScissorEnable); + ok(!d3d10_desc.MultisampleEnable, "Got unexpected multisample enable %#x.\n", + d3d10_desc.MultisampleEnable); + ok(!d3d10_desc.AntialiasedLineEnable, "Got unexpected antialiased line enable %#x.\n", + d3d10_desc.AntialiasedLineEnable); + + refcount = ID3D10RasterizerState_Release(d3d10_rast_state); + ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); + } + + refcount = ID3D11RasterizerState_Release(rast_state2); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + refcount = ID3D11RasterizerState_Release(rast_state1); + ok(!refcount, "Got unexpected refcount %u.\n", refcount); + + refcount = ID3D11Device_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +} + START_TEST(d3d11) { test_create_device(); @@ -1483,4 +1563,5 @@ START_TEST(d3d11) test_create_rendertarget_view(); test_create_shader_resource_view(); test_create_shader(); + test_create_rasterizer_state(); }

1 0

Józef Kucia : d3d11: Rename d3d10_device_init() to d3d_device_init().
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 5fb028139973c94b67cc22b2c9d2cc3095240037 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fb028139973c94b67cc22b2c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 27 18:49:59 2015 +0200 d3d11: Rename d3d10_device_init() to d3d_device_init(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/d3d11_main.c | 2 +- dlls/d3d11/d3d11_private.h | 2 +- dlls/d3d11/device.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3d11/d3d11_main.c b/dlls/d3d11/d3d11_main.c index 5d35f10..5be4cd0 100644 --- a/dlls/d3d11/d3d11_main.c +++ b/dlls/d3d11/d3d11_main.c @@ -88,7 +88,7 @@ static HRESULT WINAPI layer_create(enum dxgi_device_layer_id id, void **layer_ba } object = *layer_base; - if (FAILED(hr = d3d10_device_init(object, device_object))) + if (FAILED(hr = d3d_device_init(object, device_object))) { WARN("Failed to initialize device, hr %#x.\n", hr); *device_layer = NULL; diff --git a/dlls/d3d11/d3d11_private.h b/dlls/d3d11/d3d11_private.h index 671a5b5..6d9489a 100644 --- a/dlls/d3d11/d3d11_private.h +++ b/dlls/d3d11/d3d11_private.h @@ -392,7 +392,7 @@ static inline struct d3d_device *impl_from_ID3D10Device(ID3D10Device1 *iface) return CONTAINING_RECORD(iface, struct d3d_device, ID3D10Device1_iface); } -HRESULT d3d10_device_init(struct d3d_device *device, void *outer_unknown) DECLSPEC_HIDDEN; +HRESULT d3d_device_init(struct d3d_device *device, void *outer_unknown) DECLSPEC_HIDDEN; /* Layered device */ enum dxgi_device_layer_id diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index ed45ebe..efa52ee 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -3123,7 +3123,7 @@ static const struct wine_rb_functions d3d_rasterizer_state_rb_ops = d3d_rasterizer_state_compare, }; -HRESULT d3d10_device_init(struct d3d_device *device, void *outer_unknown) +HRESULT d3d_device_init(struct d3d_device *device, void *outer_unknown) { device->IUnknown_inner.lpVtbl = &d3d10_device_inner_unknown_vtbl; device->ID3D11Device_iface.lpVtbl = &d3d11_device_vtbl;

1 0

Józef Kucia : d3d11: Rename d3d10_device_inner to d3d_device_inner.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 9754cda53bdeb2354a75711fba27df15cfaf259c URL: http://source.winehq.org/git/wine.git/?a=commit;h=9754cda53bdeb2354a75711fb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Sep 27 18:50:00 2015 +0200 d3d11: Rename d3d10_device_inner to d3d_device_inner. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- dlls/d3d11/device.c | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index efa52ee..f56d3a9 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -563,7 +563,7 @@ static inline struct d3d_device *impl_from_IUnknown(IUnknown *iface) return CONTAINING_RECORD(iface, struct d3d_device, IUnknown_inner); } -static HRESULT STDMETHODCALLTYPE d3d10_device_inner_QueryInterface(IUnknown *iface, REFIID riid, void **out) +static HRESULT STDMETHODCALLTYPE d3d_device_inner_QueryInterface(IUnknown *iface, REFIID riid, void **out) { struct d3d_device *device = impl_from_IUnknown(iface); @@ -598,17 +598,17 @@ static HRESULT STDMETHODCALLTYPE d3d10_device_inner_QueryInterface(IUnknown *ifa return S_OK; } -static ULONG STDMETHODCALLTYPE d3d10_device_inner_AddRef(IUnknown *iface) +static ULONG STDMETHODCALLTYPE d3d_device_inner_AddRef(IUnknown *iface) { - struct d3d_device *This = impl_from_IUnknown(iface); - ULONG refcount = InterlockedIncrement(&This->refcount); + struct d3d_device *device = impl_from_IUnknown(iface); + ULONG refcount = InterlockedIncrement(&device->refcount); - TRACE("%p increasing refcount to %u\n", This, refcount); + TRACE("%p increasing refcount to %u.\n", device, refcount); return refcount; } -static ULONG STDMETHODCALLTYPE d3d10_device_inner_Release(IUnknown *iface) +static ULONG STDMETHODCALLTYPE d3d_device_inner_Release(IUnknown *iface) { struct d3d_device *device = impl_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&device->refcount); @@ -2786,12 +2786,12 @@ static const struct ID3D10Device1Vtbl d3d10_device1_vtbl = d3d10_device_GetFeatureLevel, }; -static const struct IUnknownVtbl d3d10_device_inner_unknown_vtbl = +static const struct IUnknownVtbl d3d_device_inner_unknown_vtbl = { /* IUnknown methods */ - d3d10_device_inner_QueryInterface, - d3d10_device_inner_AddRef, - d3d10_device_inner_Release, + d3d_device_inner_QueryInterface, + d3d_device_inner_AddRef, + d3d_device_inner_Release, }; /* ID3D10Multithread methods */ @@ -3125,7 +3125,7 @@ static const struct wine_rb_functions d3d_rasterizer_state_rb_ops = HRESULT d3d_device_init(struct d3d_device *device, void *outer_unknown) { - device->IUnknown_inner.lpVtbl = &d3d10_device_inner_unknown_vtbl; + device->IUnknown_inner.lpVtbl = &d3d_device_inner_unknown_vtbl; device->ID3D11Device_iface.lpVtbl = &d3d11_device_vtbl; device->ID3D10Device1_iface.lpVtbl = &d3d10_device1_vtbl; device->ID3D10Multithread_iface.lpVtbl = &d3d10_multithread_vtbl;

1 0

Iván Matellanes : msvcirt: Implement strstreambuf:: seekoff.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: 24d57405acca3fb3352ef0d20c93d5b74dd045a1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=24d57405acca3fb3352ef0d20… Author: Iván Matellanes <matellanesivan(a)gmail.com> Date: Wed Sep 23 15:49:04 2015 +0200 msvcirt: Implement strstreambuf::seekoff. --- dlls/msvcirt/msvcirt.c | 39 ++++++++++++++- dlls/msvcirt/tests/msvcirt.c | 112 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 148 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=24d57405acca3fb3352ef…

1 0

YongHao Hu : msvcp110: Add tr2_sys__Last_write_time implementation and test.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: a6dc6ac4ff73d52f9634bf80e8dc6e0b495ca32e URL: http://source.winehq.org/git/wine.git/?a=commit;h=a6dc6ac4ff73d52f9634bf80e… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Sat Sep 19 08:43:31 2015 +0800 msvcp110: Add tr2_sys__Last_write_time implementation and test. --- configure | 1 + configure.ac | 1 + dlls/msvcp110/msvcp110.spec | 8 +- dlls/msvcp110/tests/Makefile.in | 5 ++ dlls/msvcp110/tests/msvcp110.c | 163 ++++++++++++++++++++++++++++++++++++ dlls/msvcp120/msvcp120.spec | 8 +- dlls/msvcp120_app/msvcp120_app.spec | 8 +- dlls/msvcp90/ios.c | 59 +++++++++++++ 8 files changed, 241 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a6dc6ac4ff73d52f9634b…

1 0

YongHao Hu : msvcp120/tests: Add tr2_sys__Last_write_time test.
by Alexandre Julliard 01 Oct '15

01 Oct '15

Module: wine Branch: master Commit: c1737515d5aae6b7a9b57ce112aac565204faaa7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1737515d5aae6b7a9b57ce11… Author: YongHao Hu <christopherwuy(a)gmail.com> Date: Sat Sep 19 08:44:06 2015 +0800 msvcp120/tests: Add tr2_sys__Last_write_time test. --- dlls/msvcp120/tests/msvcp120.c | 47 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/dlls/msvcp120/tests/msvcp120.c b/dlls/msvcp120/tests/msvcp120.c index 9255ff1..bf7ed8f 100644 --- a/dlls/msvcp120/tests/msvcp120.c +++ b/dlls/msvcp120/tests/msvcp120.c @@ -108,6 +108,8 @@ static struct space_info (__cdecl *p_tr2_sys__Statvfs)(char const*); static struct space_info (__cdecl *p_tr2_sys__Statvfs_wchar)(WCHAR const*); static enum file_type (__cdecl *p_tr2_sys__Stat)(char const*, int *); static enum file_type (__cdecl *p_tr2_sys__Lstat)(char const*, int *); +static __int64 (__cdecl *p_tr2_sys__Last_write_time)(char const*); +static void (__cdecl *p_tr2_sys__Last_write_time_set)(char const*, __int64); static HMODULE msvcp; #define SETNOFAIL(x,y) x = (void*)GetProcAddress(msvcp,y) @@ -178,6 +180,10 @@ static BOOL init(void) "?_Stat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PEBDAEAH(a)Z"); SET(p_tr2_sys__Lstat, "?_Lstat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PEBDAEAH(a)Z"); + SET(p_tr2_sys__Last_write_time, + "?_Last_write_time(a)sys@tr2(a)std@@YA_JPEBD(a)Z"); + SET(p_tr2_sys__Last_write_time_set, + "?_Last_write_time(a)sys@tr2(a)std@@YAXPEBD_J(a)Z"); } else { SET(p_tr2_sys__File_size, "?_File_size(a)sys@tr2(a)std@@YA_KPBD(a)Z"); @@ -219,6 +225,10 @@ static BOOL init(void) "?_Stat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PBDAAH(a)Z"); SET(p_tr2_sys__Lstat, "?_Lstat(a)sys@tr2(a)std@@YA?AW4file_type(a)123@PBDAAH(a)Z"); + SET(p_tr2_sys__Last_write_time, + "?_Last_write_time(a)sys@tr2(a)std@@YA_JPBD(a)Z"); + SET(p_tr2_sys__Last_write_time_set, + "?_Last_write_time(a)sys@tr2(a)std@@YAXPBD_J(a)Z"); } msvcr = GetModuleHandleA("msvcr120.dll"); @@ -946,6 +956,42 @@ static void test_tr2_sys__Stat(void) ok(RemoveDirectoryA("tr2_test_dir"), "expect tr2_test_dir to exist\n"); } +static void test_tr2_sys__Last_write_time(void) +{ + HANDLE file; + int ret; + __int64 last_write_time, newtime; + ret = p_tr2_sys__Make_dir("tr2_test_dir"); + ok(ret == 1, "tr2_sys__Make_dir() expect 1 got %d\n", ret); + + file = CreateFileA("tr2_test_dir/f1", GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, NULL); + ok(file != INVALID_HANDLE_VALUE, "create file failed: INVALID_HANDLE_VALUE\n"); + CloseHandle(file); + + last_write_time = p_tr2_sys__Last_write_time("tr2_test_dir/f1"); + newtime = last_write_time + 123456789; + p_tr2_sys__Last_write_time_set("tr2_test_dir/f1", newtime); + todo_wine ok(last_write_time == p_tr2_sys__Last_write_time("tr2_test_dir/f1"), + "last_write_time before modfied should not equal to last_write_time %s\n", + debugstr_longlong(last_write_time)); + + errno = 0xdeadbeef; + last_write_time = p_tr2_sys__Last_write_time("not_exist"); + ok(errno == 0xdeadbeef, "tr2_sys__Last_write_time(): errno expect 0xdeadbeef, got %d\n", errno); + ok(last_write_time == 0, "expect 0 got %s\n", debugstr_longlong(last_write_time)); + last_write_time = p_tr2_sys__Last_write_time(NULL); + ok(last_write_time == 0, "expect 0 got %s\n", debugstr_longlong(last_write_time)); + + p_tr2_sys__Last_write_time_set("not_exist", newtime); + errno = 0xdeadbeef; + p_tr2_sys__Last_write_time_set(NULL, newtime); + ok(errno == 0xdeadbeef, "tr2_sys__Last_write_time(): errno expect 0xdeadbeef, got %d\n", errno); + + ok(DeleteFileA("tr2_test_dir/f1"), "expect tr2_test_dir/f1 to exist\n"); + ret = p_tr2_sys__Remove_dir("tr2_test_dir"); + ok(ret == 1, "test_tr2_sys__Remove_dir(): expect 1 got %d\n", ret); +} + START_TEST(msvcp120) { if(!init()) return; @@ -966,5 +1012,6 @@ START_TEST(msvcp120) test_tr2_sys__Rename(); test_tr2_sys__Statvfs(); test_tr2_sys__Stat(); + test_tr2_sys__Last_write_time(); FreeLibrary(msvcp); }

1 0