Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 53169: [KMTESTS/OB] - More reworking of ObType test. Now it works reliably on Windows. - Split out testing of object referencing into separate ObReference test
by tfaber＠svn.reactos.org 10 Aug '11

10 Aug '11

Author: tfaber Date: Wed Aug 10 22:42:32 2011 New Revision: 53169 URL: http://svn.reactos.org/svn/reactos?rev=53169&view=rev Log: [KMTESTS/OB] - More reworking of ObType test. Now it works reliably on Windows. - Split out testing of object referencing into separate ObReference test Added: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ob/ObReference.c (with props) Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ob/ObType.c Added: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ob/ObReference.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ob/ObReference.c (added) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ob/ObReference.c [iso-8859-1] Wed Aug 10 22:42:32 2011 @@ -1,0 +1,256 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Object Referencing test + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include <kmt_test.h> + +#define CheckObject(Handle, Pointers, Handles) do \ +{ \ + PUBLIC_OBJECT_BASIC_INFORMATION ObjectInfo; \ + Status = ZwQueryObject(Handle, ObjectBasicInformation, \ + &ObjectInfo, sizeof ObjectInfo, NULL); \ + ok_eq_hex(Status, STATUS_SUCCESS); \ + ok_eq_ulong(ObjectInfo.PointerCount, Pointers); \ + ok_eq_ulong(ObjectInfo.HandleCount, Handles); \ +} while (0) + +static POBJECT_TYPE ObDirectoryObjectType; + +static +VOID +TestReference( + IN HANDLE Handle, + IN PUNICODE_STRING Name OPTIONAL, + IN PUNICODE_STRING NameUpper OPTIONAL, + IN BOOLEAN CaseSensitive, + IN ULONG AdditionalReferences, + IN BOOLEAN Permanent) +{ + NTSTATUS Status; + LONG_PTR Ret; + PVOID Object = NULL; + PVOID Object2 = NULL; + PVOID Object3 = NULL; + PVOID Object4 = NULL; + + CheckObject(Handle, 2LU + AdditionalReferences, 1LU); + + Status = ObReferenceObjectByHandle(Handle, DIRECTORY_ALL_ACCESS, NULL, KernelMode, &Object, NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + ok(Object != NULL, "ObReferenceObjectByHandle returned NULL object\n"); + CheckObject(Handle, 3LU + AdditionalReferences, 1LU); + + Status = ObReferenceObjectByHandle(Handle, DIRECTORY_ALL_ACCESS, NULL, KernelMode, &Object2, NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + ok(Object != NULL, "ObReferenceObjectByHandle returned NULL object\n"); + ok_eq_pointer(Object, Object2); + CheckObject(Handle, 4LU + AdditionalReferences, 1LU); + + if (!skip(Object != NULL, "No object to reference!\n")) + { + Ret = ObReferenceObject(Object); + ok_eq_longptr(Ret, (LONG_PTR)4 + AdditionalReferences); + CheckObject(Handle, 5LU + AdditionalReferences, 1LU); + + Ret = ObReferenceObject(Object); + ok_eq_longptr(Ret, (LONG_PTR)5 + AdditionalReferences); + CheckObject(Handle, 6LU + AdditionalReferences, 1LU); + + Status = ObReferenceObjectByPointer(Object, DIRECTORY_ALL_ACCESS, NULL, KernelMode); + ok_eq_hex(Status, STATUS_SUCCESS); + CheckObject(Handle, 7LU + AdditionalReferences, 1LU); + + Status = ObReferenceObjectByPointer(Object, DIRECTORY_ALL_ACCESS, NULL, KernelMode); + ok_eq_hex(Status, STATUS_SUCCESS); + CheckObject(Handle, 8LU + AdditionalReferences, 1LU); + + Ret = ObDereferenceObject(Object); + ok_eq_longptr(Ret, (LONG_PTR)6 + AdditionalReferences); + CheckObject(Handle, 7LU + AdditionalReferences, 1LU); + + Ret = ObDereferenceObject(Object); + ok_eq_longptr(Ret, (LONG_PTR)5 + AdditionalReferences); + CheckObject(Handle, 6LU + AdditionalReferences, 1LU); + + Ret = ObDereferenceObject(Object); + ok_eq_longptr(Ret, (LONG_PTR)4 + AdditionalReferences); + CheckObject(Handle, 5LU + AdditionalReferences, 1LU); + + Ret = ObDereferenceObject(Object); + ok_eq_longptr(Ret, (LONG_PTR)3 + AdditionalReferences); + CheckObject(Handle, 4LU + AdditionalReferences, 1LU); + } + + if (Name && !skip(ObDirectoryObjectType != NULL, "No directory object type\n")) + { + Status = ObReferenceObjectByName(Name, 0, NULL, DIRECTORY_ALL_ACCESS, ObDirectoryObjectType, KernelMode, NULL, &Object3); + ok_eq_hex(Status, STATUS_SUCCESS); + CheckObject(Handle, 5LU + AdditionalReferences, 1LU); + } + + if (NameUpper && !skip(ObDirectoryObjectType != NULL, "No directory object type\n")) + { + Status = ObReferenceObjectByName(NameUpper, 0, NULL, DIRECTORY_ALL_ACCESS, ObDirectoryObjectType, KernelMode, NULL, &Object4); + ok_eq_hex(Status, CaseSensitive ? STATUS_OBJECT_NAME_NOT_FOUND : STATUS_SUCCESS); + CheckObject(Handle, 5LU + AdditionalReferences + !CaseSensitive, 1LU); + } + + if (NameUpper && !skip(Object4 != NULL, "No object to dereference\n")) + { + Ret = ObDereferenceObject(Object4); + ok_eq_longptr(Ret, (LONG_PTR)4 + AdditionalReferences); + CheckObject(Handle, 5LU + AdditionalReferences, 1LU); + } + if (Name && !skip(Object3 != NULL, "No object to dereference\n")) + { + Ret = ObDereferenceObject(Object3); + ok_eq_longptr(Ret, (LONG_PTR)3 + AdditionalReferences); + CheckObject(Handle, 4LU + AdditionalReferences, 1LU); + } + if (!skip(Object2 != NULL, "No object to dereference\n")) + { + Ret = ObDereferenceObject(Object2); + ok_eq_longptr(Ret, (LONG_PTR)2 + AdditionalReferences); + CheckObject(Handle, 3LU + AdditionalReferences, 1LU); + } + if (!skip(Object != NULL, "No object to dereference\n")) + { + Ret = ObDereferenceObject(Object); + ok_eq_longptr(Ret, (LONG_PTR)1 + AdditionalReferences); + CheckObject(Handle, 2LU + AdditionalReferences, 1LU); + } + + CheckObject(Handle, 2LU + AdditionalReferences, 1LU); + + if (Permanent) + { + Status = ZwMakeTemporaryObject(Handle); + ok_eq_hex(Status, STATUS_SUCCESS); + CheckObject(Handle, 2LU + AdditionalReferences, 1LU); + + Status = ZwMakeTemporaryObject(Handle); + ok_eq_hex(Status, STATUS_SUCCESS); + CheckObject(Handle, 2LU + AdditionalReferences, 1LU); + } +} + +START_TEST(ObReference) +{ + NTSTATUS Status; + NTSTATUS ExceptionStatus; + HANDLE DirectoryHandle = NULL; + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING Name, *pName; + UNICODE_STRING NameUpper, *pNameUpper; + ULONG i; + struct + { + PWSTR Name; + ULONG Flags; + ULONG AdditionalReferences; + } Tests[] = + { + { NULL, 0, 0 }, + { NULL, OBJ_CASE_INSENSITIVE, 0 }, + { NULL, OBJ_KERNEL_HANDLE, 0 }, + { NULL, OBJ_PERMANENT, 0 }, + { NULL, OBJ_CASE_INSENSITIVE | OBJ_PERMANENT, 0 }, + { NULL, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, 0 }, + { NULL, OBJ_KERNEL_HANDLE | OBJ_PERMANENT, 0 }, + { NULL, OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE | OBJ_PERMANENT, 0 }, + { L"\\YayDirectory0", 0, 1 }, + { L"\\YayDirectory1", OBJ_CASE_INSENSITIVE, 1 }, + { L"\\YayDirectory2", OBJ_KERNEL_HANDLE, 1 }, + { L"\\YayDirectory3", OBJ_PERMANENT, 1 }, + { L"\\YayDirectory4", OBJ_CASE_INSENSITIVE | OBJ_PERMANENT, 1 }, + { L"\\YayDirectory5", OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE, 1 }, + { L"\\YayDirectory6", OBJ_KERNEL_HANDLE | OBJ_PERMANENT, 1 }, + { L"\\YayDirectory7", OBJ_CASE_INSENSITIVE | OBJ_KERNEL_HANDLE | OBJ_PERMANENT, 1 }, + }; + HANDLE ObjectTypeHandle; + + /* ObReferenceObjectByName needs the object type... so get it... */ + RtlInitUnicodeString(&Name, L"\\ObjectTypes\\Directory"); + InitializeObjectAttributes(&ObjectAttributes, &Name, OBJ_KERNEL_HANDLE, NULL, NULL); + Status = ObOpenObjectByName(&ObjectAttributes, NULL, KernelMode, NULL, 0, NULL, &ObjectTypeHandle); + ok_eq_hex(Status, STATUS_SUCCESS); + ok(ObjectTypeHandle != NULL, "ObjectTypeHandle = NULL\n"); + if (!skip(Status == STATUS_SUCCESS && ObjectTypeHandle, "No handle\n")) + { + Status = ObReferenceObjectByHandle(ObjectTypeHandle, 0, NULL, KernelMode, (PVOID)&ObDirectoryObjectType, NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + ok(ObDirectoryObjectType != NULL, "ObDirectoryObjectType = NULL\n"); + Status = ZwClose(ObjectTypeHandle); + ok_eq_hex(Status, STATUS_SUCCESS); + } + + for (i = 0; i < sizeof Tests / sizeof Tests[0]; ++i) + { + if (Tests[i].Name) + { + RtlInitUnicodeString(&Name, Tests[i].Name); + pName = &Name; + Status = RtlUpcaseUnicodeString(&NameUpper, &Name, TRUE); + ok_eq_hex(Status, STATUS_SUCCESS); + if (skip(Status == STATUS_SUCCESS, "No upper case name\n")) + pNameUpper = NULL; + else + pNameUpper = &NameUpper; + } + else + { + pName = NULL; + pNameUpper = NULL; + } + InitializeObjectAttributes(&ObjectAttributes, pName, Tests[i].Flags, NULL, NULL); + Status = ZwCreateDirectoryObject(&DirectoryHandle, DIRECTORY_ALL_ACCESS, &ObjectAttributes); + ok_eq_hex(Status, STATUS_SUCCESS); + ok(DirectoryHandle != NULL, "DirectoryHandle = NULL\n"); + + if (!skip(Status == STATUS_SUCCESS && DirectoryHandle, "Cannot proceed without an object")) + { + TestReference(DirectoryHandle, pName, pNameUpper, FALSE, Tests[i].AdditionalReferences, (Tests[i].Flags & OBJ_PERMANENT) != 0); + /* try again for good measure */ + TestReference(DirectoryHandle, pName, pNameUpper, FALSE, Tests[i].AdditionalReferences, FALSE); + + Status = ZwClose(DirectoryHandle); + ok_eq_hex(Status, STATUS_SUCCESS); + DirectoryHandle = NULL; + } + + if (pNameUpper) + RtlFreeUnicodeString(pNameUpper); + } + + if (DirectoryHandle) + { + Status = ZwClose(DirectoryHandle); + ok_eq_hex(Status, STATUS_SUCCESS); + } + + /* parameter tests */ + /* bugcheck at APC_LEVEL + Status = ObReferenceObject(NULL); + Status = ObReferenceObjectByPointer(NULL, 0, NULL, UserMode); + Status = ObReferenceObjectByPointer(NULL, 0, NULL, KernelMode);*/ + + ExceptionStatus = STATUS_SUCCESS; + _SEH2_TRY { + Status = ZwClose(NULL); + ok_eq_hex(Status, STATUS_INVALID_HANDLE); + Status = ZwClose((HANDLE)-1); + ok_eq_hex(Status, STATUS_INVALID_HANDLE); + } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { + ExceptionStatus = _SEH2_GetExceptionCode(); + } _SEH2_END; + ok_eq_hex(ExceptionStatus, STATUS_SUCCESS); + + if (ObDirectoryObjectType) + { + ObDereferenceObject(ObDirectoryObjectType); + ObDirectoryObjectType = NULL; + } +} Propchange: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ob/ObReference.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ob/ObType.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ob/ObType.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ob/ObType.c [iso-8859-1] Wed Aug 10 22:42:32 2011 @@ -6,21 +6,21 @@ * Thomas Faber <thfabba(a)gmx.de> */ -/* TODO: split this into multiple tests! ObLifetime, ObHandle, ObName, ... */ +/* TODO: split this into multiple tests! ObLife, ObHandle, ObName, ... */ #include <kmt_test.h> -//#define NDEBUG +#define NDEBUG #include <debug.h> -#define CheckObject(Handle, PCount, HCount) do \ +#define CheckObject(Handle, Pointers, Handles) do \ { \ PUBLIC_OBJECT_BASIC_INFORMATION ObjectInfo; \ Status = ZwQueryObject(Handle, ObjectBasicInformation, \ &ObjectInfo, sizeof ObjectInfo, NULL); \ ok_eq_hex(Status, STATUS_SUCCESS); \ - ok_eq_ulong(ObjectInfo.PointerCount, PCount); \ - ok_eq_ulong(ObjectInfo.HandleCount, HCount); \ + ok_eq_ulong(ObjectInfo.PointerCount, Pointers); \ + ok_eq_ulong(ObjectInfo.HandleCount, Handles); \ } while (0) #define NUM_OBTYPES 5 @@ -45,11 +45,19 @@ static OBJECT_ATTRIBUTES ObAttributes[NUM_OBTYPES]; static PVOID ObBody[NUM_OBTYPES]; static HANDLE ObHandle1[NUM_OBTYPES]; -static HANDLE ObHandle2[NUM_OBTYPES]; static HANDLE DirectoryHandle; -static USHORT DumpCount, OpenCount, CloseCount, DeleteCount, - ParseCount, OkayToCloseCount, QueryNameCount; +typedef struct _COUNTS +{ + USHORT Dump; + USHORT Open; + USHORT Close; + USHORT Delete; + USHORT Parse; + USHORT OkayToClose; + USHORT QueryName; +} COUNTS, *PCOUNTS; +static COUNTS Counts; static VOID @@ -59,7 +67,7 @@ IN POB_DUMP_CONTROL DumpControl) { DPRINT("DumpProc() called\n"); - DumpCount++; + ++Counts.Dump; } static @@ -74,7 +82,7 @@ { DPRINT("OpenProc() 0x%p, OpenReason %d, HandleCount %lu, AccessMask 0x%lX\n", Object, OpenReason, HandleCount, GrantedAccess); - OpenCount++; + ++Counts.Open; return STATUS_SUCCESS; } @@ -90,7 +98,7 @@ { DPRINT("CloseProc() 0x%p, ProcessHandleCount %lu, SystemHandleCount %lu, AccessMask 0x%lX\n", Object, ProcessHandleCount, SystemHandleCount, GrantedAccess); - CloseCount++; + ++Counts.Close; } static @@ -100,7 +108,7 @@ IN PVOID Object) { DPRINT("DeleteProc() 0x%p\n", Object); - DeleteCount++; + ++Counts.Delete; } static @@ -121,11 +129,11 @@ DPRINT("ParseProc() called\n"); *Object = NULL; - ParseCount++; + ++Counts.Parse; return STATUS_OBJECT_NAME_NOT_FOUND;//STATUS_SUCCESS; } -#if 0 +/* TODO: this does not actually return an NTSTATUS! */ static NTSTATUS NTAPI @@ -137,8 +145,8 @@ { DPRINT("OkayToCloseProc() 0x%p, Handle 0x%p, AccessMask 0x%lX\n", Object, Handle, AccessMode); - OkayToCloseCount++; - return STATUS_SUCCESS; + ++Counts.OkayToClose; + return TRUE; } static @@ -154,13 +162,12 @@ { DPRINT("QueryNameProc() 0x%p, HasObjectName %d, Len %lu, AccessMask 0x%lX\n", Object, HasObjectName, Length, AccessMode); - QueryNameCount++; + ++Counts.QueryName; ObjectNameInfo = NULL; ReturnLength = 0; return STATUS_OBJECT_NAME_NOT_FOUND; } -#endif /* 0 */ static VOID @@ -168,13 +175,21 @@ { INT i; NTSTATUS Status; - WCHAR Name[15]; - - for (i = 0; i < NUM_OBTYPES; i++) - { - Status = RtlStringCbPrintfW(Name, sizeof Name, L"MyObjectType%x", i); + struct + { + WCHAR DirectoryName[sizeof "\\ObjectTypes\\" - 1]; + WCHAR TypeName[15]; + } Name = { L"\\ObjectTypes\\" }; + OBJECT_ATTRIBUTES ObjectAttributes; + HANDLE ObjectTypeHandle; + UNICODE_STRING ObjectPath; + + for (i = 0; i < NUM_OBTYPES; ++i) + { + Status = RtlStringCbPrintfW(Name.TypeName, sizeof Name.TypeName, L"MyObjectType%x", i); ASSERT(NT_SUCCESS(Status)); - RtlInitUnicodeString(&ObTypeName[i], Name); + RtlInitUnicodeString(&ObTypeName[i], Name.TypeName); + DPRINT("Creating object type %wZ\n", &ObTypeName[i]); RtlZeroMemory(&ObTypeInitializer[i], sizeof ObTypeInitializer[i]); ObTypeInitializer[i].Length = sizeof ObTypeInitializer[i]; @@ -193,12 +208,40 @@ ObTypeInitializer[i].DumpProcedure = DumpProc; ObTypeInitializer[i].OpenProcedure = OpenProc; ObTypeInitializer[i].ParseProcedure = ParseProc; - //ObTypeInitializer[i].OkayToCloseProcedure = OkayToCloseProc; - //ObTypeInitializer[i].QueryNameProcedure = QueryNameProc; + ObTypeInitializer[i].OkayToCloseProcedure = OkayToCloseProc; + ObTypeInitializer[i].QueryNameProcedure = QueryNameProc; //ObTypeInitializer[i].SecurityProcedure = SecurityProc; Status = ObCreateObjectType(&ObTypeName[i], &ObTypeInitializer[i], NULL, &ObTypes[i]); + if (Status == STATUS_OBJECT_NAME_COLLISION) + { + /* as we cannot delete the object types, get a pointer if they + * already exist */ + RtlInitUnicodeString(&ObjectPath, Name.DirectoryName); + InitializeObjectAttributes(&ObjectAttributes, &ObjectPath, OBJ_KERNEL_HANDLE, NULL, NULL); + Status = ObOpenObjectByName(&ObjectAttributes, NULL, KernelMode, NULL, 0, NULL, &ObjectTypeHandle); + ok_eq_hex(Status, STATUS_SUCCESS); + ok(ObjectTypeHandle != NULL, "ObjectTypeHandle = NULL\n"); + if (!skip(Status == STATUS_SUCCESS && ObjectTypeHandle, "No handle\n")) + { + Status = ObReferenceObjectByHandle(ObjectTypeHandle, 0, NULL, KernelMode, (PVOID)&ObTypes[i], NULL); + ok_eq_hex(Status, STATUS_SUCCESS); + if (!skip(Status == STATUS_SUCCESS && ObTypes[i], "blah\n")) + { + ObTypes[i]->TypeInfo.CloseProcedure = CloseProc; + ObTypes[i]->TypeInfo.DeleteProcedure = DeleteProc; + ObTypes[i]->TypeInfo.DumpProcedure = DumpProc; + ObTypes[i]->TypeInfo.OpenProcedure = OpenProc; + ObTypes[i]->TypeInfo.ParseProcedure = ParseProc; + ObTypes[i]->TypeInfo.OkayToCloseProcedure = OkayToCloseProc; + ObTypes[i]->TypeInfo.QueryNameProcedure = QueryNameProc; + } + Status = ZwClose(ObjectTypeHandle); + } + } + ok_eq_hex(Status, STATUS_SUCCESS); + ok(ObTypes[i] != NULL, "ObType = NULL\n"); } } @@ -209,31 +252,24 @@ NTSTATUS Status; RtlInitUnicodeString(&ObDirectoryName, L"\\ObtDirectory"); - InitializeObjectAttributes(&ObDirectoryAttributes, &ObDirectoryName, OBJ_PERMANENT | OBJ_CASE_INSENSITIVE, NULL, NULL); + InitializeObjectAttributes(&ObDirectoryAttributes, &ObDirectoryName, OBJ_KERNEL_HANDLE | OBJ_PERMANENT | OBJ_CASE_INSENSITIVE, NULL, NULL); Status = ZwCreateDirectoryObject(&DirectoryHandle, DELETE, &ObDirectoryAttributes); ok_eq_hex(Status, STATUS_SUCCESS); CheckObject(DirectoryHandle, 3LU, 1LU); } -#define CheckCounts(Open, Close, Delete, Parse, OkayToClose, QueryName) do \ -{ \ - ok_eq_uint(OpenCount, Open); \ - ok_eq_uint(CloseCount, Close); \ - ok_eq_uint(DeleteCount, Delete); \ - ok_eq_uint(ParseCount, Parse); \ - ok_eq_uint(OkayToCloseCount, OkayToClose); \ - ok_eq_uint(QueryNameCount, QueryName); \ +#define CheckCounts(OpenCount, CloseCount, DeleteCount, ParseCount, \ + OkayToCloseCount, QueryNameCount) do \ +{ \ + ok_eq_uint(Counts.Open, OpenCount); \ + ok_eq_uint(Counts.Close, CloseCount); \ + ok_eq_uint(Counts.Delete, DeleteCount); \ + ok_eq_uint(Counts.Parse, ParseCount); \ + ok_eq_uint(Counts.OkayToClose, OkayToCloseCount); \ + ok_eq_uint(Counts.QueryName, QueryNameCount); \ } while (0) -#define SaveCounts(Open, Close, Delete, Parse, OkayToClose, QueryName) do \ -{ \ - Open = OpenCount; \ - Close = CloseCount; \ - Delete = DeleteCount; \ - Parse = ParseCount; \ - OkayToClose = OkayToCloseCount; \ - QueryName = QueryNameCount; \ -} while (0) +#define SaveCounts(Save) memcpy(&Save, &Counts, sizeof Counts) /* TODO: make this the same as NUM_OBTYPES */ #define NUM_OBTYPES2 2 @@ -241,10 +277,9 @@ VOID ObtCreateObjects(VOID) { - PVOID ObBody1[2] = { NULL }; NTSTATUS Status; WCHAR Name[NUM_OBTYPES2][MAX_PATH]; - USHORT OpenSave, CloseSave, DeleteSave, ParseSave, OkayToCloseSave, QueryNameSave; + COUNTS SaveCounts; INT i; ACCESS_MASK Access[NUM_OBTYPES2] = { STANDARD_RIGHTS_ALL, GENERIC_ALL }; ULONG ObjectSize[NUM_OBTYPES2] = { sizeof(MY_OBJECT1), sizeof(MY_OBJECT2) }; @@ -258,6 +293,7 @@ RtlInitUnicodeString(&ObName[i], Name[i]); InitializeObjectAttributes(&ObAttributes[i], &ObName[i], OBJ_CASE_INSENSITIVE, NULL, NULL); } + CheckObject(DirectoryHandle, 3LU, 1LU); for (i = 0; i < NUM_OBTYPES2; ++i) { @@ -265,55 +301,24 @@ ok_eq_hex(Status, STATUS_SUCCESS); } - SaveCounts(OpenSave, CloseSave, DeleteSave, ParseSave, OkayToCloseSave, QueryNameSave); + SaveCounts(SaveCounts); // Insert them for (i = 0; i < NUM_OBTYPES2; ++i) { + CheckObject(DirectoryHandle, 3LU + i, 1LU); Status = ObInsertObject(ObBody[i], NULL, Access[i], 0, &ObBody[i], &ObHandle1[i]); ok_eq_hex(Status, STATUS_SUCCESS); ok(ObBody[i] != NULL, "Object body = NULL\n"); ok(ObHandle1[i] != NULL, "Handle = NULL\n"); CheckObject(ObHandle1[i], 3LU, 1LU); - CheckCounts(OpenSave + 1, CloseSave, DeleteSave, ParseSave, OkayToCloseSave, QueryNameSave); - SaveCounts(OpenSave, CloseSave, DeleteSave, ParseSave, OkayToCloseSave, QueryNameSave); - } - - // Now create an object of type 0, of the same name and expect it to fail - // inserting, but success creation - ok_eq_wstr(ObName[0].Buffer, L"\\ObtDirectory\\MyObject1"); - RtlInitUnicodeString(&ObName[0], L"\\ObtDirectory\\MyObject1"); - InitializeObjectAttributes(&ObAttributes[0], &ObName[0], OBJ_OPENIF, NULL, NULL); - - Status = ObCreateObject(KernelMode, ObTypes[0], &ObAttributes[0], KernelMode, NULL, sizeof(MY_OBJECT1), 0L, 0L, &ObBody1[0]); - ok_eq_hex(Status, STATUS_SUCCESS); - CheckCounts(OpenSave, CloseSave, DeleteSave, ParseSave, OkayToCloseSave, QueryNameSave); - - Status = ObInsertObject(ObBody1[0], NULL, GENERIC_ALL, 0, &ObBody1[1], &ObHandle2[0]); - ok_eq_hex(Status, STATUS_ACCESS_DENIED/*STATUS_OBJECT_NAME_EXISTS*/); - ok_eq_pointer(ObBody[0], ObBody1[1]); - ok(ObHandle2[0] != NULL, "NULL handle returned\n"); - - DPRINT("%d %d %d %d %d %d %d\n", DumpCount, OpenCount, CloseCount, DeleteCount, ParseCount, OkayToCloseCount, QueryNameCount); - CheckCounts(OpenSave + 1, CloseSave, DeleteSave + 1, ParseSave, OkayToCloseSave, QueryNameSave); - SaveCounts(OpenSave, CloseSave, DeleteSave, ParseSave, OkayToCloseSave, QueryNameSave); - - // Close its handle - if (!skip(ObHandle2[0] && ObHandle2[0] != INVALID_HANDLE_VALUE, "Nothing to close\n")) - { - Status = ZwClose(ObHandle2[0]); - ok_eq_hex(Status, STATUS_SUCCESS); - CheckCounts(OpenSave, CloseSave + 1, DeleteSave, ParseSave, OkayToCloseSave, QueryNameSave); - SaveCounts(OpenSave, CloseSave, DeleteSave, ParseSave, OkayToCloseSave, QueryNameSave); - } - - // Object referenced 2 times: - // 1) ObInsertObject - // 2) AdditionalReferences - if (ObBody1[1]) - ObDereferenceObject(ObBody1[1]); + CheckCounts(SaveCounts.Open + 1, SaveCounts.Close, SaveCounts.Delete, SaveCounts.Parse, SaveCounts.OkayToClose, SaveCounts.QueryName); + SaveCounts(SaveCounts); + CheckObject(DirectoryHandle, 4LU + i, 1LU); + } + //DPRINT1("%d %d %d %d %d %d %d\n", DumpCount, OpenCount, CloseCount, DeleteCount, ParseCount, OkayToCloseCount, QueryNameCount); - CheckCounts(OpenSave, CloseSave, DeleteSave, ParseSave, OkayToCloseSave, QueryNameSave); + CheckCounts(SaveCounts.Open, SaveCounts.Close, SaveCounts.Delete, SaveCounts.Parse, SaveCounts.OkayToClose, SaveCounts.QueryName); } static @@ -322,8 +327,8 @@ BOOLEAN Clean, BOOLEAN AlternativeMethod) { - PVOID DirObject; NTSTATUS Status; + LONG_PTR Ret; PVOID TypeObject; INT i; UNICODE_STRING ObPathName[NUM_OBTYPES]; @@ -332,63 +337,51 @@ // Close what we have opened and free what we allocated for (i = 0; i < NUM_OBTYPES2; ++i) { - if (ObBody[i]) + if (!skip(ObBody[i] != NULL, "Nothing to dereference\n")) { if (ObHandle1[i]) CheckObject(ObHandle1[i], 3LU, 1LU); - ObDereferenceObject(ObBody[i]); + Ret = ObDereferenceObject(ObBody[i]); + ok_eq_longptr(Ret, (LONG_PTR)1); if (ObHandle1[i]) CheckObject(ObHandle1[i], 2LU, 1LU); ObBody[i] = NULL; } - if (ObHandle1[i]) + if (!skip(ObHandle1[i] != NULL, "Nothing to close\n")) { - ZwClose(ObHandle1[i]); + Status = ZwClose(ObHandle1[i]); + ok_eq_hex(Status, STATUS_SUCCESS); ObHandle1[i] = NULL; } - if (ObHandle2[i]) - { - ZwClose(ObHandle2[i]); - ObHandle2[i] = NULL; - } - } - - if (!Clean) + } + + if (skip(Clean, "Not cleaning up, as requested. Use ObTypeClean to clean up\n")) return; // Now we have to get rid of a directory object // Since it is permanent, we have to firstly make it temporary // and only then kill // (this procedure is described in DDK) - if (DirectoryHandle && DirectoryHandle != INVALID_HANDLE_VALUE) + if (!skip(DirectoryHandle != NULL, "No directory handle\n")) { CheckObject(DirectoryHandle, 3LU, 1LU); - Status = ObReferenceObjectByHandle(DirectoryHandle, 0L, NULL, KernelMode, &DirObject, NULL); - ok_eq_hex(Status, STATUS_SUCCESS); - CheckObject(DirectoryHandle, 4LU, 1LU); Status = ZwMakeTemporaryObject(DirectoryHandle); ok_eq_hex(Status, STATUS_SUCCESS); - CheckObject(DirectoryHandle, 4LU, 1LU); - - // Dereference 2 times - first for just previous referencing - // and 2nd time for creation of permanent object itself - ObDereferenceObject(DirObject); CheckObject(DirectoryHandle, 3LU, 1LU); - ObDereferenceObject(DirObject); - CheckObject(DirectoryHandle, 2LU, 1LU); Status = ZwClose(DirectoryHandle); ok_eq_hex(Status, STATUS_SUCCESS); } - // Now delete the last piece - object types - // In fact, it's weird to get rid of object types, especially the way, - // how it's done in the commented section below + /* we don't delete the object types we created. It makes Windows unstable. + * TODO: perhaps make it work in ROS anyway */ + return; if (!AlternativeMethod) { for (i = 0; i < NUM_OBTYPES; ++i) - if (ObTypes[i]) + if (!skip(ObTypes[i] != NULL, "No object type to delete\n")) { - ObDereferenceObject(ObTypes[i]); + Ret = ObDereferenceObject(ObTypes[i]); + ok_eq_longptr(Ret, (LONG_PTR)0); ObTypes[i] = NULL; } } @@ -396,14 +389,16 @@ { for (i = 0; i < NUM_OBTYPES; ++i) { - if (ObTypes[i]) + if (!skip(ObTypes[i] != NULL, "No object type to delete\n")) { Status = RtlStringCbPrintfW(Name, sizeof Name, L"\\ObjectTypes\\MyObjectType%d", i); - RtlInitUnicodeString(&ObPathName[0], Name); + RtlInitUnicodeString(&ObPathName[i], Name); Status = ObReferenceObjectByName(&ObPathName[i], OBJ_CASE_INSENSITIVE, NULL, 0L, NULL, KernelMode, NULL, &TypeObject); - ObDereferenceObject(TypeObject); - ObDereferenceObject(TypeObject); + Ret = ObDereferenceObject(TypeObject); + ok_eq_longptr(Ret, (LONG_PTR)2); + Ret = ObDereferenceObject(TypeObject); + ok_eq_longptr(Ret, (LONG_PTR)1); DPRINT("Reference Name %wZ = %p, ObTypes[%d] = %p\n", ObPathName[i], TypeObject, i, ObTypes[i]); ObTypes[i] = NULL; @@ -412,73 +407,12 @@ } } -#if 0 -static -VOID -ObtReferenceTests(VOID) -{ - INT i; - NTSTATUS Status; - UNICODE_STRING ObPathName[NUM_OBTYPES]; - - // Reference them by handle - for (i = 0; i < NUM_OBTYPES2; i++) - { - CheckObject(ObHandle1[i], 2LU, 1LU); - Status = ObReferenceObjectByHandle(ObHandle1[i], 0L, ObTypes[i], KernelMode, &ObBody[i], NULL); - ok_eq_hex(Status, STATUS_SUCCESS); - CheckObject(ObHandle1[i], 3LU, 1LU); - DPRINT("Ref by handle %lx = %p\n", ObHandle1[i], ObBody[i]); - } - - // Reference them by pointer - for (i = 0; i < NUM_OBTYPES2; i++) - { - CheckObject(ObHandle1[i], 3LU, 1LU); - Status = ObReferenceObjectByPointer(ObBody[i], 0L, ObTypes[i], KernelMode); - CheckObject(ObHandle1[i], 4LU, 1LU); - ok_eq_hex(Status, STATUS_SUCCESS); - } - - // Reference them by name - RtlInitUnicodeString(&ObPathName[0], L"\\ObtDirectory\\MyObject1"); - RtlInitUnicodeString(&ObPathName[1], L"\\ObtDirectory\\MyObject2"); - -#if 0 - for (i = 0; i < NUM_OBTYPES2; i++) - { - Status = ObReferenceObjectByName(&ObPathName[i], OBJ_CASE_INSENSITIVE, NULL, 0L, ObTypes[i], KernelMode, NULL, &ObBody[i]); - DPRINT("Ref by name %wZ = %p\n", &ObPathName[i], ObBody[i]); - } -#endif - - // Dereference now all of them - - for (i = 0; i < NUM_OBTYPES2; ++i) - if (!skip(ObBody[i] != NULL, "Object pointer is NULL\n")) - { - CheckObject(ObHandle1[i], 4LU, 1LU); - // For ObInsertObject, AdditionalReference - //ObDereferenceObject(ObBody[i]); - // For ByName - //ObDereferenceObject(ObBody[i]); - // For ByPointer - ObDereferenceObject(ObBody[i]); - CheckObject(ObHandle1[i], 3LU, 1LU); - // For ByHandle - ObDereferenceObject(ObBody[i]); - CheckObject(ObHandle1[i], 2LU, 1LU); - } -} -#endif /* 0 */ - static VOID TestObjectType( IN BOOLEAN Clean) { - DumpCount = 0; OpenCount = 0; CloseCount = 0; - DeleteCount = 0; ParseCount = 0; + RtlZeroMemory(&Counts, sizeof Counts); ObtCreateObjectTypes(); DPRINT("ObtCreateObjectTypes() done\n"); @@ -486,10 +420,9 @@ ObtCreateDirectory(); DPRINT("ObtCreateDirectory() done\n"); - ObtCreateObjects(); + if (!skip(ObTypes[0] != NULL, "No object types!\n")) + ObtCreateObjects(); DPRINT("ObtCreateObjects() done\n"); - - //ObtReferenceTests(); ObtClose(Clean, FALSE); } @@ -503,12 +436,10 @@ START_TEST(ObTypeNoClean) { TestObjectType(FALSE); - trace("Cleanup skipped as requested! Run ObTypeClean to clean up\n"); } /* run this to clean up after ObTypeNoClean */ START_TEST(ObTypeClean) { ObtClose(TRUE, FALSE); - trace("Cleanup done\n"); -} +}

