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

Henri Verbeet : wined3d: Use the format info for doing compressed surface blits in BltFast().
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: e83fa982ca2b2686945f3cbeb0117a56703dc30b URL: http://source.winehq.org/git/wine.git/?a=commit;h=e83fa982ca2b2686945f3cbeb… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 10 09:44:05 2009 +0200 wined3d: Use the format info for doing compressed surface blits in BltFast(). --- dlls/wined3d/surface_base.c | 46 +++++++++--------------------------------- 1 files changed, 10 insertions(+), 36 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 50faf9a..407a6db 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -1650,65 +1650,39 @@ HRESULT WINAPI IWineD3DBaseSurfaceImpl_BltFast(IWineD3DSurface *iface, DWORD dst dEntry = This->resource.format_desc; } - /* Handle first the FOURCC surfaces... */ - if (sEntry->Flags & dEntry->Flags & WINED3DFMT_FLAG_FOURCC) + /* Handle compressed surfaces first... */ + if (sEntry->Flags & dEntry->Flags & WINED3DFMT_FLAG_COMPRESSED) { - UINT block_width; - UINT block_height; - UINT block_byte_size; UINT row_block_count; - TRACE("Fourcc -> Fourcc copy\n"); + TRACE("compressed -> compressed copy\n"); if (trans) - FIXME("trans arg not supported when a FOURCC surface is involved\n"); + FIXME("trans arg not supported when a compressed surface is involved\n"); if (dstx || dsty) FIXME("offset for destination surface is not supported\n"); if (Src->resource.format_desc->format != This->resource.format_desc->format) { - FIXME("FOURCC->FOURCC copy only supported for the same type of surface\n"); + FIXME("compressed -> compressed copy only supported for the same type of surface\n"); ret = WINED3DERR_WRONGTEXTUREFORMAT; goto error; } - if (This->resource.format_desc->format == WINED3DFMT_DXT1) - { - block_width = 4; - block_height = 4; - block_byte_size = 8; - } - else if (This->resource.format_desc->format == WINED3DFMT_DXT2 - || This->resource.format_desc->format == WINED3DFMT_DXT3 - || This->resource.format_desc->format == WINED3DFMT_DXT4 - || This->resource.format_desc->format == WINED3DFMT_DXT5) - { - block_width = 4; - block_height = 4; - block_byte_size = 16; - } - else - { - FIXME("Unsupported FourCC format %s.\n", debug_d3dformat(This->resource.format_desc->format)); - block_width = 1; - block_height = 1; - block_byte_size = This->resource.format_desc->byte_count; - } - - row_block_count = (w + block_width - 1) / block_width; - for (y = 0; y < h; y += block_height) + row_block_count = (w + dEntry->block_width - 1) / dEntry->block_width; + for (y = 0; y < h; y += dEntry->block_height) { - memcpy(dbuf, sbuf, row_block_count * block_byte_size); + memcpy(dbuf, sbuf, row_block_count * dEntry->block_byte_count); dbuf += dlock.Pitch; sbuf += slock.Pitch; } goto error; } - if ((sEntry->Flags & WINED3DFMT_FLAG_FOURCC) && !(dEntry->Flags & WINED3DFMT_FLAG_FOURCC)) + if ((sEntry->Flags & WINED3DFMT_FLAG_COMPRESSED) && !(dEntry->Flags & WINED3DFMT_FLAG_COMPRESSED)) { /* TODO: Use the libtxc_dxtn.so shared library to do * software decompression */ - ERR("DXTC decompression not supported by now\n"); + ERR("Software decompression not supported.\n"); goto error; }

1 0

Stefan Dösinger : wined3d: Store the bumpmap ARB constants in ARB structures.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: 298bd3c50da3fd181ba73a5c139c45ef8d0db743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=298bd3c50da3fd181ba73a5c1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Jun 9 14:14:12 2009 -0700 wined3d: Store the bumpmap ARB constants in ARB structures. --- dlls/wined3d/arb_program_shader.c | 149 +++++++++++++++++++++---------------- dlls/wined3d/glsl_shader.c | 31 +++----- dlls/wined3d/wined3d_private.h | 8 -- 3 files changed, 97 insertions(+), 91 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=298bd3c50da3fd181ba73…

1 0

Stefan Dösinger : wined3d: Implement loops with the NV extensions.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: 51cdc9d36146068f0b5711156e70b54d71a74e3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=51cdc9d36146068f0b5711156… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jun 3 07:14:36 2009 +0200 wined3d: Implement loops with the NV extensions. --- dlls/wined3d/arb_program_shader.c | 379 ++++++++++++++++++++++++++++++------- 1 files changed, 313 insertions(+), 66 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=51cdc9d36146068f0b571…

