Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ekohl] 54370: [SERVICES] RControlService: Initialize the callers service status information.
by ekohl＠svn.reactos.org 13 Nov '11

13 Nov '11

Author: ekohl Date: Sun Nov 13 00:13:00 2011 New Revision: 54370 URL: http://svn.reactos.org/svn/reactos?rev=54370&view=rev Log: [SERVICES] RControlService: Initialize the callers service status information. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sun Nov 13 00:13:00 2011 @@ -1095,7 +1095,6 @@ return ERROR_INVALID_HANDLE; } - /* Check the service entry point */ lpService = hSvc->ServiceEntry; if (lpService == NULL) @@ -1131,6 +1130,11 @@ if (!RtlAreAllAccessesGranted(hSvc->Handle.DesiredAccess, DesiredAccess)) return ERROR_ACCESS_DENIED; + + /* Return the current service status information */ + RtlCopyMemory(lpServiceStatus, + &lpService->Status, + sizeof(SERVICE_STATUS)); if (dwControl == SERVICE_CONTROL_STOP) {

1 0

[ekohl] 54369: [SERVICES] RControlService returns ERROR_SERVICE_NOT_ACTIVE if the service has not been started.
by ekohl＠svn.reactos.org 12 Nov '11

12 Nov '11

Author: ekohl Date: Sat Nov 12 21:16:20 2011 New Revision: 54369 URL: http://svn.reactos.org/svn/reactos?rev=54369&view=rev Log: [SERVICES] RControlService returns ERROR_SERVICE_NOT_ACTIVE if the service has not been started. Modified: trunk/reactos/base/system/services/rpcserver.c Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/services/rpcse… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] (original) +++ trunk/reactos/base/system/services/rpcserver.c [iso-8859-1] Sat Nov 12 21:16:20 2011 @@ -646,6 +646,7 @@ return ERROR_INVALID_PARAMETER; } + DWORD ScmCanonDriverImagePath(DWORD dwStartType, const wchar_t *lpServiceName, @@ -1178,6 +1179,10 @@ { dwControlsAccepted = lpService->Status.dwControlsAccepted; dwCurrentState = lpService->Status.dwCurrentState; + + /* Return ERROR_SERVICE_NOT_ACTIVE if the service has not been started */ + if (lpService->lpImage == NULL || dwCurrentState == SERVICE_STOPPED) + return ERROR_SERVICE_NOT_ACTIVE; /* Check the current state before sending a control request */ switch (dwCurrentState) @@ -2064,9 +2069,10 @@ /* Unlock the service database */ ScmUnlockDatabase(); - /* check if it is marked for deletion */ + /* Check if it is marked for deletion */ if (lpService->bDeleted) return ERROR_SERVICE_MARKED_FOR_DELETE; + /* Return Error exist */ return ERROR_SERVICE_EXISTS; }

1 0

[pschweitzer] 54368: [USETUP] Added a half checkpoint to prevent testbot to wrongly assume ReactOS has crashed during setup
by pschweitzer＠svn.reactos.org 12 Nov '11

12 Nov '11

Author: pschweitzer Date: Sat Nov 12 20:20:41 2011 New Revision: 54368 URL: http://svn.reactos.org/svn/reactos?rev=54368&view=rev Log: [USETUP] Added a half checkpoint to prevent testbot to wrongly assume ReactOS has crashed during setup Modified: trunk/reactos/base/setup/usetup/progress.c Modified: trunk/reactos/base/setup/usetup/progress.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/progress… ============================================================================== --- trunk/reactos/base/setup/usetup/progress.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/progress.c [iso-8859-1] Sat Nov 12 20:20:41 2011 @@ -317,6 +317,14 @@ { Bar->Percent = NewPercent; + /* DO NOT REMOVE THOSE LINES + * This might be needed by sysreg + */ + if (NewPercent == 50) + { + DPRINT1("CHECKPOINT:HALF_COPIED\n"); + } + sprintf(TextBuffer, "%-3lu%%", Bar->Percent); coPos.X = Bar->Left + (Bar->Width - 2) / 2;

1 0

[jgardou] 54367: (FORMATTING) -Grrr, you stupid software
by jgardou＠svn.reactos.org 12 Nov '11

12 Nov '11

Author: jgardou Date: Sat Nov 12 19:36:56 2011 New Revision: 54367 URL: http://svn.reactos.org/svn/reactos?rev=54367&view=rev Log: (FORMATTING) -Grrr, you stupid software Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Sat Nov 12 19:36:56 2011 @@ -62,7 +62,7 @@ PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); DPRINT("MmPageOutVirtualMemory(Address 0x%.8X) PID %d\n", - Address, Process->UniqueProcessId); + Address, Process->UniqueProcessId); /* * Check for paging out from a deleted virtual memory area. @@ -79,7 +79,7 @@ * Disable the virtual mapping. */ MmDisableVirtualMapping(Process, Address, - &WasDirty, &Page); + &WasDirty, &Page); if (Page == 0) { @@ -132,7 +132,7 @@ if (!NT_SUCCESS(Status)) { DPRINT1("MM: Failed to write to swap page (Status was 0x%.8X)\n", - Status); + Status); MmEnableVirtualMapping(Process, Address); PageOp->Status = STATUS_UNSUCCESSFUL; KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); @@ -200,8 +200,8 @@ * Get the segment corresponding to the virtual address */ Region = MmFindRegion(MemoryArea->StartingAddress, - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - Address, NULL); + &MemoryArea->Data.VirtualMemoryData.RegionListHead, + Address, NULL); if (Region->Type == MEM_RESERVE || Region->Protect == PAGE_NOACCESS) { @@ -220,8 +220,8 @@ * Get or create a page operation */ PageOp = MmGetPageOp(MemoryArea, Process->UniqueProcessId, - (PVOID)PAGE_ROUND_DOWN(Address), NULL, 0, - MM_PAGEOP_PAGEIN, FALSE); + (PVOID)PAGE_ROUND_DOWN(Address), NULL, 0, + MM_PAGEOP_PAGEIN, FALSE); if (PageOp == NULL) { DPRINT1("MmGetPageOp failed"); @@ -236,10 +236,10 @@ { MmUnlockAddressSpace(AddressSpace); Status = KeWaitForSingleObject(&PageOp->CompletionEvent, - 0, - KernelMode, - FALSE, - NULL); + 0, + KernelMode, + FALSE, + NULL); /* * Check for various strange conditions */ @@ -319,18 +319,18 @@ * try again */ Status = MmCreateVirtualMapping(Process, - (PVOID)PAGE_ROUND_DOWN(Address), - Region->Protect, - &Page, - 1); - while (Status == STATUS_NO_MEMORY) - { - MmUnlockAddressSpace(AddressSpace); - Status = MmCreateVirtualMapping(Process, - Address, + (PVOID)PAGE_ROUND_DOWN(Address), Region->Protect, &Page, 1); + while (Status == STATUS_NO_MEMORY) + { + MmUnlockAddressSpace(AddressSpace); + Status = MmCreateVirtualMapping(Process, + Address, + Region->Protect, + &Page, + 1); MmLockAddressSpace(AddressSpace); } if (!NT_SUCCESS(Status)) @@ -386,15 +386,15 @@ SWAPENTRY SwapEntry; MmDeletePageFileMapping(Process, - (char*)BaseAddress + (i * PAGE_SIZE), - &SwapEntry); + (char*)BaseAddress + (i * PAGE_SIZE), + &SwapEntry); MmFreeSwapPage(SwapEntry); } else { MmDeleteVirtualMapping(Process, - (char*)BaseAddress + (i*PAGE_SIZE), - FALSE, NULL, &Page); + (char*)BaseAddress + (i*PAGE_SIZE), + FALSE, NULL, &Page); if (Page != 0) { SWAPENTRY SavedSwapEntry; @@ -405,7 +405,7 @@ MmSetSavedSwapEntryPage(Page, 0); } MmDeleteRmap(Page, Process, - (char*)BaseAddress + (i * PAGE_SIZE)); + (char*)BaseAddress + (i * PAGE_SIZE)); MmReleasePageMemoryConsumer(MC_USER, Page); } } @@ -467,15 +467,15 @@ if (MemoryArea->Type == MEMORY_AREA_VIRTUAL_MEMORY) { Status = MmProtectAnonMem(AddressSpace, MemoryArea, *BaseAddress, - *NumberOfBytesToProtect, NewAccessProtection, - OldAccessProtection); + *NumberOfBytesToProtect, NewAccessProtection, + OldAccessProtection); } else if (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) { Status = MmProtectSectionView(AddressSpace, MemoryArea, *BaseAddress, - *NumberOfBytesToProtect, - NewAccessProtection, - OldAccessProtection); + *NumberOfBytesToProtect, + NewAccessProtection, + OldAccessProtection); } else { @@ -659,11 +659,11 @@ { /* Reference the handle for correct permissions */ Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_OPERATION, - PsProcessType, - PreviousMode, - (PVOID*)&Process, - NULL); + PROCESS_VM_OPERATION, + PsProcessType, + PreviousMode, + (PVOID*)&Process, + NULL); if (!NT_SUCCESS(Status)) return Status; /* Check if not running in the current process */ @@ -722,7 +722,7 @@ if (((ULONG_PTR)BaseAddress + RegionSize) > (ULONG_PTR)MemoryArea->EndingAddress) { DPRINT("BaseAddress + RegionSize %x is larger than MemoryArea's EndingAddress %x\n", - (ULONG_PTR)BaseAddress + RegionSize, MemoryArea->EndingAddress); + (ULONG_PTR)BaseAddress + RegionSize, MemoryArea->EndingAddress); MmUnlockAddressSpace(AddressSpace); if (Attached) KeUnstackDetachProcess(&ApcState); @@ -752,12 +752,11 @@ if (MemoryArea->Type == MEMORY_AREA_VIRTUAL_MEMORY && MemoryAreaLength >= RegionSize) { - Status = - MmAlterRegion(AddressSpace, - MemoryArea->StartingAddress, - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - BaseAddress, RegionSize, - Type, Protect, MmModifyAttributes); + Status = MmAlterRegion(AddressSpace, + MemoryArea->StartingAddress, + &MemoryArea->Data.VirtualMemoryData.RegionListHead, + BaseAddress, RegionSize, + Type, Protect, MmModifyAttributes); MmUnlockAddressSpace(AddressSpace); if (Attached) KeUnstackDetachProcess(&ApcState); if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); @@ -778,12 +777,11 @@ /* Region list initialized? */ if (MemoryArea->Data.SectionData.RegionListHead.Flink) { - Status = - MmAlterRegion(AddressSpace, - MemoryArea->StartingAddress, - &MemoryArea->Data.SectionData.RegionListHead, - BaseAddress, RegionSize, - Type, Protect, MmModifyAttributes); + Status = MmAlterRegion(AddressSpace, + MemoryArea->StartingAddress, + &MemoryArea->Data.SectionData.RegionListHead, + BaseAddress, RegionSize, + Type, Protect, MmModifyAttributes); } else { @@ -816,14 +814,14 @@ } Status = MmCreateMemoryArea(AddressSpace, - MEMORY_AREA_VIRTUAL_MEMORY, - &BaseAddress, - RegionSize, - Protect, - &MemoryArea, - PBaseAddress != 0, - AllocationType & MEM_TOP_DOWN, - BoundaryAddressMultiple); + MEMORY_AREA_VIRTUAL_MEMORY, + &BaseAddress, + RegionSize, + Protect, + &MemoryArea, + PBaseAddress != 0, + AllocationType & MEM_TOP_DOWN, + BoundaryAddressMultiple); if (!NT_SUCCESS(Status)) { MmUnlockAddressSpace(AddressSpace); @@ -834,10 +832,10 @@ } MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - - (ULONG_PTR)MemoryArea->StartingAddress; + (ULONG_PTR)MemoryArea->StartingAddress; MmInitializeRegion(&MemoryArea->Data.VirtualMemoryData.RegionListHead, - MemoryAreaLength, Type, Protect); + MemoryAreaLength, Type, Protect); if ((AllocationType & MEM_COMMIT) && (Protect & (PAGE_READWRITE | PAGE_EXECUTE_READWRITE))) @@ -895,7 +893,7 @@ ULONG i; DPRINT("MmFreeVirtualMemory(Process %p MemoryArea %p)\n", Process, - MemoryArea); + MemoryArea); /* Mark this memory area as about to be deleted. */ MemoryArea->DeleteInProgress = TRUE; @@ -914,17 +912,17 @@ { PMM_PAGEOP PageOp; PageOp = MmCheckForPageOp(MemoryArea, Process->UniqueProcessId, - (PVOID)((ULONG_PTR)MemoryArea->StartingAddress + (i * PAGE_SIZE)), - NULL, 0); + (PVOID)((ULONG_PTR)MemoryArea->StartingAddress + (i * PAGE_SIZE)), + NULL, 0); if (PageOp != NULL) { NTSTATUS Status; MmUnlockAddressSpace(&Process->Vm); Status = KeWaitForSingleObject(&PageOp->CompletionEvent, - 0, - KernelMode, - FALSE, - NULL); + 0, + KernelMode, + FALSE, + NULL); if (Status != STATUS_SUCCESS) { DPRINT1("Failed to wait for page op\n"); @@ -1046,11 +1044,11 @@ { /* Reference the handle for correct permissions */ Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_OPERATION, - PsProcessType, - PreviousMode, - (PVOID*)&Process, - NULL); + PROCESS_VM_OPERATION, + PsProcessType, + PreviousMode, + (PVOID*)&Process, + NULL); if (!NT_SUCCESS(Status)) return Status; /* Check if not running in the current process */ @@ -1064,7 +1062,7 @@ BaseAddress = (PVOID)PAGE_ROUND_DOWN((PBaseAddress)); RegionSize = PAGE_ROUND_UP((ULONG_PTR)(PBaseAddress) + (PRegionSize)) - - PAGE_ROUND_DOWN((PBaseAddress)); + PAGE_ROUND_DOWN((PBaseAddress)); AddressSpace = &Process->Vm; @@ -1092,17 +1090,16 @@ goto unlock_deref_and_return; case MEM_DECOMMIT: - Status = - MmAlterRegion(AddressSpace, - MemoryArea->StartingAddress, - (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) ? - &MemoryArea->Data.SectionData.RegionListHead : - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - BaseAddress, - RegionSize, - MEM_RESERVE, - PAGE_NOACCESS, - MmModifyAttributes); + Status = MmAlterRegion(AddressSpace, + MemoryArea->StartingAddress, + (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) ? + &MemoryArea->Data.SectionData.RegionListHead : + &MemoryArea->Data.VirtualMemoryData.RegionListHead, + BaseAddress, + RegionSize, + MEM_RESERVE, + PAGE_NOACCESS, + MmModifyAttributes); goto unlock_deref_and_return; } @@ -1135,8 +1132,8 @@ for (;;) { Region = MmFindRegion(MemoryArea->StartingAddress, - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - (PVOID)((ULONG_PTR)BaseAddress + LengthCount), NULL); + &MemoryArea->Data.VirtualMemoryData.RegionListHead, + (PVOID)((ULONG_PTR)BaseAddress + LengthCount), NULL); /* If a Region was found and it is committed */ if ((Region) && (Region->Type == MEM_COMMIT)) @@ -1163,9 +1160,9 @@ { *OldProtect = Region->Protect; Status = MmAlterRegion(AddressSpace, MemoryArea->StartingAddress, - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - BaseAddress, Length, Region->Type, Protect, - MmModifyAttributes); + &MemoryArea->Data.VirtualMemoryData.RegionListHead, + BaseAddress, Length, Region->Type, Protect, + MmModifyAttributes); } return (Status); @@ -1183,8 +1180,8 @@ Info->BaseAddress = (PVOID)PAGE_ROUND_DOWN(Address); Region = MmFindRegion(MemoryArea->StartingAddress, - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - Address, &RegionBase); + &MemoryArea->Data.VirtualMemoryData.RegionListHead, + Address, &RegionBase); Info->BaseAddress = RegionBase; Info->AllocationBase = MemoryArea->StartingAddress; Info->AllocationProtect = MemoryArea->Protect;

