Ros-diffs December 2010

ros-diffs@reactos.org

20 participants
369 discussions

[dgorbachev] 50117: Marco Radossevich <fwdprojects=at=email=dot=it>, a.k.a. forart: "Just two important examples that involved my contributions: UniATA & FullFAT." No code changes. See thread <http...

by dgorbachev＠svn.reactos.org

Author: dgorbachev Date: Fri Dec 24 01:59:13 2010 New Revision: 50117 URL: http://svn.reactos.org/svn/reactos?rev=50117&view=rev Log: Marco Radossevich <fwdprojects=at=email=dot=it>, a.k.a. forart: "Just two important examples that involved my contributions: UniATA & FullFAT." No code changes. See thread <http://www.reactos.org/forum/viewtopic.php?f=14&t=8809> for more details. Modified: trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h trunk/reactos/drivers/filesystems/fastfat_new/rw.c trunk/reactos/drivers/storage/ide/uniata/inc/PostDbgMesg.h Modified: trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/fatstruc.h [iso-8859-1] Fri Dec 24 01:59:13 2010 @@ -80,7 +80,7 @@ CcUnpinData((xContext)->Bcb); \ (xContext)->Bcb = NULL; \ } \ - + #define FatPinEndOfPage(xContext, xType) \ Add2Ptr((xContext)->Buffer, (xContext)->ValidLength, xType) Modified: trunk/reactos/drivers/filesystems/fastfat_new/rw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/fastfa… ============================================================================== --- trunk/reactos/drivers/filesystems/fastfat_new/rw.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/fastfat_new/rw.c [iso-8859-1] Fri Dec 24 01:59:13 2010 @@ -36,7 +36,7 @@ FatCompleteRequest(IrpContext, IrpContext->Irp, STATUS_SUCCESS); return STATUS_SUCCESS; } - + OpenType = FatDecodeFileObject(FileObject, &Vcb, &Fcb, &Ccb); DPRINT("FatiRead() Fcb %p, Name %wZ, Offset %d, Length %d, Handle %p\n", Modified: trunk/reactos/drivers/storage/ide/uniata/inc/PostDbgMesg.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… ============================================================================== --- trunk/reactos/drivers/storage/ide/uniata/inc/PostDbgMesg.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/ide/uniata/inc/PostDbgMesg.h [iso-8859-1] Fri Dec 24 01:59:13 2010 @@ -43,4 +43,4 @@ }; #endif //__cplusplus -#endif //__DBG_DUMP_TOOLS__H__ +#endif //__DBG_DUMP_TOOLS__H__

13 years, 10 months

