December 2012 - Wine-Commits

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

Dec. 18, 2012

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

Dmitry Timoshkov : winspool.drv: Correct the DocumentProperties spec entry.
by Alexandre Julliard Dec. 18, 2012

Dec. 18, 2012

Module: wine Branch: master Commit: 1cf52561c3dbe11e1fe440da19ba8e0b72a36856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cf52561c3dbe11e1fe440da1… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Dec 18 16:57:03 2012 +0800 winspool.drv: Correct the DocumentProperties spec entry. --- dlls/winspool.drv/winspool.drv.spec | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winspool.drv/winspool.drv.spec b/dlls/winspool.drv/winspool.drv.spec index bdf346c..e83faec 100644 --- a/dlls/winspool.drv/winspool.drv.spec +++ b/dlls/winspool.drv/winspool.drv.spec @@ -99,8 +99,8 @@ @ stdcall DeviceCapabilitiesW(wstr wstr long ptr ptr) @ stub DeviceMode @ stub DocumentEvent -@ stdcall DocumentPropertiesA(long long ptr ptr ptr long) -@ stdcall DocumentPropertiesW(long long ptr ptr ptr long) +@ stdcall DocumentPropertiesA(long long str ptr ptr long) +@ stdcall DocumentPropertiesW(long long wstr ptr ptr long) @ stub EXTDEVICEMODE @ stdcall EndDocPrinter(long) @ stdcall EndPagePrinter(long)

1 0

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

Dec. 17, 2012

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

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

Dec. 17, 2012

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 properties of pure dispatch interface .
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: 7202f1a32f884838586c1b019b02401f22cafd7a URL: http://source.winehq.org/git/wine.git/?a=commit;h=7202f1a32f884838586c1b019… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon Dec 17 13:36:31 2012 +0100 jscript: Fixed deleting properties of pure dispatch interface. --- dlls/jscript/dispex.c | 14 ++++++++++++-- dlls/jscript/tests/run.c | 8 ++++++++ 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/dispex.c b/dlls/jscript/dispex.c index dbb1c63..78809ee 100644 --- a/dlls/jscript/dispex.c +++ b/dlls/jscript/dispex.c @@ -1542,8 +1542,18 @@ HRESULT disp_delete_name(script_ctx_t *ctx, IDispatch *disp, jsstr_t *name, BOOL IDispatchEx_Release(dispex); }else { - hres = S_OK; - ret = FALSE; + WCHAR *name_str = name->str; + DISPID id; + + hres = IDispatch_GetIDsOfNames(disp, &IID_NULL, &name_str, 1, 0, &id); + if(SUCCEEDED(hres)) { + /* Property exists and we can't delete it from pure IDispatch interface, so return false. */ + *ret = FALSE; + }else if(hres == DISP_E_UNKNOWNNAME) { + /* Property doesn't exist, so nothing to delete */ + *ret = TRUE; + hres = S_OK; + } } return hres; diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 55b1398..46f519a 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -1846,6 +1846,14 @@ static BOOL run_tests(void) CHECK_CALLED(global_propdelete_d); CHECK_CALLED(DeleteMemberByDispID); + SET_EXPECT(puredisp_prop_d); + parse_script_a("ok((delete pureDisp.prop) === false, 'delete pureDisp.prop did not return true');"); + CHECK_CALLED(puredisp_prop_d); + + SET_EXPECT(puredisp_noprop_d); + parse_script_a("ok((delete pureDisp.noprop) === true, 'delete pureDisp.noprop did not return false');"); + CHECK_CALLED(puredisp_noprop_d); + parse_script_a("(function reportSuccess() {})()"); parse_script_a("ok(typeof(test) === 'object', \"typeof(test) != 'object'\");");

1 0

