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

Henri Verbeet : wined3d: Group instruction context information together in struct wined3d_shader_context .
by Alexandre Julliard April 16, 2009

April 16, 2009

Module: wine Branch: master Commit: 463de24e7b82a1340bbc486ca08ead3b8340eee5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=463de24e7b82a1340bbc486ca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 15 10:06:28 2009 +0200 wined3d: Group instruction context information together in struct wined3d_shader_context. --- dlls/wined3d/arb_program_shader.c | 195 +++++++++++++-------------- dlls/wined3d/baseshader.c | 9 +- dlls/wined3d/glsl_shader.c | 268 ++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 11 +- 4 files changed, 245 insertions(+), 238 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=463de24e7b82a1340bbc4…

1 0

Henri Verbeet : wined3d: Store the register type in struct wined3d_shader_src_param.
by Alexandre Julliard April 16, 2009

April 16, 2009

Module: wine Branch: master Commit: 4de1dba2c5ef8e6fd03d1e8f80e23852c01cac30 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4de1dba2c5ef8e6fd03d1e8f8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 15 10:06:28 2009 +0200 wined3d: Store the register type in struct wined3d_shader_src_param. --- dlls/wined3d/baseshader.c | 11 +++++++++-- dlls/wined3d/glsl_shader.c | 12 ++++++------ dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 5d3fdcc..03403af 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -224,6 +224,14 @@ static void shader_parse_dst_param(DWORD param, DWORD addr_param, struct wined3d dst->addr_token = addr_param; } +static void shader_parse_src_param(DWORD param, DWORD addr_param, struct wined3d_shader_src_param *src) +{ + src->register_type = ((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) + | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); + src->token = param; + src->addr_token = addr_param; +} + /* Note that this does not count the loop register * as an address register. */ @@ -885,8 +893,7 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, { DWORD param, addr_token = 0; pToken += shader_get_param(pToken, shader_version, &param, &addr_token); - src_param[i].token = param; - src_param[i].addr_token = addr_token; + shader_parse_src_param(param, addr_token, &src_param[i]); } /* Call appropriate function for output target */ diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 51349b2..ada70a8 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1944,7 +1944,7 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) char mask_char[6]; BOOL temp_destination = FALSE; - if (shader_is_scalar(shader_get_regtype(ins->src[0].token), ins->src[0].token & WINED3DSP_REGNUM_MASK)) + if (shader_is_scalar(ins->src[0].register_type, ins->src[0].token & WINED3DSP_REGNUM_MASK)) { write_mask = shader_glsl_append_dst(ins->ctx->buffer, ins); @@ -1958,9 +1958,9 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) DWORD src0reg = ins->src[0].token & WINED3DSP_REGNUM_MASK; DWORD src1reg = ins->src[1].token & WINED3DSP_REGNUM_MASK; DWORD src2reg = ins->src[2].token & WINED3DSP_REGNUM_MASK; - DWORD src0regtype = shader_get_regtype(ins->src[0].token); - DWORD src1regtype = shader_get_regtype(ins->src[1].token); - DWORD src2regtype = shader_get_regtype(ins->src[2].token); + DWORD src0regtype = ins->src[0].register_type; + DWORD src1regtype = ins->src[1].register_type; + DWORD src2regtype = ins->src[2].register_type; DWORD dstreg = ins->dst[0].register_idx; DWORD dstregtype = ins->dst[0].register_type; DWORD dst_mask = ins->dst[0].write_mask; @@ -2283,7 +2283,6 @@ static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) { glsl_src_param_t src1_param; IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)ins->ctx->shader; - DWORD regtype = shader_get_regtype(ins->src[1].token); DWORD reg = ins->src[1].token & WINED3DSP_REGNUM_MASK; const DWORD *control_values = NULL; const local_constant *constant; @@ -2295,7 +2294,8 @@ static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) * known at compile time, the GLSL compiler can unroll the loop, and replace indirect addressing with direct * addressing. */ - if(regtype == WINED3DSPR_CONSTINT) { + if (ins->src[1].register_type == WINED3DSPR_CONSTINT) + { LIST_FOR_EACH_ENTRY(constant, &shader->baseShader.constantsI, local_constant, entry) { if(constant->idx == reg) { control_values = constant->value; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 85b1c92..0ad9116 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -464,6 +464,7 @@ struct wined3d_shader_dst_param struct wined3d_shader_src_param { + WINED3DSHADER_PARAM_REGISTER_TYPE register_type; DWORD token; DWORD addr_token; };

1 0

Henri Verbeet : wined3d: Introduce struct wined3d_shader_src_param.
by Alexandre Julliard April 16, 2009

April 16, 2009

Module: wine Branch: master Commit: ff62cab5374a94f6689651369ffc1e5527a0f016 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ff62cab5374a94f6689651369… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 15 10:06:28 2009 +0200 wined3d: Introduce struct wined3d_shader_src_param. --- dlls/wined3d/arb_program_shader.c | 97 ++++++++--------- dlls/wined3d/baseshader.c | 6 +- dlls/wined3d/glsl_shader.c | 209 +++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 9 ++- 4 files changed, 163 insertions(+), 158 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ff62cab5374a94f668965…

1 0

Nikolay Sivov : comctl32/listview: Implemented LVM_SORTITEMSEX.
by Alexandre Julliard April 16, 2009

April 16, 2009

Module: wine Branch: master Commit: b2486d41c73dbecc8ca05468ff12f47e67d6731d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2486d41c73dbecc8ca05468f… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Wed Apr 15 09:27:07 2009 -0400 comctl32/listview: Implemented LVM_SORTITEMSEX. --- dlls/comctl32/listview.c | 43 +++++++++++++++++++++++++++++++++++-------- include/commctrl.h | 4 ++++ 2 files changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index e73cb16..d594e51 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -137,7 +137,6 @@ * -- LVM_SETINFOTIP * -- LVM_SETTILEWIDTH * -- LVM_SORTGROUPS - * -- LVM_SORTITEMSEX * * Macros: * -- ListView_GetCheckSate, ListView_SetCheckState @@ -148,7 +147,6 @@ * -- ListView_GetTextBkColor * -- ListView_GetUnicodeFormat, ListView_SetUnicodeFormat * -- ListView_GetWorkAreas, ListView_SetWorkAreas - * -- ListView_SortItemsEx * * Functions: * -- LVGroupComparE @@ -422,7 +420,6 @@ static void LISTVIEW_SetSelection(LISTVIEW_INFO *, INT); static void LISTVIEW_UpdateSize(LISTVIEW_INFO *); static HWND LISTVIEW_EditLabelT(LISTVIEW_INFO *, INT, BOOL); static LRESULT LISTVIEW_Command(const LISTVIEW_INFO *, WPARAM, LPARAM); -static BOOL LISTVIEW_SortItems(LISTVIEW_INFO *, PFNLVCOMPARE, LPARAM); static INT LISTVIEW_GetStringWidthT(const LISTVIEW_INFO *, LPCWSTR, BOOL); static BOOL LISTVIEW_KeySelection(LISTVIEW_INFO *, INT, BOOL); static UINT LISTVIEW_GetItemState(const LISTVIEW_INFO *, INT, UINT); @@ -7835,7 +7832,7 @@ static BOOL LISTVIEW_SetUnicodeFormat( LISTVIEW_INFO *infoPtr, BOOL fUnicode) /*** * DESCRIPTION: - * Callback internally used by LISTVIEW_SortItems() + * Callback internally used by LISTVIEW_SortItems() in response of LVM_SORTITEMS * * PARAMETER(S): * [I] first : pointer to first ITEM_INFO to compare @@ -7859,18 +7856,44 @@ static INT WINAPI LISTVIEW_CallBackCompare(LPVOID first, LPVOID second, LPARAM l /*** * DESCRIPTION: + * Callback internally used by LISTVIEW_SortItems() in response of LVM_SORTITEMSEX + * + * PARAMETER(S): + * [I] first : pointer to first ITEM_INFO to compare + * [I] second : pointer to second ITEM_INFO to compare + * [I] lParam : HWND of control + * + * RETURN: + * if first comes before second : negative + * if first comes after second : positive + * if first and second are equivalent : zero + */ +static INT WINAPI LISTVIEW_CallBackCompareEx(LPVOID first, LPVOID second, LPARAM lParam) +{ + LISTVIEW_INFO *infoPtr = (LISTVIEW_INFO *)lParam; + INT first_idx = DPA_GetPtrIndex( infoPtr->hdpaItems, first ); + INT second_idx = DPA_GetPtrIndex( infoPtr->hdpaItems, second ); + + /* Forward the call to the client defined callback */ + return (infoPtr->pfnCompare)( first_idx, second_idx, infoPtr->lParamSort ); +} + +/*** + * DESCRIPTION: * Sorts the listview items. * * PARAMETER(S): * [I] infoPtr : valid pointer to the listview structure * [I] pfnCompare : application-defined value * [I] lParamSort : pointer to comparison callback + * [I] IsEx : TRUE when LVM_SORTITEMSEX used * * RETURN: * SUCCESS : TRUE * FAILURE : FALSE */ -static BOOL LISTVIEW_SortItems(LISTVIEW_INFO *infoPtr, PFNLVCOMPARE pfnCompare, LPARAM lParamSort) +static BOOL LISTVIEW_SortItems(LISTVIEW_INFO *infoPtr, PFNLVCOMPARE pfnCompare, + LPARAM lParamSort, BOOL IsEx) { UINT uView = infoPtr->dwStyle & LVS_TYPEMASK; HDPA hdpaSubItems; @@ -7900,7 +7923,10 @@ static BOOL LISTVIEW_SortItems(LISTVIEW_INFO *infoPtr, PFNLVCOMPARE pfnCompare, infoPtr->pfnCompare = pfnCompare; infoPtr->lParamSort = lParamSort; - DPA_Sort(infoPtr->hdpaItems, LISTVIEW_CallBackCompare, (LPARAM)infoPtr); + if (IsEx) + DPA_Sort(infoPtr->hdpaItems, LISTVIEW_CallBackCompareEx, (LPARAM)infoPtr); + else + DPA_Sort(infoPtr->hdpaItems, LISTVIEW_CallBackCompare, (LPARAM)infoPtr); /* restore selection ranges */ for (i=0; i < infoPtr->nItemCount; i++) @@ -10022,9 +10048,10 @@ LISTVIEW_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) /* case LVM_SORTGROUPS: */ case LVM_SORTITEMS: - return LISTVIEW_SortItems(infoPtr, (PFNLVCOMPARE)lParam, (LPARAM)wParam); + return LISTVIEW_SortItems(infoPtr, (PFNLVCOMPARE)lParam, (LPARAM)wParam, FALSE); - /* LVM_SORTITEMSEX: */ + case LVM_SORTITEMSEX: + return LISTVIEW_SortItems(infoPtr, (PFNLVCOMPARE)lParam, (LPARAM)wParam, TRUE); case LVM_SUBITEMHITTEST: return LISTVIEW_HitTest(infoPtr, (LPLVHITTESTINFO)lParam, TRUE, FALSE); diff --git a/include/commctrl.h b/include/commctrl.h index bebdb27..a3ec513 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -3147,6 +3147,7 @@ static const WCHAR WC_LISTVIEWW[] = { 'S','y','s', #define LVM_SETITEMTEXT WINELIB_NAME_AW(LVM_SETITEMTEXT) #define LVM_SETITEMCOUNT (LVM_FIRST+47) #define LVM_SORTITEMS (LVM_FIRST+48) +#define LVM_SORTITEMSEX (LVM_FIRST+81) #define LVM_SETITEMPOSITION32 (LVM_FIRST+49) #define LVM_GETSELECTEDCOUNT (LVM_FIRST+50) #define LVM_GETITEMSPACING (LVM_FIRST+51) @@ -3772,6 +3773,9 @@ typedef struct NMLVSCROLL #define ListView_SortItems(hwndLV,_pfnCompare,_lPrm) \ (BOOL)SNDMSGA((hwndLV),LVM_SORTITEMS,(WPARAM)(LPARAM)_lPrm,(LPARAM)(PFNLVCOMPARE)_pfnCompare) +#define ListView_SortItemsEx(hwndLV, _pfnCompare, _lPrm) \ + (BOOL)SNDMSGA((hwndLV), LVM_SORTITEMSEX, (WPARAM)(LPARAM)(_lPrm), (LPARAM)(PFNLVCOMPARE)(_pfnCompare)) + #define ListView_SetItemPosition(hwndLV, i, x, y) \ (BOOL)SNDMSGA((hwndLV),LVM_SETITEMPOSITION,(WPARAM)(INT)(i),MAKELPARAM((x),(y))) #define ListView_GetSelectedCount(hwndLV) \

1 0

Henri Verbeet : wined3d: Store the register index in struct wined3d_shader_src_param.
by Alexandre Julliard April 16, 2009

April 16, 2009

Module: wine Branch: master Commit: b6668b0296aec30cac987ebd62f044c945d4b9bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6668b0296aec30cac987ebd6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 15 10:06:28 2009 +0200 wined3d: Store the register index in struct wined3d_shader_src_param. --- dlls/wined3d/arb_program_shader.c | 8 ++++-- dlls/wined3d/baseshader.c | 1 + dlls/wined3d/glsl_shader.c | 40 ++++++++++++++---------------------- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 23 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index e1ee255..cd156ba 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1154,7 +1154,7 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins) if (shader_version < WINED3DPS_VERSION(2,0)) reg_sampler_code = dst->register_idx; else - reg_sampler_code = ins->src[1].token & WINED3DSP_REGNUM_MASK; + reg_sampler_code = ins->src[1].register_idx; /* projection flag: * 1.1, 1.2, 1.3: Use WINED3DTSS_TEXTURETRANSFORMFLAGS @@ -1260,7 +1260,6 @@ static void pshader_hw_texbem(const struct wined3d_shader_instruction *ins) BOOL is_color; int i; - DWORD src = ins->src[0].token & WINED3DSP_REGNUM_MASK; SHADER_BUFFER *buffer = ins->ctx->buffer; char reg_coord[40]; @@ -1290,6 +1289,8 @@ static void pshader_hw_texbem(const struct wined3d_shader_instruction *ins) } if(has_bumpmat) { + DWORD src = ins->src[0].register_idx; + /* Sampling the perturbation map in Tsrc was done already, including the signedness correction if needed */ shader_addline(buffer, "SWZ TMP2, bumpenvmat%d, x, z, 0, 0;\n", reg_dest_code); @@ -1433,7 +1434,7 @@ static void pshader_hw_texm3x3spec(const struct wined3d_shader_instruction *ins) IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; DWORD flags; DWORD reg = ins->dst[0].register_idx; - DWORD reg3 = ins->src[1].token & WINED3DSP_REGNUM_MASK; + DWORD reg3 = ins->src[1].register_idx; SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; SHADER_BUFFER *buffer = ins->ctx->buffer; char dst_str[8]; @@ -1632,6 +1633,7 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) for (i = 0; i < nComponents; i++) { tmp_dst.write_mask = WINED3DSP_WRITEMASK_0 << i; shader_hw_map2gl(&tmp_ins); + ++tmp_src[1].register_idx; ++tmp_src[1].token; } } diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 03403af..8ae6a19 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -228,6 +228,7 @@ static void shader_parse_src_param(DWORD param, DWORD addr_param, struct wined3d { src->register_type = ((param & WINED3DSP_REGTYPE_MASK) >> WINED3DSP_REGTYPE_SHIFT) | ((param & WINED3DSP_REGTYPE_MASK2) >> WINED3DSP_REGTYPE_SHIFT2); + src->register_idx = param & WINED3DSP_REGNUM_MASK; src->token = param; src->addr_token = addr_param; } diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index ada70a8..0868b6c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1944,7 +1944,7 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) char mask_char[6]; BOOL temp_destination = FALSE; - if (shader_is_scalar(ins->src[0].register_type, ins->src[0].token & WINED3DSP_REGNUM_MASK)) + if (shader_is_scalar(ins->src[0].register_type, ins->src[0].register_idx)) { write_mask = shader_glsl_append_dst(ins->ctx->buffer, ins); @@ -1955,14 +1955,6 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) shader_addline(ins->ctx->buffer, "%s >= 0.0 ? %s : %s);\n", src0_param.param_str, src1_param.param_str, src2_param.param_str); } else { - DWORD src0reg = ins->src[0].token & WINED3DSP_REGNUM_MASK; - DWORD src1reg = ins->src[1].token & WINED3DSP_REGNUM_MASK; - DWORD src2reg = ins->src[2].token & WINED3DSP_REGNUM_MASK; - DWORD src0regtype = ins->src[0].register_type; - DWORD src1regtype = ins->src[1].register_type; - DWORD src2regtype = ins->src[2].register_type; - DWORD dstreg = ins->dst[0].register_idx; - DWORD dstregtype = ins->dst[0].register_type; DWORD dst_mask = ins->dst[0].write_mask; struct wined3d_shader_dst_param dst = ins->dst[0]; @@ -1983,9 +1975,12 @@ static void shader_glsl_cmp(const struct wined3d_shader_instruction *ins) * The first lines may overwrite source parameters of the following lines. * Deal with that by using a temporary destination register if needed */ - if ((src0reg == dstreg && src0regtype == dstregtype) - || (src1reg == dstreg && src1regtype == dstregtype) - || (src2reg == dstreg && src2regtype == dstregtype)) + if ((ins->src[0].register_idx == ins->dst[0].register_idx + && ins->src[0].register_type == ins->dst[0].register_type) + || (ins->src[1].register_idx == ins->dst[0].register_idx + && ins->src[1].register_type == ins->dst[0].register_type) + || (ins->src[2].register_idx == ins->dst[0].register_idx + && ins->src[2].register_type == ins->dst[0].register_type)) { write_mask = shader_glsl_get_write_mask(&dst, mask_char); if (!write_mask) continue; @@ -2138,6 +2133,7 @@ static void shader_glsl_mnxn(const struct wined3d_shader_instruction *ins) { tmp_dst.write_mask = WINED3DSP_WRITEMASK_0 << i; shader_glsl_dot(&tmp_ins); + ++tmp_src[1].register_idx; ++tmp_src[1].token; } } @@ -2283,7 +2279,6 @@ static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) { glsl_src_param_t src1_param; IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)ins->ctx->shader; - DWORD reg = ins->src[1].token & WINED3DSP_REGNUM_MASK; const DWORD *control_values = NULL; const local_constant *constant; @@ -2297,7 +2292,8 @@ static void shader_glsl_loop(const struct wined3d_shader_instruction *ins) if (ins->src[1].register_type == WINED3DSPR_CONSTINT) { LIST_FOR_EACH_ENTRY(constant, &shader->baseShader.constantsI, local_constant, entry) { - if(constant->idx == reg) { + if (constant->idx == ins->src[1].register_idx) + { control_values = constant->value; break; } @@ -2408,25 +2404,21 @@ static void shader_glsl_breakc(const struct wined3d_shader_instruction *ins) static void shader_glsl_label(const struct wined3d_shader_instruction *ins) { - - DWORD snum = (ins->src[0].token) & WINED3DSP_REGNUM_MASK; shader_addline(ins->ctx->buffer, "}\n"); - shader_addline(ins->ctx->buffer, "void subroutine%u () {\n", snum); + shader_addline(ins->ctx->buffer, "void subroutine%u () {\n", ins->src[0].register_idx); } static void shader_glsl_call(const struct wined3d_shader_instruction *ins) { - DWORD snum = (ins->src[0].token) & WINED3DSP_REGNUM_MASK; - shader_addline(ins->ctx->buffer, "subroutine%u();\n", snum); + shader_addline(ins->ctx->buffer, "subroutine%u();\n", ins->src[0].register_idx); } static void shader_glsl_callnz(const struct wined3d_shader_instruction *ins) { glsl_src_param_t src1_param; - DWORD snum = (ins->src[0].token) & WINED3DSP_REGNUM_MASK; shader_glsl_add_src_param(ins, ins->src[1].token, ins->src[1].addr_token, WINED3DSP_WRITEMASK_0, &src1_param); - shader_addline(ins->ctx->buffer, "if (%s) subroutine%u();\n", src1_param.param_str, snum); + shader_addline(ins->ctx->buffer, "if (%s) subroutine%u();\n", src1_param.param_str, ins->src[0].register_idx); } /********************************************* @@ -2446,7 +2438,7 @@ static void pshader_glsl_tex(const struct wined3d_shader_instruction *ins) /* 1.0-1.4: Use destination register as sampler source. * 2.0+: Use provided sampler source. */ if (shader_version < WINED3DPS_VERSION(2,0)) sampler_idx = ins->dst[0].register_idx; - else sampler_idx = ins->src[1].token & WINED3DSP_REGNUM_MASK; + else sampler_idx = ins->src[1].register_idx; sampler_type = ins->ctx->reg_maps->samplers[sampler_idx] & WINED3DSP_TEXTURETYPE_MASK; if (shader_version < WINED3DPS_VERSION(1,4)) @@ -2531,7 +2523,7 @@ static void shader_glsl_texldl(const struct wined3d_shader_instruction *ins) DWORD sampler_idx; DWORD swizzle = ins->src[1].token & WINED3DSP_SWIZZLE_MASK; - sampler_idx = ins->src[1].token & WINED3DSP_REGNUM_MASK; + sampler_idx = ins->src[1].register_idx; sampler_type = ins->ctx->reg_maps->samplers[sampler_idx] & WINED3DSP_TEXTURETYPE_MASK; if(deviceImpl->stateBlock->textures[sampler_idx] && IWineD3DBaseTexture_GetTextureDimensions(deviceImpl->stateBlock->textures[sampler_idx]) == GL_TEXTURE_RECTANGLE_ARB) { @@ -2566,7 +2558,7 @@ static void pshader_glsl_texcoord(const struct wined3d_shader_instruction *ins) shader_addline(buffer, "clamp(gl_TexCoord[%u], 0.0, 1.0)%s);\n", ins->dst[0].register_idx, dst_mask); } else { - DWORD reg = ins->src[0].token & WINED3DSP_REGNUM_MASK; + DWORD reg = ins->src[0].register_idx; DWORD src_mod = ins->src[0].token & WINED3DSP_SRCMOD_MASK; char dst_swizzle[6]; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0ad9116..9a476bc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -465,6 +465,7 @@ struct wined3d_shader_dst_param struct wined3d_shader_src_param { WINED3DSHADER_PARAM_REGISTER_TYPE register_type; + UINT register_idx; DWORD token; DWORD addr_token; };

1 0

Frans Kool : mshtml: Corrected Dutch translations.
by Alexandre Julliard April 16, 2009

April 16, 2009

Module: wine Branch: master Commit: f46bd1bb01dd08158d46ea80a1463caf762a5662 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f46bd1bb01dd08158d46ea80a… Author: Frans Kool <Frans.Kool(a)gmail.com> Date: Wed Apr 15 21:57:00 2009 +0200 mshtml: Corrected Dutch translations. --- dlls/mshtml/Nl.rc | 11 +++++++++++ 1 files changed, 11 insertions(+), 0 deletions(-) diff --git a/dlls/mshtml/Nl.rc b/dlls/mshtml/Nl.rc index a8f8f7c..f6f47e1 100644 --- a/dlls/mshtml/Nl.rc +++ b/dlls/mshtml/Nl.rc @@ -56,3 +56,14 @@ FONT 8, "MS Shell Dlg" PUSHBUTTON "OK", IDOK, 200, 10, 45, 14, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP PUSHBUTTON "Annuleren", IDCANCEL, 200, 28, 45, 14, WS_GROUP | WS_TABSTOP } + +ID_PROMPT_DIALOG DIALOG 0, 0, 200, 90 +STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "" +FONT 8, "MS Shell Dlg" +{ + LTEXT "", ID_PROMPT_PROMPT, 10, 10, 180, 30 + EDITTEXT ID_PROMPT_EDIT, 10, 45, 180, 14, ES_AUTOHSCROLL | WS_BORDER | WS_GROUP | WS_TABSTOP + PUSHBUTTON "OK", IDOK, 40, 65, 45, 15, BS_DEFPUSHBUTTON | WS_GROUP | WS_TABSTOP + PUSHBUTTON "Annuleren", IDCANCEL, 115, 65, 45, 15, WS_GROUP | WS_TABSTOP +}

1 0

Aric Stewart : msctf: Add locking flags.
by Alexandre Julliard April 16, 2009

April 16, 2009

Module: wine Branch: master Commit: 7b4f2703485ce09292e8199c88f8139f55d7f6df URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b4f2703485ce09292e8199c8… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Apr 15 09:14:50 2009 -0500 msctf: Add locking flags. --- include/textstor.idl | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/include/textstor.idl b/include/textstor.idl index 08ee21d..b603198 100644 --- a/include/textstor.idl +++ b/include/textstor.idl @@ -38,6 +38,9 @@ const DWORD TS_AS_STATUS_CHANGE = 0x10; const DWORD TS_AS_ALL_SINKS = (TS_AS_TEXT_CHANGE | TS_AS_SEL_CHANGE | TS_AS_LAYOUT_CHANGE | TS_AS_ATTR_CHANGE | TS_AS_STATUS_CHANGE); +const DWORD TS_LF_SYNC = 0x1; +const DWORD TS_LF_READ = 0x2; +const DWORD TS_LF_READWRITE = 0x6; typedef [uuid(05fcf85b-5e9c-4c3e-ab71-29471d4f38e7)] enum { TS_AE_NONE, TS_AE_START, TS_AE_END } TsActiveSelEnd; typedef [uuid(033b0df0-f193-4170-b47b-141afc247878)] enum { TS_RT_PLAIN, TS_RT_HIDDEN, TS_RT_OPAQUE } TsRunType;

1 0

Vincent Povirk : mciavi32: Remove unnecessary string buffers in MCIAVI_mciSet.
by Alexandre Julliard April 16, 2009

April 16, 2009

Module: wine Branch: master Commit: 075ff23394196d9d5e91950747b690d015a0d24c URL: http://source.winehq.org/git/wine.git/?a=commit;h=075ff23394196d9d5e9195074… Author: Vincent Povirk <vincent(a)codeweavers.com> Date: Tue Apr 14 11:56:54 2009 -0500 mciavi32: Remove unnecessary string buffers in MCIAVI_mciSet. --- dlls/mciavi32/info.c | 39 ++++++++++++++++++++------------------- 1 files changed, 20 insertions(+), 19 deletions(-) diff --git a/dlls/mciavi32/info.c b/dlls/mciavi32/info.c index 61b79b7..64d51eb 100644 --- a/dlls/mciavi32/info.c +++ b/dlls/mciavi32/info.c @@ -225,72 +225,73 @@ DWORD MCIAVI_mciSet(UINT wDevID, DWORD dwFlags, LPMCI_DGV_SET_PARMS lpParms) } if (dwFlags & MCI_SET_ON) { - char buffer[256]; - - strcpy(buffer, "MCI_SET_ON:"); + const char *szVideo=""; + const char *szAudio=""; + const char *szSeek=""; if (dwFlags & MCI_SET_VIDEO) { - strncat(buffer, " video", sizeof(buffer)-sizeof("MCI_SET_ON:")); + szVideo = " video"; wma->dwSet |= 4; } if (dwFlags & MCI_SET_AUDIO) { - strncat(buffer, " audio", sizeof(buffer)-sizeof("MCI_SET_ON:")); switch (lpParms->dwAudio) { case MCI_SET_AUDIO_ALL: - strncat(buffer, " all", sizeof(buffer)-sizeof("MCI_SET_ON:")); + szAudio = " audio all"; wma->dwSet |= 3; break; case MCI_SET_AUDIO_LEFT: - strncat(buffer, " left", sizeof(buffer)-sizeof("MCI_SET_ON:")); + szAudio = " audio left"; wma->dwSet |= 1; break; case MCI_SET_AUDIO_RIGHT: - strncat(buffer, " right", sizeof(buffer)-sizeof("MCI_SET_ON:")); + szAudio = " audio right"; wma->dwSet |= 2; break; default: + szAudio = " audio unknown"; WARN("Unknown audio channel %u\n", lpParms->dwAudio); break; } } if (dwFlags & MCI_DGV_SET_SEEK_EXACTLY) { - strncat(buffer, " seek_exactly", sizeof(buffer)); + szSeek = " seek_exactly"; } - FIXME("%s\n", buffer); + FIXME("MCI_SET_ON:%s%s%s\n", szVideo, szAudio, szSeek); } if (dwFlags & MCI_SET_OFF) { - char buffer[256]; + const char *szVideo=""; + const char *szAudio=""; + const char *szSeek=""; - strcpy(buffer, "MCI_SET_OFF:"); if (dwFlags & MCI_SET_VIDEO) { - strncat(buffer, " video", sizeof(buffer)-sizeof("MCI_SET_OFF:")); + szVideo = " video"; wma->dwSet &= ~4; } if (dwFlags & MCI_SET_AUDIO) { - strncat(buffer, " audio", sizeof(buffer)-sizeof("MCI_SET_OFF:")); switch (lpParms->dwAudio) { case MCI_SET_AUDIO_ALL: - strncat(buffer, " all", sizeof(buffer)-sizeof("MCI_SET_OFF:")); + szAudio = " audio all"; wma->dwSet &= ~3; break; case MCI_SET_AUDIO_LEFT: - strncat(buffer, " left", sizeof(buffer)-sizeof("MCI_SET_OFF:")); + szAudio = " audio left"; wma->dwSet &= ~2; break; case MCI_SET_AUDIO_RIGHT: - strncat(buffer, " right", sizeof(buffer)-sizeof("MCI_SET_OFF:")); + szAudio = " audio right"; wma->dwSet &= ~2; break; default: + szAudio = " audio unknown"; WARN("Unknown audio channel %u\n", lpParms->dwAudio); break; } } if (dwFlags & MCI_DGV_SET_SEEK_EXACTLY) { - strncat(buffer, " seek_exactly", sizeof(buffer)-strlen(buffer)-1); + szSeek = " seek_exactly"; } - FIXME("%s\n", buffer); + FIXME("MCI_SET_OFF:%s%s%s\n", szVideo, szAudio, szSeek); } if (dwFlags & MCI_DGV_SET_FILEFORMAT) { LPCSTR str = "save";

1 0

Hans Leidekker : msvcrt: Implement ___lc_codepage_func, ___lc_collate_cp_func and ___lc_handle_func.
by Alexandre Julliard April 16, 2009

April 16, 2009

Module: wine Branch: master Commit: 4aec827b1ed0fdddefb17e47fb4433d00334998a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4aec827b1ed0fdddefb17e47f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Apr 15 15:18:19 2009 +0200 msvcrt: Implement ___lc_codepage_func, ___lc_collate_cp_func and ___lc_handle_func. --- dlls/msvcrt/locale.c | 24 ++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 6 +++--- 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index f524c8d..5d6e545 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -607,3 +607,27 @@ void CDECL __lconv_init(void) { FIXME(" stub\n"); } + +/********************************************************************* + * ___lc_handle_func (MSVCRT.@) + */ +HANDLE * CDECL ___lc_handle_func(void) +{ + return MSVCRT___lc_handle; +} + +/********************************************************************* + * ___lc_codepage_func (MSVCRT.@) + */ +int CDECL ___lc_codepage_func(void) +{ + return MSVCRT___lc_codepage; +} + +/********************************************************************* + * ___lc_collate_cp_func (MSVCRT.@) + */ +int CDECL ___lc_collate_cp_func(void) +{ + return MSVCRT___lc_collate_cp; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 145b2b0..e67251d 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -84,9 +84,9 @@ @ cdecl __RTDynamicCast(ptr long ptr ptr long) MSVCRT___RTDynamicCast @ cdecl __RTtypeid(ptr) MSVCRT___RTtypeid @ cdecl __STRINGTOLD(ptr ptr str long) -@ stub ___lc_codepage_func -@ stub ___lc_collate_cp_func -@ stub ___lc_handle_func +@ cdecl ___lc_codepage_func() +@ cdecl ___lc_collate_cp_func() +@ cdecl ___lc_handle_func() @ cdecl ___mb_cur_max_func() MSVCRT____mb_cur_max_func @ cdecl ___setlc_active_func() MSVCRT____setlc_active_func @ cdecl ___unguarded_readlc_active_add_func() MSVCRT____unguarded_readlc_active_add_func

1 0

Michael Stefaniuc : mshtml/tests: Replace long with LONG.
by Alexandre Julliard April 16, 2009

April 16, 2009

Module: wine Branch: master Commit: cb538198d2087267910893f595620e363817fc3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=cb538198d2087267910893f59… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Apr 15 09:45:09 2009 +0200 mshtml/tests: Replace long with LONG. --- dlls/mshtml/tests/dom.c | 66 +++++++++++++++++++++++----------------------- 1 files changed, 33 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=cb538198d208726791089…

1 0