Ros-diffs May 2014

ros-diffs@reactos.org

14 participants
437 discussions

[hbelusca] 63303: [NTVDM]: Code formatting and DPRINT fix.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Thu May 15 01:13:44 2014 New Revision: 63303 URL: http://svn.reactos.org/svn/reactos?rev=63303&view=rev Log: [NTVDM]: Code formatting and DPRINT fix. Modified: trunk/reactos/subsystems/ntvdm/bios/vidbios.c trunk/reactos/subsystems/ntvdm/callback.c Modified: trunk/reactos/subsystems/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/vidb… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/vidbios.c [iso-8859-1] Thu May 15 01:13:44 2014 @@ -1494,7 +1494,7 @@ /* Alternate Function Select */ case 0x12: { - DPRINT1("BIOS Function INT 12h (Alternate Function Select), BX = 0x%04X NOT IMPLEMENTED\n", + DPRINT1("BIOS Function INT 10h, AH = 12h (Alternate Function Select), BX = 0x%04X NOT IMPLEMENTED\n", getBX()); break; } Modified: trunk/reactos/subsystems/ntvdm/callback.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/callback.… ============================================================================== --- trunk/reactos/subsystems/ntvdm/callback.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/callback.c [iso-8859-1] Thu May 15 01:13:44 2014 @@ -27,10 +27,8 @@ /* BOP Identifiers */ #define BOP_CONTROL 0xFF // Control BOP Handler #define BOP_CONTROL_DEFFUNC 0x00 // Default Control BOP Function - -/* 32-bit Interrupt dispatcher function code for the Control BOP Handler */ -#define BOP_CONTROL_INT32 0xFF - + #define BOP_CONTROL_INT32 0xFF // 32-bit Interrupt dispatcher + // function code for the Control BOP Handler #define BOP(num) LOBYTE(EMULATOR_BOP), HIBYTE(EMULATOR_BOP), (num) #define UnSimulate16(trap) \ @@ -89,7 +87,7 @@ Context->TrampolineFarPtr = MAKELONG(Offset, Segment); Context->Segment = Segment; Context->NextOffset = Offset + max(CALL16_TRAMPOLINE_SIZE, - INT16_TRAMPOLINE_SIZE); + INT16_TRAMPOLINE_SIZE); } VOID @@ -280,11 +278,17 @@ BYTE FuncNum = *(PBYTE)SEG_OFF_TO_PTR(getCS(), getIP()); setIP(getIP() + 1); - if (FuncNum == BOP_CONTROL_INT32) - Int32Dispatch(Stack); - else - // DPRINT1("Unassigned Control BOP Function: 0x%02X\n", FuncNum); - DisplayMessage(L"Unassigned Control BOP Function: 0x%02X\n", FuncNum); + switch (FuncNum) + { + case BOP_CONTROL_INT32: + Int32Dispatch(Stack); + break; + + default: + // DPRINT1("Unassigned Control BOP Function: 0x%02X\n", FuncNum); + DisplayMessage(L"Unassigned Control BOP Function: 0x%02X", FuncNum); + break; + } } VOID InitializeCallbacks(VOID)

10 years, 7 months

[aandrejevic] 63302: [NTVDM] Don't calculate NextElement twice. Properly initialize the keyboard buffer head and tail.

by aandrejevic＠svn.reactos.org

Author: aandrejevic Date: Wed May 14 20:56:21 2014 New Revision: 63302 URL: http://svn.reactos.org/svn/reactos?rev=63302&view=rev Log: [NTVDM] Don't calculate NextElement twice. Properly initialize the keyboard buffer head and tail. Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] Wed May 14 20:56:21 2014 @@ -39,14 +39,7 @@ /* Put the value in the queue */ *((LPWORD)((ULONG_PTR)Bda + Bda->KeybdBufferTail)) = Data; - Bda->KeybdBufferTail += sizeof(WORD); - - /* Check if we are at, or have passed, the end of the buffer */ - if (Bda->KeybdBufferTail >= Bda->KeybdBufferEnd) - { - /* Return it to the beginning */ - Bda->KeybdBufferTail = Bda->KeybdBufferStart; - } + Bda->KeybdBufferTail = NextElement; /* Return success */ return TRUE; @@ -271,7 +264,7 @@ /* Initialize the BDA */ Bda->KeybdBufferStart = FIELD_OFFSET(BIOS_DATA_AREA, KeybdBuffer); Bda->KeybdBufferEnd = Bda->KeybdBufferStart + BIOS_KBD_BUFFER_SIZE * sizeof(WORD); - Bda->KeybdBufferHead = Bda->KeybdBufferTail = 0; + Bda->KeybdBufferHead = Bda->KeybdBufferTail = Bda->KeybdBufferStart; // FIXME: Fill the keyboard buffer with invalid values, for diagnostic purposes... RtlFillMemory(((LPVOID)((ULONG_PTR)Bda + Bda->KeybdBufferStart)), BIOS_KBD_BUFFER_SIZE * sizeof(WORD), 'A');

10 years, 7 months

