November 2011 - Wine-Commits

Francois Gouget : cmd/tests: Treat lines that start with '---' as resynchronization points.
by Alexandre Julliard Nov. 29, 2011

Nov. 29, 2011

Module: wine Branch: master Commit: 81f64ee906888875de10a4c804bed88c103a282c URL: http://source.winehq.org/git/wine.git/?a=commit;h=81f64ee906888875de10a4c80… Author: Francois Gouget <fgouget(a)free.fr> Date: Tue Nov 29 11:44:37 2011 +0100 cmd/tests: Treat lines that start with '---' as resynchronization points. --- programs/cmd/tests/batch.c | 32 +++++++++++++++++++++++------ programs/cmd/tests/test_builtins.cmd | 2 +- programs/cmd/tests/test_builtins.cmd.exp | 2 +- 3 files changed, 27 insertions(+), 9 deletions(-) diff --git a/programs/cmd/tests/batch.c b/programs/cmd/tests/batch.c index 8347c03..8236352 100644 --- a/programs/cmd/tests/batch.c +++ b/programs/cmd/tests/batch.c @@ -276,7 +276,8 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da const char *out_ptr = out_data, *exp_ptr = exp_data, *out_nl, *exp_nl, *err; DWORD line = 0; static const char todo_wine_cmd[] = {'@','t','o','d','o','_','w','i','n','e','@'}; - BOOL is_todo_wine; + static const char resync_cmd[] = {'-','-','-'}; + BOOL is_todo_wine, is_out_resync, is_exp_resync; while(out_ptr < out_data+out_size && exp_ptr < exp_data+exp_size) { line++; @@ -290,6 +291,10 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da exp_ptr += sizeof(todo_wine_cmd); winetest_start_todo("wine"); } + is_exp_resync=(exp_ptr+sizeof(resync_cmd) <= exp_nl && + !memcmp(exp_ptr, resync_cmd, sizeof(resync_cmd))); + is_out_resync=(out_ptr+sizeof(resync_cmd) <= out_nl && + !memcmp(out_ptr, resync_cmd, sizeof(resync_cmd))); err = compare_line(out_ptr, out_nl, exp_ptr, exp_nl); if(err == out_nl) @@ -298,18 +303,31 @@ static void test_output(const char *out_data, DWORD out_size, const char *exp_da else if(err == exp_nl) ok(0, "excess characters on line %d (got '%.*s', wanted '%.*s')\n", line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); + else if (!err && is_todo_wine && is_out_resync && is_exp_resync) + /* Consider that the todo_wine was to deal with extra lines, + * not for the resync line itself + */ + err = NULL; else ok(!err, "unexpected char 0x%x position %d in line %d (got '%.*s', wanted '%.*s')\n", (err ? *err : 0), (err ? (int)(err-out_ptr) : -1), line, (int)(out_nl-out_ptr), out_ptr, (int)(exp_nl-exp_ptr), exp_ptr); if(is_todo_wine) winetest_end_todo("wine"); - exp_ptr = exp_nl+1; - out_ptr = out_nl+1; - if(out_nl+1 < out_data+out_size && out_nl[0] == '\r' && out_nl[1] == '\n') - out_ptr++; - if(exp_nl+1 < exp_data+exp_size && exp_nl[0] == '\r' && exp_nl[1] == '\n') - exp_ptr++; + if (is_exp_resync && err && is_todo_wine) + exp_ptr -= sizeof(todo_wine_cmd); + else if (!is_exp_resync || (is_exp_resync && !err)) + { + exp_ptr = exp_nl+1; + if(exp_nl+1 < exp_data+exp_size && exp_nl[0] == '\r' && exp_nl[1] == '\n') + exp_ptr++; + } + if (!is_out_resync || (is_out_resync && !err)) + { + out_ptr = out_nl+1; + if(out_nl+1 < out_data+out_size && out_nl[0] == '\r' && out_nl[1] == '\n') + out_ptr++; + } } ok(exp_ptr >= exp_data+exp_size, "unexpected end of output in line %d, missing %s\n", line, exp_ptr); diff --git a/programs/cmd/tests/test_builtins.cmd b/programs/cmd/tests/test_builtins.cmd index bcaccb2..1734650 100644 --- a/programs/cmd/tests/test_builtins.cmd +++ b/programs/cmd/tests/test_builtins.cmd @@ -164,7 +164,7 @@ type C (if 1==0 (echo A > B) else echo C) cd .. & rd /s/q foobar -echo ------------ Testing ^^ escape character -------------- +echo ------------ Testing circumflex escape character -------------- rem Using something like "echo foo^" asks for an additional char after a "More?" prompt on the following line; it's not possible to currently test that non-interactively echo ^hell^o, world echo hell^o, world diff --git a/programs/cmd/tests/test_builtins.cmd.exp b/programs/cmd/tests/test_builtins.cmd.exp index e35b710..68355c4 100644 --- a/programs/cmd/tests/test_builtins.cmd.exp +++ b/programs/cmd/tests/test_builtins.cmd.exp @@ -178,7 +178,7 @@ foo A B C -(a)todo_wine@------------ Testing ^ escape character -------------- +------------ Testing circumflex escape character -------------- @todo_wine(a)hello, world @todo_wine(a)hello, world @todo_wine(a)hell^o, world

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: SetBoolArray().
by Alexandre Julliard Nov. 29, 2011

