October 2012 - Wine-commits

Nikolay Sivov : dwrite: Store render params properties and implement accessing methods.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: f4f54e1fb78384dd4feb6712eff41c0e5490758b URL: http://source.winehq.org/git/wine.git/?a=commit;h=f4f54e1fb78384dd4feb6712e… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 1 09:11:44 2012 +0400 dwrite: Store render params properties and implement accessing methods. --- dlls/dwrite/main.c | 39 ++++++++++++++++++++++++++------------- 1 files changed, 26 insertions(+), 13 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index e94abc5..b4dfd3a 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -49,6 +49,12 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD reason, LPVOID reserved) struct renderingparams { IDWriteRenderingParams IDWriteRenderingParams_iface; LONG ref; + + FLOAT gamma; + FLOAT enh_contrast; + FLOAT cleartype_level; + DWRITE_PIXEL_GEOMETRY geometry; + DWRITE_RENDERING_MODE mode; }; static inline struct renderingparams *impl_from_IDWriteRenderingParams(IDWriteRenderingParams *iface) @@ -98,36 +104,36 @@ static ULONG WINAPI renderingparams_Release(IDWriteRenderingParams *iface) static FLOAT WINAPI renderingparams_GetGamma(IDWriteRenderingParams *iface) { struct renderingparams *This = impl_from_IDWriteRenderingParams(iface); - FIXME("(%p): stub\n", This); - return 128.0; + TRACE("(%p)\n", This); + return This->gamma; } static FLOAT WINAPI renderingparams_GetEnhancedContrast(IDWriteRenderingParams *iface) { struct renderingparams *This = impl_from_IDWriteRenderingParams(iface); - FIXME("(%p): stub\n", This); - return 0.0; + TRACE("(%p)\n", This); + return This->enh_contrast; } static FLOAT WINAPI renderingparams_GetClearTypeLevel(IDWriteRenderingParams *iface) { struct renderingparams *This = impl_from_IDWriteRenderingParams(iface); - FIXME("(%p): stub\n", This); - return 0.0; + TRACE("(%p)\n", This); + return This->cleartype_level; } static DWRITE_PIXEL_GEOMETRY WINAPI renderingparams_GetPixelGeometry(IDWriteRenderingParams *iface) { struct renderingparams *This = impl_from_IDWriteRenderingParams(iface); - FIXME("(%p): stub\n", This); - return DWRITE_PIXEL_GEOMETRY_FLAT; + TRACE("(%p)\n", This); + return This->geometry; } static DWRITE_RENDERING_MODE WINAPI renderingparams_GetRenderingMode(IDWriteRenderingParams *iface) { struct renderingparams *This = impl_from_IDWriteRenderingParams(iface); - FIXME("(%p): stub\n", This); - return DWRITE_RENDERING_MODE_DEFAULT; + TRACE("(%p)\n", This); + return This->mode; } static const struct IDWriteRenderingParamsVtbl renderingparamsvtbl = { @@ -141,7 +147,8 @@ static const struct IDWriteRenderingParamsVtbl renderingparamsvtbl = { renderingparams_GetRenderingMode }; -static HRESULT create_renderingparams(IDWriteRenderingParams **params) +static HRESULT create_renderingparams(FLOAT gamma, FLOAT enhancedContrast, FLOAT cleartype_level, + DWRITE_PIXEL_GEOMETRY geometry, DWRITE_RENDERING_MODE mode, IDWriteRenderingParams **params) { struct renderingparams *This; @@ -153,6 +160,12 @@ static HRESULT create_renderingparams(IDWriteRenderingParams **params) This->IDWriteRenderingParams_iface.lpVtbl = &renderingparamsvtbl; This->ref = 1; + This->gamma = gamma; + This->enh_contrast = enhancedContrast; + This->cleartype_level = cleartype_level; + This->geometry = geometry; + This->mode = mode; + *params = &This->IDWriteRenderingParams_iface; return S_OK; @@ -250,8 +263,8 @@ static HRESULT WINAPI dwritefactory_CreateMonitorRenderingParams(IDWriteFactory static HRESULT WINAPI dwritefactory_CreateCustomRenderingParams(IDWriteFactory *iface, FLOAT gamma, FLOAT enhancedContrast, FLOAT cleartype_level, DWRITE_PIXEL_GEOMETRY geometry, DWRITE_RENDERING_MODE mode, IDWriteRenderingParams **params) { - FIXME("(%f %f %f %d %d %p): stub\n", gamma, enhancedContrast, cleartype_level, geometry, mode, params); - return create_renderingparams(params); + TRACE("(%f %f %f %d %d %p)\n", gamma, enhancedContrast, cleartype_level, geometry, mode, params); + return create_renderingparams(gamma, enhancedContrast, cleartype_level, geometry, mode, params); } static HRESULT WINAPI dwritefactory_RegisterFontFileLoader(IDWriteFactory *iface, IDWriteFontFileLoader *loader)

