Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tfaber] 56733: [KMTESTS] - Centralize frequently used macros
by tfaber＠svn.reactos.org 14 Jun '12

14 Jun '12

Author: tfaber Date: Thu Jun 14 17:48:14 2012 New Revision: 56733 URL: http://svn.reactos.org/svn/reactos?rev=56733&view=rev Log: [KMTESTS] - Centralize frequently used macros Modified: trunk/rostests/kmtests/include/kmt_test.h trunk/rostests/kmtests/ntos_mm/MmSection.c trunk/rostests/kmtests/rtl/RtlException.c trunk/rostests/kmtests/rtl/RtlUnicodeString.c Modified: trunk/rostests/kmtests/include/kmt_test.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/include/kmt_test.… ============================================================================== --- trunk/rostests/kmtests/include/kmt_test.h [iso-8859-1] (original) +++ trunk/rostests/kmtests/include/kmt_test.h [iso-8859-1] Thu Jun 14 17:48:14 2012 @@ -173,6 +173,20 @@ #define MILLISECOND (1000 * MICROSECOND) #define SECOND (1000 * MILLISECOND) +#define KmtInvalidPointer ((PVOID)0x5555555555555555ULL) + +#define KmtStartSeh() \ + ExceptionStatus = STATUS_SUCCESS; \ + _SEH2_TRY \ + { +#define KmtEndSeh(ExpectedStatus) \ + } \ + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) \ + { \ + ExceptionStatus = _SEH2_GetExceptionCode(); \ + } _SEH2_END; \ + ok_eq_hex(ExceptionStatus, ExpectedStatus) + #if defined KMT_DEFINE_TEST_FUNCTIONS #if defined KMT_KERNEL_MODE Modified: trunk/rostests/kmtests/ntos_mm/MmSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_mm/MmSection… ============================================================================== --- trunk/rostests/kmtests/ntos_mm/MmSection.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_mm/MmSection.c [iso-8859-1] Thu Jun 14 17:48:14 2012 @@ -6,9 +6,6 @@ */ #include <kmt_test.h> - -#define StartSeh() ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY { -#define EndSeh(ExpectedStatus) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok_eq_hex(ExceptionStatus, ExpectedStatus) #define CheckObject(Handle, Pointers, Handles) do \ { \ @@ -81,106 +78,105 @@ { NTSTATUS Status = STATUS_SUCCESS; NTSTATUS ExceptionStatus; - const PVOID InvalidPointer = (PVOID)0x5555555555555555ULL; PVOID SectionObject; LARGE_INTEGER MaximumSize; ULONG PointerCount1, PointerCount2; - StartSeh() + KmtStartSeh() Status = MmCreateSection(NULL, 0, NULL, NULL, 0, SEC_RESERVE, NULL, NULL); - EndSeh(STATUS_SUCCESS); + KmtEndSeh(STATUS_SUCCESS); ok_eq_hex(Status, STATUS_INVALID_PAGE_PROTECTION); if (!KmtIsCheckedBuild) { /* PAGE_NOACCESS and missing SEC_RESERVE/SEC_COMMIT/SEC_IMAGE assert */ - StartSeh() + KmtStartSeh() Status = MmCreateSection(NULL, 0, NULL, NULL, PAGE_NOACCESS, SEC_RESERVE, NULL, NULL); - EndSeh(STATUS_ACCESS_VIOLATION); - - StartSeh() + KmtEndSeh(STATUS_ACCESS_VIOLATION); + + KmtStartSeh() Status = MmCreateSection(NULL, 0, NULL, NULL, PAGE_NOACCESS, 0, NULL, NULL); - EndSeh(STATUS_ACCESS_VIOLATION); + KmtEndSeh(STATUS_ACCESS_VIOLATION); } - SectionObject = InvalidPointer; - StartSeh() + SectionObject = KmtInvalidPointer; + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, NULL, 0, SEC_RESERVE, NULL, NULL); - EndSeh(STATUS_SUCCESS); + KmtEndSeh(STATUS_SUCCESS); ok_eq_hex(Status, STATUS_INVALID_PAGE_PROTECTION); - ok_eq_pointer(SectionObject, InvalidPointer); - - if (SectionObject && SectionObject != InvalidPointer) - ObDereferenceObject(SectionObject); - - StartSeh() + ok_eq_pointer(SectionObject, KmtInvalidPointer); + + if (SectionObject && SectionObject != KmtInvalidPointer) + ObDereferenceObject(SectionObject); + + KmtStartSeh() Status = MmCreateSection(NULL, 0, NULL, NULL, PAGE_READONLY, SEC_RESERVE, NULL, NULL); - EndSeh(STATUS_ACCESS_VIOLATION); - - SectionObject = InvalidPointer; - StartSeh() + KmtEndSeh(STATUS_ACCESS_VIOLATION); + + SectionObject = KmtInvalidPointer; + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, NULL, PAGE_READONLY, SEC_RESERVE, NULL, NULL); - EndSeh(STATUS_ACCESS_VIOLATION); - ok_eq_pointer(SectionObject, InvalidPointer); - - if (SectionObject && SectionObject != InvalidPointer) - ObDereferenceObject(SectionObject); - - SectionObject = InvalidPointer; + KmtEndSeh(STATUS_ACCESS_VIOLATION); + ok_eq_pointer(SectionObject, KmtInvalidPointer); + + if (SectionObject && SectionObject != KmtInvalidPointer) + ObDereferenceObject(SectionObject); + + SectionObject = KmtInvalidPointer; MaximumSize.QuadPart = 0; - StartSeh() + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_IMAGE, NULL, NULL); - EndSeh(STATUS_SUCCESS); + KmtEndSeh(STATUS_SUCCESS); ok_eq_hex(Status, STATUS_INVALID_FILE_FOR_SECTION); ok_eq_longlong(MaximumSize.QuadPart, 0LL); - ok_eq_pointer(SectionObject, InvalidPointer); - - if (SectionObject && SectionObject != InvalidPointer) + ok_eq_pointer(SectionObject, KmtInvalidPointer); + + if (SectionObject && SectionObject != KmtInvalidPointer) ObDereferenceObject(SectionObject); MaximumSize.QuadPart = 0; - StartSeh() + KmtStartSeh() Status = MmCreateSection(NULL, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_RESERVE, NULL, NULL); - EndSeh(STATUS_SUCCESS); + KmtEndSeh(STATUS_SUCCESS); ok_eq_hex(Status, STATUS_INVALID_PARAMETER_4); ok_eq_longlong(MaximumSize.QuadPart, 0LL); - if (SectionObject && SectionObject != InvalidPointer) + if (SectionObject && SectionObject != KmtInvalidPointer) ObDereferenceObject(SectionObject); MaximumSize.QuadPart = 1; - StartSeh() + KmtStartSeh() Status = MmCreateSection(NULL, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_RESERVE, NULL, NULL); - EndSeh(STATUS_ACCESS_VIOLATION); + KmtEndSeh(STATUS_ACCESS_VIOLATION); ok_eq_longlong(MaximumSize.QuadPart, 1LL); - if (SectionObject && SectionObject != InvalidPointer) - ObDereferenceObject(SectionObject); - - SectionObject = InvalidPointer; + if (SectionObject && SectionObject != KmtInvalidPointer) + ObDereferenceObject(SectionObject); + + SectionObject = KmtInvalidPointer; MaximumSize.QuadPart = 0; - StartSeh() + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_RESERVE, NULL, NULL); - EndSeh(STATUS_SUCCESS); + KmtEndSeh(STATUS_SUCCESS); ok_eq_hex(Status, STATUS_INVALID_PARAMETER_4); ok_eq_longlong(MaximumSize.QuadPart, 0LL); - ok_eq_pointer(SectionObject, InvalidPointer); - - if (SectionObject && SectionObject != InvalidPointer) + ok_eq_pointer(SectionObject, KmtInvalidPointer); + + if (SectionObject && SectionObject != KmtInvalidPointer) ObDereferenceObject(SectionObject); /* page file section */ - SectionObject = InvalidPointer; + SectionObject = KmtInvalidPointer; MaximumSize.QuadPart = 1; - StartSeh() + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_RESERVE, NULL, NULL); - EndSeh(STATUS_SUCCESS); + KmtEndSeh(STATUS_SUCCESS); ok_eq_hex(Status, STATUS_SUCCESS); ok_eq_longlong(MaximumSize.QuadPart, 1LL); - ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); + ok(SectionObject != KmtInvalidPointer, "Section object pointer untouched\n"); ok(SectionObject != NULL, "Section object pointer NULL\n"); - if (SectionObject && SectionObject != InvalidPointer) + if (SectionObject && SectionObject != KmtInvalidPointer) ObDereferenceObject(SectionObject); if (!skip(FileHandle1 != NULL && FileObject1 != NULL && @@ -190,196 +186,196 @@ PointerCount2 = 3; /* image section */ CheckObject(FileHandle2, PointerCount2, 1L); - SectionObject = InvalidPointer; - MaximumSize.QuadPart = 1; - StartSeh() + SectionObject = KmtInvalidPointer; + MaximumSize.QuadPart = 1; + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_IMAGE, FileHandle2, NULL); - EndSeh(STATUS_SUCCESS); - ok_eq_hex(Status, STATUS_SUCCESS); - ok_eq_longlong(MaximumSize.QuadPart, 1LL); - ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); + KmtEndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok(SectionObject != KmtInvalidPointer, "Section object pointer untouched\n"); ok(SectionObject != NULL, "Section object pointer NULL\n"); CheckObject(FileHandle2, PointerCount2, 1L); CheckSection(SectionObject, SEC_IMAGE); TestMapView(SectionObject, FALSE, TRUE); - if (SectionObject && SectionObject != InvalidPointer) - ObDereferenceObject(SectionObject); - - CheckObject(FileHandle2, PointerCount2, 1L); - SectionObject = InvalidPointer; - MaximumSize.QuadPart = 1; - StartSeh() + if (SectionObject && SectionObject != KmtInvalidPointer) + ObDereferenceObject(SectionObject); + + CheckObject(FileHandle2, PointerCount2, 1L); + SectionObject = KmtInvalidPointer; + MaximumSize.QuadPart = 1; + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_IMAGE, NULL, FileObject2); - EndSeh(STATUS_SUCCESS); - ok_eq_hex(Status, STATUS_SUCCESS); - ok_eq_longlong(MaximumSize.QuadPart, 1LL); - ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); + KmtEndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok(SectionObject != KmtInvalidPointer, "Section object pointer untouched\n"); ok(SectionObject != NULL, "Section object pointer NULL\n"); ++PointerCount2; CheckObject(FileHandle2, PointerCount2, 1L); CheckSection(SectionObject, 0); TestMapView(SectionObject, TRUE, TRUE); - if (SectionObject && SectionObject != InvalidPointer) + if (SectionObject && SectionObject != KmtInvalidPointer) ObDereferenceObject(SectionObject); //--PointerCount2; // ???? CheckObject(FileHandle2, PointerCount2, 1L); - SectionObject = InvalidPointer; - MaximumSize.QuadPart = 1; - StartSeh() + SectionObject = KmtInvalidPointer; + MaximumSize.QuadPart = 1; + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_IMAGE, FileHandle2, FileObject2); - EndSeh(STATUS_SUCCESS); - ok_eq_hex(Status, STATUS_SUCCESS); - ok_eq_longlong(MaximumSize.QuadPart, 1LL); - ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); + KmtEndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok(SectionObject != KmtInvalidPointer, "Section object pointer untouched\n"); ok(SectionObject != NULL, "Section object pointer NULL\n"); CheckObject(FileHandle2, PointerCount2, 1L); CheckSection(SectionObject, 0); TestMapView(SectionObject, TRUE, TRUE); - if (SectionObject && SectionObject != InvalidPointer) + if (SectionObject && SectionObject != KmtInvalidPointer) ObDereferenceObject(SectionObject); /* image section with inappropriate file */ CheckObject(FileHandle1, PointerCount1, 1L); - SectionObject = InvalidPointer; - MaximumSize.QuadPart = 1; - StartSeh() + SectionObject = KmtInvalidPointer; + MaximumSize.QuadPart = 1; + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_IMAGE, FileHandle1, NULL); - EndSeh(STATUS_SUCCESS); + KmtEndSeh(STATUS_SUCCESS); ok_eq_hex(Status, STATUS_INVALID_IMAGE_NOT_MZ); ok_eq_longlong(MaximumSize.QuadPart, 1LL); - ok_eq_pointer(SectionObject, InvalidPointer); - CheckObject(FileHandle1, PointerCount1, 1L); - - if (SectionObject && SectionObject != InvalidPointer) - ObDereferenceObject(SectionObject); - - CheckObject(FileHandle1, PointerCount1, 1L); - SectionObject = InvalidPointer; - MaximumSize.QuadPart = 1; - StartSeh() + ok_eq_pointer(SectionObject, KmtInvalidPointer); + CheckObject(FileHandle1, PointerCount1, 1L); + + if (SectionObject && SectionObject != KmtInvalidPointer) + ObDereferenceObject(SectionObject); + + CheckObject(FileHandle1, PointerCount1, 1L); + SectionObject = KmtInvalidPointer; + MaximumSize.QuadPart = 1; + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_IMAGE, NULL, FileObject1); - EndSeh(STATUS_SUCCESS); - ok_eq_hex(Status, STATUS_SUCCESS); - ok_eq_longlong(MaximumSize.QuadPart, 1LL); - ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); + KmtEndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok(SectionObject != KmtInvalidPointer, "Section object pointer untouched\n"); ok(SectionObject != NULL, "Section object pointer NULL\n"); ++PointerCount1; CheckObject(FileHandle1, PointerCount1, 1L); CheckSection(SectionObject, 0); TestMapView(SectionObject, TRUE, FALSE); - if (SectionObject && SectionObject != InvalidPointer) + if (SectionObject && SectionObject != KmtInvalidPointer) ObDereferenceObject(SectionObject); //--PointerCount1; // ???? CheckObject(FileHandle1, PointerCount1, 1L); - SectionObject = InvalidPointer; - MaximumSize.QuadPart = 1; - StartSeh() + SectionObject = KmtInvalidPointer; + MaximumSize.QuadPart = 1; + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_IMAGE, FileHandle1, FileObject1); - EndSeh(STATUS_SUCCESS); - ok_eq_hex(Status, STATUS_SUCCESS); - ok_eq_longlong(MaximumSize.QuadPart, 1LL); - ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); - ok(SectionObject != NULL, "Section object pointer NULL\n"); - CheckObject(FileHandle1, PointerCount1, 1L); - CheckSection(SectionObject, 0); - TestMapView(SectionObject, TRUE, FALSE); - - if (SectionObject && SectionObject != InvalidPointer) + KmtEndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok(SectionObject != KmtInvalidPointer, "Section object pointer untouched\n"); + ok(SectionObject != NULL, "Section object pointer NULL\n"); + CheckObject(FileHandle1, PointerCount1, 1L); + CheckSection(SectionObject, 0); + TestMapView(SectionObject, TRUE, FALSE); + + if (SectionObject && SectionObject != KmtInvalidPointer) ObDereferenceObject(SectionObject); /* image section with two different files */ CheckObject(FileHandle1, PointerCount1, 1L); - SectionObject = InvalidPointer; - MaximumSize.QuadPart = 1; - StartSeh() + SectionObject = KmtInvalidPointer; + MaximumSize.QuadPart = 1; + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_IMAGE, FileHandle1, FileObject2); - EndSeh(STATUS_SUCCESS); - ok_eq_hex(Status, STATUS_SUCCESS); - ok_eq_longlong(MaximumSize.QuadPart, 1LL); - ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); + KmtEndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok(SectionObject != KmtInvalidPointer, "Section object pointer untouched\n"); ok(SectionObject != NULL, "Section object pointer NULL\n"); CheckObject(FileHandle1, PointerCount1, 1L); CheckObject(FileHandle2, PointerCount2, 1L); CheckSection(SectionObject, 0); TestMapView(SectionObject, TRUE, TRUE); - if (SectionObject && SectionObject != InvalidPointer) - ObDereferenceObject(SectionObject); - - CheckObject(FileHandle1, PointerCount1, 1L); - SectionObject = InvalidPointer; - MaximumSize.QuadPart = 1; - StartSeh() + if (SectionObject && SectionObject != KmtInvalidPointer) + ObDereferenceObject(SectionObject); + + CheckObject(FileHandle1, PointerCount1, 1L); + SectionObject = KmtInvalidPointer; + MaximumSize.QuadPart = 1; + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_IMAGE, FileHandle2, FileObject1); - EndSeh(STATUS_SUCCESS); - ok_eq_hex(Status, STATUS_SUCCESS); - ok_eq_longlong(MaximumSize.QuadPart, 1LL); - ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); - ok(SectionObject != NULL, "Section object pointer NULL\n"); - CheckObject(FileHandle1, PointerCount1, 1L); - CheckObject(FileHandle2, PointerCount2, 1L); - CheckSection(SectionObject, 0); - TestMapView(SectionObject, TRUE, FALSE); - - if (SectionObject && SectionObject != InvalidPointer) + KmtEndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok(SectionObject != KmtInvalidPointer, "Section object pointer untouched\n"); + ok(SectionObject != NULL, "Section object pointer NULL\n"); + CheckObject(FileHandle1, PointerCount1, 1L); + CheckObject(FileHandle2, PointerCount2, 1L); + CheckSection(SectionObject, 0); + TestMapView(SectionObject, TRUE, FALSE); + + if (SectionObject && SectionObject != KmtInvalidPointer) ObDereferenceObject(SectionObject); /* data file section */ CheckObject(FileHandle1, PointerCount1, 1L); - SectionObject = InvalidPointer; - MaximumSize.QuadPart = 1; - StartSeh() + SectionObject = KmtInvalidPointer; + MaximumSize.QuadPart = 1; + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_RESERVE, FileHandle1, NULL); - EndSeh(STATUS_SUCCESS); - ok_eq_hex(Status, STATUS_SUCCESS); - ok_eq_longlong(MaximumSize.QuadPart, 1LL); - ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); - ok(SectionObject != NULL, "Section object pointer NULL\n"); - CheckObject(FileHandle1, PointerCount1, 1L); - CheckSection(SectionObject, 0); - TestMapView(SectionObject, TRUE, FALSE); - - if (SectionObject && SectionObject != InvalidPointer) - ObDereferenceObject(SectionObject); - - CheckObject(FileHandle1, PointerCount1, 1L); - SectionObject = InvalidPointer; - MaximumSize.QuadPart = 1; - StartSeh() + KmtEndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok(SectionObject != KmtInvalidPointer, "Section object pointer untouched\n"); + ok(SectionObject != NULL, "Section object pointer NULL\n"); + CheckObject(FileHandle1, PointerCount1, 1L); + CheckSection(SectionObject, 0); + TestMapView(SectionObject, TRUE, FALSE); + + if (SectionObject && SectionObject != KmtInvalidPointer) + ObDereferenceObject(SectionObject); + + CheckObject(FileHandle1, PointerCount1, 1L); + SectionObject = KmtInvalidPointer; + MaximumSize.QuadPart = 1; + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_RESERVE, NULL, FileObject1); - EndSeh(STATUS_SUCCESS); - ok_eq_hex(Status, STATUS_SUCCESS); - ok_eq_longlong(MaximumSize.QuadPart, 1LL); - ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); - ok(SectionObject != NULL, "Section object pointer NULL\n"); - CheckObject(FileHandle1, PointerCount1, 1L); - CheckSection(SectionObject, 0); - TestMapView(SectionObject, TRUE, FALSE); - - if (SectionObject && SectionObject != InvalidPointer) - ObDereferenceObject(SectionObject); - - CheckObject(FileHandle1, PointerCount1, 1L); - SectionObject = InvalidPointer; - MaximumSize.QuadPart = 1; - StartSeh() + KmtEndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok(SectionObject != KmtInvalidPointer, "Section object pointer untouched\n"); + ok(SectionObject != NULL, "Section object pointer NULL\n"); + CheckObject(FileHandle1, PointerCount1, 1L); + CheckSection(SectionObject, 0); + TestMapView(SectionObject, TRUE, FALSE); + + if (SectionObject && SectionObject != KmtInvalidPointer) + ObDereferenceObject(SectionObject); + + CheckObject(FileHandle1, PointerCount1, 1L); + SectionObject = KmtInvalidPointer; + MaximumSize.QuadPart = 1; + KmtStartSeh() Status = MmCreateSection(&SectionObject, 0, NULL, &MaximumSize, PAGE_READONLY, SEC_RESERVE, FileHandle1, FileObject1); - EndSeh(STATUS_SUCCESS); - ok_eq_hex(Status, STATUS_SUCCESS); - ok_eq_longlong(MaximumSize.QuadPart, 1LL); - ok(SectionObject != InvalidPointer, "Section object pointer untouched\n"); - ok(SectionObject != NULL, "Section object pointer NULL\n"); - CheckObject(FileHandle1, PointerCount1, 1L); - CheckSection(SectionObject, 0); - TestMapView(SectionObject, TRUE, FALSE); - - if (SectionObject && SectionObject != InvalidPointer) + KmtEndSeh(STATUS_SUCCESS); + ok_eq_hex(Status, STATUS_SUCCESS); + ok_eq_longlong(MaximumSize.QuadPart, 1LL); + ok(SectionObject != KmtInvalidPointer, "Section object pointer untouched\n"); + ok(SectionObject != NULL, "Section object pointer NULL\n"); + CheckObject(FileHandle1, PointerCount1, 1L); + CheckSection(SectionObject, 0); + TestMapView(SectionObject, TRUE, FALSE); + + if (SectionObject && SectionObject != KmtInvalidPointer) ObDereferenceObject(SectionObject); CheckObject(FileHandle1, PointerCount1, 1L); Modified: trunk/rostests/kmtests/rtl/RtlException.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/rtl/RtlException.… ============================================================================== --- trunk/rostests/kmtests/rtl/RtlException.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/rtl/RtlException.c [iso-8859-1] Thu Jun 14 17:48:14 2012 @@ -7,9 +7,6 @@ #include <kmt_test.h> -#define StartSeh() ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY { -#define EndSeh(ExpectedStatus) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok_eq_hex(ExceptionStatus, ExpectedStatus) - START_TEST(RtlException) { NTSTATUS ExceptionStatus; @@ -17,38 +14,38 @@ CHAR Value; /* Access a valid pointer - must not trigger SEH */ - StartSeh() + KmtStartSeh() RtlFillMemory(Buffer, sizeof(Buffer), 0x12); - EndSeh(STATUS_SUCCESS); + KmtEndSeh(STATUS_SUCCESS); /* Read from a NULL pointer - must cause an access violation */ - StartSeh() + KmtStartSeh() Value = *(volatile CHAR *)NULL; - EndSeh(STATUS_ACCESS_VIOLATION); + KmtEndSeh(STATUS_ACCESS_VIOLATION); /* Write to a NULL pointer - must cause an access violation */ - StartSeh() + KmtStartSeh() *(volatile CHAR *)NULL = 5; - EndSeh(STATUS_ACCESS_VIOLATION); + KmtEndSeh(STATUS_ACCESS_VIOLATION); /* TODO: Find where MmBadPointer is defined - gives an unresolved external */ #if 0 //def KMT_KERNEL_MODE /* Read from MmBadPointer - must cause an access violation */ - StartSeh() + KmtStartSeh() Value = *(volatile CHAR *)MmBadPointer; - EndSeh(STATUS_ACCESS_VIOLATION); + KmtEndSeh(STATUS_ACCESS_VIOLATION); /* Write to MmBadPointer - must cause an access violation */ - StartSeh() + KmtStartSeh() *(volatile CHAR *)MmBadPointer = 5; - EndSeh(STATUS_ACCESS_VIOLATION); + KmtEndSeh(STATUS_ACCESS_VIOLATION); #endif /* We cannot test this in kernel mode easily - the stack is just "somewhere" * in system space, and there's no guard page below it */ #ifdef KMT_USER_MODE /* Overflow the stack - must cause a special exception */ - StartSeh() + KmtStartSeh() PCHAR Pointer; while (1) @@ -56,6 +53,6 @@ Pointer = _alloca(1024); *Pointer = 5; } - EndSeh(STATUS_STACK_OVERFLOW); + KmtEndSeh(STATUS_STACK_OVERFLOW); #endif } Modified: trunk/rostests/kmtests/rtl/RtlUnicodeString.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/rtl/RtlUnicodeStr… ============================================================================== --- trunk/rostests/kmtests/rtl/RtlUnicodeString.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/rtl/RtlUnicodeString.c [iso-8859-1] Thu Jun 14 17:48:14 2012 @@ -7,9 +7,6 @@ #define KMT_EMULATE_KERNEL #include <kmt_test.h> - -#define StartSeh() ExceptionStatus = STATUS_SUCCESS; _SEH2_TRY { -#define EndSeh(ExpectedStatus) } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { ExceptionStatus = _SEH2_GetExceptionCode(); } _SEH2_END; ok_eq_hex(ExceptionStatus, ExpectedStatus) static VOID @@ -116,32 +113,32 @@ /* NULL for SearchString */ Position = 123; - StartSeh() + KmtStartSeh() Status = RtlFindCharInUnicodeString(0, NULL, &String, &Position); - EndSeh(STATUS_ACCESS_VIOLATION); + KmtEndSeh(STATUS_ACCESS_VIOLATION); ok_eq_uint(Position, 0); /* NULL for SearchString and invalid flags */ Position = 123; - StartSeh() + KmtStartSeh() Status = RtlFindCharInUnicodeString(8, NULL, &String, &Position); - EndSeh(STATUS_SUCCESS); + KmtEndSeh(STATUS_SUCCESS); ok_eq_hex(Status, STATUS_INVALID_PARAMETER); ok_eq_uint(Position, 0); ok_eq_uint(Position, 0); /* NULL for SearchString with zero-length MatchString */ Position = 123; - StartSeh() + KmtStartSeh() Status = RtlFindCharInUnicodeString(0, NULL, &ZeroLengthString, &Position); - EndSeh(STATUS_ACCESS_VIOLATION); + KmtEndSeh(STATUS_ACCESS_VIOLATION); ok_eq_uint(Position, 0); /* NULL for MatchString */ Position = 123; - StartSeh() + KmtStartSeh() Status = RtlFindCharInUnicodeString(0, &String, NULL, &Position); - EndSeh(STATUS_ACCESS_VIOLATION); + KmtEndSeh(STATUS_ACCESS_VIOLATION); ok_eq_uint(Position, 0); /* This crashes in Windows, but not in ROS. I see no reason to add @@ -149,30 +146,30 @@ #if 0 /* NULL for MatchString with zero-length SearchString */ Position = 123; - StartSeh() + KmtStartSeh() Status = RtlFindCharInUnicodeString(0, &ZeroLengthString, NULL, &Position); - EndSeh(STATUS_ACCESS_VIOLATION); + KmtEndSeh(STATUS_ACCESS_VIOLATION); ok_eq_uint(Position, 0); #endif /* NULL for MatchString and invalid flags */ Position = 123; - StartSeh() + KmtStartSeh() Status = RtlFindCharInUnicodeString(8, &String, NULL, &Position); - EndSeh(STATUS_SUCCESS); + KmtEndSeh(STATUS_SUCCESS); ok_eq_hex(Status, STATUS_INVALID_PARAMETER); ok_eq_uint(Position, 0); /* NULL for Position */ - StartSeh() + KmtStartSeh() Status = RtlFindCharInUnicodeString(0, &String, &String, NULL); - EndSeh(STATUS_SUCCESS); + KmtEndSeh(STATUS_SUCCESS); ok_eq_hex(Status, STATUS_INVALID_PARAMETER); /* NULL for all three */ - StartSeh() + KmtStartSeh() Status = RtlFindCharInUnicodeString(0, NULL, NULL, NULL); - EndSeh(STATUS_SUCCESS); + KmtEndSeh(STATUS_SUCCESS); ok_eq_hex(Status, STATUS_INVALID_PARAMETER); #endif }