Nov. 29, 2011

Module: wine Branch: master Commit: 0ca1efc5786423eb382629cfed9ace4160a59117 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ca1efc5786423eb382629cfe… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Nov 29 10:04:19 2011 +0100 d3dx9: Implement ID3DXBaseEffect::SetBoolArray(). --- dlls/d3dx9_36/effect.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index c2be558..2e8b674 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1693,10 +1693,40 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetBool(ID3DXBaseEffect *iface, D3DXHA static HRESULT WINAPI ID3DXBaseEffectImpl_SetBoolArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST BOOL *b, UINT count) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, b %p, count %u stub\n", This, parameter, b, count); + TRACE("iface %p, parameter %p, b %p, count %u\n", This, parameter, b, count); - return E_NOTIMPL; + if (param) + { + UINT i, size = min(count, param->bytes / sizeof(DWORD)); + + TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < size; ++i) + { + set_number((DWORD *)param->data + i, param->type, &b[i], D3DXPT_BOOL); + } + return D3D_OK; + + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetBoolArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, BOOL *b, UINT count)

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: SetMatrix().
by Alexandre Julliard Nov. 29, 2011

Nov. 29, 2011

Module: wine Branch: master Commit: cebdbb34ac2dee2582c29258dbf16302841850aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=cebdbb34ac2dee2582c29258d… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Nov 29 10:04:23 2011 +0100 d3dx9: Implement ID3DXBaseEffect::SetMatrix(). --- dlls/d3dx9_36/effect.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 41 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 2e8b674..3079bc0 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -935,6 +935,20 @@ static void get_matrix(struct d3dx_parameter *param, D3DXMATRIX *matrix) } } +static void set_matrix(struct d3dx_parameter *param, CONST D3DXMATRIX *matrix) +{ + unsigned int i, k; + + for (i = 0; i < 4; ++i) + { + for (k = 0; k < 4; ++k) + { + if ((i < param->rows) && (k < param->columns)) + set_number((float *)param->data + i * param->columns + k, param->type, &matrix->u.m[i][k], D3DXPT_FLOAT); + } + } +} + static struct d3dx_parameter *get_parameter_element_by_name(struct d3dx_parameter *parameter, LPCSTR name) { UINT element; @@ -2077,10 +2091,35 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetVectorArray(ID3DXBaseEffect *iface, static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrix(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST D3DXMATRIX *matrix) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, matrix %p stub\n", This, parameter, matrix); + TRACE("iface %p, parameter %p, matrix %p\n", This, parameter, matrix); - return E_NOTIMPL; + if (param && !param->element_count) + { + TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + set_matrix(param, matrix); + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrix(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXMATRIX *matrix)

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: SetMatrixArray().
by Alexandre Julliard Nov. 29, 2011

Nov. 29, 2011

Module: wine Branch: master Commit: 84f158025b7a5237f1050f01f5d825ced8b3d2e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=84f158025b7a5237f1050f01f… Author: Rico Schüller <kgbricola(a)web.de> Date: Tue Nov 29 10:04:27 2011 +0100 d3dx9: Implement ID3DXBaseEffect::SetMatrixArray(). --- dlls/d3dx9_36/effect.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 3079bc0..4d08180 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2159,10 +2159,40 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrix(ID3DXBaseEffect *iface, D3DX static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST D3DXMATRIX *matrix, UINT count) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); - FIXME("iface %p, parameter %p, matrix %p, count %u stub\n", This, parameter, matrix, count); + TRACE("iface %p, parameter %p, matrix %p, count %u\n", This, parameter, matrix, count); - return E_NOTIMPL; + if (param && param->element_count >= count) + { + UINT i; + + TRACE("Class %s\n", debug_d3dxparameter_class(param->class)); + + switch (param->class) + { + case D3DXPC_MATRIX_ROWS: + for (i = 0; i < count; ++i) + { + set_matrix(get_parameter_struct(param->member_handles[i]), &matrix[i]); + } + return D3D_OK; + + case D3DXPC_SCALAR: + case D3DXPC_VECTOR: + case D3DXPC_OBJECT: + case D3DXPC_STRUCT: + break; + + default: + FIXME("Unhandled class %s\n", debug_d3dxparameter_class(param->class)); + break; + } + } + + WARN("Invalid argument specified\n"); + + return D3DERR_INVALIDCALL; } static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXMATRIX *matrix, UINT count)

