September 2013 - Wine-commits

Piotr Caban : msvcrt: Don't forward strcmp to ntdll.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: 1803016c088d4a801b6a3891cdf52ce4d1834809 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1803016c088d4a801b6a3891c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 17 14:45:20 2013 +0200 msvcrt: Don't forward strcmp to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 79124c5..9c829d9 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1419,7 +1419,7 @@ @ cdecl strcat(str str) ntdll.strcat @ cdecl strcat_s(str long str) MSVCRT_strcat_s @ cdecl strchr(str long) MSVCRT_strchr -@ cdecl strcmp(str str) ntdll.strcmp +@ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) ntdll.strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 645cc03..43ebffa 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1642,6 +1642,14 @@ void* __cdecl MSVCRT_memchr(const void *ptr, int c, MSVCRT_size_t n) } /********************************************************************* + * strcmp (MSVCRT.@) + */ +int __cdecl MSVCRT_strcmp(const char *str1, const char *str2) +{ + return strcmp(str1, str2); +} + +/********************************************************************* * strncmp (MSVCRT.@) */ int __cdecl MSVCRT_strncmp(const char *str1, const char *str2, MSVCRT_size_t len)

1 0

Piotr Caban : msvcrt: Don't forward strlen to ntdll.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: f0ec9b134a314b60315575f34b67d4fe1bbc6eb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f0ec9b134a314b60315575f34… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 17 14:45:29 2013 +0200 msvcrt: Don't forward strlen to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 9c829d9..7cbef2a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1427,7 +1427,7 @@ @ cdecl strerror(long) MSVCRT_strerror @ cdecl strerror_s(ptr long long) @ cdecl strftime(str long str ptr) MSVCRT_strftime -@ cdecl strlen(str) ntdll.strlen +@ cdecl strlen(str) MSVCRT_strlen @ cdecl strncat(str str long) ntdll.strncat @ cdecl strncat_s(str long str long) MSVCRT_strncat_s @ cdecl strncmp(str str long) MSVCRT_strncmp diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 43ebffa..b59d604 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -781,6 +781,14 @@ MSVCRT_ulong CDECL MSVCRT_strtoul(const char* nptr, char** end, int base) return ret; } +/********************************************************************* + * strlen (MSVCRT.@) + */ +MSVCRT_size_t __cdecl MSVCRT_strlen(const char *str) +{ + return strlen(str); +} + /****************************************************************** * strnlen (MSVCRT.@) */

1 0

Piotr Caban : msvcrt: Don't forward strncat to ntdll.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: 31d92b926e448ce46e0e534286a62e5e3ce07a7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=31d92b926e448ce46e0e53428… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 17 14:45:44 2013 +0200 msvcrt: Don't forward strncat to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 7cbef2a..5445e3e 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1428,7 +1428,7 @@ @ cdecl strerror_s(ptr long long) @ cdecl strftime(str long str ptr) MSVCRT_strftime @ cdecl strlen(str) MSVCRT_strlen -@ cdecl strncat(str str long) ntdll.strncat +@ cdecl strncat(str str long) MSVCRT_strncat @ cdecl strncat_s(str long str long) MSVCRT_strncat_s @ cdecl strncmp(str str long) MSVCRT_strncmp @ cdecl strncpy(ptr str long) MSVCRT_strncpy diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index b59d604..677db63 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -677,6 +677,14 @@ int CDECL MSVCRT_strncat_s( char* dst, MSVCRT_size_t elem, const char* src, MSVC } /********************************************************************* + * strncat (MSVCRT.@) + */ +char* __cdecl MSVCRT_strncat(char *dst, const char *src, MSVCRT_size_t len) +{ + return strncat(dst, src, len); +} + +/********************************************************************* * strxfrm (MSVCRT.@) */ MSVCRT_size_t CDECL MSVCRT_strxfrm( char *dest, const char *src, MSVCRT_size_t len )

1 0

Piotr Caban : msvcrt: Don't forward strrchr to ntdll.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: 138df7da33c6aa8aa3fa004a3dfe4f56923508ad URL: http://source.winehq.org/git/wine.git/?a=commit;h=138df7da33c6aa8aa3fa004a3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 17 14:45:53 2013 +0200 msvcrt: Don't forward strrchr to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 5445e3e..304881a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1435,7 +1435,7 @@ @ cdecl strncpy_s(ptr long str long) @ cdecl strnlen(str long) MSVCRT_strnlen @ cdecl strpbrk(str str) ntdll.strpbrk -@ cdecl strrchr(str long) ntdll.strrchr +@ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) ntdll.strstr @ cdecl strtod(str ptr) MSVCRT_strtod diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 677db63..9232d63 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1650,6 +1650,14 @@ char* __cdecl MSVCRT_strchr(const char *str, int c) } /********************************************************************* + * strrchr (MSVCRT.@) + */ +char* __cdecl MSVCRT_strrchr(const char *str, int c) +{ + return strrchr(str, c); +} + +/********************************************************************* * memchr (MSVCRT.@) */ void* __cdecl MSVCRT_memchr(const void *ptr, int c, MSVCRT_size_t n)