1 0

[arty] 56732: [NTOSKRNL] Actually remove the matching exclusive lock region when unlocking.
by arty＠svn.reactos.org 14 Jun '12

14 Jun '12

Author: arty Date: Thu Jun 14 16:19:01 2012 New Revision: 56732 URL: http://svn.reactos.org/svn/reactos?rev=56732&view=rev Log: [NTOSKRNL] Actually remove the matching exclusive lock region when unlocking. Modified: trunk/reactos/ntoskrnl/fsrtl/filelock.c Modified: trunk/reactos/ntoskrnl/fsrtl/filelock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/filelock.c?… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/filelock.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/filelock.c [iso-8859-1] Thu Jun 14 16:19:01 2012 @@ -579,8 +579,8 @@ &FileObject->FileName, Conflict->Exclusive.FileLock.StartingByte.HighPart, Conflict->Exclusive.FileLock.StartingByte.LowPart, - Conflict->Exclusive.FileLock.StartingByte.HighPart, - Conflict->Exclusive.FileLock.StartingByte.LowPart, + Conflict->Exclusive.FileLock.EndingByte.HighPart, + Conflict->Exclusive.FileLock.EndingByte.LowPart, Conflict->Exclusive.FileLock.ExclusiveLock); if (!ExclusiveLock) { @@ -824,6 +824,14 @@ DPRINT("Range not locked %wZ\n", &FileObject->FileName); return STATUS_RANGE_NOT_LOCKED; } + + DPRINT("Found lock entry: Exclusive %d %08x%08x:%08x%08x %wZ\n", + Entry->Exclusive.FileLock.ExclusiveLock, + Entry->Exclusive.FileLock.StartingByte.HighPart, + Entry->Exclusive.FileLock.StartingByte.LowPart, + Entry->Exclusive.FileLock.EndingByte.HighPart, + Entry->Exclusive.FileLock.EndingByte.LowPart, + &FileObject->FileName); if (Entry->Exclusive.FileLock.ExclusiveLock) { @@ -837,6 +845,8 @@ return STATUS_RANGE_NOT_LOCKED; } RtlCopyMemory(&Find, Entry, sizeof(Find)); + // Remove the old exclusive lock region + RtlDeleteElementGenericTable(&InternalInfo->RangeTable, Entry); } else { @@ -882,7 +892,12 @@ } if (IsListEmpty(&InternalInfo->SharedLocks)) { - DPRINT("Removing the lock entry %wZ\n", &FileObject->FileName); + DPRINT("Removing the lock entry %wZ (%08x%08x:%08x%08x)\n", + &FileObject->FileName, + Entry->Exclusive.FileLock.StartingByte.HighPart, + Entry->Exclusive.FileLock.StartingByte.LowPart, + Entry->Exclusive.FileLock.EndingByte.HighPart, + Entry->Exclusive.FileLock.EndingByte.LowPart); RtlDeleteElementGenericTable(&InternalInfo->RangeTable, Entry); } else { DPRINT("Lock still has:\n");

