wine-commits December 2011

wine-commits@winehq.org

2 participants
810 discussions

Jacek Caban : jscript: Use bytecode for '>>>' expression implementation.
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: 96e822a33edd16ed0486443a0f3f48d6eb5d8df6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=96e822a33edd16ed0486443a0… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 9 11:04:24 2011 +0100 jscript: Use bytecode for '>>>' expression implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 15 +++++++++++---- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index d733c33..ececd10 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -693,6 +693,8 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, return compile_increment_expression(ctx, (unary_expression_t*)expr, OP_preinc, 1); case EXPR_RSHIFT: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_rshift); + case EXPR_RRSHIFT: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_rshift2); case EXPR_SUB: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_sub); case EXPR_THIS: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 6a76f8e..1699d84 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3160,13 +3160,20 @@ static HRESULT rshift2_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jse } /* ECMA-262 3rd Edition 11.7.3 */ -HRESULT right2_shift_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT interp_rshift2(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; + DWORD r, l; + HRESULT hres; - TRACE("\n"); + hres = stack_pop_uint(ctx, &r); + if(FAILED(hres)) + return hres; - return binary_expr_eval(ctx, expr, rshift2_eval, ei, ret); + hres = stack_pop_uint(ctx, &l); + if(FAILED(hres)) + return hres; + + return stack_push_int(ctx, l >> (r&0x1f)); } /* ECMA-262 3rd Edition 11.13.1 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index dc7f6ac..5b0a869 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -83,6 +83,7 @@ typedef struct _func_stack { X(preinc, 1, ARG_INT, 0) \ X(regexp, 1, ARG_STR, ARG_INT) \ X(rshift, 1, 0,0) \ + X(rshift2, 1, 0,0) \ X(str, 1, ARG_STR, 0) \ X(this, 1, 0,0) \ X(throw, 0, ARG_UINT, 0) \ @@ -567,7 +568,6 @@ HRESULT instanceof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t* HRESULT delete_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT typeof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT left_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT right2_shift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_lshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT assign_rrshift_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 3322206..f07280b 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1338,7 +1338,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, left_shift_expression_eval, compiled_expression_eval, - right2_shift_expression_eval, + compiled_expression_eval, compiled_expression_eval, assign_lshift_expression_eval, compiled_expression_eval,

1 0

Jacek Caban : jscript: Fixed memory leaks.
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: fcdd85267db6a3f12a94712f86d93b488ee62c2c URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcdd85267db6a3f12a94712f8… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 9 11:04:14 2011 +0100 jscript: Fixed memory leaks. --- dlls/jscript/engine.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 63ae9d7..6a76f8e 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1585,6 +1585,7 @@ static HRESULT interp_array(exec_ctx_t *ctx) } hres = to_string(ctx->parser->script, namev, &ctx->ei, &name); + VariantClear(namev); if(FAILED(hres)) { IDispatch_Release(obj); return hres; @@ -2701,6 +2702,8 @@ static HRESULT interp_postinc(exec_ctx_t *ctx) num_set_val(&inc, num_val(&n)+(double)arg); hres = disp_propput(ctx->parser->script, obj, id, &inc, &ctx->ei, NULL/*FIXME*/); } + if(FAILED(hres)) + VariantClear(&v); } IDispatch_Release(obj); if(FAILED(hres))

1 0

Hans Leidekker : winhttp: Remove some dead assignments (clang).
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: 053d1731fe815c11d355cf9bf64602dd183fdd86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=053d1731fe815c11d355cf9bf… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 9 09:01:42 2011 +0100 winhttp: Remove some dead assignments (clang). --- dlls/winhttp/request.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/request.c b/dlls/winhttp/request.c index f610dde..fac6fac 100644 --- a/dlls/winhttp/request.c +++ b/dlls/winhttp/request.c @@ -1872,7 +1872,7 @@ static BOOL receive_response( request_t *request, BOOL async ) if (!(ret = handle_redirect( request, status ))) break; clear_response_headers( request ); - ret = send_request( request, NULL, 0, NULL, 0, 0, 0, FALSE ); /* recurse synchronously */ + send_request( request, NULL, 0, NULL, 0, 0, 0, FALSE ); /* recurse synchronously */ continue; } else if (status == 401 || status == 407) @@ -1886,7 +1886,7 @@ static BOOL receive_response( request_t *request, BOOL async ) break; } clear_response_headers( request ); - ret = send_request( request, NULL, 0, NULL, 0, 0, 0, FALSE ); + send_request( request, NULL, 0, NULL, 0, 0, 0, FALSE ); continue; } break;