[tkreuzer] 50116: [RTL} Replace RtlMoveMemory x86 asm code with the code from CRT's memmove, which is better. Now we can close bug #1941

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 23 19:11:19 2010 New Revision: 50116 URL: http://svn.reactos.org/svn/reactos?rev=50116&view=rev Log: [RTL} Replace RtlMoveMemory x86 asm code with the code from CRT's memmove, which is better. Now we can close bug #1941 Modified: trunk/reactos/lib/rtl/i386/rtlmem.s Modified: trunk/reactos/lib/rtl/i386/rtlmem.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/i386/rtlmem.s?rev=… ============================================================================== --- trunk/reactos/lib/rtl/i386/rtlmem.s [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/i386/rtlmem.s [iso-8859-1] Thu Dec 23 19:11:19 2010 @@ -210,70 +210,124 @@ _RtlMoveMemory@12: - - /* Save volatiles */ + push ebp + mov ebp, esp + + /* Save non-volatiles */ push esi push edi /* Get pointers and size */ - mov esi, [esp+16] - mov edi, [esp+12] - mov ecx, [esp+20] - cld - - /* Check if the destination is higher (or equal) */ - cmp esi, edi - jbe Overlap - - /* Set ULONG size and UCHAR remainder */ -DoMove: - mov edx, ecx - and edx, 3 - shr ecx, 2 - - /* Do the move */ - rep movsd - or ecx, edx - jnz ByteMove - - /* Return */ - pop edi - pop esi - ret 12 - -ByteMove: - /* Move what's left */ - rep movsb - -DoneMove: - /* Restore volatiles */ - pop edi - pop esi - ret 12 - -Overlap: - /* Don't copy if they're equal */ - jz DoneMove - - /* Compare pointer distance with given length and check for overlap */ - mov eax, edi - sub eax, esi - cmp ecx, eax - jbe DoMove - - /* Set direction flag for backward move */ - std - - /* Copy byte-by-byte the non-overlapping distance */ - add esi, ecx - add edi, ecx - dec esi - dec edi - - /* Do the move, reset flag and return */ - rep movsb - cld - jmp DoneMove + mov edi, [ebp + 8] + mov esi, [ebp + 12] + mov ecx, [ebp + 16] + + /* Use downward copy if source < dest and overlapping */ + cmp edi, esi + jbe .CopyUp + mov eax, ecx + add eax, esi + cmp edi, eax + jb .CopyDown + +.CopyUp: + cld + + /* Check for small moves */ + cmp ecx, 16 + jb .CopyUpBytes + + /* Check if its already aligned */ + mov edx, ecx + test edi, 3 + je .CopyUpDwords + + /* Make the destination dword aligned */ + mov ecx, edi + and ecx, 3 + sub ecx, 5 + not ecx + sub edx, ecx + rep movsb + mov ecx, edx + +.CopyUpDwords: + shr ecx, 2 + rep movsd + mov ecx, edx + and ecx, 3 + +.CopyUpBytes: + test ecx, ecx + je .CopyUpEnd + rep movsb + +.CopyUpEnd: + mov eax, [ebp + 8] + pop edi + pop esi + pop ebp + ret 12 + +.CopyDown: + std + + /* Go to the end of the region */ + add edi, ecx + add esi, ecx + + /* Check for small moves */ + cmp ecx, 16 + jb .CopyDownSmall + + /* Check if its already aligned */ + mov edx, ecx + test edi, 3 + je .CopyDownAligned + + /* Make the destination dword aligned */ + mov ecx, edi + and ecx, 3 + sub edx, ecx + dec esi + dec edi + rep movsb + mov ecx, edx + sub esi, 3 + sub edi, 3 + +.CopyDownDwords: + shr ecx, 2 + rep movsd + mov ecx, edx + and ecx, 3 + je .CopyDownEnd + add esi, 3 + add edi, 3 + +.CopyDownBytes: + rep movsb + +.CopyDownEnd: + cld + mov eax, [ebp + 8] + pop edi + pop esi + pop ebp + ret 12 + +.CopyDownAligned: + sub edi, 4 + sub esi, 4 + jmp .CopyDownDwords + +.CopyDownSmall: + test ecx, ecx + je .CopyDownEnd + dec esi + dec edi + jmp .CopyDownBytes + @RtlPrefetchMemoryNonTemporal@8:

13 years, 10 months

[fireball] 50115: [UNIATA] - Update uniata to 0.40a1. Prepared by Samuel Serapion, edited by me. See issue #5762 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Thu Dec 23 16:59:55 2010 New Revision: 50115 URL: http://svn.reactos.org/svn/reactos?rev=50115&view=rev Log: [UNIATA] - Update uniata to 0.40a1. Prepared by Samuel Serapion, edited by me. See issue #5762 for more details. Added: trunk/reactos/drivers/storage/ide/uniata/todo.txt (with props) Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h trunk/reactos/drivers/storage/ide/uniata/bm_devs.h trunk/reactos/drivers/storage/ide/uniata/bsmaster.h trunk/reactos/drivers/storage/ide/uniata/config.h trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp trunk/reactos/drivers/storage/ide/uniata/id_init.cpp trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp trunk/reactos/drivers/storage/ide/uniata/id_queue.cpp trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp trunk/reactos/drivers/storage/ide/uniata/id_sata.h trunk/reactos/drivers/storage/ide/uniata/idedma.rc trunk/reactos/drivers/storage/ide/uniata/inc/CrossNt.h trunk/reactos/drivers/storage/ide/uniata/scsi.h trunk/reactos/drivers/storage/ide/uniata/srb.h trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/drivers/storage/ide/uniata/atapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/bm_devs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/bsmaster.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/config.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_ata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_dma.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_init.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_probe.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_queue.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/id_sata.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/idedma.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/inc/CrossNt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/scsi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/srb.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Added: trunk/reactos/drivers/storage/ide/uniata/todo.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata… Modified: trunk/reactos/drivers/storage/ide/uniata/uniata_ver.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/ide/uniata…