1 0

Stefan Dösinger : wined3d: Implement dsy in ARB.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: 258d99d289dc2c2c7d6e9cca77e7cbf0d1c3fdba URL: http://source.winehq.org/git/wine.git/?a=commit;h=258d99d289dc2c2c7d6e9cca7… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Wed Jun 10 00:09:40 2009 -0700 wined3d: Implement dsy in ARB. --- dlls/wined3d/arb_program_shader.c | 45 ++++++++++++++++++++++++++++++++++++- 1 files changed, 44 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 1acea74..ac7ced4 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -103,6 +103,7 @@ struct arb_ps_compiled_shader struct stb_const_desc luminanceconst[MAX_TEXTURES]; UINT int_consts[MAX_CONST_I]; char num_int_consts; + UINT ycorrection; }; struct arb_vs_compile_args @@ -321,6 +322,22 @@ static inline void shader_arb_ps_local_constants(IWineD3DDeviceImpl* deviceImpl) GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, gl_shader->int_consts[i], val)); } } + + if(gl_shader->ycorrection != WINED3D_CONST_NUM_UNUSED) + { + /* ycorrection.x: Backbuffer height(onscreen) or 0(offscreen). + * ycorrection.y: -1.0(onscreen), 1.0(offscreen) + * ycorrection.z: 1.0 + * ycorrection.w: 0.0 + */ + float val[4]; + val[0] = deviceImpl->render_offscreen ? 0.0 : ((IWineD3DSurfaceImpl *) deviceImpl->render_targets[0])->currentDesc.Height; + val[1] = deviceImpl->render_offscreen ? 1.0 : -1.0; + val[2] = 1.0; + val[3] = 0.0; + GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, gl_shader->ycorrection, val)); + checkGLcall("y correction loading\n"); + } } static inline void shader_arb_vs_local_constants(IWineD3DDeviceImpl* deviceImpl) @@ -2027,6 +2044,22 @@ static void shader_hw_sgn(const struct wined3d_shader_instruction *ins) } } +static void shader_hw_dsy(const struct wined3d_shader_instruction *ins) +{ + SHADER_BUFFER *buffer = ins->ctx->buffer; + char src[50]; + char dst[50]; + char dst_name[50]; + BOOL is_color; + + shader_arb_get_dst_param(ins, &ins->dst[0], dst); + shader_arb_get_src_param(ins, &ins->src[0], 0, src); + shader_arb_get_register_name(ins, &ins->dst[0].reg, dst_name, &is_color); + + shader_addline(buffer, "DDY %s, %s;\n", dst, src); + shader_addline(buffer, "MUL%s %s, %s, ycorrection.y;\n", shader_arb_get_modifier(ins), dst, dst_name); +} + static void shader_hw_loop(const struct wined3d_shader_instruction *ins) { SHADER_BUFFER *buffer = ins->ctx->buffer; @@ -2461,6 +2494,16 @@ static GLuint shader_arb_generate_pshader(IWineD3DPixelShaderImpl *This, } } + if(reg_maps->vpos || reg_maps->usesdsy) + { + compiled->ycorrection = next_local; + shader_addline(buffer, "PARAM ycorrection = program.local[%u];\n", next_local++); + } + else + { + compiled->ycorrection = WINED3D_CONST_NUM_UNUSED; + } + /* Base Shader Body */ shader_generate_main((IWineD3DBaseShader *)This, buffer, reg_maps, function, &priv_ctx); @@ -3105,7 +3148,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_DP4 */ shader_hw_map2gl, /* WINED3DSIH_DST */ shader_hw_map2gl, /* WINED3DSIH_DSX */ shader_hw_map2gl, - /* WINED3DSIH_DSY */ NULL, + /* WINED3DSIH_DSY */ shader_hw_dsy, /* WINED3DSIH_ELSE */ NULL, /* WINED3DSIH_ENDIF */ NULL, /* WINED3DSIH_ENDLOOP */ shader_hw_endloop,

1 0

