diff --git a/reactos/include/rosrtl/registry.h b/reactos/include/rosrtl/registry.h deleted file mode 100644 index cf0301ca5ae..00000000000 --- a/reactos/include/rosrtl/registry.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef _ROSRTL_REGISTRY_H_ -#define _ROSRTL_REGISTRY_H_ - -#ifdef __cplusplus -extern "C" { -#endif - -NTSTATUS NTAPI RosReadRegistryValue( IN PUNICODE_STRING Key, - IN PUNICODE_STRING Value, - OUT PUNICODE_STRING Result ); - -#ifdef __cplusplus -}; -#endif - -#endif/*_ROSRTL_REGISTRY_H_*/ diff --git a/reactos/include/rosrtl/string.h b/reactos/include/rosrtl/string.h deleted file mode 100644 index 20776185605..00000000000 --- a/reactos/include/rosrtl/string.h +++ /dev/null @@ -1,157 +0,0 @@ -/* $Id$ - */ - -#ifndef ROSRTL_STRING_H__ -#define ROSRTL_STRING_H__ - -#ifdef __cplusplus -extern "C" -{ -#endif - -#define RosInitializeString( \ - __PDEST_STRING__, \ - __LENGTH__, \ - __MAXLENGTH__, \ - __BUFFER__ \ -) \ -{ \ - (__PDEST_STRING__)->Length = (__LENGTH__); \ - (__PDEST_STRING__)->MaximumLength = (__MAXLENGTH__); \ - (__PDEST_STRING__)->Buffer = (__BUFFER__); \ -} - -#define RtlRosInitStringFromLiteral( \ - __PDEST_STRING__, __SOURCE_STRING__) \ - RosInitializeString( \ - (__PDEST_STRING__), \ - sizeof(__SOURCE_STRING__) - sizeof((__SOURCE_STRING__)[0]), \ - sizeof(__SOURCE_STRING__), \ - (__SOURCE_STRING__) \ - ) - -#define RtlRosInitUnicodeStringFromLiteral \ - RtlRosInitStringFromLiteral - -#define ROS_STRING_INITIALIZER(__SOURCE_STRING__) \ -{ \ - sizeof(__SOURCE_STRING__) - sizeof((__SOURCE_STRING__)[0]), \ - sizeof(__SOURCE_STRING__), \ - (__SOURCE_STRING__) \ -} - -#define ROS_EMPTY_STRING {0, 0, NULL} - -NTSTATUS -FASTCALL -RtlpOemStringToCountedUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN POEM_STRING OemSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUpcaseUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN PCUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUpcaseUnicodeStringToAnsiString( - IN OUT PANSI_STRING AnsiDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUpcaseUnicodeStringToCountedOemString( - IN OUT POEM_STRING OemDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUpcaseUnicodeStringToOemString ( - IN OUT POEM_STRING OemDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpDowncaseUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpAnsiStringToUnicodeString( - IN OUT PUNICODE_STRING DestinationString, - IN PANSI_STRING SourceString, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUnicodeStringToAnsiString( - IN OUT PANSI_STRING AnsiDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpOemStringToUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN POEM_STRING OemSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUnicodeStringToOemString( - IN OUT POEM_STRING OemDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -BOOLEAN -FASTCALL -RtlpCreateUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN PCWSTR Source, - IN POOL_TYPE PoolType); - -NTSTATUS -FASTCALL -RtlpUnicodeStringToCountedOemString( - IN OUT POEM_STRING OemDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString, - IN POOL_TYPE PoolType); - -NTSTATUS STDCALL -RtlpDuplicateUnicodeString( - INT AddNull, - IN PUNICODE_STRING SourceString, - PUNICODE_STRING DestinationString, - POOL_TYPE PoolType); - -NTSTATUS NTAPI RosAppendUnicodeString( PUNICODE_STRING ResultFirst, - PUNICODE_STRING Second, - BOOL Deallocate ); - -#ifdef __cplusplus -} -#endif - -#endif - -/* EOF */ diff --git a/reactos/lib/iphlpapi/iphlpapi_private.h b/reactos/lib/iphlpapi/iphlpapi_private.h index 9c88f1e92ba..a0fe59d9e96 100644 --- a/reactos/lib/iphlpapi/iphlpapi_private.h +++ b/reactos/lib/iphlpapi/iphlpapi_private.h @@ -24,7 +24,6 @@ #include #define NTOS_MODE_USER #include -#include #include #include #include diff --git a/reactos/lib/rosrtl/registry/registry.c b/reactos/lib/rosrtl/registry/registry.c index 4c90c393aad..dc016f6d5e1 100644 --- a/reactos/lib/rosrtl/registry/registry.c +++ b/reactos/lib/rosrtl/registry/registry.c @@ -1,3 +1,4 @@ +#if 0 #include #define NTOS_MODE_USER #include @@ -74,4 +75,5 @@ NTSTATUS NTAPI RosReadRegistryValue( PUNICODE_STRING KeyName, return Status; } +#endif diff --git a/reactos/lib/rtl/rtl.h b/reactos/lib/rtl/rtl.h index acf542a8ef3..d217c079232 100644 --- a/reactos/lib/rtl/rtl.h +++ b/reactos/lib/rtl/rtl.h @@ -26,4 +26,5 @@ extern VOID FASTCALL CHECK_PAGED_CODE_RTL(char *file, int line); #else #define PAGED_CODE_RTL() #endif + /* EOF */ diff --git a/reactos/lib/rtl/unicode.c b/reactos/lib/rtl/unicode.c index e26aa6e0c0b..12275277f03 100644 --- a/reactos/lib/rtl/unicode.c +++ b/reactos/lib/rtl/unicode.c @@ -21,7 +21,6 @@ */ #define __NTDRIVER__ #include "rtl.h" -#include #define NDEBUG #include @@ -972,29 +971,6 @@ RtlUnicodeStringToOemSize( return Size+1; //NB: incl. nullterm } - -/* - * @implemented - * - - * NOTES - * See RtlpUnicodeStringToAnsiString - */ -NTSTATUS -STDCALL -RtlUnicodeStringToAnsiString( - IN OUT PANSI_STRING AnsiDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString) -{ - return RtlpUnicodeStringToAnsiString( - AnsiDest, - UniSource, - AllocateDestinationString, - PagedPool); -} - - /* * private * @@ -1056,28 +1032,27 @@ RtlpUnicodeStringToAnsiString( return Status; } - /* * @implemented * + * NOTES - * See RtlpOemStringToUnicodeString + * See RtlpUnicodeStringToAnsiString */ NTSTATUS STDCALL -RtlOemStringToUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN POEM_STRING OemSource, +RtlUnicodeStringToAnsiString( + IN OUT PANSI_STRING AnsiDest, + IN PUNICODE_STRING UniSource, IN BOOLEAN AllocateDestinationString) { - return RtlpOemStringToUnicodeString( - UniDest, - OemSource, + return RtlpUnicodeStringToAnsiString( + AnsiDest, + UniSource, AllocateDestinationString, PagedPool); } - /* * private * @@ -1145,24 +1120,22 @@ RtlpOemStringToUnicodeString( * @implemented * * NOTES - * See RtlpUnicodeStringToOemString. + * See RtlpOemStringToUnicodeString */ NTSTATUS STDCALL -RtlUnicodeStringToOemString( - IN OUT POEM_STRING OemDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString) +RtlOemStringToUnicodeString( + IN OUT PUNICODE_STRING UniDest, + IN POEM_STRING OemSource, + IN BOOLEAN AllocateDestinationString) { - return RtlpUnicodeStringToOemString( - OemDest, - UniSource, + return RtlpOemStringToUnicodeString( + UniDest, + OemSource, AllocateDestinationString, PagedPool); } - - /* * private * @@ -1224,7 +1197,25 @@ RtlpUnicodeStringToOemString( return Status; } - +/* + * @implemented + * + * NOTES + * See RtlpUnicodeStringToOemString. + */ +NTSTATUS +STDCALL +RtlUnicodeStringToOemString( + IN OUT POEM_STRING OemDest, + IN PUNICODE_STRING UniSource, + IN BOOLEAN AllocateDestinationString) +{ + return RtlpUnicodeStringToOemString( + OemDest, + UniSource, + AllocateDestinationString, + PagedPool); +} #define ITU_IMPLEMENTED_TESTS (IS_TEXT_UNICODE_ODD_LENGTH|IS_TEXT_UNICODE_SIGNATURE) @@ -1287,28 +1278,6 @@ done: return Length; } - -/* - * @implemented - * - * NOTES - * See RtlpOemStringToCountedUnicodeString - */ -NTSTATUS -STDCALL -RtlOemStringToCountedUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN POEM_STRING OemSource, - IN BOOLEAN AllocateDestinationString) -{ - return RtlpOemStringToCountedUnicodeString( - UniDest, - OemSource, - AllocateDestinationString, - PagedPool); -} - - /* * private * @@ -1365,6 +1334,25 @@ RtlpOemStringToCountedUnicodeString( return Status; } +/* + * @implemented + * + * NOTES + * See RtlpOemStringToCountedUnicodeString + */ +NTSTATUS +STDCALL +RtlOemStringToCountedUnicodeString( + IN OUT PUNICODE_STRING UniDest, + IN POEM_STRING OemSource, + IN BOOLEAN AllocateDestinationString) +{ + return RtlpOemStringToCountedUnicodeString( + UniDest, + OemSource, + AllocateDestinationString, + PagedPool); +} /* * @implemented @@ -1654,26 +1642,6 @@ RtlHashUnicodeString( return STATUS_INVALID_PARAMETER; } -/* - * @implemented - * - * NOTES - * See RtlpUnicodeStringToCountedOemString. - */ -NTSTATUS -STDCALL -RtlUnicodeStringToCountedOemString( - IN OUT POEM_STRING OemDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString) -{ - return RtlpUnicodeStringToCountedOemString( - OemDest, - UniSource, - AllocateDestinationString, - PagedPool); -} - /* * private * @@ -1733,6 +1701,25 @@ RtlpUnicodeStringToCountedOemString( return Status; } +/* + * @implemented + * + * NOTES + * See RtlpUnicodeStringToCountedOemString. + */ +NTSTATUS +STDCALL +RtlUnicodeStringToCountedOemString( + IN OUT POEM_STRING OemDest, + IN PUNICODE_STRING UniSource, + IN BOOLEAN AllocateDestinationString) +{ + return RtlpUnicodeStringToCountedOemString( + OemDest, + UniSource, + AllocateDestinationString, + PagedPool); +} /* * @implemented @@ -1783,30 +1770,6 @@ RtlLargeIntegerToChar( return STATUS_SUCCESS; } - - -/* - * @implemented - * - * NOTES - * See RtlpUpcaseUnicodeString - */ -NTSTATUS -STDCALL -RtlUpcaseUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN PCUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString) -{ - - return RtlpUpcaseUnicodeString( - UniDest, - UniSource, - AllocateDestinationString, - PagedPool); -} - - /* * private * @@ -1851,23 +1814,22 @@ RtlpUpcaseUnicodeString( return STATUS_SUCCESS; } - - /* * @implemented * * NOTES - * See RtlpUpcaseUnicodeStringToAnsiString + * See RtlpUpcaseUnicodeString */ NTSTATUS STDCALL -RtlUpcaseUnicodeStringToAnsiString( - IN OUT PANSI_STRING AnsiDest, - IN PUNICODE_STRING UniSource, +RtlUpcaseUnicodeString( + IN OUT PUNICODE_STRING UniDest, + IN PCUNICODE_STRING UniSource, IN BOOLEAN AllocateDestinationString) { - return RtlpUpcaseUnicodeStringToAnsiString( - AnsiDest, + + return RtlpUpcaseUnicodeString( + UniDest, UniSource, AllocateDestinationString, PagedPool); @@ -1939,30 +1901,26 @@ RtlpUpcaseUnicodeStringToAnsiString( return Status; } - - /* * @implemented * * NOTES - * See RtlpUpcaseUnicodeStringToCountedOemString + * See RtlpUpcaseUnicodeStringToAnsiString */ NTSTATUS STDCALL -RtlUpcaseUnicodeStringToCountedOemString( - IN OUT POEM_STRING OemDest, +RtlUpcaseUnicodeStringToAnsiString( + IN OUT PANSI_STRING AnsiDest, IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString) + IN BOOLEAN AllocateDestinationString) { - return RtlpUpcaseUnicodeStringToCountedOemString( - OemDest, + return RtlpUpcaseUnicodeStringToAnsiString( + AnsiDest, UniSource, AllocateDestinationString, PagedPool); } - - /* * private * @@ -2026,28 +1984,26 @@ RtlpUpcaseUnicodeStringToCountedOemString( return Status; } - /* * @implemented + * * NOTES - * See RtlpUpcaseUnicodeStringToOemString + * See RtlpUpcaseUnicodeStringToCountedOemString */ NTSTATUS STDCALL -RtlUpcaseUnicodeStringToOemString ( +RtlUpcaseUnicodeStringToCountedOemString( IN OUT POEM_STRING OemDest, IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString -) + IN BOOLEAN AllocateDestinationString) { - return RtlpUpcaseUnicodeStringToOemString( + return RtlpUpcaseUnicodeStringToCountedOemString( OemDest, UniSource, AllocateDestinationString, PagedPool); } - /* * private * @@ -2114,6 +2070,25 @@ RtlpUpcaseUnicodeStringToOemString ( return Status; } +/* + * @implemented + * NOTES + * See RtlpUpcaseUnicodeStringToOemString + */ +NTSTATUS +STDCALL +RtlUpcaseUnicodeStringToOemString ( + IN OUT POEM_STRING OemDest, + IN PUNICODE_STRING UniSource, + IN BOOLEAN AllocateDestinationString +) +{ + return RtlpUpcaseUnicodeStringToOemString( + OemDest, + UniSource, + AllocateDestinationString, + PagedPool); +} /* * @implemented @@ -2309,25 +2284,6 @@ RtlCopyUnicodeString( DestinationString->Length = copylen; } - -/* - * @implemented - * - * NOTES - * See RtlpCreateUnicodeString - */ -BOOLEAN -STDCALL -RtlCreateUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN PCWSTR Source) -{ - - DPRINT("RtlCreateUnicodeString\n"); - return RtlpCreateUnicodeString(UniDest, Source, PagedPool); -} - - /* * private * @@ -2358,7 +2314,22 @@ RtlpCreateUnicodeString( return TRUE; } +/* + * @implemented + * + * NOTES + * See RtlpCreateUnicodeString + */ +BOOLEAN +STDCALL +RtlCreateUnicodeString( + IN OUT PUNICODE_STRING UniDest, + IN PCWSTR Source) +{ + DPRINT("RtlCreateUnicodeString\n"); + return RtlpCreateUnicodeString(UniDest, Source, PagedPool); +} /* * @implemented @@ -2382,28 +2353,6 @@ RtlCreateUnicodeStringFromAsciiz( return NT_SUCCESS(Status); } - - -/* - * @implemented - * - * NOTES - * See RtlpDowncaseUnicodeString - */ -NTSTATUS STDCALL -RtlDowncaseUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN PUNICODE_STRING UniSource, - IN BOOLEAN AllocateDestinationString) -{ - return RtlpDowncaseUnicodeString( - UniDest, - UniSource, - AllocateDestinationString, - PagedPool); -} - - /* * private * @@ -2462,7 +2411,24 @@ RtlpDowncaseUnicodeString( return STATUS_SUCCESS; } - +/* + * @implemented + * + * NOTES + * See RtlpDowncaseUnicodeString + */ +NTSTATUS STDCALL +RtlDowncaseUnicodeString( + IN OUT PUNICODE_STRING UniDest, + IN PUNICODE_STRING UniSource, + IN BOOLEAN AllocateDestinationString) +{ + return RtlpDowncaseUnicodeString( + UniDest, + UniSource, + AllocateDestinationString, + PagedPool); +} /* * @implemented @@ -2492,29 +2458,6 @@ RtlAppendUnicodeToString(IN OUT PUNICODE_STRING Destination, return(STATUS_SUCCESS); } - -/* - * @implemented - * - * NOTES - * See RtlpAnsiStringToUnicodeString - */ -NTSTATUS -STDCALL -RtlAnsiStringToUnicodeString( - IN OUT PUNICODE_STRING UniDest, - IN PANSI_STRING AnsiSource, - IN BOOLEAN AllocateDestinationString) -{ - return RtlpAnsiStringToUnicodeString( - UniDest, - AnsiSource, - AllocateDestinationString, - PagedPool); -} - - - /* * private * @@ -2577,7 +2520,25 @@ RtlpAnsiStringToUnicodeString( return Status; } - +/* + * @implemented + * + * NOTES + * See RtlpAnsiStringToUnicodeString + */ +NTSTATUS +STDCALL +RtlAnsiStringToUnicodeString( + IN OUT PUNICODE_STRING UniDest, + IN PANSI_STRING AnsiSource, + IN BOOLEAN AllocateDestinationString) +{ + return RtlpAnsiStringToUnicodeString( + UniDest, + AnsiSource, + AllocateDestinationString, + PagedPool); +} /* * @implemented @@ -2684,27 +2645,6 @@ RtlxUnicodeStringToOemSize(IN PUNICODE_STRING UnicodeString) return RtlUnicodeStringToOemSize(UnicodeString); } - -/* - * @implemented - * - * NOTES - * See RtlpDuplicateUnicodeString - */ -NTSTATUS STDCALL -RtlDuplicateUnicodeString( - INT AddNull, - IN PUNICODE_STRING SourceString, - PUNICODE_STRING DestinationString) -{ - return RtlpDuplicateUnicodeString( - AddNull, - SourceString, - DestinationString, - PagedPool); -} - - /* * @implemented */ @@ -2747,6 +2687,24 @@ RtlpDuplicateUnicodeString( return STATUS_SUCCESS; } +/* + * @implemented + * + * NOTES + * See RtlpDuplicateUnicodeString + */ +NTSTATUS STDCALL +RtlDuplicateUnicodeString( + INT AddNull, + IN PUNICODE_STRING SourceString, + PUNICODE_STRING DestinationString) +{ + return RtlpDuplicateUnicodeString( + AddNull, + SourceString, + DestinationString, + PagedPool); +} /* * @implemented