April 2010 - Wine-commits - list.winehq.org

Piotr Caban : msvcrt: Added _vsnwprintf* implementation.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 743e6ba6886d962034b41a80e906450d97761724 URL: http://source.winehq.org/git/wine.git/?a=commit;h=743e6ba6886d962034b41a80e… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 19 10:57:50 2010 +0200 msvcrt: Added _vsnwprintf* implementation. --- dlls/msvcr80/msvcr80.spec | 6 ++-- dlls/msvcr90/msvcr90.spec | 6 ++-- dlls/msvcrt/msvcrt.h | 2 +- dlls/msvcrt/msvcrt.spec | 6 ++-- dlls/msvcrt/wcs.c | 67 ++++++++++++++++++++++++++++++++++++++++++--- 5 files changed, 73 insertions(+), 14 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 02ecbfc..eb2f474 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1054,9 +1054,9 @@ @ cdecl _vsnprintf_s(ptr long long str ptr) msvcrt._vsnprintf_s @ cdecl _vsnprintf_s_l(ptr long long str ptr ptr) msvcrt._vsnprintf_s_l @ cdecl _vsnwprintf(ptr long wstr ptr) msvcrt._vsnwprintf -@ stub _vsnwprintf_l -@ stub _vsnwprintf_s -@ stub _vsnwprintf_s_l +@ cdecl _vsnwprintf_l(ptr long wstr ptr ptr) msvcrt._vsnwprintf_l +@ cdecl _vsnwprintf_s(ptr long long wstr ptr) msvcrt._vsnwprintf_s +@ cdecl _vsnwprintf_s_l(ptr long long wstr ptr ptr) msvcrt._vsnwprintf_s_l @ stub _vsprintf_l @ stub _vsprintf_p @ stub _vsprintf_p_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 5814fb2..7ffb0b9 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1041,9 +1041,9 @@ @ cdecl _vsnprintf_s(ptr long long str ptr) msvcrt._vsnprintf_s @ cdecl _vsnprintf_s_l(ptr long long str ptr ptr) msvcrt._vsnprintf_s_l @ cdecl _vsnwprintf(ptr long wstr ptr) msvcrt._vsnwprintf -@ stub _vsnwprintf_l -@ stub _vsnwprintf_s -@ stub _vsnwprintf_s_l +@ cdecl _vsnwprintf_l(ptr long wstr ptr ptr) msvcrt._vsnwprintf_l +@ cdecl _vsnwprintf_s(ptr long long wstr ptr) msvcrt._vsnwprintf_s +@ cdecl _vsnwprintf_s_l(ptr long long wstr ptr ptr) msvcrt._vsnwprintf_s_l @ stub _vsprintf_l @ stub _vsprintf_p @ stub _vsprintf_p_l diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 81b0f4b..8d66eef 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -738,7 +738,7 @@ MSVCRT___time64_t __cdecl MSVCRT__time64(MSVCRT___time64_t*); MSVCRT_FILE* __cdecl MSVCRT__fdopen(int, const char *); MSVCRT_FILE* __cdecl MSVCRT__wfdopen(int, const MSVCRT_wchar_t *); int __cdecl MSVCRT_vsnprintf(char *str, MSVCRT_size_t len, const char *format, __ms_va_list valist); -int __cdecl MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, unsigned int len, +int __cdecl MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, MSVCRT_size_t len, const MSVCRT_wchar_t *format, __ms_va_list valist ); int __cdecl MSVCRT_raise(int sig); diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a7070df..59ed3b3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -983,9 +983,9 @@ @ cdecl _vsnprintf_s(ptr long long str ptr) MSVCRT_vsnprintf_s @ cdecl _vsnprintf_s_l(ptr long long str ptr ptr) MSVCRT_vsnprintf_s_l @ cdecl _vsnwprintf(ptr long wstr ptr) MSVCRT_vsnwprintf -# stub _vsnwprintf_l -# stub _vsnwprintf_s -# stub _vsnwprintf_s_l +@ cdecl _vsnwprintf_l(ptr long wstr ptr ptr) MSVCRT_vsnprintf_l +@ cdecl _vsnwprintf_s(ptr long long wstr ptr) MSVCRT_vsnprintf_s +@ cdecl _vsnwprintf_s_l(ptr long long wstr ptr ptr) MSVCRT_vsnprintf_s_l # stub _vsprintf_l # stub _vsprintf_p # stub _vsprintf_p_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 4ebb0e0..652cbd7 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -935,10 +935,11 @@ int CDECL MSVCRT__snprintf(char *str, unsigned int len, const char *format, ...) } /********************************************************************* - * _vsnwsprintf (MSVCRT.@) + * vsnwsprintf_internal (INTERNAL) */ -int CDECL MSVCRT_vsnwprintf( MSVCRT_wchar_t *str, unsigned int len, - const MSVCRT_wchar_t *format, __ms_va_list valist ) +static inline int vsnwprintf_internal(MSVCRT_wchar_t *str, MSVCRT_size_t len, + const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, BOOL valid, + __ms_va_list valist) { pf_output out; @@ -947,7 +948,65 @@ int CDECL MSVCRT_vsnwprintf( MSVCRT_wchar_t *str, unsigned int len, out.used = 0; out.len = len; - return pf_vsnprintf( &out, format, NULL, FALSE, valist ); + return pf_vsnprintf( &out, format, locale, valid, valist ); +} + +/********************************************************************* + * _vsnwsprintf (MSVCRT.@) + */ +int CDECL MSVCRT_vsnwprintf(MSVCRT_wchar_t *str, MSVCRT_size_t len, + const MSVCRT_wchar_t *format, __ms_va_list valist) +{ + return vsnwprintf_internal(str, len, format, NULL, FALSE, valist); +} + +/********************************************************************* + * _vsnwsprintf_l (MSVCRT.@) + */ +int CDECL MSVCRT_vsnwprintf_l(MSVCRT_wchar_t *str, MSVCRT_size_t len, + const MSVCRT_wchar_t *format, MSVCRT__locale_t locale, + __ms_va_list valist) +{ + return vsnwprintf_internal(str, len, format, locale, FALSE, valist); +} + +/********************************************************************* + * _vsnwsprintf_s_l (MSVCRT.@) + */ +int CDECL MSVCRT_vsnwprintf_s_l( MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer, + MSVCRT_size_t count, const MSVCRT_wchar_t *format, + MSVCRT__locale_t locale, __ms_va_list valist) +{ + int len, ret; + + len = sizeOfBuffer/sizeof(MSVCRT_wchar_t); + if(count!=-1 && len>count+1) + len = count+1; + + ret = vsnwprintf_internal(str, len, format, locale, TRUE, valist); + + if(ret<0 || ret==len) { + if(count!=_TRUNCATE && count>sizeOfBuffer/sizeof(MSVCRT_wchar_t)) { + MSVCRT__invalid_parameter( NULL, NULL, NULL, 0, 0 ); + *MSVCRT__errno() = MSVCRT_ERANGE; + memset(str, 0, sizeOfBuffer); + } else + str[len-1] = '\0'; + + return -1; + } + + return ret; +} + +/********************************************************************* + * _vsnwsprintf_s (MSVCRT.@) + */ +int CDECL MSVCRT_vsnwprintf_s(MSVCRT_wchar_t *str, MSVCRT_size_t sizeOfBuffer, + MSVCRT_size_t count, const MSVCRT_wchar_t *format, __ms_va_list valist) +{ + return MSVCRT_vsnwprintf_s_l(str, sizeOfBuffer, count, + format, NULL, valist); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Added implementations of _vswprintf* functions.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 97bad691842b1e5e1204aa95af05b86ceffd09e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=97bad691842b1e5e1204aa95a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 19 10:58:00 2010 +0200 msvcrt: Added implementations of _vswprintf* functions. --- dlls/msvcr80/msvcr80.spec | 14 +++++++------- dlls/msvcr90/msvcr90.spec | 14 +++++++------- dlls/msvcrt/msvcrt.spec | 12 ++++++------ dlls/msvcrt/wcs.c | 17 ++++++++++++++--- 4 files changed, 34 insertions(+), 23 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index eb2f474..d872571 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1061,13 +1061,13 @@ @ stub _vsprintf_p @ stub _vsprintf_p_l @ stub _vsprintf_s_l -@ stub _vswprintf -@ stub _vswprintf_c -@ stub _vswprintf_c_l -@ stub _vswprintf_l -@ stub _vswprintf_p -@ stub _vswprintf_p_l -@ stub _vswprintf_s_l +@ cdecl _vswprintf(ptr long wstr ptr) msvcrt._vswprintf +@ cdecl _vswprintf_c(ptr long wstr ptr) msvcrt._vswprintf_c +@ cdecl _vswprintf_c_l(ptr long wstr ptr ptr) msvcrt._vswprintf_c_l +@ cdecl _vswprintf_l(ptr long wstr ptr ptr) msvcrt._vswprintf_l +@ cdecl _vswprintf_p(ptr long wstr ptr) msvcrt._vswprintf +@ cdecl _vswprintf_p_l(ptr long wstr ptr ptr) msvcrt._vswprintf_p_l +@ cdecl _vswprintf_s_l(ptr long wstr ptr ptr) msvcrt._vswprintf_s_l @ stub _vwprintf_l @ stub _vwprintf_p @ stub _vwprintf_p_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 7ffb0b9..75740ec 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1048,13 +1048,13 @@ @ stub _vsprintf_p @ stub _vsprintf_p_l @ stub _vsprintf_s_l -@ stub _vswprintf -@ stub _vswprintf_c -@ stub _vswprintf_c_l -@ stub _vswprintf_l -@ stub _vswprintf_p -@ stub _vswprintf_p_l -@ stub _vswprintf_s_l +@ cdecl _vswprintf(ptr long wstr ptr) msvcrt._vswprintf +@ cdecl _vswprintf_c(ptr long wstr ptr) msvcrt._vswprintf_c +@ cdecl _vswprintf_c_l(ptr long wstr ptr ptr) msvcrt._vswprintf_c_l +@ cdecl _vswprintf_l(ptr long wstr ptr ptr) msvcrt._vswprintf_l +@ cdecl _vswprintf_p(ptr long wstr ptr) msvcrt._vswprintf +@ cdecl _vswprintf_p_l(ptr long wstr ptr ptr) msvcrt._vswprintf_p_l +@ cdecl _vswprintf_s_l(ptr long wstr ptr ptr) msvcrt._vswprintf_s_l @ stub _vwprintf_l @ stub _vwprintf_p @ stub _vwprintf_p_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 59ed3b3..dffd749 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -990,12 +990,12 @@ # stub _vsprintf_p # stub _vsprintf_p_l # stub _vsprintf_s_l -# stub _vswprintf -# stub _vswprintf_c -# stub _vswprintf_c_l -# stub _vswprintf_l -# stub _vswprintf_p_l -# stub _vswprintf_s_l +@ cdecl _vswprintf(ptr long wstr ptr) MSVCRT_vsnwprintf +@ cdecl _vswprintf_c(ptr long wstr ptr) MSVCRT_vsnwprintf +@ cdecl _vswprintf_c_l(ptr long wstr ptr ptr) MSVCRT_vsnwprintf_l +@ cdecl _vswprintf_l(ptr long wstr ptr ptr) MSVCRT_vsnwprintf_l +@ cdecl _vswprintf_p_l(ptr long wstr ptr ptr) MSVCRT_vsnwprintf_l +@ cdecl _vswprintf_s_l(ptr long wstr ptr ptr) MSVCRT_vswprintf_s_l # stub _vwprintf_l # stub _vwprintf_p # stub _vwprintf_p_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 652cbd7..df0ac03 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1083,10 +1083,21 @@ int CDECL _vscwprintf( const MSVCRT_wchar_t *format, __ms_va_list args ) /********************************************************************* * vswprintf_s (MSVCRT.@) */ -int CDECL MSVCRT_vswprintf_s( MSVCRT_wchar_t* str, MSVCRT_size_t num, const MSVCRT_wchar_t* format, __ms_va_list args ) +int CDECL MSVCRT_vswprintf_s(MSVCRT_wchar_t* str, MSVCRT_size_t numberOfElements, + const MSVCRT_wchar_t* format, __ms_va_list args) { - /* FIXME: must handle positional arguments */ - return MSVCRT_vsnwprintf( str, num, format, args ); + return MSVCRT_vsnwprintf_s(str, numberOfElements*sizeof(MSVCRT_wchar_t), + INT_MAX, format, args); +} + +/********************************************************************* + * _vswprintf_s_l (MSVCRT.@) + */ +int CDECL MSVCRT_vswprintf_s_l(MSVCRT_wchar_t* str, MSVCRT_size_t numberOfElements, + const MSVCRT_wchar_t* format, MSVCRT__locale_t locale, __ms_va_list args) +{ + return MSVCRT_vsnwprintf_s_l(str, numberOfElements*sizeof(MSVCRT_wchar_t), + INT_MAX, format, locale, args ); } /*********************************************************************