Dmitry Timoshkov : winspool.drv: Add more traces.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: bdf14227ab1c6b55c11f466c9650116c9e260c42 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdf14227ab1c6b55c11f466c9… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 17 17:40:38 2012 +0800 winspool.drv: Add more traces. --- dlls/winspool.drv/info.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 45b49f3..60b621e 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -2248,6 +2248,8 @@ INT WINAPI DeviceCapabilitiesA(LPCSTR pDevice,LPCSTR pPort, WORD cap, { INT ret; + TRACE("%s,%s,%u,%p,%p\n", debugstr_a(pDevice), debugstr_a(pPort), cap, pOutput, lpdm); + if (!GDI_CallDeviceCapabilities16) { GDI_CallDeviceCapabilities16 = (void*)GetProcAddress( GetModuleHandleA("gdi32"), @@ -2288,6 +2290,8 @@ INT WINAPI DeviceCapabilitiesW(LPCWSTR pDevice, LPCWSTR pPort, LPSTR pPortA = strdupWtoA(pPort); INT ret; + TRACE("%s,%s,%u,%p,%p\n", debugstr_w(pDevice), debugstr_w(pPort), fwCapability, pOutput, pDevMode); + if(pOutput && (fwCapability == DC_BINNAMES || fwCapability == DC_FILEDEPENDENCIES || fwCapability == DC_PAPERNAMES)) { @@ -2454,6 +2458,8 @@ BOOL WINAPI OpenPrinterA(LPSTR lpPrinterName,HANDLE *phPrinter, PWSTR pwstrPrinterNameW; BOOL ret; + TRACE("%s,%p,%p\n", debugstr_a(lpPrinterName), phPrinter, pDefault); + pwstrPrinterNameW = asciitounicode(&lpPrinterNameW,lpPrinterName); if(pDefault) {

1 0

Dmitry Timoshkov : wineps.drv: Update default DEVMODE to better indicate initialized fields.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: 1cd551cd6a31474c2bd028d0f6e181d8af75e975 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cd551cd6a31474c2bd028d0f… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Dec 17 17:41:18 2012 +0800 wineps.drv: Update default DEVMODE to better indicate initialized fields. --- dlls/wineps.drv/init.c | 19 ++++++++++--------- 1 files changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/wineps.drv/init.c b/dlls/wineps.drv/init.c index 01d7f13..c63a6be 100644 --- a/dlls/wineps.drv/init.c +++ b/dlls/wineps.drv/init.c @@ -48,28 +48,29 @@ static const PSDRV_DEVMODE DefaultDevmode = /* dmDriverVersion */ 0x001, /* dmSize */ sizeof(DEVMODEW), /* dmDriverExtra */ sizeof(PSDRV_DEVMODE)-sizeof(DEVMODEW), -/* dmFields */ DM_ORIENTATION | DM_PAPERSIZE | DM_SCALE | - DM_COPIES | DM_DEFAULTSOURCE | DM_COLOR | - DM_YRESOLUTION | DM_TTOPTION, +/* dmFields */ DM_ORIENTATION | DM_PAPERSIZE | DM_PAPERLENGTH | DM_PAPERWIDTH | + DM_SCALE | DM_COPIES | DM_DEFAULTSOURCE | DM_PRINTQUALITY | + DM_COLOR | DM_DUPLEX | DM_YRESOLUTION | DM_TTOPTION | + DM_COLLATE | DM_FORMNAME, { /* u1 */ { /* s1 */ /* dmOrientation */ DMORIENT_PORTRAIT, /* dmPaperSize */ DMPAPER_LETTER, /* dmPaperLength */ 2794, /* dmPaperWidth */ 2159, -/* dmScale */ 100, /* ?? */ +/* dmScale */ 100, /* dmCopies */ 1, /* dmDefaultSource */ DMBIN_AUTO, -/* dmPrintQuality */ 0 +/* dmPrintQuality */ 300 } }, /* dmColor */ DMCOLOR_COLOR, /* dmDuplex */ DMDUP_SIMPLEX, -/* dmYResolution */ 0, +/* dmYResolution */ 300, /* dmTTOption */ DMTT_SUBDEV, -/* dmCollate */ 0, -/* dmFormName */ {}, -/* dmUnusedPadding */ 0, +/* dmCollate */ DMCOLLATE_FALSE, +/* dmFormName */ {'L','e','t','t','e','r',0}, +/* dmLogPixels */ 0, /* dmBitsPerPel */ 0, /* dmPelsWidth */ 0, /* dmPelsHeight */ 0,

1 0

Christian Costa : d3drm: Check params in IDirect3DRMMeshBuilder2Impl_GetVertices + tests.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: 871aa9d14daafb869a546a738498716ad58d54dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=871aa9d14daafb869a546a738… Author: Christian Costa <titan.costa(a)gmail.com> Date: Mon Dec 17 10:11:44 2012 +0100 d3drm: Check params in IDirect3DRMMeshBuilder2Impl_GetVertices + tests. --- dlls/d3drm/meshbuilder.c | 8 ++++++++ dlls/d3drm/tests/d3drm.c | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/dlls/d3drm/meshbuilder.c b/dlls/d3drm/meshbuilder.c index ffbdec7..bf9a162 100644 --- a/dlls/d3drm/meshbuilder.c +++ b/dlls/d3drm/meshbuilder.c @@ -801,14 +801,22 @@ static HRESULT WINAPI IDirect3DRMMeshBuilder2Impl_GetVertices(IDirect3DRMMeshBui TRACE("(%p)->(%p,%p,%p,%p,%p,%p)\n", This, vcount, vertices, ncount, normals, face_data_size, face_data); + if (vertices && (!vcount || (*vcount < This->nb_vertices))) + return D3DRMERR_BADVALUE; if (vcount) *vcount = This->nb_vertices; if (vertices && This->nb_vertices) memcpy(vertices, This->pVertices, This->nb_vertices * sizeof(D3DVECTOR)); + + if (normals && (!ncount || (*ncount < This->nb_normals))) + return D3DRMERR_BADVALUE; if (ncount) *ncount = This->nb_normals; if (normals && This->nb_normals) memcpy(normals, This->pNormals, This->nb_normals * sizeof(D3DVECTOR)); + + if (face_data && (!face_data_size || (*face_data_size < This->face_data_size))) + return D3DRMERR_BADVALUE; if (face_data_size) *face_data_size = This->face_data_size; if (face_data && This->face_data_size) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 97e047a..6eb7bd0 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -393,6 +393,24 @@ static void test_MeshBuilder(void) val = IDirect3DRMMeshBuilder_GetFaceCount(pMeshBuilder); ok(val == 1, "Wrong number of faces %d (must be 1)\n", val); + /* Check no buffer size and too small buffer size errors */ + val1 = 1; val2 = 3; val3 = 8; + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f); + ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr); + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, NULL, v, &val2, n, &val3, f); + ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr); + val1 = 3; val2 = 1; val3 = 8; + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f); + ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr); + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, NULL, n, &val3, f); + ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr); + val1 = 3; val2 = 3; val3 = 1; + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f); + ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr); + hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, NULL, f); + ok(hr == D3DRMERR_BADVALUE, "IDirect3DRMMeshBuilder_GetVertices returned %#x\n", hr); + + val1 = 3; val2 = 3; val3 = 8; hr = IDirect3DRMMeshBuilder_GetVertices(pMeshBuilder, &val1, v, &val2, n, &val3, f); ok(hr == D3DRM_OK, "Cannot get vertices information (hr = %x)\n", hr); ok(val1 == 3, "Wrong number of vertices %d (must be 3)\n", val1);

