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

Henri Verbeet : wined3d: Reuse convert_a8r8g8b8_x8r8g8b8() for B8G8R8X8 -> B8G8R8A8 conversions.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 56428c638650b39fc37b100af1d67acc0f96a559 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56428c638650b39fc37b100af… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 21 21:34:52 2011 +0200 wined3d: Reuse convert_a8r8g8b8_x8r8g8b8() for B8G8R8X8 -> B8G8R8A8 conversions. --- dlls/wined3d/surface.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8e720dd..88e8a1d 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3199,6 +3199,8 @@ static void convert_r5g6b5_x8r8g8b8(const BYTE *src, BYTE *dst, } } +/* We use this for both B8G8R8A8 -> B8G8R8X8 and B8G8R8X8 -> B8G8R8A8, since + * in both cases we're just setting the X / Alpha channel to 0xff. */ static void convert_a8r8g8b8_x8r8g8b8(const BYTE *src, BYTE *dst, DWORD pitch_in, DWORD pitch_out, unsigned int w, unsigned int h) { @@ -3317,6 +3319,7 @@ static const struct d3dfmt_convertor_desc convertors[] = {WINED3DFMT_R32_FLOAT, WINED3DFMT_R16_FLOAT, convert_r32_float_r16_float}, {WINED3DFMT_B5G6R5_UNORM, WINED3DFMT_B8G8R8X8_UNORM, convert_r5g6b5_x8r8g8b8}, {WINED3DFMT_B8G8R8A8_UNORM, WINED3DFMT_B8G8R8X8_UNORM, convert_a8r8g8b8_x8r8g8b8}, + {WINED3DFMT_B8G8R8X8_UNORM, WINED3DFMT_B8G8R8A8_UNORM, convert_a8r8g8b8_x8r8g8b8}, {WINED3DFMT_YUY2, WINED3DFMT_B8G8R8X8_UNORM, convert_yuy2_x8r8g8b8}, {WINED3DFMT_YUY2, WINED3DFMT_B5G6R5_UNORM, convert_yuy2_r5g6b5}, };

1 0

