Ros-diffs November 2011

ros-diffs@reactos.org

16 participants
274 discussions

[cgutman] 54484: [SCSIPORT] - Implement ScsiPortGetLogicalUnit

by cgutman＠svn.reactos.org

Author: cgutman Date: Thu Nov 24 00:07:15 2011 New Revision: 54484 URL: http://svn.reactos.org/svn/reactos?rev=54484&view=rev Log: [SCSIPORT] - Implement ScsiPortGetLogicalUnit Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c Modified: trunk/reactos/drivers/storage/scsiport/scsiport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/scsiport/s… ============================================================================== --- trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/scsiport/scsiport.c [iso-8859-1] Thu Nov 24 00:07:15 2011 @@ -580,37 +580,35 @@ IN UCHAR TargetId, IN UCHAR Lun) { - UNIMPLEMENTED; -#if 0 - PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; - PSCSI_PORT_LUN_EXTENSION LunExtension; - PLIST_ENTRY Entry; - - DPRINT("ScsiPortGetLogicalUnit() called\n"); - - DeviceExtension = CONTAINING_RECORD(HwDeviceExtension, - SCSI_PORT_DEVICE_EXTENSION, - MiniPortDeviceExtension); - if (IsListEmpty(&DeviceExtension->LunExtensionListHead)) - return NULL; - - Entry = DeviceExtension->LunExtensionListHead.Flink; - while (Entry != &DeviceExtension->LunExtensionListHead) - { - LunExtension = CONTAINING_RECORD(Entry, - SCSI_PORT_LUN_EXTENSION, - List); - if (LunExtension->PathId == PathId && - LunExtension->TargetId == TargetId && - LunExtension->Lun == Lun) - { - return (PVOID)&LunExtension->MiniportLunExtension; - } - - Entry = Entry->Flink; - } -#endif - return NULL; + PSCSI_PORT_DEVICE_EXTENSION DeviceExtension; + PSCSI_PORT_LUN_EXTENSION LunExtension; + + DPRINT("ScsiPortGetLogicalUnit() called\n"); + + DeviceExtension = CONTAINING_RECORD(HwDeviceExtension, + SCSI_PORT_DEVICE_EXTENSION, + MiniPortDeviceExtension); + + /* Check the extension size */ + if (!DeviceExtension->LunExtensionSize) + { + /* They didn't want one */ + return NULL; + } + + LunExtension = SpiGetLunExtension(DeviceExtension, + PathId, + TargetId, + Lun); + /* Check that the logical unit exists */ + if (!LunExtension) + { + /* Nope, return NULL */ + return NULL; + } + + /* Return the logical unit miniport extension */ + return (LunExtension + 1); }

12 years, 9 months

[gadamopoulos] 54483: [win32k] - Fix a typo in NtUserSetClipboardData that tried to print a struct as a pointer (cid 15051) - Clean up clipboard.c a bit. note: this cleanup "fixes" cid 14599 and 14...

by gadamopoulos＠svn.reactos.org