[tkreuzer] 63301: [NTDLL_APITEST] Revert unwanted changes

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed May 14 20:46:47 2014 New Revision: 63301 URL: http://svn.reactos.org/svn/reactos?rev=63301&view=rev Log: [NTDLL_APITEST] Revert unwanted changes Modified: trunk/rostests/apitests/ntdll/NtMapViewOfSection.c Modified: trunk/rostests/apitests/ntdll/NtMapViewOfSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtMapViewO… ============================================================================== --- trunk/rostests/apitests/ntdll/NtMapViewOfSection.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtMapViewOfSection.c [iso-8859-1] Wed May 14 20:46:47 2014 @@ -3,13 +3,6 @@ #define WIN32_NO_STATUS #include <ndk/ntndk.h> - -BOOL WINAPI SetInformationJobObject( - _In_ HANDLE hJob, - _In_ JOBOBJECTINFOCLASS JobObjectInfoClass, - _In_ LPVOID lpJobObjectInfo, - _In_ DWORD cbJobObjectInfoLength -); NTSYSAPI NTSTATUS @@ -32,12 +25,10 @@ NTSTATUS Status; HANDLE SectionHandle; LARGE_INTEGER MaximumSize, SectionOffset; - PVOID BaseAddress, BaseAddress2; + PVOID BaseAddress; SIZE_T ViewSize; - //ULONG OldProtect; - QUOTA_LIMITS QuotaLimits; - - /* Create a page file backed section with SEC_COMMIT */ + + /* Create a page file backed section */ MaximumSize.QuadPart = 0x20000; Status = NtCreateSection(&SectionHandle, SECTION_ALL_ACCESS, @@ -46,7 +37,7 @@ PAGE_READWRITE, SEC_COMMIT, NULL); - ok_ntstatus(Status, STATUS_SUCCESS); + ok(NT_SUCCESS(Status), "NtCreateSection failed with Status %lx\n", Status); if (!NT_SUCCESS(Status)) return; @@ -64,7 +55,8 @@ ViewShare, 0, PAGE_READWRITE); - ok_ntstatus(Status, STATUS_MAPPED_ALIGNMENT); + ok(Status == STATUS_MAPPED_ALIGNMENT, + "NtMapViewOfSection returned wrong Status %lx\n", Status); /* Try to map a page with execute rights */ BaseAddress = (PVOID)0x30000000; @@ -80,9 +72,10 @@ ViewShare, 0, PAGE_EXECUTE_READWRITE); - ok_ntstatus(Status, STATUS_SECTION_PROTECTION); - - /* Try to map 2 pages with MEM_COMMIT */ + ok(Status == STATUS_SECTION_PROTECTION, + "NtMapViewOfSection returned wrong Status %lx\n", Status); + + /* Map 2 pages, not comitting them */ BaseAddress = (PVOID)0x30000000; SectionOffset.QuadPart = 0; ViewSize = 0x2000; @@ -90,40 +83,15 @@ NtCurrentProcess(), &BaseAddress, 0, - PAGE_SIZE, + 0, &SectionOffset, &ViewSize, ViewShare, - MEM_COMMIT, + 0, PAGE_READWRITE); - ok_ntstatus(Status, STATUS_INVALID_PARAMETER_9); - - /* Map 2 pages, without MEM_COMMIT */ - BaseAddress = (PVOID)0x30000000; - SectionOffset.QuadPart = 0; - ViewSize = 0x2000; - Status = NtMapViewOfSection(SectionHandle, - NtCurrentProcess(), - &BaseAddress, - 0, - 0, - &SectionOffset, - &ViewSize, - ViewShare, - 0, - PAGE_READWRITE); - ok_ntstatus(Status, STATUS_SUCCESS); - - /* We must be able to access the memory */ - _SEH2_TRY - { - *(PULONG)BaseAddress = 1; - } - _SEH2_EXCEPT(1) - { - ok(FALSE, "Got an exception\n"); - } - _SEH2_END; + ok(NT_SUCCESS(Status), "NtMapViewOfSection failed with Status %lx\n", Status); + if (!NT_SUCCESS(Status)) + return; /* Commit a page in the section */ BaseAddress = (PVOID)0x30000000; @@ -134,15 +102,12 @@ &ViewSize, MEM_COMMIT, PAGE_READWRITE); - ok_ntstatus(Status, STATUS_SUCCESS); - - /* Try to decommit a page in the section */ + ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed with Status %lx\n", Status); Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &ViewSize, MEM_DECOMMIT); - ok_ntstatus(Status, STATUS_UNABLE_TO_DELETE_SECTION); - + ok(Status == STATUS_UNABLE_TO_DELETE_SECTION, "NtFreeVirtualMemory returned wrong Status %lx\n", Status); /* Try to commit a range larger than the section */ BaseAddress = (PVOID)0x30000000; ViewSize = 0x3000; @@ -152,7 +117,8 @@ &ViewSize, MEM_COMMIT, PAGE_READWRITE); - ok_ntstatus(Status, STATUS_CONFLICTING_ADDRESSES); + ok(Status == STATUS_CONFLICTING_ADDRESSES, + "NtAllocateVirtualMemory failed with wrong Status %lx\n", Status); /* Try to commit a page after the section */ BaseAddress = (PVOID)0x30002000; @@ -163,7 +129,7 @@ &ViewSize, MEM_COMMIT, PAGE_READWRITE); - ok_ntstatus(Status, STATUS_CONFLICTING_ADDRESSES); + ok(!NT_SUCCESS(Status), "NtAllocateVirtualMemory Should fail\n"); /* Try to allocate a page after the section */ BaseAddress = (PVOID)0x30002000; @@ -174,7 +140,7 @@ &ViewSize, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); - ok_ntstatus(Status, STATUS_CONFLICTING_ADDRESSES); + ok(!NT_SUCCESS(Status), "NtAllocateVirtualMemory should fail\n"); /* Need to go to next 64k boundary */ BaseAddress = (PVOID)0x30010000; @@ -185,7 +151,7 @@ &ViewSize, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); - ok_ntstatus(Status, STATUS_SUCCESS); + ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed with Status %lx\n", Status); if (!NT_SUCCESS(Status)) return; @@ -198,14 +164,15 @@ MEM_RELEASE); ok(NT_SUCCESS(Status), "NtFreeVirtualMemory failed with Status %lx\n", Status); - /* Try to release the section mapping with NtFreeVirtualMemory */ + /* Free the section mapping */ BaseAddress = (PVOID)0x30000000; ViewSize = 0x1000; Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &ViewSize, MEM_RELEASE); - ok_ntstatus(Status, STATUS_UNABLE_TO_DELETE_SECTION); + ok(Status == STATUS_UNABLE_TO_DELETE_SECTION, + "NtFreeVirtualMemory failed with wrong Status %lx\n", Status); /* Commit a page in the section */ BaseAddress = (PVOID)0x30001000; @@ -216,7 +183,7 @@ &ViewSize, MEM_COMMIT, PAGE_READWRITE); - ok_ntstatus(Status, STATUS_SUCCESS); + ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed with Status %lx\n", Status); /* Try to decommit the page */ BaseAddress = (PVOID)0x30001000; @@ -225,7 +192,8 @@ &BaseAddress, &ViewSize, MEM_DECOMMIT); - ok_ntstatus(Status, STATUS_UNABLE_TO_DELETE_SECTION); + ok(Status == STATUS_UNABLE_TO_DELETE_SECTION, + "NtFreeVirtualMemory failed with wrong Status %lx\n", Status); BaseAddress = UlongToPtr(0x40000000); SectionOffset.QuadPart = 0; @@ -240,7 +208,7 @@ ViewShare, 0, PAGE_READWRITE); - ok_ntstatus(Status, STATUS_SUCCESS); + ok(NT_SUCCESS(Status), "NtMapViewOfSection failed with Status %lx\n", Status); if (!NT_SUCCESS(Status)) return; @@ -259,7 +227,9 @@ ViewShare, 0, PAGE_READWRITE); - ok_ntstatus(Status, STATUS_SUCCESS); + ok(NT_SUCCESS(Status), "NtMapViewOfSection failed with Status %lx\n", Status); + if (!NT_SUCCESS(Status)) + return; ok(BaseAddress == (PVOID)0x40080000, "Invalid BaseAddress: %p", BaseAddress); @@ -271,273 +241,9 @@ &ViewSize, MEM_COMMIT, PAGE_READWRITE); - ok_ntstatus(Status, STATUS_SUCCESS); - - /* Close the mapping */ - NtUnmapViewOfSection(NtCurrentProcess(), BaseAddress); - NtClose(SectionHandle); - - /* Create a page file backed section, but only reserved */ - MaximumSize.QuadPart = 0x20000; - Status = NtCreateSection(&SectionHandle, - SECTION_ALL_ACCESS, - NULL, - &MaximumSize, - PAGE_READWRITE, - SEC_RESERVE, - NULL); - ok_ntstatus(Status, STATUS_SUCCESS); - - /* Try to map 1 page, passing MEM_RESERVE */ - BaseAddress = NULL; - SectionOffset.QuadPart = 0; - ViewSize = PAGE_SIZE; - Status = NtMapViewOfSection(SectionHandle, - NtCurrentProcess(), - &BaseAddress, - 0, - PAGE_SIZE, - &SectionOffset, - &ViewSize, - ViewShare, - MEM_RESERVE, - PAGE_READWRITE); - ok_ntstatus(Status, STATUS_INVALID_PARAMETER_9); - - /* Try to map 1 page using MEM_COMMIT */ - BaseAddress = NULL; - SectionOffset.QuadPart = 0; - ViewSize = PAGE_SIZE; - Status = NtMapViewOfSection(SectionHandle, - NtCurrentProcess(), - &BaseAddress, - 0, - PAGE_SIZE, - &SectionOffset, - &ViewSize, - ViewShare, - MEM_COMMIT, - PAGE_READWRITE); - ok_ntstatus(Status, STATUS_INVALID_PARAMETER_9); - - /* Map 2 pages, but commit 1 */ - BaseAddress = NULL; - SectionOffset.QuadPart = 0; - ViewSize = 2 * PAGE_SIZE; - Status = NtMapViewOfSection(SectionHandle, - NtCurrentProcess(), - &BaseAddress, - 0, - PAGE_SIZE, - &SectionOffset, - &ViewSize, - ViewShare, - 0, - PAGE_READWRITE); - ok_ntstatus(Status, STATUS_SUCCESS); - - /* We must be able to access the 1st page */ - Status = STATUS_SUCCESS; - _SEH2_TRY - { - *(PUCHAR)BaseAddress = 1; - } - _SEH2_EXCEPT(1) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - ok_ntstatus(Status, STATUS_SUCCESS); - - /* We must not be able to access the 2nd page */ - Status = STATUS_SUCCESS; - _SEH2_TRY - { - *((PUCHAR)BaseAddress + PAGE_SIZE) = 1; - } - _SEH2_EXCEPT(1) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - ok_ntstatus(Status, STATUS_ACCESS_VIOLATION); - - /* Map the 2 pages again into a different memory location */ - BaseAddress2 = NULL; - Status = NtMapViewOfSection(SectionHandle, - NtCurrentProcess(), - &BaseAddress2, - 0, - 0, - &SectionOffset, - &ViewSize, - ViewShare, - 0, - PAGE_READWRITE); - ok_ntstatus(Status, STATUS_SUCCESS); - - /* Commit a the 2nd page in the 2nd memory location */ - BaseAddress2 = (PUCHAR)BaseAddress2 + PAGE_SIZE; - ViewSize = PAGE_SIZE; - Status = NtAllocateVirtualMemory(NtCurrentProcess(), - &BaseAddress2, - 0, - &ViewSize, - MEM_COMMIT, - PAGE_READONLY); - ok_ntstatus(Status, STATUS_SUCCESS); - - /* Try to commit again (the already committed page) */ - Status = NtAllocateVirtualMemory(NtCurrentProcess(), - &BaseAddress2, - 0, - &ViewSize, - MEM_COMMIT, - PAGE_READONLY); - ok_ntstatus(Status, STATUS_SUCCESS); - - /* We must be able to access the memory in the 2nd page of the 1st memory location */ - Status = STATUS_SUCCESS; - _SEH2_TRY - { - *((PUCHAR)BaseAddress + PAGE_SIZE) = 2; - } - _SEH2_EXCEPT(1) - { - Status = _SEH2_GetExceptionCode(); - } - _SEH2_END; - ok_ntstatus(Status, STATUS_SUCCESS); - - ok(*(PULONG)BaseAddress2 == 2, "Value in memory was wrong"); - - /* Close the mapping */ - NtUnmapViewOfSection(NtCurrentProcess(), BaseAddress); - NtUnmapViewOfSection(NtCurrentProcess(), (PUCHAR)BaseAddress2 - PAGE_SIZE); - NtClose(SectionHandle); - -#if 0 - { - HANDLE Job; - JOBOBJECT_EXTENDED_LIMIT_INFORMATION JobLimitInformation; - - Job = CreateJobObject(NULL, NULL); - ok_ntstatus(Status, STATUS_SUCCESS); - - ok(AssignProcessToJobObject(Job, NtCurrentProcess()), ""); - - RtlZeroMemory(&JobLimitInformation, sizeof(JobLimitInformation)); - JobLimitInformation.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_JOB_MEMORY; - JobLimitInformation.JobMemoryLimit = 100 * 1024; - JobLimitInformation.PeakProcessMemoryUsed = JobLimitInformation.JobMemoryLimit; - JobLimitInformation.PeakJobMemoryUsed = JobLimitInformation.JobMemoryLimit; - - ok(SetInformationJobObject(Job, - JobObjectExtendedLimitInformation, - &JobLimitInformation, - sizeof(JobLimitInformation)), ""); - } -#endif - - QuotaLimits.PagedPoolLimit = 0; - QuotaLimits.NonPagedPoolLimit = 0; - QuotaLimits.TimeLimit.QuadPart = 0; - QuotaLimits.PagefileLimit = 0; - QuotaLimits.MinimumWorkingSetSize = 90000; - QuotaLimits.MaximumWorkingSetSize = 90000; - Status = NtSetInformationProcess(NtCurrentProcess(), - ProcessQuotaLimits, - &QuotaLimits, - sizeof(QuotaLimits)); - ok_ntstatus(Status, STATUS_SUCCESS); - - QuotaLimits.MinimumWorkingSetSize = 0; - QuotaLimits.MaximumWorkingSetSize = 0; - QuotaLimits.PagefileLimit = 1; - Status = NtSetInformationProcess(NtCurrentProcess(), - ProcessQuotaLimits, - &QuotaLimits, - sizeof(QuotaLimits)); - ok_ntstatus(Status, STATUS_SUCCESS); - - /* Try to create a huge page file backed section */ - MaximumSize.QuadPart = 0x800000000; - Status = NtCreateSection(&SectionHandle, - SECTION_ALL_ACCESS, - NULL, - &MaximumSize, - PAGE_READWRITE, - SEC_COMMIT, - NULL); - ok_ntstatus(Status, STATUS_COMMITMENT_LIMIT); - - /* Try to create a huge page file backed section with PAGE_NOACCESS protection */ - MaximumSize.QuadPart = 0x8000000000; - Status = NtCreateSection(&SectionHandle, - SECTION_ALL_ACCESS, - NULL, - &MaximumSize, - PAGE_NOACCESS, - SEC_COMMIT, - NULL); - ok_ntstatus(Status, STATUS_INVALID_PAGE_PROTECTION); - - /* Create a huge page file backed section, but only reserved */ - MaximumSize.QuadPart = 0x8000000000; - Status = NtCreateSection(&SectionHandle, - SECTION_ALL_ACCESS, - NULL, - &MaximumSize, - PAGE_READWRITE, - SEC_RESERVE, - NULL); - ok_ntstatus(Status, STATUS_SUCCESS); - - /* Pass a too large region size */ - BaseAddress = NULL; - SectionOffset.QuadPart = 0; - ViewSize = 0x80000000; - Status = NtMapViewOfSection(SectionHandle, - NtCurrentProcess(), - &BaseAddress, - 0, - 0, - &SectionOffset, - &ViewSize, - ViewShare, - 0, - PAGE_READWRITE); - ok_ntstatus(Status, STATUS_INVALID_PARAMETER_4); - - /* Map with PAGE_NOACCESS */ - BaseAddress = NULL; - SectionOffset.QuadPart = 0; - ViewSize = 0x20000000; - Status = NtMapViewOfSection(SectionHandle, - NtCurrentProcess(), - &BaseAddress, - 0, - 0, - &SectionOffset, - &ViewSize, - ViewShare, - 0, - PAGE_NOACCESS); - ok_ntstatus(Status, STATUS_SUCCESS); - - /* Update protection to PAGE_READWRITE */ - ViewSize = 0x20000000; - Status = NtAllocateVirtualMemory(NtCurrentProcess(), &BaseAddress, 0, &ViewSize, MEM_COMMIT, PAGE_READWRITE); - ok_ntstatus(Status, STATUS_SUCCESS); - - //Status = NtProtectVirtualMemory(NtCurrentProcess(), &BaseAddress, &ViewSize, PAGE_READWRITE, &OldProtect); - //ok_ntstatus(Status, STATUS_SUCCESS); - //ok(OldProtect == PAGE_NOACCESS, "Wrong protection returned: %u\n", OldProtect); - - /* Update protection to PAGE_READWRITE (1 page) */ - ViewSize = 0x1000; - Status = NtAllocateVirtualMemory(NtCurrentProcess(), &BaseAddress, 0, &ViewSize, MEM_COMMIT, PAGE_READWRITE); - ok_ntstatus(Status, STATUS_SUCCESS); + ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed with Status %lx\n", Status); + if (!NT_SUCCESS(Status)) + return; } @@ -585,7 +291,7 @@ FileHandle); ok(Status == STATUS_SUCCESS, "NtCreateSection failed, Status 0x%lx\n", Status); - /* Map the data section as flat mapping */ + /* Map the data section */ DataBase = NULL; ViewSize = 0; Status = NtMapViewOfSection(DataSectionHandle, @@ -645,12 +351,12 @@ Status = NtMapViewOfSection(ImageSectionHandle, NtCurrentProcess(), &ImageBase, - 0, // ZeroBits - 0, // CommitSize - NULL, // SectionOffset - &ViewSize, - ViewShare, - 0, // AllocationType + 0, + 0, + NULL, + &ViewSize, + ViewShare, + 0, PAGE_READONLY); #ifdef _M_IX86 ok(Status == STATUS_SUCCESS, "NtMapViewOfSection failed, Status 0x%lx\n", Status); @@ -753,93 +459,10 @@ NtUnmapViewOfSection(NtCurrentProcess(), ImageBase); } -void -Test_ImageSection2(void) -{ - UNICODE_STRING FileName; - NTSTATUS Status; - OBJECT_ATTRIBUTES FileObjectAttributes; - IO_STATUS_BLOCK IoStatusBlock; - HANDLE FileHandle, ImageSectionHandle; - PVOID ImageBase, BaseAddress; - SIZE_T ViewSize; - LARGE_INTEGER MaximumSize, SectionOffset; - - if (!RtlDosPathNameToNtPathName_U(L"testdata\\nvoglv32.dll", - &FileName, - NULL, - NULL)) - { - ok(0, "RtlDosPathNameToNtPathName_U failed\n"); - return; - } - - InitializeObjectAttributes(&FileObjectAttributes, - &FileName, - 0, - NULL, - NULL); - - Status = NtOpenFile(&FileHandle, - GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE, - &FileObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ, - FILE_SYNCHRONOUS_IO_NONALERT); - ok(Status == STATUS_SUCCESS, "NtOpenFile failed, Status 0x%lx\n", Status); - printf("Opened file with handle %p\n", FileHandle); - - /* Create a data section with write access */ - MaximumSize.QuadPart = 0x20000; - Status = NtCreateSection(&ImageSectionHandle, - SECTION_ALL_ACCESS, // DesiredAccess - NULL, // ObjectAttributes - &MaximumSize, // MaximumSize - PAGE_READWRITE, // SectionPageProtection - SEC_IMAGE, // AllocationAttributes - FileHandle); - ok(Status == STATUS_SUCCESS, "NtCreateSection failed, Status 0x%lx\n", Status); - - printf("Created image section with handle %p\n", ImageSectionHandle); - //system("PAUSE"); - - /* Map the image section */ - ImageBase = NULL; - ViewSize = 0x0000; - SectionOffset.QuadPart = 0x00000; - Status = NtMapViewOfSection(ImageSectionHandle, - NtCurrentProcess(), - &ImageBase, - 0, - 0, - &SectionOffset, - &ViewSize, - ViewShare, - 0, - PAGE_READWRITE); - ok(Status == STATUS_SUCCESS, "NtMapViewOfSection failed, Status 0x%lx\n", Status); - - printf("Mapped image section at %p, value in text section: %lx\n", - ImageBase, *((ULONG*)((PCHAR)ImageBase + 0x1196))); - system("PAUSE"); - - /* Try to allocate a page after the section */ - BaseAddress = (PUCHAR)ImageBase + 0x10000; - ViewSize = 0x1000; - Status = NtAllocateVirtualMemory(NtCurrentProcess(), - &BaseAddress, - 0, - &ViewSize, - MEM_RESERVE | MEM_COMMIT, - PAGE_READWRITE); - printf("allocation status: %lx\n", Status); - system("PAUSE"); - -} START_TEST(NtMapViewOfSection) { Test_PageFileSection(); - //Test_ImageSection2(); + Test_ImageSection(); }

