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

Vincent Povirk : gdiplus: Create HBITMAP-less bitmap objects for exotic pixel formats.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 9a6eabf0b52e7d8f9728ba7a3afe2659a7ebed73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a6eabf0b52e7d8f9728ba7a3… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sun Aug 8 16:18:40 2010 -0500 gdiplus: Create HBITMAP-less bitmap objects for exotic pixel formats. --- dlls/gdiplus/gdiplus_private.h | 3 + dlls/gdiplus/graphics.c | 39 +++++++++++++++ dlls/gdiplus/image.c | 103 ++++++++++++++++++++++++++-------------- dlls/gdiplus/tests/graphics.c | 6 +- 4 files changed, 113 insertions(+), 38 deletions(-) diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 908a1b7..f3393d4 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -49,6 +49,8 @@ extern REAL gdiplus_atan2(REAL dy, REAL dx); extern GpStatus hresult_to_status(HRESULT res); extern REAL convert_unit(REAL logpixels, GpUnit unit); +extern GpStatus graphics_from_image(GpImage *image, GpGraphics **graphics); + extern void calc_curve_bezier(CONST GpPointF *pts, REAL tension, REAL *x1, REAL *y1, REAL *x2, REAL *y2); extern void calc_curve_bezier_endp(REAL xend, REAL yend, REAL xadj, REAL yadj, @@ -269,6 +271,7 @@ struct GpBitmap{ HDC hdc; BYTE *bits; /* actual image bits if this is a DIB */ INT stride; /* stride of bits if this is a DIB */ + BYTE *own_bits; /* image bits that need to be freed with this object */ }; struct GpCachedBitmap{ diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 79290b5..e748477 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1254,6 +1254,45 @@ GpStatus WINGDIPAPI GdipCreateFromHDC2(HDC hdc, HANDLE hDevice, GpGraphics **gra return Ok; } +GpStatus graphics_from_image(GpImage *image, GpGraphics **graphics) +{ + GpStatus retval; + + *graphics = GdipAlloc(sizeof(GpGraphics)); + if(!*graphics) return OutOfMemory; + + if((retval = GdipCreateMatrix(&(*graphics)->worldtrans)) != Ok){ + GdipFree(*graphics); + return retval; + } + + if((retval = GdipCreateRegion(&(*graphics)->clip)) != Ok){ + GdipFree((*graphics)->worldtrans); + GdipFree(*graphics); + return retval; + } + + (*graphics)->hdc = NULL; + (*graphics)->hwnd = NULL; + (*graphics)->owndc = FALSE; + (*graphics)->image = image; + (*graphics)->smoothing = SmoothingModeDefault; + (*graphics)->compqual = CompositingQualityDefault; + (*graphics)->interpolation = InterpolationModeDefault; + (*graphics)->pixeloffset = PixelOffsetModeDefault; + (*graphics)->compmode = CompositingModeSourceOver; + (*graphics)->unit = UnitDisplay; + (*graphics)->scale = 1.0; + (*graphics)->busy = FALSE; + (*graphics)->textcontrast = 4; + list_init(&(*graphics)->containers); + (*graphics)->contid = 0; + + TRACE("<-- %p\n", *graphics); + + return Ok; +} + GpStatus WINGDIPAPI GdipCreateFromHWND(HWND hwnd, GpGraphics **graphics) { GpStatus ret; diff --git a/dlls/gdiplus/image.c b/dlls/gdiplus/image.c index 57c9f83..536eebb 100644 --- a/dlls/gdiplus/image.c +++ b/dlls/gdiplus/image.c @@ -1626,10 +1626,10 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, PixelFormat format, BYTE* scan0, GpBitmap** bitmap) { BITMAPINFO* pbmi; - HBITMAP hbitmap; + HBITMAP hbitmap=NULL; INT row_size, dib_stride; HDC hdc; - BYTE *bits; + BYTE *bits=NULL, *own_bits=NULL; int i; REAL xres, yres; GpStatus stat; @@ -1655,39 +1655,63 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, if(stride == 0) stride = dib_stride; - pbmi = GdipAlloc(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); - if (!pbmi) - return OutOfMemory; + if (format & PixelFormatGDI) + { + pbmi = GdipAlloc(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); + if (!pbmi) + return OutOfMemory; - pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - pbmi->bmiHeader.biWidth = width; - pbmi->bmiHeader.biHeight = -height; - pbmi->bmiHeader.biPlanes = 1; - /* FIXME: use the rest of the data from format */ - pbmi->bmiHeader.biBitCount = PIXELFORMATBPP(format); - pbmi->bmiHeader.biCompression = BI_RGB; - pbmi->bmiHeader.biSizeImage = 0; - pbmi->bmiHeader.biXPelsPerMeter = 0; - pbmi->bmiHeader.biYPelsPerMeter = 0; - pbmi->bmiHeader.biClrUsed = 0; - pbmi->bmiHeader.biClrImportant = 0; + pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); + pbmi->bmiHeader.biWidth = width; + pbmi->bmiHeader.biHeight = -height; + pbmi->bmiHeader.biPlanes = 1; + /* FIXME: use the rest of the data from format */ + pbmi->bmiHeader.biBitCount = PIXELFORMATBPP(format); + pbmi->bmiHeader.biCompression = BI_RGB; + pbmi->bmiHeader.biSizeImage = 0; + pbmi->bmiHeader.biXPelsPerMeter = 0; + pbmi->bmiHeader.biYPelsPerMeter = 0; + pbmi->bmiHeader.biClrUsed = 0; + pbmi->bmiHeader.biClrImportant = 0; + + hdc = CreateCompatibleDC(NULL); + if (!hdc) { + GdipFree(pbmi); + return GenericError; + } - hdc = CreateCompatibleDC(NULL); - if (!hdc) { + hbitmap = CreateDIBSection(hdc, pbmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + + DeleteDC(hdc); GdipFree(pbmi); - return GenericError; - } - hbitmap = CreateDIBSection(hdc, pbmi, DIB_RGB_COLORS, (void**)&bits, NULL, 0); + if (!hbitmap) return GenericError; + } + else + { + /* Not a GDI format; don't try to make an HBITMAP. */ + if (scan0) + { + /* FIXME: We should do this with GDI formats too when scan0 is + * provided, but for now we need the HDC for most drawing + * operations. */ + bits = scan0; + } + else + { + INT size = abs(stride) * height; - DeleteDC(hdc); - GdipFree(pbmi); + own_bits = bits = GdipAlloc(size); + if (!own_bits) return OutOfMemory; - if (!hbitmap) return GenericError; + if (stride < 0) + bits += stride * (1 - height); + } + } /* copy bits to the dib if necessary */ /* FIXME: should reference the bits instead of copying them */ - if (scan0) + if (scan0 && bits != scan0) for (i=0; i<height; i++) memcpy(bits+i*dib_stride, scan0+i*stride, row_size); @@ -1695,6 +1719,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, if(!*bitmap) { DeleteObject(hbitmap); + GdipFree(own_bits); return OutOfMemory; } @@ -1715,6 +1740,7 @@ GpStatus WINGDIPAPI GdipCreateBitmapFromScan0(INT width, INT height, INT stride, (*bitmap)->hdc = NULL; (*bitmap)->bits = bits; (*bitmap)->stride = dib_stride; + (*bitmap)->own_bits = own_bits; if (format == PixelFormat1bppIndexed || format == PixelFormat4bppIndexed || @@ -1916,6 +1942,7 @@ static void move_bitmap(GpBitmap *dst, GpBitmap *src, BOOL clobber_palette) dst->hdc = src->hdc; dst->bits = src->bits; dst->stride = src->stride; + dst->own_bits = src->own_bits; GdipFree(src); } @@ -1932,6 +1959,7 @@ GpStatus WINGDIPAPI GdipDisposeImage(GpImage *image) if (image->type == ImageTypeBitmap) { GdipFree(((GpBitmap*)image)->bitmapbits); + GdipFree(((GpBitmap*)image)->own_bits); DeleteDC(((GpBitmap*)image)->hdc); DeleteObject(((GpBitmap*)image)->hbitmap); } @@ -2048,18 +2076,23 @@ GpStatus WINGDIPAPI GdipGetImageGraphicsContext(GpImage *image, return NotImplemented; } - hdc = ((GpBitmap*)image)->hdc; + if (((GpBitmap*)image)->hbitmap) + { + hdc = ((GpBitmap*)image)->hdc; - if(!hdc){ - hdc = CreateCompatibleDC(0); - SelectObject(hdc, ((GpBitmap*)image)->hbitmap); - ((GpBitmap*)image)->hdc = hdc; - } + if(!hdc){ + hdc = CreateCompatibleDC(0); + SelectObject(hdc, ((GpBitmap*)image)->hbitmap); + ((GpBitmap*)image)->hdc = hdc; + } - stat = GdipCreateFromHDC(hdc, graphics); + stat = GdipCreateFromHDC(hdc, graphics); - if (stat == Ok) - (*graphics)->image = image; + if (stat == Ok) + (*graphics)->image = image; + } + else + stat = graphics_from_image(image, graphics); return stat; } diff --git a/dlls/gdiplus/tests/graphics.c b/dlls/gdiplus/tests/graphics.c index 441367e..609f426 100644 --- a/dlls/gdiplus/tests/graphics.c +++ b/dlls/gdiplus/tests/graphics.c @@ -2616,7 +2616,7 @@ static void test_GdipGetNearestColor(void) GdipDisposeImage((GpImage*)bitmap); status = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat48bppRGB, NULL, &bitmap); - todo_wine expect(Ok, status); + expect(Ok, status); if (status == Ok) { status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); @@ -2629,7 +2629,7 @@ static void test_GdipGetNearestColor(void) } status = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat64bppARGB, NULL, &bitmap); - todo_wine expect(Ok, status); + expect(Ok, status); if (status == Ok) { status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics); @@ -2642,7 +2642,7 @@ static void test_GdipGetNearestColor(void) } status = GdipCreateBitmapFromScan0(10, 10, 10, PixelFormat64bppPARGB, NULL, &bitmap); - todo_wine expect(Ok, status); + expect(Ok, status); if (status == Ok) { status = GdipGetImageGraphicsContext((GpImage*)bitmap, &graphics);

1 0

Vincent Povirk : gdiplus: Stub GdipSetPathGradientTransform.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 1fdecda9da804f33bfa31a2b67922f990b839e08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fdecda9da804f33bfa31a2b6… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Jun 24 17:19:18 2010 -0500 gdiplus: Stub GdipSetPathGradientTransform. --- dlls/gdiplus/brush.c | 13 +++++++++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 14 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 3063a64..4b90dac 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1601,6 +1601,19 @@ GpStatus WINGDIPAPI GdipSetPathGradientWrapMode(GpPathGradient *grad, return Ok; } +GpStatus WINGDIPAPI GdipSetPathGradientTransform(GpPathGradient *grad, + GpMatrix *matrix) +{ + static int calls; + + TRACE("(%p,%p)\n", grad, matrix); + + if(!(calls++)) + FIXME("not implemented\n"); + + return NotImplemented; +} + GpStatus WINGDIPAPI GdipMultiplyPathGradientTransform(GpPathGradient *grad, GDIPCONST GpMatrix *matrix, GpMatrixOrder order) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 5cb755c..91e3e59 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -559,7 +559,7 @@ @ stdcall GdipSetPathGradientPresetBlend(ptr ptr ptr long) @ stdcall GdipSetPathGradientSigmaBlend(ptr long long) @ stdcall GdipSetPathGradientSurroundColorsWithCount(ptr ptr ptr) -@ stub GdipSetPathGradientTransform +@ stdcall GdipSetPathGradientTransform(ptr ptr) @ stdcall GdipSetPathGradientWrapMode(ptr long) @ stdcall GdipSetPathMarker(ptr) @ stdcall GdipSetPenBrushFill(ptr ptr)

1 0

André Hentschel : jscript: Update German translation.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 56d024fd5ea3351f09c76b42b469c12a9ad5fc32 URL: http://source.winehq.org/git/wine.git/?a=commit;h=56d024fd5ea3351f09c76b42b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Aug 16 19:44:18 2010 +0200 jscript: Update German translation. --- dlls/jscript/jscript_De.rc | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/jscript_De.rc b/dlls/jscript/jscript_De.rc index 82628c9..f3a643c 100644 --- a/dlls/jscript/jscript_De.rc +++ b/dlls/jscript/jscript_De.rc @@ -28,6 +28,7 @@ STRINGTABLE IDS_INVALID_CALL_ARG "Ungültiger Funktionsaufruf oder Argument" IDS_CREATE_OBJ_ERROR "Automatisierungsserver konnte das Objekt nicht erstellen" IDS_NO_PROPERTY "Das Objekt unterstützt diese Eigenschaft oder Methode nicht" + IDS_UNSUPPORTED_ACTION "Das Objekt unterstützt diese Aktion nicht" IDS_ARG_NOT_OPT "Argument nicht optional" IDS_SYNTAX_ERROR "Syntax Fehler" IDS_SEMICOLON "';' erwartet"

1 0

Henri Verbeet : wined3d: Remove SetContainer() from the public IWineD3DVolume interface.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 89e6a607322eb28195ff72c5ab563a2c0277860a URL: http://source.winehq.org/git/wine.git/?a=commit;h=89e6a607322eb28195ff72c5a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 16 20:00:22 2010 +0200 wined3d: Remove SetContainer() from the public IWineD3DVolume interface. --- dlls/wined3d/volume.c | 21 +++++++-------------- dlls/wined3d/volumetexture.c | 8 ++++---- dlls/wined3d/wined3d_private.h | 1 + include/wine/wined3d.idl | 3 --- 4 files changed, 12 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index c22c263..0d9b82d 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -93,6 +93,13 @@ void volume_add_dirty_box(IWineD3DVolume *iface, const WINED3DBOX *dirty_box) } } +void volume_set_container(IWineD3DVolumeImpl *volume, IWineD3DBase *container) +{ + TRACE("volume %p, container %p.\n", volume, container); + + volume->container = container; +} + /* ******************************************* IWineD3DVolume IUnknown parts follow ******************************************* */ @@ -301,19 +308,6 @@ static HRESULT WINAPI IWineD3DVolumeImpl_UnlockBox(IWineD3DVolume *iface) { /* Internal use functions follow : */ -static HRESULT WINAPI IWineD3DVolumeImpl_SetContainer(IWineD3DVolume *iface, IWineD3DBase* container) { - IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; - - TRACE("This %p, container %p\n", This, container); - - /* We can't keep a reference to the container, since the container already keeps a reference to us. */ - - TRACE("Setting container to %p from %p\n", container, This->container); - This->container = container; - - return WINED3D_OK; -} - /* Context activation is done by the caller. */ static HRESULT WINAPI IWineD3DVolumeImpl_LoadTexture(IWineD3DVolume *iface, int gl_level, BOOL srgb_mode) { @@ -382,7 +376,6 @@ static const IWineD3DVolumeVtbl IWineD3DVolume_Vtbl = IWineD3DVolumeImpl_UnlockBox, /* Internal interface */ IWineD3DVolumeImpl_LoadTexture, - IWineD3DVolumeImpl_SetContainer }; HRESULT volume_init(IWineD3DVolumeImpl *volume, IWineD3DDeviceImpl *device, UINT width, diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 9fccb2b..648f381 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -85,13 +85,13 @@ static void volumetexture_cleanup(IWineD3DVolumeTextureImpl *This) for (i = 0; i < This->baseTexture.level_count; ++i) { - IWineD3DVolume *volume = (IWineD3DVolume *)This->baseTexture.sub_resources[i]; + IWineD3DVolumeImpl *volume = (IWineD3DVolumeImpl *)This->baseTexture.sub_resources[i]; if (volume) { /* Cleanup the container. */ - IWineD3DVolume_SetContainer(volume, NULL); - IWineD3DVolume_Release(volume); + volume_set_container(volume, NULL); + IWineD3DVolume_Release((IWineD3DVolume *)volume); } } basetexture_cleanup((IWineD3DBaseTexture *)This); @@ -466,7 +466,7 @@ HRESULT volumetexture_init(IWineD3DVolumeTextureImpl *texture, UINT width, UINT } /* Set its container to this texture. */ - IWineD3DVolume_SetContainer(volume, (IWineD3DBase *)texture); + volume_set_container((IWineD3DVolumeImpl *)volume, (IWineD3DBase *)texture); texture->baseTexture.sub_resources[i] = (IWineD3DResourceImpl *)volume; /* Calculate the next mipmap level. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e21685e..7c5dded 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1935,6 +1935,7 @@ void volume_add_dirty_box(IWineD3DVolume *iface, const WINED3DBOX *dirty_box) DE HRESULT volume_init(IWineD3DVolumeImpl *volume, IWineD3DDeviceImpl *device, UINT width, UINT height, UINT depth, DWORD usage, WINED3DFORMAT format, WINED3DPOOL pool, IUnknown *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; +void volume_set_container(IWineD3DVolumeImpl *volume, IWineD3DBase *container) DECLSPEC_HIDDEN; /***************************************************************************** * IWineD3DVolumeTexture implementation structure (extends IWineD3DBaseTextureImpl) diff --git a/include/wine/wined3d.idl b/include/wine/wined3d.idl index e15ea4d..1a439b6 100644 --- a/include/wine/wined3d.idl +++ b/include/wine/wined3d.idl @@ -2522,9 +2522,6 @@ interface IWineD3DVolume : IWineD3DResource [in] int gl_level, [in] BOOL srgb_mode ); - HRESULT SetContainer( - [in] IWineD3DBase *container - ); } [

1 0

Henri Verbeet : wined3d: Remove SetContainer() from the public IWineD3DSurface interface.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 61db577a4b885417a87c369b4a508017d10e68ed URL: http://source.winehq.org/git/wine.git/?a=commit;h=61db577a4b885417a87c369b4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 16 20:00:23 2010 +0200 wined3d: Remove SetContainer() from the public IWineD3DSurface interface. --- dlls/wined3d/cubetexture.c | 4 +- dlls/wined3d/device.c | 12 +++--- dlls/wined3d/surface.c | 73 ++++++++++++++++++++------------------- dlls/wined3d/surface_base.c | 13 ------- dlls/wined3d/surface_gdi.c | 1 - dlls/wined3d/swapchain.c | 10 +++--- dlls/wined3d/swapchain_gdi.c | 4 +- dlls/wined3d/texture.c | 4 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.idl | 3 -- 10 files changed, 55 insertions(+), 71 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=61db577a4b885417a87c3…

1 0

Henri Verbeet : wined3d: A volume's container is always a volume texture.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: b0fb388edb8c2a1f910780e4779bc251fccd1342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b0fb388edb8c2a1f910780e47… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 16 20:00:24 2010 +0200 wined3d: A volume's container is always a volume texture. --- dlls/wined3d/volume.c | 39 +++++++++------------------------------ dlls/wined3d/volumetexture.c | 2 +- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 12 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 0d9b82d..9b82fab 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -30,7 +30,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); static void volume_bind_and_dirtify(IWineD3DVolume *iface) { IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; const struct wined3d_gl_info *gl_info = &This->resource.device->adapter->gl_info; - IWineD3DVolumeTexture *texture; DWORD active_sampler; /* We don't need a specific texture unit, but after binding the texture the current unit is dirty. @@ -60,12 +59,7 @@ static void volume_bind_and_dirtify(IWineD3DVolume *iface) { IWineD3DDeviceImpl_MarkStateDirty(This->resource.device, STATE_SAMPLER(active_sampler)); } - if (SUCCEEDED(IWineD3DSurface_GetContainer(iface, &IID_IWineD3DVolumeTexture, (void **)&texture))) { - IWineD3DVolumeTexture_BindTexture(texture, FALSE); - IWineD3DVolumeTexture_Release(texture); - } else { - ERR("Volume should be part of a volume texture\n"); - } + IWineD3DVolumeTexture_BindTexture((IWineD3DVolumeTexture *)This->container, FALSE); } void volume_add_dirty_box(IWineD3DVolume *iface, const WINED3DBOX *dirty_box) @@ -93,7 +87,7 @@ void volume_add_dirty_box(IWineD3DVolume *iface, const WINED3DBOX *dirty_box) } } -void volume_set_container(IWineD3DVolumeImpl *volume, IWineD3DBase *container) +void volume_set_container(IWineD3DVolumeImpl *volume, struct IWineD3DVolumeTextureImpl *container) { TRACE("volume %p, container %p.\n", volume, container); @@ -207,7 +201,7 @@ static HRESULT WINAPI IWineD3DVolumeImpl_GetContainer(IWineD3DVolume *iface, REF } TRACE("Relaying to QueryInterface\n"); - return IUnknown_QueryInterface(This->container, riid, ppContainer); + return IUnknown_QueryInterface((IWineD3DVolumeTexture *)This->container, riid, ppContainer); } static HRESULT WINAPI IWineD3DVolumeImpl_GetDesc(IWineD3DVolume *iface, WINED3DVOLUME_DESC* pDesc) { @@ -265,27 +259,12 @@ static HRESULT WINAPI IWineD3DVolumeImpl_LockBox(IWineD3DVolume *iface, WINED3DL if (Flags & (WINED3DLOCK_NO_DIRTY_UPDATE | WINED3DLOCK_READONLY)) { /* Don't dirtify */ - } else { - /** - * Dirtify on lock - * as seen in msdn docs - */ - volume_add_dirty_box(iface, &This->lockedBox); - - /** Dirtify Container if needed */ - if (NULL != This->container) { - - IWineD3DVolumeTexture *cont = (IWineD3DVolumeTexture*) This->container; - WINED3DRESOURCETYPE containerType = IWineD3DBaseTexture_GetType((IWineD3DBaseTexture *) cont); - - if (containerType == WINED3DRTYPE_VOLUMETEXTURE) { - IWineD3DBaseTextureImpl* pTexture = (IWineD3DBaseTextureImpl*) cont; - pTexture->baseTexture.texture_rgb.dirty = TRUE; - pTexture->baseTexture.texture_srgb.dirty = TRUE; - } else { - FIXME("Set dirty on container type %d\n", containerType); - } - } + } + else + { + volume_add_dirty_box(iface, &This->lockedBox); + This->container->baseTexture.texture_rgb.dirty = TRUE; + This->container->baseTexture.texture_srgb.dirty = TRUE; } This->locked = TRUE; diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 648f381..b1f7ae6 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -466,7 +466,7 @@ HRESULT volumetexture_init(IWineD3DVolumeTextureImpl *texture, UINT width, UINT } /* Set its container to this texture. */ - volume_set_container((IWineD3DVolumeImpl *)volume, (IWineD3DBase *)texture); + volume_set_container((IWineD3DVolumeImpl *)volume, texture); texture->baseTexture.sub_resources[i] = (IWineD3DResourceImpl *)volume; /* Calculate the next mipmap level. */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c7e3025..7f59d24 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1923,7 +1923,7 @@ typedef struct IWineD3DVolumeImpl /* WineD3DVolume Information */ WINED3DVOLUMET_DESC currentDesc; - IWineD3DBase *container; + struct IWineD3DVolumeTextureImpl *container; BOOL lockable; BOOL locked; WINED3DBOX lockedBox; @@ -1935,7 +1935,7 @@ void volume_add_dirty_box(IWineD3DVolume *iface, const WINED3DBOX *dirty_box) DE HRESULT volume_init(IWineD3DVolumeImpl *volume, IWineD3DDeviceImpl *device, UINT width, UINT height, UINT depth, DWORD usage, WINED3DFORMAT format, WINED3DPOOL pool, IUnknown *parent, const struct wined3d_parent_ops *parent_ops) DECLSPEC_HIDDEN; -void volume_set_container(IWineD3DVolumeImpl *volume, IWineD3DBase *container) DECLSPEC_HIDDEN; +void volume_set_container(IWineD3DVolumeImpl *volume, struct IWineD3DVolumeTextureImpl *container) DECLSPEC_HIDDEN; /***************************************************************************** * IWineD3DVolumeTexture implementation structure (extends IWineD3DBaseTextureImpl)

1 0

Henri Verbeet : wined3d: Also store the subresource container type.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 0b24db5db5468808d29b69036dc09492b86e1b9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b24db5db5468808d29b69036… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 16 20:00:25 2010 +0200 wined3d: Also store the subresource container type. --- dlls/wined3d/arb_program_shader.c | 3 ++- dlls/wined3d/context.c | 9 +++++---- dlls/wined3d/cubetexture.c | 4 ++-- dlls/wined3d/device.c | 12 ++++++------ dlls/wined3d/surface.c | 28 +++++++++++----------------- dlls/wined3d/surface_base.c | 2 +- dlls/wined3d/swapchain.c | 10 +++++----- dlls/wined3d/swapchain_gdi.c | 4 ++-- dlls/wined3d/texture.c | 4 ++-- dlls/wined3d/wined3d_private.h | 22 ++++++++++++++++++++-- 10 files changed, 56 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0b24db5db5468808d29b6…

1 0

Henri Verbeet : wined3d: Get rid of the now redundant SFLAG_SWAPCHAIN surface flag.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 8292c687d8285704f5bc4bafa9d7017bc5113064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8292c687d8285704f5bc4bafa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 16 20:00:26 2010 +0200 wined3d: Get rid of the now redundant SFLAG_SWAPCHAIN surface flag. --- dlls/wined3d/device.c | 10 ---------- dlls/wined3d/surface.c | 5 +++-- dlls/wined3d/swapchain.c | 2 -- dlls/wined3d/wined3d_private.h | 1 - 4 files changed, 3 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 057c107..d615004 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5650,17 +5650,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetFrontBackBuffers(IWineD3DDevice *ifa TRACE("Changing the front buffer from %p to %p.\n", swapchain->front_buffer, front_impl); if (swapchain->front_buffer) - { surface_set_container(swapchain->front_buffer, WINED3D_CONTAINER_NONE, NULL); - swapchain->front_buffer->Flags &= ~SFLAG_SWAPCHAIN; - } swapchain->front_buffer = front_impl; if (front_impl) - { surface_set_container(front_impl, WINED3D_CONTAINER_SWAPCHAIN, (IWineD3DBase *)swapchain); - front_impl->Flags |= SFLAG_SWAPCHAIN; - } } if (swapchain->back_buffers[0] != back_impl) @@ -5668,10 +5662,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetFrontBackBuffers(IWineD3DDevice *ifa TRACE("Changing the back buffer from %p to %p.\n", swapchain->back_buffers[0], back_impl); if (swapchain->back_buffers[0]) - { surface_set_container(swapchain->back_buffers[0], WINED3D_CONTAINER_TEXTURE, NULL); - swapchain->back_buffers[0]->Flags &= ~SFLAG_SWAPCHAIN; - } swapchain->back_buffers[0] = back_impl; if (back_impl) @@ -5682,7 +5673,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetFrontBackBuffers(IWineD3DDevice *ifa swapchain->presentParms.BackBufferCount = 1; surface_set_container(back_impl, WINED3D_CONTAINER_SWAPCHAIN, (IWineD3DBase *)swapchain); - back_impl->Flags |= SFLAG_SWAPCHAIN; } else { diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f9771ba..d264e18 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1700,7 +1700,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED } if (!(wined3d_settings.rendertargetlock_mode == RTL_DISABLE - && ((This->Flags & SFLAG_SWAPCHAIN) || This == device->render_targets[0]))) + && ((This->container.type == WINED3D_CONTAINER_SWAPCHAIN) || This == device->render_targets[0]))) { surface_load_location(This, SFLAG_INSYSMEM, pass_rect); } @@ -1892,7 +1892,8 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_UnlockRect(IWineD3DSurface *iface) { goto unlock_end; } - if ((This->Flags & SFLAG_SWAPCHAIN) || (device->render_targets && This == device->render_targets[0])) + if (This->container.type == WINED3D_CONTAINER_SWAPCHAIN + || (device->render_targets && This == device->render_targets[0])) { if(wined3d_settings.rendertargetlock_mode == RTL_DISABLE) { static BOOL warned = FALSE; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index ea38bf1..c376cbf 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -732,7 +732,6 @@ HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface } surface_set_container(swapchain->front_buffer, WINED3D_CONTAINER_SWAPCHAIN, (IWineD3DBase *)swapchain); - swapchain->front_buffer->Flags |= SFLAG_SWAPCHAIN; if (surface_type == SURFACE_OPENGL) { surface_modify_location(swapchain->front_buffer, SFLAG_INDRAWABLE, TRUE); @@ -848,7 +847,6 @@ HRESULT swapchain_init(IWineD3DSwapChainImpl *swapchain, WINED3DSURFTYPE surface } surface_set_container(swapchain->back_buffers[i], WINED3D_CONTAINER_SWAPCHAIN, (IWineD3DBase *)swapchain); - swapchain->back_buffers[i]->Flags |= SFLAG_SWAPCHAIN; } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 384af7d..b99dc8c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2185,7 +2185,6 @@ void flip_surface(IWineD3DSurfaceImpl *front, IWineD3DSurfaceImpl *back) DECLSPE #define SFLAG_DS_ONSCREEN 0x00200000 /* Is a depth stencil, last modified onscreen */ #define SFLAG_DS_OFFSCREEN 0x00400000 /* Is a depth stencil, last modified offscreen */ #define SFLAG_INOVERLAYDRAW 0x00800000 /* Overlay drawing is in progress. Recursion prevention */ -#define SFLAG_SWAPCHAIN 0x01000000 /* The surface is part of a swapchain */ /* In some conditions the surface memory must not be freed: * SFLAG_CONVERTED: Converting the data back would take too long