1 0

[akhaldi] 56731: [CMAKE/MIDL] * Alter the way we handle the dlldata generation with midl. This works around the warnings we get about multiple rules to generate proxy.dlldata.c. * Brought to yo by ...
by akhaldi＠svn.reactos.org 14 Jun '12

14 Jun '12

Author: akhaldi Date: Thu Jun 14 11:06:23 2012 New Revision: 56731 URL: http://svn.reactos.org/svn/reactos?rev=56731&view=rev Log: [CMAKE/MIDL] * Alter the way we handle the dlldata generation with midl. This works around the warnings we get about multiple rules to generate proxy.dlldata.c. * Brought to yo by Peter Kummel. Modified: trunk/reactos/cmake/midl-support.cmake Modified: trunk/reactos/cmake/midl-support.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/midl-support.cmake?r… ============================================================================== --- trunk/reactos/cmake/midl-support.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/midl-support.cmake [iso-8859-1] Thu Jun 14 11:06:23 2012 @@ -38,16 +38,17 @@ get_includes(_includes) get_defines(_defines) set(_chain_dependency "") + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c PROPERTIES GENERATED TRUE) foreach(_idl_file ${ARGN}) get_filename_component(_name_we ${_idl_file} NAME_WE) add_custom_command( - OUTPUT ${_name_we}_p.c ${_name_we}_p.h proxy.dlldata.c + OUTPUT ${_name_we}_p.c ${_name_we}_p.h COMMAND midl ${_includes} ${_defines} ${IDL_FLAGS} /client none /server none /proxy ${_name_we}_p.c /h ${_name_we}_p.h /dlldata proxy.dlldata.c ${CMAKE_CURRENT_SOURCE_DIR}/${_idl_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_idl_file} ${_chain_dependency}) list(APPEND _chain_dependency ${CMAKE_CURRENT_BINARY_DIR}/${_name_we}_p.c) list(APPEND _chain_dependency ${CMAKE_CURRENT_BINARY_DIR}/${_name_we}_p.h) + set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_idl_file}) endforeach() - set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/proxy.dlldata.c PROPERTIES GENERATED TRUE) endfunction() function(add_rpc_files _type)

