if ((NT_SUCCESS(Status)) && !(nSize)) Status = STATUS_BUFFER_TOO_SMALL;
/* Check if we didn't have enough space */
- if (!(NT_SUCCESS(Status)) && (Status == STATUS_BUFFER_TOO_SMALL))
+ if (Status == STATUS_BUFFER_TOO_SMALL)
{
/* Fixup the length that the API returned */
- VarValueU.MaximumLength = VarValueU.Length + 2;
+ VarValueU.MaximumLength = VarValueU.Length + sizeof(UNICODE_NULL);
/* Free old Unicode buffer */
RtlFreeHeap(RtlGetProcessHeap(), 0, VarValueU.Buffer);
{
/* Set failure status */
Status = STATUS_NO_MEMORY;
+ VarValueU.Buffer = NULL;
}
}
else if (NT_SUCCESS(Status))
WINAPI
FreeEnvironmentStringsA(IN LPSTR EnvironmentStrings)
{
- return (BOOL)RtlFreeHeap(RtlGetProcessHeap(), 0, EnvironmentStrings);
+ return RtlFreeHeap(RtlGetProcessHeap(), 0, EnvironmentStrings);
}
/*
WINAPI
FreeEnvironmentStringsW(IN LPWSTR EnvironmentStrings)
{
- return (BOOL)RtlFreeHeap(RtlGetProcessHeap(), 0, EnvironmentStrings);
+ return RtlFreeHeap(RtlGetProcessHeap(), 0, EnvironmentStrings);
}
/*
Status = RtlExpandEnvironmentStrings_U(NULL, &SourceU, &DestU, &Length);
/* Check if we didn't have enough space */
- if (!(NT_SUCCESS(Status)) && (Status == STATUS_BUFFER_TOO_SMALL))
+ if (Status == STATUS_BUFFER_TOO_SMALL)
{
/* Fixup the length that the API returned */
DestU.MaximumLength = (SHORT)Length;
{
/* Set failure status */
Status = STATUS_NO_MEMORY;
+ DestU.Buffer = NULL;
}
}
else if (NT_SUCCESS(Status))
NTSTATUS Status;
USHORT UniSize;
- UniSize = UNICODE_STRING_MAX_CHARS - 2;
- if (nSize <= UniSize) UniSize = (USHORT)nSize;
+ UniSize = min(nSize, UNICODE_STRING_MAX_CHARS - 2);
RtlInitUnicodeString(&Source, (LPWSTR)lpSrc);
RtlInitEmptyUnicodeString(&Destination, lpDst, UniSize * sizeof(WCHAR));
}
/* Account for the quotes and space between the two */
- n += ((sizeof('""') * 2) + sizeof(' '));
+ n += sizeof("\" \"") - sizeof(ANSI_NULL);
/* Convert to bytes, and make sure we don't overflow */
n *= sizeof(WCHAR);
RealTimePrivilegeState = NULL;
/* Is realtime priority being requested? */
- if (PriorityClass.PriorityClass == REALTIME_PRIORITY_CLASS)
+ if (PriorityClass.PriorityClass == PROCESS_PRIORITY_CLASS_REALTIME)
{
/* Check if the caller has real-time access, and enable it if so */
RealTimePrivilegeState = BasepIsRealtimeAllowed(TRUE);