mirrors/SDL
1
0
Fork 0
mirror of https://github.com/libsdl-org/SDL.git synced 2025-09-21 18:58:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

GPU: Fix D3D12_INTERNAL_StrToWStr returning incorrect length

Browse Source
This commit is contained in:
cosmonaut
2024-12-11 16:17:14 -08:00
parent 6fe09e3aa4
commit c5acbef3bf
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/gpu/d3d12/SDL_gpu_d3d12.c
View File

@@ -3630,7 +3630,8 @@ static bool D3D12_INTERNAL_StrToWStr(
Uint32 *outSize) Uint32 *outSize)
{ {
size_t inlen, result; size_t inlen, result;
size_t outlen = wstrSize; size_t outBytesLeft = wstrSize;
*outSize = 0;
if (renderer->iconv == NULL) { if (renderer->iconv == NULL) {
renderer->iconv = SDL_iconv_open("WCHAR_T", "UTF-8"); renderer->iconv = SDL_iconv_open("WCHAR_T", "UTF-8");
@@ -3644,9 +3645,8 @@ static bool D3D12_INTERNAL_StrToWStr(
&str, &str,
&inlen, &inlen,
(char **)&wstr, (char **)&wstr,
&outlen); &outBytesLeft);
*outSize = (Uint32)outlen;
// Check... // Check...
switch (result) { switch (result) {
@@ -3660,6 +3660,7 @@ static bool D3D12_INTERNAL_StrToWStr(
break; break;
} }
*outSize = (Uint32)(wstrSize - outBytesLeft);
return true; return true;
} }