Henri Verbeet : wined3d: Merge FindContext() into context_acquire().
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 34b2956e23a03458ed4c13d7556eb5438cb3fa1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=34b2956e23a03458ed4c13d75… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 21 21:34:53 2011 +0200 wined3d: Merge FindContext() into context_acquire(). This actually fixes a bug. A context's current_rt field may get set to NULL if that surface gets destroyed or unloaded. In general, the next time that context is acquired, context_setup_target() will then set everything up again. However, if a context_acquire() call with a NULL target ends up returning such a context, context_setup_target() never sets the current_rt field because the target FindContext() chooses never gets propagated to context_acquire(). This patch ensures context_setup_target() is never called with a NULL target. --- dlls/wined3d/context.c | 99 +++++++++++++++++++++-------------------------- 1 files changed, 44 insertions(+), 55 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ac252d8..ac5a05a 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1811,59 +1811,6 @@ static void SetupForBlit(struct wined3d_device *device, struct wined3d_context * context_invalidate_state(context, STATE_TRANSFORM(WINED3DTS_PROJECTION)); } -/* Do not call while under the GL lock. */ -static struct wined3d_context *FindContext(const struct wined3d_device *device, const struct wined3d_surface *target) -{ - struct wined3d_context *current_context = context_get_current(); - struct wined3d_context *context; - - if (current_context && current_context->destroyed) current_context = NULL; - - if (!target) - { - if (current_context - && current_context->current_rt - && current_context->swapchain->device == device) - { - target = current_context->current_rt; - } - else - { - struct wined3d_swapchain *swapchain = device->swapchains[0]; - if (swapchain->back_buffers) target = swapchain->back_buffers[0]; - else target = swapchain->front_buffer; - } - } - - if (current_context && current_context->current_rt == target) - { - context_update_window(current_context); - return current_context; - } - - if (target->container.type == WINED3D_CONTAINER_SWAPCHAIN) - { - TRACE("Rendering onscreen\n"); - - context = swapchain_get_context(target->container.u.swapchain); - } - else - { - TRACE("Rendering offscreen\n"); - - /* Stay with the current context if possible. Otherwise use the - * context for the primary swapchain. */ - if (current_context && current_context->swapchain->device == device) - context = current_context; - else - context = swapchain_get_context(device->swapchains[0]); - } - - context_update_window(context); - - return context; -} - static inline BOOL is_rt_mask_onscreen(DWORD rt_mask) { return rt_mask & (1 << 31); @@ -2290,7 +2237,6 @@ static void context_setup_target(struct wined3d_device *device, { BOOL old_render_offscreen = context->render_offscreen, render_offscreen; - if (!target) return; render_offscreen = surface_is_offscreen(target); if (context->current_rt == target && render_offscreen == old_render_offscreen) return; @@ -2347,7 +2293,50 @@ struct wined3d_context *context_acquire(struct wined3d_device *device, struct wi TRACE("device %p, target %p.\n", device, target); - context = FindContext(device, target); + if (current_context && current_context->destroyed) + current_context = NULL; + + if (!target) + { + if (current_context + && current_context->current_rt + && current_context->swapchain->device == device) + { + target = current_context->current_rt; + } + else + { + struct wined3d_swapchain *swapchain = device->swapchains[0]; + if (swapchain->back_buffers) + target = swapchain->back_buffers[0]; + else + target = swapchain->front_buffer; + } + } + + if (current_context && current_context->current_rt == target) + { + context = current_context; + } + else if (target->container.type == WINED3D_CONTAINER_SWAPCHAIN) + { + TRACE("Rendering onscreen.\n"); + + context = swapchain_get_context(target->container.u.swapchain); + } + else + { + TRACE("Rendering offscreen.\n"); + + /* Stay with the current context if possible. Otherwise use the + * context for the primary swapchain. */ + if (current_context && current_context->swapchain->device == device) + context = current_context; + else + context = swapchain_get_context(device->swapchains[0]); + } + + context_update_window(context); context_setup_target(device, context, target); context_enter(context); if (!context->valid) return context;

1 0

