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

Nikolay Sivov : comctl32/updown: Don't pass VK_[UP|DOWN] to original Up/ Don control buddy's winproc.
by Alexandre Julliard 03 Apr '09

03 Apr '09

Module: wine Branch: master Commit: d7439c0b75ac928a4bfe1fd467fe2bfc86d60d1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7439c0b75ac928a4bfe1fd46… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 2 17:20:50 2009 -0400 comctl32/updown: Don't pass VK_[UP|DOWN] to original Up/Don control buddy's winproc. --- dlls/comctl32/updown.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/updown.c b/dlls/comctl32/updown.c index abe5f95..d0bc27c 100644 --- a/dlls/comctl32/updown.c +++ b/dlls/comctl32/updown.c @@ -507,6 +507,7 @@ UPDOWN_Buddy_SubclassProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam) HWND upDownHwnd = GetPropW(hwnd, BUDDY_UPDOWN_HWND); UPDOWN_KeyPressed(UPDOWN_GetInfoPtr(upDownHwnd), (int)wParam); + if ((wParam == VK_UP) || (wParam == VK_DOWN)) return 0; } else if (uMsg == WM_MOUSEWHEEL) { HWND upDownHwnd = GetPropW(hwnd, BUDDY_UPDOWN_HWND);

1 0

Rein Klazes : user32: In COMBO_WindowPosChanging() do not change the height of the the dropped rectangle, if the new height is too small.
by Alexandre Julliard 03 Apr '09

03 Apr '09

Module: wine Branch: master Commit: 8ac8957a36b559014f71e78d79394f613b9d2aed URL: http://source.winehq.org/git/wine.git/?a=commit;h=8ac8957a36b559014f71e78d7… Author: Rein Klazes <wijn(a)online.nl> Date: Fri Apr 3 07:49:34 2009 +0200 user32: In COMBO_WindowPosChanging() do not change the height of the the dropped rectangle, if the new height is too small. --- dlls/user32/combo.c | 6 +++--- dlls/user32/tests/combo.c | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+), 3 deletions(-) diff --git a/dlls/user32/combo.c b/dlls/user32/combo.c index 6e74154..7fd5d9e 100644 --- a/dlls/user32/combo.c +++ b/dlls/user32/combo.c @@ -482,20 +482,20 @@ static LRESULT COMBO_WindowPosChanging( /* * Resizing a combobox has another side effect, it resizes the dropped * rectangle as well. However, it does it only if the new height for the - * combobox is different from the height it should have. In other words, + * combobox is more than the height it should have. In other words, * if the application resizing the combobox only had the intention to resize * the actual control, for example, to do the layout of a dialog that is * resized, the height of the dropdown is not changed. */ - if (posChanging->cy != newComboHeight) + if (posChanging->cy > newComboHeight) { TRACE("posChanging->cy=%d, newComboHeight=%d, oldbot=%d, oldtop=%d\n", posChanging->cy, newComboHeight, lphc->droppedRect.bottom, lphc->droppedRect.top); lphc->droppedRect.bottom = lphc->droppedRect.top + posChanging->cy - newComboHeight; - posChanging->cy = newComboHeight; } + posChanging->cy = newComboHeight; } return 0; diff --git a/dlls/user32/tests/combo.c b/dlls/user32/tests/combo.c index cc55864..bf2f5c7 100644 --- a/dlls/user32/tests/combo.c +++ b/dlls/user32/tests/combo.c @@ -355,6 +355,48 @@ static void test_WM_LBUTTONDOWN(void) DestroyWindow(hCombo); } +static void test_changesize( DWORD style) +{ + HWND hCombo = build_combo(style); + RECT rc; + INT ddheight, clheight, ddwidth, clwidth; + /* get initial measurements */ + GetClientRect( hCombo, &rc); + clheight = rc.bottom - rc.top; + clwidth = rc.right - rc.left; + SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&rc); + ddheight = rc.bottom - rc.top; + ddwidth = rc.right - rc.left; + /* use MoveWindow to move & resize the combo */ + /* first make it slightly smaller */ + MoveWindow( hCombo, 10, 10, clwidth - 2, clheight - 2, TRUE); + GetClientRect( hCombo, &rc); + ok( rc.right - rc.left == clwidth - 2, "clientrect witdh is %d vs %d\n", + rc.right - rc.left, clwidth - 2); + ok( rc.bottom - rc.top == clheight, "clientrect height is %d vs %d\n", + rc.bottom - rc.top, clheight); + SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&rc); + ok( rc.right - rc.left == clwidth - 2, "drop-down rect witdh is %d vs %d\n", + rc.right - rc.left, clwidth - 2); + ok( rc.bottom - rc.top == ddheight, "drop-down rect height is %d vs %d\n", + rc.bottom - rc.top, ddheight); + /* new cx, cy is slightly bigger then the initial values */ + MoveWindow( hCombo, 10, 10, clwidth + 2, clheight + 2, TRUE); + GetClientRect( hCombo, &rc); + ok( rc.right - rc.left == clwidth + 2, "clientrect witdh is %d vs %d\n", + rc.right - rc.left, clwidth + 2); + ok( rc.bottom - rc.top == clheight, "clientrect height is %d vs %d\n", + rc.bottom - rc.top, clheight); + SendMessageA(hCombo, CB_GETDROPPEDCONTROLRECT, 0, (LPARAM)&rc); + ok( rc.right - rc.left == clwidth + 2, "drop-down rect witdh is %d vs %d\n", + rc.right - rc.left, clwidth + 2); + todo_wine { + ok( rc.bottom - rc.top == clheight + 2, "drop-down rect height is %d vs %d\n", + rc.bottom - rc.top, clheight + 2); + } + DestroyWindow(hCombo); +} + START_TEST(combo) { hMainWnd = CreateWindow("static", "Test", WS_OVERLAPPEDWINDOW, 10, 10, 300, 300, NULL, NULL, NULL, 0); @@ -366,6 +408,8 @@ START_TEST(combo) test_setitemheight(CBS_DROPDOWNLIST); test_CBN_SELCHANGE(); test_WM_LBUTTONDOWN(); + test_changesize(CBS_DROPDOWN); + test_changesize(CBS_DROPDOWNLIST); DestroyWindow(hMainWnd); }

1 0

Henri Verbeet : wined3d: Use the source and destination parameter count in the ARB shader backend.
by Alexandre Julliard 03 Apr '09

03 Apr '09

Module: wine Branch: master Commit: 29c9dc989d4c88f79a452f357b13e90d0cbb1fcd URL: http://source.winehq.org/git/wine.git/?a=commit;h=29c9dc989d4c88f79a452f357… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 3 10:36:38 2009 +0200 wined3d: Use the source and destination parameter count in the ARB shader backend. --- dlls/wined3d/arb_program_shader.c | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index a30041e..bcf753a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -899,7 +899,6 @@ static void pshader_hw_dp2add(const struct wined3d_shader_instruction *ins) /* Map the opcode 1-to-1 to the GL code */ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) { - CONST SHADER_OPCODE *curOpcode = ins->opcode; SHADER_BUFFER *buffer = ins->buffer; DWORD dst = ins->dst; const DWORD *src = ins->src; @@ -949,9 +948,9 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) const char *modifier; DWORD shift; - if (!curOpcode->num_params) + if (!(ins->dst_count + ins->src_count)) { - ERR("Opcode \"%s\" has no parameters\n", curOpcode->name); + ERR("Opcode \"%#x\" has no parameters\n", ins->handler_idx); return; } @@ -974,8 +973,10 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) modifier = (saturate && !shift) ? "_SAT" : ""; /* Generate input register names (with modifiers) */ - for (i = 1; i < curOpcode->num_params; ++i) - pshader_gen_input_modifier_line(ins->shader, buffer, src[i-1], i-1, operands[i]); + for (i = 0; i < ins->src_count; ++i) + { + pshader_gen_input_modifier_line(ins->shader, buffer, src[i], i, operands[i + 1]); + } /* Handle output register */ pshader_get_register_name(ins->shader, dst, output_rname); @@ -985,10 +986,10 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) arguments[0] = '\0'; strcat(arguments, operands[0]); - for (i = 1; i < curOpcode->num_params; i++) + for (i = 0; i < ins->src_count; ++i) { strcat(arguments, ", "); - strcat(arguments, operands[i]); + strcat(arguments, operands[i + 1]); } shader_addline(buffer, "%s%s %s;\n", instruction, modifier, arguments); @@ -998,13 +999,13 @@ static void shader_hw_map2gl(const struct wined3d_shader_instruction *ins) /* Note that vshader_program_add_param() adds spaces. */ arguments[0] = '\0'; - if (curOpcode->num_params > 0) + if (ins->dst_count) { vshader_program_add_param(ins, dst, FALSE, arguments); - for (i = 1; i < curOpcode->num_params; ++i) + for (i = 0; i < ins->src_count; ++i) { strcat(arguments, ","); - vshader_program_add_param(ins, src[i-1], TRUE, arguments); + vshader_program_add_param(ins, src[i], TRUE, arguments); } } shader_addline(buffer, "%s%s;\n", instruction, arguments);

1 0

Henri Verbeet : wined3d: Remove the opcode field from struct wined3d_shader_instruction.
by Alexandre Julliard 03 Apr '09

03 Apr '09

Module: wine Branch: master Commit: 04b2e0b19baa50a133aa1a13fbe158440977a088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=04b2e0b19baa50a133aa1a13f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 3 10:36:38 2009 +0200 wined3d: Remove the opcode field from struct wined3d_shader_instruction. --- dlls/wined3d/arb_program_shader.c | 19 ++++++++----------- dlls/wined3d/baseshader.c | 2 -- dlls/wined3d/glsl_shader.c | 18 +++++++----------- dlls/wined3d/wined3d_private.h | 1 - 4 files changed, 15 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index bcf753a..f32213c 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1541,9 +1541,6 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) int i; int nComponents = 0; struct wined3d_shader_instruction tmp_ins; - IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)ins->shader; - const SHADER_OPCODE *opcode_table = shader->baseShader.shader_ins; - DWORD shader_version = ins->reg_maps->shader_version; memset(&tmp_ins, 0, sizeof(tmp_ins)); @@ -1554,36 +1551,36 @@ static void shader_hw_mnxn(const struct wined3d_shader_instruction *ins) tmp_ins.src_addr[0] = ins->src_addr[0]; tmp_ins.src_addr[1] = ins->src_addr[1]; tmp_ins.reg_maps = ins->reg_maps; + tmp_ins.dst_count = 1; + tmp_ins.src_count = 2; switch(ins->handler_idx) { case WINED3DSIH_M4x4: nComponents = 4; - tmp_ins.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP4); + tmp_ins.handler_idx = WINED3DSIH_DP4; break; case WINED3DSIH_M4x3: nComponents = 3; - tmp_ins.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP4); + tmp_ins.handler_idx = WINED3DSIH_DP4; break; case WINED3DSIH_M3x4: nComponents = 4; - tmp_ins.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP3); + tmp_ins.handler_idx = WINED3DSIH_DP3; break; case WINED3DSIH_M3x3: nComponents = 3; - tmp_ins.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP3); + tmp_ins.handler_idx = WINED3DSIH_DP3; break; case WINED3DSIH_M3x2: nComponents = 2; - tmp_ins.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP3); + tmp_ins.handler_idx = WINED3DSIH_DP3; break; default: + FIXME("Unhandled opcode %#x\n", ins->handler_idx); break; } - tmp_ins.handler_idx = tmp_ins.opcode->handler_idx; - tmp_ins.dst_count = tmp_ins.opcode->dst_token ? 1 : 0; - tmp_ins.src_count = tmp_ins.opcode->num_params - tmp_ins.dst_count; for (i = 0; i < nComponents; i++) { tmp_ins.dst = ((ins->dst) & ~WINED3DSP_WRITEMASK_ALL)|(WINED3DSP_WRITEMASK_0<<i); tmp_ins.src[1] = ins->src[1]+i; diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index 71c5420..04626a9 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -838,8 +838,6 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, continue; } - ins.opcode = curOpcode; - ins.handler_idx = curOpcode->handler_idx; ins.flags = opcode_token & WINED3D_OPCODESPECIFICCONTROL_MASK; ins.coissue = opcode_token & WINED3DSI_COISSUE; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 72c07ea..2fcd37f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2032,9 +2032,6 @@ static void shader_glsl_mad(const struct wined3d_shader_instruction *ins) Vertex shaders to GLSL codes */ static void shader_glsl_mnxn(const struct wined3d_shader_instruction *ins) { - IWineD3DBaseShaderImpl *shader = (IWineD3DBaseShaderImpl *)ins->shader; - const SHADER_OPCODE *opcode_table = shader->baseShader.shader_ins; - DWORD shader_version = ins->reg_maps->shader_version; int i; int nComponents = 0; struct wined3d_shader_instruction tmp_ins; @@ -2048,36 +2045,35 @@ static void shader_glsl_mnxn(const struct wined3d_shader_instruction *ins) tmp_ins.src_addr[0] = ins->src_addr[0]; tmp_ins.src_addr[1] = ins->src_addr[1]; tmp_ins.reg_maps = ins->reg_maps; + tmp_ins.dst_count = 1; + tmp_ins.src_count = 2; switch(ins->handler_idx) { case WINED3DSIH_M4x4: nComponents = 4; - tmp_ins.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP4); + tmp_ins.handler_idx = WINED3DSIH_DP4; break; case WINED3DSIH_M4x3: nComponents = 3; - tmp_ins.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP4); + tmp_ins.handler_idx = WINED3DSIH_DP4; break; case WINED3DSIH_M3x4: nComponents = 4; - tmp_ins.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP3); + tmp_ins.handler_idx = WINED3DSIH_DP3; break; case WINED3DSIH_M3x3: nComponents = 3; - tmp_ins.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP3); + tmp_ins.handler_idx = WINED3DSIH_DP3; break; case WINED3DSIH_M3x2: nComponents = 2; - tmp_ins.opcode = shader_get_opcode(opcode_table, shader_version, WINED3DSIO_DP3); + tmp_ins.handler_idx = WINED3DSIH_DP3; break; default: break; } - tmp_ins.handler_idx = tmp_ins.opcode->handler_idx; - tmp_ins.dst_count = tmp_ins.opcode->dst_token ? 1 : 0; - tmp_ins.src_count = tmp_ins.opcode->num_params - tmp_ins.dst_count; for (i = 0; i < nComponents; ++i) { tmp_ins.dst = ((ins->dst) & ~WINED3DSP_WRITEMASK_ALL) | (WINED3DSP_WRITEMASK_0 << i); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index fe71327..425b049 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -454,7 +454,6 @@ struct wined3d_shader_instruction { IWineD3DBaseShader *shader; const shader_reg_maps *reg_maps; - CONST SHADER_OPCODE *opcode; enum WINED3D_SHADER_INSTRUCTION_HANDLER handler_idx; DWORD flags; BOOL coissue;

1 0

Henri Verbeet : wined3d: Add a struct wined3d_shader_dst_param for storing destination parameter information .
by Alexandre Julliard 03 Apr '09

03 Apr '09

Module: wine Branch: master Commit: 7245cd2b814b9bb86e210341afec6ad1ee1e2a3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=7245cd2b814b9bb86e210341a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 3 10:36:38 2009 +0200 wined3d: Add a struct wined3d_shader_dst_param for storing destination parameter information. --- dlls/wined3d/arb_program_shader.c | 104 +++++++++++++++++---------------- dlls/wined3d/baseshader.c | 8 +- dlls/wined3d/glsl_shader.c | 118 ++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 9 ++- 4 files changed, 128 insertions(+), 111 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7245cd2b814b9bb86e210…

1 0

Henri Verbeet : wined3d: Store the register index in struct wined3d_shader_dst_param.
by Alexandre Julliard 03 Apr '09

03 Apr '09

Module: wine Branch: master Commit: 7b621655468f366a66c58aa1b007704a389b75e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7b621655468f366a66c58aa1b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 3 10:36:39 2009 +0200 wined3d: Store the register index in struct wined3d_shader_dst_param. --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/baseshader.c | 1 + dlls/wined3d/glsl_shader.c | 37 +++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 22 insertions(+), 18 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7b621655468f366a66c58…

1 0

Henri Verbeet : wined3d: Use register_idx in the ARB shader backend.
by Alexandre Julliard 03 Apr '09

03 Apr '09

Module: wine Branch: master Commit: 6660978b444a96910549778252d3fdfed20a7b70 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6660978b444a9691054977825… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Apr 3 10:36:39 2009 +0200 wined3d: Use register_idx in the ARB shader backend. --- dlls/wined3d/arb_program_shader.c | 36 ++++++++++++++++++------------------ 1 files changed, 18 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 13f5341..bca567d 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -775,7 +775,7 @@ static void pshader_hw_bem(const struct wined3d_shader_instruction *ins) char dst_name[50]; char src_name[2][50]; char dst_wmask[20]; - DWORD sampler_code = ins->dst[0].token & WINED3DSP_REGNUM_MASK; + DWORD sampler_code = ins->dst[0].register_idx; BOOL has_bumpmat = FALSE; int i; @@ -1101,7 +1101,7 @@ static void pshader_hw_tex(const struct wined3d_shader_instruction *ins) DWORD reg_sampler_code; /* All versions have a destination register */ - reg_dest_code = dst & WINED3DSP_REGNUM_MASK; + reg_dest_code = ins->dst[0].register_idx; pshader_get_register_name(ins->shader, dst, reg_dest); /* 1.0-1.3: Use destination register as coordinate source. @@ -1157,10 +1157,10 @@ static void pshader_hw_texcoord(const struct wined3d_shader_instruction *ins) shader_arb_get_write_mask(ins, dst, tmp); if (ins->reg_maps->shader_version != WINED3DPS_VERSION(1,4)) { - DWORD reg = dst & WINED3DSP_REGNUM_MASK; + DWORD reg = ins->dst[0].register_idx; shader_addline(buffer, "MOV_SAT T%u%s, fragment.texcoord[%u];\n", reg, tmp, reg); } else { - DWORD reg1 = dst & WINED3DSP_REGNUM_MASK; + DWORD reg1 = ins->dst[0].register_idx; char reg_src[40]; pshader_gen_input_modifier_line(ins->shader, buffer, ins->src[0], 0, reg_src); @@ -1175,7 +1175,7 @@ static void pshader_hw_texreg2ar(const struct wined3d_shader_instruction *ins) IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; DWORD flags; - DWORD reg1 = ins->dst[0].token & WINED3DSP_REGNUM_MASK; + DWORD reg1 = ins->dst[0].register_idx; char dst_str[8]; char src_str[50]; @@ -1191,7 +1191,7 @@ static void pshader_hw_texreg2gb(const struct wined3d_shader_instruction *ins) { SHADER_BUFFER *buffer = ins->buffer; - DWORD reg1 = ins->dst[0].token & WINED3DSP_REGNUM_MASK; + DWORD reg1 = ins->dst[0].register_idx; char dst_str[8]; char src_str[50]; @@ -1205,7 +1205,7 @@ static void pshader_hw_texreg2gb(const struct wined3d_shader_instruction *ins) static void pshader_hw_texreg2rgb(const struct wined3d_shader_instruction *ins) { SHADER_BUFFER *buffer = ins->buffer; - DWORD reg1 = ins->dst[0].token & WINED3DSP_REGNUM_MASK; + DWORD reg1 = ins->dst[0].register_idx; char dst_str[8]; char src_str[50]; @@ -1229,7 +1229,7 @@ static void pshader_hw_texbem(const struct wined3d_shader_instruction *ins) DWORD reg_dest_code; /* All versions have a destination register */ - reg_dest_code = dst & WINED3DSP_REGNUM_MASK; + reg_dest_code = ins->dst[0].register_idx; /* Can directly use the name because texbem is only valid for <= 1.3 shaders */ pshader_get_register_name(ins->shader, dst, reg_coord); @@ -1293,7 +1293,7 @@ static void pshader_hw_texbem(const struct wined3d_shader_instruction *ins) static void pshader_hw_texm3x2pad(const struct wined3d_shader_instruction *ins) { - DWORD reg = ins->dst[0].token & WINED3DSP_REGNUM_MASK; + DWORD reg = ins->dst[0].register_idx; SHADER_BUFFER *buffer = ins->buffer; char src0_name[50]; @@ -1306,7 +1306,7 @@ static void pshader_hw_texm3x2tex(const struct wined3d_shader_instruction *ins) IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)ins->shader; IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; DWORD flags; - DWORD reg = ins->dst[0].token & WINED3DSP_REGNUM_MASK; + DWORD reg = ins->dst[0].register_idx; SHADER_BUFFER *buffer = ins->buffer; char dst_str[8]; char src0_name[50]; @@ -1321,7 +1321,7 @@ static void pshader_hw_texm3x2tex(const struct wined3d_shader_instruction *ins) static void pshader_hw_texm3x3pad(const struct wined3d_shader_instruction *ins) { IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)ins->shader; - DWORD reg = ins->dst[0].token & WINED3DSP_REGNUM_MASK; + DWORD reg = ins->dst[0].register_idx; SHADER_BUFFER *buffer = ins->buffer; SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; char src0_name[50]; @@ -1336,7 +1336,7 @@ static void pshader_hw_texm3x3tex(const struct wined3d_shader_instruction *ins) IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)ins->shader; IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; DWORD flags; - DWORD reg = ins->dst[0].token & WINED3DSP_REGNUM_MASK; + DWORD reg = ins->dst[0].register_idx; SHADER_BUFFER *buffer = ins->buffer; SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; char dst_str[8]; @@ -1357,7 +1357,7 @@ static void pshader_hw_texm3x3vspec(const struct wined3d_shader_instruction *ins IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)ins->shader; IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; DWORD flags; - DWORD reg = ins->dst[0].token & WINED3DSP_REGNUM_MASK; + DWORD reg = ins->dst[0].register_idx; SHADER_BUFFER *buffer = ins->buffer; SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; char dst_str[8]; @@ -1393,7 +1393,7 @@ static void pshader_hw_texm3x3spec(const struct wined3d_shader_instruction *ins) IWineD3DPixelShaderImpl *This = (IWineD3DPixelShaderImpl *)ins->shader; IWineD3DDeviceImpl* deviceImpl = (IWineD3DDeviceImpl*) This->baseShader.device; DWORD flags; - DWORD reg = ins->dst[0].token & WINED3DSP_REGNUM_MASK; + DWORD reg = ins->dst[0].register_idx; DWORD reg3 = ins->src[1] & WINED3DSP_REGNUM_MASK; SHADER_PARSE_STATE* current_state = &This->baseShader.parse_state; SHADER_BUFFER *buffer = ins->buffer; @@ -1458,7 +1458,7 @@ static void pshader_hw_texdepth(const struct wined3d_shader_instruction *ins) static void pshader_hw_texdp3tex(const struct wined3d_shader_instruction *ins) { SHADER_BUFFER *buffer = ins->buffer; - DWORD sampler_idx = ins->dst[0].token & WINED3DSP_REGNUM_MASK; + DWORD sampler_idx = ins->dst[0].register_idx; char src0[50]; char dst_str[8]; @@ -1477,7 +1477,7 @@ static void pshader_hw_texdp3(const struct wined3d_shader_instruction *ins) char src0[50]; char dst_str[50]; char dst_mask[6]; - DWORD dstreg = ins->dst[0].token & WINED3DSP_REGNUM_MASK; + DWORD dstreg = ins->dst[0].register_idx; SHADER_BUFFER *buffer = ins->buffer; /* Handle output register */ @@ -1498,7 +1498,7 @@ static void pshader_hw_texm3x3(const struct wined3d_shader_instruction *ins) char dst_str[50]; char dst_mask[6]; char src0[50]; - DWORD dst_reg = ins->dst[0].token & WINED3DSP_REGNUM_MASK; + DWORD dst_reg = ins->dst[0].register_idx; pshader_get_register_name(ins->shader, ins->dst[0].token, dst_str); shader_arb_get_write_mask(ins, ins->dst[0].token, dst_mask); @@ -1518,7 +1518,7 @@ static void pshader_hw_texm3x3(const struct wined3d_shader_instruction *ins) static void pshader_hw_texm3x2depth(const struct wined3d_shader_instruction *ins) { SHADER_BUFFER *buffer = ins->buffer; - DWORD dst_reg = ins->dst[0].token & WINED3DSP_REGNUM_MASK; + DWORD dst_reg = ins->dst[0].register_idx; char src0[50]; pshader_gen_input_modifier_line(ins->shader, buffer, ins->src[0], 0, src0);

1 0

Paul Vriens : advapi32/tests: Fix test failures on W2K.
by Alexandre Julliard 03 Apr '09

03 Apr '09

Module: wine Branch: master Commit: 8955d7c2336c6bbaa079511cbdf3aa71beb072b6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8955d7c2336c6bbaa079511cb… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Fri Apr 3 10:55:50 2009 +0200 advapi32/tests: Fix test failures on W2K. --- dlls/advapi32/tests/security.c | 24 ++++++++++++++++-------- 1 files changed, 16 insertions(+), 8 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index f264fd8..544b217 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -1684,7 +1684,7 @@ static void test_LookupAccountSid(void) } } -static void get_sid_info(PSID psid, LPSTR *user, LPSTR *dom) +static BOOL get_sid_info(PSID psid, LPSTR *user, LPSTR *dom) { static CHAR account[UNLEN + 1]; static CHAR domain[UNLEN + 1]; @@ -1697,7 +1697,8 @@ static void get_sid_info(PSID psid, LPSTR *user, LPSTR *dom) size = dom_size = UNLEN + 1; account[0] = '\0'; domain[0] = '\0'; - LookupAccountSidA(NULL, psid, account, &size, domain, &dom_size, &use); + SetLastError(0xdeadbeef); + return LookupAccountSidA(NULL, psid, account, &size, domain, &dom_size, &use); } static void check_wellknown_name(const char* name, WELL_KNOWN_SID_TYPE result) @@ -1711,7 +1712,7 @@ static void check_wellknown_name(const char* name, WELL_KNOWN_SID_TYPE result) SID_NAME_USE sid_use; LPSTR domain, account, sid_domain, wk_domain, wk_account; PSID psid; - BOOL ret; + BOOL ret ,ret2; sid_size = 0; domain_size = 0; @@ -1723,19 +1724,25 @@ static void check_wellknown_name(const char* name, WELL_KNOWN_SID_TYPE result) if (!result) { ok(!ret, " %s Should have failed to lookup account name\n",name); - return; + goto cleanup; } AllocateAndInitializeSid(&ident, 6, SECURITY_NT_NON_UNIQUE, 12, 23, 34, 45, 56, 0, 0, &domainsid); cb = sizeof(wk_sid); if (!pCreateWellKnownSid(result, domainsid, wk_sid, &cb)) { - win_skip("SID %i is not avalable on the system\n",result); - return; + win_skip("SID %i is not available on the system\n",result); + goto cleanup; + } + + ret2 = get_sid_info(wk_sid, &wk_account, &wk_domain); + if (!ret2 && GetLastError() == ERROR_NONE_MAPPED) + { + win_skip("CreateWellKnownSid() succeeded but the account '%s' is not present (W2K)\n", name); + goto cleanup; } get_sid_info(psid, &account, &sid_domain); - get_sid_info(wk_sid, &wk_account, &wk_domain); ok(ret, "Failed to lookup account name %s\n",name); ok(sid_size != 0, "sid_size was zero\n"); @@ -1746,6 +1753,7 @@ static void check_wellknown_name(const char* name, WELL_KNOWN_SID_TYPE result) ok(!lstrcmp(domain, wk_domain), "Expected %s, got %s\n", wk_domain, domain); ok(sid_use == SidTypeWellKnownGroup , "Expected Use (5), got %d\n", sid_use); +cleanup: HeapFree(GetProcessHeap(),0,psid); HeapFree(GetProcessHeap(),0,domain); } @@ -1958,7 +1966,7 @@ static void test_LookupAccountName(void) if (PRIMARYLANGID(LANGIDFROMLCID(GetThreadLocale())) != LANG_ENGLISH) { - skip("Non-english locale (skipping well know name creation tests)\n"); + skip("Non-english locale (skipping well known name creation tests)\n"); return; }