13 years, 10 months

[rmessiant] 50114: [SHELL32] - Add NULL checks in IShellView and IDropTarget implementations. Should fix bug #5780.

by rmessiant＠svn.reactos.org

Author: rmessiant Date: Thu Dec 23 15:38:14 2010 New Revision: 50114 URL: http://svn.reactos.org/svn/reactos?rev=50114&view=rev Log: [SHELL32] - Add NULL checks in IShellView and IDropTarget implementations. Should fix bug #5780. Modified: trunk/reactos/dll/win32/shell32/shlview.c Modified: trunk/reactos/dll/win32/shell32/shlview.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.c [iso-8859-1] Thu Dec 23 15:38:14 2010 @@ -2072,7 +2072,14 @@ TRACE("(%p)->(shlview=%p set=%p shlbrs=%p rec=%p hwnd=%p) incomplete\n",This, lpPrevView,lpfs, psb, prcView, phWnd); - TRACE("-- vmode=%x flags=%x left=%i top=%i right=%i bottom=%i\n",lpfs->ViewMode, lpfs->fFlags ,prcView->left,prcView->top, prcView->right, prcView->bottom); + if (lpfs != NULL) + TRACE("-- vmode=%x flags=%x\n", lpfs->ViewMode, lpfs->fFlags); + if (prcView != NULL) + TRACE("-- left=%i top=%i right=%i bottom=%i\n", prcView->left, prcView->top, prcView->right, prcView->bottom); + + /* Validate the Shell Browser */ + if (psb == NULL) + return E_UNEXPECTED; /*set up the member variables*/ This->pShellBrowser = psb; @@ -2534,8 +2541,13 @@ IDropTarget_Release(This->pCurDropTarget); This->pCurDropTarget = NULL; } - IDataObject_Release(This->pCurDataObject); - This->pCurDataObject = NULL; + + if (This->pCurDataObject != NULL) + { + IDataObject_Release(This->pCurDataObject); + This->pCurDataObject = NULL; + } + This->iDragOverItem = 0; return S_OK; @@ -2553,8 +2565,12 @@ This->pCurDropTarget = NULL; } - IDataObject_Release(This->pCurDataObject); - This->pCurDataObject = NULL; + if (This->pCurDataObject != NULL) + { + IDataObject_Release(This->pCurDataObject); + This->pCurDataObject = NULL; + } + This->iDragOverItem = 0; return S_OK;

13 years, 10 months

[rmessiant] 50113: [WIN32K] - NtGdiGetDIBitsInternal: Copy the requested amount of scanlines into the return buffer, not the whole bitmap. Should fix bug #5766.

by rmessiant＠svn.reactos.org

Author: rmessiant Date: Thu Dec 23 14:10:59 2010 New Revision: 50113 URL: http://svn.reactos.org/svn/reactos?rev=50113&view=rev Log: [WIN32K] - NtGdiGetDIBitsInternal: Copy the requested amount of scanlines into the return buffer, not the whole bitmap. Should fix bug #5766. Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dibobj.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dibobj.c [iso-8859-1] Thu Dec 23 14:10:59 2010 @@ -971,7 +971,7 @@ Status = STATUS_SUCCESS; _SEH2_TRY { - RtlCopyMemory(Bits, pDIBits, DIB_GetDIBImageBytes (width, height, bpp)); + RtlCopyMemory(Bits, pDIBits, DIB_GetDIBImageBytes (width, ScanLines, bpp)); } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) {