1 0

Piotr Caban : msvcrt: Don't forward strstr to ntdll.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: 019c34ca1ebc9cae7e334e8e08edea2d2f5f9f74 URL: http://source.winehq.org/git/wine.git/?a=commit;h=019c34ca1ebc9cae7e334e8e0… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 17 14:46:07 2013 +0200 msvcrt: Don't forward strstr to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 304881a..4de1722 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1437,7 +1437,7 @@ @ cdecl strpbrk(str str) ntdll.strpbrk @ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn -@ cdecl strstr(str str) ntdll.strstr +@ cdecl strstr(str str) MSVCRT_strstr @ cdecl strtod(str ptr) MSVCRT_strtod @ cdecl strtok(str str) MSVCRT_strtok @ cdecl strtok_s(ptr str ptr) MSVCRT_strtok_s diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 9232d63..d3bde66 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1735,3 +1735,11 @@ int __cdecl MSVCRT__stricmp(const char *s1, const char *s2) { return MSVCRT__strnicmp_l(s1, s2, -1, NULL); } + +/********************************************************************* + * strstr (MSVCRT.@) + */ +char* __cdecl MSVCRT_strstr(const char *haystack, const char *needle) +{ + return strstr(haystack, needle); +}

1 0

Piotr Caban : msvcrt: Don't forward wcschr to ntdll.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: 300c0123728cbb5cdc91b9598843d9aff6c4b857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=300c0123728cbb5cdc91b9598… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 17 14:46:17 2013 +0200 msvcrt: Don't forward wcschr to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 4de1722..5c3216c 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1482,7 +1482,7 @@ # stub wcrtomb_s(ptr ptr long long ptr) @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s -@ cdecl wcschr(wstr long) ntdll.wcschr +@ cdecl wcschr(wstr long) MSVCRT_wcschr @ cdecl wcscmp(wstr wstr) ntdll.wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll @ cdecl wcscpy(ptr wstr) ntdll.wcscpy diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 5f47ee5..8b64e4b 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1840,3 +1840,11 @@ int CDECL MSVCRT_towlower(MSVCRT_wint_t c) { return MSVCRT__towlower_l(c, NULL); } + +/********************************************************************* + * wcschr (MSVCRT.@) + */ +MSVCRT_wchar_t* CDECL MSVCRT_wcschr(const MSVCRT_wchar_t *str, MSVCRT_wchar_t ch) +{ + return strchrW(str, ch); +}

1 0