1 0

Rein Klazes : user32: Fix for the ending of menu tracking in the default handler of WM_CANCELMODE message with test .
by Alexandre Julliard 03 Apr '09

03 Apr '09

Module: wine Branch: master Commit: e861d8be43c180c438b54a684f160cd32258dd92 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e861d8be43c180c438b54a684… Author: Rein Klazes <wijn(a)online.nl> Date: Thu Apr 2 11:37:11 2009 +0200 user32: Fix for the ending of menu tracking in the default handler of WM_CANCELMODE message with test. --- dlls/user32/controls.h | 1 + dlls/user32/defwnd.c | 2 +- dlls/user32/menu.c | 32 +++++++++++++++-- dlls/user32/tests/menu.c | 86 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 116 insertions(+), 5 deletions(-) diff --git a/dlls/user32/controls.h b/dlls/user32/controls.h index 974cf5b..f51a3d9 100644 --- a/dlls/user32/controls.h +++ b/dlls/user32/controls.h @@ -88,6 +88,7 @@ extern void MENU_TrackKbdMenuBar( HWND hwnd, UINT wParam, WCHAR wChar ) DECLSPEC extern UINT MENU_DrawMenuBar( HDC hDC, LPRECT lprect, HWND hwnd, BOOL suppress_draw ) DECLSPEC_HIDDEN; extern UINT MENU_FindSubMenu( HMENU *hmenu, HMENU hSubTarget ) DECLSPEC_HIDDEN; +extern void MENU_EndMenu(HWND) DECLSPEC_HIDDEN; /* nonclient area */ extern LRESULT NC_HandleNCPaint( HWND hwnd , HRGN clip) DECLSPEC_HIDDEN; diff --git a/dlls/user32/defwnd.c b/dlls/user32/defwnd.c index 38d8def..e3ec37c 100644 --- a/dlls/user32/defwnd.c +++ b/dlls/user32/defwnd.c @@ -618,7 +618,7 @@ static LRESULT DEFWND_DefWinProc( HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa case WM_CANCELMODE: iMenuSysKey = 0; - if (!(GetWindowLongW( hwnd, GWL_STYLE ) & WS_CHILD)) EndMenu(); + MENU_EndMenu( hwnd ); if (GetCapture() == hwnd) ReleaseCapture(); break; diff --git a/dlls/user32/menu.c b/dlls/user32/menu.c index ff6af76..ab473ea 100644 --- a/dlls/user32/menu.c +++ b/dlls/user32/menu.c @@ -176,6 +176,7 @@ static UINT ODitemheight; /* default owner drawn item height */ /* Use global popup window because there's no way 2 menus can * be tracked at the same time. */ static HWND top_popup; +static HMENU top_popup_hmenu; /* Flag set by EndMenu() to force an exit from menu tracking */ static BOOL fEndMenu = FALSE; @@ -1884,8 +1885,10 @@ static BOOL MENU_ShowPopup( HWND hwndOwner, HMENU hmenu, UINT id, UINT flags, hwndOwner, 0, (HINSTANCE)GetWindowLongPtrW(hwndOwner, GWLP_HINSTANCE), (LPVOID)hmenu ); if( !menu->hWnd ) return FALSE; - if (!top_popup) top_popup = menu->hWnd; - + if (!top_popup) { + top_popup = menu->hWnd; + top_popup_hmenu = hmenu; + } /* Display the window */ SetWindowPos( menu->hWnd, HWND_TOPMOST, 0, 0, 0, 0, @@ -1953,7 +1956,10 @@ static void MENU_SelectItem( HWND hwndOwner, HMENU hmenu, UINT wIndex, if (lppop->FocusedItem == wIndex) return; if (lppop->wFlags & MF_POPUP) hdc = GetDC( lppop->hWnd ); else hdc = GetDCEx( lppop->hWnd, 0, DCX_CACHE | DCX_WINDOW); - if (!top_popup) top_popup = lppop->hWnd; + if (!top_popup) { + top_popup = lppop->hWnd; + top_popup_hmenu = hmenu; + } SelectObject( hdc, get_menu_font(FALSE)); @@ -2462,6 +2468,20 @@ HWND MENU_IsMenuActive(void) return top_popup; } +/********************************************************************** + * MENU_EndMenu + * + * Calls EndMenu() if the hwnd parameter belongs to the menu owner + * + * Does the (menu stuff) of the default window handling of WM_CANCELMODE + */ +void MENU_EndMenu( HWND hwnd ) +{ + POPUPMENU *menu; + menu = top_popup_hmenu ? MENU_GetMenu( top_popup_hmenu ) : NULL; + if (menu && hwnd == menu->hwndOwner) EndMenu(); +} + /*********************************************************************** * MENU_PtMenu * @@ -3363,6 +3383,7 @@ static BOOL MENU_ExitTracking(HWND hWnd) SendMessageW( hWnd, WM_EXITMENULOOP, 0, 0 ); ShowCaret(0); top_popup = 0; + top_popup_hmenu = NULL; return TRUE; } @@ -3530,7 +3551,10 @@ static LRESULT WINAPI PopupMenuWndProc( HWND hwnd, UINT message, WPARAM wParam, case WM_DESTROY: /* zero out global pointer in case resident popup window was destroyed. */ - if (hwnd == top_popup) top_popup = 0; + if (hwnd == top_popup) { + top_popup = 0; + top_popup_hmenu = NULL; + } break; case WM_SHOWWINDOW: diff --git a/dlls/user32/tests/menu.c b/dlls/user32/tests/menu.c index f375123..169c223 100644 --- a/dlls/user32/tests/menu.c +++ b/dlls/user32/tests/menu.c @@ -40,6 +40,7 @@ static ATOM atomMenuCheckClass; static BOOL (WINAPI *pGetMenuInfo)(HMENU,LPCMENUINFO); static UINT (WINAPI *pSendInput)(UINT, INPUT*, size_t); static BOOL (WINAPI *pSetMenuInfo)(HMENU,LPCMENUINFO); +static BOOL (WINAPI *pEndMenu) (void); static void init_function_pointers(void) { @@ -53,6 +54,7 @@ static void init_function_pointers(void) GET_PROC(GetMenuInfo) GET_PROC(SendInput) GET_PROC(SetMenuInfo) + GET_PROC(EndMenu) #undef GET_PROC } @@ -2847,6 +2849,89 @@ static void test_menu_trackpopupmenu(void) DestroyWindow(hwnd); } +/* test handling of WM_CANCELMODE messages */ +static int g_got_enteridle; +static HWND g_hwndtosend; +static LRESULT WINAPI menu_cancelmode_wnd_proc(HWND hwnd, UINT msg, + WPARAM wparam, LPARAM lparam) +{ + switch (msg) + { + case WM_ENTERMENULOOP: + g_got_enteridle = 0; + return SendMessage( g_hwndtosend, WM_CANCELMODE, 0, 0); + case WM_ENTERIDLE: + { + if( g_got_enteridle++ == 0) { + /* little hack to get another WM_ENTERIDLE message */ + PostMessage( hwnd, WM_MOUSEMOVE, 0, 0); + return SendMessage( g_hwndtosend, WM_CANCELMODE, 0, 0); + } + pEndMenu(); + return TRUE; + } + } + return DefWindowProc( hwnd, msg, wparam, lparam); +} + +static void test_menu_cancelmode(void) +{ + DWORD ret; + HWND hwnd, hwndchild; + HMENU menu; + if( !pEndMenu) { /* win95 */ + win_skip( "EndMenu is not available\n"); + return; + } + hwnd = CreateWindowEx( 0, MAKEINTATOM(atomMenuCheckClass), NULL, + WS_VISIBLE, CW_USEDEFAULT, CW_USEDEFAULT, 200, 200, + NULL, NULL, NULL, NULL); + hwndchild = CreateWindowEx( 0, MAKEINTATOM(atomMenuCheckClass), NULL, + WS_VISIBLE | WS_CHILD, 10, 10, 20, 20, + hwnd, NULL, NULL, NULL); + ok( hwnd != NULL && hwndchild != NULL, + "CreateWindowEx failed with error %d\n", GetLastError()); + g_hwndtosend = hwnd; + SetWindowLongPtr( hwnd, GWLP_WNDPROC, (LONG_PTR)menu_cancelmode_wnd_proc); + SetWindowLongPtr( hwndchild, GWLP_WNDPROC, (LONG_PTR)menu_cancelmode_wnd_proc); + menu = CreatePopupMenu(); + ok( menu != NULL, "CreatePopupMenu failed with error %d\n", GetLastError()); + ret = AppendMenuA( menu, MF_STRING, 1, "winetest"); + ok( ret, "Functie failed lasterror is %u\n", GetLastError()); + /* seems to be needed only on wine :( */ + {MSG msg; while (PeekMessage(&msg, 0, 0, 0, PM_REMOVE)) DispatchMessage(&msg);} + /* test the effect of sending a WM_CANCELMODE message in the WM_INITMENULOOP + * handler of the menu owner */ + /* test results is exctracted from variable g_got_enteridle. Possible values: + * 0 : complete conformance. Sending WM_CANCELMODE cancels a menu initializing tracking + * 1 : Sending WM_CANCELMODE cancels a menu that is in tracking state + * 2 : Sending WM_CANCELMODE does not work + */ + /* menu owner is top level window */ + g_hwndtosend = hwnd; + ret = TrackPopupMenu( menu, 0x100, 100,100, 0, hwnd, NULL); + todo_wine { + ok( g_got_enteridle == 0, "received %d WM_ENTERIDLE messages, none expected\n", g_got_enteridle); + } + ok( g_got_enteridle < 2, "received %d WM_ENTERIDLE messages, should be less then 2\n", g_got_enteridle); + /* menu owner is child window */ + g_hwndtosend = hwndchild; + ret = TrackPopupMenu( menu, 0x100, 100,100, 0, hwndchild, NULL); + todo_wine { + ok(g_got_enteridle == 0, "received %d WM_ENTERIDLE messages, none expected\n", g_got_enteridle); + } + ok(g_got_enteridle < 2, "received %d WM_ENTERIDLE messages, should be less then 2\n", g_got_enteridle); + /* now send the WM_CANCELMODE messages to the WRONG window */ + /* those should fail ( to have any effect) */ + g_hwndtosend = hwnd; + ret = TrackPopupMenu( menu, 0x100, 100,100, 0, hwndchild, NULL); + ok( g_got_enteridle == 2, "received %d WM_ENTERIDLE messages, should be 2\n", g_got_enteridle); + /* cleanup */ + DestroyMenu( menu); + DestroyWindow( hwndchild); + DestroyWindow( hwnd); +} + START_TEST(menu) { init_function_pointers(); @@ -2884,4 +2969,5 @@ START_TEST(menu) test_menu_hilitemenuitem(); test_menu_trackpopupmenu(); + test_menu_cancelmode(); }

1 0

Paul Chitescu : ntdll: Print desired version of missing dependent assemblies.
by Alexandre Julliard 03 Apr '09

03 Apr '09

Module: wine Branch: master Commit: de66f257d68d73d41d9a7dedf42bb822721730f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=de66f257d68d73d41d9a7dedf… Author: Paul Chitescu <paulc(a)voip.null.ro> Date: Thu Apr 2 21:00:07 2009 +0300 ntdll: Print desired version of missing dependent assemblies. --- dlls/ntdll/actctx.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/actctx.c b/dlls/ntdll/actctx.c index 3744904..a1b1e3b 100644 --- a/dlls/ntdll/actctx.c +++ b/dlls/ntdll/actctx.c @@ -2022,7 +2022,9 @@ static NTSTATUS parse_depend_manifests(struct actctx_loader* acl) { if (!acl->dependencies[i].optional) { - FIXME( "Could not find dependent assembly %s\n", debugstr_w(acl->dependencies[i].name) ); + FIXME( "Could not find dependent assembly %s (%s)\n", + debugstr_w(acl->dependencies[i].name), + debugstr_version(&acl->dependencies[i].version) ); status = STATUS_SXS_CANT_GEN_ACTCTX; break; }

1 0