1 0

Piotr Caban : msvcrt: Fix multiple locales parsing in _create_locale.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: f11dfcb7a6dc7d552ef1ad7abb123268424bd357 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f11dfcb7a6dc7d552ef1ad7ab… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 19 10:58:10 2010 +0200 msvcrt: Fix multiple locales parsing in _create_locale. --- dlls/msvcrt/locale.c | 22 ++++++++++++---------- 1 files changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index e8af46b..fe36976 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -214,8 +214,8 @@ static LCID MSVCRT_locale_to_LCID(const char *locale) if(cp) { lstrcpynA(search.search_codepage, cp+1, MAX_ELEM_LEN); - if(cp-region < MAX_ELEM_LEN) - search.search_country[cp-region] = '\0'; + if(cp-region-1 < MAX_ELEM_LEN) + search.search_country[cp-region-1] = '\0'; if(cp-locale < MAX_ELEM_LEN) search.search_language[cp-locale] = '\0'; } else @@ -229,11 +229,11 @@ static LCID MSVCRT_locale_to_LCID(const char *locale) (LONG_PTR)&search); if (!search.match_flags) - return 0; + return -1; /* If we were given something that didn't match, fail */ if (search.search_country[0] && !(search.match_flags & FOUND_COUNTRY)) - return 0; + return -1; lcid = MAKELCID(search.found_lang_id, SORT_DEFAULT); @@ -253,10 +253,10 @@ static LCID MSVCRT_locale_to_LCID(const char *locale) GetLocaleInfoA(lcid, LOCALE_IDEFAULTANSICODEPAGE, search.found_codepage, MAX_ELEM_LEN); } else - return 0; + return -1; if (!atoi(search.found_codepage)) - return 0; + return -1; } } else { /* Prefer ANSI codepages if present */ @@ -583,23 +583,25 @@ MSVCRT__locale_t _create_locale(int category, const char *locale) return NULL; p = strchr(locale, ';'); - if(p) { + if(locale[0]=='C' && (locale[1]==';' || locale[1]=='\0')) + lcid[i] = 0; + else if(p) { memcpy(buf, locale, p-locale); lcid[i] = MSVCRT_locale_to_LCID(buf); } else lcid[i] = MSVCRT_locale_to_LCID(locale); - if(!lcid[i]) + if(lcid[i] == -1) return NULL; if(!p || *(p+1)!='L' || *(p+2)!='C' || *(p+3)!='_') break; - locale = p+4; + locale = p+1; } } else { lcid[0] = MSVCRT_locale_to_LCID(locale); - if(!lcid[0]) + if(lcid[0] == -1) return NULL; }