10 years, 7 months

[tkreuzer] 63300: [NTOSKRNL] Fix NtReleaseMutant, which was expecting MUTANT_QUERY_STATE right on the mutant handle, which is not required, probably a copypasta. Fixes a test.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed May 14 20:27:18 2014 New Revision: 63300 URL: http://svn.reactos.org/svn/reactos?rev=63300&view=rev Log: [NTOSKRNL] Fix NtReleaseMutant, which was expecting MUTANT_QUERY_STATE right on the mutant handle, which is not required, probably a copypasta. Fixes a test. Modified: trunk/reactos/ntoskrnl/ex/mutant.c Modified: trunk/reactos/ntoskrnl/ex/mutant.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/mutant.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/ex/mutant.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/mutant.c [iso-8859-1] Wed May 14 20:27:18 2014 @@ -325,7 +325,7 @@ /* Open the Object */ Status = ObReferenceObjectByHandle(MutantHandle, - MUTANT_QUERY_STATE, + 0, /* No access rights required */ ExMutantObjectType, PreviousMode, (PVOID*)&Mutant,

10 years, 7 months

[tkreuzer] 63299: [NTDLL_APITEST] Add a test for NtReleaseMutant

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed May 14 20:23:38 2014 New Revision: 63299 URL: http://svn.reactos.org/svn/reactos?rev=63299&view=rev Log: [NTDLL_APITEST] Add a test for NtReleaseMutant Added: trunk/rostests/apitests/ntdll/NtMutant.c (with props) Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt trunk/rostests/apitests/ntdll/NtMapViewOfSection.c trunk/rostests/apitests/ntdll/testlist.c Modified: trunk/rostests/apitests/ntdll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/CMakeLists… ============================================================================== --- trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/CMakeLists.txt [iso-8859-1] Wed May 14 20:23:38 2014 @@ -7,6 +7,7 @@ NtCreateThread.c NtFreeVirtualMemory.c NtMapViewOfSection.c + NtMutant.c NtProtectVirtualMemory.c NtQuerySystemEnvironmentValue.c NtQueryVolumeInformationFile.c Modified: trunk/rostests/apitests/ntdll/NtMapViewOfSection.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtMapViewO… ============================================================================== --- trunk/rostests/apitests/ntdll/NtMapViewOfSection.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/NtMapViewOfSection.c [iso-8859-1] Wed May 14 20:23:38 2014 @@ -3,6 +3,13 @@ #define WIN32_NO_STATUS #include <ndk/ntndk.h> + +BOOL WINAPI SetInformationJobObject( + _In_ HANDLE hJob, + _In_ JOBOBJECTINFOCLASS JobObjectInfoClass, + _In_ LPVOID lpJobObjectInfo, + _In_ DWORD cbJobObjectInfoLength +); NTSYSAPI NTSTATUS @@ -25,10 +32,12 @@ NTSTATUS Status; HANDLE SectionHandle; LARGE_INTEGER MaximumSize, SectionOffset; - PVOID BaseAddress; + PVOID BaseAddress, BaseAddress2; SIZE_T ViewSize; - - /* Create a page file backed section */ + //ULONG OldProtect; + QUOTA_LIMITS QuotaLimits; + + /* Create a page file backed section with SEC_COMMIT */ MaximumSize.QuadPart = 0x20000; Status = NtCreateSection(&SectionHandle, SECTION_ALL_ACCESS, @@ -37,7 +46,7 @@ PAGE_READWRITE, SEC_COMMIT, NULL); - ok(NT_SUCCESS(Status), "NtCreateSection failed with Status %lx\n", Status); + ok_ntstatus(Status, STATUS_SUCCESS); if (!NT_SUCCESS(Status)) return; @@ -55,8 +64,7 @@ ViewShare, 0, PAGE_READWRITE); - ok(Status == STATUS_MAPPED_ALIGNMENT, - "NtMapViewOfSection returned wrong Status %lx\n", Status); + ok_ntstatus(Status, STATUS_MAPPED_ALIGNMENT); /* Try to map a page with execute rights */ BaseAddress = (PVOID)0x30000000; @@ -72,10 +80,9 @@ ViewShare, 0, PAGE_EXECUTE_READWRITE); - ok(Status == STATUS_SECTION_PROTECTION, - "NtMapViewOfSection returned wrong Status %lx\n", Status); - - /* Map 2 pages, not comitting them */ + ok_ntstatus(Status, STATUS_SECTION_PROTECTION); + + /* Try to map 2 pages with MEM_COMMIT */ BaseAddress = (PVOID)0x30000000; SectionOffset.QuadPart = 0; ViewSize = 0x2000; @@ -83,15 +90,40 @@ NtCurrentProcess(), &BaseAddress, 0, - 0, - &SectionOffset, - &ViewSize, - ViewShare, - 0, - PAGE_READWRITE); - ok(NT_SUCCESS(Status), "NtMapViewOfSection failed with Status %lx\n", Status); - if (!NT_SUCCESS(Status)) - return; + PAGE_SIZE, + &SectionOffset, + &ViewSize, + ViewShare, + MEM_COMMIT, + PAGE_READWRITE); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER_9); + + /* Map 2 pages, without MEM_COMMIT */ + BaseAddress = (PVOID)0x30000000; + SectionOffset.QuadPart = 0; + ViewSize = 0x2000; + Status = NtMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &BaseAddress, + 0, + 0, + &SectionOffset, + &ViewSize, + ViewShare, + 0, + PAGE_READWRITE); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* We must be able to access the memory */ + _SEH2_TRY + { + *(PULONG)BaseAddress = 1; + } + _SEH2_EXCEPT(1) + { + ok(FALSE, "Got an exception\n"); + } + _SEH2_END; /* Commit a page in the section */ BaseAddress = (PVOID)0x30000000; @@ -102,12 +134,15 @@ &ViewSize, MEM_COMMIT, PAGE_READWRITE); - ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed with Status %lx\n", Status); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Try to decommit a page in the section */ Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &ViewSize, MEM_DECOMMIT); - ok(Status == STATUS_UNABLE_TO_DELETE_SECTION, "NtFreeVirtualMemory returned wrong Status %lx\n", Status); + ok_ntstatus(Status, STATUS_UNABLE_TO_DELETE_SECTION); + /* Try to commit a range larger than the section */ BaseAddress = (PVOID)0x30000000; ViewSize = 0x3000; @@ -117,8 +152,7 @@ &ViewSize, MEM_COMMIT, PAGE_READWRITE); - ok(Status == STATUS_CONFLICTING_ADDRESSES, - "NtAllocateVirtualMemory failed with wrong Status %lx\n", Status); + ok_ntstatus(Status, STATUS_CONFLICTING_ADDRESSES); /* Try to commit a page after the section */ BaseAddress = (PVOID)0x30002000; @@ -129,7 +163,7 @@ &ViewSize, MEM_COMMIT, PAGE_READWRITE); - ok(!NT_SUCCESS(Status), "NtAllocateVirtualMemory Should fail\n"); + ok_ntstatus(Status, STATUS_CONFLICTING_ADDRESSES); /* Try to allocate a page after the section */ BaseAddress = (PVOID)0x30002000; @@ -140,7 +174,7 @@ &ViewSize, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); - ok(!NT_SUCCESS(Status), "NtAllocateVirtualMemory should fail\n"); + ok_ntstatus(Status, STATUS_CONFLICTING_ADDRESSES); /* Need to go to next 64k boundary */ BaseAddress = (PVOID)0x30010000; @@ -151,7 +185,7 @@ &ViewSize, MEM_RESERVE | MEM_COMMIT, PAGE_READWRITE); - ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed with Status %lx\n", Status); + ok_ntstatus(Status, STATUS_SUCCESS); if (!NT_SUCCESS(Status)) return; @@ -164,15 +198,14 @@ MEM_RELEASE); ok(NT_SUCCESS(Status), "NtFreeVirtualMemory failed with Status %lx\n", Status); - /* Free the section mapping */ + /* Try to release the section mapping with NtFreeVirtualMemory */ BaseAddress = (PVOID)0x30000000; ViewSize = 0x1000; Status = NtFreeVirtualMemory(NtCurrentProcess(), &BaseAddress, &ViewSize, MEM_RELEASE); - ok(Status == STATUS_UNABLE_TO_DELETE_SECTION, - "NtFreeVirtualMemory failed with wrong Status %lx\n", Status); + ok_ntstatus(Status, STATUS_UNABLE_TO_DELETE_SECTION); /* Commit a page in the section */ BaseAddress = (PVOID)0x30001000; @@ -183,7 +216,7 @@ &ViewSize, MEM_COMMIT, PAGE_READWRITE); - ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed with Status %lx\n", Status); + ok_ntstatus(Status, STATUS_SUCCESS); /* Try to decommit the page */ BaseAddress = (PVOID)0x30001000; @@ -192,8 +225,7 @@ &BaseAddress, &ViewSize, MEM_DECOMMIT); - ok(Status == STATUS_UNABLE_TO_DELETE_SECTION, - "NtFreeVirtualMemory failed with wrong Status %lx\n", Status); + ok_ntstatus(Status, STATUS_UNABLE_TO_DELETE_SECTION); BaseAddress = UlongToPtr(0x40000000); SectionOffset.QuadPart = 0; @@ -208,7 +240,7 @@ ViewShare, 0, PAGE_READWRITE); - ok(NT_SUCCESS(Status), "NtMapViewOfSection failed with Status %lx\n", Status); + ok_ntstatus(Status, STATUS_SUCCESS); if (!NT_SUCCESS(Status)) return; @@ -227,9 +259,7 @@ ViewShare, 0, PAGE_READWRITE); - ok(NT_SUCCESS(Status), "NtMapViewOfSection failed with Status %lx\n", Status); - if (!NT_SUCCESS(Status)) - return; + ok_ntstatus(Status, STATUS_SUCCESS); ok(BaseAddress == (PVOID)0x40080000, "Invalid BaseAddress: %p", BaseAddress); @@ -241,9 +271,273 @@ &ViewSize, MEM_COMMIT, PAGE_READWRITE); - ok(NT_SUCCESS(Status), "NtAllocateVirtualMemory failed with Status %lx\n", Status); - if (!NT_SUCCESS(Status)) - return; + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Close the mapping */ + NtUnmapViewOfSection(NtCurrentProcess(), BaseAddress); + NtClose(SectionHandle); + + /* Create a page file backed section, but only reserved */ + MaximumSize.QuadPart = 0x20000; + Status = NtCreateSection(&SectionHandle, + SECTION_ALL_ACCESS, + NULL, + &MaximumSize, + PAGE_READWRITE, + SEC_RESERVE, + NULL); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Try to map 1 page, passing MEM_RESERVE */ + BaseAddress = NULL; + SectionOffset.QuadPart = 0; + ViewSize = PAGE_SIZE; + Status = NtMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &BaseAddress, + 0, + PAGE_SIZE, + &SectionOffset, + &ViewSize, + ViewShare, + MEM_RESERVE, + PAGE_READWRITE); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER_9); + + /* Try to map 1 page using MEM_COMMIT */ + BaseAddress = NULL; + SectionOffset.QuadPart = 0; + ViewSize = PAGE_SIZE; + Status = NtMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &BaseAddress, + 0, + PAGE_SIZE, + &SectionOffset, + &ViewSize, + ViewShare, + MEM_COMMIT, + PAGE_READWRITE); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER_9); + + /* Map 2 pages, but commit 1 */ + BaseAddress = NULL; + SectionOffset.QuadPart = 0; + ViewSize = 2 * PAGE_SIZE; + Status = NtMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &BaseAddress, + 0, + PAGE_SIZE, + &SectionOffset, + &ViewSize, + ViewShare, + 0, + PAGE_READWRITE); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* We must be able to access the 1st page */ + Status = STATUS_SUCCESS; + _SEH2_TRY + { + *(PUCHAR)BaseAddress = 1; + } + _SEH2_EXCEPT(1) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + ok_ntstatus(Status, STATUS_SUCCESS); + + /* We must not be able to access the 2nd page */ + Status = STATUS_SUCCESS; + _SEH2_TRY + { + *((PUCHAR)BaseAddress + PAGE_SIZE) = 1; + } + _SEH2_EXCEPT(1) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + ok_ntstatus(Status, STATUS_ACCESS_VIOLATION); + + /* Map the 2 pages again into a different memory location */ + BaseAddress2 = NULL; + Status = NtMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &BaseAddress2, + 0, + 0, + &SectionOffset, + &ViewSize, + ViewShare, + 0, + PAGE_READWRITE); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Commit a the 2nd page in the 2nd memory location */ + BaseAddress2 = (PUCHAR)BaseAddress2 + PAGE_SIZE; + ViewSize = PAGE_SIZE; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress2, + 0, + &ViewSize, + MEM_COMMIT, + PAGE_READONLY); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Try to commit again (the already committed page) */ + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress2, + 0, + &ViewSize, + MEM_COMMIT, + PAGE_READONLY); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* We must be able to access the memory in the 2nd page of the 1st memory location */ + Status = STATUS_SUCCESS; + _SEH2_TRY + { + *((PUCHAR)BaseAddress + PAGE_SIZE) = 2; + } + _SEH2_EXCEPT(1) + { + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + ok_ntstatus(Status, STATUS_SUCCESS); + + ok(*(PULONG)BaseAddress2 == 2, "Value in memory was wrong"); + + /* Close the mapping */ + NtUnmapViewOfSection(NtCurrentProcess(), BaseAddress); + NtUnmapViewOfSection(NtCurrentProcess(), (PUCHAR)BaseAddress2 - PAGE_SIZE); + NtClose(SectionHandle); + +#if 0 + { + HANDLE Job; + JOBOBJECT_EXTENDED_LIMIT_INFORMATION JobLimitInformation; + + Job = CreateJobObject(NULL, NULL); + ok_ntstatus(Status, STATUS_SUCCESS); + + ok(AssignProcessToJobObject(Job, NtCurrentProcess()), ""); + + RtlZeroMemory(&JobLimitInformation, sizeof(JobLimitInformation)); + JobLimitInformation.BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_JOB_MEMORY; + JobLimitInformation.JobMemoryLimit = 100 * 1024; + JobLimitInformation.PeakProcessMemoryUsed = JobLimitInformation.JobMemoryLimit; + JobLimitInformation.PeakJobMemoryUsed = JobLimitInformation.JobMemoryLimit; + + ok(SetInformationJobObject(Job, + JobObjectExtendedLimitInformation, + &JobLimitInformation, + sizeof(JobLimitInformation)), ""); + } +#endif + + QuotaLimits.PagedPoolLimit = 0; + QuotaLimits.NonPagedPoolLimit = 0; + QuotaLimits.TimeLimit.QuadPart = 0; + QuotaLimits.PagefileLimit = 0; + QuotaLimits.MinimumWorkingSetSize = 90000; + QuotaLimits.MaximumWorkingSetSize = 90000; + Status = NtSetInformationProcess(NtCurrentProcess(), + ProcessQuotaLimits, + &QuotaLimits, + sizeof(QuotaLimits)); + ok_ntstatus(Status, STATUS_SUCCESS); + + QuotaLimits.MinimumWorkingSetSize = 0; + QuotaLimits.MaximumWorkingSetSize = 0; + QuotaLimits.PagefileLimit = 1; + Status = NtSetInformationProcess(NtCurrentProcess(), + ProcessQuotaLimits, + &QuotaLimits, + sizeof(QuotaLimits)); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Try to create a huge page file backed section */ + MaximumSize.QuadPart = 0x800000000; + Status = NtCreateSection(&SectionHandle, + SECTION_ALL_ACCESS, + NULL, + &MaximumSize, + PAGE_READWRITE, + SEC_COMMIT, + NULL); + ok_ntstatus(Status, STATUS_COMMITMENT_LIMIT); + + /* Try to create a huge page file backed section with PAGE_NOACCESS protection */ + MaximumSize.QuadPart = 0x8000000000; + Status = NtCreateSection(&SectionHandle, + SECTION_ALL_ACCESS, + NULL, + &MaximumSize, + PAGE_NOACCESS, + SEC_COMMIT, + NULL); + ok_ntstatus(Status, STATUS_INVALID_PAGE_PROTECTION); + + /* Create a huge page file backed section, but only reserved */ + MaximumSize.QuadPart = 0x8000000000; + Status = NtCreateSection(&SectionHandle, + SECTION_ALL_ACCESS, + NULL, + &MaximumSize, + PAGE_READWRITE, + SEC_RESERVE, + NULL); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Pass a too large region size */ + BaseAddress = NULL; + SectionOffset.QuadPart = 0; + ViewSize = 0x80000000; + Status = NtMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &BaseAddress, + 0, + 0, + &SectionOffset, + &ViewSize, + ViewShare, + 0, + PAGE_READWRITE); + ok_ntstatus(Status, STATUS_INVALID_PARAMETER_4); + + /* Map with PAGE_NOACCESS */ + BaseAddress = NULL; + SectionOffset.QuadPart = 0; + ViewSize = 0x20000000; + Status = NtMapViewOfSection(SectionHandle, + NtCurrentProcess(), + &BaseAddress, + 0, + 0, + &SectionOffset, + &ViewSize, + ViewShare, + 0, + PAGE_NOACCESS); + ok_ntstatus(Status, STATUS_SUCCESS); + + /* Update protection to PAGE_READWRITE */ + ViewSize = 0x20000000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), &BaseAddress, 0, &ViewSize, MEM_COMMIT, PAGE_READWRITE); + ok_ntstatus(Status, STATUS_SUCCESS); + + //Status = NtProtectVirtualMemory(NtCurrentProcess(), &BaseAddress, &ViewSize, PAGE_READWRITE, &OldProtect); + //ok_ntstatus(Status, STATUS_SUCCESS); + //ok(OldProtect == PAGE_NOACCESS, "Wrong protection returned: %u\n", OldProtect); + + /* Update protection to PAGE_READWRITE (1 page) */ + ViewSize = 0x1000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), &BaseAddress, 0, &ViewSize, MEM_COMMIT, PAGE_READWRITE); + ok_ntstatus(Status, STATUS_SUCCESS); } @@ -291,7 +585,7 @@ FileHandle); ok(Status == STATUS_SUCCESS, "NtCreateSection failed, Status 0x%lx\n", Status); - /* Map the data section */ + /* Map the data section as flat mapping */ DataBase = NULL; ViewSize = 0; Status = NtMapViewOfSection(DataSectionHandle, @@ -351,12 +645,12 @@ Status = NtMapViewOfSection(ImageSectionHandle, NtCurrentProcess(), &ImageBase, - 0, - 0, - NULL, - &ViewSize, - ViewShare, - 0, + 0, // ZeroBits + 0, // CommitSize + NULL, // SectionOffset + &ViewSize, + ViewShare, + 0, // AllocationType PAGE_READONLY); #ifdef _M_IX86 ok(Status == STATUS_SUCCESS, "NtMapViewOfSection failed, Status 0x%lx\n", Status); @@ -459,10 +753,93 @@ NtUnmapViewOfSection(NtCurrentProcess(), ImageBase); } +void +Test_ImageSection2(void) +{ + UNICODE_STRING FileName; + NTSTATUS Status; + OBJECT_ATTRIBUTES FileObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + HANDLE FileHandle, ImageSectionHandle; + PVOID ImageBase, BaseAddress; + SIZE_T ViewSize; + LARGE_INTEGER MaximumSize, SectionOffset; + + if (!RtlDosPathNameToNtPathName_U(L"testdata\\nvoglv32.dll", + &FileName, + NULL, + NULL)) + { + ok(0, "RtlDosPathNameToNtPathName_U failed\n"); + return; + } + + InitializeObjectAttributes(&FileObjectAttributes, + &FileName, + 0, + NULL, + NULL); + + Status = NtOpenFile(&FileHandle, + GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE, + &FileObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ, + FILE_SYNCHRONOUS_IO_NONALERT); + ok(Status == STATUS_SUCCESS, "NtOpenFile failed, Status 0x%lx\n", Status); + printf("Opened file with handle %p\n", FileHandle); + + /* Create a data section with write access */ + MaximumSize.QuadPart = 0x20000; + Status = NtCreateSection(&ImageSectionHandle, + SECTION_ALL_ACCESS, // DesiredAccess + NULL, // ObjectAttributes + &MaximumSize, // MaximumSize + PAGE_READWRITE, // SectionPageProtection + SEC_IMAGE, // AllocationAttributes + FileHandle); + ok(Status == STATUS_SUCCESS, "NtCreateSection failed, Status 0x%lx\n", Status); + + printf("Created image section with handle %p\n", ImageSectionHandle); + //system("PAUSE"); + + /* Map the image section */ + ImageBase = NULL; + ViewSize = 0x0000; + SectionOffset.QuadPart = 0x00000; + Status = NtMapViewOfSection(ImageSectionHandle, + NtCurrentProcess(), + &ImageBase, + 0, + 0, + &SectionOffset, + &ViewSize, + ViewShare, + 0, + PAGE_READWRITE); + ok(Status == STATUS_SUCCESS, "NtMapViewOfSection failed, Status 0x%lx\n", Status); + + printf("Mapped image section at %p, value in text section: %lx\n", + ImageBase, *((ULONG*)((PCHAR)ImageBase + 0x1196))); + system("PAUSE"); + + /* Try to allocate a page after the section */ + BaseAddress = (PUCHAR)ImageBase + 0x10000; + ViewSize = 0x1000; + Status = NtAllocateVirtualMemory(NtCurrentProcess(), + &BaseAddress, + 0, + &ViewSize, + MEM_RESERVE | MEM_COMMIT, + PAGE_READWRITE); + printf("allocation status: %lx\n", Status); + system("PAUSE"); + +} START_TEST(NtMapViewOfSection) { Test_PageFileSection(); - Test_ImageSection(); + //Test_ImageSection2(); } Added: trunk/rostests/apitests/ntdll/NtMutant.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/NtMutant.c… ============================================================================== --- trunk/rostests/apitests/ntdll/NtMutant.c (added) +++ trunk/rostests/apitests/ntdll/NtMutant.c [iso-8859-1] Wed May 14 20:23:38 2014 @@ -0,0 +1,26 @@ + +#include <apitest.h> + +#include <ndk/exfuncs.h> + + +VOID +Test_Release(VOID) +{ + HANDLE MutantHandle; + NTSTATUS Status; + + Status = NtCreateMutant(&MutantHandle, 0, NULL, TRUE); + ok_ntstatus(Status, STATUS_SUCCESS); + + Status = NtReleaseMutant(MutantHandle, NULL); + ok_ntstatus(Status, STATUS_SUCCESS); + +} + + + +START_TEST(NtMutant) +{ + Test_Release(); +} Propchange: trunk/rostests/apitests/ntdll/NtMutant.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rostests/apitests/ntdll/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/ntdll/testlist.c… ============================================================================== --- trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] (original) +++ trunk/rostests/apitests/ntdll/testlist.c [iso-8859-1] Wed May 14 20:23:38 2014 @@ -10,6 +10,7 @@ extern void func_NtCreateThread(void); extern void func_NtFreeVirtualMemory(void); extern void func_NtMapViewOfSection(void); +extern void func_NtMutant(void); extern void func_NtProtectVirtualMemory(void); extern void func_NtQuerySystemEnvironmentValue(void); extern void func_NtQueryVolumeInformationFile(void); @@ -38,6 +39,7 @@ { "NtCreateThread", func_NtCreateThread }, { "NtFreeVirtualMemory", func_NtFreeVirtualMemory }, { "NtMapViewOfSection", func_NtMapViewOfSection }, + { "NtMutant", func_NtMutant }, { "NtProtectVirtualMemory", func_NtProtectVirtualMemory }, { "NtQuerySystemEnvironmentValue", func_NtQuerySystemEnvironmentValue }, { "NtQueryVolumeInformationFile", func_NtQueryVolumeInformationFile },

