July 2009 - Wine-Commits - list.winehq.org

Piotr Caban : jscript: Added string argument handling to Date constructor.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 8150960f8ccdd5e52c1d2f83f857b6c9114a734e URL: http://source.winehq.org/git/wine.git/?a=commit;h=8150960f8ccdd5e52c1d2f83f… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 6 10:38:08 2009 +0200 jscript: Added string argument handling to Date constructor. --- dlls/jscript/date.c | 9 ++++----- dlls/jscript/tests/api.js | 2 ++ 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index d43708a..aa06f4e 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -2617,12 +2617,11 @@ static HRESULT DateConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPP if(FAILED(hres)) return hres; - if(V_VT(&prim) == VT_BSTR) { - FIXME("VT_BSTR not supported\n"); - return E_NOTIMPL; - } + if(V_VT(&prim) == VT_BSTR) + hres = date_parse(V_BSTR(&prim), &num); + else + hres = to_number(dispex->ctx, &prim, ei, &num); - hres = to_number(dispex->ctx, &prim, ei, &num); VariantClear(&prim); if(FAILED(hres)) return hres; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 27eabfc..b76e94b 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -940,6 +940,8 @@ date = new Date(8.64e15+1); ok(isNaN(0+date.getTime()), "date.getTime() is not NaN"); date = new Date(Infinity); ok(isNaN(0+date.getTime()), "date.getTime() is not NaN"); +date = new Date("3 July 2009 22:28:00 UTC+0100"); +ok(date.getTime() === 1246656480000, "date.getTime() = " + date.getTime()); date = new Date(1984, 11, 29, 13, 51, 24, 120); ok(date.getFullYear() === 1984, "date.getFullYear() = " + date.getFullYear()); ok(date.getMonth() === 11, "date.getMonth() = " + date.getMonth());

1 0

Piotr Caban : jscript: Added DateConstr_parse implementation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 45817bf50fd0504a2f996300be52574a831a7c5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=45817bf50fd0504a2f996300b… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 6 11:00:22 2009 +0200 jscript: Added DateConstr_parse implementation. --- dlls/jscript/date.c | 284 ++++++++++++++++++++++++++++++++++++++++++++- dlls/jscript/math.c | 1 + dlls/jscript/tests/api.js | 16 +++ 3 files changed, 299 insertions(+), 2 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=45817bf50fd0504a2f996…

1 0