1 0

Nikolay Sivov : dwrite: Stub for CreateMonitorRenderingParams().
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 7707ca7d090e8f8f77dd5d552cb5640c99ec26f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7707ca7d090e8f8f77dd5d552… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 1 09:29:35 2012 +0400 dwrite: Stub for CreateMonitorRenderingParams(). --- dlls/dwrite/main.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index b4dfd3a..866fa88 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -256,8 +256,14 @@ static HRESULT WINAPI dwritefactory_CreateRenderingParams(IDWriteFactory *iface, static HRESULT WINAPI dwritefactory_CreateMonitorRenderingParams(IDWriteFactory *iface, HMONITOR monitor, IDWriteRenderingParams **params) { - FIXME("(%p %p): stub\n", monitor, params); - return E_NOTIMPL; + static int fixme_once = 0; + + TRACE("(%p %p)\n", monitor, params); + + if (!fixme_once++) + FIXME("(%p): monitor setting ignored\n", monitor); + return IDWriteFactory_CreateCustomRenderingParams(iface, 0.0, 0.0, 0.0, DWRITE_PIXEL_GEOMETRY_FLAT, + DWRITE_RENDERING_MODE_DEFAULT, params); } static HRESULT WINAPI dwritefactory_CreateCustomRenderingParams(IDWriteFactory *iface, FLOAT gamma, FLOAT enhancedContrast,

1 0

Nikolay Sivov : dwrite: Forward CreateRenderingParams() to CreateMonitorRenderingParams() with primary monitor.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 0990d37d983ded70a5d0fb5caa505997f3ddbcc2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0990d37d983ded70a5d0fb5ca… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 1 09:35:00 2012 +0400 dwrite: Forward CreateRenderingParams() to CreateMonitorRenderingParams() with primary monitor. --- dlls/dwrite/Makefile.in | 2 +- dlls/dwrite/main.c | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/dwrite/Makefile.in b/dlls/dwrite/Makefile.in index 1b68b2b..5a6564b 100644 --- a/dlls/dwrite/Makefile.in +++ b/dlls/dwrite/Makefile.in @@ -1,6 +1,6 @@ MODULE = dwrite.dll IMPORTLIB = dwrite -IMPORTS = gdi32 +IMPORTS = user32 gdi32 C_SRCS = \ font.c \ diff --git a/dlls/dwrite/main.c b/dlls/dwrite/main.c index 866fa88..c126ec1 100644 --- a/dlls/dwrite/main.c +++ b/dlls/dwrite/main.c @@ -24,6 +24,7 @@ #include "windef.h" #include "winbase.h" +#include "winuser.h" #include "initguid.h" #include "dwrite.h" @@ -249,8 +250,14 @@ static HRESULT WINAPI dwritefactory_CreateFontFace(IDWriteFactory *iface, static HRESULT WINAPI dwritefactory_CreateRenderingParams(IDWriteFactory *iface, IDWriteRenderingParams **params) { - FIXME("(%p): stub\n", params); - return E_NOTIMPL; + HMONITOR monitor; + POINT pt; + + TRACE("(%p)\n", params); + + pt.x = pt.y = 0; + monitor = MonitorFromPoint(pt, MONITOR_DEFAULTTOPRIMARY); + return IDWriteFactory_CreateMonitorRenderingParams(iface, monitor, params); } static HRESULT WINAPI dwritefactory_CreateMonitorRenderingParams(IDWriteFactory *iface, HMONITOR monitor,

1 0

Henri Verbeet : d3d10: Implement d3d10_effect_depth_stencil_variable_GetDepthStencilState().
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 14b9f3d295329f0b5f9dd1c0120d4a46b1f51acc URL: http://source.winehq.org/git/wine.git/?a=commit;h=14b9f3d295329f0b5f9dd1c01… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 1 11:05:19 2012 +0200 d3d10: Implement d3d10_effect_depth_stencil_variable_GetDepthStencilState(). --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 27 ++++++++++++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index 65ec465..e47ea27 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -111,6 +111,7 @@ struct d3d10_effect_state_object_variable } desc; union { + ID3D10DepthStencilState *depth_stencil; ID3D10BlendState *blend; } object; }; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index 7d14620..c7617e2 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1568,13 +1568,18 @@ static HRESULT create_state_object(struct d3d10_effect_variable *v) switch (v->type->basetype) { + case D3D10_SVT_DEPTHSTENCIL: + if (FAILED(hr = ID3D10Device_CreateDepthStencilState(device, + &v->u.state.desc.depth_stencil, &v->u.state.object.depth_stencil))) + return hr; + break; + case D3D10_SVT_BLEND: if (FAILED(hr = ID3D10Device_CreateBlendState(device, &v->u.state.desc.blend, &v->u.state.object.blend))) return hr; break; - case D3D10_SVT_DEPTHSTENCIL: case D3D10_SVT_RASTERIZER: case D3D10_SVT_SAMPLER: break; @@ -6247,9 +6252,25 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_depth_stencil_variable_GetRawValue static HRESULT STDMETHODCALLTYPE d3d10_effect_depth_stencil_variable_GetDepthStencilState(ID3D10EffectDepthStencilVariable *iface, UINT index, ID3D10DepthStencilState **depth_stencil_state) { - FIXME("iface %p, index %u, depth_stencil_state %p stub!\n", iface, index, depth_stencil_state); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); - return E_NOTIMPL; + TRACE("iface %p, index %u, depth_stencil_state %p.\n", iface, index, depth_stencil_state); + + if (v->type->element_count) + v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); + else if (index) + return E_FAIL; + + if (v->type->basetype != D3D10_SVT_DEPTHSTENCIL) + { + WARN("Variable is not a depth stencil state.\n"); + return E_FAIL; + } + + if ((*depth_stencil_state = v->u.state.object.depth_stencil)) + ID3D10DepthStencilState_AddRef(*depth_stencil_state); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_depth_stencil_variable_GetBackingStore(ID3D10EffectDepthStencilVariable *iface,

1 0

Henri Verbeet : d3d10: Implement d3d10_effect_rasterizer_variable_GetRasterizerState().
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 93418213119cde792e887decc9ac73b731cd9680 URL: http://source.winehq.org/git/wine.git/?a=commit;h=93418213119cde792e887decc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 1 11:05:20 2012 +0200 d3d10: Implement d3d10_effect_rasterizer_variable_GetRasterizerState(). --- dlls/d3d10/d3d10_private.h | 1 + dlls/d3d10/effect.c | 25 +++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/dlls/d3d10/d3d10_private.h b/dlls/d3d10/d3d10_private.h index e47ea27..686ff68 100644 --- a/dlls/d3d10/d3d10_private.h +++ b/dlls/d3d10/d3d10_private.h @@ -111,6 +111,7 @@ struct d3d10_effect_state_object_variable } desc; union { + ID3D10RasterizerState *rasterizer; ID3D10DepthStencilState *depth_stencil; ID3D10BlendState *blend; } object; diff --git a/dlls/d3d10/effect.c b/dlls/d3d10/effect.c index c7617e2..1dbc634 100644 --- a/dlls/d3d10/effect.c +++ b/dlls/d3d10/effect.c @@ -1581,6 +1581,11 @@ static HRESULT create_state_object(struct d3d10_effect_variable *v) break; case D3D10_SVT_RASTERIZER: + if (FAILED(hr = ID3D10Device_CreateRasterizerState(device, + &v->u.state.desc.rasterizer, &v->u.state.object.rasterizer))) + return hr; + break; + case D3D10_SVT_SAMPLER: break; @@ -6486,9 +6491,25 @@ static HRESULT STDMETHODCALLTYPE d3d10_effect_rasterizer_variable_GetRawValue(ID static HRESULT STDMETHODCALLTYPE d3d10_effect_rasterizer_variable_GetRasterizerState(ID3D10EffectRasterizerVariable *iface, UINT index, ID3D10RasterizerState **rasterizer_state) { - FIXME("iface %p, index %u, rasterizer_state %p stub!\n", iface, index, rasterizer_state); + struct d3d10_effect_variable *v = impl_from_ID3D10EffectVariable((ID3D10EffectVariable *)iface); - return E_NOTIMPL; + TRACE("iface %p, index %u, rasterizer_state %p.\n", iface, index, rasterizer_state); + + if (v->type->element_count) + v = impl_from_ID3D10EffectVariable(iface->lpVtbl->GetElement(iface, index)); + else if (index) + return E_FAIL; + + if (v->type->basetype != D3D10_SVT_RASTERIZER) + { + WARN("Variable is not a rasterizer state.\n"); + return E_FAIL; + } + + if ((*rasterizer_state = v->u.state.object.rasterizer)) + ID3D10RasterizerState_AddRef(*rasterizer_state); + + return S_OK; } static HRESULT STDMETHODCALLTYPE d3d10_effect_rasterizer_variable_GetBackingStore(ID3D10EffectRasterizerVariable *iface,

1 0

Henri Verbeet : wined3d: Just return the surface from wined3d_device_get_render_target().
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 972217fd6abdacfffa1c1b6aca511dd23450c652 URL: http://source.winehq.org/git/wine.git/?a=commit;h=972217fd6abdacfffa1c1b6ac… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 1 11:05:21 2012 +0200 wined3d: Just return the surface from wined3d_device_get_render_target(). --- dlls/d3d8/device.c | 14 ++++++-------- dlls/d3d9/device.c | 9 +++------ dlls/ddraw/ddraw.c | 9 ++++----- dlls/wined3d/device.c | 19 +++++-------------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 4 ++-- 6 files changed, 21 insertions(+), 36 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index f892138..22280cd 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1100,14 +1100,12 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, /* If no render target is passed in check the size against the current RT */ if (!render_target) { - hr = wined3d_device_get_render_target(device->wined3d_device, 0, &original_rt); - if (FAILED(hr) || !original_rt) + if (!(original_rt = wined3d_device_get_render_target(device->wined3d_device, 0))) { wined3d_mutex_unlock(); - return hr; + return D3DERR_NOTFOUND; } wined3d_resource = wined3d_surface_get_resource(original_rt); - wined3d_surface_decref(original_rt); } else wined3d_resource = wined3d_surface_get_resource(rt_impl->wined3d_surface); @@ -1156,18 +1154,18 @@ static HRESULT WINAPI d3d8_device_GetRenderTarget(IDirect3DDevice8 *iface, IDire return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - hr = wined3d_device_get_render_target(device->wined3d_device, 0, &wined3d_surface); - if (SUCCEEDED(hr) && wined3d_surface) + if ((wined3d_surface = wined3d_device_get_render_target(device->wined3d_device, 0))) { surface_impl = wined3d_surface_get_parent(wined3d_surface); *render_target = &surface_impl->IDirect3DSurface8_iface; IDirect3DSurface8_AddRef(*render_target); - wined3d_surface_decref(wined3d_surface); + hr = D3D_OK; } else { - ERR("Failed to get wined3d render target, hr %#x.\n", hr); + ERR("Failed to get wined3d render target.\n"); *render_target = NULL; + hr = D3DERR_NOTFOUND; } wined3d_mutex_unlock(); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index cd7e001..68ab0a4 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1190,7 +1190,7 @@ static HRESULT WINAPI d3d9_device_GetRenderTarget(IDirect3DDevice9Ex *iface, DWO struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_surface *wined3d_surface; struct d3d9_surface *surface_impl; - HRESULT hr; + HRESULT hr = D3D_OK; TRACE("iface %p, idx %u, surface %p.\n", iface, idx, surface); @@ -1204,18 +1204,15 @@ static HRESULT WINAPI d3d9_device_GetRenderTarget(IDirect3DDevice9Ex *iface, DWO } wined3d_mutex_lock(); - hr = wined3d_device_get_render_target(device->wined3d_device, idx, &wined3d_surface); - if (SUCCEEDED(hr)) + if ((wined3d_surface = wined3d_device_get_render_target(device->wined3d_device, idx))) { surface_impl = wined3d_surface_get_parent(wined3d_surface); *surface = &surface_impl->IDirect3DSurface9_iface; IDirect3DSurface9_AddRef(*surface); - wined3d_surface_decref(wined3d_surface); } else { - if (hr != WINED3DERR_NOTFOUND) - WARN("Failed to get render target %u, hr %#x.\n", idx, hr); + hr = WINED3DERR_NOTFOUND; *surface = NULL; } wined3d_mutex_unlock(); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 0230b5d..b352705 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -754,8 +754,8 @@ static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, BOOL win static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, DWORD cooplevel) { struct ddraw *This = impl_from_IDirectDraw7(iface); + struct wined3d_surface *rt = NULL, *ds; struct wined3d_stateblock *stateblock; - struct wined3d_surface *rt, *ds; BOOL restore_state = FALSE; HWND window; HRESULT hr; @@ -932,12 +932,11 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, return hr; } - wined3d_device_get_render_target(This->wined3d_device, 0, &rt); + rt = wined3d_device_get_render_target(This->wined3d_device, 0); if (rt == This->wined3d_frontbuffer) - { - wined3d_surface_decref(rt); rt = NULL; - } + else if (rt) + wined3d_surface_incref(rt); wined3d_device_get_depth_stencil(This->wined3d_device, &ds); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 916a648..29fb124 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4479,27 +4479,18 @@ void CDECL wined3d_device_clear_rendertarget_view(struct wined3d_device *device, if (FAILED(hr)) ERR("Color fill failed, hr %#x.\n", hr); } -HRESULT CDECL wined3d_device_get_render_target(const struct wined3d_device *device, - UINT render_target_idx, struct wined3d_surface **render_target) +struct wined3d_surface * CDECL wined3d_device_get_render_target(const struct wined3d_device *device, + UINT render_target_idx) { - TRACE("device %p, render_target_idx %u, render_target %p.\n", - device, render_target_idx, render_target); + TRACE("device %p, render_target_idx %u.\n", device, render_target_idx); if (render_target_idx >= device->adapter->gl_info.limits.buffers) { WARN("Only %u render targets are supported.\n", device->adapter->gl_info.limits.buffers); - return WINED3DERR_INVALIDCALL; + return NULL; } - *render_target = device->fb.render_targets[render_target_idx]; - TRACE("Returning render target %p.\n", *render_target); - - if (!*render_target) - return WINED3DERR_NOTFOUND; - - wined3d_surface_incref(*render_target); - - return WINED3D_OK; + return device->fb.render_targets[render_target_idx]; } HRESULT CDECL wined3d_device_get_depth_stencil(const struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 7971552..55bd32a 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -76,7 +76,7 @@ @ cdecl wined3d_device_get_ps_consts_i(ptr long ptr long) @ cdecl wined3d_device_get_raster_status(ptr long ptr) @ cdecl wined3d_device_get_render_state(ptr long) -@ cdecl wined3d_device_get_render_target(ptr long ptr) +@ cdecl wined3d_device_get_render_target(ptr long) @ cdecl wined3d_device_get_sampler_state(ptr long long) @ cdecl wined3d_device_get_scissor_rect(ptr ptr) @ cdecl wined3d_device_get_software_vertex_processing(ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 40dfda8..a630e49 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2143,8 +2143,8 @@ HRESULT __cdecl wined3d_device_get_ps_consts_i(const struct wined3d_device *devi HRESULT __cdecl wined3d_device_get_raster_status(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_raster_status *raster_status); DWORD __cdecl wined3d_device_get_render_state(const struct wined3d_device *device, enum wined3d_render_state state); -HRESULT __cdecl wined3d_device_get_render_target(const struct wined3d_device *device, - UINT render_target_idx, struct wined3d_surface **render_target); +struct wined3d_surface * __cdecl wined3d_device_get_render_target(const struct wined3d_device *device, + UINT render_target_idx); DWORD __cdecl wined3d_device_get_sampler_state(const struct wined3d_device *device, UINT sampler_idx, enum wined3d_sampler_state state); void __cdecl wined3d_device_get_scissor_rect(const struct wined3d_device *device, RECT *rect);

1 0

Henri Verbeet : wined3d: Just return the surface from wined3d_device_get_depth_stencil().
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 95b4207c7fc553076242c799cd03d973521194ab URL: http://source.winehq.org/git/wine.git/?a=commit;h=95b4207c7fc553076242c799c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 1 11:05:22 2012 +0200 wined3d: Just return the surface from wined3d_device_get_depth_stencil(). --- dlls/d3d8/device.c | 26 +++++++++----------------- dlls/d3d9/device.c | 9 +++------ dlls/ddraw/ddraw.c | 5 +++-- dlls/wined3d/device.c | 15 +++------------ dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 3 +-- 6 files changed, 20 insertions(+), 40 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 22280cd..751ba05 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -1122,19 +1122,14 @@ static HRESULT WINAPI d3d8_device_SetRenderTarget(IDirect3DDevice8 *iface, } } - hr = wined3d_device_get_depth_stencil(device->wined3d_device, &original_ds); - if (hr == WINED3D_OK || hr == WINED3DERR_NOTFOUND) + original_ds = wined3d_device_get_depth_stencil(device->wined3d_device); + hr = wined3d_device_set_depth_stencil(device->wined3d_device, ds_impl ? ds_impl->wined3d_surface : NULL); + if (SUCCEEDED(hr) && render_target) { - hr = wined3d_device_set_depth_stencil(device->wined3d_device, ds_impl ? ds_impl->wined3d_surface : NULL); - if (SUCCEEDED(hr) && render_target) - { - hr = wined3d_device_set_render_target(device->wined3d_device, 0, rt_impl->wined3d_surface, TRUE); - if (FAILED(hr)) - wined3d_device_set_depth_stencil(device->wined3d_device, original_ds); - } + hr = wined3d_device_set_render_target(device->wined3d_device, 0, rt_impl->wined3d_surface, TRUE); + if (FAILED(hr)) + wined3d_device_set_depth_stencil(device->wined3d_device, original_ds); } - if (original_ds) - wined3d_surface_decref(original_ds); wined3d_mutex_unlock(); @@ -1177,7 +1172,7 @@ static HRESULT WINAPI d3d8_device_GetDepthStencilSurface(IDirect3DDevice8 *iface struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct wined3d_surface *wined3d_surface; struct d3d8_surface *surface_impl; - HRESULT hr; + HRESULT hr = D3D_OK; TRACE("iface %p, depth_stencil %p.\n", iface, depth_stencil); @@ -1185,18 +1180,15 @@ static HRESULT WINAPI d3d8_device_GetDepthStencilSurface(IDirect3DDevice8 *iface return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - hr = wined3d_device_get_depth_stencil(device->wined3d_device, &wined3d_surface); - if (SUCCEEDED(hr)) + if ((wined3d_surface = wined3d_device_get_depth_stencil(device->wined3d_device))) { surface_impl = wined3d_surface_get_parent(wined3d_surface); *depth_stencil = &surface_impl->IDirect3DSurface8_iface; IDirect3DSurface8_AddRef(*depth_stencil); - wined3d_surface_decref(wined3d_surface); } else { - if (hr != WINED3DERR_NOTFOUND) - ERR("Failed to get wined3d depth stencil, hr %#x.\n", hr); + hr = WINED3DERR_NOTFOUND; *depth_stencil = NULL; } wined3d_mutex_unlock(); diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 68ab0a4..af2a92f 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1240,7 +1240,7 @@ static HRESULT WINAPI d3d9_device_GetDepthStencilSurface(IDirect3DDevice9Ex *ifa struct d3d9_device *device = impl_from_IDirect3DDevice9Ex(iface); struct wined3d_surface *wined3d_surface; struct d3d9_surface *surface_impl; - HRESULT hr; + HRESULT hr = D3D_OK; TRACE("iface %p, depth_stencil %p.\n", iface, depth_stencil); @@ -1248,18 +1248,15 @@ static HRESULT WINAPI d3d9_device_GetDepthStencilSurface(IDirect3DDevice9Ex *ifa return D3DERR_INVALIDCALL; wined3d_mutex_lock(); - hr = wined3d_device_get_depth_stencil(device->wined3d_device, &wined3d_surface); - if (SUCCEEDED(hr)) + if ((wined3d_surface = wined3d_device_get_depth_stencil(device->wined3d_device))) { surface_impl = wined3d_surface_get_parent(wined3d_surface); *depth_stencil = &surface_impl->IDirect3DSurface9_iface; IDirect3DSurface9_AddRef(*depth_stencil); - wined3d_surface_decref(wined3d_surface); } else { - if (hr != WINED3DERR_NOTFOUND) - WARN("Call to IWineD3DDevice_GetDepthStencilSurface failed with 0x%08x\n", hr); + hr = WINED3DERR_NOTFOUND; *depth_stencil = NULL; } wined3d_mutex_unlock(); diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index b352705..1530685 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -754,7 +754,7 @@ static HRESULT ddraw_create_swapchain(struct ddraw *ddraw, HWND window, BOOL win static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, DWORD cooplevel) { struct ddraw *This = impl_from_IDirectDraw7(iface); - struct wined3d_surface *rt = NULL, *ds; + struct wined3d_surface *rt = NULL, *ds = NULL; struct wined3d_stateblock *stateblock; BOOL restore_state = FALSE; HWND window; @@ -938,7 +938,8 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, else if (rt) wined3d_surface_incref(rt); - wined3d_device_get_depth_stencil(This->wined3d_device, &ds); + if ((ds = wined3d_device_get_depth_stencil(This->wined3d_device))) + wined3d_surface_incref(ds); } ddraw_destroy_swapchain(This); diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 29fb124..6927f9f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4493,20 +4493,11 @@ struct wined3d_surface * CDECL wined3d_device_get_render_target(const struct win return device->fb.render_targets[render_target_idx]; } -HRESULT CDECL wined3d_device_get_depth_stencil(const struct wined3d_device *device, - struct wined3d_surface **depth_stencil) +struct wined3d_surface * CDECL wined3d_device_get_depth_stencil(const struct wined3d_device *device) { - TRACE("device %p, depth_stencil %p.\n", device, depth_stencil); - - *depth_stencil = device->fb.depth_stencil; - TRACE("Returning depth/stencil surface %p.\n", *depth_stencil); - - if (!*depth_stencil) - return WINED3DERR_NOTFOUND; - - wined3d_surface_incref(*depth_stencil); + TRACE("device %p.\n", device); - return WINED3D_OK; + return device->fb.depth_stencil; } HRESULT CDECL wined3d_device_set_render_target(struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 55bd32a..a885746 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -59,7 +59,7 @@ @ cdecl wined3d_device_get_clip_plane(ptr long ptr) @ cdecl wined3d_device_get_clip_status(ptr ptr) @ cdecl wined3d_device_get_creation_parameters(ptr ptr) -@ cdecl wined3d_device_get_depth_stencil(ptr ptr) +@ cdecl wined3d_device_get_depth_stencil(ptr) @ cdecl wined3d_device_get_device_caps(ptr ptr) @ cdecl wined3d_device_get_display_mode(ptr long ptr ptr) @ cdecl wined3d_device_get_front_buffer_data(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index a630e49..d527949 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2116,8 +2116,7 @@ HRESULT __cdecl wined3d_device_get_clip_status(const struct wined3d_device *devi struct wined3d_clip_status *clip_status); HRESULT __cdecl wined3d_device_get_creation_parameters(const struct wined3d_device *device, struct wined3d_device_creation_parameters *creation_parameters); -HRESULT __cdecl wined3d_device_get_depth_stencil(const struct wined3d_device *device, - struct wined3d_surface **depth_stencil); +struct wined3d_surface * __cdecl wined3d_device_get_depth_stencil(const struct wined3d_device *device); HRESULT __cdecl wined3d_device_get_device_caps(const struct wined3d_device *device, WINED3DCAPS *caps); HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation);

1 0

Henri Verbeet : ddraw: Properly release the ddraw reference when the last interface is released in ddraw_surface_release_iface ().
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 82282db65e674c7a45b89b9198cab60a5d0b8cff URL: http://source.winehq.org/git/wine.git/?a=commit;h=82282db65e674c7a45b89b919… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Oct 1 11:05:23 2012 +0200 ddraw: Properly release the ddraw reference when the last interface is released in ddraw_surface_release_iface(). --- dlls/ddraw/surface.c | 27 ++++++++++++++------------- 1 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index df85526..8f68425 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -311,18 +311,20 @@ static HRESULT WINAPI d3d_texture1_QueryInterface(IDirect3DTexture *iface, REFII return ddraw_surface7_QueryInterface(&surface->IDirectDrawSurface7_iface, riid, object); } -static void ddraw_surface_add_iface(struct ddraw_surface *This) +static void ddraw_surface_add_iface(struct ddraw_surface *surface) { - ULONG iface_count = InterlockedIncrement(&This->iface_count); - TRACE("%p increasing iface count to %u.\n", This, iface_count); + ULONG iface_count = InterlockedIncrement(&surface->iface_count); + TRACE("%p increasing iface count to %u.\n", surface, iface_count); if (iface_count == 1) { + if (surface->ifaceToRelease) + IUnknown_AddRef(surface->ifaceToRelease); wined3d_mutex_lock(); - if (This->wined3d_surface) - wined3d_surface_incref(This->wined3d_surface); - if (This->wined3d_texture) - wined3d_texture_incref(This->wined3d_texture); + if (surface->wined3d_surface) + wined3d_surface_incref(surface->wined3d_surface); + if (surface->wined3d_texture) + wined3d_texture_incref(surface->wined3d_texture); wined3d_mutex_unlock(); } } @@ -447,7 +449,6 @@ static ULONG WINAPI d3d_texture1_AddRef(IDirect3DTexture *iface) static void ddraw_surface_cleanup(struct ddraw_surface *surface) { struct ddraw_surface *surf; - IUnknown *ifaceToRelease; UINT i; TRACE("surface %p.\n", surface); @@ -472,7 +473,6 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface) if (surface->device1) IUnknown_Release(&surface->device1->IUnknown_inner); - ifaceToRelease = surface->ifaceToRelease; if (surface->iface_count > 1) { @@ -485,10 +485,6 @@ static void ddraw_surface_cleanup(struct ddraw_surface *surface) if (surface->wined3d_surface) wined3d_surface_decref(surface->wined3d_surface); - - /* Reduce the ddraw refcount */ - if (ifaceToRelease) - IUnknown_Release(ifaceToRelease); } ULONG ddraw_surface_release_iface(struct ddraw_surface *This) @@ -498,6 +494,8 @@ ULONG ddraw_surface_release_iface(struct ddraw_surface *This) if (iface_count == 0) { + IUnknown *release_iface = This->ifaceToRelease; + /* Complex attached surfaces are destroyed implicitly when the root is released */ wined3d_mutex_lock(); if(!This->is_complex_root) @@ -511,6 +509,9 @@ ULONG ddraw_surface_release_iface(struct ddraw_surface *This) else ddraw_surface_cleanup(This); wined3d_mutex_unlock(); + + if (release_iface) + IUnknown_Release(release_iface); } return iface_count;

1 0

Huw Davies : gdi32: Correctly map the 256-level bitmap to the 5, 17 and 65-level bitmaps.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 0941fefbc0d81fb9af48a1f2b4d3164792a981dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=0941fefbc0d81fb9af48a1f2b… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Oct 1 10:47:17 2012 +0100 gdi32: Correctly map the 256-level bitmap to the 5, 17 and 65-level bitmaps. --- dlls/gdi32/freetype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index f609758..20186fa 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6023,7 +6023,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, for (row = 0, start = buf; row < height; row++) { for (col = 0, ptr = start; col < width; col++, ptr++) - *ptr = (((int)*ptr) * max_level + 128) / 256; + *ptr = (((int)*ptr) * (max_level + 1)) / 256; start += pitch; } }

1 0

Alexandre Julliard : user32: Always flush window surfaces in PeekMessage, even with PM_NOYIELD.
by Alexandre Julliard 01 Oct '12

01 Oct '12

Module: wine Branch: master Commit: 5db9abaf81d243b887eabcc8348b0d1cf5d581d4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5db9abaf81d243b887eabcc83… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 1 12:12:53 2012 +0200 user32: Always flush window surfaces in PeekMessage, even with PM_NOYIELD. --- dlls/user32/message.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 2e81e3a..fa52207 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3685,7 +3685,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH PeekMessageW( MSG *msg_out, HWND hwnd, UINT first, if (!peek_message( &msg, hwnd, first, last, flags, 0 )) { - if (!(flags & PM_NOYIELD)) wow_handlers.wait_message( 0, NULL, 0, 0, 0 ); + if (flags & PM_NOYIELD) flush_window_surfaces( FALSE ); + else wow_handlers.wait_message( 0, NULL, 0, 0, 0 ); return FALSE; }

1 0