December 2012 - Wine-commits

Hans Leidekker : wbemprox: Avoid a crash in get_propval when the query returned no results.
by Alexandre Julliard 18 Dec '12

18 Dec '12

Module: wine Branch: master Commit: 035315c45c49053cfefbbe0856966af5aee63ce9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=035315c45c49053cfefbbe085… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 18 11:20:53 2012 +0100 wbemprox: Avoid a crash in get_propval when the query returned no results. --- dlls/wbemprox/query.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wbemprox/query.c b/dlls/wbemprox/query.c index 3fdee00..1123159 100644 --- a/dlls/wbemprox/query.c +++ b/dlls/wbemprox/query.c @@ -644,22 +644,22 @@ HRESULT get_propval( const struct view *view, UINT index, const WCHAR *name, VAR CIMTYPE *type, LONG *flavor ) { HRESULT hr; - UINT column, row = view->result[index]; + UINT column, row; VARTYPE vartype; void *val_ptr = NULL; LONGLONG val; if (is_system_prop( name )) return get_system_propval( view, index, name, ret, type, flavor ); - if (!is_selected_prop( view, name )) return WBEM_E_NOT_FOUND; + if (!view->result || !is_selected_prop( view, name )) return WBEM_E_NOT_FOUND; hr = get_column_index( view->table, name, &column ); if (hr != S_OK || is_method( view->table, column )) return WBEM_E_NOT_FOUND; - vartype = view->table->columns[column].vartype; - + row = view->result[index]; hr = get_value( view->table, row, column, &val ); if (hr != S_OK) return hr; + vartype = view->table->columns[column].vartype; if (view->table->columns[column].type & CIM_FLAG_ARRAY) { CIMTYPE basetype = view->table->columns[column].type & CIM_TYPE_MASK;

1 0

Hans Leidekker : winhttp: Check the server response when downloading a PAC script.
by Alexandre Julliard 18 Dec '12

18 Dec '12

Module: wine Branch: master Commit: e6ab87ccfa78cffae5bcbe2c1dfc58b5ef7fb2ac URL: http://source.winehq.org/git/wine.git/?a=commit;h=e6ab87ccfa78cffae5bcbe2c1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Dec 18 11:22:50 2012 +0100 winhttp: Check the server response when downloading a PAC script. --- dlls/winhttp/session.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/dlls/winhttp/session.c b/dlls/winhttp/session.c index 3889922..8a5c457 100644 --- a/dlls/winhttp/session.c +++ b/dlls/winhttp/session.c @@ -1939,7 +1939,7 @@ static BSTR download_script( const WCHAR *url ) HINTERNET ses, con = NULL, req = NULL; WCHAR *hostname; URL_COMPONENTSW uc; - DWORD size = 4096, offset, to_read, bytes_read, flags = 0; + DWORD status, size = sizeof(status), offset, to_read, bytes_read, flags = 0; char *tmp, *buffer = NULL; BSTR script = NULL; int len; @@ -1956,8 +1956,12 @@ static BSTR download_script( const WCHAR *url ) if (uc.nScheme == INTERNET_SCHEME_HTTPS) flags |= WINHTTP_FLAG_SECURE; if (!(req = WinHttpOpenRequest( con, NULL, uc.lpszUrlPath, NULL, NULL, acceptW, flags ))) goto done; if (!WinHttpSendRequest( req, NULL, 0, NULL, 0, 0, 0 )) goto done; + if (!(WinHttpReceiveResponse( req, 0 ))) goto done; + if (!WinHttpQueryHeaders( req, WINHTTP_QUERY_STATUS_CODE|WINHTTP_QUERY_FLAG_NUMBER, NULL, &status, + &size, NULL ) || status != HTTP_STATUS_OK) goto done; + size = 4096; if (!(buffer = heap_alloc( size ))) goto done; to_read = size; offset = 0;

1 0

Hwang YunSong : po: Update Korean translation.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: d5e735554bec044cd3fac402f1f36616b2f30a5a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d5e735554bec044cd3fac402f… Author: Hwang YunSong <hys545(a)dreamwiz.com> Date: Mon Dec 17 11:14:43 2012 +0900 po: Update Korean translation. --- po/ko.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/po/ko.po b/po/ko.po index 0fa120c..524409d 100644 --- a/po/ko.po +++ b/po/ko.po @@ -3530,7 +3530,7 @@ msgstr "끝나지 않은 문자열 상수" #: jscript.rc:39 msgid "'return' statement outside of function" -msgstr "" +msgstr "함수 밖에 'return'문장이 있음 " #: jscript.rc:40 msgid "Can't have 'break' outside of loop" @@ -3542,7 +3542,7 @@ msgstr "루프 바깥에는 'continue'를 사용할 수 없음" #: jscript.rc:42 msgid "Label redefined" -msgstr "라벨이 정의되지 않음" +msgstr "라벨이 중복정의됨" #: jscript.rc:43 msgid "Label not found"

1 0

Detlef Riekenberg : comdlg32/tests: Use win8 failure-code as default result .
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 1868fe651f55c58008e3d7c23e9e467c497f6aa2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1868fe651f55c58008e3d7c23… Author: Detlef Riekenberg <wine.dev(a)web.de> Date: Sun Dec 16 13:32:19 2012 +0100 comdlg32/tests: Use win8 failure-code as default result. --- dlls/comdlg32/itemdlg.c | 2 +- dlls/comdlg32/tests/itemdlg.c | 19 ++++++++++++++----- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/dlls/comdlg32/itemdlg.c b/dlls/comdlg32/itemdlg.c index 0fdfe0d..96ee5dc 100644 --- a/dlls/comdlg32/itemdlg.c +++ b/dlls/comdlg32/itemdlg.c @@ -2729,7 +2729,7 @@ static HRESULT WINAPI IServiceProvider_fnQueryService(IServiceProvider *iface, REFIID riid, void **ppv) { FileDialogImpl *This = impl_from_IServiceProvider(iface); - HRESULT hr = E_FAIL; + HRESULT hr = E_NOTIMPL; TRACE("%p (%s, %s, %p)\n", This, debugstr_guid(guidService), debugstr_guid(riid), ppv); *ppv = NULL; diff --git a/dlls/comdlg32/tests/itemdlg.c b/dlls/comdlg32/tests/itemdlg.c index ce05ed8..4e50926 100644 --- a/dlls/comdlg32/tests/itemdlg.c +++ b/dlls/comdlg32/tests/itemdlg.c @@ -277,17 +277,26 @@ static BOOL test_instantiation(void) IExplorerBrowser *peb; IShellBrowser *psb; + hr = IServiceProvider_QueryService(psp, &SID_SExplorerBrowserFrame, &IID_ICommDlgBrowser, (void**)&punk); + ok(hr == S_OK, "got 0x%08x.\n", hr); + if(SUCCEEDED(hr)) IUnknown_Release(punk); + + /* since win8, the result is E_NOTIMPL for all other services */ hr = IServiceProvider_QueryService(psp, &SID_STopLevelBrowser, &IID_IExplorerBrowser, (void**)&peb); - ok(hr == E_FAIL, "got 0x%08x.\n", hr); + ok(hr == E_NOTIMPL || broken(hr == E_FAIL), "got 0x%08x (expected E_NOTIMPL)\n", hr); if(SUCCEEDED(hr)) IExplorerBrowser_Release(peb); hr = IServiceProvider_QueryService(psp, &SID_STopLevelBrowser, &IID_IShellBrowser, (void**)&psb); - ok(hr == E_FAIL, "got 0x%08x.\n", hr); + ok(hr == E_NOTIMPL || broken(hr == E_FAIL), "got 0x%08x (expected E_NOTIMPL)\n", hr); if(SUCCEEDED(hr)) IShellBrowser_Release(psb); hr = IServiceProvider_QueryService(psp, &SID_STopLevelBrowser, &IID_ICommDlgBrowser, (void**)&punk); - ok(hr == E_FAIL, "got 0x%08x.\n", hr); + ok(hr == E_NOTIMPL || broken(hr == E_FAIL), "got 0x%08x (expected E_NOTIMPL)\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); - hr = IServiceProvider_QueryService(psp, &SID_SExplorerBrowserFrame, &IID_ICommDlgBrowser, (void**)&punk); - ok(hr == S_OK, "got 0x%08x.\n", hr); + + hr = IServiceProvider_QueryService(psp, &SID_STopLevelBrowser, &IID_IUnknown, (void**)&punk); + ok(hr == E_NOTIMPL || broken(hr == E_FAIL), "got 0x%08x (expected E_NOTIMPL)\n", hr); + if(SUCCEEDED(hr)) IUnknown_Release(punk); + hr = IServiceProvider_QueryService(psp, &IID_IUnknown, &IID_IUnknown, (void**)&punk); + ok(hr == E_NOTIMPL || broken(hr == E_FAIL), "got 0x%08x (expected E_NOTIMPL)\n", hr); if(SUCCEEDED(hr)) IUnknown_Release(punk); IServiceProvider_Release(psp);

1 0

Nikolay Sivov : msxml3: Add custom handling for DISPID_VALUE for node list.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: aaa8186a2ecc0bcdd6a3197efcd854afae81a642 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aaa8186a2ecc0bcdd6a3197ef… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Dec 17 10:16:41 2012 +0400 msxml3: Add custom handling for DISPID_VALUE for node list. --- dlls/msxml3/nodelist.c | 66 +++++++++++++++++++++++++++++++++---------- dlls/msxml3/tests/domdoc.c | 39 ++++++++++++++++++++++++-- 2 files changed, 86 insertions(+), 19 deletions(-) diff --git a/dlls/msxml3/nodelist.c b/dlls/msxml3/nodelist.c index 756783d..c68eefc 100644 --- a/dlls/msxml3/nodelist.c +++ b/dlls/msxml3/nodelist.c @@ -329,28 +329,62 @@ static HRESULT xmlnodelist_invoke(IUnknown *iface, DISPID id, LCID lcid, WORD fl TRACE("(%p)->(%x %x %x %p %p %p)\n", This, id, lcid, flags, params, res, ei); - V_VT(res) = VT_DISPATCH; - V_DISPATCH(res) = NULL; - - if (id < DISPID_DOM_COLLECTION_BASE || id > DISPID_DOM_COLLECTION_MAX) - return DISP_E_UNKNOWNNAME; - - switch(flags) + if (id >= DISPID_DOM_COLLECTION_BASE && id <= DISPID_DOM_COLLECTION_MAX) { - case INVOKE_PROPERTYGET: + switch(flags) { - IXMLDOMNode *disp = NULL; - - IXMLDOMNodeList_get_item(&This->IXMLDOMNodeList_iface, id - DISPID_DOM_COLLECTION_BASE, &disp); - V_DISPATCH(res) = (IDispatch*)disp; - break; + case DISPATCH_PROPERTYGET: + { + IXMLDOMNode *disp = NULL; + + V_VT(res) = VT_DISPATCH; + IXMLDOMNodeList_get_item(&This->IXMLDOMNodeList_iface, id - DISPID_DOM_COLLECTION_BASE, &disp); + V_DISPATCH(res) = (IDispatch*)disp; + break; + } + default: + { + FIXME("unimplemented flags %x\n", flags); + break; + } } - default: + } + else if (id == DISPID_VALUE) + { + switch(flags) { - FIXME("unimplemented flags %x\n", flags); - break; + case DISPATCH_METHOD|DISPATCH_PROPERTYGET: + case DISPATCH_PROPERTYGET: + case DISPATCH_METHOD: + { + IXMLDOMNode *item; + VARIANT index; + HRESULT hr; + + if (params->cArgs - params->cNamedArgs != 1) return DISP_E_BADPARAMCOUNT; + + VariantInit(&index); + hr = VariantChangeType(&index, params->rgvarg, 0, VT_I4); + if(FAILED(hr)) + { + FIXME("failed to convert arg, %s\n", debugstr_variant(params->rgvarg)); + return hr; + } + + IXMLDOMNodeList_get_item(&This->IXMLDOMNodeList_iface, V_I4(&index), &item); + V_VT(res) = VT_DISPATCH; + V_DISPATCH(res) = (IDispatch*)item; + break; + } + default: + { + FIXME("DISPID_VALUE: unimplemented flags %x\n", flags); + break; + } } } + else + return DISP_E_UNKNOWNNAME; TRACE("ret %p\n", V_DISPATCH(res)); diff --git a/dlls/msxml3/tests/domdoc.c b/dlls/msxml3/tests/domdoc.c index 6f2b465..d846db5 100644 --- a/dlls/msxml3/tests/domdoc.c +++ b/dlls/msxml3/tests/domdoc.c @@ -10005,6 +10005,34 @@ static void test_dispex(void) V_VT(&arg) = VT_I4; V_I2(&arg) = 0; + dispparams.cArgs = 0; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = &arg; + + V_VT(&ret) = VT_EMPTY; + V_DISPATCH(&ret) = (void*)0x1; + hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); + ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); + ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret)); + + V_VT(&arg) = VT_I4; + V_I2(&arg) = 0; + dispparams.cArgs = 2; + dispparams.cNamedArgs = 0; + dispparams.rgdispidNamedArgs = NULL; + dispparams.rgvarg = &arg; + + V_VT(&ret) = VT_EMPTY; + V_DISPATCH(&ret) = (void*)0x1; + hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); + ok(hr == DISP_E_BADPARAMCOUNT, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); + ok(V_DISPATCH(&ret) == (void*)0x1, "got %p\n", V_DISPATCH(&ret)); + + V_VT(&arg) = VT_I4; + V_I2(&arg) = 0; dispparams.cArgs = 1; dispparams.cNamedArgs = 0; dispparams.rgdispidNamedArgs = NULL; @@ -10013,7 +10041,6 @@ static void test_dispex(void) V_VT(&ret) = VT_EMPTY; V_DISPATCH(&ret) = (void*)0x1; hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); -todo_wine ok(hr == S_OK, "got 0x%08x\n", hr); ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret)); ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret)); @@ -10025,6 +10052,13 @@ todo_wine ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret)); ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret)); + V_VT(&ret) = VT_EMPTY; + V_DISPATCH(&ret) = (void*)0x1; + hr = IDispatchEx_Invoke(dispex, DISPID_VALUE, &IID_NULL, 0, DISPATCH_PROPERTYGET|DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(V_VT(&ret) == VT_DISPATCH, "got %d\n", V_VT(&ret)); + ok(V_DISPATCH(&ret) == NULL, "got %p\n", V_DISPATCH(&ret)); + dispparams.cArgs = 0; dispparams.cNamedArgs = 0; dispparams.rgdispidNamedArgs = NULL; @@ -10046,10 +10080,9 @@ todo_wine V_I4(&ret) = 1; hr = IDispatchEx_Invoke(dispex, DISPID_DOM_NODELIST_LENGTH, &IID_NULL, 0, DISPATCH_METHOD, &dispparams, &ret, NULL, NULL); ok(hr == DISP_E_MEMBERNOTFOUND, "got 0x%08x\n", hr); -todo_wine { ok(V_VT(&ret) == VT_EMPTY, "got %d\n", V_VT(&ret)); ok(V_I4(&ret) == 1, "got %d\n", V_I4(&ret)); -} + IXMLDOMNodeList_Release(node_list); /* IXMLDOMParseError */

1 0

Ken Thomases : winequartz.drv: Rename to winemac.drv ("the Mac driver").
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 35033025aa9358961053b9d755ca33f93f218b8b URL: http://source.winehq.org/git/wine.git/?a=commit;h=35033025aa9358961053b9d75… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Dec 16 18:06:52 2012 -0600 winequartz.drv: Rename to winemac.drv ("the Mac driver"). --- configure | 6 +++--- configure.ac | 8 ++++---- dlls/{winequartz.drv => winemac.drv}/Makefile.in | 4 ++-- .../quartzdrv_main.c => winemac.drv/macdrv_main.c} | 4 ++-- .../winemac.drv.spec} | 0 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/configure b/configure index e96750d..7b3b31d 100755 --- a/configure +++ b/configure @@ -6673,7 +6673,7 @@ done then CARBONLIB="-framework Carbon" - enable_winequartz_drv=${enable_winequartz_drv:-yes} + enable_winemac_drv=${enable_winemac_drv:-yes} fi if test "x$enable_win16" = "xyes" then @@ -7129,7 +7129,7 @@ $as_echo "$ac_cv_c_dll_hpux" >&6; } esac enable_wineqtdecoder=${enable_wineqtdecoder:-no} -enable_winequartz_drv=${enable_winequartz_drv:-no} +enable_winemac_drv=${enable_winemac_drv:-no} if test "$LIBEXT" = "a"; then as_fn_error $? "could not find a way to build shared libraries. @@ -15866,13 +15866,13 @@ wine_fn_config_lib winecrt0 wine_fn_config_dll wined3d enable_wined3d implib wine_fn_config_dll winegstreamer enable_winegstreamer wine_fn_config_dll winejoystick.drv enable_winejoystick_drv +wine_fn_config_dll winemac.drv enable_winemac_drv wine_fn_config_dll winemapi enable_winemapi wine_fn_config_dll winemp3.acm enable_winemp3_acm wine_fn_config_dll wineoss.drv enable_wineoss_drv wine_fn_config_dll wineps.drv enable_wineps_drv install-lib,po wine_fn_config_dll wineps16.drv16 enable_win16 wine_fn_config_dll wineqtdecoder enable_wineqtdecoder -wine_fn_config_dll winequartz.drv enable_winequartz_drv wine_fn_config_dll winex11.drv enable_winex11_drv wine_fn_config_dll wing.dll16 enable_win16 wine_fn_config_dll wing32 enable_wing32 diff --git a/configure.ac b/configure.ac index 2a4ea4e..3a07cbf 100644 --- a/configure.ac +++ b/configure.ac @@ -796,11 +796,11 @@ case $host_os in else WINE_NOTICE([QuickTime ${notice_platform}development files not found, video decoding won't be supported.]) fi - dnl Enable quartz driver on Mac OS X + dnl Enable Mac driver on Mac OS X if test "$ac_cv_header_Carbon_Carbon_h" = "yes" then AC_SUBST(CARBONLIB,"-framework Carbon") - enable_winequartz_drv=${enable_winequartz_drv:-yes} + enable_winemac_drv=${enable_winemac_drv:-yes} fi dnl Check for Xcode 3.x broken 16-bit support if test "x$enable_win16" = "xyes" @@ -899,7 +899,7 @@ case $host_os in esac enable_wineqtdecoder=${enable_wineqtdecoder:-no} -enable_winequartz_drv=${enable_winequartz_drv:-no} +enable_winemac_drv=${enable_winemac_drv:-no} if test "$LIBEXT" = "a"; then AC_MSG_ERROR( @@ -3045,13 +3045,13 @@ WINE_CONFIG_LIB(winecrt0) WINE_CONFIG_DLL(wined3d,,[implib]) WINE_CONFIG_DLL(winegstreamer) WINE_CONFIG_DLL(winejoystick.drv) +WINE_CONFIG_DLL(winemac.drv) WINE_CONFIG_DLL(winemapi) WINE_CONFIG_DLL(winemp3.acm) WINE_CONFIG_DLL(wineoss.drv) WINE_CONFIG_DLL(wineps.drv,,[install-lib,po]) WINE_CONFIG_DLL(wineps16.drv16,enable_win16) WINE_CONFIG_DLL(wineqtdecoder) -WINE_CONFIG_DLL(winequartz.drv) WINE_CONFIG_DLL(winex11.drv) WINE_CONFIG_DLL(wing.dll16,enable_win16) WINE_CONFIG_DLL(wing32) diff --git a/dlls/winequartz.drv/Makefile.in b/dlls/winemac.drv/Makefile.in similarity index 58% rename from dlls/winequartz.drv/Makefile.in rename to dlls/winemac.drv/Makefile.in index 18801f5..4145dff 100644 --- a/dlls/winequartz.drv/Makefile.in +++ b/dlls/winemac.drv/Makefile.in @@ -1,7 +1,7 @@ -MODULE = winequartz.drv +MODULE = winemac.drv IMPORTS = user32 gdi32 advapi32 C_SRCS = \ - quartzdrv_main.c + macdrv_main.c @MAKE_DLL_RULES@ diff --git a/dlls/winequartz.drv/quartzdrv_main.c b/dlls/winemac.drv/macdrv_main.c similarity index 94% rename from dlls/winequartz.drv/quartzdrv_main.c rename to dlls/winemac.drv/macdrv_main.c index 88bc6ac..17aebf6 100644 --- a/dlls/winequartz.drv/quartzdrv_main.c +++ b/dlls/winemac.drv/macdrv_main.c @@ -1,5 +1,5 @@ /* - * QUARTZDRV initialization code + * MACDRV initialization code * * Copyright 1998 Patrik Stridvall * Copyright 2000 Alexandre Julliard @@ -27,7 +27,7 @@ #include "winreg.h" /*********************************************************************** - * QUARTZDRV initialisation routine + * MACDRV initialisation routine */ BOOL WINAPI DllMain( HINSTANCE hinst, DWORD reason, LPVOID reserved ) { diff --git a/dlls/winequartz.drv/winequartz.drv.spec b/dlls/winemac.drv/winemac.drv.spec similarity index 100% rename from dlls/winequartz.drv/winequartz.drv.spec rename to dlls/winemac.drv/winemac.drv.spec

1 0

Ken Thomases : winemac: Implement minimal Create[Compatible]DC() and DeleteDC().
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 59e339faac8b6fdf1672bdbfbce4c1bc1dbd72ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=59e339faac8b6fdf1672bdbfb… Author: Ken Thomases <ken(a)codeweavers.com> Date: Sun Dec 16 18:07:10 2012 -0600 winemac: Implement minimal Create[Compatible]DC() and DeleteDC(). --- dlls/winemac.drv/Makefile.in | 1 + dlls/winemac.drv/gdi.c | 254 +++++++++++++++++++++++++++++++++++++ dlls/winemac.drv/winemac.drv.spec | 4 +- 3 files changed, 258 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=59e339faac8b6fdf1672b…

1 0

Jacek Caban : jscript: Fixed Number.toFixed for value 0 with 0 precision.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 9de9c353ac5c09546fba139f3f446e62522e49a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9de9c353ac5c09546fba139f3… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 17 13:35:54 2012 +0100 jscript: Fixed Number.toFixed for value 0 with 0 precision. --- dlls/jscript/number.c | 6 ++++-- dlls/jscript/tests/api.js | 8 ++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/number.c b/dlls/jscript/number.c index ed773a3..351e915 100644 --- a/dlls/jscript/number.c +++ b/dlls/jscript/number.c @@ -99,15 +99,17 @@ static inline jsstr_t *number_to_fixed(double val, int prec) jsstr_t *ret; WCHAR *str; + TRACE("%lf %d\n", val, prec); + if(val < 0) { neg = TRUE; val = -val; } - if(val<=-1 || val>=1) + if(val >= 1) buf_size = log10(val)+prec+2; else - buf_size = prec+1; + buf_size = prec ? prec+1 : 2; if(buf_size > NUMBER_DTOA_SIZE) buf_size = NUMBER_DTOA_SIZE; diff --git a/dlls/jscript/tests/api.js b/dlls/jscript/tests/api.js index 6322eae..5d45777 100644 --- a/dlls/jscript/tests/api.js +++ b/dlls/jscript/tests/api.js @@ -1204,6 +1204,14 @@ ok(tmp === "101.1", "num(5.5).toString(2) = " + tmp); tmp = (new Number(3)).toFixed(3); ok(tmp === "3.000", "num(3).toFixed(3) = " + tmp); +tmp = (new Number(3)).toFixed(); +ok(tmp === "3", "Number(3).toFixed() = " + tmp); +tmp = (new Number(0)).toFixed(); +ok(tmp === "0", "Number(0).toFixed() = " + tmp); +tmp = (new Number(0)).toFixed(1); +ok(tmp === "0.0", "Number(0).toFixed(1) = " + tmp); +tmp = (new Number(0)).toFixed(2); +ok(tmp === "0.00", "Number(0).toFixed(2) = " + tmp); tmp = (new Number(1.76)).toFixed(1); ok(tmp === "1.8", "num(1.76).toFixed(1) = " + tmp); tmp = (new Number(7.92)).toFixed(5);

1 0

Jacek Caban : jscript: Fixed deleting nonexisting properties from member expression.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 7f07bb9a7a1dbb9cab148ce58ec45775764a2f73 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f07bb9a7a1dbb9cab148ce58… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 17 13:36:08 2012 +0100 jscript: Fixed deleting nonexisting properties from member expression. --- dlls/jscript/dispex.c | 8 +++++--- dlls/jscript/tests/lang.js | 2 ++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index 2cd4ad5..dbb1c63 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1516,10 +1516,12 @@ HRESULT disp_delete_name(script_ctx_t *ctx, IDispatch *disp, jsstr_t *name, BOOL dispex_prop_t *prop; hres = find_prop_name(jsdisp, string_hash(name->str), name->str, &prop); - if(prop) + if(prop) { hres = delete_prop(prop, ret); - else - hres = DISP_E_MEMBERNOTFOUND; + }else { + *ret = TRUE; + hres = S_OK; + } jsdisp_release(jsdisp); return hres; diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index 23e12cc..f9c05bd 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1121,6 +1121,8 @@ ok(typeof(tmp.test) === "undefined", "tmp.test type = " + typeof(tmp.test)); ok(!("test" in tmp), "test is still in tmp after delete?"); for(iter in tmp) ok(false, "tmp has prop " + iter); +ok((delete tmp.test) === true, "deleting test didn't return true"); +ok((delete tmp.nonexistent) === true, "deleting nonexistent didn't return true"); tmp = new Object(); tmp.test = false;

1 0

Jacek Caban : jscript: Fixed deleting nonexistent identifiers.
by Alexandre Julliard 17 Dec '12

17 Dec '12

Module: wine Branch: master Commit: 4dbd777de289ee58a11b2c9919e9b2765b81941a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4dbd777de289ee58a11b2c991… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 17 13:36:18 2012 +0100 jscript: Fixed deleting nonexistent identifiers. --- dlls/jscript/engine.c | 16 +++++++++++----- dlls/jscript/tests/lang.js | 1 + 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/dlls/jscript/engine.c b/dlls/jscript/engine.c index fbfa460..489aef6 100644 --- a/dlls/jscript/engine.c +++ b/dlls/jscript/engine.c @@ -1631,16 +1631,22 @@ static HRESULT interp_delete_ident(exec_ctx_t *ctx) if(FAILED(hres)) return hres; - if(exprval.type != EXPRVAL_IDREF) { + switch(exprval.type) { + case EXPRVAL_IDREF: + hres = disp_delete(exprval.u.idref.disp, exprval.u.idref.id, &ret); + IDispatch_Release(exprval.u.idref.disp); + if(FAILED(hres)) + return ret; + break; + case EXPRVAL_INVALID: + ret = TRUE; + break; + default: FIXME("Unsupported exprval\n"); exprval_release(&exprval); return E_NOTIMPL; } - hres = disp_delete(exprval.u.idref.disp, exprval.u.idref.id, &ret); - IDispatch_Release(exprval.u.idref.disp); - if(FAILED(hres)) - return ret; return stack_push(ctx, jsval_bool(ret)); } diff --git a/dlls/jscript/tests/lang.js b/dlls/jscript/tests/lang.js index f9c05bd..bac2deb 100644 --- a/dlls/jscript/tests/lang.js +++ b/dlls/jscript/tests/lang.js @@ -1123,6 +1123,7 @@ for(iter in tmp) ok(false, "tmp has prop " + iter); ok((delete tmp.test) === true, "deleting test didn't return true"); ok((delete tmp.nonexistent) === true, "deleting nonexistent didn't return true"); +ok((delete nonexistent) === true, "deleting nonexistent didn't return true"); tmp = new Object(); tmp.test = false;

1 0