Module: wine Branch: stable Commit: 09433cd0f274bd3a9cf0d6083abc1c71747b2060 URL: http://source.winehq.org/git/wine.git/?a=commit;h=09433cd0f274bd3a9cf0d6083a...
Author: Alex Henrie alexhenrie24@gmail.com Date: Tue Jun 14 12:28:12 2016 -0600
ucrtbase: Implement _(un)lock_locales.
Signed-off-by: Alex Henrie alexhenrie24@gmail.com Signed-off-by: Piotr Caban piotr@codeweavers.com Signed-off-by: Alexandre Julliard julliard@winehq.org (cherry picked from commit c044cf410d10a78c76a2ea7e8e07d602713f9616) Signed-off-by: Michael Stefaniuc mstefani@winehq.org
---
.../api-ms-win-crt-locale-l1-1-0.spec | 4 ++-- dlls/msvcrt/locale.c | 16 ++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 4 ++-- 3 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec b/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec index 9749808..c7e5aae 100644 --- a/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec +++ b/dlls/api-ms-win-crt-locale-l1-1-0/api-ms-win-crt-locale-l1-1-0.spec @@ -11,9 +11,9 @@ @ cdecl _free_locale(ptr) ucrtbase._free_locale @ cdecl _get_current_locale() ucrtbase._get_current_locale @ cdecl _getmbcp() ucrtbase._getmbcp -@ stub _lock_locales +@ cdecl _lock_locales() ucrtbase._lock_locales @ cdecl _setmbcp(long) ucrtbase._setmbcp -@ stub _unlock_locales +@ cdecl _unlock_locales() ucrtbase._unlock_locales @ stub _wcreate_locale @ cdecl _wsetlocale(long wstr) ucrtbase._wsetlocale @ cdecl localeconv() ucrtbase.localeconv diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index a1551c2..543c1d9 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -1592,6 +1592,22 @@ static MSVCRT_pthreadlocinfo create_locinfo(int category, }
/********************************************************************* + * _lock_locales (UCRTBASE.@) + */ +void CDECL _lock_locales(void) +{ + LOCK_LOCALE +} + +/********************************************************************* + * _unlock_locales (UCRTBASE.@) + */ +void CDECL _unlock_locales(void) +{ + UNLOCK_LOCALE +} + +/********************************************************************* * _create_locale (MSVCRT.@) */ MSVCRT__locale_t CDECL MSVCRT__create_locale(int category, const char *locale) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 661d657..159ca79 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -563,7 +563,7 @@ @ cdecl _localtime64(ptr) MSVCRT__localtime64 @ cdecl _localtime64_s(ptr ptr) @ cdecl _lock_file(ptr) MSVCRT__lock_file -@ stub _lock_locales +@ cdecl _lock_locales() @ cdecl _locking(long long long) MSVCRT__locking @ cdecl _logb(double) MSVCRT__logb @ cdecl -arch=arm,x86_64 _logbf(float) MSVCRT__logbf @@ -2000,7 +2000,7 @@ @ cdecl _unlink(str) MSVCRT__unlink @ cdecl _unloaddll(long) @ cdecl _unlock_file(ptr) MSVCRT__unlock_file -@ stub _unlock_locales +@ cdecl _unlock_locales() @ cdecl _utime32(str ptr) @ cdecl _utime64(str ptr) @ cdecl _waccess(wstr long) MSVCRT__waccess