March 2010 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Don' t use filtering on textures that need complex fixups in swapchain_blit().
by Alexandre Julliard 17 Mar '10

17 Mar '10

Module: wine Branch: master Commit: 60e98cc3ad463d3451becb1033c97cb19445a6d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=60e98cc3ad463d3451becb103… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 16 19:02:14 2010 +0100 wined3d: Don't use filtering on textures that need complex fixups in swapchain_blit(). For example, interpolating palette indices doesn't have the desired result. Should we really want filtering for these cases we could implement it inside the relevant shaders, after the fixup, but I doubt it's worth the effort. --- dlls/wined3d/swapchain.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index c99b1c9..df1638f 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -152,6 +152,9 @@ static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context * tex_bottom /= src_h; } + if (is_complex_fixup(backbuffer->resource.format_desc->color_fixup)) + gl_filter = GL_NEAREST; + ENTER_GL(); context_bind_fbo(context2, GL_DRAW_FRAMEBUFFER, NULL);

1 0

Henri Verbeet : wined3d: Don' t use framebuffer blit for backbuffer formats with fixups in swapchain_blit ().
by Alexandre Julliard 17 Mar '10

17 Mar '10

Module: wine Branch: master Commit: 570f865bad363a600fbc51dadd5206a71632c667 URL: http://source.winehq.org/git/wine.git/?a=commit;h=570f865bad363a600fbc51dad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 16 19:02:15 2010 +0100 wined3d: Don't use framebuffer blit for backbuffer formats with fixups in swapchain_blit(). --- dlls/wined3d/swapchain.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index df1638f..dfe194d 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -114,7 +114,7 @@ static void swapchain_blit(IWineD3DSwapChainImpl *This, struct wined3d_context * else gl_filter = GL_LINEAR; - if (gl_info->fbo_ops.glBlitFramebuffer) + if (gl_info->fbo_ops.glBlitFramebuffer && is_identity_fixup(backbuffer->resource.format_desc->color_fixup)) { ENTER_GL(); context_bind_fbo(context, GL_READ_FRAMEBUFFER, &context->src_fbo);

1 0

Henri Verbeet : wined3d: Add missing checkGLcall's to buffer_Map().
by Alexandre Julliard 17 Mar '10

17 Mar '10

Module: wine Branch: master Commit: ec10c1ed8d15297767de27af61e9e1dc7f9c608a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec10c1ed8d15297767de27af6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 16 19:02:16 2010 +0100 wined3d: Add missing checkGLcall's to buffer_Map(). --- dlls/wined3d/buffer.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 46131af..6fefe87 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -1180,10 +1180,12 @@ static HRESULT STDMETHODCALLTYPE buffer_Map(IWineD3DBuffer *iface, UINT offset, GLbitfield mapflags = buffer_gl_map_flags(flags); This->resource.allocatedMemory = GL_EXTCALL(glMapBufferRange(This->buffer_type_hint, 0, This->resource.size, mapflags)); + checkGLcall("glMapBufferRange"); } else { This->resource.allocatedMemory = GL_EXTCALL(glMapBufferARB(This->buffer_type_hint, GL_READ_WRITE_ARB)); + checkGLcall("glMapBufferARB"); } LEAVE_GL();

1 0

Henri Verbeet : wined3d: Simplify context_apply_attachment_filter_states() flow a bit.
by Alexandre Julliard 17 Mar '10

17 Mar '10