Stefan Dösinger : wined3d: A small atifs bump map improvement.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: 8e259d9fcdaaa75a9086d0d2e58d71375c61b38c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e259d9fcdaaa75a9086d0d2e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri May 29 23:01:07 2009 +0200 wined3d: A small atifs bump map improvement. Thanks to Roland Scheidegger from Tungsten Graphics for the suggestion to replace the 2 movs + dp2add with two MADs, where one can conveniently be coissued with the other dp2add. --- dlls/wined3d/ati_fragment_shader.c | 35 +++++++++++++++-------------------- 1 files changed, 15 insertions(+), 20 deletions(-) diff --git a/dlls/wined3d/ati_fragment_shader.c b/dlls/wined3d/ati_fragment_shader.c index 1baf9ba..1f6f203 100644 --- a/dlls/wined3d/ati_fragment_shader.c +++ b/dlls/wined3d/ati_fragment_shader.c @@ -423,13 +423,6 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], con GL_EXTCALL(glPassTexCoordATI(GL_REG_0_ATI + stage + 1, GL_TEXTURE0_ARB + stage + 1, swizzle)); - - /* We need GL_REG_5_ATI as a temporary register to swizzle the bump matrix. So we run into - * issues if we're bump mapping on stage 4 or 5 - */ - if(stage >= 4) { - FIXME("Bump mapping in stage %d\n", stage); - } } /* Pass 2: Generate perturbation calculations */ @@ -460,22 +453,24 @@ static GLuint gen_ati_shader(const struct texture_stage_op op[MAX_TEXTURES], con ATI_FFP_CONST_BUMPMAT(stage), GL_NONE, GL_2X_BIT_ATI | GL_BIAS_BIT_ATI, GL_REG_0_ATI + stage + 1, GL_RED, GL_NONE); - /* FIXME: How can I make GL_DOT2_ADD_ATI read the factors from blue and alpha? It defaults to red and green, - * and it is fairly easy to make it read GL_BLUE or BL_ALPHA, but I can't get an R * B + G * A. So we're wasting - * one register and two instructions in this pass for a simple swizzling operation. - * For starters it might be good enough to merge the two movs into one, but even that isn't possible :-( + /* Don't use GL_DOT2_ADD_ATI here because we cannot configure it to read the blue and alpha + * component of the bump matrix. Instead do this with two MADs: + * + * coord.a = tex.r * bump.b + coord.g + * coord.g = tex.g * bump.a + coord.a * - * NOTE: GL_BLUE | GL_ALPHA is not possible. It doesn't throw a compilation error, but an OR operation on the - * constants doesn't make sense, considering their values. + * The first instruction writes to alpha so it can be coissued with the above DOT2_ADD. + * coord.a is unused. If the perturbed texture is projected, this was already handled + * in the glPassTexCoordATI above. */ - wrap_op1(gl_info, GL_MOV_ATI, GL_REG_5_ATI, GL_RED_BIT_ATI, GL_NONE, - ATI_FFP_CONST_BUMPMAT(stage), GL_BLUE, GL_NONE); - wrap_op1(gl_info, GL_MOV_ATI, GL_REG_5_ATI, GL_GREEN_BIT_ATI, GL_NONE, - ATI_FFP_CONST_BUMPMAT(stage), GL_ALPHA, GL_NONE); - wrap_op3(gl_info, GL_DOT2_ADD_ATI, GL_REG_0_ATI + stage + 1, GL_GREEN_BIT_ATI, GL_NONE, - GL_REG_0_ATI + stage, GL_NONE, argmodextra_y, - GL_REG_5_ATI, GL_NONE, GL_2X_BIT_ATI | GL_BIAS_BIT_ATI, + wrap_op3(gl_info, GL_MAD_ATI, GL_REG_0_ATI + stage + 1, GL_ALPHA, GL_NONE, + GL_REG_0_ATI + stage, GL_RED, argmodextra_y, + ATI_FFP_CONST_BUMPMAT(stage), GL_BLUE, GL_NONE, GL_REG_0_ATI + stage + 1, GL_GREEN, GL_NONE); + wrap_op3(gl_info, GL_MAD_ATI, GL_REG_0_ATI + stage + 1, GL_GREEN_BIT_ATI, GL_NONE, + GL_REG_0_ATI + stage, GL_GREEN, argmodextra_y, + ATI_FFP_CONST_BUMPMAT(stage), GL_ALPHA, GL_NONE, + GL_REG_0_ATI + stage + 1, GL_ALPHA, GL_NONE); } /* Pass 3: Generate sampling instructions for regular textures */

1 0