1 0

[akhaldi] 53168: [WS2_32_NEW][WS2HELP] * Add PCHs.
by akhaldi＠svn.reactos.org 10 Aug '11

10 Aug '11

Author: akhaldi Date: Wed Aug 10 22:40:12 2011 New Revision: 53168 URL: http://svn.reactos.org/svn/reactos?rev=53168&view=rev Log: [WS2_32_NEW][WS2HELP] * Add PCHs. Modified: trunk/reactos/dll/win32/ws2_32_new/CMakeLists.txt trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c trunk/reactos/dll/win32/ws2_32_new/ws2_32.rbuild trunk/reactos/dll/win32/ws2help/CMakeLists.txt trunk/reactos/dll/win32/ws2help/precomp.h trunk/reactos/dll/win32/ws2help/ws2help.rbuild Modified: trunk/reactos/dll/win32/ws2_32_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/CMake… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/CMakeLists.txt [iso-8859-1] Wed Aug 10 22:40:12 2011 @@ -48,8 +48,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/ws2_32.def) add_library(ws2_32_new SHARED ${SOURCE}) - set_module_type(ws2_32_new win32dll) +add_importlibs(ws2_32_new user32 advapi32 dnsapi ws2help msvcrt kernel32 ntdll) +add_pch(ws2_32_new inc/ws2_32.h) target_link_libraries(ws2_32_new wine) -add_importlibs(ws2_32_new user32 advapi32 dnsapi ws2help msvcrt kernel32 ntdll) add_cd_file(TARGET ws2_32_new DESTINATION reactos/system32 FOR all) Modified: trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/inc/w… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/inc/ws2_32.h [iso-8859-1] Wed Aug 10 22:40:12 2011 @@ -4,8 +4,6 @@ * FILE: lib/ws2_32.h * PURPOSE: WinSock 2.2 Main Header */ - -#pragma once /* Definitions for NDK Usage */ #define WIN32_NO_STATUS @@ -28,6 +26,8 @@ /* Winsock Helper Header */ #include <ws2help.h> +#include <nsp_dns.h> + /* Missing definitions */ #define SO_OPENTYPE 0x7008 #define SO_SYNCHRONOUS_NONALERT 0x20 Modified: trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/src/g… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/src/getxbyxx.c [iso-8859-1] Wed Aug 10 22:40:12 2011 @@ -8,7 +8,6 @@ /* INCLUDES ******************************************************************/ #include "ws2_32.h" -#include <nsp_dns.h> //#define NDEBUG #include <debug.h> Modified: trunk/reactos/dll/win32/ws2_32_new/ws2_32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32_new/ws2_3… ============================================================================== --- trunk/reactos/dll/win32/ws2_32_new/ws2_32.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32_new/ws2_32.rbuild [iso-8859-1] Wed Aug 10 22:40:12 2011 @@ -9,6 +9,9 @@ <library>advapi32</library> <library>dnsapi</library> <library>ws2help</library> + <directory name="inc"> + <pch>ws2_32.h</pch> + </directory> <directory name="src"> <file>addrconv.c</file> <file>addrinfo.c</file> Modified: trunk/reactos/dll/win32/ws2help/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/CMakeLis… ============================================================================== --- trunk/reactos/dll/win32/ws2help/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2help/CMakeLists.txt [iso-8859-1] Wed Aug 10 22:40:12 2011 @@ -12,8 +12,8 @@ ${CMAKE_CURRENT_BINARY_DIR}/ws2help.def) add_library(ws2help SHARED ${SOURCE}) - set_module_type(ws2help win32dll) add_importlibs(ws2help advapi32 ws2_32 msvcrt kernel32 ntdll) +add_pch(ws2help precomp.h) add_cd_file(TARGET ws2help DESTINATION reactos/system32 FOR all) add_importlib_target(ws2help.spec) Modified: trunk/reactos/dll/win32/ws2help/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/precomp.… ============================================================================== --- trunk/reactos/dll/win32/ws2help/precomp.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2help/precomp.h [iso-8859-1] Wed Aug 10 22:40:12 2011 @@ -20,7 +20,7 @@ /* Shared Winsock Helper headers */ #include <ws2help.h> -#include <wshdrv.h> +#include "wshdrv.h" /* Missing definition */ #define SO_OPENTYPE 0x20 Modified: trunk/reactos/dll/win32/ws2help/ws2help.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2help/ws2help.… ============================================================================== --- trunk/reactos/dll/win32/ws2help/ws2help.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2help/ws2help.rbuild [iso-8859-1] Wed Aug 10 22:40:12 2011 @@ -11,4 +11,5 @@ <file>handle.c</file> <file>notify.c</file> <file>ws2help.rc</file> + <pch>precomp.h</pch> </module>

