June 2022 - Wine-commits - list.winehq.org

Zebediah Figura : user32: Merge rawinput.c into input.c.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: ff166bac152a38b6984fe58ff3142c054251aab6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff166bac152a38b6984fe58f… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Sun May 15 18:30:25 2022 -0500 user32: Merge rawinput.c into input.c. --- dlls/user32/Makefile.in | 1 - dlls/user32/input.c | 49 +++++++++++++++++++++++++++ dlls/user32/rawinput.c | 88 ------------------------------------------------- 3 files changed, 49 insertions(+), 89 deletions(-) diff --git a/dlls/user32/Makefile.in b/dlls/user32/Makefile.in index 79821929390..3a01810991d 100644 --- a/dlls/user32/Makefile.in +++ b/dlls/user32/Makefile.in @@ -34,7 +34,6 @@ C_SRCS = \ nonclient.c \ painting.c \ property.c \ - rawinput.c \ resource.c \ scroll.c \ static.c \ diff --git a/dlls/user32/input.c b/dlls/user32/input.c index 52d4414b673..106f890da7a 100644 --- a/dlls/user32/input.c +++ b/dlls/user32/input.c @@ -6,6 +6,8 @@ * Copyright 1997 David Faure * Copyright 1998 Morten Welinder * Copyright 1998 Ulrich Weigand + * Copyright 2012 Henri Verbeet + * Copyright 2018 Zebediah Figura for CodeWeavers * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -623,3 +625,50 @@ BOOL WINAPI UnregisterDeviceNotification( HDEVNOTIFY handle ) return I_ScUnregisterDeviceNotification( handle ); } + +/*********************************************************************** + * GetRawInputDeviceInfoA (USER32.@) + */ +UINT WINAPI GetRawInputDeviceInfoA( HANDLE device, UINT command, void *data, UINT *size ) +{ + TRACE( "device %p, command %#x, data %p, size %p.\n", device, command, data, size ); + + /* RIDI_DEVICENAME size is in chars, not bytes */ + if (command == RIDI_DEVICENAME) + { + WCHAR *nameW; + UINT ret, sizeW; + + if (!size) return ~0U; + + sizeW = *size; + + if (data && sizeW > 0) + nameW = HeapAlloc( GetProcessHeap(), 0, sizeof(WCHAR) * sizeW ); + else + nameW = NULL; + + ret = NtUserGetRawInputDeviceInfo( device, command, nameW, &sizeW ); + + if (ret && ret != ~0U) + WideCharToMultiByte( CP_ACP, 0, nameW, -1, data, *size, NULL, NULL ); + + *size = sizeW; + + HeapFree( GetProcessHeap(), 0, nameW ); + + return ret; + } + + return NtUserGetRawInputDeviceInfo( device, command, data, size ); +} + +/*********************************************************************** + * DefRawInputProc (USER32.@) + */ +LRESULT WINAPI DefRawInputProc( RAWINPUT **data, INT data_count, UINT header_size ) +{ + FIXME( "data %p, data_count %d, header_size %u stub!\n", data, data_count, header_size ); + + return 0; +} diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c deleted file mode 100644 index 98854d75690..00000000000 --- a/dlls/user32/rawinput.c +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Raw Input - * - * Copyright 2012 Henri Verbeet - * Copyright 2018 Zebediah Figura for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#include "ntstatus.h" -#define WIN32_NO_STATUS -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winioctl.h" -#include "winnls.h" -#include "winreg.h" -#include "winuser.h" -#include "ddk/hidclass.h" -#include "wine/debug.h" -#include "wine/server.h" -#include "wine/hid.h" - -#include "user_private.h" - -WINE_DEFAULT_DEBUG_CHANNEL(rawinput); - -/*********************************************************************** - * GetRawInputDeviceInfoA (USER32.@) - */ -UINT WINAPI GetRawInputDeviceInfoA(HANDLE device, UINT command, void *data, UINT *data_size) -{ - TRACE("device %p, command %#x, data %p, data_size %p.\n", - device, command, data, data_size); - - /* RIDI_DEVICENAME data_size is in chars, not bytes */ - if (command == RIDI_DEVICENAME) - { - WCHAR *nameW; - UINT ret, nameW_sz; - - if (!data_size) return ~0U; - - nameW_sz = *data_size; - - if (data && nameW_sz > 0) - nameW = HeapAlloc(GetProcessHeap(), 0, sizeof(WCHAR) * nameW_sz); - else - nameW = NULL; - - ret = NtUserGetRawInputDeviceInfo( device, command, nameW, &nameW_sz ); - - if (ret && ret != ~0U) - WideCharToMultiByte(CP_ACP, 0, nameW, -1, data, *data_size, NULL, NULL); - - *data_size = nameW_sz; - - HeapFree(GetProcessHeap(), 0, nameW); - - return ret; - } - - return NtUserGetRawInputDeviceInfo( device, command, data, data_size ); -} - -/*********************************************************************** - * DefRawInputProc (USER32.@) - */ -LRESULT WINAPI DefRawInputProc(RAWINPUT **data, INT data_count, UINT header_size) -{ - FIXME("data %p, data_count %d, header_size %u stub!\n", data, data_count, header_size); - - return 0; -}