Vincent Povirk : gdiplus: Stub GdipSetPathGradientPresetBlend.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: edce2c124af85b31f2accfca89e5236807ec6168 URL: http://source.winehq.org/git/wine.git/?a=commit;h=edce2c124af85b31f2accfca8… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Jun 9 12:11:38 2009 -0500 gdiplus: Stub GdipSetPathGradientPresetBlend. --- dlls/gdiplus/brush.c | 7 +++++++ dlls/gdiplus/gdiplus.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 92052f7..824ece0 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1315,6 +1315,13 @@ GpStatus WINGDIPAPI GdipSetPathGradientBlend(GpPathGradient *brush, GDIPCONST RE return NotImplemented; } +GpStatus WINGDIPAPI GdipSetPathGradientPresetBlend(GpPathGradient *brush, + GDIPCONST ARGB *blend, GDIPCONST REAL *pos, INT count) +{ + FIXME("(%p,%p,%p,%i): stub\n", brush, blend, pos, count); + return NotImplemented; +} + GpStatus WINGDIPAPI GdipSetPathGradientCenterColor(GpPathGradient *grad, ARGB argb) { diff --git a/dlls/gdiplus/gdiplus.spec b/dlls/gdiplus/gdiplus.spec index c658e00..72fdcb6 100644 --- a/dlls/gdiplus/gdiplus.spec +++ b/dlls/gdiplus/gdiplus.spec @@ -556,7 +556,7 @@ @ stdcall GdipSetPathGradientGammaCorrection(ptr long) @ stub GdipSetPathGradientLinearBlend @ stub GdipSetPathGradientPath -@ stub GdipSetPathGradientPresetBlend +@ stdcall GdipSetPathGradientPresetBlend(ptr ptr ptr long) @ stdcall GdipSetPathGradientSigmaBlend(ptr long long) @ stdcall GdipSetPathGradientSurroundColorsWithCount(ptr ptr ptr) @ stub GdipSetPathGradientTransform

1 0

André Hentschel : cryptui: Improve German translation.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: 7db8ecb61101c747a92bd720030e78bdf208bd2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=7db8ecb61101c747a92bd7200… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Jun 9 20:21:02 2009 +0200 cryptui: Improve German translation. --- dlls/cryptui/cryptui_De.rc | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/cryptui/cryptui_De.rc b/dlls/cryptui/cryptui_De.rc index 3049f42..e9c8182 100644 --- a/dlls/cryptui/cryptui_De.rc +++ b/dlls/cryptui/cryptui_De.rc @@ -198,14 +198,14 @@ STYLE WS_VISIBLE FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Anzeigen:", -1, 6,12,40,14 - COMBOBOX IDC_DETAIL_SELECT, 28,10,100,14, + COMBOBOX IDC_DETAIL_SELECT, 43,10,100,14, CBS_DROPDOWNLIST|WS_BORDER|WS_VSCROLL|WS_TABSTOP CONTROL "", IDC_DETAIL_LIST, "SysListView32", LVS_REPORT|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 6,28,241,100 CONTROL "", IDC_DETAIL_VALUE, "RichEdit20W", ES_READONLY|ES_MULTILINE|WS_TABSTOP, 6,136,241,70 - PUSHBUTTON "&Eigenschaften bearbeiten...", IDC_EDITPROPERTIES,83,216,90,14 + PUSHBUTTON "&Eigenschaften bearbeiten...", IDC_EDITPROPERTIES,75,216,98,14 PUSHBUTTON "In &Datei kopieren...", IDC_EXPORT,177,216,70,14 END @@ -230,8 +230,8 @@ FONT 8, "MS Shell Dlg" BEGIN CONTROL "", IDC_USERNOTICE,"RichEdit20W", WS_BORDER|ES_READONLY|ES_MULTILINE|WS_DISABLED,6,10,241,200 - PUSHBUTTON "Schließen", IDOK,103,216,70,14 - PUSHBUTTON "weitere &Informationen", IDC_CPS,177,216,70,14 + PUSHBUTTON "Schließen", IDOK,95,216,70,14 + PUSHBUTTON "weitere &Informationen", IDC_CPS,171,216,76,14 END IDD_CERT_PROPERTIES_GENERAL DIALOG DISCARDABLE 0, 0, 255, 236 @@ -239,7 +239,7 @@ CAPTION "Allgemein" STYLE WS_VISIBLE FONT 8, "MS Shell Dlg" BEGIN - LTEXT "Angezeigter &Name:", -1, 6,14,60,14 + LTEXT "&Name:", -1, 6,14,60,14 EDITTEXT IDC_FRIENDLY_NAME, 60,12,191,14, ES_AUTOHSCROLL|WS_TABSTOP LTEXT "&Beschreibung:", -1, 6,32,60,14 EDITTEXT IDC_DESCRIPTION, 60,30,191,14, ES_AUTOVSCROLL|ES_MULTILINE|WS_TABSTOP|WS_VSCROLL @@ -253,7 +253,7 @@ BEGIN CONTROL "", IDC_CERTIFICATE_USAGES,"SysListView32", LVS_REPORT|LVS_NOCOLUMNHEADER|LVS_SINGLESEL|WS_CHILD|WS_VISIBLE|WS_TABSTOP|WS_BORDER, 24,100,220,90 - PUSHBUTTON "&Zweck hinzufügen...", IDC_ADD_PURPOSE,184,194,60,14 + PUSHBUTTON "&Zweck hinzufügen...", IDC_ADD_PURPOSE,173,194,71,14 END IDD_ADD_CERT_PURPOSE DIALOG DISCARDABLE 0,0,200,68 @@ -300,7 +300,7 @@ FONT 8, "MS Shell Dlg" BEGIN LTEXT "&Dateiname:", -1, 21,1,195,10 EDITTEXT IDC_IMPORT_FILENAME, 21,11,208,14, ES_AUTOHSCROLL|WS_TABSTOP - PUSHBUTTON "D&rchsuchen...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14 + PUSHBUTTON "D&urchsuchen...", IDC_IMPORT_BROWSE_FILE, 236,11,60,14 LTEXT "Hinweis: Es können mehrere Zertifikate in einer Datei folgender Formate gespeichert werden:", -1, 21,26,265,16 LTEXT "Syntaxstandard kryptografischer Meldungen /PKCS #7 Messages (.p7b)",

