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

Nikolay Sivov : comctl32/listview: Some tests for LVS_SINGLESEL switchover.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 3ce8e20896a72de2022c62964744d1660011656d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ce8e20896a72de2022c62964… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Apr 20 08:05:45 2009 -0400 comctl32/listview: Some tests for LVS_SINGLESEL switchover. --- dlls/comctl32/listview.c | 1 - dlls/comctl32/tests/listview.c | 55 ++++++++++++++++++++++++++++++++++++++++ include/commctrl.h | 2 +- 3 files changed, 56 insertions(+), 2 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index d249cff..3c294f2 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -9566,7 +9566,6 @@ static INT LISTVIEW_StyleChanged(LISTVIEW_INFO *infoPtr, WPARAM wStyleType, if (wStyleType != GWL_STYLE) return 0; /* FIXME: if LVS_NOSORTHEADER changed, update header */ - /* or LVS_SINGLESEL */ /* or LVS_SORT{AS,DES}CENDING */ infoPtr->dwStyle = lpss->styleNew; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 5733668..6b68c56 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1351,6 +1351,7 @@ static void test_multiselect(void) static const int items=5; BYTE kstate[256]; select_task task; + LONG_PTR style; static struct t_select_task task_list[] = { { "using VK_DOWN", 0, VK_DOWN, -1, -1 }, @@ -1407,6 +1408,60 @@ static void test_multiselect(void) SetKeyboardState(kstate); } DestroyWindow(hwnd); + + /* make multiple selection, then switch to LVS_SINGLESEL */ + hwnd = create_listview_control(0); + for (i=0;i<items;i++) { + insert_item(hwnd, 0); + } + item_count = (int)SendMessage(hwnd, LVM_GETITEMCOUNT, 0, 0); + expect(items,item_count); + /* deselect all items */ + ListView_SetItemState(hwnd, -1, 0, LVIS_SELECTED); + SendMessage(hwnd, LVM_SETSELECTIONMARK, 0, -1); + for (i=0;i<3;i++) { + ListView_SetItemState(hwnd, i, LVIS_SELECTED, LVIS_SELECTED); + } + + r = SendMessage(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); + expect(3, r); + r = SendMessage(hwnd, LVM_GETSELECTIONMARK, 0, 0); +todo_wine + expect(-1, r); + + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(!(style & LVS_SINGLESEL), "LVS_SINGLESEL isn't expected\n"); + SetWindowLongPtrA(hwnd, GWL_STYLE, style | LVS_SINGLESEL); + /* check that style is accepted */ + style = GetWindowLongPtrA(hwnd, GWL_STYLE); + ok(style & LVS_SINGLESEL, "LVS_SINGLESEL expected\n"); + + for (i=0;i<3;i++) { + r = ListView_GetItemState(hwnd, i, LVIS_SELECTED); + ok(r & LVIS_SELECTED, "Expected item %d to be selected\n", i); + } + r = SendMessage(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); + expect(3, r); + SendMessage(hwnd, LVM_GETSELECTIONMARK, 0, 0); + expect(3, r); + + /* select one more */ + ListView_SetItemState(hwnd, 3, LVIS_SELECTED, LVIS_SELECTED); + + for (i=0;i<3;i++) { + r = ListView_GetItemState(hwnd, i, LVIS_SELECTED); + ok(!(r & LVIS_SELECTED), "Expected item %d to be unselected\n", i); + } + r = ListView_GetItemState(hwnd, 3, LVIS_SELECTED); + ok(r & LVIS_SELECTED, "Expected item %d to be selected\n", i); + + r = SendMessage(hwnd, LVM_GETSELECTEDCOUNT, 0, 0); + expect(1, r); + r = SendMessage(hwnd, LVM_GETSELECTIONMARK, 0, 0); +todo_wine + expect(-1, r); + + DestroyWindow(hwnd); } static void test_subitem_rect(void) diff --git a/include/commctrl.h b/include/commctrl.h index 9dc7f9d..4727e3e 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -3715,7 +3715,7 @@ typedef struct NMLVSCROLL { LVITEMA _LVi; _LVi.state = data; _LVi.stateMask = dataMask;\ SNDMSGA(hwnd, LVM_SETITEMSTATE, (WPARAM)(UINT)i, (LPARAM) (LPLVITEMA)&_LVi);} #define ListView_GetItemState(hwnd,i,mask) \ - (BOOL)SNDMSGA((hwnd),LVM_GETITEMSTATE,(WPARAM)(UINT)(i),(LPARAM)(UINT)(mask)) + (UINT)SNDMSGA((hwnd),LVM_GETITEMSTATE,(WPARAM)(UINT)(i),(LPARAM)(UINT)(mask)) #define ListView_GetCountPerPage(hwnd) \ (BOOL)SNDMSGW((hwnd),LVM_GETCOUNTPERPAGE,0,0L) #define ListView_GetImageList(hwnd,iImageList) \

