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

Dylan Smith : richedit: Use tabstops to store cell positions.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 11c80396995065701205f2facb3dba10a6f8170f URL: http://source.winehq.org/git/wine.git/?a=commit;h=11c80396995065701205f2fac… Author: Dylan Smith <dylan.ah.smith(a)gmail.com> Date: Mon Aug 4 19:18:54 2008 -0400 richedit: Use tabstops to store cell positions. --- dlls/riched20/caret.c | 27 ------------ dlls/riched20/editor.c | 104 ++++++++++++++++++++++++++++++++-------------- dlls/riched20/editor.h | 2 - dlls/riched20/editstr.h | 14 +------ dlls/riched20/list.c | 18 -------- dlls/riched20/paint.c | 2 +- dlls/riched20/para.c | 29 ------------- dlls/riched20/reader.c | 10 ++++- dlls/riched20/rtf.h | 18 ++++++++- dlls/riched20/run.c | 9 +--- dlls/riched20/writer.c | 55 ++++++++++++++++--------- 11 files changed, 138 insertions(+), 150 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=11c80396995065701205f…

1 0

Stefan Dösinger : wined3d: Implement overlay flipping.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 851dd7339e52407a7f44b55798379ac518d8c336 URL: http://source.winehq.org/git/wine.git/?a=commit;h=851dd7339e52407a7f44b5579… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jul 24 11:38:51 2008 -0500 wined3d: Implement overlay flipping. --- dlls/ddraw/surface.c | 2 +- dlls/wined3d/surface.c | 89 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/swapchain.c | 72 +-------------------------------- dlls/wined3d/wined3d_private.h | 2 + 4 files changed, 91 insertions(+), 74 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index bc25218..1cf4d57 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -710,7 +710,7 @@ IDirectDrawSurfaceImpl_Flip(IDirectDrawSurface7 *iface, /* Flip has to be called from a front buffer * What about overlay surfaces, AFAIK they can flip too? */ - if( !(This->surface_desc.ddsCaps.dwCaps & DDSCAPS_FRONTBUFFER) ) + if( !(This->surface_desc.ddsCaps.dwCaps & (DDSCAPS_FRONTBUFFER | DDSCAPS_OVERLAY)) ) return DDERR_INVALIDOBJECT; /* Unchecked */ EnterCriticalSection(&ddraw_cs); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 42ce5d1..1ea221c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2622,14 +2622,99 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetMem(IWineD3DSurface *iface, void *Mem) { return WINED3D_OK; } +void flip_surface(IWineD3DSurfaceImpl *front, IWineD3DSurfaceImpl *back) { + + /* Flip the surface contents */ + /* Flip the DC */ + { + HDC tmp; + tmp = front->hDC; + front->hDC = back->hDC; + back->hDC = tmp; + } + + /* Flip the DIBsection */ + { + HBITMAP tmp; + BOOL hasDib = front->Flags & SFLAG_DIBSECTION; + tmp = front->dib.DIBsection; + front->dib.DIBsection = back->dib.DIBsection; + back->dib.DIBsection = tmp; + + if(back->Flags & SFLAG_DIBSECTION) front->Flags |= SFLAG_DIBSECTION; + else front->Flags &= ~SFLAG_DIBSECTION; + if(hasDib) back->Flags |= SFLAG_DIBSECTION; + else back->Flags &= ~SFLAG_DIBSECTION; + } + + /* Flip the surface data */ + { + void* tmp; + + tmp = front->dib.bitmap_data; + front->dib.bitmap_data = back->dib.bitmap_data; + back->dib.bitmap_data = tmp; + + tmp = front->resource.allocatedMemory; + front->resource.allocatedMemory = back->resource.allocatedMemory; + back->resource.allocatedMemory = tmp; + + tmp = front->resource.heapMemory; + front->resource.heapMemory = back->resource.heapMemory; + back->resource.heapMemory = tmp; + } + + /* Flip the PBO */ + { + GLuint tmp_pbo = front->pbo; + front->pbo = back->pbo; + back->pbo = tmp_pbo; + } + + /* client_memory should not be different, but just in case */ + { + BOOL tmp; + tmp = front->dib.client_memory; + front->dib.client_memory = back->dib.client_memory; + back->dib.client_memory = tmp; + } + + /* Flip the opengl texture */ + { + glDescriptor tmp_desc = back->glDescription; + back->glDescription = front->glDescription; + front->glDescription = tmp_desc; + } + + { + DWORD tmp_flags = back->Flags; + back->Flags = front->Flags; + front->Flags = tmp_flags; + } +} + static HRESULT WINAPI IWineD3DSurfaceImpl_Flip(IWineD3DSurface *iface, IWineD3DSurface *override, DWORD Flags) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; IWineD3DSwapChainImpl *swapchain = NULL; HRESULT hr; TRACE("(%p)->(%p,%x)\n", This, override, Flags); - /* Flipping is only supported on RenderTargets */ - if( !(This->resource.usage & WINED3DUSAGE_RENDERTARGET) ) return WINEDDERR_NOTFLIPPABLE; + /* Flipping is only supported on RenderTargets and overlays*/ + if( !(This->resource.usage & (WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_OVERLAY)) ) { + WARN("Tried to flip a non-render target, non-overlay surface\n"); + return WINEDDERR_NOTFLIPPABLE; + } + + if(This->resource.usage & WINED3DUSAGE_OVERLAY) { + flip_surface(This, (IWineD3DSurfaceImpl *) override); + + /* Update the overlay if it is visible */ + if(This->overlay_dest) { + return IWineD3DSurface_DrawOverlay((IWineD3DSurface *) This); + } else { + return WINED3D_OK; + } + } if(override) { /* DDraw sets this for the X11 surfaces, so don't confuse the user diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index e564a81..77655d0 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -307,79 +307,9 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO /* Both memory copies of the surfaces are ok, flip them around too instead of dirtifying */ IWineD3DSurfaceImpl *front = (IWineD3DSurfaceImpl *) This->frontBuffer; IWineD3DSurfaceImpl *back = (IWineD3DSurfaceImpl *) This->backBuffer[0]; - BOOL frontuptodate = front->Flags & SFLAG_INSYSMEM; - BOOL backuptodate = back->Flags & SFLAG_INSYSMEM; if(front->resource.size == back->resource.size) { - /* Flip the DC */ - { - HDC tmp; - tmp = front->hDC; - front->hDC = back->hDC; - back->hDC = tmp; - } - - /* Flip the DIBsection */ - { - HBITMAP tmp; - BOOL hasDib = front->Flags & SFLAG_DIBSECTION; - tmp = front->dib.DIBsection; - front->dib.DIBsection = back->dib.DIBsection; - back->dib.DIBsection = tmp; - - if(back->Flags & SFLAG_DIBSECTION) front->Flags |= SFLAG_DIBSECTION; - else front->Flags &= ~SFLAG_DIBSECTION; - if(hasDib) back->Flags |= SFLAG_DIBSECTION; - else back->Flags &= ~SFLAG_DIBSECTION; - } - - /* Flip the surface data */ - { - void* tmp; - - tmp = front->dib.bitmap_data; - front->dib.bitmap_data = back->dib.bitmap_data; - back->dib.bitmap_data = tmp; - - tmp = front->resource.allocatedMemory; - front->resource.allocatedMemory = back->resource.allocatedMemory; - back->resource.allocatedMemory = tmp; - - tmp = front->resource.heapMemory; - front->resource.heapMemory = back->resource.heapMemory; - back->resource.heapMemory = tmp; - } - - /* Flip the PBO */ - { - DWORD tmp_flags = front->Flags; - - GLuint tmp_pbo = front->pbo; - front->pbo = back->pbo; - back->pbo = tmp_pbo; - - if(back->Flags & SFLAG_PBO) - front->Flags |= SFLAG_PBO; - else - front->Flags &= ~SFLAG_PBO; - - if(tmp_flags & SFLAG_PBO) - back->Flags |= SFLAG_PBO; - else - back->Flags &= ~SFLAG_PBO; - } - - /* client_memory should not be different, but just in case */ - { - BOOL tmp; - tmp = front->dib.client_memory; - front->dib.client_memory = back->dib.client_memory; - back->dib.client_memory = tmp; - } - if(frontuptodate) back->Flags |= SFLAG_INSYSMEM; - else back->Flags &= ~SFLAG_INSYSMEM; - if(backuptodate) front->Flags |= SFLAG_INSYSMEM; - else front->Flags &= ~SFLAG_INSYSMEM; + flip_surface(front, back); } else { IWineD3DSurface_ModifyLocation((IWineD3DSurface *) front, SFLAG_INDRAWABLE, TRUE); IWineD3DSurface_ModifyLocation((IWineD3DSurface *) back, SFLAG_INDRAWABLE, TRUE); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 4d31b8c..669e865 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1379,6 +1379,8 @@ void get_drawable_size_backbuffer(IWineD3DSurfaceImpl *This, UINT *width, UINT * void get_drawable_size_pbuffer(IWineD3DSurfaceImpl *This, UINT *width, UINT *height); void get_drawable_size_fbo(IWineD3DSurfaceImpl *This, UINT *width, UINT *height); +void flip_surface(IWineD3DSurfaceImpl *front, IWineD3DSurfaceImpl *back); + /* Surface flags: */ #define SFLAG_OVERSIZE 0x00000001 /* Surface is bigger than gl size, blts only */ #define SFLAG_CONVERTED 0x00000002 /* Converted for color keying or Palettized */

