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

Stefan Dösinger : wined3d: Save some memory in vertex buffers.
by Alexandre Julliard April 10, 2009

April 10, 2009

Module: wine Branch: master Commit: 014c4bfc70a4d4e60f033d579d1be13a46f65170 URL: http://source.winehq.org/git/wine.git/?a=commit;h=014c4bfc70a4d4e60f033d579… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Apr 9 18:40:57 2009 +0200 wined3d: Save some memory in vertex buffers. In most cases we're fine with the vbo and glMapBuffer and never use the actual heap memory copy. Try to stick to just the vbo copy and avoid allocating the extra heap memory. In case it is needed(emulation or vertex conversion), fall back to the old double buffering mode. --- dlls/wined3d/buffer.c | 96 +++++++++++++++++++++++++++++++++++----- dlls/wined3d/device.c | 4 +- dlls/wined3d/drawprim.c | 10 ++-- dlls/wined3d/wined3d_private.h | 2 + 4 files changed, 93 insertions(+), 19 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=014c4bfc70a4d4e60f033…

1 0

Nikolay Sivov : comctl32/listview: State mask should be ignored on LVM_INSERTITEM.
by Alexandre Julliard April 10, 2009

April 10, 2009

Module: wine Branch: master Commit: 13dfb9b3a6c05c0e6dfe5d6d55cd410e83edea36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=13dfb9b3a6c05c0e6dfe5d6d5… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 9 17:23:01 2009 -0400 comctl32/listview: State mask should be ignored on LVM_INSERTITEM. --- dlls/comctl32/listview.c | 18 ++++++----- dlls/comctl32/tests/listview.c | 66 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 76 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index f06095b..e571f33 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -3478,6 +3478,8 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL NMLISTVIEW nmlv; UINT uChanged = 0; LVITEMW item; + /* stateMask is ignored for LVM_INSERTITEM */ + UINT stateMask = isNew ? ~0 : lpLVItem->stateMask; TRACE("()\n"); @@ -3510,7 +3512,7 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL TRACE("oldState=%x, newState=%x\n", item.state, lpLVItem->state); /* determine what fields will change */ - if ((lpLVItem->mask & LVIF_STATE) && ((item.state ^ lpLVItem->state) & lpLVItem->stateMask & ~infoPtr->uCallbackMask)) + if ((lpLVItem->mask & LVIF_STATE) && ((item.state ^ lpLVItem->state) & stateMask & ~infoPtr->uCallbackMask)) uChanged |= LVIF_STATE; if ((lpLVItem->mask & LVIF_IMAGE) && (lpItem->hdr.iImage != lpLVItem->iImage)) @@ -3531,7 +3533,7 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL ZeroMemory(&nmlv, sizeof(NMLISTVIEW)); nmlv.iItem = lpLVItem->iItem; - nmlv.uNewState = (item.state & ~lpLVItem->stateMask) | (lpLVItem->state & lpLVItem->stateMask); + nmlv.uNewState = (item.state & ~stateMask) | (lpLVItem->state & stateMask); nmlv.uOldState = item.state; nmlv.uChanged = uChanged; nmlv.lParam = item.lParam; @@ -3564,21 +3566,21 @@ static BOOL set_main_item(LISTVIEW_INFO *infoPtr, const LVITEMW *lpLVItem, BOOL if (uChanged & LVIF_STATE) { - if (lpItem && (lpLVItem->stateMask & ~infoPtr->uCallbackMask & ~(LVIS_FOCUSED | LVIS_SELECTED))) + if (lpItem && (stateMask & ~infoPtr->uCallbackMask & ~(LVIS_FOCUSED | LVIS_SELECTED))) { - lpItem->state &= ~lpLVItem->stateMask; - lpItem->state |= (lpLVItem->state & lpLVItem->stateMask); + lpItem->state &= ~stateMask; + lpItem->state |= (lpLVItem->state & stateMask); } - if (lpLVItem->state & lpLVItem->stateMask & ~infoPtr->uCallbackMask & LVIS_SELECTED) + if (lpLVItem->state & stateMask & ~infoPtr->uCallbackMask & LVIS_SELECTED) { if (infoPtr->dwStyle & LVS_SINGLESEL) LISTVIEW_DeselectAllSkipItem(infoPtr, lpLVItem->iItem); ranges_additem(infoPtr->selectionRanges, lpLVItem->iItem); } - else if (lpLVItem->stateMask & LVIS_SELECTED) + else if (stateMask & LVIS_SELECTED) ranges_delitem(infoPtr->selectionRanges, lpLVItem->iItem); /* if we are asked to change focus, and we manage it, do it */ - if (lpLVItem->stateMask & ~infoPtr->uCallbackMask & LVIS_FOCUSED) + if (stateMask & ~infoPtr->uCallbackMask & LVIS_FOCUSED) { if (lpLVItem->state & LVIS_FOCUSED) { diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 6f3524b..914be42 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -634,6 +634,72 @@ static void test_items(void) insert_column(hwnd, 0); insert_column(hwnd, 1); + /* LVIS_SELECTED with zero stateMask */ + /* set */ + memset (&item, 0, sizeof (item)); + item.mask = LVIF_STATE; + item.state = LVIS_SELECTED; + item.stateMask = 0; + item.iItem = 0; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item); + ok(r == 0, "ret %d\n", r); + /* get */ + memset (&item, 0xcc, sizeof (item)); + item.mask = LVIF_STATE; + item.stateMask = LVIS_SELECTED; + item.state = 0; + item.iItem = 0; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + ok(r != 0, "ret %d\n", r); + ok(item.state & LVIS_SELECTED, "Expected LVIS_SELECTED\n"); + SendMessage(hwnd, LVM_DELETEITEM, 0, 0); + + /* LVIS_SELECTED with zero stateMask */ + /* set */ + memset (&item, 0, sizeof (item)); + item.mask = LVIF_STATE; + item.state = LVIS_FOCUSED; + item.stateMask = 0; + item.iItem = 0; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item); + ok(r == 0, "ret %d\n", r); + /* get */ + memset (&item, 0xcc, sizeof (item)); + item.mask = LVIF_STATE; + item.stateMask = LVIS_FOCUSED; + item.state = 0; + item.iItem = 0; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + ok(r != 0, "ret %d\n", r); + ok(item.state & LVIS_FOCUSED, "Expected LVIS_FOCUSED\n"); + SendMessage(hwnd, LVM_DELETEITEM, 0, 0); + + /* LVIS_CUT with LVIS_FOCUSED stateMask */ + /* set */ + memset (&item, 0, sizeof (item)); + item.mask = LVIF_STATE; + item.state = LVIS_CUT; + item.stateMask = LVIS_FOCUSED; + item.iItem = 0; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_INSERTITEMA, 0, (LPARAM) &item); + ok(r == 0, "ret %d\n", r); + /* get */ + memset (&item, 0xcc, sizeof (item)); + item.mask = LVIF_STATE; + item.stateMask = LVIS_CUT; + item.state = 0; + item.iItem = 0; + item.iSubItem = 0; + r = SendMessage(hwnd, LVM_GETITEMA, 0, (LPARAM) &item); + ok(r != 0, "ret %d\n", r); + ok(item.state & LVIS_CUT, "Expected LVIS_CUT\n"); + SendMessage(hwnd, LVM_DELETEITEM, 0, 0); + /* Insert an item with just a param */ memset (&item, 0xcc, sizeof (item)); item.mask = LVIF_PARAM;

1 0

Henri Verbeet : wined3d: Split vshader_program_add_param() in shader_arb_add_src_param() and shader_arb_add_dst_param().
by Alexandre Julliard April 10, 2009

April 10, 2009

Module: wine Branch: master Commit: 3a5bbe6a0c1de501eb3ea3117d73088344230c0e URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a5bbe6a0c1de501eb3ea3117… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 10 09:15:07 2009 +0200 wined3d: Split vshader_program_add_param() in shader_arb_add_src_param() and shader_arb_add_dst_param(). --- dlls/wined3d/arb_program_shader.c | 62 ++++++++++++++++++++---------------- 1 files changed, 34 insertions(+), 28 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 586b01e..e012404 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -525,32 +525,39 @@ static void shader_arb_get_register_name(IWineD3DBaseShader *iface, WINED3DSHADE } } -/* TODO: merge with pixel shader */ -static void vshader_program_add_param(const struct wined3d_shader_instruction *ins, - const DWORD param, BOOL is_input, char *hwLine) +static void shader_arb_add_src_param(const struct wined3d_shader_instruction *ins, + DWORD param, char *str) { - char tmpReg[255]; + char register_name[255]; + char swizzle[6]; BOOL is_color; - if ((param & WINED3DSP_SRCMOD_MASK) == WINED3DSPSM_NEG) strcat(hwLine, " -"); - else strcat(hwLine, " "); + if ((param & WINED3DSP_SRCMOD_MASK) == WINED3DSPSM_NEG) strcat(str, " -"); + else strcat(str, " "); shader_arb_get_register_name(ins->shader, shader_get_regtype(param), param & WINED3DSP_REGNUM_MASK, - param & WINED3DSHADER_ADDRMODE_RELATIVE, tmpReg, &is_color); - strcat(hwLine, tmpReg); + param & WINED3DSHADER_ADDRMODE_RELATIVE, register_name, &is_color); + strcat(str, register_name); - if (!is_input) - { - char write_mask[6]; - shader_arb_get_write_mask(ins, param, write_mask); - strcat(hwLine, write_mask); - } - else - { - char swizzle[6]; - shader_arb_get_swizzle(param, is_color, swizzle); - strcat(hwLine, swizzle); - } + shader_arb_get_swizzle(param, is_color, swizzle); + strcat(str, swizzle); +} + +static void shader_arb_add_dst_param(const struct wined3d_shader_instruction *ins, + const struct wined3d_shader_dst_param *wined3d_dst, char *str) +{ + char register_name[255]; + char write_mask[6]; + BOOL is_color; + + strcat(str, " "); + + shader_arb_get_register_name(ins->shader, wined3d_dst->register_type, + wined3d_dst->register_idx, wined3d_dst->has_rel_addr, register_name, &is_color); + strcat(str, register_name); + + shader_arb_get_write_mask(ins, wined3d_dst->token, write_mask); + strcat(str, write_mask); } static const char *shader_arb_get_fixup_swizzle(enum fixup_channel_source channel_source) @@ -996,16 +1003,16 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) /* A shift requires another line. */ if (shift) pshader_gen_output_modifier_line(buffer, saturate, output_wmask, shift, output_rname); } else { - /* Note that vshader_program_add_param() adds spaces. */ + /* Note that shader_arb_add_*_param() adds spaces. */ arguments[0] = '\0'; if (ins->dst_count) { - vshader_program_add_param(ins, ins->dst[0].token, FALSE, arguments); + shader_arb_add_dst_param(ins, &ins->dst[0], arguments); for (i = 0; i < ins->src_count; ++i) { strcat(arguments, ","); - vshader_program_add_param(ins, src[i], TRUE, arguments); + shader_arb_add_src_param(ins, src[i], arguments); } } shader_addline(buffer, "%s%s;\n", instruction, arguments); @@ -1030,7 +1037,7 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) src0_param[0] = '\0'; if (((IWineD3DVertexShaderImpl *)shader)->rel_offset) { - vshader_program_add_param(ins, ins->src[0], TRUE, src0_param); + shader_arb_add_src_param(ins, ins->src[0], src0_param); shader_addline(buffer, "ADD TMP.x, %s, helper_const.z;\n", src0_param); shader_addline(buffer, "ARL A0.x, TMP.x;\n"); } @@ -1049,7 +1056,7 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) parm |= WINED3DVS_X_Y | WINED3DVS_Y_Y | WINED3DVS_Z_Y | WINED3DVS_W_Y; else if((ins->src[0] & WINED3DVS_X_X) == WINED3DVS_X_X) parm |= WINED3DVS_X_X | WINED3DVS_Y_X | WINED3DVS_Z_X | WINED3DVS_W_X; - vshader_program_add_param(ins, parm, TRUE, src0_param); + shader_arb_add_src_param(ins, parm, src0_param); shader_addline(buffer, "ARL A0.x, %s;\n", src0_param); } } @@ -1607,7 +1614,6 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) static void vshader_hw_rsq_rcp(const struct wined3d_shader_instruction *ins) { SHADER_BUFFER *buffer = ins->buffer; - DWORD dst = ins->dst[0].token; DWORD src = ins->src[0]; DWORD swizzle = (src & WINED3DSP_SWIZZLE_MASK) >> WINED3DSP_SWIZZLE_SHIFT; const char *instruction; @@ -1624,9 +1630,9 @@ static void vshader_hw_rsq_rcp(const struct wined3d_shader_instruction *ins) } strcpy(tmpLine, instruction); - vshader_program_add_param(ins, dst, FALSE, tmpLine); /* Destination */ + shader_arb_add_dst_param(ins, &ins->dst[0], tmpLine); /* Destination */ strcat(tmpLine, ","); - vshader_program_add_param(ins, src, TRUE, tmpLine); + shader_arb_add_src_param(ins, src, tmpLine); if ((WINED3DSP_NOSWIZZLE >> WINED3DSP_SWIZZLE_SHIFT) == swizzle) { /* Dx sdk says .x is used if no swizzle is given, but our test shows that * .w is used

1 0

Henri Verbeet : wined3d: Store the destination shift in struct wined3d_shader_dst_param.
by Alexandre Julliard April 10, 2009

April 10, 2009

Module: wine Branch: master Commit: 22e57d025cab64853a2255d7cc5731109b65a126 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22e57d025cab64853a2255d7c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 10 09:15:06 2009 +0200 wined3d: Store the destination shift in struct wined3d_shader_dst_param. --- dlls/wined3d/arb_program_shader.c | 12 ++++++------ dlls/wined3d/baseshader.c | 1 + dlls/wined3d/glsl_shader.c | 7 +------ dlls/wined3d/vertexshader.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 5d3bd76..a3f4613 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -815,7 +815,7 @@ static void pshader_hw_cnd(const struct wined3d_shader_instruction *ins) char dst_name[50]; char src_name[3][50]; BOOL sat = ins->dst[0].modifiers & WINED3DSPDM_SATURATE; - DWORD shift = (ins->dst[0].token & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; + DWORD shift = ins->dst[0].shift; /* FIXME: support output modifiers */ @@ -847,7 +847,7 @@ static void pshader_hw_cmp(const struct wined3d_shader_instruction *ins) char dst_wmask[20]; char dst_name[50]; char src_name[3][50]; - DWORD shift = (ins->dst[0].token & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; + DWORD shift = ins->dst[0].shift; BOOL sat = ins->dst[0].modifiers & WINED3DSPDM_SATURATE; /* FIXME: support output modifiers */ @@ -876,7 +876,7 @@ static void pshader_hw_dp2add(const struct wined3d_shader_instruction *ins) char dst_wmask[20]; char dst_name[50]; char src_name[3][50]; - DWORD shift = (ins->dst[0].token & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; + DWORD shift = ins->dst[0].shift; BOOL sat = ins->dst[0].modifiers & WINED3DSPDM_SATURATE; pshader_get_register_name(ins->shader, ins->dst[0].token, dst_name); @@ -970,7 +970,7 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) if (centroid) FIXME("Unhandled modifier(%#x)\n", mask >> WINED3DSP_DSTMOD_SHIFT); } - shift = (dst->token & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; + shift = dst->shift; modifier = (saturate && !shift) ? "_SAT" : ""; /* Generate input register names (with modifiers) */ @@ -1632,7 +1632,7 @@ static void shader_hw_nrm(const struct wined3d_shader_instruction *ins) char dst_name[50]; char src_name[50]; char dst_wmask[20]; - DWORD shift = (ins->dst[0].token & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; + DWORD shift = ins->dst[0].shift; BOOL sat = ins->dst[0].modifiers & WINED3DSPDM_SATURATE; pshader_get_register_name(ins->shader, ins->dst[0].token, dst_name); @@ -1659,7 +1659,7 @@ static void shader_hw_sincos(const struct wined3d_shader_instruction *ins) char dst_name[50]; char src_name[50]; char dst_wmask[20]; - DWORD shift = (ins->dst[0].token & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; + DWORD shift = ins->dst[0].shift; BOOL sat = ins->dst[0].modifiers & WINED3DSPDM_SATURATE; pshader_get_register_name(ins->shader, ins->dst[0].token, dst_name); diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index c7931ee..5f19a99 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -219,6 +219,7 @@ static void shader_parse_dst_param(DWORD param, DWORD addr_param, struct wined3d dst->register_idx = param & WINED3DSP_REGNUM_MASK; dst->write_mask = param & WINED3DSP_WRITEMASK_ALL; dst->modifiers = param & WINED3DSP_DSTMOD_MASK; + dst->shift = (param & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; dst->token = param; dst->addr_token = addr_param; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 19d8bf1..042c33e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1289,14 +1289,9 @@ static DWORD shader_glsl_append_dst_ext(SHADER_BUFFER *buffer, { glsl_dst_param_t glsl_dst; DWORD mask; - int shift; mask = shader_glsl_add_dst_param(ins, dst, &glsl_dst); - if (mask) - { - shift = (dst->token & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; - shader_addline(buffer, "%s%s = %s(", glsl_dst.reg_name, glsl_dst.mask_str, shift_glsl_tab[shift]); - } + if (mask) shader_addline(buffer, "%s%s = %s(", glsl_dst.reg_name, glsl_dst.mask_str, shift_glsl_tab[dst->shift]); return mask; } diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index 8369251..e0640e9 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -184,6 +184,7 @@ static void vshader_set_input( This->semantics_in[regnum].reg.register_idx = regnum; This->semantics_in[regnum].reg.write_mask = WINED3DSP_WRITEMASK_ALL; This->semantics_in[regnum].reg.modifiers = 0; + This->semantics_in[regnum].reg.shift = 0; This->semantics_in[regnum].reg.token = reg_token; This->semantics_in[regnum].reg.addr_token = 0; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 200bf22..0d1dfe2 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -450,6 +450,7 @@ struct wined3d_shader_dst_param UINT register_idx; DWORD write_mask; DWORD modifiers; + DWORD shift; DWORD token; DWORD addr_token; };

1 0

Stefan Dösinger : wined3d: Fix the drawRectPatch vertex count.
by Alexandre Julliard April 10, 2009

April 10, 2009

Module: wine Branch: master Commit: 99d88c15ea092a29542661205a856792dcdb44eb URL: http://source.winehq.org/git/wine.git/?a=commit;h=99d88c15ea092a29542661205… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Mar 20 19:16:52 2009 +0100 wined3d: Fix the drawRectPatch vertex count. DrawPrimitive now accepts the number of vertices, not the number of primitives. This code was forgotten in the patch that changed this. We're drawing triangles, so we are drawing num_primitives * 3 vertices. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 48952df..bf38d26 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6456,7 +6456,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_DrawRectPatch(IWineD3DDevice *iface, UI This->currentPatch = patch; old_primitive_type = This->stateBlock->gl_primitive_type; This->stateBlock->gl_primitive_type = GL_TRIANGLES; - IWineD3DDevice_DrawPrimitiveStrided(iface, patch->numSegs[0] * patch->numSegs[1] * 2, &patch->strided); + IWineD3DDevice_DrawPrimitiveStrided(iface, patch->numSegs[0] * patch->numSegs[1] * 2 * 3, &patch->strided); This->stateBlock->gl_primitive_type = old_primitive_type; This->currentPatch = NULL;

1 0

Henri Verbeet : wined3d: Store the relative addressing mode in struct wined3d_shader_dst_param.
by Alexandre Julliard April 10, 2009

April 10, 2009

Module: wine Branch: master Commit: 62d9dc21776d715392b17de2454857c87cbf269d URL: http://source.winehq.org/git/wine.git/?a=commit;h=62d9dc21776d715392b17de24… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 10 09:15:06 2009 +0200 wined3d: Store the relative addressing mode in struct wined3d_shader_dst_param. --- dlls/wined3d/baseshader.c | 1 + dlls/wined3d/glsl_shader.c | 3 +-- dlls/wined3d/vertexshader.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 5f19a99..235778e 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -220,6 +220,7 @@ static void shader_parse_dst_param(DWORD param, DWORD addr_param, struct wined3d dst->write_mask = param & WINED3DSP_WRITEMASK_ALL; dst->modifiers = param & WINED3DSP_DSTMOD_MASK; dst->shift = (param & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; + dst->has_rel_addr = param & WINED3DSHADER_ADDRMODE_RELATIVE; dst->token = param; dst->addr_token = addr_param; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 042c33e..6a01ed7 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1278,8 +1278,7 @@ static DWORD shader_glsl_add_dst_param(const struct wined3d_shader_instruction * glsl_dst->reg_name[0] = '\0'; shader_glsl_get_register_name(wined3d_dst->register_type, wined3d_dst->register_idx, - wined3d_dst->token & WINED3DSHADER_ADDRMODE_RELATIVE, wined3d_dst->addr_token, - glsl_dst->reg_name, &is_color, ins); + wined3d_dst->has_rel_addr, wined3d_dst->addr_token, glsl_dst->reg_name, &is_color, ins); return shader_glsl_get_write_mask(wined3d_dst, glsl_dst->mask_str); } diff --git a/dlls/wined3d/vertexshader.c b/dlls/wined3d/vertexshader.c index e0640e9..32fba08 100644 --- a/dlls/wined3d/vertexshader.c +++ b/dlls/wined3d/vertexshader.c @@ -185,6 +185,7 @@ static void vshader_set_input( This->semantics_in[regnum].reg.write_mask = WINED3DSP_WRITEMASK_ALL; This->semantics_in[regnum].reg.modifiers = 0; This->semantics_in[regnum].reg.shift = 0; + This->semantics_in[regnum].reg.has_rel_addr = FALSE; This->semantics_in[regnum].reg.token = reg_token; This->semantics_in[regnum].reg.addr_token = 0; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0d1dfe2..1e4f9ac 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -451,6 +451,7 @@ struct wined3d_shader_dst_param DWORD write_mask; DWORD modifiers; DWORD shift; + BOOL has_rel_addr; DWORD token; DWORD addr_token; };

1 0

Paul Vriens : usp10: Remove an unneeded check.
by Alexandre Julliard April 10, 2009

April 10, 2009

Module: wine Branch: master Commit: 0af0bafd6ae40f9832d9c630c24a6696ac284631 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0af0bafd6ae40f9832d9c630c… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Apr 9 21:31:07 2009 +0200 usp10: Remove an unneeded check. --- dlls/usp10/usp10.c | 25 +++++++++++-------------- 1 files changed, 11 insertions(+), 14 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index fc2f8e9..21c74e8 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1318,21 +1318,18 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, for (i = 0; i < cChars; i++) pwOutGlyphs[i] = pwcChars[i]; } - if (psva) + /* set up a valid SCRIPT_VISATTR and LogClust for each char in this run */ + for (i = 0; i < cChars; i++) { - /* set up a valid SCRIPT_VISATTR and LogClust for each char in this run */ - for (i = 0; i < cChars; i++) - { - /* FIXME: set to better values */ - psva[i].uJustification = (pwcChars[i] == ' ') ? SCRIPT_JUSTIFY_BLANK : SCRIPT_JUSTIFY_CHARACTER; - psva[i].fClusterStart = 1; - psva[i].fDiacritic = 0; - psva[i].fZeroWidth = 0; - psva[i].fReserved = 0; - psva[i].fShapeReserved = 0; - - if (pwLogClust) pwLogClust[i] = i; - } + /* FIXME: set to better values */ + psva[i].uJustification = (pwcChars[i] == ' ') ? SCRIPT_JUSTIFY_BLANK : SCRIPT_JUSTIFY_CHARACTER; + psva[i].fClusterStart = 1; + psva[i].fDiacritic = 0; + psva[i].fZeroWidth = 0; + psva[i].fReserved = 0; + psva[i].fShapeReserved = 0; + + if (pwLogClust) pwLogClust[i] = i; } return S_OK; }

1 0

Nicolas Le Cam : msi/tests: Fix format test when run on root drive directory.
by Alexandre Julliard April 10, 2009

April 10, 2009

Module: wine Branch: master Commit: 7b2a44f2579425b34300e0483cd4869fdf512dec URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b2a44f2579425b34300e0483… Author: Nicolas Le Cam <niko.lecam(a)gmail.com> Date: Fri Apr 10 00:46:03 2009 +0200 msi/tests: Fix format test when run on root drive directory. --- dlls/msi/tests/format.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/msi/tests/format.c b/dlls/msi/tests/format.c index 316eed6..2b2661c 100644 --- a/dlls/msi/tests/format.c +++ b/dlls/msi/tests/format.c @@ -2361,12 +2361,14 @@ static void test_formatrecord_tables(void) /* component with INSTALLSTATE_SOURCE */ lstrcpy( expected, "1: " ); lstrcat( expected, curr_dir ); - lstrcat( expected, "\\ " ); + if (strlen(curr_dir) > 3) + lstrcat( expected, "\\" ); + lstrcat( expected, " " ); size = MAX_PATH; MsiRecordSetString( hrec, 1, "[$parietal]" ); r = MsiFormatRecord( hpkg, hrec, buf, &size ); ok( r == ERROR_SUCCESS, "format record failed: %d\n", r); - ok( !lstrcmp( buf, expected ), "Expected '%s', got %s\n", expected, buf); + ok( !lstrcmp( buf, expected ), "Expected '%s', got '%s'\n", expected, buf); sprintf( buf, "%sI am a really long directory\\temporal.txt", root ); DeleteFile( buf );

1 0

Henri Verbeet : wined3d: Merge pshader_get_register_name() and part of vshader_program_add_param().
by Alexandre Julliard April 10, 2009

April 10, 2009

Module: wine Branch: master Commit: e6031afdfafc6edd421083106e32ba6f94bf6e27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6031afdfafc6edd421083106… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 10 09:15:07 2009 +0200 wined3d: Merge pshader_get_register_name() and part of vshader_program_add_param(). --- dlls/wined3d/arb_program_shader.c | 341 +++++++++++++++++++----------------- 1 files changed, 180 insertions(+), 161 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e6031afdfafc6edd42108…

1 0

Henri Verbeet : wined3d: Explicitly pass the register type and index to pshader_get_register_name() .
by Alexandre Julliard April 10, 2009

April 10, 2009

Module: wine Branch: master Commit: 9a28d273bcfacd51b432267c97d7f93b3ca29683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a28d273bcfacd51b432267c9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 10 09:15:06 2009 +0200 wined3d: Explicitly pass the register type and index to pshader_get_register_name(). --- dlls/wined3d/arb_program_shader.c | 62 ++++++++++++++++++------------------- 1 files changed, 30 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9a28d273bcfacd51b4322…

1 0