Piotr Caban : jscript: Added calling Date as function implementation.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: b5a82030adbe3a965690a2f974511291984818c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5a82030adbe3a965690a2f97… Author: Piotr Caban <piotr.caban(a)gmail.com> Date: Mon Jul 6 10:38:14 2009 +0200 jscript: Added calling Date as function implementation. --- dlls/jscript/date.c | 75 ++++++++++++++++++++++++++++++++++----------------- 1 files changed, 50 insertions(+), 25 deletions(-) diff --git a/dlls/jscript/date.c b/dlls/jscript/date.c index aa06f4e..fe65702 100644 --- a/dlls/jscript/date.c +++ b/dlls/jscript/date.c @@ -455,9 +455,7 @@ static SYSTEMTIME create_systemtime(DOUBLE time) return st; } -/* ECMA-262 3rd Edition 15.9.1.2 */ -static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, - VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +static inline HRESULT date_to_string(DOUBLE time, BOOL show_offset, int offset, VARIANT *retv) { static const WCHAR NaNW[] = { 'N','a','N',0 }; static const WCHAR formatW[] = { '%','s',' ','%','s',' ','%','d',' ', @@ -466,6 +464,9 @@ static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA static const WCHAR formatUTCW[] = { '%','s',' ','%','s',' ','%','d',' ', '%','0','2','d',':','%','0','2','d',':','%','0','2','d',' ', 'U','T','C',' ','%','d','%','s',0 }; + static const WCHAR formatNoOffsetW[] = { '%','s',' ','%','s',' ', + '%','d',' ','%','0','2','d',':','%','0','2','d',':', + '%','0','2','d',' ','%','d','%','s',0 }; static const WCHAR ADW[] = { 0 }; static const WCHAR BCW[] = { ' ','B','.','C','.',0 }; @@ -481,23 +482,12 @@ static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA BOOL formatAD = TRUE; BSTR week, month; - DateInstance *date; BSTR date_str; - DOUBLE time; - int len, size, year, day, offset; + int len, size, year, day; DWORD lcid_en, week_id, month_id; WCHAR sign = '-'; - TRACE("\n"); - - if(!is_class(dispex, JSCLASS_DATE)) { - FIXME("throw TypeError\n"); - return E_FAIL; - } - - date = (DateInstance*)dispex; - - if(isnan(date->time)) { + if(isnan(time)) { if(retv) { V_VT(retv) = VT_BSTR; V_BSTR(retv) = SysAllocString(NaNW); @@ -507,8 +497,6 @@ static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA return S_OK; } - time = local_time(date->time, date); - if(retv) { len = 21; @@ -554,10 +542,8 @@ static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA } while(day); day = date_from_time(time); - offset = date->bias + - daylight_saving_ta(time, date); - - if(offset == 0) len -= 5; + if(!show_offset) len -= 9; + else if(offset == 0) len -= 5; else if(offset < 0) { sign = '+'; offset = -offset; @@ -570,15 +556,19 @@ static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA return E_OUTOFMEMORY; } - if(offset) + if(!show_offset) + sprintfW(date_str, formatNoOffsetW, week, month, day, + (int)hour_from_time(time), (int)min_from_time(time), + (int)sec_from_time(time), year, formatAD?ADW:BCW); + else if(offset) sprintfW(date_str, formatW, week, month, day, (int)hour_from_time(time), (int)min_from_time(time), (int)sec_from_time(time), sign, offset/60, offset%60, year, formatAD?ADW:BCW); else sprintfW(date_str, formatUTCW, week, month, day, - (int)hour_from_time(time), (int)min_from_time(time), - (int)sec_from_time(time), year, formatAD?ADW:BCW); + (int)hour_from_time(time), (int)min_from_time(time), + (int)sec_from_time(time), year, formatAD?ADW:BCW); SysFreeString(week); SysFreeString(month); @@ -589,6 +579,29 @@ static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARA return S_OK; } +/* ECMA-262 3rd Edition 15.9.1.2 */ +static HRESULT Date_toString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, + VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) +{ + DateInstance *date; + DOUBLE time; + int offset; + + TRACE("\n"); + + if(!is_class(dispex, JSCLASS_DATE)) { + FIXME("throw TypeError\n"); + return E_FAIL; + } + + date = (DateInstance*)dispex; + time = local_time(date->time, date); + offset = date->bias + + daylight_saving_ta(time, date); + + return date_to_string(time, TRUE, offset, retv); +} + /* ECMA-262 3rd Edition 15.9.1.5 */ static HRESULT Date_toLocaleString(DispatchEx *dispex, LCID lcid, WORD flags, DISPPARAMS *dp, VARIANT *retv, jsexcept_t *ei, IServiceProvider *caller) @@ -2652,6 +2665,18 @@ static HRESULT DateConstr_value(DispatchEx *dispex, LCID lcid, WORD flags, DISPP V_DISPATCH(retv) = (IDispatch*)_IDispatchEx_(date); return S_OK; + case INVOKE_FUNC: { + FILETIME system_time, local_time; + LONGLONG lltime; + + GetSystemTimeAsFileTime(&system_time); + FileTimeToLocalFileTime(&system_time, &local_time); + lltime = ((LONGLONG)local_time.dwHighDateTime<<32) + + local_time.dwLowDateTime; + + return date_to_string(lltime/10000-TIME_EPOCH, FALSE, 0, retv); + } + default: FIXME("unimplemented flags %x\n", flags); return E_NOTIMPL;

1 0

Nikolay Sivov : comctl32/listview: Fix some test failures on 4.7x.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: c3e66a8f86eb61107382730e30e01ef533bd4ef7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3e66a8f86eb61107382730e3… Author: Nikolay Sivov <bunglehead(a)gmail.com> Date: Mon Jul 6 10:22:50 2009 +0400 comctl32/listview: Fix some test failures on 4.7x. --- dlls/comctl32/tests/listview.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/comctl32/tests/listview.c b/dlls/comctl32/tests/listview.c index 86b7ff8..43a7037 100644 --- a/dlls/comctl32/tests/listview.c +++ b/dlls/comctl32/tests/listview.c @@ -201,6 +201,7 @@ static const struct message forward_erasebkgnd_parent_seq[] = { static const struct message ownderdata_select_focus_parent_seq[] = { { WM_NOTIFY, sent|id, 0, 0, LVN_ITEMCHANGED }, { WM_NOTIFY, sent|id, 0, 0, LVN_GETDISPINFOA }, + { WM_NOTIFY, sent|id|optional, 0, 0, LVN_GETDISPINFOA }, /* version 4.7x */ { 0 } };

1 0

Aurimas Fišeras : cryptdlg: Translate "CPS" ( Certification Practice Statement) to Lithuanian and add a comment to English resource.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: e552e51a481a194ab2952d62cb8c6926f9e41198 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e552e51a481a194ab2952d62c… Author: Aurimas Fišeras <aurimas(a)gmail.com> Date: Sat Jul 4 17:39:57 2009 +0300 cryptdlg: Translate "CPS" (Certification Practice Statement) to Lithuanian and add a comment to English resource. --- dlls/cryptdlg/cryptdlg_En.rc | 2 +- dlls/cryptdlg/cryptdlg_Lt.rc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/cryptdlg/cryptdlg_En.rc b/dlls/cryptdlg/cryptdlg_En.rc index 3ab5f94..72ceecd 100644 --- a/dlls/cryptdlg/cryptdlg_En.rc +++ b/dlls/cryptdlg/cryptdlg_En.rc @@ -28,7 +28,7 @@ STRINGTABLE DISCARDABLE IDS_POLICY_ID "Policy Identifier: " IDS_POLICY_QUALIFIER_INFO "Policy Qualifier Info" IDS_POLICY_QUALIFIER_ID "Policy Qualifier Id=" - IDS_CPS "CPS" + IDS_CPS "CPS" /* Certification Practice Statement */ IDS_USER_NOTICE "User Notice" IDS_QUALIFIER "Qualifier" IDS_NOTICE_REF "Notice Reference" diff --git a/dlls/cryptdlg/cryptdlg_Lt.rc b/dlls/cryptdlg/cryptdlg_Lt.rc index a967494..74ef293 100644 --- a/dlls/cryptdlg/cryptdlg_Lt.rc +++ b/dlls/cryptdlg/cryptdlg_Lt.rc @@ -31,7 +31,7 @@ STRINGTABLE DISCARDABLE IDS_POLICY_ID "Politikos identifikatorius: " IDS_POLICY_QUALIFIER_INFO "Politikos kvalifikatoriaus informacija" IDS_POLICY_QUALIFIER_ID "Politikos kvalifikatoriaus identifikatorius=" - IDS_CPS "CPS" + IDS_CPS "Sertifikavimo Veiklos Nuostatos (CPS)" IDS_USER_NOTICE "Naudotojo pranešimas" IDS_QUALIFIER "Kvalifikatorius" IDS_NOTICE_REF "Pranešimo nuoroda"

1 0

Dan Kegel : winmm: Don't convert return string in mciSendStringA on error.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: ea5a6f2db5e6f05acf38f9257278cbcad58ab898 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ea5a6f2db5e6f05acf38f9257… Author: Dan Kegel <dank(a)kegel.com> Date: Fri Jul 3 21:52:38 2009 -0700 winmm: Don't convert return string in mciSendStringA on error. --- dlls/winmm/mci.c | 2 +- dlls/winmm/tests/mci.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winmm/mci.c b/dlls/winmm/mci.c index 262d62d..6fca013 100644 --- a/dlls/winmm/mci.c +++ b/dlls/winmm/mci.c @@ -1506,7 +1506,7 @@ DWORD WINAPI mciSendStringA(LPCSTR lpstrCommand, LPSTR lpstrRet, } } ret = mciSendStringW(lpwstrCommand, lpwstrRet, uRetLen, hwndCallback); - if (lpwstrRet) + if (!ret && lpwstrRet) WideCharToMultiByte( CP_ACP, 0, lpwstrRet, -1, lpstrRet, uRetLen, NULL, NULL ); HeapFree(GetProcessHeap(), 0, lpwstrCommand); HeapFree(GetProcessHeap(), 0, lpwstrRet); diff --git a/dlls/winmm/tests/mci.c b/dlls/winmm/tests/mci.c index 8764b30..5f86985 100644 --- a/dlls/winmm/tests/mci.c +++ b/dlls/winmm/tests/mci.c @@ -53,7 +53,7 @@ START_TEST(mci) memset(buf, 0, sizeof(buf)); err = mciSendString(command_close_all, buf, sizeof(buf), hwnd); todo_wine ok(!err,"mciSendString(%s, buf, sizeof(buf) , NULL) returned error: %d\n", command_close_all, err); - todo_wine ok(buf[0] == 0, "mciSendString(%s, buf, sizeof(buf) , NULL) changed output buffer: %s\n", command_close_all, buf); + ok(buf[0] == 0, "mciSendString(%s, buf, sizeof(buf) , NULL) changed output buffer: %s\n", command_close_all, buf); memset(buf, 0, sizeof(buf)); err = mciSendString(command_sysinfo, buf, sizeof(buf), NULL);

1 0

Dmitry Timoshkov : user32: Fix some BM_SETSTYLE test failres under Win9x.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: df055b2d2ccf5911ff754619b1892c02fc333334 URL: http://source.winehq.org/git/wine.git/?a=commit;h=df055b2d2ccf5911ff754619b… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Mon Jul 6 15:16:01 2009 +0900 user32: Fix some BM_SETSTYLE test failres under Win9x. --- dlls/user32/tests/msg.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 0e6ed29..e2789ce 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -5215,7 +5215,7 @@ static const struct message WmSetStyleButtonSeq[] = { WM_APP, sent|wparam|lparam, 0, 0 }, { WM_PAINT, sent }, { WM_NCPAINT, sent|defwinproc|optional }, /* FIXME: Wine sends it */ - { WM_ERASEBKGND, sent|defwinproc }, + { WM_ERASEBKGND, sent|defwinproc|optional }, /* Win9x doesn't send it */ { WM_CTLCOLORBTN, sent|parent }, { 0 } }; @@ -5225,7 +5225,7 @@ static const struct message WmSetStyleStaticSeq[] = { WM_APP, sent|wparam|lparam, 0, 0 }, { WM_PAINT, sent }, { WM_NCPAINT, sent|defwinproc|optional }, /* FIXME: Wine sends it */ - { WM_ERASEBKGND, sent|defwinproc }, + { WM_ERASEBKGND, sent|defwinproc|optional }, /* Win9x doesn't send it */ { WM_CTLCOLORSTATIC, sent|parent }, { 0 } }; @@ -5235,7 +5235,7 @@ static const struct message WmSetStyleUserSeq[] = { WM_APP, sent|wparam|lparam, 0, 0 }, { WM_PAINT, sent }, { WM_NCPAINT, sent|defwinproc|optional }, /* FIXME: Wine sends it */ - { WM_ERASEBKGND, sent|defwinproc }, + { WM_ERASEBKGND, sent|defwinproc|optional }, /* Win9x doesn't send it */ { WM_CTLCOLORBTN, sent|parent }, { WM_COMMAND, sent|wparam|parent, MAKEWPARAM(ID_BUTTON, BN_PAINT) }, { 0 } @@ -5246,9 +5246,9 @@ static const struct message WmSetStyleOwnerdrawSeq[] = { WM_APP, sent|wparam|lparam, 0, 0 }, { WM_PAINT, sent }, { WM_NCPAINT, sent|optional }, /* FIXME: Wine sends it */ - { WM_ERASEBKGND, sent|defwinproc }, - { WM_CTLCOLORBTN, sent|parent }, + { WM_ERASEBKGND, sent|defwinproc|optional }, /* Win9x doesn't send it */ { WM_CTLCOLORBTN, sent|parent }, + { WM_CTLCOLORBTN, sent|parent|optional }, /* Win9x doesn't send it */ { WM_DRAWITEM, sent|wparam|lparam|parent, ID_BUTTON, 0x000010e4 }, { 0 } };

1 0

Henri Verbeet : wined3d: Get rid of the redundant "return_value" variable.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: ad0ef46a39df6fcae62554c15da5a48ee2f52eab URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad0ef46a39df6fcae62554c15… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 6 10:08:38 2009 +0200 wined3d: Get rid of the redundant "return_value" variable. --- dlls/wined3d/directx.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 9ac96fe..0bbb198 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -468,7 +468,6 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { GLint gl_max; GLfloat gl_floatv[2]; int major = 1, minor = 0; - BOOL return_value = TRUE; unsigned i; HDC hdc; unsigned int vidmem=0; @@ -1548,7 +1547,7 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { } LEAVE_GL(); - return return_value; + return TRUE; } /**********************************************************

1 0

Francois Gouget : winapi: Simplify and improve the readability of the C parsers.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: a4ed46d3988ad2af2d8077bb284e9a5ee0e05543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a4ed46d3988ad2af2d8077bb2… Author: Francois Gouget <fgouget(a)free.fr> Date: Mon Jul 6 08:08:10 2009 +0200 winapi: Simplify and improve the readability of the C parsers. Specifically, clean up parameter passing, and remove unneeded intermediate variable references. Remove uninformative comments. --- tools/winapi/c_function.pm | 158 ++++--------- tools/winapi/c_parser.pm | 577 ++++++++++++++------------------------------ tools/winapi/c_type.pm | 408 ++++++++++++------------------- 3 files changed, 381 insertions(+), 762 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a4ed46d3988ad2af2d807…

1 0

Henri Verbeet : winedd3d: Get rid of a useless trace.
by Alexandre Julliard July 6, 2009

July 6, 2009

Module: wine Branch: master Commit: 966f8f452d5465fa06caac69f50f0c98cba0a412 URL: http://source.winehq.org/git/wine.git/?a=commit;h=966f8f452d5465fa06caac69f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Jul 6 10:08:39 2009 +0200 winedd3d: Get rid of a useless trace. gl_card isn't initialized yet here, and GL_RENDERER is already printed earlier. --- dlls/wined3d/directx.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 0bbb198..fa89621 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -674,8 +674,6 @@ static BOOL IWineD3DImpl_FillGLCaps(WineD3D_GL_Info *gl_info) { /* Current Windows drivers have versions like 6.14.... (some older have an earlier version). */ gl_info->driver_version_hipart = MAKEDWORD_VERSION(6, 14); - TRACE_(d3d_caps)("found GL_RENDERER (%s)->(0x%04x)\n", debugstr_a(gl_info->gl_renderer), gl_info->gl_card); - /* * Initialize openGL extension related variables * with Default values

1 0