Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 59187: Fix code indentation
by hbelusca＠svn.reactos.org 07 Jun '13

07 Jun '13

Author: hbelusca Date: Fri Jun 7 23:50:44 2013 New Revision: 59187 URL: http://svn.reactos.org/svn/reactos?rev=59187&view=rev Log: Fix code indentation Modified: trunk/reactos/dll/win32/kernel32/client/file/filename.c Modified: trunk/reactos/dll/win32/kernel32/client/file/filename.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/filename.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/filename.c [iso-8859-1] Fri Jun 7 23:50:44 2013 @@ -233,53 +233,53 @@ BOOL WINAPI SetFileShortNameW( - HANDLE hFile, - LPCWSTR lpShortName) -{ - NTSTATUS Status; - ULONG NeededSize; - UNICODE_STRING ShortName; - IO_STATUS_BLOCK IoStatusBlock; - PFILE_NAME_INFORMATION FileNameInfo; - - if(IsConsoleHandle(hFile)) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - if(!lpShortName) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - RtlInitUnicodeString(&ShortName, lpShortName); - - NeededSize = sizeof(FILE_NAME_INFORMATION) + ShortName.Length + sizeof(WCHAR); - if(!(FileNameInfo = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, NeededSize))) - { - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return FALSE; - } - - FileNameInfo->FileNameLength = ShortName.Length; - RtlCopyMemory(FileNameInfo->FileName, ShortName.Buffer, ShortName.Length); - - Status = NtSetInformationFile(hFile, - &IoStatusBlock, //out - FileNameInfo, - NeededSize, - FileShortNameInformation); - - RtlFreeHeap(RtlGetProcessHeap(), 0, FileNameInfo); - if(!NT_SUCCESS(Status)) - { - BaseSetLastNTError(Status); - return FALSE; - } - - return TRUE; + HANDLE hFile, + LPCWSTR lpShortName) +{ + NTSTATUS Status; + ULONG NeededSize; + UNICODE_STRING ShortName; + IO_STATUS_BLOCK IoStatusBlock; + PFILE_NAME_INFORMATION FileNameInfo; + + if(IsConsoleHandle(hFile)) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if(!lpShortName) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + RtlInitUnicodeString(&ShortName, lpShortName); + + NeededSize = sizeof(FILE_NAME_INFORMATION) + ShortName.Length + sizeof(WCHAR); + if(!(FileNameInfo = RtlAllocateHeap(RtlGetProcessHeap(), HEAP_ZERO_MEMORY, NeededSize))) + { + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return FALSE; + } + + FileNameInfo->FileNameLength = ShortName.Length; + RtlCopyMemory(FileNameInfo->FileName, ShortName.Buffer, ShortName.Length); + + Status = NtSetInformationFile(hFile, + &IoStatusBlock, //out + FileNameInfo, + NeededSize, + FileShortNameInformation); + + RtlFreeHeap(RtlGetProcessHeap(), 0, FileNameInfo); + if(!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + return TRUE; } @@ -290,27 +290,26 @@ WINAPI SetFileShortNameA( HANDLE hFile, - LPCSTR lpShortName - ) -{ - PWCHAR ShortNameW; - - if(IsConsoleHandle(hFile)) - { - SetLastError(ERROR_INVALID_HANDLE); - return FALSE; - } - - if(!lpShortName) - { - SetLastError(ERROR_INVALID_PARAMETER); - return FALSE; - } - - if (!(ShortNameW = FilenameA2W(lpShortName, FALSE))) - return FALSE; - - return SetFileShortNameW(hFile, ShortNameW); + LPCSTR lpShortName) +{ + PWCHAR ShortNameW; + + if(IsConsoleHandle(hFile)) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + if(!lpShortName) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + if (!(ShortNameW = FilenameA2W(lpShortName, FALSE))) + return FALSE; + + return SetFileShortNameW(hFile, ShortNameW); }

1 0

[ekohl] 59186: [NETAPI32] Fix NetLocalGroupGetMembers and implement level 1. The netapi32:access winetest does not crash any more and group members appear in the user manager control panel.
by ekohl＠svn.reactos.org 07 Jun '13

07 Jun '13

Author: ekohl Date: Fri Jun 7 22:36:49 2013 New Revision: 59186 URL: http://svn.reactos.org/svn/reactos?rev=59186&view=rev Log: [NETAPI32] Fix NetLocalGroupGetMembers and implement level 1. The netapi32:access winetest does not crash any more and group members appear in the user manager control panel. Modified: trunk/reactos/dll/win32/netapi32/local_group.c Modified: trunk/reactos/dll/win32/netapi32/local_group.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/netapi32/local_g… ============================================================================== --- trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/netapi32/local_group.c [iso-8859-1] Fri Jun 7 22:36:49 2013 @@ -50,10 +50,13 @@ SAM_HANDLE ServerHandle; SAM_HANDLE DomainHandle; SAM_HANDLE AliasHandle; + LSA_HANDLE LsaHandle; PSID *Sids; ULONG Count; - ULONG Index; + PLSA_REFERENCED_DOMAIN_LIST Domains; + PLSA_TRANSLATED_NAME Names; + } MEMBER_ENUM_CONTEXT, *PMEMBER_ENUM_CONTEXT; @@ -157,66 +160,6 @@ SamFreeMemory(AliasInfo->AdminComment.Buffer); SamFreeMemory(AliasInfo); -} - - -static -NET_API_STATUS -BuildAliasMemberBuffer(PSID MemberSid, - DWORD level, - LPVOID *Buffer) -{ - LPVOID LocalBuffer = NULL; - PLOCALGROUP_MEMBERS_INFO_0 MembersInfo0; - PVOID Ptr; - ULONG Size = 0; - NET_API_STATUS ApiStatus = NERR_Success; - - switch (level) - { - case 0: - Size = sizeof(LOCALGROUP_MEMBERS_INFO_0) + - RtlLengthSid(MemberSid); - break; - - default: - ApiStatus = ERROR_INVALID_LEVEL; - goto done; - } - - - ApiStatus = NetApiBufferAllocate(Size, &LocalBuffer); - if (ApiStatus != NERR_Success) - goto done; - - ZeroMemory(LocalBuffer, Size); - - switch (level) - { - case 0: - MembersInfo0 = (PLOCALGROUP_MEMBERS_INFO_0)LocalBuffer; - - Ptr = (PVOID)MembersInfo0++; - MembersInfo0->lgrmi0_sid = (PSID)Ptr; - - memcpy(MembersInfo0->lgrmi0_sid, - MemberSid, - RtlLengthSid(MemberSid)); - break; - } - -done: - if (ApiStatus == NERR_Success) - { - *Buffer = LocalBuffer; - } - else - { - if (LocalBuffer != NULL) - NetApiBufferFree(LocalBuffer); - } - - return ApiStatus; } @@ -996,14 +939,21 @@ LPDWORD totalentries, PDWORD_PTR resumehandle) { + OBJECT_ATTRIBUTES ObjectAttributes; UNICODE_STRING ServerName; UNICODE_STRING AliasName; PMEMBER_ENUM_CONTEXT EnumContext = NULL; LPVOID Buffer = NULL; + PLOCALGROUP_MEMBERS_INFO_0 MembersInfo0; + PLOCALGROUP_MEMBERS_INFO_1 MembersInfo1; + LPWSTR Ptr; + ULONG Size = 0; + ULONG SidLength; + ULONG i; NET_API_STATUS ApiStatus = NERR_Success; NTSTATUS Status = STATUS_SUCCESS; - TRACE("(%s %s %d %p %d, %p %p %p) stub!\n", debugstr_w(servername), + TRACE("(%s %s %d %p %d, %p %p %p)\n", debugstr_w(servername), debugstr_w(localgroupname), level, bufptr, prefmaxlen, entriesread, totalentries, resumehandle); @@ -1109,30 +1059,135 @@ ApiStatus = NERR_Success; goto done; } - } - - /* Build the member information buffer */ - ApiStatus = BuildAliasMemberBuffer(EnumContext->Sids[EnumContext->Index], - level, - &Buffer); + + + if (level != 0) + { + InitializeObjectAttributes(&ObjectAttributes, + NULL, + 0, + 0, + NULL); + + Status = LsaOpenPolicy((servername != NULL) ? &ServerName : NULL, + (PLSA_OBJECT_ATTRIBUTES)&ObjectAttributes, + POLICY_EXECUTE, + &EnumContext->LsaHandle); + if (!NT_SUCCESS(Status)) + { + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + + Status = LsaLookupSids(EnumContext->LsaHandle, + EnumContext->Count, + EnumContext->Sids, + &EnumContext->Domains, + &EnumContext->Names); + if (!NT_SUCCESS(Status)) + { + ApiStatus = NetpNtStatusToApiStatus(Status); + goto done; + } + } + } + + /* Calculate the required buffer size */ + for (i = 0; i < EnumContext->Count; i++) + { + switch (level) + { + case 0: + Size = sizeof(LOCALGROUP_MEMBERS_INFO_0) + + RtlLengthSid(EnumContext->Sids[i]); + break; + + case 1: + Size = sizeof(LOCALGROUP_MEMBERS_INFO_1) + + RtlLengthSid(EnumContext->Sids[i]) + + EnumContext->Names[i].Name.Length + sizeof(WCHAR); + break; + + default: + ApiStatus = ERROR_INVALID_LEVEL; + goto done; + } + } + + /* Allocate the member buffer */ + ApiStatus = NetApiBufferAllocate(Size, &Buffer); if (ApiStatus != NERR_Success) goto done; - EnumContext->Index++; - (*entriesread)++; + ZeroMemory(Buffer, Size); + + /* Fill the member buffer */ + switch (level) + { + case 0: + MembersInfo0 = (PLOCALGROUP_MEMBERS_INFO_0)Buffer; + Ptr = (PVOID)((ULONG_PTR)Buffer + sizeof(LOCALGROUP_MEMBERS_INFO_0) * EnumContext->Count); + break; + + case 1: + MembersInfo1 = (PLOCALGROUP_MEMBERS_INFO_1)Buffer; + Ptr = (PVOID)((ULONG_PTR)Buffer + sizeof(LOCALGROUP_MEMBERS_INFO_1) * EnumContext->Count); + break; + } + + for (i = 0; i < EnumContext->Count; i++) + { + switch (level) + { + case 0: + MembersInfo0->lgrmi0_sid = (PSID)Ptr; + + SidLength = RtlLengthSid(EnumContext->Sids[i]); + memcpy(MembersInfo0->lgrmi0_sid, + EnumContext->Sids[i], + SidLength); + Ptr = (PVOID)((ULONG_PTR)Ptr + SidLength); + break; + + case 1: + MembersInfo1->lgrmi1_sid = (PSID)Ptr; + + SidLength = RtlLengthSid(EnumContext->Sids[i]); + memcpy(MembersInfo1->lgrmi1_sid, + EnumContext->Sids[i], + SidLength); + + Ptr = (PVOID)((ULONG_PTR)Ptr + SidLength); + + MembersInfo1->lgrmi1_sidusage = EnumContext->Names[i].Use; + + TRACE("Name: %S\n", EnumContext->Names[i].Name.Buffer); + + MembersInfo1->lgrmi1_name = (LPWSTR)Ptr; + + memcpy(MembersInfo1->lgrmi1_name, + EnumContext->Names[i].Name.Buffer, + EnumContext->Names[i].Name.Length); + break; + } + } + + *entriesread = EnumContext->Count; + + *bufptr = (LPBYTE)Buffer; done: - if (ApiStatus == NERR_Success && EnumContext->Index < EnumContext->Count) - ApiStatus = ERROR_MORE_DATA; - if (EnumContext != NULL) - *totalentries = EnumContext->Count - EnumContext->Index; + *totalentries = EnumContext->Count; if (resumehandle == NULL || ApiStatus != ERROR_MORE_DATA) { /* Release the enumeration context */ if (EnumContext != NULL) { + if (EnumContext->LsaHandle != NULL) + LsaClose(EnumContext->LsaHandle); + if (EnumContext->AliasHandle != NULL) SamCloseHandle(EnumContext->AliasHandle); @@ -1144,6 +1199,12 @@ if (EnumContext->Sids != NULL) SamFreeMemory(EnumContext->Sids); + + if (EnumContext->Domains != NULL) + LsaFreeMemory(EnumContext->Domains); + + if (EnumContext->Names != NULL) + LsaFreeMemory(EnumContext->Names); NetApiBufferFree(EnumContext); EnumContext = NULL;

