diff --git a/reactos/lib/kernel32/file/find.c b/reactos/lib/kernel32/file/find.c index 02fa156085f..b1d7b2bfb98 100644 --- a/reactos/lib/kernel32/file/find.c +++ b/reactos/lib/kernel32/file/find.c @@ -94,7 +94,7 @@ InternalFindFirstFile ( PKERNEL32_FIND_FILE_DATA IData; IO_STATUS_BLOCK IoStatusBlock; UNICODE_STRING NtPathU; - UNICODE_STRING PatternStr; + UNICODE_STRING PatternStr = RTL_CONSTANT_STRING(L"*"); NTSTATUS Status; PWSTR e1, e2; WCHAR CurrentDir[256]; @@ -234,11 +234,7 @@ InternalFindFirstFile ( } /* change pattern: "*.*" --> "*" */ - if (!wcscmp (SearchPattern, L"*.*")) - { - RtlRosInitUnicodeStringFromLiteral(&PatternStr, L"*"); - } - else + if (wcscmp (SearchPattern, L"*.*")) { RtlInitUnicodeString(&PatternStr, SearchPattern); } diff --git a/reactos/lib/kernel32/k32.h b/reactos/lib/kernel32/k32.h index a95732247ed..38cd3b0bdf3 100755 --- a/reactos/lib/kernel32/k32.h +++ b/reactos/lib/kernel32/k32.h @@ -34,7 +34,6 @@ /* FIXME: KILL ROSRTL */ #include -#include #include /* Internal Kernel32 Header */ diff --git a/reactos/lib/kernel32/misc/comm.c b/reactos/lib/kernel32/misc/comm.c index 45de5e59bb9..58ce8c05540 100644 --- a/reactos/lib/kernel32/misc/comm.c +++ b/reactos/lib/kernel32/misc/comm.c @@ -210,8 +210,8 @@ COMMDCB_ParseBool(LPWSTR *StrTail, BOOL bRetVal; ULONG_PTR nValue; static COMMDCB_PARAM_STRFLAG a_BoolFlags[] = { - { ROS_STRING_INITIALIZER(L"off"), FALSE }, - { ROS_STRING_INITIALIZER(L"on"), TRUE } + { RTL_CONSTANT_STRING(L"off"), FALSE }, + { RTL_CONSTANT_STRING(L"on"), TRUE } }; /* try to recognize the next flag as a boolean */ @@ -339,9 +339,9 @@ COMMDCB_PARAM_HANDLER(dtr) BOOL bRetVal; ULONG_PTR nValue; static COMMDCB_PARAM_STRFLAG a_DTRFlags[] = { - { ROS_STRING_INITIALIZER(L"hs"), DTR_CONTROL_HANDSHAKE }, - { ROS_STRING_INITIALIZER(L"off"), DTR_CONTROL_DISABLE }, - { ROS_STRING_INITIALIZER(L"on"), DTR_CONTROL_ENABLE } + { RTL_CONSTANT_STRING(L"hs"), DTR_CONTROL_HANDSHAKE }, + { RTL_CONSTANT_STRING(L"off"), DTR_CONTROL_DISABLE }, + { RTL_CONSTANT_STRING(L"on"), DTR_CONTROL_ENABLE } }; (void)Timeouts; @@ -450,10 +450,10 @@ COMMDCB_PARAM_HANDLER(rts) DWORD nRetVal; ULONG_PTR nValue; static COMMDCB_PARAM_STRFLAG a_RTSFlags[] = { - { ROS_STRING_INITIALIZER(L"hs"), RTS_CONTROL_HANDSHAKE }, - { ROS_STRING_INITIALIZER(L"off"), RTS_CONTROL_DISABLE }, - { ROS_STRING_INITIALIZER(L"on"), RTS_CONTROL_ENABLE }, - { ROS_STRING_INITIALIZER(L"tg"), RTS_CONTROL_TOGGLE } + { RTL_CONSTANT_STRING(L"hs"), RTS_CONTROL_HANDSHAKE }, + { RTL_CONSTANT_STRING(L"off"), RTS_CONTROL_DISABLE }, + { RTL_CONSTANT_STRING(L"on"), RTS_CONTROL_ENABLE }, + { RTL_CONSTANT_STRING(L"tg"), RTS_CONTROL_TOGGLE } }; (void)Timeouts; @@ -480,9 +480,9 @@ COMMDCB_PARAM_HANDLER(stop) BOOL bRetVal; ULONG_PTR nValue; static COMMDCB_PARAM_STRFLAG a_StopFlags[] = { - { ROS_STRING_INITIALIZER(L"1"), ONESTOPBIT }, - { ROS_STRING_INITIALIZER(L"1.5"), ONE5STOPBITS }, - { ROS_STRING_INITIALIZER(L"2"), TWOSTOPBITS } + { RTL_CONSTANT_STRING(L"1"), ONESTOPBIT }, + { RTL_CONSTANT_STRING(L"1.5"), ONE5STOPBITS }, + { RTL_CONSTANT_STRING(L"2"), TWOSTOPBITS } }; (void)Timeouts; @@ -572,7 +572,7 @@ COMMDCB_PARAM_HANDLER(xon) /* FUNCTIONS */ #define COMMDCB_PARAM(__P__) \ { \ - ROS_STRING_INITIALIZER( L""#__P__ ), \ + RTL_CONSTANT_STRING( L""#__P__ ), \ (ULONG_PTR)&COMMDCB_ ## __P__ ## Param \ } diff --git a/reactos/lib/kernel32/misc/computername.c b/reactos/lib/kernel32/misc/computername.c index 3e100ccb08f..92962ec9fb9 100644 --- a/reactos/lib/kernel32/misc/computername.c +++ b/reactos/lib/kernel32/misc/computername.c @@ -144,7 +144,9 @@ GetComputerNameExW ( case ComputerNameDnsFullyQualified: RtlInitUnicodeString(&Dot,L"."); - RosInitializeString(&ResultString,0,*nSize * sizeof(WCHAR),lpBuffer); + RtlInitUnicodeString(&ResultString, NULL); + ResultString.Length = *nSize * sizeof(WCHAR); + ResultString.MaximumLength = *nSize * sizeof(WCHAR); RtlInitUnicodeString(&RegKey, L"\\Registry\\Machine\\System" L"\\CurrentControlSet\\Services\\Tcpip" diff --git a/reactos/lib/kernel32/misc/dllmain.c b/reactos/lib/kernel32/misc/dllmain.c index 7aa6df08389..e0b3f9a88df 100644 --- a/reactos/lib/kernel32/misc/dllmain.c +++ b/reactos/lib/kernel32/misc/dllmain.c @@ -47,7 +47,7 @@ static NTSTATUS OpenBaseDirectory(PHANDLE DirHandle) { OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING Name = ROS_STRING_INITIALIZER(L"\\BaseNamedObjects"); + UNICODE_STRING Name = RTL_CONSTANT_STRING(L"\\BaseNamedObjects"); NTSTATUS Status; InitializeObjectAttributes(&ObjectAttributes, diff --git a/reactos/lib/kernel32/misc/lang.c b/reactos/lib/kernel32/misc/lang.c index c030e8cab49..f6686d1233f 100644 --- a/reactos/lib/kernel32/misc/lang.c +++ b/reactos/lib/kernel32/misc/lang.c @@ -293,7 +293,8 @@ EnumSystemLocalesW ( { NTSTATUS result; HANDLE langKey; - UNICODE_STRING langKeyName; + UNICODE_STRING langKeyName = RTL_CONSTANT_STRING( + L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Nls\\Locale"); OBJECT_ATTRIBUTES objectAttributes; ULONG index, length; unsigned char fullInfo[sizeof(KEY_VALUE_FULL_INFORMATION)+255*2]; //FIXME: MAX_PATH*2 @@ -314,9 +315,6 @@ EnumSystemLocalesW ( // Open language registry key //FIXME: Should we use critical section here? - RtlRosInitUnicodeStringFromLiteral(&langKeyName, - L"\\Registry\\Machine\\System\\CurrentControlSet\\Control\\Nls\\Locale"); - InitializeObjectAttributes(&objectAttributes, &langKeyName, OBJ_CASE_INSENSITIVE,