1 0

Henri Verbeet : wined3d: Get rid of WINED3DDEVINFO_BANDWIDTHTIMINGS.
by Alexandre Julliard Nov. 29, 2011

Nov. 29, 2011

Module: wine Branch: master Commit: adb0c0862639aefee707a07b27f75936c10477aa URL: http://source.winehq.org/git/wine.git/?a=commit;h=adb0c0862639aefee707a07b2… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 28 21:31:00 2011 +0100 wined3d: Get rid of WINED3DDEVINFO_BANDWIDTHTIMINGS. --- include/wine/wined3d.h | 9 --------- 1 files changed, 0 insertions(+), 9 deletions(-) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 3fc6d16..88fd0de 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -1692,15 +1692,6 @@ struct wined3d_device_creation_parameters DWORD flags; }; -typedef struct _WINED3DDEVINFO_BANDWIDTHTIMINGS -{ - float MaxBandwidthUtilized; - float FrontEndUploadMemoryUtilizedPercent; - float VertexRateUtilizedPercent; - float TriangleSetupRateUtilizedPercent; - float FillRateUtilizedPercent; -} WINED3DDEVINFO_BANDWIDTHTIMINGS; - typedef struct _WINED3DDEVINFO_CACHEUTILIZATION { float TextureCacheHitRate;

1 0

Eric Pouech : msvcrt: Implemented _ultow_s.
by Alexandre Julliard Nov. 29, 2011

Nov. 29, 2011