1 0

[hbelusca] 59185: [KERNEL32-RTL] Fix return type and usage of RtlDetermineDosPathNameType_U, and use the declaration of RTL_PATH_TYPE in winternl.h instead of the wineism DOS_PATHNAME_TYPE. See r59...
by hbelusca＠svn.reactos.org 07 Jun '13

07 Jun '13

Author: hbelusca Date: Fri Jun 7 20:40:34 2013 New Revision: 59185 URL: http://svn.reactos.org/svn/reactos?rev=59185&view=rev Log: [KERNEL32-RTL] Fix return type and usage of RtlDetermineDosPathNameType_U, and use the declaration of RTL_PATH_TYPE in winternl.h instead of the wineism DOS_PATHNAME_TYPE. See r59183 and 59184 for more information. Modified: trunk/reactos/dll/win32/kernel32/wine/profile.c trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/psdk/winternl.h trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/dll/win32/kernel32/wine/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/wine/pr… ============================================================================== --- trunk/reactos/dll/win32/kernel32/wine/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/wine/profile.c [iso-8859-1] Fri Jun 7 20:40:34 2013 @@ -762,7 +762,7 @@ if (!filename) filename = wininiW; - if ((RtlDetermineDosPathNameType_U(filename) == RELATIVE_PATH) && + if ((RtlDetermineDosPathNameType_U(filename) == RtlPathTypeRelative) && !strchrW(filename, '\\') && !strchrW(filename, '/')) { static const WCHAR wszSeparator[] = {'\\', 0}; Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Fri Jun 7 20:40:34 2013 @@ -2617,7 +2617,7 @@ ); NTSYSAPI -ULONG +RTL_PATH_TYPE NTAPI RtlDetermineDosPathNameType_U( _In_ PCWSTR Path Modified: trunk/reactos/include/psdk/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winternl.h?re… ============================================================================== --- trunk/reactos/include/psdk/winternl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winternl.h [iso-8859-1] Fri Jun 7 20:40:34 2013 @@ -861,18 +861,18 @@ } TIMER_BASIC_INFORMATION, *PTIMER_BASIC_INFORMATION; -/* return type of RtlDetermineDosPathNameType_U (FIXME: not the correct names) */ -typedef enum -{ - INVALID_PATH = 0, - UNC_PATH, /* "//foo" */ - ABSOLUTE_DRIVE_PATH, /* "c:/foo" */ - RELATIVE_DRIVE_PATH, /* "c:foo" */ - ABSOLUTE_PATH, /* "/foo" */ - RELATIVE_PATH, /* "foo" */ - DEVICE_PATH, /* "//./foo" */ - UNC_DOT_PATH /* "//." */ -} DOS_PATHNAME_TYPE; +/* Return type of RtlDetermineDosPathNameType_U */ +typedef enum _RTL_PATH_TYPE +{ + RtlPathTypeUnknown, + RtlPathTypeUncAbsolute, + RtlPathTypeDriveAbsolute, + RtlPathTypeDriveRelative, + RtlPathTypeRooted, + RtlPathTypeRelative, + RtlPathTypeLocalDevice, + RtlPathTypeRootLocalDevice, +} RTL_PATH_TYPE; /*********************************************************************** * IA64 specific types and data structures @@ -2130,7 +2130,7 @@ HANDLE WINAPI RtlDestroyHeap(HANDLE); void WINAPI RtlDestroyProcessParameters(RTL_USER_PROCESS_PARAMETERS*); NTSTATUS WINAPI RtlDestroyQueryDebugBuffer(PDEBUG_BUFFER); -DOS_PATHNAME_TYPE WINAPI RtlDetermineDosPathNameType_U(PCWSTR); +RTL_PATH_TYPE WINAPI RtlDetermineDosPathNameType_U(PCWSTR); BOOLEAN WINAPI RtlDoesFileExists_U(LPCWSTR); BOOLEAN WINAPI RtlDosPathNameToNtPathName_U(PCWSTR,PUNICODE_STRING,PCWSTR*,CURDIR*); ULONG WINAPI RtlDosSearchPath_U(LPCWSTR, LPCWSTR, LPCWSTR, ULONG, LPWSTR, LPWSTR*); Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=59185&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Fri Jun 7 20:40:34 2013 @@ -867,7 +867,7 @@ /* * @implemented */ -ULONG +RTL_PATH_TYPE NTAPI RtlDetermineDosPathNameType_U(IN PCWSTR Path) {

1 0

[spetreolle] 59184: Revert 59183 on hbelusca's request.
by spetreolle＠svn.reactos.org 07 Jun '13

07 Jun '13

Author: spetreolle Date: Fri Jun 7 09:36:37 2013 New Revision: 59184 URL: http://svn.reactos.org/svn/reactos?rev=59184&view=rev Log: Revert 59183 on hbelusca's request. Modified: trunk/reactos/dll/win32/kernel32/wine/profile.c trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/psdk/winternl.h trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/dll/win32/kernel32/wine/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/wine/pr… ============================================================================== --- trunk/reactos/dll/win32/kernel32/wine/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/wine/profile.c [iso-8859-1] Fri Jun 7 09:36:37 2013 @@ -762,7 +762,7 @@ if (!filename) filename = wininiW; - if ((RtlDetermineDosPathNameType_U(filename) == RtlPathTypeRelative) && + if ((RtlDetermineDosPathNameType_U(filename) == RELATIVE_PATH) && !strchrW(filename, '\\') && !strchrW(filename, '/')) { static const WCHAR wszSeparator[] = {'\\', 0}; Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Fri Jun 7 09:36:37 2013 @@ -2617,7 +2617,7 @@ ); NTSYSAPI -RTL_PATH_TYPE +ULONG NTAPI RtlDetermineDosPathNameType_U( _In_ PCWSTR Path Modified: trunk/reactos/include/psdk/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winternl.h?re… ============================================================================== --- trunk/reactos/include/psdk/winternl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winternl.h [iso-8859-1] Fri Jun 7 09:36:37 2013 @@ -861,18 +861,18 @@ } TIMER_BASIC_INFORMATION, *PTIMER_BASIC_INFORMATION; -/* Return type of RtlDetermineDosPathNameType_U */ -typedef enum _RTL_PATH_TYPE -{ - RtlPathTypeUnknown, - RtlPathTypeUncAbsolute, - RtlPathTypeDriveAbsolute, - RtlPathTypeDriveRelative, - RtlPathTypeRooted, - RtlPathTypeRelative, - RtlPathTypeLocalDevice, - RtlPathTypeRootLocalDevice, -} RTL_PATH_TYPE; +/* return type of RtlDetermineDosPathNameType_U (FIXME: not the correct names) */ +typedef enum +{ + INVALID_PATH = 0, + UNC_PATH, /* "//foo" */ + ABSOLUTE_DRIVE_PATH, /* "c:/foo" */ + RELATIVE_DRIVE_PATH, /* "c:foo" */ + ABSOLUTE_PATH, /* "/foo" */ + RELATIVE_PATH, /* "foo" */ + DEVICE_PATH, /* "//./foo" */ + UNC_DOT_PATH /* "//." */ +} DOS_PATHNAME_TYPE; /*********************************************************************** * IA64 specific types and data structures @@ -2130,7 +2130,7 @@ HANDLE WINAPI RtlDestroyHeap(HANDLE); void WINAPI RtlDestroyProcessParameters(RTL_USER_PROCESS_PARAMETERS*); NTSTATUS WINAPI RtlDestroyQueryDebugBuffer(PDEBUG_BUFFER); -RTL_PATH_TYPE WINAPI RtlDetermineDosPathNameType_U(PCWSTR); +DOS_PATHNAME_TYPE WINAPI RtlDetermineDosPathNameType_U(PCWSTR); BOOLEAN WINAPI RtlDoesFileExists_U(LPCWSTR); BOOLEAN WINAPI RtlDosPathNameToNtPathName_U(PCWSTR,PUNICODE_STRING,PCWSTR*,CURDIR*); ULONG WINAPI RtlDosSearchPath_U(LPCWSTR, LPCWSTR, LPCWSTR, ULONG, LPWSTR, LPWSTR*); Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=59184&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Fri Jun 7 09:36:37 2013 @@ -160,7 +160,7 @@ { /* Check if the character is a path or drive separator */ c = *End; - if (IS_PATH_SEPARATOR(c) || ((c == ':') && (End == PathCopy.Buffer + 1))) + if ((c == '\\') || (c == '/') || ((c == ':') && (End == PathCopy.Buffer + 1))) { /* Get the next lower case character */ End++; @@ -422,33 +422,30 @@ if (PartName) { /* Loop from the back until we find a path separator */ - p = &NewBuffer[DosLength / sizeof (WCHAR)]; - while (--p > NewBuffer) - { - /* We found a path separator, move past it */ - if (*p == OBJ_NAME_PATH_SEPARATOR) - { - ++p; - break; - } - } - - /* Check whether a separator was found and if something remains */ - if ((p > NewBuffer) && *p) - { - /* What follows the path separator is the partial name */ - *PartName = p; - } - else - { - /* The path ends with a path separator, no partial name */ - *PartName = NULL; + p = &NewBuffer[(DosLength - 1) / sizeof (WCHAR)]; + while (p > NewBuffer) if (*p-- == '\\') break; + + /* Was one found? */ + if (p > NewBuffer) + { + /* Move past it -- anything left? */ + p++; + if (!*p) + { + /* The path ends with a path separator, no part name */ + *PartName = NULL; + } + else + { + /* What follows the path separator is the part name */ + *PartName = p; + } } } /* Build the final NT path string */ + NtPath->Length = (USHORT)DosLength; NtPath->Buffer = NewBuffer; - NtPath->Length = (USHORT)DosLength; NtPath->MaximumLength = (USHORT)DosLength + sizeof(UNICODE_NULL); return STATUS_SUCCESS; } @@ -577,6 +574,7 @@ /* Nothing else is expected */ default: ASSERT(FALSE); + } /* Now copy the prefix and the buffer */ @@ -594,7 +592,7 @@ NtName->Length = (USHORT)Length; NtName->MaximumLength = (USHORT)MaxLength; NewBuffer[LengthChars] = UNICODE_NULL; - DPRINT("New buffer: %S\n", NewBuffer); + DPRINT("new buffer: %S\n", NewBuffer); DPRINT("NT Name: %wZ\n", NtName); /* Check if a partial name was requested */ @@ -653,7 +651,7 @@ RelativeName->RelativeName.Buffer = (PWSTR)((ULONG_PTR)NewBuffer + PrefixLength + FullPath.Length - PrefixCut * sizeof(WCHAR)); RelativeName->RelativeName.Length = (USHORT)(PathLength - FullPath.Length); /* If relative name starts with \, skip it */ - if (RelativeName->RelativeName.Buffer[0] == OBJ_NAME_PATH_SEPARATOR) + if (RelativeName->RelativeName.Buffer[0] == L'\\') { RelativeName->RelativeName.Buffer++; RelativeName->RelativeName.Length -= sizeof(WCHAR); @@ -869,7 +867,7 @@ /* * @implemented */ -RTL_PATH_TYPE +ULONG NTAPI RtlDetermineDosPathNameType_U(IN PCWSTR Path) { @@ -1123,7 +1121,7 @@ FullPath.Length = (USHORT)FullPathLength; /* If full path isn't \ terminated, do it */ - if (FullPath.Buffer[CharLength - 1] != OBJ_NAME_PATH_SEPARATOR) + if (FullPath.Buffer[CharLength - 1] != L'\\') { if ((CharLength + 1) * sizeof(WCHAR) > SavedLength) { @@ -1131,7 +1129,7 @@ goto Leave; } - FullPath.Buffer[CharLength] = OBJ_NAME_PATH_SEPARATOR; + FullPath.Buffer[CharLength] = L'\\'; FullPath.Buffer[CharLength + 1] = UNICODE_NULL; FullPath.Length += sizeof(WCHAR); } @@ -1502,8 +1500,6 @@ if (!name || !*name) return 0; - RtlZeroMemory(buffer, size); - if (file_part) *file_part = NULL; /* check for DOS device name */ @@ -1737,9 +1733,9 @@ } /* Add a terminating slash if needed */ - if ((BufferStart != NewBuffer) && (BufferStart[-1] != OBJ_NAME_PATH_SEPARATOR)) - { - *BufferStart++ = OBJ_NAME_PATH_SEPARATOR; + if ((BufferStart != NewBuffer) && (BufferStart[-1] != '\\')) + { + *BufferStart++ = '\\'; } /* Bail out if we reached the end */ @@ -2055,7 +2051,6 @@ /* Initialize optional arguments */ if (FullNameOut) *FullNameOut = NULL; if (FilePartSize) *FilePartSize = 0; - if (LengthNeeded) *LengthNeeded = 0; if (DynamicString) { DynamicString->Length = DynamicString->MaximumLength = 0; @@ -2327,7 +2322,7 @@ &StaticCandidateString, Status); } - DPRINT("Status: %lx BUFFER: %S\n", Status, CallerBuffer->Buffer); + DPRINT("STatus: %lx BUFFER: %S\n", Status, CallerBuffer->Buffer); goto Quickie; } else