Author: gadamopoulos Date: Wed Nov 23 19:52:06 2011 New Revision: 54483 URL: http://svn.reactos.org/svn/reactos?rev=54483&view=rev Log: [win32k] - Fix a typo in NtUserSetClipboardData that tried to print a struct as a pointer (cid 15051) - Clean up clipboard.c a bit. note: this cleanup "fixes" cid 14599 and 14598, but even though they are false positives, this cleanup was needed - Add missing break in NtUserQueryWindow (cid 13486) Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c trunk/reactos/subsystems/win32/win32k/ntuser/window.c Modified: trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/clipboard.c [iso-8859-1] Wed Nov 23 19:52:06 2011 @@ -780,7 +780,6 @@ HANDLE APIENTRY NtUserGetClipboardData(UINT fmt, PGETCLIPBDATA pgcd) { - NTSTATUS Status = STATUS_SUCCESS; HANDLE hRet = NULL; PCLIP pElement; PWINSTATION_OBJECT pWinStaObj = NULL; @@ -861,20 +860,14 @@ if (pPaletteEl && !IS_DATA_DELAYED(pPaletteEl)) pgcd->hPalette = pPaletteEl->hData; } + + hRet = pElement->hData; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); + SetLastNtError(_SEH2_GetExceptionCode()); } _SEH2_END - - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - goto cleanup; - } - - hRet = pElement->hData; cleanup: if(pWinStaObj) @@ -882,7 +875,7 @@ UserLeave(); - TRACE("Ret: %p\n", hRet); + TRACE("NtUserGetClipboardData returns %p\n", hRet); return hRet; } @@ -952,12 +945,9 @@ NtUserSetClipboardData(UINT fmt, HANDLE hData, PSETCLIPBDATA pUnsafeScd) { SETCLIPBDATA scd; - NTSTATUS Status = STATUS_SUCCESS; - HANDLE hRet = NULL; - - TRACE("NtUserSetClipboardData(%x %p %p)\n", fmt, hData, scd); - - UserEnterExclusive(); + HANDLE hRet; + + TRACE("NtUserSetClipboardData(%x %p %p)\n", fmt, hData, pUnsafeScd); _SEH2_TRY { @@ -966,20 +956,16 @@ } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { - Status = _SEH2_GetExceptionCode(); + SetLastNtError(_SEH2_GetExceptionCode()); + _SEH2_YIELD(return NULL;) } _SEH2_END - if (!NT_SUCCESS(Status)) - { - SetLastNtError(Status); - goto cleanup; - } + UserEnterExclusive(); /* Call internal function */ hRet = UserSetClipboardData(fmt, hData, &scd); -cleanup: UserLeave(); return hRet; Modified: trunk/reactos/subsystems/win32/win32k/ntuser/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/ntuser/window.c [iso-8859-1] Wed Nov 23 19:52:06 2011 @@ -3683,6 +3683,7 @@ case QUERY_WINDOW_REAL_ID: Result = (DWORD)pWnd->head.pti->pEThread->Cid.UniqueProcess; + break; default: Result = (DWORD)NULL;

12 years, 9 months

[tfaber] 54482: [SERVICES] - Do not use an unsigned type for a value that can become negative in ScmAssignNewTag (CID 14665)

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Nov 23 18:15:26 2011 New Revision: 54482 URL: http://svn.reactos.org/svn/reactos?rev=54482&view=rev Log: [SERVICES] - Do not use an unsigned type for a value that can become negative in ScmAssignNewTag (CID 14665) 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] Wed Nov 23 18:15:26 2011 @@ -271,7 +271,7 @@ DWORD dwFreeTag = 0; DWORD dwTagUsedBase = 1; BOOLEAN TagUsed[TAG_ARRAY_SIZE]; - DWORD dwTagOffset; + INT nTagOffset; DWORD i; DWORD cbDataSize; PLIST_ENTRY ServiceEntry; @@ -333,9 +333,9 @@ /* mark tags in GroupOrderList as used */ for (i = 1; i <= dwGroupTagCount; i++) { - dwTagOffset = pdwGroupTags[i] - dwTagUsedBase; - if (dwTagOffset >= 0 && dwTagOffset < TAG_ARRAY_SIZE) - TagUsed[dwTagOffset] = TRUE; + nTagOffset = pdwGroupTags[i] - dwTagUsedBase; + if (nTagOffset >= 0 && nTagOffset < TAG_ARRAY_SIZE) + TagUsed[nTagOffset] = TRUE; } /* mark tags in service list as used */ @@ -346,9 +346,9 @@ CurrentService = CONTAINING_RECORD(ServiceEntry, SERVICE, ServiceListEntry); if (CurrentService->lpGroup == lpService->lpGroup) { - dwTagOffset = CurrentService->dwTag - dwTagUsedBase; - if (dwTagOffset >= 0 && dwTagOffset < TAG_ARRAY_SIZE) - TagUsed[dwTagOffset] = TRUE; + nTagOffset = CurrentService->dwTag - dwTagUsedBase; + if (nTagOffset >= 0 && nTagOffset < TAG_ARRAY_SIZE) + TagUsed[nTagOffset] = TRUE; } ServiceEntry = ServiceEntry->Flink; @@ -365,8 +365,7 @@ } dwTagUsedBase += TAG_ARRAY_SIZE; - } - while (!dwFreeTag); + } while (!dwFreeTag); cleanup: if (pdwGroupTags)