Module: wine Branch: master Commit: 2b86950c3b8ea908cb02ded037b491cf21fa517b URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b86950c3b8ea908cb02ded03… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 16 19:02:17 2010 +0100 wined3d: Simplify context_apply_attachment_filter_states() flow a bit. --- dlls/wined3d/context.c | 57 ++++++++++++++++++++++++++--------------------- 1 files changed, 31 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4d28cd4..6fd877c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -116,15 +116,16 @@ static void context_destroy_fbo(struct wined3d_context *context, GLuint *fbo) /* GL locking is done by the caller */ static void context_apply_attachment_filter_states(IWineD3DSurface *surface) { - const IWineD3DSurfaceImpl *surface_impl = (IWineD3DSurfaceImpl *)surface; - IWineD3DDeviceImpl *device = surface_impl->resource.device; IWineD3DBaseTextureImpl *texture_impl; - BOOL update_minfilter = FALSE; - BOOL update_magfilter = FALSE; /* Update base texture states array */ if (SUCCEEDED(IWineD3DSurface_GetContainer(surface, &IID_IWineD3DBaseTexture, (void **)&texture_impl))) { + IWineD3DSurfaceImpl *surface_impl = (IWineD3DSurfaceImpl *)surface; + IWineD3DDeviceImpl *device = surface_impl->resource.device; + BOOL update_minfilter = FALSE; + BOOL update_magfilter = FALSE; + if (texture_impl->baseTexture.texture_rgb.states[WINED3DTEXSTA_MINFILTER] != WINED3DTEXF_POINT || texture_impl->baseTexture.texture_rgb.states[WINED3DTEXSTA_MIPFILTER] != WINED3DTEXF_NONE) { @@ -146,33 +147,37 @@ static void context_apply_attachment_filter_states(IWineD3DSurface *surface) } IWineD3DBaseTexture_Release((IWineD3DBaseTexture *)texture_impl); - } - - if (update_minfilter || update_magfilter) - { - GLenum target, bind_target; - GLint old_binding; - target = surface_impl->texture_target; - if (target == GL_TEXTURE_2D) + if (update_minfilter || update_magfilter) { - bind_target = GL_TEXTURE_2D; - glGetIntegerv(GL_TEXTURE_BINDING_2D, &old_binding); - } else if (target == GL_TEXTURE_RECTANGLE_ARB) { - bind_target = GL_TEXTURE_RECTANGLE_ARB; - glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &old_binding); - } else { - bind_target = GL_TEXTURE_CUBE_MAP_ARB; - glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP_ARB, &old_binding); + GLenum target, bind_target; + GLint old_binding; + + target = surface_impl->texture_target; + if (target == GL_TEXTURE_2D) + { + bind_target = GL_TEXTURE_2D; + glGetIntegerv(GL_TEXTURE_BINDING_2D, &old_binding); + } + else if (target == GL_TEXTURE_RECTANGLE_ARB) + { + bind_target = GL_TEXTURE_RECTANGLE_ARB; + glGetIntegerv(GL_TEXTURE_BINDING_RECTANGLE_ARB, &old_binding); + } + else + { + bind_target = GL_TEXTURE_CUBE_MAP_ARB; + glGetIntegerv(GL_TEXTURE_BINDING_CUBE_MAP_ARB, &old_binding); + } + + glBindTexture(bind_target, surface_impl->texture_name); + if (update_minfilter) glTexParameteri(bind_target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); + if (update_magfilter) glTexParameteri(bind_target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); + glBindTexture(bind_target, old_binding); } - glBindTexture(bind_target, surface_impl->texture_name); - if (update_minfilter) glTexParameteri(bind_target, GL_TEXTURE_MIN_FILTER, GL_NEAREST); - if (update_magfilter) glTexParameteri(bind_target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - glBindTexture(bind_target, old_binding); + checkGLcall("apply_attachment_filter_states()"); } - - checkGLcall("apply_attachment_filter_states()"); } /* GL locking is done by the caller */

1 0

Henri Verbeet : wined3d: Simplify the IWineD3DDeviceImpl_ClearSurface() surface loading code.
by Alexandre Julliard 17 Mar '10

17 Mar '10

