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

Henri Verbeet : wined3d: Free priv->stack in shader_glsl_free().
by Alexandre Julliard 04 Jun '09

04 Jun '09

Module: wine Branch: master Commit: 37bdcd6b9bf041e55643f20673c79acc91ed91ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=37bdcd6b9bf041e55643f2067… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 4 10:16:20 2009 +0200 wined3d: Free priv->stack in shader_glsl_free(). --- dlls/wined3d/glsl_shader.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index d33a3ff..89b1e03 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -4503,6 +4503,7 @@ static void shader_glsl_free(IWineD3DDevice *iface) { wine_rb_destroy(&priv->program_lookup, NULL, NULL); constant_heap_free(&priv->pconst_heap); constant_heap_free(&priv->vconst_heap); + HeapFree(GetProcessHeap(), 0, priv->stack); HeapFree(GetProcessHeap(), 0, This->shader_priv); This->shader_priv = NULL;

1 0

Henri Verbeet : wined3d: Remove entries without an internal format from the GL formats template.
by Alexandre Julliard 04 Jun '09

04 Jun '09

Module: wine Branch: master Commit: 0cf49767ad181bdc4b4d80473c538255d43230b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0cf49767ad181bdc4b4d80473… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 4 10:16:20 2009 +0200 wined3d: Remove entries without an internal format from the GL formats template. --- dlls/wined3d/utils.c | 52 +++---------------------------------------------- 1 files changed, 4 insertions(+), 48 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 858e3ca..4802a7c 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -182,9 +182,6 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { /* WINED3DFORMAT internal srgbInternal rtInternal format type flags */ - {WINED3DFMT_UNKNOWN, 0, 0, 0, - 0, 0, - 0}, /* FourCC formats */ /* GL_APPLE_ycbcr_422 claims that its '2YUV' format, which is supported via the UNSIGNED_SHORT_8_8_REV_APPLE type * is equivalent to 'UYVY' format on Windows, and the 'YUVS' via UNSIGNED_SHORT_8_8_APPLE equates to 'YUY2'. The @@ -216,15 +213,6 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { {WINED3DFMT_DXT5, GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT, 0, GL_RGBA, GL_UNSIGNED_BYTE, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, - {WINED3DFMT_MULTI2_ARGB8, 0, 0, 0, - 0, 0, - 0}, - {WINED3DFMT_G8R8_G8B8, 0, 0, 0, - 0, 0, - 0}, - {WINED3DFMT_R8G8_B8G8, 0, 0, 0, - 0, 0, - 0}, /* IEEE formats */ {WINED3DFMT_R32_FLOAT, GL_RGB32F_ARB, GL_RGB32F_ARB, 0, GL_RED, GL_FLOAT, @@ -235,10 +223,6 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { {WINED3DFMT_R32G32B32A32_FLOAT, GL_RGBA32F_ARB, GL_RGBA32F_ARB, 0, GL_RGBA, GL_FLOAT, WINED3DFMT_FLAG_RENDERTARGET}, - /* Hmm? */ - {WINED3DFMT_CxV8U8, 0, 0, 0, - 0, 0, - 0}, /* Float */ {WINED3DFMT_R16_FLOAT, GL_RGB16F_ARB, GL_RGB16F_ARB, 0, GL_RED, GL_HALF_FLOAT_ARB, @@ -250,9 +234,6 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { GL_RGBA, GL_HALF_FLOAT_ARB, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING | WINED3DFMT_FLAG_RENDERTARGET}, /* Palettized formats */ - {WINED3DFMT_A8P8, 0, 0, 0, - 0, 0, - 0}, {WINED3DFMT_P8, GL_COLOR_INDEX8_EXT, GL_COLOR_INDEX8_EXT, 0, GL_COLOR_INDEX, GL_UNSIGNED_BYTE, 0}, @@ -284,9 +265,6 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { {WINED3DFMT_A8_UNORM, GL_ALPHA8, GL_ALPHA8, 0, GL_ALPHA, GL_UNSIGNED_BYTE, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING}, - {WINED3DFMT_A8R3G3B2, 0, 0, 0, - 0, 0, - 0}, {WINED3DFMT_X4R4G4B4, GL_RGB4, GL_RGB4, 0, GL_BGRA, GL_UNSIGNED_SHORT_4_4_4_4_REV, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, @@ -334,12 +312,6 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { {WINED3DFMT_R16G16_SNORM, GL_SIGNED_HILO16_NV, GL_SIGNED_HILO16_NV, 0, GL_HILO_NV, GL_SHORT, WINED3DFMT_FLAG_POSTPIXELSHADER_BLENDING | WINED3DFMT_FLAG_FILTERING}, - {WINED3DFMT_W11V11U10, 0, 0, 0, - 0, 0, - 0}, - {WINED3DFMT_A2W10V10U10, 0, 0, 0, - 0, 0, - 0}, /* Depth stencil formats */ {WINED3DFMT_D16_LOCKABLE, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT, @@ -371,29 +343,9 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { {WINED3DFMT_D24FS8, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_FLOAT, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL}, - /* Is this a vertex buffer? */ - {WINED3DFMT_VERTEXDATA, 0, 0, 0, - 0, 0, - 0}, - {WINED3DFMT_R16_UINT, 0, 0, 0, - 0, 0, - 0}, - {WINED3DFMT_R32_UINT, 0, 0, 0, - 0, 0, - 0}, {WINED3DFMT_R16G16B16A16_SNORM, GL_COLOR_INDEX, GL_COLOR_INDEX, 0, GL_COLOR_INDEX, GL_UNSIGNED_SHORT, 0}, - /* Vendor-specific formats */ - {WINED3DFMT_ATI2N, 0, 0, 0, - GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, - 0}, - {WINED3DFMT_NVHU, 0, 0, 0, - GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, - 0}, - {WINED3DFMT_NVHS, 0, 0, 0, - GL_LUMINANCE_ALPHA, GL_UNSIGNED_BYTE, - 0} }; static inline int getFmtIdx(WINED3DFORMAT fmt) { @@ -616,6 +568,8 @@ static void apply_format_fixups(WineD3D_GL_Info *gl_info) idx = getFmtIdx(WINED3DFMT_ATI2N); gl_info->gl_formats[idx].glInternal = GL_COMPRESSED_RED_GREEN_RGTC2_EXT; gl_info->gl_formats[idx].glGammaInternal = GL_COMPRESSED_RED_GREEN_RGTC2_EXT; + gl_info->gl_formats[idx].glFormat = GL_LUMINANCE_ALPHA; + gl_info->gl_formats[idx].glType = GL_UNSIGNED_BYTE; gl_info->gl_formats[idx].color_fixup = create_color_fixup_desc( 0, CHANNEL_SOURCE_Y, 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); } @@ -624,6 +578,8 @@ static void apply_format_fixups(WineD3D_GL_Info *gl_info) idx = getFmtIdx(WINED3DFMT_ATI2N); gl_info->gl_formats[idx].glInternal = GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI; gl_info->gl_formats[idx].glGammaInternal = GL_COMPRESSED_LUMINANCE_ALPHA_3DC_ATI; + gl_info->gl_formats[idx].glFormat = GL_LUMINANCE_ALPHA; + gl_info->gl_formats[idx].glType = GL_UNSIGNED_BYTE; gl_info->gl_formats[idx].color_fixup= create_color_fixup_desc( 0, CHANNEL_SOURCE_X, 0, CHANNEL_SOURCE_W, 0, CHANNEL_SOURCE_ONE, 0, CHANNEL_SOURCE_ONE); }

1 0

Henri Verbeet : wined3d: Remove WINED3DFMT_R16G16B16A16_SNORM from the GL formats template.
by Alexandre Julliard 04 Jun '09

04 Jun '09

Module: wine Branch: master Commit: faaea935737ebff7b2dae3843b24f36c304940b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=faaea935737ebff7b2dae3843… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 4 10:16:20 2009 +0200 wined3d: Remove WINED3DFMT_R16G16B16A16_SNORM from the GL formats template. This entry obviously can't work correctly. --- dlls/wined3d/utils.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4802a7c..e152337 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -343,9 +343,6 @@ static const GlPixelFormatDescTemplate gl_formats_template[] = { {WINED3DFMT_D24FS8, GL_DEPTH_COMPONENT24_ARB, GL_DEPTH_COMPONENT24_ARB, 0, GL_DEPTH_COMPONENT, GL_FLOAT, WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL}, - {WINED3DFMT_R16G16B16A16_SNORM, GL_COLOR_INDEX, GL_COLOR_INDEX, 0, - GL_COLOR_INDEX, GL_UNSIGNED_SHORT, - 0}, }; static inline int getFmtIdx(WINED3DFORMAT fmt) {

1 0

Henri Verbeet : wined3d: Check FBO compatibility after the fixups are applied.
by Alexandre Julliard 04 Jun '09

04 Jun '09

Module: wine Branch: master Commit: 0a059aafbe7155e0d058689fe948acc5f3cbdcc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a059aafbe7155e0d058689fe… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 4 10:16:21 2009 +0200 wined3d: Check FBO compatibility after the fixups are applied. --- dlls/wined3d/utils.c | 59 ++++++++++++++++++++++++++++++------------------- 1 files changed, 36 insertions(+), 23 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index e152337..e4c09c8 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -420,6 +420,40 @@ static BOOL check_fbo_compat(const WineD3D_GL_Info *gl_info, GLint internal_form return status == GL_FRAMEBUFFER_COMPLETE_EXT; } +static void init_format_fbo_compat_info(WineD3D_GL_Info *gl_info) +{ + unsigned int i; + + for (i = 0; i < sizeof(formats) / sizeof(*formats); ++i) + { + struct GlPixelFormatDesc *desc = &gl_info->gl_formats[i]; + + if (!desc->glInternal) continue; + + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && desc->rtInternal) + { + /* 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)) + { + TRACE("Format %s is supported as fbo target\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", + debug_d3dformat(desc->format)); + } + } + else + { + desc->rtInternal = desc->glInternal; + } + } +} + static BOOL init_format_texture_info(WineD3D_GL_Info *gl_info) { unsigned int i; @@ -439,34 +473,12 @@ static BOOL init_format_texture_info(WineD3D_GL_Info *gl_info) desc = &gl_info->gl_formats[fmt_idx]; desc->glInternal = gl_formats_template[i].glInternal; desc->glGammaInternal = gl_formats_template[i].glGammaInternal; + desc->rtInternal = gl_formats_template[i].rtInternal; desc->glFormat = gl_formats_template[i].glFormat; desc->glType = gl_formats_template[i].glType; desc->color_fixup = COLOR_FIXUP_IDENTITY; desc->Flags |= gl_formats_template[i].Flags; desc->heightscale = 1.0; - - if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && gl_formats_template[i].rtInternal) - { - /* 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, gl_formats_template[i].glInternal)) - { - TRACE("Internal format of %s not supported as FBO target, using render target internal instead\n", - debug_d3dformat(gl_formats_template[i].fmt)); - desc->rtInternal = gl_formats_template[i].rtInternal; - } - else - { - TRACE("Format %s is supported as fbo target\n", debug_d3dformat(gl_formats_template[i].fmt)); - desc->rtInternal = gl_formats_template[i].glInternal; - } - } - else - { - desc->rtInternal = gl_formats_template[i].glInternal; - } } return TRUE; @@ -670,6 +682,7 @@ BOOL initPixelFormats(WineD3D_GL_Info *gl_info) } apply_format_fixups(gl_info); + init_format_fbo_compat_info(gl_info); return TRUE; }

1 0

Nikolay Sivov : comctl32/listview: Some tests for LVS_SORT[A, DE]SCENDING, remove these styles from TODOs.
by Alexandre Julliard 04 Jun '09

04 Jun '09

Module: wine Branch: master Commit: 3e4ba3048a64a33f2f8d798f12f37e84a8dda7bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=3e4ba3048a64a33f2f8d798f1… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jun 3 22:43:28 2009 +0400 comctl32/listview: Some tests for LVS_SORT[A,DE]SCENDING, remove these styles from TODOs. --- dlls/comctl32/listview.c | 1 - dlls/comctl32/tests/listview.c | 29 +++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index aa614c2..b83c697 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -80,7 +80,6 @@ * Styles * -- LVS_NOLABELWRAP * -- LVS_NOSCROLL (see Q137520) - * -- LVS_SORTASCENDING, LVS_SORTDESCENDING * -- LVS_ALIGNTOP * -- LVS_TYPESTYLEMASK * diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index d0aa1f3..a8e0b9b 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -2226,6 +2226,35 @@ static void test_ownerdata(void) "ownerdata getitem selected state 2", FALSE); DestroyWindow(hwnd); + + /* LVS_SORTASCENDING/LVS_SORTDESCENDING aren't compatible with LVS_OWNERDATA */ + hwnd = create_listview_control(LVS_OWNERDATA | LVS_SORTASCENDING); + ok(hwnd != NULL, "failed to create a listview window\n"); + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(style & LVS_OWNERDATA, "Expected LVS_OWNERDATA\n"); + ok(style & LVS_SORTASCENDING, "Expected LVS_SORTASCENDING to be set\n"); + SetWindowLongPtrA(hwnd, GWL_STYLE, style & ~LVS_SORTASCENDING); + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(!(style & LVS_SORTASCENDING), "Expected LVS_SORTASCENDING not set\n"); + DestroyWindow(hwnd); + /* apparently it's allowed to switch these style on after creation */ + hwnd = create_listview_control(LVS_OWNERDATA); + ok(hwnd != NULL, "failed to create a listview window\n"); + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(style & LVS_OWNERDATA, "Expected LVS_OWNERDATA\n"); + SetWindowLongPtrA(hwnd, GWL_STYLE, style | LVS_SORTASCENDING); + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(style & LVS_SORTASCENDING, "Expected LVS_SORTASCENDING to be set\n"); + DestroyWindow(hwnd); + + hwnd = create_listview_control(LVS_OWNERDATA); + ok(hwnd != NULL, "failed to create a listview window\n"); + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(style & LVS_OWNERDATA, "Expected LVS_OWNERDATA\n"); + SetWindowLongPtrA(hwnd, GWL_STYLE, style | LVS_SORTDESCENDING); + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(style & LVS_SORTDESCENDING, "Expected LVS_SORTDESCENDING to be set\n"); + DestroyWindow(hwnd); } static void test_norecompute(void)

1 0

Nikolay Sivov : comctl32/listview: Improve item visibility calculation for report view.
by Alexandre Julliard 04 Jun '09

04 Jun '09

Module: wine Branch: master Commit: f8904e156fafa6b25eb70d50bbb0029fd0e1a3dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=f8904e156fafa6b25eb70d50b… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jun 4 01:43:28 2009 +0400 comctl32/listview: Improve item visibility calculation for report view. --- dlls/comctl32/listview.c | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index b83c697..63500f2 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4096,7 +4096,8 @@ static void LISTVIEW_RefreshReport(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, INT rgntype; RECT rcClip, rcItem; POINT Origin, Position; - RANGE colRange; + RANGES colRanges; + INT col, index; ITERATOR j; TRACE("()\n"); @@ -4107,19 +4108,19 @@ static void LISTVIEW_RefreshReport(LISTVIEW_INFO *infoPtr, ITERATOR *i, HDC hdc, /* Get scroll info once before loop */ LISTVIEW_GetOrigin(infoPtr, &Origin); - + + colRanges = ranges_create(DPA_GetPtrCount(infoPtr->hdpaColumns)); + /* narrow down the columns we need to paint */ - for(colRange.lower = 0; colRange.lower < DPA_GetPtrCount(infoPtr->hdpaColumns); colRange.lower++) + for(col = 0; col < DPA_GetPtrCount(infoPtr->hdpaColumns); col++) { - LISTVIEW_GetHeaderRect(infoPtr, colRange.lower, &rcItem); - if (rcItem.right + Origin.x >= rcClip.left) break; - } - for(colRange.upper = DPA_GetPtrCount(infoPtr->hdpaColumns); colRange.upper > 0; colRange.upper--) - { - LISTVIEW_GetHeaderRect(infoPtr, colRange.upper - 1, &rcItem); - if (rcItem.left + Origin.x < rcClip.right) break; + index = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, col, 0); + + LISTVIEW_GetHeaderRect(infoPtr, index, &rcItem); + if ((rcItem.right + Origin.x >= rcClip.left) && (rcItem.left + Origin.x < rcClip.right)) + ranges_additem(colRanges, index); } - iterator_rangeitems(&j, colRange); + iterator_rangesitems(&j, colRanges); /* in full row select, we _have_ to draw the main item */ if (infoPtr->dwLvExStyle & LVS_EX_FULLROWSELECT)

1 0

Nikolay Sivov : comctl32/listview: Improve grid drawing on LVS_EX_GRIDLINES style.
by Alexandre Julliard 04 Jun '09

04 Jun '09

Module: wine Branch: master Commit: 39398aedc7ce83deb5d975bc80beee659884a351 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39398aedc7ce83deb5d975bc8… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Jun 4 02:43:06 2009 +0400 comctl32/listview: Improve grid drawing on LVS_EX_GRIDLINES style. --- dlls/comctl32/listview.c | 37 +++++++++++++++++++++++-------------- 1 files changed, 23 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 63500f2..b50bf2b 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4166,10 +4166,11 @@ static void LISTVIEW_RefreshReportGrid(LISTVIEW_INFO *infoPtr, HDC hdc) { INT rgntype; INT y, itemheight; + INT col, index; HPEN hPen, hOldPen; RECT rcClip, rcItem = {0}; POINT Origin; - RANGE colRange; + RANGES colRanges; ITERATOR j; BOOL rmost = FALSE; @@ -4182,21 +4183,23 @@ static void LISTVIEW_RefreshReportGrid(LISTVIEW_INFO *infoPtr, HDC hdc) /* Get scroll info once before loop */ LISTVIEW_GetOrigin(infoPtr, &Origin); + colRanges = ranges_create(DPA_GetPtrCount(infoPtr->hdpaColumns)); + /* narrow down the columns we need to paint */ - for(colRange.lower = 0; colRange.lower < DPA_GetPtrCount(infoPtr->hdpaColumns); colRange.lower++) - { - LISTVIEW_GetHeaderRect(infoPtr, colRange.lower, &rcItem); - if (rcItem.right + Origin.x >= rcClip.left) break; - } - for(colRange.upper = DPA_GetPtrCount(infoPtr->hdpaColumns); colRange.upper > 0; colRange.upper--) + for(col = 0; col < DPA_GetPtrCount(infoPtr->hdpaColumns); col++) { - LISTVIEW_GetHeaderRect(infoPtr, colRange.upper - 1, &rcItem); - if (rcItem.left + Origin.x < rcClip.right) break; + index = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, col, 0); + + LISTVIEW_GetHeaderRect(infoPtr, index, &rcItem); + if ((rcItem.right + Origin.x >= rcClip.left) && (rcItem.left + Origin.x < rcClip.right)) + ranges_additem(colRanges, index); } + /* is right most vertical line visible? */ if (DPA_GetPtrCount(infoPtr->hdpaColumns) > 0) { - LISTVIEW_GetHeaderRect(infoPtr, DPA_GetPtrCount(infoPtr->hdpaColumns) - 1, &rcItem); + index = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, DPA_GetPtrCount(infoPtr->hdpaColumns) - 1, 0); + LISTVIEW_GetHeaderRect(infoPtr, index, &rcItem); rmost = (rcItem.right + Origin.x < rcClip.right); } @@ -4205,11 +4208,11 @@ static void LISTVIEW_RefreshReportGrid(LISTVIEW_INFO *infoPtr, HDC hdc) hOldPen = SelectObject ( hdc, hPen ); /* draw the vertical lines for the columns */ - iterator_rangeitems(&j, colRange); + iterator_rangesitems(&j, colRanges); while(iterator_next(&j)) { LISTVIEW_GetHeaderRect(infoPtr, j.nItem, &rcItem); - if (rcItem.left == 0) continue; /* skip first column */ + if (rcItem.left == 0) continue; /* skip leftmost column */ rcItem.left += Origin.x; rcItem.right += Origin.x; rcItem.top = infoPtr->rcList.top; @@ -4222,8 +4225,14 @@ static void LISTVIEW_RefreshReportGrid(LISTVIEW_INFO *infoPtr, HDC hdc) /* draw rightmost grid line if visible */ if (rmost) { - MoveToEx (hdc, rcItem.right, rcItem.top, NULL); - LineTo (hdc, rcItem.right, rcItem.bottom); + index = SendMessageW(infoPtr->hwndHeader, HDM_ORDERTOINDEX, + DPA_GetPtrCount(infoPtr->hdpaColumns) - 1, 0); + LISTVIEW_GetHeaderRect(infoPtr, index, &rcItem); + + rcItem.right += Origin.x; + + MoveToEx (hdc, rcItem.right, infoPtr->rcList.top, NULL); + LineTo (hdc, rcItem.right, infoPtr->rcList.bottom); } /* draw the horizontial lines for the rows */

1 0

Alexandre Julliard : user32/tests: Add more synchronization in the exit thread test to avoid races.
by Alexandre Julliard 04 Jun '09

04 Jun '09

Module: wine Branch: master Commit: 52ad8123f9146959257d2f991215dbf2a3fc4d22 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52ad8123f9146959257d2f991… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 3 20:33:45 2009 +0200 user32/tests: Add more synchronization in the exit thread test to avoid races. --- dlls/user32/tests/msg.c | 49 ++++++++++++++++++++++++++++------------------ 1 files changed, 30 insertions(+), 19 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index dfc4c0d..0a59ae8 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -6315,7 +6315,9 @@ static void test_paint_messages(void) struct wnd_event { HWND hwnd; - HANDLE event; + HANDLE grand_child; + HANDLE start_event; + HANDLE stop_event; }; static DWORD WINAPI thread_proc(void *param) @@ -6327,7 +6329,7 @@ static DWORD WINAPI thread_proc(void *param) 100, 100, 200, 200, 0, 0, 0, NULL); ok(wnd_event->hwnd != 0, "Failed to create overlapped window\n"); - SetEvent(wnd_event->event); + SetEvent(wnd_event->start_event); while (GetMessage(&msg, 0, 0, 0)) { @@ -6351,13 +6353,13 @@ static DWORD CALLBACK create_grand_child_thread( void *param ) ok (hchild != 0, "Failed to create child window\n"); flush_events(); flush_sequence(); - SetEvent( wnd_event->event ); + SetEvent( wnd_event->start_event ); - while (GetMessage(&msg, 0, 0, 0)) + for (;;) { - TranslateMessage(&msg); - DispatchMessage(&msg); + MsgWaitForMultipleObjects(0, NULL, FALSE, 1000, QS_ALLINPUT); if (!IsWindow( hchild )) break; /* will be destroyed when parent thread exits */ + while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg); } return 0; } @@ -6366,7 +6368,7 @@ static DWORD CALLBACK create_child_thread( void *param ) { struct wnd_event *wnd_event = param; struct wnd_event child_event; - DWORD tid; + DWORD ret, tid; MSG msg; child_event.hwnd = CreateWindowExA(0, "TestWindowClass", "Test child", @@ -6375,15 +6377,16 @@ static DWORD CALLBACK create_child_thread( void *param ) SetFocus( child_event.hwnd ); flush_events(); flush_sequence(); - child_event.event = wnd_event->event; - CloseHandle( CreateThread(NULL, 0, create_grand_child_thread, &child_event, 0, &tid) ); + child_event.start_event = wnd_event->start_event; + wnd_event->grand_child = CreateThread(NULL, 0, create_grand_child_thread, &child_event, 0, &tid); for (;;) { - DWORD ret = MsgWaitForMultipleObjects(1, &child_event.event, FALSE, 1000, QS_SENDMESSAGE); + DWORD ret = MsgWaitForMultipleObjects(1, &child_event.start_event, FALSE, 1000, QS_SENDMESSAGE); if (ret != 1) break; while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg); } - Sleep( 200 ); /* leave parent the time to finish processing messages */ + ret = WaitForSingleObject( wnd_event->stop_event, 5000 ); + ok( !ret, "WaitForSingleObject failed %x\n", ret ); return 0; } @@ -6398,8 +6401,8 @@ static void test_interthread_messages(void) struct wnd_event wnd_event; BOOL ret; - wnd_event.event = CreateEventW(NULL, 0, 0, NULL); - if (!wnd_event.event) + wnd_event.start_event = CreateEventW(NULL, 0, 0, NULL); + if (!wnd_event.start_event) { win_skip("skipping interthread message test under win9x\n"); return; @@ -6408,9 +6411,9 @@ static void test_interthread_messages(void) hThread = CreateThread(NULL, 0, thread_proc, &wnd_event, 0, &tid); ok(hThread != NULL, "CreateThread failed, error %d\n", GetLastError()); - ok(WaitForSingleObject(wnd_event.event, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); + ok(WaitForSingleObject(wnd_event.start_event, INFINITE) == WAIT_OBJECT_0, "WaitForSingleObject failed\n"); - CloseHandle(wnd_event.event); + CloseHandle(wnd_event.start_event); SetLastError(0xdeadbeef); ok(!DestroyWindow(wnd_event.hwnd), "DestroyWindow succeded\n"); @@ -6460,20 +6463,28 @@ static void test_interthread_messages(void) ok (wnd_event.hwnd != 0, "Failed to create parent window\n"); flush_sequence(); log_all_parent_messages++; - wnd_event.event = CreateEventA( NULL, TRUE, FALSE, NULL ); + wnd_event.start_event = CreateEventA( NULL, TRUE, FALSE, NULL ); + wnd_event.stop_event = CreateEventA( NULL, TRUE, FALSE, NULL ); hThread = CreateThread( NULL, 0, create_child_thread, &wnd_event, 0, &tid ); for (;;) { - ret = MsgWaitForMultipleObjects(1, &wnd_event.event, FALSE, 1000, QS_SENDMESSAGE); + ret = MsgWaitForMultipleObjects(1, &wnd_event.start_event, FALSE, 1000, QS_SENDMESSAGE); if (ret != 1) break; while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg); } ok( !ret, "MsgWaitForMultipleObjects failed %x\n", ret ); /* now wait for the thread without processing messages; this shouldn't deadlock */ + SetEvent( wnd_event.stop_event ); ret = WaitForSingleObject( hThread, 5000 ); ok( !ret, "WaitForSingleObject failed %x\n", ret ); CloseHandle( hThread ); - CloseHandle( wnd_event.event ); + + ret = WaitForSingleObject( wnd_event.grand_child, 5000 ); + ok( !ret, "WaitForSingleObject failed %x\n", ret ); + CloseHandle( wnd_event.grand_child ); + + CloseHandle( wnd_event.start_event ); + CloseHandle( wnd_event.stop_event ); flush_events(); ok_sequence(WmExitThreadSeq, "destroy child on thread exit", FALSE); log_all_parent_messages--; @@ -10210,7 +10221,7 @@ static const struct message WmShowMaximized_2[] = { }; static const struct message WmShowMaximized_3[] = { { HCBT_MINMAX, hook|lparam, 0, SW_SHOWMAXIMIZED }, - { WM_GETMINMAXINFO, sent }, + { WM_GETMINMAXINFO, sent|optional }, { WM_WINDOWPOSCHANGING, sent|wparam, SWP_FRAMECHANGED|SWP_STATECHANGED, 0, SWP_NOCLIENTSIZE|SWP_NOCLIENTMOVE|SWP_NOSIZE|SWP_NOMOVE }, { HCBT_ACTIVATE, hook|optional }, /* win2000 doesn't send it */ { WM_WINDOWPOSCHANGING, sent|wparam|optional, SWP_NOSIZE|SWP_NOMOVE }, /* win2000 doesn't send it */

1 0

Alexandre Julliard : user32/tests: More systematically ignore the messages we don't care about.
by Alexandre Julliard 04 Jun '09

04 Jun '09

Module: wine Branch: master Commit: 7b40a2fa95e5f5f3b8d31b8c65d1cdb5d7d953e9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b40a2fa95e5f5f3b8d31b8c6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 4 11:45:33 2009 +0200 user32/tests: More systematically ignore the messages we don't care about. --- dlls/user32/tests/win.c | 69 ++++++++++++++++++++++++---------------------- 1 files changed, 36 insertions(+), 33 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 43988b5..d45eba3 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -2634,6 +2634,17 @@ static void test_capture_3(HWND hwnd1, HWND hwnd2) ok (ret, "releasecapture did not return TRUE after second try.\n"); } +/* PeekMessage wrapper that ignores the messages we don't care about */ +static BOOL peek_message( MSG *msg ) +{ + BOOL ret; + do + { + ret = PeekMessageA(msg, 0, 0, 0, PM_REMOVE); + } while (ret && (msg->message == WM_TIMER || ignore_message(msg->message))); + return ret; +} + static void test_keyboard_input(HWND hwnd) { MSG msg; @@ -2652,40 +2663,31 @@ static void test_keyboard_input(HWND hwnd) flush_events( TRUE ); PostMessageA(hwnd, WM_KEYDOWN, 0, 0); - do - { - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); - ok( ret, "no message available\n"); - } - while (ret && msg.message >= 0xc000); + ret = peek_message(&msg); + ok( ret, "no message available\n"); ok(msg.hwnd == hwnd && msg.message == WM_KEYDOWN, "hwnd %p message %04x\n", msg.hwnd, msg.message); - do - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); - while (ret && (msg.message == WM_TIMER || msg.message >= 0xc000)); + ret = peek_message(&msg); ok( !ret, "message %04x available\n", msg.message); ok(GetFocus() == hwnd, "wrong focus window %p\n", GetFocus()); PostThreadMessageA(GetCurrentThreadId(), WM_KEYDOWN, 0, 0); - ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); + ret = peek_message(&msg); + ok(ret, "no message available\n"); ok(!msg.hwnd && msg.message == WM_KEYDOWN, "hwnd %p message %04x\n", msg.hwnd, msg.message); - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + ret = peek_message(&msg); ok( !ret, "message %04x available\n", msg.message); ok(GetFocus() == hwnd, "wrong focus window %p\n", GetFocus()); keybd_event(VK_SPACE, 0, 0, 0); - do - { - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); - } while (ret && msg.message >= 0xc000); - if (!ret) + if (!peek_message(&msg)) { skip( "keybd_event didn't work, skipping keyboard test\n" ); return; } ok(msg.hwnd == hwnd && msg.message == WM_KEYDOWN, "hwnd %p message %04x\n", msg.hwnd, msg.message); - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + ret = peek_message(&msg); ok( !ret, "message %04x available\n", msg.message); SetFocus(0); @@ -2694,25 +2696,28 @@ static void test_keyboard_input(HWND hwnd) flush_events( TRUE ); PostMessageA(hwnd, WM_KEYDOWN, 0, 0); - ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); + ret = peek_message(&msg); + ok(ret, "no message available\n"); ok(msg.hwnd == hwnd && msg.message == WM_KEYDOWN, "hwnd %p message %04x\n", msg.hwnd, msg.message); - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + ret = peek_message(&msg); ok( !ret, "message %04x available\n", msg.message); ok(GetFocus() == 0, "wrong focus window %p\n", GetFocus()); PostThreadMessageA(GetCurrentThreadId(), WM_KEYDOWN, 0, 0); - ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); + ret = peek_message(&msg); + ok(ret, "no message available\n"); ok(!msg.hwnd && msg.message == WM_KEYDOWN, "hwnd %p message %04x\n", msg.hwnd, msg.message); - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + ret = peek_message(&msg); ok( !ret, "message %04x available\n", msg.message); ok(GetFocus() == 0, "wrong focus window %p\n", GetFocus()); keybd_event(VK_SPACE, 0, 0, 0); - ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); + ret = peek_message(&msg); + ok(ret, "no message available\n"); ok(msg.hwnd == hwnd && msg.message == WM_SYSKEYDOWN, "hwnd %p message %04x\n", msg.hwnd, msg.message); - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + ret = peek_message(&msg); ok( !ret, "message %04x available\n", msg.message); } @@ -2722,11 +2727,11 @@ static BOOL wait_for_message( MSG *msg ) for (;;) { - ret = PeekMessageA(msg, 0, 0, 0, PM_REMOVE); + ret = peek_message(msg); if (ret) { if (msg->message == WM_PAINT) DispatchMessage(msg); - else if (!ignore_message(msg->message)) break; + else break; } else if (MsgWaitForMultipleObjects( 0, NULL, FALSE, 100, QS_ALLINPUT ) == WAIT_TIMEOUT) break; } @@ -2779,9 +2784,7 @@ static void test_mouse_input(HWND hwnd) /* Check that setting the same position may generate WM_MOUSEMOVE */ SetCursorPos(x, y); msg.message = 0; - do - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); - while (ret && msg.message >= 0xc000); /* skip registered messages */ + ret = peek_message(&msg); if (ret) { ok(msg.hwnd == popup && msg.message == WM_MOUSEMOVE, "hwnd %p message %04x\n", @@ -2802,11 +2805,11 @@ static void test_mouse_input(HWND hwnd) /* FIXME: SetCursorPos in Wine generates additional WM_MOUSEMOVE message */ while (PeekMessageA(&msg, 0, 0, 0, PM_REMOVE)) { - if (msg.message == WM_TIMER || msg.message >= 0xc000) continue; /* skip registered messages */ + if (msg.message == WM_TIMER || ignore_message(msg.message)) continue; ok(msg.hwnd == popup && msg.message == WM_MOUSEMOVE, "hwnd %p message %04x\n", msg.hwnd, msg.message); } - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + ret = peek_message(&msg); ok( !ret, "message %04x available\n", msg.message); mouse_event(MOUSEEVENTF_MOVE, -1, -1, 0, 0); @@ -2866,7 +2869,7 @@ static void test_mouse_input(HWND hwnd) ok(msg.hwnd == popup && msg.message == WM_LBUTTONUP, "hwnd %p/%p message %04x\n", msg.hwnd, popup, msg.message); - ret = PeekMessageA(&msg, 0, 0, 0, PM_REMOVE); + ret = peek_message(&msg); ok(!ret, "message %04x available\n", msg.message); ShowWindow(popup, SW_HIDE); @@ -2894,10 +2897,10 @@ static void test_mouse_input(HWND hwnd) ok(ret, "no message available\n"); ok(msg.hwnd == popup && msg.message == WM_LBUTTONDOWN, "hwnd %p/%p message %04x\n", msg.hwnd, popup, msg.message); - ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); + ok(peek_message(&msg), "no message available\n"); ok(msg.hwnd == popup && msg.message == WM_LBUTTONUP, "hwnd %p/%p message %04x\n", msg.hwnd, popup, msg.message); - ok(PeekMessageA(&msg, 0, 0, 0, PM_REMOVE), "no message available\n"); + ok(peek_message(&msg), "no message available\n"); /* Test WM_MOUSEACTIVATE */ #define TEST_MOUSEACTIVATE(A,B) \

1 0

Hans Leidekker : crypt32: Initialize salt correctly.
by Alexandre Julliard 04 Jun '09

04 Jun '09

Module: wine Branch: master Commit: 0376ec38b01a9664842debc085c02a2b34d1340e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0376ec38b01a9664842debc08… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 4 10:11:55 2009 +0200 crypt32: Initialize salt correctly. --- dlls/crypt32/protectdata.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/crypt32/protectdata.c b/dlls/crypt32/protectdata.c index e6ac16e..a7351bb 100644 --- a/dlls/crypt32/protectdata.c +++ b/dlls/crypt32/protectdata.c @@ -609,7 +609,7 @@ BOOL fill_protect_data(struct protect_data_t * pInfo, LPCWSTR szDataDescr, if ((pInfo->salt.pbData=CryptMemAlloc(CRYPT32_PROTECTDATA_SALT_LEN))) { /* generate random salt */ - if (!CryptGenRandom(hProv, pInfo->salt.cbData, pInfo->salt.pbData)) + if (!CryptGenRandom(hProv, CRYPT32_PROTECTDATA_SALT_LEN, pInfo->salt.pbData)) { ERR("CryptGenRandom\n"); free_protect_data(pInfo);

1 0