12 years, 9 months

[tfaber] 54481: [SERVICES] - Fix dwServiceType and dwServiceState checks in REnumServicesStatusW (see r54373) - Fix a memory leak in RQueryServiceConfig2A

by tfaber＠svn.reactos.org

Author: tfaber Date: Wed Nov 23 17:13:53 2011 New Revision: 54481 URL: http://svn.reactos.org/svn/reactos?rev=54481&view=rev Log: [SERVICES] - Fix dwServiceType and dwServiceState checks in REnumServicesStatusW (see r54373) - Fix a memory leak in RQueryServiceConfig2A 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] Wed Nov 23 17:13:53 2011 @@ -2511,13 +2511,16 @@ *pcbBytesNeeded = 0; *lpServicesReturned = 0; - if ((dwServiceType!=SERVICE_DRIVER) && (dwServiceType!=SERVICE_WIN32)) + if ((dwServiceType == 0) || + ((dwServiceType & ~(SERVICE_DRIVER | SERVICE_WIN32)) != 0)) { DPRINT("Not a valid Service Type!\n"); return ERROR_INVALID_PARAMETER; } - if ((dwServiceState<SERVICE_ACTIVE) || (dwServiceState>SERVICE_STATE_ALL)) + if ((dwServiceState != SERVICE_ACTIVE) && + (dwServiceState != SERVICE_INACTIVE) && + (dwServiceState != SERVICE_STATE_ALL)) { DPRINT("Not a valid Service State!\n"); return ERROR_INVALID_PARAMETER; @@ -2667,7 +2670,7 @@ dwRequiredSize += dwSize; } - if (dwError == 0) + if (dwError == ERROR_SUCCESS) { *pcbBytesNeeded = 0; if (lpResumeHandle) *lpResumeHandle = 0; @@ -4800,7 +4803,6 @@ PSERVICE lpService = NULL; HKEY hServiceKey = NULL; LPWSTR lpDescriptionW = NULL; - LPSTR lpDescription = NULL; DPRINT("RQueryServiceConfig2A() called hService %p dwInfoLevel %u, lpBuffer %p cbBufSize %u pcbBytesNeeded %p\n", hService, dwInfoLevel, lpBuffer, cbBufSize, pcbBytesNeeded); @@ -4894,8 +4896,8 @@ /* Unlock the service database */ ScmUnlockDatabase(); - if (lpDescription != NULL) - HeapFree(GetProcessHeap(), 0, lpDescription); + if (lpDescriptionW != NULL) + HeapFree(GetProcessHeap(), 0, lpDescriptionW); if (hServiceKey != NULL) RegCloseKey(hServiceKey);

12 years, 9 months

[jgardou] 54480: [NTOSKRNL/MM] - Also round down offset we're given when creating a page op, so we don't miss the one that could be running at the time

by jgardou＠svn.reactos.org

Author: jgardou Date: Wed Nov 23 00:24:29 2011 New Revision: 54480 URL: http://svn.reactos.org/svn/reactos?rev=54480&view=rev Log: [NTOSKRNL/MM] - Also round down offset we're given when creating a page op, so we don't miss the one that could be running at the time Modified: trunk/reactos/ntoskrnl/mm/pageop.c Modified: trunk/reactos/ntoskrnl/mm/pageop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pageop.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pageop.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pageop.c [iso-8859-1] Wed Nov 23 00:24:29 2011 @@ -147,6 +147,7 @@ PMM_PAGEOP PageOp; Address = (PVOID)PAGE_ROUND_DOWN(Address); + Offset = PAGE_ROUND_DOWN(Offset); /* * Calcuate the hash value for pageop structure

12 years, 10 months