1 0

Rémi Bernon : mf: Uninitialize renderer before creating mixer and presenter.
by Alexandre Julliard 29 Jun '22

29 Jun '22

Module: wine Branch: master Commit: 90696fe884ed42cb58feae0fd53ad1f4d0281bc7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=90696fe884ed42cb58feae0f… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Mon Jun 27 13:43:18 2022 +0200 mf: Uninitialize renderer before creating mixer and presenter. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> --- dlls/mf/evr.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/dlls/mf/evr.c b/dlls/mf/evr.c index 90702ff3d95..c9506af9143 100644 --- a/dlls/mf/evr.c +++ b/dlls/mf/evr.c @@ -1702,11 +1702,8 @@ static HRESULT video_renderer_configure_presenter(struct video_renderer *rendere return hr; } -static HRESULT video_renderer_initialize(struct video_renderer *renderer, IMFTransform *mixer, - IMFVideoPresenter *presenter) +static void video_renderer_uninitialize(struct video_renderer *renderer) { - HRESULT hr; - video_renderer_release_services(renderer); if (renderer->mixer) @@ -1726,6 +1723,12 @@ static HRESULT video_renderer_initialize(struct video_renderer *renderer, IMFTra IUnknown_Release(renderer->device_manager); renderer->device_manager = NULL; } +} + +static HRESULT video_renderer_initialize(struct video_renderer *renderer, IMFTransform *mixer, + IMFVideoPresenter *presenter) +{ + HRESULT hr; renderer->mixer = mixer; IMFTransform_AddRef(renderer->mixer); @@ -1747,11 +1750,22 @@ static HRESULT WINAPI video_renderer_InitializeRenderer(IMFVideoRenderer *iface, TRACE("%p, %p, %p.\n", iface, mixer, presenter); + EnterCriticalSection(&renderer->cs); + + if (renderer->flags & EVR_SHUT_DOWN) + { + LeaveCriticalSection(&renderer->cs); + return MF_E_SHUTDOWN; + } + + video_renderer_uninitialize(renderer); + if (mixer) IMFTransform_AddRef(mixer); else if (FAILED(hr = video_renderer_create_mixer(NULL, &mixer))) { WARN("Failed to create default mixer object, hr %#lx.\n", hr); + LeaveCriticalSection(&renderer->cs); return hr; } @@ -1760,21 +1774,15 @@ static HRESULT WINAPI video_renderer_InitializeRenderer(IMFVideoRenderer *iface, else if (FAILED(hr = video_renderer_create_presenter(renderer, NULL, &presenter))) { WARN("Failed to create default presenter, hr %#lx.\n", hr); + LeaveCriticalSection(&renderer->cs); IMFTransform_Release(mixer); return hr; } - EnterCriticalSection(&renderer->cs); - - if (renderer->flags & EVR_SHUT_DOWN) - hr = MF_E_SHUTDOWN; - else - { - /* FIXME: check clock state */ - /* FIXME: check that streams are not initialized */ + /* FIXME: check clock state */ + /* FIXME: check that streams are not initialized */ - hr = video_renderer_initialize(renderer, mixer, presenter); - } + hr = video_renderer_initialize(renderer, mixer, presenter); LeaveCriticalSection(&renderer->cs);

1 0

Alexandre Julliard : ntdll: Add a few more isw* functions.
by Alexandre Julliard 29 Jun '22

29 Jun '22

Module: wine Branch: master Commit: c948a6cf9201152a664ab4976da51bdfac59deaa URL: https://source.winehq.org/git/wine.git/?a=commit;h=c948a6cf9201152a664ab497… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 29 11:48:20 2022 +0200 ntdll: Add a few more isw* functions. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 4 +++ dlls/ntdll/wcstring.c | 83 ++++++++++++++++++++++++++++----------------------- 2 files changed, 49 insertions(+), 38 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index b1650ab4306..fa1941ec811 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1560,10 +1560,14 @@ @ cdecl ispunct(long) @ cdecl isspace(long) @ cdecl isupper(long) +@ cdecl iswalnum(long) @ cdecl iswalpha(long) +@ cdecl iswascii(long) @ cdecl iswctype(long long) @ cdecl iswdigit(long) +@ cdecl iswgraph(long) @ cdecl iswlower(long) +@ cdecl iswprint(long) @ cdecl iswspace(long) @ cdecl iswxdigit(long) @ cdecl isxdigit(long) diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index 9422e4f676c..eef3197c4fe 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -384,77 +384,84 @@ INT __cdecl iswctype( WCHAR wc, unsigned short type ) } +/********************************************************************* + * iswalnum (NTDLL.@) + */ +INT __cdecl iswalnum( WCHAR wc ) +{ + return iswctype( wc, C1_ALPHA | C1_UPPER | C1_LOWER | C1_DIGIT ); +} + + /********************************************************************* * iswalpha (NTDLL.@) */ INT __cdecl iswalpha( WCHAR wc ) { - if (wc >= 256) return 0; - return wctypes[wc] & (C1_ALPHA | C1_UPPER | C1_LOWER); + return iswctype( wc, C1_ALPHA | C1_UPPER | C1_LOWER ); } /********************************************************************* - * iswdigit (NTDLL.@) - * - * Checks if a unicode char wc is a digit - * - * RETURNS - * TRUE: The unicode char wc is a digit. - * FALSE: Otherwise + * iswascii (NTDLL.@) + */ +INT __cdecl iswascii( WCHAR wc ) +{ + return wc < 0x80; +} + + +/********************************************************************* + * iswdigit (NTDLL.@) */ INT __cdecl iswdigit( WCHAR wc ) { - if (wc >= 256) return 0; - return wctypes[wc] & C1_DIGIT; + return iswctype( wc, C1_DIGIT ); } /********************************************************************* - * iswlower (NTDLL.@) - * - * Checks if a unicode char wc is a lower case letter - * - * RETURNS - * TRUE: The unicode char wc is a lower case letter. - * FALSE: Otherwise + * iswgraph (NTDLL.@) + */ +INT __cdecl iswgraph( WCHAR wc ) +{ + return iswctype( wc, C1_ALPHA | C1_UPPER | C1_LOWER | C1_DIGIT | C1_PUNCT ); +} + + +/********************************************************************* + * iswlower (NTDLL.@) */ INT __cdecl iswlower( WCHAR wc ) { - if (wc >= 256) return 0; - return wctypes[wc] & C1_LOWER; + return iswctype( wc, C1_LOWER ); } /********************************************************************* - * iswspace (NTDLL.@) - * - * Checks if a unicode char wc is a white space character - * - * RETURNS - * TRUE: The unicode char wc is a white space character. - * FALSE: Otherwise + * iswprint (NTDLL.@) + */ +INT __cdecl iswprint( WCHAR wc ) +{ + return iswctype( wc, C1_ALPHA | C1_UPPER | C1_LOWER | C1_DIGIT | C1_PUNCT | C1_BLANK ); +} + + +/********************************************************************* + * iswspace (NTDLL.@) */ INT __cdecl iswspace( WCHAR wc ) { - if (wc >= 256) return 0; - return wctypes[wc] & C1_SPACE; + return iswctype( wc, C1_SPACE ); } /********************************************************************* - * iswxdigit (NTDLL.@) - * - * Checks if a unicode char wc is an extended digit - * - * RETURNS - * TRUE: The unicode char wc is an extended digit. - * FALSE: Otherwise + * iswxdigit (NTDLL.@) */ INT __cdecl iswxdigit( WCHAR wc ) { - if (wc >= 256) return 0; - return wctypes[wc] & C1_XDIGIT; + return iswctype( wc, C1_XDIGIT ); }

1 0

Alexandre Julliard : ntdll: Add strcpy_s and wcscpy_s.
by Alexandre Julliard 29 Jun '22

29 Jun '22

Module: wine Branch: master Commit: 41f488a32d17b47a88606d538f6ab10fed96bad6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=41f488a32d17b47a88606d53… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 29 11:48:47 2022 +0200 ntdll: Add strcpy_s and wcscpy_s. Implementation copied from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/string.c | 21 +++++++++++++++++++++ dlls/ntdll/wcstring.c | 21 +++++++++++++++++++++ 3 files changed, 44 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index fa1941ec811..93cb322f06d 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1590,6 +1590,7 @@ @ cdecl strchr(str long) @ cdecl strcmp(str str) @ cdecl strcpy(ptr str) +@ cdecl strcpy_s(ptr long str) @ cdecl strcspn(str str) @ cdecl strlen(str) @ cdecl strncat(str str long) @@ -1618,6 +1619,7 @@ @ cdecl wcschr(wstr long) @ cdecl wcscmp(wstr wstr) @ cdecl wcscpy(ptr wstr) +@ cdecl wcscpy_s(ptr long wstr) @ cdecl wcscspn(wstr wstr) @ cdecl wcslen(wstr) @ cdecl wcsncat(wstr wstr long) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 9c46b02aac4..6308ecfe049 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -21,6 +21,7 @@ */ #include <limits.h> +#include <errno.h> #include <stdarg.h> #include <stdlib.h> #include <stdio.h> @@ -256,6 +257,26 @@ char * __cdecl strcpy( char *dst, const char *src ) } +/********************************************************************* + * strcpy_s (NTDLL.@) + */ +errno_t __cdecl strcpy_s( char *dst, size_t len, const char *src ) +{ + size_t i; + + if (!dst || !len) return EINVAL; + if (!src) + { + *dst = 0; + return EINVAL; + } + + for (i = 0; i < len; i++) if (!(dst[i] = src[i])) return 0; + *dst = 0; + return ERANGE; +} + + /********************************************************************* * strcspn (NTDLL.@) */ diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index eef3197c4fe..b6afdb1d72e 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -21,6 +21,7 @@ */ #include <ctype.h> +#include <errno.h> #include <stdlib.h> #include <string.h> #include <stdarg.h> @@ -162,6 +163,26 @@ LPWSTR __cdecl wcscpy( LPWSTR dst, LPCWSTR src ) } +/********************************************************************* + * wcscpy_s (NTDLL.@) + */ +errno_t __cdecl wcscpy_s( wchar_t *dst, size_t len, const wchar_t *src ) +{ + size_t i; + + if (!dst || !len) return EINVAL; + if (!src) + { + *dst = 0; + return EINVAL; + } + + for (i = 0; i < len; i++) if (!(dst[i] = src[i])) return 0; + *dst = 0; + return ERANGE; +} + + /*********************************************************************** * wcslen (NTDLL.@) */

1 0

Alexandre Julliard : ntdll: Add strcat_s and wcscat_s.
by Alexandre Julliard 29 Jun '22

29 Jun '22

Module: wine Branch: master Commit: 83cd792e355f94e39b63eedc295b1cbfa25bea83 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83cd792e355f94e39b63eedc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 29 11:49:14 2022 +0200 ntdll: Add strcat_s and wcscat_s. Implementation copied from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/string.c | 20 ++++++++++++++++++++ dlls/ntdll/wcstring.c | 20 ++++++++++++++++++++ 3 files changed, 42 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 93cb322f06d..1e94d23c7df 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1587,6 +1587,7 @@ @ cdecl sqrt(double) @ varargs sscanf(str str) @ cdecl strcat(str str) +@ cdecl strcat_s(str long str) @ cdecl strchr(str long) @ cdecl strcmp(str str) @ cdecl strcpy(ptr str) @@ -1616,6 +1617,7 @@ @ cdecl vsprintf_s(ptr long str ptr) @ cdecl vswprintf_s(ptr long wstr ptr) @ cdecl wcscat(wstr wstr) +@ cdecl wcscat_s(wstr long wstr) @ cdecl wcschr(wstr long) @ cdecl wcscmp(wstr wstr) @ cdecl wcscpy(ptr wstr) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 6308ecfe049..8a37cd6d8d4 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -224,6 +224,26 @@ char * __cdecl strcat( char *dst, const char *src ) } +/********************************************************************* + * strcat_s (NTDLL.@) + */ +errno_t __cdecl strcat_s( char *dst, size_t len, const char *src ) +{ + size_t i, j; + + if (!dst || !len) return EINVAL; + if (!src) + { + *dst = 0; + return EINVAL; + } + for (i = 0; i < len; i++) if (!dst[i]) break; + for (j = 0; (j + i) < len; j++) if (!(dst[j + i] = src[j])) return 0; + *dst = 0; + return ERANGE; +} + + /********************************************************************* * strchr (NTDLL.@) */ diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index b6afdb1d72e..d5e50981153 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -204,6 +204,26 @@ LPWSTR __cdecl wcscat( LPWSTR dst, LPCWSTR src ) } +/********************************************************************* + * wcscat_s (NTDLL.@) + */ +errno_t __cdecl wcscat_s( wchar_t *dst, size_t len, const wchar_t *src ) +{ + size_t i, j; + + if (!dst || !len) return EINVAL; + if (!src) + { + *dst = 0; + return EINVAL; + } + for (i = 0; i < len; i++) if (!dst[i]) break; + for (j = 0; (j + i) < len; j++) if (!(dst[j + i] = src[j])) return 0; + *dst = 0; + return ERANGE; +} + + /********************************************************************* * wcschr (NTDLL.@) */

1 0

Alexandre Julliard : ntdll: Add strncpy_s and wcsncpy_s.
by Alexandre Julliard 29 Jun '22

29 Jun '22

Module: wine Branch: master Commit: 94e960c861c013771d72022ef994d38e937cef58 URL: https://source.winehq.org/git/wine.git/?a=commit;h=94e960c861c013771d72022e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 29 11:49:38 2022 +0200 ntdll: Add strncpy_s and wcsncpy_s. Implementation copied from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/string.c | 42 ++++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/wcstring.c | 42 ++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 1e94d23c7df..95b2e652b3d 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1597,6 +1597,7 @@ @ cdecl strncat(str str long) @ cdecl strncmp(str str long) @ cdecl strncpy(ptr str long) +@ cdecl strncpy_s(ptr long str long) @ cdecl strnlen(ptr long) @ cdecl strpbrk(str str) @ cdecl strrchr(str long) @@ -1627,6 +1628,7 @@ @ cdecl wcsncat(wstr wstr long) @ cdecl wcsncmp(wstr wstr long) @ cdecl wcsncpy(ptr wstr long) +@ cdecl wcsncpy_s(ptr long wstr long) @ cdecl wcsnlen(ptr long) @ cdecl wcspbrk(wstr wstr) @ cdecl wcsrchr(wstr long) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 8a37cd6d8d4..212cd30e2f1 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -356,6 +356,48 @@ char * __cdecl strncpy( char *dst, const char *src, size_t len ) } +/********************************************************************* + * strncpy_s (NTDLL.@) + */ +errno_t __cdecl strncpy_s( char *dst, size_t len, const char *src, size_t count ) +{ + size_t i, end; + + if (!count) + { + if (dst && len) *dst = 0; + return 0; + } + if (!dst || !len) return EINVAL; + if (!src) + { + *dst = 0; + return EINVAL; + } + + if (count != _TRUNCATE && count < len) + end = count; + else + end = len - 1; + + for (i = 0; i < end; i++) + if (!(dst[i] = src[i])) return 0; + + if (count == _TRUNCATE) + { + dst[i] = 0; + return STRUNCATE; + } + if (end == count) + { + dst[i] = 0; + return 0; + } + dst[0] = 0; + return ERANGE; +} + + /********************************************************************* * strnlen (NTDLL.@) */ diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index d5e50981153..cb45986207d 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -292,6 +292,48 @@ LPWSTR __cdecl wcsncpy( LPWSTR s1, LPCWSTR s2, size_t n ) } +/********************************************************************* + * wcsncpy_s (NTDLL.@) + */ +errno_t __cdecl wcsncpy_s( wchar_t *dst, size_t len, const wchar_t *src, size_t count ) +{ + size_t i, end; + + if (!count) + { + if (dst && len) *dst = 0; + return 0; + } + if (!dst || !len) return EINVAL; + if (!src) + { + *dst = 0; + return EINVAL; + } + + if (count != _TRUNCATE && count < len) + end = count; + else + end = len - 1; + + for (i = 0; i < end; i++) + if (!(dst[i] = src[i])) return 0; + + if (count == _TRUNCATE) + { + dst[i] = 0; + return STRUNCATE; + } + if (end == count) + { + dst[i] = 0; + return 0; + } + dst[0] = 0; + return ERANGE; +} + + /********************************************************************* * wcsnlen (NTDLL.@) */

1 0

Alexandre Julliard : ntdll: Add strncat_s and wcsncat_s.
by Alexandre Julliard 29 Jun '22

29 Jun '22

Module: wine Branch: master Commit: 7c70b9397f3ece7db9022760aa18d7af63b19f76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c70b9397f3ece7db9022760… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 29 11:49:55 2022 +0200 ntdll: Add strncat_s and wcsncat_s. Implementation copied from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/string.c | 41 +++++++++++++++++++++++++++++++++++++++++ dlls/ntdll/wcstring.c | 41 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 95b2e652b3d..e02c4278deb 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1595,6 +1595,7 @@ @ cdecl strcspn(str str) @ cdecl strlen(str) @ cdecl strncat(str str long) +@ cdecl strncat_s(str long str long) @ cdecl strncmp(str str long) @ cdecl strncpy(ptr str long) @ cdecl strncpy_s(ptr long str long) @@ -1626,6 +1627,7 @@ @ cdecl wcscspn(wstr wstr) @ cdecl wcslen(wstr) @ cdecl wcsncat(wstr wstr long) +@ cdecl wcsncat_s(wstr long wstr long) @ cdecl wcsncmp(wstr wstr long) @ cdecl wcsncpy(ptr wstr long) @ cdecl wcsncpy_s(ptr long wstr long) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 212cd30e2f1..6c4ac47803a 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -332,6 +332,47 @@ char * __cdecl strncat( char *dst, const char *src, size_t len ) } +/********************************************************************* + * strncat_s (NTDLL.@) + */ +errno_t __cdecl strncat_s( char *dst, size_t len, const char *src, size_t count ) +{ + size_t i, j; + + if (!dst || !len) return EINVAL; + if (!count) return 0; + if (!src) + { + *dst = 0; + return EINVAL; + } + + for (i = 0; i < len; i++) if (!dst[i]) break; + + if (i == len) + { + *dst = 0; + return EINVAL; + } + + for (j = 0; (j + i) < len; j++) + { + if (count == _TRUNCATE && j + i == len - 1) + { + dst[j + i] = 0; + return STRUNCATE; + } + if (j == count || !(dst[j + i] = src[j])) + { + dst[j + i] = 0; + return 0; + } + } + *dst = 0; + return ERANGE; +} + + /********************************************************************* * strncmp (NTDLL.@) */ diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index cb45986207d..e481c89ca71 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -268,6 +268,47 @@ LPWSTR __cdecl wcsncat( LPWSTR s1, LPCWSTR s2, size_t n ) } +/********************************************************************* + * wcsncat_s (NTDLL.@) + */ +errno_t __cdecl wcsncat_s( wchar_t *dst, size_t len, const wchar_t *src, size_t count ) +{ + size_t i, j; + + if (!dst || !len) return EINVAL; + if (!count) return 0; + if (!src) + { + *dst = 0; + return EINVAL; + } + + for (i = 0; i < len; i++) if (!dst[i]) break; + + if (i == len) + { + *dst = 0; + return EINVAL; + } + + for (j = 0; (j + i) < len; j++) + { + if (count == _TRUNCATE && j + i == len - 1) + { + dst[j + i] = 0; + return STRUNCATE; + } + if (j == count || !(dst[j + i] = src[j])) + { + dst[j + i] = 0; + return 0; + } + } + *dst = 0; + return ERANGE; +} + + /********************************************************************* * wcsncmp (NTDLL.@) */