1 0

Stefan Dösinger : wined3d: Update the surface locations in Present.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: b0c4673779f0d4e3b8fde7356016b876ddeeffa8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0c4673779f0d4e3b8fde7356… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jul 24 13:38:10 2008 -0500 wined3d: Update the surface locations in Present. --- dlls/wined3d/swapchain.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 77655d0..318c220 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -309,11 +309,30 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO IWineD3DSurfaceImpl *back = (IWineD3DSurfaceImpl *) This->backBuffer[0]; if(front->resource.size == back->resource.size) { + DWORD fbflags; flip_surface(front, back); + + /* Tell the front buffer surface that is has been modified. However, + * the other locations were preserved during that, so keep the flags. + * This serves to update the emulated overlay, if any + */ + fbflags = front->Flags; + IWineD3DSurface_ModifyLocation(This->frontBuffer, SFLAG_INDRAWABLE, TRUE); + front->Flags = fbflags; } else { IWineD3DSurface_ModifyLocation((IWineD3DSurface *) front, SFLAG_INDRAWABLE, TRUE); IWineD3DSurface_ModifyLocation((IWineD3DSurface *) back, SFLAG_INDRAWABLE, TRUE); } + } else { + IWineD3DSurface_ModifyLocation(This->frontBuffer, SFLAG_INDRAWABLE, TRUE); + /* If the swapeffect is DISCARD, the back buffer is undefined. That means the SYSMEM + * and INTEXTURE copies can keep their old content if they have any defined content. + * If the swapeffect is COPY, the content remains the same. If it is FLIP however, + * the texture / sysmem copy needs to be reloaded from the drawable + */ + if(This->presentParms.SwapEffect == WINED3DSWAPEFFECT_FLIP) { + IWineD3DSurface_ModifyLocation(This->backBuffer[0], SFLAG_INDRAWABLE, TRUE); + } } if(This->presentParms.PresentationInterval != WINED3DPRESENT_INTERVAL_IMMEDIATE && GL_SUPPORT(SGI_VIDEO_SYNC)) {

1 0

Stefan Dösinger : wined3d: Implement overlay position tracking.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: e795d842ec092a4d136da078231e5a007292cda0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e795d842ec092a4d136da0782… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Aug 5 12:19:43 2008 +0200 wined3d: Implement overlay position tracking. --- dlls/ddraw/surface.c | 8 ++++- dlls/wined3d/surface_base.c | 59 +++++++++++++++++++++++++++++++++++-- dlls/wined3d/wined3d_private.h | 5 +++ include/wine/wined3d_interface.h | 1 + include/wine/wined3d_types.h | 24 +++++++++++++++ 5 files changed, 92 insertions(+), 5 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index a716149..bc25218 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -1841,7 +1841,13 @@ IDirectDrawSurfaceImpl_UpdateOverlay(IDirectDrawSurface7 *iface, Flags, (WINEDDOVERLAYFX *) FX); LeaveCriticalSection(&ddraw_cs); - return hr; + switch(hr) { + case WINED3DERR_INVALIDCALL: return DDERR_INVALIDPARAMS; + case WINEDDERR_NOTAOVERLAYSURFACE: return DDERR_NOTAOVERLAYSURFACE; + case WINEDDERR_OVERLAYNOTVISIBLE: return DDERR_OVERLAYNOTVISIBLE; + default: + return hr; + } } /***************************************************************************** diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 400c7a7..59d0958 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -357,8 +357,9 @@ DWORD WINAPI IWineD3DBaseSurfaceImpl_GetPitch(IWineD3DSurface *iface) { HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetOverlayPosition(IWineD3DSurface *iface, LONG X, LONG Y) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + LONG w, h; - FIXME("(%p)->(%d,%d) Stub!\n", This, X, Y); + TRACE("(%p)->(%d,%d) Stub!\n", This, X, Y); if(!(This->resource.usage & WINED3DUSAGE_OVERLAY)) { @@ -366,21 +367,38 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetOverlayPosition(IWineD3DSurface *iface return WINEDDERR_NOTAOVERLAYSURFACE; } + w = This->overlay_destrect.right - This->overlay_destrect.left; + h = This->overlay_destrect.bottom - This->overlay_destrect.top; + This->overlay_destrect.left = X; + This->overlay_destrect.top = Y; + This->overlay_destrect.right = X + w; + This->overlay_destrect.bottom = Y + h; + return WINED3D_OK; } HRESULT WINAPI IWineD3DBaseSurfaceImpl_GetOverlayPosition(IWineD3DSurface *iface, LONG *X, LONG *Y) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + HRESULT hr; - FIXME("(%p)->(%p,%p) Stub!\n", This, X, Y); + TRACE("(%p)->(%p,%p)\n", This, X, Y); if(!(This->resource.usage & WINED3DUSAGE_OVERLAY)) { TRACE("(%p): Not an overlay surface\n", This); return WINEDDERR_NOTAOVERLAYSURFACE; } + if(This->overlay_dest == NULL) { + *X = 0; *Y = 0; + hr = WINEDDERR_OVERLAYNOTVISIBLE; + } else { + *X = This->overlay_destrect.left; + *Y = This->overlay_destrect.top; + hr = WINED3D_OK; + } - return WINED3D_OK; + TRACE("Returning 0x%08x, position %d, %d\n", hr, *X, *Y); + return hr; } HRESULT WINAPI IWineD3DBaseSurfaceImpl_UpdateOverlayZOrder(IWineD3DSurface *iface, DWORD Flags, IWineD3DSurface *Ref) { @@ -405,8 +423,41 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_UpdateOverlay(IWineD3DSurface *iface, REC if(!(This->resource.usage & WINED3DUSAGE_OVERLAY)) { - TRACE("(%p): Not an overlay surface\n", This); + WARN("(%p): Not an overlay surface\n", This); return WINEDDERR_NOTAOVERLAYSURFACE; + } else if(!DstSurface) { + WARN("(%p): Dest surface is NULL\n", This); + return WINED3DERR_INVALIDCALL; + } + + if(SrcRect) { + This->overlay_srcrect = *SrcRect; + } else { + This->overlay_srcrect.left = 0; + This->overlay_srcrect.top = 0; + This->overlay_srcrect.right = This->currentDesc.Width; + This->overlay_srcrect.bottom = This->currentDesc.Height; + } + + if(DstRect) { + This->overlay_destrect = *DstRect; + } else { + This->overlay_destrect.left = 0; + This->overlay_destrect.top = 0; + This->overlay_destrect.right = Dst ? Dst->currentDesc.Width : 0; + This->overlay_destrect.bottom = Dst ? Dst->currentDesc.Height : 0; + } + + if(Flags & WINEDDOVER_SHOW) { + This->overlay_dest = Dst; + + } else if(Flags & WINEDDOVER_HIDE) { + /* tests show that the rectangles are erased on hide */ + This->overlay_srcrect.left = 0; This->overlay_srcrect.top = 0; + This->overlay_srcrect.right = 0; This->overlay_srcrect.bottom = 0; + This->overlay_destrect.left = 0; This->overlay_destrect.top = 0; + This->overlay_destrect.right = 0; This->overlay_destrect.bottom = 0; + This->overlay_dest = NULL; } return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c1432ec..4d31b8c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1326,6 +1326,11 @@ struct IWineD3DSurfaceImpl /* DirectDraw clippers */ IWineD3DClipper *clipper; + + /* DirectDraw Overlay handling */ + RECT overlay_srcrect; + RECT overlay_destrect; + IWineD3DSurfaceImpl *overlay_dest; }; extern const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl; diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 76d5843..a99a37c 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -80,6 +80,7 @@ struct IWineD3DSurface; #define WINEDDERR_SURFACEBUSY MAKE_WINED3DHRESULT(430) #define WINEDDERR_INVALIDRECT MAKE_WINED3DHRESULT(150) #define WINEDDERR_NOCLIPLIST MAKE_WINED3DHRESULT(205) +#define WINEDDERR_OVERLAYNOTVISIBLE MAKE_WINED3DHRESULT(577) #define WINED3DOK_NOAUTOGEN MAKE_WINED3DSTATUS(2159) /***************************************************************************** diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index c4d10f5..bbfbcff 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -1803,4 +1803,28 @@ typedef struct _WINEDDOVERLAYFX #define WINEDDFLIP_INTERVAL3 0x03000000 #define WINEDDFLIP_INTERVAL4 0x04000000 +#define WINEDDOVER_ALPHADEST 0x00000001 +#define WINEDDOVER_ALPHADESTCONSTOVERRIDE 0x00000002 +#define WINEDDOVER_ALPHADESTNEG 0x00000004 +#define WINEDDOVER_ALPHADESTSURFACEOVERRIDE 0x00000008 +#define WINEDDOVER_ALPHAEDGEBLEND 0x00000010 +#define WINEDDOVER_ALPHASRC 0x00000020 +#define WINEDDOVER_ALPHASRCCONSTOVERRIDE 0x00000040 +#define WINEDDOVER_ALPHASRCNEG 0x00000080 +#define WINEDDOVER_ALPHASRCSURFACEOVERRIDE 0x00000100 +#define WINEDDOVER_HIDE 0x00000200 +#define WINEDDOVER_KEYDEST 0x00000400 +#define WINEDDOVER_KEYDESTOVERRIDE 0x00000800 +#define WINEDDOVER_KEYSRC 0x00001000 +#define WINEDDOVER_KEYSRCOVERRIDE 0x00002000 +#define WINEDDOVER_SHOW 0x00004000 +#define WINEDDOVER_ADDDIRTYRECT 0x00008000 +#define WINEDDOVER_REFRESHDIRTYRECTS 0x00010000 +#define WINEDDOVER_REFRESHALL 0x00020000 +#define WINEDDOVER_DDFX 0x00080000 +#define WINEDDOVER_AUTOFLIP 0x00100000 +#define WINEDDOVER_BOB 0x00200000 +#define WINEDDOVER_OVERRIDEBOBWEAVE 0x00400000 +#define WINEDDOVER_INTERLEAVED 0x00800000 + #endif

