wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Henri Verbeet : wined3d: Use the format info to calculate compressed surface size in IWineD3DBaseSurfaceImpl_SetFormat ().
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: da12ac05a4a5fe857fa317fbdbbb2ccce12b838a URL: http://source.winehq.org/git/wine.git/?a=commit;h=da12ac05a4a5fe857fa317fbd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 11 10:24:30 2009 +0200 wined3d: Use the format info to calculate compressed surface size in IWineD3DBaseSurfaceImpl_SetFormat(). --- dlls/wined3d/surface_base.c | 17 +++++++++-------- 1 files changed, 9 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 407a6db..f0acb87 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -521,14 +521,15 @@ 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 == WINED3DFMT_DXT1) { - /* DXT1 is half byte per pixel */ - This->resource.size = ((max(This->pow2Width, 4) * format_desc->byte_count) * max(This->pow2Height, 4)) >> 1; - - } else if (format == WINED3DFMT_DXT2 || format == WINED3DFMT_DXT3 || - format == WINED3DFMT_DXT4 || format == WINED3DFMT_DXT5) { - This->resource.size = ((max(This->pow2Width, 4) * format_desc->byte_count) * max(This->pow2Height, 4)); - } else { + } + 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;

1 0

Henri Verbeet : wined3d: Use the format info to calculate compressed surface size in IWineD3DDeviceImpl_CreateSurface ().
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: e255f971e490cec51eeccde21b5d93d00cbab782 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e255f971e490cec51eeccde21… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 11 10:24:30 2009 +0200 wined3d: Use the format info to calculate compressed surface size in IWineD3DDeviceImpl_CreateSurface(). --- dlls/wined3d/device.c | 27 ++++++++++----------------- 1 files changed, 10 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e6b4681..896f048 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -898,7 +898,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSurface(IWineD3DDevice *iface, IWineD3DSurfaceImpl *object; /*NOTE: impl ref allowed since this is a create function */ unsigned int Size = 1; const struct GlPixelFormatDesc *glDesc = getFormatDescEntry(Format, &GLINFO_LOCATION); - UINT mul_4w, mul_4h; HRESULT hr; TRACE("(%p) Create surface\n",This); @@ -912,24 +911,18 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSurface(IWineD3DDevice *iface, * by the device. *******************************/ - /** DXTn mipmaps use the same number of 'levels' down to eg. 8x1, but since - * 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 = (mul_4w * glDesc->byte_count * mul_4h) >> 1; - - } else if (Format == WINED3DFMT_DXT2 || Format == WINED3DFMT_DXT3 || - Format == WINED3DFMT_DXT4 || Format == WINED3DFMT_DXT5 || - Format == WINED3DFMT_ATI2N) { - Size = (mul_4w * glDesc->byte_count * mul_4h); - } else { - /* The pitch is a multiple of 4 bytes */ + } + else if (glDesc->Flags & WINED3DFMT_FLAG_COMPRESSED) + { + UINT row_block_count = (Width + glDesc->block_width - 1) / glDesc->block_width; + UINT row_count = (Height + glDesc->block_height - 1) / glDesc->block_height; + Size = row_count * row_block_count * glDesc->block_byte_count; + } + else + { + /* The pitch is a multiple of 4 bytes */ Size = ((Width * glDesc->byte_count) + This->surface_alignment - 1) & ~(This->surface_alignment - 1); Size *= Height; }

1 0

Henri Verbeet : wined3d: Improve some TRACEs in init_format_fbo_compat_info ().
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: 1ad485ff83950a99f19ad95058b34842219dc5a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ad485ff83950a99f19ad9505… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 11 10:24:30 2009 +0200 wined3d: Improve some TRACEs in init_format_fbo_compat_info(). --- dlls/wined3d/utils.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 55c806b..211e717 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -598,13 +598,15 @@ static void init_format_fbo_compat_info(WineD3D_GL_Info *gl_info) if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + TRACE("Checking if format %s is supported as FBO color attachment...\n", debug_d3dformat(desc->format)); + /* Check if the default internal format is supported as a frame buffer target, otherwise * fall back to the render target internal. * * Try to stick to the standard format if possible, this limits precision differences. */ if (check_fbo_compat(gl_info, desc->glInternal, desc->glFormat, desc->glType)) { - TRACE("Format %s is supported as fbo target\n", debug_d3dformat(desc->format)); + TRACE("Format %s is supported as FBO color attachment\n", debug_d3dformat(desc->format)); desc->Flags |= WINED3DFMT_FLAG_FBO_ATTACHABLE; desc->rtInternal = desc->glInternal; } @@ -614,15 +616,19 @@ static void init_format_fbo_compat_info(WineD3D_GL_Info *gl_info) { if (desc->Flags & WINED3DFMT_FLAG_RENDERTARGET) { - FIXME("Internal format of %s not supported as FBO target, and no fallback specified.\n", - debug_d3dformat(desc->format)); + FIXME("Format %s with rendertarget flag is not supported as FBO color attachment," + " and no fallback specified.\n", debug_d3dformat(desc->format)); desc->Flags &= ~WINED3DFMT_FLAG_RENDERTARGET; } + else + { + TRACE("Format %s is not supported as FBO color attachment.\n", debug_d3dformat(desc->format)); + } desc->rtInternal = desc->glInternal; } else { - TRACE("Internal format of %s not supported as FBO target, using render target internal instead.\n", + TRACE("Format %s is not supported as FBO color attachment, using rtInternal format as fallback.\n", debug_d3dformat(desc->format)); } }

1 0

Henri Verbeet : wined3d: Remove some redundant s3tc extension checks.
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: b052c6e8aa96823451624c99333b5eb8f867b137 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b052c6e8aa96823451624c993… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 11 10:24:30 2009 +0200 wined3d: Remove some redundant s3tc extension checks. If the extension isn't available to surface shouldn't have been created. We don't do extension checks for all the other formats either. --- dlls/wined3d/device.c | 32 ++++++++------- dlls/wined3d/surface.c | 99 +++++++++++++++++++++++++---------------------- 2 files changed, 70 insertions(+), 61 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fe084ca..e6b4681 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5987,22 +5987,24 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, WINED3DFMT_DXT3 == destFormat || WINED3DFMT_DXT4 == destFormat || WINED3DFMT_DXT5 == destFormat) { - if (GL_SUPPORT(EXT_TEXTURE_COMPRESSION_S3TC)) { - if (destSurfaceHeight != srcHeight || destSurfaceWidth != srcWidth) { - /* FIXME: The easy way to do this is to lock the destination, and copy the bits across */ - FIXME("Updating part of a compressed texture is not supported at the moment\n"); - } if (destFormat != srcFormat) { - FIXME("Updating mixed format compressed texture is not curretly support\n"); - } else { - GL_EXTCALL(glCompressedTexImage2DARB(glDescription->target, glDescription->level, - dst_format_desc->glInternal, srcWidth, srcHeight, 0, destSize, data)); - } - } else { - FIXME("Attempting to update a DXT compressed texture without hardware support\n"); - } - - } else { + if (destSurfaceHeight != srcHeight || destSurfaceWidth != srcWidth) + { + /* FIXME: The easy way to do this is to lock the destination, and copy the bits across. */ + FIXME("Updating part of a compressed texture is not supported.\n"); + } + if (destFormat != srcFormat) + { + FIXME("Updating mixed format compressed textures is not supported.\n"); + } + else + { + GL_EXTCALL(glCompressedTexImage2DARB(glDescription->target, glDescription->level, + dst_format_desc->glInternal, srcWidth, srcHeight, 0, destSize, data)); + } + } + else + { glTexSubImage2D(glDescription->target, glDescription->level, destLeft, destTop, srcWidth, srcHeight, dst_format_desc->glFormat, dst_format_desc->glType, data); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a20ecd2..c81dab3 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -150,25 +150,26 @@ static void surface_download_data(IWineD3DSurfaceImpl *This) { || format_desc->format == WINED3DFMT_DXT3 || format_desc->format == WINED3DFMT_DXT4 || format_desc->format == WINED3DFMT_DXT5 || format_desc->format == WINED3DFMT_ATI2N) { - if (!GL_SUPPORT(EXT_TEXTURE_COMPRESSION_S3TC)) { /* We can assume this as the texture would not have been created otherwise */ - FIXME("(%p) : Attempting to lock a compressed texture when texture compression isn't supported by opengl\n", This); - } else { - TRACE("(%p) : Calling glGetCompressedTexImageARB level %d, format %#x, type %#x, data %p\n", - This, This->glDescription.level, format_desc->glFormat, format_desc->glType, - This->resource.allocatedMemory); - - if(This->Flags & SFLAG_PBO) { - GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, This->pbo)); - checkGLcall("glBindBufferARB"); - GL_EXTCALL(glGetCompressedTexImageARB(This->glDescription.target, This->glDescription.level, NULL)); - checkGLcall("glGetCompressedTexImageARB()"); - GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0)); - checkGLcall("glBindBufferARB"); - } else { - GL_EXTCALL(glGetCompressedTexImageARB(This->glDescription.target, This->glDescription.level, This->resource.allocatedMemory)); - checkGLcall("glGetCompressedTexImageARB()"); - } + TRACE("(%p) : Calling glGetCompressedTexImageARB level %d, format %#x, type %#x, data %p.\n", + This, This->glDescription.level, format_desc->glFormat, format_desc->glType, + This->resource.allocatedMemory); + + if (This->Flags & SFLAG_PBO) + { + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, This->pbo)); + checkGLcall("glBindBufferARB"); + GL_EXTCALL(glGetCompressedTexImageARB(This->glDescription.target, This->glDescription.level, NULL)); + checkGLcall("glGetCompressedTexImageARB()"); + GL_EXTCALL(glBindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0)); + checkGLcall("glBindBufferARB"); } + else + { + GL_EXTCALL(glGetCompressedTexImageARB(This->glDescription.target, + This->glDescription.level, This->resource.allocatedMemory)); + checkGLcall("glGetCompressedTexImageARB()"); + } + LEAVE_GL(); } else { void *mem; @@ -297,35 +298,41 @@ static void surface_upload_data(IWineD3DSurfaceImpl *This, GLenum internal, GLsi || format_desc->format == WINED3DFMT_DXT3 || format_desc->format == WINED3DFMT_DXT4 || format_desc->format == WINED3DFMT_DXT5 || format_desc->format == WINED3DFMT_ATI2N) { - if (!GL_SUPPORT(EXT_TEXTURE_COMPRESSION_S3TC)) { - FIXME("Using DXT1/3/5 without advertized support\n"); - } else { - /* glCompressedTexSubImage2D for uploading and glTexImage2D for allocating does not work well on some drivers(r200 dri, MacOS ATI driver) - * glCompressedTexImage2D does not accept NULL pointers. So for compressed textures surface_allocate_surface does nothing, and this - * function uses glCompressedTexImage2D instead of the SubImage call - */ - TRACE("(%p) : Calling glCompressedTexSubImage2D w %d, h %d, data %p\n", This, width, height, data); - ENTER_GL(); + /* glCompressedTexSubImage2D() for uploading and glTexImage2D() for + * allocating does not work well on some drivers (r200 dri, MacOS ATI + * driver). glCompressedTexImage2D() does not accept NULL pointers. So + * for compressed textures surface_allocate_surface() does nothing, + * and this function uses glCompressedTexImage2D() instead of + * glCompressedTexSubImage2D(). */ + TRACE("(%p) : Calling glCompressedTexImage2DARB w %u, h %u, data %p.\n", This, width, height, data); + + ENTER_GL(); - if(This->Flags & SFLAG_PBO) { - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, This->pbo)); - checkGLcall("glBindBufferARB"); - TRACE("(%p) pbo: %#x, data: %p\n", This, This->pbo, data); + if (This->Flags & SFLAG_PBO) + { + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, This->pbo)); + checkGLcall("glBindBufferARB"); - GL_EXTCALL(glCompressedTexImage2DARB(This->glDescription.target, This->glDescription.level, internal, - width, height, 0 /* border */, This->resource.size, NULL)); - checkGLcall("glCompressedTexSubImage2D"); + TRACE("(%p) pbo: %#x, data: %p.\n", This, This->pbo, data); - GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); - checkGLcall("glBindBufferARB"); - } else { - GL_EXTCALL(glCompressedTexImage2DARB(This->glDescription.target, This->glDescription.level, internal, - width, height, 0 /* border */, This->resource.size, data)); - checkGLcall("glCompressedTexSubImage2D"); - } - LEAVE_GL(); + GL_EXTCALL(glCompressedTexImage2DARB(This->glDescription.target, This->glDescription.level, + internal, width, height, 0 /* border */, This->resource.size, NULL)); + checkGLcall("glCompressedTexImage2DARB"); + + GL_EXTCALL(glBindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0)); + checkGLcall("glBindBufferARB"); } - } else { + else + { + GL_EXTCALL(glCompressedTexImage2DARB(This->glDescription.target, This->glDescription.level, + internal, width, height, 0 /* border */, This->resource.size, data)); + checkGLcall("glCompressedTexSubImage2D"); + } + + LEAVE_GL(); + } + else + { TRACE("(%p) : Calling glTexSubImage2D w %d, h %d, data, %p\n", This, width, height, data); ENTER_GL();

1 0

Austin English : wine.desktop: Allow start to execute lnk files.
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: ea09e4afe8aa602b7f8e76a3d32e841a509c2144 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea09e4afe8aa602b7f8e76a3d… Author: Austin English <austinenglish(a)gmail.com> Date: Thu Jun 11 01:20:09 2009 -0500 wine.desktop: Allow start to execute lnk files. --- tools/wine.desktop | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/tools/wine.desktop b/tools/wine.desktop index 52f91c6..db4254d 100644 --- a/tools/wine.desktop +++ b/tools/wine.desktop @@ -16,6 +16,6 @@ Name[da]=Wine, Programstarter til Windows-programmer Name[nb]=Wine Programlaster for Windowsapplikasjoner Name[nn]=Wine Programlaster for Windowsapplikasjoner Exec=wine start /unix %f -MimeType=application/x-ms-dos-executable;application/x-msi; +MimeType=application/x-ms-dos-executable;application/x-msi;application/x-win-lnk; NoDisplay=true StartupNotify=true

1 0

Nikolay Sivov : comctl32/header: Update some Header flags and structures.
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: 779d9ee2582793650e9ed5353eda0e78b16485ca URL: http://source.winehq.org/git/wine.git/?a=commit;h=779d9ee2582793650e9ed5353… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jun 11 01:27:45 2009 +0400 comctl32/header: Update some Header flags and structures. --- include/commctrl.h | 16 ++++++++++++++++ 1 files changed, 16 insertions(+), 0 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 849fa46..6347dff 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -736,6 +736,8 @@ static const WCHAR WC_HEADERW[] = { 'S','y','s','H','e','a','d','e','r','3','2', #define HDS_FILTERBAR 0x0100 #define HDS_FLAT 0x0200 #define HDS_CHECKBOXES 0x0400 +#define HDS_NOSIZING 0x0800 +#define HDS_OVERFLOW 0x1000 #define HDI_WIDTH 0x0001 #define HDI_HEIGHT HDI_WIDTH @@ -747,6 +749,9 @@ static const WCHAR WC_HEADERW[] = { 'S','y','s','H','e','a','d','e','r','3','2', #define HDI_DI_SETITEM 0x0040 #define HDI_ORDER 0x0080 #define HDI_FILTER 0x0100 +#define HDI_STATE 0x0200 + +#define HDIS_FOCUSED 0x00000001 #define HDF_LEFT 0x0000 #define HDF_RIGHT 0x0001 @@ -763,6 +768,7 @@ static const WCHAR WC_HEADERW[] = { 'S','y','s','H','e','a','d','e','r','3','2', #define HDF_BITMAP 0x2000 #define HDF_STRING 0x4000 #define HDF_OWNERDRAW 0x8000 +#define HDF_SPLITBUTTON 0x1000000 #define HHT_NOWHERE 0x0001 #define HHT_ONHEADER 0x0002 @@ -775,6 +781,8 @@ static const WCHAR WC_HEADERW[] = { 'S','y','s','H','e','a','d','e','r','3','2', #define HHT_TORIGHT 0x0400 #define HHT_TOLEFT 0x0800 #define HHT_ONITEMSTATEICON 0x1000 +#define HHT_ONDROPDOWN 0x2000 +#define HHT_ONOVERFLOW 0x4000 #define HDM_FIRST 0x1200 #define HDM_GETITEMCOUNT (HDM_FIRST+0) @@ -862,10 +870,14 @@ typedef struct _HD_ITEMA INT cchTextMax; INT fmt; LPARAM lParam; + /* (_WIN32_IE >= 0x0300) */ INT iImage; INT iOrder; + /* (_WIN32_IE >= 0x0500) */ UINT type; LPVOID pvFilter; + /* (_WIN32_WINNT >= 0x0600) */ + UINT state; } HDITEMA, *LPHDITEMA; typedef struct _HD_ITEMW @@ -877,10 +889,14 @@ typedef struct _HD_ITEMW INT cchTextMax; INT fmt; LPARAM lParam; + /* (_WIN32_IE >= 0x0300) */ INT iImage; INT iOrder; + /* (_WIN32_IE >= 0x0500) */ UINT type; LPVOID pvFilter; + /* (_WIN32_WINNT >= 0x0600) */ + UINT state; } HDITEMW, *LPHDITEMW; #define HDITEM WINELIB_NAME_AW(HDITEM)

1 0

Nikolay Sivov : comctl32/listview: Don't use special value (1) for item width to represent both zero and one pixel width.
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: f2f444a230ba69ae6fabe28e8c0c1b95484a9362 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f2f444a230ba69ae6fabe28e8… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jun 11 00:32:46 2009 +0400 comctl32/listview: Don't use special value (1) for item width to represent both zero and one pixel width. --- dlls/comctl32/listview.c | 26 ++++++++++++++++++++------ dlls/comctl32/tests/listview.c | 2 +- 2 files changed, 21 insertions(+), 7 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index c210bf5..8ef516a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -1239,12 +1239,25 @@ static BOOL iterator_frameditems(ITERATOR* i, const LISTVIEW_INFO* infoPtr, cons INT nPerCol = max((infoPtr->rcList.bottom - infoPtr->rcList.top) / infoPtr->nItemHeight, 1); INT nFirstRow = max(frame.top / infoPtr->nItemHeight, 0); INT nLastRow = min((frame.bottom - 1) / infoPtr->nItemHeight, nPerCol - 1); - INT nFirstCol = max(frame.left / infoPtr->nItemWidth, 0); - INT nLastCol = min((frame.right - 1) / infoPtr->nItemWidth, (infoPtr->nItemCount + nPerCol - 1) / nPerCol); - INT lower = nFirstCol * nPerCol + nFirstRow; + INT nFirstCol; + INT nLastCol; + INT lower; RANGE item_range; INT nCol; + if (infoPtr->nItemWidth) + { + nFirstCol = max(frame.left / infoPtr->nItemWidth, 0); + nLastCol = min((frame.right - 1) / infoPtr->nItemWidth, (infoPtr->nItemCount + nPerCol - 1) / nPerCol); + } + else + { + nFirstCol = max(frame.left, 0); + nLastCol = min(frame.right - 1, (infoPtr->nItemCount + nPerCol - 1) / nPerCol); + } + + lower = nFirstCol * nPerCol + nFirstRow; + TRACE("nPerCol=%d, nFirstRow=%d, nLastRow=%d, nFirstCol=%d, nLastCol=%d, lower=%d\n", nPerCol, nFirstRow, nLastRow, nFirstCol, nLastCol, lower); @@ -1493,7 +1506,7 @@ static inline INT LISTVIEW_GetCountPerRow(const LISTVIEW_INFO *infoPtr) { INT nListWidth = infoPtr->rcList.right - infoPtr->rcList.left; - return max(nListWidth/infoPtr->nItemWidth, 1); + return max(nListWidth/(infoPtr->nItemWidth ? infoPtr->nItemWidth : 1), 1); } /*** @@ -1736,7 +1749,8 @@ static void LISTVIEW_UpdateScroll(const LISTVIEW_INFO *infoPtr) if(horzInfo.nPage < infoPtr->nItemWidth) horzInfo.nPage = infoPtr->nItemWidth; - horzInfo.nPage /= infoPtr->nItemWidth; + if (infoPtr->nItemWidth) + horzInfo.nPage /= infoPtr->nItemWidth; } else if (infoPtr->uView == LV_VIEW_DETAILS) { @@ -2530,7 +2544,7 @@ static INT LISTVIEW_CalculateItemWidth(const LISTVIEW_INFO *infoPtr) nItemWidth = max(DEFAULT_COLUMN_WIDTH, nItemWidth + WIDTH_PADDING); } - return max(nItemWidth, 1); + return nItemWidth; } /*** diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 2dce945..3895bea 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2829,7 +2829,7 @@ static void test_getitemrect(void) /* zero width rectangle with no padding */ expect(0, rect.left); - todo_wine expect(0, rect.right); + expect(0, rect.right); insert_column(hwnd, 0); insert_column(hwnd, 1);

1 0

Nikolay Sivov : comctl32/listview: Make item width calculation not rely on column order for LV_VIEW_DETAILS.
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: a5c970dea9cbe50a124443556c9bfe11d90ab23b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a5c970dea9cbe50a124443556… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jun 10 22:56:44 2009 +0400 comctl32/listview: Make item width calculation not rely on column order for LV_VIEW_DETAILS. --- dlls/comctl32/listview.c | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 55519dd..c210bf5 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -2505,11 +2505,15 @@ static INT LISTVIEW_CalculateItemWidth(const LISTVIEW_INFO *infoPtr) nItemWidth = infoPtr->iconSpacing.cx; else if (infoPtr->uView == LV_VIEW_DETAILS) { - RECT rcHeader; - if (DPA_GetPtrCount(infoPtr->hdpaColumns) > 0) { - LISTVIEW_GetHeaderRect(infoPtr, DPA_GetPtrCount(infoPtr->hdpaColumns) - 1, &rcHeader); + RECT rcHeader; + INT index; + + index = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, + DPA_GetPtrCount(infoPtr->hdpaColumns) - 1, 0); + + LISTVIEW_GetHeaderRect(infoPtr, index, &rcHeader); nItemWidth = rcHeader.right; } }