1 0

Andrew Talbot : comdlg32: Constify some variables.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: 764974e59d4785e17ab4ffd91c9e3bda248e087e URL: http://source.winehq.org/git/wine.git/?a=commit;h=764974e59d4785e17ab4ffd91… Author: Andrew Talbot <andrew.talbot(a)talbotville.com> Date: Tue Jun 9 22:41:27 2009 +0100 comdlg32: Constify some variables. --- dlls/comdlg32/filedlg.c | 2 +- dlls/comdlg32/printdlg.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/comdlg32/filedlg.c b/dlls/comdlg32/filedlg.c index 10fccc2..b820624 100644 --- a/dlls/comdlg32/filedlg.c +++ b/dlls/comdlg32/filedlg.c @@ -3297,7 +3297,7 @@ void FILEDLG95_FILENAME_FillFromSelection (HWND hwnd) * Although shell32 is already linked the behaviour of exported StrRetToStrN * is dependent on whether emulated OS is unicode or not. */ -static HRESULT COMDLG32_StrRetToStrNW (LPWSTR dest, DWORD len, LPSTRRET src, LPITEMIDLIST pidl) +static HRESULT COMDLG32_StrRetToStrNW (LPWSTR dest, DWORD len, LPSTRRET src, const ITEMIDLIST *pidl) { switch (src->uType) { diff --git a/dlls/comdlg32/printdlg.c b/dlls/comdlg32/printdlg.c index 6726c6a..21366fd 100644 --- a/dlls/comdlg32/printdlg.c +++ b/dlls/comdlg32/printdlg.c @@ -2364,7 +2364,7 @@ static inline BOOL is_metric(const pagesetup_data *data) return pagesetup_get_flags(data) & PSD_INHUNDREDTHSOFMILLIMETERS; } -static inline LONG tenths_mm_to_size(pagesetup_data *data, LONG size) +static inline LONG tenths_mm_to_size(const pagesetup_data *data, LONG size) { if (is_metric(data)) return 10 * size; @@ -2372,7 +2372,7 @@ static inline LONG tenths_mm_to_size(pagesetup_data *data, LONG size) return 10 * size * 100 / 254; } -static inline LONG thousandths_inch_to_size(pagesetup_data *data, LONG size) +static inline LONG thousandths_inch_to_size(const pagesetup_data *data, LONG size) { if (is_metric(data)) return size * 254 / 100; @@ -2537,7 +2537,7 @@ typedef enum } devnames_name; -static inline WORD get_devname_offset(DEVNAMES *dn, devnames_name which) +static inline WORD get_devname_offset(const DEVNAMES *dn, devnames_name which) { switch(which) { @@ -3010,7 +3010,7 @@ static void update_margin_edits(HWND hDlg, const pagesetup_data *data, WORD id) } } -static void margin_edit_notification(HWND hDlg, pagesetup_data *data, WORD msg, WORD id) +static void margin_edit_notification(HWND hDlg, const pagesetup_data *data, WORD msg, WORD id) { switch (msg) {