10 years, 7 months

[hbelusca] 63298: [NTVDM] For diagnostic/debugging purposes, prefill the keyboard buffer with invalid values.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed May 14 19:19:57 2014 New Revision: 63298 URL: http://svn.reactos.org/svn/reactos?rev=63298&view=rev Log: [NTVDM] For diagnostic/debugging purposes, prefill the keyboard buffer with invalid values. Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c Modified: trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/bios/bios… ============================================================================== --- trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/bios/bios32/kbdbios32.c [iso-8859-1] Wed May 14 19:19:57 2014 @@ -273,6 +273,9 @@ Bda->KeybdBufferEnd = Bda->KeybdBufferStart + BIOS_KBD_BUFFER_SIZE * sizeof(WORD); Bda->KeybdBufferHead = Bda->KeybdBufferTail = 0; + // FIXME: Fill the keyboard buffer with invalid values, for diagnostic purposes... + RtlFillMemory(((LPVOID)((ULONG_PTR)Bda + Bda->KeybdBufferStart)), BIOS_KBD_BUFFER_SIZE * sizeof(WORD), 'A'); + /* Register the BIOS 32-bit Interrupts */ /* Initialize software vector handlers */

10 years, 7 months

[hbelusca] 63297: [NTVDM]: Introduce a echo state for INT 21h, AH=01h and AH=3Fh.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Wed May 14 18:50:29 2014 New Revision: 63297 URL: http://svn.reactos.org/svn/reactos?rev=63297&view=rev Log: [NTVDM]: Introduce a echo state for INT 21h, AH=01h and AH=3Fh. Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.h trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dosfiles.c Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.c [iso-8859-1] Wed May 14 18:50:29 2014 @@ -39,6 +39,9 @@ static BYTE DosAllocStrategy = DOS_ALLOC_BEST_FIT; static BOOLEAN DosUmbLinked = FALSE; static WORD DosErrorLevel = 0x0000; + +/* Echo state for INT 21h, AH = 01h and AH = 3Fh */ +BOOLEAN DoEcho = FALSE; /* PRIVATE FUNCTIONS **********************************************************/ @@ -1434,8 +1437,9 @@ case 0x01: { // FIXME: Under DOS 2+, input / output handle may be redirected!!!! + DoEcho = TRUE; Character = DosReadCharacter(DOS_INPUT_HANDLE); - DosPrintCharacter(DOS_OUTPUT_HANDLE, Character); + DoEcho = FALSE; // /* Let the BOP repeat if needed */ // if (getCF()) break; @@ -1576,6 +1580,8 @@ while (Count < InputBuffer->MaxLength) { + // FIXME!! This function should interpret backspaces etc... + /* Try to read a character (wait) */ Character = DosReadCharacter(DOS_INPUT_HANDLE); @@ -2051,10 +2057,14 @@ case 0x3F: { WORD BytesRead = 0; - WORD ErrorCode = DosReadFile(getBX(), - SEG_OFF_TO_PTR(getDS(), getDX()), - getCX(), - &BytesRead); + WORD ErrorCode; + + DoEcho = TRUE; + ErrorCode = DosReadFile(getBX(), + SEG_OFF_TO_PTR(getDS(), getDX()), + getCX(), + &BytesRead); + DoEcho = FALSE; if (ErrorCode == ERROR_SUCCESS) { Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dos.h [iso-8859-1] Wed May 14 18:50:29 2014 @@ -160,6 +160,8 @@ #pragma pack(pop) +extern BOOLEAN DoEcho; + /* FUNCTIONS ******************************************************************/ extern CALLBACK16 DosContext; Modified: trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dosfiles.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/ntvdm/dos/dos32… ============================================================================== --- trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dosfiles.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/ntvdm/dos/dos32krnl/dosfiles.c [iso-8859-1] Wed May 14 18:50:29 2014 @@ -167,15 +167,14 @@ /* Retrieve the character in AL (scan code is in AH) */ Character = getAL(); - // FIXME: Sometimes we need echo, some other times not. - // DosPrintCharacter(DOS_OUTPUT_HANDLE, Character); + if (DoEcho) DosPrintCharacter(DOS_OUTPUT_HANDLE, Character); ((PCHAR)Buffer)[BytesRead32] = Character; /* Stop on first carriage return */ if (Character == '\r') { - // DosPrintCharacter(DOS_OUTPUT_HANDLE, '\n'); + if (DoEcho) DosPrintCharacter(DOS_OUTPUT_HANDLE, '\n'); break; }

