November 2010 - Wine-commits

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

03 Nov '10

Module: wine Branch: master Commit: 71200a9818dbdf60610e7e6e1eff8ad668df0851 URL: http://source.winehq.org/git/wine.git/?a=commit;h=71200a9818dbdf60610e7e6e1… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Nov 2 22:03:47 2010 +0100 msvcrt: Implemented (_)wcserror. --- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr70/msvcr70.spec | 4 +- dlls/msvcr71/msvcr71.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/errno.c | 46 +++++++++++++++++++++++++++++++++++++++++++ dlls/msvcrt/main.c | 1 + dlls/msvcrt/msvcrt.h | 1 + dlls/msvcrt/msvcrt.spec | 4 +- 9 files changed, 60 insertions(+), 12 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index e6fadd6..8789861 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -482,7 +482,7 @@ @ extern __unguarded_readlc_active msvcrt.__unguarded_readlc_active @ stub __vswprintf_l @ extern __wargv msvcrt.__wargv -@ stub __wcserror +@ cdecl __wcserror(wstr) msvcrt.__wcserror @ stub __wcserror_s @ stub __wcsncnt @ cdecl __wgetmainargs(ptr ptr ptr long ptr) msvcrt.__wgetmainargs @@ -1284,7 +1284,7 @@ @ cdecl _wcreat(wstr long) msvcrt._wcreat @ stub _wcscoll_l @ cdecl _wcsdup(wstr) msvcrt._wcsdup -@ stub _wcserror +@ cdecl _wcserror(long) msvcrt._wcserror @ stub _wcserror_s @ stub _wcsftime_l @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 52156b7..307ae09 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -206,7 +206,7 @@ @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) msvcrt.__unDNameEx @ extern __unguarded_readlc_active msvcrt.__unguarded_readlc_active @ extern __wargv msvcrt.__wargv -@ stub __wcserror +@ cdecl __wcserror(wstr) msvcrt.__wcserror @ cdecl __wgetmainargs(ptr ptr ptr long ptr) msvcrt.__wgetmainargs @ extern __winitenv msvcrt.__winitenv @ cdecl _abnormal_termination() msvcrt._abnormal_termination @@ -595,7 +595,7 @@ @ extern _wcmdln msvcrt._wcmdln @ cdecl _wcreat(wstr long) msvcrt._wcreat @ cdecl _wcsdup(wstr) msvcrt._wcsdup -@ stub _wcserror +@ cdecl _wcserror(long) msvcrt._wcserror @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll @ cdecl _wcslwr(wstr) msvcrt._wcslwr diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 33db3a6..fc8491d 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -201,7 +201,7 @@ @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) msvcrt.__unDNameEx @ extern __unguarded_readlc_active msvcrt.__unguarded_readlc_active @ extern __wargv msvcrt.__wargv -@ stub __wcserror +@ cdecl __wcserror(wstr) msvcrt.__wcserror @ cdecl __wgetmainargs(ptr ptr ptr long ptr) msvcrt.__wgetmainargs @ extern __winitenv msvcrt.__winitenv @ cdecl _abnormal_termination() msvcrt._abnormal_termination @@ -591,7 +591,7 @@ @ extern _wcmdln msvcrt._wcmdln @ cdecl _wcreat(wstr long) msvcrt._wcreat @ cdecl _wcsdup(wstr) msvcrt._wcsdup -@ stub _wcserror +@ cdecl _wcserror(long) msvcrt._wcserror @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp @ cdecl _wcsicoll(wstr wstr) msvcrt._wcsicoll @ cdecl _wcslwr(wstr) msvcrt._wcslwr diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 3953b5c..1ca1b19 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -306,7 +306,7 @@ @ extern __unguarded_readlc_active msvcrt.__unguarded_readlc_active @ stub __vswprintf_l @ extern __wargv msvcrt.__wargv -@ stub __wcserror +@ cdecl __wcserror(wstr) msvcrt.__wcserror @ stub __wcserror_s @ stub __wcsncnt @ cdecl __wgetmainargs(ptr ptr ptr long ptr) msvcrt.__wgetmainargs @@ -1137,7 +1137,7 @@ @ cdecl _wcreat(wstr long) msvcrt._wcreat @ stub _wcscoll_l @ cdecl _wcsdup(wstr) msvcrt._wcsdup -@ stub _wcserror +@ cdecl _wcserror(long) msvcrt._wcserror @ stub _wcserror_s @ stub _wcsftime_l @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index f9188e3..8d38a07 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -298,7 +298,7 @@ @ extern __unguarded_readlc_active msvcrt.__unguarded_readlc_active @ stub __vswprintf_l @ extern __wargv msvcrt.__wargv -@ stub __wcserror +@ cdecl __wcserror(wstr) msvcrt.__wcserror @ stub __wcserror_s @ stub __wcsncnt @ cdecl __wgetmainargs(ptr ptr ptr long ptr) msvcrt.__wgetmainargs @@ -1124,7 +1124,7 @@ @ cdecl _wcreat(wstr long) msvcrt._wcreat @ stub _wcscoll_l @ cdecl _wcsdup(wstr) msvcrt._wcsdup -@ stub _wcserror +@ cdecl _wcserror(long) msvcrt._wcserror @ stub _wcserror_s @ stub _wcsftime_l @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 266b6db..0457869 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -27,6 +27,7 @@ #include "windef.h" #include "winternl.h" #include "msvcrt.h" +#include "winnls.h" #include "excpt.h" #include "wine/debug.h" @@ -326,6 +327,51 @@ void CDECL MSVCRT_perror(const char* str) MSVCRT__write( 2, "\n", 1 ); } +/********************************************************************* + * _wcserror (MSVCRT.@) + */ +MSVCRT_wchar_t* CDECL _wcserror(int err) +{ + thread_data_t *data = msvcrt_get_thread_data(); + + if (!data->wcserror_buffer) + if (!(data->wcserror_buffer = MSVCRT_malloc(256 * sizeof(MSVCRT_wchar_t)))) return NULL; + + if (err < 0 || err > MSVCRT__sys_nerr) err = MSVCRT__sys_nerr; + MultiByteToWideChar(CP_ACP, 0, MSVCRT__sys_errlist[err], -1, data->wcserror_buffer, 256); + return data->wcserror_buffer; +} + +/********************************************************************** + * __wcserror (MSVCRT.@) + */ +MSVCRT_wchar_t* CDECL __wcserror(const MSVCRT_wchar_t* str) +{ + thread_data_t *data = msvcrt_get_thread_data(); + int err; + static const WCHAR colonW[] = {':', ' ', '\0'}; + static const WCHAR nlW[] = {'\n', '\0'}; + size_t len; + + if (!data->wcserror_buffer) + if (!(data->wcserror_buffer = MSVCRT_malloc(256 * sizeof(MSVCRT_wchar_t)))) return NULL; + + err = data->thread_errno; + if (err < 0 || err > MSVCRT__sys_nerr) err = MSVCRT__sys_nerr; + + if (str && *str) + { + lstrcpyW(data->wcserror_buffer, str); + lstrcatW(data->wcserror_buffer, colonW); + } + else data->wcserror_buffer[0] = '\0'; + len = lstrlenW(data->wcserror_buffer); + MultiByteToWideChar(CP_ACP, 0, MSVCRT__sys_errlist[err], -1, data->wcserror_buffer + len, 256 - len); + lstrcatW(data->wcserror_buffer, nlW); + + return data->wcserror_buffer; +} + /****************************************************************************** * _set_error_mode (MSVCRT.@) * diff --git a/dlls/msvcrt/main.c b/dlls/msvcrt/main.c index 323f8b7..ac24270 100644 --- a/dlls/msvcrt/main.c +++ b/dlls/msvcrt/main.c @@ -70,6 +70,7 @@ static inline void msvcrt_free_tls_mem(void) HeapFree(GetProcessHeap(),0,tls->asctime_buffer); HeapFree(GetProcessHeap(),0,tls->wasctime_buffer); HeapFree(GetProcessHeap(),0,tls->strerror_buffer); + HeapFree(GetProcessHeap(),0,tls->wcserror_buffer); MSVCRT__free_locale(tls->locale); } HeapFree(GetProcessHeap(), 0, tls); diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index c36b5bd..2e8263e 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -116,6 +116,7 @@ struct __thread_data { MSVCRT_wchar_t *wasctime_buffer; /* buffer for wasctime */ struct MSVCRT_tm time_buffer; /* buffer for localtime/gmtime */ char *strerror_buffer; /* buffer for strerror */ + MSVCRT_wchar_t *wcserror_buffer; /* buffer for wcserror */ int fpecode; MSVCRT_terminate_function terminate_handler; MSVCRT_unexpected_function unexpected_handler; diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index f6baa10..d1a5c59 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -263,7 +263,7 @@ @ cdecl __unDNameEx(ptr str long ptr ptr ptr long) @ extern __unguarded_readlc_active MSVCRT___unguarded_readlc_active @ extern __wargv MSVCRT___wargv -# stub __wcserror +@ cdecl __wcserror(wstr) # stub __wcserror_s # stub __wcsncnt @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @@ -1057,7 +1057,7 @@ # stub _wcscoll_l @ cdecl _wcsdup(wstr) # stub _wcsdup_dbg -# stub _wcserror +@ cdecl _wcserror(long) # stub _wcserror_s # stub _wcsftime_l @ cdecl _wcsicmp(wstr wstr) ntdll._wcsicmp