1 0

[tfaber] 53167: [KMTESTS] - Remove breakpoint on buffer overflow - Use a compromise for ok_* macros for SIZE_T and [U]LONG_PTR values
by tfaber＠svn.reactos.org 10 Aug '11

10 Aug '11

Author: tfaber Date: Wed Aug 10 22:26:14 2011 New Revision: 53167 URL: http://svn.reactos.org/svn/reactos?rev=53167&view=rev Log: [KMTESTS] - Remove breakpoint on buffer overflow - Use a compromise for ok_* macros for SIZE_T and [U]LONG_PTR values Modified: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExResource.c branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeSpinLock.c branches/GSoC_2011/KMTestSuite/kmtests/rtl/RtlMemory.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/i… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] Wed Aug 10 22:26:14 2011 @@ -99,10 +99,6 @@ #endif /* defined KMT_USER_MODE */ extern PKMT_RESULTBUFFER ResultBuffer; - -#define MICROSECOND 10 -#define MILLISECOND (1000 * MICROSECOND) -#define SECOND (1000 * MILLISECOND) #ifdef __GNUC__ #define KMT_FORMAT(type, fmt, first) __attribute__((__format__(type, fmt, first))) @@ -141,7 +137,15 @@ #define ok_eq_ulong(value, expected) ok_eq_print(value, expected, "%lu") #define ok_eq_longlong(value, expected) ok_eq_print(value, expected, "%I64d") #define ok_eq_ulonglong(value, expected) ok_eq_print(value, expected, "%I64u") -#define ok_eq_size(value, expected) ok_eq_ulonglong((ULONGLONG)(value), (ULONGLONG)(expected)) +#ifndef _WIN64 +#define ok_eq_size(value, expected) ok_eq_print(value, (SIZE_T)(expected), "%lu") +#define ok_eq_longptr(value, expected) ok_eq_print(value, (LONG_PTR)(expected), "%ld") +#define ok_eq_ulongptr(value, expected) ok_eq_print(value, (ULONG_PTR)(expected), "%lu") +#elif defined _WIN64 +#define ok_eq_size(value, expected) ok_eq_print(value, (SIZE_T)(expected), "%I64u") +#define ok_eq_longptr(value, expected) ok_eq_print(value, (LONG_PTR)(expected), "%I64d") +#define ok_eq_ulongptr(value, expected) ok_eq_print(value, (ULONG_PTR)(expected), "%I64u") +#endif /* defined _WIN64 */ #define ok_eq_hex(value, expected) ok_eq_print(value, expected, "0x%08lx") #define ok_bool_true(value, desc) ok((value) == TRUE, desc " FALSE, expected TRUE\n") #define ok_bool_false(value, desc) ok((value) == FALSE, desc " TRUE, expected FALSE\n") @@ -156,6 +160,10 @@ METHOD_BUFFERED, \ FILE_ANY_ACCESS) +#define MICROSECOND 10 +#define MILLISECOND (1000 * MICROSECOND) +#define SECOND (1000 * MILLISECOND) + #if defined KMT_DEFINE_TEST_FUNCTIONS #if defined KMT_KERNEL_MODE @@ -216,11 +224,7 @@ OldLength = Buffer->LogBufferLength; NewLength = OldLength + Length; if (NewLength > Buffer->LogBufferMaxLength) - { - /* TODO: indicate failure somehow */ - __debugbreak(); return; - } } while (InterlockedCompareExchange(&Buffer->LogBufferLength, NewLength, OldLength) != OldLength); memcpy(&Buffer->LogBuffer[OldLength], String, Length); Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExResource.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExResource.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ex/ExResource.c [iso-8859-1] Wed Aug 10 22:26:14 2011 @@ -44,16 +44,16 @@ ok_eq_uint((Res)->Flag, 0); \ if (!Reinit) ok_eq_pointer((Res)->SharedWaiters, NULL); \ if (!Reinit) ok_eq_pointer((Res)->ExclusiveWaiters, NULL); \ - ok_eq_pointer((PVOID)(Res)->OwnerThreads[0].OwnerThread, NULL); \ + ok_eq_ulongptr((Res)->OwnerThreads[0].OwnerThread, 0); \ ok_eq_ulong((Res)->OwnerThreads[0].TableSize, 0LU); \ - ok_eq_pointer((PVOID)(Res)->OwnerThreads[1].OwnerThread, NULL); \ + ok_eq_ulongptr((Res)->OwnerThreads[1].OwnerThread, 0); \ ok_eq_ulong((Res)->OwnerThreads[1].TableSize, 0LU); \ ok_eq_ulong((Res)->ContentionCount, 0LU); \ ok_eq_uint((Res)->NumberOfSharedWaiters, 0); \ ok_eq_uint((Res)->NumberOfExclusiveWaiters, 0); \ /* ok_eq_pointer((Res)->Reserved2, NULL); */ \ ok_eq_pointer((Res)->Address, NULL); \ - ok_eq_pointer((PVOID)(Res)->SpinLock, NULL); \ + ok_eq_ulongptr((Res)->SpinLock, 0); \ } while (0) #define CheckResourceStatus(Res, Exclusive, Shared, ExclusiveWaiters, SharedWaiters) do \ Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeSpinLock.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeSpinLock.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeSpinLock.c [iso-8859-1] Wed Aug 10 22:26:14 2011 @@ -140,14 +140,14 @@ { \ ok_eq_bool(Ret, (Value) == 0); \ if (SpinLock) \ - ok_eq_pointer((PVOID)*(SpinLock), \ - (Value) ? (PVOID)((ULONG_PTR)Thread | 1) : 0); \ + ok_eq_ulongptr(*(SpinLock), \ + (Value) ? (ULONG_PTR)Thread | 1 : 0); \ } \ else \ { \ ok_bool_true(Ret, "KeTestSpinLock returned"); \ if (SpinLock) \ - ok_eq_pointer((PVOID)*(SpinLock), NULL); \ + ok_eq_ulongptr(*(SpinLock), 0); \ } \ ok_eq_uint((CheckData)->Irql, (CheckData)->OriginalIrql); \ } while (0) @@ -165,7 +165,7 @@ { \ ok_eq_bool(Ret, (Value) == 0); \ if (SpinLock) \ - ok_eq_pointer((PVOID)*(SpinLock), \ + ok_eq_ulongptr(*(SpinLock), \ (Value) ? &(CheckData)->QueueHandle : 0); \ ok_eq_pointer((CheckData)->QueueHandle.LockQueue.Next, NULL); \ ok_eq_pointer((CheckData)->QueueHandle.LockQueue.Lock, \ @@ -175,7 +175,7 @@ { \ ok_bool_true(Ret, "KeTestSpinLock returned"); \ if (SpinLock) \ - ok_eq_pointer((PVOID)*(SpinLock), NULL); \ + ok_eq_ulongptr(*(SpinLock), 0); \ ok_eq_pointer((CheckData)->QueueHandle.LockQueue.Next, (CheckData)->UntouchedValue); \ ok_eq_pointer((CheckData)->QueueHandle.LockQueue.Lock, (CheckData)->UntouchedValue); \ } \ @@ -219,7 +219,7 @@ ok_irql(CheckData->OriginalIrql); if (SpinLock) - ok_eq_pointer((PVOID)*SpinLock, NULL); + ok_eq_ulongptr(*SpinLock, 0); CheckData->Acquire(SpinLock, CheckData); CheckSpinLock(SpinLock, CheckData, 1); CheckData->Release(SpinLock, CheckData); @@ -312,7 +312,7 @@ /* KeInitializeSpinLock */ memset(&SpinLock, 0x55, sizeof SpinLock); KeInitializeSpinLock(&SpinLock); - ok_eq_pointer((PVOID)SpinLock, NULL); + ok_eq_ulongptr(SpinLock, 0); /* KeTestSpinLock */ ok_bool_true(KeTestSpinLock(&SpinLock), "KeTestSpinLock returned"); Modified: branches/GSoC_2011/KMTestSuite/kmtests/rtl/RtlMemory.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/r… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/rtl/RtlMemory.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/rtl/RtlMemory.c [iso-8859-1] Wed Aug 10 22:26:14 2011 @@ -156,11 +156,11 @@ { NTSTATUS Status; UCHAR Buffer[513]; - const INT Size = 512; - const INT HalfSize = Size / 2; + const SIZE_T Size = 512; + const SIZE_T HalfSize = Size / 2; SIZE_T RetSize; KIRQL Irql; - INT i; + ULONG i; KeRaiseIrql(HIGH_LEVEL, &Irql); /* zero everything behind 'Size'. Tests will check that this wasn't changed. @@ -308,7 +308,7 @@ RetSize = RtlCompareMemory(Buffer, Buffer + HalfSize - 7, SIZE_MAX); ok_eq_size(RetSize, HalfSize - 8 + 1); RetSize = RtlCompareMemory(NULL, NULL, 0); - ok_eq_size(RetSize, 0LU); + ok_eq_size(RetSize, 0); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); } _SEH2_END; @@ -318,31 +318,31 @@ /* RtlCompareMemoryUlong */ MakeBuffer(Buffer, 8, 0x55, Size - 4, 0, 0); RetSize = RtlCompareMemoryUlong(Buffer, sizeof(ULONG), 0x55555555LU); - ok_eq_size(RetSize, 4LU); + ok_eq_size(RetSize, 4); RetSize = RtlCompareMemoryUlong(Buffer + 1, sizeof(ULONG), 0x55555555LU); - ok_eq_size(RetSize, 4LU); + ok_eq_size(RetSize, 4); RetSize = RtlCompareMemoryUlong(Buffer + 2, sizeof(ULONG), 0x55555555LU); - ok_eq_size(RetSize, 4LU); + ok_eq_size(RetSize, 4); RetSize = RtlCompareMemoryUlong(Buffer + 3, sizeof(ULONG), 0x55555555LU); - ok_eq_size(RetSize, 4LU); + ok_eq_size(RetSize, 4); RetSize = RtlCompareMemoryUlong(Buffer + 5, sizeof(ULONG), 0x55555555LU); - ok_eq_size(RetSize, 0LU); + ok_eq_size(RetSize, 0); RetSize = RtlCompareMemoryUlong(Buffer + 5, sizeof(ULONG), 0x00555555LU); - ok_eq_size(RetSize, 4LU); + ok_eq_size(RetSize, 4); RetSize = RtlCompareMemoryUlong(Buffer, 1, 0x55555555LU); - ok_eq_size(RetSize, 0LU); + ok_eq_size(RetSize, 0); RetSize = RtlCompareMemoryUlong(Buffer, 2, 0x55555555LU); - ok_eq_size(RetSize, 0LU); + ok_eq_size(RetSize, 0); RetSize = RtlCompareMemoryUlong(Buffer, 3, 0x55555555LU); - ok_eq_size(RetSize, 0LU); + ok_eq_size(RetSize, 0); RetSize = RtlCompareMemoryUlong(Buffer, 5, 0x55555555LU); - ok_eq_size(RetSize, 4LU); + ok_eq_size(RetSize, 4); KeLowerIrql(Irql); Status = STATUS_SUCCESS; _SEH2_TRY { RetSize = RtlCompareMemoryUlong(NULL, 0, 0x55555555LU); - ok_eq_size(RetSize, 0LU); + ok_eq_size(RetSize, 0); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { Status = _SEH2_GetExceptionCode(); } _SEH2_END;