1 0

Henri Verbeet : wined3d: Avoid IWineD3DSurface_GetContainer().
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 368e5eb87ae983e4ea2f66b3ca2f4154b36bbcda URL: http://source.winehq.org/git/wine.git/?a=commit;h=368e5eb87ae983e4ea2f66b3c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 16 20:00:27 2010 +0200 wined3d: Avoid IWineD3DSurface_GetContainer(). --- dlls/wined3d/context.c | 8 +-- dlls/wined3d/surface.c | 139 ++++++++++++++++++++------------------------ dlls/wined3d/surface_gdi.c | 18 +++--- 3 files changed, 73 insertions(+), 92 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=368e5eb87ae983e4ea2f6…

1 0

Henri Verbeet : dsound: Remove the useless CINTERFACE definition.
by Alexandre Julliard 17 Aug '10

17 Aug '10

Module: wine Branch: master Commit: 049edc9587b5dd19e0c47695106ab23d4d358f23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=049edc9587b5dd19e0c476951… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 16 20:00:28 2010 +0200 dsound: Remove the useless CINTERFACE definition. --- dlls/dsound/duplex.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/dsound/duplex.c b/dlls/dsound/duplex.c index dbe811b..4a1fbd2 100644 --- a/dlls/dsound/duplex.c +++ b/dlls/dsound/duplex.c @@ -24,7 +24,6 @@ #define NONAMELESSSTRUCT #define NONAMELESSUNION -#define CINTERFACE #define COBJMACROS #include "windef.h" #include "winbase.h"

1 0