1 0

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

03 Nov '10

Module: wine Branch: master Commit: 5437c72fe19cf99e22e63c924c78bf9b7c195096 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5437c72fe19cf99e22e63c924… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Nov 2 22:03:53 2010 +0100 msvcrt: Implemented (_)wcserror_s. --- dlls/msvcr100/msvcr100.spec | 4 +- dlls/msvcr80/msvcr80.spec | 4 +- dlls/msvcr90/msvcr90.spec | 4 +- dlls/msvcrt/errno.c | 66 ++++++++++++++++++++++++++++++++---------- dlls/msvcrt/msvcrt.spec | 4 +- 5 files changed, 58 insertions(+), 24 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 8789861..4b5300f 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -483,7 +483,7 @@ @ stub __vswprintf_l @ extern __wargv msvcrt.__wargv @ cdecl __wcserror(wstr) msvcrt.__wcserror -@ stub __wcserror_s +@ cdecl __wcserror_s(ptr long wstr) msvcrt.__wcserror_s @ stub __wcsncnt @ cdecl __wgetmainargs(ptr ptr ptr long ptr) msvcrt.__wgetmainargs @ extern __winitenv msvcrt.__winitenv @@ -1285,7 +1285,7 @@ @ stub _wcscoll_l @ cdecl _wcsdup(wstr) msvcrt._wcsdup @ cdecl _wcserror(long) msvcrt._wcserror -@ stub _wcserror_s +@ cdecl _wcserror_s(ptr long long) msvcrt._wcserror_s @ stub _wcsftime_l @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp @ stub _wcsicmp_l diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 1ca1b19..639c14d 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -307,7 +307,7 @@ @ stub __vswprintf_l @ extern __wargv msvcrt.__wargv @ cdecl __wcserror(wstr) msvcrt.__wcserror -@ stub __wcserror_s +@ cdecl __wcserror_s(ptr long wstr) msvcrt.__wcserror_s @ stub __wcsncnt @ cdecl __wgetmainargs(ptr ptr ptr long ptr) msvcrt.__wgetmainargs @ extern __winitenv msvcrt.__winitenv @@ -1138,7 +1138,7 @@ @ stub _wcscoll_l @ cdecl _wcsdup(wstr) msvcrt._wcsdup @ cdecl _wcserror(long) msvcrt._wcserror -@ stub _wcserror_s +@ cdecl _wcserror_s(ptr long long) msvcrt._wcserror_s @ stub _wcsftime_l @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp @ stub _wcsicmp_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8d38a07..19a0ec9 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -299,7 +299,7 @@ @ stub __vswprintf_l @ extern __wargv msvcrt.__wargv @ cdecl __wcserror(wstr) msvcrt.__wcserror -@ stub __wcserror_s +@ cdecl __wcserror_s(ptr long wstr) msvcrt.__wcserror_s @ stub __wcsncnt @ cdecl __wgetmainargs(ptr ptr ptr long ptr) msvcrt.__wgetmainargs @ extern __winitenv msvcrt.__winitenv @@ -1125,7 +1125,7 @@ @ stub _wcscoll_l @ cdecl _wcsdup(wstr) msvcrt._wcsdup @ cdecl _wcserror(long) msvcrt._wcserror -@ stub _wcserror_s +@ cdecl _wcserror_s(ptr long long) msvcrt._wcserror_s @ stub _wcsftime_l @ cdecl _wcsicmp(wstr wstr) msvcrt._wcsicmp @ stub _wcsicmp_l diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c index 0457869..70a895c 100644 --- a/dlls/msvcrt/errno.c +++ b/dlls/msvcrt/errno.c @@ -328,6 +328,21 @@ void CDECL MSVCRT_perror(const char* str) } /********************************************************************* + * _wcserror_s (MSVCRT.@) + */ +int CDECL _wcserror_s(MSVCRT_wchar_t* buffer, MSVCRT_size_t nc, int err) +{ + if (!MSVCRT_CHECK_PMT(buffer != NULL) || !MSVCRT_CHECK_PMT(nc > 0)) + { + _set_errno(MSVCRT_EINVAL); + return MSVCRT_EINVAL; + } + if (err < 0 || err > MSVCRT__sys_nerr) err = MSVCRT__sys_nerr; + MultiByteToWideChar(CP_ACP, 0, MSVCRT__sys_errlist[err], -1, buffer, nc); + return 0; +} + +/********************************************************************* * _wcserror (MSVCRT.@) */ MSVCRT_wchar_t* CDECL _wcserror(int err) @@ -336,38 +351,57 @@ MSVCRT_wchar_t* CDECL _wcserror(int err) if (!data->wcserror_buffer) if (!(data->wcserror_buffer = MSVCRT_malloc(256 * sizeof(MSVCRT_wchar_t)))) return NULL; - - if (err < 0 || err > MSVCRT__sys_nerr) err = MSVCRT__sys_nerr; - MultiByteToWideChar(CP_ACP, 0, MSVCRT__sys_errlist[err], -1, data->wcserror_buffer, 256); + _wcserror_s(data->wcserror_buffer, 256, err); return data->wcserror_buffer; } /********************************************************************** - * __wcserror (MSVCRT.@) + * __wcserror_s (MSVCRT.@) */ -MSVCRT_wchar_t* CDECL __wcserror(const MSVCRT_wchar_t* str) +int CDECL __wcserror_s(MSVCRT_wchar_t* buffer, MSVCRT_size_t nc, const MSVCRT_wchar_t* str) { - thread_data_t *data = msvcrt_get_thread_data(); int err; static const WCHAR colonW[] = {':', ' ', '\0'}; static const WCHAR nlW[] = {'\n', '\0'}; size_t len; - if (!data->wcserror_buffer) - if (!(data->wcserror_buffer = MSVCRT_malloc(256 * sizeof(MSVCRT_wchar_t)))) return NULL; - - err = data->thread_errno; + err = *MSVCRT__errno(); if (err < 0 || err > MSVCRT__sys_nerr) err = MSVCRT__sys_nerr; + len = MultiByteToWideChar(CP_ACP, 0, MSVCRT__sys_errlist[err], -1, NULL, 0) + 1 /* \n */; + if (str && *str) len += lstrlenW(str) + 2 /* ': ' */; + if (len > nc) + { + MSVCRT_INVALID_PMT("buffer[nc] is too small"); + _set_errno(MSVCRT_ERANGE); + return MSVCRT_ERANGE; + } if (str && *str) { - lstrcpyW(data->wcserror_buffer, str); - lstrcatW(data->wcserror_buffer, colonW); + lstrcpyW(buffer, str); + lstrcatW(buffer, colonW); } - else data->wcserror_buffer[0] = '\0'; - len = lstrlenW(data->wcserror_buffer); - MultiByteToWideChar(CP_ACP, 0, MSVCRT__sys_errlist[err], -1, data->wcserror_buffer + len, 256 - len); - lstrcatW(data->wcserror_buffer, nlW); + else buffer[0] = '\0'; + len = lstrlenW(buffer); + MultiByteToWideChar(CP_ACP, 0, MSVCRT__sys_errlist[err], -1, buffer + len, 256 - len); + lstrcatW(buffer, nlW); + + return 0; +} + +/********************************************************************** + * __wcserror (MSVCRT.@) + */ +MSVCRT_wchar_t* CDECL __wcserror(const MSVCRT_wchar_t* str) +{ + thread_data_t *data = msvcrt_get_thread_data(); + int err; + + if (!data->wcserror_buffer) + if (!(data->wcserror_buffer = MSVCRT_malloc(256 * sizeof(MSVCRT_wchar_t)))) return NULL; + + err = __wcserror_s(data->wcserror_buffer, 256, str); + if (err) FIXME("bad wcserror call (%d)\n", err); return data->wcserror_buffer; } diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index d1a5c59..10a8870 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -264,7 +264,7 @@ @ extern __unguarded_readlc_active MSVCRT___unguarded_readlc_active @ extern __wargv MSVCRT___wargv @ cdecl __wcserror(wstr) -# stub __wcserror_s +@ cdecl __wcserror_s(ptr long wstr) # stub __wcsncnt @ cdecl __wgetmainargs(ptr ptr ptr long ptr) @ extern __winitenv MSVCRT___winitenv @@ -1058,7 +1058,7 @@ @ cdecl _wcsdup(wstr) # stub _wcsdup_dbg @ cdecl _wcserror(long) -# stub _wcserror_s +@ cdecl _wcserror_s(ptr long long) # stub _wcsftime_l @ cdecl _wcsicmp(wstr wstr) ntdll._wcsicmp # stub _wcsicmp_l

