From 7ffba6f094fedccf574e2c829a9ac9e19ebd26ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herm=C3=A8s=20B=C3=A9lusca-Ma=C3=AFto?= Date: Sat, 11 Jul 2015 00:18:30 +0000 Subject: [PATCH] [NDK][KERNEL32][LIBCNTPR] Add RtlAnsiCharToUnicodeChar prototype inside NDK. [NDK][NTVDM] Add few missing RTL bitmap prototypes. svn path=/trunk/; revision=68386 --- reactos/dll/win32/kernel32/include/kernel32.h | 3 -- reactos/include/ndk/rtlfuncs.h | 42 +++++++++++++++++-- reactos/lib/sdk/crt/string/mbstowcs_nt.c | 1 - .../mvdm/ntvdm/dos/dos32krnl/himem.c | 9 ---- 4 files changed, 38 insertions(+), 17 deletions(-) diff --git a/reactos/dll/win32/kernel32/include/kernel32.h b/reactos/dll/win32/kernel32/include/kernel32.h index d9d8dc69a64..35dd831cfff 100644 --- a/reactos/dll/win32/kernel32/include/kernel32.h +++ b/reactos/dll/win32/kernel32/include/kernel32.h @@ -357,9 +357,6 @@ DWORD WINAPI BaseSetLastNTError(IN NTSTATUS Status); -/* FIXME */ -WCHAR WINAPI RtlAnsiCharToUnicodeChar(LPSTR *); - VOID NTAPI BasepLocateExeLdrEntry(IN PLDR_DATA_TABLE_ENTRY Entry, diff --git a/reactos/include/ndk/rtlfuncs.h b/reactos/include/ndk/rtlfuncs.h index c6ce74dccd4..c63c87d0809 100644 --- a/reactos/include/ndk/rtlfuncs.h +++ b/reactos/include/ndk/rtlfuncs.h @@ -1927,12 +1927,12 @@ RtlOemToUnicodeN( // // Ansi->Unicode String Functions // +_IRQL_requires_max_(APC_LEVEL) NTSYSAPI -ULONG +WCHAR NTAPI -RtlxAnsiStringToUnicodeSize( - PCANSI_STRING AnsiString -); +RtlAnsiCharToUnicodeChar( + _Inout_ PUCHAR *SourceCharacter); NTSYSAPI NTSTATUS @@ -1943,6 +1943,13 @@ RtlAnsiStringToUnicodeString( BOOLEAN AllocateDestinationString ); +NTSYSAPI +ULONG +NTAPI +RtlxAnsiStringToUnicodeSize( + PCANSI_STRING AnsiString +); + #ifdef NTOS_MODE_USER #define RtlAnsiStringToUnicodeSize(STRING) ( \ @@ -3079,6 +3086,33 @@ RtlFindClearBitsAndSet( _In_ ULONG HintIndex ); +NTSYSAPI +ULONG +NTAPI +RtlFindFirstRunClear( + _In_ PRTL_BITMAP BitMapHeader, + _Out_ PULONG StartingIndex +); + +NTSYSAPI +ULONG +NTAPI +RtlFindClearRuns( + _In_ PRTL_BITMAP BitMapHeader, + _Out_writes_to_(SizeOfRunArray, return) PRTL_BITMAP_RUN RunArray, + _In_range_(>, 0) ULONG SizeOfRunArray, + _In_ BOOLEAN LocateLongestRuns +); + +NTSYSAPI +ULONG +NTAPI +RtlFindLastBackwardRunClear( + _In_ PRTL_BITMAP BitMapHeader, + _In_ ULONG FromIndex, + _Out_ PULONG StartingRunIndex +); + NTSYSAPI CCHAR NTAPI diff --git a/reactos/lib/sdk/crt/string/mbstowcs_nt.c b/reactos/lib/sdk/crt/string/mbstowcs_nt.c index 16a53462926..f0d5c2c7037 100644 --- a/reactos/lib/sdk/crt/string/mbstowcs_nt.c +++ b/reactos/lib/sdk/crt/string/mbstowcs_nt.c @@ -2,7 +2,6 @@ #include #include -WCHAR NTAPI RtlAnsiCharToUnicodeChar(IN OUT PUCHAR *AnsiChar); #undef MB_CUR_MAX #define MB_CUR_MAX 2 diff --git a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c index 3952194622f..4d774ec4bd6 100644 --- a/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c +++ b/reactos/subsystems/mvdm/ntvdm/dos/dos32krnl/himem.c @@ -28,15 +28,6 @@ /* BOP Identifiers */ #define BOP_XMS 0x52 -ULONG -NTAPI -RtlFindLastBackwardRunClear -( - IN PRTL_BITMAP BitMapHeader, - IN ULONG FromIndex, - OUT PULONG StartingRunIndex -); - /* PRIVATE VARIABLES **********************************************************/ static const BYTE EntryProcedure[] = {