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

Rein Klazes : user32/tests: Show that vertical and horizontal window scroll bar info is not created independently .
by Alexandre Julliard April 30, 2009

April 30, 2009

Module: wine Branch: master Commit: a240254d361a29274665e126e0aaafca0ceb1c67 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a240254d361a29274665e126e… Author: Rein Klazes <wijn(a)online.nl> Date: Thu Apr 30 08:06:49 2009 +0200 user32/tests: Show that vertical and horizontal window scroll bar info is not created independently. --- dlls/user32/tests/scroll.c | 128 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 128 insertions(+), 0 deletions(-) diff --git a/dlls/user32/tests/scroll.c b/dlls/user32/tests/scroll.c index 46080ca..0c36ff8 100644 --- a/dlls/user32/tests/scroll.c +++ b/dlls/user32/tests/scroll.c @@ -206,6 +206,128 @@ static void scrollbar_test4(void) sbi.rcScrollBar.bottom, sbi.rcScrollBar.right ); } +/* some tests designed to show that Horizontal and Vertical + * window scroll bar info are not created independently */ +static void scrollbar_test_default( DWORD style) +{ + INT min, max, ret; + HWND hwnd; + SCROLLINFO si = { sizeof( SCROLLINFO), SIF_TRACKPOS }; + + hwnd = CreateWindowExA( 0, "static", "", WS_POPUP | style, + 0, 0, 10, 10, 0, 0, 0, NULL); + assert( hwnd != 0); + + ret = GetScrollRange( hwnd, SB_VERT, &min, &max); + ok( ret || + broken( !ret) /* Win 98/ME */ , "GetScrollRange failed.\n"); + /* range is 0,0 if there are no H or V scroll bars. 0,100 otherwise */ + if( !( style & ( WS_VSCROLL | WS_HSCROLL))) + ok( min == 0 && max == 0, + "Scroll bar range is %d,%d. Expected 0,0. Style %08x\n", min, max, style); + else + ok( min == 0 && max == 100, + "Scroll bar range is %d,%d. Expected 0,100. Style %08x\n", min, max, style); + ret = GetScrollRange( hwnd, SB_HORZ, &min, &max); + ok( ret || + broken( !ret) /* Win 98/ME */ , "GetScrollRange failed.\n"); + /* range is 0,0 if there are no H or V scroll bars. 0,100 otherwise */ + if( !( style & ( WS_VSCROLL | WS_HSCROLL))) + ok( min == 0 && max == 0, + "Scroll bar range is %d,%d. Expected 0,0. Style %08x\n", min, max, style); + else + ok( min == 0 && max == 100, + "Scroll bar range is %d,%d. Expected 0,100. Style %08x\n", min, max, style); + /* test GetScrollInfo, vist for vertical SB */ + ret = GetScrollInfo( hwnd, SB_VERT, &si); + /* should fail if no H orV scroll bar styles are present. Succeed otherwise */ + if( !( style & ( WS_VSCROLL | WS_HSCROLL))) + ok( !ret, "GetScrollInfo succeeded unexpectedly. Style is %08x\n", style); + else + ok( ret, "GetScrollInfo failed unexpectedly. Style is %08x\n", style); + /* Same for Horizontal SB */ + ret = GetScrollInfo( hwnd, SB_HORZ, &si); + /* should fail if no H orV scroll bar styles are present. Succeed otherwise */ + if( !( style & ( WS_VSCROLL | WS_HSCROLL))) + ok( !ret, "GetScrollInfo succeeded unexpectedly. Style is %08x\n", style); + else + ok( ret, "GetScrollInfo failed unexpectedly. Style is %08x\n", style); + /* now set the Vertical Scroll range to something that could be the default value it + * already has */; + ret = SetScrollRange( hwnd, SB_VERT, 0, 100, FALSE); + ok( ret, "SetScrollRange failed.\n"); + /* and request the Horizontal range */ + ret = GetScrollRange( hwnd, SB_HORZ, &min, &max); + ok( ret, "GetScrollRange failed.\n"); + /* now the range should be 0,100 in ALL cases */ +todo_wine + ok( min == 0 && max == 100, + "Scroll bar range is %d,%d. Expected 0,100. Style %08x\n", min, max, style); + /* See what is different now for GetScrollRange */ + ret = GetScrollInfo( hwnd, SB_HORZ, &si); + /* should succeed in ALL cases */ +todo_wine + ok( ret, "GetScrollInfo failed unexpectedly. Style is %08x\n", style); + ret = GetScrollInfo( hwnd, SB_VERT, &si); + /* should succeed in ALL cases */ + ok( ret, "GetScrollInfo failed unexpectedly. Style is %08x\n", style); + /* do the test again with H and V reversed. + * Start with a clean window */ + DestroyWindow( hwnd); + hwnd = CreateWindowExA( 0, "static", "", WS_POPUP | style, + 0, 0, 10, 10, 0, 0, 0, NULL); + assert( hwnd != 0); + /* Set Horizonta Scroll range to something that could be the default value it + * already has */; + ret = SetScrollRange( hwnd, SB_HORZ, 0, 100, FALSE); + ok( ret, "SetScrollRange failed.\n"); + /* and request the Vertical range */ + ret = GetScrollRange( hwnd, SB_VERT, &min, &max); + ok( ret, "GetScrollRange failed.\n"); + /* now the range should be 0,100 in ALL cases */ +todo_wine + ok( min == 0 && max == 100, + "Scroll bar range is %d,%d. Expected 0,100. Style %08x\n", min, max, style); + /* See what is different now for GetScrollRange */ + ret = GetScrollInfo( hwnd, SB_HORZ, &si); + /* should succeed in ALL cases */ + ok( ret, "GetScrollInfo failed unexpectedly. Style is %08x\n", style); + ret = GetScrollInfo( hwnd, SB_VERT, &si); + /* should succeed in ALL cases */ +todo_wine + ok( ret, "GetScrollInfo failed unexpectedly. Style is %08x\n", style); + /* Slightly change the test to muse SetScrollInfo + * Start with a clean window */ + DestroyWindow( hwnd); + hwnd = CreateWindowExA( 0, "static", "", WS_POPUP | style, + 0, 0, 10, 10, 0, 0, 0, NULL); + assert( hwnd != 0); + /* set Horizontal position with SetScrollInfo */ + si.nPos = 0; + si.nMin = 11; + si.nMax = 22; + si.fMask |= SIF_RANGE; + ret = SetScrollInfo( hwnd, SB_HORZ, &si, FALSE); + ok( ret, "SetScrollInfo failed. Style is %08x\n", style); + /* and request the Vertical range */ + ret = GetScrollRange( hwnd, SB_VERT, &min, &max); + ok( ret, "GetScrollRange failed.\n"); + /* now the range should be 0,100 in ALL cases */ +todo_wine + ok( min == 0 && max == 100, + "Scroll bar range is %d,%d. Expected 0,100. Style %08x\n", min, max, style); + /* See what is different now for GetScrollRange */ + ret = GetScrollInfo( hwnd, SB_HORZ, &si); + /* should succeed in ALL cases */ + ok( ret, "GetScrollInfo failed unexpectedly. Style is %08x\n", style); + ret = GetScrollInfo( hwnd, SB_VERT, &si); + /* should succeed in ALL cases */ +todo_wine + ok( ret, "GetScrollInfo failed unexpectedly. Style is %08x\n", style); + /* clean up */ + DestroyWindow( hwnd); +} + START_TEST ( scroll ) { WNDCLASSA wc; @@ -236,6 +358,12 @@ START_TEST ( scroll ) scrollbar_test3(); scrollbar_test4(); + scrollbar_test_default( 0); +if( 0) { /* enable this when the todo's in scrollbar_test_default are fixed */ + scrollbar_test_default( WS_HSCROLL); + scrollbar_test_default( WS_VSCROLL); + scrollbar_test_default( WS_HSCROLL | WS_VSCROLL); +} DestroyWindow(hScroll); DestroyWindow(hMainWnd); }