1 0

Nikolay Sivov : comctl32/listview: Update some ListView structures with recently added members.
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: ee015b8cd493397ba289fea5069099310ec7766e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee015b8cd493397ba289fea50… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jun 10 22:11:40 2009 +0400 comctl32/listview: Update some ListView structures with recently added members. --- include/commctrl.h | 73 +++++++++++++++++++++++++++++++++++++++++---------- 1 files changed, 58 insertions(+), 15 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 7d77faa..849fa46 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -3301,10 +3301,15 @@ typedef struct tagLVITEMA INT cchTextMax; INT iImage; LPARAM lParam; - INT iIndent; /* (_WIN32_IE >= 0x0300) */ - int iGroupId; /* (_WIN32_IE >= 0x560) */ - UINT cColumns; /* (_WIN32_IE >= 0x560) */ - PUINT puColumns; /* (_WIN32_IE >= 0x560) */ + /* (_WIN32_IE >= 0x0300) */ + INT iIndent; + /* (_WIN32_IE >= 0x0560) */ + INT iGroupId; + UINT cColumns; + PUINT puColumns; + /* (_WIN32_WINNT >= 0x0600) */ + PINT piColFmt; + INT iGroup; } LVITEMA, *LPLVITEMA; typedef struct tagLVITEMW @@ -3318,10 +3323,15 @@ typedef struct tagLVITEMW INT cchTextMax; INT iImage; LPARAM lParam; - INT iIndent; /* (_WIN32_IE >= 0x0300) */ - int iGroupId; /* (_WIN32_IE >= 0x560) */ - UINT cColumns; /* (_WIN32_IE >= 0x560) */ - PUINT puColumns; /* (_WIN32_IE >= 0x560) */ + /* (_WIN32_IE >= 0x0300) */ + INT iIndent; + /* (_WIN32_IE >= 0x0560) */ + INT iGroupId; + UINT cColumns; + PUINT puColumns; + /* (_WIN32_WINNT >= 0x0600) */ + PINT piColFmt; + INT iGroup; } LVITEMW, *LPLVITEMW; #define LVITEM WINELIB_NAME_AW(LVITEM) @@ -3331,6 +3341,10 @@ typedef struct tagLVITEMW #define LVITEM_V1_SIZEW CCSIZEOF_STRUCT(LVITEMW, lParam) #define LVITEM_V1_SIZE WINELIB_NAME_AW(LVITEM_V1_SIZE) +#define LVITEMA_V5_SIZE CCSIZEOF_STRUCT(LVITEMA, puColumns) +#define LVITEMW_V5_SIZE CCSIZEOF_STRUCT(LVITEMW, puColumns) +#define LVITEM_V5_SIZE WINELIB_NAME_AW(LVITEM_V5_SIZE) + #define LV_ITEM LVITEM #define LV_ITEMA LVITEMA #define LV_ITEMW LVITEMW @@ -3394,8 +3408,13 @@ typedef struct tagLVCOLUMNA LPSTR pszText; INT cchTextMax; INT iSubItem; - INT iImage; /* (_WIN32_IE >= 0x0300) */ - INT iOrder; /* (_WIN32_IE >= 0x0300) */ + /* (_WIN32_IE >= 0x0300) */ + INT iImage; + INT iOrder; + /* (_WIN32_WINNT >= 0x0600) */ + INT cxMin; + INT cxDefault; + INT cxIdeal; } LVCOLUMNA, *LPLVCOLUMNA; typedef struct tagLVCOLUMNW @@ -3406,8 +3425,13 @@ typedef struct tagLVCOLUMNW LPWSTR pszText; INT cchTextMax; INT iSubItem; - INT iImage; /* (_WIN32_IE >= 0x0300) */ - INT iOrder; /* (_WIN32_IE >= 0x0300) */ + /* (_WIN32_IE >= 0x0300) */ + INT iImage; + INT iOrder; + /* (_WIN32_WINNT >= 0x0600) */ + INT cxMin; + INT cxDefault; + INT cxIdeal; } LVCOLUMNW, *LPLVCOLUMNW; #define LVCOLUMN WINELIB_NAME_AW(LVCOLUMN) @@ -3513,6 +3537,8 @@ typedef struct tagLVHITTESTINFO UINT flags; INT iItem; INT iSubItem; + /* (_WIN32_WINNT >= 0x0600) */ + INT iGroup; } LVHITTESTINFO, *LPLVHITTESTINFO; #define LV_HITTESTINFO LVHITTESTINFO @@ -3551,15 +3577,32 @@ typedef struct LVGROUP UINT cbSize; UINT mask; LPWSTR pszHeader; - int cchHeader; + INT cchHeader; LPWSTR pszFooter; - int cchFooter; - int iGroupId; + INT cchFooter; + INT iGroupId; UINT stateMask; UINT state; UINT uAlign; + /* (_WIN32_WINNT >= 0x0600) */ + LPWSTR pszSubtitle; + UINT cchSubtitle; + LPWSTR pszTask; + UINT cchTask; + LPWSTR pszDescriptionTop; + UINT cchDescriptionTop; + LPWSTR pszDescriptionBottom; + UINT cchDescriptionBottom; + INT iTitleImage; + INT iExtendedImage; + INT iFirstItem; + UINT cItems; + LPWSTR pszSubsetTitle; + UINT cchSubsetTitle; } LVGROUP, *PLVGROUP; +#define LVGROUP_V5_SIZE CCSIZEOF_STRUCT(LVGROUP, uAlign) + typedef struct LVGROUPMETRICS { UINT cbSize;