1 0

Alexandre Julliard : ntdll: Add strtok_s and wcstok_s.
by Alexandre Julliard 29 Jun '22

29 Jun '22

Module: wine Branch: master Commit: b44ebda3888fbd746a44b745d1f971e1a95a9025 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b44ebda3888fbd746a44b745… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 29 11:50:12 2022 +0200 ntdll: Add strtok_s and wcstok_s. Implementation copied from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/string.c | 27 +++++++++++++++++++++++++++ dlls/ntdll/wcstring.c | 27 +++++++++++++++++++++++++++ 3 files changed, 56 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index e02c4278deb..18055fe3b9c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1604,6 +1604,7 @@ @ cdecl strrchr(str long) @ cdecl strspn(str str) @ cdecl strstr(str str) +@ cdecl strtok_s(str str ptr) @ cdecl strtol(str ptr long) @ cdecl strtoul(str ptr long) @ varargs swprintf(ptr wstr) NTDLL_swprintf @@ -1637,6 +1638,7 @@ @ cdecl wcsspn(wstr wstr) @ cdecl wcsstr(wstr wstr) @ cdecl wcstok(wstr wstr) +@ cdecl wcstok_s(wstr wstr ptr) @ cdecl wcstol(wstr ptr long) @ cdecl wcstombs(ptr ptr long) @ cdecl wcstoul(wstr ptr long) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 6c4ac47803a..d0330f48926 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -795,6 +795,33 @@ int CDECL _tolower(int c) } +/********************************************************************* + * strtok_s (NTDLL.@) + */ +char * __cdecl strtok_s( char *str, const char *delim, char **ctx ) +{ + char *next; + + if (!delim || !ctx) return NULL; + if (!str) + { + str = *ctx; + if (!str) return NULL; + } + while (*str && strchr( delim, *str )) str++; + if (!*str) + { + *ctx = str; + return NULL; + } + next = str + 1; + while (*next && !strchr( delim, *next )) next++; + if (*next) *next++ = 0; + *ctx = next; + return str; +} + + static int char_to_int( char c ) { if ('0' <= c && c <= '9') return c - '0'; diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index e481c89ca71..ed9e1612918 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -455,6 +455,33 @@ LPWSTR __cdecl wcstok( LPWSTR str, LPCWSTR delim ) } +/********************************************************************* + * wcstok_s (NTDLL.@) + */ +wchar_t * __cdecl wcstok_s( wchar_t *str, const wchar_t *delim, wchar_t **ctx ) +{ + wchar_t *next; + + if (!delim || !ctx) return NULL; + if (!str) + { + str = *ctx; + if (!str) return NULL; + } + while (*str && wcschr( delim, *str )) str++; + if (!*str) + { + *ctx = str; + return NULL; + } + next = str + 1; + while (*next && !wcschr( delim, *next )) next++; + if (*next) *next++ = 0; + *ctx = next; + return str; +} + + /********************************************************************* * wcstombs (NTDLL.@) */