1 0

Piotr Caban : msvcrt: Added implementation of __crtGetStringTypeW.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: be5a6a03a6e2c1f0a5c23eff6c475481c2d25153 URL: http://source.winehq.org/git/wine.git/?a=commit;h=be5a6a03a6e2c1f0a5c23eff6… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 19 10:58:19 2010 +0200 msvcrt: Added implementation of __crtGetStringTypeW. --- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/locale.c | 16 ++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index d872571..04535b3 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -148,7 +148,7 @@ @ cdecl __crtCompareStringA(long long str long str long) msvcrt.__crtCompareStringA @ cdecl __crtCompareStringW(long long wstr long wstr long) msvcrt.__crtCompareStringW @ cdecl __crtGetLocaleInfoW(long long ptr long) msvcrt.__crtGetLocaleInfoW -@ stub __crtGetStringTypeW +@ cdecl __crtGetStringTypeW(long long wstr long ptr) msvcrt.__crtGetStringTypeW @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA @ stub __crtLCMapStringW @ stub __daylight diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 75740ec..ae13be4 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -145,7 +145,7 @@ @ cdecl __crtCompareStringA(long long str long str long) msvcrt.__crtCompareStringA @ cdecl __crtCompareStringW(long long wstr long wstr long) msvcrt.__crtCompareStringW @ cdecl __crtGetLocaleInfoW(long long ptr long) msvcrt.__crtGetLocaleInfoW -@ stub __crtGetStringTypeW +@ cdecl __crtGetStringTypeW(long long wstr long ptr) msvcrt.__crtGetStringTypeW @ cdecl __crtLCMapStringA(long long str long ptr long long long) msvcrt.__crtLCMapStringA @ stub __crtLCMapStringW @ stub __daylight diff --git a/dlls/msvcrt/locale.c b/dlls/msvcrt/locale.c index fe36976..fe77b83 100644 --- a/dlls/msvcrt/locale.c +++ b/dlls/msvcrt/locale.c @@ -54,6 +54,7 @@ unsigned char charmax = CHAR_MAX; #define UNLOCK_LOCALE _munlock(_SETLOCALE_LOCK); #define MSVCRT_LEADBYTE 0x8000 +#define MSVCRT_C1_DEFINED 0x200 /* Friendly country strings & iso codes for synonym support. * Based on MS documentation for setlocale(). @@ -458,6 +459,21 @@ int CDECL __crtGetLocaleInfoW( LCID lcid, LCTYPE type, MSVCRT_wchar_t *buffer, i } /********************************************************************* + * __crtGetStringTypeW(MSVCRT.@) + * + * This function was accepting different number of arguments in older + * versions of msvcrt. + */ +BOOL CDECL __crtGetStringTypeW(DWORD unk, DWORD type, + MSVCRT_wchar_t *buffer, int len, WORD *out) +{ + FIXME("(unk %x, type %x, wstr %p(%d), %p) partial stub\n", + unk, type, buffer, len, out); + + return GetStringTypeW(type, buffer, len, out); +} + +/********************************************************************* * localeconv (MSVCRT.@) */ struct MSVCRT_lconv * CDECL MSVCRT_localeconv(void) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index dffd749..f4f9ee8 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -138,7 +138,7 @@ @ cdecl __crtCompareStringA(long long str long str long) @ cdecl __crtCompareStringW(long long wstr long wstr long) @ cdecl __crtGetLocaleInfoW(long long ptr long) -# stub __crtGetStringTypeW +@ cdecl __crtGetStringTypeW(long long wstr long ptr) @ cdecl __crtLCMapStringA(long long str long ptr long long long) # stub __crtLCMapStringW # stub __daylight

