December 2011 - Wine-Commits

Francois Gouget : include: Add a couple of missing include directives in dshow.h.
by Alexandre Julliard Dec. 9, 2011

Dec. 9, 2011

Module: wine Branch: master Commit: f6c037cee38c66813aba01440483292fd95ebc08 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f6c037cee38c66813aba01440… Author: Francois Gouget <fgouget(a)free.fr> Date: Fri Dec 9 11:57:32 2011 +0100 include: Add a couple of missing include directives in dshow.h. --- include/dshow.h | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/include/dshow.h b/include/dshow.h index 6513140..3451609 100644 --- a/include/dshow.h +++ b/include/dshow.h @@ -32,7 +32,10 @@ #include <olectl.h> #include <ddraw.h> #include <mmsystem.h> -/* FIXME: #include <strsafe.h>*/ +#ifndef NO_DSHOW_STRSAFE +#define NO_SHLWAPI_STRFCNS +#include <strsafe.h> +#endif #ifndef NUMELMS #define NUMELMS(array) (sizeof(array)/sizeof((array)[0])) @@ -41,7 +44,7 @@ #include <strmif.h> #include <amvideo.h> #ifdef DSHOW_USE_AMAUDIO -/* FIXME: #include <amaudio.h>*/ +#include <amaudio.h> #endif #include <control.h> #include <evcode.h>

1 0

Piotr Caban : services: Set result inside service_send_command.
by Alexandre Julliard Dec. 9, 2011

Dec. 9, 2011