1 0

Alexandre Julliard : ntdll: Add strlwr_s and wcslwr_s.
by Alexandre Julliard 29 Jun '22

29 Jun '22

Module: wine Branch: master Commit: a15c55e658a0065709ae1b327e0f238cded4d51a URL: https://source.winehq.org/git/wine.git/?a=commit;h=a15c55e658a0065709ae1b32… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 29 11:51:07 2022 +0200 ntdll: Add strlwr_s and wcslwr_s. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/string.c | 21 +++++++++++++++++++-- dlls/ntdll/wcstring.c | 24 ++++++++++++++++++------ 3 files changed, 39 insertions(+), 8 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 18055fe3b9c..91c56d4d92c 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1521,6 +1521,7 @@ @ cdecl _strcmpi(str str) _stricmp @ cdecl _stricmp(str str) @ cdecl _strlwr(str) +@ cdecl _strlwr_s(str long) @ cdecl _strnicmp(str str long) @ cdecl _strupr(str) @ cdecl _tolower(long) @@ -1536,6 +1537,7 @@ @ cdecl _vswprintf(ptr wstr ptr) @ cdecl _wcsicmp(wstr wstr) @ cdecl _wcslwr(wstr) +@ cdecl _wcslwr_s(wstr long) @ cdecl _wcsnicmp(wstr wstr long) @ cdecl _wcsupr(wstr) @ cdecl _wtoi(wstr) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index d0330f48926..8fbce780eb2 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -444,7 +444,7 @@ errno_t __cdecl strncpy_s( char *dst, size_t len, const char *src, size_t count */ size_t __cdecl strnlen( const char *str, size_t len ) { - const char *s = str; + const char *s; for (s = str; len && *s; s++, len--) ; return s - str; } @@ -620,11 +620,28 @@ LPSTR __cdecl _strupr( LPSTR str ) LPSTR __cdecl _strlwr( LPSTR str ) { LPSTR ret = str; - for ( ; *str; str++) *str = tolower(*str); + for ( ; *str; str++) if (*str >= 'A' && *str <= 'Z') *str += 'a' - 'A'; return ret; } +/********************************************************************* + * _strlwr_s (NTDLL.@) + */ +errno_t __cdecl _strlwr_s( char *str, size_t len ) +{ + if (!str) return EINVAL; + + if (strnlen( str, len ) == len) + { + *str = 0; + return EINVAL; + } + _strlwr( str ); + return 0; +} + + /********************************************************************* * toupper (NTDLL.@) */ diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index ed9e1612918..b2662cb9cf1 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -108,14 +108,26 @@ int __cdecl _wcsicmp( LPCWSTR str1, LPCWSTR str2 ) LPWSTR __cdecl _wcslwr( LPWSTR str ) { WCHAR *ret = str; + for ( ; *str; str++) if (*str >= 'A' && *str <= 'Z') *str += 'a' - 'A'; + return ret; +} - while (*str) + +/********************************************************************* + * _wcslwr_s (NTDLL.@) + */ +errno_t __cdecl _wcslwr_s( wchar_t *str, size_t len ) +{ + if (!str) return EINVAL; + + if (wcsnlen( str, len ) == len) { - WCHAR ch = *str; - if (ch >= 'A' && ch <= 'Z') ch += 32; - *str++ = ch; + *str = 0; + return EINVAL; } - return ret; + + _wcslwr( str ); + return 0; } @@ -380,7 +392,7 @@ errno_t __cdecl wcsncpy_s( wchar_t *dst, size_t len, const wchar_t *src, size_t */ size_t __cdecl wcsnlen( const WCHAR *str, size_t len ) { - const WCHAR *s = str; + const WCHAR *s; for (s = str; len && *s; s++, len--) ; return s - str; }