13 years, 10 months

[tkreuzer] 50112: [VBEMP] Fix rounding error when calculating display size Loosely based on patch by neoman. Fixes gdi32_winetest:mapping See issue #5790 for more details.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Thu Dec 23 12:11:19 2010 New Revision: 50112 URL: http://svn.reactos.org/svn/reactos?rev=50112&view=rev Log: [VBEMP] Fix rounding error when calculating display size Loosely based on patch by neoman. Fixes gdi32_winetest:mapping See issue #5790 for more details. Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c Modified: trunk/reactos/drivers/video/miniport/vbe/vbemp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/miniport/vbe… ============================================================================== --- trunk/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/miniport/vbe/vbemp.c [iso-8859-1] Thu Dec 23 12:11:19 2010 @@ -847,6 +847,7 @@ ULONG VideoModeId) { PVBE_MODEINFO VBEMode = &DeviceExtension->ModeInfo[VideoModeId]; + ULONG dpi; VideoMode->Length = sizeof(VIDEO_MODE_INFORMATION); VideoMode->ModeIndex = VideoModeId; @@ -860,9 +861,10 @@ VideoMode->BitsPerPlane = VBEMode->BitsPerPixel / VBEMode->NumberOfPlanes; VideoMode->Frequency = 1; - /* Assume 96DPI and 25.4 millimeters per inch */ - VideoMode->XMillimeter = VBEMode->XResolution * 254 / 960; - VideoMode->YMillimeter = VBEMode->YResolution * 254 / 960; + /* Assume 96DPI and 25.4 millimeters per inch, round to nearest */ + dpi = 96; + VideoMode->XMillimeter = ((ULONGLONG)VBEMode->XResolution * 254 + (dpi * 5)) / (dpi * 10); + VideoMode->YMillimeter = ((ULONGLONG)VBEMode->YResolution * 254 + (dpi * 5)) / (dpi * 10); if (VBEMode->BitsPerPixel > 8) {

13 years, 10 months

[fireball] 50111: [NTOS] - Fix copypasta, thanks Victor!

by fireball＠svn.reactos.org

Author: fireball Date: Thu Dec 23 09:14:42 2010 New Revision: 50111 URL: http://svn.reactos.org/svn/reactos?rev=50111&view=rev Log: [NTOS] - Fix copypasta, thanks Victor! Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Thu Dec 23 09:14:42 2010 @@ -2458,7 +2458,7 @@ ASSERT(BaseVpn > Vad->EndingVpn); /* Stop if there is no right child */ - if (!Vad->LeftChild) break; + if (!Vad->RightChild) break; /* Search on the right next */ Vad = Vad->RightChild;

13 years, 10 months

[arty] 50110: Do the required flush when the last reference to a cache stripe is released. The installer now completes given enough ram in NEWCC=1, and writes an understandable FS. There's at least...

by arty＠svn.reactos.org