1 0

[tfaber] 56730: [KMTESTS] - Return a boolean from ok() - Add KmtGetPoolTag function to allow verifying pool tags used for allocations
by tfaber＠svn.reactos.org 13 Jun '12

13 Jun '12

Author: tfaber Date: Wed Jun 13 21:56:54 2012 New Revision: 56730 URL: http://svn.reactos.org/svn/reactos?rev=56730&view=rev Log: [KMTESTS] - Return a boolean from ok() - Add KmtGetPoolTag function to allow verifying pool tags used for allocations Modified: trunk/rostests/kmtests/include/kmt_test.h trunk/rostests/kmtests/ntos_ex/ExPools.c Modified: trunk/rostests/kmtests/include/kmt_test.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/include/kmt_test.… ============================================================================== --- trunk/rostests/kmtests/include/kmt_test.h [iso-8859-1] (original) +++ trunk/rostests/kmtests/include/kmt_test.h [iso-8859-1] Wed Jun 13 21:56:54 2012 @@ -87,6 +87,7 @@ VOID KmtSetIrql(IN KIRQL NewIrql); BOOLEAN KmtAreInterruptsEnabled(VOID); +ULONG KmtGetPoolTag(PVOID Memory); #elif defined KMT_USER_MODE DWORD KmtRunKernelTest(IN PCSTR TestName); @@ -124,8 +125,8 @@ #define trace_(file, line, ...) KmtTrace( file ":" KMT_STRINGIZE(line), __VA_ARGS__) #define skip_(test, file, line, ...) KmtSkip(test, file ":" KMT_STRINGIZE(line), __VA_ARGS__) -VOID KmtVOk(INT Condition, PCSTR FileAndLine, PCSTR Format, va_list Arguments) KMT_FORMAT(ms_printf, 3, 0); -VOID KmtOk(INT Condition, PCSTR FileAndLine, PCSTR Format, ...) KMT_FORMAT(ms_printf, 3, 4); +BOOLEAN KmtVOk(INT Condition, PCSTR FileAndLine, PCSTR Format, va_list Arguments) KMT_FORMAT(ms_printf, 3, 0); +BOOLEAN KmtOk(INT Condition, PCSTR FileAndLine, PCSTR Format, ...) KMT_FORMAT(ms_printf, 3, 4); VOID KmtVTrace(PCSTR FileAndLine, PCSTR Format, va_list Arguments) KMT_FORMAT(ms_printf, 2, 0); VOID KmtTrace(PCSTR FileAndLine, PCSTR Format, ...) KMT_FORMAT(ms_printf, 2, 3); BOOLEAN KmtVSkip(INT Condition, PCSTR FileAndLine, PCSTR Format, va_list Arguments) KMT_FORMAT(ms_printf, 3, 0); @@ -161,6 +162,7 @@ (expected) ? "TRUE" : "FALSE") #define ok_eq_str(value, expected) ok(!strcmp(value, expected), #value " = \"%s\", expected \"%s\"\n", value, expected) #define ok_eq_wstr(value, expected) ok(!wcscmp(value, expected), #value " = \"%ls\", expected \"%ls\"\n", value, expected) +#define ok_eq_tag(value, expected) ok_eq_print(value, expected, "0x%08lx") #define KMT_MAKE_CODE(ControlCode) CTL_CODE(FILE_DEVICE_UNKNOWN, \ 0xC00 + (ControlCode), \ @@ -222,6 +224,58 @@ return (__readeflags() & (1 << 9)) != 0; } +typedef struct _POOL_HEADER +{ + union + { + struct + { +#ifdef _M_AMD64 + USHORT PreviousSize:8; + USHORT PoolIndex:8; + USHORT BlockSize:8; + USHORT PoolType:8; +#else + USHORT PreviousSize:9; + USHORT PoolIndex:7; + USHORT BlockSize:9; + USHORT PoolType:7; +#endif + }; + ULONG Ulong1; + }; +#ifdef _M_AMD64 + ULONG PoolTag; +#endif + union + { +#ifdef _M_AMD64 + PEPROCESS ProcessBilled; +#else + ULONG PoolTag; +#endif + struct + { + USHORT AllocatorBackTraceIndex; + USHORT PoolTagHash; + }; + }; +} POOL_HEADER, *PPOOL_HEADER; + +ULONG KmtGetPoolTag(PVOID Memory) +{ + PPOOL_HEADER Header; + + /* it's not so easy for allocations of PAGE_SIZE */ + if (((ULONG_PTR)Memory & (PAGE_SIZE - 1)) == 0) + return 'TooL'; + + Header = Memory; + Header--; + + return Header->PoolTag; +} + INT __cdecl KmtVSNPrintF(PSTR Buffer, SIZE_T BufferMaxLength, PCSTR Format, va_list Arguments) KMT_FORMAT(ms_printf, 3, 0); #elif defined KMT_USER_MODE static PKMT_RESULTBUFFER KmtAllocateResultBuffer(SIZE_T ResultBufferSize) @@ -335,13 +389,13 @@ KmtAddToLogBuffer(ResultBuffer, MessageBuffer, MessageLength); } -VOID KmtVOk(INT Condition, PCSTR FileAndLine, PCSTR Format, va_list Arguments) +BOOLEAN KmtVOk(INT Condition, PCSTR FileAndLine, PCSTR Format, va_list Arguments) { CHAR MessageBuffer[512]; SIZE_T MessageLength; if (!ResultBuffer) - return; + return Condition != 0; if (Condition) { @@ -359,14 +413,18 @@ MessageLength = KmtXVSNPrintF(MessageBuffer, sizeof MessageBuffer, FileAndLine, ": Test failed: ", Format, Arguments); KmtAddToLogBuffer(ResultBuffer, MessageBuffer, MessageLength); } -} - -VOID KmtOk(INT Condition, PCSTR FileAndLine, PCSTR Format, ...) -{ + + return Condition != 0; +} + +BOOLEAN KmtOk(INT Condition, PCSTR FileAndLine, PCSTR Format, ...) +{ + BOOLEAN Ret; va_list Arguments; va_start(Arguments, Format); - KmtVOk(Condition, FileAndLine, Format, Arguments); + Ret = KmtVOk(Condition, FileAndLine, Format, Arguments); va_end(Arguments); + return Ret; } VOID KmtVTrace(PCSTR FileAndLine, PCSTR Format, va_list Arguments) Modified: trunk/rostests/kmtests/ntos_ex/ExPools.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ex/ExPools.c… ============================================================================== --- trunk/rostests/kmtests/ntos_ex/ExPools.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ex/ExPools.c [iso-8859-1] Wed Jun 13 21:56:54 2012 @@ -145,8 +145,36 @@ ExFreePoolWithTag(Ptr, TAG_POOLTEST); } +static +VOID +TestPoolTags(VOID) +{ + PVOID Memory; + + Memory = ExAllocatePoolWithTag(PagedPool, 8, 'MyTa'); + ok_eq_tag(KmtGetPoolTag(Memory), 'MyTa'); + ExFreePoolWithTag(Memory, 'MyTa'); + + Memory = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE, 'MyTa'); + ok_eq_tag(KmtGetPoolTag(Memory), 'TooL'); + ExFreePoolWithTag(Memory, 'MyTa'); + + Memory = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE - 3 * sizeof(PVOID), 'MyTa'); + ok_eq_tag(KmtGetPoolTag(Memory), 'TooL'); + ExFreePoolWithTag(Memory, 'MyTa'); + + Memory = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE - 4 * sizeof(PVOID) + 1, 'MyTa'); + ok_eq_tag(KmtGetPoolTag(Memory), 'TooL'); + ExFreePoolWithTag(Memory, 'MyTa'); + + Memory = ExAllocatePoolWithTag(PagedPool, PAGE_SIZE - 4 * sizeof(PVOID), 'MyTa'); + ok_eq_tag(KmtGetPoolTag(Memory), 'MyTa'); + ExFreePoolWithTag(Memory, 'MyTa'); +} + START_TEST(ExPools) { PoolsTest(); PoolsCorruption(); + TestPoolTags(); }