1 0

[jgardou] 54366: (FORMATTING) - get back this good ol' 4-space indentation
by jgardou＠svn.reactos.org 12 Nov '11

12 Nov '11

Author: jgardou Date: Sat Nov 12 19:26:26 2011 New Revision: 54366 URL: http://svn.reactos.org/svn/reactos?rev=54366&view=rev Log: (FORMATTING) - get back this good ol' 4-space indentation Modified: trunk/reactos/ntoskrnl/mm/anonmem.c Modified: trunk/reactos/ntoskrnl/mm/anonmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/anonmem.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/anonmem.c [iso-8859-1] Sat Nov 12 19:26:26 2011 @@ -51,164 +51,164 @@ NTSTATUS NTAPI MmPageOutVirtualMemory(PMMSUPPORT AddressSpace, - PMEMORY_AREA MemoryArea, - PVOID Address, - PMM_PAGEOP PageOp) + PMEMORY_AREA MemoryArea, + PVOID Address, + PMM_PAGEOP PageOp) { - PFN_NUMBER Page; - BOOLEAN WasDirty; - SWAPENTRY SwapEntry; - NTSTATUS Status; - PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); + PFN_NUMBER Page; + BOOLEAN WasDirty; + SWAPENTRY SwapEntry; + NTSTATUS Status; + PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); - DPRINT("MmPageOutVirtualMemory(Address 0x%.8X) PID %d\n", - Address, Process->UniqueProcessId); - - /* + DPRINT("MmPageOutVirtualMemory(Address 0x%.8X) PID %d\n", + Address, Process->UniqueProcessId); + + /* * Check for paging out from a deleted virtual memory area. */ - if (MemoryArea->DeleteInProgress) - { - PageOp->Status = STATUS_UNSUCCESSFUL; - KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); - MmReleasePageOp(PageOp); - return(STATUS_UNSUCCESSFUL); - } - - /* + if (MemoryArea->DeleteInProgress) + { + PageOp->Status = STATUS_UNSUCCESSFUL; + KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); + MmReleasePageOp(PageOp); + return(STATUS_UNSUCCESSFUL); + } + + /* * Disable the virtual mapping. */ - MmDisableVirtualMapping(Process, Address, - &WasDirty, &Page); - - if (Page == 0) - { - KeBugCheck(MEMORY_MANAGEMENT); - } - - /* + MmDisableVirtualMapping(Process, Address, + &WasDirty, &Page); + + if (Page == 0) + { + KeBugCheck(MEMORY_MANAGEMENT); + } + + /* * Paging out non-dirty data is easy. */ - if (!WasDirty) - { - MmLockAddressSpace(AddressSpace); - MmDeleteVirtualMapping(Process, Address, FALSE, NULL, NULL); - MmDeleteAllRmaps(Page, NULL, NULL); - if ((SwapEntry = MmGetSavedSwapEntryPage(Page)) != 0) - { - MmCreatePageFileMapping(Process, Address, SwapEntry); - MmSetSavedSwapEntryPage(Page, 0); - } - MmUnlockAddressSpace(AddressSpace); - MmReleasePageMemoryConsumer(MC_USER, Page); - PageOp->Status = STATUS_SUCCESS; - KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); - MmReleasePageOp(PageOp); - return(STATUS_SUCCESS); - } - - /* + if (!WasDirty) + { + MmLockAddressSpace(AddressSpace); + MmDeleteVirtualMapping(Process, Address, FALSE, NULL, NULL); + MmDeleteAllRmaps(Page, NULL, NULL); + if ((SwapEntry = MmGetSavedSwapEntryPage(Page)) != 0) + { + MmCreatePageFileMapping(Process, Address, SwapEntry); + MmSetSavedSwapEntryPage(Page, 0); + } + MmUnlockAddressSpace(AddressSpace); + MmReleasePageMemoryConsumer(MC_USER, Page); + PageOp->Status = STATUS_SUCCESS; + KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); + MmReleasePageOp(PageOp); + return(STATUS_SUCCESS); + } + + /* * If necessary, allocate an entry in the paging file for this page */ - SwapEntry = MmGetSavedSwapEntryPage(Page); - if (SwapEntry == 0) - { - SwapEntry = MmAllocSwapPage(); - if (SwapEntry == 0) - { - MmShowOutOfSpaceMessagePagingFile(); - MmEnableVirtualMapping(Process, Address); - PageOp->Status = STATUS_UNSUCCESSFUL; - KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); - MmReleasePageOp(PageOp); - return(STATUS_PAGEFILE_QUOTA); - } - } - - /* + SwapEntry = MmGetSavedSwapEntryPage(Page); + if (SwapEntry == 0) + { + SwapEntry = MmAllocSwapPage(); + if (SwapEntry == 0) + { + MmShowOutOfSpaceMessagePagingFile(); + MmEnableVirtualMapping(Process, Address); + PageOp->Status = STATUS_UNSUCCESSFUL; + KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); + MmReleasePageOp(PageOp); + return(STATUS_PAGEFILE_QUOTA); + } + } + + /* * Write the page to the pagefile */ - Status = MmWriteToSwapPage(SwapEntry, Page); - if (!NT_SUCCESS(Status)) - { - DPRINT1("MM: Failed to write to swap page (Status was 0x%.8X)\n", - Status); - MmEnableVirtualMapping(Process, Address); - PageOp->Status = STATUS_UNSUCCESSFUL; - KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); - MmReleasePageOp(PageOp); - return(STATUS_UNSUCCESSFUL); - } - - /* + Status = MmWriteToSwapPage(SwapEntry, Page); + if (!NT_SUCCESS(Status)) + { + DPRINT1("MM: Failed to write to swap page (Status was 0x%.8X)\n", + Status); + MmEnableVirtualMapping(Process, Address); + PageOp->Status = STATUS_UNSUCCESSFUL; + KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); + MmReleasePageOp(PageOp); + return(STATUS_UNSUCCESSFUL); + } + + /* * Otherwise we have succeeded, free the page */ - DPRINT("MM: Swapped out virtual memory page 0x%.8X!\n", Page << PAGE_SHIFT); - MmLockAddressSpace(AddressSpace); - MmDeleteVirtualMapping(Process, Address, FALSE, NULL, NULL); - MmCreatePageFileMapping(Process, Address, SwapEntry); - MmUnlockAddressSpace(AddressSpace); - MmDeleteAllRmaps(Page, NULL, NULL); - MmSetSavedSwapEntryPage(Page, 0); - MmReleasePageMemoryConsumer(MC_USER, Page); - PageOp->Status = STATUS_SUCCESS; - KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); - MmReleasePageOp(PageOp); - return(STATUS_SUCCESS); + DPRINT("MM: Swapped out virtual memory page 0x%.8X!\n", Page << PAGE_SHIFT); + MmLockAddressSpace(AddressSpace); + MmDeleteVirtualMapping(Process, Address, FALSE, NULL, NULL); + MmCreatePageFileMapping(Process, Address, SwapEntry); + MmUnlockAddressSpace(AddressSpace); + MmDeleteAllRmaps(Page, NULL, NULL); + MmSetSavedSwapEntryPage(Page, 0); + MmReleasePageMemoryConsumer(MC_USER, Page); + PageOp->Status = STATUS_SUCCESS; + KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); + MmReleasePageOp(PageOp); + return(STATUS_SUCCESS); } NTSTATUS NTAPI MmNotPresentFaultVirtualMemory(PMMSUPPORT AddressSpace, - MEMORY_AREA* MemoryArea, - PVOID Address) + MEMORY_AREA* MemoryArea, + PVOID Address) /* - * FUNCTION: Move data into memory to satisfy a page not present fault - * ARGUMENTS: - * AddressSpace = Address space within which the fault occurred - * MemoryArea = The memory area within which the fault occurred - * Address = The absolute address of fault - * RETURNS: Status - * NOTES: This function is called with the address space lock held. - */ +* FUNCTION: Move data into memory to satisfy a page not present fault +* ARGUMENTS: +* AddressSpace = Address space within which the fault occurred +* MemoryArea = The memory area within which the fault occurred +* Address = The absolute address of fault +* RETURNS: Status +* NOTES: This function is called with the address space lock held. +*/ { - PFN_NUMBER Page; - NTSTATUS Status; - PMM_REGION Region; - PMM_PAGEOP PageOp; - PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); + PFN_NUMBER Page; + NTSTATUS Status; + PMM_REGION Region; + PMM_PAGEOP PageOp; + PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); - /* + /* * There is a window between taking the page fault and locking the * address space when another thread could load the page so we check * that. */ - if (MmIsPagePresent(NULL, Address)) - { - return(STATUS_SUCCESS); - } - - /* + if (MmIsPagePresent(NULL, Address)) + { + return(STATUS_SUCCESS); + } + + /* * Check for the virtual memory area being deleted. */ - if (MemoryArea->DeleteInProgress) - { - return(STATUS_UNSUCCESSFUL); - } - - /* + if (MemoryArea->DeleteInProgress) + { + return(STATUS_UNSUCCESSFUL); + } + + /* * Get the segment corresponding to the virtual address */ - Region = MmFindRegion(MemoryArea->StartingAddress, - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - Address, NULL); - - if (Region->Type == MEM_RESERVE || Region->Protect == PAGE_NOACCESS) - { - return(STATUS_ACCESS_VIOLATION); - } - - /* + Region = MmFindRegion(MemoryArea->StartingAddress, + &MemoryArea->Data.VirtualMemoryData.RegionListHead, + Address, NULL); + + if (Region->Type == MEM_RESERVE || Region->Protect == PAGE_NOACCESS) + { + return(STATUS_ACCESS_VIOLATION); + } + + /* * FIXME */ if (Region->Protect & PAGE_GUARD) @@ -216,230 +216,230 @@ return(STATUS_GUARD_PAGE_VIOLATION); } - /* + /* * Get or create a page operation */ - PageOp = MmGetPageOp(MemoryArea, Process->UniqueProcessId, - (PVOID)PAGE_ROUND_DOWN(Address), NULL, 0, - MM_PAGEOP_PAGEIN, FALSE); - if (PageOp == NULL) - { - DPRINT1("MmGetPageOp failed"); - KeBugCheck(MEMORY_MANAGEMENT); - } - - /* + PageOp = MmGetPageOp(MemoryArea, Process->UniqueProcessId, + (PVOID)PAGE_ROUND_DOWN(Address), NULL, 0, + MM_PAGEOP_PAGEIN, FALSE); + if (PageOp == NULL) + { + DPRINT1("MmGetPageOp failed"); + KeBugCheck(MEMORY_MANAGEMENT); + } + + /* * Check if someone else is already handling this fault, if so wait * for them */ - if (PageOp->Thread != PsGetCurrentThread()) - { - MmUnlockAddressSpace(AddressSpace); - Status = KeWaitForSingleObject(&PageOp->CompletionEvent, - 0, - KernelMode, - FALSE, - NULL); - /* - * Check for various strange conditions - */ - if (Status != STATUS_SUCCESS) - { - DPRINT1("Failed to wait for page op\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - if (PageOp->Status == STATUS_PENDING) - { - DPRINT1("Woke for page op before completion\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } - /* - * If this wasn't a pagein then we need to restart the handling - */ - if (PageOp->OpType != MM_PAGEOP_PAGEIN) - { - MmLockAddressSpace(AddressSpace); - KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); - MmReleasePageOp(PageOp); - return(STATUS_MM_RESTART_OPERATION); - } - /* - * If the thread handling this fault has failed then we don't retry - */ - if (!NT_SUCCESS(PageOp->Status)) - { - MmLockAddressSpace(AddressSpace); - KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); - Status = PageOp->Status; - MmReleasePageOp(PageOp); - return(Status); - } - MmLockAddressSpace(AddressSpace); - KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); - MmReleasePageOp(PageOp); - return(STATUS_SUCCESS); - } - - /* + if (PageOp->Thread != PsGetCurrentThread()) + { + MmUnlockAddressSpace(AddressSpace); + Status = KeWaitForSingleObject(&PageOp->CompletionEvent, + 0, + KernelMode, + FALSE, + NULL); + /* + * Check for various strange conditions + */ + if (Status != STATUS_SUCCESS) + { + DPRINT1("Failed to wait for page op\n"); + KeBugCheck(MEMORY_MANAGEMENT); + } + if (PageOp->Status == STATUS_PENDING) + { + DPRINT1("Woke for page op before completion\n"); + KeBugCheck(MEMORY_MANAGEMENT); + } + /* + * If this wasn't a pagein then we need to restart the handling + */ + if (PageOp->OpType != MM_PAGEOP_PAGEIN) + { + MmLockAddressSpace(AddressSpace); + KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); + MmReleasePageOp(PageOp); + return(STATUS_MM_RESTART_OPERATION); + } + /* + * If the thread handling this fault has failed then we don't retry + */ + if (!NT_SUCCESS(PageOp->Status)) + { + MmLockAddressSpace(AddressSpace); + KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); + Status = PageOp->Status; + MmReleasePageOp(PageOp); + return(Status); + } + MmLockAddressSpace(AddressSpace); + KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); + MmReleasePageOp(PageOp); + return(STATUS_SUCCESS); + } + + /* * Try to allocate a page */ - MI_SET_USAGE(MI_USAGE_VAD); - MI_SET_PROCESS2(Process->ImageFileName); - Status = MmRequestPageMemoryConsumer(MC_USER, FALSE, &Page); - if (Status == STATUS_NO_MEMORY) - { - MmUnlockAddressSpace(AddressSpace); - Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); - MmLockAddressSpace(AddressSpace); - } - if (!NT_SUCCESS(Status)) - { - DPRINT1("MmRequestPageMemoryConsumer failed, status = %x\n", Status); - KeBugCheck(MEMORY_MANAGEMENT); - } - - /* + MI_SET_USAGE(MI_USAGE_VAD); + MI_SET_PROCESS2(Process->ImageFileName); + Status = MmRequestPageMemoryConsumer(MC_USER, FALSE, &Page); + if (Status == STATUS_NO_MEMORY) + { + MmUnlockAddressSpace(AddressSpace); + Status = MmRequestPageMemoryConsumer(MC_USER, TRUE, &Page); + MmLockAddressSpace(AddressSpace); + } + if (!NT_SUCCESS(Status)) + { + DPRINT1("MmRequestPageMemoryConsumer failed, status = %x\n", Status); + KeBugCheck(MEMORY_MANAGEMENT); + } + + /* * Handle swapped out pages. */ - if (MmIsPageSwapEntry(NULL, Address)) - { - SWAPENTRY SwapEntry; - - MmDeletePageFileMapping(Process, Address, &SwapEntry); - Status = MmReadFromSwapPage(SwapEntry, Page); - if (!NT_SUCCESS(Status)) - { - KeBugCheck(MEMORY_MANAGEMENT); - } - MmSetSavedSwapEntryPage(Page, SwapEntry); - } - - /* + if (MmIsPageSwapEntry(NULL, Address)) + { + SWAPENTRY SwapEntry; + + MmDeletePageFileMapping(Process, Address, &SwapEntry); + Status = MmReadFromSwapPage(SwapEntry, Page); + if (!NT_SUCCESS(Status)) + { + KeBugCheck(MEMORY_MANAGEMENT); + } + MmSetSavedSwapEntryPage(Page, SwapEntry); + } + + /* * Set the page. If we fail because we are out of memory then * try again */ - Status = MmCreateVirtualMapping(Process, - (PVOID)PAGE_ROUND_DOWN(Address), - Region->Protect, - &Page, - 1); - while (Status == STATUS_NO_MEMORY) - { - MmUnlockAddressSpace(AddressSpace); - Status = MmCreateVirtualMapping(Process, - Address, - Region->Protect, - &Page, - 1); - MmLockAddressSpace(AddressSpace); - } - if (!NT_SUCCESS(Status)) - { - DPRINT1("MmCreateVirtualMapping failed, not out of memory\n"); - KeBugCheck(MEMORY_MANAGEMENT); - return(Status); - } - - /* + Status = MmCreateVirtualMapping(Process, + (PVOID)PAGE_ROUND_DOWN(Address), + Region->Protect, + &Page, + 1); + while (Status == STATUS_NO_MEMORY) + { + MmUnlockAddressSpace(AddressSpace); + Status = MmCreateVirtualMapping(Process, + Address, + Region->Protect, + &Page, + 1); + MmLockAddressSpace(AddressSpace); + } + if (!NT_SUCCESS(Status)) + { + DPRINT1("MmCreateVirtualMapping failed, not out of memory\n"); + KeBugCheck(MEMORY_MANAGEMENT); + return(Status); + } + + /* * Add the page to the process's working set */ - MmInsertRmap(Page, Process, (PVOID)PAGE_ROUND_DOWN(Address)); - - /* + MmInsertRmap(Page, Process, (PVOID)PAGE_ROUND_DOWN(Address)); + + /* * Finish the operation */ - PageOp->Status = STATUS_SUCCESS; - KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); - MmReleasePageOp(PageOp); - return(STATUS_SUCCESS); + PageOp->Status = STATUS_SUCCESS; + KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); + MmReleasePageOp(PageOp); + return(STATUS_SUCCESS); } static VOID MmModifyAttributes(PMMSUPPORT AddressSpace, - PVOID BaseAddress, - SIZE_T RegionSize, - ULONG OldType, - ULONG OldProtect, - ULONG NewType, - ULONG NewProtect) + PVOID BaseAddress, + SIZE_T RegionSize, + ULONG OldType, + ULONG OldProtect, + ULONG NewType, + ULONG NewProtect) /* - * FUNCTION: Modify the attributes of a memory region - */ +* FUNCTION: Modify the attributes of a memory region +*/ { - PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); + PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); - /* + /* * If we are switching a previously committed region to reserved then * free any allocated pages within the region */ - if (NewType == MEM_RESERVE && OldType == MEM_COMMIT) - { - ULONG i; - - for (i=0; i < PAGE_ROUND_UP(RegionSize)/PAGE_SIZE; i++) - { - PFN_NUMBER Page; - - if (MmIsPageSwapEntry(Process, - (char*)BaseAddress + (i * PAGE_SIZE))) - { - SWAPENTRY SwapEntry; - - MmDeletePageFileMapping(Process, - (char*)BaseAddress + (i * PAGE_SIZE), - &SwapEntry); - MmFreeSwapPage(SwapEntry); - } - else - { - MmDeleteVirtualMapping(Process, - (char*)BaseAddress + (i*PAGE_SIZE), - FALSE, NULL, &Page); - if (Page != 0) + if (NewType == MEM_RESERVE && OldType == MEM_COMMIT) + { + ULONG i; + + for (i=0; i < PAGE_ROUND_UP(RegionSize)/PAGE_SIZE; i++) + { + PFN_NUMBER Page; + + if (MmIsPageSwapEntry(Process, + (char*)BaseAddress + (i * PAGE_SIZE))) { - SWAPENTRY SavedSwapEntry; - SavedSwapEntry = MmGetSavedSwapEntryPage(Page); - if (SavedSwapEntry != 0) - { - MmFreeSwapPage(SavedSwapEntry); - MmSetSavedSwapEntryPage(Page, 0); - } - MmDeleteRmap(Page, Process, - (char*)BaseAddress + (i * PAGE_SIZE)); - MmReleasePageMemoryConsumer(MC_USER, Page); + SWAPENTRY SwapEntry; + + MmDeletePageFileMapping(Process, + (char*)BaseAddress + (i * PAGE_SIZE), + &SwapEntry); + MmFreeSwapPage(SwapEntry); } - } - } - } - - /* + else + { + MmDeleteVirtualMapping(Process, + (char*)BaseAddress + (i*PAGE_SIZE), + FALSE, NULL, &Page); + if (Page != 0) + { + SWAPENTRY SavedSwapEntry; + SavedSwapEntry = MmGetSavedSwapEntryPage(Page); + if (SavedSwapEntry != 0) + { + MmFreeSwapPage(SavedSwapEntry); + MmSetSavedSwapEntryPage(Page, 0); + } + MmDeleteRmap(Page, Process, + (char*)BaseAddress + (i * PAGE_SIZE)); + MmReleasePageMemoryConsumer(MC_USER, Page); + } + } + } + } + + /* * If we are changing the protection attributes of a committed region then * alter the attributes for any allocated pages within the region */ - if (NewType == MEM_COMMIT && OldType == MEM_COMMIT && - OldProtect != NewProtect) - { - ULONG i; - - for (i=0; i < PAGE_ROUND_UP(RegionSize)/PAGE_SIZE; i++) - { - if (MmIsPagePresent(Process, - (char*)BaseAddress + (i*PAGE_SIZE))) - { - MmSetPageProtect(Process, - (char*)BaseAddress + (i*PAGE_SIZE), - NewProtect); - } - } - } + if (NewType == MEM_COMMIT && OldType == MEM_COMMIT && + OldProtect != NewProtect) + { + ULONG i; + + for (i=0; i < PAGE_ROUND_UP(RegionSize)/PAGE_SIZE; i++) + { + if (MmIsPagePresent(Process, + (char*)BaseAddress + (i*PAGE_SIZE))) + { + MmSetPageProtect(Process, + (char*)BaseAddress + (i*PAGE_SIZE), + NewProtect); + } + } + } } NTSTATUS NTAPI MiProtectVirtualMemory(IN PEPROCESS Process, - IN OUT PVOID *BaseAddress, - IN OUT PSIZE_T NumberOfBytesToProtect, - IN ULONG NewAccessProtection, - OUT PULONG OldAccessProtection OPTIONAL) + IN OUT PVOID *BaseAddress, + IN OUT PSIZE_T NumberOfBytesToProtect, + IN ULONG NewAccessProtection, + OUT PULONG OldAccessProtection OPTIONAL) { PMEMORY_AREA MemoryArea; PMMSUPPORT AddressSpace; @@ -462,20 +462,20 @@ } if (OldAccessProtection == NULL) - OldAccessProtection = &OldAccessProtection_; + OldAccessProtection = &OldAccessProtection_; if (MemoryArea->Type == MEMORY_AREA_VIRTUAL_MEMORY) { Status = MmProtectAnonMem(AddressSpace, MemoryArea, *BaseAddress, - *NumberOfBytesToProtect, NewAccessProtection, - OldAccessProtection); + *NumberOfBytesToProtect, NewAccessProtection, + OldAccessProtection); } else if (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) { Status = MmProtectSectionView(AddressSpace, MemoryArea, *BaseAddress, - *NumberOfBytesToProtect, - NewAccessProtection, - OldAccessProtection); + *NumberOfBytesToProtect, + NewAccessProtection, + OldAccessProtection); } else { @@ -489,28 +489,28 @@ } /* - * @implemented - */ +* @implemented +*/ NTSTATUS NTAPI NtAllocateVirtualMemory(IN HANDLE ProcessHandle, - IN OUT PVOID* UBaseAddress, - IN ULONG_PTR ZeroBits, - IN OUT PSIZE_T URegionSize, - IN ULONG AllocationType, - IN ULONG Protect) + IN OUT PVOID* UBaseAddress, + IN ULONG_PTR ZeroBits, + IN OUT PSIZE_T URegionSize, + IN ULONG AllocationType, + IN ULONG Protect) { - PEPROCESS Process; - MEMORY_AREA* MemoryArea; - ULONG_PTR MemoryAreaLength; - ULONG Type; - NTSTATUS Status; - PMMSUPPORT AddressSpace; - PVOID BaseAddress; - ULONG RegionSize; - PVOID PBaseAddress; - ULONG_PTR PRegionSize; - PHYSICAL_ADDRESS BoundaryAddressMultiple; + PEPROCESS Process; + MEMORY_AREA* MemoryArea; + ULONG_PTR MemoryAreaLength; + ULONG Type; + NTSTATUS Status; + PMMSUPPORT AddressSpace; + PVOID BaseAddress; + ULONG RegionSize; + PVOID PBaseAddress; + ULONG_PTR PRegionSize; + PHYSICAL_ADDRESS BoundaryAddressMultiple; PEPROCESS CurrentProcess = PsGetCurrentProcess(); KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); KAPC_STATE ApcState; @@ -528,7 +528,7 @@ /* Check for valid Allocation Types */ if ((AllocationType & ~(MEM_COMMIT | MEM_RESERVE | MEM_RESET | MEM_PHYSICAL | - MEM_TOP_DOWN | MEM_WRITE_WATCH))) + MEM_TOP_DOWN | MEM_WRITE_WATCH))) { DPRINT1("Invalid Allocation Type\n"); return STATUS_INVALID_PARAMETER_5; @@ -659,11 +659,11 @@ { /* Reference the handle for correct permissions */ Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_OPERATION, - PsProcessType, - PreviousMode, - (PVOID*)&Process, - NULL); + PROCESS_VM_OPERATION, + PsProcessType, + PreviousMode, + (PVOID*)&Process, + NULL); if (!NT_SUCCESS(Status)) return Status; /* Check if not running in the current process */ @@ -688,297 +688,297 @@ } } - BaseAddress = (PVOID)PAGE_ROUND_DOWN(PBaseAddress); - RegionSize = PAGE_ROUND_UP((ULONG_PTR)PBaseAddress + PRegionSize) - - PAGE_ROUND_DOWN(PBaseAddress); - - - /* + BaseAddress = (PVOID)PAGE_ROUND_DOWN(PBaseAddress); + RegionSize = PAGE_ROUND_UP((ULONG_PTR)PBaseAddress + PRegionSize) - + PAGE_ROUND_DOWN(PBaseAddress); + + + /* * Copy on Write is reserved for system use. This case is a certain failure * but there may be other cases...needs more testing */ - if ((!BaseAddress || (AllocationType & MEM_RESERVE)) && - (Protect & (PAGE_WRITECOPY | PAGE_EXECUTE_WRITECOPY))) - { - DPRINT1("Copy on write is not supported by VirtualAlloc\n"); - return STATUS_INVALID_PAGE_PROTECTION; - } - - Type = (AllocationType & MEM_COMMIT) ? MEM_COMMIT : MEM_RESERVE; - DPRINT("Type %x\n", Type); - - AddressSpace = &Process->Vm; - MmLockAddressSpace(AddressSpace); - - if (PBaseAddress != 0) - { - MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); - - if (MemoryArea != NULL) - { - MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - - (ULONG_PTR)MemoryArea->StartingAddress; - - if (((ULONG_PTR)BaseAddress + RegionSize) > (ULONG_PTR)MemoryArea->EndingAddress) - { - DPRINT("BaseAddress + RegionSize %x is larger than MemoryArea's EndingAddress %x\n", - (ULONG_PTR)BaseAddress + RegionSize, MemoryArea->EndingAddress); - - MmUnlockAddressSpace(AddressSpace); - if (Attached) KeUnstackDetachProcess(&ApcState); - if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); - return STATUS_MEMORY_NOT_ALLOCATED; - } - - if (AllocationType == MEM_RESET) - { - if (MmIsPagePresent(Process, BaseAddress)) + if ((!BaseAddress || (AllocationType & MEM_RESERVE)) && + (Protect & (PAGE_WRITECOPY | PAGE_EXECUTE_WRITECOPY))) + { + DPRINT1("Copy on write is not supported by VirtualAlloc\n"); + return STATUS_INVALID_PAGE_PROTECTION; + } + + Type = (AllocationType & MEM_COMMIT) ? MEM_COMMIT : MEM_RESERVE; + DPRINT("Type %x\n", Type); + + AddressSpace = &Process->Vm; + MmLockAddressSpace(AddressSpace); + + if (PBaseAddress != 0) + { + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); + + if (MemoryArea != NULL) + { + MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - + (ULONG_PTR)MemoryArea->StartingAddress; + + if (((ULONG_PTR)BaseAddress + RegionSize) > (ULONG_PTR)MemoryArea->EndingAddress) { - /* FIXME: mark pages as not modified */ + DPRINT("BaseAddress + RegionSize %x is larger than MemoryArea's EndingAddress %x\n", + (ULONG_PTR)BaseAddress + RegionSize, MemoryArea->EndingAddress); + + MmUnlockAddressSpace(AddressSpace); + if (Attached) KeUnstackDetachProcess(&ApcState); + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); + return STATUS_MEMORY_NOT_ALLOCATED; + } + + if (AllocationType == MEM_RESET) + { + if (MmIsPagePresent(Process, BaseAddress)) + { + /* FIXME: mark pages as not modified */ + } + else + { + /* FIXME: if pages are in paging file discard them and bring in pages of zeros */ + } + + MmUnlockAddressSpace(AddressSpace); + if (Attached) KeUnstackDetachProcess(&ApcState); + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); + + /* MEM_RESET does not modify any attributes of region */ + return STATUS_SUCCESS; + } + + if (MemoryArea->Type == MEMORY_AREA_VIRTUAL_MEMORY && + MemoryAreaLength >= RegionSize) + { + Status = + MmAlterRegion(AddressSpace, + MemoryArea->StartingAddress, + &MemoryArea->Data.VirtualMemoryData.RegionListHead, + BaseAddress, RegionSize, + Type, Protect, MmModifyAttributes); + MmUnlockAddressSpace(AddressSpace); + if (Attached) KeUnstackDetachProcess(&ApcState); + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); + DPRINT("NtAllocateVirtualMemory() = %x\n",Status); + + /* Give the caller rounded BaseAddress and area length */ + if (NT_SUCCESS(Status)) + { + *UBaseAddress = BaseAddress; + *URegionSize = RegionSize; + DPRINT("*UBaseAddress %x *URegionSize %x\n", BaseAddress, RegionSize); + } + + return(Status); + } + else if (MemoryAreaLength >= RegionSize) + { + /* Region list initialized? */ + if (MemoryArea->Data.SectionData.RegionListHead.Flink) + { + Status = + MmAlterRegion(AddressSpace, + MemoryArea->StartingAddress, + &MemoryArea->Data.SectionData.RegionListHead, + BaseAddress, RegionSize, + Type, Protect, MmModifyAttributes); + } + else + { + Status = STATUS_ACCESS_VIOLATION; + } + + MmUnlockAddressSpace(AddressSpace); + if (Attached) KeUnstackDetachProcess(&ApcState); + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); + DPRINT("NtAllocateVirtualMemory() = %x\n",Status); + + /* Give the caller rounded BaseAddress and area length */ + if (NT_SUCCESS(Status)) + { + *UBaseAddress = BaseAddress; + *URegionSize = RegionSize; + DPRINT("*UBaseAddress %x *URegionSize %x\n", BaseAddress, RegionSize); + } + + return(Status); } else { - /* FIXME: if pages are in paging file discard them and bring in pages of zeros */ + MmUnlockAddressSpace(AddressSpace); + if (Attached) KeUnstackDetachProcess(&ApcState); + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); + return(STATUS_UNSUCCESSFUL); } - - MmUnlockAddressSpace(AddressSpace); - if (Attached) KeUnstackDetachProcess(&ApcState); - if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); - - /* MEM_RESET does not modify any attributes of region */ - return STATUS_SUCCESS; - } - - if (MemoryArea->Type == MEMORY_AREA_VIRTUAL_MEMORY && - MemoryAreaLength >= RegionSize) - { - Status = - MmAlterRegion(AddressSpace, - MemoryArea->StartingAddress, - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - BaseAddress, RegionSize, - Type, Protect, MmModifyAttributes); - MmUnlockAddressSpace(AddressSpace); - if (Attached) KeUnstackDetachProcess(&ApcState); - if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); - DPRINT("NtAllocateVirtualMemory() = %x\n",Status); - - /* Give the caller rounded BaseAddress and area length */ - if (NT_SUCCESS(Status)) - { - *UBaseAddress = BaseAddress; - *URegionSize = RegionSize; - DPRINT("*UBaseAddress %x *URegionSize %x\n", BaseAddress, RegionSize); - } - - return(Status); - } - else if (MemoryAreaLength >= RegionSize) - { - /* Region list initialized? */ - if (MemoryArea->Data.SectionData.RegionListHead.Flink) - { - Status = - MmAlterRegion(AddressSpace, - MemoryArea->StartingAddress, - &MemoryArea->Data.SectionData.RegionListHead, - BaseAddress, RegionSize, - Type, Protect, MmModifyAttributes); - } - else - { - Status = STATUS_ACCESS_VIOLATION; - } - - MmUnlockAddressSpace(AddressSpace); - if (Attached) KeUnstackDetachProcess(&ApcState); - if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); - DPRINT("NtAllocateVirtualMemory() = %x\n",Status); - - /* Give the caller rounded BaseAddress and area length */ - if (NT_SUCCESS(Status)) - { - *UBaseAddress = BaseAddress; - *URegionSize = RegionSize; - DPRINT("*UBaseAddress %x *URegionSize %x\n", BaseAddress, RegionSize); - } - - return(Status); - } - else - { - MmUnlockAddressSpace(AddressSpace); - if (Attached) KeUnstackDetachProcess(&ApcState); - if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); - return(STATUS_UNSUCCESSFUL); - } - } - } - - Status = MmCreateMemoryArea(AddressSpace, - MEMORY_AREA_VIRTUAL_MEMORY, - &BaseAddress, - RegionSize, - Protect, - &MemoryArea, - PBaseAddress != 0, - AllocationType & MEM_TOP_DOWN, - BoundaryAddressMultiple); - if (!NT_SUCCESS(Status)) - { - MmUnlockAddressSpace(AddressSpace); - if (Attached) KeUnstackDetachProcess(&ApcState); - if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); - DPRINT("NtAllocateVirtualMemory() = %x\n",Status); - return(Status); - } - - MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - - (ULONG_PTR)MemoryArea->StartingAddress; - - MmInitializeRegion(&MemoryArea->Data.VirtualMemoryData.RegionListHead, - MemoryAreaLength, Type, Protect); - - if ((AllocationType & MEM_COMMIT) && - (Protect & (PAGE_READWRITE | PAGE_EXECUTE_READWRITE))) - { - const ULONG nPages = PAGE_ROUND_UP(MemoryAreaLength) >> PAGE_SHIFT; - MmReserveSwapPages(nPages); - } - - MmUnlockAddressSpace(AddressSpace); - if (Attached) KeUnstackDetachProcess(&ApcState); - if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); - - *UBaseAddress = BaseAddress; - *URegionSize = MemoryAreaLength; - DPRINT("*UBaseAddress %x *URegionSize %x\n", BaseAddress, RegionSize); - - return(STATUS_SUCCESS); + } + } + + Status = MmCreateMemoryArea(AddressSpace, + MEMORY_AREA_VIRTUAL_MEMORY, + &BaseAddress, + RegionSize, + Protect, + &MemoryArea, + PBaseAddress != 0, + AllocationType & MEM_TOP_DOWN, + BoundaryAddressMultiple); + if (!NT_SUCCESS(Status)) + { + MmUnlockAddressSpace(AddressSpace); + if (Attached) KeUnstackDetachProcess(&ApcState); + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); + DPRINT("NtAllocateVirtualMemory() = %x\n",Status); + return(Status); + } + + MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - + (ULONG_PTR)MemoryArea->StartingAddress; + + MmInitializeRegion(&MemoryArea->Data.VirtualMemoryData.RegionListHead, + MemoryAreaLength, Type, Protect); + + if ((AllocationType & MEM_COMMIT) && + (Protect & (PAGE_READWRITE | PAGE_EXECUTE_READWRITE))) + { + const ULONG nPages = PAGE_ROUND_UP(MemoryAreaLength) >> PAGE_SHIFT; + MmReserveSwapPages(nPages); + } + + MmUnlockAddressSpace(AddressSpace); + if (Attached) KeUnstackDetachProcess(&ApcState); + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); + + *UBaseAddress = BaseAddress; + *URegionSize = MemoryAreaLength; + DPRINT("*UBaseAddress %x *URegionSize %x\n", BaseAddress, RegionSize); + + return(STATUS_SUCCESS); } static VOID MmFreeVirtualMemoryPage(PVOID Context, - MEMORY_AREA* MemoryArea, - PVOID Address, - PFN_NUMBER Page, - SWAPENTRY SwapEntry, - BOOLEAN Dirty) + MEMORY_AREA* MemoryArea, + PVOID Address, + PFN_NUMBER Page, + SWAPENTRY SwapEntry, + BOOLEAN Dirty) { - PEPROCESS Process = (PEPROCESS)Context; - - if (Page != 0) - { - SWAPENTRY SavedSwapEntry; - SavedSwapEntry = MmGetSavedSwapEntryPage(Page); - if (SavedSwapEntry != 0) - { - MmFreeSwapPage(SavedSwapEntry); - MmSetSavedSwapEntryPage(Page, 0); - } - MmDeleteRmap(Page, Process, Address); - MmReleasePageMemoryConsumer(MC_USER, Page); - } - else if (SwapEntry != 0) - { - MmFreeSwapPage(SwapEntry); - } + PEPROCESS Process = (PEPROCESS)Context; + + if (Page != 0) + { + SWAPENTRY SavedSwapEntry; + SavedSwapEntry = MmGetSavedSwapEntryPage(Page); + if (SavedSwapEntry != 0) + { + MmFreeSwapPage(SavedSwapEntry); + MmSetSavedSwapEntryPage(Page, 0); + } + MmDeleteRmap(Page, Process, Address); + MmReleasePageMemoryConsumer(MC_USER, Page); + } + else if (SwapEntry != 0) + { + MmFreeSwapPage(SwapEntry); + } } VOID NTAPI MmFreeVirtualMemory(PEPROCESS Process, - PMEMORY_AREA MemoryArea) + PMEMORY_AREA MemoryArea) { - PLIST_ENTRY current_entry; - PMM_REGION current; - ULONG i; - - DPRINT("MmFreeVirtualMemory(Process %p MemoryArea %p)\n", Process, - MemoryArea); - - /* Mark this memory area as about to be deleted. */ - MemoryArea->DeleteInProgress = TRUE; - - /* + PLIST_ENTRY current_entry; + PMM_REGION current; + ULONG i; + + DPRINT("MmFreeVirtualMemory(Process %p MemoryArea %p)\n", Process, + MemoryArea); + + /* Mark this memory area as about to be deleted. */ + MemoryArea->DeleteInProgress = TRUE; + + /* * Wait for any ongoing paging operations. Notice that since we have * flagged this memory area as deleted no more page ops will be added. */ - if (MemoryArea->PageOpCount > 0) - { - ULONG_PTR MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - - (ULONG_PTR)MemoryArea->StartingAddress; - const ULONG nPages = PAGE_ROUND_UP(MemoryAreaLength) >> PAGE_SHIFT; - - for (i = 0; i < nPages && MemoryArea->PageOpCount != 0; ++i) - { - PMM_PAGEOP PageOp; - PageOp = MmCheckForPageOp(MemoryArea, Process->UniqueProcessId, - (PVOID)((ULONG_PTR)MemoryArea->StartingAddress + (i * PAGE_SIZE)), - NULL, 0); - if (PageOp != NULL) - { - NTSTATUS Status; - MmUnlockAddressSpace(&Process->Vm); - Status = KeWaitForSingleObject(&PageOp->CompletionEvent, - 0, - KernelMode, - FALSE, - NULL); - if (Status != STATUS_SUCCESS) + if (MemoryArea->PageOpCount > 0) + { + ULONG_PTR MemoryAreaLength = (ULONG_PTR)MemoryArea->EndingAddress - + (ULONG_PTR)MemoryArea->StartingAddress; + const ULONG nPages = PAGE_ROUND_UP(MemoryAreaLength) >> PAGE_SHIFT; + + for (i = 0; i < nPages && MemoryArea->PageOpCount != 0; ++i) + { + PMM_PAGEOP PageOp; + PageOp = MmCheckForPageOp(MemoryArea, Process->UniqueProcessId, + (PVOID)((ULONG_PTR)MemoryArea->StartingAddress + (i * PAGE_SIZE)), + NULL, 0); + if (PageOp != NULL) { - DPRINT1("Failed to wait for page op\n"); - KeBugCheck(MEMORY_MANAGEMENT); + NTSTATUS Status; + MmUnlockAddressSpace(&Process->Vm); + Status = KeWaitForSingleObject(&PageOp->CompletionEvent, + 0, + KernelMode, + FALSE, + NULL); + if (Status != STATUS_SUCCESS) + { + DPRINT1("Failed to wait for page op\n"); + KeBugCheck(MEMORY_MANAGEMENT); + } + MmLockAddressSpace(&Process->Vm); + MmReleasePageOp(PageOp); } - MmLockAddressSpace(&Process->Vm); - MmReleasePageOp(PageOp); - } - } - } - - /* Free all the individual segments. */ - current_entry = MemoryArea->Data.VirtualMemoryData.RegionListHead.Flink; - while (current_entry != &MemoryArea->Data.VirtualMemoryData.RegionListHead) - { - current = CONTAINING_RECORD(current_entry, MM_REGION, RegionListEntry); - current_entry = current_entry->Flink; - ExFreePool(current); - } - - /* Actually free the memory area. */ - MmFreeMemoryArea(&Process->Vm, - MemoryArea, - MmFreeVirtualMemoryPage, - (PVOID)Process); + } + } + + /* Free all the individual segments. */ + current_entry = MemoryArea->Data.VirtualMemoryData.RegionListHead.Flink; + while (current_entry != &MemoryArea->Data.VirtualMemoryData.RegionListHead) + { + current = CONTAINING_RECORD(current_entry, MM_REGION, RegionListEntry); + current_entry = current_entry->Flink; + ExFreePool(current); + } + + /* Actually free the memory area. */ + MmFreeMemoryArea(&Process->Vm, + MemoryArea, + MmFreeVirtualMemoryPage, + (PVOID)Process); } /* - * @implemented - */ +* @implemented +*/ NTSTATUS NTAPI NtFreeVirtualMemory(IN HANDLE ProcessHandle, - IN PVOID* UBaseAddress, - IN PSIZE_T URegionSize, - IN ULONG FreeType) + IN PVOID* UBaseAddress, + IN PSIZE_T URegionSize, + IN ULONG FreeType) /* - * FUNCTION: Frees a range of virtual memory - * ARGUMENTS: - * ProcessHandle = Points to the process that allocated the virtual - * memory - * BaseAddress = Points to the memory address, rounded down to a - * multiple of the pagesize - * RegionSize = Limits the range to free, rounded up to a multiple of - * the paging size - * FreeType = Can be one of the values: MEM_DECOMMIT, or MEM_RELEASE - * RETURNS: Status - */ +* FUNCTION: Frees a range of virtual memory +* ARGUMENTS: +* ProcessHandle = Points to the process that allocated the virtual +* memory +* BaseAddress = Points to the memory address, rounded down to a +* multiple of the pagesize +* RegionSize = Limits the range to free, rounded up to a multiple of +* the paging size +* FreeType = Can be one of the values: MEM_DECOMMIT, or MEM_RELEASE +* RETURNS: Status +*/ { - MEMORY_AREA* MemoryArea; - NTSTATUS Status; - PEPROCESS Process; - PMMSUPPORT AddressSpace; - PVOID BaseAddress, PBaseAddress; - SIZE_T RegionSize, PRegionSize; + MEMORY_AREA* MemoryArea; + NTSTATUS Status; + PEPROCESS Process; + PMMSUPPORT AddressSpace; + PVOID BaseAddress, PBaseAddress; + SIZE_T RegionSize, PRegionSize; PEPROCESS CurrentProcess = PsGetCurrentProcess(); KPROCESSOR_MODE PreviousMode = KeGetPreviousMode(); KAPC_STATE ApcState; @@ -991,15 +991,15 @@ DPRINT1("Invalid FreeType\n"); return STATUS_INVALID_PARAMETER_4; } - + /* Check if no flag was used, or if both flags were used */ if (!((FreeType & (MEM_DECOMMIT | MEM_RELEASE))) || - ((FreeType & (MEM_DECOMMIT | MEM_RELEASE)) == (MEM_DECOMMIT | MEM_RELEASE))) + ((FreeType & (MEM_DECOMMIT | MEM_RELEASE)) == (MEM_DECOMMIT | MEM_RELEASE))) { DPRINT1("Invalid FreeType combination\n"); return STATUS_INVALID_PARAMETER_4; } - + /* Enter SEH */ _SEH2_TRY { @@ -1010,7 +1010,7 @@ ProbeForWritePointer(UBaseAddress); ProbeForWriteUlong(URegionSize); } - + /* Capture their values */ PBaseAddress = *UBaseAddress; PRegionSize = *URegionSize; @@ -1021,180 +1021,180 @@ _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; - + /* Make sure the allocation isn't past the user area */ if (PBaseAddress >= MM_HIGHEST_USER_ADDRESS) { DPRINT1("Virtual free base above User Space\n"); return STATUS_INVALID_PARAMETER_2; } - - /* Make sure the allocation wouldn't overflow past the user area */ - if (((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (ULONG_PTR)PBaseAddress) < PRegionSize) - { - DPRINT1("Region size would overflow into kernel-memory\n"); - return STATUS_INVALID_PARAMETER_3; - } - - /* Check if this is for the current process */ - if (ProcessHandle == NtCurrentProcess()) - { - /* We already have the current process, no need to go through Ob */ - Process = CurrentProcess; - } - else - { - /* Reference the handle for correct permissions */ - Status = ObReferenceObjectByHandle(ProcessHandle, - PROCESS_VM_OPERATION, - PsProcessType, - PreviousMode, - (PVOID*)&Process, - NULL); - if (!NT_SUCCESS(Status)) return Status; - - /* Check if not running in the current process */ - if (CurrentProcess != Process) - { - /* Attach to it */ - KeStackAttachProcess(&Process->Pcb, &ApcState); - Attached = TRUE; - } - } - - BaseAddress = (PVOID)PAGE_ROUND_DOWN((PBaseAddress)); - RegionSize = PAGE_ROUND_UP((ULONG_PTR)(PBaseAddress) + (PRegionSize)) - - PAGE_ROUND_DOWN((PBaseAddress)); - - AddressSpace = &Process->Vm; - - MmLockAddressSpace(AddressSpace); - MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); - if (MemoryArea == NULL) - { - Status = STATUS_UNSUCCESSFUL; - goto unlock_deref_and_return; - } - - switch (FreeType) - { - case MEM_RELEASE: - /* We can only free a memory area in one step. */ - if (MemoryArea->StartingAddress != BaseAddress || - MemoryArea->Type != MEMORY_AREA_VIRTUAL_MEMORY) - { + + /* Make sure the allocation wouldn't overflow past the user area */ + if (((ULONG_PTR)MM_HIGHEST_USER_ADDRESS - (ULONG_PTR)PBaseAddress) < PRegionSize) + { + DPRINT1("Region size would overflow into kernel-memory\n"); + return STATUS_INVALID_PARAMETER_3; + } + + /* Check if this is for the current process */ + if (ProcessHandle == NtCurrentProcess()) + { + /* We already have the current process, no need to go through Ob */ + Process = CurrentProcess; + } + else + { + /* Reference the handle for correct permissions */ + Status = ObReferenceObjectByHandle(ProcessHandle, + PROCESS_VM_OPERATION, + PsProcessType, + PreviousMode, + (PVOID*)&Process, + NULL); + if (!NT_SUCCESS(Status)) return Status; + + /* Check if not running in the current process */ + if (CurrentProcess != Process) + { + /* Attach to it */ + KeStackAttachProcess(&Process->Pcb, &ApcState); + Attached = TRUE; + } + } + + BaseAddress = (PVOID)PAGE_ROUND_DOWN((PBaseAddress)); + RegionSize = PAGE_ROUND_UP((ULONG_PTR)(PBaseAddress) + (PRegionSize)) - + PAGE_ROUND_DOWN((PBaseAddress)); + + AddressSpace = &Process->Vm; + + MmLockAddressSpace(AddressSpace); + MemoryArea = MmLocateMemoryAreaByAddress(AddressSpace, BaseAddress); + if (MemoryArea == NULL) + { + Status = STATUS_UNSUCCESSFUL; + goto unlock_deref_and_return; + } + + switch (FreeType) + { + case MEM_RELEASE: + /* We can only free a memory area in one step. */ + if (MemoryArea->StartingAddress != BaseAddress || + MemoryArea->Type != MEMORY_AREA_VIRTUAL_MEMORY) + { Status = STATUS_UNSUCCESSFUL; goto unlock_deref_and_return; - } - - MmFreeVirtualMemory(Process, MemoryArea); - Status = STATUS_SUCCESS; - goto unlock_deref_and_return; - - case MEM_DECOMMIT: - Status = - MmAlterRegion(AddressSpace, - MemoryArea->StartingAddress, - (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) ? - &MemoryArea->Data.SectionData.RegionListHead : - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - BaseAddress, - RegionSize, - MEM_RESERVE, - PAGE_NOACCESS, - MmModifyAttributes); - goto unlock_deref_and_return; - } - - Status = STATUS_NOT_IMPLEMENTED; - -unlock_deref_and_return: - - MmUnlockAddressSpace(AddressSpace); - if (Attached) KeUnstackDetachProcess(&ApcState); - if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); - - return(Status); + } + + MmFreeVirtualMemory(Process, MemoryArea); + Status = STATUS_SUCCESS; + goto unlock_deref_and_return; + + case MEM_DECOMMIT: + Status = + MmAlterRegion(AddressSpace, + MemoryArea->StartingAddress, + (MemoryArea->Type == MEMORY_AREA_SECTION_VIEW) ? + &MemoryArea->Data.SectionData.RegionListHead : + &MemoryArea->Data.VirtualMemoryData.RegionListHead, + BaseAddress, + RegionSize, + MEM_RESERVE, + PAGE_NOACCESS, + MmModifyAttributes); + goto unlock_deref_and_return; + } + + Status = STATUS_NOT_IMPLEMENTED; + + unlock_deref_and_return: + + MmUnlockAddressSpace(AddressSpace); + if (Attached) KeUnstackDetachProcess(&ApcState); + if (ProcessHandle != NtCurrentProcess()) ObDereferenceObject(Process); + + return(Status); } NTSTATUS NTAPI MmProtectAnonMem(PMMSUPPORT AddressSpace, - PMEMORY_AREA MemoryArea, - PVOID BaseAddress, - SIZE_T Length, - ULONG Protect, - PULONG OldProtect) + PMEMORY_AREA MemoryArea, + PVOID BaseAddress, + SIZE_T Length, + ULONG Protect, + PULONG OldProtect) { - PMM_REGION Region; - NTSTATUS Status = STATUS_SUCCESS; - ULONG_PTR LengthCount = 0; - - /* Search all Regions in MemoryArea up to Length */ - /* Every Region up to Length must be committed for success */ - for (;;) - { - Region = MmFindRegion(MemoryArea->StartingAddress, - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - (PVOID)((ULONG_PTR)BaseAddress + LengthCount), NULL); - - /* If a Region was found and it is committed */ - if ((Region) && (Region->Type == MEM_COMMIT)) - { - LengthCount += Region->Length; - if (Length <= LengthCount) break; - continue; - } - /* If Region was found and it is not commited */ - else if (Region) - { - Status = STATUS_NOT_COMMITTED; - break; - } - /* If no Region was found at all */ - else if (LengthCount == 0) - { - Status = STATUS_INVALID_ADDRESS; - break; - } - } - - if (NT_SUCCESS(Status)) - { - *OldProtect = Region->Protect; - Status = MmAlterRegion(AddressSpace, MemoryArea->StartingAddress, - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - BaseAddress, Length, Region->Type, Protect, - MmModifyAttributes); - } - - return (Status); + PMM_REGION Region; + NTSTATUS Status = STATUS_SUCCESS; + ULONG_PTR LengthCount = 0; + + /* Search all Regions in MemoryArea up to Length */ + /* Every Region up to Length must be committed for success */ + for (;;) + { + Region = MmFindRegion(MemoryArea->StartingAddress, + &MemoryArea->Data.VirtualMemoryData.RegionListHead, + (PVOID)((ULONG_PTR)BaseAddress + LengthCount), NULL); + + /* If a Region was found and it is committed */ + if ((Region) && (Region->Type == MEM_COMMIT)) + { + LengthCount += Region->Length; + if (Length <= LengthCount) break; + continue; + } + /* If Region was found and it is not commited */ + else if (Region) + { + Status = STATUS_NOT_COMMITTED; + break; + } + /* If no Region was found at all */ + else if (LengthCount == 0) + { + Status = STATUS_INVALID_ADDRESS; + break; + } + } + + if (NT_SUCCESS(Status)) + { + *OldProtect = Region->Protect; + Status = MmAlterRegion(AddressSpace, MemoryArea->StartingAddress, + &MemoryArea->Data.VirtualMemoryData.RegionListHead, + BaseAddress, Length, Region->Type, Protect, + MmModifyAttributes); + } + + return (Status); } NTSTATUS NTAPI MmQueryAnonMem(PMEMORY_AREA MemoryArea, - PVOID Address, - PMEMORY_BASIC_INFORMATION Info, - PSIZE_T ResultLength) + PVOID Address, + PMEMORY_BASIC_INFORMATION Info, + PSIZE_T ResultLength) { - PMM_REGION Region; - PVOID RegionBase = NULL; - - Info->BaseAddress = (PVOID)PAGE_ROUND_DOWN(Address); - - Region = MmFindRegion(MemoryArea->StartingAddress, - &MemoryArea->Data.VirtualMemoryData.RegionListHead, - Address, &RegionBase); - Info->BaseAddress = RegionBase; - Info->AllocationBase = MemoryArea->StartingAddress; - Info->AllocationProtect = MemoryArea->Protect; - Info->RegionSize = Region->Length; - Info->State = Region->Type; - Info->Protect = Region->Protect; - Info->Type = MEM_PRIVATE; - - *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); - return(STATUS_SUCCESS); + PMM_REGION Region; + PVOID RegionBase = NULL; + + Info->BaseAddress = (PVOID)PAGE_ROUND_DOWN(Address); + + Region = MmFindRegion(MemoryArea->StartingAddress, + &MemoryArea->Data.VirtualMemoryData.RegionListHead, + Address, &RegionBase); + Info->BaseAddress = RegionBase; + Info->AllocationBase = MemoryArea->StartingAddress; + Info->AllocationProtect = MemoryArea->Protect; + Info->RegionSize = Region->Length; + Info->State = Region->Type; + Info->Protect = Region->Protect; + Info->Type = MEM_PRIVATE; + + *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); + return(STATUS_SUCCESS); } /* EOF */