1 0

Stefan Dösinger : wined3d: Basic overlay emulation with opengl.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: fad3f9ba98bcf7931fac442d493071e4d5e1c332 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fad3f9ba98bcf7931fac442d4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Aug 1 13:12:18 2008 -0500 wined3d: Basic overlay emulation with opengl. --- dlls/wined3d/surface.c | 23 ++++++++++++++++++++++- dlls/wined3d/surface_base.c | 6 +++++- dlls/wined3d/surface_gdi.c | 8 +++++++- include/wine/wined3d_interface.h | 2 ++ 4 files changed, 36 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b15e2a0..42ce5d1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1378,6 +1378,11 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { unlock_end: This->Flags &= ~SFLAG_LOCKED; memset(&This->lockedRect, 0, sizeof(RECT)); + + /* Overlays have to be redrawn manually after changes with the GL implementation */ + if(This->overlay_dest) { + IWineD3DSurface_DrawOverlay(iface); + } return WINED3D_OK; } @@ -3338,6 +3343,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * /* Activate the destination context, set it up for blitting */ + myDevice->activeContext->last_was_blit = FALSE; ActivateContext(myDevice, (IWineD3DSurface *) This, CTXUSAGE_BLIT); if(!dstSwapchain) { @@ -4452,6 +4458,20 @@ static WINED3DSURFTYPE WINAPI IWineD3DSurfaceImpl_GetImplType(IWineD3DSurface *i return SURFACE_OPENGL; } +static HRESULT WINAPI IWineD3DSurfaceImpl_DrawOverlay(IWineD3DSurface *iface) { + IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + HRESULT hr; + + /* If there's no destination surface there is nothing to do */ + if(!This->overlay_dest) return WINED3D_OK; + + hr = IWineD3DSurfaceImpl_Blt((IWineD3DSurface *) This->overlay_dest, &This->overlay_destrect, + iface, &This->overlay_srcrect, WINEDDBLT_WAIT, + NULL, WINED3DTEXF_LINEAR); + + return hr; +} + const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = { /* IUnknown */ @@ -4508,5 +4528,6 @@ const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl = IWineD3DSurfaceImpl_PrivateSetup, IWineD3DSurfaceImpl_ModifyLocation, IWineD3DSurfaceImpl_LoadLocation, - IWineD3DSurfaceImpl_GetImplType + IWineD3DSurfaceImpl_GetImplType, + IWineD3DSurfaceImpl_DrawOverlay }; diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 59d0958..3816329 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -374,6 +374,8 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetOverlayPosition(IWineD3DSurface *iface This->overlay_destrect.right = X + w; This->overlay_destrect.bottom = Y + h; + IWineD3DSurface_DrawOverlay(iface); + return WINED3D_OK; } @@ -419,7 +421,7 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_UpdateOverlayZOrder(IWineD3DSurface *ifac HRESULT WINAPI IWineD3DBaseSurfaceImpl_UpdateOverlay(IWineD3DSurface *iface, RECT *SrcRect, IWineD3DSurface *DstSurface, RECT *DstRect, DWORD Flags, WINEDDOVERLAYFX *FX) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; IWineD3DSurfaceImpl *Dst = (IWineD3DSurfaceImpl *) DstSurface; - FIXME("(%p)->(%p, %p, %p, %08x, %p)\n", This, SrcRect, Dst, DstRect, Flags, FX); + TRACE("(%p)->(%p, %p, %p, %08x, %p)\n", This, SrcRect, Dst, DstRect, Flags, FX); if(!(This->resource.usage & WINED3DUSAGE_OVERLAY)) { @@ -460,6 +462,8 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_UpdateOverlay(IWineD3DSurface *iface, REC This->overlay_dest = NULL; } + IWineD3DSurface_DrawOverlay(iface); + return WINED3D_OK; } diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 030b848..60564b4 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -801,6 +801,11 @@ static WINED3DSURFTYPE WINAPI IWineGDISurfaceImpl_GetImplType(IWineD3DSurface *i return SURFACE_GDI; } +static HRESULT WINAPI IWineGDISurfaceImpl_DrawOverlay(IWineD3DSurface *iface) { + FIXME("GDI surfaces can't draw overlays yet\n"); + return E_FAIL; +} + /* FIXME: This vtable should not use any IWineD3DSurface* implementation functions, * only IWineD3DBaseSurface and IWineGDISurface ones. */ @@ -860,5 +865,6 @@ const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl = IWineGDISurfaceImpl_PrivateSetup, IWineGDISurfaceImpl_ModifyLocation, IWineGDISurfaceImpl_LoadLocation, - IWineGDISurfaceImpl_GetImplType + IWineGDISurfaceImpl_GetImplType, + IWineGDISurfaceImpl_DrawOverlay }; diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index a99a37c..b478cda 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -1175,6 +1175,7 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWineD3DResource) STDMETHOD_(void,ModifyLocation)(THIS_ DWORD flag, BOOL persistent); STDMETHOD(LoadLocation)(THIS_ DWORD flag, const RECT *rect); STDMETHOD_(WINED3DSURFTYPE,GetImplType)(THIS); + STDMETHOD(DrawOverlay)(THIS); }; #undef INTERFACE @@ -1235,6 +1236,7 @@ DECLARE_INTERFACE_(IWineD3DSurface,IWineD3DResource) #define IWineD3DSurface_ModifyLocation(p,a,b) (p)->lpVtbl->ModifyLocation(p,a,b) #define IWineD3DSurface_LoadLocation(p,a,b) (p)->lpVtbl->LoadLocation(p,a,b) #define IWineD3DSurface_GetImplType(p) (p)->lpVtbl->GetImplType(p) +#define IWineD3DSurface_DrawOverlay(p) (p)->lpVtbl->DrawOverlay(p) #endif /*****************************************************************************

