September 2008 - Wine-commits

Nikolay Sivov : gdiplus: Initial GdipFlattenPath implementation.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: 72304d837720ac789c068e6691651af56b7db761 URL: http://source.winehq.org/git/wine.git/?a=commit;h=72304d837720ac789c068e669… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Sep 3 19:11:53 2008 +0400 gdiplus: Initial GdipFlattenPath implementation. --- dlls/gdiplus/graphicspath.c | 228 ++++++++++++++++++++++++++++++++++++- dlls/gdiplus/tests/graphicspath.c | 45 ++++++-- 2 files changed, 259 insertions(+), 14 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=72304d837720ac789c068…

1 0

Nikolay Sivov : gdiplus: Fix curve closing in GdipDrawClosedCurve2.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: 9c60a57ad1e28bda4b687007b511709d7f889f81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c60a57ad1e28bda4b687007b… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Sep 3 19:57:09 2008 +0400 gdiplus: Fix curve closing in GdipDrawClosedCurve2. --- dlls/gdiplus/graphics.c | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7045a34..1265bd7 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1102,7 +1102,7 @@ GpStatus WINGDIPAPI GdipDrawClosedCurveI(GpGraphics *graphics, GpPen *pen, GpStatus WINGDIPAPI GdipDrawClosedCurve2(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *points, INT count, REAL tension) { - GpPointF *ptf; + GpPath *path; GpStatus stat; TRACE("(%p, %p, %p, %d, %.2f)\n", graphics, pen, points, count, tension); @@ -1113,18 +1113,18 @@ GpStatus WINGDIPAPI GdipDrawClosedCurve2(GpGraphics *graphics, GpPen *pen, if(graphics->busy) return ObjectBusy; - /* make a full points copy.. */ - ptf = GdipAlloc(sizeof(GpPointF)*(count+1)); - if(!ptf) - return OutOfMemory; - memcpy(ptf, points, sizeof(GpPointF)*count); + if((stat = GdipCreatePath(FillModeAlternate, &path)) != Ok) + return stat; - /* ..and add a first point as a last one */ - ptf[count] = ptf[0]; + stat = GdipAddPathClosedCurve2(path, points, count, tension); + if(stat != Ok){ + GdipDeletePath(path); + return stat; + } - stat = GdipDrawCurve2(graphics, pen, ptf, count + 1, tension); + stat = GdipDrawPath(graphics, pen, path); - GdipFree(ptf); + GdipDeletePath(path); return stat; }

1 0

Nikolay Sivov : gdiplus: Stubs for AdjustableArrowCap calls.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: 50bfa9b0eba6275352b8494cde2cd6ff49c40966 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50bfa9b0eba6275352b8494cd… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Sep 3 20:34:58 2008 +0400 gdiplus: Stubs for AdjustableArrowCap calls. --- dlls/gdiplus/customlinecap.c | 91 ++++++++++++++++++++++++++++++++++++++++ dlls/gdiplus/gdiplus.spec | 18 ++++---- dlls/gdiplus/gdiplus_private.h | 4 ++ include/gdiplusflat.h | 9 ++++ include/gdiplusgpstubs.h | 2 + 5 files changed, 115 insertions(+), 9 deletions(-) diff --git a/dlls/gdiplus/customlinecap.c b/dlls/gdiplus/customlinecap.c index 7fb7f4a..5658e69 100644 --- a/dlls/gdiplus/customlinecap.c +++ b/dlls/gdiplus/customlinecap.c @@ -233,3 +233,94 @@ GpStatus WINGDIPAPI GdipGetCustomLineCapBaseCap(GpCustomLineCap *customCap, GpLi return Ok; } + +GpStatus WINGDIPAPI GdipCreateAdjustableArrowCap(REAL height, REAL width, BOOL fill, + GpAdjustableArrowCap **cap) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipGetAdjustableArrowCapFillState(GpAdjustableArrowCap* cap, BOOL* fill) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipGetAdjustableArrowCapHeight(GpAdjustableArrowCap* cap, REAL* height) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipGetAdjustableArrowCapMiddleInset(GpAdjustableArrowCap* cap, REAL* middle) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipGetAdjustableArrowCapWidth(GpAdjustableArrowCap* cap, REAL* width) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipSetAdjustableArrowCapFillState(GpAdjustableArrowCap* cap, BOOL fill) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipSetAdjustableArrowCapHeight(GpAdjustableArrowCap* cap, REAL height) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipSetAdjustableArrowCapMiddleInset(GpAdjustableArrowCap* cap, REAL middle) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + +GpStatus WINGDIPAPI GdipSetAdjustableArrowCapWidth(GpAdjustableArrowCap* cap, REAL width) +{ + static int calls; + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 97ab0c6..e25ceb7 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -69,7 +69,7 @@ @ stdcall GdipConvertToEmfPlus(ptr ptr ptr long ptr ptr) @ stub GdipConvertToEmfPlusToFile @ stub GdipConvertToEmfPlusToStream -@ stub GdipCreateAdjustableArrowCap +@ stdcall GdipCreateAdjustableArrowCap(long long long ptr) @ stub GdipCreateBitmapFromDirectDrawSurface @ stdcall GdipCreateBitmapFromFile(wstr ptr) @ stdcall GdipCreateBitmapFromFileICM(wstr ptr) @@ -236,10 +236,10 @@ @ stdcall GdipFlattenPath(ptr ptr long) @ stdcall GdipFlush(ptr long) @ stdcall GdipFree(ptr) -@ stub GdipGetAdjustableArrowCapFillState -@ stub GdipGetAdjustableArrowCapHeight -@ stub GdipGetAdjustableArrowCapMiddleInset -@ stub GdipGetAdjustableArrowCapWidth +@ stdcall GdipGetAdjustableArrowCapFillState(ptr ptr) +@ stdcall GdipGetAdjustableArrowCapHeight(ptr ptr) +@ stdcall GdipGetAdjustableArrowCapMiddleInset(ptr ptr) +@ stdcall GdipGetAdjustableArrowCapWidth(ptr ptr) @ stub GdipGetAllPropertyItems @ stdcall GdipGetBrushType(ptr ptr) @ stdcall GdipGetCellAscent(ptr long ptr) @@ -502,10 +502,10 @@ @ stub GdipScalePenTransform @ stub GdipScaleTextureTransform @ stdcall GdipScaleWorldTransform(ptr long long long) -@ stub GdipSetAdjustableArrowCapFillState -@ stub GdipSetAdjustableArrowCapHeight -@ stub GdipSetAdjustableArrowCapMiddleInset -@ stub GdipSetAdjustableArrowCapWidth +@ stdcall GdipSetAdjustableArrowCapFillState(ptr long) +@ stdcall GdipSetAdjustableArrowCapHeight(ptr long) +@ stdcall GdipSetAdjustableArrowCapMiddleInset(ptr long) +@ stdcall GdipSetAdjustableArrowCapWidth(ptr long) @ stub GdipSetClipGraphics @ stub GdipSetClipHrgn @ stub GdipSetClipPath diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 4eb847c..8a6ddec 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -167,6 +167,10 @@ struct GpCustomLineCap{ REAL scale; }; +struct GpAdustableArrowCap{ + GpCustomLineCap cap; +}; + struct GpImage{ IPicture* picture; ImageType type; diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index 12e8d94..cbadd8b 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -526,6 +526,15 @@ GpStatus WINGDIPAPI GdipSetMetafileDownLevelRasterizationLimit(GpMetafile*,UINT) GpStatus WINGDIPAPI GdipSetClipRectI(GpGraphics*,INT,INT,INT,INT,CombineMode); GpStatus WINGDIPAPI GdipFillRegion(GpGraphics*,GpBrush*,GpRegion*); +GpStatus WINGDIPAPI GdipCreateAdjustableArrowCap(REAL,REAL,BOOL,GpAdjustableArrowCap**); +GpStatus WINGDIPAPI GdipGetAdjustableArrowCapFillState(GpAdjustableArrowCap*,BOOL*); +GpStatus WINGDIPAPI GdipGetAdjustableArrowCapHeight(GpAdjustableArrowCap*,REAL*); +GpStatus WINGDIPAPI GdipGetAdjustableArrowCapMiddleInset(GpAdjustableArrowCap*,REAL*); +GpStatus WINGDIPAPI GdipGetAdjustableArrowCapWidth(GpAdjustableArrowCap*,REAL*); +GpStatus WINGDIPAPI GdipSetAdjustableArrowCapFillState(GpAdjustableArrowCap*,BOOL); +GpStatus WINGDIPAPI GdipSetAdjustableArrowCapHeight(GpAdjustableArrowCap*,REAL); +GpStatus WINGDIPAPI GdipSetAdjustableArrowCapMiddleInset(GpAdjustableArrowCap*,REAL); +GpStatus WINGDIPAPI GdipSetAdjustableArrowCapWidth(GpAdjustableArrowCap*,REAL); #ifdef __cplusplus } diff --git a/include/gdiplusgpstubs.h b/include/gdiplusgpstubs.h index bb7c47f..917097e 100644 --- a/include/gdiplusgpstubs.h +++ b/include/gdiplusgpstubs.h @@ -28,6 +28,7 @@ class GpPath {}; class GpMatrix {}; class GpPathIterator {}; class GpCustomLineCap {}; +class GpAdjustableArrowCap : public GpCustomLineCap {}; class GpImage {}; class GpMetafile : public GpImage {}; class GpImageAttributes {}; @@ -52,6 +53,7 @@ typedef struct GpPath GpPath; typedef struct GpMatrix GpMatrix; typedef struct GpPathIterator GpPathIterator; typedef struct GpCustomLineCap GpCustomLineCap; +typedef struct GpAdjustableArrowCap GpAdjustableArrowCap; typedef struct GpImage GpImage; typedef struct GpMetafile GpMetafile; typedef struct GpImageAttributes GpImageAttributes;

1 0

Stefan Dösinger : wined3d: Compressed surface sizes are multiples of 4.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: da1030f36c24a5654b33064bcc7a87450dca4795 URL: http://source.winehq.org/git/wine.git/?a=commit;h=da1030f36c24a5654b33064bc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Aug 31 23:16:10 2008 -0500 wined3d: Compressed surface sizes are multiples of 4. Since those surfaces are stored in blocks, the 4 pixel step doesn't only apply to surfaces < 4, but also to surfaces bigger than that, with a non-multiple-of-4 size. --- dlls/wined3d/device.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b0181fa..735dbc1 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -588,6 +588,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSurface(IWineD3DDevice *iface, U unsigned int Size = 1; const GlPixelFormatDesc *glDesc; const StaticPixelFormatDesc *tableEntry = getFormatDescEntry(Format, &GLINFO_LOCATION, &glDesc); + UINT mul_4w, mul_4h; TRACE("(%p) Create surface\n",This); /** FIXME: Check ranges on the inputs are valid @@ -625,16 +626,18 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSurface(IWineD3DDevice *iface, U * it is based around 4x4 pixel blocks it requires padding, so allocate enough * space! *********************************/ + mul_4w = (Width + 3) & ~3; + mul_4h = (Height + 3) & ~3; if (WINED3DFMT_UNKNOWN == Format) { Size = 0; } else if (Format == WINED3DFMT_DXT1) { /* DXT1 is half byte per pixel */ - Size = ((max(Width,4) * tableEntry->bpp) * max(Height,4)) >> 1; + Size = (mul_4w * tableEntry->bpp * mul_4h) >> 1; } else if (Format == WINED3DFMT_DXT2 || Format == WINED3DFMT_DXT3 || Format == WINED3DFMT_DXT4 || Format == WINED3DFMT_DXT5 || Format == WINED3DFMT_ATI2N) { - Size = ((max(Width,4) * tableEntry->bpp) * max(Height,4)); + Size = (mul_4w * tableEntry->bpp * mul_4h); } else { /* The pitch is a multiple of 4 bytes */ Size = ((Width * tableEntry->bpp) + This->surface_alignment - 1) & ~(This->surface_alignment - 1);

1 0

Vincent Povirk : user32/tests: Don' t check menu items when testing MNS_CHECKORBMP.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: 491e44d4257527e37cff4d5f28b499b5a3d08cdd URL: http://source.winehq.org/git/wine.git/?a=commit;h=491e44d4257527e37cff4d5f2… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Wed Sep 3 16:08:22 2008 -0500 user32/tests: Don't check menu items when testing MNS_CHECKORBMP. If the MNS_CHECKORBMP style is set on a menu, and the menu is checked, the bitmap is not drawn. For the menu tests, that means we get no WM_DRAWITEM message for an owner-drawn bitmap, and the bounding box of the bitmap is not tested. We should leave the menu item unchecked in this case so we can test it. --- dlls/user32/tests/menu.c | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index 4e879c6..74cb2a0 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -357,7 +357,8 @@ static void test_mbs_help( int ispop, int hassub, int mnuopt, MOD_GotDrawItemMsg = FALSE; mii.fMask = MIIM_FTYPE | MIIM_DATA | MIIM_STATE; mii.fType = 0; - mii.fState = MF_CHECKED; + /* check the menu item unless MNS_CHECKORBMP is set */ + mii.fState = (mnuopt != 2 ? MFS_CHECKED : MFS_UNCHECKED); mii.dwItemData =0; MODsizes[0] = bmpsize; hastab = 0; @@ -447,10 +448,20 @@ static void test_mbs_help( int ispop, int hassub, int mnuopt, if( hbmp == HBMMENU_CALLBACK && MOD_GotDrawItemMsg) { /* check the position of the bitmap */ /* horizontal */ - expect = ispop ? (4 + ( mnuopt ? 0 : GetSystemMetrics(SM_CXMENUCHECK))) - : 3; - ok( expect == MOD_rc[0].left, - "bitmap left is %d expected %d\n", MOD_rc[0].left, expect); + if (!ispop) + expect = 3; + else if (mnuopt == 0) + expect = 4 + GetSystemMetrics(SM_CXMENUCHECK); + else if (mnuopt == 1) + expect = 4; + else /* mnuopt == 2 */ + expect = 2; + if (ispop && mnuopt == 2) + todo_wine ok( expect == MOD_rc[0].left, + "bitmap left is %d expected %d\n", MOD_rc[0].left, expect); + else + ok( expect == MOD_rc[0].left, + "bitmap left is %d expected %d\n", MOD_rc[0].left, expect); failed = failed || !(expect == MOD_rc[0].left); /* vertical */ expect = (rc.bottom - rc.top - MOD_rc[0].bottom + MOD_rc[0].top) / 2;

1 0

Alexander Dorofeyev : wined3d: Make the condition to enter p8 conversion shader path more strict.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: 5c7f2906eeaa9825049eea53240edd71606ec103 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c7f2906eeaa9825049eea532… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Wed Sep 3 23:59:41 2008 +0300 wined3d: Make the condition to enter p8 conversion shader path more strict. This prevents shader path from being entered for an offscreen surface when there is p8 render target and fixes failures in ddraw visual test (with opengl rendering and RTL_READDRAW mode) and visual glitches in Red Alert. --- dlls/wined3d/surface.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 500b05d..283b159 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1533,7 +1533,11 @@ HRESULT d3dfmt_get_conv(IWineD3DSurfaceImpl *This, BOOL need_alpha_ck, BOOL use_ * in which the main render target uses p8. Some games like GTA Vice City use P8 for texturing which * conflicts with this. */ - if( !(GL_SUPPORT(EXT_PALETTED_TEXTURE) || (GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && primary_render_target_is_p8(device))) || colorkey_active || !use_texturing ) { + if( !(GL_SUPPORT(EXT_PALETTED_TEXTURE) || + (GL_SUPPORT(ARB_FRAGMENT_PROGRAM) && + device->render_targets && + This == (IWineD3DSurfaceImpl*)device->render_targets[0])) || + colorkey_active || !use_texturing ) { *format = GL_RGBA; *internal = GL_RGBA; *type = GL_UNSIGNED_BYTE;

1 0

Alexander Dorofeyev : wined3d: Remove glDrawBuffer calls in BltOverride.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: 7c38816819178e517d150110e7520dc8ed0ad1c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c38816819178e517d150110e… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Wed Sep 3 23:59:46 2008 +0300 wined3d: Remove glDrawBuffer calls in BltOverride. Handled in ActivateContext, must be remains of pre-context management code. --- dlls/wined3d/surface.c | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 283b159..31cb368 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3468,9 +3468,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * } ENTER_GL(); - glDrawBuffer(buffer); - checkGLcall("glDrawBuffer"); - myDevice->blitter->set_shader((IWineD3DDevice *) myDevice, Src->resource.format, Src->glDescription.target, Src->pow2Width, Src->pow2Height); @@ -3543,13 +3540,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * /* Leave the opengl state valid for blitting */ myDevice->blitter->unset_shader((IWineD3DDevice *) myDevice); - /* The draw buffer should only need to be restored if we were drawing to the front buffer, and there is a back buffer. - * otherwise the context manager should choose between GL_BACK / offscreenDrawBuffer - */ - if(dstSwapchain && This == (IWineD3DSurfaceImpl *) dstSwapchain->frontBuffer && dstSwapchain->backBuffer) { - glDrawBuffer(GL_BACK); - checkGLcall("glDrawBuffer"); - } /* Restore the color key parameters */ Src->CKeyFlags = oldCKeyFlags; Src->SrcBltCKey = oldBltCKey;

1 0

Alexander Dorofeyev : wined3d: Get rid of gl buffer variable in BltOverride .
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: 1bcd6e45080063ab9396506efb9cd5ad914c251e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bcd6e45080063ab9396506ef… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Wed Sep 3 23:59:53 2008 +0300 wined3d: Get rid of gl buffer variable in BltOverride. Uses This == dstSwapchain->frontBuffer instead as suggested by Henri Verbeet. --- dlls/wined3d/surface.c | 34 ++++++++++------------------------ 1 files changed, 10 insertions(+), 24 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 31cb368..99379dd 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3368,7 +3368,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * WINEDDCOLORKEY oldBltCKey = Src->SrcBltCKey; RECT SourceRectangle; BOOL paletteOverride = FALSE; - GLenum buffer; TRACE("Blt from surface %p to rendertarget %p\n", Src, This); @@ -3442,29 +3441,16 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * /* Activate the destination context, set it up for blitting */ ActivateContext(myDevice, (IWineD3DSurface *) This, CTXUSAGE_BLIT); - if(!dstSwapchain) { - TRACE("Drawing to offscreen buffer\n"); - buffer = myDevice->offscreenBuffer; - } else { - buffer = surface_get_gl_buffer((IWineD3DSurface *)This, (IWineD3DSwapChain *)dstSwapchain); - - /* Front buffer coordinates are screen coordinates, while OpenGL coordinates are - * window relative. Also beware of the origin difference(top left vs bottom left). - * Also beware that the front buffer's surface size is screen width x screen height, - * whereas the real gl drawable size is the size of the window. - */ - if(buffer == GL_FRONT) { - RECT windowsize; - POINT offset = {0,0}; - UINT h; - ClientToScreen(dstSwapchain->win_handle, &offset); - GetClientRect(dstSwapchain->win_handle, &windowsize); - h = windowsize.bottom - windowsize.top; - rect.x1 -= offset.x; rect.x2 -=offset.x; - rect.y1 -= offset.y; rect.y2 -=offset.y; - rect.y1 += This->currentDesc.Height - h; rect.y2 += This->currentDesc.Height - h; - } - TRACE("Drawing to %#x buffer\n", buffer); + if (dstSwapchain && (IWineD3DSurface *)This == dstSwapchain->frontBuffer) { + RECT windowsize; + POINT offset = {0,0}; + UINT h; + ClientToScreen(dstSwapchain->win_handle, &offset); + GetClientRect(dstSwapchain->win_handle, &windowsize); + h = windowsize.bottom - windowsize.top; + rect.x1 -= offset.x; rect.x2 -=offset.x; + rect.y1 -= offset.y; rect.y2 -=offset.y; + rect.y1 += This->currentDesc.Height - h; rect.y2 += This->currentDesc.Height - h; } ENTER_GL();

1 0

Alexander Dorofeyev : wined3d: Remove obsolete code & ModifyLocation TODO.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: 78312704d9d4712f52e712ee6176e64bf7b020f6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=78312704d9d4712f52e712ee6… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Wed Sep 3 23:59:58 2008 +0300 wined3d: Remove obsolete code & ModifyLocation TODO. This fbo logic appears to have already been implemented in ModifyLocation. --- dlls/wined3d/device.c | 4 ---- dlls/wined3d/surface.c | 5 ----- 2 files changed, 0 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 74688dd..b0181fa 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5152,10 +5152,6 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfa * it is most likely more efficient to perform a clear on the sysmem copy too instead of downloading it */ IWineD3DSurface_ModifyLocation(This->lastActiveRenderTarget, SFLAG_INDRAWABLE, TRUE); - /* TODO: Move the fbo logic into ModifyLocation() */ - if(This->render_offscreen && wined3d_settings.offscreen_rendering_mode == ORM_FBO) { - target->Flags |= SFLAG_INTEXTURE; - } } if (Flags & WINED3DCLEAR_ZBUFFER) { /* Note that WINED3DCLEAR_ZBUFFER implies a depth stencil exists on the device */ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 99379dd..8b50cf3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3437,7 +3437,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * /* Now load the surface */ IWineD3DSurface_PreLoad((IWineD3DSurface *) Src); - /* Activate the destination context, set it up for blitting */ ActivateContext(myDevice, (IWineD3DSurface *) This, CTXUSAGE_BLIT); @@ -3545,10 +3544,6 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, RECT * * is outdated now */ IWineD3DSurface_ModifyLocation((IWineD3DSurface *) This, SFLAG_INDRAWABLE, TRUE); - /* TODO: This should be moved to ModifyLocation() */ - if(!(dstSwapchain || wined3d_settings.offscreen_rendering_mode != ORM_FBO)) { - This->Flags |= SFLAG_INTEXTURE; - } return WINED3D_OK; } else {

1 0

Alexandre Julliard : configure: Disable by default some modules that cannot work on Windows.
by Alexandre Julliard 04 Sep '08

04 Sep '08

Module: wine Branch: master Commit: ec1ebfb1361a874b9edf9bb2a7c5220a1ff1e22c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec1ebfb1361a874b9edf9bb2a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 4 12:29:07 2008 +0200 configure: Disable by default some modules that cannot work on Windows. --- configure | 7 +++++++ configure.ac | 8 ++++++++ 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 590bd05..32f32f1 100755 --- a/configure +++ b/configure @@ -8581,6 +8581,13 @@ fi IMPLIBEXT="a" WIN16_FILES="" WIN16_INSTALL="" + enable_iphlpapi=${enable_iphlpapi:-no} + enable_kernel32=${enable_kernel32:-no} + enable_msvcrt=${enable_msvcrt:-no} + enable_ntdll=${enable_ntdll:-no} + enable_ws2_32=${enable_ws2_32:-no} + enable_loader=${enable_loader:-no} + enable_server=${enable_server:-no} ;; darwin*|macosx*) DLLEXT=".so" diff --git a/configure.ac b/configure.ac index 589ee93..46d071e 100644 --- a/configure.ac +++ b/configure.ac @@ -475,6 +475,14 @@ case $host_os in dnl We can't build 16-bit NE dlls WIN16_FILES="" WIN16_INSTALL="" + dnl Disable modules that can't be used on Windows + enable_iphlpapi=${enable_iphlpapi:-no} + enable_kernel32=${enable_kernel32:-no} + enable_msvcrt=${enable_msvcrt:-no} + enable_ntdll=${enable_ntdll:-no} + enable_ws2_32=${enable_ws2_32:-no} + enable_loader=${enable_loader:-no} + enable_server=${enable_server:-no} ;; darwin*|macosx*) DLLEXT=".so"

1 0