1 0

[ion] 54365: [KERNEL32]: Fix mailslot code to use the static unicode string in the TEB for conversion, and correctly handle failure cases to bound names to MAX_PATH as Win32 demands. Also fix timeo...
by ion＠svn.reactos.org 12 Nov '11

12 Nov '11

Author: ion Date: Sat Nov 12 18:28:16 2011 New Revision: 54365 URL: http://svn.reactos.org/svn/reactos?rev=54365&view=rev Log: [KERNEL32]: Fix mailslot code to use the static unicode string in the TEB for conversion, and correctly handle failure cases to bound names to MAX_PATH as Win32 demands. Also fix timeout conversions to use the correct timeout value for infinite timeout. [KERNEL32]: Reformat since 3-space identation is just murder. Modified: trunk/reactos/dll/win32/kernel32/client/file/mailslot.c trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/dll/win32/kernel32/client/file/mailslot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/mailslot.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/mailslot.c [iso-8859-1] Sat Nov 12 18:28:16 2011 @@ -8,216 +8,226 @@ * UPDATE HISTORY: */ -/* INCLUDES *****************************************************************/ +/* INCLUDES *******************************************************************/ #include <k32.h> #define NDEBUG #include <debug.h> -DEBUG_CHANNEL(kernel32file); - -/* FUNCTIONS ****************************************************************/ - -/* - * @implemented - */ -HANDLE WINAPI -CreateMailslotA(LPCSTR lpName, - DWORD nMaxMessageSize, - DWORD lReadTimeout, - LPSECURITY_ATTRIBUTES lpSecurityAttributes) -{ - HANDLE MailslotHandle; - UNICODE_STRING NameU; - ANSI_STRING NameA; - - RtlInitAnsiString(&NameA, (LPSTR)lpName); - RtlAnsiStringToUnicodeString(&NameU, &NameA, TRUE); - - MailslotHandle = CreateMailslotW(NameU.Buffer, - nMaxMessageSize, - lReadTimeout, - lpSecurityAttributes); - - RtlFreeUnicodeString(&NameU); - - return(MailslotHandle); -} - - -/* - * @implemented - */ -HANDLE WINAPI -CreateMailslotW(LPCWSTR lpName, - DWORD nMaxMessageSize, - DWORD lReadTimeout, - LPSECURITY_ATTRIBUTES lpSecurityAttributes) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - UNICODE_STRING MailslotName; - HANDLE MailslotHandle; - NTSTATUS Status; - BOOLEAN Result; - LARGE_INTEGER DefaultTimeOut; - IO_STATUS_BLOCK Iosb; - ULONG Attributes = OBJ_CASE_INSENSITIVE; - PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; - - Result = RtlDosPathNameToNtPathName_U(lpName, - &MailslotName, - NULL, - NULL); - if (!Result) + +/* FUNCTIONS ******************************************************************/ + +/* + * @implemented + */ +HANDLE +WINAPI +CreateMailslotA(IN LPCSTR lpName, + IN DWORD nMaxMessageSize, + IN DWORD lReadTimeout, + IN LPSECURITY_ATTRIBUTES lpSecurityAttributes) +{ + PUNICODE_STRING NameU; + ANSI_STRING NameA; + NTSTATUS Status; + + NameU = &NtCurrentTeb()->StaticUnicodeString; + + RtlInitAnsiString(&NameA, (LPSTR)lpName); + Status = RtlAnsiStringToUnicodeString(NameU, &NameA, FALSE); + if (!NT_SUCCESS(Status)) + { + if (Status == STATUS_BUFFER_OVERFLOW) + { + SetLastError(ERROR_FILENAME_EXCED_RANGE); + } + else + { + BaseSetLastNTError(Status); + } + + return INVALID_HANDLE_VALUE; + } + + return CreateMailslotW(NameU->Buffer, + nMaxMessageSize, + lReadTimeout, + lpSecurityAttributes); +} + +/* + * @implemented + */ +HANDLE +WINAPI +CreateMailslotW(IN LPCWSTR lpName, + IN DWORD nMaxMessageSize, + IN DWORD lReadTimeout, + IN LPSECURITY_ATTRIBUTES lpSecurityAttributes) +{ + OBJECT_ATTRIBUTES ObjectAttributes; + UNICODE_STRING MailslotName; + HANDLE MailslotHandle; + NTSTATUS Status; + BOOLEAN Result; + LARGE_INTEGER DefaultTimeOut; + IO_STATUS_BLOCK Iosb; + ULONG Attributes = OBJ_CASE_INSENSITIVE; + PSECURITY_DESCRIPTOR SecurityDescriptor = NULL; + + Result = RtlDosPathNameToNtPathName_U(lpName, &MailslotName, NULL, NULL); + if (!Result) + { + SetLastError(ERROR_PATH_NOT_FOUND); + return INVALID_HANDLE_VALUE; + } + + DPRINT("Mailslot name: %wZ\n", &MailslotName); + + if (lpSecurityAttributes) + { + SecurityDescriptor = lpSecurityAttributes->lpSecurityDescriptor; + if(lpSecurityAttributes->bInheritHandle) Attributes |= OBJ_INHERIT; + } + + InitializeObjectAttributes(&ObjectAttributes, + &MailslotName, + Attributes, + NULL, + SecurityDescriptor); + + if (lReadTimeout == MAILSLOT_WAIT_FOREVER) + { + /* Set the max */ + DefaultTimeOut.QuadPart = 0xFFFFFFFFFFFFFFFFLL; + } + else + { + /* Convert to NT format */ + DefaultTimeOut.QuadPart = UInt32x32To64(-10000, lReadTimeout); + } + + Status = NtCreateMailslotFile(&MailslotHandle, + GENERIC_READ | SYNCHRONIZE | WRITE_DAC, + &ObjectAttributes, + &Iosb, + FILE_WRITE_THROUGH, + 0, + nMaxMessageSize, + &DefaultTimeOut); + + if ((Status == STATUS_INVALID_DEVICE_REQUEST) || + (Status == STATUS_NOT_SUPPORTED)) + { + Status = STATUS_OBJECT_NAME_INVALID; + } + + RtlFreeHeap(RtlGetProcessHeap(), 0, MailslotName.Buffer); + + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtCreateMailslot failed (Status %x)!\n", Status); + BaseSetLastNTError(Status); + return INVALID_HANDLE_VALUE; + } + + return MailslotHandle; +} + +/* + * @implemented + */ +BOOL +WINAPI +GetMailslotInfo(IN HANDLE hMailslot, + IN LPDWORD lpMaxMessageSize, + IN LPDWORD lpNextSize, + IN LPDWORD lpMessageCount, + IN LPDWORD lpReadTimeout) +{ + FILE_MAILSLOT_QUERY_INFORMATION Buffer; + IO_STATUS_BLOCK Iosb; + NTSTATUS Status; + LARGE_INTEGER Timeout; + + Status = NtQueryInformationFile(hMailslot, + &Iosb, + &Buffer, + sizeof(FILE_MAILSLOT_QUERY_INFORMATION), + FileMailslotQueryInformation); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtQueryInformationFile failed (Status %x)!\n", Status); + BaseSetLastNTError(Status); + return FALSE; + } + + if (lpMaxMessageSize) *lpMaxMessageSize = Buffer.MaximumMessageSize; + if (lpNextSize) *lpNextSize = Buffer.NextMessageSize; + if (lpMessageCount) *lpMessageCount = Buffer.MessagesAvailable; + + if (lpReadTimeout) { - SetLastError(ERROR_PATH_NOT_FOUND); - return(INVALID_HANDLE_VALUE); + if (Buffer.ReadTimeout.QuadPart == 0xFFFFFFFFFFFFFFFFLL) + { + *lpReadTimeout = MAILSLOT_WAIT_FOREVER; + } + else + { + Timeout.QuadPart = -Buffer.ReadTimeout.QuadPart; + Timeout = RtlExtendedLargeIntegerDivide(Timeout, 10000, NULL); + if (Timeout.HighPart == 0) + { + *lpReadTimeout = Timeout.LowPart; + } + else + { + *lpReadTimeout = 0xFFFFFFFE; + } + } } - TRACE("Mailslot name: %wZ\n", &MailslotName); - - if(lpSecurityAttributes) - { - SecurityDescriptor = lpSecurityAttributes->lpSecurityDescriptor; - if(lpSecurityAttributes->bInheritHandle) - Attributes |= OBJ_INHERIT; + return TRUE; +} + +/* + * @implemented + */ +BOOL +WINAPI +SetMailslotInfo(IN HANDLE hMailslot, + IN DWORD lReadTimeout) +{ + FILE_MAILSLOT_SET_INFORMATION Buffer; + LARGE_INTEGER Timeout; + IO_STATUS_BLOCK Iosb; + NTSTATUS Status; + + if (lReadTimeout == MAILSLOT_WAIT_FOREVER) + { + /* Set the max */ + Timeout.QuadPart = 0xFFFFFFFFFFFFFFFFLL; + } + else + { + /* Convert to NT format */ + Timeout.QuadPart = UInt32x32To64(-10000, lReadTimeout); + } + + Buffer.ReadTimeout = &Timeout; + + Status = NtSetInformationFile(hMailslot, + &Iosb, + &Buffer, + sizeof(FILE_MAILSLOT_SET_INFORMATION), + FileMailslotSetInformation); + if (!NT_SUCCESS(Status)) + { + DPRINT1("NtSetInformationFile failed (Status %x)!\n", Status); + BaseSetLastNTError(Status); + return FALSE; } - InitializeObjectAttributes(&ObjectAttributes, - &MailslotName, - Attributes, - NULL, - SecurityDescriptor); - - if (lReadTimeout == MAILSLOT_WAIT_FOREVER) - { - /* Set the max */ - DefaultTimeOut.LowPart = 0; - DefaultTimeOut.HighPart = 0x80000000; - } - else - { - /* Convert to NT format */ - DefaultTimeOut.QuadPart = UInt32x32To64(-10000, lReadTimeout); - } - - Status = NtCreateMailslotFile(&MailslotHandle, - GENERIC_READ | SYNCHRONIZE | WRITE_DAC, - &ObjectAttributes, - &Iosb, - FILE_WRITE_THROUGH, - 0, - nMaxMessageSize, - &DefaultTimeOut); - - if (Status == STATUS_INVALID_DEVICE_REQUEST || Status == STATUS_NOT_SUPPORTED) - { - Status = STATUS_OBJECT_NAME_INVALID; - } - - RtlFreeHeap(RtlGetProcessHeap(), - 0, - MailslotName.Buffer); - - if (!NT_SUCCESS(Status)) - { - WARN("NtCreateMailslot failed (Status %x)!\n", Status); - BaseSetLastNTError (Status); - return(INVALID_HANDLE_VALUE); - } - - return(MailslotHandle); -} - - -/* - * @implemented - */ -BOOL WINAPI -GetMailslotInfo(HANDLE hMailslot, - LPDWORD lpMaxMessageSize, - LPDWORD lpNextSize, - LPDWORD lpMessageCount, - LPDWORD lpReadTimeout) -{ - FILE_MAILSLOT_QUERY_INFORMATION Buffer; - IO_STATUS_BLOCK Iosb; - NTSTATUS Status; - - Status = NtQueryInformationFile(hMailslot, - &Iosb, - &Buffer, - sizeof(FILE_MAILSLOT_QUERY_INFORMATION), - FileMailslotQueryInformation); - if (!NT_SUCCESS(Status)) - { - WARN("NtQueryInformationFile failed (Status %x)!\n", Status); - BaseSetLastNTError (Status); - return(FALSE); - } - - if (lpMaxMessageSize != NULL) - { - *lpMaxMessageSize = Buffer.MaximumMessageSize; - } - if (lpNextSize != NULL) - { - *lpNextSize = Buffer.NextMessageSize; - } - if (lpMessageCount != NULL) - { - *lpMessageCount = Buffer.MessagesAvailable; - } - if (lpReadTimeout != NULL) - { - if (Buffer.ReadTimeout.LowPart == 0 && - Buffer.ReadTimeout.HighPart == (LONG)0x80000000) - *lpReadTimeout = MAILSLOT_WAIT_FOREVER; - else - *lpReadTimeout = (DWORD)(Buffer.ReadTimeout.QuadPart / -10000); - } - - return(TRUE); -} - - -/* - * @implemented - */ -BOOL WINAPI -SetMailslotInfo(HANDLE hMailslot, - DWORD lReadTimeout) -{ - FILE_MAILSLOT_SET_INFORMATION Buffer; - LARGE_INTEGER Timeout; - IO_STATUS_BLOCK Iosb; - NTSTATUS Status; - - if (lReadTimeout == MAILSLOT_WAIT_FOREVER) - { - /* Set the max */ - Timeout.LowPart = 0; - Timeout.HighPart = 0x80000000; - } - else - { - /* Convert to NT format */ - Timeout.QuadPart = UInt32x32To64(-10000, lReadTimeout); - } - Buffer.ReadTimeout = &Timeout; - - Status = NtSetInformationFile(hMailslot, - &Iosb, - &Buffer, - sizeof(FILE_MAILSLOT_SET_INFORMATION), - FileMailslotSetInformation); - if (!NT_SUCCESS(Status)) - { - WARN("NtSetInformationFile failed (Status %x)!\n", Status); - BaseSetLastNTError (Status); - return(FALSE); - } - - return(TRUE); + return TRUE; } /* EOF */ Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Sat Nov 12 18:28:16 2011 @@ -3554,7 +3554,17 @@ Product.QuadPart = (ULONGLONG)Multiplicand * (ULONGLONG)Multiplier; return Product; } + #endif + +NTSYSAPI +LARGE_INTEGER +NTAPI +RtlExtendedLargeIntegerDivide( + IN LARGE_INTEGER Dividend, + IN ULONG Divisor, + OUT PULONG Remainder OPTIONAL +); NTSYSAPI ULONG