1 0

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

03 Nov '10

Module: wine Branch: master Commit: 4b6d5fd583bfc39cd7d9877c333eddb7f2fa3e36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b6d5fd583bfc39cd7d9877c3… Author: Eric Pouech <eric.pouech(a)orange.fr> Date: Tue Nov 2 22:03:59 2010 +0100 msvcrt: Implemented wcstok_s. --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 24 ++++++++++++++++++------ 5 files changed, 22 insertions(+), 10 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 4b5300f..800fc31 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1653,7 +1653,7 @@ @ cdecl wcsstr(wstr wstr) msvcrt.wcsstr @ cdecl wcstod(wstr ptr) msvcrt.wcstod @ cdecl wcstok(wstr wstr) msvcrt.wcstok -@ stub wcstok_s +@ cdecl wcstok_s(ptr wstr ptr) msvcrt.wcstok_s @ cdecl wcstol(wstr ptr long) msvcrt.wcstol @ cdecl wcstombs(ptr ptr long) msvcrt.wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) msvcrt.wcstombs_s diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 639c14d..5dfce03 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1507,7 +1507,7 @@ @ cdecl wcsstr(wstr wstr) msvcrt.wcsstr @ cdecl wcstod(wstr ptr) msvcrt.wcstod @ cdecl wcstok(wstr wstr) msvcrt.wcstok -@ stub wcstok_s +@ cdecl wcstok_s(ptr wstr ptr) msvcrt.wcstok_s @ cdecl wcstol(wstr ptr long) msvcrt.wcstol @ cdecl wcstombs(ptr ptr long) msvcrt.wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) msvcrt.wcstombs_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 19a0ec9..2e63ad7 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1491,7 +1491,7 @@ @ cdecl wcsstr(wstr wstr) msvcrt.wcsstr @ cdecl wcstod(wstr ptr) msvcrt.wcstod @ cdecl wcstok(wstr wstr) msvcrt.wcstok -@ stub wcstok_s +@ cdecl wcstok_s(ptr wstr ptr) msvcrt.wcstok_s @ cdecl wcstol(wstr ptr long) msvcrt.wcstol @ cdecl wcstombs(ptr ptr long) msvcrt.wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) msvcrt.wcstombs_s diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 10a8870..70d28ce 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1457,7 +1457,7 @@ @ cdecl wcsstr(wstr wstr) ntdll.wcsstr @ cdecl wcstod(wstr ptr) MSVCRT_wcstod @ cdecl wcstok(wstr wstr) MSVCRT_wcstok -# stub wcstok_s +@ cdecl wcstok_s(ptr wstr ptr) @ cdecl wcstol(wstr ptr long) ntdll.wcstol @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstombs_s(ptr ptr long wstr long) MSVCRT_wcstombs_s diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 1042008..48831b2 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1368,25 +1368,37 @@ MSVCRT_wchar_t* CDECL MSVCRT_wcspbrk( const MSVCRT_wchar_t* str, const MSVCRT_wc } /********************************************************************* - * wcstok (MSVCRT.@) + * wcstok_s (MSVCRT.@) */ -MSVCRT_wchar_t * CDECL MSVCRT_wcstok( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *delim ) +MSVCRT_wchar_t * CDECL wcstok_s( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *delim, + MSVCRT_wchar_t **next_token ) { - thread_data_t *data = msvcrt_get_thread_data(); MSVCRT_wchar_t *ret; - if (!str) - if (!(str = data->wcstok_next)) return NULL; + if (!MSVCRT_CHECK_PMT(delim != NULL) || !MSVCRT_CHECK_PMT(next_token != NULL) || + !MSVCRT_CHECK_PMT(str != NULL || *next_token != NULL)) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return NULL; + } + if (!str) str = *next_token; while (*str && strchrW( delim, *str )) str++; if (!*str) return NULL; ret = str++; while (*str && !strchrW( delim, *str )) str++; if (*str) *str++ = 0; - data->wcstok_next = str; + *next_token = str; return ret; } +/********************************************************************* + * wcstok (MSVCRT.@) + */ +MSVCRT_wchar_t * CDECL MSVCRT_wcstok( MSVCRT_wchar_t *str, const MSVCRT_wchar_t *delim ) +{ + return wcstok_s(str, delim, &msvcrt_get_thread_data()->wcstok_next); +} /********************************************************************* * wctomb (MSVCRT.@)