1 0

[akhaldi] 56729: [STDOLE32.TLB] * The previous msvc build fix wasn't proper. Back this out until we figure out a compatible one.
by akhaldi＠svn.reactos.org 13 Jun '12

13 Jun '12

Author: akhaldi Date: Wed Jun 13 10:38:13 2012 New Revision: 56729 URL: http://svn.reactos.org/svn/reactos?rev=56729&view=rev Log: [STDOLE32.TLB] * The previous msvc build fix wasn't proper. Back this out until we figure out a compatible one. Modified: trunk/reactos/dll/win32/CMakeLists.txt trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl Modified: trunk/reactos/dll/win32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/CMakeLists.txt?r… ============================================================================== --- trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/CMakeLists.txt [iso-8859-1] Wed Jun 13 10:38:13 2012 @@ -180,7 +180,9 @@ add_subdirectory(spoolss) add_subdirectory(srclient) add_subdirectory(stdole2.tlb) -add_subdirectory(stdole32.tlb) +if(NOT MSVC) + add_subdirectory(stdole32.tlb) # FIXME: msvc build. +endif() add_subdirectory(sti) add_subdirectory(sxs) add_subdirectory(syssetup) Modified: trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/stdole32.tlb/std… ============================================================================== --- trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl [iso-8859-1] (original) +++ trunk/reactos/dll/win32/stdole32.tlb/std_ole_v1.idl [iso-8859-1] Wed Jun 13 10:38:13 2012 @@ -61,7 +61,6 @@ SCODE scode; } EXCEPINFO; -#ifdef __WIDL__ [ odl, uuid(00000000-0000-0000-C000-000000000046) @@ -136,5 +135,4 @@ HRESULT Clone( [out] IEnumVARIANT **ppenum); } -#endif };

