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

Nikolay Sivov : comctl32/listview: Select all items with LVM_SETITEMSTATE is blocked in LVS_SINGLESEL.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: 4a5e23a2f960dfaa19de6fed481a2f13c69356a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4a5e23a2f960dfaa19de6fed4… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 10 13:02:57 2009 +0400 comctl32/listview: Select all items with LVM_SETITEMSTATE is blocked in LVS_SINGLESEL. --- dlls/comctl32/listview.c | 4 ++++ dlls/comctl32/tests/listview.c | 31 +++++++++++++++++++++++++++++++ 2 files changed, 35 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 1928d4b..7bed09e 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -7687,6 +7687,10 @@ static BOOL LISTVIEW_SetItemState(LISTVIEW_INFO *infoPtr, INT nItem, const LVITE if (nItem == -1) { + /* select all isn't allowed in LVS_SINGLESEL */ + if ((lvItem.state & lvItem.stateMask & LVIS_SELECTED) && (infoPtr->dwStyle & LVS_SINGLESEL)) + return FALSE; + /* apply to all items */ for (lvItem.iItem = 0; lvItem.iItem < infoPtr->nItemCount; lvItem.iItem++) if (!LISTVIEW_SetItemT(infoPtr, &lvItem, TRUE)) bResult = FALSE; diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index e94bdaa..5987e1e 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1496,6 +1496,7 @@ static void test_multiselect(void) BYTE kstate[256]; select_task task; LONG_PTR style; + LVITEMA item; static struct t_select_task task_list[] = { { "using VK_DOWN", 0, VK_DOWN, -1, -1 }, @@ -1605,6 +1606,36 @@ todo_wine todo_wine expect(-1, r); + /* try to select all on LVS_SINGLESEL */ + memset(&item, 0, sizeof(item)); + item.stateMask = LVIS_SELECTED; + r = SendMessage(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, r); + ListView_SetSelectionMark(hwnd, -1); + + item.stateMask = LVIS_SELECTED; + item.state = LVIS_SELECTED; + r = SendMessage(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(FALSE, r); + + r = ListView_GetSelectedCount(hwnd); + expect(0, r); + r = ListView_GetSelectionMark(hwnd); + expect(-1, r); + + /* try to deselect all on LVS_SINGLESEL */ + item.stateMask = LVIS_SELECTED; + item.state = LVIS_SELECTED; + r = SendMessage(hwnd, LVM_SETITEMSTATE, 0, (LPARAM)&item); + expect(TRUE, r); + + item.stateMask = LVIS_SELECTED; + item.state = 0; + r = SendMessage(hwnd, LVM_SETITEMSTATE, -1, (LPARAM)&item); + expect(TRUE, r); + r = ListView_GetSelectedCount(hwnd); + expect(0, r); + DestroyWindow(hwnd); }

1 0

Nikolay Sivov : comctl32/listview: Don' t redraw focus rectangle on column scroll.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: e847d7c038cab5ce9f77fa62380a8ea712ed69e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e847d7c038cab5ce9f77fa623… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 10 13:15:44 2009 +0400 comctl32/listview: Don't redraw focus rectangle on column scroll. --- dlls/comctl32/listview.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index 7bed09e..f268855 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4658,9 +4658,6 @@ static void LISTVIEW_ScrollColumns(LISTVIEW_INFO *infoPtr, INT nColumn, INT dx) /* do not update screen if not in report mode */ if (!is_redrawing(infoPtr) || (infoPtr->dwStyle & LVS_TYPEMASK) != LVS_REPORT) return; - /* if we have a focus, we must first erase the focus rect */ - if (infoPtr->bFocus) LISTVIEW_ShowFocusRect(infoPtr, FALSE); - /* Need to reset the item width when inserting a new column */ infoPtr->nItemWidth += dx; @@ -4671,9 +4668,6 @@ static void LISTVIEW_ScrollColumns(LISTVIEW_INFO *infoPtr, INT nColumn, INT dx) rcOld = infoPtr->rcList; rcOld.left = ptOrigin.x + rcCol.left + dx; ScrollWindowEx(infoPtr->hwndSelf, dx, 0, &rcOld, &rcOld, 0, 0, SW_ERASE | SW_INVALIDATE); - - /* we can restore focus now */ - if (infoPtr->bFocus) LISTVIEW_ShowFocusRect(infoPtr, TRUE); } /***

1 0

Nikolay Sivov : comctl32/listview: Add LVN_INCREMENTALSEARCH definitions.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: 50e9ceb9e4e0915b98200469bbc9334a1b2258b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=50e9ceb9e4e0915b98200469b… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Sun May 10 14:42:44 2009 +0400 comctl32/listview: Add LVN_INCREMENTALSEARCH definitions. --- include/commctrl.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 7b93497..d3c24cd 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -3253,12 +3253,20 @@ static const WCHAR WC_LISTVIEWW[] = { 'S','y','s', #define LVN_GETINFOTIPA (LVN_FIRST-57) #define LVN_GETINFOTIPW (LVN_FIRST-58) #define LVN_GETINFOTIP WINELIB_NAME_AW(LVN_GETINFOTIP) +#define LVN_INCREMENTALSEARCHA (LVN_FIRST-62) +#define LVN_INCREMENTALSEARCHW (LVN_FIRST-63) +#define LVN_INCREMENTALSEARCH WINELIB_NAME_AW(LVN_INCREMENTALSEARCH) #define LVN_BEGINSCROLL (LVN_FIRST-80) #define LVN_ENDSCROLL (LVN_FIRST-81) #define LVN_LINKCLICK (LVN_FIRST-84) #define LVN_ASYNCDRAWN (LVN_FIRST-86) #define LVN_GETEMPTYMARKUP (LVN_FIRST-87) +/* LVN_INCREMENTALSEARCH return codes */ +#define LVNSCH_DEFAULT -1 +#define LVNSCH_ERROR -2 +#define LVNSCH_IGNORE -3 + #define LVA_DEFAULT 0x0000 #define LVA_ALIGNLEFT 0x0001 #define LVA_ALIGNTOP 0x0002

1 0

Austin English : d3dxof/tests: Sign compare fix.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: 454c8ff3caa938b5d8df8c3594f813fbf46f222d URL: http://source.winehq.org/git/wine.git/?a=commit;h=454c8ff3caa938b5d8df8c359… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 8 11:44:27 2009 -0500 d3dxof/tests: Sign compare fix. --- dlls/d3dxof/tests/d3dxof.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/d3dxof/tests/d3dxof.c b/dlls/d3dxof/tests/d3dxof.c index 71dda86..aec29b0 100644 --- a/dlls/d3dxof/tests/d3dxof.c +++ b/dlls/d3dxof/tests/d3dxof.c @@ -151,10 +151,10 @@ static void process_data(LPDIRECTXFILEDATA lpDirectXFileData, int* plevel) char str_clsid_type[40]; DWORD len= 100; LPDIRECTXFILEOBJECT pChildObj; - int i,k; + int i; int j = 0; LPBYTE pData; - DWORD size; + DWORD k, size; hr = IDirectXFileData_GetId(lpDirectXFileData, &clsid); ok(hr == DXFILE_OK, "IDirectXFileData_GetId: %x\n", hr);

1 0

Austin English : hlink/tests: Sign compare fix.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: 5f9e19b4fdd916d315d9fdcd39d56d44cabd582b URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f9e19b4fdd916d315d9fdcd3… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 8 11:44:57 2009 -0500 hlink/tests: Sign compare fix. --- dlls/hlink/tests/hlink.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/hlink/tests/hlink.c b/dlls/hlink/tests/hlink.c index 5e07359..6981942 100644 --- a/dlls/hlink/tests/hlink.c +++ b/dlls/hlink/tests/hlink.c @@ -80,7 +80,7 @@ static const char *debugstr_guid(REFIID riid) static void test_HlinkIsShortcut(void) { - int i; + UINT i; HRESULT hres; static const WCHAR file0[] = {'f','i','l','e',0};

1 0

Austin English : msvcrt/tests: Sign compare fixes.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: b7b28159c97f8be9e45246cf7ea3f8731b771b37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b7b28159c97f8be9e45246cf7… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 8 11:46:08 2009 -0500 msvcrt/tests: Sign compare fixes. --- dlls/msvcrt/tests/data.c | 2 +- dlls/msvcrt/tests/heap.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/msvcrt/tests/data.c b/dlls/msvcrt/tests/data.c index 40ff46b..db29cd4 100644 --- a/dlls/msvcrt/tests/data.c +++ b/dlls/msvcrt/tests/data.c @@ -74,7 +74,7 @@ static void test_initvar( HMODULE hmsvcrt ) int* (*pp_winmajor)() = (int*(*)())GetProcAddress(hmsvcrt, "__p__winmajor"); int* (*pp_winminor)() = (int*(*)())GetProcAddress(hmsvcrt, "__p__winminor"); int* (*pp_osver)() = (int*(*)())GetProcAddress(hmsvcrt, "__p__osver"); - int winver, winmajor, winminor, osver; + unsigned int winver, winmajor, winminor, osver; if( !( pp_winmajor && pp_winminor && pp_winver)) { win_skip("_winver variables are not available\n"); diff --git a/dlls/msvcrt/tests/heap.c b/dlls/msvcrt/tests/heap.c index 6e6b544..7d3db23 100644 --- a/dlls/msvcrt/tests/heap.c +++ b/dlls/msvcrt/tests/heap.c @@ -103,7 +103,7 @@ static void test_aligned_realloc(unsigned int size1, unsigned int size2, unsigne mem1 = malloc(size1); if (mem1) { - int i; + unsigned int i; for (i = 0; i < size1; i++) ((char *)mem)[i] = i + 1; memcpy(mem1, mem, size1); @@ -138,7 +138,7 @@ static void test_aligned_realloc(unsigned int size1, unsigned int size2, unsigne ok(memcmp(mem2, mem1, min(size1, size2))==0, "_aligned_realloc(%p, %d, %d) has different data\n", mem, size2, alignment); if (memcmp(mem2, mem1, min(size1, size2)) && winetest_debug > 1) { - int i; + unsigned int i; for (i = 0; i < min(size1, size2); i++) { if (((char *)mem2)[i] != ((char *)mem1)[i]) @@ -175,7 +175,7 @@ static void test_aligned_offset_realloc(unsigned int size1, unsigned int size2, mem1 = malloc(size1); if (mem1) { - int i; + unsigned int i; for (i = 0; i < size1; i++) ((char *)mem)[i] = i + 1; memcpy(mem1, mem, size1); @@ -211,7 +211,7 @@ static void test_aligned_offset_realloc(unsigned int size1, unsigned int size2, ok(memcmp(mem2, mem1, min(size1, size2))==0, "_aligned_offset_realloc(%p, %d, %d, %d) has different data\n", mem, size2, alignment, offset); if (memcmp(mem2, mem1, min(size1, size2)) && winetest_debug > 1) { - int i; + unsigned int i; for (i = 0; i < min(size1, size2); i++) { if (((char *)mem2)[i] != ((char *)mem1)[i])

1 0

Austin English : imm32/tests: Sign compare fix.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: 49d08124a6b994d1d7fd785273029365577cabc5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=49d08124a6b994d1d7fd78527… Author: Austin English <austinenglish(a)gmail.com> Date: Fri May 8 11:45:12 2009 -0500 imm32/tests: Sign compare fix. --- dlls/imm32/tests/imm32.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/tests/imm32.c b/dlls/imm32/tests/imm32.c index 7e7f752..1951242 100644 --- a/dlls/imm32/tests/imm32.c +++ b/dlls/imm32/tests/imm32.c @@ -90,7 +90,7 @@ static void msg_spy_flush_msgs(void) { } static CWPSTRUCT* msg_spy_find_msg(UINT message) { - int i; + UINT i; msg_spy_pump_msg_queue();

1 0

Stefan Dösinger : wined3d: Merge shader_arb_add_src_param and pshader_gen_input_modifier_line.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: 48c2b0d66960790fcd781c391f0a4abe915a8f9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=48c2b0d66960790fcd781c391… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 17:42:16 2009 +0200 wined3d: Merge shader_arb_add_src_param and pshader_gen_input_modifier_line. Mostly based on the code of pshader_gen_input_modifier_line. The space-adding behavior of shader_arb_add_src_param was removed because the plurality of instruction handlers passes an uninitialized buffer in and expects a register name written to its start, and only map2gl and rcp_rsq use the space-adding stuff. I'll change rcp_rsq in a later patch anyway. I changed the name to shader_arb_get_src_param to reflect this behavior. --- dlls/wined3d/arb_program_shader.c | 103 ++++++++++++++++--------------------- 1 files changed, 44 insertions(+), 59 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=48c2b0d66960790fcd781…

1 0

Stefan Dösinger : wined3d: Get rid of the strcat in shader_arb_add_dst_param and make it shader_arb_get_dst_param .
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: 7a1f9c84f19d9b6c928f44aefcedd71efe847ba9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7a1f9c84f19d9b6c928f44aef… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 18:18:34 2009 +0200 wined3d: Get rid of the strcat in shader_arb_add_dst_param and make it shader_arb_get_dst_param. --- dlls/wined3d/arb_program_shader.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 44ee5f8..67987ba 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -567,18 +567,16 @@ static void shader_arb_get_register_name(IWineD3DBaseShader *iface, WINED3DSHADE } } -static void shader_arb_add_dst_param(const struct wined3d_shader_instruction *ins, +static void shader_arb_get_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->ctx->shader, wined3d_dst->reg.type, wined3d_dst->reg.idx, !!wined3d_dst->reg.rel_addr, register_name, &is_color); - strcat(str, register_name); + strcpy(str, register_name); shader_arb_get_write_mask(ins, wined3d_dst, write_mask); strcat(str, write_mask); @@ -1011,15 +1009,15 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) } shader_addline(buffer, "%s%s %s;\n", instruction, modifier, arguments); } else { - /* Note that shader_arb_add_dst_param() adds spaces. */ - arguments[0] = '\0'; if (ins->dst_count) { - shader_arb_add_dst_param(ins, &ins->dst[0], arguments); + char operand[100]; + shader_arb_get_dst_param(ins, &ins->dst[0], operand); + strcat(arguments, " "); + strcat(arguments, operand); for (i = 0; i < ins->src_count; ++i) { - char operand[100]; strcat(arguments, ", "); shader_arb_get_src_param(ins, &ins->src[i], i, operand); strcat(arguments, operand); @@ -1616,6 +1614,7 @@ static void vshader_hw_rsq_rcp(const struct wined3d_shader_instruction *ins) const char *instruction; char tmpLine[256]; + char dst[50]; char src[50]; switch(ins->handler_idx) @@ -1628,7 +1627,9 @@ 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 */ + shader_arb_get_dst_param(ins, &ins->dst[0], dst); /* Destination */ + strcat(tmpLine, " "); + strcat(tmpLine, dst); strcat(tmpLine, ", "); shader_arb_get_src_param(ins, &ins->src[0], 0, src); strcat(tmpLine, src);

1 0

Stefan Dösinger : wined3d: Simplify shader_hw_map2gl.
by Alexandre Julliard 11 May '09

11 May '09

Module: wine Branch: master Commit: da47f685220cd238a5ada6afb996a9fa752f9dac URL: http://source.winehq.org/git/wine.git/?a=commit;h=da47f685220cd238a5ada6afb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu May 7 18:20:59 2009 +0200 wined3d: Simplify shader_hw_map2gl. Most of the extra work done in the pixel shader code was not needed or redundant. This patch unifies the two paths. --- dlls/wined3d/arb_program_shader.c | 101 ++++++++---------------------------- 1 files changed, 23 insertions(+), 78 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 67987ba..ec4bea7 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -915,8 +915,10 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) { SHADER_BUFFER *buffer = ins->ctx->buffer; const char *instruction; - char arguments[256]; + char arguments[256], dst_str[50]; unsigned int i; + const struct wined3d_shader_dst_param *dst = &ins->dst[0]; + const char *modifier; switch (ins->handler_idx) { @@ -938,7 +940,6 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) case WINED3DSIH_MIN: instruction = "MIN"; break; case WINED3DSIH_MOV: instruction = "MOV"; break; case WINED3DSIH_MUL: instruction = "MUL"; break; - case WINED3DSIH_NOP: instruction = "NOP"; break; case WINED3DSIH_POW: instruction = "POW"; break; case WINED3DSIH_SGE: instruction = "SGE"; break; case WINED3DSIH_SLT: instruction = "SLT"; break; @@ -948,83 +949,27 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) break; } - if (shader_is_pshader_version(ins->ctx->reg_maps->shader_version.type)) - { - /* Output token related */ - const struct wined3d_shader_dst_param *dst; - char output_rname[256]; - char output_wmask[20]; - char operands[4][100]; - BOOL saturate = FALSE; - BOOL centroid = FALSE; - BOOL partialprecision = FALSE; - const char *modifier; - BOOL is_color; - DWORD shift; - - if (!(ins->dst_count + ins->src_count)) - { - ERR("Opcode \"%#x\" has no parameters\n", ins->handler_idx); - return; - } - dst = &ins->dst[0]; - - /* Process modifiers */ - if (dst->modifiers) - { - DWORD mask = dst->modifiers; - - saturate = mask & WINED3DSPDM_SATURATE; - centroid = mask & WINED3DSPDM_MSAMPCENTROID; - partialprecision = mask & WINED3DSPDM_PARTIALPRECISION; - mask &= ~(WINED3DSPDM_MSAMPCENTROID | WINED3DSPDM_PARTIALPRECISION | WINED3DSPDM_SATURATE); - if (mask) - FIXME("Unrecognized modifier(%#x)\n", mask); - - if (centroid) - FIXME("Unhandled modifier(%#x)\n", mask); - } - shift = dst->shift; - modifier = (saturate && !shift) ? "_SAT" : ""; - - /* Generate input register names (with modifiers) */ - for (i = 0; i < ins->src_count; ++i) - { - shader_arb_get_src_param(ins, &ins->src[i], i, operands[i + 1]); - } + /* All instructions handled by this function have a destination parameter */ + if(dst->modifiers & WINED3DSPDM_SATURATE) modifier = "_SAT"; + else modifier = ""; - /* Handle output register */ - shader_arb_get_register_name(ins->ctx->shader, dst->reg.type, - dst->reg.idx, !!dst->reg.rel_addr, output_rname, &is_color); - strcpy(operands[0], output_rname); - shader_arb_get_write_mask(ins, dst, output_wmask); - strcat(operands[0], output_wmask); - - arguments[0] = '\0'; - strcat(arguments, operands[0]); - for (i = 0; i < ins->src_count; ++i) - { - strcat(arguments, ", "); - strcat(arguments, operands[i + 1]); - } - shader_addline(buffer, "%s%s %s;\n", instruction, modifier, arguments); - } else { - arguments[0] = '\0'; - if (ins->dst_count) - { - char operand[100]; - shader_arb_get_dst_param(ins, &ins->dst[0], operand); - strcat(arguments, " "); - strcat(arguments, operand); - for (i = 0; i < ins->src_count; ++i) - { - strcat(arguments, ", "); - shader_arb_get_src_param(ins, &ins->src[i], i, operand); - strcat(arguments, operand); - } - } - shader_addline(buffer, "%s%s;\n", instruction, arguments); + /* Note that shader_arb_add_dst_param() adds spaces. */ + arguments[0] = '\0'; + shader_arb_get_dst_param(ins, dst, dst_str); + for (i = 0; i < ins->src_count; ++i) + { + char operand[100]; + strcat(arguments, ", "); + shader_arb_get_src_param(ins, &ins->src[i], i, operand); + strcat(arguments, operand); } + shader_addline(buffer, "%s%s %s%s;\n", instruction, modifier, dst_str, arguments); +} + +static void shader_hw_nop(const struct wined3d_shader_instruction *ins) +{ + SHADER_BUFFER *buffer = ins->ctx->buffer; + shader_addline(buffer, "NOP;\n"); } static void shader_hw_mov(const struct wined3d_shader_instruction *ins) @@ -2275,7 +2220,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_MOV */ shader_hw_mov, /* WINED3DSIH_MOVA */ shader_hw_mov, /* WINED3DSIH_MUL */ shader_hw_map2gl, - /* WINED3DSIH_NOP */ shader_hw_map2gl, + /* WINED3DSIH_NOP */ shader_hw_nop, /* WINED3DSIH_NRM */ shader_hw_nrm, /* WINED3DSIH_PHASE */ NULL, /* WINED3DSIH_POW */ shader_hw_map2gl,

1 0