[pschweitzer] 54479: [NTOSKRNL] Don't attempt to free random address Don't attempt to free null address

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Tue Nov 22 22:07:35 2011 New Revision: 54479 URL: http://svn.reactos.org/svn/reactos?rev=54479&view=rev Log: [NTOSKRNL] Don't attempt to free random address Don't attempt to free null address Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c [iso-8859-1] Tue Nov 22 22:07:35 2011 @@ -1245,7 +1245,7 @@ { ULONG KeyNameBufferLength; PKEY_VALUE_PARTIAL_INFORMATION ParentIdPrefixInformation = NULL; - UNICODE_STRING KeyName; + UNICODE_STRING KeyName = {0, 0, NULL}; UNICODE_STRING KeyValue; UNICODE_STRING ValueName; HANDLE hKey = NULL; @@ -1267,10 +1267,8 @@ ParentIdPrefixInformation = ExAllocatePool(PagedPool, KeyNameBufferLength + sizeof(WCHAR)); if (!ParentIdPrefixInformation) { - Status = STATUS_INSUFFICIENT_RESOURCES; - goto cleanup; - } - + return STATUS_INSUFFICIENT_RESOURCES; + } KeyName.Buffer = ExAllocatePool(PagedPool, (49 * sizeof(WCHAR)) + DeviceNode->Parent->InstancePath.Length); if (!KeyName.Buffer)

12 years, 10 months

[jgardou] 54478: [OOPS] - I forgot this one

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Nov 22 22:05:02 2011 New Revision: 54478 URL: http://svn.reactos.org/svn/reactos?rev=54478&view=rev Log: [OOPS] - I forgot this one Modified: trunk/reactos/ntoskrnl/include/internal/mm.h Modified: trunk/reactos/ntoskrnl/include/internal/mm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/mm.h [iso-8859-1] Tue Nov 22 22:05:02 2011 @@ -88,6 +88,7 @@ #define MM_PAGEOP_PAGEOUT (2) #define MM_PAGEOP_PAGESYNCH (3) #define MM_PAGEOP_ACCESSFAULT (4) +#define MM_PAGEOP_CHANGEPROTECT (5) /* Number of list heads to use */ #define MI_FREE_POOL_LISTS 4 @@ -1639,15 +1640,6 @@ NTSTATUS NTAPI -MmWritePageSectionView( - PMMSUPPORT AddressSpace, - PMEMORY_AREA MArea, - PVOID Address, - PMM_PAGEOP PageOp -); - -NTSTATUS -NTAPI MmInitSectionImplementation(VOID); NTSTATUS

12 years, 10 months

[jgardou] 54477: [NTOSKRNL/MM] - create a page op when changing page protection attribute - properly handle PAGE_NOACCESS protection change in NtProtectVirtualMemory - Round down the address we're ...

by jgardou＠svn.reactos.org

