[NDK][KERNEL32][LIBCNTPR]

Add RtlAnsiCharToUnicodeChar prototype inside NDK.

[NDK][NTVDM]
Add few missing RTL bitmap prototypes.

svn path=/trunk/; revision=68386

diff --git a/reactos/dll/win32/kernel32/include/kernel32.h b/reactos/dll/win32/kernel32/include/kernel32.h
index d9d8dc6..35dd831 100644 (file)
--- 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 c6ce74d..c63c87d 100644 (file)
--- 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 16a5346..f0d5c2c 100644 (file)
--- a/reactos/lib/sdk/crt/string/mbstowcs_nt.c
+++ b/reactos/lib/sdk/crt/string/mbstowcs_nt.c
@@ -2,7 +2,6 @@
 #include <ndk/rtlfuncs.h>
 #include <string.h>
 
-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 3952194..4d774ec 100644 (file)
--- 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[] = {