wine-commits February 2010

wine-commits@winehq.org

2 participants
783 discussions

Christian Costa : d3drm: Remove wrong description.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 739c1177d9c0b8d28b226ad09fb033c83d53bd06 URL: http://source.winehq.org/git/wine.git/?a=commit;h=739c1177d9c0b8d28b226ad09… Author: Christian Costa <titan.costa(a)wanadoo.fr> Date: Mon Feb 15 09:49:03 2010 +0100 d3drm: Remove wrong description. --- dlls/d3drm/d3drm.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 849efea..72eb864 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -3,9 +3,6 @@ * * Copyright 2010 Christian Costa * - * This file contains the (internal) driver registration functions, - * driver enumeration APIs and DirectDraw creation functions. - * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public * License as published by the Free Software Foundation; either

1 0

Alexander Nicolaysen Sørnes : dsound/ tests: Test querying for KsPropertySet on primary buffer.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 9c88bd8d245c667979fe99c5e6aa78b2cae0ae07 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c88bd8d245c667979fe99c5e… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Mon Feb 15 00:59:27 2010 +0100 dsound/tests: Test querying for KsPropertySet on primary buffer. --- dlls/dsound/tests/ds3d.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/dsound/tests/ds3d.c b/dlls/dsound/tests/ds3d.c index 8ae0efa..ad380d8 100644 --- a/dlls/dsound/tests/ds3d.c +++ b/dlls/dsound/tests/ds3d.c @@ -1158,13 +1158,12 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) "to create a 3D primary buffer: %08x\n",rc); if (rc==DS_OK && primary!=NULL) { LPDIRECTSOUND3DLISTENER listener=NULL; + LPDIRECTSOUNDBUFFER temp_buffer=NULL; rc=IDirectSoundBuffer_QueryInterface(primary, &IID_IDirectSound3DListener,(void **)&listener); ok(rc==DS_OK && listener!=NULL,"IDirectSoundBuffer_QueryInterface() " "failed to get a 3D listener: %08x\n",rc); if (rc==DS_OK && listener!=NULL) { - LPDIRECTSOUNDBUFFER temp_buffer=NULL; - /* Checking the COM interface */ rc=IDirectSoundBuffer_QueryInterface(primary, &IID_IDirectSoundBuffer,(LPVOID *)&temp_buffer); @@ -1213,6 +1212,16 @@ static HRESULT test_primary_3d_with_listener(LPGUID lpGuid) "references, should have 0\n",ref); } + todo_wine { + temp_buffer = NULL; + rc=IDirectSoundBuffer_QueryInterface(primary, + &IID_IKsPropertySet,(LPVOID *)&temp_buffer); + ok(rc==DS_OK && temp_buffer!=NULL, + "IDirectSoundBuffer_QueryInterface didn't handle IKsPropertySet on primary buffer: ret = %08x\n", rc); + if(temp_buffer) + IKsPropertySet_Release(temp_buffer); + } + /* Testing the reference counting */ ref=IDirectSoundBuffer_Release(primary); ok(ref==0,"IDirectSoundBuffer_Release() primary has %d references, "

1 0

André Hentschel : cmd: Improve German translation.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: d00f0316463eb53fffff2edbdc9809876dc6a4a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d00f0316463eb53fffff2edbd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Feb 14 21:43:31 2010 +0100 cmd: Improve German translation. --- programs/cmd/De.rc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/cmd/De.rc b/programs/cmd/De.rc index 0e4fc44..2e83338 100644 --- a/programs/cmd/De.rc +++ b/programs/cmd/De.rc @@ -233,7 +233,7 @@ mit PUSHD gespeicherten.\n" Betriebssystem oder der Shell zurück, von der CMD gestart wurde.\n" - WCMD_ALLHELP, "CMD eingebauten Befehle sind:\n\ + WCMD_ALLHELP, "In CMD eingebaute Befehle sind:\n\ ATTRIB\t\tZeigt oder ändert die DOS Dateieigenschaften\n\ CALL\t\tRuft eine Batch-Datei innerhalb einer anderen auf\n\ CD (CHDIR)\tWechselt in ein Verzeichnis\n\

1 0

Vincent Povirk : ole32: Add error checking to StorageBaseImpl_CreateStorage .
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: d420a858da7db4948b7163809e1107bbe95d7eaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=d420a858da7db4948b7163809… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Feb 13 12:46:18 2010 -0600 ole32: Add error checking to StorageBaseImpl_CreateStorage. --- dlls/ole32/storage32.c | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index a7c12b5..88e0524 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -1132,15 +1132,22 @@ static HRESULT WINAPI StorageBaseImpl_CreateStorage( /* * Create a new directory entry for the storage */ - StorageBaseImpl_CreateDirEntry(This, &newEntry, &newEntryRef); + hr = StorageBaseImpl_CreateDirEntry(This, &newEntry, &newEntryRef); + if (FAILED(hr)) + return hr; /* * Insert the new directory entry into the parent storage's tree */ - insertIntoTree( + hr = insertIntoTree( This, This->storageDirEntry, newEntryRef); + if (FAILED(hr)) + { + StorageBaseImpl_DestroyDirEntry(This, newEntryRef); + return hr; + } /* * Open it to get a pointer to return.

1 0

Vincent Povirk : ole32: Add error checking to StorageBaseImpl_CreateStream.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 1fab6e351564724d36c6cf97ce10c7bc32b81e0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fab6e351564724d36c6cf97c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Feb 13 12:44:12 2010 -0600 ole32: Add error checking to StorageBaseImpl_CreateStream. --- dlls/ole32/storage32.c | 13 +++++++++++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/storage32.c b/dlls/ole32/storage32.c index 3beff78..a7c12b5 100644 --- a/dlls/ole32/storage32.c +++ b/dlls/ole32/storage32.c @@ -834,6 +834,7 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( StgStreamImpl* newStream; DirEntry currentEntry, newStreamEntry; DirRef currentEntryRef, newStreamEntryRef; + HRESULT hr; TRACE("(%p, %s, %x, %d, %d, %p)\n", iface, debugstr_w(pwcsName), grfMode, @@ -933,14 +934,22 @@ static HRESULT WINAPI StorageBaseImpl_CreateStream( /* * Create an entry with the new data */ - StorageBaseImpl_CreateDirEntry(This, &newStreamEntry, &newStreamEntryRef); + hr = StorageBaseImpl_CreateDirEntry(This, &newStreamEntry, &newStreamEntryRef); + if (FAILED(hr)) + return hr; + /* * Insert the new entry in the parent storage's tree. */ - insertIntoTree( + hr = insertIntoTree( This, This->storageDirEntry, newStreamEntryRef); + if (FAILED(hr)) + { + StorageBaseImpl_DestroyDirEntry(This, newStreamEntryRef); + return hr; + } /* * Open the stream to return it.

1 0

Vincent Povirk : gdiplus: Convert formats that can' t be drawn by gdi32 when drawing bitmaps.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 00dec58bb256233e1f2e896ed99216bd1ca91f37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=00dec58bb256233e1f2e896ed… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Fri Feb 5 13:48:36 2010 -0600 gdiplus: Convert formats that can't be drawn by gdi32 when drawing bitmaps. --- dlls/gdiplus/graphics.c | 20 +++++++++++++++----- 1 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 39ab18c..359b954 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1926,12 +1926,16 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image else return NotImplemented; - if (bitmap->format == PixelFormat32bppARGB) + if (!(bitmap->format == PixelFormat16bppRGB555 || + bitmap->format == PixelFormat24bppRGB || + bitmap->format == PixelFormat32bppRGB || + bitmap->format == PixelFormat32bppPARGB)) { BITMAPINFOHEADER bih; BYTE *temp_bits; + PixelFormat dst_format; - /* we need a bitmap with premultiplied alpha */ + /* we can't draw a bitmap of this format directly */ hdc = CreateCompatibleDC(0); temp_hdc = 1; temp_bitmap = 1; @@ -1951,8 +1955,14 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image hbitmap = CreateDIBSection(hdc, (BITMAPINFO*)&bih, DIB_RGB_COLORS, (void**)&temp_bits, NULL, 0); - convert_32bppARGB_to_32bppPARGB(bitmap->width, bitmap->height, - temp_bits, bitmap->width*4, bitmap->bits, bitmap->stride); + if (bitmap->format & (PixelFormatAlpha|PixelFormatPAlpha)) + dst_format = PixelFormat32bppPARGB; + else + dst_format = PixelFormat32bppRGB; + + convert_pixels(bitmap->width, bitmap->height, + bitmap->width*4, temp_bits, dst_format, + bitmap->stride, bitmap->bits, bitmap->format, bitmap->image.palette_entries); } else { @@ -1967,7 +1977,7 @@ GpStatus WINGDIPAPI GdipDrawImagePointsRect(GpGraphics *graphics, GpImage *image old_hbm = SelectObject(hdc, hbitmap); } - if (bitmap->format == PixelFormat32bppARGB || bitmap->format == PixelFormat32bppPARGB) + if (bitmap->format & (PixelFormatAlpha|PixelFormatPAlpha)) { BLENDFUNCTION bf;

1 0

Vincent Povirk : gdiplus: Implement GdipGetTextureImage.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: cf4ec6e8406c618496146216c1c9f37803881c6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf4ec6e8406c618496146216c… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Sat Feb 13 12:21:08 2010 -0600 gdiplus: Implement GdipGetTextureImage. --- 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 4d36de2..c867f91 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1190,6 +1190,19 @@ GpStatus WINGDIPAPI GdipGetSolidFillColor(GpSolidFill *sf, ARGB *argb) } /****************************************************************************** + * GdipGetTextureImage [GDIPLUS.@] + */ +GpStatus WINGDIPAPI GdipGetTextureImage(GpTexture *brush, GpImage **image) +{ + TRACE("(%p, %p)\n", brush, image); + + if(!brush || !image) + return InvalidParameter; + + return GdipCloneImage(brush->image, image); +} + +/****************************************************************************** * GdipGetTextureTransform [GDIPLUS.@] */ GpStatus WINGDIPAPI GdipGetTextureTransform(GpTexture *brush, GpMatrix *matrix) diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index 7d6081d..1da91d3 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -397,7 +397,7 @@ @ stdcall GdipGetStringFormatTrimming(ptr ptr) @ stdcall GdipGetTextContrast(ptr ptr) @ stdcall GdipGetTextRenderingHint(ptr ptr) -@ stub GdipGetTextureImage +@ stdcall GdipGetTextureImage(ptr ptr) @ stdcall GdipGetTextureTransform(ptr ptr) @ stdcall GdipGetTextureWrapMode(ptr ptr) @ stdcall GdipGetVisibleClipBounds(ptr ptr)

1 0

Vincent Povirk : gdiplus: Store an image in texture brushes, and use it when cloning.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 70c9e4fb3d6811ed3e8574768c13e2f2e70f3aad URL: http://source.winehq.org/git/wine.git/?a=commit;h=70c9e4fb3d6811ed3e8574768… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 11 16:43:45 2010 -0600 gdiplus: Store an image in texture brushes, and use it when cloning. --- dlls/gdiplus/brush.c | 25 ++++++++++++++++++------- dlls/gdiplus/gdiplus_private.h | 1 + 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index a533aca..4d36de2 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -160,13 +160,23 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) break; } case BrushTypeTextureFill: - *clone = GdipAlloc(sizeof(GpTexture)); - if(!*clone) return OutOfMemory; + { + GpStatus stat; + GpTexture *texture = (GpTexture*)brush; + GpTexture *new_texture; - memcpy(*clone, brush, sizeof(GpTexture)); + stat = GdipCreateTexture(texture->image, texture->wrap, &new_texture); - (*clone)->gdibrush = CreateBrushIndirect(&(*clone)->lb); - break; + if (stat == Ok) + { + memcpy(new_texture->transform, texture->transform, sizeof(GpMatrix)); + *clone = (GpBrush*)new_texture; + } + else + *clone = NULL; + + return stat; + } default: ERR("not implemented for brush type %d\n", brush->bt); return NotImplemented; @@ -829,10 +839,9 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, (*texture)->brush.gdibrush = CreateBrushIndirect(&(*texture)->brush.lb); (*texture)->brush.bt = BrushTypeTextureFill; (*texture)->wrap = imageattr->wrap; + (*texture)->image = new_image; exit: - GdipDisposeImage(new_image); - if (status == Ok) { TRACE("<-- %p\n", *texture); @@ -845,6 +854,7 @@ exit: GdipFree(*texture); *texture = NULL; } + GdipDisposeImage(new_image); TRACE("<-- error %u\n", status); } @@ -946,6 +956,7 @@ GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush *brush) break; case BrushTypeTextureFill: GdipDeleteMatrix(((GpTexture*)brush)->transform); + GdipDisposeImage(((GpTexture*)brush)->image); break; default: break; diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 75dc8c6..8e26eb1 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -180,6 +180,7 @@ struct GpLineGradient{ struct GpTexture{ GpBrush brush; GpMatrix *transform; + GpImage *image; WrapMode wrap; /* not used yet */ };

1 0

Vincent Povirk : gdiplus: Use GdipCloneBitmapArea to get bitmap areas for texture brushes.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: 53e326a77c8eaba69917dfe0a3e257d5f3231289 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53e326a77c8eaba69917dfe0a… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 11 16:30:56 2010 -0600 gdiplus: Use GdipCloneBitmapArea to get bitmap areas for texture brushes. --- dlls/gdiplus/brush.c | 140 ++++++++++++------------------------------------- 1 files changed, 35 insertions(+), 105 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 0d32c0f..a533aca 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -784,18 +784,15 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, GDIPCONST GpImageAttributes *imageattr, REAL x, REAL y, REAL width, REAL height, GpTexture **texture) { - HDC hdc; - HBITMAP hbm, old = NULL; - BITMAPINFO *pbmi; - BITMAPINFOHEADER *bmih; - INT n_x, n_y, n_width, n_height, abs_height, stride, image_stride, i, bytespp; - BOOL bm_is_selected; - BYTE *dibits, *buff, *textbits; + HBITMAP hbm; GpStatus status; + GpImage *new_image=NULL; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f, %p)\n", image, imageattr, x, y, width, height, texture); + *texture = NULL; + if(!image || !texture || x < 0.0 || y < 0.0 || width < 0.0 || height < 0.0) return InvalidParameter; @@ -804,121 +801,54 @@ GpStatus WINGDIPAPI GdipCreateTextureIA(GpImage *image, return NotImplemented; } - n_x = roundr(x); - n_y = roundr(y); - n_width = roundr(width); - n_height = roundr(height); - - if(n_x + n_width > ((GpBitmap*)image)->width || - n_y + n_height > ((GpBitmap*)image)->height) - return InvalidParameter; - - hbm = ((GpBitmap*)image)->hbitmap; - if(!hbm) return GenericError; - hdc = ((GpBitmap*)image)->hdc; - bm_is_selected = (hdc != 0); - - pbmi = GdipAlloc(sizeof(BITMAPINFOHEADER) + 256 * sizeof(RGBQUAD)); - if (!pbmi) - return OutOfMemory; - pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - pbmi->bmiHeader.biBitCount = 0; - - if(!bm_is_selected){ - hdc = CreateCompatibleDC(0); - old = SelectObject(hdc, hbm); - } - - /* fill out bmi */ - GetDIBits(hdc, hbm, 0, 0, NULL, pbmi, DIB_RGB_COLORS); - - bytespp = pbmi->bmiHeader.biBitCount / 8; - abs_height = abs(pbmi->bmiHeader.biHeight); - - if(n_x > pbmi->bmiHeader.biWidth || n_x + n_width > pbmi->bmiHeader.biWidth || - n_y > abs_height || n_y + n_height > abs_height){ - GdipFree(pbmi); - return InvalidParameter; - } - - dibits = GdipAlloc(pbmi->bmiHeader.biSizeImage); - - if(dibits) /* this is not a good place to error out */ - GetDIBits(hdc, hbm, 0, abs_height, dibits, pbmi, DIB_RGB_COLORS); - - if(!bm_is_selected){ - SelectObject(hdc, old); - DeleteDC(hdc); - } - - if(!dibits){ - GdipFree(pbmi); - return OutOfMemory; - } - - image_stride = (pbmi->bmiHeader.biWidth * bytespp + 3) & ~3; - stride = (n_width * bytespp + 3) & ~3; - buff = GdipAlloc(sizeof(BITMAPINFOHEADER) + stride * n_height); - if(!buff){ - GdipFree(pbmi); - GdipFree(dibits); - return OutOfMemory; - } + status = GdipCloneBitmapArea(x, y, width, height, PixelFormatDontCare, (GpBitmap*)image, (GpBitmap**)&new_image); + if (status != Ok) + return status; - bmih = (BITMAPINFOHEADER*)buff; - textbits = (BYTE*) (bmih + 1); - bmih->biSize = sizeof(BITMAPINFOHEADER); - bmih->biWidth = n_width; - bmih->biHeight = n_height; - bmih->biCompression = BI_RGB; - bmih->biSizeImage = stride * n_height; - bmih->biBitCount = pbmi->bmiHeader.biBitCount; - bmih->biClrUsed = 0; - bmih->biPlanes = 1; - - /* image is flipped */ - if(pbmi->bmiHeader.biHeight > 0){ - dibits += image_stride * (pbmi->bmiHeader.biHeight - 1); - image_stride *= -1; - textbits += stride * (n_height - 1); - stride *= -1; + hbm = ((GpBitmap*)new_image)->hbitmap; + if(!hbm) + { + status = GenericError; + goto exit; } - GdipFree(pbmi); - - for(i = 0; i < n_height; i++) - memcpy(&textbits[i * stride], - &dibits[n_x * bytespp + (n_y + i) * image_stride], - abs(stride)); - *texture = GdipAlloc(sizeof(GpTexture)); if (!*texture){ - GdipFree(dibits); - GdipFree(buff); - return OutOfMemory; + status = OutOfMemory; + goto exit; } if((status = GdipCreateMatrix(&(*texture)->transform)) != Ok){ - GdipFree(*texture); - GdipFree(dibits); - GdipFree(buff); - return status; + goto exit; } - (*texture)->brush.lb.lbStyle = BS_DIBPATTERNPT; - (*texture)->brush.lb.lbColor = DIB_RGB_COLORS; - (*texture)->brush.lb.lbHatch = (ULONG_PTR)buff; + (*texture)->brush.lb.lbStyle = BS_PATTERN; + (*texture)->brush.lb.lbColor = 0; + (*texture)->brush.lb.lbHatch = (ULONG_PTR)hbm; (*texture)->brush.gdibrush = CreateBrushIndirect(&(*texture)->brush.lb); (*texture)->brush.bt = BrushTypeTextureFill; (*texture)->wrap = imageattr->wrap; - GdipFree(dibits); - GdipFree(buff); +exit: + GdipDisposeImage(new_image); - TRACE("<-- %p\n", *texture); + if (status == Ok) + { + TRACE("<-- %p\n", *texture); + } + else + { + if (*texture) + { + GdipDeleteMatrix((*texture)->transform); + GdipFree(*texture); + *texture = NULL; + } + TRACE("<-- error %u\n", status); + } - return Ok; + return status; } /******************************************************************************

1 0

Vincent Povirk : gdiplus: Copy hatch brushes using the create function.
by Alexandre Julliard 15 Feb '10

15 Feb '10

Module: wine Branch: master Commit: e933da4fdb69fd0667d2c9137717c68991ebf172 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e933da4fdb69fd0667d2c9137… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Thu Feb 11 16:01:14 2010 -0600 gdiplus: Copy hatch brushes using the create function. The DIB used in the LOGBRUSH doesn't last long enough. --- dlls/gdiplus/brush.c | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 2eca755..0d32c0f 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -60,13 +60,11 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) break; } case BrushTypeHatchFill: - *clone = GdipAlloc(sizeof(GpHatch)); - if (!*clone) return OutOfMemory; - - memcpy(*clone, brush, sizeof(GpHatch)); + { + GpHatch *hatch = (GpHatch*)brush; - (*clone)->gdibrush = CreateBrushIndirect(&(*clone)->lb); - break; + return GdipCreateHatchBrush(hatch->hatchstyle, hatch->forecol, hatch->backcol, (GpHatch**)clone); + } case BrushTypePathGradient:{ GpPathGradient *src, *dest; INT count;

1 0

← Newer
1
...
29
30
31
32
33
34
35
...
79
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits February 2010