Piotr Caban : msvcrt: Don't forward wcslen to ntdll.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: a89f72635543924ff8d2ec50cd4e0ff426130347 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a89f72635543924ff8d2ec50c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 17 14:46:30 2013 +0200 msvcrt: Don't forward wcslen to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 5c3216c..4d029bd 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1489,7 +1489,7 @@ @ cdecl wcscpy_s(ptr long wstr) MSVCRT_wcscpy_s @ cdecl wcscspn(wstr wstr) ntdll.wcscspn @ cdecl wcsftime(ptr long wstr ptr) MSVCRT_wcsftime -@ cdecl wcslen(wstr) ntdll.wcslen +@ cdecl wcslen(wstr) MSVCRT_wcslen @ cdecl wcsncat(wstr wstr long) ntdll.wcsncat @ cdecl wcsncat_s(wstr long wstr long) MSVCRT_wcsncat_s @ cdecl wcsncmp(wstr wstr long) ntdll.wcsncmp diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 8b64e4b..a752f01 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1848,3 +1848,11 @@ MSVCRT_wchar_t* CDECL MSVCRT_wcschr(const MSVCRT_wchar_t *str, MSVCRT_wchar_t ch { return strchrW(str, ch); } + +/*********************************************************************** + * wcslen (MSVCRT.@) + */ +int CDECL MSVCRT_wcslen(const MSVCRT_wchar_t *str) +{ + return strlenW(str); +}

1 0

Piotr Caban : msvcrt: Don't forward wcsstr to ntdll.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: 882761f15d180c5b2185bbe2750c6d694f80a05b URL: http://source.winehq.org/git/wine.git/?a=commit;h=882761f15d180c5b2185bbe27… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 17 14:46:42 2013 +0200 msvcrt: Don't forward wcsstr to ntdll. --- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 4d029bd..90bd7ff 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1501,7 +1501,7 @@ @ cdecl wcsrtombs(ptr ptr long ptr) MSVCRT_wcsrtombs @ cdecl wcsrtombs_s(ptr ptr long ptr long ptr) MSVCRT_wcsrtombs_s @ cdecl wcsspn(wstr wstr) ntdll.wcsspn -@ cdecl wcsstr(wstr wstr) ntdll.wcsstr +@ cdecl wcsstr(wstr wstr) MSVCRT_wcsstr @ cdecl wcstod(wstr ptr) MSVCRT_wcstod @ cdecl wcstok(wstr wstr) MSVCRT_wcstok @ cdecl wcstok_s(ptr wstr ptr) diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index a752f01..dca6a3d 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -1856,3 +1856,11 @@ int CDECL MSVCRT_wcslen(const MSVCRT_wchar_t *str) { return strlenW(str); } + +/********************************************************************* + * wcsstr (MSVCRT.@) + */ +MSVCRT_wchar_t* CDECL MSVCRT_wcsstr(const MSVCRT_wchar_t *str, const MSVCRT_wchar_t *sub) +{ + return strstrW(str, sub); +}

1 0

Piotr Caban : msvcrt: Fix loop condition when printing Inf or NaN.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: bffc240b4eab673b0d30c112551f540c5c4f2a4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=bffc240b4eab673b0d30c1125… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Sep 17 15:23:39 2013 +0200 msvcrt: Fix loop condition when printing Inf or NaN. --- dlls/msvcrt/printf.h | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/printf.h b/dlls/msvcrt/printf.h index dd36f59..96e7845 100644 --- a/dlls/msvcrt/printf.h +++ b/dlls/msvcrt/printf.h @@ -594,7 +594,7 @@ int FUNC_NAME(pf_printf)(FUNC_NAME(puts_clbk) pf_puts, void *puts_ctx, const API static const char inf_str[] = "#INF"; static const char ind_str[] = "#IND"; - for(i=1; i<=sizeof(inf ? inf_str : ind_str); i++) { + for(i=1; i<(inf ? sizeof(inf_str) : sizeof(ind_str)); i++) { if(decimal_point[i]<'0' || decimal_point[i]>'9') break;

1 0

Bruno Jesus : ws2_32: Use the struct information when the parameters are zero in WSASocket.
by Alexandre Julliard 17 Sep '13

17 Sep '13

Module: wine Branch: master Commit: 8e29fcddb92b5a37092f74c388072f8196db3649 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8e29fcddb92b5a37092f74c38… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Sep 17 10:00:24 2013 -0300 ws2_32: Use the struct information when the parameters are zero in WSASocket. --- dlls/ws2_32/socket.c | 14 +++++++------- dlls/ws2_32/tests/sock.c | 3 +-- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 4750656..30c3c6c 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -5884,20 +5884,20 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, return ret; } - /* convert the socket family and type */ - af = convert_af_w2u(af); - type = convert_socktype_w2u(type); - if (lpProtocolInfo) { - if (af == FROM_PROTOCOL_INFO) + if (af == FROM_PROTOCOL_INFO || !af) af = lpProtocolInfo->iAddressFamily; - if (type == FROM_PROTOCOL_INFO) + if (type == FROM_PROTOCOL_INFO || !type) type = lpProtocolInfo->iSocketType; - if (protocol == FROM_PROTOCOL_INFO) + if (protocol == FROM_PROTOCOL_INFO || !protocol) protocol = lpProtocolInfo->iProtocol; } + /* convert the socket family and type */ + af = convert_af_w2u(af); + type = convert_socktype_w2u(type); + if ( af == AF_UNSPEC) /* did they not specify the address family? */ { if ((protocol == IPPROTO_TCP && type == SOCK_STREAM) || diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 70269b4..1f18869 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1946,7 +1946,6 @@ todo_wine pi[0].iSocketType = SOCK_DGRAM; pi[0].iAddressFamily = AF_INET; sock = WSASocketA(0, 0, 0, &pi[0], 0, 0); -todo_wine { ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", WSAGetLastError()); size = sizeof(socktype); @@ -1956,7 +1955,7 @@ todo_wine { ok(socktype == SOCK_DGRAM, "Wrong socket type, expected %d received %d\n", SOCK_DGRAM, socktype); closesocket(sock); -} + sock = WSASocketA(AF_INET, SOCK_STREAM, IPPROTO_TCP, &pi[0], 0, 0); ok(sock != INVALID_SOCKET, "Failed to create socket: %d\n", WSAGetLastError());

1 0