1 0

[cgutman] 53166: [LWIP] - Remove 2 custom definitions to use the default values
by cgutman＠svn.reactos.org 10 Aug '11

10 Aug '11

Author: cgutman Date: Wed Aug 10 18:04:49 2011 New Revision: 53166 URL: http://svn.reactos.org/svn/reactos?rev=53166&view=rev Log: [LWIP] - Remove 2 custom definitions to use the default values Modified: trunk/reactos/lib/drivers/lwip/src/include/lwipopts.h Modified: trunk/reactos/lib/drivers/lwip/src/include/lwipopts.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/include/lwipopts.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/include/lwipopts.h [iso-8859-1] Wed Aug 10 18:04:49 2011 @@ -64,10 +64,6 @@ #define TCP_SND_BUF TCP_WND -#define TCP_SND_QUEUELEN (TCP_SND_BUF / TCP_MSS) - -#define TCP_SNDLOWAT TCP_MSS - #define TCP_MAXRTX 8 #define TCP_SYNMAXRTX 4

1 0

[tkreuzer] 53165: [NTOSKRNL] Fix MSVC build, when KDBG is used
by tkreuzer＠svn.reactos.org 10 Aug '11

10 Aug '11

Author: tkreuzer Date: Wed Aug 10 16:12:45 2011 New Revision: 53165 URL: http://svn.reactos.org/svn/reactos?rev=53165&view=rev Log: [NTOSKRNL] Fix MSVC build, when KDBG is used Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c Modified: trunk/reactos/ntoskrnl/kdbg/kdb_cli.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/kdbg/kdb_cli.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/kdbg/kdb_cli.c [iso-8859-1] Wed Aug 10 16:12:45 2011 @@ -466,17 +466,17 @@ */ static VOID KdbpPrintStructInternal -(PROSSYM_INFO Info, - PCHAR Indent, - BOOLEAN DoRead, - PVOID BaseAddress, +(PROSSYM_INFO Info, + PCHAR Indent, + BOOLEAN DoRead, + PVOID BaseAddress, PROSSYM_AGGREGATE Aggregate) { ULONG i; ULONGLONG Result; PROSSYM_AGGREGATE_MEMBER Member; ULONG IndentLen = strlen(Indent); - ROSSYM_AGGREGATE MemberAggregate = { }; + ROSSYM_AGGREGATE MemberAggregate = {0 }; for (i = 0; i < Aggregate->NumElements; i++) { Member = &Aggregate->Elements[i]; @@ -508,7 +508,7 @@ default: { if (Member->Size < 8) { if (NT_SUCCESS(KdbpSafeReadMemory(&Result, ((PCHAR)BaseAddress) + Member->BaseOffset, Member->Size))) { - int j; + ULONG j; for (j = 0; j < Member->Size; j++) { KdbpPrint(" %02x", (int)(Result & 0xff)); Result >>= 8; @@ -551,24 +551,26 @@ ULONG Argc, PCHAR Argv[]) { - int i; + ULONG i; ULONGLONG Result = 0; PVOID BaseAddress = 0; - ROSSYM_AGGREGATE Aggregate = { }; - UNICODE_STRING ModName = { }; - ANSI_STRING AnsiName = { }; - CHAR Indent[100] = { }; + ROSSYM_AGGREGATE Aggregate = {0}; + UNICODE_STRING ModName = {0}; + ANSI_STRING AnsiName = {0}; + CHAR Indent[100] = {0}; + PROSSYM_INFO Info; + if (Argc < 3) goto end; AnsiName.Length = AnsiName.MaximumLength = strlen(Argv[1]); AnsiName.Buffer = Argv[1]; RtlAnsiStringToUnicodeString(&ModName, &AnsiName, TRUE); - PROSSYM_INFO Info = KdbpSymFindCachedFile(&ModName); + Info = KdbpSymFindCachedFile(&ModName); if (!Info || !RosSymAggregate(Info, Argv[2], &Aggregate)) { DPRINT1("Could not get aggregate\n"); goto end; } - + // Get an argument for location if it was given if (Argc > 3) { ULONG len; @@ -579,7 +581,7 @@ len = strlen(Argv[i]); Argv[i][len] = ' '; } - + /* Evaluate the expression */ DPRINT1("Arg: %s\n", ArgStart); if (KdbpEvaluateExpression(ArgStart, strlen(ArgStart), &Result)) { @@ -1330,7 +1332,7 @@ if (strcmp(Argv[i+1], "IF") == 0) /* IF found */ { ConditionArgIndex = i + 2; - if (ConditionArgIndex >= Argc) + if ((ULONG)ConditionArgIndex >= Argc) { KdbpPrint("%s: IF requires condition expression.\n", Argv[0]); return TRUE; @@ -2605,6 +2607,7 @@ p = p0; for (j = KdbNumberOfRowsTerminal; j--; ) { + int linesCnt; p1 = memrchr(p0, '\n', p-p0); prev_p = p; p = p1; @@ -2615,7 +2618,7 @@ p = p0; break; } - int linesCnt = (KdbNumberOfColsTerminal+prev_p-p-2) / KdbNumberOfColsTerminal; + linesCnt = (KdbNumberOfColsTerminal+prev_p-p-2) / KdbNumberOfColsTerminal; if (linesCnt > 1) j -= linesCnt-1; } @@ -3528,7 +3531,7 @@ KdbpTryGetCharKeyboard(&DummyScanCode, 5); } - /* + /* * Null terminate the output string -- documentation states that * DbgPrompt does not null terminate, but it does */ @@ -3536,7 +3539,7 @@ /* Print a new line */ KdPortPutByteEx(&SerialPortInfo, '\r'); - KdPortPutByteEx(&SerialPortInfo, '\n'); + KdPortPutByteEx(&SerialPortInfo, '\n'); /* Release spinlock */ KiReleaseSpinLock(&KdpSerialSpinLock);