1 0

[arty] 56728: [REGEDIT] Implement silent mode so the winetest can run.
by arty＠svn.reactos.org 13 Jun '12

13 Jun '12

Author: arty Date: Wed Jun 13 01:39:02 2012 New Revision: 56728 URL: http://svn.reactos.org/svn/reactos?rev=56728&view=rev Log: [REGEDIT] Implement silent mode so the winetest can run. Modified: trunk/reactos/base/applications/regedit/regedit.c Modified: trunk/reactos/base/applications/regedit/regedit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… ============================================================================== --- trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] (original) +++ trunk/reactos/base/applications/regedit/regedit.c [iso-8859-1] Wed Jun 13 01:39:02 2012 @@ -132,7 +132,7 @@ (*command_line) += pos; } -BOOL PerformRegAction(REGEDIT_ACTION action, LPWSTR s) +BOOL PerformRegAction(REGEDIT_ACTION action, LPWSTR s, BOOL silent) { TCHAR szTitle[256], szText[256]; switch (action) @@ -166,7 +166,8 @@ LoadString(hInst, IDS_APP_TITLE, szTitle, sizeof(szTitle)); LoadString(hInst, IDS_IMPORTED_OK, szText, sizeof(szTitle)); /* show successful import */ - MessageBox(NULL, szText, szTitle, MB_OK); + if (!silent) + MessageBox(NULL, szText, szTitle, MB_OK); } break; } @@ -239,6 +240,7 @@ BOOL ProcessCmdLine(LPWSTR lpCmdLine) { + BOOL silent = FALSE; REGEDIT_ACTION action = ACTION_UNDEF; LPWSTR s = lpCmdLine; /* command line pointer */ WCHAR ch = *s; /* current character */ @@ -254,7 +256,11 @@ chu = (WCHAR)towupper(ch); if (!ch2 || iswspace(ch2)) { - if (chu == L'S' || chu == L'V') + if (chu == L'S') + { + silent = TRUE; + } + else if (chu == L'V') { /* ignore these switches */ } @@ -321,7 +327,7 @@ LoadString(hInst, IDS_APP_TITLE, szTitle, sizeof(szTitle)); LoadString(hInst, IDS_IMPORT_PROMPT, szText, sizeof(szTitle)); /* request import confirmation */ - if (MessageBox(NULL, szText, szTitle, MB_YESNO) == IDYES) + if (silent || MessageBox(NULL, szText, szTitle, MB_YESNO) == IDYES) { action = ACTION_ADD; } @@ -330,5 +336,5 @@ if (action == ACTION_UNDEF) return FALSE; - return PerformRegAction(action, s); -} + return PerformRegAction(action, s, silent); +}