Module: wine Branch: master Commit: d7bc2eff2f2651646753e13b7d840469347a7386 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7bc2eff2f2651646753e13b7… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Mon Nov 28 21:53:38 2011 +0100 msvcrt: Implemented _ultow_s. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 54 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 58 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 4b5b525..16c8486 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1202,7 +1202,7 @@ @ cdecl _ultoa(long ptr long) msvcrt._ultoa @ cdecl _ultoa_s(long ptr long long) msvcrt._ultoa_s @ cdecl _ultow(long ptr long) msvcrt._ultow -@ stub _ultow_s +@ cdecl _ultow_s(long ptr long long) msvcrt._ultow_s @ cdecl _umask(long) msvcrt._umask @ stub _umask_s @ stub _ungetc_nolock diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 5de5586..240b9f2 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1055,7 +1055,7 @@ @ cdecl _ultoa(long ptr long) msvcrt._ultoa @ cdecl _ultoa_s(long ptr long long) msvcrt._ultoa_s @ cdecl _ultow(long ptr long) msvcrt._ultow -@ stub _ultow_s +@ cdecl _ultow_s(long ptr long long) msvcrt._ultow_s @ cdecl _umask(long) msvcrt._umask @ stub _umask_s @ stub _ungetc_nolock diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 77e0e45..f1fa88a 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1049,7 +1049,7 @@ @ cdecl _ultoa(long ptr long) msvcrt._ultoa @ cdecl _ultoa_s(long ptr long long) msvcrt._ultoa_s @ cdecl _ultow(long ptr long) msvcrt._ultow -@ stub _ultow_s +@ cdecl _ultow_s(long ptr long long) msvcrt._ultow_s @ cdecl _umask(long) msvcrt._umask @ stub _umask_s @ stub _ungetc_nolock diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index fac2104..2687fd6 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -991,7 +991,7 @@ @ cdecl _ultoa(long ptr long) ntdll._ultoa @ cdecl _ultoa_s(long ptr long long) @ cdecl _ultow(long ptr long) ntdll._ultow -# stub _ultow_s(long ptr long long) +@ cdecl _ultow_s(long ptr long long) @ cdecl _umask(long) MSVCRT__umask # stub _umask_s(long ptr) @ cdecl _ungetch(long) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 608401d..ad9e88b 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1288,6 +1288,60 @@ int CDECL _ultoa_s(MSVCRT_ulong value, char *str, MSVCRT_size_t size, int radix) } /********************************************************************* + * _ultow_s (MSVCRT.@) + */ +int CDECL _ultow_s(MSVCRT_ulong value, WCHAR *str, MSVCRT_size_t size, int radix) +{ + MSVCRT_ulong digit; + WCHAR buffer[33], *pos; + size_t len; + + if (!str || !size || radix < 2 || radix > 36) + { + if (str && size) + str[0] = '\0'; + + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + pos = buffer + 32; + *pos = '\0'; + + do + { + digit = value % radix; + value /= radix; + + if (digit < 10) + *--pos = '0' + digit; + else + *--pos = 'a' + digit - 10; + } + while (value != 0); + + len = buffer + 33 - pos; + if (len > size) + { + size_t i; + WCHAR *p = str; + + /* Copy the temporary buffer backwards up to the available number of + * characters. */ + + for (pos = buffer + 31, i = 0; i < size; i++) + *p++ = *pos--; + + str[0] = '\0'; + *MSVCRT__errno() = MSVCRT_ERANGE; + return MSVCRT_ERANGE; + } + + memcpy(str, pos, len * sizeof(WCHAR)); + return 0; +} + +/********************************************************************* * _i64toa_s (MSVCRT.@) */ int CDECL _i64toa_s(__int64 value, char *str, MSVCRT_size_t size, int radix)

1 0

Luca Bennati : po: Update Italian translation.
by Alexandre Julliard Nov. 29, 2011

Nov. 29, 2011

Module: wine Branch: master Commit: 29fddd83ffaf7896b0cdacfdc4f9e3486e93e55d URL: http://source.winehq.org/git/wine.git/?a=commit;h=29fddd83ffaf7896b0cdacfdc… Author: Luca Bennati <lucak3(a)gmail.com> Date: Mon Nov 28 08:31:34 2011 +0100 po: Update Italian translation. --- po/it.po | 10 ++++------ 1 files changed, 4 insertions(+), 6 deletions(-) diff --git a/po/it.po b/po/it.po index aff677b..b4584d7 100644 --- a/po/it.po +++ b/po/it.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2011-11-21 21:59+0100\n" +"PO-Revision-Date: 2011-11-28 08:30+0100\n" "Last-Translator: Luca Bennati <lucak3(a)gmail.com>\n" "Language-Team: none\n" "Language: Italian\n" @@ -9352,7 +9352,6 @@ msgid "Unicode (UTF-8)" msgstr "Unicode (UTF-8)" #: notepad.rc:99 -#, fuzzy msgid "" "%1\n" "This file contains Unicode characters which will be lost if\n" @@ -9361,9 +9360,9 @@ msgid "" "one of the Unicode options in the Encoding drop down list.\n" "Continue?" msgstr "" -"%s\n" +"%1\n" "Questo file contiene caratteri Unicode che andranno persi se\n" -"salvi questo file nella codifica %s.\n" +"salvi questo file nella codifica %2.\n" "Per mantenere questi caratteri, clicca Annulla e scegli\n" "una delle opzioni Unicode nel menù a tendina Codifica.\n" "Continuare?" @@ -11178,9 +11177,8 @@ msgid "Processes: %d" msgstr "Processi: %d" #: taskmgr.rc:267 -#, fuzzy msgid "Mem Usage: %1!u!kB / %2!u!kB" -msgstr "Uso della Memoria: %dK / %dK" +msgstr "Uso della Memoria: %1!u!kB / %2!u!kB" #: taskmgr.rc:272 msgid "Image Name"