10 years, 7 months

[akhaldi] 63296: [CRT] * Update _wsopen(). CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed May 14 18:24:38 2014 New Revision: 63296 URL: http://svn.reactos.org/svn/reactos?rev=63296&view=rev Log: [CRT] * Update _wsopen(). CORE-8080 Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Wed May 14 18:24:38 2014 @@ -1822,11 +1822,11 @@ if (oflags & _O_CREAT) { - va_list ap; - - va_start(ap, shflags); + __ms_va_list ap; + + __ms_va_start(ap, shflags); pmode = va_arg(ap, int); - va_end(ap); + __ms_va_end(ap); } else pmode = 0;

10 years, 7 months

[akhaldi] 63295: [CRT] * Update fopen_s(). CORE-8080

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed May 14 17:14:46 2014 New Revision: 63295 URL: http://svn.reactos.org/svn/reactos?rev=63295&view=rev Log: [CRT] * Update fopen_s(). CORE-8080 Modified: trunk/reactos/lib/sdk/crt/stdio/file.c Modified: trunk/reactos/lib/sdk/crt/stdio/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/file.c?r… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/file.c [iso-8859-1] Wed May 14 17:14:46 2014 @@ -3180,11 +3180,9 @@ int CDECL fopen_s(FILE** pFile, const char *filename, const char *mode) { - if (!MSVCRT_CHECK_PMT(pFile != NULL) || !MSVCRT_CHECK_PMT(filename != NULL) || - !MSVCRT_CHECK_PMT(mode != NULL)) { - *_errno() = EINVAL; - return EINVAL; - } + if (!MSVCRT_CHECK_PMT(pFile != NULL)) return EINVAL; + if (!MSVCRT_CHECK_PMT(filename != NULL)) return EINVAL; + if (!MSVCRT_CHECK_PMT(mode != NULL)) return EINVAL; *pFile = fopen(filename, mode);

