system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-11-01 06:06:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

ntdll: Add _wmakepath_s.

Browse source 
Implementation copied from msvcrt.

Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2022-06-30 11:07:04 +02:00
parent 5d2f0688cf
commit 0c986b2c77
2 changed files with 78 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
dlls/ntdll/ntdll.spec
View file

@ -1555,6 +1555,7 @@
@ cdecl -ret64 _wcstoui64(wstr ptr long) @ cdecl -ret64 _wcstoui64(wstr ptr long)
@ cdecl _wcsupr(wstr) @ cdecl _wcsupr(wstr)
@ cdecl _wcsupr_s(wstr long) @ cdecl _wcsupr_s(wstr long)
@ cdecl _wmakepath_s(ptr long wstr wstr wstr wstr)
@ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long) @ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long)
@ cdecl _wtoi(wstr) @ cdecl _wtoi(wstr)
@ cdecl -ret64 _wtoi64(wstr) @ cdecl -ret64 _wtoi64(wstr)

77
dlls/ntdll/wcstring.c
View file

@ -1375,3 +1375,80 @@ error:
if (ext) ext[0]= 0; if (ext) ext[0]= 0;
return ERANGE; return ERANGE;
} }
/*********************************************************************
* _wmakepath_s (NTDLL.@)
*/
errno_t __cdecl _wmakepath_s( wchar_t *path, size_t size, const wchar_t *drive,
const wchar_t *directory, const wchar_t *filename,
const wchar_t *extension )
{
wchar_t *p = path;
if (!path || !size) return EINVAL;
if (drive && drive[0])
{
if (size <= 2) goto range;
*p++ = drive[0];
*p++ = ':';
size -= 2;
}
if (directory && directory[0])
{
unsigned int len = wcslen(directory);
unsigned int needs_separator = directory[len - 1] != '/' && directory[len - 1] != '\\';
unsigned int copylen = min(size - 1, len);
if (size < 2) goto range;
memmove(p, directory, copylen * sizeof(wchar_t));
if (size <= len) goto range;
p += copylen;
size -= copylen;
if (needs_separator)
{
if (size < 2) goto range;
*p++ = '\\';
size -= 1;
}
}
if (filename && filename[0])
{
unsigned int len = wcslen(filename);
unsigned int copylen = min(size - 1, len);
if (size < 2) goto range;
memmove(p, filename, copylen * sizeof(wchar_t));
if (size <= len) goto range;
p += len;
size -= len;
}
if (extension && extension[0])
{
unsigned int len = wcslen(extension);
unsigned int needs_period = extension[0] != '.';
unsigned int copylen;
if (size < 2) goto range;
if (needs_period)
{
*p++ = '.';
size -= 1;
}
copylen = min(size - 1, len);
memcpy(p, extension, copylen * sizeof(wchar_t));
if (size <= len) goto range;
p += copylen;
}
*p = 0;
return 0;
range:
path[0] = 0;
return ERANGE;
}