1 0

Huw Davies : ole32: Implement GetDataHere.
by Alexandre Julliard April 30, 2009

April 30, 2009

Module: wine Branch: master Commit: 66d04f8eb6ee0d9a1bdbc3f2c364126d8bb52010 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66d04f8eb6ee0d9a1bdbc3f2c… Author: Huw Davies <huw(a)codeweavers.com> Date: Thu Apr 30 13:48:46 2009 +0100 ole32: Implement GetDataHere. --- dlls/ole32/clipboard.c | 106 +++++++++++++++++++++++++++++- dlls/ole32/tests/clipboard.c | 150 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 253 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=66d04f8eb6ee0d9a1bdbc…

1 0

Nikolay Sivov : comctl32/listview: Check columns array size before trying to obtain rectangle.
by Alexandre Julliard April 30, 2009

April 30, 2009

Module: wine Branch: master Commit: 8a03ac58c59e787b6275704bb36a018eee1bb1c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8a03ac58c59e787b6275704bb… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Thu Apr 30 15:59:21 2009 +0400 comctl32/listview: Check columns array size before trying to obtain rectangle. --- dlls/comctl32/listview.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index bfe47a3..169c242 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -4156,11 +4156,11 @@ static void LISTVIEW_RefreshReportGrid(LISTVIEW_INFO *infoPtr, HDC hdc) INT rgntype; INT y, itemheight; HPEN hPen, hOldPen; - RECT rcClip, rcItem; + RECT rcClip, rcItem = {0}; POINT Origin; RANGE colRange; ITERATOR j; - BOOL rmost; + BOOL rmost = FALSE; TRACE("()\n"); @@ -4183,8 +4183,11 @@ static void LISTVIEW_RefreshReportGrid(LISTVIEW_INFO *infoPtr, HDC hdc) if (rcItem.left + Origin.x < rcClip.right) break; } /* is right most vertical line visible? */ - LISTVIEW_GetHeaderRect(infoPtr, DPA_GetPtrCount(infoPtr->hdpaColumns) - 1, &rcItem); - rmost = (rcItem.right + Origin.x < rcClip.right); + if (DPA_GetPtrCount(infoPtr->hdpaColumns) > 0) + { + LISTVIEW_GetHeaderRect(infoPtr, DPA_GetPtrCount(infoPtr->hdpaColumns) - 1, &rcItem); + rmost = (rcItem.right + Origin.x < rcClip.right); + } if ((hPen = CreatePen( PS_SOLID, 1, comctl32_color.clr3dFace ))) {

1 0

Alexandre Julliard : ntdll: Move NtRaiseException and RtlUnwind implementations to the CPU-specific files .
by Alexandre Julliard April 30, 2009

April 30, 2009

Module: wine Branch: master Commit: c5a57e7d13d604898f8cddeed3b6d2bfd44b68df URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5a57e7d13d604898f8cddeed… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Apr 30 13:08:32 2009 +0200 ntdll: Move NtRaiseException and RtlUnwind implementations to the CPU-specific files. --- dlls/ntdll/exception.c | 315 +------------------------------------------ dlls/ntdll/ntdll_misc.h | 3 +- dlls/ntdll/signal_i386.c | 242 +++++++++++++++++++++++++++++++++ dlls/ntdll/signal_powerpc.c | 101 ++++++++++++++ dlls/ntdll/signal_sparc.c | 100 ++++++++++++++ dlls/ntdll/signal_x86_64.c | 127 +++++++++++++++++ 6 files changed, 574 insertions(+), 314 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=c5a57e7d13d604898f8cd…

1 0

Henri Verbeet : wined3d: Split shader_dump_param() in shader_dump_src_param () and shader_dump_dst_param().
by Alexandre Julliard April 30, 2009

April 30, 2009

Module: wine Branch: master Commit: bf4f7bf34af37952ebef4ff41db6f4528d2a2275 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf4f7bf34af37952ebef4ff41… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 30 11:02:20 2009 +0200 wined3d: Split shader_dump_param() in shader_dump_src_param() and shader_dump_dst_param(). --- dlls/wined3d/baseshader.c | 218 +++++++++++++++++++++++--------------------- 1 files changed, 114 insertions(+), 104 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bf4f7bf34af37952ebef4…

1 0

Henri Verbeet : wined3d: Pass a struct wined3d_shader_semantic to shader_dump_decl_usage().
by Alexandre Julliard April 30, 2009

April 30, 2009

Module: wine Branch: master Commit: 54a3054e5acc981d679b5ddc89d27a639ec6ae2d URL: http://source.winehq.org/git/wine.git/?a=commit;h=54a3054e5acc981d679b5ddc8… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 30 11:02:20 2009 +0200 wined3d: Pass a struct wined3d_shader_semantic to shader_dump_decl_usage(). --- dlls/wined3d/baseshader.c | 161 +++++++++++++++++++------------------------- 1 files changed, 70 insertions(+), 91 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index b4a768e..96e09d6 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -840,82 +840,75 @@ HRESULT shader_get_registers_used(IWineD3DBaseShader *iface, struct shader_reg_m return WINED3D_OK; } -static void shader_dump_decl_usage(DWORD decl, DWORD param, DWORD shader_version) +static void shader_dump_decl_usage(const struct wined3d_shader_semantic *semantic, DWORD shader_version) { - DWORD regtype = shader_get_regtype(param); - TRACE("dcl"); - if (regtype == WINED3DSPR_SAMPLER) { - DWORD ttype = (decl & WINED3DSP_TEXTURETYPE_MASK) >> WINED3DSP_TEXTURETYPE_SHIFT; - - switch (ttype) { + if (semantic->reg.register_type == WINED3DSPR_SAMPLER) + { + switch (semantic->sampler_type) + { case WINED3DSTT_2D: TRACE("_2d"); break; case WINED3DSTT_CUBE: TRACE("_cube"); break; case WINED3DSTT_VOLUME: TRACE("_volume"); break; - default: TRACE("_unknown_ttype(0x%08x)", ttype); - } - - } else { - - DWORD usage = decl & WINED3DSP_DCL_USAGE_MASK; - DWORD idx = (decl & WINED3DSP_DCL_USAGEINDEX_MASK) >> WINED3DSP_DCL_USAGEINDEX_SHIFT; - + default: TRACE("_unknown_ttype(0x%08x)", semantic->sampler_type); + } + } + else + { /* Pixel shaders 3.0 don't have usage semantics */ if (shader_is_pshader_version(shader_version) && shader_version < WINED3DPS_VERSION(3,0)) return; else TRACE("_"); - switch(usage) { - case WINED3DDECLUSAGE_POSITION: - TRACE("position%d", idx); - break; - case WINED3DDECLUSAGE_BLENDINDICES: - TRACE("blend"); - break; - case WINED3DDECLUSAGE_BLENDWEIGHT: - TRACE("weight"); - break; - case WINED3DDECLUSAGE_NORMAL: - TRACE("normal%d", idx); - break; - case WINED3DDECLUSAGE_PSIZE: - TRACE("psize"); - break; - case WINED3DDECLUSAGE_COLOR: - if(idx == 0) { - TRACE("color"); - } else { - TRACE("specular%d", (idx - 1)); - } - break; - case WINED3DDECLUSAGE_TEXCOORD: - TRACE("texture%d", idx); - break; - case WINED3DDECLUSAGE_TANGENT: - TRACE("tangent"); - break; - case WINED3DDECLUSAGE_BINORMAL: - TRACE("binormal"); - break; - case WINED3DDECLUSAGE_TESSFACTOR: - TRACE("tessfactor"); - break; - case WINED3DDECLUSAGE_POSITIONT: - TRACE("positionT%d", idx); - break; - case WINED3DDECLUSAGE_FOG: - TRACE("fog"); - break; - case WINED3DDECLUSAGE_DEPTH: - TRACE("depth"); - break; - case WINED3DDECLUSAGE_SAMPLE: - TRACE("sample"); - break; - default: - FIXME("unknown_semantics(0x%08x)", usage); + switch (semantic->usage) + { + case WINED3DDECLUSAGE_POSITION: + TRACE("position%d", semantic->usage_idx); + break; + case WINED3DDECLUSAGE_BLENDINDICES: + TRACE("blend"); + break; + case WINED3DDECLUSAGE_BLENDWEIGHT: + TRACE("weight"); + break; + case WINED3DDECLUSAGE_NORMAL: + TRACE("normal%d", semantic->usage_idx); + break; + case WINED3DDECLUSAGE_PSIZE: + TRACE("psize"); + break; + case WINED3DDECLUSAGE_COLOR: + if (semantic->usage_idx == 0) TRACE("color"); + else TRACE("specular%d", (semantic->usage_idx - 1)); + break; + case WINED3DDECLUSAGE_TEXCOORD: + TRACE("texture%d", semantic->usage_idx); + break; + case WINED3DDECLUSAGE_TANGENT: + TRACE("tangent"); + break; + case WINED3DDECLUSAGE_BINORMAL: + TRACE("binormal"); + break; + case WINED3DDECLUSAGE_TESSFACTOR: + TRACE("tessfactor"); + break; + case WINED3DDECLUSAGE_POSITIONT: + TRACE("positionT%d", semantic->usage_idx); + break; + case WINED3DDECLUSAGE_FOG: + TRACE("fog"); + break; + case WINED3DDECLUSAGE_DEPTH: + TRACE("depth"); + break; + case WINED3DDECLUSAGE_SAMPLE: + TRACE("sample"); + break; + default: + FIXME("unknown_semantics(0x%08x)", semantic->usage); } } } @@ -1202,12 +1195,12 @@ void shader_generate_main(IWineD3DBaseShader *iface, SHADER_BUFFER* buffer, } } -static void shader_dump_ins_modifiers(const DWORD output) +static void shader_dump_ins_modifiers(const struct wined3d_shader_dst_param *dst) { - DWORD shift = (output & WINED3DSP_DSTSHIFT_MASK) >> WINED3DSP_DSTSHIFT_SHIFT; - DWORD mmask = output & WINED3DSP_DSTMOD_MASK; + DWORD mmask = dst->modifiers; - switch (shift) { + switch (dst->shift) + { case 0: break; case 13: TRACE("_d8"); break; case 14: TRACE("_d4"); break; @@ -1215,7 +1208,7 @@ static void shader_dump_ins_modifiers(const DWORD output) case 1: TRACE("_x2"); break; case 2: TRACE("_x4"); break; case 3: TRACE("_x8"); break; - default: TRACE("_unhandled_shift(%d)", shift); break; + default: TRACE("_unhandled_shift(%d)", dst->shift); break; } if (mmask & WINED3DSPDM_SATURATE) TRACE("_sat"); @@ -1269,18 +1262,15 @@ void shader_trace_init(const DWORD *pFunction, const SHADER_OPCODE *opcode_table if (ins.handler_idx == WINED3DSIH_DCL) { - struct wined3d_shader_dst_param dst; - DWORD usage = *pToken; - DWORD param = *(pToken + 1); + struct wined3d_shader_semantic semantic; - shader_parse_dst_param(param, NULL, &dst); + shader_sm1_read_semantic(&pToken, &semantic); - shader_dump_decl_usage(usage, param, shader_version); - shader_dump_ins_modifiers(param); + shader_dump_decl_usage(&semantic, shader_version); + shader_dump_ins_modifiers(&semantic.reg); TRACE(" "); - shader_dump_param(dst.register_type, dst.register_idx, FALSE, - 0, dst.write_mask, dst.rel_addr, shader_version); - pToken += 2; + shader_dump_param(semantic.reg.register_type, semantic.reg.register_idx, FALSE, + 0, semantic.reg.write_mask, semantic.reg.rel_addr, shader_version); } else if (ins.handler_idx == WINED3DSIH_DEF) { @@ -1360,20 +1350,9 @@ void shader_trace_init(const DWORD *pFunction, const SHADER_OPCODE *opcode_table struct wined3d_shader_dst_param dst; struct wined3d_shader_src_param rel_addr; - tokens_read = shader_get_param(pToken, shader_version, &param, &addr_token); - pToken += tokens_read; - - if (param & WINED3DSHADER_ADDRMODE_RELATIVE) - { - shader_parse_src_param(addr_token, NULL, &rel_addr); - shader_parse_dst_param(param, &rel_addr, &dst); - } - else - { - shader_parse_dst_param(param, NULL, &dst); - } + shader_sm1_read_dst_param(&pToken, &dst, &rel_addr, shader_version); - shader_dump_ins_modifiers(param); + shader_dump_ins_modifiers(&dst); TRACE(" "); shader_dump_param(dst.register_type, dst.register_idx, FALSE, 0, dst.write_mask, dst.rel_addr, shader_version);

1 0

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

April 30, 2009

Module: wine Branch: master Commit: 18df05eb34752d49ddc1dd704cc8220affdea98f URL: http://source.winehq.org/git/wine.git/?a=commit;h=18df05eb34752d49ddc1dd704… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 30 11:02:19 2009 +0200 wined3d: Explicitly pass the register type and index to shader_get_float_offset(). --- dlls/wined3d/baseshader.c | 28 ++++++++++++++-------------- 1 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index ba4a918..077fb62 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -453,20 +453,18 @@ static inline BOOL shader_is_comment(DWORD token) /* Convert floating point offset relative * to a register file to an absolute offset for float constants */ -static unsigned int shader_get_float_offset(const DWORD reg) +static unsigned int shader_get_float_offset(WINED3DSHADER_PARAM_REGISTER_TYPE register_type, UINT register_idx) { - unsigned int regnum = reg & WINED3DSP_REGNUM_MASK; - int regtype = shader_get_regtype(reg); - - switch (regtype) { - case WINED3DSPR_CONST: return regnum; - case WINED3DSPR_CONST2: return 2048 + regnum; - case WINED3DSPR_CONST3: return 4096 + regnum; - case WINED3DSPR_CONST4: return 6144 + regnum; + switch (register_type) + { + case WINED3DSPR_CONST: return register_idx; + case WINED3DSPR_CONST2: return 2048 + register_idx; + case WINED3DSPR_CONST3: return 4096 + register_idx; + case WINED3DSPR_CONST4: return 6144 + register_idx; default: - FIXME("Unsupported register type: %d\n", regtype); - return regnum; - } + FIXME("Unsupported register type: %d\n", register_type); + return register_idx; + } } static void shader_delete_constant_list(struct list* clist) { @@ -962,7 +960,8 @@ static void shader_dump_param(const DWORD param, const DWORD addr_token, BOOL is case WINED3DSPR_CONST3: case WINED3DSPR_CONST4: TRACE("c"); - shader_dump_arr_entry(param, addr_token, shader_get_float_offset(param), shader_version); + shader_dump_arr_entry(param, addr_token, shader_get_float_offset(shader_get_regtype(param), + param & WINED3DSP_REGNUM_MASK), shader_version); break; case WINED3DSPR_TEXTURE: /* vs: case D3DSPR_ADDR */ TRACE("%c%u", (pshader? 't':'a'), reg); @@ -1268,7 +1267,8 @@ void shader_trace_init(const DWORD *pFunction, const SHADER_OPCODE *opcode_table } else if (ins.handler_idx == WINED3DSIH_DEF) { - unsigned int offset = shader_get_float_offset(*pToken); + unsigned int offset = shader_get_float_offset(shader_get_regtype(*pToken), + *pToken & WINED3DSP_REGNUM_MASK); TRACE("def c%u = %f, %f, %f, %f", offset, *(const float *)(pToken + 1),

1 0

Henri Verbeet : wined3d: Explicitly pass register type, index, etc. to shader_dump_param().
by Alexandre Julliard April 30, 2009

April 30, 2009

Module: wine Branch: master Commit: 032b8d4c02d0148480865f9d51d91781f32c67d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=032b8d4c02d0148480865f9d5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 30 11:02:19 2009 +0200 wined3d: Explicitly pass register type, index, etc. to shader_dump_param(). --- dlls/wined3d/baseshader.c | 251 +++++++++++++++++++++++++++------------------ 1 files changed, 150 insertions(+), 101 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=032b8d4c02d0148480865…

1 0

Henri Verbeet : wined3d: Define GL_FENCE_APPLE to the correct value.
by Alexandre Julliard April 30, 2009

April 30, 2009

Module: wine Branch: master Commit: 53169b98d218b24152af617e02ab36dc342ad746 URL: http://source.winehq.org/git/wine.git/?a=commit;h=53169b98d218b24152af617e0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 30 11:02:20 2009 +0200 wined3d: Define GL_FENCE_APPLE to the correct value. --- dlls/wined3d/wined3d_gl.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/wined3d_gl.h b/dlls/wined3d/wined3d_gl.h index 55c5855..447de85 100644 --- a/dlls/wined3d/wined3d_gl.h +++ b/dlls/wined3d/wined3d_gl.h @@ -2895,7 +2895,7 @@ typedef void (WINE_GLAPI * PGLFNGETFENCEIVNVPROC) (GLuint, GLenum, GLint *); #ifndef GL_APPLE_fence #define GL_APPLE_fence 1 #define GL_DRAW_PIXELS_APPLE 0x8A0A -#define GL_FENCE_APPLE 0x84F3 +#define GL_FENCE_APPLE 0x8A0B #endif typedef void (WINE_GLAPI * PGLFNGENFENCESAPPLEPROC) (GLsizei, GLuint *); typedef void (WINE_GLAPI * PGLFNDELETEFENCESAPPLEPROC) (GLuint, const GLuint *);

1 0

Guy Albertelli : kernel32/tests: Fix new problems with volume tests.
by Alexandre Julliard April 30, 2009

April 30, 2009

Module: wine Branch: master Commit: 1016bd7ec44a01c4f6acbf68dcc4cb665429a216 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1016bd7ec44a01c4f6acbf68d… Author: Guy Albertelli <galberte(a)neo.rr.com> Date: Wed Apr 29 15:33:01 2009 -0400 kernel32/tests: Fix new problems with volume tests. --- dlls/kernel32/tests/volume.c | 46 +++++++---------------------------------- 1 files changed, 8 insertions(+), 38 deletions(-) diff --git a/dlls/kernel32/tests/volume.c b/dlls/kernel32/tests/volume.c index 49703ef..19fc6f0 100644 --- a/dlls/kernel32/tests/volume.c +++ b/dlls/kernel32/tests/volume.c @@ -37,10 +37,15 @@ static BOOL (WINAPI *pGetVolumeInformationA)(LPCSTR, LPSTR, DWORD, LPDWORD, LPDW static void test_query_dos_deviceA(void) { char drivestr[] = "a:"; - char *p, *q, *buffer, buffer2[2000]; + char *p, *buffer, buffer2[2000]; DWORD ret, ret2, buflen=32768; BOOL found = FALSE; + if (!pFindFirstVolumeA) { + win_skip("On win9x, HARDDISK and RAMDISK not present\n"); + return; + } + buffer = HeapAlloc( GetProcessHeap(), 0, buflen ); ret = QueryDosDeviceA( NULL, buffer, buflen ); ok(ret && GetLastError() != ERROR_INSUFFICIENT_BUFFER, @@ -54,29 +59,13 @@ static void test_query_dos_deviceA(void) p = buffer; for (;;) { if (!strlen(p)) break; - trace("device entry %s\n", p); ret2 = QueryDosDeviceA( p, buffer2, sizeof(buffer2) ); - ok(ret2, "QueryDosDeviceA failed to return current mapping, last error %u\n", GetLastError()); - if (ret2) { - q = buffer2; - for (;;) { - if (!strlen(q)) break; - trace("for device %s, current mapping %s\n", p, q); - q += strlen(q) + 1; - if (ret2 <= (q-buffer2)) break; - } - } + ok(ret2, "QueryDosDeviceA failed to return current mapping for %s, last error %u\n", p, GetLastError()); p += strlen(p) + 1; if (ret <= (p-buffer)) break; } } - if (!pFindFirstVolumeA) { - win_skip("On win9x, HARDDISK and RAMDISK not present\n"); - HeapFree( GetProcessHeap(), 0, buffer ); - return; - } - for (;drivestr[0] <= 'z'; drivestr[0]++) { ret = QueryDosDeviceA( drivestr, buffer, buflen); if(ret) { @@ -294,49 +283,30 @@ static void test_GetVolumeInformationA(void) ret = pGetVolumeInformationA(NULL, vol_name_buf, vol_name_size, NULL, NULL, NULL, fs_name_buf, fs_name_len); ok(ret, "GetVolumeInformationA failed on null root dir, last error %u\n", GetLastError()); - if (ret) { - trace("for %s, vol_serial_num=0x%08x, max_comp_len=%d, filesys flags=0x%08x, vol name=%s, filesys name=%s\n", - "<NULL>", vol_serial_num, max_comp_len, fs_flags, vol_name_buf, fs_name_buf); - } /* Try normal drive letter with trailing \ */ ret = pGetVolumeInformationA(Root_Dir1, vol_name_buf, vol_name_size, &vol_serial_num, &max_comp_len, &fs_flags, fs_name_buf, fs_name_len); ok(ret, "GetVolumeInformationA failed, root=%s, last error=%u\n", Root_Dir1, GetLastError()); - if (ret) { - trace("for %s, vol_serial_num=0x%08x, max_comp_len=%d, filesys flags=0x%08x, vol name=%s, filesys name=%s\n", - Root_Dir1, vol_serial_num, max_comp_len, fs_flags, vol_name_buf, fs_name_buf); - } /* try again with dirve letter and the "disable parsing" prefix */ ret = pGetVolumeInformationA(Root_Dir2, vol_name_buf, vol_name_size, &vol_serial_num, &max_comp_len, &fs_flags, fs_name_buf, fs_name_len); todo_wine ok(ret, "GetVolumeInformationA failed, root=%s, last error=%u\n", Root_Dir2, GetLastError()); - if (ret) { - trace("for %s, vol_serial_num=0x%08x, max_comp_len=%d, filesys flags=0x%08x, vol name=%s, filesys name=%s\n", - Root_Dir2, vol_serial_num, max_comp_len, fs_flags, vol_name_buf, fs_name_buf); - } /* try again with unique voluem name */ ret = pGetVolumeInformationA(volume, vol_name_buf, vol_name_size, &vol_serial_num, &max_comp_len, &fs_flags, fs_name_buf, fs_name_len); todo_wine ok(ret, "GetVolumeInformationA failed, root=%s, last error=%u\n", volume, GetLastError()); - if (ret) { - trace("for %s, vol_serial_num=0x%08x, max_comp_len=%d, filesys flags=0x%08x, vol name=%s, filesys name=%s\n", - volume, vol_serial_num, max_comp_len, fs_flags, vol_name_buf, fs_name_buf); - } /* try again with device name space */ Root_Dir2[2] = '.'; ret = pGetVolumeInformationA(Root_Dir2, vol_name_buf, vol_name_size, &vol_serial_num, &max_comp_len, &fs_flags, fs_name_buf, fs_name_len); todo_wine ok(ret, "GetVolumeInformationA failed, root=%s, last error=%u\n", Root_Dir2, GetLastError()); - if (ret) { - trace("for %s, vol_serial_num=0x%08x, max_comp_len=%d, filesys flags=0x%08x, vol name=%s, filesys name=%s\n", - Root_Dir2, vol_serial_num, max_comp_len, fs_flags, vol_name_buf, fs_name_buf); - } /* try again with a directory off the root - should generate error */ + if (windowsdir[strlen(windowsdir)-1] != '\\') strcat(windowsdir, "\\"); ret = pGetVolumeInformationA(windowsdir, vol_name_buf, vol_name_size, &vol_serial_num, &max_comp_len, &fs_flags, fs_name_buf, fs_name_len); todo_wine ok(!ret && GetLastError()==ERROR_DIR_NOT_ROOT,

1 0