1 0

Francois Gouget : wineesd.drv: Add a trailing '\n' to a WARN() trace.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 8e18524ad365d7c80bc383b605f0e0b0ef4e2df4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e18524ad365d7c80bc383b60… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Apr 20 14:49:15 2009 +0200 wineesd.drv: Add a trailing '\n' to a WARN() trace. --- dlls/wineesd.drv/audio.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wineesd.drv/audio.c b/dlls/wineesd.drv/audio.c index 9fde808..02446e3 100644 --- a/dlls/wineesd.drv/audio.c +++ b/dlls/wineesd.drv/audio.c @@ -1192,7 +1192,7 @@ static DWORD wodOpen(WORD wDevID, LPWAVEOPENDESC lpDesc, DWORD dwFlags) } else { - WARN("esd_open_sound() failed"); + WARN("esd_open_sound() failed\n"); /* just do a rough guess at the latency and continue anyway */ wwo->dwLatency = 1000 * (2 * ESD_BUF_SIZE) / out_rate; }

1 0

Henri Verbeet : wined3d: Create a relative addressing token for 1. x shaders in the frontend.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: d6ee7d59a8f22af7e51523ee9d8a5a288c0839a9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6ee7d59a8f22af7e51523ee9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 17 09:46:56 2009 +0200 wined3d: Create a relative addressing token for 1.x shaders in the frontend. Rather than handling this in the backends. Note that the ARB backend always assumes 1.x shaders. --- dlls/wined3d/baseshader.c | 31 +++++++++++++++++++++++-------- dlls/wined3d/glsl_shader.c | 27 ++++++--------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index e0cedbc..7640a79 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -7,6 +7,7 @@ * Copyright 2005 Oliver Stieber * Copyright 2006 Ivan Gyurdiev * Copyright 2007-2008 Stefan Dösinger for CodeWeavers + * Copyright 2009 Henri Verbeet for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -131,17 +132,31 @@ const SHADER_OPCODE *shader_get_opcode(const SHADER_OPCODE *opcode_table, DWORD * Return the number of tokens read */ static int shader_get_param(const DWORD *pToken, DWORD shader_version, DWORD *param, DWORD *addr_token) { + UINT count = 1; + + *param = *pToken; + /* PS >= 3.0 have relative addressing (with token) * VS >= 2.0 have relative addressing (with token) * VS >= 1.0 < 2.0 have relative addressing (without token) * The version check below should work in general */ + if (*pToken & WINED3DSHADER_ADDRMODE_RELATIVE) + { + if (WINED3DSHADER_VERSION_MAJOR(shader_version) < 2) + { + *addr_token = (1 << 31) + | ((WINED3DSPR_ADDR << WINED3DSP_REGTYPE_SHIFT2) & WINED3DSP_REGTYPE_MASK2) + | ((WINED3DSPR_ADDR << WINED3DSP_REGTYPE_SHIFT) & WINED3DSP_REGTYPE_MASK) + | WINED3DSP_NOSWIZZLE; + } + else + { + *addr_token = *(pToken + 1); + ++count; + } + } - char rel_token = WINED3DSHADER_VERSION_MAJOR(shader_version) >= 2 && - ((*pToken & WINED3DSHADER_ADDRESSMODE_MASK) == WINED3DSHADER_ADDRMODE_RELATIVE); - - *param = *pToken; - *addr_token = rel_token? *(pToken + 1): 0; - return rel_token? 2:1; + return count; } /* Return the number of parameters to skip for an opcode */ @@ -167,7 +182,7 @@ static int shader_skip_unrecognized(const DWORD *pToken, DWORD shader_version) /* TODO: Think of a good name for 0x80000000 and replace it with a constant */ while (*pToken & 0x80000000) { - DWORD param, addr_token; + DWORD param, addr_token = 0; tokens_read += shader_get_param(pToken, shader_version, &param, &addr_token); pToken += tokens_read; @@ -1014,7 +1029,7 @@ void shader_trace_init(const DWORD *pFunction, const SHADER_OPCODE *opcode_table } else { - DWORD param, addr_token; + DWORD param, addr_token = 0; int tokens_read; /* Print out predication source token first - it follows diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 3c8eac1..01a7c38 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1105,27 +1105,12 @@ static void shader_glsl_get_register_name(WINED3DSHADER_PARAM_REGISTER_TYPE regi /* Relative addressing */ if (rel_addr) { - /* Relative addressing on shaders 2.0+ have a relative address token, - * prior to that, it was hard-coded as "A0.x" because there's only 1 register */ - if (WINED3DSHADER_VERSION_MAJOR(shader_version) >= 2) - { - glsl_src_param_t rel_param; - shader_glsl_add_src_param(ins, addr_token, 0, WINED3DSP_WRITEMASK_0, &rel_param); - if (register_idx) - { - sprintf(register_name, "%cC[%s + %u]", prefix, rel_param.param_str, register_idx); - } else { - sprintf(register_name, "%cC[%s]", prefix, rel_param.param_str); - } - } else { - if (register_idx) - { - sprintf(register_name, "%cC[A0.x + %u]", prefix, register_idx); - } else { - sprintf(register_name, "%cC[A0.x]", prefix); - } - } - + glsl_src_param_t rel_param; + shader_glsl_add_src_param(ins, addr_token, 0, WINED3DSP_WRITEMASK_0, &rel_param); + if (register_idx) + sprintf(register_name, "%cC[%s + %u]", prefix, rel_param.param_str, register_idx); + else + sprintf(register_name, "%cC[%s]", prefix, rel_param.param_str); } else { if (shader_constant_is_local(This, register_idx)) {

1 0

Henri Verbeet : wined3d: Store the source relative addressing token as a struct wined3d_shader_src_param .
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 0663eb932326b1b9767296c3f80ac58959de6b97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0663eb932326b1b9767296c3f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 17 09:46:56 2009 +0200 wined3d: Store the source relative addressing token as a struct wined3d_shader_src_param. --- dlls/wined3d/baseshader.c | 20 ++++- dlls/wined3d/glsl_shader.c | 168 ++++++++++++++++++++-------------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 100 insertions(+), 90 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=0663eb932326b1b976729…

1 0

Henri Verbeet : wined3d: Store the destination relative addressing token as a struct wined3d_shader_src_param .
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 915b91757f35a246f956e65f75a09f1a86cfeab2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=915b91757f35a246f956e65f7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 17 09:46:56 2009 +0200 wined3d: Store the destination relative addressing token as a struct wined3d_shader_src_param. --- dlls/wined3d/arb_program_shader.c | 29 +++++++++++++++-------------- dlls/wined3d/baseshader.c | 24 +++++++++++++++++------- dlls/wined3d/glsl_shader.c | 3 ++- dlls/wined3d/vertexshader.c | 3 +-- dlls/wined3d/wined3d_private.h | 3 +-- 5 files changed, 36 insertions(+), 26 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=915b91757f35a246f956e…

1 0

Henri Verbeet : wined3d: Pass a struct wined3d_shader_src_param to shader_glsl_get_register_name() for the relative addressing token.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: c7660c57a0961ead60c0217a272a12072d8b4565 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7660c57a0961ead60c0217a2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 17 09:46:57 2009 +0200 wined3d: Pass a struct wined3d_shader_src_param to shader_glsl_get_register_name() for the relative addressing token. --- dlls/wined3d/glsl_shader.c | 11 +++++------ 1 files changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 429695b..79b95fc 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1022,7 +1022,7 @@ static void shader_glsl_gen_modifier ( /** Writes the GLSL variable name that corresponds to the register that the * DX opcode parameter is trying to access */ static void shader_glsl_get_register_name(WINED3DSHADER_PARAM_REGISTER_TYPE register_type, UINT register_idx, - BOOL rel_addr, const DWORD addr_token, char *register_name, BOOL *is_color, + const struct wined3d_shader_src_param *rel_addr, char *register_name, BOOL *is_color, const struct wined3d_shader_instruction *ins) { /* oPos, oFog and oPts in D3D */ @@ -1051,7 +1051,7 @@ static void shader_glsl_get_register_name(WINED3DSHADER_PARAM_REGISTER_TYPE regi if (rel_addr) { glsl_src_param_t rel_param; - shader_glsl_add_src_param(ins, addr_token, NULL, WINED3DSP_WRITEMASK_0, &rel_param); + shader_glsl_add_src_param(ins, rel_addr->token, NULL, WINED3DSP_WRITEMASK_0, &rel_param); /* Removing a + 0 would be an obvious optimization, but macos doesn't see the NOP * operation there @@ -1106,7 +1106,7 @@ static void shader_glsl_get_register_name(WINED3DSHADER_PARAM_REGISTER_TYPE regi if (rel_addr) { glsl_src_param_t rel_param; - shader_glsl_add_src_param(ins, addr_token, NULL, WINED3DSP_WRITEMASK_0, &rel_param); + shader_glsl_add_src_param(ins, rel_addr->token, NULL, WINED3DSP_WRITEMASK_0, &rel_param); if (register_idx) sprintf(register_name, "%cC[%s + %u]", prefix, rel_param.param_str, register_idx); else @@ -1277,7 +1277,7 @@ static void shader_glsl_add_src_param(const struct wined3d_shader_instruction *i swizzle_str[0] = '\0'; shader_glsl_get_register_name(shader_get_regtype(param), param & WINED3DSP_REGNUM_MASK, - !!addr_param, addr_param ? addr_param->token : 0, src_param->reg_name, &is_color, ins); + addr_param, src_param->reg_name, &is_color, ins); shader_glsl_get_swizzle(param, is_color, mask, swizzle_str); shader_glsl_gen_modifier(param, src_param->reg_name, swizzle_str, src_param->param_str); @@ -1295,8 +1295,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->rel_addr, wined3d_dst->rel_addr ? wined3d_dst->rel_addr->token : 0, - glsl_dst->reg_name, &is_color, ins); + wined3d_dst->rel_addr, glsl_dst->reg_name, &is_color, ins); return shader_glsl_get_write_mask(wined3d_dst, glsl_dst->mask_str); }

1 0

Henri Verbeet : wined3d: Pass a struct wined3d_shader_src_param to shader_glsl_add_src_param().
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 48a096a6381cc706a52c645aaa95aff7812bd57d URL: http://source.winehq.org/git/wine.git/?a=commit;h=48a096a6381cc706a52c645aa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 17 09:46:57 2009 +0200 wined3d: Pass a struct wined3d_shader_src_param to shader_glsl_add_src_param(). --- dlls/wined3d/glsl_shader.c | 183 +++++++++++++++++++++---------------------- 1 files changed, 89 insertions(+), 94 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=48a096a6381cc706a52c6…

1 0

Henri Verbeet : wined3d: Simplify replicating the . x swizzle in shader_hw_mov().
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 1ae060be4afa083581ecab49743c07113c91fad4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1ae060be4afa083581ecab497… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 17 09:46:57 2009 +0200 wined3d: Simplify replicating the .x swizzle in shader_hw_mov(). It becomes even simpler once the swizzle shift and token field are eliminated. --- dlls/wined3d/arb_program_shader.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 4be1a1f..65ad8b2 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1076,17 +1076,9 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) { /* Apple's ARB_vertex_program implementation does not accept an ARL source argument * with more than one component. Thus replicate the first source argument over all - * 4 components. For example, .xyzw -> .x (or better: .xxxx), .zwxy -> .z, etc) - */ - DWORD parm = ins->src[0].token & ~(WINED3DVS_SWIZZLE_MASK); - if ((ins->src[0].token & WINED3DVS_X_W) == WINED3DVS_X_W) - parm |= WINED3DVS_X_W | WINED3DVS_Y_W | WINED3DVS_Z_W | WINED3DVS_W_W; - else if ((ins->src[0].token & WINED3DVS_X_Z) == WINED3DVS_X_Z) - parm |= WINED3DVS_X_Z | WINED3DVS_Y_Z | WINED3DVS_Z_Z | WINED3DVS_W_Z; - else if ((ins->src[0].token & WINED3DVS_X_Y) == WINED3DVS_X_Y) - parm |= WINED3DVS_X_Y | WINED3DVS_Y_Y | WINED3DVS_Z_Y | WINED3DVS_W_Y; - else if ((ins->src[0].token & WINED3DVS_X_X) == WINED3DVS_X_X) - parm |= WINED3DVS_X_X | WINED3DVS_Y_X | WINED3DVS_Z_X | WINED3DVS_W_X; + * 4 components. For example, .xyzw -> .x (or better: .xxxx), .zwxy -> .z, etc) */ + DWORD parm = ins->src[0].token & ~(WINED3DSP_SWIZZLE_MASK); + parm |= ((ins->src[0].token >> WINED3DSP_SWIZZLE_SHIFT) & 0x3) * (0x55 << WINED3DSP_SWIZZLE_SHIFT); shader_arb_add_src_param(ins, parm, src0_param); shader_addline(buffer, "ARL A0.x, %s;\n", src0_param); }

1 0

Henri Verbeet : wined3d: Pass a struct wined3d_shader_src_param to shader_arb_add_src_param().
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: ea0b3b42eb43c3c79139dd97694753351263373c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea0b3b42eb43c3c79139dd976… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 17 09:46:57 2009 +0200 wined3d: Pass a struct wined3d_shader_src_param to shader_arb_add_src_param(). --- dlls/wined3d/arb_program_shader.c | 24 +++++++++++++----------- 1 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 65ad8b2..0cf5831 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -551,20 +551,20 @@ static void shader_arb_get_register_name(IWineD3DBaseShader *iface, WINED3DSHADE } static void shader_arb_add_src_param(const struct wined3d_shader_instruction *ins, - DWORD param, char *str) + const struct wined3d_shader_src_param *wined3d_src, char *str) { char register_name[255]; char swizzle[6]; BOOL is_color; - if ((param & WINED3DSP_SRCMOD_MASK) == WINED3DSPSM_NEG) strcat(str, " -"); + if (wined3d_src->modifiers == WINED3DSPSM_NEG) strcat(str, " -"); else strcat(str, " "); - shader_arb_get_register_name(ins->ctx->shader, shader_get_regtype(param), param & WINED3DSP_REGNUM_MASK, - param & WINED3DSHADER_ADDRMODE_RELATIVE, register_name, &is_color); + shader_arb_get_register_name(ins->ctx->shader, wined3d_src->register_type, + wined3d_src->register_idx, !!wined3d_src->rel_addr, register_name, &is_color); strcat(str, register_name); - shader_arb_get_swizzle(param, is_color, swizzle); + shader_arb_get_swizzle(wined3d_src->token, is_color, swizzle); strcat(str, swizzle); } @@ -1043,7 +1043,7 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) for (i = 0; i < ins->src_count; ++i) { strcat(arguments, ","); - shader_arb_add_src_param(ins, ins->src[i].token, arguments); + shader_arb_add_src_param(ins, &ins->src[i], arguments); } } shader_addline(buffer, "%s%s;\n", instruction, arguments); @@ -1068,7 +1068,7 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) src0_param[0] = '\0'; if (((IWineD3DVertexShaderImpl *)shader)->rel_offset) { - shader_arb_add_src_param(ins, ins->src[0].token, 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"); } @@ -1077,9 +1077,11 @@ static void shader_hw_mov(const struct wined3d_shader_instruction *ins) /* Apple's ARB_vertex_program implementation does not accept an ARL source argument * with more than one component. Thus replicate the first source argument over all * 4 components. For example, .xyzw -> .x (or better: .xxxx), .zwxy -> .z, etc) */ - DWORD parm = ins->src[0].token & ~(WINED3DSP_SWIZZLE_MASK); - parm |= ((ins->src[0].token >> WINED3DSP_SWIZZLE_SHIFT) & 0x3) * (0x55 << WINED3DSP_SWIZZLE_SHIFT); - shader_arb_add_src_param(ins, parm, src0_param); + struct wined3d_shader_src_param tmp_src = ins->src[0]; + tmp_src.token &= ~WINED3DSP_SWIZZLE_MASK; + tmp_src.token |= ((ins->src[0].token >> WINED3DSP_SWIZZLE_SHIFT) & 0x3) + * (0x55 << WINED3DSP_SWIZZLE_SHIFT); + shader_arb_add_src_param(ins, &tmp_src, src0_param); shader_addline(buffer, "ARL A0.x, %s;\n", src0_param); } } @@ -1651,7 +1653,7 @@ static void vshader_hw_rsq_rcp(const struct wined3d_shader_instruction *ins) strcpy(tmpLine, instruction); shader_arb_add_dst_param(ins, &ins->dst[0], tmpLine); /* Destination */ strcat(tmpLine, ","); - shader_arb_add_src_param(ins, ins->src[0].token, tmpLine); + shader_arb_add_src_param(ins, &ins->src[0], 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

Huw Davies : winex11.drv: Fix ordering of synthesized text formats.
by Alexandre Julliard 20 Apr '09

20 Apr '09

Module: wine Branch: master Commit: 0d4451a85dca44bc3fe154f6fb9281785df38938 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d4451a85dca44bc3fe154f6f… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 17 14:46:06 2009 +0100 winex11.drv: Fix ordering of synthesized text formats. --- dlls/user32/tests/clipboard.c | 71 +++++++++++++++++++++++++++++++++++++++++ dlls/winex11.drv/clipboard.c | 2 +- 2 files changed, 72 insertions(+), 1 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 30b1707..41561a4 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -21,6 +21,7 @@ #include "wine/test.h" #include "winbase.h" #include "winerror.h" +#include "wingdi.h" #include "winuser.h" static BOOL is_win9x = FALSE; @@ -190,6 +191,75 @@ todo_wine test_last_error(ERROR_CLIPBOARD_NOT_OPEN); } +static HGLOBAL create_text(void) +{ + HGLOBAL h = GlobalAlloc(GMEM_DDESHARE|GMEM_MOVEABLE, 5); + char *p = GlobalLock(h); + strcpy(p, "test"); + GlobalUnlock(h); + return h; +} + +static HENHMETAFILE create_emf(void) +{ + const RECT rect = {0, 0, 100, 100}; + HDC hdc = CreateEnhMetaFileA(NULL, NULL, &rect, "HENHMETAFILE Ole Clipboard Test\0Test\0\0"); + ExtTextOutA(hdc, 0, 0, ETO_OPAQUE, &rect, "Test String", strlen("Test String"), NULL); + return CloseEnhMetaFile(hdc); +} + +static void test_synthesized(void) +{ + HGLOBAL h, htext; + HENHMETAFILE emf; + BOOL r; + UINT cf; + + htext = create_text(); + emf = create_emf(); + + r = OpenClipboard(NULL); + ok(r, "gle %d\n", GetLastError()); + r = EmptyClipboard(); + ok(r, "gle %d\n", GetLastError()); + h = SetClipboardData(CF_TEXT, htext); + ok(h == htext, "got %p\n", h); + h = SetClipboardData(CF_ENHMETAFILE, emf); + ok(h == emf, "got %p\n", h); + r = CloseClipboard(); + ok(r, "gle %d\n", GetLastError()); + + r = OpenClipboard(NULL); + ok(r, "gle %d\n", GetLastError()); + cf = EnumClipboardFormats(0); + ok(cf == CF_TEXT, "cf %08x\n", cf); + + cf = EnumClipboardFormats(cf); + ok(cf == CF_ENHMETAFILE, "cf %08x\n", cf); + + cf = EnumClipboardFormats(cf); + todo_wine ok(cf == CF_LOCALE, "cf %08x\n", cf); + if(cf == CF_LOCALE) + cf = EnumClipboardFormats(cf); + ok(cf == CF_OEMTEXT, "cf %08x\n", cf); + + cf = EnumClipboardFormats(cf); + ok(cf == CF_UNICODETEXT, "cf %08x\n", cf); + + cf = EnumClipboardFormats(cf); + todo_wine ok(cf == CF_METAFILEPICT, "cf %08x\n", cf); + if(cf == CF_METAFILEPICT) + cf = EnumClipboardFormats(cf); + + ok(cf == 0, "cf %08x\n", cf); + + r = EmptyClipboard(); + ok(r, "gle %d\n", GetLastError()); + + r = CloseClipboard(); + ok(r, "gle %d\n", GetLastError()); +} + START_TEST(clipboard) { SetLastError(0xdeadbeef); @@ -198,4 +268,5 @@ START_TEST(clipboard) test_RegisterClipboardFormatA(); test_ClipboardOwner(); + test_synthesized(); } diff --git a/dlls/winex11.drv/clipboard.c b/dlls/winex11.drv/clipboard.c index 0b27a87..07d58a5 100644 --- a/dlls/winex11.drv/clipboard.c +++ b/dlls/winex11.drv/clipboard.c @@ -2778,9 +2778,9 @@ void CDECL X11DRV_EndClipboardUpdate(void) INT count = ClipDataCount; /* Do Unicode <-> Text <-> OEM mapping */ - X11DRV_CLIPBOARD_SynthesizeData(CF_UNICODETEXT); X11DRV_CLIPBOARD_SynthesizeData(CF_TEXT); X11DRV_CLIPBOARD_SynthesizeData(CF_OEMTEXT); + X11DRV_CLIPBOARD_SynthesizeData(CF_UNICODETEXT); /* Enhmetafile <-> MetafilePict mapping */ X11DRV_CLIPBOARD_SynthesizeData(CF_ENHMETAFILE);

1 0