Author: arty Date: Thu Dec 23 08:42:51 2010 New Revision: 50110 URL: http://svn.reactos.org/svn/reactos?rev=50110&view=rev Log: Do the required flush when the last reference to a cache stripe is released. The installer now completes given enough ram in NEWCC=1, and writes an understandable FS. There's at least one more problem preventing the resulting installation from booting however. Fix a bug in rmap where we were checking the next (unfortunately named current) rmap for a segment membership. Fix a mistake in cache trim. #ifdef detection of DirectMapping in section in NEWCC mode in page out. Modified: trunk/reactos/ntoskrnl/cache/cachesub.c trunk/reactos/ntoskrnl/cache/fssup.c trunk/reactos/ntoskrnl/cache/newcc.h trunk/reactos/ntoskrnl/cache/pinsup.c trunk/reactos/ntoskrnl/mm/rmap.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/cache/cachesub.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/cachesub.c?… ============================================================================== --- trunk/reactos/ntoskrnl/cache/cachesub.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/cachesub.c [iso-8859-1] Thu Dec 23 08:42:51 2010 @@ -189,12 +189,12 @@ CcpDereferenceCache(Bcb - CcCacheSections, FALSE); } else - CcpUnpinData(Bcb); + CcpUnpinData(Bcb, TRUE); } else { ListEntry = ListEntry->Flink; - CcpUnpinData(Bcb); + CcpUnpinData(Bcb, TRUE); } DPRINT("End loop\n"); Modified: trunk/reactos/ntoskrnl/cache/fssup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/fssup.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cache/fssup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/fssup.c [iso-8859-1] Thu Dec 23 08:42:51 2010 @@ -53,7 +53,7 @@ // Reference a cache stripe so it won't go away CcpLock(); if (CcCacheSections[BcbHead].BaseAddress) { - CcpReferenceCache(i); + CcpReferenceCache(BcbHead); CcpUnlock(); } else { CcpUnlock(); @@ -68,7 +68,7 @@ *NrFreed += Freed; CcpLock(); - CcpDereferenceCache(BcbHead, FALSE); + CcpUnpinData(&CcCacheSections[BcbHead], TRUE); CcpUnlock(); } @@ -474,10 +474,10 @@ CcpLock(); ListEntry = ListEntry->Flink; // Return from pin state - CcpUnpinData(PinnedBcb); - } - - CcpUnpinData(Bcb); + CcpUnpinData(PinnedBcb, TRUE); + } + + CcpUnpinData(Bcb, TRUE); } CcpUnlock(); Modified: trunk/reactos/ntoskrnl/cache/newcc.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/newcc.h?rev… ============================================================================== --- trunk/reactos/ntoskrnl/cache/newcc.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/newcc.h [iso-8859-1] Thu Dec 23 08:42:51 2010 @@ -65,9 +65,9 @@ NTAPI CcInitView(VOID); -VOID +BOOLEAN NTAPI -CcpUnpinData(PNOCC_BCB Bcb); +CcpUnpinData(PNOCC_BCB Bcb, BOOLEAN ActuallyRelease); BOOLEAN NTAPI Modified: trunk/reactos/ntoskrnl/cache/pinsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/pinsup.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/cache/pinsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/pinsup.c [iso-8859-1] Thu Dec 23 08:42:51 2010 @@ -707,9 +707,9 @@ return Result; } -VOID -NTAPI -CcpUnpinData(IN PNOCC_BCB RealBcb) +BOOLEAN +NTAPI +CcpUnpinData(IN PNOCC_BCB RealBcb, BOOLEAN ReleaseBit) { if (RealBcb->RefCount <= 2) { @@ -718,9 +718,11 @@ { DPRINT("Triggering exclusive waiter\n"); KeSetEvent(&RealBcb->ExclusiveWait, IO_NO_INCREMENT, FALSE); - return; + return TRUE; } } + if (RealBcb->RefCount == 2 && !ReleaseBit) + return FALSE; if (RealBcb->RefCount > 1) { DPRINT("Removing one reference #%x\n", RealBcb - CcCacheSections); @@ -730,6 +732,7 @@ if (RealBcb->RefCount == 1) { DPRINT("Clearing allocation bit #%x\n", RealBcb - CcCacheSections); + RtlClearBit(CcCacheBitmap, RealBcb - CcCacheSections); #ifdef PIN_WRITE_ONLY @@ -745,6 +748,8 @@ &OldProtect); #endif } + + return TRUE; } VOID @@ -753,13 +758,21 @@ { PNOCC_BCB RealBcb = (PNOCC_BCB)Bcb; ULONG Selected = RealBcb - CcCacheSections; + BOOLEAN Released; ASSERT(RealBcb >= CcCacheSections && RealBcb - CcCacheSections < CACHE_NUM_SECTIONS); DPRINT("CcUnpinData Bcb #%x (RefCount %d)\n", Selected, RealBcb->RefCount); CcpLock(); - CcpUnpinData(RealBcb); + Released = CcpUnpinData(RealBcb, FALSE); CcpUnlock(); + + if (!Released) { + MiFlushMappedSection(RealBcb->BaseAddress, &RealBcb->FileOffset, &RealBcb->Map->FileSizes.FileSize, RealBcb->Dirty); + CcpLock(); + CcpUnpinData(RealBcb, TRUE); + CcpUnlock(); + } } VOID Modified: trunk/reactos/ntoskrnl/mm/rmap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/rmap.c?rev=501… ============================================================================== --- trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/rmap.c [iso-8859-1] Thu Dec 23 08:42:51 2010 @@ -365,7 +365,7 @@ previous_entry = current_entry; current_entry = current_entry->Next; #ifdef NEWCC - if (!RMAP_IS_SEGMENT(current_entry->Address)) + if (!RMAP_IS_SEGMENT(previous_entry->Address)) #endif { if (DeleteMapping) Modified: trunk/reactos/ntoskrnl/mm/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Thu Dec 23 08:42:51 2010 @@ -2039,7 +2039,9 @@ ULONG FileOffset; NTSTATUS Status; PFILE_OBJECT FileObject; +#ifndef NEWCC PBCB Bcb = NULL; +#endif BOOLEAN DirectMapped; BOOLEAN IsImageSection; PEPROCESS Process = MmGetAddressSpaceOwner(AddressSpace); @@ -2061,6 +2063,7 @@ FileObject = Context.Section->FileObject; DirectMapped = FALSE; +#ifndef NEWCC if (FileObject != NULL && !(Context.Segment->Characteristics & IMAGE_SCN_MEM_SHARED)) { @@ -2077,6 +2080,7 @@ DirectMapped = TRUE; } } +#endif /*

