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

Henri Verbeet : wined3d: Make the device parameter to device_preload_textures() const.
by Alexandre Julliard 07 Jul '11

07 Jul '11

Module: wine Branch: master Commit: 0a5b56083d9e27dbf94644267a25ea4fb69bca9f URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a5b56083d9e27dbf94644267… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 6 23:14:24 2011 +0200 wined3d: Make the device parameter to device_preload_textures() const. --- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bc9c716..514630c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -461,7 +461,7 @@ static void device_preload_texture(const struct wined3d_state *state, unsigned i texture->texture_ops->texture_preload(texture, srgb); } -void device_preload_textures(struct wined3d_device *device) +void device_preload_textures(const struct wined3d_device *device) { const struct wined3d_state *state = &device->stateBlock->state; unsigned int i; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4000ed2..7f23111 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1753,7 +1753,7 @@ void device_context_remove(struct wined3d_device *device, struct wined3d_context HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, UINT adapter_idx, WINED3DDEVTYPE device_type, HWND focus_window, DWORD flags, BYTE surface_alignment, struct wined3d_device_parent *device_parent) DECLSPEC_HIDDEN; -void device_preload_textures(struct wined3d_device *device) DECLSPEC_HIDDEN; +void device_preload_textures(const struct wined3d_device *device) DECLSPEC_HIDDEN; LRESULT device_process_message(struct wined3d_device *device, HWND window, BOOL unicode, UINT message, WPARAM wparam, LPARAM lparam, WNDPROC proc) DECLSPEC_HIDDEN; void device_resource_add(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Make the context parameter to the get_drawable_size() callback const.
by Alexandre Julliard 07 Jul '11

07 Jul '11

Module: wine Branch: master Commit: 4671f86cd6bfdd16818c292c95d82766c8d89b69 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4671f86cd6bfdd16818c292c9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 6 23:14:25 2011 +0200 wined3d: Make the context parameter to the get_drawable_size() callback const. --- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_private.h | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 514630c..b10fde6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6185,16 +6185,16 @@ void device_invalidate_state(const struct wined3d_device *device, DWORD state) } } -void get_drawable_size_fbo(struct wined3d_context *context, UINT *width, UINT *height) +void get_drawable_size_fbo(const struct wined3d_context *context, UINT *width, UINT *height) { /* The drawable size of a fbo target is the opengl texture size, which is the power of two size. */ *width = context->current_rt->pow2Width; *height = context->current_rt->pow2Height; } -void get_drawable_size_backbuffer(struct wined3d_context *context, UINT *width, UINT *height) +void get_drawable_size_backbuffer(const struct wined3d_context *context, UINT *width, UINT *height) { - struct wined3d_swapchain *swapchain = context->swapchain; + const struct wined3d_swapchain *swapchain = context->swapchain; /* The drawable size of a backbuffer / aux buffer offscreen target is the size of the * current context's drawable, which is the size of the back buffer of the swapchain * the active context belongs to. */ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 5848f37..405d89f 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -1190,7 +1190,7 @@ struct wined3d_context *swapchain_get_context(struct wined3d_swapchain *swapchai return swapchain_create_context(swapchain); } -void get_drawable_size_swapchain(struct wined3d_context *context, UINT *width, UINT *height) +void get_drawable_size_swapchain(const struct wined3d_context *context, UINT *width, UINT *height) { /* The drawable size of an onscreen drawable is the surface size. * (Actually: The window size, but the surface is created in window size) */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 7f23111..8541fcd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2011,7 +2011,7 @@ struct wined3d_surface UINT pow2Height; /* A method to retrieve the drawable size. Not in the Vtable to make it changeable */ - void (*get_drawable_size)(struct wined3d_context *context, UINT *width, UINT *height); + void (*get_drawable_size)(const struct wined3d_context *context, UINT *width, UINT *height); /* PBO */ GLuint pbo; @@ -2090,9 +2090,9 @@ void surface_upload_data(struct wined3d_surface *surface, const struct wined3d_g const struct wined3d_format *format, const RECT *src_rect, UINT src_w, const POINT *dst_point, BOOL srgb, const struct wined3d_bo_address *data) DECLSPEC_HIDDEN; -void get_drawable_size_swapchain(struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN; -void get_drawable_size_backbuffer(struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN; -void get_drawable_size_fbo(struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN; +void get_drawable_size_swapchain(const struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN; +void get_drawable_size_backbuffer(const struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN; +void get_drawable_size_fbo(const struct wined3d_context *context, UINT *width, UINT *height) DECLSPEC_HIDDEN; void draw_textured_quad(struct wined3d_surface *src_surface, const RECT *src_rect, const RECT *dst_rect, WINED3DTEXTUREFILTERTYPE Filter) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Make the current_renderbuffer field in struct wined3d_surface const.
by Alexandre Julliard 07 Jul '11

07 Jul '11

Module: wine Branch: master Commit: bec379e411fd039e2c008eb0434673802d768280 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bec379e411fd039e2c008eb04… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 6 23:14:26 2011 +0200 wined3d: Make the current_renderbuffer field in struct wined3d_surface const. --- dlls/wined3d/wined3d_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 8541fcd..2ba3e14 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2039,7 +2039,7 @@ struct wined3d_surface WINEDDCOLORKEY glCKey; struct list renderbuffers; - struct wined3d_renderbuffer_entry *current_renderbuffer; + const struct wined3d_renderbuffer_entry *current_renderbuffer; SIZE ds_current_size; /* DirectDraw clippers */

1 0

Henri Verbeet : wined3d: Make the surface parameter to surface_get_texture_name() const.
by Alexandre Julliard 07 Jul '11

07 Jul '11

Module: wine Branch: master Commit: 67724d9f706e62adedd56aecaf144219e6071461 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67724d9f706e62adedd56aeca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 6 23:14:27 2011 +0200 wined3d: Make the surface parameter to surface_get_texture_name() const. --- dlls/wined3d/wined3d_private.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2ba3e14..ae660a2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2058,7 +2058,7 @@ static inline struct wined3d_surface *surface_from_resource(struct wined3d_resou return CONTAINING_RECORD(resource, struct wined3d_surface, resource); } -static inline GLuint surface_get_texture_name(struct wined3d_surface *surface, +static inline GLuint surface_get_texture_name(const struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, BOOL srgb) { return srgb && !gl_info->supported[EXT_TEXTURE_SRGB_DECODE]

1 0

Henri Verbeet : wined3d: Rename "flag" to "location" in surface_modify_location().
by Alexandre Julliard 07 Jul '11

07 Jul '11

Module: wine Branch: master Commit: 640234c504babbaf61dfd57848803aa838ebf79d URL: http://source.winehq.org/git/wine.git/?a=commit;h=640234c504babbaf61dfd5784… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jul 6 23:14:28 2011 +0200 wined3d: Rename "flag" to "location" in surface_modify_location(). --- dlls/wined3d/surface.c | 28 ++++++++++++++-------------- dlls/wined3d/wined3d_private.h | 4 ++-- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 439cb2f..d44904d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -5793,20 +5793,22 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co surface->ds_current_size.cy = surface->resource.height; } -void surface_modify_location(struct wined3d_surface *surface, DWORD flag, BOOL persistent) +void surface_modify_location(struct wined3d_surface *surface, DWORD location, BOOL persistent) { const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; struct wined3d_surface *overlay; TRACE("surface %p, location %s, persistent %#x.\n", - surface, debug_surflocation(flag), persistent); + surface, debug_surflocation(location), persistent); if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { if (surface_is_offscreen(surface)) { - /* With ORM_FBO, SFLAG_INTEXTURE and SFLAG_INDRAWABLE are the same for offscreen targets. */ - if (flag & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE)) flag |= (SFLAG_INTEXTURE | SFLAG_INDRAWABLE); + /* With ORM_FBO, SFLAG_INTEXTURE and SFLAG_INDRAWABLE are the same + * for offscreen targets. */ + if (location & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE)) + location |= (SFLAG_INTEXTURE | SFLAG_INDRAWABLE); } else { @@ -5814,16 +5816,14 @@ void surface_modify_location(struct wined3d_surface *surface, DWORD flag, BOOL p } } - if (flag & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX) + if (location & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX) && gl_info->supported[EXT_TEXTURE_SRGB_DECODE]) - { - flag |= (SFLAG_INTEXTURE | SFLAG_INSRGBTEX); - } + location |= (SFLAG_INTEXTURE | SFLAG_INSRGBTEX); if (persistent) { - if (((surface->flags & SFLAG_INTEXTURE) && !(flag & SFLAG_INTEXTURE)) - || ((surface->flags & SFLAG_INSRGBTEX) && !(flag & SFLAG_INSRGBTEX))) + if (((surface->flags & SFLAG_INTEXTURE) && !(location & SFLAG_INTEXTURE)) + || ((surface->flags & SFLAG_INSRGBTEX) && !(location & SFLAG_INSRGBTEX))) { if (surface->container.type == WINED3D_CONTAINER_TEXTURE) { @@ -5832,10 +5832,10 @@ void surface_modify_location(struct wined3d_surface *surface, DWORD flag, BOOL p } } surface->flags &= ~SFLAG_LOCATIONS; - surface->flags |= flag; + surface->flags |= location; /* Redraw emulated overlays, if any */ - if (flag & SFLAG_INDRAWABLE && !list_empty(&surface->overlays)) + if (location & SFLAG_INDRAWABLE && !list_empty(&surface->overlays)) { LIST_FOR_EACH_ENTRY(overlay, &surface->overlays, struct wined3d_surface, overlay_entry) { @@ -5845,7 +5845,7 @@ void surface_modify_location(struct wined3d_surface *surface, DWORD flag, BOOL p } else { - if ((surface->flags & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX)) && (flag & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX))) + if ((surface->flags & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX)) && (location & (SFLAG_INTEXTURE | SFLAG_INSRGBTEX))) { if (surface->container.type == WINED3D_CONTAINER_TEXTURE) { @@ -5853,7 +5853,7 @@ void surface_modify_location(struct wined3d_surface *surface, DWORD flag, BOOL p wined3d_texture_set_dirty(surface->container.u.texture, TRUE); } } - surface->flags &= ~flag; + surface->flags &= ~location; } if (!(surface->flags & SFLAG_LOCATIONS)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index ae660a2..535e2d3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2075,9 +2075,9 @@ BOOL surface_is_offscreen(const struct wined3d_surface *surface) DECLSPEC_HIDDEN HRESULT surface_load(struct wined3d_surface *surface, BOOL srgb) DECLSPEC_HIDDEN; void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; -HRESULT surface_load_location(struct wined3d_surface *surface, DWORD flag, const RECT *rect) DECLSPEC_HIDDEN; +HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location, const RECT *rect) DECLSPEC_HIDDEN; void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location, UINT w, UINT h) DECLSPEC_HIDDEN; -void surface_modify_location(struct wined3d_surface *surface, DWORD flag, BOOL persistent) DECLSPEC_HIDDEN; +void surface_modify_location(struct wined3d_surface *surface, DWORD location, BOOL persistent) DECLSPEC_HIDDEN; void surface_prepare_texture(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, BOOL srgb) DECLSPEC_HIDDEN; void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, struct wined3d_surface *rt) DECLSPEC_HIDDEN;

1 0

Michael Stefaniuc : d3d9: Use unsafe_impl_from_IDirect3DSurface9 for app provided ifaces.
by Alexandre Julliard 07 Jul '11

07 Jul '11

Module: wine Branch: master Commit: a7530e789273db28d988d51810cb5a9e8971c4dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7530e789273db28d988d5181… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 7 10:54:02 2011 +0200 d3d9: Use unsafe_impl_from_IDirect3DSurface9 for app provided ifaces. --- dlls/d3d9/d3d9_private.h | 1 + dlls/d3d9/device.c | 27 +++++++++++++-------------- dlls/d3d9/surface.c | 10 ++++++++++ dlls/d3d9/swapchain.c | 8 +++++--- 4 files changed, 29 insertions(+), 17 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index fb6e7e6..8d592be 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -241,6 +241,7 @@ typedef struct IDirect3DSurface9Impl HRESULT surface_init(IDirect3DSurface9Impl *surface, IDirect3DDevice9Impl *device, UINT width, UINT height, D3DFORMAT format, BOOL lockable, BOOL discard, UINT level, DWORD usage, D3DPOOL pool, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality) DECLSPEC_HIDDEN; +IDirect3DSurface9Impl *unsafe_impl_from_IDirect3DSurface9(IDirect3DSurface9 *iface) DECLSPEC_HIDDEN; /* ---------------------- */ /* IDirect3DVertexBuffer9 */ diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 0f33a27..200b611 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -400,7 +400,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetCursorProperties(IDirect3DDevice9E UINT XHotSpot, UINT YHotSpot, IDirect3DSurface9 *pCursorBitmap) { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); - IDirect3DSurface9Impl *pSurface = (IDirect3DSurface9Impl*)pCursorBitmap; + IDirect3DSurface9Impl *pSurface = unsafe_impl_from_IDirect3DSurface9(pCursorBitmap); HRESULT hr; TRACE("iface %p, hotspot_x %u, hotspot_y %u, bitmap %p.\n", @@ -970,15 +970,16 @@ static HRESULT WINAPI IDirect3DDevice9Impl_UpdateSurface(IDirect3DDevice9Ex *ifa IDirect3DSurface9 *pDestinationSurface, const POINT *pDestPoint) { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); + IDirect3DSurface9Impl *src = unsafe_impl_from_IDirect3DSurface9(pSourceSurface); + IDirect3DSurface9Impl *dst = unsafe_impl_from_IDirect3DSurface9(pDestinationSurface); HRESULT hr; TRACE("iface %p, src_surface %p, src_rect %p, dst_surface %p, dst_point %p.\n", iface, pSourceSurface, pSourceRect, pDestinationSurface, pDestPoint); wined3d_mutex_lock(); - hr = wined3d_device_update_surface(This->wined3d_device, - ((IDirect3DSurface9Impl *)pSourceSurface)->wined3d_surface, pSourceRect, - ((IDirect3DSurface9Impl *)pDestinationSurface)->wined3d_surface, pDestPoint); + hr = wined3d_device_update_surface(This->wined3d_device, src->wined3d_surface, pSourceRect, + dst->wined3d_surface, pDestPoint); wined3d_mutex_unlock(); return hr; @@ -1004,8 +1005,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_UpdateTexture(IDirect3DDevice9Ex *ifa static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderTargetData(IDirect3DDevice9Ex *iface, IDirect3DSurface9 *pRenderTarget, IDirect3DSurface9 *pDestSurface) { - IDirect3DSurface9Impl *renderTarget = (IDirect3DSurface9Impl *)pRenderTarget; - IDirect3DSurface9Impl *destSurface = (IDirect3DSurface9Impl *)pDestSurface; + IDirect3DSurface9Impl *renderTarget = unsafe_impl_from_IDirect3DSurface9(pRenderTarget); + IDirect3DSurface9Impl *destSurface = unsafe_impl_from_IDirect3DSurface9(pDestSurface); HRESULT hr; TRACE("iface %p, render_target %p, dst_surface %p.\n", iface, pRenderTarget, pDestSurface); @@ -1022,7 +1023,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetFrontBufferData(IDirect3DDevice9Ex UINT iSwapChain, IDirect3DSurface9 *pDestSurface) { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); - IDirect3DSurface9Impl *destSurface = (IDirect3DSurface9Impl *)pDestSurface; + IDirect3DSurface9Impl *destSurface = unsafe_impl_from_IDirect3DSurface9(pDestSurface); HRESULT hr; TRACE("iface %p, swapchain %u, dst_surface %p.\n", iface, iSwapChain, pDestSurface); @@ -1037,8 +1038,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetFrontBufferData(IDirect3DDevice9Ex static HRESULT WINAPI IDirect3DDevice9Impl_StretchRect(IDirect3DDevice9Ex *iface, IDirect3DSurface9 *pSourceSurface, const RECT *pSourceRect, IDirect3DSurface9 *pDestSurface, const RECT *pDestRect, D3DTEXTUREFILTERTYPE Filter) { - IDirect3DSurface9Impl *src = (IDirect3DSurface9Impl *) pSourceSurface; - IDirect3DSurface9Impl *dst = (IDirect3DSurface9Impl *) pDestSurface; + IDirect3DSurface9Impl *src = unsafe_impl_from_IDirect3DSurface9(pSourceSurface); + IDirect3DSurface9Impl *dst = unsafe_impl_from_IDirect3DSurface9(pDestSurface); HRESULT hr; TRACE("iface %p, src_surface %p, src_rect %p, dst_surface %p, dst_rect %p, filter %#x.\n", @@ -1062,7 +1063,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ColorFill(IDirect3DDevice9Ex *iface, ((color >> 24) & 0xff) / 255.0f, }; IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); - IDirect3DSurface9Impl *surface = (IDirect3DSurface9Impl *)pSurface; + IDirect3DSurface9Impl *surface = unsafe_impl_from_IDirect3DSurface9(pSurface); struct wined3d_resource *wined3d_resource; struct wined3d_resource_desc desc; HRESULT hr; @@ -1124,7 +1125,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetRenderTarget(IDirect3DDevice9Ex *i DWORD RenderTargetIndex, IDirect3DSurface9 *pRenderTarget) { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); - IDirect3DSurface9Impl *pSurface = (IDirect3DSurface9Impl*)pRenderTarget; + IDirect3DSurface9Impl *pSurface = unsafe_impl_from_IDirect3DSurface9(pRenderTarget); HRESULT hr; TRACE("iface %p, idx %u, surface %p.\n", iface, RenderTargetIndex, pRenderTarget); @@ -1190,13 +1191,11 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetDepthStencilSurface(IDirect3DDevic IDirect3DSurface9 *pZStencilSurface) { IDirect3DDevice9Impl *This = impl_from_IDirect3DDevice9Ex(iface); - IDirect3DSurface9Impl *pSurface; + IDirect3DSurface9Impl *pSurface = unsafe_impl_from_IDirect3DSurface9(pZStencilSurface); HRESULT hr; TRACE("iface %p, depth_stencil %p.\n", iface, pZStencilSurface); - pSurface = (IDirect3DSurface9Impl*)pZStencilSurface; - wined3d_mutex_lock(); hr = wined3d_device_set_depth_stencil(This->wined3d_device, pSurface ? pSurface->wined3d_surface : NULL); wined3d_mutex_unlock(); diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index a4111ff..3f3ac3c 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -20,6 +20,7 @@ */ #include "config.h" +#include <assert.h> #include "d3d9_private.h" WINE_DEFAULT_DEBUG_CHANNEL(d3d9); @@ -423,3 +424,12 @@ HRESULT surface_init(IDirect3DSurface9Impl *surface, IDirect3DDevice9Impl *devic return D3D_OK; } + +IDirect3DSurface9Impl *unsafe_impl_from_IDirect3DSurface9(IDirect3DSurface9 *iface) +{ + if (!iface) + return NULL; + assert(iface->lpVtbl == &Direct3DSurface9_Vtbl); + + return impl_from_IDirect3DSurface9(iface); +} diff --git a/dlls/d3d9/swapchain.c b/dlls/d3d9/swapchain.c index 2643707..f316058 100644 --- a/dlls/d3d9/swapchain.c +++ b/dlls/d3d9/swapchain.c @@ -98,15 +98,17 @@ static HRESULT WINAPI DECLSPEC_HOTPATCH IDirect3DSwapChain9Impl_Present(LPDIRECT return hr; } -static HRESULT WINAPI IDirect3DSwapChain9Impl_GetFrontBufferData(LPDIRECT3DSWAPCHAIN9 iface, IDirect3DSurface9* pDestSurface) { +static HRESULT WINAPI IDirect3DSwapChain9Impl_GetFrontBufferData(IDirect3DSwapChain9 *iface, + IDirect3DSurface9 *pDestSurface) +{ IDirect3DSwapChain9Impl *This = (IDirect3DSwapChain9Impl *)iface; + IDirect3DSurface9Impl *dst = unsafe_impl_from_IDirect3DSurface9(pDestSurface); HRESULT hr; TRACE("iface %p, surface %p.\n", iface, pDestSurface); wined3d_mutex_lock(); - hr = wined3d_swapchain_get_front_buffer_data(This->wined3d_swapchain, - ((IDirect3DSurface9Impl *)pDestSurface)->wined3d_surface); + hr = wined3d_swapchain_get_front_buffer_data(This->wined3d_swapchain, dst->wined3d_surface); wined3d_mutex_unlock(); return hr;

1 0

Michael Stefaniuc : d3d9: COM cleanup for the IDirect3DSurface9 iface.
by Alexandre Julliard 07 Jul '11

07 Jul '11

Module: wine Branch: master Commit: 4e31d28cff3b619a13da3f6e6f501939b457a96b URL: http://source.winehq.org/git/wine.git/?a=commit;h=4e31d28cff3b619a13da3f6e6… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Thu Jul 7 10:59:49 2011 +0200 d3d9: COM cleanup for the IDirect3DSurface9 iface. --- dlls/d3d9/d3d9_private.h | 5 +-- dlls/d3d9/device.c | 8 ++-- dlls/d3d9/surface.c | 69 ++++++++++++++++++++++++++++------------------ 3 files changed, 48 insertions(+), 34 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 8d592be..76fef72 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -223,9 +223,8 @@ HRESULT swapchain_init(IDirect3DSwapChain9Impl *swapchain, IDirect3DDevice9Impl */ typedef struct IDirect3DSurface9Impl { - /* IUnknown fields */ - const IDirect3DSurface9Vtbl *lpVtbl; - LONG ref; + IDirect3DSurface9 IDirect3DSurface9_iface; + LONG ref; struct wined3d_surface *wined3d_surface; IDirect3DDevice9Ex *parentDevice; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 200b611..2866126 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -920,7 +920,7 @@ static HRESULT IDirect3DDevice9Impl_CreateSurface(IDirect3DDevice9Impl *device, } TRACE("Created surface %p.\n", object); - *ppSurface = (IDirect3DSurface9 *)object; + *ppSurface = &object->IDirect3DSurface9_iface; return D3D_OK; } @@ -3142,7 +3142,7 @@ static HRESULT CDECL device_parent_create_surface(struct wined3d_device_parent * IDirect3DDevice9Ex_Release(d3d_surface->parentDevice); d3d_surface->parentDevice = NULL; - IDirect3DSurface9_Release((IDirect3DSurface9 *)d3d_surface); + IDirect3DSurface9_Release(&d3d_surface->IDirect3DSurface9_iface); d3d_surface->forwardReference = container_parent; return hr; @@ -3176,7 +3176,7 @@ static HRESULT CDECL device_parent_create_rendertarget(struct wined3d_device_par d3d_surface->container = container_parent; /* Implicit surfaces are created with an refcount of 0 */ - IDirect3DSurface9_Release((IDirect3DSurface9 *)d3d_surface); + IDirect3DSurface9_Release(&d3d_surface->IDirect3DSurface9_iface); return hr; } @@ -3206,7 +3206,7 @@ static HRESULT CDECL device_parent_create_depth_stencil(struct wined3d_device_pa wined3d_surface_incref(*surface); d3d_surface->container = (IUnknown *)&device->IDirect3DDevice9Ex_iface; /* Implicit surfaces are created with an refcount of 0 */ - IDirect3DSurface9_Release((IDirect3DSurface9 *)d3d_surface); + IDirect3DSurface9_Release(&d3d_surface->IDirect3DSurface9_iface); return hr; } diff --git a/dlls/d3d9/surface.c b/dlls/d3d9/surface.c index 3f3ac3c..126b947 100644 --- a/dlls/d3d9/surface.c +++ b/dlls/d3d9/surface.c @@ -27,12 +27,14 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d9); static inline IDirect3DSurface9Impl *impl_from_IDirect3DSurface9(IDirect3DSurface9 *iface) { - return CONTAINING_RECORD(iface, IDirect3DSurface9Impl, lpVtbl); + return CONTAINING_RECORD(iface, IDirect3DSurface9Impl, IDirect3DSurface9_iface); } /* IDirect3DSurface9 IUnknown parts follow: */ -static HRESULT WINAPI IDirect3DSurface9Impl_QueryInterface(LPDIRECT3DSURFACE9 iface, REFIID riid, LPVOID* ppobj) { - IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; +static HRESULT WINAPI IDirect3DSurface9Impl_QueryInterface(IDirect3DSurface9 *iface, REFIID riid, + void **ppobj) +{ + IDirect3DSurface9Impl *This = impl_from_IDirect3DSurface9(iface); TRACE("iface %p, riid %s, object %p.\n", iface, debugstr_guid(riid), ppobj); @@ -49,8 +51,9 @@ static HRESULT WINAPI IDirect3DSurface9Impl_QueryInterface(LPDIRECT3DSURFACE9 if return E_NOINTERFACE; } -static ULONG WINAPI IDirect3DSurface9Impl_AddRef(LPDIRECT3DSURFACE9 iface) { - IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; +static ULONG WINAPI IDirect3DSurface9Impl_AddRef(IDirect3DSurface9 *iface) +{ + IDirect3DSurface9Impl *This = impl_from_IDirect3DSurface9(iface); TRACE("iface %p.\n", iface); @@ -77,8 +80,9 @@ static ULONG WINAPI IDirect3DSurface9Impl_AddRef(LPDIRECT3DSURFACE9 iface) { } -static ULONG WINAPI IDirect3DSurface9Impl_Release(LPDIRECT3DSURFACE9 iface) { - IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; +static ULONG WINAPI IDirect3DSurface9Impl_Release(IDirect3DSurface9 *iface) +{ + IDirect3DSurface9Impl *This = impl_from_IDirect3DSurface9(iface); TRACE("iface %p.\n", iface); @@ -108,9 +112,10 @@ static ULONG WINAPI IDirect3DSurface9Impl_Release(LPDIRECT3DSURFACE9 iface) { } /* IDirect3DSurface9 IDirect3DResource9 Interface follow: */ -static HRESULT WINAPI IDirect3DSurface9Impl_GetDevice(IDirect3DSurface9 *iface, IDirect3DDevice9 **device) +static HRESULT WINAPI IDirect3DSurface9Impl_GetDevice(IDirect3DSurface9 *iface, + IDirect3DDevice9 **device) { - IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; + IDirect3DSurface9Impl *This = impl_from_IDirect3DSurface9(iface); TRACE("iface %p, device %p.\n", iface, device); @@ -191,8 +196,9 @@ static HRESULT WINAPI IDirect3DSurface9Impl_FreePrivateData(IDirect3DSurface9 *i return hr; } -static DWORD WINAPI IDirect3DSurface9Impl_SetPriority(LPDIRECT3DSURFACE9 iface, DWORD PriorityNew) { - IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; +static DWORD WINAPI IDirect3DSurface9Impl_SetPriority(IDirect3DSurface9 *iface, DWORD PriorityNew) +{ + IDirect3DSurface9Impl *This = impl_from_IDirect3DSurface9(iface); HRESULT hr; TRACE("iface %p, priority %u.\n", iface, PriorityNew); @@ -204,8 +210,9 @@ static DWORD WINAPI IDirect3DSurface9Impl_SetPriority(LPDIRECT3DSURFACE9 iface, return hr; } -static DWORD WINAPI IDirect3DSurface9Impl_GetPriority(LPDIRECT3DSURFACE9 iface) { - IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; +static DWORD WINAPI IDirect3DSurface9Impl_GetPriority(IDirect3DSurface9 *iface) +{ + IDirect3DSurface9Impl *This = impl_from_IDirect3DSurface9(iface); HRESULT hr; TRACE("iface %p.\n", iface); @@ -217,8 +224,9 @@ static DWORD WINAPI IDirect3DSurface9Impl_GetPriority(LPDIRECT3DSURFACE9 iface) return hr; } -static void WINAPI IDirect3DSurface9Impl_PreLoad(LPDIRECT3DSURFACE9 iface) { - IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; +static void WINAPI IDirect3DSurface9Impl_PreLoad(IDirect3DSurface9 *iface) +{ + IDirect3DSurface9Impl *This = impl_from_IDirect3DSurface9(iface); TRACE("iface %p.\n", iface); @@ -235,8 +243,10 @@ static D3DRESOURCETYPE WINAPI IDirect3DSurface9Impl_GetType(IDirect3DSurface9 *i } /* IDirect3DSurface9 Interface follow: */ -static HRESULT WINAPI IDirect3DSurface9Impl_GetContainer(LPDIRECT3DSURFACE9 iface, REFIID riid, void** ppContainer) { - IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; +static HRESULT WINAPI IDirect3DSurface9Impl_GetContainer(IDirect3DSurface9 *iface, REFIID riid, + void **ppContainer) +{ + IDirect3DSurface9Impl *This = impl_from_IDirect3DSurface9(iface); HRESULT res; TRACE("iface %p, riid %s, container %p.\n", iface, debugstr_guid(riid), ppContainer); @@ -252,7 +262,7 @@ static HRESULT WINAPI IDirect3DSurface9Impl_GetContainer(LPDIRECT3DSURFACE9 ifac static HRESULT WINAPI IDirect3DSurface9Impl_GetDesc(IDirect3DSurface9 *iface, D3DSURFACE_DESC *desc) { - IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; + IDirect3DSurface9Impl *This = impl_from_IDirect3DSurface9(iface); struct wined3d_resource_desc wined3d_desc; struct wined3d_resource *wined3d_resource; @@ -275,8 +285,10 @@ static HRESULT WINAPI IDirect3DSurface9Impl_GetDesc(IDirect3DSurface9 *iface, D3 return D3D_OK; } -static HRESULT WINAPI IDirect3DSurface9Impl_LockRect(LPDIRECT3DSURFACE9 iface, D3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) { - IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; +static HRESULT WINAPI IDirect3DSurface9Impl_LockRect(IDirect3DSurface9 *iface, + D3DLOCKED_RECT *pLockedRect, const RECT *pRect, DWORD Flags) +{ + IDirect3DSurface9Impl *This = impl_from_IDirect3DSurface9(iface); HRESULT hr; TRACE("iface %p, locked_rect %p, rect %p, flags %#x.\n", iface, pLockedRect, pRect, Flags); @@ -288,8 +300,9 @@ static HRESULT WINAPI IDirect3DSurface9Impl_LockRect(LPDIRECT3DSURFACE9 iface, D return hr; } -static HRESULT WINAPI IDirect3DSurface9Impl_UnlockRect(LPDIRECT3DSURFACE9 iface) { - IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; +static HRESULT WINAPI IDirect3DSurface9Impl_UnlockRect(IDirect3DSurface9 *iface) +{ + IDirect3DSurface9Impl *This = impl_from_IDirect3DSurface9(iface); HRESULT hr; TRACE("iface %p.\n", iface); @@ -305,8 +318,9 @@ static HRESULT WINAPI IDirect3DSurface9Impl_UnlockRect(LPDIRECT3DSURFACE9 iface) } } -static HRESULT WINAPI IDirect3DSurface9Impl_GetDC(LPDIRECT3DSURFACE9 iface, HDC* phdc) { - IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; +static HRESULT WINAPI IDirect3DSurface9Impl_GetDC(IDirect3DSurface9 *iface, HDC* phdc) +{ + IDirect3DSurface9Impl *This = impl_from_IDirect3DSurface9(iface); HRESULT hr; TRACE("iface %p, hdc %p.\n", iface, phdc); @@ -325,8 +339,9 @@ static HRESULT WINAPI IDirect3DSurface9Impl_GetDC(LPDIRECT3DSURFACE9 iface, HDC* return hr; } -static HRESULT WINAPI IDirect3DSurface9Impl_ReleaseDC(LPDIRECT3DSURFACE9 iface, HDC hdc) { - IDirect3DSurface9Impl *This = (IDirect3DSurface9Impl *)iface; +static HRESULT WINAPI IDirect3DSurface9Impl_ReleaseDC(IDirect3DSurface9 *iface, HDC hdc) +{ + IDirect3DSurface9Impl *This = impl_from_IDirect3DSurface9(iface); HRESULT hr; TRACE("iface %p, hdc %p.\n", iface, hdc); @@ -382,7 +397,7 @@ HRESULT surface_init(IDirect3DSurface9Impl *surface, IDirect3DDevice9Impl *devic { HRESULT hr; - surface->lpVtbl = &Direct3DSurface9_Vtbl; + surface->IDirect3DSurface9_iface.lpVtbl = &Direct3DSurface9_Vtbl; surface->ref = 1; switch (format)

1 0

Hans Leidekker : msi: Use the return value of MSI_IterateRecords (clang).
by Alexandre Julliard 07 Jul '11

07 Jul '11

Module: wine Branch: master Commit: 4202b1419c9e0a4931fce7fa7fc70301547de9c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4202b1419c9e0a4931fce7fa7… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jul 7 09:21:52 2011 +0200 msi: Use the return value of MSI_IterateRecords (clang). --- dlls/msi/action.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 9070b76..0ac6dba 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -6977,6 +6977,7 @@ static UINT ACTION_RemoveExistingProducts( MSIPACKAGE *package ) { r = MSI_IterateRecords( view, NULL, ITERATE_RemoveExistingProducts, package ); msiobj_release( &view->hdr ); + return r; } return ERROR_SUCCESS; }

1 0

Vincent Povirk : user32: Test that QS_HOTKEY is properly set and cleared.
by Alexandre Julliard 06 Jul '11

06 Jul '11

Module: wine Branch: master Commit: b85dbc9c0368e0bd5f698a247bda50bb25fff4d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b85dbc9c0368e0bd5f698a247… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jun 17 14:00:49 2011 -0500 user32: Test that QS_HOTKEY is properly set and cleared. --- dlls/user32/tests/msg.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index ee1637d..2d903f0 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -7717,6 +7717,7 @@ static LRESULT WINAPI HotkeyMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam static LONG defwndproc_counter = 0; LRESULT ret; struct recvd_message msg; + DWORD queue_status; if (ignore_message( message )) return 0; @@ -7738,7 +7739,18 @@ static LRESULT WINAPI HotkeyMsgCheckProcA(HWND hwnd, UINT message, WPARAM wParam defwndproc_counter--; if (message == WM_APP) + { + queue_status = GetQueueStatus(QS_HOTKEY); + ok((queue_status & (QS_HOTKEY << 16)) == QS_HOTKEY << 16, "expected QS_HOTKEY << 16 set, got %x\n", queue_status); + queue_status = GetQueueStatus(QS_POSTMESSAGE); + ok((queue_status & (QS_POSTMESSAGE << 16)) == QS_POSTMESSAGE << 16, "expected QS_POSTMESSAGE << 16 set, got %x\n", queue_status); PostMessageA(hwnd, WM_APP+1, 0, 0); + } + else if (message == WM_APP+1) + { + queue_status = GetQueueStatus(QS_HOTKEY); + ok((queue_status & (QS_HOTKEY << 16)) == 0, "expected QS_HOTKEY << 16 cleared, got %x\n", queue_status); + } return ret; } @@ -13151,6 +13163,7 @@ static void test_hotkey(void) HWND test_window, taskbar_window; BOOL ret; MSG msg; + DWORD queue_status; SHORT key_state; SetLastError(0xdeadbeef); @@ -13238,6 +13251,8 @@ static void test_hotkey(void) ok_sequence(WmHotkeyPressLWIN, "window hotkey press LWIN", FALSE); keybd_event(hotkey_letter, 0, 0, 0); + queue_status = GetQueueStatus(QS_HOTKEY); + ok((queue_status & (QS_HOTKEY << 16)) == QS_HOTKEY << 16, "expected QS_HOTKEY << 16 set, got %x\n", queue_status); while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) { if (msg.message == WM_HOTKEY) @@ -13249,6 +13264,9 @@ static void test_hotkey(void) } ok_sequence(WmHotkeyPress, "window hotkey press", FALSE); + queue_status = GetQueueStatus(QS_HOTKEY); + ok((queue_status & (QS_HOTKEY << 16)) == 0, "expected QS_HOTKEY << 16 cleared, got %x\n", queue_status); + key_state = GetAsyncKeyState(hotkey_letter); ok((key_state & 0x8000) == 0x8000, "unexpected key state %x\n", key_state); @@ -13262,6 +13280,16 @@ static void test_hotkey(void) DispatchMessage(&msg); ok_sequence(WmHotkeyReleaseLWIN, "window hotkey release LWIN", FALSE); + /* normal posted WM_HOTKEY messages set QS_HOTKEY */ + PostMessage(test_window, WM_HOTKEY, 0, 0); + queue_status = GetQueueStatus(QS_HOTKEY); + ok((queue_status & (QS_HOTKEY << 16)) == QS_HOTKEY << 16, "expected QS_HOTKEY << 16 set, got %x\n", queue_status); + queue_status = GetQueueStatus(QS_POSTMESSAGE); + ok((queue_status & (QS_POSTMESSAGE << 16)) == QS_POSTMESSAGE << 16, "expected QS_POSTMESSAGE << 16 set, got %x\n", queue_status); + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) + DispatchMessage(&msg); + flush_sequence(); + /* Send and process all messages at once */ PostMessage(test_window, WM_APP, 0, 0); keybd_event(VK_LWIN, 0, 0, 0);

1 0

Vincent Povirk : winex11.drv: Process keyboard events when QS_HOTKEY is specified.
by Alexandre Julliard 06 Jul '11

06 Jul '11

Module: wine Branch: master Commit: 7a21d06295269e19139abf50a50cdc857fdb2078 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a21d06295269e19139abf50a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Jun 17 14:01:13 2011 -0500 winex11.drv: Process keyboard events when QS_HOTKEY is specified. --- dlls/winex11.drv/event.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winex11.drv/event.c b/dlls/winex11.drv/event.c index 419ad0f..00915cf 100644 --- a/dlls/winex11.drv/event.c +++ b/dlls/winex11.drv/event.c @@ -213,7 +213,7 @@ static Bool filter_event( Display *display, XEvent *event, char *arg ) case KeyRelease: case KeymapNotify: case MappingNotify: - return (mask & QS_KEY) != 0; + return (mask & (QS_KEY|QS_HOTKEY)) != 0; case ButtonPress: case ButtonRelease: return (mask & QS_MOUSEBUTTON) != 0;

1 0