10 years, 7 months

[akhaldi] 63294: [BZIP2] * Cleanup this folder.

by akhaldi＠svn.reactos.org

Author: akhaldi Date: Wed May 14 17:05:42 2014 New Revision: 63294 URL: http://svn.reactos.org/svn/reactos?rev=63294&view=rev Log: [BZIP2] * Cleanup this folder. Removed: trunk/reactos/lib/3rdparty/bzip2/Makefile-libbz2_so trunk/reactos/lib/3rdparty/bzip2/README.COMPILATION.PROBLEMS trunk/reactos/lib/3rdparty/bzip2/bzip2.1 trunk/reactos/lib/3rdparty/bzip2/bzip2.1.preformatted trunk/reactos/lib/3rdparty/bzip2/bzip2.txt trunk/reactos/lib/3rdparty/bzip2/dlltest.dsp trunk/reactos/lib/3rdparty/bzip2/libbz2.dsp trunk/reactos/lib/3rdparty/bzip2/makefile.msc trunk/reactos/lib/3rdparty/bzip2/manual.ps trunk/reactos/lib/3rdparty/bzip2/manual.texi trunk/reactos/lib/3rdparty/bzip2/manual_1.html trunk/reactos/lib/3rdparty/bzip2/manual_2.html trunk/reactos/lib/3rdparty/bzip2/manual_3.html trunk/reactos/lib/3rdparty/bzip2/manual_4.html trunk/reactos/lib/3rdparty/bzip2/manual_toc.html trunk/reactos/lib/3rdparty/bzip2/sample1.ref trunk/reactos/lib/3rdparty/bzip2/sample2.ref trunk/reactos/lib/3rdparty/bzip2/sample3.ref trunk/reactos/lib/3rdparty/bzip2/words0 trunk/reactos/lib/3rdparty/bzip2/words1 trunk/reactos/lib/3rdparty/bzip2/words2 trunk/reactos/lib/3rdparty/bzip2/words3 [This mail would be too long, it was shortened to contain the URLs only.] Removed: trunk/reactos/lib/3rdparty/bzip2/Makefile-libbz2_so URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/bzip2/Makefil… Removed: trunk/reactos/lib/3rdparty/bzip2/README.COMPILATION.PROBLEMS URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/bzip2/README.… Removed: trunk/reactos/lib/3rdparty/bzip2/bzip2.1 URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/bzip2/bzip2.1… Removed: trunk/reactos/lib/3rdparty/bzip2/bzip2.1.preformatted URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/bzip2/bzip2.1… Removed: trunk/reactos/lib/3rdparty/bzip2/bzip2.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/bzip2/bzip2.t… Removed: trunk/reactos/lib/3rdparty/bzip2/dlltest.dsp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/bzip2/dlltest… Removed: trunk/reactos/lib/3rdparty/bzip2/libbz2.dsp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/bzip2/libbz2.… Removed: trunk/reactos/lib/3rdparty/bzip2/makefile.msc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/bzip2/makefil… Removed: trunk/reactos/lib/3rdparty/bzip2/manual.ps URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/bzip2/manual.… Removed: trunk/reactos/lib/3rdparty/bzip2/manual.texi URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/bzip2/manual.… Removed: trunk/reactos/lib/3rdparty/bzip2/manual_1.html URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/bzip2/manual_… Removed: trunk/reactos/lib/3rdparty/bzip2/manual_2.html URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/bzip2/manual_… Removed: trunk/reactos/lib/3rdparty/bzip2/manual_3.html URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/bzip2/manual_… Removed: trunk/reactos/lib/3rdparty/bzip2/manual_4.html URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/bzip2/manual_… Removed: trunk/reactos/lib/3rdparty/bzip2/manual_toc.html URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/bzip2/manual_… Removed: trunk/reactos/lib/3rdparty/bzip2/sample1.ref URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/bzip2/sample1… Removed: trunk/reactos/lib/3rdparty/bzip2/sample2.ref URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/bzip2/sample2… Removed: trunk/reactos/lib/3rdparty/bzip2/sample3.ref URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/bzip2/sample3… Removed: trunk/reactos/lib/3rdparty/bzip2/words0 URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/bzip2/words0?… Removed: trunk/reactos/lib/3rdparty/bzip2/words1 URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/bzip2/words1?… Removed: trunk/reactos/lib/3rdparty/bzip2/words2 URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/bzip2/words2?… Removed: trunk/reactos/lib/3rdparty/bzip2/words3 URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/3rdparty/bzip2/words3?…

10 years, 7 months

← Newer
1
...
20
21
22
23
24
25
26
...
44
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs May 2014