1 0

Erich Hoover : include: Add macros for retrieving control message headers.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: cac2c176efd85c06b55dfebb623be66ad548b317 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cac2c176efd85c06b55dfebb6… Author: Erich Hoover <ehoover(a)mines.edu> Date: Tue Nov 2 16:35:04 2010 -0600 include: Add macros for retrieving control message headers. --- include/ws2def.h | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/include/ws2def.h b/include/ws2def.h index 00b10ab..8c1fc4a 100644 --- a/include/ws2def.h +++ b/include/ws2def.h @@ -78,4 +78,21 @@ typedef enum { ScopeLevelGlobal = 14 } SCOPE_LEVEL; +/* + * Macros for retrieving control message data returned by WSARecvMsg() + */ +#define WSA_CMSG_DATA(cmsg) ((UCHAR*)((WSACMSGHDR*)(cmsg)+1)) +#define WSA_CMSG_FIRSTHDR(mhdr) ((mhdr)->Control.len >= sizeof(WSACMSGHDR) ? (WSACMSGHDR *) (mhdr)->Control.buf : (WSACMSGHDR *) 0) +#define WSA_CMSG_ALIGN(len) (((len) + sizeof(SIZE_T) - 1) & ~(sizeof(SIZE_T) - 1)) +/* + * Next Header: If the response is too short (or the next message in the response + * is too short) then return NULL, otherwise return the next control message. + */ +#define WSA_CMSG_NXTHDR(mhdr,cmsg) \ + (!(cmsg) ? WSA_CMSG_FIRSTHDR(mhdr) : \ + ((mhdr)->Control.len < sizeof(WSACMSGHDR) ? NULL : \ + (((unsigned char*)(((WSACMSGHDR*)((unsigned char*)cmsg + WSA_CMSG_ALIGN(cmsg->cmsg_len)))+1) > ((unsigned char*)(mhdr)->Control.buf + (mhdr)->Control.len)) ? NULL : \ + (((unsigned char*)cmsg + WSA_CMSG_ALIGN(cmsg->cmsg_len)+WSA_CMSG_ALIGN(((WSACMSGHDR*)((unsigned char*)cmsg + WSA_CMSG_ALIGN(cmsg->cmsg_len)))->cmsg_len) > ((unsigned char*)(mhdr)->Control.buf + (mhdr)->Control.len)) ? NULL : \ + (WSACMSGHDR*)((unsigned char*)cmsg + WSA_CMSG_ALIGN(cmsg->cmsg_len)))))) + #endif /* _WS2DEF_ */