1 0

Stefan Dösinger : wined3d: Move the pshader fog update to the vertex pipeline.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: a7d5b1e9a5b05f3df902264980fda02ccc6f4966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a7d5b1e9a5b05f3df90226498… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 4 10:55:26 2008 -0500 wined3d: Move the pshader fog update to the vertex pipeline. --- dlls/wined3d/arb_program_shader.c | 1 - dlls/wined3d/state.c | 27 ++++++++++++++++++--------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4e1fe09..dbb7f3f 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -2816,7 +2816,6 @@ static void fragment_prog_arbfp(DWORD state, IWineD3DStateBlockImpl *stateblock, device->StateTable[STATE_VERTEXSHADERCONSTANT].apply(STATE_VERTEXSHADERCONSTANT, stateblock, context); } } - context->last_was_pshader = use_pshader; if(use_pshader) { device->StateTable[STATE_PIXELSHADERCONSTANT].apply(STATE_PIXELSHADERCONSTANT, stateblock, context); } diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index a6903c6..dd81378 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3562,11 +3562,26 @@ static void sampler(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DCont } } +void apply_pshader_fog(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { + IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; + + if (use_ps(device)) { + if(!context->last_was_pshader) { + state_fog(state, stateblock, context); + } + context->last_was_pshader = TRUE; + } else { + if(context->last_was_pshader) { + state_fog(state, stateblock, context); + } + context->last_was_pshader = FALSE; + } +} + void apply_pixelshader(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { IWineD3DDeviceImpl *device = stateblock->wineD3DDevice; BOOL use_pshader = use_ps(device); BOOL use_vshader = use_vs(device); - BOOL update_fog = FALSE; int i; if (use_pshader) { @@ -3580,7 +3595,6 @@ void apply_pixelshader(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DC sampler(STATE_SAMPLER(i), stateblock, context); } } - update_fog = TRUE; } else { /* Otherwise all samplers were activated by the code above in earlier draws, or by sampler() * if a different texture was bound. I don't have to do anything. @@ -3599,8 +3613,6 @@ void apply_pixelshader(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DC (STATE_TEXTURESTAGE(i, WINED3DTSS_COLOROP), stateblock, context); } } - if(context->last_was_pshader) - update_fog = TRUE; } if(!isStateDirty(context, device->StateTable[STATE_VSHADER].representative)) { @@ -3610,11 +3622,6 @@ void apply_pixelshader(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DC shaderconstant(STATE_VERTEXSHADERCONSTANT, stateblock, context); } } - - if(update_fog) - state_fog(state, stateblock, context); - - context->last_was_pshader = use_pshader; } static void shader_bumpenvmat(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *context) { @@ -5406,6 +5413,8 @@ const struct StateEntryTemplate ffp_vertexstate_template[] = { { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), state_psizemax_arb }, ARB_POINT_PARAMETERS }, { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), state_psizemax_ext }, EXT_POINT_PARAMETERS }, { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), { STATE_RENDER(WINED3DRS_POINTSIZE_MAX), state_psizemax_w }, 0 }, + /* pixel shaders need a different fog input */ + { STATE_PIXELSHADER, { STATE_PIXELSHADER, apply_pshader_fog }, 0 }, /* Samplers for NP2 texture matrix adjustions. They are not needed if GL_ARB_texture_non_power_of_two is supported, * so register a NULL state handler in that case to get the vertex part of sampler() skipped(VTF is handled in the misc states. * otherwise, register sampler_texmatrix, which takes care of updating the texture matrix

1 0

Stefan Dösinger : wined3d: Remove a glFlush.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: eb0264e2b385579cc39c12cf12cd6ad3946816f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=eb0264e2b385579cc39c12cf1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 4 13:36:15 2008 -0500 wined3d: Remove a glFlush. --- dlls/wined3d/surface.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 10c8ab1..b15e2a0 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1188,8 +1188,6 @@ static void flush_to_framebuffer_drawpixels(IWineD3DSurfaceImpl *This, GLenum fm IWineD3DSwapChain_Release((IWineD3DSwapChain *)swapchain); } - glFlush(); - vcheckGLcall("glFlush"); glGetIntegerv(GL_PACK_SWAP_BYTES, &prev_store); vcheckGLcall("glIntegerv"); glGetIntegerv(GL_CURRENT_RASTER_POSITION, &prev_rasterpos[0]);

1 0

Stefan Dösinger : wined3d: Call glFlush outside the GL lock.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 44d419ad8e203926710c8b2bf291e69586ce2bd3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=44d419ad8e203926710c8b2bf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Aug 4 13:34:47 2008 -0500 wined3d: Call glFlush outside the GL lock. --- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/surface.c | 12 +++++------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9e97d3b..dab4b38 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4945,10 +4945,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_EndScene(IWineD3DDevice *iface) { ActivateContext(This, This->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); /* We only have to do this if we need to read the, swapbuffers performs a flush for us */ - ENTER_GL(); glFlush(); - checkGLcall("glFlush"); - LEAVE_GL(); + /* No checkGLcall here to avoid locking the lock just for checking a call that hardly ever + * fails + */ This->inScene = FALSE; return WINED3D_OK; diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cb4d879..10c8ab1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3438,10 +3438,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * checkGLcall("glDisable(GL_ALPHA_TEST)"); } - /* Flush in case the drawable is used by multiple GL contexts */ - if(dstSwapchain && (This == (IWineD3DSurfaceImpl *) dstSwapchain->frontBuffer || dstSwapchain->num_contexts >= 2)) - glFlush(); - glBindTexture(Src->glDescription.target, 0); checkGLcall("glBindTexture(Src->glDescription.target, 0)"); /* Leave the opengl state valid for blitting */ @@ -3465,6 +3461,10 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * LEAVE_GL(); + /* Flush in case the drawable is used by multiple GL contexts */ + if(dstSwapchain && (This == (IWineD3DSurfaceImpl *) dstSwapchain->frontBuffer || dstSwapchain->num_contexts >= 2)) + glFlush(); + /* TODO: If the surface is locked often, perform the Blt in software on the memory instead */ /* The surface is now in the drawable. On onscreen surfaces or without fbos the texture * is outdated now @@ -3729,9 +3729,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_RealizePalette(IWineD3DSurface *iface) { /* Without this some palette updates are missed. This at least happens on Nvidia drivers but * it works fine using Mesa. */ - ENTER_GL(); glFlush(); - LEAVE_GL(); } else { if(!(This->Flags & SFLAG_INSYSMEM)) { TRACE("Palette changed with surface that does not have an up to date system memory copy\n"); @@ -4183,6 +4181,7 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT glDisable(GL_TEXTURE_2D); checkGLcall("glDisable(GL_TEXTURE_2D)"); } + LEAVE_GL(); hr = IWineD3DSurface_GetContainer((IWineD3DSurface*)This, &IID_IWineD3DSwapChain, (void **) &swapchain); if(hr == WINED3D_OK && swapchain) { @@ -4204,7 +4203,6 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT IWineD3DBaseTexture_Release(texture); } } - LEAVE_GL(); } /*****************************************************************************

1 0

Andrew Talbot : hhctrl.ocx: Sign-compare warning fix.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: da335a6c916e3ee57205ee69a99dac3e6ec37f91 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da335a6c916e3ee57205ee69a… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Mon Aug 4 22:39:20 2008 +0100 hhctrl.ocx: Sign-compare warning fix. --- dlls/hhctrl.ocx/chm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hhctrl.ocx/chm.c b/dlls/hhctrl.ocx/chm.c index 699fa04..e8d036b 100644 --- a/dlls/hhctrl.ocx/chm.c +++ b/dlls/hhctrl.ocx/chm.c @@ -413,7 +413,7 @@ CHMInfo *CloseCHM(CHMInfo *chm) IStream_Release(chm->strings_stream); if(chm->strings_size) { - int i; + DWORD i; for(i=0; i<chm->strings_size; i++) heap_free(chm->strings[i]);

1 0

James Hawkins : advpack: Fix a failing test in win98.
by Alexandre Julliard 05 Aug '08

05 Aug '08

Module: wine Branch: master Commit: 35e16a2b42b059017b9d7145810a84a77c3b6de8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=35e16a2b42b059017b9d71458… Author: James Hawkins <jhawkins(a)codeweavers.com> Date: Mon Aug 4 17:52:47 2008 -0500 advpack: Fix a failing test in win98. --- dlls/advpack/tests/files.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/advpack/tests/files.c b/dlls/advpack/tests/files.c index d018975..9ddd3bc 100644 --- a/dlls/advpack/tests/files.c +++ b/dlls/advpack/tests/files.c @@ -97,6 +97,7 @@ static BOOL check_ini_file_attr(LPSTR filename) static void test_AddDelBackupEntry(void) { + BOOL ret; HRESULT res; CHAR path[MAX_PATH]; CHAR windir[MAX_PATH]; @@ -165,7 +166,10 @@ static void test_AddDelBackupEntry(void) res = pAddDelBackupEntry("one\0three\0", NULL, "basename", AADBE_DEL_ENTRY); SetFileAttributesA(path, FILE_ATTRIBUTE_NORMAL); ok(res == S_OK, "Expected S_OK, got %d\n", res); - ok(DeleteFileA(path), "Expected path to exist\n"); + ret = DeleteFileA(path); + ok(ret == TRUE || + broken(ret == FALSE), /* win98 */ + "Expected path to exist\n"); } /* the FCI callbacks */

1 0