1 0

Piotr Caban : msvcrt: Added _atodbl_l implementation.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: 3b5ab1b48facb8f30032948e326ce9eb3521502d URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b5ab1b48facb8f30032948e3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 17 15:19:07 2012 +0100 msvcrt: Added _atodbl_l implementation. --- dlls/msvcrt/msvcrt.h | 6 ++++++ dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/string.c | 23 +++++++++++++++++++++++ 3 files changed, 31 insertions(+), 2 deletions(-) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index ea31b3c..bdd5933 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -986,6 +986,7 @@ int pf_printf_w(puts_clbk_w, void*, const MSVCRT_wchar_t*, MSVCRT__locale_t, printf_arg arg_clbk_valist(void*, int, int, __ms_va_list*) DECLSPEC_HIDDEN; #define MSVCRT_FLT_MIN 1.175494351e-38F +#define MSVCRT_DBL_MIN 2.2250738585072014e-308 #define MSVCRT__OVERFLOW 3 #define MSVCRT__UNDERFLOW 4 @@ -994,4 +995,9 @@ typedef struct float f; } MSVCRT__CRT_FLOAT; +typedef struct +{ + double x; +} MSVCRT__CRT_DOUBLE; + #endif /* __WINE_MSVCRT_H */ diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 274554b..79f6511 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -300,8 +300,8 @@ # stub _aligned_realloc_dbg(ptr long long str long) @ cdecl _amsg_exit(long) @ cdecl _assert(str str long) MSVCRT__assert -@ stub _atodbl(ptr str) -# stub _atodbl_l(ptr str ptr) +@ cdecl _atodbl(ptr str) MSVCRT__atodbl +@ cdecl _atodbl_l(ptr str ptr) MSVCRT__atodbl_l @ cdecl _atof_l(str ptr) MSVCRT__atof_l @ cdecl _atoflt_l(ptr str ptr) MSVCRT__atoflt_l @ cdecl -ret64 _atoi64(str) ntdll._atoi64 diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 90518bc..f166865 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -455,6 +455,29 @@ int CDECL MSVCRT__atoflt_l( MSVCRT__CRT_FLOAT *value, char *str, MSVCRT__locale_ } /********************************************************************* + * _atodbl_l (MSVCRT.@) + */ +int CDECL MSVCRT__atodbl_l(MSVCRT__CRT_DOUBLE *value, char *str, MSVCRT__locale_t locale) +{ + int err; + + value->x = strtod_helper(str, NULL, locale, &err); + if(isinf(value->x)) + return MSVCRT__OVERFLOW; + if((value->x!=0 || err) && value->x>-MSVCRT_DBL_MIN && value->x<MSVCRT_DBL_MIN) + return MSVCRT__UNDERFLOW; + return 0; +} + +/********************************************************************* + * _atodbl (MSVCRT.@) + */ +int CDECL MSVCRT__atodbl(MSVCRT__CRT_DOUBLE *value, char *str) +{ + return MSVCRT__atodbl_l(value, str, NULL); +} + +/********************************************************************* * _strcoll_l (MSVCRT.@) */ int CDECL MSVCRT_strcoll_l( const char* str1, const char* str2, MSVCRT__locale_t locale )

1 0

Piotr Caban : msvcrt: Don' t duplicate floating-point number parsing code in MSVCRT__atoflt_l.
by Alexandre Julliard Dec. 17, 2012

Dec. 17, 2012

Module: wine Branch: master Commit: 38bf8ac44bbc9d9f9cb121158e51bfe7ca02dd2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=38bf8ac44bbc9d9f9cb121158… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Dec 17 15:18:54 2012 +0100 msvcrt: Don't duplicate floating-point number parsing code in MSVCRT__atoflt_l. --- dlls/msvcrt/string.c | 137 +++++++++++--------------------------------------- 1 files changed, 29 insertions(+), 108 deletions(-) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 2748c8d..90518bc 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -280,10 +280,7 @@ void CDECL MSVCRT__swab(char* src, char* dst, int len) } } -/********************************************************************* - * strtod_l (MSVCRT.@) - */ -double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t locale) +static double strtod_helper(const char *str, char **end, MSVCRT__locale_t locale, int *err) { MSVCRT_pthreadlocinfo locinfo; unsigned __int64 d=0, hlp; @@ -294,7 +291,10 @@ double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t loca long double lret=1, expcnt = 10; BOOL found_digit = FALSE, negexp; - if (!MSVCRT_CHECK_PMT(str != NULL)) return 0; + if(err) + *err = 0; + else + if(!MSVCRT_CHECK_PMT(str != NULL)) return 0; if(!locale) locinfo = get_locinfo(); @@ -392,8 +392,12 @@ double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t loca _control87(fpcontrol, 0xffffffff); - if((d && ret==0.0) || isinf(ret)) - *MSVCRT__errno() = MSVCRT_ERANGE; + if((d && ret==0.0) || isinf(ret)) { + if(err) + *err = MSVCRT_ERANGE; + else + *MSVCRT__errno() = MSVCRT_ERANGE; + } if(end) *end = (char*)p; @@ -402,6 +406,14 @@ double CDECL MSVCRT_strtod_l( const char *str, char **end, MSVCRT__locale_t loca } /********************************************************************* + * strtod_l (MSVCRT.@) + */ +double CDECL MSVCRT_strtod_l(const char *str, char **end, MSVCRT__locale_t locale) +{ + return strtod_helper(str, end, locale, NULL); +} + +/********************************************************************* * strtod (MSVCRT.@) */ double CDECL MSVCRT_strtod( const char *str, char **end ) @@ -430,107 +442,16 @@ double CDECL MSVCRT__atof_l( const char *str, MSVCRT__locale_t locale) */ int CDECL MSVCRT__atoflt_l( MSVCRT__CRT_FLOAT *value, char *str, MSVCRT__locale_t locale) { - MSVCRT_pthreadlocinfo locinfo; - unsigned __int64 d=0, hlp; - unsigned fpcontrol; - int exp=0, sign=1; - const char *p; - int ret=0; - BOOL found_digit = FALSE; - - if(!locale) - locinfo = get_locinfo(); - else - locinfo = locale->locinfo; - - /* FIXME: use *_l functions */ - p = str; - while(isspace(*p)) - p++; - - if(*p == '-') { - sign = -1; - p++; - } else if(*p == '+') - p++; - - while(isdigit(*p)) { - found_digit = TRUE; - hlp = d*10+*(p++)-'0'; - if(d>MSVCRT_UI64_MAX/10 || hlp<d) { - exp++; - break; - } else - d = hlp; - } - while(isdigit(*p)) { - exp++; - p++; - } - - if(*p == *locinfo->lconv->decimal_point) - p++; - - while(isdigit(*p)) { - found_digit = TRUE; - hlp = d*10+*(p++)-'0'; - if(d>MSVCRT_UI64_MAX/10 || hlp<d) - break; - - d = hlp; - exp--; - } - while(isdigit(*p)) - p++; - - if(!found_digit) { - value->f = 0.0; - return 0; - } - - if(*p=='e' || *p=='E' || *p=='d' || *p=='D') { - int e=0, s=1; - - p++; - if(*p == '-') { - s = -1; - p++; - } else if(*p == '+') - p++; - - if(isdigit(*p)) { - while(isdigit(*p)) { - if(e>INT_MAX/10 || (e=e*10+*p-'0')<0) - e = INT_MAX; - p++; - } - e *= s; - - if(exp<0 && e<0 && exp+e>=0) exp = INT_MIN; - else if(exp>0 && e>0 && exp+e<0) exp = INT_MAX; - else exp += e; - } else { - if(*p=='-' || *p=='+') - p--; - p--; - } - } - - fpcontrol = _control87(0, 0); - _control87(MSVCRT__EM_DENORMAL|MSVCRT__EM_INVALID|MSVCRT__EM_ZERODIVIDE - |MSVCRT__EM_OVERFLOW|MSVCRT__EM_UNDERFLOW|MSVCRT__EM_INEXACT, 0xffffffff); - - if(exp>0) - value->f = (double)sign*d*pow(10, exp); - else - value->f = (double)sign*d/pow(10, -exp); - - _control87(fpcontrol, 0xffffffff); - - if((d && value->f>-MSVCRT_FLT_MIN && value->f<MSVCRT_FLT_MIN) || isinf(value->f)) - ret = exp > 0 ? MSVCRT__OVERFLOW : MSVCRT__UNDERFLOW; - - return ret; + double d; + int err; + + d = strtod_helper(str, NULL, locale, &err); + value->f = d; + if(isinf(value->f)) + return MSVCRT__OVERFLOW; + if((d!=0 || err) && value->f>-MSVCRT_FLT_MIN && value->f<MSVCRT_FLT_MIN) + return MSVCRT__UNDERFLOW; + return 0; } /*********************************************************************

1 0