1 0

[osiejka] 54364: [TRANSLATION] - base/setup,shell and system conversion patch, by UTF-8 conversion patch by Elton Chung, see bug 6333; - Romanian translation fixes and UTF-8 conversion by Stefan Fu...
by osiejka＠svn.reactos.org 12 Nov '11

12 Nov '11

Author: osiejka Date: Sat Nov 12 16:38:00 2011 New Revision: 54364 URL: http://svn.reactos.org/svn/reactos?rev=54364&view=rev Log: [TRANSLATION] - base/setup,shell and system conversion patch, by UTF-8 conversion patch by Elton Chung, see bug 6333; - Romanian translation fixes and UTF-8 conversion by Stefan Fulea, see bug 6603; Added: trunk/reactos/base/setup/welcome/lang/ro-RO.rc (with props) trunk/reactos/base/system/diskpart/lang/ro-RO.rc (with props) Modified: trunk/reactos/base/applications/cacls/lang/ro-RO.rc trunk/reactos/base/applications/calc/lang/ro-RO.rc trunk/reactos/base/applications/charmap/lang/ro-RO.rc trunk/reactos/base/applications/cmdutils/doskey/lang/ro-RO.rc trunk/reactos/base/applications/cmdutils/find/lang/ro-RO.rc trunk/reactos/base/applications/cmdutils/more/lang/ro-RO.rc trunk/reactos/base/applications/dxdiag/lang/ro-RO.rc trunk/reactos/base/applications/findstr/lang/ro-RO.rc trunk/reactos/base/applications/fontview/lang/ro-RO.rc trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc trunk/reactos/base/applications/games/spider/lang/ro-RO.rc trunk/reactos/base/applications/games/winmine/lang/ro-RO.rc trunk/reactos/base/applications/logoff/lang/ro-RO.rc trunk/reactos/base/applications/magnify/lang/ro-RO.rc trunk/reactos/base/applications/mplay32/lang/ro-RO.rc trunk/reactos/base/applications/msconfig/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/devmgmt_new/rsrc.rc trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc trunk/reactos/base/applications/mspaint/lang/ro-RO.rc trunk/reactos/base/applications/mstsc/lang/ro-RO.rc trunk/reactos/base/applications/network/ipconfig/lang/ro-RO.rc trunk/reactos/base/applications/network/ping/lang/ro-RO.rc trunk/reactos/base/applications/notepad/lang/ro-RO.rc trunk/reactos/base/applications/rapps/lang/ro-RO.rc trunk/reactos/base/applications/regedit/lang/ro-RO.rc trunk/reactos/base/applications/screensavers/logon/lang/ro-RO.rc trunk/reactos/base/applications/shutdown/lang/ro-RO.rc trunk/reactos/base/applications/sndrec32/lang/ro-RO.rc trunk/reactos/base/applications/sndvol32/lang/ro-RO.rc trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc trunk/reactos/base/setup/reactos/lang/bg-BG.rc trunk/reactos/base/setup/reactos/lang/cs-CZ.rc trunk/reactos/base/setup/reactos/lang/de-DE.rc trunk/reactos/base/setup/reactos/lang/el-GR.rc trunk/reactos/base/setup/reactos/lang/es-ES.rc trunk/reactos/base/setup/reactos/lang/et-EE.rc trunk/reactos/base/setup/reactos/lang/fi-FI.rc trunk/reactos/base/setup/reactos/lang/fr-FR.rc trunk/reactos/base/setup/reactos/lang/hu-HU.rc trunk/reactos/base/setup/reactos/lang/it-IT.rc trunk/reactos/base/setup/reactos/lang/ja-JP.rc trunk/reactos/base/setup/reactos/lang/lt-LT.rc trunk/reactos/base/setup/reactos/lang/no-NO.rc trunk/reactos/base/setup/reactos/lang/pt-BR.rc trunk/reactos/base/setup/reactos/lang/ro-RO.rc trunk/reactos/base/setup/reactos/lang/sk-SK.rc trunk/reactos/base/setup/reactos/lang/sv-SE.rc trunk/reactos/base/setup/reactos/lang/th-TH.rc trunk/reactos/base/setup/reactos/lang/zh-CN.rc trunk/reactos/base/setup/reactos/rsrc.rc trunk/reactos/base/setup/usetup/lang/ro-RO.h trunk/reactos/base/setup/vmwinst/lang/bg-BG.rc trunk/reactos/base/setup/vmwinst/lang/cs-CZ.rc trunk/reactos/base/setup/vmwinst/lang/da-DK.rc trunk/reactos/base/setup/vmwinst/lang/de-DE.rc trunk/reactos/base/setup/vmwinst/lang/el-GR.rc trunk/reactos/base/setup/vmwinst/lang/es-ES.rc trunk/reactos/base/setup/vmwinst/lang/fr-FR.rc trunk/reactos/base/setup/vmwinst/lang/hu-HU.rc trunk/reactos/base/setup/vmwinst/lang/it-IT.rc trunk/reactos/base/setup/vmwinst/lang/ja-JP.rc trunk/reactos/base/setup/vmwinst/lang/lt-LT.rc trunk/reactos/base/setup/vmwinst/lang/no-NO.rc trunk/reactos/base/setup/vmwinst/lang/ro-RO.rc trunk/reactos/base/setup/vmwinst/lang/sk-SK.rc trunk/reactos/base/setup/vmwinst/lang/sv-SE.rc trunk/reactos/base/setup/vmwinst/lang/zh-CN.rc trunk/reactos/base/setup/vmwinst/rsrc.rc trunk/reactos/base/setup/welcome/lang/bg-BG.rc trunk/reactos/base/setup/welcome/lang/cs-CZ.rc trunk/reactos/base/setup/welcome/lang/da-DK.rc trunk/reactos/base/setup/welcome/lang/de-DE.rc trunk/reactos/base/setup/welcome/lang/el-GR.rc trunk/reactos/base/setup/welcome/lang/en-US.rc trunk/reactos/base/setup/welcome/lang/es-ES.rc trunk/reactos/base/setup/welcome/lang/et-EE.rc trunk/reactos/base/setup/welcome/lang/fr-FR.rc trunk/reactos/base/setup/welcome/lang/hu-HU.rc trunk/reactos/base/setup/welcome/lang/ja-JP.rc trunk/reactos/base/setup/welcome/lang/lt-LT.rc trunk/reactos/base/setup/welcome/lang/no-NO.rc trunk/reactos/base/setup/welcome/lang/pt-BR.rc trunk/reactos/base/setup/welcome/lang/sk-SK.rc trunk/reactos/base/setup/welcome/lang/sv-SE.rc trunk/reactos/base/setup/welcome/lang/th-TH.rc trunk/reactos/base/setup/welcome/lang/zh-CN.rc trunk/reactos/base/setup/welcome/rsrc.rc trunk/reactos/base/shell/cmd/lang/el-GR.rc trunk/reactos/base/shell/cmd/lang/es-ES.rc trunk/reactos/base/shell/cmd/lang/fr-FR.rc trunk/reactos/base/shell/cmd/lang/hu-HU.rc trunk/reactos/base/shell/cmd/lang/it-IT.rc trunk/reactos/base/shell/cmd/lang/no-NO.rc trunk/reactos/base/shell/cmd/lang/ro-RO.rc trunk/reactos/base/shell/cmd/lang/sk-SK.rc trunk/reactos/base/shell/cmd/lang/sv-SE.rc trunk/reactos/base/shell/cmd/rsrc.rc trunk/reactos/base/shell/explorer-new/explorer.rc trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc trunk/reactos/base/shell/explorer-new/lang/de-DE.rc trunk/reactos/base/shell/explorer-new/lang/es-ES.rc trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc trunk/reactos/base/shell/explorer-new/lang/it-IT.rc trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc trunk/reactos/base/shell/explorer-new/lang/ko-KR.rc trunk/reactos/base/shell/explorer-new/lang/lt-LT.rc trunk/reactos/base/shell/explorer-new/lang/no-NO.rc trunk/reactos/base/shell/explorer-new/lang/ro-RO.rc trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc trunk/reactos/base/shell/explorer/explorer-ro.rc trunk/reactos/base/system/diskpart/diskpart.rc trunk/reactos/base/system/format/lang/bg-BG.rc trunk/reactos/base/system/format/lang/cs-CZ.rc trunk/reactos/base/system/format/lang/de-DE.rc trunk/reactos/base/system/format/lang/el-GR.rc trunk/reactos/base/system/format/lang/en-US.rc trunk/reactos/base/system/format/lang/es-ES.rc trunk/reactos/base/system/format/lang/fr-FR.rc trunk/reactos/base/system/format/lang/hu-HU.rc trunk/reactos/base/system/format/lang/id-ID.rc trunk/reactos/base/system/format/lang/it-IT.rc trunk/reactos/base/system/format/lang/ja-JP.rc trunk/reactos/base/system/format/lang/lt-LT.rc trunk/reactos/base/system/format/lang/no-NO.rc trunk/reactos/base/system/format/lang/ro-RO.rc trunk/reactos/base/system/format/lang/sk-SK.rc trunk/reactos/base/system/format/rsrc.rc trunk/reactos/base/system/regsvr32/lang/bg-BG.rc trunk/reactos/base/system/regsvr32/lang/cs-CZ.rc trunk/reactos/base/system/regsvr32/lang/de-DE.rc trunk/reactos/base/system/regsvr32/lang/en-US.rc trunk/reactos/base/system/regsvr32/lang/es-ES.rc trunk/reactos/base/system/regsvr32/lang/fr-FR.rc trunk/reactos/base/system/regsvr32/lang/hu-HU.rc trunk/reactos/base/system/regsvr32/lang/id-ID.rc trunk/reactos/base/system/regsvr32/lang/it-IT.rc trunk/reactos/base/system/regsvr32/lang/ja-JP.rc trunk/reactos/base/system/regsvr32/lang/lt-LT.rc trunk/reactos/base/system/regsvr32/lang/nl-NL.rc trunk/reactos/base/system/regsvr32/lang/no-NO.rc trunk/reactos/base/system/regsvr32/lang/pt-BR.rc trunk/reactos/base/system/regsvr32/rsrc.rc trunk/reactos/base/system/rundll32/lang/bg-BG.rc trunk/reactos/base/system/rundll32/lang/cs-CZ.rc trunk/reactos/base/system/rundll32/lang/de-DE.rc trunk/reactos/base/system/rundll32/lang/el-GR.rc trunk/reactos/base/system/rundll32/lang/en-US.rc trunk/reactos/base/system/rundll32/lang/es-ES.rc trunk/reactos/base/system/rundll32/lang/fr-FR.rc trunk/reactos/base/system/rundll32/lang/hu-HU.rc trunk/reactos/base/system/rundll32/lang/id-ID.rc trunk/reactos/base/system/rundll32/lang/it-IT.rc trunk/reactos/base/system/rundll32/lang/ja-JP.rc trunk/reactos/base/system/rundll32/lang/lt-LT.rc trunk/reactos/base/system/rundll32/lang/nl-NL.rc trunk/reactos/base/system/rundll32/lang/no-NO.rc trunk/reactos/base/system/rundll32/lang/pt-BR.rc trunk/reactos/base/system/rundll32/lang/ro-RO.rc trunk/reactos/base/system/rundll32/lang/sk-SK.rc trunk/reactos/base/system/rundll32/lang/th-TH.rc trunk/reactos/base/system/rundll32/rsrc.rc trunk/reactos/base/system/runonce/lang/es-ES.rc trunk/reactos/base/system/runonce/lang/fr-FR.rc trunk/reactos/base/system/runonce/lang/ja-JP.rc trunk/reactos/base/system/runonce/lang/ro-RO.rc trunk/reactos/base/system/runonce/lang/sk-SK.rc trunk/reactos/base/system/runonce/rsrc.rc trunk/reactos/base/system/subst/CMakeLists.txt trunk/reactos/base/system/subst/lang/en-US.rc trunk/reactos/base/system/subst/lang/es-ES.rc trunk/reactos/base/system/subst/lang/fr-FR.rc trunk/reactos/base/system/subst/lang/it-IT.rc trunk/reactos/base/system/subst/lang/ro-RO.rc trunk/reactos/base/system/subst/rsrc.rc trunk/reactos/base/system/userinit/lang/bg-BG.rc trunk/reactos/base/system/userinit/lang/cs-CZ.rc trunk/reactos/base/system/userinit/lang/de-DE.rc trunk/reactos/base/system/userinit/lang/el-GR.rc trunk/reactos/base/system/userinit/lang/en-US.rc trunk/reactos/base/system/userinit/lang/es-ES.rc trunk/reactos/base/system/userinit/lang/fr-FR.rc trunk/reactos/base/system/userinit/lang/hu-HU.rc trunk/reactos/base/system/userinit/lang/id-ID.rc trunk/reactos/base/system/userinit/lang/it-IT.rc trunk/reactos/base/system/userinit/lang/ja-JP.rc trunk/reactos/base/system/userinit/lang/lt-LT.rc trunk/reactos/base/system/userinit/lang/nl-NL.rc trunk/reactos/base/system/userinit/lang/no-NO.rc trunk/reactos/base/system/userinit/lang/pt-BR.rc trunk/reactos/base/system/userinit/lang/sk-SK.rc trunk/reactos/base/system/userinit/lang/sv-SE.rc trunk/reactos/base/system/userinit/lang/th-TH.rc trunk/reactos/base/system/userinit/rsrc.rc trunk/reactos/base/system/winlogon/lang/bg-BG.rc trunk/reactos/base/system/winlogon/lang/cs-CZ.rc trunk/reactos/base/system/winlogon/lang/de-DE.rc trunk/reactos/base/system/winlogon/lang/el-GR.rc trunk/reactos/base/system/winlogon/lang/es-ES.rc trunk/reactos/base/system/winlogon/lang/fr-FR.rc trunk/reactos/base/system/winlogon/lang/hu-HU.rc trunk/reactos/base/system/winlogon/lang/ja-JP.rc trunk/reactos/base/system/winlogon/lang/lt-LT.rc trunk/reactos/base/system/winlogon/lang/no-NO.rc trunk/reactos/base/system/winlogon/lang/ro-RO.rc trunk/reactos/base/system/winlogon/lang/sk-SK.rc trunk/reactos/base/system/winlogon/lang/sv-SE.rc trunk/reactos/base/system/winlogon/lang/zh-CN.rc trunk/reactos/base/system/winlogon/rsrc.rc trunk/reactos/boot/freeldr/fdebug/lang/ro-RO.rc trunk/reactos/dll/cpl/access/lang/ro-RO.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/applications/cacls/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cacls/la… Modified: trunk/reactos/base/applications/calc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/lan… Modified: trunk/reactos/base/applications/charmap/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/charmap/… Modified: trunk/reactos/base/applications/cmdutils/doskey/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/find/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/cmdutils/more/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… Modified: trunk/reactos/base/applications/dxdiag/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/dxdiag/l… Modified: trunk/reactos/base/applications/findstr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/findstr/… Modified: trunk/reactos/base/applications/fontview/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/fontview… Modified: trunk/reactos/base/applications/games/solitaire/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/so… Modified: trunk/reactos/base/applications/games/spider/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/sp… Modified: trunk/reactos/base/applications/games/winmine/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/games/wi… Modified: trunk/reactos/base/applications/logoff/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/logoff/l… Modified: trunk/reactos/base/applications/magnify/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/magnify/… Modified: trunk/reactos/base/applications/mplay32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mplay32/… Modified: trunk/reactos/base/applications/msconfig/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/msconfig… Modified: trunk/reactos/base/applications/mscutils/devmgmt/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/devmgmt_new/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/eventvwr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mscutils/servman/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mscutils… Modified: trunk/reactos/base/applications/mspaint/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mspaint/… Modified: trunk/reactos/base/applications/mstsc/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/mstsc/la… Modified: trunk/reactos/base/applications/network/ipconfig/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/network/ping/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/… Modified: trunk/reactos/base/applications/notepad/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/notepad/… Modified: trunk/reactos/base/applications/rapps/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/rapps/la… Modified: trunk/reactos/base/applications/regedit/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/regedit/… Modified: trunk/reactos/base/applications/screensavers/logon/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/screensa… Modified: trunk/reactos/base/applications/shutdown/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/shutdown… Modified: trunk/reactos/base/applications/sndrec32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndrec32… Modified: trunk/reactos/base/applications/sndvol32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/sndvol32… Modified: trunk/reactos/base/applications/taskmgr/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/taskmgr/… Modified: trunk/reactos/base/setup/reactos/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/bg… Modified: trunk/reactos/base/setup/reactos/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/cs… Modified: trunk/reactos/base/setup/reactos/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/de… Modified: trunk/reactos/base/setup/reactos/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/el… Modified: trunk/reactos/base/setup/reactos/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/es… Modified: trunk/reactos/base/setup/reactos/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/et… Modified: trunk/reactos/base/setup/reactos/lang/fi-FI.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/fi… Modified: trunk/reactos/base/setup/reactos/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/fr… Modified: trunk/reactos/base/setup/reactos/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/hu… Modified: trunk/reactos/base/setup/reactos/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/it… Modified: trunk/reactos/base/setup/reactos/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ja… Modified: trunk/reactos/base/setup/reactos/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/lt… Modified: trunk/reactos/base/setup/reactos/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/no… Modified: trunk/reactos/base/setup/reactos/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/pt… Modified: trunk/reactos/base/setup/reactos/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/ro… Modified: trunk/reactos/base/setup/reactos/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/sk… Modified: trunk/reactos/base/setup/reactos/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/sv… Modified: trunk/reactos/base/setup/reactos/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/th… Modified: trunk/reactos/base/setup/reactos/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/lang/zh… Modified: trunk/reactos/base/setup/reactos/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/reactos/rsrc.rc… Modified: trunk/reactos/base/setup/usetup/lang/ro-RO.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/lang/ro-… Modified: trunk/reactos/base/setup/vmwinst/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/bg… Modified: trunk/reactos/base/setup/vmwinst/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/cs… Modified: trunk/reactos/base/setup/vmwinst/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/da… Modified: trunk/reactos/base/setup/vmwinst/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/de… Modified: trunk/reactos/base/setup/vmwinst/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/el… Modified: trunk/reactos/base/setup/vmwinst/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/es… Modified: trunk/reactos/base/setup/vmwinst/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/fr… Modified: trunk/reactos/base/setup/vmwinst/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/hu… Modified: trunk/reactos/base/setup/vmwinst/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/it… Modified: trunk/reactos/base/setup/vmwinst/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/ja… Modified: trunk/reactos/base/setup/vmwinst/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/lt… Modified: trunk/reactos/base/setup/vmwinst/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/no… Modified: trunk/reactos/base/setup/vmwinst/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/ro… Modified: trunk/reactos/base/setup/vmwinst/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/sk… Modified: trunk/reactos/base/setup/vmwinst/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/sv… Modified: trunk/reactos/base/setup/vmwinst/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/lang/zh… Modified: trunk/reactos/base/setup/vmwinst/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/vmwinst/rsrc.rc… Modified: trunk/reactos/base/setup/welcome/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/bg… Modified: trunk/reactos/base/setup/welcome/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/cs… Modified: trunk/reactos/base/setup/welcome/lang/da-DK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/da… Modified: trunk/reactos/base/setup/welcome/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/de… Modified: trunk/reactos/base/setup/welcome/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/el… Modified: trunk/reactos/base/setup/welcome/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/en… Modified: trunk/reactos/base/setup/welcome/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/es… Modified: trunk/reactos/base/setup/welcome/lang/et-EE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/et… Modified: trunk/reactos/base/setup/welcome/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/fr… Modified: trunk/reactos/base/setup/welcome/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/hu… Modified: trunk/reactos/base/setup/welcome/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/ja… Modified: trunk/reactos/base/setup/welcome/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/lt… Modified: trunk/reactos/base/setup/welcome/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/no… Modified: trunk/reactos/base/setup/welcome/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/pt… Added: trunk/reactos/base/setup/welcome/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/ro… Modified: trunk/reactos/base/setup/welcome/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/sk… Modified: trunk/reactos/base/setup/welcome/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/sv… Modified: trunk/reactos/base/setup/welcome/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/th… Modified: trunk/reactos/base/setup/welcome/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/lang/zh… Modified: trunk/reactos/base/setup/welcome/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/welcome/rsrc.rc… Modified: trunk/reactos/base/shell/cmd/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/el-GR.… Modified: trunk/reactos/base/shell/cmd/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/es-ES.… Modified: trunk/reactos/base/shell/cmd/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/fr-FR.… Modified: trunk/reactos/base/shell/cmd/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/hu-HU.… Modified: trunk/reactos/base/shell/cmd/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/it-IT.… Modified: trunk/reactos/base/shell/cmd/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/no-NO.… Modified: trunk/reactos/base/shell/cmd/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/ro-RO.… Modified: trunk/reactos/base/shell/cmd/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sk-SK.… Modified: trunk/reactos/base/shell/cmd/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/lang/sv-SE.… Modified: trunk/reactos/base/shell/cmd/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/rsrc.rc?rev… Modified: trunk/reactos/base/shell/explorer-new/explorer.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/ex… Modified: trunk/reactos/base/shell/explorer-new/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… Modified: trunk/reactos/base/shell/explorer-new/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… Modified: trunk/reactos/base/shell/explorer-new/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… Modified: trunk/reactos/base/shell/explorer-new/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… Modified: trunk/reactos/base/shell/explorer-new/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… Modified: trunk/reactos/base/shell/explorer-new/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… Modified: trunk/reactos/base/shell/explorer-new/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… Modified: trunk/reactos/base/shell/explorer-new/lang/ko-KR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… Modified: trunk/reactos/base/shell/explorer-new/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… Modified: trunk/reactos/base/shell/explorer-new/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… Modified: trunk/reactos/base/shell/explorer-new/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… Modified: trunk/reactos/base/shell/explorer-new/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer-new/la… Modified: trunk/reactos/base/shell/explorer/explorer-ro.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/explorer/explor… Modified: trunk/reactos/base/system/diskpart/diskpart.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/diskp… Added: trunk/reactos/base/system/diskpart/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/diskpart/lang/… Modified: trunk/reactos/base/system/format/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/bg… Modified: trunk/reactos/base/system/format/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/cs… Modified: trunk/reactos/base/system/format/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/de… Modified: trunk/reactos/base/system/format/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/el… Modified: trunk/reactos/base/system/format/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/en… Modified: trunk/reactos/base/system/format/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/es… Modified: trunk/reactos/base/system/format/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/fr… Modified: trunk/reactos/base/system/format/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/hu… Modified: trunk/reactos/base/system/format/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/id… Modified: trunk/reactos/base/system/format/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/it… Modified: trunk/reactos/base/system/format/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/ja… Modified: trunk/reactos/base/system/format/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/lt… Modified: trunk/reactos/base/system/format/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/no… Modified: trunk/reactos/base/system/format/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/ro… Modified: trunk/reactos/base/system/format/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/lang/sk… Modified: trunk/reactos/base/system/format/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/format/rsrc.rc… Modified: trunk/reactos/base/system/regsvr32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… Modified: trunk/reactos/base/system/regsvr32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… Modified: trunk/reactos/base/system/regsvr32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… Modified: trunk/reactos/base/system/regsvr32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… Modified: trunk/reactos/base/system/regsvr32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… Modified: trunk/reactos/base/system/regsvr32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… Modified: trunk/reactos/base/system/regsvr32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… Modified: trunk/reactos/base/system/regsvr32/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… Modified: trunk/reactos/base/system/regsvr32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… Modified: trunk/reactos/base/system/regsvr32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… Modified: trunk/reactos/base/system/regsvr32/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… Modified: trunk/reactos/base/system/regsvr32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… Modified: trunk/reactos/base/system/regsvr32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… Modified: trunk/reactos/base/system/regsvr32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/lang/… Modified: trunk/reactos/base/system/regsvr32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/regsvr32/rsrc.… Modified: trunk/reactos/base/system/rundll32/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… Modified: trunk/reactos/base/system/rundll32/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… Modified: trunk/reactos/base/system/rundll32/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… Modified: trunk/reactos/base/system/rundll32/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… Modified: trunk/reactos/base/system/rundll32/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… Modified: trunk/reactos/base/system/rundll32/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… Modified: trunk/reactos/base/system/rundll32/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… Modified: trunk/reactos/base/system/rundll32/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… Modified: trunk/reactos/base/system/rundll32/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… Modified: trunk/reactos/base/system/rundll32/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… Modified: trunk/reactos/base/system/rundll32/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… Modified: trunk/reactos/base/system/rundll32/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… Modified: trunk/reactos/base/system/rundll32/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… Modified: trunk/reactos/base/system/rundll32/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… Modified: trunk/reactos/base/system/rundll32/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… Modified: trunk/reactos/base/system/rundll32/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… Modified: trunk/reactos/base/system/rundll32/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… Modified: trunk/reactos/base/system/rundll32/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/lang/… Modified: trunk/reactos/base/system/rundll32/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/rundll32/rsrc.… Modified: trunk/reactos/base/system/runonce/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/lang/e… Modified: trunk/reactos/base/system/runonce/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/lang/f… Modified: trunk/reactos/base/system/runonce/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/lang/j… Modified: trunk/reactos/base/system/runonce/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/lang/r… Modified: trunk/reactos/base/system/runonce/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/lang/s… Modified: trunk/reactos/base/system/runonce/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/runonce/rsrc.r… Modified: trunk/reactos/base/system/subst/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/CMakeLis… Modified: trunk/reactos/base/system/subst/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/en-… Modified: trunk/reactos/base/system/subst/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/es-… Modified: trunk/reactos/base/system/subst/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/fr-… Modified: trunk/reactos/base/system/subst/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/it-… Modified: trunk/reactos/base/system/subst/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/lang/ro-… Modified: trunk/reactos/base/system/subst/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/subst/rsrc.rc?… Modified: trunk/reactos/base/system/userinit/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/en-US.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/id-ID.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/it-IT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/nl-NL.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/pt-BR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/lang/th-TH.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/lang/… Modified: trunk/reactos/base/system/userinit/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/userinit/rsrc.… Modified: trunk/reactos/base/system/winlogon/lang/bg-BG.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… Modified: trunk/reactos/base/system/winlogon/lang/cs-CZ.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… Modified: trunk/reactos/base/system/winlogon/lang/de-DE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… Modified: trunk/reactos/base/system/winlogon/lang/el-GR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… Modified: trunk/reactos/base/system/winlogon/lang/es-ES.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… Modified: trunk/reactos/base/system/winlogon/lang/fr-FR.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… Modified: trunk/reactos/base/system/winlogon/lang/hu-HU.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… Modified: trunk/reactos/base/system/winlogon/lang/ja-JP.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… Modified: trunk/reactos/base/system/winlogon/lang/lt-LT.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… Modified: trunk/reactos/base/system/winlogon/lang/no-NO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… Modified: trunk/reactos/base/system/winlogon/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… Modified: trunk/reactos/base/system/winlogon/lang/sk-SK.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… Modified: trunk/reactos/base/system/winlogon/lang/sv-SE.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… Modified: trunk/reactos/base/system/winlogon/lang/zh-CN.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/lang/… Modified: trunk/reactos/base/system/winlogon/rsrc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/system/winlogon/rsrc.… Modified: trunk/reactos/boot/freeldr/fdebug/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/fdebug/lang/r… Modified: trunk/reactos/dll/cpl/access/lang/ro-RO.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/access/lang/ro-RO.…

