November 2010 - Wine-commits

Eric Pouech : msvcrt: Implemented _itow_s.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: af2bc15eddfea046a0b283bc7cd73fd4ba9bef78 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af2bc15eddfea046a0b283bc7… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Nov 2 22:02:52 2010 +0100 msvcrt: Implemented _itow_s. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 77 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 81 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 2f23ff0..d4e5c38 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -836,7 +836,7 @@ @ cdecl _itoa(long ptr long) msvcrt._itoa @ cdecl _itoa_s(long ptr long long) msvcrt._itoa_s @ cdecl _itow(long ptr long) msvcrt._itow -@ stub _itow_s +@ cdecl _itow_s(long ptr long long) msvcrt._itow_s @ cdecl _j0(double) msvcrt._j0 @ cdecl _j1(double) msvcrt._j1 @ cdecl _jn(long double) msvcrt._jn diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 5f0198c..7fb8eca 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -682,7 +682,7 @@ @ cdecl _itoa(long ptr long) msvcrt._itoa @ cdecl _itoa_s(long ptr long long) msvcrt._itoa_s @ cdecl _itow(long ptr long) msvcrt._itow -@ stub _itow_s +@ cdecl _itow_s(long ptr long long) msvcrt._itow_s @ cdecl _j0(double) msvcrt._j0 @ cdecl _j1(double) msvcrt._j1 @ cdecl _jn(long double) msvcrt._jn diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 7a53b7b..c38e5f9 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -670,7 +670,7 @@ @ cdecl _itoa(long ptr long) msvcrt._itoa @ cdecl _itoa_s(long ptr long long) msvcrt._itoa_s @ cdecl _itow(long ptr long) msvcrt._itow -@ stub _itow_s +@ cdecl _itow_s(long ptr long long) msvcrt._itow_s @ cdecl _j0(double) msvcrt._j0 @ cdecl _j1(double) msvcrt._j1 @ cdecl _jn(long double) msvcrt._jn diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index eb0d8ec..a1cd124 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -611,7 +611,7 @@ @ cdecl _itoa(long ptr long) ntdll._itoa @ cdecl _itoa_s(long ptr long long) @ cdecl _itow(long ptr long) ntdll._itow -# stub _itow_s +@ cdecl _itow_s(long ptr long long) @ cdecl _j0(double) @ cdecl _j1(double) @ cdecl _jn(long double) diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 6b3725f..3c4b53c 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -746,6 +746,83 @@ int CDECL _itoa_s(int value, char *str, MSVCRT_size_t size, int radix) } /********************************************************************* + * _itow_s (MSVCRT.@) + */ +int CDECL _itow_s(int value, MSVCRT_wchar_t *str, MSVCRT_size_t size, int radix) +{ + unsigned int val, digit; + int is_negative; + MSVCRT_wchar_t buffer[33], *pos; + size_t len; + + if (!MSVCRT_CHECK_PMT(str != NULL) || !MSVCRT_CHECK_PMT(size > 0) || + !MSVCRT_CHECK_PMT(radix >= 2) || !MSVCRT_CHECK_PMT(radix <= 36)) + { + if (str && size) + str[0] = '\0'; + + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + if (value < 0 && radix == 10) + { + is_negative = 1; + val = -value; + } + else + { + is_negative = 0; + val = value; + } + + pos = buffer + 32; + *pos = '\0'; + + do + { + digit = val % radix; + val /= radix; + + if (digit < 10) + *--pos = '0' + digit; + else + *--pos = 'a' + digit - 10; + } + while (val != 0); + + if (is_negative) + *--pos = '-'; + + len = buffer + 33 - pos; + if (len > size) + { + size_t i; + MSVCRT_wchar_t *p = str; + + /* Copy the temporary buffer backwards up to the available number of + * characters. Don't copy the negative sign if present. */ + + if (is_negative) + { + p++; + size--; + } + + for (pos = buffer + 31, i = 0; i < size; i++) + *p++ = *pos--; + + MSVCRT_INVALID_PMT("str[size] is too small"); + str[0] = '\0'; + *MSVCRT__errno() = MSVCRT_ERANGE; + return MSVCRT_ERANGE; + } + + memcpy(str, pos, len * sizeof(MSVCRT_wchar_t)); + return 0; +} + +/********************************************************************* * _ui64toa_s (MSVCRT.@) */ int CDECL MSVCRT__ui64toa_s(unsigned __int64 value, char *str,

1 0

