December 2012 - Wine-Commits

Jacek Caban : jscript: Added SCRIPTTEXT_ISEXPRESSION tests.
by Alexandre Julliard Dec. 12, 2012

Dec. 12, 2012

Module: wine Branch: master Commit: 2c41c4c1cb1da024e5dbf2786066d221e1dbb81d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2c41c4c1cb1da024e5dbf2786… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 12 13:12:39 2012 +0100 jscript: Added SCRIPTTEXT_ISEXPRESSION tests. --- dlls/jscript/tests/run.c | 83 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 81 insertions(+), 2 deletions(-) diff --git a/dlls/jscript/tests/run.c b/dlls/jscript/tests/run.c index 3c5422c..58cf874 100644 --- a/dlls/jscript/tests/run.c +++ b/dlls/jscript/tests/run.c @@ -141,7 +141,7 @@ static const WCHAR test_valW[] = {'t','e','s','t','V','a','l',0}; static const CHAR test_valA[] = "testVal"; static const WCHAR emptyW[] = {0}; -static BOOL strict_dispid_check; +static BOOL strict_dispid_check, testing_expr; static const char *test_name = "(null)"; static IDispatch *script_disp; static int invoke_version; @@ -652,7 +652,8 @@ static HRESULT WINAPI Global_InvokeEx(IDispatchEx *iface, DISPID id, LCID lcid, ok(!pdp->rgdispidNamedArgs, "rgdispidNamedArgs != NULL\n"); ok(pdp->cArgs == 0, "cArgs = %d\n", pdp->cArgs); ok(!pdp->cNamedArgs, "cNamedArgs = %d\n", pdp->cNamedArgs); - ok(!pvarRes, "pvarRes != NULL\n"); + if(!testing_expr) + ok(!pvarRes, "pvarRes != NULL\n"); ok(pei != NULL, "pei == NULL\n"); return S_OK; @@ -1695,6 +1696,82 @@ static void test_isvisible(BOOL global_members) IActiveScriptParse_Release(parser); } +static HRESULT parse_script_expr(const char *expr, VARIANT *res) +{ + IActiveScriptParse *parser; + IActiveScript *engine; + BSTR str; + HRESULT hres; + + engine = create_script(); + + hres = IActiveScript_QueryInterface(engine, &IID_IActiveScriptParse, (void**)&parser); + ok(hres == S_OK, "Could not get IActiveScriptParse: %08x\n", hres); + + hres = IActiveScriptParse_InitNew(parser); + ok(hres == S_OK, "InitNew failed: %08x\n", hres); + + hres = IActiveScript_SetScriptSite(engine, &ActiveScriptSite); + ok(hres == S_OK, "SetScriptSite failed: %08x\n", hres); + + SET_EXPECT(GetItemInfo_testVal); + hres = IActiveScript_AddNamedItem(engine, test_valW, + SCRIPTITEM_ISVISIBLE|SCRIPTITEM_ISSOURCE|SCRIPTITEM_GLOBALMEMBERS); + ok(hres == S_OK, "AddNamedItem failed: %08x\n", hres); + CHECK_CALLED(GetItemInfo_testVal); + + hres = IActiveScript_SetScriptState(engine, SCRIPTSTATE_STARTED); + ok(hres == S_OK, "SetScriptState(SCRIPTSTATE_STARTED) failed: %08x\n", hres); + + str = a2bstr(expr); + hres = IActiveScriptParse_ParseScriptText(parser, str, NULL, NULL, NULL, 0, 0, SCRIPTTEXT_ISEXPRESSION, res, NULL); + SysFreeString(str); + + IActiveScript_Release(engine); + IActiveScriptParse_Release(parser); + + return hres; +} + +static void test_script_exprs(void) +{ + VARIANT v; + HRESULT hres; + + testing_expr = TRUE; + + hres = parse_script_expr("true", &v); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_BOOL(&v) == VARIANT_TRUE, "V_BOOL(v) = %x\n", V_BOOL(&v)); + + hres = parse_script_expr("false, true", &v); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_BOOL(&v) == VARIANT_TRUE, "V_BOOL(v) = %x\n", V_BOOL(&v)); + + SET_EXPECT(global_success_d); + SET_EXPECT(global_success_i); + hres = parse_script_expr("reportSuccess(); true", &v); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_BOOL, "V_VT(v) = %d\n", V_VT(&v)); + ok(V_BOOL(&v) == VARIANT_TRUE, "V_BOOL(v) = %x\n", V_BOOL(&v)); + CHECK_CALLED(global_success_d); + CHECK_CALLED(global_success_i); + + hres = parse_script_expr("if(false) true", &v); + ok(hres == S_OK, "parse_script_expr failed: %08x\n", hres); + ok(V_VT(&v) == VT_EMPTY, "V_VT(v) = %d\n", V_VT(&v)); + + hres = parse_script_expr("return testPropGet", &v); + ok(hres == 0x800a03fa, "parse_script_expr failed: %08x\n", hres); + + hres = parse_script_expr("reportSuccess(); return true", &v); + ok(hres == 0x800a03fa, "parse_script_expr failed: %08x\n", hres); + + testing_expr = FALSE; +} + static BOOL run_tests(void) { HRESULT hres; @@ -1892,6 +1969,8 @@ static BOOL run_tests(void) hres = parse_htmlscript_a("var a=1;\nif(a\n-->0) a=5;\n"); ok(hres != S_OK, "ParseScriptText have not failed\n"); + test_script_exprs(); + parse_script_with_error_a( "?", 0x800a03ea, 0, 0,

1 0

Jacek Caban : jscript: Added support for SCRIPTTEXT_ISEXPRESSION.
by Alexandre Julliard Dec. 12, 2012

Dec. 12, 2012

Module: wine Branch: master Commit: 5e4a16819ef3e29757d54a536e436cdb18981fee URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e4a16819ef3e29757d54a536… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 12 13:12:17 2012 +0100 jscript: Added support for SCRIPTTEXT_ISEXPRESSION. --- dlls/jscript/jscript.c | 26 +++++++++++++++++++++++++- 1 files changed, 25 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/jscript.c b/dlls/jscript/jscript.c index 16deac4..f7032bb 100644 --- a/dlls/jscript/jscript.c +++ b/dlls/jscript/jscript.c @@ -766,10 +766,34 @@ static HRESULT WINAPI JScriptParse_ParseScriptText(IActiveScriptParse *iface, if(This->thread_id != GetCurrentThreadId() || This->ctx->state == SCRIPTSTATE_CLOSED) return E_UNEXPECTED; - hres = compile_script(This->ctx, pstrCode, NULL, pstrDelimiter, FALSE, This->is_encode, &code); + hres = compile_script(This->ctx, pstrCode, NULL, pstrDelimiter, (dwFlags & SCRIPTTEXT_ISEXPRESSION) != 0, + This->is_encode, &code); if(FAILED(hres)) return hres; + if(dwFlags & SCRIPTTEXT_ISEXPRESSION) { + exec_ctx_t *exec_ctx; + + hres = create_exec_ctx(This->ctx, NULL, This->ctx->global, NULL, TRUE, &exec_ctx); + if(SUCCEEDED(hres)) { + jsval_t r; + + IActiveScriptSite_OnEnterScript(This->site); + + clear_ei(This->ctx); + hres = exec_source(exec_ctx, code, &code->global_code, TRUE, &r); + if(SUCCEEDED(hres)) { + hres = jsval_to_variant(r, pvarResult); + jsval_release(r); + } + exec_release(exec_ctx); + + IActiveScriptSite_OnLeaveScript(This->site); + } + + return hres; + } + if(!is_started(This->ctx)) { if(This->queue_tail) This->queue_tail = This->queue_tail->next = code;

1 0

Christian Costa : d3drm: Load object only if it is top level and requested or if it is part of another object .
by Alexandre Julliard Dec. 12, 2012

Dec. 12, 2012

Module: wine Branch: master Commit: 6595cdd41fb2f9e26a607683558791bbd3bb5e5d URL: http://source.winehq.org/git/wine.git/?a=commit;h=6595cdd41fb2f9e26a6076835… Author: Christian Costa <titan.costa(a)gmail.com> Date: Wed Dec 12 09:36:37 2012 +0100 d3drm: Load object only if it is top level and requested or if it is part of another object. --- dlls/d3drm/d3drm.c | 130 ++++++++++++++++++++++++++++------------------------ 1 files changed, 70 insertions(+), 60 deletions(-) diff --git a/dlls/d3drm/d3drm.c b/dlls/d3drm/d3drm.c index 7261eb2..2fe4fce 100644 --- a/dlls/d3drm/d3drm.c +++ b/dlls/d3drm/d3drm.c @@ -1272,6 +1272,8 @@ static HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPI TRACE("Found object type whose GUID = %s\n", debugstr_guid(guid)); + /* Load object only if it is top level and requested or if it is part of another object */ + if (IsEqualGUID(guid, &TID_D3DRMMesh)) { TRACE("Found TID_D3DRMMesh\n"); @@ -1285,30 +1287,34 @@ static HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPI break; } - if (requested) + if (requested || parent_frame) { - LPDIRECT3DRMMESHBUILDER3 meshbuilder; + IDirect3DRMMeshBuilder3 *meshbuilder; - TRACE("Load mesh data and notify application\n"); + TRACE("Load mesh data\n"); hr = IDirect3DRM3_CreateMeshBuilder(iface, &meshbuilder); if (SUCCEEDED(hr)) { - LPDIRECT3DRMOBJECT object = NULL; - - hr = IDirect3DRMMeshBuilder3_QueryInterface(meshbuilder, GUIDs[i], (void**)&object); + hr = load_mesh_data(meshbuilder, data_object); if (SUCCEEDED(hr)) { - hr = load_mesh_data(meshbuilder, data_object); - if (SUCCEEDED(hr)) + /* Only top level objects are notified */ + if (!parent_frame) { - /* Only top level objects are notified */ - if (parent_frame) - IDirect3DRMFrame3_AddVisual(parent_frame, (IUnknown*)meshbuilder); - else + IDirect3DRMObject *object; + + hr = IDirect3DRMMeshBuilder3_QueryInterface(meshbuilder, GUIDs[i], (void**)&object); + if (SUCCEEDED(hr)) + { LoadProc(object, GUIDs[i], ArgLP); + IDirect3DRMObject_Release(object); + } + } + else + { + IDirect3DRMFrame3_AddVisual(parent_frame, (IUnknown*)meshbuilder); } - IDirect3DRMObject_Release(object); } IDirect3DRMMeshBuilder3_Release(meshbuilder); } @@ -1330,68 +1336,69 @@ static HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPI break; } - if (requested) + if (requested || parent_frame) { - LPDIRECT3DRMFRAME3 frame; + IDirect3DRMFrame3 *frame; - TRACE("Load frame data and notify application\n"); + TRACE("Load frame data\n"); hr = IDirect3DRM3_CreateFrame(iface, parent_frame, &frame); if (SUCCEEDED(hr)) { - LPDIRECT3DRMOBJECT object; + IDirectXFileObject *child; - hr = IDirect3DRMFrame3_QueryInterface(frame, GUIDs[i], (void**)&object); - if (SUCCEEDED(hr)) + while (SUCCEEDED(hr = IDirectXFileData_GetNextObject(data_object, &child))) { - LPDIRECTXFILEOBJECT child; + IDirectXFileData *data; + IDirectXFileDataReference *reference; + IDirectXFileBinary *binary; - while (SUCCEEDED(hr = IDirectXFileData_GetNextObject(data_object, &child))) + hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileBinary, (void **)&binary); + if (SUCCEEDED(hr)) { - LPDIRECTXFILEDATA data; - LPDIRECTXFILEDATAREFERENCE reference; - LPDIRECTXFILEBINARY binary; - - hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileBinary, (void **)&binary); - if (SUCCEEDED(hr)) - { - FIXME("Binary Object not supported yet\n"); - IDirectXFileBinary_Release(binary); - continue; - } - - hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileData, (void **)&data); - if (SUCCEEDED(hr)) - { - TRACE("Found Data Object\n"); - hr = load_data(iface, data, GUIDs, nb_GUIDs, LoadProc, ArgLP, LoadTextureProc, ArgLTP, frame); - IDirectXFileData_Release(data); - continue; - } - hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileDataReference, (void **)&reference); - if (SUCCEEDED(hr)) - { - TRACE("Found Data Object Reference\n"); - IDirectXFileDataReference_Resolve(reference, &data); - hr = load_data(iface, data, GUIDs, nb_GUIDs, LoadProc, ArgLP, LoadTextureProc, ArgLTP, frame); - IDirectXFileData_Release(data); - IDirectXFileDataReference_Release(reference); - continue; - } + FIXME("Binary Object not supported yet\n"); + IDirectXFileBinary_Release(binary); + continue; } - if (hr != DXFILEERR_NOMOREOBJECTS) + hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileData, (void **)&data); + if (SUCCEEDED(hr)) { - IDirect3DRMObject_Release(object); - IDirect3DRMFrame3_Release(frame); - goto end; + TRACE("Found Data Object\n"); + hr = load_data(iface, data, GUIDs, nb_GUIDs, LoadProc, ArgLP, LoadTextureProc, ArgLTP, frame); + IDirectXFileData_Release(data); + continue; } - hr = S_OK; + hr = IDirectXFileObject_QueryInterface(child, &IID_IDirectXFileDataReference, (void **)&reference); + if (SUCCEEDED(hr)) + { + TRACE("Found Data Object Reference\n"); + IDirectXFileDataReference_Resolve(reference, &data); + hr = load_data(iface, data, GUIDs, nb_GUIDs, LoadProc, ArgLP, LoadTextureProc, ArgLTP, frame); + IDirectXFileData_Release(data); + IDirectXFileDataReference_Release(reference); + continue; + } + } - /* Only top level objects are notified */ - if (!parent_frame) + if (hr != DXFILEERR_NOMOREOBJECTS) + { + IDirect3DRMFrame3_Release(frame); + goto end; + } + hr = S_OK; + + /* Only top level objects are notified */ + if (!parent_frame) + { + IDirect3DRMObject *object; + + hr = IDirect3DRMFrame3_QueryInterface(frame, GUIDs[i], (void**)&object); + if (SUCCEEDED(hr)) + { LoadProc(object, GUIDs[i], ArgLP); - IDirect3DRMObject_Release(object); + IDirect3DRMObject_Release(object); + } } IDirect3DRMFrame3_Release(frame); } @@ -1402,12 +1409,15 @@ static HRESULT load_data(IDirect3DRM3* iface, LPDIRECTXFILEDATA data_object, LPI } else if (IsEqualGUID(guid, &TID_D3DRMMaterial)) { - TRACE("Found TID_D3DRMMaterial => Will be taken into account when a mesh will reference it\n"); + TRACE("Found TID_D3DRMMaterial\n"); + + /* Cannot be requested so nothing to do */ } else if (IsEqualGUID(guid, &TID_D3DRMFrameTransformMatrix)) { TRACE("Found TID_D3DRMFrameTransformMatrix\n"); + /* Cannot be requested */ if (parent_frame) { D3DRMMATRIX4D matrix;

1 0

Piotr Caban : msvcrt: Added _mbsnbcoll_l implementation.
by Alexandre Julliard Dec. 12, 2012

Dec. 12, 2012

Module: wine Branch: master Commit: f5c86479193ac81238e961fb2dc7c48444afec52 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f5c86479193ac81238e961fb2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 12 11:17:10 2012 +0100 msvcrt: Added _mbsnbcoll_l implementation. --- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/mbcs.c | 56 ++++++++++++++++++++++++++----------------- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 6 ++-- 6 files changed, 44 insertions(+), 31 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 8202518..24d3080 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1095,7 +1095,7 @@ @ cdecl _mbscmp(str str) msvcrt._mbscmp @ stub _mbscmp_l @ cdecl _mbscoll(str str) msvcrt._mbscoll -@ stub _mbscoll_l +@ cdecl _mbscoll_l(str str ptr) msvcrt._mbscoll_l @ stub _mbscpy_s @ stub _mbscpy_s_l @ cdecl _mbscspn(str str) msvcrt._mbscspn @@ -1123,7 +1123,7 @@ @ cdecl _mbsnbcnt(ptr long) msvcrt._mbsnbcnt @ stub _mbsnbcnt_l @ cdecl _mbsnbcoll(str str long) msvcrt._mbsnbcoll -@ stub _mbsnbcoll_l +@ cdecl _mbsnbcoll_l(str str long ptr) msvcrt._mbsnbcoll_l @ cdecl _mbsnbcpy(ptr str long) msvcrt._mbsnbcpy @ stub _mbsnbcpy_l @ cdecl _mbsnbcpy_s(ptr long str long) msvcrt._mbsnbcpy_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 39152c4..bdb442d 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -752,7 +752,7 @@ @ cdecl _mbscmp(str str) msvcrt._mbscmp @ stub _mbscmp_l @ cdecl _mbscoll(str str) msvcrt._mbscoll -@ stub _mbscoll_l +@ cdecl _mbscoll_l(str str ptr) msvcrt._mbscoll_l @ stub _mbscpy_s @ stub _mbscpy_s_l @ cdecl _mbscspn(str str) msvcrt._mbscspn @@ -780,7 +780,7 @@ @ cdecl _mbsnbcnt(ptr long) msvcrt._mbsnbcnt @ stub _mbsnbcnt_l @ cdecl _mbsnbcoll(str str long) msvcrt._mbsnbcoll -@ stub _mbsnbcoll_l +@ cdecl _mbsnbcoll_l(str str long ptr) msvcrt._mbsnbcoll_l @ cdecl _mbsnbcpy(ptr str long) msvcrt._mbsnbcpy @ stub _mbsnbcpy_l @ cdecl _mbsnbcpy_s(ptr long str long) msvcrt._mbsnbcpy_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index efe67ac..bc122e6 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -745,7 +745,7 @@ @ cdecl _mbscmp(str str) msvcrt._mbscmp @ stub _mbscmp_l @ cdecl _mbscoll(str str) msvcrt._mbscoll -@ stub _mbscoll_l +@ cdecl _mbscoll_l(str str ptr) msvcrt._mbscoll_l @ stub _mbscpy_s @ stub _mbscpy_s_l @ cdecl _mbscspn(str str) msvcrt._mbscspn @@ -773,7 +773,7 @@ @ cdecl _mbsnbcnt(ptr long) msvcrt._mbsnbcnt @ stub _mbsnbcnt_l @ cdecl _mbsnbcoll(str str long) msvcrt._mbsnbcoll -@ stub _mbsnbcoll_l +@ cdecl _mbsnbcoll_l(str str long ptr) msvcrt._mbsnbcoll_l @ cdecl _mbsnbcpy(ptr str long) msvcrt._mbsnbcpy @ stub _mbsnbcpy_l @ cdecl _mbsnbcpy_s(ptr long str long) msvcrt._mbsnbcpy_s diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index a2c9daa..fc0fc2e 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -807,34 +807,46 @@ int CDECL _mbsicoll(const unsigned char* str, const unsigned char* cmp) } /********************************************************************* + * _mbsnbcoll_l(MSVCRT.@) + */ +int CDECL _mbsnbcoll_l(const unsigned char *str1, const unsigned char *str2, MSVCRT_size_t len, MSVCRT__locale_t locale) +{ + MSVCRT_pthreadmbcinfo mbcinfo; + + if(!locale) + mbcinfo = get_mbcinfo(); + else + mbcinfo = locale->mbcinfo; + + if(!mbcinfo->ismbcodepage) + return MSVCRT_strncoll_l((const char*)str1, (const char*)str2, len, locale); + return CompareStringA(mbcinfo->mblcid, 0, (const char*)str1, len, (const char*)str2, len)-CSTR_EQUAL; +} + +/********************************************************************* + * _mbscoll_l(MSVCRT.@) + */ +int CDECL _mbscoll_l(const unsigned char *str1, const unsigned char *str2, MSVCRT__locale_t locale) +{ + return _mbsnbcoll_l(str1, str2, -1, locale); +} + +/********************************************************************* + * _mbsnbcoll(MSVCRT.@) + */ +int CDECL _mbsnbcoll(const unsigned char *str1, const unsigned char *str2, MSVCRT_size_t len) +{ + return _mbsnbcoll_l(str1, str2, len, NULL); +} + +/********************************************************************* * _mbscoll(MSVCRT.@) - * Performs a case-sensitive comparison according to the current code page - * RETURN - * _NLSCMPERROR if error - * FIXME: handle locales. */ int CDECL _mbscoll(const unsigned char* str, const unsigned char* cmp) { - if(get_mbcinfo()->ismbcodepage) - { - unsigned int strc, cmpc; - do { - if(!*str) - return *cmp ? -1 : 0; - if(!*cmp) - return 1; - strc = _mbsnextc(str); - cmpc = _mbsnextc(cmp); - if(strc != cmpc) - return strc < cmpc ? -1 : 1; - str +=(strc > 255) ? 2 : 1; - cmp +=(strc > 255) ? 2 : 1; /* equal, use same increment */ - } while(1); - } - return u_strcmp(str, cmp); /* ASCII CP */ + return _mbsnbcoll_l(str, cmp, -1, NULL); } - /********************************************************************* * _mbsicmp(MSVCRT.@) */ diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 7921545..ea31b3c 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -953,6 +953,7 @@ void __cdecl MSVCRT__invalid_parameter(const MSVCRT_wchar_t *expr, const MSVCRT_ 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); /* 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 6324c86..06d26b4 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -690,7 +690,7 @@ @ cdecl _mbscmp(str str) # stub _mbscmp_l(str str ptr) @ cdecl _mbscoll(str str) -# stub _mbscoll_l(str str ptr) +@ cdecl _mbscoll_l(str str ptr) @ cdecl _mbscpy(ptr str) # stub _mbscpy_s(ptr long str) # stub _mbscpy_s_l(ptr long str ptr) @@ -720,8 +720,8 @@ # stub _mbsnbcmp_l(str str long ptr) @ cdecl _mbsnbcnt(ptr long) # stub _mbsnbcnt_l(ptr long ptr) -@ stub _mbsnbcoll(str str long) -# stub _mbsnbcoll_l(str str long ptr) +@ cdecl _mbsnbcoll(str str long) +@ cdecl _mbsnbcoll_l(str str long ptr) @ cdecl _mbsnbcpy(ptr str long) # stub _mbsnbcpy_l(ptr str long ptr) @ cdecl _mbsnbcpy_s(ptr long str long)

1 0

Piotr Caban : msvcrt: Added _mbsnbicoll_l implementation.
by Alexandre Julliard Dec. 12, 2012

Dec. 12, 2012

Module: wine Branch: master Commit: a2b71b732a61c0b6fbe50acbe7eb7c91f3adf2ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2b71b732a61c0b6fbe50acbe… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 12 11:16:57 2012 +0100 msvcrt: Added _mbsnbicoll_l implementation. --- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/mbcs.c | 52 ++++++++++++++++++++++++++++--------------- dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 6 ++-- 6 files changed, 44 insertions(+), 27 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index b4c702c..8202518 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1105,7 +1105,7 @@ @ cdecl _mbsicmp(str str) msvcrt._mbsicmp @ stub _mbsicmp_l @ cdecl _mbsicoll(str str) msvcrt._mbsicoll -@ stub _mbsicoll_l +@ cdecl _mbsicoll_l(str str ptr) msvcrt._mbsicoll_l @ cdecl _mbsinc(str) msvcrt._mbsinc @ stub _mbsinc_l @ cdecl _mbslen(str) msvcrt._mbslen @@ -1131,7 +1131,7 @@ @ cdecl _mbsnbicmp(str str long) msvcrt._mbsnbicmp @ stub _mbsnbicmp_l @ cdecl _mbsnbicoll(str str long) msvcrt._mbsnbicoll -@ stub _mbsnbicoll_l +@ cdecl _mbsnbicoll_l(str str long ptr) msvcrt._mbsnbicoll_l @ cdecl _mbsnbset(ptr long long) msvcrt._mbsnbset @ stub _mbsnbset_l @ stub _mbsnbset_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b08208a..39152c4 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -762,7 +762,7 @@ @ cdecl _mbsicmp(str str) msvcrt._mbsicmp @ stub _mbsicmp_l @ cdecl _mbsicoll(str str) msvcrt._mbsicoll -@ stub _mbsicoll_l +@ cdecl _mbsicoll_l(str str ptr) msvcrt._mbsicoll_l @ cdecl _mbsinc(str) msvcrt._mbsinc @ stub _mbsinc_l @ cdecl _mbslen(str) msvcrt._mbslen @@ -788,7 +788,7 @@ @ cdecl _mbsnbicmp(str str long) msvcrt._mbsnbicmp @ stub _mbsnbicmp_l @ cdecl _mbsnbicoll(str str long) msvcrt._mbsnbicoll -@ stub _mbsnbicoll_l +@ cdecl _mbsnbicoll_l(str str long ptr) msvcrt._mbsnbicoll_l @ cdecl _mbsnbset(ptr long long) msvcrt._mbsnbset @ stub _mbsnbset_l @ stub _mbsnbset_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 4729b76..efe67ac 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -755,7 +755,7 @@ @ cdecl _mbsicmp(str str) msvcrt._mbsicmp @ stub _mbsicmp_l @ cdecl _mbsicoll(str str) msvcrt._mbsicoll -@ stub _mbsicoll_l +@ cdecl _mbsicoll_l(str str ptr) msvcrt._mbsicoll_l @ cdecl _mbsinc(str) msvcrt._mbsinc @ stub _mbsinc_l @ cdecl _mbslen(str) msvcrt._mbslen @@ -781,7 +781,7 @@ @ cdecl _mbsnbicmp(str str long) msvcrt._mbsnbicmp @ stub _mbsnbicmp_l @ cdecl _mbsnbicoll(str str long) msvcrt._mbsnbicoll -@ stub _mbsnbicoll_l +@ cdecl _mbsnbicoll_l(str str long ptr) msvcrt._mbsnbicoll_l @ cdecl _mbsnbset(ptr long long) msvcrt._mbsnbset @ stub _mbsnbset_l @ stub _mbsnbset_s diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c index e06511d..a2c9daa 100644 --- a/dlls/msvcrt/mbcs.c +++ b/dlls/msvcrt/mbcs.c @@ -766,28 +766,44 @@ int CDECL _mbscmp(const unsigned char* str, const unsigned char* cmp) } /********************************************************************* + * _mbsnbicoll_l(MSVCRT.@) + */ +int CDECL _mbsnbicoll_l(const unsigned char *str1, const unsigned char *str2, MSVCRT_size_t len, MSVCRT__locale_t locale) +{ + MSVCRT_pthreadmbcinfo mbcinfo; + + if(!locale) + mbcinfo = get_mbcinfo(); + else + mbcinfo = locale->mbcinfo; + + if(!mbcinfo->ismbcodepage) + return MSVCRT__strnicoll_l((const char*)str1, (const char*)str2, len, locale); + return CompareStringA(mbcinfo->mblcid, NORM_IGNORECASE, (const char*)str1, len, (const char*)str2, len)-CSTR_EQUAL; +} + +/********************************************************************* + * _mbsicoll_l(MSVCRT.@) + */ +int CDECL _mbsicoll_l(const unsigned char *str1, const unsigned char *str2, MSVCRT__locale_t locale) +{ + return _mbsnbicoll_l(str1, str2, -1, locale); +} + +/********************************************************************* + * _mbsnbicoll(MSVCRT.@) + */ +int CDECL _mbsnbicoll(const unsigned char *str1, const unsigned char *str2, MSVCRT_size_t len) +{ + return _mbsnbicoll_l(str1, str2, len, NULL); +} + +/********************************************************************* * _mbsicoll(MSVCRT.@) - * FIXME: handle locales. */ int CDECL _mbsicoll(const unsigned char* str, const unsigned char* cmp) { - if(get_mbcinfo()->ismbcodepage) - { - unsigned int strc, cmpc; - do { - if(!*str) - return *cmp ? -1 : 0; - if(!*cmp) - return 1; - strc = _mbctolower(_mbsnextc(str)); - cmpc = _mbctolower(_mbsnextc(cmp)); - if(strc != cmpc) - return strc < cmpc ? -1 : 1; - str +=(strc > 255) ? 2 : 1; - cmp +=(strc > 255) ? 2 : 1; /* equal, use same increment */ - } while(1); - } - return u_strcasecmp(str, cmp); /* ASCII CP */ + return _mbsnbicoll_l(str, cmp, -1, NULL); } /********************************************************************* diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index da8e0a8..7921545 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -952,6 +952,7 @@ void __cdecl MSVCRT__invalid_parameter(const MSVCRT_wchar_t *expr, const MSVCRT_ const MSVCRT_wchar_t *file, unsigned int line, MSVCRT_uintptr_t arg); 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); /* 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 db9e22f..6324c86 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -703,7 +703,7 @@ @ cdecl _mbsicmp(str str) # stub _mbsicmp_l(str str ptr) @ cdecl _mbsicoll(str str) -# stub _mbsicoll_l(str str ptr) +@ cdecl _mbsicoll_l(str str ptr) @ cdecl _mbsinc(str) # stub _mbsinc_l(str ptr) @ cdecl _mbslen(str) @@ -728,8 +728,8 @@ # stub _mbsnbcpy_s_l(ptr long str long ptr) @ cdecl _mbsnbicmp(str str long) # stub _mbsnbicmp_l(str str long ptr) -@ stub _mbsnbicoll(str str long) -# stub _mbsnbicoll_l(str str long ptr) +@ cdecl _mbsnbicoll(str str long) +@ cdecl _mbsnbicoll_l(str str long ptr) @ cdecl _mbsnbset(ptr long long) # stub _mbsnbset_l(str long long ptr) # stub _mbsnbset_s(ptr long long long)

1 0

Jacek Caban : jscript: Throw an error if return statement is in eval code.
by Alexandre Julliard Dec. 12, 2012

Dec. 12, 2012

Module: wine Branch: master Commit: b568d88815d717503b8b4a2042666ce3b0abf9cd URL: http://source.winehq.org/git/wine.git/?a=commit;h=b568d88815d717503b8b4a204… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Dec 12 13:12:04 2012 +0100 jscript: Throw an error if return statement is in eval code. --- dlls/jscript/compile.c | 8 +++++++ dlls/jscript/jscript.h | 1 + dlls/jscript/jscript.rc | 1 + dlls/jscript/resource.h | 1 + dlls/jscript/tests/api.js | 2 + po/ar.po | 46 ++++++++++++++++++++++++-------------------- po/bg.po | 46 ++++++++++++++++++++++++-------------------- po/ca.po | 46 ++++++++++++++++++++++++-------------------- po/cs.po | 46 ++++++++++++++++++++++++-------------------- po/da.po | 46 ++++++++++++++++++++++++-------------------- po/de.po | 46 ++++++++++++++++++++++++-------------------- po/el.po | 46 ++++++++++++++++++++++++-------------------- po/en.po | 46 ++++++++++++++++++++++++-------------------- po/en_US.po | 46 ++++++++++++++++++++++++-------------------- po/eo.po | 46 ++++++++++++++++++++++++-------------------- po/es.po | 46 ++++++++++++++++++++++++-------------------- po/fa.po | 46 ++++++++++++++++++++++++-------------------- po/fi.po | 46 ++++++++++++++++++++++++-------------------- po/fr.po | 46 ++++++++++++++++++++++++-------------------- po/he.po | 46 ++++++++++++++++++++++++-------------------- po/hi.po | 46 ++++++++++++++++++++++++-------------------- po/hu.po | 46 ++++++++++++++++++++++++-------------------- po/it.po | 46 ++++++++++++++++++++++++-------------------- po/ja.po | 46 ++++++++++++++++++++++++-------------------- po/ko.po | 46 ++++++++++++++++++++++++-------------------- po/lt.po | 46 ++++++++++++++++++++++++-------------------- po/ml.po | 46 ++++++++++++++++++++++++-------------------- po/nb_NO.po | 46 ++++++++++++++++++++++++-------------------- po/nl.po | 46 ++++++++++++++++++++++++-------------------- po/or.po | 46 ++++++++++++++++++++++++-------------------- po/pa.po | 46 ++++++++++++++++++++++++-------------------- po/pl.po | 46 ++++++++++++++++++++++++-------------------- po/pt_BR.po | 46 ++++++++++++++++++++++++-------------------- po/pt_PT.po | 46 ++++++++++++++++++++++++-------------------- po/rm.po | 46 ++++++++++++++++++++++++-------------------- po/ro.po | 46 ++++++++++++++++++++++++-------------------- po/ru.po | 46 ++++++++++++++++++++++++-------------------- po/sk.po | 46 ++++++++++++++++++++++++-------------------- po/sl.po | 46 ++++++++++++++++++++++++-------------------- po/sr_RS(a)cyrillic.po | 46 ++++++++++++++++++++++++-------------------- po/sr_RS(a)latin.po | 46 ++++++++++++++++++++++++-------------------- po/sv.po | 46 ++++++++++++++++++++++++-------------------- po/te.po | 46 ++++++++++++++++++++++++-------------------- po/th.po | 46 ++++++++++++++++++++++++-------------------- po/tr.po | 46 ++++++++++++++++++++++++-------------------- po/uk.po | 46 ++++++++++++++++++++++++-------------------- po/wa.po | 46 ++++++++++++++++++++++++-------------------- po/wine.pot | 46 ++++++++++++++++++++++++-------------------- po/zh_CN.po | 46 ++++++++++++++++++++++++-------------------- po/zh_TW.po | 46 ++++++++++++++++++++++++-------------------- 50 files changed, 1138 insertions(+), 945 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b568d88815d717503b8b4…

1 0

Piotr Caban : msvcr100: Added fread_s implementation.
by Alexandre Julliard Dec. 12, 2012

Dec. 12, 2012

Module: wine Branch: master Commit: 101abcd8b119853ff70449be27e2322b16bbaf47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=101abcd8b119853ff70449be2… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 12 11:14:48 2012 +0100 msvcr100: Added fread_s implementation. --- dlls/msvcr100/msvcr100.c | 54 +++++++++++++++++++++++++++ dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr100/tests/msvcr100.c | 80 ++++++++++++++++++++++++++++++++++++++++ dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- include/msvcrt/limits.h | 8 ++++ 6 files changed, 145 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.c b/dlls/msvcr100/msvcr100.c index 5778940..f529b10 100644 --- a/dlls/msvcr100/msvcr100.c +++ b/dlls/msvcr100/msvcr100.c @@ -25,6 +25,7 @@ #include "stdlib.h" #include "errno.h" #include "malloc.h" +#include "limits.h" #include "sys/stat.h" #include "windef.h" #include "winbase.h" @@ -404,6 +405,59 @@ unsigned __int64 CDECL _byteswap_uint64(unsigned __int64 i) } /********************************************************************* + * fread_s (MSVCR100.@) + */ +size_t CDECL fread_s(void *buf, size_t buf_size, size_t elem_size, size_t count, FILE *stream) +{ + size_t bytes_left, buf_pos; + + TRACE("(%p %lu %lu %lu %p\n", buf, (unsigned long)buf_size, + (unsigned long)elem_size, (unsigned long)count, stream); + + + if(!CHECK_PMT(stream != NULL)) { + if(buf && buf_size) + memset(buf, 0, buf_size); + return 0; + } + if(!elem_size || !count) return 0; + if(!CHECK_PMT(buf != NULL)) return 0; + if(!CHECK_PMT(SIZE_MAX/count >= elem_size)) return 0; + + bytes_left = elem_size*count; + buf_pos = 0; + while(bytes_left) { + if(stream->_cnt > 0) { + size_t size = bytes_left<stream->_cnt ? bytes_left : stream->_cnt; + + if(!CHECK_PMT_ERR(size <= buf_size-buf_pos, ERANGE)) { + memset(buf, 0, buf_size); + return 0; + } + + fread((char*)buf+buf_pos, 1, size, stream); + buf_pos += size; + bytes_left -= size; + }else { + int c = _filbuf(stream); + + if(c == EOF) + break; + + if(!CHECK_PMT_ERR(buf_size-buf_pos > 0, ERANGE)) { + memset(buf, 0, buf_size); + return 0; + } + + ((char*)buf)[buf_pos++] = c; + bytes_left--; + } + } + + return buf_pos/elem_size; +} + +/********************************************************************* * DllMain (MSVCR100.@) */ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 162ad65..70fca053 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1669,7 +1669,7 @@ @ cdecl fputwc(long ptr) msvcrt.fputwc @ cdecl fputws(wstr ptr) msvcrt.fputws @ cdecl fread(ptr long long ptr) msvcrt.fread -@ stub fread_s +@ cdecl fread_s(ptr long long long ptr) @ cdecl free(ptr) msvcrt.free @ cdecl freopen(str str ptr) msvcrt.freopen @ cdecl freopen_s(ptr str str ptr) msvcrt.freopen_s diff --git a/dlls/msvcr100/tests/msvcr100.c b/dlls/msvcr100/tests/msvcr100.c index 366e8ee..143979d 100644 --- a/dlls/msvcr100/tests/msvcr100.c +++ b/dlls/msvcr100/tests/msvcr100.c @@ -20,6 +20,7 @@ #include <stdarg.h> #include <stdlib.h> #include <wchar.h> +#include <stdio.h> #include <windef.h> #include <winbase.h> @@ -68,6 +69,9 @@ static void __cdecl test_invalid_parameter_handler(const wchar_t *expression, static int* (__cdecl *p_errno)(void); static int (__cdecl *p_wmemcpy_s)(wchar_t *dest, size_t numberOfElements, const wchar_t *src, size_t count); static int (__cdecl *p_wmemmove_s)(wchar_t *dest, size_t numberOfElements, const wchar_t *src, size_t count); +static FILE* (__cdecl *p_fopen)(const char*,const char*); +static int (__cdecl *p_fclose)(FILE*); +static size_t (__cdecl *p_fread_s)(void*,size_t,size_t,size_t,FILE*); /* make sure we use the correct errno */ #undef errno @@ -91,6 +95,9 @@ static BOOL init(void) SET(p_set_invalid_parameter_handler, "_set_invalid_parameter_handler"); SET(p_wmemcpy_s, "wmemcpy_s"); SET(p_wmemmove_s, "wmemmove_s"); + SET(p_fopen, "fopen"); + SET(p_fclose, "fclose"); + SET(p_fread_s, "fread_s"); return TRUE; } @@ -247,6 +254,78 @@ static void test_wmemmove_s(void) "Cannot reset invalid parameter handler\n"); } +static void test_fread_s(void) +{ + static const char test_file[] = "fread_s.tst"; + int ret; + char buf[10]; + + FILE *f = fopen(test_file, "w"); + if(!f) { + skip("Error creating test file\n"); + return; + } + fwrite("test", 1, 4, f); + fclose(f); + + ok(p_set_invalid_parameter_handler(test_invalid_parameter_handler) == NULL, + "Invalid parameter handler was already set\n"); + + SET_EXPECT(invalid_parameter_handler); + errno = 0xdeadbeef; + ret = p_fread_s(buf, sizeof(buf), 1, 1, NULL); + ok(ret == 0, "fread_s returned %d, expected 0\n", ret); + ok(errno == EINVAL, "errno = %d, expected EINVAL\n", errno); + CHECK_CALLED(invalid_parameter_handler); + + f = p_fopen(test_file, "r"); + errno = 0xdeadbeef; + ret = p_fread_s(NULL, sizeof(buf), 0, 1, f); + ok(ret == 0, "fread_s returned %d, expected 0\n", ret); + ok(errno == 0xdeadbeef, "errno = %d, expected 0xdeadbeef\n", errno); + ret = p_fread_s(NULL, sizeof(buf), 1, 0, f); + ok(ret == 0, "fread_s returned %d, expected 0\n", ret); + ok(errno == 0xdeadbeef, "errno = %d, expected 0xdeadbeef\n", errno); + + SET_EXPECT(invalid_parameter_handler); + errno = 0xdeadbeef; + ret = p_fread_s(NULL, sizeof(buf), 1, 1, f); + ok(ret == 0, "fread_s returned %d, expected 0\n", ret); + ok(errno == EINVAL, "errno = %d, expected EINVAL\n", errno); + CHECK_CALLED(invalid_parameter_handler); + + SET_EXPECT(invalid_parameter_handler); + errno = 0xdeadbeef; + buf[1] = 'a'; + ret = p_fread_s(buf, 3, 1, 10, f); + ok(ret == 0, "fread_s returned %d, expected 0\n", ret); + ok(buf[0] == 0, "buf[0] = '%c', expected 0\n", buf[0]); + ok(buf[1] == 0, "buf[1] = '%c', expected 0\n", buf[1]); + ok(errno == ERANGE, "errno = %d, expected ERANGE\n", errno); + CHECK_CALLED(invalid_parameter_handler); + + SET_EXPECT(invalid_parameter_handler); + errno = 0xdeadbeef; + ret = p_fread_s(buf, 2, 1, 10, f); + ok(ret == 0, "fread_s returned %d, expected 0\n", ret); + ok(buf[0] == 0, "buf[0] = '%c', expected 0\n", buf[0]); + ok(errno == ERANGE, "errno = %d, expected ERANGE\n", errno); + CHECK_CALLED(invalid_parameter_handler); + + memset(buf, 'a', sizeof(buf)); + ret = p_fread_s(buf, sizeof(buf), 3, 10, f); + ok(ret==1, "fread_s returned %d, expected 1\n", ret); + ok(buf[0] == 'e', "buf[0] = '%c', expected 'e'\n", buf[0]); + ok(buf[1] == 's', "buf[1] = '%c', expected 's'\n", buf[1]); + ok(buf[2] == 't', "buf[2] = '%c', expected 't'\n", buf[2]); + ok(buf[3] == 'a', "buf[3] = '%c', expected 'a'\n", buf[3]); + p_fclose(f); + + ok(p_set_invalid_parameter_handler(NULL) == test_invalid_parameter_handler, + "Cannot reset invalid parameter handler\n"); + unlink(test_file); +} + START_TEST(msvcr100) { if (!init()) @@ -254,4 +333,5 @@ START_TEST(msvcr100) test_wmemcpy_s(); test_wmemmove_s(); + test_fread_s(); } diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index e9274f5..2eecb7a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1323,7 +1323,7 @@ @ cdecl fputwc(long ptr) msvcrt.fputwc @ cdecl fputws(wstr ptr) msvcrt.fputws @ cdecl fread(ptr long long ptr) msvcrt.fread -@ stub fread_s +@ cdecl fread_s(ptr long long long ptr) msvcr100.fread_s @ cdecl free(ptr) msvcrt.free @ cdecl freopen(str str ptr) msvcrt.freopen @ cdecl freopen_s(ptr str str ptr) msvcrt.freopen_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 3b18f43..8644692 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1324,7 +1324,7 @@ @ cdecl fputwc(long ptr) msvcrt.fputwc @ cdecl fputws(wstr ptr) msvcrt.fputws @ cdecl fread(ptr long long ptr) msvcrt.fread -@ stub fread_s +@ cdecl fread_s(ptr long long long ptr) msvcr100.fread_s @ cdecl free(ptr) msvcrt.free @ cdecl freopen(str str ptr) msvcrt.freopen @ cdecl freopen_s(ptr str str ptr) msvcrt.freopen_s diff --git a/include/msvcrt/limits.h b/include/msvcrt/limits.h index 938da76..d0f058b 100644 --- a/include/msvcrt/limits.h +++ b/include/msvcrt/limits.h @@ -38,4 +38,12 @@ #define I64_MAX _I64_MAX #define UI64_MAX _UI64_MAX +#ifndef SIZE_MAX +# ifdef _WIN64 +# define SIZE_MAX UI64_MAX +# else +# define SIZE_MAX UINT_MAX +# endif +#endif + #endif /* __WINE_LIMITS_H */

1 0

Piotr Caban : msvcrt: Added _atoi_l implementation.
by Alexandre Julliard Dec. 12, 2012

Dec. 12, 2012

Module: wine Branch: master Commit: b5cf3057e97aa18f4525bd4819855efb60e09836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b5cf3057e97aa18f4525bd481… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 12 11:16:19 2012 +0100 msvcrt: Added _atoi_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 17 +++++++++++++++++ 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index c57b43d..44123a3 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -693,7 +693,7 @@ @ cdecl _atoflt_l(ptr str ptr) msvcrt._atoflt_l @ cdecl -ret64 _atoi64(str) msvcrt._atoi64 @ stub _atoi64_l -@ stub _atoi_l +@ cdecl _atoi_l(str ptr) msvcrt._atoi_l @ stub _atol_l @ cdecl _atoldbl(ptr str) msvcrt._atoldbl @ stub _atoldbl_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 8c53751..91fe34a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -349,7 +349,7 @@ @ cdecl _atoflt_l(ptr str ptr) msvcrt._atoflt_l @ cdecl -ret64 _atoi64(str) msvcrt._atoi64 @ stub _atoi64_l -@ stub _atoi_l +@ cdecl _atoi_l(str ptr) msvcrt._atoi_l @ stub _atol_l @ cdecl _atoldbl(ptr str) msvcrt._atoldbl @ stub _atoldbl_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 500ed27..ae3dfa2 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -341,7 +341,7 @@ @ cdecl _atoflt_l(ptr str ptr) msvcrt._atoflt_l @ cdecl -ret64 _atoi64(str) msvcrt._atoi64 @ stub _atoi64_l -@ stub _atoi_l +@ cdecl _atoi_l(str ptr) msvcrt._atoi_l @ stub _atol_l @ cdecl _atoldbl(ptr str) msvcrt._atoldbl @ stub _atoldbl_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 239e820..6d46f82 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -306,7 +306,7 @@ @ cdecl _atoflt_l(ptr str ptr) MSVCRT__atoflt_l @ cdecl -ret64 _atoi64(str) ntdll._atoi64 # stub -ret64 _atoi64_l(str ptr) -# stub _atoi_l(str ptr) +@ cdecl _atoi_l(str ptr) MSVCRT__atoi_l # stub _atol_l(str ptr) @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl # stub _atoldbl_l(ptr str ptr) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index ad33f6a..1e46488 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -915,6 +915,23 @@ __int64 CDECL MSVCRT_strtoi64(const char *nptr, char **endptr, int base) } /********************************************************************* + * _atoi_l (MSVCRT.@) + */ +int MSVCRT__atoi_l(const char *str, MSVCRT__locale_t locale) +{ + __int64 ret = MSVCRT_strtoi64_l(str, NULL, 10, locale); + + if(ret > INT_MAX) { + ret = INT_MAX; + *MSVCRT__errno() = MSVCRT_ERANGE; + } else if(ret < INT_MIN) { + ret = INT_MIN; + *MSVCRT__errno() = MSVCRT_ERANGE; + } + return ret; +} + +/********************************************************************* * _strtoui64_l (MSVCRT.@) * * FIXME: locale parameter is ignored

1 0

Piotr Caban : msvcrt: Added _fwprintf_l implementation.
by Alexandre Julliard Dec. 12, 2012

Dec. 12, 2012

Module: wine Branch: master Commit: 3b41fab0e9341bdfdc511b9cdc8235dd2d9c724c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3b41fab0e9341bdfdc511b9cd… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 12 11:16:43 2012 +0100 msvcrt: Added _fwprintf_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 13 +++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 877f76e..b4c702c 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -854,7 +854,7 @@ @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime32(long ptr) msvcrt._futime32 @ cdecl _futime64(long ptr) msvcrt._futime64 -@ stub _fwprintf_l +@ varargs _fwprintf_l(ptr wstr ptr) msvcrt._fwprintf_l @ stub _fwprintf_p @ stub _fwprintf_p_l @ stub _fwprintf_s_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d62590d..b08208a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -508,7 +508,7 @@ @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime32(long ptr) msvcrt._futime32 @ cdecl _futime64(long ptr) msvcrt._futime64 -@ stub _fwprintf_l +@ varargs _fwprintf_l(ptr wstr ptr) msvcrt._fwprintf_l @ stub _fwprintf_p @ stub _fwprintf_p_l @ stub _fwprintf_s_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 61b0340..4729b76 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -503,7 +503,7 @@ @ cdecl _fullpath(ptr str long) msvcrt._fullpath @ cdecl _futime32(long ptr) msvcrt._futime32 @ cdecl _futime64(long ptr) msvcrt._futime64 -@ stub _fwprintf_l +@ varargs _fwprintf_l(ptr wstr ptr) msvcrt._fwprintf_l @ stub _fwprintf_p @ stub _fwprintf_p_l @ stub _fwprintf_s_l diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 4b9abc9..e157ede 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3959,6 +3959,19 @@ int CDECL MSVCRT_fwprintf_s(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, ... } /********************************************************************* + * _fwprintf_l (MSVCRT.@) + */ +int CDECL MSVCRT__fwprintf_l(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, ...) +{ + __ms_va_list valist; + int res; + __ms_va_start(valist, locale); + res = MSVCRT__vfwprintf_l(file, format, locale, valist); + __ms_va_end(valist); + return res; +} + +/********************************************************************* * printf (MSVCRT.@) */ int CDECL MSVCRT_printf(const char *format, ...) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f95219f..db9e22f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -462,7 +462,7 @@ @ cdecl _futime(long ptr) @ cdecl _futime32(long ptr) @ cdecl _futime64(long ptr) -# stub _fwprintf_l(ptr wstr ptr) +@ varargs _fwprintf_l(ptr wstr ptr) MSVCRT__fwprintf_l # stub _fwprintf_p(ptr wstr) # stub _fwprintf_p_l(ptr wstr ptr) # stub _fwprintf_s_l(ptr wstr ptr)

1 0

Piotr Caban : msvcr100: Added _get_timezone implementation.
by Alexandre Julliard Dec. 12, 2012

Dec. 12, 2012

Module: wine Branch: master Commit: c4d085bc74e55b5ffea624faafac6817d0bb87c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c4d085bc74e55b5ffea624faa… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 12 11:15:51 2012 +0100 msvcr100: Added _get_timezone implementation. --- dlls/msvcr100/msvcr100.c | 11 +++++++++++ dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr100/msvcr100.c b/dlls/msvcr100/msvcr100.c index 1a54c43..f571aee 100644 --- a/dlls/msvcr100/msvcr100.c +++ b/dlls/msvcr100/msvcr100.c @@ -473,6 +473,17 @@ int CDECL _sprintf_p(char *buffer, size_t length, const char *format, ...) } /********************************************************************* + * _get_timezone (MSVCR100.@) + */ +int CDECL _get_timezone(LONG *timezone) +{ + if(!CHECK_PMT(timezone != NULL)) return EINVAL; + + *timezone = *(LONG*)GetProcAddress(GetModuleHandleA("msvcrt.dll"), "_timezone"); + return 0; +} + +/********************************************************************* * DllMain (MSVCR100.@) */ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 510c974..0729f30 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -877,7 +877,7 @@ @ cdecl _get_printf_count_output() msvcrt._get_printf_count_output @ stub _get_purecall_handler @ cdecl _get_terminate() msvcrt._get_terminate -@ stub _get_timezone +@ cdecl _get_timezone(ptr) @ cdecl _get_tzname(ptr str long long) msvcrt._get_tzname @ cdecl _get_unexpected() msvcrt._get_unexpected @ cdecl _get_wpgmptr(ptr) msvcrt._get_wpgmptr diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 27a8f6d..bd1e86a 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -535,7 +535,7 @@ @ stub _get_purecall_handler @ cdecl _get_sbh_threshold() msvcrt._get_sbh_threshold @ cdecl _get_terminate() msvcrt._get_terminate -@ stub _get_timezone +@ cdecl _get_timezone(ptr) msvcr100._get_timezone @ cdecl _get_tzname(ptr str long long) msvcrt._get_tzname @ cdecl _get_unexpected() msvcrt._get_unexpected @ stub _get_winmajor diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ccdb7e0..2453e6f 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -528,7 +528,7 @@ @ stub _get_purecall_handler @ cdecl _get_sbh_threshold() msvcrt._get_sbh_threshold @ cdecl _get_terminate() msvcrt._get_terminate -@ stub _get_timezone +@ cdecl _get_timezone(ptr) msvcr100._get_timezone @ cdecl _get_tzname(ptr str long long) msvcrt._get_tzname @ cdecl _get_unexpected() msvcrt._get_unexpected @ cdecl _get_wpgmptr(ptr) msvcrt._get_wpgmptr

1 0