1 0

[tfaber] 54363: [KMTESTS/KE] - Do not check IRQLs above HIGH_LEVEL. That's not very useful anyway. Fixes hang in kmtest:KeIrql.
by tfaber＠svn.reactos.org 12 Nov '11

12 Nov '11

Author: tfaber Date: Sat Nov 12 14:49:14 2011 New Revision: 54363 URL: http://svn.reactos.org/svn/reactos?rev=54363&view=rev Log: [KMTESTS/KE] - Do not check IRQLs above HIGH_LEVEL. That's not very useful anyway. Fixes hang in kmtest:KeIrql. Modified: trunk/rostests/kmtests/ntos_ke/KeIrql.c Modified: trunk/rostests/kmtests/ntos_ke/KeIrql.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ke/KeIrql.c?… ============================================================================== --- trunk/rostests/kmtests/ntos_ke/KeIrql.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ke/KeIrql.c [iso-8859-1] Sat Nov 12 14:49:14 2011 @@ -92,21 +92,6 @@ --Irql; } - DPRINT("Alive!\n"); - /* on x86, you can raise to _any_ possible KIRQL value */ - /* on x64, anything with more than the least significant 4 bits set bugchecked, last time I tried */ - /* TODO: other platforms? */ -#if defined _M_IX86 - for (Irql = PASSIVE_LEVEL; Irql <= (KIRQL)-1; ++Irql) - { - DPRINT("Raising to %u\n", Irql); - KeRaiseIrql(Irql, &Irql2); - ok_eq_uint(Irql2, PrevIrql); - KeLowerIrql(Irql2); - ok_irql(PrevIrql); - } -#endif /* defined _M_IX86 */ - /* test KeRaiseIrqlToDpcLevel */ ok_irql(PASSIVE_LEVEL); Irql = KeRaiseIrqlToDpcLevel();