1 0

[tkreuzer] 53164: [ROSSYM_NEW] Add RosSymAggregate and RosSymFreeAggregate stubs for MSVC
by tkreuzer＠svn.reactos.org 10 Aug '11

10 Aug '11

Author: tkreuzer Date: Wed Aug 10 16:11:59 2011 New Revision: 53164 URL: http://svn.reactos.org/svn/reactos?rev=53164&view=rev Log: [ROSSYM_NEW] Add RosSymAggregate and RosSymFreeAggregate stubs for MSVC Modified: trunk/reactos/lib/rossym_new/dummy.c Modified: trunk/reactos/lib/rossym_new/dummy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rossym_new/dummy.c?rev… ============================================================================== --- trunk/reactos/lib/rossym_new/dummy.c [iso-8859-1] (original) +++ trunk/reactos/lib/rossym_new/dummy.c [iso-8859-1] Wed Aug 10 16:11:59 2011 @@ -8,17 +8,20 @@ BOOLEAN RosSymCreateFromFile(PVOID FileContext, PROSSYM_INFO *RosSymInfo) { + UNIMPLEMENTED; return FALSE; } VOID RosSymDelete(PROSSYM_INFO RosSymInfo) { + UNIMPLEMENTED; } VOID RosSymFreeInfo(PROSSYM_LINEINFO LineInfo) { + UNIMPLEMENTED; } BOOLEAN @@ -26,15 +29,32 @@ ULONG_PTR RelativeAddress, PROSSYM_LINEINFO RosSymLineInfo) { + UNIMPLEMENTED; return FALSE; } VOID RosSymInit(PROSSYM_CALLBACKS Callbacks) { + UNIMPLEMENTED; } VOID RosSymInitKernelMode(VOID) { + UNIMPLEMENTED; } + +BOOLEAN +RosSymAggregate(PROSSYM_INFO RosSymInfo, PCHAR Type, PROSSYM_AGGREGATE Aggregate) +{ + UNIMPLEMENTED; + return FALSE; +} + +VOID +RosSymFreeAggregate(PROSSYM_AGGREGATE Aggregate) +{ + UNIMPLEMENTED; +} +