1 0

Nikolay Sivov : comctl32/listview: Test for indentation callback.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: 5e5a58b138d501ffac962aedb811e8bc46c7b387 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e5a58b138d501ffac962aedb… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Tue Jun 9 23:16:21 2009 +0400 comctl32/listview: Test for indentation callback. --- dlls/comctl32/tests/listview.c | 30 ++++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index ca72fa5..e7cbe03 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3280,6 +3280,35 @@ static void test_notifyformat(void) DestroyWindow(hwndparentW); } +static void test_indentation(void) +{ + HWND hwnd; + LVITEMA item; + DWORD r; + + hwnd = create_listview_control(0); + ok(hwnd != NULL, "failed to create a listview window\n"); + + memset(&item, 0, sizeof(item)); + item.mask = LVIF_INDENT; + item.iItem = 0; + item.iIndent = I_INDENTCALLBACK; + r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM)&item); + expect(0, r); + + flush_sequences(sequences, NUM_MSG_SEQUENCES); + + item.iItem = 0; + item.mask = LVIF_INDENT; + r = SendMessage(hwnd, LVM_GETITEM, 0, (LPARAM)&item); + expect(TRUE, r); + + ok_sequence(sequences, PARENT_SEQ_INDEX, single_getdispinfo_parent_seq, + "get indent dispinfo", TRUE); + + DestroyWindow(hwnd); +} + START_TEST(listview) { HMODULE hComctl32; @@ -3330,6 +3359,7 @@ START_TEST(listview) test_columnscreation(); test_editbox(); test_notifyformat(); + test_indentation(); DestroyWindow(hwndparent); }

1 0

Nikolay Sivov : comctl32/listview: Implement callback functionality for item indentation.
by Alexandre Julliard 10 Jun '09

10 Jun '09

Module: wine Branch: master Commit: abe5dee0bb7f3854a6cb2519faf75facdd08fe6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=abe5dee0bb7f3854a6cb2519f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Jun 10 03:23:17 2009 +0400 comctl32/listview: Implement callback functionality for item indentation. --- dlls/comctl32/listview.c | 21 +++++++++++++++++++-- dlls/comctl32/tests/listview.c | 2 +- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index df07384..55519dd 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -6,6 +6,7 @@ * Copyright 2000 Jason Mawdsley * Copyright 2001 CodeWeavers Inc. * Copyright 2002 Dimitrie O. Paun + * Copyright 2009 Nikolay Sivov * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -5746,6 +5747,14 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, dispInfo.item.iImage = I_IMAGECALLBACK; } + /* Only items support indentation */ + if ((lpLVItem->mask & LVIF_INDENT) && lpItem->iIndent == I_INDENTCALLBACK && + (isubitem == 0)) + { + dispInfo.item.mask |= LVIF_INDENT; + dispInfo.item.iIndent = I_INDENTCALLBACK; + } + /* Apps depend on calling back for text if it is NULL or LPSTR_TEXTCALLBACKW */ if ((lpLVItem->mask & LVIF_TEXT) && !(lpLVItem->mask & LVIF_NORECOMPUTE) && !is_textW(pItemHdr->pszText)) @@ -5837,8 +5846,16 @@ static BOOL LISTVIEW_GetItemT(const LISTVIEW_INFO *infoPtr, LPLVITEMW lpLVItem, } /* and last, but not least, the indent field */ - if (lpLVItem->mask & LVIF_INDENT) - lpLVItem->iIndent = lpItem->iIndent; + if (dispInfo.item.mask & LVIF_INDENT) + { + lpLVItem->iIndent = dispInfo.item.iIndent; + if ((dispInfo.item.mask & LVIF_DI_SETITEM) && lpItem->iIndent == I_INDENTCALLBACK) + lpItem->iIndent = dispInfo.item.iIndent; + } + else if (lpLVItem->mask & LVIF_INDENT) + { + lpLVItem->iIndent = lpItem->iIndent; + } return TRUE; } diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index e7cbe03..2dce945 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -3304,7 +3304,7 @@ static void test_indentation(void) expect(TRUE, r); ok_sequence(sequences, PARENT_SEQ_INDEX, single_getdispinfo_parent_seq, - "get indent dispinfo", TRUE); + "get indent dispinfo", FALSE); DestroyWindow(hwnd); }

1 0