1 0

[pschweitzer] 54362: [MESA32] Include headers in the proper order. Fixes mesa32 build.
by pschweitzer＠svn.reactos.org 12 Nov '11

12 Nov '11

Author: pschweitzer Date: Sat Nov 12 13:04:59 2011 New Revision: 54362 URL: http://svn.reactos.org/svn/reactos?rev=54362&view=rev Log: [MESA32] Include headers in the proper order. Fixes mesa32 build. Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c Modified: trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/3rdparty/mesa32/src/dr… ============================================================================== --- trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c [iso-8859-1] (original) +++ trunk/reactos/dll/3rdparty/mesa32/src/drivers/windows/gdi/wgl.c [iso-8859-1] Sat Nov 12 13:04:59 2011 @@ -35,8 +35,8 @@ #include <stdarg.h> #include <windef.h> +#include <winbase.h> #include <wincon.h> -#include <winbase.h> # if defined(BUILD_GL32) # define WINGDIAPI __declspec(dllexport)

1 0

[pschweitzer] 54361: [PSDK] Revert r54359.
by pschweitzer＠svn.reactos.org 12 Nov '11

12 Nov '11

Author: pschweitzer Date: Sat Nov 12 12:27:01 2011 New Revision: 54361 URL: http://svn.reactos.org/svn/reactos?rev=54361&view=rev Log: [PSDK] Revert r54359. Modified: trunk/reactos/include/psdk/wincon.h Modified: trunk/reactos/include/psdk/wincon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincon.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wincon.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/wincon.h [iso-8859-1] Sat Nov 12 12:27:01 2011 @@ -201,7 +201,7 @@ DWORD WINAPI GetConsoleTitleW(LPWSTR,DWORD); #if (_WIN32_WINNT >= 0x0500) HWND WINAPI GetConsoleWindow(void); -BOOL APIENTRY GetConsoleDisplayMode(OUT LPDWORD lpModeFlags); +WINBASEAPI BOOL APIENTRY GetConsoleDisplayMode(OUT LPDWORD lpModeFlags); BOOL APIENTRY SetConsoleDisplayMode(IN HANDLE hConsoleOutput,IN DWORD dwFlags, OUT PCOORD lpNewScreenBufferDimensions); #endif COORD WINAPI GetLargestConsoleWindowSize(HANDLE);

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