1 0

Alexandre Julliard : ntdll: Add strupr_s and wcsupr_s.
by Alexandre Julliard 29 Jun '22

29 Jun '22

Module: wine Branch: master Commit: 25f4760e851a05e3c241e6d9f83f14cca7f1ef4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=25f4760e851a05e3c241e6d9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 29 11:51:46 2022 +0200 ntdll: Add strupr_s and wcsupr_s. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 2 ++ dlls/ntdll/string.c | 20 +++++++++++++++++++- dlls/ntdll/wcstring.c | 23 ++++++++++++++++++----- 3 files changed, 39 insertions(+), 6 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 91c56d4d92c..0cda13586f4 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1524,6 +1524,7 @@ @ cdecl _strlwr_s(str long) @ cdecl _strnicmp(str str long) @ cdecl _strupr(str) +@ cdecl _strupr_s(str long) @ cdecl _tolower(long) @ cdecl _toupper(long) @ cdecl _ui64toa(int64 ptr long) @@ -1540,6 +1541,7 @@ @ cdecl _wcslwr_s(wstr long) @ cdecl _wcsnicmp(wstr wstr long) @ cdecl _wcsupr(wstr) +@ cdecl _wcsupr_s(wstr long) @ cdecl _wtoi(wstr) @ cdecl -ret64 _wtoi64(wstr) @ cdecl _wtol(wstr) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 8fbce780eb2..1bea000b2bd 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -600,11 +600,29 @@ int __cdecl _stricmp( LPCSTR str1, LPCSTR str2 ) LPSTR __cdecl _strupr( LPSTR str ) { LPSTR ret = str; - for ( ; *str; str++) *str = RtlUpperChar(*str); + for ( ; *str; str++) if (*str >= 'a' && *str <= 'z') *str += 'A' + 'a'; return ret; } +/********************************************************************* + * _strupr_s (NTDLL.@) + */ +errno_t __cdecl _strupr_s( char *str, size_t len ) +{ + if (!str) return EINVAL; + + if (strnlen( str, len ) == len) + { + *str = 0; + return EINVAL; + } + + _strupr( str ); + return 0; +} + + /********************************************************************* * _strlwr (NTDLL.@) * diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index b2662cb9cf1..97d67ee38d0 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -154,13 +154,26 @@ LPWSTR __cdecl _wcsupr( LPWSTR str ) { WCHAR *ret = str; - while (*str) + for ( ; *str; str++) if (*str >= 'a' && *str <= 'z') *str += 'A' - 'a'; + return ret; +} + + +/********************************************************************* + * _wcsupr_s (NTDLL.@) + */ +errno_t __cdecl _wcsupr_s( wchar_t *str, size_t len ) +{ + if (!str) return EINVAL; + + if (wcsnlen( str, len ) == len) { - WCHAR ch = *str; - if (ch >= 'a' && ch <= 'z') ch -= 32; - *str++ = ch; + *str = 0; + return EINVAL; } - return ret; + + _wcsupr( str ); + return 0; }

1 0