Author: jgardou Date: Tue Nov 22 22:01:06 2011 New Revision: 54477 URL: http://svn.reactos.org/svn/reactos?rev=54477&view=rev Log: [NTOSKRNL/MM] - create a page op when changing page protection attribute - properly handle PAGE_NOACCESS protection change in NtProtectVirtualMemory - Round down the address we're given when creating a page op, so we're sure there is o,ly one page op for running for one page - Add a small hack Now ReatOS boots with DPH enabled on low memory conditions Modified: trunk/reactos/ntoskrnl/mm/anonmem.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/pageop.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] Tue Nov 22 22:01:06 2011 @@ -420,16 +420,42 @@ OldProtect != NewProtect) { ULONG i; + PMM_PAGEOP PageOp; + PMEMORY_AREA MArea; + char* addr = (char*)BaseAddress; for (i=0; i < PAGE_ROUND_UP(RegionSize)/PAGE_SIZE; i++) { - if (MmIsPagePresent(Process, - (char*)BaseAddress + (i*PAGE_SIZE))) + MArea = MmLocateMemoryAreaByAddress(AddressSpace, addr); + do { - MmSetPageProtect(Process, - (char*)BaseAddress + (i*PAGE_SIZE), - NewProtect); + PageOp = MmGetPageOp(MArea, Process->UniqueProcessId, addr, + NULL, 0, MM_PAGEOP_CHANGEPROTECT, TRUE); + } while(PageOp == NULL); + + /* Should we enable/disable virtual mapping? */ + if((NewProtect & PAGE_NOACCESS) && + !(OldProtect & PAGE_NOACCESS) && + (MmIsPagePresent(Process, addr))) + { + /* Set other flags if any */ + if(NewProtect != PAGE_NOACCESS) + MmSetPageProtect(Process, addr, NewProtect & ~PAGE_NOACCESS); + MmDisableVirtualMapping(Process, addr, NULL, NULL); } + else if((OldProtect & PAGE_NOACCESS) && !(NewProtect & PAGE_NOACCESS)) + { + MmEnableVirtualMapping(Process, addr); + } + + /* Set new protection flags */ + if(MmIsPagePresent(Process, addr)) + { + MmSetPageProtect(Process, addr, NewProtect); + } + KeSetEvent(&PageOp->CompletionEvent, IO_NO_INCREMENT, FALSE); + MmReleasePageOp(PageOp); + addr += PAGE_SIZE; } } } Modified: trunk/reactos/ntoskrnl/mm/i386/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/i386/page.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/i386/page.c [iso-8859-1] Tue Nov 22 22:01:06 2011 @@ -304,21 +304,17 @@ MmReleasePageMemoryConsumer(MC_SYSTEM, Pfn); } InterlockedExchangePte(PageDir, MmGlobalKernelPageDirectory[PdeOffset]); - /* Flush it before accessing it */ - KeInvalidateTlbEntry(MiPteToAddress(PageDir)); RtlZeroMemory(MiPteToAddress(PageDir), PAGE_SIZE); return (PULONG)MiAddressToPte(Address); } InterlockedExchangePte(PageDir, MmGlobalKernelPageDirectory[PdeOffset]); - /* Flush it before accessing it */ - KeInvalidateTlbEntry(MiPteToAddress(PageDir)); } return (PULONG)MiAddressToPte(Address); } BOOLEAN MmUnmapPageTable(PULONG Pt) { - if (Pt >= (PULONG)PAGETABLE_MAP && Pt < (PULONG)PAGETABLE_MAP + 1024*1024) + if (!IS_HYPERSPACE(Pt)) { return TRUE; } @@ -383,7 +379,10 @@ Pte = *Pt; } while (Pte != InterlockedCompareExchangePte(Pt, Pte & ~PA_PRESENT, Pte)); - MiFlushTlb(Pt, Address); + if(Pte & PA_PRESENT) + MiFlushTlb(Pt, Address); + else + MmUnmapPageTable(Pt); WasValid = (PAGE_MASK(Pte) != 0); if (!WasValid) @@ -457,16 +456,17 @@ */ Pte = InterlockedExchangePte(Pt, 0); - MiFlushTlb(Pt, Address); WasValid = (PAGE_MASK(Pte) != 0); if (WasValid) { Pfn = PTE_TO_PFN(Pte); + MiFlushTlb(Pt, Address); } else { Pfn = 0; + MmUnmapPageTable(Pt); } if (FreePage && WasValid) @@ -523,7 +523,13 @@ */ Pte = InterlockedExchangePte(Pt, 0); - MiFlushTlb(Pt, Address); + //MiFlushTlb(Pt, Address); + MmUnmapPageTable(Pt); + + if(!(Pte & 0x800)) + { + KeBugCheck(MEMORY_MANAGEMENT); + } /* * Return some information to the caller @@ -632,8 +638,14 @@ Pt = MmGetPageTableForProcess(Process, Address, FALSE); if (Pt == NULL) { - KeBugCheck(MEMORY_MANAGEMENT); - } + //HACK to get DPH working, waiting for MM rewrite :-/ + //KeBugCheck(MEMORY_MANAGEMENT); + return; + } + + /* Do not mark a 0 page as present */ + if(0 == InterlockedCompareExchangePte(Pt, 0, 0)) + return; do { @@ -695,9 +707,13 @@ { KeBugCheck(MEMORY_MANAGEMENT); } - Pte = *Pt; - InterlockedExchangePte(Pt, SwapEntry << 1); - MiFlushTlb(Pt, Address); + Pte = InterlockedExchangePte(Pt, SwapEntry << 1); + if(PAGE_MASK(Pte)) + { + KeBugCheck(MEMORY_MANAGEMENT); + } + //MiFlushTlb(Pt, Address); + MmUnmapPageTable(Pt); return(STATUS_SUCCESS); } @@ -792,19 +808,19 @@ } oldPdeOffset = PdeOffset; - Pte = *Pt; + Pte = InterlockedExchangePte(Pt, PFN_TO_PTE(Pages[i]) | Attributes);; /* There should not be anything valid here */ - if ((Pte & PA_PRESENT) || (Pte & 0x800)) - { + if (PAGE_MASK(Pte) != 0) + { + PMMPFN Pfn1 = MiGetPfnEntry(PTE_TO_PFN(Pte)); + (void)Pfn1; DPRINT1("Bad PTE %lx\n", Pte); KeBugCheck(MEMORY_MANAGEMENT); } - InterlockedExchangePte(Pt, PFN_TO_PTE(Pages[i]) | Attributes); /* flush if currently mapped, just continue editing if hyperspace - * NOTE : Do not call MiFlushTlb, as it will unmap the page table, - * and we might need it afterwards */ - if (Address >= MmSystemRangeStart || - (Pt >= (PULONG)PAGETABLE_MAP && Pt < (PULONG)PAGETABLE_MAP + 1024*1024)) + * NOTE : This check is similar to what is done in MiFlushTlb, but we + * don't use it because it would unmap the page table */ + if (Addr >= MmSystemRangeStart || (!IS_HYPERSPACE(Pt))) { KeInvalidateTlbEntry(Addr); } @@ -889,6 +905,7 @@ { ULONG Attributes = 0; PULONG Pt; + ULONG Pte; DPRINT("MmSetPageProtect(Process %x Address %x flProtect %x)\n", Process, Address, flProtect); @@ -910,8 +927,17 @@ { KeBugCheck(MEMORY_MANAGEMENT); } - InterlockedExchangePte(Pt, PAGE_MASK(*Pt) | Attributes | (*Pt & (PA_ACCESSED|PA_DIRTY))); - MiFlushTlb(Pt, Address); + Pte = InterlockedExchangePte(Pt, PAGE_MASK(*Pt) | Attributes | (*Pt & (PA_ACCESSED|PA_DIRTY))); + + if(!PAGE_MASK(Pte)) + { + DPRINT1("Invalid Pte %lx\n", Pte); + __debugbreak(); + } + if((Pte & Attributes) != Attributes) + MiFlushTlb(Pt, Address); + else + MmUnmapPageTable(Pt); } /* Modified: trunk/reactos/ntoskrnl/mm/pageop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pageop.c?rev=5… ============================================================================== --- trunk/reactos/ntoskrnl/mm/pageop.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pageop.c [iso-8859-1] Tue Nov 22 22:01:06 2011 @@ -145,6 +145,8 @@ ULONG_PTR Hash; KIRQL oldIrql; PMM_PAGEOP PageOp; + + Address = (PVOID)PAGE_ROUND_DOWN(Address); /* * Calcuate the hash value for pageop structure