1 0

[tkreuzer] 53163: [RTL] Fix MSVC warning about signed/unsigned mismatch. In this case it was not a bug, because the compiler implicitly casts to unsigned, when signed and unsigned are compared, so ...
by tkreuzer＠svn.reactos.org 10 Aug '11

10 Aug '11

Author: tkreuzer Date: Wed Aug 10 13:52:30 2011 New Revision: 53163 URL: http://svn.reactos.org/svn/reactos?rev=53163&view=rev Log: [RTL] Fix MSVC warning about signed/unsigned mismatch. In this case it was not a bug, because the compiler implicitly casts to unsigned, when signed and unsigned are compared, so (-1 < 0x23U) is false. Modified: trunk/reactos/lib/rtl/error.c Modified: trunk/reactos/lib/rtl/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/error.c?rev=53163&… ============================================================================== --- trunk/reactos/lib/rtl/error.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/error.c [iso-8859-1] Wed Aug 10 13:52:30 2011 @@ -56,8 +56,8 @@ while (table->start) { - if (status < table->start) break; - if (status < table->end) + if ((ULONG)status < table->start) break; + if ((ULONG)status < table->end) { DWORD ret = table->table[status - table->start]; /* unknown entries are 0 */

1 0

[tfaber] 53162: [KMTESTS/KE] - KeEvent: part 3/3
by tfaber＠svn.reactos.org 10 Aug '11

