Author: cfinck Date: Sat Jul 18 12:29:25 2015 New Revision: 68416
URL: http://svn.reactos.org/svn/reactos?rev=68416&view=rev Log: Merge r68232 to get Windows' rpcrt4.dll to work under ReactOS.
Added: branches/colins-printing-for-freedom/reactos/lib/rtl/appverifier.c - copied unchanged from r68232, trunk/reactos/lib/rtl/appverifier.c Modified: branches/colins-printing-for-freedom/ (props changed) branches/colins-printing-for-freedom/reactos/ (props changed) branches/colins-printing-for-freedom/reactos/dll/ntdll/def/ntdll.spec branches/colins-printing-for-freedom/reactos/lib/rtl/CMakeLists.txt branches/colins-printing-for-freedom/reactos/lib/rtl/memstream.c
Propchange: branches/colins-printing-for-freedom/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jul 18 12:29:25 2015 @@ -1 +1 @@ -/trunk:67713,67936 +/trunk:67713,67936,68232
Propchange: branches/colins-printing-for-freedom/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sat Jul 18 12:29:25 2015 @@ -20,4 +20,4 @@ /branches/usb-bringup:51335,51337,51341-51343,51348,51350,51353,51355,51365-51369,51372,51384-54388,54396-54398,54736-54737,54752-54754,54756-54760,54762,54764-54765,54767-54768,54772,54774-54777,54781,54787,54790-54792,54797-54798,54806,54808,54834-54838,54843,54850,54852,54856,54858-54859 /branches/usb-bringup-trunk:55019-55543,55548-55554,55556-55567 /branches/wlan-bringup:54809-54998 -/trunk/reactos:67713,67936 +/trunk/reactos:67713,67936,68232
Modified: branches/colins-printing-for-freedom/reactos/dll/ntdll/def/ntdll.spec URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/reac... ============================================================================== --- branches/colins-printing-for-freedom/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/dll/ntdll/def/ntdll.spec [iso-8859-1] Sat Jul 18 12:29:25 2015 @@ -467,7 +467,7 @@ @ stdcall RtlAppendStringToString(ptr ptr) @ stdcall RtlAppendUnicodeStringToString(ptr ptr) @ stdcall RtlAppendUnicodeToString(ptr wstr) -;@ stdcall RtlApplicationVerifierStop +@ stdcall RtlApplicationVerifierStop(ptr str ptr str ptr str ptr str ptr str) @ stdcall RtlApplyRXact(ptr) @ stdcall RtlApplyRXactNoFlush(ptr) @ stdcall RtlAreAllAccessesGranted(long long) @@ -506,7 +506,7 @@ @ stdcall -arch=win32 -ret64 RtlConvertUlongToLargeInteger(long) @ stdcall RtlCopyLuid(ptr ptr) @ stdcall RtlCopyLuidAndAttributesArray(long ptr ptr) -;@ stdcall RtlCopyMappedMemory +@ stdcall RtlCopyMappedMemory(ptr ptr long) @ stdcall RtlCopyMemoryStreamTo(ptr ptr int64 ptr ptr) @ stdcall RtlCopyOutOfProcessMemoryStreamTo(ptr ptr int64 ptr ptr) RtlCopyMemoryStreamTo @ stdcall RtlCopySecurityDescriptor(ptr ptr)
Modified: branches/colins-printing-for-freedom/reactos/lib/rtl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/reac... ============================================================================== --- branches/colins-printing-for-freedom/reactos/lib/rtl/CMakeLists.txt [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/lib/rtl/CMakeLists.txt [iso-8859-1] Sat Jul 18 12:29:25 2015 @@ -9,6 +9,7 @@ access.c acl.c actctx.c + appverifier.c assert.c atom.c avltable.c
Modified: branches/colins-printing-for-freedom/reactos/lib/rtl/memstream.c URL: http://svn.reactos.org/svn/reactos/branches/colins-printing-for-freedom/reac... ============================================================================== --- branches/colins-printing-for-freedom/reactos/lib/rtl/memstream.c [iso-8859-1] (original) +++ branches/colins-printing-for-freedom/reactos/lib/rtl/memstream.c [iso-8859-1] Sat Jul 18 12:29:25 2015 @@ -1,7 +1,7 @@ /* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/rtl/mem.c + * FILE: lib/rtl/memstream.c * PURPOSE: MemoryStream functions * PROGRAMMER: David Quintana (gigaherz@gmail.com) */ @@ -465,3 +465,17 @@
return E_NOTIMPL; } + +/* + * @implemented + */ +VOID +NTAPI +RtlCopyMappedMemory( + _Out_ PVOID Destination, + _In_ const VOID *Source, + _In_ SIZE_T Size) +{ + /* FIXME: This is supposed to handle STATUS_IN_PAGE_ERROR exceptions */ + RtlCopyMemory(Destination, Source, Size); +}