12 years, 10 months

[rharabien] 54476: - Partially revert r54475 to check if it fixes KVM

by rharabien＠svn.reactos.org

Author: rharabien Date: Tue Nov 22 20:11:55 2011 New Revision: 54476 URL: http://svn.reactos.org/svn/reactos?rev=54476&view=rev Log: - Partially revert r54475 to check if it fixes KVM Modified: trunk/reactos/dll/win32/kernel32/client/proc.c trunk/reactos/subsystems/win32/csrss/win32csr/handle.c Modified: trunk/reactos/dll/win32/kernel32/client/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/proc.c [iso-8859-1] Tue Nov 22 20:11:55 2011 @@ -2902,7 +2902,7 @@ if (!NT_SUCCESS(Status)) { - DPRINT1("CSR Notification Failed"); + DPRINT1("CSR Notification Failed\n"); BaseSetLastNTError(Status); goto Cleanup; } Modified: trunk/reactos/subsystems/win32/csrss/win32csr/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/handle.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/handle.c [iso-8859-1] Tue Nov 22 20:11:55 2011 @@ -158,8 +158,8 @@ LeaveCriticalSection(&Console->Lock); if (_InterlockedDecrement(&Console->ReferenceCount) == 0) ConioDeleteConsole(&Console->Header); - CloseHandle(ProcessData->ConsoleEvent); - ProcessData->ConsoleEvent = NULL; + //CloseHandle(ProcessData->ConsoleEvent); + //ProcessData->ConsoleEvent = NULL; RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return STATUS_SUCCESS; }

