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

Hugh McMaster : regedit: Allow renaming of values in root keys.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: ab03ecf7bc592bb63ef4cc1662a7741b02ec1522 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ab03ecf7bc592bb63ef4cc16… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Jun 30 21:08:54 2022 +1000 regedit: Allow renaming of values in root keys. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> --- programs/regedit/framewnd.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index 83e4ec89ee0..c9eb2c4c469 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -946,9 +946,10 @@ static BOOL _CmdWndProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM lParam) case ID_EDIT_RENAME: { WCHAR* keyPath = GetItemPath(g_pChildWnd->hTreeWnd, 0, &hKeyRoot); - if (keyPath == 0 || *keyPath == 0) { + if (!keyPath) { MessageBeep(MB_ICONHAND); - } else if (GetFocus() == g_pChildWnd->hTreeWnd) { + break; + } else if (*keyPath && GetFocus() == g_pChildWnd->hTreeWnd) { StartKeyRename(g_pChildWnd->hTreeWnd); } else if (GetFocus() == g_pChildWnd->hListWnd) { StartValueRename(g_pChildWnd->hListWnd);

1 0

Georg Lehmann : winevulkan: Update to VK spec version 1.3.219.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: fda62d4b195422cfa3b221ba16e8c3ee610277ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=fda62d4b195422cfa3b221ba… Author: Georg Lehmann <dadschoorse(a)gmail.com> Date: Thu Jun 30 14:31:26 2022 +0200 winevulkan: Update to VK spec version 1.3.219. Signed-off-by: Georg Lehmann <dadschoorse(a)gmail.com> --- dlls/winevulkan/loader_thunks.c | 20 ++++++++++++ dlls/winevulkan/loader_thunks.h | 16 +++++++++ dlls/winevulkan/make_vulkan | 2 +- dlls/winevulkan/vulkan_thunks.c | 52 +++++++++++++++++++++++++++++ dlls/winevulkan/vulkan_thunks.h | 4 +++ dlls/winevulkan/winevulkan.json | 2 +- include/wine/vulkan.h | 72 ++++++++++++++++++++++++++++++++++++++++- 7 files changed, 165 insertions(+), 3 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=fda62d4b195422cfa3b2…

1 0

Claire Girka : mmdevapi: Override product strings for DualSense controller audio devices.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: 67f9c76386c8f67363f1fa90d7f7ac0ac84fdcd7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=67f9c76386c8f67363f1fa90… Author: Claire Girka <claire(a)sitedethib.com> Date: Wed Jun 29 12:09:01 2022 +0200 mmdevapi: Override product strings for DualSense controller audio devices. Some games expect the DualSense audio device (used for haptic feedback and controller speaker) to be called “Wireless Controller”. --- dlls/mmdevapi/devenum.c | 41 +++++++++++++++++++++++++++++++++++++++-- 1 file changed, 39 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/devenum.c b/dlls/mmdevapi/devenum.c index 053275cac45..bfeb3f3ecd8 100644 --- a/dlls/mmdevapi/devenum.c +++ b/dlls/mmdevapi/devenum.c @@ -255,6 +255,30 @@ static HRESULT set_driver_prop_value(GUID *id, const EDataFlow flow, const PROPE return hr; } +struct product_name_overrides +{ + const WCHAR *id; + const WCHAR *product; +}; + +static const struct product_name_overrides product_name_overrides[] = +{ + /* Sony controllers */ + { .id = L"VID_054C&PID_0CE6", .product = L"Wireless Controller" }, +}; + +static const WCHAR *find_product_name_override(const WCHAR *device_id) +{ + const WCHAR *match_id = wcschr( device_id, '\\' ) + 1; + DWORD i; + + for (i = 0; i < ARRAY_SIZE(product_name_overrides); ++i) + if (!wcsnicmp( product_name_overrides[i].id, match_id, 17 )) + return product_name_overrides[i].product; + + return NULL; +} + /* Creates or updates the state of a device * If GUID is null, a random guid will be assigned * and the device will be created @@ -321,6 +345,21 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st pv.vt = VT_LPWSTR; pv.pwszVal = name; + + if (SUCCEEDED(set_driver_prop_value(id, flow, &devicepath_key))) { + PROPVARIANT pv2; + + PropVariantInit(&pv2); + + if (SUCCEEDED(MMDevice_GetPropValue(id, flow, &devicepath_key, &pv2)) && pv2.vt == VT_LPWSTR) { + const WCHAR *override; + if ((override = find_product_name_override(pv2.pwszVal)) != NULL) + pv.pwszVal = (WCHAR*) override; + } + + PropVariantClear(&pv2); + } + MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_Device_FriendlyName, &pv); MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_FriendlyName, &pv); MMDevice_SetPropValue(id, flow, (const PROPERTYKEY*)&DEVPKEY_Device_DeviceDesc, &pv); @@ -328,8 +367,6 @@ static MMDevice *MMDevice_Create(WCHAR *name, GUID *id, EDataFlow flow, DWORD st pv.pwszVal = guidstr; MMDevice_SetPropValue(id, flow, &deviceinterface_key, &pv); - set_driver_prop_value(id, flow, &devicepath_key); - if (FAILED(set_driver_prop_value(id, flow, &PKEY_AudioEndpoint_FormFactor))) { pv.vt = VT_UI4;

1 0

Hans Leidekker : winhttp: Remove assertion that is no longer valid in Windows 10.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: 80a2c664411120ada327d2bac8e7390016e63979 URL: https://source.winehq.org/git/wine.git/?a=commit;h=80a2c664411120ada327d2ba… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 30 12:52:03 2022 +0200 winhttp: Remove assertion that is no longer valid in Windows 10. --- dlls/winhttp/net.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 40c9f3c8534..be776ae2971 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -350,7 +350,7 @@ DWORD netconn_secure_connect( struct netconn *conn, WCHAR *hostname, DWORD secur } assert(in_bufs[0].BufferType == SECBUFFER_TOKEN); - assert(in_bufs[1].BufferType == SECBUFFER_EMPTY); + in_bufs[1].BufferType = SECBUFFER_EMPTY; if(in_bufs[0].cbBuffer + 1024 > read_buf_size) { BYTE *new_read_buf;

1 0

Hans Leidekker : wininet: Remove assertion that is no longer valid in Windows 10.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: fc701aa14ce8c1d7aeb3b3d9b35edd1cd860c9ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc701aa14ce8c1d7aeb3b3d9… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Thu Jun 30 12:55:52 2022 +0200 wininet: Remove assertion that is no longer valid in Windows 10. --- dlls/wininet/netconnection.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/netconnection.c b/dlls/wininet/netconnection.c index f89493967a2..a3ca03d3ef1 100644 --- a/dlls/wininet/netconnection.c +++ b/dlls/wininet/netconnection.c @@ -500,7 +500,7 @@ static DWORD netcon_secure_connect_setup(netconn_t *connection, BOOL compat_mode } assert(in_bufs[0].BufferType == SECBUFFER_TOKEN); - assert(in_bufs[1].BufferType == SECBUFFER_EMPTY); + in_bufs[1].BufferType = SECBUFFER_EMPTY; if(in_bufs[0].cbBuffer + 1024 > read_buf_size) { BYTE *new_read_buf;

1 0

Hans Leidekker : secur32: Return a SECBUFFER_MISSING buffer from the handshake if the input message is incomplete.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: 0a10bfc8b17234db6aff130ce0448a62c3fb6a1e URL: https://source.winehq.org/git/wine.git/?a=commit;h=0a10bfc8b17234db6aff130c… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed Jun 29 13:54:57 2022 +0200 secur32: Return a SECBUFFER_MISSING buffer from the handshake if the input message is incomplete. --- dlls/secur32/schannel.c | 25 +++++++++++++++++++++++-- dlls/secur32/tests/schannel.c | 21 ++++++++++++++++++++- 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/dlls/secur32/schannel.c b/dlls/secur32/schannel.c index 7dc9bd1d21a..70018e57f7e 100644 --- a/dlls/secur32/schannel.c +++ b/dlls/secur32/schannel.c @@ -747,6 +747,18 @@ static inline BOOL is_dtls_context(const struct schan_context *ctx) return ctx->header_size == HEADER_SIZE_DTLS; } +static void fill_missing_sec_buffer(SecBufferDesc *input, DWORD size) +{ + int idx = schan_find_sec_buffer_idx(input, 0, SECBUFFER_EMPTY); + if (idx == -1) WARN("no empty buffer\n"); + else + { + SecBuffer *buffer = &input->pBuffers[idx]; + buffer->BufferType = SECBUFFER_MISSING; + buffer->cbBuffer = size; + } +} + /*********************************************************************** * InitializeSecurityContextW */ @@ -887,7 +899,15 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( buffer = &pInput->pBuffers[idx]; ptr = buffer->pvBuffer; - while (buffer->cbBuffer > expected_size + ctx->header_size) + if (buffer->cbBuffer < ctx->header_size) + { + TRACE("Expected at least %Iu bytes, but buffer only contains %lu bytes.\n", + ctx->header_size, buffer->cbBuffer); + fill_missing_sec_buffer(pInput, ctx->header_size - buffer->cbBuffer); + return SEC_E_INCOMPLETE_MESSAGE; + } + + while (buffer->cbBuffer >= expected_size + ctx->header_size) { record_size = ctx->header_size + read_record_size(ptr, ctx->header_size); @@ -899,7 +919,8 @@ static SECURITY_STATUS SEC_ENTRY schan_InitializeSecurityContextW( if (!expected_size) { TRACE("Expected at least %Iu bytes, but buffer only contains %lu bytes.\n", - max(ctx->header_size + 1, record_size), buffer->cbBuffer); + max(ctx->header_size, record_size), buffer->cbBuffer); + fill_missing_sec_buffer(pInput, record_size - buffer->cbBuffer); return SEC_E_INCOMPLETE_MESSAGE; } diff --git a/dlls/secur32/tests/schannel.c b/dlls/secur32/tests/schannel.c index c68474e9eae..8322b5a80a5 100644 --- a/dlls/secur32/tests/schannel.c +++ b/dlls/secur32/tests/schannel.c @@ -1132,8 +1132,10 @@ static void test_communication(void) ok( context2.dwLower == 0xdeadbeef, "Did not expect dwLower to be set on new context\n"); ok( context2.dwUpper == 0xdeadbeef, "Did not expect dwUpper to be set on new context\n"); - buffers[1].cBuffers = 1; + buffers[1].cBuffers = 2; buffers[1].pBuffers[0].cbBuffer = 0; + buffers[1].pBuffers[1].cbBuffer = 0; + buffers[1].pBuffers[1].BufferType = SECBUFFER_EMPTY; status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, @@ -1141,6 +1143,10 @@ static void test_communication(void) ok(status == SEC_E_INCOMPLETE_MESSAGE, "Got unexpected status %#lx.\n", status); ok(buffers[0].pBuffers[0].cbBuffer == buf_size, "Output buffer size changed.\n"); ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_TOKEN, "Output buffer type changed.\n"); + ok(buffers[1].pBuffers[1].cbBuffer == 5 || + broken(buffers[1].pBuffers[1].cbBuffer == 0), /* < win10 */ "Wrong buffer size.\n"); + ok(buffers[1].pBuffers[1].BufferType == SECBUFFER_MISSING || + broken(buffers[1].pBuffers[1].BufferType == SECBUFFER_EMPTY), /* < win10 */ "Wrong buffer type.\n"); buf = &buffers[1].pBuffers[0]; buf->cbBuffer = buf_size; @@ -1149,6 +1155,8 @@ static void test_communication(void) return; buffers[1].pBuffers[0].cbBuffer = 4; + buffers[1].pBuffers[1].cbBuffer = 0; + buffers[1].pBuffers[1].BufferType = SECBUFFER_EMPTY; status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, 0, 0, &buffers[1], 0, NULL, &buffers[0], &attrs, NULL); @@ -1156,9 +1164,15 @@ static void test_communication(void) "Got unexpected status %#lx.\n", status); ok(buffers[0].pBuffers[0].cbBuffer == buf_size, "Output buffer size changed.\n"); ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_TOKEN, "Output buffer type changed.\n"); + ok(buffers[1].pBuffers[1].cbBuffer == 1 || + broken(buffers[1].pBuffers[1].cbBuffer == 0), /* < win10 */ "Wrong buffer size.\n"); + ok(buffers[1].pBuffers[1].BufferType == SECBUFFER_MISSING || + broken(buffers[1].pBuffers[1].BufferType == SECBUFFER_EMPTY), /* < win10 */ "Wrong buffer type.\n"); context2.dwLower = context2.dwUpper = 0xdeadbeef; buffers[1].pBuffers[0].cbBuffer = 5; + buffers[1].pBuffers[1].cbBuffer = 0; + buffers[1].pBuffers[1].BufferType = SECBUFFER_EMPTY; status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM, 0, 0, &buffers[1], 0, &context2, &buffers[0], &attrs, NULL); @@ -1166,9 +1180,14 @@ static void test_communication(void) "Got unexpected status %#lx.\n", status); ok(buffers[0].pBuffers[0].cbBuffer == buf_size, "Output buffer size changed.\n"); ok(buffers[0].pBuffers[0].BufferType == SECBUFFER_TOKEN, "Output buffer type changed.\n"); + ok(buffers[1].pBuffers[1].cbBuffer > 5 || + broken(buffers[1].pBuffers[1].cbBuffer == 0), /* < win10 */ "Wrong buffer size\n" ); + ok(buffers[1].pBuffers[1].BufferType == SECBUFFER_MISSING || + broken(buffers[1].pBuffers[1].BufferType == SECBUFFER_EMPTY), /* < win10 */ "Wrong buffer type.\n"); ok( context2.dwLower == 0xdeadbeef, "Did not expect dwLower to be set on new context\n"); ok( context2.dwUpper == 0xdeadbeef, "Did not expect dwUpper to be set on new context\n"); + buffers[1].cBuffers = 1; buffers[1].pBuffers[0].cbBuffer = ret; status = InitializeSecurityContextA(&cred_handle, &context, (SEC_CHAR *)"localhost", ISC_REQ_CONFIDENTIALITY|ISC_REQ_STREAM|ISC_REQ_USE_SUPPLIED_CREDS,

1 0

Alexandre Julliard : ntdll: Add _i64toa_s.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: 911810c51af3b6c6edeb102907cec561f12ddb7f URL: https://source.winehq.org/git/wine.git/?a=commit;h=911810c51af3b6c6edeb1029… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 30 11:06:15 2022 +0200 ntdll: Add _i64toa_s. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 3 +++ dlls/ntdll/string.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index d592b7adbb4..a3832042704 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1503,14 +1503,17 @@ @ stub _fltused @ cdecl -arch=i386 -ret64 _ftol() @ cdecl _i64toa(int64 ptr long) +@ cdecl _i64toa_s(int64 ptr long long) @ cdecl _i64tow(int64 ptr long) @ cdecl _i64tow_s(int64 ptr long long) @ cdecl _itoa(long ptr long) +@ cdecl _itoa_s(long ptr long long) @ cdecl _itow(long ptr long) @ cdecl _itow_s(long ptr long long) @ cdecl _lfind(ptr ptr ptr long ptr) @ stdcall -arch=x86_64,arm64 _local_unwind(ptr ptr) @ cdecl _ltoa(long ptr long) +@ cdecl _ltoa_s(long ptr long long) @ cdecl _ltow(long ptr long) @ cdecl _ltow_s(long ptr long long) @ cdecl _memccpy(ptr ptr long long) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 797152a81e1..5a971a4a0b2 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -1258,6 +1258,80 @@ errno_t __cdecl _ultoa_s( __msvcrt_ulong value, char *str, size_t size, int radi } +/********************************************************************* + * _i64toa_s (NTDLL.@) + */ +errno_t __cdecl _i64toa_s( __int64 value, char *str, size_t size, int radix ) +{ + unsigned __int64 val; + BOOL is_negative; + char buffer[65], *pos; + + if (!str || !size) return EINVAL; + if (radix < 2 || radix > 36) + { + str[0] = 0; + return EINVAL; + } + + if (value < 0 && radix == 10) + { + is_negative = TRUE; + val = -value; + } + else + { + is_negative = FALSE; + val = value; + } + + pos = buffer + 64; + *pos = 0; + + do + { + unsigned int digit = val % radix; + val /= radix; + + if (digit < 10) + *--pos = '0' + digit; + else + *--pos = 'a' + digit - 10; + } + while (val != 0); + + if (is_negative) *--pos = '-'; + + if (buffer - pos + 65 > size) + { + str[0] = 0; + return ERANGE; + } + memcpy( str, pos, buffer - pos + 65 ); + return 0; +} + + +/********************************************************************* + * _ltoa_s (NTDLL.@) + */ +errno_t __cdecl _ltoa_s( __msvcrt_long value, char *str, size_t size, int radix ) +{ + if (value < 0 && radix == 10) return _i64toa_s( value, str, size, radix ); + return _ui64toa_s( (__msvcrt_ulong)value, str, size, radix ); +} + + +/********************************************************************* + * _itoa_s (NTDLL.@) + */ +errno_t __cdecl _itoa_s( int value, char *str, size_t size, int radix ) +{ + if (value < 0 && radix == 10) return _i64toa_s( value, str, size, radix ); + return _ui64toa_s( (unsigned int)value, str, size, radix ); +} + + /********************************************************************* * _atoi64 (NTDLL.@) *

1 0

Alexandre Julliard : ntdll: Add _wsplitpath_s.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: 0db689edf4a2d05db05449a3ca21c0e6c088880f URL: https://source.winehq.org/git/wine.git/?a=commit;h=0db689edf4a2d05db05449a3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 30 11:06:29 2022 +0200 ntdll: Add _wsplitpath_s. Implementation copied from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/wcstring.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 77 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index a3832042704..9291ed63f77 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1554,6 +1554,7 @@ @ cdecl -ret64 _wcstoui64(wstr ptr long) @ cdecl _wcsupr(wstr) @ cdecl _wcsupr_s(wstr long) +@ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long) @ cdecl _wtoi(wstr) @ cdecl -ret64 _wtoi64(wstr) @ cdecl _wtol(wstr) diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index a0d7042f30c..76190c08c12 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -1299,3 +1299,79 @@ LONGLONG __cdecl _wtoi64( LPCWSTR str ) return bMinus ? -RunningTotal : RunningTotal; } + + +/****************************************************************** + * _wsplitpath_s (NTDLL.@) + */ +errno_t __cdecl _wsplitpath_s( const wchar_t *inpath, wchar_t *drive, size_t sz_drive, + wchar_t *dir, size_t sz_dir, wchar_t *fname, size_t sz_fname, + wchar_t *ext, size_t sz_ext ) +{ + const wchar_t *p, *end; + + if (!inpath || (!drive && sz_drive) || + (drive && !sz_drive) || + (!dir && sz_dir) || + (dir && !sz_dir) || + (!fname && sz_fname) || + (fname && !sz_fname) || + (!ext && sz_ext) || + (ext && !sz_ext)) + return EINVAL; + + if (inpath[0] && inpath[1] == ':') + { + if (drive) + { + if (sz_drive <= 2) goto error; + drive[0] = inpath[0]; + drive[1] = inpath[1]; + drive[2] = 0; + } + inpath += 2; + } + else if (drive) drive[0] = '\0'; + + /* look for end of directory part */ + end = NULL; + for (p = inpath; *p; p++) if (*p == '/' || *p == '\\') end = p + 1; + + if (end) /* got a directory */ + { + if (dir) + { + if (sz_dir <= end - inpath) goto error; + memcpy( dir, inpath, (end - inpath) * sizeof(wchar_t) ); + dir[end - inpath] = 0; + } + inpath = end; + } + else if (dir) dir[0] = 0; + + /* look for extension: what's after the last dot */ + end = NULL; + for (p = inpath; *p; p++) if (*p == '.') end = p; + + if (!end) end = p; /* there's no extension */ + + if (fname) + { + if (sz_fname <= end - inpath) goto error; + memcpy( fname, inpath, (end - inpath) * sizeof(wchar_t) ); + fname[end - inpath] = 0; + } + if (ext) + { + if (sz_ext <= wcslen(end)) goto error; + wcscpy( ext, end ); + } + return 0; + +error: + if (drive) drive[0] = 0; + if (dir) dir[0] = 0; + if (fname) fname[0]= 0; + if (ext) ext[0]= 0; + return ERANGE; +}

1 0

Alexandre Julliard : ntdll: Add _splitpath_s.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: 5d2f0688cfdd782962f7104a87b925890b68dd48 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d2f0688cfdd782962f7104a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 30 11:06:44 2022 +0200 ntdll: Add _splitpath_s. Implementation copied from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/string.c | 81 +++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 60 insertions(+), 22 deletions(-) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index 9291ed63f77..ffc3cb00fcd 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1524,6 +1524,7 @@ @ varargs _snwprintf_s(ptr long long wstr) @ varargs _swprintf(ptr wstr) NTDLL_swprintf @ cdecl _splitpath(str ptr ptr ptr ptr) +@ cdecl _splitpath_s(str ptr long ptr long ptr long ptr long) @ cdecl _strcmpi(str str) _stricmp @ cdecl _stricmp(str str) @ cdecl _strlwr(str) diff --git a/dlls/ntdll/string.c b/dlls/ntdll/string.c index 5a971a4a0b2..2e3bbc043e5 100644 --- a/dlls/ntdll/string.c +++ b/dlls/ntdll/string.c @@ -1852,37 +1852,37 @@ int WINAPIV sscanf( const char *str, const char *format, ... ) } -/********************************************************************* - * _splitpath (NTDLL.@) - * - * Split a path into its component pieces. - * - * PARAMS - * inpath [I] Path to split - * drv [O] Destination for drive component (e.g. "A:"). Must be at least 3 characters. - * dir [O] Destination for directory component. Should be at least MAX_PATH characters. - * fname [O] Destination for File name component. Should be at least MAX_PATH characters. - * ext [O] Destination for file extension component. Should be at least MAX_PATH characters. - * - * RETURNS - * Nothing. +/****************************************************************** + * _splitpath_s (NTDLL.@) */ -void __cdecl _splitpath(const char* inpath, char * drv, char * dir, - char* fname, char * ext ) +errno_t __cdecl _splitpath_s( const char *inpath, char *drive, size_t sz_drive, + char *dir, size_t sz_dir, char *fname, size_t sz_fname, + char *ext, size_t sz_ext ) { const char *p, *end; + if (!inpath || (!drive && sz_drive) || + (drive && !sz_drive) || + (!dir && sz_dir) || + (dir && !sz_dir) || + (!fname && sz_fname) || + (fname && !sz_fname) || + (!ext && sz_ext) || + (ext && !sz_ext)) + return EINVAL; + if (inpath[0] && inpath[1] == ':') { - if (drv) + if (drive) { - drv[0] = inpath[0]; - drv[1] = inpath[1]; - drv[2] = 0; + if (sz_drive <= 2) goto error; + drive[0] = inpath[0]; + drive[1] = inpath[1]; + drive[2] = 0; } inpath += 2; } - else if (drv) drv[0] = 0; + else if (drive) drive[0] = '\0'; /* look for end of directory part */ end = NULL; @@ -1892,6 +1892,7 @@ void __cdecl _splitpath(const char* inpath, char * drv, char * dir, { if (dir) { + if (sz_dir <= end - inpath) goto error; memcpy( dir, inpath, end - inpath ); dir[end - inpath] = 0; } @@ -1907,8 +1908,44 @@ void __cdecl _splitpath(const char* inpath, char * drv, char * dir, if (fname) { + if (sz_fname <= end - inpath) goto error; memcpy( fname, inpath, end - inpath ); fname[end - inpath] = 0; } - if (ext) strcpy( ext, end ); + if (ext) + { + if (sz_ext <= strlen(end)) goto error; + strcpy( ext, end ); + } + return 0; + +error: + if (drive) drive[0] = 0; + if (dir) dir[0] = 0; + if (fname) fname[0]= 0; + if (ext) ext[0]= 0; + return ERANGE; +} + + +/********************************************************************* + * _splitpath (NTDLL.@) + * + * Split a path into its component pieces. + * + * PARAMS + * inpath [I] Path to split + * drv [O] Destination for drive component (e.g. "A:"). Must be at least 3 characters. + * dir [O] Destination for directory component. Should be at least MAX_PATH characters. + * fname [O] Destination for File name component. Should be at least MAX_PATH characters. + * ext [O] Destination for file extension component. Should be at least MAX_PATH characters. + * + * RETURNS + * Nothing. + */ +void __cdecl _splitpath(const char* inpath, char * drv, char * dir, + char* fname, char * ext ) +{ + _splitpath_s( inpath, drv, drv ? _MAX_DRIVE : 0, dir, dir ? _MAX_DIR : 0, + fname, fname ? _MAX_FNAME : 0, ext, ext ? _MAX_EXT : 0 ); }

1 0

Alexandre Julliard : ntdll: Add _wmakepath_s.
by Alexandre Julliard 30 Jun '22

30 Jun '22

Module: wine Branch: master Commit: 0c986b2c778022a8c271471b89bd0ff9a3ff7a41 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c986b2c778022a8c271471b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Jun 30 11:07:04 2022 +0200 ntdll: Add _wmakepath_s. Implementation copied from msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/ntdll.spec | 1 + dlls/ntdll/wcstring.c | 77 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+) diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec index ffc3cb00fcd..cc78f4539f3 100644 --- a/dlls/ntdll/ntdll.spec +++ b/dlls/ntdll/ntdll.spec @@ -1555,6 +1555,7 @@ @ cdecl -ret64 _wcstoui64(wstr ptr long) @ cdecl _wcsupr(wstr) @ 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 _wtoi(wstr) @ cdecl -ret64 _wtoi64(wstr) diff --git a/dlls/ntdll/wcstring.c b/dlls/ntdll/wcstring.c index 76190c08c12..aa43c3de16b 100644 --- a/dlls/ntdll/wcstring.c +++ b/dlls/ntdll/wcstring.c @@ -1375,3 +1375,80 @@ error: if (ext) ext[0]= 0; 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; +}

1 0