1 0

Hans Leidekker : winhttp: Avoid a null pointer dereference (clang).
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: e950e89867cca8ed3fad6c9cbbdb12a746c320bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=e950e89867cca8ed3fad6c9cb… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Dec 9 09:01:23 2011 +0100 winhttp: Avoid a null pointer dereference (clang). --- dlls/winhttp/session.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 0f9e782..b4ed568 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -565,7 +565,7 @@ static void str_to_buffer( WCHAR *buffer, const WCHAR *str, LPDWORD buflen ) if (str) len = strlenW( str ); if (buffer && *buflen > len) { - memcpy( buffer, str, len * sizeof(WCHAR) ); + if (str) memcpy( buffer, str, len * sizeof(WCHAR) ); buffer[len] = 0; } *buflen = len * sizeof(WCHAR);

1 0

Nikolay Sivov : comctl32/listview: Create header when LVS_EX_FULLROWSELECT is requested.
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: 485fde811db67ba2aaf51ac6f0850f32a6b5afe9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=485fde811db67ba2aaf51ac6f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Dec 9 10:42:54 2011 +0300 comctl32/listview: Create header when LVS_EX_FULLROWSELECT is requested. --- dlls/comctl32/listview.c | 5 +++++ dlls/comctl32/tests/listview.c | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c index c951633..3cd316a 100644 --- a/dlls/comctl32/listview.c +++ b/dlls/comctl32/listview.c @@ -8450,6 +8450,11 @@ static DWORD LISTVIEW_SetExtendedListViewStyle(LISTVIEW_INFO *infoPtr, DWORD mas LISTVIEW_UpdateSize(infoPtr); } + if((infoPtr->dwLvExStyle ^ old_ex_style) & LVS_EX_FULLROWSELECT) + { + LISTVIEW_CreateHeader(infoPtr); + } + if((infoPtr->dwLvExStyle ^ old_ex_style) & LVS_EX_TRANSPARENTBKGND) { if (infoPtr->dwLvExStyle & LVS_EX_TRANSPARENTBKGND) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 64d6090..b3df59e 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -1557,6 +1557,20 @@ static void test_create(void) ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); DestroyWindow(hList); + /* setting LVS_EX_FULLROWSELECT creates header */ + hList = CreateWindow("SysListView32", "Test", LVS_REPORT, 0, 0, 100, 100, NULL, NULL, + GetModuleHandle(NULL), 0); + hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); + ok(!IsWindow(hHeader), "Header shouldn't be created\n"); + ok(NULL == GetDlgItem(hList, 0), "NULL dialog item expected\n"); + SendMessage(hList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT); + hHeader = (HWND)SendMessage(hList, LVM_GETHEADER, 0, 0); + ok(IsWindow(hHeader) || + broken(!IsWindow(hHeader)), /* 4.7x common controls */ + "Header should be created\n"); + ok(hHeader == GetDlgItem(hList, 0), "Expected header as dialog item\n"); + DestroyWindow(hList); + /* not report style accepts LVS_EX_HEADERDRAGDROP too */ hList = create_listview_control(LVS_ICON); SendMessage(hList, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_HEADERDRAGDROP);

1 0