Eric Pouech : msvcrt: Implemented _wputenv_s.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: 356b2d2bc07aabf771908eb4d217d42fb4cb949e URL: http://source.winehq.org/git/wine.git/?a=commit;h=356b2d2bc07aabf771908eb4d… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Nov 2 22:02:59 2010 +0100 msvcrt: Implemented _wputenv_s. --- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/environ.c | 52 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 4 +- 5 files changed, 60 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index d4e5c38..6035f70 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1035,7 +1035,7 @@ @ cdecl _putch(long) msvcrt._putch @ stub _putch_nolock @ cdecl _putenv(str) msvcrt._putenv -@ stub _putenv_s +@ cdecl _putenv_s(str str) msvcrt._putenv_s @ cdecl _putw(long ptr) msvcrt._putw @ stub _putwch @ stub _putwch_nolock @@ -1371,7 +1371,7 @@ @ stub _wprintf_p_l @ stub _wprintf_s_l @ cdecl _wputenv(wstr) msvcrt._wputenv -@ stub _wputenv_s +@ cdecl _wputenv_s(wstr wstr) msvcrt._wputenv_s @ cdecl _wremove(wstr) msvcrt._wremove @ cdecl _wrename(wstr wstr) msvcrt._wrename @ cdecl _write(long ptr long) msvcrt._write diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 7fb8eca..ce58a11 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -883,7 +883,7 @@ @ cdecl _putch(long) msvcrt._putch @ stub _putch_nolock @ cdecl _putenv(str) msvcrt._putenv -@ stub _putenv_s +@ cdecl _putenv_s(str str) msvcrt._putenv_s @ cdecl _putw(long ptr) msvcrt._putw @ stub _putwch @ stub _putwch_nolock @@ -1227,7 +1227,7 @@ @ stub _wprintf_p_l @ stub _wprintf_s_l @ cdecl _wputenv(wstr) msvcrt._wputenv -@ stub _wputenv_s +@ cdecl _wputenv_s(wstr wstr) msvcrt._wputenv_s @ cdecl _wremove(wstr) msvcrt._wremove @ cdecl _wrename(wstr wstr) msvcrt._wrename @ cdecl _write(long ptr long) msvcrt._write diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index c38e5f9..d9f6fb4 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -869,7 +869,7 @@ @ cdecl _putch(long) msvcrt._putch @ stub _putch_nolock @ cdecl _putenv(str) msvcrt._putenv -@ stub _putenv_s +@ cdecl _putenv_s(str str) msvcrt._putenv_s @ cdecl _putw(long ptr) msvcrt._putw @ stub _putwch @ stub _putwch_nolock @@ -1211,7 +1211,7 @@ @ stub _wprintf_p_l @ stub _wprintf_s_l @ cdecl _wputenv(wstr) msvcrt._wputenv -@ stub _wputenv_s +@ cdecl _wputenv_s(wstr wstr) msvcrt._wputenv_s @ cdecl _wremove(wstr) msvcrt._wremove @ cdecl _wrename(wstr wstr) msvcrt._wrename @ cdecl _write(long ptr long) msvcrt._write diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index add5905..75178bd 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -160,3 +160,55 @@ finish: HeapFree(GetProcessHeap(), 0, name); return ret; } + +/********************************************************************* + * _putenv_s (MSVCRT.@) + */ +int CDECL _putenv_s(const char *name, const char *value) +{ + int ret; + + TRACE("%s %s\n", debugstr_a(name), debugstr_a(value)); + + if (!MSVCRT_CHECK_PMT(name != NULL) || !MSVCRT_CHECK_PMT(value != NULL)) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return -1; + } + + ret = SetEnvironmentVariableA(name, value[0] ? value : NULL) ? 0 : -1; + + /* _putenv returns success on deletion of nonexistent variable, unlike [Rtl]SetEnvironmentVariable */ + if ((ret == -1) && (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) ret = 0; + + MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(MSVCRT__environ); + MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(MSVCRT__wenviron); + + return ret; +} + +/********************************************************************* + * _wputenv_s (MSVCRT.@) + */ +int CDECL _wputenv_s(const MSVCRT_wchar_t *name, const MSVCRT_wchar_t *value) +{ + int ret; + + TRACE("%s %s\n", debugstr_w(name), debugstr_w(value)); + + if (!MSVCRT_CHECK_PMT(name != NULL) || !MSVCRT_CHECK_PMT(value != NULL)) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return -1; + } + + ret = SetEnvironmentVariableW(name, value[0] ? value : NULL) ? 0 : -1; + + /* _putenv returns success on deletion of nonexistent variable, unlike [Rtl]SetEnvironmentVariable */ + if ((ret == -1) && (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) ret = 0; + + MSVCRT__environ = msvcrt_SnapshotOfEnvironmentA(MSVCRT__environ); + MSVCRT__wenviron = msvcrt_SnapshotOfEnvironmentW(MSVCRT__wenviron); + + return ret; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a1cd124..af86f2e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -817,7 +817,7 @@ @ cdecl _purecall() @ cdecl _putch(long) @ cdecl _putenv(str) -# stub _putenv_s +@ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw # stub _putwch @ cdecl _putws(wstr) @@ -1146,7 +1146,7 @@ # stub _wprintf_p_l # stub _wprintf_s_l @ cdecl _wputenv(wstr) -# stub _wputenv_s +@ cdecl _wputenv_s(wstr wstr) @ cdecl _wremove(wstr) @ cdecl _wrename(wstr wstr) @ cdecl _write(long ptr long) MSVCRT__write

1 0

