Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-31 19:21:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

[NTOS][NDK][RTL] A bunch of 'wrong size' fixes

Browse source
This commit is contained in:
Ivan Labutin 2017-11-13 15:06:29 +01:00 • committed by Timo Kreuzer
parent 4d35d59fb9
commit d6792047f3
8 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

9
sdk/lib/rtl/memstream.c
View file

@ -205,6 +205,7 @@ RtlReadOutOfProcessMemoryStream(
ULONG CopyLength;
PRTL_MEMORY_STREAM Stream = IStream_To_RTL_MEMORY_STREAM(This);
SIZE_T Available = (PUCHAR)Stream->End - (PUCHAR)Stream->Current;
SIZE_T LocalBytesRead = 0;
if (BytesRead)
*BytesRead = 0;
@ -218,10 +219,14 @@ RtlReadOutOfProcessMemoryStream(
Stream->Current,
Buffer,
CopyLength,
BytesRead);
&LocalBytesRead);
if (NT_SUCCESS(Status))
Stream->Current = (PUCHAR)Stream->Current + *BytesRead;
{
Stream->Current = (PUCHAR)Stream->Current + LocalBytesRead;
if (BytesRead)
*BytesRead = (ULONG)LocalBytesRead;
}
return HRESULT_FROM_WIN32(RtlNtStatusToDosError(Status));
}

4
sdk/lib/rtl/rtlp.h
View file

@ -27,10 +27,10 @@ extern VOID FASTCALL CHECK_PAGED_CODE_RTL(char *file, int line);
#endif
#define ROUND_DOWN(n, align) \
(((ULONG)(n)) & ~((align) - 1l))
(((ULONG_PTR)(n)) & ~((align) - 1l))
#define ROUND_UP(n, align) \
ROUND_DOWN(((ULONG)(n)) + (align) - 1, (align))
ROUND_DOWN(((ULONG_PTR)(n)) + (align) - 1, (align))
#define RVA(m, b) ((PVOID)((ULONG_PTR)(b) + (ULONG_PTR)(m)))