Pierre Schweitzer : usp10: Fix memory leak.
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: 06f65740b2efc23ff6520cef44ea73fc79409e0a URL: http://source.winehq.org/git/wine.git/?a=commit;h=06f65740b2efc23ff6520cef4… Author: Pierre Schweitzer <pierre(a)reactos.org> Date: Thu Dec 8 22:58:56 2011 +0100 usp10: Fix memory leak. --- dlls/usp10/usp10.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 1506bd5..359d4a3 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -1464,6 +1464,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, if (!glyphs || !pwLogClust || !piAdvance || !psva || !pGoffset || !abc) { + heap_free (BidiLevel); heap_free (glyphs); heap_free (pwLogClust); heap_free (piAdvance);

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DPSHADERCAPS2_0 typedef.
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: 38c3cde6fdeacd42b71b0ec95ea2300a69a5512c URL: http://source.winehq.org/git/wine.git/?a=commit;h=38c3cde6fdeacd42b71b0ec95… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 8 21:04:06 2011 +0100 wined3d: Get rid of the WINED3DPSHADERCAPS2_0 typedef. --- dlls/d3d9/d3d9_private.h | 10 +++++----- dlls/wined3d/directx.c | 30 +++++++++++++++--------------- include/wine/wined3d.h | 16 ++++++++-------- 3 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index b16498e..1c3748d 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -115,11 +115,11 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_H _pD3D9Caps->VS20Caps.DynamicFlowControlDepth = _pWineCaps->VS20Caps.dynamic_flow_control_depth; \ _pD3D9Caps->VS20Caps.NumTemps = _pWineCaps->VS20Caps.temp_count; \ _pD3D9Caps->VS20Caps.StaticFlowControlDepth = _pWineCaps->VS20Caps.static_flow_control_depth; \ - _pD3D9Caps->PS20Caps.Caps = _pWineCaps->PS20Caps.Caps; \ - _pD3D9Caps->PS20Caps.DynamicFlowControlDepth = _pWineCaps->PS20Caps.DynamicFlowControlDepth; \ - _pD3D9Caps->PS20Caps.NumTemps = _pWineCaps->PS20Caps.NumTemps; \ - _pD3D9Caps->PS20Caps.StaticFlowControlDepth = _pWineCaps->PS20Caps.StaticFlowControlDepth; \ - _pD3D9Caps->PS20Caps.NumInstructionSlots = _pWineCaps->PS20Caps.NumInstructionSlots; \ + _pD3D9Caps->PS20Caps.Caps = _pWineCaps->PS20Caps.caps; \ + _pD3D9Caps->PS20Caps.DynamicFlowControlDepth = _pWineCaps->PS20Caps.dynamic_flow_control_depth; \ + _pD3D9Caps->PS20Caps.NumTemps = _pWineCaps->PS20Caps.temp_count; \ + _pD3D9Caps->PS20Caps.StaticFlowControlDepth = _pWineCaps->PS20Caps.static_flow_control_depth; \ + _pD3D9Caps->PS20Caps.NumInstructionSlots = _pWineCaps->PS20Caps.instruction_slot_count; \ _pD3D9Caps->VertexTextureFilterCaps = _pWineCaps->VertexTextureFilterCaps; \ _pD3D9Caps->MaxVShaderInstructionsExecuted = _pWineCaps->MaxVShaderInstructionsExecuted; \ _pD3D9Caps->MaxPShaderInstructionsExecuted = _pWineCaps->MaxPShaderInstructionsExecuted; \ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index b73a82d..fe77b88 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4804,18 +4804,18 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte /* Caps is more or less undocumented on MSDN but it appears to be * used for PS20Caps based on results from R9600/FX5900/Geforce6800 * cards from Windows */ - caps->PS20Caps.Caps = WINED3DPS20CAPS_ARBITRARYSWIZZLE | + caps->PS20Caps.caps = WINED3DPS20CAPS_ARBITRARYSWIZZLE | WINED3DPS20CAPS_GRADIENTINSTRUCTIONS | WINED3DPS20CAPS_PREDICATION | WINED3DPS20CAPS_NODEPENDENTREADLIMIT | WINED3DPS20CAPS_NOTEXINSTRUCTIONLIMIT; /* PS 3.0 requires MAX_DYNAMICFLOWCONTROLDEPTH (24) */ - caps->PS20Caps.DynamicFlowControlDepth = WINED3DPS20_MAX_DYNAMICFLOWCONTROLDEPTH; - caps->PS20Caps.NumTemps = max(32, adapter->gl_info.limits.arb_ps_temps); + caps->PS20Caps.dynamic_flow_control_depth = WINED3DPS20_MAX_DYNAMICFLOWCONTROLDEPTH; + caps->PS20Caps.temp_count = max(32, adapter->gl_info.limits.arb_ps_temps); /* PS 3.0 requires MAX_STATICFLOWCONTROLDEPTH (4) */ - caps->PS20Caps.StaticFlowControlDepth = WINED3DPS20_MAX_STATICFLOWCONTROLDEPTH; + caps->PS20Caps.static_flow_control_depth = WINED3DPS20_MAX_STATICFLOWCONTROLDEPTH; /* PS 3.0 requires MAX_NUMINSTRUCTIONSLOTS (512) */ - caps->PS20Caps.NumInstructionSlots = WINED3DPS20_MAX_NUMINSTRUCTIONSLOTS; + caps->PS20Caps.instruction_slot_count = WINED3DPS20_MAX_NUMINSTRUCTIONSLOTS; caps->MaxPShaderInstructionsExecuted = 65535; caps->MaxPixelShader30InstructionSlots = max(WINED3DMIN30SHADERINSTRUCTIONS, @@ -4824,23 +4824,23 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte else if(caps->PixelShaderVersion == 2) { /* Below we assume PS2.0 specs, not extended 2.0a(GeforceFX)/2.0b(Radeon R3xx) ones */ - caps->PS20Caps.Caps = 0; - caps->PS20Caps.DynamicFlowControlDepth = 0; /* WINED3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH = 0 */ - caps->PS20Caps.NumTemps = max(12, adapter->gl_info.limits.arb_ps_temps); - caps->PS20Caps.StaticFlowControlDepth = WINED3DPS20_MIN_STATICFLOWCONTROLDEPTH; /* Minimum: 1 */ + caps->PS20Caps.caps = 0; + caps->PS20Caps.dynamic_flow_control_depth = 0; /* WINED3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH = 0 */ + caps->PS20Caps.temp_count = max(12, adapter->gl_info.limits.arb_ps_temps); + caps->PS20Caps.static_flow_control_depth = WINED3DPS20_MIN_STATICFLOWCONTROLDEPTH; /* Minimum: 1 */ /* Minimum number (64 ALU + 32 Texture), a GeforceFX uses 512 */ - caps->PS20Caps.NumInstructionSlots = WINED3DPS20_MIN_NUMINSTRUCTIONSLOTS; + caps->PS20Caps.instruction_slot_count = WINED3DPS20_MIN_NUMINSTRUCTIONSLOTS; caps->MaxPShaderInstructionsExecuted = 512; /* Minimum value, a GeforceFX uses 1024 */ caps->MaxPixelShader30InstructionSlots = 0; } else /* PS 1.x */ { - caps->PS20Caps.Caps = 0; - caps->PS20Caps.DynamicFlowControlDepth = 0; - caps->PS20Caps.NumTemps = 0; - caps->PS20Caps.StaticFlowControlDepth = 0; - caps->PS20Caps.NumInstructionSlots = 0; + caps->PS20Caps.caps = 0; + caps->PS20Caps.dynamic_flow_control_depth = 0; + caps->PS20Caps.temp_count = 0; + caps->PS20Caps.static_flow_control_depth = 0; + caps->PS20Caps.instruction_slot_count = 0; caps->MaxPShaderInstructionsExecuted = 0; caps->MaxPixelShader30InstructionSlots = 0; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b8981d5..4f5998c 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1750,14 +1750,14 @@ struct wined3d_vertex_shader_caps INT static_flow_control_depth; }; -typedef struct _WINED3DPSHADERCAPS2_0 +struct wined3d_pixel_shader_caps { - DWORD Caps; - INT DynamicFlowControlDepth; - INT NumTemps; - INT StaticFlowControlDepth; - INT NumInstructionSlots; -} WINED3DPSHADERCAPS2_0; + DWORD caps; + INT dynamic_flow_control_depth; + INT temp_count; + INT static_flow_control_depth; + INT instruction_slot_count; +}; typedef struct _WINEDDCAPS { @@ -1861,7 +1861,7 @@ typedef struct _WINED3DCAPS DWORD NumSimultaneousRTs; DWORD StretchRectFilterCaps; struct wined3d_vertex_shader_caps VS20Caps; - WINED3DPSHADERCAPS2_0 PS20Caps; + struct wined3d_pixel_shader_caps PS20Caps; DWORD VertexTextureFilterCaps; DWORD MaxVShaderInstructionsExecuted; DWORD MaxPShaderInstructionsExecuted;

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DVSHADERCAPS2_0 typedef.
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: af6b98c44bec5e68552b71d31ffd8bf78785f466 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af6b98c44bec5e68552b71d31… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 8 21:04:05 2011 +0100 wined3d: Get rid of the WINED3DVSHADERCAPS2_0 typedef. --- dlls/d3d9/d3d9_private.h | 9 ++++----- dlls/wined3d/directx.c | 24 ++++++++++++------------ include/wine/wined3d.h | 14 +++++++------- 3 files changed, 23 insertions(+), 24 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 76fef72..b16498e 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -111,11 +111,10 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_H _pD3D9Caps->DeclTypes = _pWineCaps->DeclTypes; \ _pD3D9Caps->NumSimultaneousRTs = _pWineCaps->NumSimultaneousRTs; \ _pD3D9Caps->StretchRectFilterCaps = _pWineCaps->StretchRectFilterCaps; \ - _pD3D9Caps->VS20Caps.Caps = _pWineCaps->VS20Caps.Caps; \ - _pD3D9Caps->VS20Caps.DynamicFlowControlDepth = _pWineCaps->VS20Caps.DynamicFlowControlDepth; \ - _pD3D9Caps->VS20Caps.NumTemps = _pWineCaps->VS20Caps.NumTemps; \ - _pD3D9Caps->VS20Caps.NumTemps = _pWineCaps->VS20Caps.NumTemps; \ - _pD3D9Caps->VS20Caps.StaticFlowControlDepth = _pWineCaps->VS20Caps.StaticFlowControlDepth; \ + _pD3D9Caps->VS20Caps.Caps = _pWineCaps->VS20Caps.caps; \ + _pD3D9Caps->VS20Caps.DynamicFlowControlDepth = _pWineCaps->VS20Caps.dynamic_flow_control_depth; \ + _pD3D9Caps->VS20Caps.NumTemps = _pWineCaps->VS20Caps.temp_count; \ + _pD3D9Caps->VS20Caps.StaticFlowControlDepth = _pWineCaps->VS20Caps.static_flow_control_depth; \ _pD3D9Caps->PS20Caps.Caps = _pWineCaps->PS20Caps.Caps; \ _pD3D9Caps->PS20Caps.DynamicFlowControlDepth = _pWineCaps->PS20Caps.DynamicFlowControlDepth; \ _pD3D9Caps->PS20Caps.NumTemps = _pWineCaps->PS20Caps.NumTemps; \ diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 57c3058..b73a82d 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -4763,32 +4763,32 @@ HRESULT CDECL wined3d_get_device_caps(const struct wined3d *wined3d, UINT adapte * aren't set (in case of software rendering) use the VS 3.0 from * MSDN or else if there's OpenGL spec use a hardcoded value minimum * VS3.0 value. */ - caps->VS20Caps.Caps = WINED3DVS20CAPS_PREDICATION; + caps->VS20Caps.caps = WINED3DVS20CAPS_PREDICATION; /* VS 3.0 requires MAX_DYNAMICFLOWCONTROLDEPTH (24) */ - caps->VS20Caps.DynamicFlowControlDepth = WINED3DVS20_MAX_DYNAMICFLOWCONTROLDEPTH; - caps->VS20Caps.NumTemps = max(32, adapter->gl_info.limits.arb_vs_temps); + caps->VS20Caps.dynamic_flow_control_depth = WINED3DVS20_MAX_DYNAMICFLOWCONTROLDEPTH; + caps->VS20Caps.temp_count = max(32, adapter->gl_info.limits.arb_vs_temps); /* level of nesting in loops / if-statements; VS 3.0 requires MAX (4) */ - caps->VS20Caps.StaticFlowControlDepth = WINED3DVS20_MAX_STATICFLOWCONTROLDEPTH; + caps->VS20Caps.static_flow_control_depth = WINED3DVS20_MAX_STATICFLOWCONTROLDEPTH; caps->MaxVShaderInstructionsExecuted = 65535; /* VS 3.0 needs at least 65535, some cards even use 2^32-1 */ caps->MaxVertexShader30InstructionSlots = max(512, adapter->gl_info.limits.arb_vs_instructions); } else if (caps->VertexShaderVersion == 2) { - caps->VS20Caps.Caps = 0; - caps->VS20Caps.DynamicFlowControlDepth = WINED3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH; - caps->VS20Caps.NumTemps = max(12, adapter->gl_info.limits.arb_vs_temps); - caps->VS20Caps.StaticFlowControlDepth = 1; + caps->VS20Caps.caps = 0; + caps->VS20Caps.dynamic_flow_control_depth = WINED3DVS20_MIN_DYNAMICFLOWCONTROLDEPTH; + caps->VS20Caps.temp_count = max(12, adapter->gl_info.limits.arb_vs_temps); + caps->VS20Caps.static_flow_control_depth = 1; caps->MaxVShaderInstructionsExecuted = 65535; caps->MaxVertexShader30InstructionSlots = 0; } else { /* VS 1.x */ - caps->VS20Caps.Caps = 0; - caps->VS20Caps.DynamicFlowControlDepth = 0; - caps->VS20Caps.NumTemps = 0; - caps->VS20Caps.StaticFlowControlDepth = 0; + caps->VS20Caps.caps = 0; + caps->VS20Caps.dynamic_flow_control_depth = 0; + caps->VS20Caps.temp_count = 0; + caps->VS20Caps.static_flow_control_depth = 0; caps->MaxVShaderInstructionsExecuted = 0; caps->MaxVertexShader30InstructionSlots = 0; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index ea9f4fb..b8981d5 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1742,13 +1742,13 @@ struct wined3d_strided_data BOOL position_transformed; }; -typedef struct _WINED3DVSHADERCAPS2_0 +struct wined3d_vertex_shader_caps { - DWORD Caps; - INT DynamicFlowControlDepth; - INT NumTemps; - INT StaticFlowControlDepth; -} WINED3DVSHADERCAPS2_0; + DWORD caps; + INT dynamic_flow_control_depth; + INT temp_count; + INT static_flow_control_depth; +}; typedef struct _WINED3DPSHADERCAPS2_0 { @@ -1860,7 +1860,7 @@ typedef struct _WINED3DCAPS DWORD DeclTypes; DWORD NumSimultaneousRTs; DWORD StretchRectFilterCaps; - WINED3DVSHADERCAPS2_0 VS20Caps; + struct wined3d_vertex_shader_caps VS20Caps; WINED3DPSHADERCAPS2_0 PS20Caps; DWORD VertexTextureFilterCaps; DWORD MaxVShaderInstructionsExecuted;

1 0

Henri Verbeet : wined3d: Introduce a helper function for checking colors against a color key.
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: f3afa69f8d257c2d0ecb26a3476edc4a5fc93715 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3afa69f8d257c2d0ecb26a34… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 8 21:04:04 2011 +0100 wined3d: Introduce a helper function for checking colors against a color key. --- dlls/wined3d/surface.c | 31 +++++++++++++------------------ 1 files changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index a081216..16e79f4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4534,6 +4534,14 @@ HRESULT d3dfmt_get_conv(const struct wined3d_surface *surface, BOOL need_alpha_c return WINED3D_OK; } +static BOOL color_in_range(const struct wined3d_color_key *color_key, DWORD color) +{ + /* FIXME: Is this really how color keys are supposed to work? I think it + * makes more sense to compare the individual channels. */ + return color >= color_key->color_space_low_value + && color <= color_key->color_space_high_value; +} + void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[256][4], BOOL colorkey) { const struct wined3d_device *device = surface->resource.device; @@ -4575,22 +4583,13 @@ void d3dfmt_p8_init_palette(const struct wined3d_surface *surface, BYTE table[25 * color key itself is passed to glAlphaFunc in other cases the * alpha component of pixels that should be masked away is set to 0. */ if (index_in_alpha) - { table[i][3] = i; - } - else if (colorkey && (i >= surface->src_blt_color_key.color_space_low_value) - && (i <= surface->src_blt_color_key.color_space_high_value)) - { + else if (colorkey && color_in_range(&surface->src_blt_color_key, i)) table[i][3] = 0x00; - } else if (pal->flags & WINEDDPCAPS_ALPHA) - { table[i][3] = pal->palents[i].peFlags; - } else - { table[i][3] = 0xFF; - } } } } @@ -4656,8 +4655,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; x++ ) { WORD color = *Source++; *Dest = ((color & 0xFFC0) | ((color & 0x1F) << 1)); - if ((color < surface->src_blt_color_key.color_space_low_value) - || (color > surface->src_blt_color_key.color_space_high_value)) + if (!color_in_range(&surface->src_blt_color_key, color)) *Dest |= 0x0001; Dest++; } @@ -4678,8 +4676,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; x++ ) { WORD color = *Source++; *Dest = color; - if ((color < surface->src_blt_color_key.color_space_low_value) - || (color > surface->src_blt_color_key.color_space_high_value)) + if (!color_in_range(&surface->src_blt_color_key, color)) *Dest |= (1 << 15); else *Dest &= ~(1 << 15); @@ -4700,8 +4697,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; x++) { DWORD color = ((DWORD)source[0] << 16) + ((DWORD)source[1] << 8) + (DWORD)source[2] ; DWORD dstcolor = color << 8; - if ((color < surface->src_blt_color_key.color_space_low_value) - || (color > surface->src_blt_color_key.color_space_high_value)) + if (!color_in_range(&surface->src_blt_color_key, color)) dstcolor |= 0xff; *(DWORD*)dest = dstcolor; source += 3; @@ -4722,8 +4718,7 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; x++) { DWORD color = 0xffffff & *(const DWORD*)source; DWORD dstcolor = color << 8; - if ((color < surface->src_blt_color_key.color_space_low_value) - || (color > surface->src_blt_color_key.color_space_high_value)) + if (!color_in_range(&surface->src_blt_color_key, color)) dstcolor |= 0xff; *(DWORD*)dest = dstcolor; source += 4;

1 0

Henri Verbeet : wined3d: Print the GL_RENDERER string when no " card selector" is available in wined3d_guess_card().
by Alexandre Julliard 09 Dec '11

09 Dec '11

Module: wine Branch: master Commit: d2ca44a597fe5d4f1fb92e32b1aea75804e2aaea URL: http://source.winehq.org/git/wine.git/?a=commit;h=d2ca44a597fe5d4f1fb92e32b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Dec 8 21:04:03 2011 +0100 wined3d: Print the GL_RENDERER string when no "card selector" is available in wined3d_guess_card(). --- dlls/wined3d/directx.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index c2d5c2f..57c3058 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2150,8 +2150,8 @@ static enum wined3d_pci_device wined3d_guess_card(const struct wined3d_gl_info * return vendor_card_select_table[i].select_card(gl_info, gl_renderer); } - FIXME_(d3d_caps)("No card selector available for GL vendor %d and card vendor %04x.\n", - *gl_vendor, *card_vendor); + FIXME_(d3d_caps)("No card selector available for GL vendor %#x and card vendor %04x (using GL_RENDERER %s).\n", + *gl_vendor, *card_vendor, debugstr_a(gl_renderer)); /* Default to generic Nvidia hardware based on the supported OpenGL extensions. The choice * for Nvidia was because the hardware and drivers they make are of good quality. This makes

1 0

← Newer
1
...
53
54
55
56
57
58
59
...
81
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2011