12 years, 10 months

[rharabien] 54475: [WIN32CSR] - Fix process reference leak in case of GuiConsoleOpenUserRegistryPathPerProcessId failing to open registry key. Fixes console processes in LiveCD being ghosts.

by rharabien＠svn.reactos.org

Author: rharabien Date: Tue Nov 22 18:49:40 2011 New Revision: 54475 URL: http://svn.reactos.org/svn/reactos?rev=54475&view=rev Log: [WIN32CSR] - Fix process reference leak in case of GuiConsoleOpenUserRegistryPathPerProcessId failing to open registry key. Fixes console processes in LiveCD being ghosts. Modified: trunk/reactos/subsystems/win32/csrss/win32csr/console.c trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c trunk/reactos/subsystems/win32/csrss/win32csr/handle.c Modified: trunk/reactos/subsystems/win32/csrss/win32csr/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/console.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/console.c [iso-8859-1] Tue Nov 22 18:49:40 2011 @@ -140,7 +140,7 @@ GuiMode = TRUE; } } - if (GuiMode) + else /* GuiMode */ { Status = GuiInitConsole(Console, ShowCmd); if (! NT_SUCCESS(Status)) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/guiconsole.c [iso-8859-1] Tue Nov 22 18:49:40 2011 @@ -215,8 +215,8 @@ if (!GetTokenInformation(hProcessToken, TokenUser, (PVOID)Buffer, sizeof(Buffer), &Length)) { DPRINT("Error: GetTokenInformation failed(0x%x)\n",GetLastError()); + CloseHandle(hProcessToken); CloseHandle(hProcess); - CloseHandle(hProcessToken); return FALSE; } @@ -224,6 +224,8 @@ if (!NT_SUCCESS(RtlConvertSidToUnicodeString(&SidName, TokUser, TRUE))) { DPRINT("Error: RtlConvertSidToUnicodeString failed(0x%x)\n", GetLastError()); + CloseHandle(hProcessToken); + CloseHandle(hProcess); return FALSE; } @@ -231,15 +233,18 @@ RtlFreeUnicodeString(&SidName); CloseHandle(hProcessToken); + if (res != ERROR_SUCCESS) + { + CloseHandle(hProcess); + return FALSE; + } + if (hProcHandle) *hProcHandle = hProcess; else CloseHandle(hProcess); - if (res != ERROR_SUCCESS) - return FALSE; - else - return TRUE; + return TRUE; } static BOOL @@ -285,7 +290,7 @@ if (!fLength) { - DPRINT("GetProcessImageFileNameW failed(0x%x)ProcessId %d\n", GetLastError(),hProcess); + DPRINT("GetProcessImageFileNameW failed(0x%x)ProcessId %d\n", GetLastError(), ProcessId); return FALSE; } /* @@ -2310,7 +2315,7 @@ NULL); if (NULL == ThreadHandle) { - NtClose(GraphicsStartupEvent); + CloseHandle(GraphicsStartupEvent); DPRINT1("Win32Csr: Failed to create graphics console thread. Expect problems\n"); return STATUS_UNSUCCESSFUL; } Modified: trunk/reactos/subsystems/win32/csrss/win32csr/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/handle.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/handle.c [iso-8859-1] Tue Nov 22 18:49:40 2011 @@ -158,6 +158,8 @@ LeaveCriticalSection(&Console->Lock); if (_InterlockedDecrement(&Console->ReferenceCount) == 0) ConioDeleteConsole(&Console->Header); + CloseHandle(ProcessData->ConsoleEvent); + ProcessData->ConsoleEvent = NULL; RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return STATUS_SUCCESS; }

12 years, 10 months

← Newer
1
...
5
6
7
8
9
10
11
...
28
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs November 2011