wine-commits April 2009

wine-commits@winehq.org

2 participants
664 discussions

Henri Verbeet : wined3d: Relative addressing tokens are always source parameters.
by Alexandre Julliard 29 Apr '09

29 Apr '09

Module: wine Branch: master Commit: 88b6d5eb0bca5d6b66e53957b45aaa0831324319 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88b6d5eb0bca5d6b66e53957b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 29 09:55:07 2009 +0200 wined3d: Relative addressing tokens are always source parameters. So the "is_src" argument to shader_dump_arr_entry() is redundant (and wrong). --- dlls/wined3d/baseshader.c | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index a1bd859..ba4a918 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -901,8 +901,7 @@ static void shader_dump_decl_usage(DWORD decl, DWORD param, DWORD shader_version } } -static void shader_dump_arr_entry(const DWORD param, const DWORD addr_token, - unsigned int reg, BOOL is_src, DWORD shader_version) +static void shader_dump_arr_entry(const DWORD param, const DWORD addr_token, unsigned int reg, DWORD shader_version) { char relative = ((param & WINED3DSHADER_ADDRESSMODE_MASK) == WINED3DSHADER_ADDRMODE_RELATIVE); @@ -910,7 +909,7 @@ static void shader_dump_arr_entry(const DWORD param, const DWORD addr_token, if (relative) { TRACE("["); if (addr_token) - shader_dump_param(addr_token, 0, is_src, shader_version); + shader_dump_param(addr_token, 0, TRUE, shader_version); else TRACE("a0.x"); TRACE(" + "); @@ -956,14 +955,14 @@ static void shader_dump_param(const DWORD param, const DWORD addr_token, BOOL is break; case WINED3DSPR_INPUT: TRACE("v"); - shader_dump_arr_entry(param, addr_token, reg, is_src, shader_version); + shader_dump_arr_entry(param, addr_token, reg, shader_version); break; case WINED3DSPR_CONST: case WINED3DSPR_CONST2: case WINED3DSPR_CONST3: case WINED3DSPR_CONST4: TRACE("c"); - shader_dump_arr_entry(param, addr_token, shader_get_float_offset(param), is_src, shader_version); + shader_dump_arr_entry(param, addr_token, shader_get_float_offset(param), shader_version); break; case WINED3DSPR_TEXTURE: /* vs: case D3DSPR_ADDR */ TRACE("%c%u", (pshader? 't':'a'), reg); @@ -987,18 +986,18 @@ static void shader_dump_param(const DWORD param, const DWORD addr_token, BOOL is if (WINED3DSHADER_VERSION_MAJOR(shader_version) >= 3) { TRACE("o"); - shader_dump_arr_entry(param, addr_token, reg, is_src, shader_version); + shader_dump_arr_entry(param, addr_token, reg, shader_version); } else TRACE("oT%u", reg); break; case WINED3DSPR_CONSTINT: TRACE("i"); - shader_dump_arr_entry(param, addr_token, reg, is_src, shader_version); + shader_dump_arr_entry(param, addr_token, reg, shader_version); break; case WINED3DSPR_CONSTBOOL: TRACE("b"); - shader_dump_arr_entry(param, addr_token, reg, is_src, shader_version); + shader_dump_arr_entry(param, addr_token, reg, shader_version); break; case WINED3DSPR_LABEL: TRACE("l%u", reg);

1 0

Henri Verbeet : wined3d: The "input" parameter to shader_dump_param() should be a BOOL.
by Alexandre Julliard 29 Apr '09

29 Apr '09

Module: wine Branch: master Commit: 52644ab053762b9f9aedc4a7758793bec98b35cf URL: http://source.winehq.org/git/wine.git/?a=commit;h=52644ab053762b9f9aedc4a77… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 29 09:55:07 2009 +0200 wined3d: The "input" parameter to shader_dump_param() should be a BOOL. It's used to determine if the token is a source or destination parameter. A subsequent patch will split shader_dump_param() in two different functions. --- dlls/wined3d/baseshader.c | 32 +++++++++++++++++--------------- 1 files changed, 17 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index f9f2f80..a1bd859 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -94,7 +94,7 @@ typedef enum _WINED3DSHADER_ADDRESSMODE_TYPE WINED3DSHADER_ADDRMODE_FORCE_DWORD = 0x7fffffff, } WINED3DSHADER_ADDRESSMODE_TYPE; -static void shader_dump_param(const DWORD param, const DWORD addr_token, int input, DWORD shader_version); +static void shader_dump_param(const DWORD param, const DWORD addr_token, BOOL is_src, DWORD shader_version); /* Read a parameter opcode from the input stream, * and possibly a relative addressing token. @@ -902,7 +902,7 @@ static void shader_dump_decl_usage(DWORD decl, DWORD param, DWORD shader_version } static void shader_dump_arr_entry(const DWORD param, const DWORD addr_token, - unsigned int reg, int input, DWORD shader_version) + unsigned int reg, BOOL is_src, DWORD shader_version) { char relative = ((param & WINED3DSHADER_ADDRESSMODE_MASK) == WINED3DSHADER_ADDRMODE_RELATIVE); @@ -910,7 +910,7 @@ static void shader_dump_arr_entry(const DWORD param, const DWORD addr_token, if (relative) { TRACE("["); if (addr_token) - shader_dump_param(addr_token, 0, input, shader_version); + shader_dump_param(addr_token, 0, is_src, shader_version); else TRACE("a0.x"); TRACE(" + "); @@ -920,7 +920,7 @@ static void shader_dump_arr_entry(const DWORD param, const DWORD addr_token, TRACE("]"); } -static void shader_dump_param(const DWORD param, const DWORD addr_token, int input, DWORD shader_version) +static void shader_dump_param(const DWORD param, const DWORD addr_token, BOOL is_src, DWORD shader_version) { static const char * const rastout_reg_names[] = { "oPos", "oFog", "oPts" }; static const char * const misctype_reg_names[] = { "vPos", "vFace"}; @@ -933,7 +933,8 @@ static void shader_dump_param(const DWORD param, const DWORD addr_token, int inp /* There are some minor differences between pixel and vertex shaders */ char pshader = shader_is_pshader_version(shader_version); - if (input) { + if (is_src) + { if ( (modifier == WINED3DSPSM_NEG) || (modifier == WINED3DSPSM_BIASNEG) || (modifier == WINED3DSPSM_SIGNNEG) || @@ -955,14 +956,14 @@ static void shader_dump_param(const DWORD param, const DWORD addr_token, int inp break; case WINED3DSPR_INPUT: TRACE("v"); - shader_dump_arr_entry(param, addr_token, reg, input, shader_version); + shader_dump_arr_entry(param, addr_token, reg, is_src, shader_version); break; case WINED3DSPR_CONST: case WINED3DSPR_CONST2: case WINED3DSPR_CONST3: case WINED3DSPR_CONST4: TRACE("c"); - shader_dump_arr_entry(param, addr_token, shader_get_float_offset(param), input, shader_version); + shader_dump_arr_entry(param, addr_token, shader_get_float_offset(param), is_src, shader_version); break; case WINED3DSPR_TEXTURE: /* vs: case D3DSPR_ADDR */ TRACE("%c%u", (pshader? 't':'a'), reg); @@ -986,18 +987,18 @@ static void shader_dump_param(const DWORD param, const DWORD addr_token, int inp if (WINED3DSHADER_VERSION_MAJOR(shader_version) >= 3) { TRACE("o"); - shader_dump_arr_entry(param, addr_token, reg, input, shader_version); + shader_dump_arr_entry(param, addr_token, reg, is_src, shader_version); } else TRACE("oT%u", reg); break; case WINED3DSPR_CONSTINT: TRACE("i"); - shader_dump_arr_entry(param, addr_token, reg, input, shader_version); + shader_dump_arr_entry(param, addr_token, reg, is_src, shader_version); break; case WINED3DSPR_CONSTBOOL: TRACE("b"); - shader_dump_arr_entry(param, addr_token, reg, input, shader_version); + shader_dump_arr_entry(param, addr_token, reg, is_src, shader_version); break; case WINED3DSPR_LABEL: TRACE("l%u", reg); @@ -1023,7 +1024,8 @@ static void shader_dump_param(const DWORD param, const DWORD addr_token, int inp break; } - if (!input) { + if (!is_src) + { /* operand output (for modifiers and shift, see dump_ins_modifiers) */ if ((param & WINED3DSP_WRITEMASK_ALL) != WINED3DSP_WRITEMASK_ALL) { @@ -1262,7 +1264,7 @@ void shader_trace_init(const DWORD *pFunction, const SHADER_OPCODE *opcode_table shader_dump_decl_usage(usage, param, shader_version); shader_dump_ins_modifiers(param); TRACE(" "); - shader_dump_param(param, 0, 0, shader_version); + shader_dump_param(param, 0, FALSE, shader_version); pToken += 2; } else if (ins.handler_idx == WINED3DSIH_DEF) @@ -1301,7 +1303,7 @@ void shader_trace_init(const DWORD *pFunction, const SHADER_OPCODE *opcode_table if (ins.predicate) { TRACE("("); - shader_dump_param(*(pToken + 2), 0, 1, shader_version); + shader_dump_param(*(pToken + 2), 0, TRUE, shader_version); TRACE(") "); } @@ -1339,7 +1341,7 @@ void shader_trace_init(const DWORD *pFunction, const SHADER_OPCODE *opcode_table shader_dump_ins_modifiers(param); TRACE(" "); - shader_dump_param(param, addr_token, 0, shader_version); + shader_dump_param(param, addr_token, FALSE, shader_version); } /* Predication token - already printed out, just skip it */ @@ -1352,7 +1354,7 @@ void shader_trace_init(const DWORD *pFunction, const SHADER_OPCODE *opcode_table pToken += tokens_read; TRACE((i == 0)? " " : ", "); - shader_dump_param(param, addr_token, 1, shader_version); + shader_dump_param(param, addr_token, TRUE, shader_version); } } TRACE("\n");

1 0

Henri Verbeet : wined3d: Handle the sampler type shift in the frontend.
by Alexandre Julliard 29 Apr '09

29 Apr '09

Module: wine Branch: master Commit: 42a8041cb84ea55ca4118434ed6b724a593c1109 URL: http://source.winehq.org/git/wine.git/?a=commit;h=42a8041cb84ea55ca4118434e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 29 09:55:07 2009 +0200 wined3d: Handle the sampler type shift in the frontend. --- dlls/wined3d/baseshader.c | 8 ++++++-- dlls/wined3d/wined3d_private_types.h | 19 ++++++++----------- 2 files changed, 14 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index d8035b7..f9f2f80 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -38,6 +38,10 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d); #define WINED3DSP_DCL_USAGEINDEX_SHIFT 16 #define WINED3DSP_DCL_USAGEINDEX_MASK (0xf << WINED3DSP_DCL_USAGEINDEX_SHIFT) +/* DCL sampler type */ +#define WINED3DSP_TEXTURETYPE_SHIFT 27 +#define WINED3DSP_TEXTURETYPE_MASK (0xf << WINED3DSP_TEXTURETYPE_SHIFT) + /* Opcode-related masks */ #define WINED3DSI_OPCODE_MASK 0x0000ffff @@ -269,7 +273,7 @@ static void shader_sm1_read_semantic(const DWORD **ptr, struct wined3d_shader_se semantic->usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; semantic->usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; - semantic->sampler_type = usage_token & WINED3DSP_TEXTURETYPE_MASK; + semantic->sampler_type = (usage_token & WINED3DSP_TEXTURETYPE_MASK) >> WINED3DSP_TEXTURETYPE_SHIFT; shader_parse_dst_param(dst_token, NULL, &semantic->reg); } @@ -824,7 +828,7 @@ static void shader_dump_decl_usage(DWORD decl, DWORD param, DWORD shader_version TRACE("dcl"); if (regtype == WINED3DSPR_SAMPLER) { - DWORD ttype = decl & WINED3DSP_TEXTURETYPE_MASK; + DWORD ttype = (decl & WINED3DSP_TEXTURETYPE_MASK) >> WINED3DSP_TEXTURETYPE_SHIFT; switch (ttype) { case WINED3DSTT_2D: TRACE("_2d"); break; diff --git a/dlls/wined3d/wined3d_private_types.h b/dlls/wined3d/wined3d_private_types.h index 9f62a9c..30d6900 100644 --- a/dlls/wined3d/wined3d_private_types.h +++ b/dlls/wined3d/wined3d_private_types.h @@ -31,18 +31,15 @@ #define WINED3DFMT_FLAG_RENDERTARGET 0x10 #define WINED3DFMT_FLAG_FOURCC 0x20 -/** DCL sampler texture type **/ -#define WINED3DSP_TEXTURETYPE_SHIFT 27 -#define WINED3DSP_TEXTURETYPE_MASK 0x78000000 - -typedef enum _WINED3DSAMPLER_TEXTURE_TYPE { - WINED3DSTT_UNKNOWN = 0 << WINED3DSP_TEXTURETYPE_SHIFT, - WINED3DSTT_1D = 1 << WINED3DSP_TEXTURETYPE_SHIFT, - WINED3DSTT_2D = 2 << WINED3DSP_TEXTURETYPE_SHIFT, - WINED3DSTT_CUBE = 3 << WINED3DSP_TEXTURETYPE_SHIFT, - WINED3DSTT_VOLUME = 4 << WINED3DSP_TEXTURETYPE_SHIFT, - - WINED3DSTT_FORCE_DWORD = 0x7FFFFFFF +typedef enum _WINED3DSAMPLER_TEXTURE_TYPE +{ + WINED3DSTT_UNKNOWN = 0, + WINED3DSTT_1D = 1, + WINED3DSTT_2D = 2, + WINED3DSTT_CUBE = 3, + WINED3DSTT_VOLUME = 4, + + WINED3DSTT_FORCE_DWORD = 0x7FFFFFFF } WINED3DSAMPLER_TEXTURE_TYPE; /** Register types **/

1 0

Henri Verbeet : wined3d: Store the sampler type in struct shader_reg_maps.
by Alexandre Julliard 29 Apr '09

29 Apr '09

Module: wine Branch: master Commit: 8d4c90496f8ff981f75ef473ca2ae11bfbe0ffca URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d4c90496f8ff981f75ef473c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 29 09:55:06 2009 +0200 wined3d: Store the sampler type in struct shader_reg_maps. Instead of the usage token. --- dlls/wined3d/arb_program_shader.c | 2 +- dlls/wined3d/baseshader.c | 4 ++-- dlls/wined3d/device.c | 21 ++++++++++++--------- dlls/wined3d/glsl_shader.c | 37 ++++++++++++++++++------------------- dlls/wined3d/pixelshader.c | 16 ++++++++-------- dlls/wined3d/wined3d_private.h | 4 +--- 6 files changed, 42 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=8d4c90496f8ff981f75ef…

1 0

Henri Verbeet : wined3d: Introduce shader_sm1_read_semantic().
by Alexandre Julliard 29 Apr '09

29 Apr '09

Module: wine Branch: master Commit: 65321dd1ce194f0d0cb7858890474652d23063e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=65321dd1ce194f0d0cb785889… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 29 09:55:07 2009 +0200 wined3d: Introduce shader_sm1_read_semantic(). --- dlls/wined3d/baseshader.c | 70 ++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 40 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 5d91c5b..d8035b7 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -262,6 +262,17 @@ static void shader_sm1_read_dst_param(const DWORD **ptr, struct wined3d_shader_d } } +static void shader_sm1_read_semantic(const DWORD **ptr, struct wined3d_shader_semantic *semantic) +{ + DWORD usage_token = *(*ptr)++; + DWORD dst_token = *(*ptr)++; + + semantic->usage = (usage_token & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; + semantic->usage_idx = (usage_token & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; + semantic->sampler_type = usage_token & WINED3DSP_TEXTURETYPE_MASK; + shader_parse_dst_param(dst_token, NULL, &semantic->reg); +} + static const char *shader_opcode_names[] = { /* WINED3DSIH_ABS */ "abs", @@ -601,39 +612,36 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, struct shader_reg_m /* Handle declarations */ if (ins.handler_idx == WINED3DSIH_DCL) { - DWORD usage = *pToken++; - DWORD param = *pToken++; - DWORD regtype = shader_get_regtype(param); - unsigned int regnum = param & WINED3DSP_REGNUM_MASK; + struct wined3d_shader_semantic semantic; - /* Vshader: mark attributes used - Pshader: mark 3.0 input registers used, save token */ - if (WINED3DSPR_INPUT == regtype) { + shader_sm1_read_semantic(&pToken, &semantic); - if (!pshader) - reg_maps->attributes[regnum] = 1; - else - reg_maps->packed_input[regnum] = 1; - - semantics_in[regnum].usage = (usage & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; - semantics_in[regnum].usage_idx = - (usage & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; - shader_parse_dst_param(param, NULL, &semantics_in[regnum].reg); - - /* Vshader: mark 3.0 output registers used, save token */ - } else if (WINED3DSPR_OUTPUT == regtype) { - reg_maps->packed_output[regnum] = 1; - semantics_out[regnum].usage = (usage & WINED3DSP_DCL_USAGE_MASK) >> WINED3DSP_DCL_USAGE_SHIFT; - semantics_out[regnum].usage_idx = - (usage & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; - shader_parse_dst_param(param, NULL, &semantics_out[regnum].reg); - - if (usage & (WINED3DDECLUSAGE_FOG << WINED3DSP_DCL_USAGE_SHIFT)) - reg_maps->fog = 1; - - /* Save sampler usage token */ - } else if (WINED3DSPR_SAMPLER == regtype) - reg_maps->sampler_type[regnum] = usage & WINED3DSP_TEXTURETYPE_MASK; + switch (semantic.reg.register_type) + { + /* Vshader: mark attributes used + * Pshader: mark 3.0 input registers used, save token */ + case WINED3DSPR_INPUT: + if (!pshader) reg_maps->attributes[semantic.reg.register_idx] = 1; + else reg_maps->packed_input[semantic.reg.register_idx] = 1; + semantics_in[semantic.reg.register_idx] = semantic; + break; + + /* Vshader: mark 3.0 output registers used, save token */ + case WINED3DSPR_OUTPUT: + reg_maps->packed_output[semantic.reg.register_idx] = 1; + semantics_out[semantic.reg.register_idx] = semantic; + if (semantic.usage == WINED3DDECLUSAGE_FOG) reg_maps->fog = 1; + break; + + /* Save sampler usage token */ + case WINED3DSPR_SAMPLER: + reg_maps->sampler_type[semantic.reg.register_idx] = semantic.sampler_type; + break; + + default: + TRACE("Not recording DCL register type %#x.\n", semantic.reg.register_type); + break; + } } else if (ins.handler_idx == WINED3DSIH_DEF) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b6d5152..16512cc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -482,6 +482,7 @@ struct wined3d_shader_semantic { WINED3DDECLUSAGE usage; UINT usage_idx; + WINED3DSAMPLER_TEXTURE_TYPE sampler_type; struct wined3d_shader_dst_param reg; };

1 0

Dmitry Timoshkov : explorer: Initialize the Progman DDE interface when starting explorer.
by Alexandre Julliard 29 Apr '09

29 Apr '09

Module: wine Branch: master Commit: 54d7c8012d1d7369a56779955ced5a09e448a1cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=54d7c8012d1d7369a56779955… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Apr 29 15:17:35 2009 +0900 explorer: Initialize the Progman DDE interface when starting explorer. --- programs/explorer/desktop.c | 9 +++++++++ 1 files changed, 9 insertions(+), 0 deletions(-) diff --git a/programs/explorer/desktop.c b/programs/explorer/desktop.c index 480d245..67ade26 100644 --- a/programs/explorer/desktop.c +++ b/programs/explorer/desktop.c @@ -326,6 +326,9 @@ void manage_desktop( WCHAR *arg ) if (hwnd == GetDesktopWindow()) { + HMODULE shell32; + void (WINAPI *pShellDDEInit)( BOOL ); + SetWindowLongPtrW( hwnd, GWLP_WNDPROC, (LONG_PTR)desktop_wnd_proc ); SendMessageW( hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIconW( 0, MAKEINTRESOURCEW(OIC_WINLOGO))); if (name) set_desktop_window_title( hwnd, name ); @@ -334,6 +337,12 @@ void manage_desktop( WCHAR *arg ) initialize_display_settings( hwnd ); initialize_appbar(); initialize_systray(); + + if ((shell32 = LoadLibraryA( "shell32.dll" )) && + (pShellDDEInit = (void *)GetProcAddress( shell32, (LPCSTR)188))) + { + pShellDDEInit( TRUE ); + } } else {

1 0

Dmitry Timoshkov : user32: Add the tests for LB_DELETESTRING, make them pass under Wine.
by Alexandre Julliard 29 Apr '09

29 Apr '09

Module: wine Branch: master Commit: d2ecb1194102b6d7e6078556f80e58c70ca39c23 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2ecb1194102b6d7e6078556f… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Wed Apr 29 12:55:13 2009 +0900 user32: Add the tests for LB_DELETESTRING, make them pass under Wine. --- dlls/user32/listbox.c | 25 +++++++++++++++++-------- dlls/user32/tests/msg.c | 40 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+), 8 deletions(-) diff --git a/dlls/user32/listbox.c b/dlls/user32/listbox.c index f7231f9..eaa805b 100644 --- a/dlls/user32/listbox.c +++ b/dlls/user32/listbox.c @@ -1684,12 +1684,19 @@ static LRESULT LISTBOX_InsertString( LB_DESCR *descr, INT index, LPCWSTR str ) */ static void LISTBOX_DeleteItem( LB_DESCR *descr, INT index ) { + /* save the item data before it gets freed by LB_RESETCONTENT */ + ULONG_PTR item_data = descr->items[index].data; + LPWSTR item_str = descr->items[index].str; + + if (!descr->nb_items) + SendMessageW( descr->self, LB_RESETCONTENT, 0, 0 ); + /* Note: Win 3.1 only sends DELETEITEM on owner-draw items, * while Win95 sends it for all items with user data. * It's probably better to send it too often than not * often enough, so this is what we do here. */ - if (IS_OWNERDRAW(descr) || descr->items[index].data) + if (IS_OWNERDRAW(descr) || item_data) { DELETEITEMSTRUCT dis; UINT id = (UINT)GetWindowLongPtrW( descr->self, GWLP_ID ); @@ -1698,11 +1705,11 @@ static void LISTBOX_DeleteItem( LB_DESCR *descr, INT index ) dis.CtlID = id; dis.itemID = index; dis.hwndItem = descr->self; - dis.itemData = descr->items[index].data; + dis.itemData = item_data; SendMessageW( descr->owner, WM_DELETEITEM, id, (LPARAM)&dis ); } if (HAS_STRINGS(descr)) - HeapFree( GetProcessHeap(), 0, descr->items[index].str ); + HeapFree( GetProcessHeap(), 0, item_str ); } @@ -1718,18 +1725,20 @@ static LRESULT LISTBOX_RemoveItem( LB_DESCR *descr, INT index ) if ((index < 0) || (index >= descr->nb_items)) return LB_ERR; + descr->nb_items--; + LISTBOX_DeleteItem( descr, index ); + + if (!descr->nb_items) return LB_OKAY; + /* We need to invalidate the original rect instead of the updated one. */ LISTBOX_InvalidateItems( descr, index ); - LISTBOX_DeleteItem( descr, index ); - /* Remove the item */ item = &descr->items[index]; - if (index < descr->nb_items-1) + if (index < descr->nb_items) RtlMoveMemory( item, item + 1, - (descr->nb_items - index - 1) * sizeof(LB_ITEMDATA) ); - descr->nb_items--; + (descr->nb_items - index) * sizeof(LB_ITEMDATA) ); if (descr->anchor_item == descr->nb_items) descr->anchor_item--; /* Shrink the item array if possible */ diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index f698b7f..2445f82 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -11017,6 +11017,19 @@ static const struct message wm_lb_click_0[] = { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_LISTBOX, LBN_SELCHANGE) }, { 0 } }; +static const struct message wm_lb_deletestring[] = +{ + { LB_DELETESTRING, sent|wparam|lparam, 0, 0 }, + { WM_DELETEITEM, sent|wparam|parent, ID_LISTBOX, 0 }, + { 0 } +}; +static const struct message wm_lb_deletestring_reset[] = +{ + { LB_DELETESTRING, sent|wparam|lparam, 0, 0 }, + { LB_RESETCONTENT, sent|wparam|lparam|defwinproc, 0, 0 }, + { WM_DELETEITEM, sent|wparam|parent, ID_LISTBOX, 0 }, + { 0 } +}; #define check_lb_state(a1, a2, a3, a4, a5) check_lb_state_dbg(a1, a2, a3, a4, a5, __LINE__) @@ -11127,6 +11140,33 @@ static void test_listbox_messages(void) check_lb_state(listbox, 3, 0, 0, 0); flush_sequence(); + trace("deleting item 0\n"); + ret = SendMessage(listbox, LB_DELETESTRING, 0, 0); + ok(ret == 2, "expected 2, got %ld\n", ret); + ok_sequence(wm_lb_deletestring, "LB_DELETESTRING 0", FALSE ); + check_lb_state(listbox, 2, -1, 0, 0); + flush_sequence(); + + trace("deleting item 0\n"); + ret = SendMessage(listbox, LB_DELETESTRING, 0, 0); + ok(ret == 1, "expected 1, got %ld\n", ret); + ok_sequence(wm_lb_deletestring, "LB_DELETESTRING 0", FALSE ); + check_lb_state(listbox, 1, -1, 0, 0); + flush_sequence(); + + trace("deleting item 0\n"); + ret = SendMessage(listbox, LB_DELETESTRING, 0, 0); + ok(ret == 0, "expected 0, got %ld\n", ret); + ok_sequence(wm_lb_deletestring_reset, "LB_DELETESTRING 0", FALSE ); + check_lb_state(listbox, 0, -1, 0, 0); + flush_sequence(); + + trace("deleting item 0\n"); + ret = SendMessage(listbox, LB_DELETESTRING, 0, 0); + ok(ret == LB_ERR, "expected LB_ERR, got %ld\n", ret); + check_lb_state(listbox, 0, -1, 0, 0); + flush_sequence(); + log_all_parent_messages--; DestroyWindow(listbox);

1 0

Vincent Povirk : gdiplus: Add tests for GdipGet/SetLineBlend.
by Alexandre Julliard 29 Apr '09

29 Apr '09

Module: wine Branch: master Commit: 47c3993ad31781694e28ad31efeba60308a850d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47c3993ad31781694e28ad31e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 28 17:30:39 2009 -0500 gdiplus: Add tests for GdipGet/SetLineBlend. --- dlls/gdiplus/tests/brush.c | 108 ++++++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 2 + 2 files changed, 110 insertions(+), 0 deletions(-) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index d2cbd3c..cabbd7f 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -344,6 +344,113 @@ static void test_gradientgetrect(void) status = GdipDeleteBrush((GpBrush*)brush); } +static void test_lineblend(void) +{ + GpLineGradient *brush; + GpStatus status; + GpPointF pt1, pt2; + INT count=10; + int i; + const REAL factors[5] = {0.0f, 0.1f, 0.5f, 0.9f, 1.0f}; + const REAL positions[5] = {0.0f, 0.2f, 0.5f, 0.8f, 1.0f}; + REAL res_factors[6] = {0.3f, 0.0f, 0.0f, 0.0f, 0.0f}; + REAL res_positions[6] = {0.3f, 0.0f, 0.0f, 0.0f, 0.0f}; + + pt1.X = pt1.Y = 1.0; + pt2.X = pt2.Y = 100.0; + status = GdipCreateLineBrush(&pt1, &pt2, 0, 0, WrapModeTile, &brush); + expect(Ok, status); + + status = GdipGetLineBlendCount(NULL, &count); + expect(InvalidParameter, status); + + status = GdipGetLineBlendCount(brush, NULL); + expect(InvalidParameter, status); + + status = GdipGetLineBlendCount(brush, &count); + expect(Ok, status); + expect(1, count); + + status = GdipGetLineBlend(NULL, res_factors, res_positions, 1); + expect(InvalidParameter, status); + + status = GdipGetLineBlend(brush, NULL, res_positions, 1); + expect(InvalidParameter, status); + + status = GdipGetLineBlend(brush, res_factors, NULL, 1); + expect(InvalidParameter, status); + + status = GdipGetLineBlend(brush, res_factors, res_positions, 0); + expect(InvalidParameter, status); + + status = GdipGetLineBlend(brush, res_factors, res_positions, -1); + expect(InvalidParameter, status); + + status = GdipGetLineBlend(brush, res_factors, res_positions, 1); + expect(Ok, status); + + status = GdipGetLineBlend(brush, res_factors, res_positions, 2); + expect(Ok, status); + + status = GdipSetLineBlend(NULL, factors, positions, 5); + expect(InvalidParameter, status); + + status = GdipSetLineBlend(brush, NULL, positions, 5); + expect(InvalidParameter, status); + + status = GdipSetLineBlend(brush, factors, NULL, 5); + expect(InvalidParameter, status); + + status = GdipSetLineBlend(brush, factors, positions, 0); + expect(InvalidParameter, status); + + status = GdipSetLineBlend(brush, factors, positions, -1); + expect(InvalidParameter, status); + + /* leave off the 0.0 position */ + status = GdipSetLineBlend(brush, &factors[1], &positions[1], 4); + expect(InvalidParameter, status); + + /* leave off the 1.0 position */ + status = GdipSetLineBlend(brush, factors, positions, 4); + expect(InvalidParameter, status); + + status = GdipSetLineBlend(brush, factors, positions, 5); + expect(Ok, status); + + status = GdipGetLineBlendCount(brush, &count); + expect(Ok, status); + expect(5, count); + + status = GdipGetLineBlend(brush, res_factors, res_positions, 4); + expect(InsufficientBuffer, status); + + status = GdipGetLineBlend(brush, res_factors, res_positions, 5); + expect(Ok, status); + + for (i=0; i<5; i++) + { + expectf(factors[i], res_factors[i]); + expectf(positions[i], res_positions[i]); + } + + status = GdipGetLineBlend(brush, res_factors, res_positions, 6); + expect(Ok, status); + + status = GdipSetLineBlend(brush, factors, positions, 1); + expect(Ok, status); + + status = GdipGetLineBlendCount(brush, &count); + expect(Ok, status); + expect(1, count); + + status = GdipGetLineBlend(brush, res_factors, res_positions, 1); + expect(Ok, status); + + status = GdipDeleteBrush((GpBrush*)brush); + expect(Ok, status); +} + START_TEST(brush) { struct GdiplusStartupInput gdiplusStartupInput; @@ -365,6 +472,7 @@ START_TEST(brush) test_transform(); test_texturewrap(); test_gradientgetrect(); + test_lineblend(); GdiplusShutdown(gdiplusToken); } diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index f8ebc73..4041c2c 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -382,6 +382,8 @@ GpStatus WINGDIPAPI GdipGetLineRectI(GpLineGradient*,GpRect*); GpStatus WINGDIPAPI GdipGetLineWrapMode(GpLineGradient*,GpWrapMode*); GpStatus WINGDIPAPI GdipSetLineBlend(GpLineGradient*,GDIPCONST REAL*, GDIPCONST REAL*,INT); +GpStatus WINGDIPAPI GdipGetLineBlend(GpLineGradient*,REAL*,REAL*,INT); +GpStatus WINGDIPAPI GdipGetLineBlendCount(GpLineGradient*,INT*); GpStatus WINGDIPAPI GdipSetLineColors(GpLineGradient*,ARGB,ARGB); GpStatus WINGDIPAPI GdipSetLineGammaCorrection(GpLineGradient*,BOOL); GpStatus WINGDIPAPI GdipSetLineSigmaBlend(GpLineGradient*,REAL,REAL);

1 0

Vincent Povirk : gdiplus: Implement GdipGetLineBlend.
by Alexandre Julliard 29 Apr '09

29 Apr '09

Module: wine Branch: master Commit: 47a81f5a0c7eaafd6f392f2eea74e9cd42f1f227 URL: http://source.winehq.org/git/wine.git/?a=commit;h=47a81f5a0c7eaafd6f392f2ee… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 28 18:18:26 2009 -0500 gdiplus: Implement GdipGetLineBlend. --- dlls/gdiplus/brush.c | 14 +++++++++----- 1 files changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index 20a440c..74e7764 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1151,14 +1151,18 @@ GpStatus WINGDIPAPI GdipSetLineBlend(GpLineGradient *brush, GpStatus WINGDIPAPI GdipGetLineBlend(GpLineGradient *brush, REAL *factors, REAL *positions, INT count) { - static int calls; - TRACE("(%p, %p, %p, %i)\n", brush, factors, positions, count); - if(!(calls++)) - FIXME("not implemented\n"); + if (!brush || !factors || !positions || count <= 0) + return InvalidParameter; - return NotImplemented; + if (count < brush->blendcount) + return InsufficientBuffer; + + memcpy(factors, brush->blendfac, brush->blendcount * sizeof(REAL)); + memcpy(positions, brush->blendpos, brush->blendcount * sizeof(REAL)); + + return Ok; } GpStatus WINGDIPAPI GdipGetLineBlendCount(GpLineGradient *brush, INT *count)

1 0

Vincent Povirk : gdiplus: Implement GdipGetLineBlendCount.
by Alexandre Julliard 29 Apr '09

29 Apr '09

Module: wine Branch: master Commit: 1e88ee503040bf586b9415a5e5c0e927ee93439e URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e88ee503040bf586b9415a5e… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 28 18:08:54 2009 -0500 gdiplus: Implement GdipGetLineBlendCount. --- dlls/gdiplus/brush.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index eb0df03..20a440c 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -1163,14 +1163,14 @@ GpStatus WINGDIPAPI GdipGetLineBlend(GpLineGradient *brush, REAL *factors, GpStatus WINGDIPAPI GdipGetLineBlendCount(GpLineGradient *brush, INT *count) { - static int calls; - TRACE("(%p, %p)\n", brush, count); - if(!(calls++)) - FIXME("not implemented\n"); + if (!brush || !count) + return InvalidParameter; - return NotImplemented; + *count = brush->blendcount; + + return Ok; } GpStatus WINGDIPAPI GdipSetLineGammaCorrection(GpLineGradient *line,

1 0

← Newer
1
2
3
4
5
6
7
8
...
67
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2009