Eric Pouech : msvcrt: Implemented _(w)dupenv_s.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: fc186c3bdab8c1b42e402f3db1dda7be201b9027 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fc186c3bdab8c1b42e402f3db… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Nov 2 22:03:05 2010 +0100 msvcrt: Implemented _(w)dupenv_s. --- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/environ.c | 49 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 2 + 5 files changed, 57 insertions(+), 6 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 6035f70..9ceb3e2 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -581,7 +581,7 @@ @ extern _dstbias msvcrt._dstbias @ cdecl _dup(long) msvcrt._dup @ cdecl _dup2(long long) msvcrt._dup2 -@ stub _dupenv_s +@ cdecl _dupenv_s(ptr ptr str) msvcrt._dupenv_s @ cdecl _ecvt(double long ptr ptr) msvcrt._ecvt @ stub _ecvt_s @ cdecl _encoded_null() msvcr90._encoded_null @@ -1327,7 +1327,7 @@ @ stub _wctomb_l @ stub _wctomb_s_l @ stub _wctype -@ stub _wdupenv_s +@ cdecl _wdupenv_s(ptr ptr wstr) msvcrt._wdupenv_s @ extern _wenviron msvcrt._wenviron @ varargs _wexecl(wstr wstr) msvcrt._wexecl @ varargs _wexecle(wstr wstr) msvcrt._wexecle diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index ce58a11..2dec3a4 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -421,7 +421,7 @@ @ extern _dstbias msvcrt._dstbias @ cdecl _dup(long) msvcrt._dup @ cdecl _dup2(long long) msvcrt._dup2 -@ stub _dupenv_s +@ cdecl _dupenv_s(ptr ptr str) msvcrt._dupenv_s @ cdecl _ecvt(double long ptr ptr) msvcrt._ecvt @ stub _ecvt_s @ cdecl _encode_pointer(ptr) msvcr90._encode_pointer @@ -1180,7 +1180,7 @@ @ stub _wctomb_l @ stub _wctomb_s_l @ stub _wctype -@ stub _wdupenv_s +@ cdecl _wdupenv_s(ptr ptr wstr) msvcrt._wdupenv_s @ extern _wenviron msvcrt._wenviron @ varargs _wexecl(wstr wstr) msvcrt._wexecl @ varargs _wexecle(wstr wstr) msvcrt._wexecle diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index d9f6fb4..9b87c0a 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -413,7 +413,7 @@ @ extern _dstbias msvcrt._dstbias @ cdecl _dup(long) msvcrt._dup @ cdecl _dup2(long long) msvcrt._dup2 -@ stub _dupenv_s +@ cdecl _dupenv_s(ptr ptr str) msvcrt._dupenv_s @ cdecl _ecvt(double long ptr ptr) msvcrt._ecvt @ stub _ecvt_s @ cdecl _encode_pointer(ptr) MSVCR90_encode_pointer @@ -1167,7 +1167,7 @@ @ stub _wctomb_l @ stub _wctomb_s_l @ stub _wctype -@ stub _wdupenv_s +@ cdecl _wdupenv_s(ptr ptr wstr) msvcrt._wdupenv_s @ extern _wenviron msvcrt._wenviron @ varargs _wexecl(wstr wstr) msvcrt._wexecl @ varargs _wexecle(wstr wstr) msvcrt._wexecle diff --git a/dlls/msvcrt/environ.c b/dlls/msvcrt/environ.c index 75178bd..99efd4b 100644 --- a/dlls/msvcrt/environ.c +++ b/dlls/msvcrt/environ.c @@ -212,3 +212,52 @@ int CDECL _wputenv_s(const MSVCRT_wchar_t *name, const MSVCRT_wchar_t *value) return ret; } + +/****************************************************************** + * _dupenv_s (MSVCRT.@) + */ +int _dupenv_s(char **buffer, MSVCRT_size_t *numberOfElements, const char *varname) +{ + char* e; + MSVCRT_size_t sz; + + if (!MSVCRT_CHECK_PMT(buffer != NULL) || !MSVCRT_CHECK_PMT(varname) || + !(e = MSVCRT_getenv(varname))) + { + return *MSVCRT__errno() = MSVCRT_EINVAL; + } + sz = strlen(e) + 1; + if (!(*buffer = MSVCRT_malloc(sz))) + { + if (numberOfElements) *numberOfElements = 0; + return *MSVCRT__errno() = MSVCRT_ENOMEM; + } + strcpy(*buffer, e); + if (numberOfElements) *numberOfElements = sz; + return 0; +} + +/****************************************************************** + * _wdupenv_s (MSVCRT.@) + */ +int _wdupenv_s(MSVCRT_wchar_t **buffer, MSVCRT_size_t *numberOfElements, + const MSVCRT_wchar_t *varname) +{ + MSVCRT_wchar_t* e; + MSVCRT_size_t sz; + + if (!MSVCRT_CHECK_PMT(buffer != NULL) || !MSVCRT_CHECK_PMT(varname) || + !(e = _wgetenv(varname))) + { + return *MSVCRT__errno() = MSVCRT_EINVAL; + } + sz = strlenW(e) + 1; + if (!(*buffer = MSVCRT_malloc(sz * sizeof(MSVCRT_wchar_t)))) + { + if (numberOfElements) *numberOfElements = 0; + return *MSVCRT__errno() = MSVCRT_ENOMEM; + } + strcpyW(*buffer, e); + if (numberOfElements) *numberOfElements = sz; + return 0; +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index af86f2e..ca2607c 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1480,3 +1480,5 @@ @ cdecl _wcstod_l(wstr ptr) MSVCRT__wcstod_l @ cdecl ___mb_cur_max_l_func(ptr) @ cdecl _set_purecall_handler(ptr) +@ cdecl _dupenv_s(ptr ptr str) +@ cdecl _wdupenv_s(ptr ptr str)

1 0

Eric Pouech : msvcrt: Implemented (w)searchenv_s.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: 83d87f3b13f87128b44465471c95cde88342d647 URL: http://source.winehq.org/git/wine.git/?a=commit;h=83d87f3b13f87128b44465471… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Nov 2 22:03:17 2010 +0100 msvcrt: Implemented (w)searchenv_s. --- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/dir.c | 144 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/msvcrt.spec | 4 +- 5 files changed, 152 insertions(+), 8 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 9ceb3e2..cace374 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1064,7 +1064,7 @@ @ stub _scwprintf_p @ stub _scwprintf_p_l @ cdecl _searchenv(str str ptr) msvcrt._searchenv -@ stub _searchenv_s +@ cdecl _searchenv_s(str str ptr long) msvcrt._searchenv_s @ stub _seh_longjmp_unwind4 @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind @ cdecl _set_SSE2_enable(long) msvcrt._set_SSE2_enable @@ -1379,7 +1379,7 @@ @ varargs _wscanf_l(wstr ptr) msvcrt._wscanf_l @ varargs _wscanf_s_l(wstr ptr) msvcrt._wscanf_s_l @ cdecl _wsearchenv(wstr wstr ptr) msvcrt._wsearchenv -@ stub _wsearchenv_s +@ cdecl _wsearchenv_s(wstr wstr ptr long) msvcrt._wsearchenv_s @ cdecl _wsetlocale(long wstr) msvcrt._wsetlocale @ varargs _wsopen(wstr long long) msvcrt._wsopen @ stub _wsopen_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 2dec3a4..9ac3094 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -916,7 +916,7 @@ @ stub _scwprintf_p @ stub _scwprintf_p_l @ cdecl _searchenv(str str ptr) msvcrt._searchenv -@ stub _searchenv_s +@ cdecl _searchenv_s(str str ptr long) msvcrt._searchenv_s @ stub _seh_longjmp_unwind4 @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind @ cdecl _set_SSE2_enable(long) msvcrt._set_SSE2_enable @@ -1235,7 +1235,7 @@ @ varargs _wscanf_l(wstr ptr) msvcrt._wscanf_l @ varargs _wscanf_s_l(wstr ptr) msvcrt._wscanf_s_l @ cdecl _wsearchenv(wstr wstr ptr) msvcrt._wsearchenv -@ stub _wsearchenv_s +@ cdecl _wsearchenv_s(wstr wstr ptr long) msvcrt._wsearchenv_s @ cdecl _wsetlocale(long wstr) msvcrt._wsetlocale @ varargs _wsopen(wstr long long) msvcrt._wsopen @ stub _wsopen_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9b87c0a..a307afe 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -902,7 +902,7 @@ @ stub _scwprintf_p @ stub _scwprintf_p_l @ cdecl _searchenv(str str ptr) msvcrt._searchenv -@ stub _searchenv_s +@ cdecl _searchenv_s(str str ptr long) msvcrt._searchenv_s @ stub _seh_longjmp_unwind4 @ stdcall -i386 _seh_longjmp_unwind(ptr) msvcrt._seh_longjmp_unwind @ cdecl _set_SSE2_enable(long) msvcrt._set_SSE2_enable @@ -1219,7 +1219,7 @@ @ varargs _wscanf_l(wstr ptr) msvcrt._wscanf_l @ varargs _wscanf_s_l(wstr ptr) msvcrt._wscanf_s_l @ cdecl _wsearchenv(wstr wstr ptr) msvcrt._wsearchenv -@ stub _wsearchenv_s +@ cdecl _wsearchenv_s(wstr wstr ptr long) msvcrt._wsearchenv_s @ cdecl _wsetlocale(long wstr) msvcrt._wsetlocale @ varargs _wsopen(wstr long long) msvcrt._wsopen @ stub _wsopen_s diff --git a/dlls/msvcrt/dir.c b/dlls/msvcrt/dir.c index b45a459..f175ac0 100644 --- a/dlls/msvcrt/dir.c +++ b/dlls/msvcrt/dir.c @@ -1472,6 +1472,78 @@ void CDECL _searchenv(const char* file, const char* env, char *buf) } /********************************************************************* + * _searchenv_s (MSVCRT.@) + */ +int CDECL _searchenv_s(const char* file, const char* env, char *buf, MSVCRT_size_t count) +{ + char*envVal, *penv; + char curPath[MAX_PATH]; + + if (!MSVCRT_CHECK_PMT(file != NULL) || !MSVCRT_CHECK_PMT(buf != NULL) || + !MSVCRT_CHECK_PMT(count > 0)) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + + *buf = '\0'; + + /* Try CWD first */ + if (GetFileAttributesA( file ) != INVALID_FILE_ATTRIBUTES) + { + if (GetFullPathNameA( file, count, buf, NULL )) return 0; + msvcrt_set_errno(GetLastError()); + return 0; + } + + /* Search given environment variable */ + envVal = MSVCRT_getenv(env); + if (!envVal) + { + *MSVCRT__errno() = MSVCRT_ENOENT; + return MSVCRT_ENOENT; + } + + penv = envVal; + TRACE(":searching for %s in paths %s\n", file, envVal); + + do + { + char *end = penv; + + while(*end && *end != ';') end++; /* Find end of next path */ + if (penv == end || !*penv) + { + *MSVCRT__errno() = MSVCRT_ENOENT; + return MSVCRT_ENOENT; + } + memcpy(curPath, penv, end - penv); + if (curPath[end - penv] != '/' && curPath[end - penv] != '\\') + { + curPath[end - penv] = '\\'; + curPath[end - penv + 1] = '\0'; + } + else + curPath[end - penv] = '\0'; + + strcat(curPath, file); + TRACE("Checking for file %s\n", curPath); + if (GetFileAttributesA( curPath ) != INVALID_FILE_ATTRIBUTES) + { + if (strlen(curPath) + 1 > count) + { + MSVCRT_INVALID_PMT("buf[count] is too small"); + *MSVCRT__errno() = MSVCRT_ERANGE; + return MSVCRT_ERANGE; + } + strcpy(buf, curPath); + return 0; + } + penv = *end ? end + 1 : end; + } while(1); +} + +/********************************************************************* * _wsearchenv (MSVCRT.@) * * Unicode version of _searchenv @@ -1533,3 +1605,75 @@ void CDECL _wsearchenv(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t* env, MS penv = *end ? end + 1 : end; } while(1); } + +/********************************************************************* + * _wsearchenv_s (MSVCRT.@) + */ +int CDECL _wsearchenv_s(const MSVCRT_wchar_t* file, const MSVCRT_wchar_t* env, + MSVCRT_wchar_t *buf, MSVCRT_size_t count) +{ + MSVCRT_wchar_t* envVal, *penv; + MSVCRT_wchar_t curPath[MAX_PATH]; + + if (!MSVCRT_CHECK_PMT(file != NULL) || !MSVCRT_CHECK_PMT(buf != NULL) || + !MSVCRT_CHECK_PMT(count > 0)) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return MSVCRT_EINVAL; + } + *buf = '\0'; + + /* Try CWD first */ + if (GetFileAttributesW( file ) != INVALID_FILE_ATTRIBUTES) + { + if (GetFullPathNameW( file, count, buf, NULL )) return 0; + msvcrt_set_errno(GetLastError()); + return 0; + } + + /* Search given environment variable */ + envVal = _wgetenv(env); + if (!envVal) + { + *MSVCRT__errno() = MSVCRT_ENOENT; + return MSVCRT_ENOENT; + } + + penv = envVal; + TRACE(":searching for %s in paths %s\n", debugstr_w(file), debugstr_w(envVal)); + + do + { + MSVCRT_wchar_t *end = penv; + + while(*end && *end != ';') end++; /* Find end of next path */ + if (penv == end || !*penv) + { + *MSVCRT__errno() = MSVCRT_ENOENT; + return MSVCRT_ENOENT; + } + memcpy(curPath, penv, (end - penv) * sizeof(MSVCRT_wchar_t)); + if (curPath[end - penv] != '/' && curPath[end - penv] != '\\') + { + curPath[end - penv] = '\\'; + curPath[end - penv + 1] = '\0'; + } + else + curPath[end - penv] = '\0'; + + strcatW(curPath, file); + TRACE("Checking for file %s\n", debugstr_w(curPath)); + if (GetFileAttributesW( curPath ) != INVALID_FILE_ATTRIBUTES) + { + if (strlenW(curPath) + 1 > count) + { + MSVCRT_INVALID_PMT("buf[count] is too small"); + *MSVCRT__errno() = MSVCRT_ERANGE; + return MSVCRT_ERANGE; + } + strcpyW(buf, curPath); + return 0; + } + penv = *end ? end + 1 : end; + } while(1); +} diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ca2607c..0f9fdb4 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -846,7 +846,7 @@ # stub _scwprintf_l # stub _scwprintf_p_l @ cdecl _searchenv(str str ptr) -# stub _searchenv_s +@ cdecl _searchenv_s(str str ptr long) # stub _seh_longjmp_unwind4 @ stdcall -i386 _seh_longjmp_unwind(ptr) @ cdecl _set_SSE2_enable(long) MSVCRT__set_SSE2_enable @@ -1154,7 +1154,7 @@ @ varargs _wscanf_l(wstr ptr) MSVCRT__wscanf_l @ varargs _wscanf_s_l(wstr ptr) MSVCRT__wscanf_s_l @ cdecl _wsearchenv(wstr wstr ptr) -# stub _wsearchenv_s +@ cdecl _wsearchenv_s(wstr wstr ptr long) @ cdecl _wsetlocale(long wstr) MSVCRT__wsetlocale @ varargs _wsopen (wstr long long) MSVCRT__wsopen # stub _wsopen_s

1 0

Eric Pouech : msvcrt: Implemented _putwch.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: d36cfcf48a788c389e6b5df984db95e5f06394db URL: http://source.winehq.org/git/wine.git/?a=commit;h=d36cfcf48a788c389e6b5df98… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Nov 2 22:03:22 2010 +0100 msvcrt: Implemented _putwch. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/file.c | 8 ++++++++ dlls/msvcrt/msvcrt.spec | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index cace374..28f261e 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1037,7 +1037,7 @@ @ cdecl _putenv(str) msvcrt._putenv @ cdecl _putenv_s(str str) msvcrt._putenv_s @ cdecl _putw(long ptr) msvcrt._putw -@ stub _putwch +@ cdecl _putwch(long) msvcrt._putwch @ stub _putwch_nolock @ cdecl _putws(wstr) msvcrt._putws @ stub _pwctype diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 9ac3094..2fda832 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -885,7 +885,7 @@ @ cdecl _putenv(str) msvcrt._putenv @ cdecl _putenv_s(str str) msvcrt._putenv_s @ cdecl _putw(long ptr) msvcrt._putw -@ stub _putwch +@ cdecl _putwch(long) msvcrt._putwch @ stub _putwch_nolock @ cdecl _putws(wstr) msvcrt._putws @ stub _pwctype diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index a307afe..51aa66c 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -871,7 +871,7 @@ @ cdecl _putenv(str) msvcrt._putenv @ cdecl _putenv_s(str str) msvcrt._putenv_s @ cdecl _putw(long ptr) msvcrt._putw -@ stub _putwch +@ cdecl _putwch(long) msvcrt._putwch @ stub _putwch_nolock @ cdecl _putws(wstr) msvcrt._putws @ stub _pwctype diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 8902bdd..7074120 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3130,6 +3130,14 @@ int CDECL MSVCRT_putchar(int c) } /********************************************************************* + * _putwch (MSVCRT.@) + */ +int CDECL MSVCRT__putwch(int c) +{ + return MSVCRT_fputwc(c, MSVCRT_stdout); +} + +/********************************************************************* * puts (MSVCRT.@) */ int CDECL MSVCRT_puts(const char *s) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 0f9fdb4..07c1981 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -819,7 +819,7 @@ @ cdecl _putenv(str) @ cdecl _putenv_s(str str) @ cdecl _putw(long ptr) MSVCRT__putw -# stub _putwch +@ cdecl _putwch(long) MSVCRT__putwch @ cdecl _putws(wstr) # extern _pwctype @ cdecl _read(long ptr long) MSVCRT__read

1 0

Paul Vriens : msacm32: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: c99e151bc0a6b33f818cb442529e8a003fb72f8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=c99e151bc0a6b33f818cb4425… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 2 21:22:45 2010 +0100 msacm32: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/msacm32/Makefile.in | 1 + dlls/msacm32/msacm_Sr.rc | 88 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+), 0 deletions(-) diff --git a/dlls/msacm32/Makefile.in b/dlls/msacm32/Makefile.in index c86c3fe..a8e51e1 100644 --- a/dlls/msacm32/Makefile.in +++ b/dlls/msacm32/Makefile.in @@ -31,6 +31,7 @@ RC_SRCS = \ msacm_Ro.rc \ msacm_Ru.rc \ msacm_Si.rc \ + msacm_Sr.rc \ msacm_Sv.rc \ msacm_Tr.rc \ msacm_Uk.rc \ diff --git a/dlls/msacm32/msacm_Sr.rc b/dlls/msacm32/msacm_Sr.rc new file mode 100644 index 0000000..d402555 --- /dev/null +++ b/dlls/msacm32/msacm_Sr.rc @@ -0,0 +1,88 @@ +/* + * Serbian resource file for MS ACM + * + * Copyright 2000 Eric Pouech + * Copyright 2010 Đorđe Vasiljević + * + * 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 "wineacm.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Избор звука" +FONT 8, "MS Shell Dlg" +BEGIN + + LTEXT "&Назив:", -1, 5, 5, 115, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + PUSHBUTTON "&Сачувај као...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 + PUSHBUTTON "&Уклони", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + + LTEXT "&Формат:", -1, 5, 41, 44, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Особине:", -1, 5, 59, 44, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + + DEFPUSHBUTTON "У реду", IDOK, 48, 80, 40, 14 + PUSHBUTTON "Откажи", IDCANCEL, 92, 80, 40, 14 + PUSHBUTTON "&Помоћ", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + +END + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +DLG_ACMFORMATCHOOSE_ID DIALOG 10, 20, 225, 100 +STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU +CAPTION "Izbor zvuka" +FONT 8, "MS Shell Dlg" +BEGIN + + LTEXT "&Naziv:", -1, 5, 5, 115, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_CUSTOM, 5, 15, 115, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + PUSHBUTTON "&Sačuvaj kao...", IDD_ACMFORMATCHOOSE_BTN_SETNAME, 125, 14, 45, 14 + PUSHBUTTON "&Ukloni", IDD_ACMFORMATCHOOSE_BTN_DELNAME, 175, 14, 45, 14 + + LTEXT "&Format:", -1, 5, 41, 44, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMATTAG, 50, 39, 170, 60, + CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_TABSTOP + + LTEXT "&Osobine:", -1, 5, 59, 44, 8, NOT WS_GROUP + + COMBOBOX IDD_ACMFORMATCHOOSE_CMB_FORMAT, 50, 57, 170, 60, + CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP + + DEFPUSHBUTTON "U redu", IDOK, 48, 80, 40, 14 + PUSHBUTTON "Otkaži", IDCANCEL, 92, 80, 40, 14 + PUSHBUTTON "&Pomoć", IDD_ACMFORMATCHOOSE_BTN_HELP, 136, 80, 40, 14 + +END

1 0

Paul Vriens : msrle32: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: 138a5d678f7323f1b04a4dfbea3bba32df3b4c14 URL: http://source.winehq.org/git/wine.git/?a=commit;h=138a5d678f7323f1b04a4dfbe… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 2 21:24:34 2010 +0100 msrle32: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/msrle32/Makefile.in | 1 + dlls/msrle32/msrle_Sr.rc | 42 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 0 deletions(-) diff --git a/dlls/msrle32/Makefile.in b/dlls/msrle32/Makefile.in index e4ed7db..51deb33 100644 --- a/dlls/msrle32/Makefile.in +++ b/dlls/msrle32/Makefile.in @@ -25,6 +25,7 @@ RC_SRCS = \ msrle_Ro.rc \ msrle_Ru.rc \ msrle_Si.rc \ + msrle_Sr.rc \ msrle_Sv.rc \ msrle_Tr.rc \ msrle_Uk.rc diff --git a/dlls/msrle32/msrle_Sr.rc b/dlls/msrle32/msrle_Sr.rc new file mode 100644 index 0000000..b9d4b0c --- /dev/null +++ b/dlls/msrle32/msrle_Sr.rc @@ -0,0 +1,42 @@ +/* + * Serbian resource file for MS-RLE + * + * Copyright 2002 Michael Günnewig + * Copyright 2010 Đorđe Vasiljević + * + * 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 "msrle_private.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +STRINGTABLE +{ + IDS_NAME "WINE-MS-RLE" + IDS_DESCRIPTION "Wine MS-RLE видео кодек" + IDS_ABOUT "Wine MS-RLE видео кодек\nCopyright ©2002 by Michael Günnewig" +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +STRINGTABLE +{ + IDS_NAME "WINE-MS-RLE" + IDS_DESCRIPTION "Wine MS-RLE video kodek" + IDS_ABOUT "Wine MS-RLE video kodek\nCopyright ©2002 by Michael Günnewig" +}

1 0

Paul Vriens : sane.ds: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: f0b6e56cc2f762c5555ec03d45c1f90215fc3f87 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0b6e56cc2f762c5555ec03d4… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 2 22:05:59 2010 +0100 sane.ds: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/sane.ds/Makefile.in | 1 + dlls/sane.ds/sane_Sr.rc | 66 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+), 0 deletions(-) diff --git a/dlls/sane.ds/Makefile.in b/dlls/sane.ds/Makefile.in index c2d0c29..30ae8b6 100644 --- a/dlls/sane.ds/Makefile.in +++ b/dlls/sane.ds/Makefile.in @@ -29,6 +29,7 @@ RC_SRCS = \ sane_Ro.rc \ sane_Ru.rc \ sane_Si.rc \ + sane_Sr.rc \ sane_Sv.rc \ sane_Uk.rc \ sane_Zh.rc diff --git a/dlls/sane.ds/sane_Sr.rc b/dlls/sane.ds/sane_Sr.rc new file mode 100644 index 0000000..5657c13 --- /dev/null +++ b/dlls/sane.ds/sane_Sr.rc @@ -0,0 +1,66 @@ +/* + * Serbian resources for Twain + * + * Copyright 2006 CodeWeavers, Aric Stewart + * Copyright 2010 Đorđe Vasiljević + * + * 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 "resource.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +IDD_DIALOG1 DIALOG 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "Претрага" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Претраживање...",IDC_STATIC,5,19,176,8, SS_CENTER +END + +STRINGTABLE +{ + 0 "" + 1 "px" + 2 "b" + 3 "мм" + 4 "тпи" + 5 "%" + 6 "нс" +} + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +IDD_DIALOG1 DIALOG 0, 0, 186, 46 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE | DS_CENTER | DS_SETFOREGROUND +CAPTION "Pretraga" +FONT 8, "MS Sans Serif" +BEGIN + LTEXT "Pretraživanje...",IDC_STATIC,5,19,176,8, SS_CENTER +END + +STRINGTABLE +{ + 0 "" + 1 "px" + 2 "b" + 3 "mm" + 4 "tpi" + 5 "%" + 6 "ns" +}

1 0

Paul Vriens : serialui: Add the Serbian (Latin and Cyrillic) translation.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: b1316b4de9e99ad08a8a8340d9fe87de8752fce6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b1316b4de9e99ad08a8a8340d… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Tue Nov 2 22:07:50 2010 +0100 serialui: Add the Serbian (Latin and Cyrillic) translation. Translation by Đorđe Vasiljević. --- dlls/serialui/Makefile.in | 1 + dlls/serialui/Sr.rc | 70 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 71 insertions(+), 0 deletions(-) diff --git a/dlls/serialui/Makefile.in b/dlls/serialui/Makefile.in index 12956c7..1812296 100644 --- a/dlls/serialui/Makefile.in +++ b/dlls/serialui/Makefile.in @@ -27,6 +27,7 @@ RC_SRCS = \ Ro.rc \ Ru.rc \ Si.rc \ + Sr.rc \ Sv.rc \ Tr.rc \ Uk.rc \ diff --git a/dlls/serialui/Sr.rc b/dlls/serialui/Sr.rc new file mode 100644 index 0000000..d087247 --- /dev/null +++ b/dlls/serialui/Sr.rc @@ -0,0 +1,70 @@ +/* + * Copyright 2000 Mike McCormack + * Copyright 2010 Đorđe Vasiljević + * + * 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 "serialui.h" + +#pragma code_page(65001) + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC + +IDD_SERIALUICONFIG DIALOG 0, 0, 160, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Својства за " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Број бауда", -1,5,20,55,10 + COMBOBOX IDC_BAUD, 60, 20, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Једнакост", -1,5,40,55,10 + COMBOBOX IDC_PARITY, 60, 40, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Контрола протока", -1,5,60,55,10 + COMBOBOX IDC_FLOW, 60, 60, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Битови података", -1,5,80,55,10 + COMBOBOX IDC_DATA, 60, 80, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Зауставно време", -1,5,100,55,10 + COMBOBOX IDC_STOP, 60, 100, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "У реду", IDOK,30,138,50,14 + PUSHBUTTON "Откажи", IDCANCEL,85,138,50,14 + /* these two buttons are for testing Get/SetDefaultCommConfig */ + /* PUSHBUTTON "GetDefault", ID_GETDEFAULT,30,115,50,14 */ + /* PUSHBUTTON "SetDefault", ID_SETDEFAULT,85,115,50,14 */ +END + +LANGUAGE LANG_SERBIAN, SUBLANG_SERBIAN_LATIN + +IDD_SERIALUICONFIG DIALOG 0, 0, 160, 159 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_VISIBLE +CAPTION "Svojstva za " +FONT 8, "MS Shell Dlg" +BEGIN + LTEXT "Broj bauda", -1,5,20,55,10 + COMBOBOX IDC_BAUD, 60, 20, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Jednakost", -1,5,40,55,10 + COMBOBOX IDC_PARITY, 60, 40, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Kontrola protoka", -1,5,60,55,10 + COMBOBOX IDC_FLOW, 60, 60, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Bitovi podataka", -1,5,80,55,10 + COMBOBOX IDC_DATA, 60, 80, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + LTEXT "Zaustavno vreme", -1,5,100,55,10 + COMBOBOX IDC_STOP, 60, 100, 90, 36, CBS_DROPDOWNLIST|CBS_AUTOHSCROLL|WS_BORDER | WS_VSCROLL | WS_TABSTOP + DEFPUSHBUTTON "U redu", IDOK,30,138,50,14 + PUSHBUTTON "Otkaži", IDCANCEL,85,138,50,14 + /* these two buttons are for testing Get/SetDefaultCommConfig */ + /* PUSHBUTTON "GetDefault", ID_GETDEFAULT,30,115,50,14 */ + /* PUSHBUTTON "SetDefault", ID_SETDEFAULT,85,115,50,14 */ +END