1 0

Thomas Mullaly : urlmon: Fixed memory free of an uninitialized variable.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: 03efc237b601b429e300c5ba63828d0b0cac209f URL: http://source.winehq.org/git/wine.git/?a=commit;h=03efc237b601b429e300c5ba6… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Tue Nov 2 21:12:23 2010 -0400 urlmon: Fixed memory free of an uninitialized variable. Thanks to Gerald for spotting this. --- dlls/urlmon/uri.c | 1 - 1 files changed, 0 insertions(+), 1 deletions(-) diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 3e29575..6aaa133 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -5605,7 +5605,6 @@ static HRESULT combine_uri(Uri *base, Uri *relative, DWORD flags, IUri **result) data.uri = SysAllocString(relative->raw_uri); if(!data.uri) { - IUri_Release(URI(ret)); *result = NULL; return E_OUTOFMEMORY; }

1 0

Thomas Mullaly : urlmon: Improved IUri support for file URIs.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: d6e624c7ee0cc64a0e4f4e3d42a99453fcd21028 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d6e624c7ee0cc64a0e4f4e3d4… Author: Thomas Mullaly <thomas.mullaly(a)gmail.com> Date: Sun Oct 10 15:40:54 2010 -0400 urlmon: Improved IUri support for file URIs. --- dlls/urlmon/tests/uri.c | 29 +++++++++++++++++++++++++++++ dlls/urlmon/uri.c | 16 ++++++++++++++-- 2 files changed, 43 insertions(+), 2 deletions(-) diff --git a/dlls/urlmon/tests/uri.c b/dlls/urlmon/tests/uri.c index cb1ad6f..bf1ed1c 100644 --- a/dlls/urlmon/tests/uri.c +++ b/dlls/urlmon/tests/uri.c @@ -4295,6 +4295,35 @@ static const uri_properties uri_tests[] = { {URL_SCHEME_MK,S_OK,FALSE}, {URLZONE_INVALID,E_NOTIMPL,FALSE} } + }, + /* Two '\' are added to the URI when USE_DOS_PATH is set, and it's a UNC path. */ + { "file://server/dir/index.html", Uri_CREATE_FILE_USE_DOS_PATH, S_OK, FALSE, + Uri_HAS_ABSOLUTE_URI|Uri_HAS_AUTHORITY|Uri_HAS_DISPLAY_URI|Uri_HAS_EXTENSION|Uri_HAS_HOST| + Uri_HAS_PATH|Uri_HAS_PATH_AND_QUERY|Uri_HAS_RAW_URI|Uri_HAS_SCHEME_NAME|Uri_HAS_HOST_TYPE| + Uri_HAS_SCHEME, FALSE, + { + {"file://\\\\server\\dir\\index.html",S_OK,FALSE}, + {"server",S_OK,FALSE}, + {"file://\\\\server\\dir\\index.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {".html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"server",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"\\dir\\index.html",S_OK,FALSE}, + {"\\dir\\index.html",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"file://server/dir/index.html",S_OK,FALSE}, + {"file",S_OK,FALSE}, + {"",S_FALSE,FALSE}, + {"",S_FALSE,FALSE} + }, + { + {Uri_HOST_DNS,S_OK,FALSE}, + {0,S_FALSE,FALSE}, + {URL_SCHEME_FILE,S_OK,FALSE}, + {URLZONE_INVALID,E_NOTIMPL,FALSE} + } } }; diff --git a/dlls/urlmon/uri.c b/dlls/urlmon/uri.c index 6aaa133..ad50fb2 100644 --- a/dlls/urlmon/uri.c +++ b/dlls/urlmon/uri.c @@ -2348,6 +2348,9 @@ static BOOL canonicalize_userinfo(const parse_data *data, Uri *uri, DWORD flags, * it isn't an unknown scheme type. * * 4) If it's a file scheme and the host is "localhost" it's removed. + * + * 5) If it's a file scheme and Uri_CREATE_FILE_USE_DOS_PATH is set, + * then the UNC path characters are added before the host name. */ static BOOL canonicalize_reg_name(const parse_data *data, Uri *uri, DWORD flags, BOOL computeOnly) { @@ -2356,8 +2359,6 @@ static BOOL canonicalize_reg_name(const parse_data *data, Uri *uri, const WCHAR *ptr; const BOOL known_scheme = data->scheme_type != URL_SCHEME_UNKNOWN; - uri->host_start = uri->canon_len; - if(data->scheme_type == URL_SCHEME_FILE && data->host_len == lstrlenW(localhostW)) { if(!StrCmpNIW(data->host, localhostW, data->host_len)) { @@ -2368,6 +2369,17 @@ static BOOL canonicalize_reg_name(const parse_data *data, Uri *uri, } } + if(data->scheme_type == URL_SCHEME_FILE && flags & Uri_CREATE_FILE_USE_DOS_PATH) { + if(!computeOnly) { + uri->canon_uri[uri->canon_len] = '\\'; + uri->canon_uri[uri->canon_len+1] = '\\'; + } + uri->canon_len += 2; + uri->authority_start = uri->canon_len; + } + + uri->host_start = uri->canon_len; + for(ptr = data->host; ptr < data->host+data->host_len; ++ptr) { if(*ptr == '%' && known_scheme) { WCHAR val = decode_pct_val(ptr);

1 0

Michael Stefaniuc : strmbase: Remove duplicate 'const' in strmbase.h.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: ac45ab3d8f5268252342bba53db2ca78c5ba796f URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac45ab3d8f5268252342bba53… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Wed Nov 3 00:59:04 2010 +0100 strmbase: Remove duplicate 'const' in strmbase.h. --- dlls/strmbase/dllfunc.c | 2 +- include/wine/strmbase.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/strmbase/dllfunc.c b/dlls/strmbase/dllfunc.c index 35e373f..adb5655 100644 --- a/dlls/strmbase/dllfunc.c +++ b/dlls/strmbase/dllfunc.c @@ -136,7 +136,7 @@ static HRESULT SetupRegisterAllClasses(const FactoryTemplate * pList, int num, return hr; } -HRESULT WINAPI AMovieSetupRegisterFilter2( const AMOVIESETUP_FILTER const * pFilter, IFilterMapper2 *pIFM2, BOOL bRegister) +HRESULT WINAPI AMovieSetupRegisterFilter2(const AMOVIESETUP_FILTER *pFilter, IFilterMapper2 *pIFM2, BOOL bRegister) { if (!pFilter) return S_OK; diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 21b6dfc..e79ab37 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -311,7 +311,7 @@ typedef struct tagFactoryTemplate { } FactoryTemplate; HRESULT WINAPI AMovieDllRegisterServer2(BOOL bRegister); -HRESULT WINAPI AMovieSetupRegisterFilter2( const AMOVIESETUP_FILTER const * pFilter, IFilterMapper2 *pIFM2, BOOL bRegister); +HRESULT WINAPI AMovieSetupRegisterFilter2(const AMOVIESETUP_FILTER *pFilter, IFilterMapper2 *pIFM2, BOOL bRegister); /* Dll Functions */ BOOL WINAPI STRMBASE_DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv);

1 0

André Hentschel : include: Add BS_PUSHBOX.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: b2e1c2defebfd8cdb66bbadb207a1e0267d4dd10 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b2e1c2defebfd8cdb66bbadb2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 2 19:52:39 2010 +0100 include: Add BS_PUSHBOX. --- include/winuser.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/winuser.h b/include/winuser.h index 9d07ef6..154c8da 100644 --- a/include/winuser.h +++ b/include/winuser.h @@ -710,6 +710,7 @@ typedef struct tagWINDOWPLACEMENT #define BS_GROUPBOX 0x00000007L #define BS_USERBUTTON 0x00000008L #define BS_AUTORADIOBUTTON 0x00000009L +#define BS_PUSHBOX 0x0000000AL #define BS_OWNERDRAW 0x0000000BL #define BS_TYPEMASK 0x0000000FL #define BS_LEFTTEXT 0x00000020L

1 0

André Hentschel : include: Add new button control styles.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: 61d237225f26b4eb33d8ecd2b17e75fc6e75ccbe URL: http://source.winehq.org/git/wine.git/?a=commit;h=61d237225f26b4eb33d8ecd2b… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 2 19:53:26 2010 +0100 include: Add new button control styles. --- include/commctrl.h | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/include/commctrl.h b/include/commctrl.h index 2261485..558591b 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -199,7 +199,6 @@ typedef struct tagNMCHAR #endif -/* This is only for Winelib applications. DON't use it wine itself!!! */ #ifndef SNDMSG #ifdef __cplusplus #define SNDMSG ::SendMessage @@ -1059,6 +1058,12 @@ typedef struct tagNMBCHOTITEM #define BST_HOT 0x0200 +/* Button control styles for _WIN32_WINNT >= 0x600 */ +#define BS_SPLITBUTTON 0x0000000C +#define BS_DEFSPLITBUTTON 0x0000000D +#define BS_COMMANDLINK 0x0000000E +#define BS_DEFCOMMANDLINK 0x0000000F + /* Toolbar */ #define TOOLBARCLASSNAMEA "ToolbarWindow32"

1 0

André Hentschel : wordpad: Replace obsolete styles.
by Alexandre Julliard 03 Nov '10

03 Nov '10

Module: wine Branch: master Commit: 347049bca8bfbe62026809cdda9a2228fd8d1500 URL: http://source.winehq.org/git/wine.git/?a=commit;h=347049bca8bfbe62026809cdd… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Nov 2 19:56:20 2010 +0100 wordpad: Replace obsolete styles. --- programs/wordpad/wordpad.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/wordpad/wordpad.c b/programs/wordpad/wordpad.c index 187aef0..db7546b 100644 --- a/programs/wordpad/wordpad.c +++ b/programs/wordpad/wordpad.c @@ -162,7 +162,7 @@ static void AddButton(HWND hwndToolBar, int nImage, int nCommand) button.iBitmap = nImage; button.idCommand = nCommand; button.fsState = TBSTATE_ENABLED; - button.fsStyle = TBSTYLE_BUTTON; + button.fsStyle = BTNS_BUTTON; button.dwData = 0; button.iString = -1; SendMessageW(hwndToolBar, TB_ADDBUTTONSW, 1, (LPARAM)&button); @@ -176,7 +176,7 @@ static void AddSeparator(HWND hwndToolBar) button.iBitmap = -1; button.idCommand = 0; button.fsState = 0; - button.fsStyle = TBSTYLE_SEP; + button.fsStyle = BTNS_SEP; button.dwData = 0; button.iString = -1; SendMessageW(hwndToolBar, TB_ADDBUTTONSW, 1, (LPARAM)&button); @@ -1818,7 +1818,7 @@ static LRESULT OnCreate( HWND hWnd ) if(!SendMessageW(hReBarWnd, RB_SETBARINFO, 0, (LPARAM)&rbi)) return -1; - hToolBarWnd = CreateToolbarEx(hReBarWnd, CCS_NOPARENTALIGN|CCS_NOMOVEY|WS_VISIBLE|WS_CHILD|TBSTYLE_TOOLTIPS|TBSTYLE_BUTTON, + hToolBarWnd = CreateToolbarEx(hReBarWnd, CCS_NOPARENTALIGN|CCS_NOMOVEY|WS_VISIBLE|WS_CHILD|TBSTYLE_TOOLTIPS|BTNS_BUTTON, IDC_TOOLBAR, 1, hInstance, IDB_TOOLBAR, NULL, 0, @@ -1880,7 +1880,7 @@ static LRESULT OnCreate( HWND hWnd ) SendMessageW(hReBarWnd, RB_INSERTBAND, -1, (LPARAM)&rbb); hFormatBarWnd = CreateToolbarEx(hReBarWnd, - CCS_NOPARENTALIGN | CCS_NOMOVEY | WS_VISIBLE | TBSTYLE_TOOLTIPS | TBSTYLE_BUTTON, + CCS_NOPARENTALIGN | CCS_NOMOVEY | WS_VISIBLE | TBSTYLE_TOOLTIPS | BTNS_BUTTON, IDC_FORMATBAR, 8, hInstance, IDB_FORMATBAR, NULL, 0, 16, 16, 16, 16, sizeof(TBBUTTON)); AddButton(hFormatBarWnd, 0, ID_FORMAT_BOLD);

1 0