Module: wine Branch: master Commit: c368e551964ca8e0bb67a7964fecd943e0716644 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c368e551964ca8e0bb67a7964… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Dec 9 13:33:45 2011 +0100 services: Set result inside service_send_command. --- programs/services/rpc.c | 34 ++++++++++++++++++++++++---------- 1 files changed, 24 insertions(+), 10 deletions(-) diff --git a/programs/services/rpc.c b/programs/services/rpc.c index 66bd17b..806e65d 100644 --- a/programs/services/rpc.c +++ b/programs/services/rpc.c @@ -914,34 +914,50 @@ BOOL service_send_command( struct service_entry *service, HANDLE pipe, const void *data, DWORD size, DWORD *result ) { OVERLAPPED overlapped; - DWORD count; + DWORD count, ret; BOOL r; overlapped.hEvent = service->overlapped_event; r = WriteFile(pipe, data, size, &count, &overlapped); if (!r && GetLastError() == ERROR_IO_PENDING) { - WaitForSingleObject( service->overlapped_event, service_pipe_timeout ); + ret = WaitForSingleObject( service->overlapped_event, service_pipe_timeout ); + if (ret == WAIT_TIMEOUT) + { + WINE_ERR("sending command timed out\n"); + *result = ERROR_SERVICE_REQUEST_TIMEOUT; + return FALSE; + } r = GetOverlappedResult( pipe, &overlapped, &count, FALSE ); } if (!r || count != size) { WINE_ERR("service protocol error - failed to write pipe!\n"); + *result = (!r ? GetLastError() : ERROR_WRITE_FAULT); return FALSE; } r = ReadFile(pipe, result, sizeof *result, &count, &overlapped); if (!r && GetLastError() == ERROR_IO_PENDING) { - WaitForSingleObject( service->overlapped_event, service_pipe_timeout ); + ret = WaitForSingleObject( service->overlapped_event, service_pipe_timeout ); + if (ret == WAIT_TIMEOUT) + { + WINE_ERR("receiving command result timed out\n"); + *result = ERROR_SERVICE_REQUEST_TIMEOUT; + return FALSE; + } r = GetOverlappedResult( pipe, &overlapped, &count, FALSE ); } if (!r || count != sizeof *result) { WINE_ERR("service protocol error - failed to read pipe " "r = %d count = %d!\n", r, count); + *result = (!r ? GetLastError() : ERROR_READ_FAULT); return FALSE; } - return r; + + *result = ERROR_SUCCESS; + return TRUE; } /****************************************************************************** @@ -996,7 +1012,7 @@ DWORD __cdecl svcctl_ControlService( { DWORD access_required; struct sc_service_handle *service; - DWORD err; + DWORD result; BOOL ret; HANDLE control_mutex; HANDLE control_pipe; @@ -1027,8 +1043,8 @@ DWORD __cdecl svcctl_ControlService( return ERROR_INVALID_PARAMETER; } - if ((err = validate_service_handle(hService, access_required, &service)) != 0) - return err; + if ((result = validate_service_handle(hService, access_required, &service)) != 0) + return result; service_lock_exclusive(service->service_entry); @@ -1078,9 +1094,7 @@ DWORD __cdecl svcctl_ControlService( ret = WaitForSingleObject(control_mutex, 30000); if (ret == WAIT_OBJECT_0) { - DWORD result = ERROR_SUCCESS; - - ret = service_send_control(service->service_entry, control_pipe, dwControl, &result); + service_send_control(service->service_entry, control_pipe, dwControl, &result); if (dwControl == SERVICE_CONTROL_STOP) {

1 0

Jacek Caban : jscript: Use bytecode for '>>>=' expression implementation.
by Alexandre Julliard Dec. 9, 2011

Dec. 9, 2011

Module: wine Branch: master Commit: 7904932a9ed5320391acfd2b43fd0d6c8695a376 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7904932a9ed5320391acfd2b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Dec 9 11:04:45 2011 +0100 jscript: Use bytecode for '>>>=' expression implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 29 ----------------------------- dlls/jscript/engine.h | 1 - dlls/jscript/parser.y | 2 +- 4 files changed, 3 insertions(+), 31 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index ececd10..541e945 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -627,6 +627,8 @@ static HRESULT compile_expression_noret(compiler_ctx_t *ctx, expression_t *expr, return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_or); case EXPR_ASSIGNRSHIFT: return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_rshift); + case EXPR_ASSIGNRRSHIFT: + return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_rshift2); case EXPR_ASSIGNXOR: return compile_assign_expression(ctx, (binary_expression_t*)expr, OP_xor); case EXPR_BAND: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 1699d84..3ebdb83 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3141,25 +3141,6 @@ static HRESULT interp_rshift(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.7.3 */ -static HRESULT rshift2_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcept_t *ei, VARIANT *retv) -{ - DWORD li, ri; - HRESULT hres; - - hres = to_uint32(ctx, lval, ei, &li); - if(FAILED(hres)) - return hres; - - hres = to_uint32(ctx, rval, ei, &ri); - if(FAILED(hres)) - return hres; - - V_VT(retv) = VT_I4; - V_I4(retv) = li >> (ri&0x1f); - return S_OK; -} - -/* ECMA-262 3rd Edition 11.7.3 */ static HRESULT interp_rshift2(exec_ctx_t *ctx) { DWORD r, l; @@ -3212,16 +3193,6 @@ HRESULT assign_lshift_expression_eval(script_ctx_t *ctx, expression_t *_expr, DW return assign_oper_eval(ctx, expr->expression1, expr->expression2, lshift_eval, ei, ret); } -/* ECMA-262 3rd Edition 11.13.2 */ -HRESULT assign_rrshift_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) -{ - binary_expression_t *expr = (binary_expression_t*)_expr; - - TRACE("\n"); - - return assign_oper_eval(ctx, expr->expression1, expr->expression2, rshift2_eval, ei, ret); -} - static HRESULT interp_undefined(exec_ctx_t *ctx) { VARIANT v; diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 5b0a869..ba2c3a8 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -569,7 +569,6 @@ HRESULT delete_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exp 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 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; HRESULT compiled_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 f07280b..00fea0b 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1342,7 +1342,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, assign_lshift_expression_eval, compiled_expression_eval, - assign_rrshift_expression_eval, + compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, compiled_expression_eval,

1 0

Jacek Caban : jscript: Use bytecode for '>>>' expression implementation.
by Alexandre Julliard Dec. 9, 2011

Dec. 9, 2011

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

Łukasz Wojniłowicz : po: Update Polish translation.
by Alexandre Julliard Dec. 9, 2011

Dec. 9, 2011

Module: wine Branch: master Commit: 7626ad68503a86ed53caea69fc79919871d6425e URL: http://source.winehq.org/git/wine.git/?a=commit;h=7626ad68503a86ed53caea69f… Author: Łukasz Wojniłowicz <lukasz.wojnilowicz(a)gmail.com> Date: Thu Dec 8 18:20:22 2011 +0100 po: Update Polish translation. --- po/pl.po | 254 ++++++++++++++++++++++++++++---------------------------------- 1 files changed, 115 insertions(+), 139 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=7626ad68503a86ed53cae…

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DVSHADERCAPS2_0 typedef.
by Alexandre Julliard Dec. 9, 2011

Dec. 9, 2011

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

Pierre Schweitzer : usp10: Fix memory leak.
by Alexandre Julliard Dec. 9, 2011

Dec. 9, 2011

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: Print the GL_RENDERER string when no " card selector" is available in wined3d_guess_card().
by Alexandre Julliard Dec. 9, 2011

Dec. 9, 2011

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

Henri Verbeet : wined3d: Introduce a helper function for checking colors against a color key.
by Alexandre Julliard Dec. 9, 2011

Dec. 9, 2011

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

Alexandre Julliard : gdi32/tests: Add tests for DIB_PAL_COLORS and DIB palettes with missing entries.
by Alexandre Julliard Dec. 9, 2011

Dec. 9, 2011

Module: wine Branch: master Commit: 98670510f40822ae1824d4908668ca88ca3d3ba9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=98670510f40822ae1824d4908… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Dec 8 21:32:22 2011 +0100 gdi32/tests: Add tests for DIB_PAL_COLORS and DIB palettes with missing entries. --- dlls/gdi32/tests/bitmap.c | 446 +++++++++++++++++++++++++++++++++------------ 1 files changed, 325 insertions(+), 121 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=98670510f40822ae1824d…

1 0