10 Aug '11

Author: tfaber Date: Wed Aug 10 13:49:36 2011 New Revision: 53162 URL: http://svn.reactos.org/svn/reactos?rev=53162&view=rev Log: [KMTESTS/KE] - KeEvent: part 3/3 Modified: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_platform.h branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeEvent.c Modified: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_platform.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/i… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_platform.h [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_platform.h [iso-8859-1] Wed Aug 10 13:49:36 2011 @@ -49,5 +49,6 @@ #include <pseh/pseh2.h> #include <limits.h> +#include <stdarg.h> #endif /* !defined _KMTEST_PLATFORM_H_ */ Modified: branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/i… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/include/kmt_test.h [iso-8859-1] Wed Aug 10 13:49:36 2011 @@ -14,8 +14,6 @@ #define _KMTEST_TEST_H_ #include <kmt_platform.h> - -#include <stdarg.h> typedef VOID KMT_TESTFUNC(VOID); typedef KMT_TESTFUNC *PKMT_TESTFUNC; @@ -101,6 +99,10 @@ #endif /* defined KMT_USER_MODE */ extern PKMT_RESULTBUFFER ResultBuffer; + +#define MICROSECOND 10 +#define MILLISECOND (1000 * MICROSECOND) +#define SECOND (1000 * MILLISECOND) #ifdef __GNUC__ #define KMT_FORMAT(type, fmt, first) __attribute__((__format__(type, fmt, first))) Modified: branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeEvent.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/KMTestSuite/kmtests/n… ============================================================================== --- branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeEvent.c [iso-8859-1] (original) +++ branches/GSoC_2011/KMTestSuite/kmtests/ntos_ke/KeEvent.c [iso-8859-1] Wed Aug 10 13:49:36 2011 @@ -7,18 +7,29 @@ #include <kmt_test.h> -/* TODO: more thread testing, exports vs macros */ - -#define CheckEvent(Event, ExpectedType, State, ExpectedWaitNext, Irql) do \ +/* TODO: why does GCC have 3 tests less than MSVC?! */ + +#define CheckEvent(Event, ExpectedType, State, ExpectedWaitNext, \ + Irql, ThreadList, ThreadCount) do \ { \ + INT TheIndex; \ + PLIST_ENTRY TheEntry; \ + PKTHREAD TheThread; \ ok_eq_uint((Event)->Header.Type, ExpectedType); \ ok_eq_uint((Event)->Header.Hand, sizeof *(Event) / sizeof(ULONG)); \ - ok_eq_long((Event)->Header.Lock & 0xFF00FF00L, 0x55005500L); \ + ok_eq_hex((Event)->Header.Lock & 0xFF00FF00L, 0x55005500L); \ ok_eq_long((Event)->Header.SignalState, State); \ - ok_eq_pointer((Event)->Header.WaitListHead.Flink, \ - &(Event)->Header.WaitListHead); \ - ok_eq_pointer((Event)->Header.WaitListHead.Blink, \ - &(Event)->Header.WaitListHead); \ + TheEntry = (Event)->Header.WaitListHead.Flink; \ + for (TheIndex = 0; TheIndex < (ThreadCount); ++TheIndex) \ + { \ + TheThread = CONTAINING_RECORD(TheEntry, KTHREAD, \ + WaitBlock[0].WaitListEntry); \ + ok_eq_pointer(TheThread, (ThreadList)[TheIndex]); \ + ok_eq_pointer(TheEntry->Flink->Blink, TheEntry); \ + TheEntry = TheEntry->Flink; \ + } \ + ok_eq_pointer(TheEntry, &(Event)->Header.WaitListHead); \ + ok_eq_pointer(TheEntry->Flink->Blink, TheEntry); \ ok_eq_long(KeReadStateEvent(Event), State); \ ok_eq_bool(Thread->WaitNext, ExpectedWaitNext); \ ok_irql(Irql); \ @@ -36,46 +47,49 @@ memset(Event, 0x55, sizeof *Event); KeInitializeEvent(Event, Type, FALSE); - CheckEvent(Event, Type, 0L, FALSE, OriginalIrql); + CheckEvent(Event, Type, 0L, FALSE, OriginalIrql, (PVOID *)NULL, 0); memset(Event, 0x55, sizeof *Event); KeInitializeEvent(Event, Type, TRUE); - CheckEvent(Event, Type, 1L, FALSE, OriginalIrql); + CheckEvent(Event, Type, 1L, FALSE, OriginalIrql, (PVOID *)NULL, 0); Event->Header.SignalState = 0x12345678L; - CheckEvent(Event, Type, 0x12345678L, FALSE, OriginalIrql); + CheckEvent(Event, Type, 0x12345678L, FALSE, OriginalIrql, (PVOID *)NULL, 0); State = KePulseEvent(Event, 0, FALSE); - CheckEvent(Event, Type, 0L, FALSE, OriginalIrql); + CheckEvent(Event, Type, 0L, FALSE, OriginalIrql, (PVOID *)NULL, 0); ok_eq_long(State, 0x12345678L); Event->Header.SignalState = 0x12345678L; KeClearEvent(Event); - CheckEvent(Event, Type, 0L, FALSE, OriginalIrql); + CheckEvent(Event, Type, 0L, FALSE, OriginalIrql, (PVOID *)NULL, 0); State = KeSetEvent(Event, 0, FALSE); - CheckEvent(Event, Type, 1L, FALSE, OriginalIrql); + CheckEvent(Event, Type, 1L, FALSE, OriginalIrql, (PVOID *)NULL, 0); ok_eq_long(State, 0L); State = KeResetEvent(Event); - CheckEvent(Event, Type, 0L, FALSE, OriginalIrql); + CheckEvent(Event, Type, 0L, FALSE, OriginalIrql, (PVOID *)NULL, 0); ok_eq_long(State, 1L); Event->Header.SignalState = 0x23456789L; State = KeSetEvent(Event, 0, FALSE); - CheckEvent(Event, Type, 1L, FALSE, OriginalIrql); + CheckEvent(Event, Type, 1L, FALSE, OriginalIrql, (PVOID *)NULL, 0); ok_eq_long(State, 0x23456789L); Event->Header.SignalState = 0x3456789AL; State = KeResetEvent(Event); - CheckEvent(Event, Type, 0L, FALSE, OriginalIrql); + CheckEvent(Event, Type, 0L, FALSE, OriginalIrql, (PVOID *)NULL, 0); ok_eq_long(State, 0x3456789AL); - if (OriginalIrql <= DISPATCH_LEVEL || !KmtIsCheckedBuild) + /* Irql is raised to DISPATCH_LEVEL here, which kills checked build, + * a spinlock is acquired and never released, which kills MP build */ + if ((OriginalIrql <= DISPATCH_LEVEL || !KmtIsCheckedBuild) && + !KmtIsMultiProcessorBuild) { Event->Header.SignalState = 0x456789ABL; State = KeSetEvent(Event, 0, TRUE); - CheckEvent(Event, Type, 1L, TRUE, DISPATCH_LEVEL); + CheckEvent(Event, Type, 1L, TRUE, DISPATCH_LEVEL, (PVOID *)NULL, 0); ok_eq_long(State, 0x456789ABL); ok_eq_uint(Thread->WaitIrql, OriginalIrql); /* repair the "damage" */ @@ -84,7 +98,7 @@ Event->Header.SignalState = 0x56789ABCL; State = KePulseEvent(Event, 0, TRUE); - CheckEvent(Event, Type, 0L, TRUE, DISPATCH_LEVEL); + CheckEvent(Event, Type, 0L, TRUE, DISPATCH_LEVEL, (PVOID *)NULL, 0); ok_eq_long(State, 0x56789ABCL); ok_eq_uint(Thread->WaitIrql, OriginalIrql); /* repair the "damage" */ @@ -100,8 +114,7 @@ { HANDLE Handle; PKTHREAD Thread; - PKEVENT Event1; - PKEVENT Event2; + PKEVENT Event; volatile BOOLEAN Signal; } THREAD_DATA, *PTHREAD_DATA; @@ -116,69 +129,92 @@ ok_irql(PASSIVE_LEVEL); ThreadData->Signal = TRUE; - Status = KeWaitForSingleObject(ThreadData->Event1, Executive, KernelMode, FALSE, NULL); - ok_irql(PASSIVE_LEVEL); - ok_eq_hex(Status, STATUS_SUCCESS); - ThreadData->Signal = TRUE; - Status = KeWaitForSingleObject(ThreadData->Event2, Executive, KernelMode, FALSE, NULL); - ok_irql(PASSIVE_LEVEL); + Status = KeWaitForSingleObject(ThreadData->Event, Executive, KernelMode, FALSE, NULL); ok_eq_hex(Status, STATUS_SUCCESS); ok_irql(PASSIVE_LEVEL); } +typedef LONG (NTAPI *PSET_EVENT_FUNCTION)(PRKEVENT, KPRIORITY, BOOLEAN); + static VOID -TestEventThreads( +TestEventConcurrent( IN PKEVENT Event, IN EVENT_TYPE Type, - IN KIRQL OriginalIrql) + IN KIRQL OriginalIrql, + PSET_EVENT_FUNCTION SetEvent, + KPRIORITY PriorityIncrement, + LONG ExpectedState, + BOOLEAN SatisfiesAll) { NTSTATUS Status; THREAD_DATA Threads[5]; - LARGE_INTEGER Timeout; + const INT ThreadCount = sizeof Threads / sizeof Threads[0]; KPRIORITY Priority; - KEVENT WaitEvent; - KEVENT TerminateEvent; - int i; - Timeout.QuadPart = -1000 * 10; + LARGE_INTEGER LongTimeout, ShortTimeout; + INT i; + KWAIT_BLOCK WaitBlock[MAXIMUM_WAIT_OBJECTS]; + PVOID ThreadObjects[MAXIMUM_WAIT_OBJECTS]; + LONG State; + PKTHREAD Thread = KeGetCurrentThread(); + + LongTimeout.QuadPart = -100 * MILLISECOND; + ShortTimeout.QuadPart = -1 * MILLISECOND; KeInitializeEvent(Event, Type, FALSE); - KeInitializeEvent(&WaitEvent, NotificationEvent, FALSE); - KeInitializeEvent(&TerminateEvent, SynchronizationEvent, FALSE); - - for (i = 0; i < sizeof Threads / sizeof Threads[0]; ++i) - { - Threads[i].Event1 = Event; - Threads[i].Event2 = &TerminateEvent; + + for (i = 0; i < ThreadCount; ++i) + { + Threads[i].Event = Event; Threads[i].Signal = FALSE; Status = PsCreateSystemThread(&Threads[i].Handle, GENERIC_ALL, NULL, NULL, NULL, WaitForEventThread, &Threads[i]); ok_eq_hex(Status, STATUS_SUCCESS); Status = ObReferenceObjectByHandle(Threads[i].Handle, SYNCHRONIZE, PsThreadType, KernelMode, (PVOID *)&Threads[i].Thread, NULL); ok_eq_hex(Status, STATUS_SUCCESS); + ThreadObjects[i] = Threads[i].Thread; Priority = KeQueryPriorityThread(Threads[i].Thread); ok_eq_long(Priority, 8L); while (!Threads[i].Signal) { - Status = KeWaitForSingleObject(&WaitEvent, Executive, KernelMode, FALSE, &Timeout); - ok_eq_hex(Status, STATUS_TIMEOUT); + Status = KeDelayExecutionThread(KernelMode, FALSE, &ShortTimeout); + ok_eq_hex(Status, STATUS_SUCCESS); } - Threads[i].Signal = FALSE; - } - - for (i = 0; i < sizeof Threads / sizeof Threads[0]; ++i) - { - KeSetEvent(Event, 1, FALSE); - while (!Threads[i].Signal) + CheckEvent(Event, Type, 0L, FALSE, OriginalIrql, ThreadObjects, i + 1); + } + + /* the threads shouldn't wake up on their own */ + Status = KeDelayExecutionThread(KernelMode, FALSE, &ShortTimeout); + ok_eq_hex(Status, STATUS_SUCCESS); + + for (i = 0; i < ThreadCount; ++i) + { + CheckEvent(Event, Type, 0L, FALSE, OriginalIrql, ThreadObjects + i, ThreadCount - i); + State = SetEvent(Event, PriorityIncrement + i, FALSE); + + ok_eq_long(State, 0L); + CheckEvent(Event, Type, ExpectedState, FALSE, OriginalIrql, ThreadObjects + i + 1, SatisfiesAll ? 0 : ThreadCount - i - 1); + Status = KeWaitForMultipleObjects(ThreadCount, ThreadObjects, SatisfiesAll ? WaitAll : WaitAny, Executive, KernelMode, FALSE, &LongTimeout, WaitBlock); + ok_eq_hex(Status, STATUS_WAIT_0 + i); + if (SatisfiesAll) { - Status = KeWaitForSingleObject(&WaitEvent, Executive, KernelMode, FALSE, &Timeout); - ok_eq_hex(Status, STATUS_TIMEOUT); + for (; i < ThreadCount; ++i) + { + Priority = KeQueryPriorityThread(Threads[i].Thread); + ok_eq_long(Priority, max(min(8L + PriorityIncrement, 15L), 8L)); + } + break; } Priority = KeQueryPriorityThread(Threads[i].Thread); - ok_eq_long(Priority, 9L); - KeSetEvent(&TerminateEvent, 0, FALSE); - Status = KeWaitForSingleObject(Threads[i].Thread, Executive, KernelMode, FALSE, NULL); - ok_eq_hex(Status, STATUS_SUCCESS); - + ok_eq_long(Priority, max(min(8L + PriorityIncrement + i, 15L), 8L)); + /* replace the thread with the current thread - which will never signal */ + if (!skip((Status & 0x3F) < ThreadCount, "Index out of bounds")) + ThreadObjects[Status & 0x3F] = Thread; + Status = KeWaitForMultipleObjects(ThreadCount, ThreadObjects, WaitAny, Executive, KernelMode, FALSE, &ShortTimeout, WaitBlock); + ok_eq_hex(Status, STATUS_TIMEOUT); + } + + for (i = 0; i < ThreadCount; ++i) + { ObDereferenceObject(Threads[i].Thread); Status = ZwClose(Threads[i].Handle); ok_eq_hex(Status, STATUS_SUCCESS); @@ -190,17 +226,41 @@ KEVENT Event; KIRQL Irql; KIRQL Irqls[] = { PASSIVE_LEVEL, APC_LEVEL, DISPATCH_LEVEL, HIGH_LEVEL }; - int i; + INT i; + KPRIORITY PriorityIncrement; for (i = 0; i < sizeof Irqls / sizeof Irqls[0]; ++i) { + /* DRIVER_IRQL_NOT_LESS_OR_EQUAL (TODO: on MP only?) */ + if (Irqls[i] > DISPATCH_LEVEL && KmtIsCheckedBuild) + return; KeRaiseIrql(Irqls[i], &Irql); TestEventFunctional(&Event, NotificationEvent, Irqls[i]); TestEventFunctional(&Event, SynchronizationEvent, Irqls[i]); KeLowerIrql(Irql); } - TestEventThreads(&Event, NotificationEvent, PASSIVE_LEVEL); + for (i = 0; i < sizeof Irqls / sizeof Irqls[0]; ++i) + { + /* creating threads above DISPATCH_LEVEL... nope */ + if (Irqls[i] >= DISPATCH_LEVEL && KmtIsCheckedBuild) + continue; + KeRaiseIrql(Irqls[i], &Irql); + trace("IRQL: %u\n", Irqls[i]); + for (PriorityIncrement = -1; PriorityIncrement <= 8; ++PriorityIncrement) + { + trace("PriorityIncrement: %ld\n", PriorityIncrement); + trace("-> Checking KeSetEvent, NotificationEvent\n"); + TestEventConcurrent(&Event, NotificationEvent, Irqls[i], KeSetEvent, PriorityIncrement, 1, TRUE); + trace("-> Checking KeSetEvent, SynchronizationEvent\n"); + TestEventConcurrent(&Event, SynchronizationEvent, Irqls[i], KeSetEvent, PriorityIncrement, 0, FALSE); + trace("-> Checking KePulseEvent, NotificationEvent\n"); + TestEventConcurrent(&Event, NotificationEvent, Irqls[i], KePulseEvent, PriorityIncrement, 0, TRUE); + trace("-> Checking KePulseEvent, SynchronizationEvent\n"); + TestEventConcurrent(&Event, SynchronizationEvent, Irqls[i], KePulseEvent, PriorityIncrement, 0, FALSE); + } + KeLowerIrql(Irql); + } ok_irql(PASSIVE_LEVEL); KmtSetIrql(PASSIVE_LEVEL);

