March 2013 - Wine-Commits - list.winehq.org

Frédéric Delanoy : wined3d: Add NVIDIA GeForce 410M.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 8e9af2869cd571a2d9eea35a7503b4fbb785e962 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e9af2869cd571a2d9eea35a7… Author: Frédéric Delanoy <frederic.delanoy(a)gmail.com> Date: Wed Mar 27 01:06:11 2013 +0100 wined3d: Add NVIDIA GeForce 410M. --- dlls/wined3d/directx.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 60a4b2d..6b6bc8e 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1099,6 +1099,7 @@ static const struct gpu_description gpu_description_table[] = {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GTX280, "NVIDIA GeForce GTX 280", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_315M, "NVIDIA GeForce 315M", DRIVER_NVIDIA_GEFORCE6, 512 }, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_320M, "NVIDIA GeForce 320M", DRIVER_NVIDIA_GEFORCE6, 256}, + {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_410M, "NVIDIA GeForce 410M", DRIVER_NVIDIA_GEFORCE6, 512}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT320M, "NVIDIA GeForce GT 320M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT325M, "NVIDIA GeForce GT 325M", DRIVER_NVIDIA_GEFORCE6, 1024}, {HW_VENDOR_NVIDIA, CARD_NVIDIA_GEFORCE_GT330, "NVIDIA GeForce GT 330", DRIVER_NVIDIA_GEFORCE6, 1024}, @@ -1553,6 +1554,7 @@ static enum wined3d_pci_device select_card_nvidia_binary(const struct wined3d_gl {"GT 440", CARD_NVIDIA_GEFORCE_GT440}, /* Geforce 400 - lowend */ {"GT 430", CARD_NVIDIA_GEFORCE_GT430}, /* Geforce 400 - lowend */ {"GT 420", CARD_NVIDIA_GEFORCE_GT420}, /* Geforce 400 - lowend */ + {"410M", CARD_NVIDIA_GEFORCE_410M}, /* Geforce 400 - lowend mobile */ {"GT 330", CARD_NVIDIA_GEFORCE_GT330}, /* Geforce 300 - highend */ {"GTS 360M", CARD_NVIDIA_GEFORCE_GTS350M}, /* Geforce 300 - highend mobile */ {"GTS 350M", CARD_NVIDIA_GEFORCE_GTS350M}, /* Geforce 300 - highend mobile */ diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e9a593d..2a11286 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1398,6 +1398,7 @@ enum wined3d_pci_device CARD_NVIDIA_GEFORCE_GT325M = 0x0a35, CARD_NVIDIA_GEFORCE_GT330 = 0x0ca0, CARD_NVIDIA_GEFORCE_GTS350M = 0x0cb0, + CARD_NVIDIA_GEFORCE_410M = 0x1055, CARD_NVIDIA_GEFORCE_GT420 = 0x0de2, CARD_NVIDIA_GEFORCE_GT430 = 0x0de1, CARD_NVIDIA_GEFORCE_GT440 = 0x0de0,

1 0

Jacek Caban : jscript: Use helpers to access string buffer in global.c.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: e67169c114c48c3053798014731541c9746e8cc4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e67169c114c48c30537980147… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 11:03:44 2013 +0100 jscript: Use helpers to access string buffer in global.c. --- dlls/jscript/global.c | 69 ++++++++++++++++++++++++++---------------------- 1 files changed, 37 insertions(+), 32 deletions(-) diff --git a/dlls/jscript/global.c b/dlls/jscript/global.c index 093b1dd..0c0aa29 100644 --- a/dlls/jscript/global.c +++ b/dlls/jscript/global.c @@ -278,7 +278,7 @@ static HRESULT JSGlobal_escape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u jsval_t *r) { jsstr_t *ret_str, *str; - const WCHAR *ptr; + const WCHAR *ptr, *buf; DWORD len = 0; WCHAR *ret; HRESULT hres; @@ -291,11 +291,11 @@ static HRESULT JSGlobal_escape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u return S_OK; } - hres = to_string(ctx, argv[0], &str); + hres = to_flat_string(ctx, argv[0], &str, &buf); if(FAILED(hres)) return hres; - for(ptr = str->str; *ptr; ptr++) { + for(ptr = buf; *ptr; ptr++) { if(*ptr > 0xff) len += 6; else if(is_ecma_nonblank(*ptr)) @@ -311,7 +311,7 @@ static HRESULT JSGlobal_escape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u } len = 0; - for(ptr = str->str; *ptr; ptr++) { + for(ptr = buf; *ptr; ptr++) { if(*ptr > 0xff) { ret[len++] = '%'; ret[len++] = 'u'; @@ -343,6 +343,7 @@ static HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns jsval_t *r) { bytecode_t *code; + const WCHAR *src; HRESULT hres; TRACE("\n"); @@ -364,8 +365,12 @@ static HRESULT JSGlobal_eval(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns return E_UNEXPECTED; } + src = jsstr_flatten(get_string(argv[0])); + if(!src) + return E_OUTOFMEMORY; + TRACE("parsing %s\n", debugstr_jsval(argv[0])); - hres = compile_script(ctx, get_string(argv[0])->str, NULL, NULL, TRUE, FALSE, &code); + hres = compile_script(ctx, src, NULL, NULL, TRUE, FALSE, &code); if(FAILED(hres)) { WARN("parse (%s) failed: %08x\n", debugstr_jsval(argv[0]), hres); return throw_syntax_error(ctx, hres, NULL); @@ -438,10 +443,10 @@ static HRESULT JSGlobal_parseInt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, jsval_t *r) { BOOL neg = FALSE, empty = TRUE; + const WCHAR *ptr; DOUBLE ret = 0.0; INT radix=0, i; jsstr_t *str; - WCHAR *ptr; HRESULT hres; if(!argc) { @@ -463,11 +468,12 @@ static HRESULT JSGlobal_parseInt(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, } } - hres = to_string(ctx, argv[0], &str); + hres = to_flat_string(ctx, argv[0], &str, &ptr); if(FAILED(hres)) return hres; - for(ptr = str->str; isspaceW(*ptr); ptr++); + while(isspaceW(*ptr)) + ptr++; switch(*ptr) { case '+': @@ -520,7 +526,7 @@ static HRESULT JSGlobal_parseFloat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag LONGLONG d = 0, hlp; jsstr_t *val_str; int exp = 0; - WCHAR *str; + const WCHAR *str; BOOL ret_nan = TRUE, positive = TRUE; HRESULT hres; @@ -530,12 +536,10 @@ static HRESULT JSGlobal_parseFloat(script_ctx_t *ctx, vdisp_t *jsthis, WORD flag return S_OK; } - hres = to_string(ctx, argv[0], &val_str); + hres = to_flat_string(ctx, argv[0], &val_str, &str); if(FAILED(hres)) return hres; - str = val_str->str; - while(isspaceW(*str)) str++; if(*str == '+') @@ -625,7 +629,7 @@ static HRESULT JSGlobal_unescape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, jsval_t *r) { jsstr_t *ret_str, *str; - const WCHAR *ptr; + const WCHAR *ptr, *buf; DWORD len = 0; WCHAR *ret; HRESULT hres; @@ -638,11 +642,11 @@ static HRESULT JSGlobal_unescape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, return S_OK; } - hres = to_string(ctx, argv[0], &str); + hres = to_flat_string(ctx, argv[0], &str, &buf); if(FAILED(hres)) return hres; - for(ptr = str->str; *ptr; ptr++) { + for(ptr = buf; *ptr; ptr++) { if(*ptr == '%') { if(hex_to_int(*(ptr+1))!=-1 && hex_to_int(*(ptr+2))!=-1) ptr += 2; @@ -661,7 +665,7 @@ static HRESULT JSGlobal_unescape(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, } len = 0; - for(ptr = str->str; *ptr; ptr++) { + for(ptr = buf; *ptr; ptr++) { if(*ptr == '%') { if(hex_to_int(*(ptr+1))!=-1 && hex_to_int(*(ptr+2))!=-1) { ret[len] = (hex_to_int(*(ptr+1))<<4) + hex_to_int(*(ptr+2)); @@ -758,8 +762,8 @@ static HRESULT JSGlobal_CollectGarbage(script_ctx_t *ctx, vdisp_t *jsthis, WORD static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + const WCHAR *ptr, *uri; jsstr_t *str, *ret; - const WCHAR *ptr; DWORD len = 0, i; char buf[4]; WCHAR *rptr; @@ -773,11 +777,11 @@ static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags return S_OK; } - hres = to_string(ctx, argv[0], &str); + hres = to_flat_string(ctx, argv[0], &str, &uri); if(FAILED(hres)) return hres; - for(ptr = str->str; *ptr; ptr++) { + for(ptr = uri; *ptr; ptr++) { if(is_uri_unescaped(*ptr) || is_uri_reserved(*ptr) || *ptr == '#') { len++; }else { @@ -797,7 +801,7 @@ static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags return E_OUTOFMEMORY; } - for(ptr = str->str; *ptr; ptr++) { + for(ptr = uri; *ptr; ptr++) { if(is_uri_unescaped(*ptr) || is_uri_reserved(*ptr) || *ptr == '#') { *rptr++ = *ptr; }else { @@ -823,10 +827,11 @@ static HRESULT JSGlobal_encodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags static HRESULT JSGlobal_decodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + const WCHAR *ptr, *uri; jsstr_t *str, *ret_str; unsigned len = 0; - WCHAR *ptr, *ret; int i, val, res; + WCHAR *ret; char buf[4]; WCHAR out; HRESULT hres; @@ -839,11 +844,11 @@ static HRESULT JSGlobal_decodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags return S_OK; } - hres = to_string(ctx, argv[0], &str); + hres = to_flat_string(ctx, argv[0], &str, &uri); if(FAILED(hres)) return hres; - for(ptr = str->str; *ptr; ptr++) { + for(ptr = uri; *ptr; ptr++) { if(*ptr != '%') { len++; }else { @@ -875,7 +880,7 @@ static HRESULT JSGlobal_decodeURI(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags return E_OUTOFMEMORY; } - for(ptr = str->str; *ptr; ptr++) { + for(ptr = uri; *ptr; ptr++) { if(*ptr != '%') { *ret++ = *ptr; }else { @@ -910,7 +915,7 @@ static HRESULT JSGlobal_encodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W { jsstr_t *str, *ret_str; char buf[4]; - const WCHAR *ptr; + const WCHAR *ptr, *uri; DWORD len = 0, size, i; WCHAR *ret; HRESULT hres; @@ -923,11 +928,11 @@ static HRESULT JSGlobal_encodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W return S_OK; } - hres = to_string(ctx, argv[0], &str); + hres = to_flat_string(ctx, argv[0], &str, &uri); if(FAILED(hres)) return hres; - for(ptr = str->str; *ptr; ptr++) { + for(ptr = uri; *ptr; ptr++) { if(is_uri_unescaped(*ptr)) len++; else { @@ -946,7 +951,7 @@ static HRESULT JSGlobal_encodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W return E_OUTOFMEMORY; } - for(ptr = str->str; *ptr; ptr++) { + for(ptr = uri; *ptr; ptr++) { if(is_uri_unescaped(*ptr)) { *ret++ = *ptr; }else { @@ -972,8 +977,8 @@ static HRESULT JSGlobal_encodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { + const WCHAR *ptr, *uri; jsstr_t *str, *ret; - const WCHAR *ptr; WCHAR *out_ptr; DWORD len = 0; HRESULT hres; @@ -986,11 +991,11 @@ static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W return S_OK; } - hres = to_string(ctx, argv[0], &str); + hres = to_flat_string(ctx, argv[0], &str, &uri); if(FAILED(hres)) return hres; - ptr = str->str; + ptr = uri; while(*ptr) { if(*ptr == '%') { char octets[4]; @@ -1046,7 +1051,7 @@ static HRESULT JSGlobal_decodeURIComponent(script_ctx_t *ctx, vdisp_t *jsthis, W return E_OUTOFMEMORY; } - ptr = str->str; + ptr = uri; while(*ptr) { if(*ptr == '%') { char octets[4];

1 0

Jacek Caban : jscript: Use helpers to access string buffer in engine.c.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 20530c55b81304523bf9482c300460f339c0e498 URL: http://source.winehq.org/git/wine.git/?a=commit;h=20530c55b81304523bf9482c3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Mar 27 11:02:42 2013 +0100 jscript: Use helpers to access string buffer in engine.c. --- dlls/jscript/engine.c | 35 ++++++++++++++++++++--------------- 1 files changed, 20 insertions(+), 15 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index a8a9aea..a84faec 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -346,7 +346,7 @@ void exec_release(exec_ctx_t *ctx) heap_free(ctx); } -static HRESULT disp_get_id(script_ctx_t *ctx, IDispatch *disp, WCHAR *name, BSTR name_bstr, DWORD flags, DISPID *id) +static HRESULT disp_get_id(script_ctx_t *ctx, IDispatch *disp, const WCHAR *name, BSTR name_bstr, DWORD flags, DISPID *id) { IDispatchEx *dispex; jsdisp_t *jsdisp; @@ -375,7 +375,7 @@ static HRESULT disp_get_id(script_ctx_t *ctx, IDispatch *disp, WCHAR *name, BSTR IDispatchEx_Release(dispex); }else { TRACE("using IDispatch\n"); - hres = IDispatch_GetIDsOfNames(disp, &IID_NULL, &name, 1, 0, id); + hres = IDispatch_GetIDsOfNames(disp, &IID_NULL, &bstr, 1, 0, id); } if(name_bstr != bstr) @@ -729,10 +729,12 @@ static HRESULT interp_throw_type(exec_ctx_t *ctx) { const HRESULT hres = get_op_uint(ctx, 0); jsstr_t *str = get_op_str(ctx, 1); + const WCHAR *ptr; TRACE("%08x %s\n", hres, debugstr_jsstr(str)); - return throw_type_error(ctx->script, hres, str->str); + ptr = jsstr_flatten(str); + return ptr ? throw_type_error(ctx->script, hres, ptr) : E_OUTOFMEMORY; } /* ECMA-262 3rd Edition 12.14 */ @@ -828,9 +830,10 @@ static HRESULT interp_func(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.2.1 */ static HRESULT interp_array(exec_ctx_t *ctx) { + jsstr_t *name_str; + const WCHAR *name; jsval_t v, namev; IDispatch *obj; - jsstr_t *name; DISPID id; HRESULT hres; @@ -844,15 +847,15 @@ static HRESULT interp_array(exec_ctx_t *ctx) return hres; } - hres = to_string(ctx->script, namev, &name); + hres = to_flat_string(ctx->script, namev, &name_str, &name); jsval_release(namev); if(FAILED(hres)) { IDispatch_Release(obj); return hres; } - hres = disp_get_id(ctx->script, obj, name->str, NULL, 0, &id); - jsstr_release(name); + hres = disp_get_id(ctx->script, obj, name, NULL, 0, &id); + jsstr_release(name_str); if(SUCCEEDED(hres)) { hres = disp_propget(ctx->script, obj, id, &v); }else if(hres == DISP_E_UNKNOWNNAME) { @@ -900,8 +903,9 @@ static HRESULT interp_memberid(exec_ctx_t *ctx) { const unsigned arg = get_op_uint(ctx, 0); jsval_t objv, namev; + const WCHAR *name; + jsstr_t *name_str; IDispatch *obj; - jsstr_t *name; DISPID id; HRESULT hres; @@ -913,7 +917,7 @@ static HRESULT interp_memberid(exec_ctx_t *ctx) hres = to_object(ctx->script, objv, &obj); jsval_release(objv); if(SUCCEEDED(hres)) { - hres = to_string(ctx->script, namev, &name); + hres = to_flat_string(ctx->script, namev, &name_str, &name); if(FAILED(hres)) IDispatch_Release(obj); } @@ -921,8 +925,8 @@ static HRESULT interp_memberid(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - hres = disp_get_id(ctx->script, obj, name->str, NULL, arg, &id); - jsstr_release(name); + hres = disp_get_id(ctx->script, obj, name, NULL, arg, &id); + jsstr_release(name_str); if(FAILED(hres)) { IDispatch_Release(obj); if(hres == DISP_E_UNKNOWNNAME && !(arg & fdexNameEnsure)) { @@ -1392,10 +1396,11 @@ static HRESULT interp_instanceof(exec_ctx_t *ctx) /* ECMA-262 3rd Edition 11.8.7 */ static HRESULT interp_in(exec_ctx_t *ctx) { + const WCHAR *str; + jsstr_t *jsstr; jsval_t obj, v; DISPID id = 0; BOOL ret; - jsstr_t *str; HRESULT hres; TRACE("\n"); @@ -1407,16 +1412,16 @@ static HRESULT interp_in(exec_ctx_t *ctx) } v = stack_pop(ctx); - hres = to_string(ctx->script, v, &str); + hres = to_flat_string(ctx->script, v, &jsstr, &str); jsval_release(v); if(FAILED(hres)) { IDispatch_Release(get_object(obj)); return hres; } - hres = disp_get_id(ctx->script, get_object(obj), str->str, NULL, 0, &id); + hres = disp_get_id(ctx->script, get_object(obj), str, NULL, 0, &id); IDispatch_Release(get_object(obj)); - jsstr_release(str); + jsstr_release(jsstr); if(SUCCEEDED(hres)) ret = TRUE; else if(hres == DISP_E_UNKNOWNNAME)

1 0

Piotr Caban : msvcrt: Added _set_output_format implementation.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 9c4be83a78c5a105d4e3305d9977c213a4503a84 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c4be83a78c5a105d4e3305d9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 10:39:30 2013 +0100 msvcrt: Added _set_output_format implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/misc.c | 17 ++++++++++++++++- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/printf.h | 23 +++++++++++++---------- include/msvcrt/stdio.h | 1 + 9 files changed, 36 insertions(+), 16 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 5938d54..93bddbf 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1270,7 +1270,7 @@ @ cdecl _set_fmode(long) msvcrt._set_fmode @ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler @ stub _set_malloc_crt_max_wait -@ stub _set_output_format +@ cdecl _set_output_format(long) msvcrt._set_output_format @ cdecl _set_printf_count_output(long) msvcrt._set_printf_count_output @ cdecl _set_purecall_handler(ptr) msvcrt._set_purecall_handler @ cdecl _seterrormode(long) msvcrt._seterrormode diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 81b3fc2..7f6b0d9 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1632,7 +1632,7 @@ @ cdecl _set_fmode(long) msvcrt._set_fmode @ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler @ stub _set_malloc_crt_max_wait -@ stub _set_output_format +@ cdecl _set_output_format(long) msvcrt._set_output_format @ cdecl _set_printf_count_output(long) msvcrt._set_printf_count_output @ cdecl _set_purecall_handler(ptr) msvcrt._set_purecall_handler @ cdecl _seterrormode(long) msvcrt._seterrormode diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 6b7a318..a2e2929 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -931,7 +931,7 @@ @ cdecl _set_fmode(long) msvcrt._set_fmode @ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler @ stub _set_malloc_crt_max_wait -@ stub _set_output_format +@ cdecl _set_output_format(long) msvcrt._set_output_format @ cdecl _set_printf_count_output(long) msvcrt._set_printf_count_output @ cdecl _set_purecall_handler(ptr) msvcrt._set_purecall_handler @ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 81a265d..998349f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -924,7 +924,7 @@ @ cdecl _set_fmode(long) msvcrt._set_fmode @ cdecl _set_invalid_parameter_handler(ptr) msvcrt._set_invalid_parameter_handler @ stub _set_malloc_crt_max_wait -@ stub _set_output_format +@ cdecl _set_output_format(long) msvcrt._set_output_format @ cdecl _set_printf_count_output(long) msvcrt._set_printf_count_output @ cdecl _set_purecall_handler(ptr) msvcrt._set_purecall_handler @ cdecl _set_sbh_threshold(long) msvcrt._set_sbh_threshold diff --git a/dlls/msvcrt/misc.c b/dlls/msvcrt/misc.c index 2da2429..75e75e6 100644 --- a/dlls/msvcrt/misc.c +++ b/dlls/msvcrt/misc.c @@ -29,6 +29,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); +static unsigned int output_format; /********************************************************************* * _beep (MSVCRT.@) @@ -283,7 +284,21 @@ void CDECL MSVCRT_qsort_s(void *base, MSVCRT_size_t nmemb, MSVCRT_size_t size, */ unsigned int CDECL _get_output_format(void) { - return 0; + return output_format; +} + +/********************************************************************* + * _set_output_format (MSVCRT.@) + */ +unsigned int CDECL _set_output_format(unsigned int new_output_format) +{ + unsigned int ret = output_format; + + if(!MSVCRT_CHECK_PMT(new_output_format==0 || new_output_format==MSVCRT__TWO_DIGIT_EXPONENT)) + return ret; + + output_format = new_output_format; + return ret; } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 3bbbe93..07e2984 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -982,6 +982,7 @@ int __cdecl MSVCRT__toupper_l(int,MSVCRT__locale_t); int __cdecl MSVCRT__tolower_l(int,MSVCRT__locale_t); int __cdecl MSVCRT__strnicoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); int __cdecl MSVCRT_strncoll_l(const char*, const char*, MSVCRT_size_t, MSVCRT__locale_t); +unsigned int __cdecl _get_output_format(void); /* Maybe one day we'll enable the invalid parameter handlers with the full set of information (msvcrXXd) * #define MSVCRT_INVALID_PMT(x) MSVCRT_call_invalid_parameter_handler(x, __FUNCTION__, __FILE__, __LINE__, 0) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index b6ae261..99072aa 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -894,7 +894,7 @@ @ cdecl _set_error_mode(long) # stub _set_fileinfo(long) @ cdecl _set_fmode(long) -# stub _set_output_format(long) +@ cdecl _set_output_format(long) @ cdecl _set_sbh_threshold(long) @ cdecl _seterrormode(long) @ cdecl -arch=i386,x86_64,arm -norelay _setjmp(ptr) MSVCRT__setjmp diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index d02115e..3ccb1c4 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -307,22 +307,25 @@ static inline void FUNC_NAME(pf_fixup_exponent)(char *buf) if(tmp[0] && (tmp[1]=='+' || tmp[1]=='-') && isdigit(tmp[2]) && isdigit(tmp[3])) { - char final; + BOOL two_digit_exp = (_get_output_format() == MSVCRT__TWO_DIGIT_EXPONENT); + + tmp += 2; + if(isdigit(tmp[2])) { + if(two_digit_exp && tmp[0]=='0') { + tmp[0] = tmp[1]; + tmp[1] = tmp[2]; + tmp[2] = tmp[3]; + } - if (isdigit(tmp[4])) return; /* Exponent already 3 digits */ + }else if(two_digit_exp) { + return; + } - tmp += 2; - final = tmp[2]; + tmp[3] = tmp[2]; tmp[2] = tmp[1]; tmp[1] = tmp[0]; tmp[0] = '0'; - - if(final == '\0') { - tmp[3] = '\0'; - if(buf[0] == ' ') - memmove(buf, buf + 1, (tmp - buf) + 3); - } } } diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h index f6bf3b5..a01859e 100644 --- a/include/msvcrt/stdio.h +++ b/include/msvcrt/stdio.h @@ -182,6 +182,7 @@ int __cdecl vprintf_s(const char*,__ms_va_list); int __cdecl vsprintf(char*,const char*,__ms_va_list); int __cdecl vsprintf_s(char*,size_t,const char*,__ms_va_list); unsigned int __cdecl _get_output_format(void); +unsigned int __cdecl _set_output_format(void); #ifndef _WSTDIO_DEFINED #define _WSTDIO_DEFINED

1 0

Piotr Caban : wmi: Match parameters list with function we're forwarding to.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 57fb89200f55460d0f73791d46da7eadd5044e97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57fb89200f55460d0f73791d4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 09:51:38 2013 +0100 wmi: Match parameters list with function we're forwarding to. --- dlls/wmi/wmi.spec | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wmi/wmi.spec b/dlls/wmi/wmi.spec index c6ae3cc..4291d4d 100644 --- a/dlls/wmi/wmi.spec +++ b/dlls/wmi/wmi.spec @@ -1,25 +1,25 @@ -@ stdcall CloseTrace(long) advapi32.CloseTrace -@ stdcall ControlTraceA(long long ptr long) advapi32.ControlTraceA -@ stdcall ControlTraceW(long long ptr long) advapi32.ControlTraceW +@ stdcall CloseTrace(int64) advapi32.CloseTrace +@ stdcall ControlTraceA(int64 str ptr long) advapi32.ControlTraceA +@ stdcall ControlTraceW(int64 wstr ptr long) advapi32.ControlTraceW @ stdcall CreateTraceInstanceId(long ptr) advapi32.CreateTraceInstanceId -@ stdcall EnableTrace(long long long ptr long) advapi32.EnableTrace -@ stdcall GetTraceEnableFlags(long) advapi32.GetTraceEnableFlags -@ stdcall GetTraceEnableLevel(long) advapi32.GetTraceEnableLevel -@ stdcall GetTraceLoggerHandle(ptr) advapi32.GetTraceLoggerHandle -@ stdcall OpenTraceA(ptr) advapi32.OpenTraceA -@ stdcall OpenTraceW(ptr) advapi32.OpenTraceW +@ stdcall EnableTrace(long long long ptr int64) advapi32.EnableTrace +@ stdcall GetTraceEnableFlags(int64) advapi32.GetTraceEnableFlags +@ stdcall GetTraceEnableLevel(int64) advapi32.GetTraceEnableLevel +@ stdcall -ret64 GetTraceLoggerHandle(ptr) advapi32.GetTraceLoggerHandle +@ stdcall -ret64 OpenTraceA(ptr) advapi32.OpenTraceA +@ stdcall -ret64 OpenTraceW(ptr) advapi32.OpenTraceW @ stdcall ProcessTrace(ptr long ptr ptr) advapi32.ProcessTrace @ stdcall QueryAllTracesA(ptr long ptr) advapi32.QueryAllTracesA @ stdcall QueryAllTracesW(ptr long ptr) advapi32.QueryAllTracesW -@ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr ptr ptr ptr) advapi32.RegisterTraceGuidsA -@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr ptr ptr ptr) advapi32.RegisterTraceGuidsW +@ stdcall RegisterTraceGuidsA(ptr ptr ptr long ptr str str ptr) advapi32.RegisterTraceGuidsA +@ stdcall RegisterTraceGuidsW(ptr ptr ptr long ptr wstr wstr ptr) advapi32.RegisterTraceGuidsW @ stdcall RemoveTraceCallback(ptr) advapi32.RemoveTraceCallback @ stdcall SetTraceCallback(ptr ptr) advapi32.SetTraceCallback -@ stdcall StartTraceA(ptr ptr ptr) advapi32.StartTraceA -@ stdcall StartTraceW(ptr ptr ptr) advapi32.StartTraceW -@ stdcall TraceEvent(long ptr) advapi32.TraceEvent -@ stdcall TraceEventInstance(long ptr ptr ptr) advapi32.TraceEventInstance -@ stdcall UnregisterTraceGuids(long) advapi32.UnregisterTraceGuids +@ stdcall StartTraceA(ptr str ptr) advapi32.StartTraceA +@ stdcall StartTraceW(ptr wstr ptr) advapi32.StartTraceW +@ stdcall TraceEvent(int64 ptr) advapi32.TraceEvent +@ stdcall TraceEventInstance(int64 ptr ptr ptr) advapi32.TraceEventInstance +@ stdcall UnregisterTraceGuids(int64) advapi32.UnregisterTraceGuids @ stdcall WmiCloseBlock() advapi32.WmiCloseBlock @ stdcall WmiDevInstToInstanceNameA() advapi32.WmiDevInstToInstanceNameA @ stdcall WmiDevInstToInstanceNameW() advapi32.WmiDevInstToInstanceNameW

1 0

Piotr Caban : imagehlp: Match parameters list with function we' re forwarding to.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 60cf24a972bcaecbcc5592305627675d701033bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=60cf24a972bcaecbcc5592305… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Mar 27 09:51:27 2013 +0100 imagehlp: Match parameters list with function we're forwarding to. --- dlls/imagehlp/imagehlp.spec | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/imagehlp/imagehlp.spec b/dlls/imagehlp/imagehlp.spec index 3ba9efa..744b339 100644 --- a/dlls/imagehlp/imagehlp.spec +++ b/dlls/imagehlp/imagehlp.spec @@ -3,7 +3,7 @@ @ stdcall CheckSumMappedFile(ptr long ptr ptr) @ stdcall EnumerateLoadedModules64(long ptr ptr) dbghelp.EnumerateLoadedModules64 @ stdcall EnumerateLoadedModules(long ptr ptr) dbghelp.EnumerateLoadedModules -@ stdcall FindDebugInfoFile(str str str) dbghelp.FindDebugInfoFile +@ stdcall FindDebugInfoFile(str str ptr) dbghelp.FindDebugInfoFile @ stdcall FindDebugInfoFileEx(str str ptr ptr ptr) dbghelp.FindDebugInfoFileEx @ stdcall FindExecutableImage(str str str) dbghelp.FindExecutableImage @ stdcall FindExecutableImageEx(str str ptr ptr ptr) dbghelp.FindExecutableImageEx @@ -38,16 +38,16 @@ @ stdcall RemovePrivateCvSymbolic(ptr ptr ptr) @ stub RemovePrivateCvSymbolicEx @ stdcall RemoveRelocations(ptr) -@ stdcall SearchTreeForFile(str str str) dbghelp.SearchTreeForFile +@ stdcall SearchTreeForFile(str str ptr) dbghelp.SearchTreeForFile @ stdcall SetImageConfigInformation(ptr ptr) @ stdcall SplitSymbols(str str str long) @ stdcall StackWalk64(long long long ptr ptr ptr ptr ptr ptr) dbghelp.StackWalk64 @ stdcall StackWalk(long long long ptr ptr ptr ptr ptr ptr) dbghelp.StackWalk @ stdcall SymCleanup(long) dbghelp.SymCleanup -@ stdcall SymEnumSourceFiles(long long str ptr ptr) dbghelp.SymEnumSourceFiles +@ stdcall SymEnumSourceFiles(ptr int64 str ptr ptr) dbghelp.SymEnumSourceFiles @ stub SymEnumSym -@ stdcall SymEnumSymbols(long long str ptr ptr) dbghelp.SymEnumSymbols -@ stdcall SymEnumTypes(long long ptr ptr) dbghelp.SymEnumTypes +@ stdcall SymEnumSymbols(ptr int64 str ptr ptr) dbghelp.SymEnumSymbols +@ stdcall SymEnumTypes(ptr int64 ptr ptr) dbghelp.SymEnumTypes @ stdcall SymEnumerateModules64(long ptr ptr) dbghelp.SymEnumerateModules64 @ stdcall SymEnumerateModules(long ptr ptr) dbghelp.SymEnumerateModules @ stdcall SymEnumerateSymbols64(long int64 ptr ptr) dbghelp.SymEnumerateSymbols64 @@ -55,7 +55,7 @@ @ stub SymEnumerateSymbolsW64 @ stub SymEnumerateSymbolsW @ stdcall SymFindFileInPath(long str str ptr long long long ptr ptr ptr) dbghelp.SymFindFileInPath -@ stdcall SymFromAddr(long long ptr ptr) dbghelp.SymFromAddr +@ stdcall SymFromAddr(ptr int64 ptr ptr) dbghelp.SymFromAddr @ stdcall SymFromName(long str ptr) dbghelp.SymFromName @ stdcall SymFunctionTableAccess64(long int64) dbghelp.SymFunctionTableAccess64 @ stdcall SymFunctionTableAccess(long long) dbghelp.SymFunctionTableAccess @@ -74,7 +74,7 @@ @ stdcall SymGetModuleInfoW64(long int64 ptr) dbghelp.SymGetModuleInfoW64 @ stdcall SymGetModuleInfoW(long long ptr) dbghelp.SymGetModuleInfoW @ stdcall SymGetOptions() dbghelp.SymGetOptions -@ stdcall SymGetSearchPath(long str long) dbghelp.SymGetSearchPath +@ stdcall SymGetSearchPath(long ptr long) dbghelp.SymGetSearchPath @ stdcall SymGetSymFromAddr64(long int64 ptr ptr) dbghelp.SymGetSymFromAddr64 @ stdcall SymGetSymFromAddr(long long ptr ptr) dbghelp.SymGetSymFromAddr @ stdcall SymGetSymFromName64(long str ptr) dbghelp.SymGetSymFromName64 @@ -83,8 +83,8 @@ @ stdcall SymGetSymNext(long ptr) dbghelp.SymGetSymNext @ stdcall SymGetSymPrev64(long ptr) dbghelp.SymGetSymPrev64 @ stdcall SymGetSymPrev(long ptr) dbghelp.SymGetSymPrev -@ stdcall SymGetTypeFromName(long long str ptr) dbghelp.SymGetTypeFromName -@ stdcall SymGetTypeInfo(long long long long ptr) dbghelp.SymGetTypeInfo +@ stdcall SymGetTypeFromName(ptr int64 str ptr) dbghelp.SymGetTypeFromName +@ stdcall SymGetTypeInfo(ptr int64 long long ptr) dbghelp.SymGetTypeInfo @ stdcall SymInitialize(long str long) dbghelp.SymInitialize @ stdcall SymLoadModule64(long long str str int64 long) dbghelp.SymLoadModule64 @ stdcall SymLoadModule(long long str str long long) dbghelp.SymLoadModule

1 0

Alexandre Julliard : notepad: Add a 256x256 icon.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: wine Branch: master Commit: 3f053c91497843a2d6f4710d4b0fc9111f192163 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f053c91497843a2d6f4710d4… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Mar 27 14:39:06 2013 +0100 notepad: Add a 256x256 icon. --- programs/notepad/notepad.ico | Bin 25214 -> 53938 bytes programs/notepad/notepad.svg | 2508 +++++++++++++++++++++++++++++++++++++----- 2 files changed, 2218 insertions(+), 290 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=3f053c91497843a2d6f47…

1 0

Francois Gouget : testbot/web: Remove some dead code in JobDetails.pl.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: tools Branch: master Commit: 508205dfe36c288ee6ec510e252a4585e5b8df8f URL: http://source.winehq.org/git/tools.git/?a=commit;h=508205dfe36c288ee6ec510e… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 16:39:55 2013 +0100 testbot/web: Remove some dead code in JobDetails.pl. --- testbot/web/JobDetails.pl | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index a751f11..651335c 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -360,7 +360,6 @@ sub GenerateBody my $First = 1; my $CurrentDll = ""; my $PrintedDll = ""; - my $Crashed = !1; my $Line; while (defined($Line = <LOGFILE>)) { @@ -392,10 +391,6 @@ sub GenerateBody print "<pre><code>"; $First = !1; } - if ($Line =~ m/: unhandled exception [0-9a-fA-F]{8} at /) - { - $Crashed = 1; - } if (! $FullLog && $Line =~ m/^[^:]+:([^ ]+) done $258$/) { print "$1: Timeout\n";

1 0

Francois Gouget : testbot/testagentd: Sanity check the list sizes.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: tools Branch: master Commit: b48ed0abc3eeafe5639223576b3ab246af226c20 URL: http://source.winehq.org/git/tools.git/?a=commit;h=b48ed0abc3eeafe563922357… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 16:37:51 2013 +0100 testbot/testagentd: Sanity check the list sizes. This heuristic normally lets us detect and drop connections that use the wrong protocol. --- testbot/src/testagentd/testagentd.c | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) diff --git a/testbot/src/testagentd/testagentd.c b/testbot/src/testagentd/testagentd.c index 75782c4..e99dcb4 100644 --- a/testbot/src/testagentd/testagentd.c +++ b/testbot/src/testagentd/testagentd.c @@ -387,10 +387,17 @@ static int skip_entries(SOCKET client, uint32_t count) static int recv_list_size(SOCKET client, uint32_t *u32) { - int success = recv_raw_uint32(client, u32); - if (success) - debug(" recv_list_size() -> %u\n", *u32); - return success; + if (!recv_raw_uint32(client, u32)) + return 0; + debug(" recv_list_size() -> %u\n", *u32); + + if (*u32 >= 1048576) + { + /* The client is in fact most likely not speaking the right protocol */ + set_status(ST_FATAL, "the list size is too big (%d)", *u32); + return 0; + } + return 1; } static int expect_list_size(SOCKET client, uint32_t expected)

1 0

Francois Gouget : testbot/TestAgent: Provide command-line access to the wait RPC.
by Alexandre Julliard March 27, 2013

March 27, 2013

Module: tools Branch: master Commit: ea0744c7908dd06db7bf6c5b4518ae832cd5d993 URL: http://source.winehq.org/git/tools.git/?a=commit;h=ea0744c7908dd06db7bf6c5b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Wed Mar 27 16:37:06 2013 +0100 testbot/TestAgent: Provide command-line access to the wait RPC. --- testbot/scripts/TestAgent | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 insertions(+), 1 deletions(-) diff --git a/testbot/scripts/TestAgent b/testbot/scripts/TestAgent index 897ca81..bb7dd14 100755 --- a/testbot/scripts/TestAgent +++ b/testbot/scripts/TestAgent @@ -53,7 +53,7 @@ sub error(@) } my ($Cmd, $Hostname, $LocalFilename, $ServerFilename, @Rm); -my (@Run, $RunIn, $RunOut, $RunErr); +my (@Run, $RunIn, $RunOut, $RunErr, $WaitPid); my $SendFlags = 0; my $RunFlags = 0; my ($Port, $ConnectTimeout, $Timeout, $TunnelOpt); @@ -172,6 +172,11 @@ while (@ARGV) $Cmd = $arg; last; } + elsif ($arg eq "wait") + { + $Cmd = $arg; + $WaitPid = check_opt_val($arg, $WaitPid); + } elsif ($arg eq "rm") { $Cmd = $arg; @@ -216,6 +221,25 @@ if (!defined $Usage) error("the --run-xxx options can only be used with the run command\n"); $Usage = 2; } + elsif ($Cmd eq "wait") + { + my $oldwarn = $SIG{__WARN__}; + $SIG{__WARN__} = sub { die $_[0] }; + my $bad = eval { $WaitPid < 0 }; + if (defined $oldwarn) + { + $SIG{__WARN__} = $oldwarn; + } + else + { + delete $SIG{__WARN__}; + } + if ($bad or $@) + { + error("the pid '$WaitPid' is invalid\n"); + $Usage = 2; + } + } elsif ($Cmd eq "rm" and !@Rm) { error("you must specify the server files to delete\n"); @@ -243,6 +267,7 @@ if (defined $Usage) print "Usage: $name0 [options] <hostname> sendfile <localpath> <serverpath>\n"; print "or $name0 [options] <hostname> getfile <serverpath> <localpath>\n"; print "or $name0 [options] <hostname> run <command> <arguments>\n"; + print "or $name0 [options] <hostname> wait <pid>\n"; print "or $name0 [options] <hostname> rm <serverfiles>\n"; print "or $name0 [options] <hostname> [ping|version]\n"; print "\n"; @@ -264,6 +289,7 @@ if (defined $Usage) print " --run-err <serverpath> Redirect the stderr or the command being run to the\n"; print " specified server file.\n"; print " --run-dntrunc-err Do not truncate the file stderr is redirected to.\n"; + print " wait Waits for the specified child process on the server.\n"; print " rm Deletes the specified files on the server.\n"; print " getversion Returns the version of the server.\n"; print " ping Makes sure the server is still alive.\n"; @@ -318,6 +344,11 @@ elsif ($Cmd eq "run") } } } +elsif ($Cmd eq "wait") +{ + $Result = $TA->Wait($WaitPid, $Timeout); + print "Child exit status: $Result\n" if (defined $Result); +} elsif ($Cmd eq "rm") { $Result = $TA->Rm(@Rm);

1 0