1 0

Jacek Caban : jscript: Use bytecode for '*' expression implementation.
by Alexandre Julliard Nov. 29, 2011

Nov. 29, 2011

Module: wine Branch: master Commit: cf68237c8010f2b7fa8279753383cdf8e83067a4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf68237c8010f2b7fa8279753… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 29 11:08:54 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, 16 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 3ee3d40..a529fe7 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -364,6 +364,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_neg); case EXPR_MINUS: return compile_unary_expression(ctx, (unary_expression_t*)expr, OP_minus); + case EXPR_MUL: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_mul); case EXPR_NEW: return compile_new_expression(ctx, (call_expression_t*)expr); case EXPR_NOTEQ: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 273281e..5e60381 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -2323,13 +2323,22 @@ static HRESULT mul_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, jsexcep } /* ECMA-262 3rd Edition 11.5.1 */ -HRESULT mul_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +HRESULT interp_mul(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; + VARIANT l, r; + HRESULT hres; TRACE("\n"); - return binary_expr_eval(ctx, expr, mul_eval, ei, ret); + hres = stack_pop_number(ctx, &r); + if(FAILED(hres)) + return hres; + + hres = stack_pop_number(ctx, &l); + if(FAILED(hres)) + return hres; + + return stack_push_number(ctx, num_val(&l)*num_val(&r)); } /* ECMA-262 3rd Edition 11.5.2 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 807bb8a..120bf42 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -55,6 +55,7 @@ typedef struct _func_stack { X(jmp_nz, 0, ARG_ADDR, 0) \ X(jmp_z, 0, ARG_ADDR, 0) \ X(minus, 1, 0,0) \ + X(mul, 1, 0,0) \ X(neg, 1, 0,0) \ X(neq, 1, 0,0) \ X(neq2, 1, 0,0) \ @@ -555,7 +556,6 @@ HRESULT binary_or_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*, HRESULT binary_xor_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT binary_and_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT instanceof_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT mul_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT div_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT mod_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT delete_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 617c848..9b72d7f 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1315,7 +1315,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - mul_expression_eval, + compiled_expression_eval, div_expression_eval, mod_expression_eval, delete_expression_eval,

1 0

Henri Verbeet : ddraw: Rename the wineD3D field in IDirectDrawImpl to wined3d.
by Alexandre Julliard Nov. 29, 2011

Nov. 29, 2011

Module: wine Branch: master Commit: 22d41e2c3f39a871cfd12bb06ce7ddd48390e088 URL: http://source.winehq.org/git/wine.git/?a=commit;h=22d41e2c3f39a871cfd12bb06… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 28 21:30:58 2011 +0100 ddraw: Rename the wineD3D field in IDirectDrawImpl to wined3d. --- dlls/ddraw/ddraw.c | 28 ++++++++++++++-------------- dlls/ddraw/ddraw_private.h | 3 +-- dlls/ddraw/device.c | 10 +++++----- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/dlls/ddraw/ddraw.c b/dlls/ddraw/ddraw.c index 45496f6..dfe7b37 100644 --- a/dlls/ddraw/ddraw.c +++ b/dlls/ddraw/ddraw.c @@ -486,7 +486,7 @@ static void ddraw_destroy(IDirectDrawImpl *This) if (This->wined3d_swapchain) ddraw_destroy_swapchain(This); wined3d_device_decref(This->wined3d_device); - wined3d_decref(This->wineD3D); + wined3d_decref(This->wined3d); /* Now free the object */ HeapFree(GetProcessHeap(), 0, This); @@ -835,7 +835,7 @@ static HRESULT WINAPI ddraw7_SetCooperativeLevel(IDirectDraw7 *iface, HWND hwnd, { struct wined3d_display_mode display_mode; - wined3d_get_adapter_display_mode(This->wineD3D, WINED3DADAPTER_DEFAULT, &display_mode); + wined3d_get_adapter_display_mode(This->wined3d, WINED3DADAPTER_DEFAULT, &display_mode); wined3d_device_setup_fullscreen_window(This->wined3d_device, hwnd, display_mode.width, display_mode.height); } @@ -1453,7 +1453,7 @@ static HRESULT WINAPI ddraw7_GetFourCCCodes(IDirectDraw7 *iface, DWORD *NumCodes for (i = 0; i < (sizeof(formats) / sizeof(formats[0])); ++i) { - hr = wined3d_check_device_format(This->wineD3D, WINED3DADAPTER_DEFAULT, WINED3DDEVTYPE_HAL, + hr = wined3d_check_device_format(This->wined3d, WINED3DADAPTER_DEFAULT, WINED3DDEVTYPE_HAL, mode.format_id, 0, WINED3DRTYPE_SURFACE, formats[i], DefaultSurfaceType); if (SUCCEEDED(hr)) { @@ -1652,7 +1652,7 @@ static HRESULT WINAPI ddraw7_GetAvailableVidMem(IDirectDraw7 *iface, DDSCAPS2 *C { struct wined3d_adapter_identifier desc = {0}; - hr = wined3d_get_adapter_identifier(This->wineD3D, WINED3DADAPTER_DEFAULT, 0, &desc); + hr = wined3d_get_adapter_identifier(This->wined3d, WINED3DADAPTER_DEFAULT, 0, &desc); *total = desc.video_memory; } @@ -2135,7 +2135,7 @@ static HRESULT WINAPI ddraw7_EnumDisplayModes(IDirectDraw7 *iface, DWORD Flags, for(fmt = 0; fmt < (sizeof(checkFormatList) / sizeof(checkFormatList[0])); fmt++) { modenum = 0; - while (wined3d_enum_adapter_modes(This->wineD3D, WINED3DADAPTER_DEFAULT, + while (wined3d_enum_adapter_modes(This->wined3d, WINED3DADAPTER_DEFAULT, checkFormatList[fmt], modenum++, &mode) == WINED3D_OK) { PixelFormat_WineD3DtoDD(&pixelformat, mode.format_id); @@ -3851,7 +3851,7 @@ static HRESULT WINAPI d3d7_EnumDevices(IDirect3D7 *iface, LPD3DENUMDEVICESCALLBA wined3d_mutex_lock(); - hr = IDirect3DImpl_GetCaps(This->wineD3D, &device_desc1, &device_desc7); + hr = IDirect3DImpl_GetCaps(This->wined3d, &device_desc1, &device_desc7); if (hr != D3D_OK) { wined3d_mutex_unlock(); @@ -3918,7 +3918,7 @@ static HRESULT WINAPI d3d3_EnumDevices(IDirect3D3 *iface, LPD3DENUMDEVICESCALLBA wined3d_mutex_lock(); - hr = IDirect3DImpl_GetCaps(This->wineD3D, &device_desc1, &device_desc7); + hr = IDirect3DImpl_GetCaps(This->wined3d, &device_desc1, &device_desc7); if (hr != D3D_OK) { wined3d_mutex_unlock(); @@ -4282,7 +4282,7 @@ static HRESULT WINAPI d3d3_FindDevice(IDirect3D3 *iface, D3DFINDDEVICESEARCH *fd } /* Get the caps */ - hr = IDirect3DImpl_GetCaps(This->wineD3D, &desc1, &desc7); + hr = IDirect3DImpl_GetCaps(This->wined3d, &desc1, &desc7); if (hr != D3D_OK) return hr; /* Now return our own GUID */ @@ -4594,7 +4594,7 @@ static HRESULT WINAPI d3d7_EnumZBufferFormats(IDirect3D7 *iface, REFCLSID device for (i = 0; i < (sizeof(formats) / sizeof(*formats)); ++i) { - hr = wined3d_check_device_format(This->wineD3D, WINED3DADAPTER_DEFAULT, type, mode.format_id, + hr = wined3d_check_device_format(This->wined3d, WINED3DADAPTER_DEFAULT, type, mode.format_id, WINED3DUSAGE_DEPTHSTENCIL, WINED3DRTYPE_SURFACE, formats[i], SURFACE_OPENGL); if (SUCCEEDED(hr)) { @@ -4619,7 +4619,7 @@ static HRESULT WINAPI d3d7_EnumZBufferFormats(IDirect3D7 *iface, REFCLSID device * while others used dwZBufferBitDepth=32. In either case the pitch matches a 32 bits per * pixel format, so we use dwZBufferBitDepth=32. Some games expect 24. Windows Vista and * newer enumerate both versions, so we do the same(bug 22434) */ - hr = wined3d_check_device_format(This->wineD3D, WINED3DADAPTER_DEFAULT, type, mode.format_id, + hr = wined3d_check_device_format(This->wined3d, WINED3DADAPTER_DEFAULT, type, mode.format_id, WINED3DUSAGE_DEPTHSTENCIL, WINED3DRTYPE_SURFACE, WINED3DFMT_X8D24_UNORM, SURFACE_OPENGL); if (SUCCEEDED(hr)) { @@ -5455,20 +5455,20 @@ HRESULT ddraw_init(IDirectDrawImpl *ddraw, WINED3DDEVTYPE device_type) ddraw->orig_width = GetSystemMetrics(SM_CXSCREEN); ddraw->orig_height = GetSystemMetrics(SM_CYSCREEN); - ddraw->wineD3D = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS, + ddraw->wined3d = wined3d_create(7, WINED3D_LEGACY_DEPTH_BIAS, &ddraw->IDirectDraw7_iface); - if (!ddraw->wineD3D) + if (!ddraw->wined3d) { WARN("Failed to create a wined3d object.\n"); return E_OUTOFMEMORY; } - hr = wined3d_device_create(ddraw->wineD3D, WINED3DADAPTER_DEFAULT, device_type, + hr = wined3d_device_create(ddraw->wined3d, WINED3DADAPTER_DEFAULT, device_type, NULL, 0, 8, &ddraw->device_parent, &ddraw->wined3d_device); if (FAILED(hr)) { WARN("Failed to create a wined3d device, hr %#x.\n", hr); - wined3d_decref(ddraw->wineD3D); + wined3d_decref(ddraw->wined3d); return hr; } diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index a4522b0..b85ea4a 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -80,8 +80,7 @@ struct IDirectDrawImpl LONG ref7, ref4, ref2, ref3, ref1, numIfaces; BOOL initialized; - /* WineD3D linkage */ - struct wined3d *wineD3D; + struct wined3d *wined3d; struct wined3d_device *wined3d_device; BOOL d3d_initialized; diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 462f39e..e9e7744 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -460,7 +460,7 @@ IDirect3DDeviceImpl_7_GetCaps(IDirect3DDevice7 *iface, TRACE("iface %p, device_desc %p.\n", iface, Desc); /* Call the same function used by IDirect3D, this saves code */ - return IDirect3DImpl_GetCaps(This->ddraw->wineD3D, &OldDesc, Desc); + return IDirect3DImpl_GetCaps(This->ddraw->wined3d, &OldDesc, Desc); } static HRESULT WINAPI @@ -511,7 +511,7 @@ IDirect3DDeviceImpl_3_GetCaps(IDirect3DDevice3 *iface, TRACE("iface %p, hw_desc %p, hel_desc %p.\n", iface, HWDesc, HelDesc); - hr = IDirect3DImpl_GetCaps(This->ddraw->wineD3D, HWDesc, &newDesc); + hr = IDirect3DImpl_GetCaps(This->ddraw->wined3d, HWDesc, &newDesc); if(hr != D3D_OK) return hr; *HelDesc = *HWDesc; @@ -1103,7 +1103,7 @@ IDirect3DDeviceImpl_7_EnumTextureFormats(IDirect3DDevice7 *iface, for (i = 0; i < sizeof(FormatList) / sizeof(*FormatList); ++i) { - hr = wined3d_check_device_format(This->ddraw->wineD3D, WINED3DADAPTER_DEFAULT, WINED3DDEVTYPE_HAL, + hr = wined3d_check_device_format(This->ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3DDEVTYPE_HAL, mode.format_id, 0, WINED3DRTYPE_TEXTURE, FormatList[i], SURFACE_OPENGL); if (hr == D3D_OK) { @@ -1126,7 +1126,7 @@ IDirect3DDeviceImpl_7_EnumTextureFormats(IDirect3DDevice7 *iface, for (i = 0; i < sizeof(BumpFormatList) / sizeof(*BumpFormatList); ++i) { - hr = wined3d_check_device_format(This->ddraw->wineD3D, WINED3DADAPTER_DEFAULT, + hr = wined3d_check_device_format(This->ddraw->wined3d, WINED3DADAPTER_DEFAULT, WINED3DDEVTYPE_HAL, mode.format_id, WINED3DUSAGE_QUERY_LEGACYBUMPMAP, WINED3DRTYPE_TEXTURE, BumpFormatList[i], SURFACE_OPENGL); if (hr == D3D_OK) @@ -1240,7 +1240,7 @@ IDirect3DDeviceImpl_2_EnumTextureFormats(IDirect3DDevice2 *iface, for (i = 0; i < sizeof(FormatList) / sizeof(*FormatList); ++i) { - hr = wined3d_check_device_format(This->ddraw->wineD3D, 0, WINED3DDEVTYPE_HAL, + hr = wined3d_check_device_format(This->ddraw->wined3d, 0, WINED3DDEVTYPE_HAL, mode.format_id, 0, WINED3DRTYPE_TEXTURE, FormatList[i], SURFACE_OPENGL); if (hr == D3D_OK) {

1 0

Henri Verbeet : wined3d: Use proper texcoord masks for GLSL texm3x3spec / texm3x3vspec.
by Alexandre Julliard Nov. 29, 2011

Nov. 29, 2011

Module: wine Branch: master Commit: ab73f20e38febfd287e585fe59797248fefaae6e URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab73f20e38febfd287e585fe5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Nov 28 21:30:59 2011 +0100 wined3d: Use proper texcoord masks for GLSL texm3x3spec / texm3x3vspec. --- dlls/wined3d/glsl_shader.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 68e2f8f..b746139 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3425,6 +3425,7 @@ static void shader_glsl_texm3x3spec(const struct wined3d_shader_instruction *ins struct wined3d_shader_tex_mx *tex_mx = ins->ctx->tex_mx; DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; struct glsl_sample_function sample_function; + char coord_mask[6]; shader_glsl_add_src_param(ins, &ins->src[0], src_mask, &src0_param); shader_glsl_add_src_param(ins, &ins->src[1], src_mask, &src1_param); @@ -3436,9 +3437,11 @@ static void shader_glsl_texm3x3spec(const struct wined3d_shader_instruction *ins /* Dependent read, not valid with conditional NP2 */ shader_glsl_get_sample_function(ins->ctx, reg, 0, &sample_function); + shader_glsl_write_mask_to_str(sample_function.coord_mask, coord_mask); /* Sample the texture */ - shader_glsl_gen_sample_code(ins, reg, &sample_function, WINED3DSP_NOSWIZZLE, NULL, NULL, NULL, "tmp0.xyz"); + shader_glsl_gen_sample_code(ins, reg, &sample_function, WINED3DSP_NOSWIZZLE, + NULL, NULL, NULL, "tmp0%s", coord_mask); tex_mx->current_row = 0; } @@ -3453,6 +3456,7 @@ static void shader_glsl_texm3x3vspec(const struct wined3d_shader_instruction *in DWORD src_mask = WINED3DSP_WRITEMASK_0 | WINED3DSP_WRITEMASK_1 | WINED3DSP_WRITEMASK_2; struct glsl_sample_function sample_function; struct glsl_src_param src0_param; + char coord_mask[6]; shader_glsl_add_src_param(ins, &ins->src[0], src_mask, &src0_param); @@ -3466,9 +3470,11 @@ static void shader_glsl_texm3x3vspec(const struct wined3d_shader_instruction *in /* Dependent read, not valid with conditional NP2 */ shader_glsl_get_sample_function(ins->ctx, reg, 0, &sample_function); + shader_glsl_write_mask_to_str(sample_function.coord_mask, coord_mask); /* Sample the texture using the calculated coordinates */ - shader_glsl_gen_sample_code(ins, reg, &sample_function, WINED3DSP_NOSWIZZLE, NULL, NULL, NULL, "tmp0.xyz"); + shader_glsl_gen_sample_code(ins, reg, &sample_function, WINED3DSP_NOSWIZZLE, + NULL, NULL, NULL, "tmp0%s", coord_mask); tex_mx->current_row = 0; }

1 0