1 0

[osiejka] 53161: - Revert 53150, FAT corruption was not caused by ntdll:exception test;
by osiejka＠svn.reactos.org 10 Aug '11

10 Aug '11

Author: osiejka Date: Wed Aug 10 11:29:41 2011 New Revision: 53161 URL: http://svn.reactos.org/svn/reactos?rev=53161&view=rev Log: - Revert 53150, FAT corruption was not caused by ntdll:exception test; Modified: trunk/rostests/winetests/ntdll/exception.c Modified: trunk/rostests/winetests/ntdll/exception.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/winetests/ntdll/exception… ============================================================================== --- trunk/rostests/winetests/ntdll/exception.c [iso-8859-1] (original) +++ trunk/rostests/winetests/ntdll/exception.c [iso-8859-1] Wed Aug 10 11:29:41 2011 @@ -1392,11 +1392,6 @@ { HMODULE hntdll = GetModuleHandleA("ntdll.dll"); - if(!winetest_interactive) { - skip("ReactOS Bug 6404: ntdll_winetest:exception enters kdbg on the int3 exception test.\n"); - return; - } - code_mem = VirtualAlloc(NULL, 65536, MEM_RESERVE | MEM_COMMIT, PAGE_EXECUTE_READWRITE); if(!code_mem) { trace("VirtualAlloc failed\n");

1 0

[jgardou] 53160: [SETUPAPI] - fix confusion on buffer size between string length and number of bytes. Might fix some infamous heap corruption bug during install. Please test.
by jgardou＠svn.reactos.org 10 Aug '11

10 Aug '11

Author: jgardou Date: Wed Aug 10 01:31:35 2011 New Revision: 53160 URL: http://svn.reactos.org/svn/reactos?rev=53160&view=rev Log: [SETUPAPI] - fix confusion on buffer size between string length and number of bytes. Might fix some infamous heap corruption bug during install. Please test. Modified: trunk/reactos/dll/win32/setupapi/driver.c Modified: trunk/reactos/dll/win32/setupapi/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/driver.… ============================================================================== --- trunk/reactos/dll/win32/setupapi/driver.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/setupapi/driver.c [iso-8859-1] Wed Aug 10 01:31:35 2011 @@ -681,9 +681,9 @@ if (dwType == REG_EXPAND_SZ) { cbData = ExpandEnvironmentStringsW(pvBuf, pvData, - pcbData ? *pcbData : 0); + pcbData ? (*pcbData)/sizeof(WCHAR) : 0); dwType = REG_SZ; - if(pcbData && cbData > *pcbData) + if(pcbData && cbData > ((*pcbData)/sizeof(WCHAR))) ret = ERROR_MORE_DATA; } else if (pcbData) @@ -814,7 +814,7 @@ KEY_QUERY_VALUE); if (hDriverKey == INVALID_HANDLE_VALUE) goto done; - RequiredSize = len - strlenW(InfFileName); + RequiredSize = (len - strlenW(InfFileName)) * sizeof(WCHAR); rc = RegGetValueW( hDriverKey, NULL,

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