Kill off more of rosrtl Deleted: trunk/reactos/include/rosrtl/registry.h Deleted: trunk/reactos/include/rosrtl/string.h Modified: trunk/reactos/lib/iphlpapi/iphlpapi_private.h Modified: trunk/reactos/lib/rosrtl/registry/registry.c Modified: trunk/reactos/lib/rtl/rtl.h Modified: trunk/reactos/lib/rtl/unicode.c _____
Deleted: trunk/reactos/include/rosrtl/registry.h --- trunk/reactos/include/rosrtl/registry.h 2005-07-01 03:03:06 UTC (rev 16361) +++ trunk/reactos/include/rosrtl/registry.h 2005-07-01 03:14:40 UTC (rev 16362) @@ -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_*/ _____
Deleted: trunk/reactos/include/rosrtl/string.h --- trunk/reactos/include/rosrtl/string.h 2005-07-01 03:03:06 UTC (rev 16361) +++ trunk/reactos/include/rosrtl/string.h 2005-07-01 03:14:40 UTC (rev 16362) @@ -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 */ _____
Modified: trunk/reactos/lib/iphlpapi/iphlpapi_private.h --- trunk/reactos/lib/iphlpapi/iphlpapi_private.h 2005-07-01 03:03:06 UTC (rev 16361) +++ trunk/reactos/lib/iphlpapi/iphlpapi_private.h 2005-07-01 03:14:40 UTC (rev 16362) @@ -24,7 +24,6 @@
#include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> -#include <rosrtl/string.h> #include <winsock2.h> #include <nspapi.h> #include <iptypes.h> _____
Modified: trunk/reactos/lib/rosrtl/registry/registry.c --- trunk/reactos/lib/rosrtl/registry/registry.c 2005-07-01 03:03:06 UTC (rev 16361) +++ trunk/reactos/lib/rosrtl/registry/registry.c 2005-07-01 03:14:40 UTC (rev 16362) @@ -1,3 +1,4 @@
+#if 0 #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> @@ -74,4 +75,5 @@
return Status; } +#endif
_____
Modified: trunk/reactos/lib/rtl/rtl.h --- trunk/reactos/lib/rtl/rtl.h 2005-07-01 03:03:06 UTC (rev 16361) +++ trunk/reactos/lib/rtl/rtl.h 2005-07-01 03:14:40 UTC (rev 16362) @@ -26,4 +26,5 @@
#else #define PAGED_CODE_RTL() #endif + /* EOF */ _____
Modified: trunk/reactos/lib/rtl/unicode.c --- trunk/reactos/lib/rtl/unicode.c 2005-07-01 03:03:06 UTC (rev 16361) +++ trunk/reactos/lib/rtl/unicode.c 2005-07-01 03:14:40 UTC (rev 16362) @@ -21,7 +21,6 @@
*/ #define __NTDRIVER__ #include "rtl.h" -#include <rosrtl/string.h>
#define NDEBUG #include <debug.h> @@ -972,30 +971,7 @@ 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 * * NOTES @@ -1056,28 +1032,27 @@ 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 @@ * @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,8 +1197,26 @@ 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,29 +1278,7 @@ 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 * * NOTES @@ -1365,6 +1334,25 @@ 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 @@ -1655,26 +1643,6 @@ }
/* - * @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 * * NOTES @@ -1733,6 +1701,25 @@ 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,31 +1770,7 @@ 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 * * NOTES @@ -1851,23 +1814,22 @@ 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 @@ 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 @@ 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 @@ 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,26 +2284,7 @@ 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 * * Creates a nullterminated UNICODE_STRING @@ -2358,7 +2314,22 @@ 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,29 +2353,7 @@ 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 * * NOTES @@ -2462,8 +2411,25 @@ 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,30 +2458,7 @@ 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 * * NOTES @@ -2577,8 +2520,26 @@ 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,31 +2645,10 @@ 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 - */ -NTSTATUS STDCALL RtlpDuplicateUnicodeString( INT AddNull, IN PUNICODE_STRING SourceString, @@ -2747,6 +2687,24 @@ 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