1 0

[hbelusca] 59183: [KERNEL32-RTL] Fix return type and usage of RtlDetermineDosPathNameType_U, and use the declaration of RTL_PATH_TYPE in winternl.h instead of the wineism DOS_PATHNAME_TYPE. [RTL:PA...
by hbelusca＠svn.reactos.org 07 Jun '13

07 Jun '13

Author: hbelusca Date: Fri Jun 7 01:25:57 2013 New Revision: 59183 URL: http://svn.reactos.org/svn/reactos?rev=59183&view=rev Log: [KERNEL32-RTL] Fix return type and usage of RtlDetermineDosPathNameType_U, and use the declaration of RTL_PATH_TYPE in winternl.h instead of the wineism DOS_PATHNAME_TYPE. [RTL:PATH] - Make usage of the IS_PATH_SEPARATOR(...) macro instead of automatically checking for L'\\' or L'/', and of OBJ_NAME_PATH_SEPARATOR when checking for L'\\' only or setting the character L'\\' (just code consistency only). <Test fixes:> - Fix a search loop and a check in RtlpWin32NTNameToNtPathName_U (a problem of setting the pointer *PartName via the variable p existed (always 1 character shift wrt. the expected result, and now *PartName is set to NULL even if p == NewBuffer). - Zero out an optional parameter (if present) in RtlDosSearchPath_Ustr. - Zero out the return buffer in RtlGetFullPathName_U (function from Wine). Those fixes ^ correct the following tests: * ntdll:RtlDosPathNameToNtPathName_U (58 errors to 4 errors remaining due to UNC path handling). * ntdll:RtlDosSearchPath_U (9 errors to 6 errors remaining due to the fact that our RtlDosSearchPath_U doesn't throw exception on bad arguments because it checks the validity of its arguments (pointers especially), whereas on Windows it seems it doesn't happen to be the case). * ntdll:RtlDosSearchPath_Ustr (4 errors to full success). * ntdll:RtlGetFullPathName_U (31 errors to 8 errors). * ntdll:RtlGetFullPathName_UstrEx (29 errors to 6 errors). Modified: trunk/reactos/dll/win32/kernel32/wine/profile.c trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/psdk/winternl.h trunk/reactos/lib/rtl/path.c Modified: trunk/reactos/dll/win32/kernel32/wine/profile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/wine/pr… ============================================================================== --- trunk/reactos/dll/win32/kernel32/wine/profile.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/wine/profile.c [iso-8859-1] Fri Jun 7 01:25:57 2013 @@ -762,7 +762,7 @@ if (!filename) filename = wininiW; - if ((RtlDetermineDosPathNameType_U(filename) == RELATIVE_PATH) && + if ((RtlDetermineDosPathNameType_U(filename) == RtlPathTypeRelative) && !strchrW(filename, '\\') && !strchrW(filename, '/')) { static const WCHAR wszSeparator[] = {'\\', 0}; Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Fri Jun 7 01:25:57 2013 @@ -2617,7 +2617,7 @@ ); NTSYSAPI -ULONG +RTL_PATH_TYPE NTAPI RtlDetermineDosPathNameType_U( _In_ PCWSTR Path Modified: trunk/reactos/include/psdk/winternl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winternl.h?re… ============================================================================== --- trunk/reactos/include/psdk/winternl.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winternl.h [iso-8859-1] Fri Jun 7 01:25:57 2013 @@ -861,18 +861,18 @@ } TIMER_BASIC_INFORMATION, *PTIMER_BASIC_INFORMATION; -/* return type of RtlDetermineDosPathNameType_U (FIXME: not the correct names) */ -typedef enum -{ - INVALID_PATH = 0, - UNC_PATH, /* "//foo" */ - ABSOLUTE_DRIVE_PATH, /* "c:/foo" */ - RELATIVE_DRIVE_PATH, /* "c:foo" */ - ABSOLUTE_PATH, /* "/foo" */ - RELATIVE_PATH, /* "foo" */ - DEVICE_PATH, /* "//./foo" */ - UNC_DOT_PATH /* "//." */ -} DOS_PATHNAME_TYPE; +/* Return type of RtlDetermineDosPathNameType_U */ +typedef enum _RTL_PATH_TYPE +{ + RtlPathTypeUnknown, + RtlPathTypeUncAbsolute, + RtlPathTypeDriveAbsolute, + RtlPathTypeDriveRelative, + RtlPathTypeRooted, + RtlPathTypeRelative, + RtlPathTypeLocalDevice, + RtlPathTypeRootLocalDevice, +} RTL_PATH_TYPE; /*********************************************************************** * IA64 specific types and data structures @@ -2130,7 +2130,7 @@ HANDLE WINAPI RtlDestroyHeap(HANDLE); void WINAPI RtlDestroyProcessParameters(RTL_USER_PROCESS_PARAMETERS*); NTSTATUS WINAPI RtlDestroyQueryDebugBuffer(PDEBUG_BUFFER); -DOS_PATHNAME_TYPE WINAPI RtlDetermineDosPathNameType_U(PCWSTR); +RTL_PATH_TYPE WINAPI RtlDetermineDosPathNameType_U(PCWSTR); BOOLEAN WINAPI RtlDoesFileExists_U(LPCWSTR); BOOLEAN WINAPI RtlDosPathNameToNtPathName_U(PCWSTR,PUNICODE_STRING,PCWSTR*,CURDIR*); ULONG WINAPI RtlDosSearchPath_U(LPCWSTR, LPCWSTR, LPCWSTR, ULONG, LPWSTR, LPWSTR*); Modified: trunk/reactos/lib/rtl/path.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/path.c?rev=59183&r… ============================================================================== --- trunk/reactos/lib/rtl/path.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/path.c [iso-8859-1] Fri Jun 7 01:25:57 2013 @@ -160,7 +160,7 @@ { /* Check if the character is a path or drive separator */ c = *End; - if ((c == '\\') || (c == '/') || ((c == ':') && (End == PathCopy.Buffer + 1))) + if (IS_PATH_SEPARATOR(c) || ((c == ':') && (End == PathCopy.Buffer + 1))) { /* Get the next lower case character */ End++; @@ -422,30 +422,33 @@ if (PartName) { /* Loop from the back until we find a path separator */ - p = &NewBuffer[(DosLength - 1) / sizeof (WCHAR)]; - while (p > NewBuffer) if (*p-- == '\\') break; - - /* Was one found? */ - if (p > NewBuffer) - { - /* Move past it -- anything left? */ - p++; - if (!*p) + p = &NewBuffer[DosLength / sizeof (WCHAR)]; + while (--p > NewBuffer) + { + /* We found a path separator, move past it */ + if (*p == OBJ_NAME_PATH_SEPARATOR) { - /* The path ends with a path separator, no part name */ - *PartName = NULL; + ++p; + break; } - else - { - /* What follows the path separator is the part name */ - *PartName = p; - } + } + + /* Check whether a separator was found and if something remains */ + if ((p > NewBuffer) && *p) + { + /* What follows the path separator is the partial name */ + *PartName = p; + } + else + { + /* The path ends with a path separator, no partial name */ + *PartName = NULL; } } /* Build the final NT path string */ + NtPath->Buffer = NewBuffer; NtPath->Length = (USHORT)DosLength; - NtPath->Buffer = NewBuffer; NtPath->MaximumLength = (USHORT)DosLength + sizeof(UNICODE_NULL); return STATUS_SUCCESS; } @@ -574,7 +577,6 @@ /* Nothing else is expected */ default: ASSERT(FALSE); - } /* Now copy the prefix and the buffer */ @@ -592,7 +594,7 @@ NtName->Length = (USHORT)Length; NtName->MaximumLength = (USHORT)MaxLength; NewBuffer[LengthChars] = UNICODE_NULL; - DPRINT("new buffer: %S\n", NewBuffer); + DPRINT("New buffer: %S\n", NewBuffer); DPRINT("NT Name: %wZ\n", NtName); /* Check if a partial name was requested */ @@ -651,7 +653,7 @@ RelativeName->RelativeName.Buffer = (PWSTR)((ULONG_PTR)NewBuffer + PrefixLength + FullPath.Length - PrefixCut * sizeof(WCHAR)); RelativeName->RelativeName.Length = (USHORT)(PathLength - FullPath.Length); /* If relative name starts with \, skip it */ - if (RelativeName->RelativeName.Buffer[0] == L'\\') + if (RelativeName->RelativeName.Buffer[0] == OBJ_NAME_PATH_SEPARATOR) { RelativeName->RelativeName.Buffer++; RelativeName->RelativeName.Length -= sizeof(WCHAR); @@ -867,7 +869,7 @@ /* * @implemented */ -ULONG +RTL_PATH_TYPE NTAPI RtlDetermineDosPathNameType_U(IN PCWSTR Path) { @@ -1121,7 +1123,7 @@ FullPath.Length = (USHORT)FullPathLength; /* If full path isn't \ terminated, do it */ - if (FullPath.Buffer[CharLength - 1] != L'\\') + if (FullPath.Buffer[CharLength - 1] != OBJ_NAME_PATH_SEPARATOR) { if ((CharLength + 1) * sizeof(WCHAR) > SavedLength) { @@ -1129,7 +1131,7 @@ goto Leave; } - FullPath.Buffer[CharLength] = L'\\'; + FullPath.Buffer[CharLength] = OBJ_NAME_PATH_SEPARATOR; FullPath.Buffer[CharLength + 1] = UNICODE_NULL; FullPath.Length += sizeof(WCHAR); } @@ -1500,6 +1502,8 @@ if (!name || !*name) return 0; + RtlZeroMemory(buffer, size); + if (file_part) *file_part = NULL; /* check for DOS device name */ @@ -1733,9 +1737,9 @@ } /* Add a terminating slash if needed */ - if ((BufferStart != NewBuffer) && (BufferStart[-1] != '\\')) - { - *BufferStart++ = '\\'; + if ((BufferStart != NewBuffer) && (BufferStart[-1] != OBJ_NAME_PATH_SEPARATOR)) + { + *BufferStart++ = OBJ_NAME_PATH_SEPARATOR; } /* Bail out if we reached the end */ @@ -2051,6 +2055,7 @@ /* Initialize optional arguments */ if (FullNameOut) *FullNameOut = NULL; if (FilePartSize) *FilePartSize = 0; + if (LengthNeeded) *LengthNeeded = 0; if (DynamicString) { DynamicString->Length = DynamicString->MaximumLength = 0; @@ -2322,7 +2327,7 @@ &StaticCandidateString, Status); } - DPRINT("STatus: %lx BUFFER: %S\n", Status, CallerBuffer->Buffer); + DPRINT("Status: %lx BUFFER: %S\n", Status, CallerBuffer->Buffer); goto Quickie; } else

1 0

[fireball] 59182: [KMTEST] - Fix variables declarations, and don't mix 1/0 and TRUE/FALSE. Boolean was invented for that.
by fireball＠svn.reactos.org 06 Jun '13

06 Jun '13

Author: fireball Date: Thu Jun 6 21:54:00 2013 New Revision: 59182 URL: http://svn.reactos.org/svn/reactos?rev=59182&view=rev Log: [KMTEST] - Fix variables declarations, and don't mix 1/0 and TRUE/FALSE. Boolean was invented for that. Modified: trunk/rostests/kmtests/ntos_se/SeQueryInfoToken.c Modified: trunk/rostests/kmtests/ntos_se/SeQueryInfoToken.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_se/SeQueryIn… ============================================================================== --- trunk/rostests/kmtests/ntos_se/SeQueryInfoToken.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_se/SeQueryInfoToken.c [iso-8859-1] Thu Jun 6 21:54:00 2013 @@ -47,6 +47,8 @@ PTOKEN_STATISTICS TStats; PTOKEN_TYPE TType; PTOKEN_USER TUser; + BOOLEAN Flag; + ULONG i; //----------------------------------------------------------------// // Testing SeQueryInformationToken with various args // @@ -100,18 +102,17 @@ { TGroups = (PTOKEN_GROUPS)Buffer; GroupCount = TGroups->GroupCount; - int flag = 1; - int i; + Flag = TRUE; for (i = 0; i < GroupCount; i++) { sid = TGroups->Groups[i].Sid; if (!RtlValidSid(sid)) { - flag = 0; + Flag = FALSE; break; } } - ok((flag == TRUE), "TokenGroup's SIDs are not valid\n"); + ok((Flag == TRUE), "TokenGroup's SIDs are not valid\n"); ExFreePool(Buffer); } } @@ -221,6 +222,7 @@ PVOID Buffer; POBJECT_TYPE PsProcessType = NULL; PGENERIC_MAPPING GenericMapping; + ULONG i; SubjectContext = ExAllocatePool(PagedPool, sizeof(SECURITY_SUBJECT_CONTEXT)); @@ -351,7 +353,6 @@ ok((SeAppendPrivileges(AccessState, NewPrivilegeSet)) == STATUS_SUCCESS, "SeAppendPrivileges failed\n"); ok((AuxData->PrivilegeSet->PrivilegeCount == 20),"PrivelegeCount must be 20, but it is %d\n", AuxData->PrivilegeSet->PrivilegeCount); ExFreePool(NewPrivilegeSet); - int i; for (i = 0; i < AuxData->PrivilegeSet->PrivilegeCount; i++) { AuxData->PrivilegeSet->Privilege[i].Attributes = TPrivileges->Privileges[i].Attributes;

1 0

[fireball] 59181: [KMTEST] - Constantine Belev: Fix a few bugs in the SeQueryInfoToken test. Now it does not crash in ReactOS anymore.
by fireball＠svn.reactos.org 06 Jun '13

06 Jun '13

Author: fireball Date: Thu Jun 6 09:44:34 2013 New Revision: 59181 URL: http://svn.reactos.org/svn/reactos?rev=59181&view=rev Log: [KMTEST] - Constantine Belev: Fix a few bugs in the SeQueryInfoToken test. Now it does not crash in ReactOS anymore. Modified: trunk/rostests/kmtests/ntos_se/SeQueryInfoToken.c Modified: trunk/rostests/kmtests/ntos_se/SeQueryInfoToken.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_se/SeQueryIn… ============================================================================== --- trunk/rostests/kmtests/ntos_se/SeQueryInfoToken.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_se/SeQueryInfoToken.c [iso-8859-1] Thu Jun 6 09:44:34 2013 @@ -14,7 +14,7 @@ #include <debug.h> //------------------------------------------------------------------------------// -// Functions required forWorking with ACCESS_STATE structure // +// Functions required forWorking with ACCESS_STATE structure // //------------------------------------------------------------------------------// NTKERNELAPI NTSTATUS NTAPI SeCreateAccessState( @@ -29,7 +29,7 @@ ); //------------------------------------------------------------------------------// -// Testing Functions // +// Testing Functions // //------------------------------------------------------------------------------// // Testing function for SQIT @@ -47,10 +47,9 @@ PTOKEN_STATISTICS TStats; PTOKEN_TYPE TType; PTOKEN_USER TUser; - //NTSTATUS ExceptionStatus; - - //----------------------------------------------------------------// - // Testing SeQueryInformationToken with various args // + + //----------------------------------------------------------------// + // Testing SeQueryInformationToken with various args // //----------------------------------------------------------------// ok(Token != NULL, "Token is not captured. Testing SQIT interrupted\n\n"); @@ -58,92 +57,144 @@ if (Token == NULL) return; Status = SeQueryInformationToken(Token, TokenOwner, &Buffer); - ok((Status == STATUS_SUCCESS), "SQIT with TokenOwner arg fails with \n"); - if (Buffer) - { - Towner = (TOKEN_OWNER *)Buffer; - sid = Towner->Owner; - ok((RtlValidSid(sid) == TRUE), "TokenOwner's SID is not a valid SID\n"); - ExFreePool(Buffer); - } - - ok((SeQueryInformationToken(Token, TokenDefaultDacl, &Buffer) == STATUS_SUCCESS), "SQIT with TokenDefaultDacl fails\n"); - if (Buffer) { - TDefDacl = (PTOKEN_DEFAULT_DACL)Buffer; - acl = TDefDacl->DefaultDacl; - ok(((acl->AclRevision == ACL_REVISION || acl->AclRevision == ACL_REVISION_DS) == TRUE), "DACL is invalid\n"); - ExFreePool(Buffer); - } - - ok((SeQueryInformationToken(Token, TokenGroups, &Buffer) == STATUS_SUCCESS), "SQIT with TokenGroups fails\n"); - if (Buffer) - { - TGroups = (PTOKEN_GROUPS)Buffer; - GroupCount = TGroups->GroupCount; - int flag = 1; - int i; - for (i = 0; i < GroupCount; i++) - { - sid = TGroups->Groups[i].Sid; - if (!RtlValidSid(sid)) + ok((Status == STATUS_SUCCESS), "SQIT with TokenOwner arg fails with status 0x%X\n", Status); + if (Status == STATUS_SUCCESS) + { + ok(Buffer != NULL, "Wrong. SQIT call was successful with TokenOwner arg. But Buffer = NULL\n"); + + if (Buffer) + { + Towner = (TOKEN_OWNER *)Buffer; + sid = Towner->Owner; + ok((RtlValidSid(sid) == TRUE), "TokenOwner's SID is not a valid SID\n"); + ExFreePool(Buffer); + } + } + + //----------------------------------------------------------------// + + Buffer = NULL; + Status = SeQueryInformationToken(Token, TokenDefaultDacl, &Buffer); + ok(Status == STATUS_SUCCESS, "SQIT with TokenDefaultDacl fails with status 0x%X\n", Status); + if (Status == STATUS_SUCCESS) + { + ok(Buffer != NULL, "Wrong. SQIT call was successful with TokenDefaultDacl arg. But Buffer = NULL\n"); + if (Buffer) + { + TDefDacl = (PTOKEN_DEFAULT_DACL)Buffer; + acl = TDefDacl->DefaultDacl; + ok(((acl->AclRevision == ACL_REVISION || acl->AclRevision == ACL_REVISION_DS) == TRUE), "DACL is invalid\n"); + ExFreePool(Buffer); + } + } + + //----------------------------------------------------------------// + + Buffer = NULL; + Status = SeQueryInformationToken(Token, TokenGroups, &Buffer); + ok(Status == STATUS_SUCCESS, "SQIT with TokenGroups fails with status 0x%X\n", Status); + if (Status == STATUS_SUCCESS) + { + ok(Buffer != NULL, "Wrong. SQIT call was successful with TokenGroups arg. But Buffer = NULL\n"); + if (Buffer) + { + TGroups = (PTOKEN_GROUPS)Buffer; + GroupCount = TGroups->GroupCount; + int flag = 1; + int i; + for (i = 0; i < GroupCount; i++) { - flag = 0; - break; + sid = TGroups->Groups[i].Sid; + if (!RtlValidSid(sid)) + { + flag = 0; + break; + } } - } - ok((flag == TRUE), "TokenGroup's SIDs are not valid\n"); - ExFreePool(Buffer); - } - - //----------------------------------------------------------------// - - ok(SeQueryInformationToken(Token, TokenImpersonationLevel, &Buffer), "SQIT with TokenImpersonation fails\n"); - - //----------------------------------------------------------------// - - // Call SQIT with TokenStatistics - - ok((SeQueryInformationToken(Token, TokenStatistics, &Buffer) == STATUS_SUCCESS), "SQIT with TokenStatistics fails\n"); - if (Buffer) - { - TStats = (PTOKEN_STATISTICS)Buffer; - // just put 0 into 1st arg or use trace to print TokenStatistics - ok(1, "print statistics:\nTokenID = %u_%d\nSecurityImperLevel = %d\nPrivCount = %d\nGroupCount = %d\n\n", TStats->TokenId.LowPart, - TStats->TokenId.HighPart, - TStats->ImpersonationLevel, - TStats->PrivilegeCount, - TStats->GroupCount - ); - ExFreePool(TStats); - } - - //----------------------------------------------------------------// - - // Call SQIT with TokenType - - ok((SeQueryInformationToken(Token, TokenType, &Buffer) == STATUS_SUCCESS), "SQIT with TokenType fails\n"); - if (Buffer) - { - TType = (PTOKEN_TYPE)Buffer; - ok((*TType == TokenPrimary || *TType == TokenImpersonation), "TokenType in not a primary nor impersonation. FAILED\n"); - ExFreePool(TType); - } - - //----------------------------------------------------------------// - - // Call SQIT with TokenUser - - ok((SeQueryInformationToken(Token, TokenUser, &Buffer) == STATUS_SUCCESS), "SQIT with TokenUser fails\n"); - if (Buffer) - { - TUser = (PTOKEN_USER)Buffer; - ok(RtlValidSid(TUser->User.Sid), "TokenUser has an invalid Sid\n"); - ExFreePool(TUser); - } - - //----------------------------------------------------------------// - - + ok((flag == TRUE), "TokenGroup's SIDs are not valid\n"); + ExFreePool(Buffer); + } + } + + //----------------------------------------------------------------// + + // Call SQIT with TokenImpersonationLevel argument + // + // What's up? Why SQIT fails with right arg? + + Buffer = NULL; + Status = SeQueryInformationToken(Token, TokenImpersonationLevel, &Buffer); + ok(Status == STATUS_SUCCESS, "SQIT with TokenImpersonationLevel fails with status 0x%X\n", Status); + + Buffer = NULL; + Status = SeQueryInformationToken(Token, TokenImpersonationLevel, &Buffer); + ok(Status == STATUS_SUCCESS, "and again: SQIT with TokenImpersonationLevel fails with status 0x%X\n", Status); + if (Status == STATUS_SUCCESS) + { + ok(Buffer != NULL, "Wrong. SQIT call was successful with TokenImpersonationLevel arg. But Buffer = NULL\n"); + } else { + ok(Buffer == NULL, "Wrong. SQIT call is't success. But Buffer != NULL\n"); + } + + //----------------------------------------------------------------// + + Buffer = NULL; + Status = SeQueryInformationToken(Token, TokenStatistics, &Buffer); + ok(Status == STATUS_SUCCESS, "SQIT with TokenStatistics fails with status 0x%X\n", Status); + if (Status == STATUS_SUCCESS) + { + ok(Buffer != NULL, "Wrong. SQIT call was successful with TokenStatistics arg. But Buffer = NULL\n"); + if (Buffer) + { + TStats = (PTOKEN_STATISTICS)Buffer; + // just put 0 into 1st arg or use trace to print TokenStatistics f + ok(1, "print statistics:\n\tTokenID = %u_%d\n\tSecurityImperLevel = %d\n\tPrivCount = %d\n\tGroupCount = %d\n\n", TStats->TokenId.LowPart, + TStats->TokenId.HighPart, + TStats->ImpersonationLevel, + TStats->PrivilegeCount, + TStats->GroupCount + ); + ExFreePool(TStats); + } + } else { + ok(Buffer == NULL, "Wrong. SQIT call is't success. But Buffer != NULL\n"); + } + + //----------------------------------------------------------------// + + Buffer = NULL; + Status = SeQueryInformationToken(Token, TokenType, &Buffer); + ok(Status == STATUS_SUCCESS, "SQIT with TokenType fails with status 0x%X\n", Status); + if (Status == STATUS_SUCCESS) + { + ok(Buffer != NULL, "Wrong. SQIT call was successful with TokenType arg. But Buffer = NULL\n"); + if (Buffer) + { + TType = (PTOKEN_TYPE)Buffer; + ok((*TType == TokenPrimary || *TType == TokenImpersonation), "TokenType in not a primary nor impersonation. FAILED\n"); + ExFreePool(TType); + } + } + + //----------------------------------------------------------------// + + Buffer = NULL; + Status = SeQueryInformationToken(Token, TokenUser, &Buffer); + ok(Status == STATUS_SUCCESS, "SQIT with TokenUser fails\n"); + if (Status == STATUS_SUCCESS) + { + ok(Buffer != NULL, "Wrong. SQIT call was successful with TokenUser arg. But Buffer = NULL\n"); + if (Buffer) + { + TUser = (PTOKEN_USER)Buffer; + ok(RtlValidSid(TUser->User.Sid), "TokenUser has an invalid Sid\n"); + ExFreePool(TUser); + } + } + + //----------------------------------------------------------------// + + Buffer = NULL; Status = SeQueryInformationToken(Token, TokenSandBoxInert, &Buffer); ok(Status != STATUS_SUCCESS, "SQIT must fail with wrong TOKEN_INFORMATION_CLASS arg\n"); } @@ -151,7 +202,7 @@ //------------------------------------------------------------------------------// //------------------------------------------------------------------------------// -// Body of the main test // +// Body of the main test // //------------------------------------------------------------------------------// START_TEST(SeQueryInfoToken) @@ -181,7 +232,7 @@ TestsSeQueryInformationToken(Token); //----------------------------------------------------------------// - // Creating an ACCESS_STATE structure // + // Creating an ACCESS_STATE structure // //----------------------------------------------------------------// AccessState = ExAllocatePool(PagedPool, sizeof(ACCESS_STATE)); @@ -202,25 +253,26 @@ Token = SeQuerySubjectContextToken(&AccessState->SubjectSecurityContext); - // Testing SQIT whti AccessState Token + // Testing SQIT with AccessState Token TestsSeQueryInformationToken(Token); //----------------------------------------------------------------// - // Testing other functions // - //----------------------------------------------------------------// - - //----------------------------------------------------------------// - // Testing SeAppendPrivileges // + // Testing other functions // + //----------------------------------------------------------------// + + //----------------------------------------------------------------// + // Testing SeAppendPrivileges // //----------------------------------------------------------------// AuxData->PrivilegeSet->PrivilegeCount = 1; - // Testing SeAppendPrivileges. Must change PrivilegeCount to 2 (1 + 1) + // Testing SeAppendPrivileges. Must change PrivilegeCount to 2 (1 + 1) NewPrivilegeSet = ExAllocatePool(PagedPool, sizeof(PRIVILEGE_SET)); NewPrivilegeSet->PrivilegeCount = 1; - ok((SeAppendPrivileges(AccessState, NewPrivilegeSet)) == STATUS_SUCCESS, "SeAppendPrivileges failed\n"); + Status = SeAppendPrivileges(AccessState, NewPrivilegeSet); + ok(Status == STATUS_SUCCESS, "SeAppendPrivileges failed\n"); ok((AuxData->PrivilegeSet->PrivilegeCount == 2),"PrivelegeCount must be 2, but it is %d\n", AuxData->PrivilegeSet->PrivilegeCount); ExFreePool(NewPrivilegeSet); @@ -231,12 +283,13 @@ NewPrivilegeSet = ExAllocatePool(PagedPool, 4*sizeof(PRIVILEGE_SET)); NewPrivilegeSet->PrivilegeCount = 4; - ok((SeAppendPrivileges(AccessState, NewPrivilegeSet)) == STATUS_SUCCESS, "SeAppendPrivileges failed\n"); + Status = SeAppendPrivileges(AccessState, NewPrivilegeSet); + ok(Status == STATUS_SUCCESS, "SeAppendPrivileges failed\n"); ok((AuxData->PrivilegeSet->PrivilegeCount == 6),"PrivelegeCount must be 6, but it is %d\n", AuxData->PrivilegeSet->PrivilegeCount); ExFreePool(NewPrivilegeSet); //----------------------------------------------------------------// - // Testing SePrivilegeCheck // + // Testing SePrivilegeCheck // //----------------------------------------------------------------// // KPROCESSOR_MODE is set to KernelMode ===> Always return TRUE @@ -252,7 +305,7 @@ //----------------------------------------------------------------// //----------------------------------------------------------------// - // Testing SeFreePrivileges // + // Testing SeFreePrivileges // //----------------------------------------------------------------// Privileges = ExAllocatePool(PagedPool, AuxData->PrivilegeSet->PrivilegeCount*sizeof(PRIVILEGE_SET)); @@ -275,34 +328,39 @@ //----------------------------------------------------------------// - // Testing SePrivilegeCheck // + // Testing SePrivilegeCheck // //----------------------------------------------------------------// // I'm trying to make success call of SePrivilegeCheck from UserMode // If we sets Privileges properly, can we expect true from SePrivilegeCheck? // answer: yes // This test demonstrates it - SeQueryInformationToken(Token, TokenPrivileges, &Buffer); - if (Buffer) - { - TPrivileges = (PTOKEN_PRIVILEGES)(Buffer); - //trace("TPCount = %u\n\n", TPrivileges->PrivilegeCount); - - NewPrivilegeSet = ExAllocatePool(PagedPool, 14*sizeof(PRIVILEGE_SET)); - NewPrivilegeSet->PrivilegeCount = 14; - - ok((SeAppendPrivileges(AccessState, NewPrivilegeSet)) == STATUS_SUCCESS, "SeAppendPrivileges failed\n"); - ok((AuxData->PrivilegeSet->PrivilegeCount == 20),"PrivelegeCount must be 20, but it is %d\n", AuxData->PrivilegeSet->PrivilegeCount); - ExFreePool(NewPrivilegeSet); - int i; - for (i = 0; i < AuxData->PrivilegeSet->PrivilegeCount; i++) - { - AuxData->PrivilegeSet->Privilege[i].Attributes = TPrivileges->Privileges[i].Attributes; - AuxData->PrivilegeSet->Privilege[i].Luid = TPrivileges->Privileges[i].Luid; - } - //trace("AccessState->privCount = %u\n\n", ((PAUX_ACCESS_DATA)(AccessState->AuxData))->PrivilegeSet->PrivilegeCount); - - ok(SePrivilegeCheck(AuxData->PrivilegeSet, &(AccessState->SubjectSecurityContext), UserMode), "SePrivilegeCheck fails in UserMode, but I wish it will success\n"); + Buffer = NULL; + Status = SeQueryInformationToken(Token, TokenPrivileges, &Buffer); + if (Status == STATUS_SUCCESS) + { + ok(Buffer != NULL, "Wrong. SQIT call was successful with TokenPrivileges arg. But Buffer = NULL\n"); + if (Buffer) + { + TPrivileges = (PTOKEN_PRIVILEGES)(Buffer); + //trace("TPCount = %u\n\n", TPrivileges->PrivilegeCount); + + NewPrivilegeSet = ExAllocatePool(PagedPool, 14*sizeof(PRIVILEGE_SET)); + NewPrivilegeSet->PrivilegeCount = 14; + + ok((SeAppendPrivileges(AccessState, NewPrivilegeSet)) == STATUS_SUCCESS, "SeAppendPrivileges failed\n"); + ok((AuxData->PrivilegeSet->PrivilegeCount == 20),"PrivelegeCount must be 20, but it is %d\n", AuxData->PrivilegeSet->PrivilegeCount); + ExFreePool(NewPrivilegeSet); + int i; + for (i = 0; i < AuxData->PrivilegeSet->PrivilegeCount; i++) + { + AuxData->PrivilegeSet->Privilege[i].Attributes = TPrivileges->Privileges[i].Attributes; + AuxData->PrivilegeSet->Privilege[i].Luid = TPrivileges->Privileges[i].Luid; + } + //trace("AccessState->privCount = %u\n\n", ((PAUX_ACCESS_DATA)(AccessState->AuxData))->PrivilegeSet->PrivilegeCount); + + ok(SePrivilegeCheck(AuxData->PrivilegeSet, &(AccessState->SubjectSecurityContext), UserMode), "SePrivilegeCheck fails in UserMode, but I wish it will success\n"); + } } // Call SeFreePrivileges again @@ -326,7 +384,7 @@ if (Privileges) SeFreePrivileges(Privileges); //----------------------------------------------------------------// - // Missing for now // + // Missing for now // //----------------------------------------------------------------// SeUnlockSubjectContext(&AccessState->SubjectSecurityContext); @@ -339,4 +397,4 @@ if (SubjectContext) ExFreePool(SubjectContext); if (AuxData) ExFreePool(AuxData); if (AccessState) ExFreePool(AccessState); -} +}

1 0

[fireball] 59180: [KMTEST] - Fix formatting of FsRtlTunnel.c - Add proper header.
by fireball＠svn.reactos.org 05 Jun '13

05 Jun '13

Author: fireball Date: Wed Jun 5 23:25:02 2013 New Revision: 59180 URL: http://svn.reactos.org/svn/reactos?rev=59180&view=rev Log: [KMTEST] - Fix formatting of FsRtlTunnel.c - Add proper header. Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlTunnel.c Modified: trunk/rostests/kmtests/ntos_fsrtl/FsRtlTunnel.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_fsrtl/FsRtlT… ============================================================================== --- trunk/rostests/kmtests/ntos_fsrtl/FsRtlTunnel.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_fsrtl/FsRtlTunnel.c [iso-8859-1] Wed Jun 5 23:25:02 2013 @@ -1,21 +1,26 @@ /* - Lab 4, at the rate of the OS. - - Tested with the system kmtest - the following functions: - FsRtlInitializeTunnelCache - FsRtlDeleteTunnelCache - FsRtlAddToTunnelCache - FsRtlDeleteKeyFromTunnelCache - FsRtlFindInTunnelCache - - Ashuha Arseny IU9-41. 2013. +* PROJECT: ReactOS kernel-mode tests +* LICENSE: LGPLv2+ - See COPYING.LIB in the top level directory +* PURPOSE: Kernel-Mode Test Suite FsRtl Test +* PROGRAMMER: Ashuha Arseny, Moscow State Technical University +* Marina Volosnikova, Moscow State Technical University +* Denis Petkevich, Moscow State Technical University */ #include <kmt_test.h> #define NDEBUG #include <debug.h> + +/* +Tested with the system kmtest +the following functions: +FsRtlInitializeTunnelCache +FsRtlDeleteTunnelCache +FsRtlAddToTunnelCache +FsRtlDeleteKeyFromTunnelCache +FsRtlFindInTunnelCache +*/ static PTUNNEL T; static PTUNNEL Tb; @@ -24,135 +29,135 @@ PUNICODE_STRING CopyUS(PUNICODE_STRING a) { - PUNICODE_STRING b = (PUNICODE_STRING)ExAllocatePool(PagedPool,sizeof(UNICODE_STRING)); - ok(b != NULL, "US is NULL after allocated memory\n"); - b->Length = 0; - b->MaximumLength =a->MaximumLength; - b->Buffer = (PWSTR)ExAllocatePoolWithTag(PagedPool, b->MaximumLength, 1633); - ok(b->Buffer != NULL, "US->Buffer is NULL after allocated memory\n"); - RtlCopyUnicodeString(b, a); - return b; + PUNICODE_STRING b = (PUNICODE_STRING)ExAllocatePool(PagedPool,sizeof(UNICODE_STRING)); + ok(b != NULL, "US is NULL after allocated memory\n"); + b->Length = 0; + b->MaximumLength =a->MaximumLength; + b->Buffer = (PWSTR)ExAllocatePoolWithTag(PagedPool, b->MaximumLength, 1633); + ok(b->Buffer != NULL, "US->Buffer is NULL after allocated memory\n"); + RtlCopyUnicodeString(b, a); + return b; } void TestFsRtlInitializeTunnelCache() { - SIZE_T eq; - T = ExAllocatePool(PagedPool, sizeof(TUNNEL)); - ok(T != NULL, "PTUNEL is NULL after allocated memory\n"); - Tb = ExAllocatePool(PagedPool, sizeof(TUNNEL)); - ok(Tb != NULL, "PTUNEL is NULL after allocated memory\n"); - - memset((void*)T, 0, sizeof(TUNNEL)); - memset((void*)Tb, 0, sizeof(TUNNEL)); + SIZE_T eq; + T = ExAllocatePool(PagedPool, sizeof(TUNNEL)); + ok(T != NULL, "PTUNEL is NULL after allocated memory\n"); + Tb = ExAllocatePool(PagedPool, sizeof(TUNNEL)); + ok(Tb != NULL, "PTUNEL is NULL after allocated memory\n"); - FsRtlInitializeTunnelCache(T); - - eq = RtlCompareMemory((const VOID*)T, (const VOID*)Tb, sizeof(TUNNEL)); - - ok ( eq != sizeof(TUNNEL), "FsRtlInitializeTunnelCache function did not change anything in the memory at the address PTUNEL.\n"); + memset((void*)T, 0, sizeof(TUNNEL)); + memset((void*)Tb, 0, sizeof(TUNNEL)); + + FsRtlInitializeTunnelCache(T); + + eq = RtlCompareMemory((const VOID*)T, (const VOID*)Tb, sizeof(TUNNEL)); + + ok ( eq != sizeof(TUNNEL), "FsRtlInitializeTunnelCache function did not change anything in the memory at the address PTUNEL.\n"); } void TestFsRtlAddToTunnelCache(ULONGLONG DirectoryKey, PUNICODE_STRING s_name, PUNICODE_STRING l_name, BOOLEAN KeyByShortName) { - SIZE_T eq; - LONG b; - PUNICODE_STRING bs_name; - PUNICODE_STRING bl_name; - PVOID Bufb; - PVOID Buf; + SIZE_T eq; + LONG b; + PUNICODE_STRING bs_name; + PUNICODE_STRING bl_name; + PVOID Bufb; + PVOID Buf; - Buf = ExAllocatePool(PagedPool, BufSize); - ok(Buf != NULL, "Buff in TestFsRtlAddToTunnelCache is NULL after allocated memory\n"); - Bufb = ExAllocatePool(PagedPool, BufSize); - ok(Bufb != NULL, "Buff in TestFsRtlAddToTunnelCache is NULL after allocated memory\n"); - - //allocate memory for the bufs_name - bs_name = CopyUS(s_name); - - //allocate memory for the l_name and bl_name - bl_name = CopyUS(l_name); - - memset((void*)Buf, 0, BufSize); - memset((void*)Bufb, 0, BufSize); - - FsRtlAddToTunnelCache(T, DirectoryKey, s_name, l_name, KeyByShortName, BufSize, Buf); - - eq = RtlCompareMemory((const VOID*)Buf, (const VOID*)Bufb, BufSize); - - ok( eq != sizeof(TUNNEL),"FsRtlAddToTunnelCache function did not change anything in the memory at the address Buf.\n"); - - b = RtlCompareUnicodeString(l_name, bl_name, TRUE); - ok (b == 0, "long name after call FsRtlAddToTunnelCache != long name befo call FsRtlAddToTunnelCache\n\n"); - b = RtlCompareUnicodeString(s_name, bs_name, TRUE); - ok (b == 0, "short name after call FsRtlAddToTunnelCache != short name befo call FsRtlAddToTunnelCache\n\n"); + Buf = ExAllocatePool(PagedPool, BufSize); + ok(Buf != NULL, "Buff in TestFsRtlAddToTunnelCache is NULL after allocated memory\n"); + Bufb = ExAllocatePool(PagedPool, BufSize); + ok(Bufb != NULL, "Buff in TestFsRtlAddToTunnelCache is NULL after allocated memory\n"); + + // Allocate memory for the bufs_name + bs_name = CopyUS(s_name); + + // Allocate memory for the l_name and bl_name + bl_name = CopyUS(l_name); + + memset((void*)Buf, 0, BufSize); + memset((void*)Bufb, 0, BufSize); + + FsRtlAddToTunnelCache(T, DirectoryKey, s_name, l_name, KeyByShortName, BufSize, Buf); + + eq = RtlCompareMemory((const VOID*)Buf, (const VOID*)Bufb, BufSize); + + ok( eq != sizeof(TUNNEL),"FsRtlAddToTunnelCache function did not change anything in the memory at the address Buf.\n"); + + b = RtlCompareUnicodeString(l_name, bl_name, TRUE); + ok (b == 0, "long name after call FsRtlAddToTunnelCache != long name befo call FsRtlAddToTunnelCache\n\n"); + b = RtlCompareUnicodeString(s_name, bs_name, TRUE); + ok (b == 0, "short name after call FsRtlAddToTunnelCache != short name befo call FsRtlAddToTunnelCache\n\n"); } BOOLEAN TestFsRtlFindInTunnelCache(ULONG DirectoryKey, PUNICODE_STRING name, PUNICODE_STRING s_name, PUNICODE_STRING l_name) { - // Allocate memory for the Buf - ULONG BufsizeTemp = BufSize; - PVOID Buf = ExAllocatePool(PagedPool, BufSize*2); - ok(Buf != NULL, "Buff in FsRtlFindInTunnelCache is NULL after allocated memory\n"); + // Allocate memory for the Buf + ULONG BufsizeTemp = BufSize; + PVOID Buf = ExAllocatePool(PagedPool, BufSize*2); + ok(Buf != NULL, "Buff in FsRtlFindInTunnelCache is NULL after allocated memory\n"); - return FsRtlFindInTunnelCache(T, DirectoryKey, name, s_name, l_name, &BufsizeTemp, Buf); + return FsRtlFindInTunnelCache(T, DirectoryKey, name, s_name, l_name, &BufsizeTemp, Buf); } void TestFsRtlDeleteKeyFromTunnelCache(ULONGLONG a) { - FsRtlDeleteKeyFromTunnelCache(T, a); + FsRtlDeleteKeyFromTunnelCache(T, a); } START_TEST(FsRtlTunnel) { - PUNICODE_STRING s_name; - PUNICODE_STRING l_name; - PUNICODE_STRING name; - PUNICODE_STRING a; - BOOLEAN is; - - //Initialize Cash - TestFsRtlInitializeTunnelCache(); - - s_name = (PUNICODE_STRING)ExAllocatePool(PagedPool,sizeof(UNICODE_STRING)); - ok(s_name != NULL, "s_name in TestFsRtlAddToTunnelCache is NULL after allocated memory\n"); - RtlInitUnicodeString(s_name, L"smal"); - - l_name = (PUNICODE_STRING)ExAllocatePool(PagedPool,sizeof(UNICODE_STRING)); - ok(l_name != NULL, "l_name in TestFsRtlAddToTunnelCache is NULL after allocated memory\n"); - RtlInitUnicodeString(l_name, L"bigbigbigbigbig"); - - // Add elem - TestFsRtlAddToTunnelCache(12345, s_name, l_name, TRUE); - - name = (PUNICODE_STRING)ExAllocatePool(PagedPool,sizeof(UNICODE_STRING)); - ok(name != NULL, "name in FsRtlFindInTunnelCache is NULL after allocated memory\n"); - RtlInitUnicodeString(name, L"smal"); - - // Find - is = TestFsRtlFindInTunnelCache(12345, name, s_name, l_name); - ok(is == TRUE, "FsRtlFindInTunnelCache dosn't find elem id = 12345\n"); - - TestFsRtlDeleteKeyFromTunnelCache(12345); //Delete - is = TestFsRtlFindInTunnelCache(12345, name, s_name, l_name); - ok(is == FALSE, "TestFsRtlDeleteKeyFromTunnelCache dosn't delete elem id = 12345\n"); - - is = TestFsRtlFindInTunnelCache(12347, name, s_name, l_name); - ok(is == FALSE, "FsRtlDeleteTunnelCache dosn't clear cash\n"); - - TestFsRtlAddToTunnelCache(12345, s_name, l_name, TRUE); - TestFsRtlAddToTunnelCache(12347, s_name, l_name, TRUE); - a = (PUNICODE_STRING)ExAllocatePool(PagedPool,sizeof(UNICODE_STRING)); - TestFsRtlAddToTunnelCache(12346, a, l_name, FALSE); - - //Clear all - FsRtlDeleteTunnelCache(T); - - is = TestFsRtlFindInTunnelCache(12345, name, s_name, l_name); - ok(is == FALSE, "FsRtlDeleteTunnelCache dosn't clear cash\n"); - - is = TestFsRtlFindInTunnelCache(12346, name, a, l_name); - ok(is == FALSE, "FsRtlDeleteTunnelCache dosn't clear cash\n"); - - is = TestFsRtlFindInTunnelCache(12347, name, s_name, l_name); - ok(is == FALSE, "FsRtlDeleteTunnelCache dosn't clear cash\n"); + PUNICODE_STRING s_name; + PUNICODE_STRING l_name; + PUNICODE_STRING name; + PUNICODE_STRING a; + BOOLEAN is; + + //Initialize Cash + TestFsRtlInitializeTunnelCache(); + + s_name = (PUNICODE_STRING)ExAllocatePool(PagedPool,sizeof(UNICODE_STRING)); + ok(s_name != NULL, "s_name in TestFsRtlAddToTunnelCache is NULL after allocated memory\n"); + RtlInitUnicodeString(s_name, L"smal"); + + l_name = (PUNICODE_STRING)ExAllocatePool(PagedPool,sizeof(UNICODE_STRING)); + ok(l_name != NULL, "l_name in TestFsRtlAddToTunnelCache is NULL after allocated memory\n"); + RtlInitUnicodeString(l_name, L"bigbigbigbigbig"); + + // Add elem + TestFsRtlAddToTunnelCache(12345, s_name, l_name, TRUE); + + name = (PUNICODE_STRING)ExAllocatePool(PagedPool,sizeof(UNICODE_STRING)); + ok(name != NULL, "name in FsRtlFindInTunnelCache is NULL after allocated memory\n"); + RtlInitUnicodeString(name, L"smal"); + + // Find + is = TestFsRtlFindInTunnelCache(12345, name, s_name, l_name); + ok(is == TRUE, "FsRtlFindInTunnelCache dosn't find elem id = 12345\n"); + + TestFsRtlDeleteKeyFromTunnelCache(12345); //Delete + is = TestFsRtlFindInTunnelCache(12345, name, s_name, l_name); + ok(is == FALSE, "TestFsRtlDeleteKeyFromTunnelCache dosn't delete elem id = 12345\n"); + + is = TestFsRtlFindInTunnelCache(12347, name, s_name, l_name); + ok(is == FALSE, "FsRtlDeleteTunnelCache dosn't clear cash\n"); + + TestFsRtlAddToTunnelCache(12345, s_name, l_name, TRUE); + TestFsRtlAddToTunnelCache(12347, s_name, l_name, TRUE); + a = (PUNICODE_STRING)ExAllocatePool(PagedPool,sizeof(UNICODE_STRING)); + TestFsRtlAddToTunnelCache(12346, a, l_name, FALSE); + + //Clear all + FsRtlDeleteTunnelCache(T); + + is = TestFsRtlFindInTunnelCache(12345, name, s_name, l_name); + ok(is == FALSE, "FsRtlDeleteTunnelCache dosn't clear cash\n"); + + is = TestFsRtlFindInTunnelCache(12346, name, a, l_name); + ok(is == FALSE, "FsRtlDeleteTunnelCache dosn't clear cash\n"); + + is = TestFsRtlFindInTunnelCache(12347, name, s_name, l_name); + ok(is == FALSE, "FsRtlDeleteTunnelCache dosn't clear cash\n"); }

1 0

[hbelusca] 59179: [ROSAPPS] Add 4 little tests for RtlDetermineDosPathNameType
by hbelusca＠svn.reactos.org 05 Jun '13

05 Jun '13

Author: hbelusca Date: Wed Jun 5 23:24:04 2013 New Revision: 59179 URL: http://svn.reactos.org/svn/reactos?rev=59179&view=rev Log: [ROSAPPS] Add 4 little tests for RtlDetermineDosPathNameType Modified: trunk/rostests/apitests/ntdll/RtlDetermineDosPathNameType.c Modified: trunk/rostests/apitests/ntdll/RtlDetermineDosPathNameType.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/RtlDetermi… ============================================================================== --- trunk/rostests/apitests/ntdll/RtlDetermineDosPathNameType.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/RtlDetermineDosPathNameType.c [iso-8859-1] Wed Jun 5 23:24:04 2013 @@ -146,6 +146,10 @@ { L"\\\\", RtlPathTypeUncAbsolute }, { L"\\\\\\", RtlPathTypeUncAbsolute }, { L"\\\\;", RtlPathTypeUncAbsolute }, + { L"\\\\f\\b\\", RtlPathTypeUncAbsolute }, + { L"\\\\f\\b", RtlPathTypeUncAbsolute }, + { L"\\\\f\\", RtlPathTypeUncAbsolute }, + { L"\\\\f", RtlPathTypeUncAbsolute }, { L"\\??\\", RtlPathTypeRooted }, { L"\\??\\UNC", RtlPathTypeRooted }, { L"\\??\\UNC\\", RtlPathTypeRooted },

1 0

[fireball] 59178: [KMTEST] - Add tests for SeQueryInformationToken NTAPI. By Moscow State Technical University students Constantine Belev, Denis Grishin, Egor Sinitsyn. - Disabled from testbot beca...
by fireball＠svn.reactos.org 05 Jun '13

05 Jun '13

Author: fireball Date: Wed Jun 5 23:16:14 2013 New Revision: 59178 URL: http://svn.reactos.org/svn/reactos?rev=59178&view=rev Log: [KMTEST] - Add tests for SeQueryInformationToken NTAPI. By Moscow State Technical University students Constantine Belev, Denis Grishin, Egor Sinitsyn. - Disabled from testbot because they bugcheck ReactOS (unimplemented functions bugcheck). Work in progress... Added: trunk/rostests/kmtests/ntos_se/ (with props) trunk/rostests/kmtests/ntos_se/SeQueryInfoToken.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/kmtest_drv/testlist.c Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Wed Jun 5 23:16:14 2013 @@ -60,6 +60,7 @@ ntos_ob/ObType.c ntos_ob/ObTypes.c ntos_ps/PsNotify.c + ntos_se/SeQueryInfoToken.c ${COMMON_SOURCE} kmtest_drv/kmtest_drv.rc) Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Wed Jun 5 23:16:14 2013 @@ -43,6 +43,7 @@ KMT_TESTFUNC Test_ObTypeNoClean; KMT_TESTFUNC Test_ObTypes; KMT_TESTFUNC Test_PsNotify; +KMT_TESTFUNC Test_SeQueryInfoToken; KMT_TESTFUNC Test_RtlAvlTree; KMT_TESTFUNC Test_RtlException; KMT_TESTFUNC Test_RtlMemory; @@ -90,6 +91,7 @@ { "-ObTypeNoClean", Test_ObTypeNoClean }, { "ObTypes", Test_ObTypes }, { "PsNotify", Test_PsNotify }, + { "-SeQueryInfoToken", Test_SeQueryInfoToken }, { "RtlAvlTreeKM", Test_RtlAvlTree }, { "RtlExceptionKM", Test_RtlException }, { "RtlMemoryKM", Test_RtlMemory }, Propchange: trunk/rostests/kmtests/ntos_se/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Jun 5 23:16:14 2013 @@ -0,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+) Propchange: trunk/rostests/kmtests/ntos_se/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details. Propchange: trunk/rostests/kmtests/ntos_se/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID% Propchange: trunk/rostests/kmtests/ntos_se/ ------------------------------------------------------------------------------ tsvn:logminsize = 10 Added: trunk/rostests/kmtests/ntos_se/SeQueryInfoToken.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_se/SeQueryIn… ============================================================================== --- trunk/rostests/kmtests/ntos_se/SeQueryInfoToken.c (added) +++ trunk/rostests/kmtests/ntos_se/SeQueryInfoToken.c [iso-8859-1] Wed Jun 5 23:16:14 2013 @@ -0,0 +1,342 @@ +/* +* PROJECT: ReactOS kernel-mode tests +* LICENSE: GPLv2+ - See COPYING in the top level directory +* PURPOSE: Kernel-Mode Test Suite Process Notification Routines test +* PROGRAMMER: Constantine Belev (Moscow State Technical University) +* Denis Grishin (Moscow State Technical University) +* Egor Sinitsyn (Moscow State Technical University) +*/ + +#include <kmt_test.h> +#include <ntifs.h> + +#define NDEBUG +#include <debug.h> + +//------------------------------------------------------------------------------// +// Functions required forWorking with ACCESS_STATE structure // +//------------------------------------------------------------------------------// + +NTKERNELAPI NTSTATUS NTAPI SeCreateAccessState( + PACCESS_STATE AccessState, + PVOID AuxData, + ACCESS_MASK DesiredAccess, + PGENERIC_MAPPING Mapping + ); + +NTKERNELAPI VOID NTAPI SeDeleteAccessState( + PACCESS_STATE AccessState + ); + +//------------------------------------------------------------------------------// +// Testing Functions // +//------------------------------------------------------------------------------// + +// Testing function for SQIT + +void TestsSeQueryInformationToken(PACCESS_TOKEN Token) +{ + NTSTATUS Status; + PVOID Buffer = NULL; + PSID sid; + PTOKEN_OWNER Towner; + PTOKEN_DEFAULT_DACL TDefDacl; + PTOKEN_GROUPS TGroups; + ULONG GroupCount; + PACL acl; + PTOKEN_STATISTICS TStats; + PTOKEN_TYPE TType; + PTOKEN_USER TUser; + //NTSTATUS ExceptionStatus; + + //----------------------------------------------------------------// + // Testing SeQueryInformationToken with various args // + //----------------------------------------------------------------// + + ok(Token != NULL, "Token is not captured. Testing SQIT interrupted\n\n"); + + if (Token == NULL) return; + + Status = SeQueryInformationToken(Token, TokenOwner, &Buffer); + ok((Status == STATUS_SUCCESS), "SQIT with TokenOwner arg fails with \n"); + if (Buffer) + { + Towner = (TOKEN_OWNER *)Buffer; + sid = Towner->Owner; + ok((RtlValidSid(sid) == TRUE), "TokenOwner's SID is not a valid SID\n"); + ExFreePool(Buffer); + } + + ok((SeQueryInformationToken(Token, TokenDefaultDacl, &Buffer) == STATUS_SUCCESS), "SQIT with TokenDefaultDacl fails\n"); + if (Buffer) { + TDefDacl = (PTOKEN_DEFAULT_DACL)Buffer; + acl = TDefDacl->DefaultDacl; + ok(((acl->AclRevision == ACL_REVISION || acl->AclRevision == ACL_REVISION_DS) == TRUE), "DACL is invalid\n"); + ExFreePool(Buffer); + } + + ok((SeQueryInformationToken(Token, TokenGroups, &Buffer) == STATUS_SUCCESS), "SQIT with TokenGroups fails\n"); + if (Buffer) + { + TGroups = (PTOKEN_GROUPS)Buffer; + GroupCount = TGroups->GroupCount; + int flag = 1; + int i; + for (i = 0; i < GroupCount; i++) + { + sid = TGroups->Groups[i].Sid; + if (!RtlValidSid(sid)) + { + flag = 0; + break; + } + } + ok((flag == TRUE), "TokenGroup's SIDs are not valid\n"); + ExFreePool(Buffer); + } + + //----------------------------------------------------------------// + + ok(SeQueryInformationToken(Token, TokenImpersonationLevel, &Buffer), "SQIT with TokenImpersonation fails\n"); + + //----------------------------------------------------------------// + + // Call SQIT with TokenStatistics + + ok((SeQueryInformationToken(Token, TokenStatistics, &Buffer) == STATUS_SUCCESS), "SQIT with TokenStatistics fails\n"); + if (Buffer) + { + TStats = (PTOKEN_STATISTICS)Buffer; + // just put 0 into 1st arg or use trace to print TokenStatistics + ok(1, "print statistics:\nTokenID = %u_%d\nSecurityImperLevel = %d\nPrivCount = %d\nGroupCount = %d\n\n", TStats->TokenId.LowPart, + TStats->TokenId.HighPart, + TStats->ImpersonationLevel, + TStats->PrivilegeCount, + TStats->GroupCount + ); + ExFreePool(TStats); + } + + //----------------------------------------------------------------// + + // Call SQIT with TokenType + + ok((SeQueryInformationToken(Token, TokenType, &Buffer) == STATUS_SUCCESS), "SQIT with TokenType fails\n"); + if (Buffer) + { + TType = (PTOKEN_TYPE)Buffer; + ok((*TType == TokenPrimary || *TType == TokenImpersonation), "TokenType in not a primary nor impersonation. FAILED\n"); + ExFreePool(TType); + } + + //----------------------------------------------------------------// + + // Call SQIT with TokenUser + + ok((SeQueryInformationToken(Token, TokenUser, &Buffer) == STATUS_SUCCESS), "SQIT with TokenUser fails\n"); + if (Buffer) + { + TUser = (PTOKEN_USER)Buffer; + ok(RtlValidSid(TUser->User.Sid), "TokenUser has an invalid Sid\n"); + ExFreePool(TUser); + } + + //----------------------------------------------------------------// + + + Status = SeQueryInformationToken(Token, TokenSandBoxInert, &Buffer); + ok(Status != STATUS_SUCCESS, "SQIT must fail with wrong TOKEN_INFORMATION_CLASS arg\n"); +} + +//------------------------------------------------------------------------------// + +//------------------------------------------------------------------------------// +// Body of the main test // +//------------------------------------------------------------------------------// + +START_TEST(SeQueryInfoToken) +{ + PACCESS_STATE AccessState; + ACCESS_MASK AccessMask = MAXIMUM_ALLOWED; + ACCESS_MASK DesiredAccess = MAXIMUM_ALLOWED; + NTSTATUS Status = STATUS_SUCCESS; + PAUX_ACCESS_DATA AuxData = NULL; + PPRIVILEGE_SET NewPrivilegeSet; + BOOLEAN Checker; + PPRIVILEGE_SET Privileges = NULL; + PSECURITY_SUBJECT_CONTEXT SubjectContext = NULL; + PACCESS_TOKEN Token = NULL; + PTOKEN_PRIVILEGES TPrivileges; + PVOID Buffer; + POBJECT_TYPE PsProcessType = NULL; + PGENERIC_MAPPING GenericMapping; + + SubjectContext = ExAllocatePool(PagedPool, sizeof(SECURITY_SUBJECT_CONTEXT)); + + SeCaptureSubjectContext(SubjectContext); + SeLockSubjectContext(SubjectContext); + Token = SeQuerySubjectContextToken(SubjectContext); + + // Testing SQIT with current Token + TestsSeQueryInformationToken(Token); + + //----------------------------------------------------------------// + // Creating an ACCESS_STATE structure // + //----------------------------------------------------------------// + + AccessState = ExAllocatePool(PagedPool, sizeof(ACCESS_STATE)); + PsProcessType = ExAllocatePool(PagedPool, sizeof(OBJECT_TYPE)); + AuxData = ExAllocatePool(PagedPool, 0xC8); + GenericMapping = ExAllocatePool(PagedPool, sizeof(GENERIC_MAPPING)); + + Status = SeCreateAccessState(AccessState, + (PVOID)AuxData, + DesiredAccess, + GenericMapping + ); + + ok((Status == STATUS_SUCCESS), "SeCreateAccessState failed with Status 0x%08X\n", Status); + + SeCaptureSubjectContext(&AccessState->SubjectSecurityContext); + SeLockSubjectContext(&AccessState->SubjectSecurityContext); + + Token = SeQuerySubjectContextToken(&AccessState->SubjectSecurityContext); + + // Testing SQIT whti AccessState Token + TestsSeQueryInformationToken(Token); + + //----------------------------------------------------------------// + // Testing other functions // + //----------------------------------------------------------------// + + //----------------------------------------------------------------// + // Testing SeAppendPrivileges // + //----------------------------------------------------------------// + + AuxData->PrivilegeSet->PrivilegeCount = 1; + + // Testing SeAppendPrivileges. Must change PrivilegeCount to 2 (1 + 1) + + NewPrivilegeSet = ExAllocatePool(PagedPool, sizeof(PRIVILEGE_SET)); + NewPrivilegeSet->PrivilegeCount = 1; + + ok((SeAppendPrivileges(AccessState, NewPrivilegeSet)) == STATUS_SUCCESS, "SeAppendPrivileges failed\n"); + ok((AuxData->PrivilegeSet->PrivilegeCount == 2),"PrivelegeCount must be 2, but it is %d\n", AuxData->PrivilegeSet->PrivilegeCount); + ExFreePool(NewPrivilegeSet); + + //----------------------------------------------------------------// + + // Testing SeAppendPrivileges. Must change PrivilegeCount to 6 (2 + 4) + + NewPrivilegeSet = ExAllocatePool(PagedPool, 4*sizeof(PRIVILEGE_SET)); + NewPrivilegeSet->PrivilegeCount = 4; + + ok((SeAppendPrivileges(AccessState, NewPrivilegeSet)) == STATUS_SUCCESS, "SeAppendPrivileges failed\n"); + ok((AuxData->PrivilegeSet->PrivilegeCount == 6),"PrivelegeCount must be 6, but it is %d\n", AuxData->PrivilegeSet->PrivilegeCount); + ExFreePool(NewPrivilegeSet); + + //----------------------------------------------------------------// + // Testing SePrivilegeCheck // + //----------------------------------------------------------------// + + // KPROCESSOR_MODE is set to KernelMode ===> Always return TRUE + ok(SePrivilegeCheck(AuxData->PrivilegeSet, &(AccessState->SubjectSecurityContext), KernelMode), "SePrivilegeCheck failed with KernelMode mode arg\n"); + // and call it again + ok(SePrivilegeCheck(AuxData->PrivilegeSet, &(AccessState->SubjectSecurityContext), KernelMode), "SePrivilegeCheck failed with KernelMode mode arg\n"); + + //----------------------------------------------------------------// + + // KPROCESSOR_MODE is set to UserMode. Expect false + ok(!SePrivilegeCheck(AuxData->PrivilegeSet, &(AccessState->SubjectSecurityContext), UserMode), "SePrivilegeCheck unexpected success with UserMode arg\n"); + + //----------------------------------------------------------------// + + //----------------------------------------------------------------// + // Testing SeFreePrivileges // + //----------------------------------------------------------------// + + Privileges = ExAllocatePool(PagedPool, AuxData->PrivilegeSet->PrivilegeCount*sizeof(PRIVILEGE_SET)); + + Checker = SeAccessCheck( + AccessState->SecurityDescriptor, + &AccessState->SubjectSecurityContext, + FALSE, + AccessState->OriginalDesiredAccess, + AccessState->PreviouslyGrantedAccess, + &Privileges, + (PGENERIC_MAPPING)((PCHAR*)PsProcessType + 52), + KernelMode, + &AccessMask, + &Status + ); + ok(Checker, "Checker is NULL\n"); + ok((Privileges != NULL), "Privileges is NULL\n"); + if (Privileges) SeFreePrivileges(Privileges); + + + //----------------------------------------------------------------// + // Testing SePrivilegeCheck // + //----------------------------------------------------------------// + // I'm trying to make success call of SePrivilegeCheck from UserMode + // If we sets Privileges properly, can we expect true from SePrivilegeCheck? + // answer: yes + // This test demonstrates it + + SeQueryInformationToken(Token, TokenPrivileges, &Buffer); + if (Buffer) + { + TPrivileges = (PTOKEN_PRIVILEGES)(Buffer); + //trace("TPCount = %u\n\n", TPrivileges->PrivilegeCount); + + NewPrivilegeSet = ExAllocatePool(PagedPool, 14*sizeof(PRIVILEGE_SET)); + NewPrivilegeSet->PrivilegeCount = 14; + + ok((SeAppendPrivileges(AccessState, NewPrivilegeSet)) == STATUS_SUCCESS, "SeAppendPrivileges failed\n"); + ok((AuxData->PrivilegeSet->PrivilegeCount == 20),"PrivelegeCount must be 20, but it is %d\n", AuxData->PrivilegeSet->PrivilegeCount); + ExFreePool(NewPrivilegeSet); + int i; + for (i = 0; i < AuxData->PrivilegeSet->PrivilegeCount; i++) + { + AuxData->PrivilegeSet->Privilege[i].Attributes = TPrivileges->Privileges[i].Attributes; + AuxData->PrivilegeSet->Privilege[i].Luid = TPrivileges->Privileges[i].Luid; + } + //trace("AccessState->privCount = %u\n\n", ((PAUX_ACCESS_DATA)(AccessState->AuxData))->PrivilegeSet->PrivilegeCount); + + ok(SePrivilegeCheck(AuxData->PrivilegeSet, &(AccessState->SubjectSecurityContext), UserMode), "SePrivilegeCheck fails in UserMode, but I wish it will success\n"); + } + + // Call SeFreePrivileges again + + Privileges = ExAllocatePool(PagedPool, 20*sizeof(PRIVILEGE_SET)); + + Checker = SeAccessCheck( + AccessState->SecurityDescriptor, + &AccessState->SubjectSecurityContext, + TRUE, + AccessState->OriginalDesiredAccess, + AccessState->PreviouslyGrantedAccess, + &Privileges, + (PGENERIC_MAPPING)((PCHAR*)PsProcessType + 52), + KernelMode, + &AccessMask, + &Status + ); + ok(Checker, "Checker is NULL\n"); + ok((Privileges != NULL), "Privileges is NULL\n"); + if (Privileges) SeFreePrivileges(Privileges); + + //----------------------------------------------------------------// + // Missing for now // + //----------------------------------------------------------------// + + SeUnlockSubjectContext(&AccessState->SubjectSecurityContext); + SeUnlockSubjectContext(SubjectContext); + + SeDeleteAccessState(AccessState); + + if (GenericMapping) ExFreePool(GenericMapping); + if (PsProcessType) ExFreePool(PsProcessType); + if (SubjectContext) ExFreePool(SubjectContext); + if (AuxData) ExFreePool(AuxData); + if (AccessState) ExFreePool(AccessState); +} Propchange: trunk/rostests/kmtests/ntos_se/SeQueryInfoToken.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/rostests/kmtests/ntos_se/SeQueryInfoToken.c ------------------------------------------------------------------------------ svn:mime-type = text/plain

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs