October 2018 - Wine-commits

Hans Leidekker : webservices: Add more tests for default envelope and adressing versions.
by Alexandre Julliard 18 Oct '18

18 Oct '18

Module: wine Branch: master Commit: dea016dbe8c7f03f860e889e95f9b14c6af466e8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=dea016dbe8c7f03f860e889e… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Oct 17 13:42:37 2018 +0200 webservices: Add more tests for default envelope and adressing versions. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/msg.c | 47 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/dlls/webservices/tests/msg.c b/dlls/webservices/tests/msg.c index 22d69ec..766c2c5 100644 --- a/dlls/webservices/tests/msg.c +++ b/dlls/webservices/tests/msg.c @@ -104,6 +104,7 @@ static void test_WsCreateMessageForChannel(void) hr = WsCreateMessageForChannel( NULL, NULL, 0, &msg, NULL ); ok( hr == E_INVALIDARG, "got %08x\n", hr ); + /* HTTP */ hr = WsCreateChannel( WS_CHANNEL_TYPE_REQUEST, WS_HTTP_CHANNEL_BINDING, NULL, 0, NULL, &channel, NULL ); ok( hr == S_OK, "got %08x\n", hr ); @@ -154,6 +155,52 @@ static void test_WsCreateMessageForChannel(void) WsFreeChannel( channel ); WsFreeMessage( msg ); + + /* TCP */ + hr = WsCreateChannel( WS_CHANNEL_TYPE_DUPLEX_SESSION, WS_TCP_CHANNEL_BINDING, NULL, 0, NULL, + &channel, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + env_version = 0xdeadbeef; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_ENVELOPE_VERSION, &env_version, + sizeof(env_version), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( env_version == WS_ENVELOPE_VERSION_SOAP_1_2, "got %u\n", env_version ); + + addr_version = 0xdeadbeef; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_ADDRESSING_VERSION, &addr_version, + sizeof(addr_version), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( addr_version == WS_ADDRESSING_VERSION_1_0, "got %u\n", addr_version ); + + WsFreeChannel( channel ); + WsFreeMessage( msg ); + + /* UDP */ + hr = WsCreateChannel( WS_CHANNEL_TYPE_DUPLEX, WS_UDP_CHANNEL_BINDING, NULL, 0, NULL, + &channel, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + hr = WsCreateMessageForChannel( channel, NULL, 0, &msg, NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + + env_version = 0xdeadbeef; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_ENVELOPE_VERSION, &env_version, + sizeof(env_version), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( env_version == WS_ENVELOPE_VERSION_SOAP_1_2, "got %u\n", env_version ); + + addr_version = 0xdeadbeef; + hr = WsGetMessageProperty( msg, WS_MESSAGE_PROPERTY_ADDRESSING_VERSION, &addr_version, + sizeof(addr_version), NULL ); + ok( hr == S_OK, "got %08x\n", hr ); + ok( addr_version == WS_ADDRESSING_VERSION_1_0, "got %u\n", addr_version ); + + WsFreeChannel( channel ); + WsFreeMessage( msg ); } static void test_WsInitializeMessage(void)

1 0

Piotr Caban : msvcrt: Don't forward _atoi64 to ntdll.
by Alexandre Julliard 18 Oct '18

18 Oct '18

Module: wine Branch: master Commit: 4d0a008e5d0f5984fa6c8088cbe0f0be3702dace URL: https://source.winehq.org/git/wine.git/?a=commit;h=4d0a008e5d0f5984fa6c8088… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 15:22:51 2018 +0200 msvcrt: Don't forward _atoi64 to ntdll. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45922 Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-convert-l1-1-0.spec | 2 +- dlls/msvcr100/msvcr100.spec | 4 ++-- dlls/msvcr110/msvcr110.spec | 4 ++-- dlls/msvcr120/msvcr120.spec | 4 ++-- dlls/msvcr120_app/msvcr120_app.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr80/msvcr80.spec | 4 ++-- dlls/msvcr90/msvcr90.spec | 4 ++-- dlls/msvcrt/msvcrt.spec | 4 ++-- dlls/msvcrt/string.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 4 ++-- 11 files changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec index f8e1b8e..a72ec0a 100644 --- a/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec +++ b/dlls/api-ms-win-crt-convert-l1-1-0/api-ms-win-crt-convert-l1-1-0.spec @@ -5,7 +5,7 @@ @ cdecl _atoflt(ptr str) ucrtbase._atoflt @ cdecl _atoflt_l(ptr str ptr) ucrtbase._atoflt_l @ cdecl -ret64 _atoi64(str) ucrtbase._atoi64 -@ cdecl _atoi64_l(str ptr) ucrtbase._atoi64_l +@ cdecl -ret64 _atoi64_l(str ptr) ucrtbase._atoi64_l @ cdecl _atoi_l(str ptr) ucrtbase._atoi_l @ cdecl _atol_l(str ptr) ucrtbase._atol_l @ cdecl _atoldbl(ptr str) ucrtbase._atoldbl diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index d7f90e6..78af262 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -696,8 +696,8 @@ @ cdecl _atof_l(str ptr) MSVCRT__atof_l @ cdecl _atoflt(ptr str) MSVCRT__atoflt @ cdecl _atoflt_l(ptr str ptr) MSVCRT__atoflt_l -@ cdecl -ret64 _atoi64(str) ntdll._atoi64 -@ cdecl _atoi64_l(str ptr) MSVCRT__atoi64_l +@ cdecl -ret64 _atoi64(str) MSVCRT__atoi64 +@ cdecl -ret64 _atoi64_l(str ptr) MSVCRT__atoi64_l @ cdecl _atoi_l(str ptr) MSVCRT__atoi_l @ cdecl _atol_l(str ptr) MSVCRT__atol_l @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 113b606..d944012 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1044,8 +1044,8 @@ @ cdecl _atof_l(str ptr) MSVCRT__atof_l @ cdecl _atoflt(ptr str) MSVCRT__atoflt @ cdecl _atoflt_l(ptr str ptr) MSVCRT__atoflt_l -@ cdecl -ret64 _atoi64(str) ntdll._atoi64 -@ cdecl _atoi64_l(str ptr) MSVCRT__atoi64_l +@ cdecl -ret64 _atoi64(str) MSVCRT__atoi64 +@ cdecl -ret64 _atoi64_l(str ptr) MSVCRT__atoi64_l @ cdecl _atoi_l(str ptr) MSVCRT__atoi_l @ cdecl _atol_l(str ptr) MSVCRT__atol_l @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 2725e01..b5b273d 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1034,8 +1034,8 @@ @ cdecl _atof_l(str ptr) MSVCRT__atof_l @ cdecl _atoflt(ptr str) MSVCRT__atoflt @ cdecl _atoflt_l(ptr str ptr) MSVCRT__atoflt_l -@ cdecl -ret64 _atoi64(str) ntdll._atoi64 -@ cdecl _atoi64_l(str ptr) MSVCRT__atoi64_l +@ cdecl -ret64 _atoi64(str) MSVCRT__atoi64 +@ cdecl -ret64 _atoi64_l(str ptr) MSVCRT__atoi64_l @ cdecl _atoi_l(str ptr) MSVCRT__atoi_l @ cdecl _atol_l(str ptr) MSVCRT__atol_l @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl diff --git a/dlls/msvcr120_app/msvcr120_app.spec b/dlls/msvcr120_app/msvcr120_app.spec index 22539e1..e926bbb 100644 --- a/dlls/msvcr120_app/msvcr120_app.spec +++ b/dlls/msvcr120_app/msvcr120_app.spec @@ -1006,7 +1006,7 @@ @ cdecl _atoflt(ptr str) msvcr120._atoflt @ cdecl _atoflt_l(ptr str ptr) msvcr120._atoflt_l @ cdecl -ret64 _atoi64(str) msvcr120._atoi64 -@ cdecl _atoi64_l(str ptr) msvcr120._atoi64_l +@ cdecl -ret64 _atoi64_l(str ptr) msvcr120._atoi64_l @ cdecl _atoi_l(str ptr) msvcr120._atoi_l @ cdecl _atol_l(str ptr) msvcr120._atol_l @ cdecl _atoldbl(ptr str) msvcr120._atoldbl diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index a31cd1b..aad93a7 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -235,7 +235,7 @@ @ cdecl _amsg_exit(long) @ cdecl _assert(str str long) MSVCRT__assert @ cdecl _atodbl(ptr str) MSVCRT__atodbl -@ cdecl -ret64 _atoi64(str) ntdll._atoi64 +@ cdecl -ret64 _atoi64(str) MSVCRT__atoi64 @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl @ cdecl _beep(long long) MSVCRT__beep @ cdecl _beginthread(ptr long ptr) diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index b563427..703bf85 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -360,8 +360,8 @@ @ cdecl _atof_l(str ptr) MSVCRT__atof_l @ cdecl _atoflt(ptr str) MSVCRT__atoflt @ cdecl _atoflt_l(ptr str ptr) MSVCRT__atoflt_l -@ cdecl -ret64 _atoi64(str) ntdll._atoi64 -@ cdecl _atoi64_l(str ptr) MSVCRT__atoi64_l +@ cdecl -ret64 _atoi64(str) MSVCRT__atoi64 +@ cdecl -ret64 _atoi64_l(str ptr) MSVCRT__atoi64_l @ cdecl _atoi_l(str ptr) MSVCRT__atoi_l @ cdecl _atol_l(str ptr) MSVCRT__atol_l @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index a735005..9b86c53 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -344,8 +344,8 @@ @ cdecl _atof_l(str ptr) MSVCRT__atof_l @ cdecl _atoflt(ptr str) MSVCRT__atoflt @ cdecl _atoflt_l(ptr str ptr) MSVCRT__atoflt_l -@ cdecl -ret64 _atoi64(str) ntdll._atoi64 -@ cdecl _atoi64_l(str ptr) MSVCRT__atoi64_l +@ cdecl -ret64 _atoi64(str) MSVCRT__atoi64 +@ cdecl -ret64 _atoi64_l(str ptr) MSVCRT__atoi64_l @ cdecl _atoi_l(str ptr) MSVCRT__atoi_l @ cdecl _atol_l(str ptr) MSVCRT__atol_l @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 4dee1a6..a08093a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -331,8 +331,8 @@ @ cdecl _atodbl_l(ptr str ptr) MSVCRT__atodbl_l @ cdecl _atof_l(str ptr) MSVCRT__atof_l @ cdecl _atoflt_l(ptr str ptr) MSVCRT__atoflt_l -@ cdecl -ret64 _atoi64(str) ntdll._atoi64 -@ cdecl _atoi64_l(str ptr) MSVCRT__atoi64_l +@ cdecl -ret64 _atoi64(str) MSVCRT__atoi64 +@ cdecl -ret64 _atoi64_l(str ptr) MSVCRT__atoi64_l @ cdecl _atoi_l(str ptr) MSVCRT__atoi_l @ cdecl _atol_l(str ptr) MSVCRT__atol_l @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index b58d56b..56447a7 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1080,6 +1080,14 @@ __int64 CDECL MSVCRT__atoi64_l(const char *str, MSVCRT__locale_t locale) } /****************************************************************** + * _atoi64 (MSVCRT.@) + */ +__int64 CDECL MSVCRT__atoi64(const char *str) +{ + return MSVCRT_strtoi64_l(str, NULL, 10, NULL); +} + +/****************************************************************** * _atol_l (MSVCRT.@) */ MSVCRT_long CDECL MSVCRT__atol_l(const char *str, MSVCRT__locale_t locale) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 422315b..0cec390 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -195,8 +195,8 @@ @ cdecl _atof_l(str ptr) MSVCRT__atof_l @ cdecl _atoflt(ptr str) MSVCRT__atoflt @ cdecl _atoflt_l(ptr str ptr) MSVCRT__atoflt_l -@ cdecl -ret64 _atoi64(str) ntdll._atoi64 -@ cdecl _atoi64_l(str ptr) MSVCRT__atoi64_l +@ cdecl -ret64 _atoi64(str) MSVCRT__atoi64 +@ cdecl -ret64 _atoi64_l(str ptr) MSVCRT__atoi64_l @ cdecl _atoi_l(str ptr) MSVCRT__atoi_l @ cdecl _atol_l(str ptr) MSVCRT__atol_l @ cdecl _atoldbl(ptr str) MSVCRT__atoldbl

1 0

Piotr Caban : msvcrt: Don't forward _wcsupr to ntdll.
by Alexandre Julliard 18 Oct '18

18 Oct '18

Module: wine Branch: master Commit: 32b94e6b2d4956e60f211020b15faa4244f92332 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32b94e6b2d4956e60f211020… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 15:22:56 2018 +0200 msvcrt: Don't forward _wcsupr to ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 78af262..f678354 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1520,7 +1520,7 @@ @ cdecl -ret64 _wcstoui64(wstr ptr long) MSVCRT__wcstoui64 @ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) MSVCRT__wcstoui64_l @ cdecl _wcstoul_l(wstr ptr long ptr) MSVCRT__wcstoul_l -@ cdecl _wcsupr(wstr) ntdll._wcsupr +@ cdecl _wcsupr(wstr) MSVCRT__wcsupr @ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index d944012..58d51f7 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1878,7 +1878,7 @@ @ cdecl -ret64 _wcstoui64(wstr ptr long) MSVCRT__wcstoui64 @ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) MSVCRT__wcstoui64_l @ cdecl _wcstoul_l(wstr ptr long ptr) MSVCRT__wcstoul_l -@ cdecl _wcsupr(wstr) ntdll._wcsupr +@ cdecl _wcsupr(wstr) MSVCRT__wcsupr @ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index b5b273d..f2a9ed0 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -1902,7 +1902,7 @@ @ cdecl _wcstoul_l(wstr ptr long ptr) MSVCRT__wcstoul_l @ cdecl -ret64 _wcstoull_l(wstr ptr long ptr) MSVCRT__wcstoui64_l @ stub _wcstoumax_l -@ cdecl _wcsupr(wstr) ntdll._wcsupr +@ cdecl _wcsupr(wstr) MSVCRT__wcsupr @ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index aad93a7..b9a4f4d 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -607,7 +607,7 @@ @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoui64(wstr ptr long) MSVCRT__wcstoui64 -@ cdecl _wcsupr(wstr) ntdll._wcsupr +@ cdecl _wcsupr(wstr) MSVCRT__wcsupr @ cdecl _wctime(ptr) MSVCRT__wctime @ cdecl _wctime64(ptr) MSVCRT__wctime64 # extern _wctype diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 1927376..e690699 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -603,7 +603,7 @@ @ cdecl _wcsset(wstr long) MSVCRT__wcsset @ cdecl -ret64 _wcstoi64(wstr ptr long) MSVCRT__wcstoi64 @ cdecl -ret64 _wcstoui64(wstr ptr long) MSVCRT__wcstoui64 -@ cdecl _wcsupr(wstr) ntdll._wcsupr +@ cdecl _wcsupr(wstr) MSVCRT__wcsupr @ cdecl _wctime(ptr) MSVCRT__wctime @ cdecl _wctime64(ptr) MSVCRT__wctime64 # extern _wctype diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 703bf85..cb4b6d9 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1199,7 +1199,7 @@ @ cdecl -ret64 _wcstoui64(wstr ptr long) MSVCRT__wcstoui64 @ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) MSVCRT__wcstoui64_l @ cdecl _wcstoul_l(wstr ptr long ptr) MSVCRT__wcstoul_l -@ cdecl _wcsupr(wstr) ntdll._wcsupr +@ cdecl _wcsupr(wstr) MSVCRT__wcsupr @ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 9b86c53..cf33b43 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1175,7 +1175,7 @@ @ cdecl -ret64 _wcstoui64(wstr ptr long) MSVCRT__wcstoui64 @ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) MSVCRT__wcstoui64_l @ cdecl _wcstoul_l(wstr ptr long ptr) MSVCRT__wcstoul_l -@ cdecl _wcsupr(wstr) ntdll._wcsupr +@ cdecl _wcsupr(wstr) MSVCRT__wcsupr @ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index a08093a..83a33f3 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1130,7 +1130,7 @@ @ cdecl -ret64 _wcstoui64(wstr ptr long) MSVCRT__wcstoui64 @ cdecl -ret64 _wcstoui64_l(wstr ptr long ptr) MSVCRT__wcstoui64_l @ cdecl _wcstoul_l(wstr ptr long ptr) MSVCRT__wcstoul_l -@ cdecl _wcsupr(wstr) ntdll._wcsupr +@ cdecl _wcsupr(wstr) MSVCRT__wcsupr @ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index c2a4474..0e4019f 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -268,6 +268,14 @@ MSVCRT_wchar_t* CDECL MSVCRT__wcsupr_l( MSVCRT_wchar_t *str, MSVCRT__locale_t lo } /****************************************************************** + * _wcsupr (MSVCRT.@) + */ +MSVCRT_wchar_t* CDECL MSVCRT__wcsupr( MSVCRT_wchar_t *str ) +{ + return MSVCRT__wcsupr_l(str, NULL); +} + +/****************************************************************** * _wcslwr_s_l (MSVCRT.@) */ int CDECL MSVCRT__wcslwr_s_l( MSVCRT_wchar_t* str, MSVCRT_size_t n, MSVCRT__locale_t locale ) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 0cec390..03d34a9 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2051,7 +2051,7 @@ @ cdecl _wcstoul_l(wstr ptr long ptr) MSVCRT__wcstoul_l @ cdecl -ret64 _wcstoull_l(wstr ptr long ptr) MSVCRT__wcstoui64_l @ stub _wcstoumax_l -@ cdecl _wcsupr(wstr) ntdll._wcsupr +@ cdecl _wcsupr(wstr) MSVCRT__wcsupr @ cdecl _wcsupr_l(wstr ptr) MSVCRT__wcsupr_l @ cdecl _wcsupr_s(wstr long) MSVCRT__wcsupr_s @ cdecl _wcsupr_s_l(wstr long ptr) MSVCRT__wcsupr_s_l

1 0

Piotr Caban : msvcrt: Don't forward atol to ntdll.
by Alexandre Julliard 18 Oct '18

18 Oct '18

Module: wine Branch: master Commit: 98eb7171e1d61ec24d337d11b672373dfac19db8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98eb7171e1d61ec24d337d11… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 15:23:00 2018 +0200 msvcrt: Don't forward atol to ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index f678354..61cc0ea 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1639,7 +1639,7 @@ @ cdecl -private atexit(ptr) MSVCRT_atexit # not imported to avoid conflicts with Mingw @ cdecl atof(str) MSVCRT_atof @ cdecl atoi(str) MSVCRT_atoi -@ cdecl atol(str) ntdll.atol +@ cdecl atol(str) MSVCRT_atol @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s @ cdecl btowc(long) MSVCRT_btowc diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 58d51f7..bcd6eed 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -1996,7 +1996,7 @@ @ cdecl -private atexit(ptr) MSVCRT_atexit # not imported to avoid conflicts with Mingw @ cdecl atof(str) MSVCRT_atof @ cdecl atoi(str) MSVCRT_atoi -@ cdecl atol(str) ntdll.atol +@ cdecl atol(str) MSVCRT_atol @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s @ cdecl btowc(long) MSVCRT_btowc diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index f2a9ed0..87c85ae 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2031,7 +2031,7 @@ @ cdecl -private atexit(ptr) MSVCRT_atexit # not imported to avoid conflicts with Mingw @ cdecl atof(str) MSVCRT_atof @ cdecl atoi(str) MSVCRT_atoi -@ cdecl atol(str) ntdll.atol +@ cdecl atol(str) MSVCRT_atol @ cdecl -ret64 atoll(str) MSVCRT_atoll @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index b9a4f4d..b9b6278 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -689,7 +689,7 @@ @ cdecl -private atexit(ptr) MSVCRT_atexit # not imported to avoid conflicts with Mingw @ cdecl atof(str) MSVCRT_atof @ cdecl atoi(str) MSVCRT_atoi -@ cdecl atol(str) ntdll.atol +@ cdecl atol(str) MSVCRT_atol @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch @ cdecl calloc(long long) MSVCRT_calloc @ cdecl ceil(double) MSVCRT_ceil diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index e690699..c5c1533 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -685,7 +685,7 @@ @ cdecl -private atexit(ptr) MSVCRT_atexit # not imported to avoid conflicts with Mingw @ cdecl atof(str) MSVCRT_atof @ cdecl atoi(str) MSVCRT_atoi -@ cdecl atol(str) ntdll.atol +@ cdecl atol(str) MSVCRT_atol @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch @ cdecl calloc(long long) MSVCRT_calloc @ cdecl ceil(double) MSVCRT_ceil diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index cb4b6d9..994fdce 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1321,7 +1321,7 @@ @ cdecl -private atexit(ptr) MSVCRT_atexit # not imported to avoid conflicts with Mingw @ cdecl atof(str) MSVCRT_atof @ cdecl atoi(str) MSVCRT_atoi -@ cdecl atol(str) ntdll.atol +@ cdecl atol(str) MSVCRT_atol @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s @ cdecl btowc(long) MSVCRT_btowc diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index cf33b43..8f82504 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1294,7 +1294,7 @@ @ cdecl -private atexit(ptr) MSVCRT_atexit # not imported to avoid conflicts with Mingw @ cdecl atof(str) MSVCRT_atof @ cdecl atoi(str) MSVCRT_atoi -@ cdecl atol(str) ntdll.atol +@ cdecl atol(str) MSVCRT_atol @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s @ cdecl btowc(long) MSVCRT_btowc diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 83a33f3..56ff74a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1256,7 +1256,7 @@ @ cdecl -private atexit(ptr) MSVCRT_atexit # not imported to avoid conflicts with Mingw @ cdecl atof(str) MSVCRT_atof @ cdecl atoi(str) MSVCRT_atoi -@ cdecl atol(str) ntdll.atol +@ cdecl atol(str) MSVCRT_atol @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s @ cdecl btowc(long) MSVCRT_btowc diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 56447a7..e0e620f 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -1104,6 +1104,14 @@ MSVCRT_long CDECL MSVCRT__atol_l(const char *str, MSVCRT__locale_t locale) return ret; } +/****************************************************************** + * atol (MSVCRT.@) + */ +MSVCRT_long CDECL MSVCRT_atol(const char *str) +{ + return MSVCRT__atol_l(str, NULL); +} + #if _MSVCR_VER>=120 /****************************************************************** diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 03d34a9..1577de6 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2172,7 +2172,7 @@ @ cdecl atanhl(double) MSVCR120_atanhl @ cdecl atof(str) MSVCRT_atof @ cdecl atoi(str) MSVCRT_atoi -@ cdecl atol(str) ntdll.atol +@ cdecl atol(str) MSVCRT_atol @ cdecl -ret64 atoll(str) MSVCRT_atoll @ cdecl bsearch(ptr ptr long long ptr) MSVCRT_bsearch @ cdecl bsearch_s(ptr ptr long long ptr ptr) MSVCRT_bsearch_s

1 0

Piotr Caban : msvcrt: Don't forward wcscmp to ntdll.
by Alexandre Julliard 18 Oct '18

18 Oct '18

Module: wine Branch: master Commit: 66b38682ebc8e1e4e280a06210042f3ca0567bda URL: https://source.winehq.org/git/wine.git/?a=commit;h=66b38682ebc8e1e4e280a062… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 15:23:04 2018 +0200 msvcrt: Don't forward wcscmp to ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 61cc0ea..cdb46a3 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1857,7 +1857,7 @@ @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr -@ cdecl wcscmp(wstr wstr) ntdll.wcscmp +@ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll @ cdecl wcscpy(ptr wstr) ntdll.wcscpy @ cdecl wcscpy_s(ptr long wstr) MSVCRT_wcscpy_s diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index bcd6eed..81dcecd 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2215,7 +2215,7 @@ @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr -@ cdecl wcscmp(wstr wstr) ntdll.wcscmp +@ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll @ cdecl wcscpy(ptr wstr) ntdll.wcscpy @ cdecl wcscpy_s(ptr long wstr) MSVCRT_wcscpy_s diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 87c85ae..338eb69 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2450,7 +2450,7 @@ @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr -@ cdecl wcscmp(wstr wstr) ntdll.wcscmp +@ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll @ cdecl wcscpy(ptr wstr) ntdll.wcscpy @ cdecl wcscpy_s(ptr long wstr) MSVCRT_wcscpy_s diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index b9b6278..c074378 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -852,7 +852,7 @@ @ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcschr(wstr long) MSVCRT_wcschr -@ cdecl wcscmp(wstr wstr) ntdll.wcscmp +@ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll @ cdecl wcscpy(ptr wstr) ntdll.wcscpy @ cdecl wcscspn(wstr wstr) ntdll.wcscspn diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index c5c1533..f760979 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -848,7 +848,7 @@ @ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcschr(wstr long) MSVCRT_wcschr -@ cdecl wcscmp(wstr wstr) ntdll.wcscmp +@ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll @ cdecl wcscpy(ptr wstr) ntdll.wcscpy @ cdecl wcscspn(wstr wstr) ntdll.wcscspn diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 994fdce..6b65d34 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1537,7 +1537,7 @@ @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr -@ cdecl wcscmp(wstr wstr) ntdll.wcscmp +@ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll @ cdecl wcscpy(ptr wstr) ntdll.wcscpy @ cdecl wcscpy_s(ptr long wstr) MSVCRT_wcscpy_s diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 8f82504..f55bf6d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1510,7 +1510,7 @@ @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr -@ cdecl wcscmp(wstr wstr) ntdll.wcscmp +@ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll @ cdecl wcscpy(ptr wstr) ntdll.wcscpy @ cdecl wcscpy_s(ptr long wstr) MSVCRT_wcscpy_s diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 56ff74a..6ca3e51 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1483,7 +1483,7 @@ @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr -@ cdecl wcscmp(wstr wstr) ntdll.wcscmp +@ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll @ cdecl wcscpy(ptr wstr) ntdll.wcscpy @ cdecl wcscpy_s(ptr long wstr) MSVCRT_wcscpy_s diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 0e4019f..9d861d9 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2555,3 +2555,11 @@ MSVCRT_size_t CDECL MSVCRT_wcsxfrm(MSVCRT_wchar_t *dest, { return MSVCRT__wcsxfrm_l(dest, src, len, NULL); } + +/********************************************************************* + * wcscmp (MSVCRT.@) + */ +int CDECL MSVCRT_wcscmp(const MSVCRT_wchar_t *str1, const MSVCRT_wchar_t *str2) +{ + return strcmpW(str1, str2); +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 1577de6..3e1cb55 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2557,7 +2557,7 @@ @ cdecl wcscat(wstr wstr) ntdll.wcscat @ cdecl wcscat_s(wstr long wstr) MSVCRT_wcscat_s @ cdecl wcschr(wstr long) MSVCRT_wcschr -@ cdecl wcscmp(wstr wstr) ntdll.wcscmp +@ cdecl wcscmp(wstr wstr) MSVCRT_wcscmp @ cdecl wcscoll(wstr wstr) MSVCRT_wcscoll @ cdecl wcscpy(ptr wstr) ntdll.wcscpy @ cdecl wcscpy_s(ptr long wstr) MSVCRT_wcscpy_s

1 0

Piotr Caban : msvcrt: Don't forward wcsrchr to ntdll.
by Alexandre Julliard 18 Oct '18

18 Oct '18

Module: wine Branch: master Commit: c69de2c27c0002ca9ccd227d3a6c2e69f68c7eef URL: https://source.winehq.org/git/wine.git/?a=commit;h=c69de2c27c0002ca9ccd227d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 15:23:08 2018 +0200 msvcrt: Don't forward wcsrchr to ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index cdb46a3..2ee8953 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1871,7 +1871,7 @@ @ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s @ cdecl wcsnlen(wstr long) MSVCRT_wcsnlen @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk -@ cdecl wcsrchr(wstr long) ntdll.wcsrchr +@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr @ 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 diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 81dcecd..3a42bb8 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2229,7 +2229,7 @@ @ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s @ cdecl wcsnlen(wstr long) MSVCRT_wcsnlen @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk -@ cdecl wcsrchr(wstr long) ntdll.wcsrchr +@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr @ 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 diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 338eb69..bbdb774 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2464,7 +2464,7 @@ @ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s @ cdecl wcsnlen(wstr long) MSVCRT_wcsnlen @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk -@ cdecl wcsrchr(wstr long) ntdll.wcsrchr +@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr @ 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 diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index c074378..96e9b8e 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -862,7 +862,7 @@ @ cdecl wcsncmp(wstr wstr long) MSVCRT_wcsncmp @ cdecl wcsncpy(ptr wstr long) MSVCRT_wcsncpy @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk -@ cdecl wcsrchr(wstr long) ntdll.wcsrchr +@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr @ cdecl wcsspn(wstr wstr) ntdll.wcsspn @ cdecl wcsstr(wstr wstr) MSVCRT_wcsstr @ cdecl wcstod(wstr ptr) MSVCRT_wcstod diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index f760979..ef9fdb8 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -858,7 +858,7 @@ @ cdecl wcsncmp(wstr wstr long) MSVCRT_wcsncmp @ cdecl wcsncpy(ptr wstr long) MSVCRT_wcsncpy @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk -@ cdecl wcsrchr(wstr long) ntdll.wcsrchr +@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr @ cdecl wcsspn(wstr wstr) ntdll.wcsspn @ cdecl wcsstr(wstr wstr) MSVCRT_wcsstr @ cdecl wcstod(wstr ptr) MSVCRT_wcstod diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 6b65d34..94fc2c3 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1551,7 +1551,7 @@ @ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s @ cdecl wcsnlen(wstr long) MSVCRT_wcsnlen @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk -@ cdecl wcsrchr(wstr long) ntdll.wcsrchr +@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr @ 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 diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index f55bf6d..c467c9d 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1524,7 +1524,7 @@ @ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s @ cdecl wcsnlen(wstr long) MSVCRT_wcsnlen @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk -@ cdecl wcsrchr(wstr long) ntdll.wcsrchr +@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr @ 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 diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 6ca3e51..ded47de 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1497,7 +1497,7 @@ @ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s @ cdecl wcsnlen(wstr long) MSVCRT_wcsnlen @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk -@ cdecl wcsrchr(wstr long) ntdll.wcsrchr +@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr @ 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 diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 9d861d9..7717336 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2439,6 +2439,14 @@ MSVCRT_wchar_t* CDECL MSVCRT_wcschr(const MSVCRT_wchar_t *str, MSVCRT_wchar_t ch return strchrW(str, ch); } +/********************************************************************* + * wcsrchr (MSVCRT.@) + */ +MSVCRT_wchar_t* CDECL MSVCRT_wcsrchr(const MSVCRT_wchar_t *str, MSVCRT_wchar_t ch) +{ + return strrchrW(str, ch); +} + /*********************************************************************** * wcslen (MSVCRT.@) */ diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 3e1cb55..c26d103 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2571,7 +2571,7 @@ @ cdecl wcsncpy_s(ptr long wstr long) MSVCRT_wcsncpy_s @ cdecl wcsnlen(wstr long) MSVCRT_wcsnlen @ cdecl wcspbrk(wstr wstr) MSVCRT_wcspbrk -@ cdecl wcsrchr(wstr long) ntdll.wcsrchr +@ cdecl wcsrchr(wstr long) MSVCRT_wcsrchr @ 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

1 0

Piotr Caban : msvcrt: Don't forward wcstol to ntdll.
by Alexandre Julliard 18 Oct '18

18 Oct '18

Module: wine Branch: master Commit: 48dbb1786195167b862a6e8c163adb52e4801e18 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48dbb1786195167b862a6e8c… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 15:23:22 2018 +0200 msvcrt: Don't forward wcstol to ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/wcs.c | 9 +++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 18 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 2ee8953..61f72f0 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1879,7 +1879,7 @@ @ cdecl wcstod(wstr ptr) MSVCRT_wcstod @ cdecl wcstok(wstr wstr) MSVCRT_wcstok @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s -@ cdecl wcstol(wstr ptr long) ntdll.wcstol +@ 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 @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 3a42bb8..4edad71 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2237,7 +2237,7 @@ @ cdecl wcstod(wstr ptr) MSVCRT_wcstod @ cdecl wcstok(wstr wstr) MSVCRT_wcstok @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s -@ cdecl wcstol(wstr ptr long) ntdll.wcstol +@ 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 @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index bbdb774..7d18e14 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2474,7 +2474,7 @@ @ stub wcstoimax @ cdecl wcstok(wstr wstr) MSVCRT_wcstok @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s -@ cdecl wcstol(wstr ptr long) ntdll.wcstol +@ cdecl wcstol(wstr ptr long) MSVCRT_wcstol @ stub wcstold @ cdecl -ret64 wcstoll(wstr ptr long) MSVCRT__wcstoi64 @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 96e9b8e..ac2eb95 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -867,7 +867,7 @@ @ cdecl wcsstr(wstr wstr) MSVCRT_wcsstr @ cdecl wcstod(wstr ptr) MSVCRT_wcstod @ cdecl wcstok(wstr wstr) MSVCRT_wcstok -@ cdecl wcstol(wstr ptr long) ntdll.wcstol +@ cdecl wcstol(wstr ptr long) MSVCRT_wcstol @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul @ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index ef9fdb8..20a37eb 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -863,7 +863,7 @@ @ cdecl wcsstr(wstr wstr) MSVCRT_wcsstr @ cdecl wcstod(wstr ptr) MSVCRT_wcstod @ cdecl wcstok(wstr wstr) MSVCRT_wcstok -@ cdecl wcstol(wstr ptr long) ntdll.wcstol +@ cdecl wcstol(wstr ptr long) MSVCRT_wcstol @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul @ cdecl wcsxfrm(ptr wstr long) MSVCRT_wcsxfrm diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 94fc2c3..544483c 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1559,7 +1559,7 @@ @ cdecl wcstod(wstr ptr) MSVCRT_wcstod @ cdecl wcstok(wstr wstr) MSVCRT_wcstok @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s -@ cdecl wcstol(wstr ptr long) ntdll.wcstol +@ 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 @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index c467c9d..40dc508 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1532,7 +1532,7 @@ @ cdecl wcstod(wstr ptr) MSVCRT_wcstod @ cdecl wcstok(wstr wstr) MSVCRT_wcstok @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s -@ cdecl wcstol(wstr ptr long) ntdll.wcstol +@ 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 @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index ded47de..5db436a 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1505,7 +1505,7 @@ @ cdecl wcstod(wstr ptr) MSVCRT_wcstod @ cdecl wcstok(wstr wstr) MSVCRT_wcstok @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s -@ cdecl wcstol(wstr ptr long) ntdll.wcstol +@ 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 @ cdecl wcstoul(wstr ptr long) MSVCRT_wcstoul diff --git a/dlls/msvcrt/wcs.c b/dlls/msvcrt/wcs.c index 7717336..77099f6 100644 --- a/dlls/msvcrt/wcs.c +++ b/dlls/msvcrt/wcs.c @@ -2225,6 +2225,15 @@ MSVCRT_long CDECL MSVCRT__wcstol_l(const MSVCRT_wchar_t *s, } /********************************************************************* + * wcstol (MSVCRT.@) + */ +MSVCRT_long CDECL MSVCRT_wcstol(const MSVCRT_wchar_t *s, + MSVCRT_wchar_t **end, int base) +{ + return MSVCRT__wcstol_l(s, end, base, NULL); +} + +/********************************************************************* * _wtoi_l (MSVCRT.@) */ int __cdecl MSVCRT__wtoi_l(const MSVCRT_wchar_t *str, MSVCRT__locale_t locale) diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index c26d103..bc650ff 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2581,7 +2581,7 @@ @ stub wcstoimax @ cdecl wcstok(wstr wstr) MSVCRT_wcstok @ cdecl wcstok_s(ptr wstr ptr) MSVCRT_wcstok_s -@ cdecl wcstol(wstr ptr long) ntdll.wcstol +@ cdecl wcstol(wstr ptr long) MSVCRT_wcstol @ stub wcstold @ cdecl -ret64 wcstoll(wstr ptr long) MSVCRT__wcstoi64 @ cdecl wcstombs(ptr ptr long) MSVCRT_wcstombs

1 0

Piotr Caban : msvcrt: Don't forward strcspn to ntdll.
by Alexandre Julliard 18 Oct '18

18 Oct '18

Module: wine Branch: master Commit: f43ae5e8034c1c9afd339e1aa1be8d013eb0f68b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f43ae5e8034c1c9afd339e1a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 15:23:29 2018 +0200 msvcrt: Don't forward strcspn to ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index 61f72f0..d39d8d8 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1802,7 +1802,7 @@ @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s -@ cdecl strcspn(str str) ntdll.strcspn +@ cdecl strcspn(str str) MSVCRT_strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strerror_s(ptr long long) MSVCRT_strerror_s @ cdecl strftime(ptr long str ptr) MSVCRT_strftime diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 4edad71..4df968d 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2160,7 +2160,7 @@ @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s -@ cdecl strcspn(str str) ntdll.strcspn +@ cdecl strcspn(str str) MSVCRT_strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strerror_s(ptr long long) MSVCRT_strerror_s @ cdecl strftime(ptr long str ptr) MSVCRT_strftime diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 7d18e14..5e21169 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2370,7 +2370,7 @@ @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s -@ cdecl strcspn(str str) ntdll.strcspn +@ cdecl strcspn(str str) MSVCRT_strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strerror_s(ptr long long) MSVCRT_strerror_s @ cdecl strftime(ptr long str ptr) MSVCRT_strftime diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index ac2eb95..28a9ddc 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -814,7 +814,7 @@ @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) MSVCRT_strcpy -@ cdecl strcspn(str str) ntdll.strcspn +@ cdecl strcspn(str str) MSVCRT_strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strftime(ptr long str ptr) MSVCRT_strftime @ cdecl strlen(str) MSVCRT_strlen diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 20a37eb..3b7f1cf 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -810,7 +810,7 @@ @ cdecl strcmp(str str) MSVCRT_strcmp @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) MSVCRT_strcpy -@ cdecl strcspn(str str) ntdll.strcspn +@ cdecl strcspn(str str) MSVCRT_strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strftime(ptr long str ptr) MSVCRT_strftime @ cdecl strlen(str) MSVCRT_strlen diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 544483c..8f35c54 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1482,7 +1482,7 @@ @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s -@ cdecl strcspn(str str) ntdll.strcspn +@ cdecl strcspn(str str) MSVCRT_strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strerror_s(ptr long long) MSVCRT_strerror_s @ cdecl strftime(ptr long str ptr) MSVCRT_strftime diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index 40dc508..a9c6a13 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1455,7 +1455,7 @@ @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s -@ cdecl strcspn(str str) ntdll.strcspn +@ cdecl strcspn(str str) MSVCRT_strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strerror_s(ptr long long) MSVCRT_strerror_s @ cdecl strftime(ptr long str ptr) MSVCRT_strftime diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 5db436a..16f1790 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1423,7 +1423,7 @@ @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s -@ cdecl strcspn(str str) ntdll.strcspn +@ cdecl strcspn(str str) MSVCRT_strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strerror_s(ptr long long) MSVCRT_strerror_s @ cdecl strftime(ptr long str ptr) MSVCRT_strftime diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index e0e620f..513f3b2 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2044,3 +2044,11 @@ int __cdecl MSVCRT__memicmp(const char *s1, const char *s2, MSVCRT_size_t len) { return MSVCRT__memicmp_l(s1, s2, len, NULL); } + +/********************************************************************* + * strcspn (MSVCRT.@) + */ +MSVCRT_size_t __cdecl MSVCRT_strcspn(const char *str, const char *reject) +{ + return strcspn( str, reject ); +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index bc650ff..8838302 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2501,7 +2501,7 @@ @ cdecl strcoll(str str) MSVCRT_strcoll @ cdecl strcpy(ptr str) MSVCRT_strcpy @ cdecl strcpy_s(ptr long str) MSVCRT_strcpy_s -@ cdecl strcspn(str str) ntdll.strcspn +@ cdecl strcspn(str str) MSVCRT_strcspn @ cdecl strerror(long) MSVCRT_strerror @ cdecl strerror_s(ptr long long) MSVCRT_strerror_s @ cdecl strftime(ptr long str ptr) MSVCRT_strftime

1 0

Piotr Caban : msvcrt: Don't forward strpbrk to ntdll.
by Alexandre Julliard 18 Oct '18

18 Oct '18

Module: wine Branch: master Commit: c99d14d04de1e3958b6f293f79422a40367308ba URL: https://source.winehq.org/git/wine.git/?a=commit;h=c99d14d04de1e3958b6f293f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Wed Oct 17 15:23:37 2018 +0200 msvcrt: Don't forward strpbrk to ntdll. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcr100/msvcr100.spec | 2 +- dlls/msvcr110/msvcr110.spec | 2 +- dlls/msvcr120/msvcr120.spec | 2 +- dlls/msvcr70/msvcr70.spec | 2 +- dlls/msvcr71/msvcr71.spec | 2 +- dlls/msvcr80/msvcr80.spec | 2 +- dlls/msvcr90/msvcr90.spec | 2 +- dlls/msvcrt/msvcrt.spec | 2 +- dlls/msvcrt/string.c | 8 ++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 10 files changed, 17 insertions(+), 9 deletions(-) diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec index d39d8d8..1579415 100644 --- a/dlls/msvcr100/msvcr100.spec +++ b/dlls/msvcr100/msvcr100.spec @@ -1813,7 +1813,7 @@ @ cdecl strncpy(ptr str long) MSVCRT_strncpy @ cdecl strncpy_s(ptr long str long) MSVCRT_strncpy_s @ cdecl strnlen(str long) MSVCRT_strnlen -@ cdecl strpbrk(str str) ntdll.strpbrk +@ cdecl strpbrk(str str) MSVCRT_strpbrk @ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) MSVCRT_strstr diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec index 4df968d..029620f 100644 --- a/dlls/msvcr110/msvcr110.spec +++ b/dlls/msvcr110/msvcr110.spec @@ -2171,7 +2171,7 @@ @ cdecl strncpy(ptr str long) MSVCRT_strncpy @ cdecl strncpy_s(ptr long str long) MSVCRT_strncpy_s @ cdecl strnlen(str long) MSVCRT_strnlen -@ cdecl strpbrk(str str) ntdll.strpbrk +@ cdecl strpbrk(str str) MSVCRT_strpbrk @ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) MSVCRT_strstr diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec index 5e21169..89002ed 100644 --- a/dlls/msvcr120/msvcr120.spec +++ b/dlls/msvcr120/msvcr120.spec @@ -2381,7 +2381,7 @@ @ cdecl strncpy(ptr str long) MSVCRT_strncpy @ cdecl strncpy_s(ptr long str long) MSVCRT_strncpy_s @ cdecl strnlen(str long) MSVCRT_strnlen -@ cdecl strpbrk(str str) ntdll.strpbrk +@ cdecl strpbrk(str str) MSVCRT_strpbrk @ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) MSVCRT_strstr diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec index 28a9ddc..bda8160 100644 --- a/dlls/msvcr70/msvcr70.spec +++ b/dlls/msvcr70/msvcr70.spec @@ -821,7 +821,7 @@ @ cdecl strncat(str str long) MSVCRT_strncat @ cdecl strncmp(str str long) MSVCRT_strncmp @ cdecl strncpy(ptr str long) MSVCRT_strncpy -@ cdecl strpbrk(str str) ntdll.strpbrk +@ cdecl strpbrk(str str) MSVCRT_strpbrk @ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) MSVCRT_strstr diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec index 3b7f1cf..124b73b 100644 --- a/dlls/msvcr71/msvcr71.spec +++ b/dlls/msvcr71/msvcr71.spec @@ -817,7 +817,7 @@ @ cdecl strncat(str str long) MSVCRT_strncat @ cdecl strncmp(str str long) MSVCRT_strncmp @ cdecl strncpy(ptr str long) MSVCRT_strncpy -@ cdecl strpbrk(str str) ntdll.strpbrk +@ cdecl strpbrk(str str) MSVCRT_strpbrk @ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) MSVCRT_strstr diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec index 8f35c54..7aebe34 100644 --- a/dlls/msvcr80/msvcr80.spec +++ b/dlls/msvcr80/msvcr80.spec @@ -1493,7 +1493,7 @@ @ cdecl strncpy(ptr str long) MSVCRT_strncpy @ cdecl strncpy_s(ptr long str long) MSVCRT_strncpy_s @ cdecl strnlen(str long) MSVCRT_strnlen -@ cdecl strpbrk(str str) ntdll.strpbrk +@ cdecl strpbrk(str str) MSVCRT_strpbrk @ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) MSVCRT_strstr diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec index a9c6a13..eb70ff9 100644 --- a/dlls/msvcr90/msvcr90.spec +++ b/dlls/msvcr90/msvcr90.spec @@ -1466,7 +1466,7 @@ @ cdecl strncpy(ptr str long) MSVCRT_strncpy @ cdecl strncpy_s(ptr long str long) MSVCRT_strncpy_s @ cdecl strnlen(str long) MSVCRT_strnlen -@ cdecl strpbrk(str str) ntdll.strpbrk +@ cdecl strpbrk(str str) MSVCRT_strpbrk @ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) MSVCRT_strstr diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec index 16f1790..d963f7c 100644 --- a/dlls/msvcrt/msvcrt.spec +++ b/dlls/msvcrt/msvcrt.spec @@ -1434,7 +1434,7 @@ @ cdecl strncpy(ptr str long) MSVCRT_strncpy @ cdecl strncpy_s(ptr long str long) MSVCRT_strncpy_s @ cdecl strnlen(str long) MSVCRT_strnlen -@ cdecl strpbrk(str str) ntdll.strpbrk +@ cdecl strpbrk(str str) MSVCRT_strpbrk @ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) MSVCRT_strstr diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c index 513f3b2..cbbb65b 100644 --- a/dlls/msvcrt/string.c +++ b/dlls/msvcrt/string.c @@ -2052,3 +2052,11 @@ MSVCRT_size_t __cdecl MSVCRT_strcspn(const char *str, const char *reject) { return strcspn( str, reject ); } + +/********************************************************************* + * strpbrk (MSVCRT.@) + */ +char* __cdecl MSVCRT_strpbrk(const char *str, const char *accept) +{ + return strpbrk(str, accept); +} diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 8838302..404da75 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -2512,7 +2512,7 @@ @ cdecl strncpy(ptr str long) MSVCRT_strncpy @ cdecl strncpy_s(ptr long str long) MSVCRT_strncpy_s @ cdecl strnlen(str long) MSVCRT_strnlen -@ cdecl strpbrk(str str) ntdll.strpbrk +@ cdecl strpbrk(str str) MSVCRT_strpbrk @ cdecl strrchr(str long) MSVCRT_strrchr @ cdecl strspn(str str) ntdll.strspn @ cdecl strstr(str str) MSVCRT_strstr

1 0

Jacek Caban : rpcrt4/tests: Get rid of no longer needed win9x checks.
by Alexandre Julliard 18 Oct '18

18 Oct '18

Module: wine Branch: master Commit: d6c94be74d166a42321548808e482873e2c0685f URL: https://source.winehq.org/git/wine.git/?a=commit;h=d6c94be74d166a4232154880… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed Oct 17 15:57:08 2018 +0200 rpcrt4/tests: Get rid of no longer needed win9x checks. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/rpcrt4/tests/ndr_marshall.c | 32 +++++++++----------------------- dlls/rpcrt4/tests/rpc_async.c | 23 ++++++----------------- 2 files changed, 15 insertions(+), 40 deletions(-) diff --git a/dlls/rpcrt4/tests/ndr_marshall.c b/dlls/rpcrt4/tests/ndr_marshall.c index 2695d46..d65b730 100644 --- a/dlls/rpcrt4/tests/ndr_marshall.c +++ b/dlls/rpcrt4/tests/ndr_marshall.c @@ -2187,11 +2187,6 @@ static void test_conf_complex_array(void) #endif expected_length = (4 + memsrc.dim1 * (2 + memsrc.dim2)) * 4; - if (StubMsg.BufferLength == 96) - { - win_skip("Tests crash on Win9x, WinMe and NT4\n"); - goto cleanup; - } ok(StubMsg.BufferLength >= expected_length, "length %d\n", StubMsg.BufferLength); /*NdrGetBuffer(&_StubMsg, _StubMsg.BufferLength, NULL);*/ @@ -2261,7 +2256,6 @@ static void test_conf_complex_array(void) HeapFree(GetProcessHeap(), 0, StubMsg.RpcMsg->Buffer); -cleanup: for(i = 0; i < memsrc.dim1; i++) HeapFree(GetProcessHeap(), 0, memsrc.array[i]); HeapFree(GetProcessHeap(), 0, memsrc.array); @@ -2397,14 +2391,6 @@ static void test_NdrGetUserMarshalInfo(void) unsigned char buffer[16]; void *rpc_channel_buffer = (void *)(ULONG_PTR)0xcafebabe; RPC_MESSAGE rpc_msg; - RPC_STATUS (RPC_ENTRY *pNdrGetUserMarshalInfo)(ULONG *,ULONG,NDR_USER_MARSHAL_INFO *); - - pNdrGetUserMarshalInfo = (void *)GetProcAddress(GetModuleHandleA("rpcrt4.dll"), "NdrGetUserMarshalInfo"); - if (!pNdrGetUserMarshalInfo) - { - skip("NdrGetUserMarshalInfo not exported\n"); - return; - } /* unmarshall */ @@ -2432,7 +2418,7 @@ static void test_NdrGetUserMarshalInfo(void) memset(&umi, 0xaa, sizeof(umi)); - status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); + status = NdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); ok(status == RPC_S_OK, "NdrGetUserMarshalInfo failed with error %d\n", status); ok( umi.InformationLevel == 1, "umi.InformationLevel was %u instead of 1\n", @@ -2466,7 +2452,7 @@ static void test_NdrGetUserMarshalInfo(void) memset(&umi, 0xaa, sizeof(umi)); - status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); + status = NdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); ok(status == RPC_S_OK, "NdrGetUserMarshalInfo failed with error %d\n", status); ok( umi.InformationLevel == 1, "umi.InformationLevel was %u instead of 1\n", @@ -2500,7 +2486,7 @@ static void test_NdrGetUserMarshalInfo(void) memset(&umi, 0xaa, sizeof(umi)); - status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); + status = NdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); ok(status == RPC_S_OK, "NdrGetUserMarshalInfo failed with error %d\n", status); ok( umi.InformationLevel == 1, "umi.InformationLevel was %u instead of 1\n", @@ -2534,7 +2520,7 @@ static void test_NdrGetUserMarshalInfo(void) memset(&umi, 0xaa, sizeof(umi)); - status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); + status = NdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); ok(status == RPC_S_OK, "NdrGetUserMarshalInfo failed with error %d\n", status); ok( umi.InformationLevel == 1, "umi.InformationLevel was %u instead of 1\n", @@ -2566,7 +2552,7 @@ static void test_NdrGetUserMarshalInfo(void) umcb.CBType = USER_MARSHAL_CB_MARSHALL; - status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); + status = NdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); ok(status == RPC_S_OK, "NdrGetUserMarshalInfo failed with error %d\n", status); ok( U1(umi).Level1.BufferSize == 0, "umi.Level1.BufferSize was %u instead of 0\n", @@ -2575,22 +2561,22 @@ static void test_NdrGetUserMarshalInfo(void) /* error conditions */ rpc_msg.BufferLength = 14; - status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); + status = NdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); ok(status == ERROR_INVALID_USER_BUFFER, "NdrGetUserMarshalInfo should have failed with ERROR_INVALID_USER_BUFFER instead of %d\n", status); rpc_msg.BufferLength = 15; - status = pNdrGetUserMarshalInfo(&umcb.Flags, 9999, &umi); + status = NdrGetUserMarshalInfo(&umcb.Flags, 9999, &umi); ok(status == RPC_S_INVALID_ARG, "NdrGetUserMarshalInfo should have failed with RPC_S_INVALID_ARG instead of %d\n", status); umcb.CBType = 9999; - status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); + status = NdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); ok(status == RPC_S_OK, "NdrGetUserMarshalInfo failed with error %d\n", status); umcb.CBType = USER_MARSHAL_CB_MARSHALL; umcb.Signature = 0; - status = pNdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); + status = NdrGetUserMarshalInfo(&umcb.Flags, 1, &umi); ok(status == RPC_S_INVALID_ARG, "NdrGetUserMarshalInfo should have failed with RPC_S_INVALID_ARG instead of %d\n", status); } diff --git a/dlls/rpcrt4/tests/rpc_async.c b/dlls/rpcrt4/tests/rpc_async.c index 555c58f..15c57fe 100644 --- a/dlls/rpcrt4/tests/rpc_async.c +++ b/dlls/rpcrt4/tests/rpc_async.c @@ -25,9 +25,6 @@ #include <rpc.h> #include <rpcasync.h> -static RPC_STATUS (RPC_ENTRY *pRpcAsyncInitializeHandle)(PRPC_ASYNC_STATE,unsigned int); -static RPC_STATUS (RPC_ENTRY *pRpcAsyncGetCallStatus)(PRPC_ASYNC_STATE); - static void test_RpcAsyncInitializeHandle(void) { char buffer[256]; @@ -36,15 +33,15 @@ static void test_RpcAsyncInitializeHandle(void) int i; void *unset_ptr; - status = pRpcAsyncInitializeHandle((PRPC_ASYNC_STATE)buffer, sizeof(buffer)); + status = RpcAsyncInitializeHandle((PRPC_ASYNC_STATE)buffer, sizeof(buffer)); ok(status == ERROR_INVALID_PARAMETER, "RpcAsyncInitializeHandle with large Size should have returned ERROR_INVALID_PARAMETER instead of %d\n", status); - status = pRpcAsyncInitializeHandle(&async, sizeof(async) - 1); + status = RpcAsyncInitializeHandle(&async, sizeof(async) - 1); ok(status == ERROR_INVALID_PARAMETER, "RpcAsyncInitializeHandle with small Size should have returned ERROR_INVALID_PARAMETER instead of %d\n", status); memset(&async, 0xcc, sizeof(async)); memset(&unset_ptr, 0xcc, sizeof(unset_ptr)); - status = pRpcAsyncInitializeHandle(&async, sizeof(async)); + status = RpcAsyncInitializeHandle(&async, sizeof(async)); ok(status == RPC_S_OK, "RpcAsyncInitializeHandle failed with error %d\n", status); ok(async.Size == sizeof(async), "async.Size wrong: %d\n", async.Size); @@ -65,29 +62,21 @@ static void test_RpcAsyncGetCallStatus(void) RPC_ASYNC_STATE async; RPC_STATUS status; - status = pRpcAsyncInitializeHandle(&async, sizeof(async)); + status = RpcAsyncInitializeHandle(&async, sizeof(async)); ok(status == RPC_S_OK, "RpcAsyncInitializeHandle failed with error %d\n", status); - status = pRpcAsyncGetCallStatus(&async); + status = RpcAsyncGetCallStatus(&async); todo_wine ok(status == RPC_S_INVALID_BINDING, "RpcAsyncGetCallStatus should have returned RPC_S_INVALID_BINDING instead of %d\n", status); memset(&async, 0, sizeof(async)); - status = pRpcAsyncGetCallStatus(&async); + status = RpcAsyncGetCallStatus(&async); todo_wine ok(status == RPC_S_INVALID_BINDING, "RpcAsyncGetCallStatus should have returned RPC_S_INVALID_BINDING instead of %d\n", status); } START_TEST( rpc_async ) { - HMODULE hRpcRt4 = GetModuleHandleA("rpcrt4.dll"); - pRpcAsyncInitializeHandle = (void *)GetProcAddress(hRpcRt4, "RpcAsyncInitializeHandle"); - pRpcAsyncGetCallStatus = (void *)GetProcAddress(hRpcRt4, "RpcAsyncGetCallStatus"); - if (!pRpcAsyncInitializeHandle || !pRpcAsyncGetCallStatus) - { - win_skip("asynchronous functions not available\n"); - return; - } test_RpcAsyncInitializeHandle(); test_RpcAsyncGetCallStatus(); }

1 0