May 2012 - Wine-Commits - list.winehq.org

Jacek Caban : jscript: Better handling of to_integer result in String. substring.
by Alexandre Julliard May 3, 2012

May 3, 2012

Module: wine Branch: master Commit: 9b02d2d5a3c83a8819e4e1b4a83a2c789dab9b27 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b02d2d5a3c83a8819e4e1b4a… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 3 10:41:23 2012 +0200 jscript: Better handling of to_integer result in String.substring. --- dlls/jscript/string.c | 27 +++++++++------------------ 1 files changed, 9 insertions(+), 18 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 773e3a3..3b7e700 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1302,6 +1302,7 @@ static HRESULT String_substring(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, INT start=0, end; DWORD length; VARIANT v; + double d; HRESULT hres; TRACE("\n"); @@ -1317,15 +1318,9 @@ static HRESULT String_substring(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return hres; } - if(V_VT(&v) == VT_I4) { - start = V_I4(&v); - if(start < 0) - start = 0; - else if(start >= length) - start = length; - }else { - start = V_R8(&v) < 0.0 ? 0 : length; - } + d = num_val(&v); + if(d >= 0) + start = is_int32(d) ? min((int)d, length) : length; } if(arg_cnt(dp) >= 2) { @@ -1335,15 +1330,11 @@ static HRESULT String_substring(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return hres; } - if(V_VT(&v) == VT_I4) { - end = V_I4(&v); - if(end < 0) - end = 0; - else if(end > length) - end = length; - }else { - end = V_R8(&v) < 0.0 ? 0 : length; - } + d = num_val(&v); + if(d >= 0) + end = is_int32(d) ? min((int)d, length) : length; + else + end = 0; }else { end = length; }

1 0

Jacek Caban : jscript: Better handling of to_integer result in Array.splice .
by Alexandre Julliard May 3, 2012

May 3, 2012

Module: wine Branch: master Commit: 3ee7438a5ffed4187dda3054449e898e2c269ee1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ee7438a5ffed4187dda30544… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 3 10:40:04 2012 +0200 jscript: Better handling of to_integer result in Array.splice. --- dlls/jscript/array.c | 22 +++++++++++++--------- dlls/jscript/tests/api.js | 22 ++++++++++++++++++++++ 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index fe8d751..e288525 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -853,6 +853,8 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP { DWORD length, start=0, delete_cnt=0, argc, i, add_args = 0; jsdisp_t *ret_array = NULL, *jsthis; + double d; + int n; VARIANT v; HRESULT hres = S_OK; @@ -867,14 +869,15 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP hres = to_integer(ctx, get_arg(dp,0), ei, &v); if(FAILED(hres)) return hres; + d = num_val(&v); - if(V_VT(&v) == VT_I4) { - if(V_I4(&v) >= 0) - start = min(V_I4(&v), length); + if(is_int32(d)) { + if((n = d) >= 0) + start = min(n, length); else - start = -V_I4(&v) > length ? 0 : length + V_I4(&v); + start = -n > length ? 0 : length + n; }else { - start = V_R8(&v) < 0.0 ? 0 : length; + start = d < 0.0 ? 0 : length; } } @@ -882,11 +885,12 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP hres = to_integer(ctx, get_arg(dp,1), ei, &v); if(FAILED(hres)) return hres; + d = num_val(&v); - if(V_VT(&v) == VT_I4) { - if(V_I4(&v) > 0) - delete_cnt = min(V_I4(&v), length-start); - }else if(V_R8(&v) > 0.0) { + if(is_int32(d)) { + if((n = d) > 0) + delete_cnt = min(n, length-start); + }else if(d > 0.0) { delete_cnt = length-start; } diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index e81bb3f..c1ae808 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -18,6 +18,8 @@ var tmp, i; +var bigInt = Math.pow(2,40); + ok(ScriptEngine() === "JScript", "ScriptEngine() = " + ScriptEngine()); ok(ScriptEngine(3) === "JScript", "ScriptEngine(3) = " + ScriptEngine(3)); ok(ScriptEngineMajorVersion() === ScriptEngineMajorVersion(2), "ScriptEngineMajorVersion() !== ScriptEngineMajorVersion(2)"); @@ -996,6 +998,26 @@ tmp = arr.splice(); ok(tmp.toString() == "", "arr.splice(2,-1) returned " + tmp.toString()); ok(arr.toString() == "1,2,3,4,5", "arr.splice(2,-1) is " + arr.toString()); +arr = [1,2,3,4,5]; +tmp = arr.splice(bigInt); +ok(tmp.toString() == "", "arr.splice(bigInt) returned " + tmp.toString()); +ok(arr.toString() == "1,2,3,4,5", "arr.splice(bigInt) is " + arr.toString()); + +arr = [1,2,3,4,5]; +tmp = arr.splice(-bigInt); +ok(tmp.toString() == "", "arr.splice(-bigInt) returned " + tmp.toString()); +ok(arr.toString() == "1,2,3,4,5", "arr.splice(-bigInt) is " + arr.toString()); + +arr = [1,2,3,4,5]; +tmp = arr.splice(2, bigInt); +ok(tmp.toString() == "3,4,5", "arr.splice(2, bigInt) returned " + tmp.toString()); +ok(arr.toString() == "1,2", "arr.splice(2, bigInt) is " + arr.toString()); + +arr = [1,2,3,4,5]; +tmp = arr.splice(2, -bigInt); +ok(tmp.toString() == "", "arr.splice(2, bigInt) returned " + tmp.toString()); +ok(arr.toString() == "1,2,3,4,5", "arr.splice(2, bigInt) is " + arr.toString()); + obj = new Object(); obj.length = 3; obj[0] = 1;

1 0

Jacek Caban : jscript: Better handling of to_integer result in String. lastIndexOf.
by Alexandre Julliard May 3, 2012

May 3, 2012

Module: wine Branch: master Commit: d49635f08acaa5ed6bfc167a1759d8a9687d68c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d49635f08acaa5ed6bfc167a1… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 3 10:40:57 2012 +0200 jscript: Better handling of to_integer result in String.lastIndexOf. --- dlls/jscript/string.c | 12 +++++------- dlls/jscript/tests/api.js | 2 ++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index d74f8cf..62cc6f0 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -538,7 +538,7 @@ static HRESULT String_lastIndexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags VARIANT *retv, jsexcept_t *ei) { BSTR search_str, val_str; - DWORD length, pos, search_len; + DWORD length, pos = 0, search_len; const WCHAR *str; INT ret = -1; HRESULT hres; @@ -568,15 +568,13 @@ static HRESULT String_lastIndexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags if(arg_cnt(dp) >= 2) { VARIANT ival; + double d; hres = to_integer(ctx, get_arg(dp,1), ei, &ival); if(SUCCEEDED(hres)) { - if(V_VT(&ival) == VT_I4) - pos = V_VT(&ival) > 0 ? V_I4(&ival) : 0; - else - pos = V_R8(&ival) > 0.0 ? length : 0; - if(pos > length) - pos = length; + d = num_val(&ival); + if(d > 0) + pos = is_int32(d) ? min((int)d, length) : length; } }else { pos = length; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 8d8e819..b25f0ae 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -496,6 +496,8 @@ tmp = "aaaa".lastIndexOf("a",2); ok(tmp == 2, "lastIndexOf = " + tmp); tmp = strObj.lastIndexOf("b"); ok(tmp === 1, "lastIndexOf = " + tmp); +tmp = "bbb".lastIndexOf("b", bigInt); +ok(tmp === 2, "lastIndexOf = " + tmp); tmp = "".toLowerCase(); ok(tmp === "", "''.toLowerCase() = " + tmp);

1 0

Jacek Caban : jscript: Better handling of to_integer result in String.slice .
by Alexandre Julliard May 3, 2012

May 3, 2012

Module: wine Branch: master Commit: c01562040da27ed0d0d1cd559281cd0064826eb2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c01562040da27ed0d0d1cd559… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 3 10:41:10 2012 +0200 jscript: Better handling of to_integer result in String.slice. --- dlls/jscript/string.c | 21 ++++++++++++--------- 1 files changed, 12 insertions(+), 9 deletions(-) diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 62cc6f0..773e3a3 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -1071,6 +1071,7 @@ static HRESULT String_slice(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP BSTR val_str; DWORD length; INT start=0, end; + double d; VARIANT v; HRESULT hres; @@ -1087,8 +1088,10 @@ static HRESULT String_slice(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP return hres; } - if(V_VT(&v) == VT_I4) { - start = V_I4(&v); + d = num_val(&v); + + if(is_int32(d)) { + start = d; if(start < 0) { start = length + start; if(start < 0) @@ -1096,11 +1099,9 @@ static HRESULT String_slice(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP }else if(start > length) { start = length; } - }else { - start = V_R8(&v) < 0.0 ? 0 : length; + }else if(d > 0) { + start = length; } - }else { - start = 0; } if(arg_cnt(dp) >= 2) { @@ -1110,8 +1111,10 @@ static HRESULT String_slice(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP return hres; } - if(V_VT(&v) == VT_I4) { - end = V_I4(&v); + d = num_val(&v); + + if(is_int32(d)) { + end = d; if(end < 0) { end = length + end; if(end < 0) @@ -1120,7 +1123,7 @@ static HRESULT String_slice(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP end = length; } }else { - end = V_R8(&v) < 0.0 ? 0 : length; + end = d < 0.0 ? 0 : length; } }else { end = length;

1 0

Jacek Caban : jscript: Return double from to_integer.
by Alexandre Julliard May 3, 2012

May 3, 2012

Module: wine Branch: master Commit: 56bf46fda0770d5de871b955f397bd8f1343cb7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=56bf46fda0770d5de871b955f… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 3 10:42:42 2012 +0200 jscript: Return double from to_integer. --- dlls/jscript/array.c | 8 ++---- dlls/jscript/jscript.h | 2 +- dlls/jscript/jsutils.c | 15 +++++------- dlls/jscript/string.c | 56 +++++++++++++---------------------------------- 4 files changed, 26 insertions(+), 55 deletions(-) diff --git a/dlls/jscript/array.c b/dlls/jscript/array.c index e288525..5ff6344 100644 --- a/dlls/jscript/array.c +++ b/dlls/jscript/array.c @@ -853,9 +853,9 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP { DWORD length, start=0, delete_cnt=0, argc, i, add_args = 0; jsdisp_t *ret_array = NULL, *jsthis; + VARIANT v; double d; int n; - VARIANT v; HRESULT hres = S_OK; TRACE("\n"); @@ -866,10 +866,9 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP argc = arg_cnt(dp); if(argc >= 1) { - hres = to_integer(ctx, get_arg(dp,0), ei, &v); + hres = to_integer(ctx, get_arg(dp,0), ei, &d); if(FAILED(hres)) return hres; - d = num_val(&v); if(is_int32(d)) { if((n = d) >= 0) @@ -882,10 +881,9 @@ static HRESULT Array_splice(script_ctx_t *ctx, vdisp_t *vthis, WORD flags, DISPP } if(argc >= 2) { - hres = to_integer(ctx, get_arg(dp,1), ei, &v); + hres = to_integer(ctx, get_arg(dp,1), ei, &d); if(FAILED(hres)) return hres; - d = num_val(&v); if(is_int32(d)) { if((n = d) > 0) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index c9bd6c0..dcdd143 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -254,7 +254,7 @@ typedef enum { HRESULT to_primitive(script_ctx_t*,VARIANT*,jsexcept_t*,VARIANT*, hint_t) DECLSPEC_HIDDEN; HRESULT to_boolean(VARIANT*,VARIANT_BOOL*) DECLSPEC_HIDDEN; HRESULT to_number(script_ctx_t*,VARIANT*,jsexcept_t*,double*) DECLSPEC_HIDDEN; -HRESULT to_integer(script_ctx_t*,VARIANT*,jsexcept_t*,VARIANT*) DECLSPEC_HIDDEN; +HRESULT to_integer(script_ctx_t*,VARIANT*,jsexcept_t*,double*) DECLSPEC_HIDDEN; HRESULT to_int32(script_ctx_t*,VARIANT*,jsexcept_t*,INT*) DECLSPEC_HIDDEN; HRESULT to_uint32(script_ctx_t*,VARIANT*,jsexcept_t*,DWORD*) DECLSPEC_HIDDEN; HRESULT to_string(script_ctx_t*,VARIANT*,jsexcept_t*,BSTR*) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 5e7e347..c3924b7 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -457,13 +457,13 @@ HRESULT to_number(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, double *ret) } /* ECMA-262 3rd Edition 9.4 */ -HRESULT to_integer(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret) +HRESULT to_integer(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, double *ret) { double n; HRESULT hres; if(V_VT(v) == VT_I4) { - *ret = *v; + *ret = V_I4(v); return S_OK; } @@ -471,13 +471,10 @@ HRESULT to_integer(script_ctx_t *ctx, VARIANT *v, jsexcept_t *ei, VARIANT *ret) if(FAILED(hres)) return hres; - if(isnan(n)) { - V_VT(ret) = VT_I4; - V_I4(ret) = 0; - }else { - num_set_val(ret, n >= 0.0 ? floor(n) : -floor(-n)); - } - + if(isnan(n)) + *ret = 0; + else + *ret = n >= 0.0 ? floor(n) : -floor(-n); return S_OK; } diff --git a/dlls/jscript/string.c b/dlls/jscript/string.c index 9e2fcb2..ea826c6 100644 --- a/dlls/jscript/string.c +++ b/dlls/jscript/string.c @@ -302,15 +302,13 @@ static HRESULT String_charAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS return hres; if(arg_cnt(dp)) { - VARIANT num; double d; - hres = to_integer(ctx, get_arg(dp, 0), ei, &num); + hres = to_integer(ctx, get_arg(dp, 0), ei, &d); if(FAILED(hres)) { SysFreeString(val_str); return hres; } - d = num_val(&num); pos = is_int32(d) ? d : -1; } @@ -349,17 +347,14 @@ static HRESULT String_charCodeAt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return hres; if(arg_cnt(dp) > 0) { - VARIANT v; double d; - hres = to_integer(ctx, get_arg(dp, 0), ei, &v); + hres = to_integer(ctx, get_arg(dp, 0), ei, &d); if(FAILED(hres)) { SysFreeString(val_str); return hres; } - d = num_val(&v); - if(!is_int32(d) || d < 0 || d >= length) { SysFreeString(val_str); if(retv) @@ -493,15 +488,11 @@ static HRESULT String_indexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DI } if(arg_cnt(dp) >= 2) { - VARIANT ival; double d; - hres = to_integer(ctx, get_arg(dp,1), ei, &ival); - if(SUCCEEDED(hres)) { - d = num_val(&ival); - if(d > 0.0) - pos = is_int32(d) ? min((int)d, length) : length; - } + hres = to_integer(ctx, get_arg(dp,1), ei, &d); + if(SUCCEEDED(hres) && d > 0.0) + pos = is_int32(d) ? min(length, d) : length; } if(SUCCEEDED(hres)) { @@ -567,15 +558,11 @@ static HRESULT String_lastIndexOf(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags search_len = SysStringLen(search_str); if(arg_cnt(dp) >= 2) { - VARIANT ival; double d; - hres = to_integer(ctx, get_arg(dp,1), ei, &ival); - if(SUCCEEDED(hres)) { - d = num_val(&ival); - if(d > 0) - pos = is_int32(d) ? min((int)d, length) : length; - } + hres = to_integer(ctx, get_arg(dp,1), ei, &d); + if(SUCCEEDED(hres) && d > 0) + pos = is_int32(d) ? min(length, d) : length; }else { pos = length; } @@ -1072,7 +1059,6 @@ static HRESULT String_slice(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP DWORD length; INT start=0, end; double d; - VARIANT v; HRESULT hres; TRACE("\n"); @@ -1082,14 +1068,12 @@ static HRESULT String_slice(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP return hres; if(arg_cnt(dp)) { - hres = to_integer(ctx, get_arg(dp,0), ei, &v); + hres = to_integer(ctx, get_arg(dp,0), ei, &d); if(FAILED(hres)) { SysFreeString(val_str); return hres; } - d = num_val(&v); - if(is_int32(d)) { start = d; if(start < 0) { @@ -1105,14 +1089,12 @@ static HRESULT String_slice(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DISP } if(arg_cnt(dp) >= 2) { - hres = to_integer(ctx, get_arg(dp,1), ei, &v); + hres = to_integer(ctx, get_arg(dp,1), ei, &d); if(FAILED(hres)) { SysFreeString(val_str); return hres; } - d = num_val(&v); - if(is_int32(d)) { end = d; if(end < 0) { @@ -1301,7 +1283,6 @@ static HRESULT String_substring(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, BSTR val_str; INT start=0, end; DWORD length; - VARIANT v; double d; HRESULT hres; @@ -1312,27 +1293,25 @@ static HRESULT String_substring(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return hres; if(arg_cnt(dp) >= 1) { - hres = to_integer(ctx, get_arg(dp,0), ei, &v); + hres = to_integer(ctx, get_arg(dp,0), ei, &d); if(FAILED(hres)) { SysFreeString(val_str); return hres; } - d = num_val(&v); if(d >= 0) - start = is_int32(d) ? min((int)d, length) : length; + start = is_int32(d) ? min(length, d) : length; } if(arg_cnt(dp) >= 2) { - hres = to_integer(ctx, get_arg(dp,1), ei, &v); + hres = to_integer(ctx, get_arg(dp,1), ei, &d); if(FAILED(hres)) { SysFreeString(val_str); return hres; } - d = num_val(&v); if(d >= 0) - end = is_int32(d) ? min((int)d, length) : length; + end = is_int32(d) ? min(length, d) : length; else end = 0; }else { @@ -1365,7 +1344,6 @@ static HRESULT String_substr(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS const WCHAR *str; INT start=0, len; DWORD length; - VARIANT v; double d; HRESULT hres; @@ -1376,25 +1354,23 @@ static HRESULT String_substr(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, DIS return hres; if(arg_cnt(dp) >= 1) { - hres = to_integer(ctx, get_arg(dp,0), ei, &v); + hres = to_integer(ctx, get_arg(dp,0), ei, &d); if(FAILED(hres)) { SysFreeString(val_str); return hres; } - d = num_val(&v); if(d >= 0) start = is_int32(d) ? min(length, d) : length; } if(arg_cnt(dp) >= 2) { - hres = to_integer(ctx, get_arg(dp,1), ei, &v); + hres = to_integer(ctx, get_arg(dp,1), ei, &d); if(FAILED(hres)) { SysFreeString(val_str); return hres; } - d = num_val(&v); if(d >= 0.0) len = is_int32(d) ? min(length-start, d) : length-start; else

1 0

Jacek Caban : wininet: Clean up HTTP_QUERY_STATUS_CODE tests.
by Alexandre Julliard May 3, 2012

May 3, 2012

Module: wine Branch: master Commit: ebf406c163405018bc57403527f112a3528629a7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ebf406c163405018bc5740352… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 3 12:19:33 2012 +0200 wininet: Clean up HTTP_QUERY_STATUS_CODE tests. --- dlls/wininet/tests/http.c | 126 ++++++++++++++++++++------------------------- 1 files changed, 56 insertions(+), 70 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 4974c88..6050220 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -178,6 +178,48 @@ static BOOL proxy_active(void) return proxy_enable != 0; } +#define test_status_code(a,b) _test_status_code(__LINE__,a,b) +static void _test_status_code(unsigned line, HINTERNET req, DWORD excode) +{ + DWORD code, size, index; + char exbuf[10], bufa[10]; + BOOL res; + + code = 0xdeadbeef; + size = sizeof(code); + res = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &code, &size, NULL); + ok_(__FILE__,line)(res, "HttpQueryInfo(HTTP_QUERY_STATUS_CODE|number) failed: %u\n", GetLastError()); + ok_(__FILE__,line)(code == excode, "code = %d, expected %d\n", code, excode); + + code = 0xdeadbeef; + index = 0; + size = sizeof(code); + res = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &code, &size, &index); + ok_(__FILE__,line)(res, "HttpQueryInfo(HTTP_QUERY_STATUS_CODE|number index) failed: %u\n", GetLastError()); + ok_(__FILE__,line)(code == excode, "code = %d, expected %d\n", code, excode); + ok_(__FILE__,line)(!index, "index = %d, expected 0\n", code); + + sprintf(exbuf, "%u", excode); + + size = sizeof(bufa); + res = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE, bufa, &size, NULL); + ok_(__FILE__,line)(res, "HttpQueryInfo(HTTP_QUERY_STATUS_CODE) failed: %u\n", GetLastError()); + ok_(__FILE__,line)(!strcmp(bufa, exbuf), "unexpected status code %s, expected %s", bufa, exbuf); + + code = 0xdeadbeef; + index = 1; + size = sizeof(code); + res = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE||HTTP_QUERY_FLAG_NUMBER, &code, &size, &index); + ok_(__FILE__,line)(!res && GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, + "HttpQueryInfo failed: %x(%d)\n", res, GetLastError()); + + code = 0xdeadbeef; + size = sizeof(code); + res = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE||HTTP_QUERY_FLAG_REQUEST_HEADERS, &code, &size, NULL); + ok_(__FILE__,line)(!res && GetLastError() == ERROR_HTTP_HEADER_NOT_FOUND, + "HttpQueryInfo failed: %x(%d)\n", res, GetLastError()); +} + static int close_handle_cnt; static VOID WINAPI callback( @@ -1848,7 +1890,7 @@ static void test_last_error(int port) static void test_proxy_indirect(int port) { HINTERNET hi, hc, hr; - DWORD r, sz, val; + DWORD r, sz; char buffer[0x40]; hi = InternetOpen(NULL, 0, NULL, NULL, 0); @@ -1873,15 +1915,7 @@ static void test_proxy_indirect(int port) } ok(!strcmp(buffer, "Basic realm=\"placebo\""), "proxy auth info wrong\n"); - sz = sizeof buffer; - r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE, buffer, &sz, NULL); - ok(r, "HttpQueryInfo failed\n"); - ok(!strcmp(buffer, "407"), "proxy code wrong\n"); - - sz = sizeof val; - r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &val, &sz, NULL); - ok(r, "HttpQueryInfo failed\n"); - ok(val == 407, "proxy code wrong\n"); + test_status_code(hr, 407); sz = sizeof buffer; r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_TEXT, buffer, &sz, NULL); @@ -1931,11 +1965,7 @@ static void test_proxy_direct(int port) r = HttpSendRequest(hr, NULL, 0, NULL, 0); ok(r, "HttpSendRequest failed\n"); - sz = sizeof buffer; - r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE, buffer, &sz, NULL); - ok(r, "HttpQueryInfo failed\n"); - ok(!strcmp(buffer, "407"), "proxy code wrong\n"); - + test_status_code(hr, 407); /* set the user + password then try again */ todo_wine { @@ -1986,11 +2016,7 @@ static void test_header_handling_order(int port) ret = HttpSendRequest(request, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed\n"); - status = 0; - size = sizeof(status); - ret = HttpQueryInfo( request, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); - ok(ret, "HttpQueryInfo failed\n"); - ok(status == 200, "request failed with status %u\n", status); + test_status_code(request, 200); InternetCloseHandle(request); @@ -2031,7 +2057,6 @@ static void test_header_handling_order(int port) static void test_connection_header(int port) { HINTERNET ses, con, req; - DWORD size, status; BOOL ret; ses = InternetOpen("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); @@ -2046,11 +2071,7 @@ static void test_connection_header(int port) ret = HttpSendRequest(req, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed\n"); - status = 0; - size = sizeof(status); - ret = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL); - ok(ret, "HttpQueryInfo failed\n"); - ok(status == 200, "request failed with status %u\n", status); + test_status_code(req, 200); InternetCloseHandle(req); @@ -2060,11 +2081,7 @@ static void test_connection_header(int port) ret = HttpSendRequest(req, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed\n"); - status = 0; - size = sizeof(status); - ret = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL); - ok(ret, "HttpQueryInfo failed\n"); - ok(status == 200, "request failed with status %u\n", status); + test_status_code(req, 200); InternetCloseHandle(req); @@ -2074,11 +2091,7 @@ static void test_connection_header(int port) ret = HttpSendRequest(req, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed\n"); - status = 0; - size = sizeof(status); - ret = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL); - ok(ret, "HttpQueryInfo failed\n"); - ok(status == 200, "request failed with status %u\n", status); + test_status_code(req, 200); InternetCloseHandle(req); @@ -2088,11 +2101,7 @@ static void test_connection_header(int port) ret = HttpSendRequest(req, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed\n"); - status = 0; - size = sizeof(status); - ret = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL); - ok(ret, "HttpQueryInfo failed\n"); - ok(status == 200, "request failed with status %u\n", status); + test_status_code(req, 200); InternetCloseHandle(req); InternetCloseHandle(con); @@ -2301,7 +2310,7 @@ static void test_HttpSendRequestW(int port) static void test_cookie_header(int port) { HINTERNET ses, con, req; - DWORD size, status, error; + DWORD size, error; BOOL ret; char buffer[64]; @@ -2336,11 +2345,7 @@ static void test_cookie_header(int port) ret = HttpSendRequest(req, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed: %u\n", GetLastError()); - status = 0; - size = sizeof(status); - ret = HttpQueryInfo(req, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL); - ok(ret, "HttpQueryInfo failed\n"); - ok(status == 200, "request failed with status %u\n", status); + test_status_code(req, 200); buffer[0] = 0; size = sizeof(buffer); @@ -2356,7 +2361,6 @@ static void test_cookie_header(int port) static void test_basic_authentication(int port) { HINTERNET session, connect, request; - DWORD size, status; BOOL ret; session = InternetOpen("winetest", INTERNET_OPEN_TYPE_DIRECT, NULL, NULL, 0); @@ -2371,11 +2375,7 @@ static void test_basic_authentication(int port) ret = HttpSendRequest(request, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed %u\n", GetLastError()); - status = 0; - size = sizeof(status); - ret = HttpQueryInfo( request, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); - ok(ret, "HttpQueryInfo failed\n"); - ok(status == 200, "request failed with status %u\n", status); + test_status_code(request, 200); InternetCloseHandle(request); InternetCloseHandle(connect); @@ -2385,7 +2385,7 @@ static void test_basic_authentication(int port) static void test_invalid_response_headers(int port) { HINTERNET session, connect, request; - DWORD size, status; + DWORD size; BOOL ret; char buffer[256]; @@ -2401,11 +2401,7 @@ static void test_invalid_response_headers(int port) ret = HttpSendRequest(request, NULL, 0, NULL, 0); ok(ret, "HttpSendRequest failed %u\n", GetLastError()); - status = 0; - size = sizeof(status); - ret = HttpQueryInfo( request, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); - ok(ret, "HttpQueryInfo failed\n"); - ok(status == 401, "unexpected status %u\n", status); + test_status_code(request, 401); buffer[0] = 0; size = sizeof(buffer); @@ -2545,17 +2541,7 @@ static void test_HttpQueryInfo(int port) ok(ret, "HttpQueryInfo failed %u\n", GetLastError()); ok(index == 0, "expected 0 got %u\n", index); - index = 0; - size = sizeof(buffer); - ret = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE, buffer, &size, &index); - ok(ret, "HttpQueryInfo failed %u\n", GetLastError()); - ok(index == 0, "expected 0 got %u\n", index); - - index = 0; - size = sizeof(buffer); - ret = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, buffer, &size, &index); - ok(ret, "HttpQueryInfo failed %u\n", GetLastError()); - ok(index == 0, "expected 0 got %u\n", index); + test_status_code(hr, 200); index = 0xdeadbeef; size = sizeof(buffer);

1 0

Jacek Caban : wininet: Set status code OK for responses without headers.
by Alexandre Julliard May 3, 2012

May 3, 2012

Module: wine Branch: master Commit: 2aa3d697a3d772e37a8ff59eb3e538320b73c305 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2aa3d697a3d772e37a8ff59eb… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 3 12:20:38 2012 +0200 wininet: Set status code OK for responses without headers. --- dlls/wininet/http.c | 1 + dlls/wininet/tests/http.c | 9 ++------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index 84b83f2..90cb286 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -5725,6 +5725,7 @@ static INT HTTP_GetResponseHeaders(http_request_t *request, BOOL clear) heap_free(request->version); heap_free(request->statusText); + request->status_code = HTTP_STATUS_OK; request->version = heap_strdupW(g_szHttp1_0); request->statusText = heap_strdupW(szOK); diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 7e21a22..7984f16 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -2426,7 +2426,7 @@ static void test_invalid_response_headers(int port) static void test_response_without_headers(int port) { HINTERNET hi, hc, hr; - DWORD r, count, size, status; + DWORD r, count, size; char buffer[1024]; SetLastError(0xdeadbeef); @@ -2453,12 +2453,7 @@ static void test_response_without_headers(int port) todo_wine ok(count == sizeof page1 - 1, "count was wrong\n"); todo_wine ok(!memcmp(buffer, page1, sizeof page1), "http data wrong\n"); - status = 0; - size = sizeof(status); - SetLastError(0xdeadbeef); - r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); - ok(r, "HttpQueryInfo failed %u\n", GetLastError()); - todo_wine ok(status == 200, "expected status 200 got %u\n", status); + test_status_code(hr, 200); buffer[0] = 0; size = sizeof(buffer);

1 0

Michael Mc Donnell : d3dx9: Added D3DXOptimizeFaces semi-stub.
by Alexandre Julliard May 3, 2012

May 3, 2012

Module: wine Branch: master Commit: 5a14f5b37e2f2317a980aed4af4080c262c93787 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a14f5b37e2f2317a980aed4a… Author: Michael Mc Donnell <michael(a)mcdonnell.dk> Date: Fri Mar 30 19:02:20 2012 +0200 d3dx9: Added D3DXOptimizeFaces semi-stub. --- dlls/d3dx9_36/d3dx9_36.spec | 2 +- dlls/d3dx9_36/mesh.c | 68 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 69 insertions(+), 1 deletions(-) diff --git a/dlls/d3dx9_36/d3dx9_36.spec b/dlls/d3dx9_36/d3dx9_36.spec index b0f7988..94893d3 100644 --- a/dlls/d3dx9_36/d3dx9_36.spec +++ b/dlls/d3dx9_36/d3dx9_36.spec @@ -228,7 +228,7 @@ @ stdcall D3DXMatrixTransformation2D(ptr ptr float ptr ptr float ptr) @ stdcall D3DXMatrixTranslation(ptr float float float) @ stdcall D3DXMatrixTranspose(ptr ptr) -@ stub D3DXOptimizeFaces(ptr long long long ptr) +@ stdcall D3DXOptimizeFaces(ptr long long long ptr) @ stub D3DXOptimizeVertices(ptr long long long ptr) @ stdcall D3DXPlaneFromPointNormal(ptr ptr ptr) @ stdcall D3DXPlaneFromPoints(ptr ptr ptr ptr) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index be8ca60..9c1853a 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -6700,3 +6700,71 @@ cleanup: return hr; } + +/************************************************************************* + * D3DXOptimizeFaces (D3DX9_36.@) + * + * Re-orders the faces so the vertex cache is used optimally. + * + * PARAMS + * indices [I] Pointer to an index buffer belonging to a mesh. + * num_faces [I] Number of faces in the mesh. + * num_vertices [I] Number of vertices in the mesh. + * indices_are_32bit [I] Specifies whether indices are 32- or 16-bit. + * face_remap [I/O] The new order the faces should be drawn in. + * + * RETURNS + * Success: D3D_OK. + * Failure: D3DERR_INVALIDCALL. + * + * BUGS + * The face re-ordering does not use the vertex cache optimally. + * + */ +HRESULT WINAPI D3DXOptimizeFaces(LPCVOID indices, + UINT num_faces, + UINT num_vertices, + BOOL indices_are_32bit, + DWORD *face_remap) +{ + UINT i; + UINT j = num_faces - 1; + UINT limit_16_bit = 2 << 15; /* According to MSDN */ + HRESULT hr = D3D_OK; + + FIXME("(%p, %u, %u, %s, %p): semi-stub. Face order will not be optimal.\n", + indices, num_faces, num_vertices, + indices_are_32bit ? "TRUE" : "FALSE", face_remap); + + if (!indices_are_32bit && num_faces >= limit_16_bit) + { + WARN("Number of faces must be less than %d when using 16-bit indices.\n", + limit_16_bit); + hr = D3DERR_INVALIDCALL; + goto error; + } + + if (!face_remap) + { + WARN("Face remap pointer is NULL.\n"); + hr = D3DERR_INVALIDCALL; + goto error; + } + + /* The faces are drawn in reverse order for simple meshes. This ordering + * is not optimal for complicated meshes, but will not break anything + * either. The ordering should be changed to take advantage of the vertex + * cache on the graphics card. + * + * TODO Re-order to take advantage of vertex cache. + */ + for (i = 0; i < num_faces; i++) + { + face_remap[i] = j--; + } + + return D3D_OK; + +error: + return hr; +}

1 0

Jacek Caban : wininet: Added special case for HTTP_QUERY_STATUS_CODE in HttpQueryInfo.
by Alexandre Julliard May 3, 2012

May 3, 2012

Module: wine Branch: master Commit: 0d76489353eed2a35fecc5c6491f3fc08c3e9c80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0d76489353eed2a35fecc5c64… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu May 3 12:20:25 2012 +0200 wininet: Added special case for HTTP_QUERY_STATUS_CODE in HttpQueryInfo. --- dlls/wininet/http.c | 30 +++++++++++++++++++++++++++++- dlls/wininet/tests/http.c | 4 +++- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index d5697ae..84b83f2 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -3421,6 +3421,34 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, index = HTTP_GetCustomHeaderIndex(request, header_lookup[request->read_gzip ? HTTP_QUERY_CONTENT_TYPE : level], requested_index,request_only); break; + case HTTP_QUERY_STATUS_CODE: { + DWORD res = ERROR_SUCCESS; + + if(request_only || requested_index) + break; + + if(dwInfoLevel & HTTP_QUERY_FLAG_NUMBER) { + if(*lpdwBufferLength >= sizeof(DWORD)) + *(DWORD*)lpBuffer = request->status_code; + else + res = ERROR_INSUFFICIENT_BUFFER; + *lpdwBufferLength = sizeof(DWORD); + }else { + WCHAR buf[12]; + DWORD size; + static const WCHAR formatW[] = {'%','u',0}; + + size = (sprintfW(buf, formatW, request->status_code)+1) * sizeof(WCHAR); + + if(size <= *lpdwBufferLength) + memcpy(lpBuffer, buf, size); + else + res = ERROR_INSUFFICIENT_BUFFER; + + *lpdwBufferLength = size; + } + return res; + } default: assert (LAST_TABLE_HEADER == (HTTP_QUERY_UNLESS_MODIFIED_SINCE + 1)); @@ -3440,7 +3468,7 @@ static DWORD HTTP_HttpQueryInfoW(http_request_t *request, DWORD dwInfoLevel, return ERROR_HTTP_HEADER_NOT_FOUND; } - if (lpdwIndex && level != HTTP_QUERY_STATUS_CODE) (*lpdwIndex)++; + if (lpdwIndex) (*lpdwIndex)++; /* coalesce value to requested type */ if (dwInfoLevel & HTTP_QUERY_FLAG_NUMBER && lpBuffer) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 6050220..7e21a22 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -473,6 +473,8 @@ static void InternetReadFile_test(int flags, const test_data_t *test) goto abort; } + test_status_code(hor, 0); + trace("HttpSendRequestA -->\n"); if(test->post_data) { post_len = strlen(test->post_data); @@ -2455,7 +2457,7 @@ static void test_response_without_headers(int port) size = sizeof(status); SetLastError(0xdeadbeef); r = HttpQueryInfo(hr, HTTP_QUERY_STATUS_CODE | HTTP_QUERY_FLAG_NUMBER, &status, &size, NULL ); - todo_wine ok(r, "HttpQueryInfo failed %u\n", GetLastError()); + ok(r, "HttpQueryInfo failed %u\n", GetLastError()); todo_wine ok(status == 200, "expected status 200 got %u\n", status); buffer[0] = 0;

1 0

Alexandre Julliard : winex11: Remove obsolete escapes.
by Alexandre Julliard May 3, 2012

May 3, 2012

Module: wine Branch: master Commit: 416240b781bc303983562b84ef08eb279d69311e URL: http://source.winehq.org/git/wine.git/?a=commit;h=416240b781bc303983562b84e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu May 3 12:50:52 2012 +0200 winex11: Remove obsolete escapes. --- dlls/winex11.drv/init.c | 21 --------------------- dlls/winex11.drv/x11drv.h | 7 ------- 2 files changed, 0 insertions(+), 28 deletions(-) diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c index b1b52c0..051b293 100644 --- a/dlls/winex11.drv/init.c +++ b/dlls/winex11.drv/init.c @@ -343,20 +343,6 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d { switch(*(const enum x11drv_escape_codes *)in_data) { - case X11DRV_GET_DISPLAY: - if (out_count >= sizeof(Display *)) - { - *(Display **)out_data = gdi_display; - return TRUE; - } - break; - case X11DRV_GET_DRAWABLE: - if (out_count >= sizeof(Drawable)) - { - *(Drawable *)out_data = physDev->drawable; - return TRUE; - } - break; case X11DRV_SET_DRAWABLE: if (in_count >= sizeof(struct x11drv_escape_set_drawable)) { @@ -437,13 +423,6 @@ static INT X11DRV_ExtEscape( PHYSDEV dev, INT escape, INT in_count, LPCVOID in_d return TRUE; } break; - case X11DRV_GET_FONT: - case X11DRV_GET_DCE: - case X11DRV_SET_DCE: - case X11DRV_GET_GLX_DRAWABLE: - case X11DRV_SYNC_PIXMAP: - FIXME( "%x escape no longer supported\n", *(const enum x11drv_escape_codes *)in_data ); - break; case X11DRV_FLUSH_GL_DRAWABLE: flush_gl_drawable(physDev); return TRUE; diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index e9985bb..58ecf59 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -329,16 +329,9 @@ extern void X11DRV_PALETTE_ComputeColorShifts(ColorShifts *shifts, unsigned long #define X11DRV_ESCAPE 6789 enum x11drv_escape_codes { - X11DRV_GET_DISPLAY, /* get X11 display for a DC */ - X11DRV_GET_DRAWABLE, /* get current drawable for a DC */ - X11DRV_GET_FONT, /* get current X font for a DC */ X11DRV_SET_DRAWABLE, /* set current drawable for a DC */ X11DRV_START_EXPOSURES, /* start graphics exposures */ X11DRV_END_EXPOSURES, /* end graphics exposures */ - X11DRV_GET_DCE, /* no longer used */ - X11DRV_SET_DCE, /* no longer used */ - X11DRV_GET_GLX_DRAWABLE, /* get current glx drawable for a DC */ - X11DRV_SYNC_PIXMAP, /* sync the dibsection to its pixmap */ X11DRV_FLUSH_GL_DRAWABLE /* flush changes made to the gl drawable */ };

1 0