1 0

Yaron Shahrabani : progman: Added Hebrew translation.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: 16047ebc391b3312c0ecef8045b7dc0087d69112 URL: http://source.winehq.org/git/wine.git/?a=commit;h=16047ebc391b3312c0ecef804… Author: Yaron Shahrabani <sh.yaron(a)gmail.com> Date: Mon Nov 1 23:17:07 2010 +0200 progman: Added Hebrew translation. --- programs/progman/He.rc | 223 ++++++++++++++++++++++++++++++++++++++++++ programs/progman/Makefile.in | 1 + 2 files changed, 224 insertions(+), 0 deletions(-) diff --git a/programs/progman/He.rc b/programs/progman/He.rc new file mode 100644 index 0000000..3311acd --- /dev/null +++ b/programs/progman/He.rc @@ -0,0 +1,223 @@ +/* + * Program Manager + * + * Copyright 1996 Ulrich Schmid + * Copyright 2002 Sylvain Petreolle + * Copyright 2010 Yaron Shahrabani <sh.yaron(a)gmail.com> + * + * 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 "progman.h" + +#pragma code_page(65001) + +LANGUAGE LANG_HEBREW, SUBLANG_DEFAULT + +/* Menu */ + +MAIN_MENU MENU +{ + POPUP "&קובץ" { + MENUITEM "&חדש...", PM_NEW + MENUITEM "&פתיחה\tEnter", PM_OPEN + MENUITEM "ה&עברה...\tF7", PM_MOVE, GRAYED + MENUITEM "הע&תקה...\tF8", PM_COPY, GRAYED + MENUITEM "&מחיקה\tEntf", PM_DELETE + MENUITEM "מא&פיינים...\tAlt+Enter", PM_ATTRIBUTES + MENUITEM SEPARATOR + MENUITEM "הפע&לה...", PM_EXECUTE + MENUITEM SEPARATOR + MENUITEM "י&ציאה מ־Windows...", PM_EXIT + } + POPUP "&אפשרויות" { + MENUITEM "&סידור אוטומטי", PM_AUTO_ARRANGE + MENUITEM "מ&זעור עם ההפעלה", PM_MIN_ON_RUN + MENUITEM "&שמירת ההגדרות עם היציאה", PM_SAVE_SETTINGS + } + POPUP "&חלונות" { + MENUITEM "&חופפים\tShift+F5", PM_OVERLAP + MENUITEM "&זה לצד זה\tShift+F4", PM_SIDE_BY_SIDE + MENUITEM "&סידור סמלים", PM_ARRANGE + } + +POPUP "ע&זרה" { + MENUITEM "&תכנים", PM_CONTENTS + MENUITEM "&חיפוש...", PM_SEARCH + MENUITEM SEPARATOR + MENUITEM "&עזרה על העזרה", PM_HELPONHELP + MENUITEM "&מדריך", PM_TUTORIAL + MENUITEM SEPARATOR + MENUITEM "על &אודות Wine", PM_ABOUT_WINE + } +} + +/* Dialog `New' */ + +DIALOG_NEW DIALOG 0, 0, 170, 65 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "חדשה" +{ +RADIOBUTTON "", PM_NEW_GROUP, 10, 15, 10, 15 +LTEXT "&קבוצת תכניות", -1, 20, 18, 80, 15 +RADIOBUTTON "", PM_NEW_PROGRAM, 10, 35, 10, 15 +LTEXT "&תכנית", -1, 20, 38, 80, 15 +DEFPUSHBUTTON "אישור", IDOK, 105, 5, 60, 15, WS_TABSTOP +PUSHBUTTON "ביטול", IDCANCEL, 105, 25, 60, 15, WS_TABSTOP +PUSHBUTTON "ע&זרה", PM_HELP, 105, 45, 60, 15, WS_TABSTOP +} + +/* Dialog `Move' */ + +DIALOG_MOVE DIALOG 0, 0, 250, 65 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "העברת תכנית" +{ +LTEXT "העברת תכנית:", -1, 5, 5, 90, 15 +LTEXT "", PM_PROGRAM, 95, 5, 90, 15 +LTEXT "מהקבוצה:", -1, 5, 13, 90, 15 +LTEXT "", PM_FROM_GROUP, 95, 13, 90, 15 +LTEXT "&אל הקבוצה:", PM_TO_GROUP_TXT, 5, 28, 140, 15 +COMBOBOX PM_TO_GROUP, 5, 38, 140, 50, WS_TABSTOP | CBS_DROPDOWNLIST +DEFPUSHBUTTON "אישור", IDOK, 185, 5, 60, 15, WS_TABSTOP +PUSHBUTTON "ביטול", IDCANCEL, 185, 25, 60, 15, WS_TABSTOP +PUSHBUTTON "ע&זרה", PM_HELP, 185, 45, 60, 15, WS_TABSTOP +} + +/* Dialog `Copy' */ + +DIALOG_COPY DIALOG 0, 0, 250, 65 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "העתקת תכנית" +{ +LTEXT "העתקת תכנית:", -1, 5, 5, 90, 15 +LTEXT "", PM_PROGRAM, 95, 5, 90, 15 +LTEXT "מהקבוצה:", -1, 5, 13, 90, 15 +LTEXT "", PM_FROM_GROUP, 95, 13, 90, 15 +LTEXT "&אל הקבוצה:", PM_TO_GROUP_TXT, 5, 28, 140, 15 +COMBOBOX PM_TO_GROUP, 5, 38, 140, 50, WS_TABSTOP | CBS_DROPDOWNLIST +DEFPUSHBUTTON "אישור", IDOK, 185, 5, 60, 15, WS_TABSTOP +PUSHBUTTON "ביטול", IDCANCEL, 185, 25, 60, 15, WS_TABSTOP +PUSHBUTTON "ע&זרה", PM_HELP, 185, 45, 60, 15, WS_TABSTOP +} + +/* Dialog `Group attributes' */ + +DIALOG_GROUP DIALOG 0, 0, 230, 65 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "מאפייני קבוצת תכניות" +{ +LTEXT "&תיאור:", PM_DESCRIPTION_TXT, 05, 18, 50, 10 +EDITTEXT PM_DESCRIPTION, 60, 18, 90, 15, WS_TABSTOP +LTEXT "&קובץ קבוצה:", PM_FILE_TXT, 05, 38, 50, 10 +EDITTEXT PM_FILE, 60, 38, 90, 15, WS_TABSTOP +DEFPUSHBUTTON "אישור", IDOK, 155, 5, 60, 15, WS_TABSTOP +PUSHBUTTON "ביטול", IDCANCEL, 155, 25, 60, 15, WS_TABSTOP +PUSHBUTTON "ע&זרה", PM_HELP, 155, 45, 60, 15, WS_TABSTOP +} + +/* Dialog `Program attributes' */ + +DIALOG_PROGRAM DIALOG 0, 0, 250, 105 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "מאפייני התכנית" +{ +LTEXT "&תיאור:", PM_DESCRIPTION_TXT, 05, 10, 60, 10 +EDITTEXT PM_DESCRIPTION, 80, 10, 90, 15, WS_TABSTOP +LTEXT "&שורת הפקודה:", PM_COMMAND_LINE_TXT, 05, 25, 60, 10 +EDITTEXT PM_COMMAND_LINE, 80, 25, 90, 15, WS_TABSTOP +LTEXT "&תיקיית ההפעלה:", PM_DIRECTORY_TXT, 05, 40, 60, 10 +EDITTEXT PM_DIRECTORY, 80, 40, 90, 15, WS_TABSTOP +LTEXT "&צירוף מקשים:", PM_HOT_KEY_TXT, 05, 55, 60, 10 +EDITTEXT PM_HOT_KEY, 80, 55, 90, 15, WS_TABSTOP +ICON "", PM_ICON, 20, 70 +CHECKBOX "", PM_SYMBOL, 80, 75, 10, 10, WS_TABSTOP +LTEXT "מ&זעור בעת ההפעלה", -1, 95, 75, 75, 10 +DEFPUSHBUTTON "אישור", IDOK, 185, 5, 60, 15, WS_TABSTOP +PUSHBUTTON "ביטול", IDCANCEL, 185, 25, 60, 15, WS_TABSTOP +PUSHBUTTON "&עיון...", PM_BROWSE, 185, 45, 60, 15, WS_TABSTOP +PUSHBUTTON "החלפת ה&סמל...", PM_OTHER_SYMBOL, 185, 65, 60, 15, WS_TABSTOP +PUSHBUTTON "ע&זרה", PM_HELP, 185, 85, 60, 15, WS_TABSTOP +} + +/* Dialog `Symbol' */ + +DIALOG_SYMBOL DIALOG 0, 0, 200, 85 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "שינוי הסמל" +{ +LTEXT "&שם הקובץ:", PM_ICON_FILE_TXT, 5, 15, 40, 10 +EDITTEXT PM_ICON_FILE, 45, 15, 85, 15, WS_TABSTOP +LTEXT "הסמל ה&נוכחי:", PM_SYMBOL_LIST_TXT, 5, 30, 125, 10 +COMBOBOX PM_SYMBOL_LIST, 5, 40, 125, 50, + CBS_DROPDOWNLIST | CBS_AUTOHSCROLL | CBS_OWNERDRAWFIXED | WS_TABSTOP +DEFPUSHBUTTON "אישור", IDOK, 135, 5, 60, 15, WS_TABSTOP +PUSHBUTTON "ביטול", IDCANCEL, 135, 25, 60, 15, WS_TABSTOP +PUSHBUTTON "&עיון...", PM_BROWSE, 135, 45, 60, 15, WS_TABSTOP +PUSHBUTTON "ע&זרה", PM_HELP, 135, 65, 60, 15, WS_TABSTOP +} + +/* Dialog `Execute' */ + +DIALOG_EXECUTE DIALOG 0, 0, 200, 85 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +EXSTYLE WS_EX_LAYOUTRTL +CAPTION "הפעלת תכנית" +{ +LTEXT "&שורת הפקודה:", -1, 05, 15, 120, 10 +EDITTEXT PM_COMMAND, 05, 25, 120, 15, WS_TABSTOP +CHECKBOX "", PM_SYMBOL, 05, 45, 10, 10, WS_TABSTOP +LTEXT "מ&זעור בעת ההפעלה", -1, 20, 45, 120, 10 +DEFPUSHBUTTON "אישור", IDOK, 135, 5, 60, 15, WS_TABSTOP +PUSHBUTTON "ביטול", IDCANCEL, 135, 25, 60, 15, WS_TABSTOP +PUSHBUTTON "&עיון...", PM_BROWSE, 135, 45, 60, 15, WS_TABSTOP +PUSHBUTTON "ע&זרה", PM_HELP, 135, 65, 60, 15, WS_TABSTOP +} + +/* Strings */ + +STRINGTABLE +{ +IDS_PROGRAM_MANAGER, "Program Manager" +IDS_ERROR, "ERROR" +IDS_WARNING, "WARNING" +IDS_INFO, "Information" +IDS_DELETE, "Delete" +IDS_DELETE_GROUP_s, "Delete group `%s' ?" +IDS_DELETE_PROGRAM_s, "Delete program `%s' ?" +IDS_NOT_IMPLEMENTED, "Not implemented" +IDS_FILE_READ_ERROR_s, "Error reading `%s'." +IDS_FILE_WRITE_ERROR_s, "Error writing `%s'." +IDS_GRPFILE_READ_ERROR_s, "\ +The group file `%s' cannot be opened.\n\ +Should it be tried further on?" +IDS_OUT_OF_MEMORY, "Out of memory." +IDS_WINHELP_ERROR, "Help not available." +IDS_UNKNOWN_FEATURE_s, "Unknown feature in %s" +IDS_FILE_NOT_OVERWRITTEN_s, "File `%s' exists. Not overwritten." +IDS_SAVE_GROUP_AS_s, "Save group as `%s to prevent overwriting original files." +IDS_NO_HOT_KEY, "None" +IDS_ALL_FILES, "All files (*.*)" +IDS_PROGRAMS, "Programs" +IDS_LIBRARIES_DLL, "Libraries (*.dll)" +IDS_SYMBOL_FILES, "Icon files" +IDS_SYMBOLS_ICO, "Icons (*.ico)" +} diff --git a/programs/progman/Makefile.in b/programs/progman/Makefile.in index 6ee9f81..a6c6a32 100644 --- a/programs/progman/Makefile.in +++ b/programs/progman/Makefile.in @@ -17,6 +17,7 @@ RC_SRCS = \ En.rc \ Es.rc \ Fr.rc \ + He.rc \ Hu.rc \ It.rc \ Ko.rc \

1 0