13 years, 10 months

[fireball] 50109: [NTOS] - Fix a typo in region size calculation of special memory areas, which unbreaks OllyDbg & co. Thanks Michael Martin for the hint. See issue #5692 for more details.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Dec 22 22:18:32 2010 New Revision: 50109 URL: http://svn.reactos.org/svn/reactos?rev=50109&view=rev Log: [NTOS] - Fix a typo in region size calculation of special memory areas, which unbreaks OllyDbg & co. Thanks Michael Martin for the hint. See issue #5692 for more details. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Wed Dec 22 22:18:32 2010 @@ -2379,7 +2379,7 @@ MemoryInfo.AllocationBase = (PCHAR)MM_HIGHEST_VAD_ADDRESS + 1; MemoryInfo.State = MEM_RESERVE; MemoryInfo.Protect = PAGE_NOACCESS; - MemoryInfo.RegionSize = (ULONG_PTR)MemoryInfo.AllocationBase - (ULONG_PTR)Address; + MemoryInfo.RegionSize = (ULONG_PTR)MM_HIGHEST_USER_ADDRESS + 1 - (ULONG_PTR)Address; } /* Return the data, NtQueryInformation already probed it*/

13 years, 10 months

[fireball] 50108: [NTOS] - Fix memory region size calculation in MemoryBasicInformation in certain cases. Spotted by Michael Martin.

by fireball＠svn.reactos.org

Author: fireball Date: Wed Dec 22 21:59:27 2010 New Revision: 50108 URL: http://svn.reactos.org/svn/reactos?rev=50108&view=rev Log: [NTOS] - Fix memory region size calculation in MemoryBasicInformation in certain cases. Spotted by Michael Martin. Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Wed Dec 22 21:59:27 2010 @@ -2446,6 +2446,9 @@ /* Check if this VAD is too high */ if (BaseVpn < Vad->StartingVpn) { + /* Stop if there is no left child */ + if (!Vad->LeftChild) break; + /* Search on the left next */ Vad = Vad->LeftChild; } @@ -2453,6 +2456,11 @@ { /* Then this VAD is too low, keep searching on the right */ ASSERT(BaseVpn > Vad->EndingVpn); + + /* Stop if there is no right child */ + if (!Vad->LeftChild) break; + + /* Search on the right next */ Vad = Vad->RightChild; } }

13 years, 10 months

← Newer
1
...
11
12
13
14
15
16
17
...
37
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 December 2010