Module: wine Branch: master Commit: 509b038cf5b0c54d7a430d0848a34dcc19166880 URL: http://source.winehq.org/git/wine.git/?a=commit;h=509b038cf5b0c54d7a430d084… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 16 19:02:18 2010 +0100 wined3d: Simplify the IWineD3DDeviceImpl_ClearSurface() surface loading code. --- dlls/wined3d/device.c | 78 ++++++++++++++++++++++-------------------------- 1 files changed, 36 insertions(+), 42 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4a0c2df..4df5399 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4305,15 +4305,42 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Present(IWineD3DDevice *iface, return WINED3D_OK; } +static BOOL is_full_clear(IWineD3DSurfaceImpl *target, const WINED3DVIEWPORT *viewport, + const RECT *scissor_rect, const WINED3DRECT *clear_rect) +{ + /* partial viewport*/ + if (viewport->X != 0 || viewport->Y != 0 + || viewport->Width < target->currentDesc.Width + || viewport->Height < target->currentDesc.Height) + return FALSE; + + /* partial scissor rect */ + if (scissor_rect && (scissor_rect->left > 0 || scissor_rect->top > 0 + || scissor_rect->right < target->currentDesc.Width + || scissor_rect->bottom < target->currentDesc.Height)) + return FALSE; + + /* partial clear rect */ + if (clear_rect && (clear_rect->x1 > 0 || clear_rect->y1 > 0 + || clear_rect->x2 < target->currentDesc.Width + || clear_rect->y2 < target->currentDesc.Height)) + return FALSE; + + return TRUE; +} + /* Not called from the VTable (internal subroutine) */ -HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *target, DWORD Count, - CONST WINED3DRECT* pRects, DWORD Flags, WINED3DCOLOR Color, - float Z, DWORD Stencil) { +HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfaceImpl *target, DWORD Count, + const WINED3DRECT *pRects, DWORD Flags, WINED3DCOLOR Color, float Z, DWORD Stencil) +{ + IWineD3DStateBlockImpl *stateblock = This->stateBlock; + const RECT *scissor_rect = stateblock->renderState[WINED3DRS_SCISSORTESTENABLE] ? &stateblock->scissorRect : NULL; + const WINED3DRECT *clear_rect = (Count > 0 && pRects) ? pRects : NULL; + const WINED3DVIEWPORT *vp = &stateblock->viewport; GLbitfield glMask = 0; unsigned int i; WINED3DRECT curRect; RECT vp_rect; - const WINED3DVIEWPORT *vp = &This->stateBlock->viewport; UINT drawable_width, drawable_height; IWineD3DSurfaceImpl *depth_stencil = (IWineD3DSurfaceImpl *) This->stencilBufferTarget; struct wined3d_context *context; @@ -4327,29 +4354,10 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfa * the drawable up to date. We have to check all settings that limit the clear area though. Do not bother * checking all this if the dest surface is in the drawable anyway. */ - if((Flags & WINED3DCLEAR_TARGET) && !(target->Flags & SFLAG_INDRAWABLE)) { - while(1) { - if(vp->X != 0 || vp->Y != 0 || - vp->Width < target->currentDesc.Width || vp->Height < target->currentDesc.Height) { - IWineD3DSurface_LoadLocation((IWineD3DSurface *) target, SFLAG_INDRAWABLE, NULL); - break; - } - if(This->stateBlock->renderState[WINED3DRS_SCISSORTESTENABLE] && ( - This->stateBlock->scissorRect.left > 0 || This->stateBlock->scissorRect.top > 0 || - This->stateBlock->scissorRect.right < target->currentDesc.Width || - This->stateBlock->scissorRect.bottom < target->currentDesc.Height)) { - IWineD3DSurface_LoadLocation((IWineD3DSurface *) target, SFLAG_INDRAWABLE, NULL); - break; - } - if(Count > 0 && pRects && ( - pRects[0].x1 > 0 || pRects[0].y1 > 0 || - pRects[0].x2 < target->currentDesc.Width || - pRects[0].y2 < target->currentDesc.Height)) { - IWineD3DSurface_LoadLocation((IWineD3DSurface *) target, SFLAG_INDRAWABLE, NULL); - break; - } - break; - } + if (Flags & WINED3DCLEAR_TARGET && !(target->Flags & SFLAG_INDRAWABLE)) + { + if (!is_full_clear(target, vp, scissor_rect, clear_rect)) + IWineD3DSurface_LoadLocation((IWineD3DSurface *)target, SFLAG_INDRAWABLE, NULL); } context = context_acquire(This, (IWineD3DSurface *)target, CTXUSAGE_CLEAR); @@ -4374,22 +4382,8 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfa glMask = glMask | GL_DEPTH_BUFFER_BIT; IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_ZWRITEENABLE)); - if (vp->X != 0 || vp->Y != 0 || - vp->Width < depth_stencil->currentDesc.Width || vp->Height < depth_stencil->currentDesc.Height) { - surface_load_ds_location(This->stencilBufferTarget, context, location); - } - else if (This->stateBlock->renderState[WINED3DRS_SCISSORTESTENABLE] && ( - This->stateBlock->scissorRect.left > 0 || This->stateBlock->scissorRect.top > 0 || - This->stateBlock->scissorRect.right < depth_stencil->currentDesc.Width || - This->stateBlock->scissorRect.bottom < depth_stencil->currentDesc.Height)) { + if (!(depth_stencil->Flags & location) && !is_full_clear(depth_stencil, vp, scissor_rect, clear_rect)) surface_load_ds_location(This->stencilBufferTarget, context, location); - } - else if (Count > 0 && pRects && ( - pRects[0].x1 > 0 || pRects[0].y1 > 0 || - pRects[0].x2 < depth_stencil->currentDesc.Width || - pRects[0].y2 < depth_stencil->currentDesc.Height)) { - surface_load_ds_location(This->stencilBufferTarget, context, location); - } } if (Flags & WINED3DCLEAR_TARGET) {