1 0

Piotr Caban : msvcrt/tests: Added setlocale tests.
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: d03020a976581253435fc345d82f320314aac5b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d03020a976581253435fc345d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Mon Apr 19 10:58:30 2010 +0200 msvcrt/tests: Added setlocale tests. --- dlls/msvcrt/tests/Makefile.in | 1 + dlls/msvcrt/tests/locale.c | 81 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 82 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/Makefile.in b/dlls/msvcrt/tests/Makefile.in index 79958ea..60348f5 100644 --- a/dlls/msvcrt/tests/Makefile.in +++ b/dlls/msvcrt/tests/Makefile.in @@ -16,6 +16,7 @@ C_SRCS = \ file.c \ headers.c \ heap.c \ + locale.c \ misc.c \ printf.c \ scanf.c \ diff --git a/dlls/msvcrt/tests/locale.c b/dlls/msvcrt/tests/locale.c new file mode 100644 index 0000000..ce44347 --- /dev/null +++ b/dlls/msvcrt/tests/locale.c @@ -0,0 +1,81 @@ +/* + * Unit test suite for locale functions. + * + * Copyright 2010 Piotr Caban for CodeWeavers + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <locale.h> +#include "wine/test.h" + +static void test_setlocale(void) +{ + static const char lc_all[] = "LC_COLLATE=C;LC_CTYPE=C;" + "LC_MONETARY=Greek_Greece.1253;LC_NUMERIC=Polish_Poland.1250;LC_TIME=C"; + + char *ret, buf[100]; + + ret = setlocale(20, "C"); + ok(ret == NULL, "ret = %s\n", ret); + + ret = setlocale(LC_ALL, ""); + ok(ret != NULL, "ret == NULL\n"); + + ret = setlocale(LC_ALL, "C"); + ok(!strcmp(ret, "C"), "ret = %s\n", ret); + + ret = setlocale(LC_ALL, NULL); + todo_wine ok(!strcmp(ret, "C"), "ret = %s\n", ret); + + if(!setlocale(LC_NUMERIC, "Polish") + || !setlocale(LC_NUMERIC, "Greek") + || !setlocale(LC_NUMERIC, "German") + || !setlocale(LC_NUMERIC, "English")) { + win_skip("System with limited locales\n"); + return; + } + + ret = setlocale(LC_NUMERIC, "Polish"); + ok(!strcmp(ret, "Polish_Poland.1250"), "ret = %s\n", ret); + + ret = setlocale(LC_MONETARY, "Greek"); + ok(!strcmp(ret, "Greek_Greece.1253"), "ret = %s\n", ret); + + ret = setlocale(LC_ALL, NULL); + ok(!strcmp(ret, lc_all), "ret = %s\n", ret); + + strcpy(buf, ret); + ret = setlocale(LC_ALL, buf); + todo_wine ok(!strcmp(ret, lc_all), "ret = %s\n", ret); + + ret = setlocale(LC_ALL, "German"); + todo_wine ok(!strcmp(ret, "German_Germany.1252"), "ret = %s\n", ret); + + /* This test shows that _country_synonims table is incorrect */ + /* It translates "America" to "US" */ + ret = setlocale(LC_ALL, "America"); + ok(ret == NULL, "ret = %s\n", ret); + + ret = setlocale(LC_ALL, "US"); + todo_wine ok(ret != NULL, "ret == NULL\n"); + if(ret) + ok(!strcmp(ret, "English_United States.1252"), "ret = %s\n", ret); +} + +START_TEST(locale) +{ + test_setlocale(); +}

