morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fixed GetEnvironmentVariableX for windows

Browse Source
This commit is contained in:
akallabeth
2022-03-03 07:31:08 +01:00
committed by akallabeth
parent fa1656178a
commit aef3cb16fa
1 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
winpr/libwinpr/environment/environment.c
View File

@@ -666,17 +666,12 @@ DWORD GetEnvironmentVariableX(const char* lpName, char* lpBuffer, DWORD nSize)
char lpBufferMaxA[WINPR_MAX_ENVIRONMENT_LENGTH] = { 0 };
WCHAR lpBufferMaxW[WINPR_MAX_ENVIRONMENT_LENGTH] = { 0 };
// calling GetEnvironmentVariableX with a NULL buffer should return the expected size
// TODO: dynamically allocate the buffer, or use the theoretical limit of 32,768 characters
nSizeW = ARRAYSIZE(lpBufferMaxW);
lpBufferA = lpBufferMaxA;
lpBufferW = lpBufferMaxW;
nSizeW = sizeof(lpBufferMaxW) / 2;
result = GetEnvironmentVariableW(lpNameW, lpBufferMaxW, nSizeW);
result = GetEnvironmentVariableW(lpNameW, lpBufferW, nSizeW);
status = ConvertFromUnicode(CP_UTF8, 0, lpBufferW, -1, &lpBufferA, sizeof(lpBufferMaxA),
NULL, NULL);
status = ConvertFromUnicode(CP_UTF8, 0, lpBufferMaxW, _wcsnlen(lpBufferMaxW, nSizeW),
&lpBufferMaxA, sizeof(lpBufferMaxA), NULL, NULL);
if (status > 0)
result = (DWORD)status;