1 0

Henri Verbeet : wined3d: Don' t change the draw buffer in IWineD3DDeviceImpl_SetFrontBackBuffers().
by Alexandre Julliard 17 Mar '10

17 Mar '10

Module: wine Branch: master Commit: e9dbd5bff85488417ea3e4f2d40f37efc1759e2e URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9dbd5bff85488417ea3e4f2d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 16 19:02:19 2010 +0100 wined3d: Don't change the draw buffer in IWineD3DDeviceImpl_SetFrontBackBuffers(). This should be handled by the context's draw buffer management. --- dlls/wined3d/device.c | 25 +++---------------------- 1 files changed, 3 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4df5399..3d4a48b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5743,28 +5743,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetFrontBackBuffers(IWineD3DDevice *ifa if(Swapchain->backBuffer[0] != Back) { TRACE("Changing the back buffer from %p to %p\n", Swapchain->backBuffer, Back); - /* What to do about the context here in the case of multithreading? Not sure. - * This function is called by IDirect3D7::CreateDevice so in theory its initialization code - */ - WARN("No active context?\n"); - - ENTER_GL(); - if(!Swapchain->backBuffer[0]) { - /* GL was told to draw to the front buffer at creation, - * undo that - */ - glDrawBuffer(GL_BACK); - checkGLcall("glDrawBuffer(GL_BACK)"); - /* Set the backbuffer count to 1 because other code uses it to fing the back buffers */ - Swapchain->presentParms.BackBufferCount = 1; - } else if (!Back) { - /* That makes problems - disable for now */ - /* glDrawBuffer(GL_FRONT); */ - checkGLcall("glDrawBuffer(GL_FRONT)"); - /* We have lost our back buffer, set this to 0 to avoid confusing other code */ - Swapchain->presentParms.BackBufferCount = 0; - } - LEAVE_GL(); + /* Update the backbuffer count. */ + if (!Swapchain->backBuffer[0]) Swapchain->presentParms.BackBufferCount = 1; + else if (!Back) Swapchain->presentParms.BackBufferCount = 0; if(Swapchain->backBuffer[0]) {

1 0

Henri Verbeet : wined3d: Cleanup IWineD3DDeviceImpl_SetFrontBackBuffers().
by Alexandre Julliard 17 Mar '10

17 Mar '10

Module: wine Branch: master Commit: 7b52c2fbed561ac381f63826bab97802d0070e46 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b52c2fbed561ac381f63826b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 16 19:02:20 2010 +0100 wined3d: Cleanup IWineD3DDeviceImpl_SetFrontBackBuffers(). --- dlls/wined3d/device.c | 118 +++++++++++++++++++++++++++---------------------- 1 files changed, 65 insertions(+), 53 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3d4a48b..5f4d2f8 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5688,85 +5688,97 @@ static HRESULT WINAPI IWineD3DDeviceImpl_GetRenderTarget(IWineD3DDevice* iface } static HRESULT WINAPI IWineD3DDeviceImpl_SetFrontBackBuffers(IWineD3DDevice *iface, - IWineD3DSurface *Front, IWineD3DSurface *Back) + IWineD3DSurface *front, IWineD3DSurface *back) { - IWineD3DSurfaceImpl *FrontImpl = (IWineD3DSurfaceImpl *) Front; - IWineD3DSurfaceImpl *BackImpl = (IWineD3DSurfaceImpl *) Back; - IWineD3DSwapChainImpl *Swapchain; + IWineD3DSurfaceImpl *front_impl = (IWineD3DSurfaceImpl *)front; + IWineD3DSurfaceImpl *back_impl = (IWineD3DSurfaceImpl *)back; + IWineD3DSwapChainImpl *swapchain; HRESULT hr; - TRACE("iface %p, front %p, back %p.\n", iface, Front, Back); + TRACE("iface %p, front %p, back %p.\n", iface, front, back); - hr = IWineD3DDevice_GetSwapChain(iface, 0, (IWineD3DSwapChain **) &Swapchain); - if(hr != WINED3D_OK) { - ERR("Can't get the swapchain\n"); + if (FAILED(hr = IWineD3DDevice_GetSwapChain(iface, 0, (IWineD3DSwapChain **)&swapchain))) + { + ERR("Failed to get the swapchain, hr %#x.\n", hr); return hr; } - /* Make sure to release the swapchain */ - IWineD3DSwapChain_Release((IWineD3DSwapChain *) Swapchain); - - if(FrontImpl && !(FrontImpl->resource.usage & WINED3DUSAGE_RENDERTARGET) ) { - ERR("Trying to set a front buffer which doesn't have WINED3DUSAGE_RENDERTARGET usage\n"); - return WINED3DERR_INVALIDCALL; - } - else if(BackImpl && !(BackImpl->resource.usage & WINED3DUSAGE_RENDERTARGET)) { - ERR("Trying to set a back buffer which doesn't have WINED3DUSAGE_RENDERTARGET usage\n"); + if (front_impl && !(front_impl->resource.usage & WINED3DUSAGE_RENDERTARGET)) + { + ERR("Trying to set a front buffer which doesn't have WINED3DUSAGE_RENDERTARGET usage.\n"); + IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain); return WINED3DERR_INVALIDCALL; } - if(Swapchain->frontBuffer != Front) { - TRACE("Changing the front buffer from %p to %p\n", Swapchain->frontBuffer, Front); - - if(Swapchain->frontBuffer) + if (back_impl) + { + if (!(back_impl->resource.usage & WINED3DUSAGE_RENDERTARGET)) { - IWineD3DSurface_SetContainer(Swapchain->frontBuffer, NULL); - ((IWineD3DSurfaceImpl *)Swapchain->frontBuffer)->Flags &= ~SFLAG_SWAPCHAIN; + ERR("Trying to set a back buffer which doesn't have WINED3DUSAGE_RENDERTARGET usage.\n"); + IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain); + return WINED3DERR_INVALIDCALL; } - Swapchain->frontBuffer = Front; - if(Swapchain->frontBuffer) { - IWineD3DSurface_SetContainer(Swapchain->frontBuffer, (IWineD3DBase *) Swapchain); - ((IWineD3DSurfaceImpl *)Swapchain->frontBuffer)->Flags |= SFLAG_SWAPCHAIN; + if (!swapchain->backBuffer) + { + swapchain->backBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*swapchain->backBuffer)); + if (!swapchain->backBuffer) + { + ERR("Failed to allocate back buffer array memory.\n"); + IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain); + return E_OUTOFMEMORY; + } } } - if(Back && !Swapchain->backBuffer) { - /* We need memory for the back buffer array - only one back buffer this way */ - Swapchain->backBuffer = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(IWineD3DSurface *)); - if(!Swapchain->backBuffer) { - ERR("Out of memory\n"); - return E_OUTOFMEMORY; + if (swapchain->frontBuffer != front) + { + TRACE("Changing the front buffer from %p to %p.\n", swapchain->frontBuffer, front); + + if (swapchain->frontBuffer) + { + IWineD3DSurface_SetContainer(swapchain->frontBuffer, NULL); + ((IWineD3DSurfaceImpl *)swapchain->frontBuffer)->Flags &= ~SFLAG_SWAPCHAIN; + } + swapchain->frontBuffer = front; + + if (front) + { + IWineD3DSurface_SetContainer(front, (IWineD3DBase *)swapchain); + front_impl->Flags |= SFLAG_SWAPCHAIN; } } - if(Swapchain->backBuffer[0] != Back) { - TRACE("Changing the back buffer from %p to %p\n", Swapchain->backBuffer, Back); + if (swapchain->backBuffer[0] != back) + { + TRACE("Changing the back buffer from %p to %p.\n", swapchain->backBuffer[0], back); - /* Update the backbuffer count. */ - if (!Swapchain->backBuffer[0]) Swapchain->presentParms.BackBufferCount = 1; - else if (!Back) Swapchain->presentParms.BackBufferCount = 0; + if (swapchain->backBuffer[0]) + { + IWineD3DSurface_SetContainer(swapchain->backBuffer[0], NULL); + ((IWineD3DSurfaceImpl *)swapchain->backBuffer[0])->Flags &= ~SFLAG_SWAPCHAIN; + } + swapchain->backBuffer[0] = back; - if(Swapchain->backBuffer[0]) + if (back) { - IWineD3DSurface_SetContainer(Swapchain->backBuffer[0], NULL); - ((IWineD3DSurfaceImpl *)Swapchain->backBuffer[0])->Flags &= ~SFLAG_SWAPCHAIN; + swapchain->presentParms.BackBufferWidth = back_impl->currentDesc.Width; + swapchain->presentParms.BackBufferHeight = back_impl->currentDesc.Height; + swapchain->presentParms.BackBufferFormat = back_impl->resource.format_desc->format; + swapchain->presentParms.BackBufferCount = 1; + + IWineD3DSurface_SetContainer(back, (IWineD3DBase *)swapchain); + back_impl->Flags |= SFLAG_SWAPCHAIN; } - Swapchain->backBuffer[0] = Back; - - if(Swapchain->backBuffer[0]) { - IWineD3DSurface_SetContainer(Swapchain->backBuffer[0], (IWineD3DBase *) Swapchain); - ((IWineD3DSurfaceImpl *)Swapchain->backBuffer[0])->Flags |= SFLAG_SWAPCHAIN; - Swapchain->presentParms.BackBufferWidth = BackImpl->currentDesc.Width; - Swapchain->presentParms.BackBufferHeight = BackImpl->currentDesc.Height; - Swapchain->presentParms.BackBufferFormat = BackImpl->resource.format_desc->format; - } else { - HeapFree(GetProcessHeap(), 0, Swapchain->backBuffer); - Swapchain->backBuffer = NULL; + else + { + swapchain->presentParms.BackBufferCount = 0; + HeapFree(GetProcessHeap(), 0, swapchain->backBuffer); + swapchain->backBuffer = NULL; } - } + IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain); return WINED3D_OK; }

1 0

Paul Vriens : kernel32/tests: Run tests again on Win95.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: b120836bd25debfefe02057a85c4e381f67266de URL: http://source.winehq.org/git/wine.git/?a=commit;h=b120836bd25debfefe02057a8… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Mar 16 10:42:48 2010 +0100 kernel32/tests: Run tests again on Win95. --- dlls/kernel32/tests/debugger.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/kernel32/tests/debugger.c b/dlls/kernel32/tests/debugger.c index 057b977..e116c9d 100644 --- a/dlls/kernel32/tests/debugger.c +++ b/dlls/kernel32/tests/debugger.c @@ -44,6 +44,7 @@ static char** myARGV; static BOOL (WINAPI *pCheckRemoteDebuggerPresent)(HANDLE,PBOOL); static BOOL (WINAPI *pDebugActiveProcessStop)(DWORD); static BOOL (WINAPI *pDebugSetProcessKillOnExit)(BOOL); +static BOOL (WINAPI *pIsDebuggerPresent)(void); static struct _TEB * (WINAPI *pNtCurrentTeb)(void); static LONG child_failures; @@ -529,7 +530,7 @@ static void doChild(int argc, char **argv) ret = CloseHandle(parent); child_ok(ret, "CloseHandle failed, last error %#x.\n", GetLastError()); - ret = IsDebuggerPresent(); + ret = pIsDebuggerPresent(); child_ok(ret, "Expected ret != 0, got %#x.\n", ret); ret = pCheckRemoteDebuggerPresent(GetCurrentProcess(), &debug); child_ok(ret, "CheckRemoteDebuggerPresent failed, last error %#x.\n", GetLastError()); @@ -539,7 +540,7 @@ static void doChild(int argc, char **argv) { pNtCurrentTeb()->Peb->BeingDebugged = FALSE; - ret = IsDebuggerPresent(); + ret = pIsDebuggerPresent(); child_ok(!ret, "Expected ret != 0, got %#x.\n", ret); ret = pCheckRemoteDebuggerPresent(GetCurrentProcess(), &debug); child_ok(ret, "CheckRemoteDebuggerPresent failed, last error %#x.\n", GetLastError()); @@ -624,6 +625,7 @@ START_TEST(debugger) pCheckRemoteDebuggerPresent=(void*)GetProcAddress(hdll, "CheckRemoteDebuggerPresent"); pDebugActiveProcessStop=(void*)GetProcAddress(hdll, "DebugActiveProcessStop"); pDebugSetProcessKillOnExit=(void*)GetProcAddress(hdll, "DebugSetProcessKillOnExit"); + pIsDebuggerPresent=(void*)GetProcAddress(hdll, "IsDebuggerPresent"); hdll=GetModuleHandle("ntdll.dll"); if (hdll) pNtCurrentTeb = (void*)GetProcAddress(hdll, "NtCurrentTeb");

1 0

Yann Droneaud : cmd: Remove %CD% test.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: 954d06ca354146e1d813fa688ec1dcc00cf71370 URL: http://source.winehq.org/git/wine.git/?a=commit;h=954d06ca354146e1d813fa688… Author: Yann Droneaud <yann(a)droneaud.fr> Date: Tue Mar 16 10:53:28 2010 +0100 cmd: Remove %CD% test. %CD% seems not supported on Windows NT 4. --- programs/cmd/tests/test_builtins.cmd | 1 - programs/cmd/tests/test_builtins.cmd.exp | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index e346ffa..a7d7027 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -23,7 +23,6 @@ cd dummydir echo %~dp0 cd .. rmdir dummydir -echo %CD% echo %% echo P% echo %P diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index a8b2fc0..e8e5473 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -16,7 +16,6 @@ bar ~dp0 should be directory containing batch file @pwd@\ @pwd@\ -(a)pwd@ % P P

1 0

Yann Droneaud : cmd: Add another expansion test.
by Alexandre Julliard 16 Mar '10

16 Mar '10

Module: wine Branch: master Commit: ac8d92405c24dcc3a10277ad0c3f53b2acd789c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac8d92405c24dcc3a10277ad0… Author: Yann Droneaud <yann(a)droneaud.fr> Date: Tue Mar 16 10:54:26 2010 +0100 cmd: Add another expansion test. Test %VAR%VAR% to check that the second variable is not expanded. --- programs/cmd/tests/test_builtins.cmd | 1 + programs/cmd/tests/test_builtins.cmd.exp | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index a7d7027..696ce13 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -32,6 +32,7 @@ echo P%UNKNOWN%S echo %ERRORLEVEL echo %ERRORLEVEL% echo %ERRORLEVEL%%ERRORLEVEL% +echo %ERRORLEVEL%ERRORLEVEL% echo %ERRORLEVEL%% echo %ERRORLEVEL%%% echo P%ERRORLEVEL% diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index e8e5473..55fc9f2 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -25,6 +25,7 @@ PS ERRORLEVEL 0 00 +0ERRORLEVEL 0 0% P0

1 0