1 0

[arty] 56727: [NTOSKRNL] When a VAD is truncated using VirtualFree, truncate the corresponding MemoryArea so new allocations will match in both spaces.
by arty＠svn.reactos.org 12 Jun '12

12 Jun '12

Author: arty Date: Tue Jun 12 22:31:54 2012 New Revision: 56727 URL: http://svn.reactos.org/svn/reactos?rev=56727&view=rev Log: [NTOSKRNL] When a VAD is truncated using VirtualFree, truncate the corresponding MemoryArea so new allocations will match in both spaces. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Tue Jun 12 22:31:54 2012 @@ -4214,6 +4214,8 @@ // if ((EndingAddress >> PAGE_SHIFT) == Vad->EndingVpn) { + PMEMORY_AREA MemoryArea; + // // This is pretty easy and similar to case A. We compute the // amount of pages to decommit, update the VAD's commit charge @@ -4226,7 +4228,12 @@ Vad, Process); Vad->u.VadFlags.CommitCharge -= CommitReduction; + // For ReactOS: shrink the corresponding memory area + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, (PVOID)StartingAddress); + ASSERT(Vad->StartingVpn << PAGE_SHIFT == (ULONG_PTR)MemoryArea->StartingAddress); + ASSERT((Vad->EndingVpn + 1) << PAGE_SHIFT == (ULONG_PTR)MemoryArea->EndingAddress); Vad->EndingVpn = ((ULONG_PTR)StartingAddress - 1) >> PAGE_SHIFT; + MemoryArea->EndingAddress = (PVOID)(((Vad->EndingVpn + 1) << PAGE_SHIFT) - 1); } else {