1 0

Henri Verbeet : wined3d: Get rid of "myDevice".
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 10c5a8ac9e921f63df2c4d4565c87b5cf2e76f31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=10c5a8ac9e921f63df2c4d456… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 18 22:50:42 2010 +0200 wined3d: Get rid of "myDevice". --- dlls/wined3d/surface.c | 162 ++++++++++++++++++++++++----------------------- 1 files changed, 83 insertions(+), 79 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=10c5a8ac9e921f63df2c4…

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_load_ds_location().
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: ae46589f535010e497965b97c5689841224b504c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae46589f535010e497965b97c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 18 22:50:43 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_load_ds_location(). --- dlls/wined3d/device.c | 4 +- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/surface.c | 69 ++++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 3 +- 4 files changed, 44 insertions(+), 34 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ae46589f535010e497965…

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_modify_ds_location() .
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: efb3993a3adcfce05489b62ad257da70ad1bdfe1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=efb3993a3adcfce05489b62ad… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 18 22:50:44 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_modify_ds_location(). --- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/surface.c | 16 +++++++--------- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 13 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 547b109..1fb0dac 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4513,7 +4513,7 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfac if (Flags & WINED3DCLEAR_ZBUFFER) { /* Note that WINED3DCLEAR_ZBUFFER implies a depth stencil exists on the device */ DWORD location = context->render_offscreen ? SFLAG_DS_OFFSCREEN : SFLAG_DS_ONSCREEN; - surface_modify_ds_location(This->stencilBufferTarget, location); + surface_modify_ds_location(depth_stencil, location); } LEAVE_GL(); @@ -5920,11 +5920,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetDepthStencilSurface(IWineD3DDevice * if (This->stencilBufferTarget) { if (((IWineD3DSwapChainImpl *)This->swapchains[0])->presentParms.Flags & WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL || ((IWineD3DSurfaceImpl *)This->stencilBufferTarget)->Flags & SFLAG_DISCARD) { - surface_modify_ds_location(This->stencilBufferTarget, SFLAG_DS_DISCARDED); + surface_modify_ds_location((IWineD3DSurfaceImpl *)This->stencilBufferTarget, SFLAG_DS_DISCARDED); } else { struct wined3d_context *context = context_acquire(This, This->render_targets[0], CTXUSAGE_RESOURCELOAD); surface_load_ds_location((IWineD3DSurfaceImpl *)This->stencilBufferTarget, context, SFLAG_DS_OFFSCREEN); - surface_modify_ds_location(This->stencilBufferTarget, SFLAG_DS_OFFSCREEN); + surface_modify_ds_location((IWineD3DSurfaceImpl *)This->stencilBufferTarget, SFLAG_DS_OFFSCREEN); context_release(context); } } diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 03927c9..ed641a6 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -614,7 +614,7 @@ void drawPrimitive(IWineD3DDevice *iface, UINT index_count, UINT StartIdx, UINT || This->stateBlock->renderState[WINED3DRS_ZENABLE]) surface_load_ds_location((IWineD3DSurfaceImpl *)This->stencilBufferTarget, context, location); if (This->stateBlock->renderState[WINED3DRS_ZWRITEENABLE]) - surface_modify_ds_location(This->stencilBufferTarget, location); + surface_modify_ds_location((IWineD3DSurfaceImpl *)This->stencilBufferTarget, location); } /* Ok, we will be updating the screen from here onwards so grab the lock */ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d376e28..a91acb1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4054,17 +4054,15 @@ static void surface_depth_blt(IWineD3DSurfaceImpl *This, const struct wined3d_gl device->shader_backend->shader_deselect_depth_blt((IWineD3DDevice *)device); } -void surface_modify_ds_location(IWineD3DSurface *iface, DWORD location) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - - TRACE("(%p) New location %#x\n", This, location); +void surface_modify_ds_location(IWineD3DSurfaceImpl *surface, DWORD location) +{ + TRACE("surface %p, new location %#x.\n", surface, location); - if (location & ~SFLAG_DS_LOCATIONS) { - FIXME("(%p) Invalid location (%#x) specified\n", This, location); - } + if (location & ~SFLAG_DS_LOCATIONS) + FIXME("Invalid location (%#x) specified.\n", location); - This->Flags &= ~SFLAG_DS_LOCATIONS; - This->Flags |= location; + surface->Flags &= ~SFLAG_DS_LOCATIONS; + surface->Flags |= location; } /* Context activation is done by the caller. */ diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 8c78fac..934979b 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -464,7 +464,7 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO if (This->presentParms.Flags & WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL || ((IWineD3DSurfaceImpl *)This->device->stencilBufferTarget)->Flags & SFLAG_DISCARD) { - surface_modify_ds_location(This->device->stencilBufferTarget, SFLAG_DS_DISCARDED); + surface_modify_ds_location((IWineD3DSurfaceImpl *)This->device->stencilBufferTarget, SFLAG_DS_DISCARDED); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 42bafca..9bcfc7f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2679,7 +2679,7 @@ void surface_add_dirty_rect(IWineD3DSurface *iface, const RECT *dirty_rect) DECL GLenum surface_get_gl_buffer(IWineD3DSurface *iface) DECLSPEC_HIDDEN; void surface_load_ds_location(IWineD3DSurfaceImpl *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; -void surface_modify_ds_location(IWineD3DSurface *iface, DWORD location) DECLSPEC_HIDDEN; +void surface_modify_ds_location(IWineD3DSurfaceImpl *surface, DWORD location) DECLSPEC_HIDDEN; void surface_set_compatible_renderbuffer(IWineD3DSurface *iface, unsigned int width, unsigned int height) DECLSPEC_HIDDEN; void surface_set_texture_name(IWineD3DSurface *iface, GLuint name, BOOL srgb_name) DECLSPEC_HIDDEN;

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_is_offscreen().
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 03dc612c9c1c69aa599294bee948b0c5aeb877b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=03dc612c9c1c69aa599294bee… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 18 22:50:45 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_is_offscreen(). --- dlls/wined3d/context.c | 6 +++--- dlls/wined3d/device.c | 17 ++++++++--------- dlls/wined3d/surface.c | 36 ++++++++++++++++++------------------ dlls/wined3d/wined3d_private.h | 2 +- 4 files changed, 30 insertions(+), 31 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=03dc612c9c1c69aa59929…

1 0

Henri Verbeet : wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_set_compatible_renderbuffer ().
by Alexandre Julliard 19 Apr '10

19 Apr '10

Module: wine Branch: master Commit: 92a44884c7b36bf70b1abdda7460a5e2c5b4e543 URL: http://source.winehq.org/git/wine.git/?a=commit;h=92a44884c7b36bf70b1abdda7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Apr 18 22:50:46 2010 +0200 wined3d: Simply pass an IWineD3DSurfaceImpl pointer to surface_set_compatible_renderbuffer(). --- dlls/wined3d/context.c | 2 +- dlls/wined3d/surface.c | 29 ++++++++++++++++------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 1a1a69d..870ab37 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -423,7 +423,7 @@ static void context_apply_fbo_entry(struct wined3d_context *context, struct fbo_ unsigned int w = ((IWineD3DSurfaceImpl *)device->render_targets[0])->pow2Width; unsigned int h = ((IWineD3DSurfaceImpl *)device->render_targets[0])->pow2Height; - surface_set_compatible_renderbuffer(device->stencilBufferTarget, w, h); + surface_set_compatible_renderbuffer((IWineD3DSurfaceImpl *)device->stencilBufferTarget, w, h); } context_attach_depth_stencil_fbo(context, GL_FRAMEBUFFER, (IWineD3DSurfaceImpl *)device->stencilBufferTarget, TRUE); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index d2bdc9c..b7580c5 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -873,15 +873,15 @@ static void surface_allocate_surface(IWineD3DSurfaceImpl *This, const struct win * render target dimensions. With FBOs, the dimensions have to be an exact match. */ /* TODO: We should synchronize the renderbuffer's content with the texture's content. */ /* GL locking is done by the caller */ -void surface_set_compatible_renderbuffer(IWineD3DSurface *iface, unsigned int width, unsigned int height) { - IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; - const struct wined3d_gl_info *gl_info = &This->resource.device->adapter->gl_info; +void surface_set_compatible_renderbuffer(IWineD3DSurfaceImpl *surface, unsigned int width, unsigned int height) +{ + const struct wined3d_gl_info *gl_info = &surface->resource.device->adapter->gl_info; renderbuffer_entry_t *entry; GLuint renderbuffer = 0; unsigned int src_width, src_height; - src_width = This->pow2Width; - src_height = This->pow2Height; + src_width = surface->pow2Width; + src_height = surface->pow2Height; /* A depth stencil smaller than the render target is not valid */ if (width > src_width || height > src_height) return; @@ -890,32 +890,35 @@ void surface_set_compatible_renderbuffer(IWineD3DSurface *iface, unsigned int wi if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT] || (width == src_width && height == src_height)) { - This->current_renderbuffer = NULL; + surface->current_renderbuffer = NULL; return; } /* Look if we've already got a renderbuffer of the correct dimensions */ - LIST_FOR_EACH_ENTRY(entry, &This->renderbuffers, renderbuffer_entry_t, entry) { - if (entry->width == width && entry->height == height) { + LIST_FOR_EACH_ENTRY(entry, &surface->renderbuffers, renderbuffer_entry_t, entry) + { + if (entry->width == width && entry->height == height) + { renderbuffer = entry->id; - This->current_renderbuffer = entry; + surface->current_renderbuffer = entry; break; } } - if (!renderbuffer) { + if (!renderbuffer) + { gl_info->fbo_ops.glGenRenderbuffers(1, &renderbuffer); gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, renderbuffer); gl_info->fbo_ops.glRenderbufferStorage(GL_RENDERBUFFER, - This->resource.format_desc->glInternal, width, height); + surface->resource.format_desc->glInternal, width, height); entry = HeapAlloc(GetProcessHeap(), 0, sizeof(renderbuffer_entry_t)); entry->width = width; entry->height = height; entry->id = renderbuffer; - list_add_head(&This->renderbuffers, &entry->entry); + list_add_head(&surface->renderbuffers, &entry->entry); - This->current_renderbuffer = entry; + surface->current_renderbuffer = entry; } checkGLcall("set_compatible_renderbuffer"); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3594dfd..a0b398a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2680,7 +2680,7 @@ GLenum surface_get_gl_buffer(IWineD3DSurface *iface) DECLSPEC_HIDDEN; void surface_load_ds_location(IWineD3DSurfaceImpl *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void surface_modify_ds_location(IWineD3DSurfaceImpl *surface, DWORD location) DECLSPEC_HIDDEN; -void surface_set_compatible_renderbuffer(IWineD3DSurface *iface, +void surface_set_compatible_renderbuffer(IWineD3DSurfaceImpl *surface, unsigned int width, unsigned int height) DECLSPEC_HIDDEN; void surface_set_texture_name(IWineD3DSurface *iface, GLuint name, BOOL srgb_name) DECLSPEC_HIDDEN; void surface_set_texture_target(IWineD3DSurface *iface, GLenum target) DECLSPEC_HIDDEN;

1 0