1 0

Gerald Pfeifer : d3d9: Use correct constant types ( WINED3DPOOL_DEFAULT instead of D3DPOOL_DEFAULT and WINED3DRTYPE_SURFACE instead of D3DRTYPE_SURFACE ).
by Alexandre Julliard 11 Jun '09

11 Jun '09

Module: wine Branch: master Commit: 6383d5fee28fdd6a44303d86cd12713f0e2ce9fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=6383d5fee28fdd6a44303d86c… Author: Gerald Pfeifer <gerald(a)pfeifer.com> Date: Wed Jun 10 17:09:42 2009 +0200 d3d9: Use correct constant types (WINED3DPOOL_DEFAULT instead of D3DPOOL_DEFAULT and WINED3DRTYPE_SURFACE instead of D3DRTYPE_SURFACE). --- dlls/d3d9/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index c711087..4eeb609 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -797,7 +797,7 @@ static HRESULT WINAPI IDirect3DDevice9Impl_ColorFill(LPDIRECT3DDEVICE9EX iface /* This method is only allowed with surfaces that are render targets, or offscreen plain surfaces * in D3DPOOL_DEFAULT */ - if(!(usage & WINED3DUSAGE_RENDERTARGET) && (pool != D3DPOOL_DEFAULT || restype != D3DRTYPE_SURFACE)) { + if(!(usage & WINED3DUSAGE_RENDERTARGET) && (pool != WINED3DPOOL_DEFAULT || restype != WINED3DRTYPE_SURFACE)) { LeaveCriticalSection(&d3d9_cs); WARN("Surface is not a render target, or not a stand-alone D3DPOOL_DEFAULT surface\n"); return D3DERR_INVALIDCALL;

1 0

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 June 2009