1 0

[jgardou] 56726: [CMAKE] WIN32 subsystem and the kernel deserve their own projects.
by jgardou＠svn.reactos.org 12 Jun '12

12 Jun '12

Author: jgardou Date: Tue Jun 12 22:28:46 2012 New Revision: 56726 URL: http://svn.reactos.org/svn/reactos?rev=56726&view=rev Log: [CMAKE] WIN32 subsystem and the kernel deserve their own projects. Modified: trunk/reactos/ntoskrnl/CMakeLists.txt trunk/reactos/win32ss/CMakeLists.txt Modified: trunk/reactos/ntoskrnl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/CMakeLists.txt?re… ============================================================================== --- trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/CMakeLists.txt [iso-8859-1] Tue Jun 12 22:28:46 2012 @@ -1,3 +1,5 @@ + +PROJECT(NTOS) spec2def(ntoskrnl.exe ntoskrnl.spec ADD_IMPORTLIB) Modified: trunk/reactos/win32ss/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/win32ss/CMakeLists.txt [iso-8859-1] Tue Jun 12 22:28:46 2012 @@ -1,5 +1,8 @@ set(USE_DIBLIB FALSE) + +# Give WIN32 subsystem its own project. +PROJECT(WIN32SS) add_subdirectory(drivers)

1 0

[arty] 56724: [NTOSKRNL] Withdraw a wait entry before mapping a page.
by arty＠svn.reactos.org 12 Jun '12

12 Jun '12

Author: arty Date: Tue Jun 12 20:41:13 2012 New Revision: 56724 URL: http://svn.reactos.org/svn/reactos?rev=56724&view=rev Log: [NTOSKRNL] Withdraw a wait entry before mapping a page. Modified: trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Tue Jun 12 20:41:13 2012 @@ -1283,6 +1283,8 @@ if (HasSwapEntry) { + SWAPENTRY DummyEntry; + /* * Is it a wait entry? */ @@ -1331,6 +1333,7 @@ KeBugCheck(MEMORY_MANAGEMENT); } MmLockAddressSpace(AddressSpace); + MmDeletePageFileMapping(Process, PAddress, &DummyEntry); Status = MmCreateVirtualMapping(Process, PAddress, Region->Protect,

1 0

[jgardou] 56723: [NTGDI] - fix potential NULL access. CID 702353
by jgardou＠svn.reactos.org 12 Jun '12

12 Jun '12

Author: jgardou Date: Tue Jun 12 19:21:55 2012 New Revision: 56723 URL: http://svn.reactos.org/svn/reactos?rev=56723&view=rev Log: [NTGDI] - fix potential NULL access. CID 702353 Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.c Modified: trunk/reactos/win32ss/gdi/ntgdi/palette.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/gdi/ntgdi/palette.… ============================================================================== --- trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/gdi/ntgdi/palette.c [iso-8859-1] Tue Jun 12 19:21:55 2012 @@ -1016,10 +1016,10 @@ psurf = pdc->dclevel.pSurface; /* Check if we have the default surface */ - if ((psurf == NULL) && !bSet) + if (psurf == NULL) { /* Use a mono palette */ - ppal = gppalMono; + if(!bSet) ppal = gppalMono; } else if (psurf->SurfObj.iType == STYPE_BITMAP) {

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