wine-commits December 2012

wine-commits@winehq.org

2 participants
549 discussions

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

12 Dec '12

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

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

12 Dec '12

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

Alexandre Julliard : user32: Start checking for driver events more often when the app doesn' t consume messages properly.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: bd5d5e97767eaa9827a464195be50fdd036d72d2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd5d5e97767eaa9827a464195… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 12 20:17:21 2012 +0100 user32: Start checking for driver events more often when the app doesn't consume messages properly. --- dlls/user32/message.c | 12 ++++++++++++ dlls/user32/user_private.h | 3 ++- dlls/user32/winproc.c | 1 + 3 files changed, 15 insertions(+), 1 deletions(-) diff --git a/dlls/user32/message.c b/dlls/user32/message.c index 3f0312a..79066a8 100644 --- a/dlls/user32/message.c +++ b/dlls/user32/message.c @@ -3671,6 +3671,16 @@ void WINAPI PostQuitMessage( INT exit_code ) SERVER_END_REQ; } +/* check for driver events if we detect that the app is not properly consuming messages */ +static inline void check_for_driver_events(void) +{ + if (get_user_thread_info()->message_count > 200) + { + flush_window_surfaces( FALSE ); + USER_Driver->pMsgWaitForMultipleObjectsEx( 0, NULL, 0, QS_ALLINPUT, 0 ); + } + else get_user_thread_info()->message_count++; +} /*********************************************************************** * PeekMessageW (USER32.@) @@ -3680,6 +3690,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH PeekMessageW( MSG *msg_out, HWND hwnd, UINT first, MSG msg; USER_CheckNotLock(); + check_for_driver_events(); if (!peek_message( &msg, hwnd, first, last, flags, 0 )) { @@ -3726,6 +3737,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetMessageW( MSG *msg, HWND hwnd, UINT first, UINT unsigned int mask = QS_POSTMESSAGE | QS_SENDMESSAGE; /* Always selected */ USER_CheckNotLock(); + check_for_driver_events(); if (first || last) { diff --git a/dlls/user32/user_private.h b/dlls/user32/user_private.h index 3dc68c3..d743062 100644 --- a/dlls/user32/user_private.h +++ b/dlls/user32/user_private.h @@ -172,7 +172,8 @@ struct wm_char_mapping_data struct user_thread_info { HANDLE server_queue; /* Handle to server-side queue */ - DWORD recursion_count; /* SendMessage recursion counter */ + WORD recursion_count; /* SendMessage recursion counter */ + WORD message_count; /* Get/PeekMessage loop counter */ BOOL hook_unicode; /* Is current hook unicode? */ HHOOK hook; /* Current hook */ struct received_message_info *receive_info; /* Message being currently received */ diff --git a/dlls/user32/winproc.c b/dlls/user32/winproc.c index 3b13b82..e6b5194 100644 --- a/dlls/user32/winproc.c +++ b/dlls/user32/winproc.c @@ -1126,6 +1126,7 @@ static DWORD wait_message( DWORD count, CONST HANDLE *handles, DWORD timeout, DW { DWORD ret = USER_Driver->pMsgWaitForMultipleObjectsEx( count, handles, timeout, mask, flags ); if (ret == WAIT_TIMEOUT && !count && !timeout) NtYieldExecution(); + if ((mask & QS_INPUT) == QS_INPUT) get_user_thread_info()->message_count = 0; return ret; }

1 0

Alexandre Julliard : ole32: Limit the number of messages processed at once in CoWaitForMultipleObjects .
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: a283b986c768d386b4e0937632059f61e0a256be URL: http://source.winehq.org/git/wine.git/?a=commit;h=a283b986c768d386b4e093763… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Dec 12 14:06:46 2012 +0100 ole32: Limit the number of messages processed at once in CoWaitForMultipleObjects. --- dlls/ole32/compobj.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index af5b0fe..460ed4e 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -3871,6 +3871,7 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, if (res == WAIT_OBJECT_0 + cHandles) /* messages available */ { MSG msg; + int count = 0; /* call message filter */ @@ -3900,7 +3901,9 @@ HRESULT WINAPI CoWaitForMultipleHandles(DWORD dwFlags, DWORD dwTimeout, } } - while (COM_PeekMessage(apt, &msg)) + /* some apps (e.g. Visio 2010) don't handle WM_PAINT properly and loop forever, + * so after processing 100 messages we go back to checking the wait handles */ + while (count++ < 100 && COM_PeekMessage(apt, &msg)) { TRACE("received message whilst waiting for RPC: 0x%04x\n", msg.message); TranslateMessage(&msg);

1 0

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

12 Dec '12

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 12 Dec '12

12 Dec '12

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

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

12 Dec '12

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 : msvcrt: Added _vfwprintf_l implementation.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: 48335be04eeea96f7f6b970694f5482a0b89523d URL: http://source.winehq.org/git/wine.git/?a=commit;h=48335be04eeea96f7f6b97069… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 12 11:16:32 2012 +0100 msvcrt: Added _vfwprintf_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 17 +++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 44123a3..877f76e 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1426,7 +1426,7 @@ @ stub _vfprintf_p @ stub _vfprintf_p_l @ stub _vfprintf_s_l -@ stub _vfwprintf_l +@ cdecl _vfwprintf_l(ptr wstr ptr ptr) msvcrt._vfwprintf_l @ stub _vfwprintf_p @ stub _vfwprintf_p_l @ stub _vfwprintf_s_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 91fe34a..d62590d 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1087,7 +1087,7 @@ @ stub _vfprintf_p @ stub _vfprintf_p_l @ stub _vfprintf_s_l -@ stub _vfwprintf_l +@ cdecl _vfwprintf_l(ptr wstr ptr ptr) msvcrt._vfwprintf_l @ stub _vfwprintf_p @ stub _vfwprintf_p_l @ stub _vfwprintf_s_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index ae3dfa2..61b0340 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1081,7 +1081,7 @@ @ stub _vfprintf_p @ stub _vfprintf_p_l @ stub _vfprintf_s_l -@ stub _vfwprintf_l +@ cdecl _vfwprintf_l(ptr wstr ptr ptr) msvcrt._vfwprintf_l @ stub _vfwprintf_p @ stub _vfwprintf_p_l @ stub _vfwprintf_s_l diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index bca17d2..4b9abc9 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3858,6 +3858,23 @@ int CDECL MSVCRT_vfwprintf_s(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, __ } /********************************************************************* + * _vfwprintf_l (MSVCRT.@) + */ +int CDECL MSVCRT__vfwprintf_l(MSVCRT_FILE* file, const MSVCRT_wchar_t *format, + MSVCRT__locale_t locale, __ms_va_list valist) +{ + int ret; + + if (!MSVCRT_CHECK_PMT( file != NULL )) return -1; + + MSVCRT__lock_file(file); + ret = pf_printf_w(puts_clbk_file_w, file, format, locale, FALSE, FALSE, arg_clbk_valist, NULL, &valist); + MSVCRT__unlock_file(file); + + return ret; +} + +/********************************************************************* * vprintf (MSVCRT.@) */ int CDECL MSVCRT_vprintf(const char *format, __ms_va_list valist) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6d46f82..f95219f 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1018,7 +1018,7 @@ # stub _vfprintf_p(ptr str ptr) # stub _vfprintf_p_l(ptr str ptr ptr) # stub _vfprintf_s_l(ptr str ptr ptr) -# stub _vfwprintf_l(ptr wstr ptr ptr) +@ cdecl _vfwprintf_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_l # stub _vfwprintf_p(ptr wstr ptr) # stub _vfwprintf_p_l(ptr wstr ptr ptr) # stub _vfwprintf_s_l(ptr wstr ptr ptr)

1 0

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

12 Dec '12

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 _wtoi_l implementation.
by Alexandre Julliard 12 Dec '12

12 Dec '12

Module: wine Branch: master Commit: 3acb238f1584256468bf592843bb55206d656a56 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3acb238f1584256468bf59284… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Dec 12 11:16:05 2012 +0100 msvcrt: Added _wtoi_l implementation. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 17 +++++++++++++++++ 5 files changed, 21 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 0729f30..c57b43d 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1604,7 +1604,7 @@ @ cdecl _wtoi(wstr) msvcrt._wtoi @ cdecl -ret64 _wtoi64(wstr) msvcrt._wtoi64 @ stub _wtoi64_l -@ stub _wtoi_l +@ cdecl _wtoi_l(wstr ptr) msvcrt._wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol @ stub _wtol_l @ cdecl _wunlink(wstr) msvcrt._wunlink diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index bd1e86a..8c53751 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1268,7 +1268,7 @@ @ cdecl _wtoi(wstr) msvcrt._wtoi @ cdecl -ret64 _wtoi64(wstr) msvcrt._wtoi64 @ stub _wtoi64_l -@ stub _wtoi_l +@ cdecl _wtoi_l(wstr ptr) msvcrt._wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol @ stub _wtol_l @ cdecl _wunlink(wstr) msvcrt._wunlink diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 2453e6f..500ed27 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1259,7 +1259,7 @@ @ cdecl _wtoi(wstr) msvcrt._wtoi @ cdecl -ret64 _wtoi64(wstr) msvcrt._wtoi64 @ stub _wtoi64_l -@ stub _wtoi_l +@ cdecl _wtoi_l(wstr ptr) msvcrt._wtoi_l @ cdecl _wtol(wstr) msvcrt._wtol @ stub _wtol_l @ cdecl _wunlink(wstr) msvcrt._wunlink diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ecf44fd..239e820 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1199,7 +1199,7 @@ @ cdecl _wtoi(wstr) ntdll._wtoi @ cdecl -ret64 _wtoi64(wstr) ntdll._wtoi64 # stub -ret64 _wtoi64_l(wstr ptr) -# stub _wtoi_l(wstr ptr) +@ cdecl _wtoi_l(wstr ptr) MSVCRT__wtoi_l @ cdecl _wtol(wstr) ntdll._wtol # stub _wtol_l(wstr ptr) @ cdecl _wunlink(wstr) MSVCRT__wunlink diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 555e63a..cc48968 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1438,6 +1438,23 @@ __int64 CDECL MSVCRT__wcstoi64(const MSVCRT_wchar_t *nptr, } /********************************************************************* + * _wtoi_l (MSVCRT.@) + */ +int MSVCRT__wtoi_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) +{ + __int64 ret = MSVCRT__wcstoi64_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; +} + +/********************************************************************* * _wcstoui64_l (MSVCRT.@) * * FIXME: locale parameter is ignored

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
55
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits December 2012