December 2011 - Wine-commits

Hans Leidekker : winhttp: Support ICU_ESCAPE in WinHttpCrackUrl.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 9a5ad30225d48d9881dc83c98471345e66672008 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9a5ad30225d48d9881dc83c98… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 1 13:02:20 2011 +0100 winhttp: Support ICU_ESCAPE in WinHttpCrackUrl. --- dlls/winhttp/tests/url.c | 24 +++++++ dlls/winhttp/url.c | 149 ++++++++++++++++++++++++++++------------------ 2 files changed, 114 insertions(+), 59 deletions(-) diff --git a/dlls/winhttp/tests/url.c b/dlls/winhttp/tests/url.c index 7de31f2..d447879 100644 --- a/dlls/winhttp/tests/url.c +++ b/dlls/winhttp/tests/url.c @@ -69,6 +69,8 @@ static const WCHAR url12[] = {'h','t','t','p',':','/','/','e','x','a','m','p','l','e','.','n','e','t','/','p','a','t','h','?','v','a','r','1','=','e','x','a','m','p','l','e','@','e','x','a','m','p','l','e','.','c','o','m','&','v','a','r','2','=','x','&','v','a','r','3','=','y', 0}; static const WCHAR url13[] = {'h','t','t','p','s',':','/','/','t','o','o','l','s','.','g','o','o','g','l','e','.','c','o','m','/','s','e','r','v','i','c','e','/','u','p','d','a','t','e','2','?','w','=','3',':','B','x','D','H','o','W','y','8','e','z','M',0}; +static const WCHAR url14[] = + {'h','t','t','p',':','/','/','w','i','n','e','h','q','.','o',' ','g','/','p','a','t','h',' ','w','i','t','h',' ','s','p','a','c','e','s',0}; static const WCHAR url_k1[] = {'h','t','t','p',':','/','/','u','s','e','r','n','a','m','e',':','p','a','s','s','w','o','r','d', @@ -318,6 +320,10 @@ static void reset_url_components( URL_COMPONENTS *uc ) static void WinHttpCrackUrl_test( void ) { + static const WCHAR hostnameW[] = + {'w','i','n','e','h','q','.','o',' ','g',0}; + static const WCHAR pathW[] = + {'/','p','a','t','h','%','2','0','w','i','t','h','%','2','0','s','p','a','c','e','s',0}; URL_COMPONENTSW uc; WCHAR scheme[20], user[20], pass[20], host[20], path[80], extra[40]; DWORD error; @@ -599,6 +605,24 @@ static void WinHttpCrackUrl_test( void ) uc.nPort = 0; ret = WinHttpCrackUrl( url13, 0, ICU_DECODE, &uc ); ok( ret, "WinHttpCrackUrl failed\n" ); + + uc.lpszScheme = scheme; + uc.dwSchemeLength = 20; + uc.lpszHostName = host; + uc.dwHostNameLength = 20; + uc.lpszUserName = NULL; + uc.dwUserNameLength = 0; + uc.lpszPassword = NULL; + uc.dwPasswordLength = 0; + uc.lpszUrlPath = path; + uc.dwUrlPathLength = 40; + uc.lpszExtraInfo = NULL; + uc.dwExtraInfoLength = 0; + uc.nPort = 0; + ret = WinHttpCrackUrl( url14, 0, ICU_ESCAPE|ICU_DECODE, &uc ); + ok( ret, "WinHttpCrackUrl failed\n" ); + ok( !lstrcmpW( uc.lpszHostName, hostnameW ), "unexpected host name\n" ); + ok( !lstrcmpW( uc.lpszUrlPath, pathW ), "unexpected path\n" ); } START_TEST(url) diff --git a/dlls/winhttp/url.c b/dlls/winhttp/url.c index 798b549..d8b423c 100644 --- a/dlls/winhttp/url.c +++ b/dlls/winhttp/url.c @@ -38,7 +38,7 @@ static BOOL set_component( WCHAR **str, DWORD *str_len, WCHAR *value, DWORD len, { if (!*str) { - if (len && *str_len && (flags & ICU_DECODE)) + if (len && *str_len && (flags & (ICU_DECODE|ICU_ESCAPE))) { set_last_error( ERROR_INVALID_PARAMETER ); return FALSE; @@ -89,18 +89,93 @@ static WCHAR *decode_url( LPCWSTR url, DWORD *len ) return ret; } +static BOOL need_escape( WCHAR c ) +{ + if (isalnumW( c )) return FALSE; + + if (c <= 31 || c >= 127) return TRUE; + else + { + switch (c) + { + case ' ': + case '"': + case '#': + case '%': + case '<': + case '>': + case ']': + case '\\': + case '[': + case '^': + case '`': + case '{': + case '|': + case '}': + case '~': + return TRUE; + default: + return FALSE; + } + } +} + +static DWORD copy_escape( WCHAR *dst, const WCHAR *src, DWORD len ) +{ + static const WCHAR hex[] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'}; + DWORD ret = len; + unsigned int i; + WCHAR *p = dst; + + for (i = 0; i < len; i++, p++) + { + if (need_escape( src[i] )) + { + p[0] = '%'; + p[1] = hex[(src[i] >> 4) & 0xf]; + p[2] = hex[src[i] & 0xf]; + ret += 2; + p += 2; + } + else *p = src[i]; + } + dst[ret] = 0; + return ret; +} + +static WCHAR *escape_url( LPCWSTR url, DWORD *len ) +{ + WCHAR *ret; + const WCHAR *p, *q; + + if ((p = q = strrchrW( url, '/' ))) + { + while (*q) + { + if (need_escape( *q )) *len += 2; + q++; + } + } + if (!(ret = heap_alloc( (*len + 1) * sizeof(WCHAR) ))) return NULL; + if (!p) strcpyW( ret, url ); + else + { + memcpy( ret, url, (p - url) * sizeof(WCHAR) ); + copy_escape( ret + (p - url), p, q - p ); + } + return ret; +} + /*********************************************************************** * WinHttpCrackUrl (winhttp.@) */ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONENTSW uc ) { BOOL ret = FALSE; - WCHAR *p, *q, *r, *url_decoded = NULL; + WCHAR *p, *q, *r, *url_decoded = NULL, *url_escaped = NULL; TRACE("%s, %d, %x, %p\n", debugstr_w(url), len, flags, uc); - if (flags & ICU_ESCAPE) FIXME("flag ICU_ESCAPE not supported\n"); - if (!url || !uc || uc->dwStructSize != sizeof(URL_COMPONENTS)) { set_last_error( ERROR_INVALID_PARAMETER ); @@ -108,7 +183,16 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN } if (!len) len = strlenW( url ); - if (flags & ICU_DECODE) + if (flags & ICU_ESCAPE) + { + if (!(url_escaped = escape_url( url, &len ))) + { + set_last_error( ERROR_OUTOFMEMORY ); + return FALSE; + } + url = url_escaped; + } + else if (flags & ICU_DECODE) { if (!(url_decoded = decode_url( url, &len ))) { @@ -211,6 +295,7 @@ BOOL WINAPI WinHttpCrackUrl( LPCWSTR url, DWORD len, DWORD flags, LPURL_COMPONEN exit: heap_free( url_decoded ); + heap_free( url_escaped ); return ret; } @@ -235,60 +320,6 @@ static BOOL uses_default_port( INTERNET_SCHEME scheme, INTERNET_PORT port ) return FALSE; } -static BOOL need_escape( WCHAR c ) -{ - if (isalnumW( c )) return FALSE; - - if (c <= 31 || c >= 127) return TRUE; - else - { - switch (c) - { - case ' ': - case '"': - case '#': - case '%': - case '<': - case '>': - case ']': - case '\\': - case '[': - case '^': - case '`': - case '{': - case '|': - case '}': - case '~': - return TRUE; - default: - return FALSE; - } - } -} - -static DWORD copy_escape( WCHAR *dst, const WCHAR *src, DWORD len ) -{ - static const WCHAR hex[] = {'0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F'}; - DWORD ret = len; - unsigned int i; - WCHAR *p = dst; - - for (i = 0; i < len; i++, p++) - { - if (need_escape( src[i] )) - { - p[0] = '%'; - p[1] = hex[(src[i] >> 4) & 0xf]; - p[2] = hex[src[i] & 0xf]; - ret += 2; - p += 2; - } - else *p = src[i]; - } - dst[ret] = 0; - return ret; -} - static DWORD comp_length( DWORD len, DWORD flags, WCHAR *comp ) { DWORD ret;

1 0

Hans Leidekker : winhttp: Double the handle table size on reallocation.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 5683433f9cc4d3d8f05a11b5f9fa25cb27c6ebf9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5683433f9cc4d3d8f05a11b5f… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 1 13:02:53 2011 +0100 winhttp: Double the handle table size on reallocation. --- dlls/winhttp/handle.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/handle.c b/dlls/winhttp/handle.c index 7010727..7a346a8 100644 --- a/dlls/winhttp/handle.c +++ b/dlls/winhttp/handle.c @@ -103,7 +103,7 @@ HINTERNET alloc_handle( object_header_t *hdr ) } if (max_handles == next_handle) { - num = max_handles + HANDLE_CHUNK_SIZE; + num = max_handles * 2; if (!(p = heap_realloc_zero( handles, sizeof(ULONG_PTR) * num ))) goto end; handles = p; max_handles = num;

1 0

Hans Leidekker : msi: Split up delete_reg_key_or_value.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 959ebdb118aa5d32c2d0f6cd6975263317968eab URL: http://source.winehq.org/git/wine.git/?a=commit;h=959ebdb118aa5d32c2d0f6cd6… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 1 13:04:19 2011 +0100 msi: Split up delete_reg_key_or_value. --- dlls/msi/action.c | 32 +++++++++++++++----------------- 1 files changed, 15 insertions(+), 17 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 6bc4fff..c3e971e 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2689,40 +2689,36 @@ static UINT ACTION_WriteRegistryValues(MSIPACKAGE *package) return rc; } -static void delete_reg_key_or_value( HKEY hkey_root, LPCWSTR key, LPCWSTR value, BOOL delete_key ) +static void delete_reg_value( HKEY root, const WCHAR *keypath, const WCHAR *value ) { LONG res; HKEY hkey; DWORD num_subkeys, num_values; - if (delete_key) - { - if ((res = RegDeleteTreeW( hkey_root, key ))) - { - TRACE("Failed to delete key %s (%d)\n", debugstr_w(key), res); - } - return; - } - - if (!(res = RegOpenKeyW( hkey_root, key, &hkey ))) + if (!(res = RegOpenKeyW( root, keypath, &hkey ))) { if ((res = RegDeleteValueW( hkey, value ))) { - TRACE("Failed to delete value %s (%d)\n", debugstr_w(value), res); + TRACE("failed to delete value %s (%d)\n", debugstr_w(value), res); } res = RegQueryInfoKeyW( hkey, NULL, NULL, NULL, &num_subkeys, NULL, NULL, &num_values, NULL, NULL, NULL, NULL ); RegCloseKey( hkey ); if (!res && !num_subkeys && !num_values) { - TRACE("Removing empty key %s\n", debugstr_w(key)); - RegDeleteKeyW( hkey_root, key ); + TRACE("removing empty key %s\n", debugstr_w(keypath)); + RegDeleteKeyW( root, keypath ); } return; } - TRACE("Failed to open key %s (%d)\n", debugstr_w(key), res); + TRACE("failed to open key %s (%d)\n", debugstr_w(keypath), res); } +static void delete_reg_key( HKEY root, const WCHAR *keypath ) +{ + LONG res = RegDeleteTreeW( root, keypath ); + if (res) TRACE("failed to delete key %s (%d)\n", debugstr_w(keypath), res); +} static UINT ITERATE_RemoveRegistryValuesOnUninstall( MSIRECORD *row, LPVOID param ) { @@ -2779,7 +2775,8 @@ static UINT ITERATE_RemoveRegistryValuesOnUninstall( MSIRECORD *row, LPVOID para keypath = get_keypath( package, hkey_root, deformated_key ); msi_free( deformated_key ); - delete_reg_key_or_value( hkey_root, keypath, deformated_name, delete_key ); + if (delete_key) delete_reg_key( hkey_root, keypath ); + else delete_reg_value( hkey_root, keypath, deformated_name ); msi_free( keypath ); uirow = MSI_CreateRecord( 2 ); @@ -2843,7 +2840,8 @@ static UINT ITERATE_RemoveRegistryValuesOnInstall( MSIRECORD *row, LPVOID param keypath = get_keypath( package, hkey_root, deformated_key ); msi_free( deformated_key ); - delete_reg_key_or_value( hkey_root, keypath, deformated_name, delete_key ); + if (delete_key) delete_reg_key( hkey_root, keypath ); + else delete_reg_value( hkey_root, keypath, deformated_name ); msi_free( keypath ); uirow = MSI_CreateRecord( 2 );

1 0

Hans Leidekker : msi: Resolve the target folder if necessary in msi_get_target_folder.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 39b7e6e50cf6ea4562e1d5a2788eea35886c7bf5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39b7e6e50cf6ea4562e1d5a27… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Dec 1 13:04:44 2011 +0100 msi: Resolve the target folder if necessary in msi_get_target_folder. --- dlls/msi/action.c | 10 ++-------- dlls/msi/install.c | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index c3e971e..d4170f5 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -3517,14 +3517,8 @@ static WCHAR *get_link_file( MSIPACKAGE *package, MSIRECORD *row ) link_folder = msi_get_target_folder( package, directory ); if (!link_folder) { - /* some installers use a separate root */ - MSIFOLDER *folder = msi_get_loaded_folder( package, directory ); - while (folder->Parent && strcmpW( folder->Parent, folder->Directory )) - { - folder = msi_get_loaded_folder( package, folder->Parent ); - } - msi_resolve_target_folder( package, folder->Directory, TRUE ); - link_folder = msi_get_target_folder( package, directory ); + ERR("unable to resolve folder %s\n", debugstr_w(directory)); + return NULL; } /* may be needed because of a bug somewhere else */ msi_create_full_path( link_folder ); diff --git a/dlls/msi/install.c b/dlls/msi/install.c index 285d7c9..fc5a625 100644 --- a/dlls/msi/install.c +++ b/dlls/msi/install.c @@ -213,8 +213,18 @@ UINT msi_strcpy_to_awstring( LPCWSTR str, awstring *awbuf, DWORD *sz ) const WCHAR *msi_get_target_folder( MSIPACKAGE *package, const WCHAR *name ) { MSIFOLDER *folder = msi_get_loaded_folder( package, name ); - if (folder) return folder->ResolvedTarget; - return NULL; + + if (!folder) return NULL; + if (!folder->ResolvedTarget) + { + MSIFOLDER *parent = folder; + while (parent->Parent && strcmpW( parent->Parent, parent->Directory )) + { + parent = msi_get_loaded_folder( package, parent->Parent ); + } + msi_resolve_target_folder( package, parent->Directory, TRUE ); + } + return folder->ResolvedTarget; } /***********************************************************************

1 0

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

01 Dec '11

Module: wine Branch: master Commit: e5a31cc2d0184c85fa335b36436f30dbea8e19de URL: http://source.winehq.org/git/wine.git/?a=commit;h=e5a31cc2d0184c85fa335b364… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 1 13:22:52 2011 +0100 jscript: Use bytecode for '<' expression implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 20 +++++++++----------- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index b0fa861..e5598f6 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -408,6 +408,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return push_instr_bstr(ctx, OP_ident, ((identifier_expression_t*)expr)->identifier); case EXPR_IN: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_in); + case EXPR_LESS: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_lt); case EXPR_LITERAL: return compile_literal(ctx, ((literal_expression_t*)expr)->literal); case EXPR_LOGNEG: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 62efc44..25af171 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3016,26 +3016,24 @@ static HRESULT less_eval(script_ctx_t *ctx, VARIANT *lval, VARIANT *rval, BOOL g } /* ECMA-262 3rd Edition 11.8.1 */ -HRESULT less_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT interp_lt(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; - VARIANT rval, lval; + VARIANT *l, *r; BOOL b; HRESULT hres; - TRACE("\n"); + r = stack_pop(ctx); + l = stack_pop(ctx); - hres = get_binary_expr_values(ctx, expr, ei, &lval, &rval); - if(FAILED(hres)) - return hres; + TRACE("%s < %s\n", debugstr_variant(l), debugstr_variant(r)); - hres = less_eval(ctx, &lval, &rval, FALSE, ei, &b); - VariantClear(&lval); - VariantClear(&rval); + hres = less_eval(ctx->parser->script, l, r, FALSE, &ctx->ei, &b); + VariantClear(l); + VariantClear(r); if(FAILED(hres)) return hres; - return return_bool(ret, b); + return stack_push_bool(ctx, b); } /* ECMA-262 3rd Edition 11.8.3 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 362e9d1..7d39102 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -56,6 +56,7 @@ typedef struct _func_stack { X(jmp, 0, ARG_ADDR, 0) \ X(jmp_nz, 0, ARG_ADDR, 0) \ X(jmp_z, 0, ARG_ADDR, 0) \ + X(lt, 1, 0,0) \ X(minus, 1, 0,0) \ X(mod, 1, 0,0) \ X(mul, 1, 0,0) \ @@ -560,7 +561,6 @@ HRESULT post_increment_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcep HRESULT post_decrement_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT pre_increment_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT pre_decrement_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT less_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT lesseq_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT greater_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT greatereq_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 3fffbe9..45d1ce9 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1331,7 +1331,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - less_expression_eval, + compiled_expression_eval, lesseq_expression_eval, greater_expression_eval, greatereq_expression_eval,

1 0

Jacek Caban : jscript: Use bytecode for '<=' expression implementation.
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: fb51810a95234451226f6de2b12ebf80b730a740 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb51810a95234451226f6de2b… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 1 13:23:03 2011 +0100 jscript: Use bytecode for '<=' expression implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 22 ++++++++++------------ dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index e5598f6..04c247e 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -410,6 +410,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_in); case EXPR_LESS: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_lt); + case EXPR_LESSEQ: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_lteq); case EXPR_LITERAL: return compile_literal(ctx, ((literal_expression_t*)expr)->literal); case EXPR_LOGNEG: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 25af171..76cc0c8 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3036,27 +3036,25 @@ static HRESULT interp_lt(exec_ctx_t *ctx) return stack_push_bool(ctx, b); } -/* ECMA-262 3rd Edition 11.8.3 */ -HRESULT lesseq_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +/* ECMA-262 3rd Edition 11.8.1 */ +static HRESULT interp_lteq(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; - VARIANT rval, lval; + VARIANT *l, *r; BOOL b; HRESULT hres; - TRACE("\n"); + r = stack_pop(ctx); + l = stack_pop(ctx); - hres = get_binary_expr_values(ctx, expr, ei, &lval, &rval); - if(FAILED(hres)) - return hres; + TRACE("%s <= %s\n", debugstr_variant(l), debugstr_variant(r)); - hres = less_eval(ctx, &rval, &lval, TRUE, ei, &b); - VariantClear(&lval); - VariantClear(&rval); + hres = less_eval(ctx->parser->script, r, l, TRUE, &ctx->ei, &b); + VariantClear(l); + VariantClear(r); if(FAILED(hres)) return hres; - return return_bool(ret, b); + return stack_push_bool(ctx, b); } /* ECMA-262 3rd Edition 11.8.2 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 7d39102..8131b5f 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -57,6 +57,7 @@ typedef struct _func_stack { X(jmp_nz, 0, ARG_ADDR, 0) \ X(jmp_z, 0, ARG_ADDR, 0) \ X(lt, 1, 0,0) \ + X(lteq, 1, 0,0) \ X(minus, 1, 0,0) \ X(mod, 1, 0,0) \ X(mul, 1, 0,0) \ @@ -561,7 +562,6 @@ HRESULT post_increment_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcep HRESULT post_decrement_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT pre_increment_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT pre_decrement_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT lesseq_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT greater_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT greatereq_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; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 45d1ce9..e815667 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1332,7 +1332,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - lesseq_expression_eval, + compiled_expression_eval, greater_expression_eval, greatereq_expression_eval, compiled_expression_eval,

1 0

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

01 Dec '11

Module: wine Branch: master Commit: f3e18fbf03d0894b83b949542ec2975b742d71d5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3e18fbf03d0894b83b949542… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 1 13:23:16 2011 +0100 jscript: Use bytecode for '>' expression implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 20 +++++++++----------- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 04c247e..7a82683 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -404,6 +404,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_eq); case EXPR_EQEQ: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_eq2); + case EXPR_GREATER: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_gt); case EXPR_IDENT: return push_instr_bstr(ctx, OP_ident, ((identifier_expression_t*)expr)->identifier); case EXPR_IN: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 76cc0c8..8d177c2 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3058,26 +3058,24 @@ static HRESULT interp_lteq(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.8.2 */ -HRESULT greater_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT interp_gt(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; - VARIANT rval, lval; + VARIANT *l, *r; BOOL b; HRESULT hres; - TRACE("\n"); + r = stack_pop(ctx); + l = stack_pop(ctx); - hres = get_binary_expr_values(ctx, expr, ei, &lval, &rval); - if(FAILED(hres)) - return hres; + TRACE("%s > %s\n", debugstr_variant(l), debugstr_variant(r)); - hres = less_eval(ctx, &rval, &lval, FALSE, ei, &b); - VariantClear(&lval); - VariantClear(&rval); + hres = less_eval(ctx->parser->script, r, l, FALSE, &ctx->ei, &b); + VariantClear(l); + VariantClear(r); if(FAILED(hres)) return hres; - return return_bool(ret, b); + return stack_push_bool(ctx, b); } /* ECMA-262 3rd Edition 11.8.4 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index 8131b5f..c176180 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -50,6 +50,7 @@ typedef struct _func_stack { X(double, 1, ARG_SBL, 0) \ X(eq, 1, 0,0) \ X(eq2, 1, 0,0) \ + X(gt, 1, 0,0) \ X(ident, 1, ARG_BSTR, 0) \ X(in, 1, 0,0) \ X(int, 1, ARG_INT, 0) \ @@ -562,7 +563,6 @@ HRESULT post_increment_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcep HRESULT post_decrement_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT pre_increment_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT pre_decrement_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT greater_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT greatereq_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 right_shift_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 e815667..39bcba6 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1333,7 +1333,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - greater_expression_eval, + compiled_expression_eval, greatereq_expression_eval, compiled_expression_eval, compiled_expression_eval,

1 0

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

01 Dec '11

Module: wine Branch: master Commit: 9f9f5ae0a7a5ec9ce31bd110c6a30fd172f8ee37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f9f5ae0a7a5ec9ce31bd110c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Dec 1 13:23:36 2011 +0100 jscript: Use bytecode for '>=' expression implementation. --- dlls/jscript/compile.c | 2 ++ dlls/jscript/engine.c | 20 +++++++++----------- dlls/jscript/engine.h | 2 +- dlls/jscript/parser.y | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index 7a82683..ed42b4d 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -406,6 +406,8 @@ static HRESULT compile_expression(compiler_ctx_t *ctx, expression_t *expr) return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_eq2); case EXPR_GREATER: return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_gt); + case EXPR_GREATEREQ: + return compile_binary_expression(ctx, (binary_expression_t*)expr, OP_gteq); case EXPR_IDENT: return push_instr_bstr(ctx, OP_ident, ((identifier_expression_t*)expr)->identifier); case EXPR_IN: diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index 8d177c2..d24392c 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -3079,26 +3079,24 @@ static HRESULT interp_gt(exec_ctx_t *ctx) } /* ECMA-262 3rd Edition 11.8.4 */ -HRESULT greatereq_expression_eval(script_ctx_t *ctx, expression_t *_expr, DWORD flags, jsexcept_t *ei, exprval_t *ret) +static HRESULT interp_gteq(exec_ctx_t *ctx) { - binary_expression_t *expr = (binary_expression_t*)_expr; - VARIANT rval, lval; + VARIANT *l, *r; BOOL b; HRESULT hres; - TRACE("\n"); + r = stack_pop(ctx); + l = stack_pop(ctx); - hres = get_binary_expr_values(ctx, expr, ei, &lval, &rval); - if(FAILED(hres)) - return hres; + TRACE("%s >= %s\n", debugstr_variant(l), debugstr_variant(r)); - hres = less_eval(ctx, &lval, &rval, TRUE, ei, &b); - VariantClear(&lval); - VariantClear(&rval); + hres = less_eval(ctx->parser->script, l, r, TRUE, &ctx->ei, &b); + VariantClear(l); + VariantClear(r); if(FAILED(hres)) return hres; - return return_bool(ret, b); + return stack_push_bool(ctx, b); } /* ECMA-262 3rd Edition 11.4.8 */ diff --git a/dlls/jscript/engine.h b/dlls/jscript/engine.h index c176180..e86db0f 100644 --- a/dlls/jscript/engine.h +++ b/dlls/jscript/engine.h @@ -51,6 +51,7 @@ typedef struct _func_stack { X(eq, 1, 0,0) \ X(eq2, 1, 0,0) \ X(gt, 1, 0,0) \ + X(gteq, 1, 0,0) \ X(ident, 1, ARG_BSTR, 0) \ X(in, 1, 0,0) \ X(int, 1, ARG_INT, 0) \ @@ -563,7 +564,6 @@ HRESULT post_increment_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcep HRESULT post_decrement_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT pre_increment_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; HRESULT pre_decrement_expression_eval(script_ctx_t*,expression_t*,DWORD,jsexcept_t*,exprval_t*) DECLSPEC_HIDDEN; -HRESULT greatereq_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 right_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; diff --git a/dlls/jscript/parser.y b/dlls/jscript/parser.y index 39bcba6..c1c5df6 100644 --- a/dlls/jscript/parser.y +++ b/dlls/jscript/parser.y @@ -1334,7 +1334,7 @@ static const expression_eval_t expression_eval_table[] = { compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, - greatereq_expression_eval, + compiled_expression_eval, compiled_expression_eval, compiled_expression_eval, left_shift_expression_eval,

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: SetMatrixTransposeArray().
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 1e0f04e5cf65c7ccc6ec1e435eb1f26e631ce273 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e0f04e5cf65c7ccc6ec1e435… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Dec 1 13:44:55 2011 +0100 d3dx9: Implement ID3DXBaseEffect::SetMatrixTransposeArray(). --- dlls/d3dx9_36/effect.c | 35 +++++++++++++++++++++++++++++++++-- 1 files changed, 33 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 4d08180..2cf12ac 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2305,10 +2305,41 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixTranspose(ID3DXBaseEffect *if static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixTransposeArray(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); + D3DXMATRIX m; - 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]), D3DXMatrixTranspose(&m, &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_GetMatrixTransposeArray(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXMATRIX *matrix, UINT count)

1 0

Rico Schüller : d3dx9: Implement ID3DXBaseEffect:: SetMatrixTranspose().
by Alexandre Julliard 01 Dec '11

01 Dec '11

Module: wine Branch: master Commit: 90415ebdfacbe22824ad1857ce37b200cc66d77c URL: http://source.winehq.org/git/wine.git/?a=commit;h=90415ebdfacbe22824ad1857c… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Dec 1 13:45:07 2011 +0100 d3dx9: Implement ID3DXBaseEffect::SetMatrixTranspose(). --- dlls/d3dx9_36/effect.c | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 2cf12ac..927e067 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -2257,10 +2257,36 @@ static HRESULT WINAPI ID3DXBaseEffectImpl_GetMatrixPointerArray(ID3DXBaseEffect static HRESULT WINAPI ID3DXBaseEffectImpl_SetMatrixTranspose(ID3DXBaseEffect *iface, D3DXHANDLE parameter, CONST D3DXMATRIX *matrix) { struct ID3DXBaseEffectImpl *This = impl_from_ID3DXBaseEffect(iface); + struct d3dx_parameter *param = get_valid_parameter(This, parameter); + D3DXMATRIX m; - 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, D3DXMatrixTranspose(&m, 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_GetMatrixTranspose(ID3DXBaseEffect *iface, D3DXHANDLE parameter, D3DXMATRIX *matrix)

1 0