Henri Verbeet : wined3d: Draw buffers are per-framebuffer state.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: f8ce77a5986ce0648dc6cbaef77ddf6828ea1e3e URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8ce77a5986ce0648dc6cbaef… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 21 21:34:54 2011 +0200 wined3d: Draw buffers are per-framebuffer state. --- dlls/wined3d/context.c | 49 ++++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 31 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index ac5a05a..53aeca3 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -268,6 +268,17 @@ void context_check_fbo_status(const struct wined3d_context *context, GLenum targ } } +static inline DWORD context_generate_rt_mask(GLenum buffer) +{ + /* Should take care of all the GL_FRONT/GL_BACK/GL_AUXi/GL_NONE... cases */ + return buffer ? (1 << 31) | buffer : 0; +} + +static inline DWORD context_generate_rt_mask_from_surface(const struct wined3d_surface *target) +{ + return (1 << 31) | surface_get_gl_buffer(target); +} + static struct fbo_entry *context_create_fbo_entry(const struct wined3d_context *context, struct wined3d_surface **render_targets, struct wined3d_surface *depth_stencil, DWORD location) { @@ -279,6 +290,7 @@ static struct fbo_entry *context_create_fbo_entry(const struct wined3d_context * memcpy(entry->render_targets, render_targets, gl_info->limits.buffers * sizeof(*entry->render_targets)); entry->depth_stencil = depth_stencil; entry->location = location; + entry->rt_mask = context_generate_rt_mask(GL_COLOR_ATTACHMENT0); entry->attached = FALSE; entry->id = 0; @@ -1204,17 +1216,6 @@ static int WineD3D_ChoosePixelFormat(struct wined3d_device *device, HDC hdc, return iPixelFormat; } -static inline DWORD context_generate_rt_mask(GLenum buffer) -{ - /* Should take care of all the GL_FRONT/GL_BACK/GL_AUXi/GL_NONE... cases */ - return buffer ? (1 << 31) | buffer : 0; -} - -static inline DWORD context_generate_rt_mask_from_surface(const struct wined3d_surface *target) -{ - return (1 << 31) | surface_get_gl_buffer(target); -} - /* Do not call while under the GL lock. */ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, struct wined3d_surface *target, const struct wined3d_format *ds_format) @@ -1875,7 +1876,10 @@ void context_set_draw_buffer(struct wined3d_context *context, GLenum buffer) { glDrawBuffer(buffer); checkGLcall("glDrawBuffer()"); - context->draw_buffers_mask = context_generate_rt_mask(buffer); + if (context->current_fbo) + context->current_fbo->rt_mask = context_generate_rt_mask(buffer); + else + context->draw_buffers_mask = context_generate_rt_mask(buffer); } static void context_set_render_offscreen(struct wined3d_context *context, BOOL offscreen) @@ -1942,7 +1946,7 @@ static DWORD context_generate_rt_mask_no_fbo(const struct wined3d_device *device /* Context activation is done by the caller. */ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_device *device) { - DWORD rt_mask; + DWORD rt_mask, old_mask; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { @@ -1973,8 +1977,10 @@ void context_apply_blit_state(struct wined3d_context *context, struct wined3d_de rt_mask = context_generate_rt_mask_no_fbo(device, context->current_rt); } + old_mask = context->current_fbo ? context->current_fbo->rt_mask : context->draw_buffers_mask; + ENTER_GL(); - if (rt_mask != context->draw_buffers_mask) + if (rt_mask != old_mask) { context_apply_draw_buffers(context, rt_mask); context->draw_buffers_mask = rt_mask; @@ -2011,7 +2017,7 @@ static BOOL context_validate_rt_config(UINT rt_count, BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_device *device, UINT rt_count, const struct wined3d_fb_state *fb) { - DWORD rt_mask = 0; + DWORD rt_mask = 0, old_mask; UINT i; struct wined3d_surface **rts = fb->render_targets; @@ -2075,8 +2081,10 @@ BOOL context_apply_clear_state(struct wined3d_context *context, struct wined3d_d rt_mask = context_generate_rt_mask_no_fbo(device, rts[0]); } + old_mask = context->current_fbo ? context->current_fbo->rt_mask : context->draw_buffers_mask; + ENTER_GL(); - if (rt_mask != context->draw_buffers_mask) + if (rt_mask != old_mask) { context_apply_draw_buffers(context, rt_mask); context->draw_buffers_mask = rt_mask; @@ -2142,6 +2150,7 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat const struct wined3d_device *device = context->swapchain->device; const struct wined3d_fb_state *fb = state->fb; DWORD rt_mask = find_draw_buffers_mask(context, device); + DWORD old_mask; if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { @@ -2157,7 +2166,8 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat } } - if (context->draw_buffers_mask != rt_mask) + old_mask = context->current_fbo ? context->current_fbo->rt_mask : context->draw_buffers_mask; + if (rt_mask != old_mask) { context_apply_draw_buffers(context, rt_mask); context->draw_buffers_mask = rt_mask; @@ -2168,12 +2178,13 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat void context_state_drawbuf(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { const struct wined3d_device *device = context->swapchain->device; - DWORD rt_mask; + DWORD rt_mask, old_mask; if (isStateDirty(context, STATE_FRAMEBUFFER)) return; + old_mask = context->current_fbo ? context->current_fbo->rt_mask : context->draw_buffers_mask; rt_mask = find_draw_buffers_mask(context, device); - if (context->draw_buffers_mask != rt_mask) + if (rt_mask != old_mask) { context_apply_draw_buffers(context, rt_mask); context->draw_buffers_mask = rt_mask; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 044e0df..5e20740 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1944,6 +1944,7 @@ struct fbo_entry struct wined3d_surface **render_targets; struct wined3d_surface *depth_stencil; DWORD location; + DWORD rt_mask; BOOL attached; GLuint id; };

1 0

Henri Verbeet : wined3d: Don' t allow blits with an invalid destination rectangle when a clipper is set either .
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: e1ab5f6e6bf251566289ccf3177ebaf8102cb72b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e1ab5f6e6bf251566289ccf31… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 21 21:34:55 2011 +0200 wined3d: Don't allow blits with an invalid destination rectangle when a clipper is set either. Clippers don't really work. Previously we mostly didn't run into this because the rectangle was already rejected by ddraw_surface7_Blt(), although ddraw_surface7_BltFast() might have been affected in a couple of cases. We should of course implement clippers, but until that happens, completely rejecting the blit is better than introducing memory corruption. This fixes a regression introduced by commit 92e616f355ded5f3634625dba245e9b437e3ad6a. --- dlls/wined3d/surface.c | 13 ++++++++----- 1 files changed, 8 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 88e8a1d..8412aa5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1307,15 +1307,18 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC surface_get_rect(dst_surface, dst_rect_in, &dst_rect); - /* The destination rect can be out of bounds on the condition - * that a clipper is set for the surface. */ - if (!dst_surface->clipper && (dst_rect.left >= dst_rect.right || dst_rect.top >= dst_rect.bottom + if (dst_rect.left >= dst_rect.right || dst_rect.top >= dst_rect.bottom || dst_rect.left > dst_surface->resource.width || dst_rect.left < 0 || dst_rect.top > dst_surface->resource.height || dst_rect.top < 0 || dst_rect.right > dst_surface->resource.width || dst_rect.right < 0 - || dst_rect.bottom > dst_surface->resource.height || dst_rect.bottom < 0)) + || dst_rect.bottom > dst_surface->resource.height || dst_rect.bottom < 0) { - WARN("Application gave us bad destination rectangle for blit without a clipper set.\n"); + /* The destination rect can be out of bounds on the condition + * that a clipper is set for the surface. */ + if (dst_surface->clipper) + FIXME("Blit clipping not implemented.\n"); + else + WARN("The application gave us a bad destination rectangle without a clipper set.\n"); return WINEDDERR_INVALIDRECT; }

1 0

Henri Verbeet : wined3d: Allow color fills on FBO attachable surfaces in ffp_blit_supported().
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 26484c92005c74d88b3cc2a6c1e3896e2e8941ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=26484c92005c74d88b3cc2a6c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Aug 21 21:34:56 2011 +0200 wined3d: Allow color fills on FBO attachable surfaces in ffp_blit_supported(). --- dlls/wined3d/surface.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8412aa5..d7d65fb 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6367,12 +6367,20 @@ static BOOL ffp_blit_supported(const struct wined3d_gl_info *gl_info, enum wined return FALSE; case WINED3D_BLIT_OP_COLOR_FILL: - if (!(dst_usage & WINED3DUSAGE_RENDERTARGET)) + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + { + if (!((dst_format->flags & WINED3DFMT_FLAG_FBO_ATTACHABLE) || (dst_usage & WINED3DUSAGE_RENDERTARGET))) + return FALSE; + } + else if (!(dst_usage & WINED3DUSAGE_RENDERTARGET)) { TRACE("Color fill not supported\n"); return FALSE; } + /* FIXME: We should reject color fills on formats with fixups, + * but this would break P8 color fills for example. */ + return TRUE; case WINED3D_BLIT_OP_DEPTH_FILL:

1 0

Jörg Höhle : wineoss.drv: Fix AudioRenderClient write pointer calculation.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: ea47c12ebe105823d6810dac99e26bd7fcd68e44 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea47c12ebe105823d6810dac9… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Tue Aug 9 23:34:11 2011 +0200 wineoss.drv: Fix AudioRenderClient write pointer calculation. --- dlls/wineoss.drv/mmdevdrv.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 1e69a22..f962f8a 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -1611,8 +1611,7 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, *data = This->tmp_buffer; This->buf_state = LOCKED_WRAPPED; }else{ - *data = This->local_buffer + - This->lcl_offs_frames * This->fmt->nBlockAlign; + *data = This->local_buffer + write_pos * This->fmt->nBlockAlign; This->buf_state = LOCKED_NORMAL; } @@ -1656,8 +1655,8 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( } if(This->buf_state == LOCKED_NORMAL) - buffer = This->local_buffer + - This->lcl_offs_frames * This->fmt->nBlockAlign; + buffer = This->local_buffer + This->fmt->nBlockAlign * + ((This->lcl_offs_frames + This->held_frames) % This->bufsize_frames); else buffer = This->tmp_buffer;

1 0

Michael Stefaniuc : amstream: Basic COM cleanup for the IDirectDrawMediaStream iface.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: aba87e0fe5bbd0fa9d8dea6074ebe3ef36fb7802 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aba87e0fe5bbd0fa9d8dea607… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 16 10:11:54 2011 +0200 amstream: Basic COM cleanup for the IDirectDrawMediaStream iface. --- dlls/amstream/mediastream.c | 48 ++++++++++++++++++++++++++---------------- 1 files changed, 30 insertions(+), 18 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 39c28c9..0444cc2 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -44,7 +44,7 @@ typedef struct { } IMediaStreamImpl; typedef struct { - const IDirectDrawMediaStreamVtbl *lpVtbl; + IDirectDrawMediaStream IDirectDrawMediaStream_iface; LONG ref; IMultiMediaStream* Parent; MSPID PurposeId; @@ -207,77 +207,89 @@ HRESULT DirectDrawMediaStream_create(IMultiMediaStream* Parent, const MSPID* pPu return E_OUTOFMEMORY; } - object->lpVtbl = &DirectDrawMediaStream_Vtbl; + object->IDirectDrawMediaStream_iface.lpVtbl = &DirectDrawMediaStream_Vtbl; object->ref = 1; object->Parent = Parent; object->PurposeId = *pPurposeId; object->StreamType = StreamType; - *ppMediaStream = (IMediaStream*)object; + *ppMediaStream = (IMediaStream*)&object->IDirectDrawMediaStream_iface; return S_OK; } -static HRESULT WINAPI IDirectDrawMediaStreamImpl_QueryInterface(IDirectDrawMediaStream* iface, REFIID riid, void** ppvObject) +static inline IDirectDrawMediaStreamImpl *impl_from_IDirectDrawMediaStream(IDirectDrawMediaStream *iface) { - IMediaStreamImpl *This = (IMediaStreamImpl *)iface; + return CONTAINING_RECORD(iface, IDirectDrawMediaStreamImpl, IDirectDrawMediaStream_iface); +} - TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppvObject); +static HRESULT WINAPI IDirectDrawMediaStreamImpl_QueryInterface(IDirectDrawMediaStream *iface, + REFIID riid, void **ppv) +{ + IDirectDrawMediaStreamImpl *This = impl_from_IDirectDrawMediaStream(iface); + + TRACE("(%p/%p)->(%s,%p)\n", iface, This, debugstr_guid(riid), ppv); if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IMediaStream) || IsEqualGUID(riid, &IID_IDirectDrawMediaStream)) { IUnknown_AddRef(iface); - *ppvObject = This; + *ppv = This; return S_OK; } - ERR("(%p)->(%s,%p),not found\n",This,debugstr_guid(riid),ppvObject); + ERR("(%p)->(%s,%p),not found\n", This, debugstr_guid(riid), ppv); return E_NOINTERFACE; } -static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetFormat(IDirectDrawMediaStream* iface, DDSURFACEDESC *pDDSDCurrent, - IDirectDrawPalette **ppDirectDrawPalette, DDSURFACEDESC *pDDSDDesired, DWORD *pdwFlags) +static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetFormat(IDirectDrawMediaStream *iface, + DDSURFACEDESC *pDDSDCurrent, IDirectDrawPalette **ppDirectDrawPalette, + DDSURFACEDESC *pDDSDDesired, DWORD *pdwFlags) { - FIXME("(%p)->(%p,%p,%p,%p) stub!\n", iface, pDDSDCurrent, ppDirectDrawPalette, pDDSDDesired, pdwFlags); + FIXME("(%p)->(%p,%p,%p,%p) stub!\n", iface, pDDSDCurrent, ppDirectDrawPalette, pDDSDDesired, + pdwFlags); return E_NOTIMPL; } -static HRESULT WINAPI IDirectDrawMediaStreamImpl_SetFormat(IDirectDrawMediaStream* iface, const DDSURFACEDESC *pDDSurfaceDesc, - IDirectDrawPalette *pDirectDrawPalette) +static HRESULT WINAPI IDirectDrawMediaStreamImpl_SetFormat(IDirectDrawMediaStream *iface, + const DDSURFACEDESC *pDDSurfaceDesc, IDirectDrawPalette *pDirectDrawPalette) { FIXME("(%p)->(%p,%p) stub!\n", iface, pDDSurfaceDesc, pDirectDrawPalette); return E_NOTIMPL; } -static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetDirectDraw(IDirectDrawMediaStream* iface, IDirectDraw **ppDirectDraw) +static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetDirectDraw(IDirectDrawMediaStream *iface, + IDirectDraw **ppDirectDraw) { FIXME("(%p)->(%p) stub!\n", iface, ppDirectDraw); return E_NOTIMPL; } -static HRESULT WINAPI IDirectDrawMediaStreamImpl_SetDirectDraw(IDirectDrawMediaStream* iface, IDirectDraw *pDirectDraw) +static HRESULT WINAPI IDirectDrawMediaStreamImpl_SetDirectDraw(IDirectDrawMediaStream *iface, + IDirectDraw *pDirectDraw) { FIXME("(%p)->(%p) stub!\n", iface, pDirectDraw); return E_NOTIMPL; } -static HRESULT WINAPI IDirectDrawMediaStreamImpl_CreateSample(IDirectDrawMediaStream* iface, IDirectDrawSurface *pSurface, const RECT *pRect, - DWORD dwFlags, IDirectDrawStreamSample **ppSample) +static HRESULT WINAPI IDirectDrawMediaStreamImpl_CreateSample(IDirectDrawMediaStream *iface, + IDirectDrawSurface *pSurface, const RECT *pRect, DWORD dwFlags, + IDirectDrawStreamSample **ppSample) { FIXME("(%p)->(%p,%p,%x,%p) stub!\n", iface, pSurface, pRect, dwFlags, ppSample); return E_NOTIMPL; } -static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetTimePerFrame(IDirectDrawMediaStream* iface, STREAM_TIME *pFrameTime) +static HRESULT WINAPI IDirectDrawMediaStreamImpl_GetTimePerFrame(IDirectDrawMediaStream *iface, + STREAM_TIME *pFrameTime) { FIXME("(%p)->(%p) stub!\n", iface, pFrameTime);

1 0

Michael Stefaniuc : amstream: Avoid the forward declaration of the DirectDrawMediaStream_Vtbl.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 2b55b5b6632a40d1eee63720b7439cd568bdea09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b55b5b6632a40d1eee63720b… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 16 10:13:31 2011 +0200 amstream: Avoid the forward declaration of the DirectDrawMediaStream_Vtbl. --- dlls/amstream/mediastream.c | 52 +++++++++++++++++++++--------------------- 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/dlls/amstream/mediastream.c b/dlls/amstream/mediastream.c index 0444cc2..f41b944 100644 --- a/dlls/amstream/mediastream.c +++ b/dlls/amstream/mediastream.c @@ -52,7 +52,6 @@ typedef struct { } IDirectDrawMediaStreamImpl; static const struct IMediaStreamVtbl MediaStream_Vtbl; -static const struct IDirectDrawMediaStreamVtbl DirectDrawMediaStream_Vtbl; HRESULT MediaStream_create(IMultiMediaStream* Parent, const MSPID* pPurposeId, STREAM_TYPE StreamType, IMediaStream** ppMediaStream) { @@ -194,31 +193,6 @@ static const struct IMediaStreamVtbl MediaStream_Vtbl = IMediaStreamImpl_SendEndOfStream }; -HRESULT DirectDrawMediaStream_create(IMultiMediaStream* Parent, const MSPID* pPurposeId, STREAM_TYPE StreamType, IMediaStream** ppMediaStream) -{ - IDirectDrawMediaStreamImpl* object; - - TRACE("(%p,%s,%p)\n", Parent, debugstr_guid(pPurposeId), ppMediaStream); - - object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IMediaStreamImpl)); - if (!object) - { - ERR("Out of memory\n"); - return E_OUTOFMEMORY; - } - - object->IDirectDrawMediaStream_iface.lpVtbl = &DirectDrawMediaStream_Vtbl; - object->ref = 1; - - object->Parent = Parent; - object->PurposeId = *pPurposeId; - object->StreamType = StreamType; - - *ppMediaStream = (IMediaStream*)&object->IDirectDrawMediaStream_iface; - - return S_OK; -} - static inline IDirectDrawMediaStreamImpl *impl_from_IDirectDrawMediaStream(IDirectDrawMediaStream *iface) { return CONTAINING_RECORD(iface, IDirectDrawMediaStreamImpl, IDirectDrawMediaStream_iface); @@ -322,3 +296,29 @@ static const struct IDirectDrawMediaStreamVtbl DirectDrawMediaStream_Vtbl = IDirectDrawMediaStreamImpl_GetTimePerFrame }; #undef XCAST + +HRESULT DirectDrawMediaStream_create(IMultiMediaStream *Parent, const MSPID *pPurposeId, + STREAM_TYPE StreamType, IMediaStream **ppMediaStream) +{ + IDirectDrawMediaStreamImpl *object; + + TRACE("(%p,%s,%p)\n", Parent, debugstr_guid(pPurposeId), ppMediaStream); + + object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IMediaStreamImpl)); + if (!object) + { + ERR("Out of memory\n"); + return E_OUTOFMEMORY; + } + + object->IDirectDrawMediaStream_iface.lpVtbl = &DirectDrawMediaStream_Vtbl; + object->ref = 1; + + object->Parent = Parent; + object->PurposeId = *pPurposeId; + object->StreamType = StreamType; + + *ppMediaStream = (IMediaStream*)&object->IDirectDrawMediaStream_iface; + + return S_OK; +}

1 0

Michael Stefaniuc : amstream: Get rid of the explicit implementation of IMediaStream.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: f49d6df1984e4057a853134176d2e791417c3097 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f49d6df1984e4057a85313417… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 16 10:24:15 2011 +0200 amstream: Get rid of the explicit implementation of IMediaStream. --- dlls/amstream/amstream.c | 6 +- dlls/amstream/amstream_private.h | 4 +- dlls/amstream/mediastream.c | 156 +++++++++++--------------------------- 3 files changed, 46 insertions(+), 120 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f49d6df1984e4057a8531…

1 0

Michael Stefaniuc : amstream: Use CoTaskMemRealloc instead of alloc+copy.
by Alexandre Julliard 22 Aug '11

22 Aug '11

Module: wine Branch: master Commit: 52dd315666e3151341652e2739c379541923a2ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=52dd315666e3151341652e273… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Aug 16 10:32:27 2011 +0200 amstream: Use CoTaskMemRealloc instead of alloc+copy. --- dlls/amstream/amstream.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-) diff --git a/dlls/amstream/amstream.c b/dlls/amstream/amstream.c index 979c58e..d22a268 100644 --- a/dlls/amstream/amstream.c +++ b/dlls/amstream/amstream.c @@ -279,15 +279,12 @@ static HRESULT WINAPI IAMMultiMediaStreamImpl_AddMediaStream(IAMMultiMediaStream hr = mediastream_create((IMultiMediaStream*)iface, PurposeId, This->StreamType, &pStream); if (SUCCEEDED(hr)) { - pNewStreams = CoTaskMemAlloc((This->nbStreams+1)*sizeof(IMediaStream*)); + pNewStreams = CoTaskMemRealloc(This->pStreams, (This->nbStreams+1) * sizeof(IMediaStream*)); if (!pNewStreams) { IMediaStream_Release(pStream); return E_OUTOFMEMORY; } - if (This->nbStreams) - CopyMemory(pNewStreams, This->pStreams, This->nbStreams*sizeof(IMediaStream*)); - CoTaskMemFree(This->pStreams); This->pStreams = pNewStreams; This->pStreams[This->nbStreams] = pStream; This->nbStreams++;

1 0