June 2009 - Wine-Commits - list.winehq.org

Francois Gouget : gdi32/tests: Small indentation fix.
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: 34accb382b39aea268033b49a834e4f0422710bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=34accb382b39aea268033b49a… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jun 15 10:53:05 2009 +0200 gdi32/tests: Small indentation fix. --- dlls/gdi32/tests/clipping.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/gdi32/tests/clipping.c b/dlls/gdi32/tests/clipping.c index eff87c3..06cb22a 100644 --- a/dlls/gdi32/tests/clipping.c +++ b/dlls/gdi32/tests/clipping.c @@ -189,13 +189,13 @@ static void test_ExtCreateRegion(void) HRGN hrgn; XFORM xform; -if (0) /* crashes under Win9x */ -{ - SetLastError(0xdeadbeef); - hrgn = ExtCreateRegion(NULL, 0, NULL); - ok(!hrgn, "ExtCreateRegion should fail\n"); - ok(GetLastError() == ERROR_INVALID_PARAMETER, "ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); -} + if (0) /* crashes under Win9x */ + { + SetLastError(0xdeadbeef); + hrgn = ExtCreateRegion(NULL, 0, NULL); + ok(!hrgn, "ExtCreateRegion should fail\n"); + ok(GetLastError() == ERROR_INVALID_PARAMETER, "ERROR_INVALID_PARAMETER, got %u\n", GetLastError()); + } rgn.data.rdh.dwSize = 0; rgn.data.rdh.iType = 0;

1 0

Henri Verbeet : wined3d: Get rid of the pointers in WINED3DSURFACE_DESC.
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: 88162fabb8ff5ef8d013ddc94df113f18975861e URL: http://source.winehq.org/git/wine.git/?a=commit;h=88162fabb8ff5ef8d013ddc94… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 15 09:06:50 2009 +0200 wined3d: Get rid of the pointers in WINED3DSURFACE_DESC. --- dlls/d3d8/cubetexture.c | 23 +++++++++++------------ dlls/d3d8/device.c | 16 +++++++--------- dlls/d3d8/surface.c | 23 +++++++++++------------ dlls/d3d8/texture.c | 23 +++++++++++------------ dlls/d3d9/cubetexture.c | 27 ++++++++++++--------------- dlls/d3d9/device.c | 25 ++++++------------------- dlls/d3d9/surface.c | 27 ++++++++++++--------------- dlls/d3d9/texture.c | 30 +++++++++++++----------------- dlls/ddraw/ddraw.c | 43 +++++++++++++------------------------------ dlls/ddraw/device.c | 13 +++---------- dlls/wined3d/device.c | 20 +++++++++----------- dlls/wined3d/stateblock.c | 22 +++++++++------------- dlls/wined3d/surface_base.c | 20 +++++++++++--------- include/wine/wined3d.idl | 18 +++++++++--------- 14 files changed, 137 insertions(+), 193 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=88162fabb8ff5ef8d013d…

1 0

Damjan Jovanovic : winex11.drv: Fix file drops on KDE4 and XFCE.
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: 36685b076188d1e38b30bf9608778dda9fcd4e21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36685b076188d1e38b30bf960… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Sun Jun 14 12:25:48 2009 +0200 winex11.drv: Fix file drops on KDE4 and XFCE. --- dlls/winex11.drv/xdnd.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/winex11.drv/xdnd.c b/dlls/winex11.drv/xdnd.c index 954284f..38687ec 100644 --- a/dlls/winex11.drv/xdnd.c +++ b/dlls/winex11.drv/xdnd.c @@ -375,9 +375,7 @@ static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len) { while (end < len && uriList[end] != '\r') ++end; - if (end == len) - break; - if (uriList[end+1] != '\n') + if (end < (len - 1) && uriList[end+1] != '\n') { WARN("URI list line doesn't end in \\r\\n\n"); break; @@ -412,7 +410,7 @@ static int X11DRV_XDND_DeconstructTextURIList(int property, void* data, int len) start = end + 2; end = start; } - if (out && end == len) + if (out && end >= len) { DROPFILES *dropFiles; dropFiles = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(DROPFILES) + size + 1);

1 0

Aurimas Fišeras : hhctrl.ocx: Add Lithuanian translation.
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: 7f77207769ec4b9c7ac30891672d771cfa247121 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f77207769ec4b9c7ac308916… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sun Jun 14 12:07:25 2009 +0300 hhctrl.ocx: Add Lithuanian translation. --- dlls/hhctrl.ocx/Lt.rc | 63 +++++++++++++++++++++++++++++++++++++++++++++ dlls/hhctrl.ocx/hhctrl.rc | 1 + 2 files changed, 64 insertions(+), 0 deletions(-) diff --git a/dlls/hhctrl.ocx/Lt.rc b/dlls/hhctrl.ocx/Lt.rc new file mode 100644 index 0000000..fed6b40 --- /dev/null +++ b/dlls/hhctrl.ocx/Lt.rc @@ -0,0 +1,63 @@ +/* + * HTML Help resources + * Lithuanian Language Support + * + * Copyright 2009 Aurimas Fišeras <aurimas(a)gmail.com> + * + * 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 + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/* UTF-8 */ +#pragma code_page(65001) + +LANGUAGE LANG_LITHUANIAN, SUBLANG_NEUTRAL + +STRINGTABLE +BEGIN + IDS_CONTENTS "&Turinys" + IDS_INDEX "&Rodyklė" + IDS_SEARCH "&Paieška" + IDS_FAVORITES "&Adresynas" +END + +STRINGTABLE +BEGIN + IDTB_EXPAND "Rodyti" + IDTB_CONTRACT "Slėpti" + IDTB_STOP "Stabdyti" + IDTB_REFRESH "Atnaujinti" + IDTB_BACK "Atgal" + IDTB_HOME "Į pradžią" + IDTB_SYNC "Sinchronizuoti" + IDTB_PRINT "Spausdinti" + IDTB_OPTIONS "Parinktys" + IDTB_FORWARD "Pirmyn" + IDTB_NOTES "IDTB_NOTES" + IDTB_BROWSE_FWD "IDTB_BROWSE_FWD" + IDTB_BROWSE_BACK "IDT_BROWSE_BACK" + IDTB_CONTENTS "IDTB_CONTENTS" + IDTB_INDEX "IDTB_INDEX" + IDTB_SEARCH "IDTB_SEARCH" + IDTB_HISTORY "IDTB_HISTORY" + IDTB_FAVORITES "IDTB_FAVORITES" + IDTB_JUMP1 "Nukreipimas1" + IDTB_JUMP2 "Nukreipimas2" + IDTB_CUSTOMIZE "Adaptuoti" + IDTB_ZOOM "Keisti mastelį" + IDTB_TOC_NEXT "IDTB_TOC_NEXT" + IDTB_TOC_PREV "IDTB_TOC_PREV" +END + +#pragma code_page(default) diff --git a/dlls/hhctrl.ocx/hhctrl.rc b/dlls/hhctrl.ocx/hhctrl.rc index e6dc112..8618819 100644 --- a/dlls/hhctrl.ocx/hhctrl.rc +++ b/dlls/hhctrl.ocx/hhctrl.rc @@ -38,6 +38,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL #include "Fi.rc" #include "Hu.rc" #include "Ko.rc" +#include "Lt.rc" #include "Nl.rc" #include "No.rc" #include "Pl.rc"

1 0

Henri Verbeet : wined3d: Introduce surface_cleanup().
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: 32613eb628fc50f28baf912610738001fbe5ffd9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=32613eb628fc50f28baf91261… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 15 09:06:49 2009 +0200 wined3d: Introduce surface_cleanup(). --- dlls/wined3d/surface.c | 112 +++++++++++++++++++++++++++--------------------- 1 files changed, 63 insertions(+), 49 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 116cff0..a3ecf29 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -34,6 +34,64 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); WINE_DECLARE_DEBUG_CHANNEL(d3d); #define GLINFO_LOCATION This->resource.wineD3DDevice->adapter->gl_info +static void surface_cleanup(IWineD3DSurfaceImpl *This) +{ + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + renderbuffer_entry_t *entry, *entry2; + + TRACE("(%p) : Cleaning up.\n", This); + + /* Need a context to destroy the texture. Use the currently active render + * target, but only if the primary render target exists. Otherwise + * lastActiveRenderTarget is garbage. When destroying the primary render + * target, Uninit3D() will activate a context before doing anything. */ + if (device->render_targets && device->render_targets[0]) + { + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + } + + ENTER_GL(); + + if (This->glDescription.textureName) + { + /* Release the OpenGL texture. */ + TRACE("Deleting texture %u.\n", This->glDescription.textureName); + glDeleteTextures(1, &This->glDescription.textureName); + } + + if (This->Flags & SFLAG_PBO) + { + /* Delete the PBO. */ + GL_EXTCALL(glDeleteBuffersARB(1, &This->pbo)); + } + + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &This->renderbuffers, renderbuffer_entry_t, entry) + { + GL_EXTCALL(glDeleteRenderbuffersEXT(1, &entry->id)); + HeapFree(GetProcessHeap(), 0, entry); + } + + LEAVE_GL(); + + if (This->Flags & SFLAG_DIBSECTION) + { + /* Release the DC. */ + SelectObject(This->hDC, This->dib.holdbitmap); + DeleteDC(This->hDC); + /* Release the DIB section. */ + DeleteObject(This->dib.DIBsection); + This->dib.bitmap_data = NULL; + This->resource.allocatedMemory = NULL; + } + + if (This->Flags & SFLAG_USERPTR) IWineD3DSurface_SetMem((IWineD3DSurface *)This, NULL); + if (This->overlay_dest) list_remove(&This->overlay_entry); + + HeapFree(GetProcessHeap(), 0, This->palette9); + + resource_cleanup((IWineD3DResource *)This); +} + static void surface_force_reload(IWineD3DSurface *iface) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; @@ -540,59 +598,15 @@ static ULONG WINAPI IWineD3DSurfaceImpl_Release(IWineD3DSurface *iface) IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; ULONG ref = InterlockedDecrement(&This->resource.ref); TRACE("(%p) : Releasing from %d\n", This, ref + 1); - if (ref == 0) { - IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; - renderbuffer_entry_t *entry, *entry2; - TRACE("(%p) : cleaning up\n", This); - - /* Need a context to destroy the texture. Use the currently active render target, but only if - * the primary render target exists. Otherwise lastActiveRenderTarget is garbage, see above. - * When destroying the primary rt, Uninit3D will activate a context before doing anything - */ - if(device->render_targets && device->render_targets[0]) { - ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); - } - - ENTER_GL(); - if (This->glDescription.textureName != 0) { /* release the openGL texture.. */ - TRACE("Deleting texture %d\n", This->glDescription.textureName); - glDeleteTextures(1, &This->glDescription.textureName); - } - - if(This->Flags & SFLAG_PBO) { - /* Delete the PBO */ - GL_EXTCALL(glDeleteBuffersARB(1, &This->pbo)); - } - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &This->renderbuffers, renderbuffer_entry_t, entry) { - GL_EXTCALL(glDeleteRenderbuffersEXT(1, &entry->id)); - HeapFree(GetProcessHeap(), 0, entry); - } - LEAVE_GL(); - - if(This->Flags & SFLAG_DIBSECTION) { - /* Release the DC */ - SelectObject(This->hDC, This->dib.holdbitmap); - DeleteDC(This->hDC); - /* Release the DIB section */ - DeleteObject(This->dib.DIBsection); - This->dib.bitmap_data = NULL; - This->resource.allocatedMemory = NULL; - } - if(This->Flags & SFLAG_USERPTR) IWineD3DSurface_SetMem(iface, NULL); - - HeapFree(GetProcessHeap(), 0, This->palette9); - - resource_cleanup((IWineD3DResource *)iface); - - if(This->overlay_dest) { - list_remove(&This->overlay_entry); - } + if (!ref) + { + surface_cleanup(This); - TRACE("(%p) Released\n", This); + TRACE("(%p) Released.\n", This); HeapFree(GetProcessHeap(), 0, This); - } + return ref; }

1 0

Henri Verbeet : wined3d: Introduce surface_calculate_size().
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: fede35d1c5fd6760ae908b25d6a6be9126b1802a URL: http://source.winehq.org/git/wine.git/?a=commit;h=fede35d1c5fd6760ae908b25d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 15 09:06:49 2009 +0200 wined3d: Introduce surface_calculate_size(). --- dlls/wined3d/surface.c | 44 +++++++++++++++++++++++---------------- dlls/wined3d/surface_base.c | 18 ++------------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 30 insertions(+), 33 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 33fc51a..36ba6c5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -94,6 +94,31 @@ static void surface_cleanup(IWineD3DSurfaceImpl *This) resource_cleanup((IWineD3DResource *)This); } +UINT surface_calculate_size(const struct GlPixelFormatDesc *format_desc, UINT alignment, UINT width, UINT height) +{ + UINT size; + + if (format_desc->format == WINED3DFMT_UNKNOWN) + { + size = 0; + } + else if (format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED) + { + UINT row_block_count = (width + format_desc->block_width - 1) / format_desc->block_width; + UINT row_count = (height + format_desc->block_height - 1) / format_desc->block_height; + size = row_count * row_block_count * format_desc->block_byte_count; + } + else + { + /* The pitch is a multiple of 4 bytes. */ + size = height * (((width * format_desc->byte_count) + alignment - 1) & ~(alignment - 1)); + } + + if (format_desc->heightscale != 0.0) size *= format_desc->heightscale; + + return size; +} + HRESULT surface_init(IWineD3DSurfaceImpl *surface, WINED3DSURFTYPE surface_type, UINT alignment, UINT width, UINT height, UINT level, BOOL lockable, BOOL discard, WINED3DMULTISAMPLE_TYPE multisample_type, UINT multisample_quality, IWineD3DDeviceImpl *device, DWORD usage, WINED3DFORMAT format, @@ -113,24 +138,7 @@ HRESULT surface_init(IWineD3DSurfaceImpl *surface, WINED3DSURFTYPE surface_type, /* FIXME: Check that the format is supported by the device. */ - if (format == WINED3DFMT_UNKNOWN) - { - resource_size = 0; - } - else if (format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED) - { - UINT row_block_count = (width + format_desc->block_width - 1) / format_desc->block_width; - UINT row_count = (height + format_desc->block_height - 1) / format_desc->block_height; - resource_size = row_count * row_block_count * format_desc->block_byte_count; - } - else - { - /* The pitch is a multiple of 4 bytes. */ - resource_size = ((width * format_desc->byte_count) + alignment - 1) & ~(alignment - 1); - resource_size *= height; - } - - if (format_desc->heightscale != 0.0) resource_size *= format_desc->heightscale; + resource_size = surface_calculate_size(format_desc, alignment, width, height); /* Look at the implementation and set the correct Vtable. */ switch (surface_type) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index e17f892..1d1341b 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -519,21 +519,9 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_SetFormat(IWineD3DSurface *iface, WINED3D } TRACE("(%p) : Setting texture format to (%d,%s)\n", This, format, debug_d3dformat(format)); - if (format == WINED3DFMT_UNKNOWN) { - This->resource.size = 0; - } - else if (format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED) - { - UINT row_block_count = (This->pow2Width + format_desc->block_width - 1) / format_desc->block_width; - UINT row_count = (This->pow2Height + format_desc->block_height - 1) / format_desc->block_height; - This->resource.size = row_count * row_block_count * format_desc->block_byte_count; - } - else - { - unsigned char alignment = This->resource.wineD3DDevice->surface_alignment; - This->resource.size = ((This->pow2Width * format_desc->byte_count) + alignment - 1) & ~(alignment - 1); - This->resource.size *= This->pow2Height; - } + + This->resource.size = surface_calculate_size(format_desc, This->resource.wineD3DDevice->surface_alignment, + This->pow2Width, This->pow2Height); This->Flags |= (WINED3DFMT_D16_LOCKABLE == format) ? SFLAG_LOCKABLE : 0; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a1ac336..331015c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1920,6 +1920,7 @@ struct IWineD3DSurfaceImpl extern const IWineD3DSurfaceVtbl IWineD3DSurface_Vtbl; extern const IWineD3DSurfaceVtbl IWineGDISurface_Vtbl; +UINT surface_calculate_size(const struct GlPixelFormatDesc *format_desc, UINT alignment, UINT width, UINT height); void surface_gdi_cleanup(IWineD3DSurfaceImpl *This); HRESULT surface_init(IWineD3DSurfaceImpl *surface, WINED3DSURFTYPE surface_type, UINT alignment, UINT width, UINT height, UINT level, BOOL lockable, BOOL discard, WINED3DMULTISAMPLE_TYPE multisample_type,

1 0

Henri Verbeet : wined3d: Introduce surface_init() to handle most of the surface initialization.
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: 5f581975dcf83f4f32432137990c72c26b415e3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f581975dcf83f4f324321379… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 15 09:06:49 2009 +0200 wined3d: Introduce surface_init() to handle most of the surface initialization. --- dlls/wined3d/device.c | 135 +++---------------------------------- dlls/wined3d/surface.c | 145 +++++++++++++++++++++++++++++++++++++++- dlls/wined3d/surface_gdi.c | 2 +- dlls/wined3d/wined3d_private.h | 6 ++ 4 files changed, 160 insertions(+), 128 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f581975dcf83f4f32432…

1 0

Rein Klazes : winedos: int21, function 32h returns data in DS:BX, not DS:DX .
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: 1591e3a76285b0331e175446f3274be45c2a3395 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1591e3a76285b0331e175446f… Author: Rein Klazes <wijn(a)online.nl> Date: Sun Jun 14 14:27:25 2009 +0200 winedos: int21, function 32h returns data in DS:BX, not DS:DX. --- dlls/winedos/int21.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winedos/int21.c b/dlls/winedos/int21.c index 79aa8ea..16b2359 100644 --- a/dlls/winedos/int21.c +++ b/dlls/winedos/int21.c @@ -4592,7 +4592,7 @@ void WINAPI DOSVM_Int21Handler( CONTEXT86 *context ) if (INT21_FillDrivePB( drive )) { SET_AL( context, 0x00 ); /* success */ - SET_DX( context, offsetof( INT21_HEAP, misc_dpb_list[drive] ) ); + SET_BX( context, offsetof( INT21_HEAP, misc_dpb_list[drive] ) ); context->SegDs = INT21_GetHeapSelector( context ); } else

1 0

Henri Verbeet : wined3d: Introduce surface_gdi_cleanup().
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: bbfdfb2f1f0cd4e4b6cd1e906341f8a97a1bce0c URL: http://source.winehq.org/git/wine.git/?a=commit;h=bbfdfb2f1f0cd4e4b6cd1e906… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jun 15 09:06:49 2009 +0200 wined3d: Introduce surface_gdi_cleanup(). --- dlls/wined3d/surface_gdi.c | 50 ++++++++++++++++++++++++------------------- 1 files changed, 28 insertions(+), 22 deletions(-) diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 0ad65e0..ca5c738 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -35,6 +35,29 @@ /* Use the d3d_surface debug channel to have one channel for all surfaces */ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); +static void surface_gdi_cleanup(IWineD3DSurfaceImpl *This) +{ + TRACE("(%p) : Cleaning up.\n", This); + + if (This->Flags & SFLAG_DIBSECTION) + { + /* Release the DC. */ + SelectObject(This->hDC, This->dib.holdbitmap); + DeleteDC(This->hDC); + /* Release the DIB section. */ + DeleteObject(This->dib.DIBsection); + This->dib.bitmap_data = NULL; + This->resource.allocatedMemory = NULL; + } + + if (This->Flags & SFLAG_USERPTR) IWineD3DSurface_SetMem((IWineD3DSurface *)This, NULL); + if (This->overlay_dest) list_remove(&This->overlay_entry); + + HeapFree(GetProcessHeap(), 0, This->palette9); + + resource_cleanup((IWineD3DResource *)This); +} + /***************************************************************************** * IWineD3DSurface::Release, GDI version * @@ -46,32 +69,15 @@ static ULONG WINAPI IWineGDISurfaceImpl_Release(IWineD3DSurface *iface) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; ULONG ref = InterlockedDecrement(&This->resource.ref); TRACE("(%p) : Releasing from %d\n", This, ref + 1); - if (ref == 0) { - TRACE("(%p) : cleaning up\n", This); - if(This->Flags & SFLAG_DIBSECTION) { - /* Release the DC */ - SelectObject(This->hDC, This->dib.holdbitmap); - DeleteDC(This->hDC); - /* Release the DIB section */ - DeleteObject(This->dib.DIBsection); - This->dib.bitmap_data = NULL; - This->resource.allocatedMemory = NULL; - } - if(This->Flags & SFLAG_USERPTR) IWineD3DSurface_SetMem(iface, NULL); - - HeapFree(GetProcessHeap(), 0, This->palette9); - - resource_cleanup((IWineD3DResource *)iface); - - if(This->overlay_dest) { - list_remove(&This->overlay_entry); - } + if (!ref) + { + surface_gdi_cleanup(This); - TRACE("(%p) Released\n", This); + TRACE("(%p) Released.\n", This); HeapFree(GetProcessHeap(), 0, This); - } + return ref; }

1 0

Paul Vriens : mlang/tests: Fix a test failure on Win95.
by Alexandre Julliard June 15, 2009

June 15, 2009

Module: wine Branch: master Commit: 3a5a79ff759b758253ecec25d3359380cea64532 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a5a79ff759b758253ecec25d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Jun 12 21:51:00 2009 +0200 mlang/tests: Fix a test failure on Win95. --- dlls/mlang/tests/mlang.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mlang/tests/mlang.c b/dlls/mlang/tests/mlang.c index 6a871b8..14568df 100644 --- a/dlls/mlang/tests/mlang.c +++ b/dlls/mlang/tests/mlang.c @@ -121,7 +121,7 @@ static const WCHAR de_engb[] = {'E','n','g','l','i','s','c','h',' ', '(','G','r','o',0xDF,'b','r','i','t','a','n','n','i','e','n',')',0}; static const WCHAR de_engb2[] ={'E','n','g','l','i','s','c','h',' ', '(','V','e','r','e','i','n','i','g','t','e','s',' ', - 'K',0xF6,'n','i','g','r','e','i','c',0}; + 'K',0xF6,'n','i','g','r','e','i',0}; static const WCHAR de_enus[] = {'E','n','g','l','i','s','c','h',' ', '(','U','S','A',')',0}; static const WCHAR de_de[] = {'D','e','u','t','s','c','h',' ',

1 0