Ros-diffs

ros-diffs@reactos.org

81390 discussions

[tkreuzer] 55675: [FREELDR] - Fix heap code for 64 bit (before someone asks: the reason to use ULONG_PTR instead of ULONG is warning free code without casts)
by tkreuzer＠svn.reactos.org 17 Feb '12

17 Feb '12

Author: tkreuzer Date: Fri Feb 17 17:22:14 2012 New Revision: 55675 URL: http://svn.reactos.org/svn/reactos?rev=55675&view=rev Log: [FREELDR] - Fix heap code for 64 bit (before someone asks: the reason to use ULONG_PTR instead of ULONG is warning free code without casts) Modified: trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c Modified: trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/mm/he… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/mm/heap_new.c [iso-8859-1] Fri Feb 17 17:22:14 2012 @@ -39,8 +39,8 @@ typedef struct _BLOCK_DATA { - ULONG_PTR Flink; - ULONG_PTR Blink; + ULONG_PTR Flink:32; + ULONG_PTR Blink:32; } BLOCK_DATA, *PBLOCK_DATA; typedef struct _HEAP_BLOCK

1 0

[jgardou] 55674: [NTOSKRNL/ARM3] - remove useless code : Page Directories Entries are backed by ARM3 managed pages
by jgardou＠svn.reactos.org 17 Feb '12

17 Feb '12

Author: jgardou Date: Fri Feb 17 16:14:12 2012 New Revision: 55674 URL: http://svn.reactos.org/svn/reactos?rev=55674&view=rev Log: [NTOSKRNL/ARM3] - remove useless code : Page Directories Entries are backed by ARM3 managed pages Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Fri Feb 17 16:14:12 2012 @@ -1351,8 +1351,6 @@ PMMPFN Pfn1, Pfn2; KIRQL OldIrql; PFN_NUMBER PageFrameIndex; - PULONG PageDir; - ULONG i; //ASSERT(Process->CommitCharge == 0); @@ -1370,27 +1368,6 @@ /* Check for fully initialized process */ if (Process->AddressSpaceInitialized == 2) { - /* Map the PDE */ - PageDir = MmCreateHyperspaceMapping(Process->Pcb.DirectoryTableBase[0] >> PAGE_SHIFT); - for (i = 0; i < ADDR_TO_PDE_OFFSET(MmSystemRangeStart); i++) - { - /* Loop all page tables */ - if (PageDir[i] != 0) - { - /* Check if they are RosMm-owned */ - if (MI_IS_ROS_PFN(MiGetPfnEntry(PageDir[i] >> PAGE_SHIFT))) - { - /* Free them through the RosMm ABI */ - //DPRINT1("Freeing MC_SYSTEM: %lx\n", PageDir[i]); - MmReleasePageMemoryConsumer(MC_SYSTEM, PageDir[i] >> PAGE_SHIFT); - } - } - } - - /* Unmap the PDE */ - //DPRINT1("Done\n"); - MmDeleteHyperspaceMapping(PageDir); - /* Map the working set page and its page table */ Pfn1 = MiGetPfnEntry(Process->WorkingSetPage); Pfn2 = MiGetPfnEntry(Pfn1->u4.PteFrame);

1 0

[janderwald] 55673: [KERNEL32] - Fix error status of GetQueuedCompletionStatus, which should set the error to WAIT_TIMEOUT - Fixes 4 failing winetests - Patch by Samuel Serapion (samcharly_hotmail_...
by janderwald＠svn.reactos.org 17 Feb '12

17 Feb '12

Author: janderwald Date: Fri Feb 17 16:11:40 2012 New Revision: 55673 URL: http://svn.reactos.org/svn/reactos?rev=55673&view=rev Log: [KERNEL32] - Fix error status of GetQueuedCompletionStatus, which should set the error to WAIT_TIMEOUT - Fixes 4 failing winetests - Patch by Samuel Serapion (samcharly_hotmail_com) See issue #6907 for more details. Modified: trunk/reactos/dll/win32/kernel32/client/file/iocompl.c Modified: trunk/reactos/dll/win32/kernel32/client/file/iocompl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/iocompl.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/iocompl.c [iso-8859-1] Fri Feb 17 16:11:40 2012 @@ -123,7 +123,12 @@ if (!NT_SUCCESS(errCode) || errCode == STATUS_TIMEOUT) { *lpOverlapped = NULL; - BaseSetLastNTError(errCode); + + if(errCode == STATUS_TIMEOUT) + SetLastError(WAIT_TIMEOUT); + else + BaseSetLastNTError(errCode); + return FALSE; }

1 0

[jgardou] 55672: [CMAKE] - use quotes in reactos.dff for every platform. Paths beginning with '.' are no longer seen as directives
by jgardou＠svn.reactos.org 17 Feb '12

17 Feb '12

Author: jgardou Date: Fri Feb 17 15:54:05 2012 New Revision: 55672 URL: http://svn.reactos.org/svn/reactos?rev=55672&view=rev Log: [CMAKE] - use quotes in reactos.dff for every platform. Paths beginning with '.' are no longer seen as directives Modified: trunk/reactos/cmake/CMakeMacros.cmake Modified: trunk/reactos/cmake/CMakeMacros.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/CMakeMacros.cmake?re… ============================================================================== --- trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/CMakeMacros.cmake [iso-8859-1] Fri Feb 17 15:54:05 2012 @@ -155,11 +155,7 @@ #add it in reactos.cab dir_to_num(${_CD_DESTINATION} _num) file(RELATIVE_PATH __relative_file ${REACTOS_SOURCE_DIR} ${_CD_FILE}) - if(CMAKE_HOST_SYSTEM_NAME MATCHES Windows) - file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.dyn "${__relative_file} ${_num}\n") - else() - file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.dyn "\"${__relative_file}\" ${_num}\n") - endif() + file(APPEND ${REACTOS_BINARY_DIR}/boot/bootdata/packages/reactos.dff.dyn "\"${__relative_file}\" ${_num}\n") unset(__relative_file) if(_CD_TARGET) #manage dependency

1 0

[tkreuzer] 55671: [WIN32K] Fix another bug in NtGdiSelectBitmap, where selecting the same bitmap a second time, would release the bitmap
by tkreuzer＠svn.reactos.org 17 Feb '12

17 Feb '12

Author: tkreuzer Date: Fri Feb 17 15:51:13 2012 New Revision: 55671 URL: http://svn.reactos.org/svn/reactos?rev=55671&view=rev Log: [WIN32K] Fix another bug in NtGdiSelectBitmap, where selecting the same bitmap a second time, would release the bitmap Modified: trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c Modified: trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/objects/dcobjs.c [iso-8859-1] Fri Feb 17 15:51:13 2012 @@ -261,11 +261,9 @@ IN HBITMAP hbmp) { PDC pdc; - PDC_ATTR pdcattr; HBITMAP hbmpOld; PSURFACE psurfNew, psurfOld; HRGN hVisRgn; - SIZEL sizlBitmap = {1, 1}; HDC hdcOld; ASSERT_NOGDILOCKS(); @@ -278,7 +276,6 @@ { return NULL; } - pdcattr = pdc->pdcattr; /* Must be a memory dc to select a bitmap */ if (pdc->dctype != DC_TYPE_MEMORY) @@ -290,10 +287,34 @@ /* Save the old bitmap */ psurfOld = pdc->dclevel.pSurface; + /* Check if there is a bitmap selected */ + if (psurfOld) + { + /* Get the old bitmap's handle */ + hbmpOld = psurfOld->BaseObject.hHmgr; + } + else + { + /* Use the default bitmap */ + hbmpOld = StockObjects[DEFAULT_BITMAP]; + } + + /* Check if the new bitmap is already selected */ + if (hbmp == hbmpOld) + { + /* Unlock the DC and return the old bitmap */ + DC_UnlockDc(pdc); + return hbmpOld; + } + /* Check if the default bitmap was passed */ if (hbmp == StockObjects[DEFAULT_BITMAP]) { psurfNew = NULL; + + /* Default bitmap is 1x1 pixel */ + pdc->dclevel.sizl.cx = 1; + pdc->dclevel.sizl.cy = 1; // HACK psurfNew = SURFACE_ShareLockSurface(hbmp); @@ -308,28 +329,32 @@ return NULL; } - /* Set the bitmp's hdc */ + /* Set the bitmap's hdc and check if it was set before */ hdcOld = InterlockedCompareExchangePointer((PVOID*)&psurfNew->hdc, hdc, 0); - if (hdcOld != NULL && hdcOld != hdc) - { - /* The bitmap is already selected, fail */ + if (hdcOld != NULL) + { + /* The bitmap is already selected into a different DC */ + ASSERT(hdcOld != hdc); + + /* Dereference the bitmap, unlock the DC and fail. */ SURFACE_ShareUnlockSurface(psurfNew); DC_UnlockDc(pdc); return NULL; } - /* Get the bitmap size */ - sizlBitmap = psurfNew->SurfObj.sizlBitmap; + /* Copy the bitmap size */ + pdc->dclevel.sizl = psurfNew->SurfObj.sizlBitmap; /* Check if the bitmap is a dibsection */ if(psurfNew->hSecure) { /* Set DIBSECTION attribute */ - pdcattr->ulDirty_ |= DC_DIBSECTION; + pdc->pdcattr->ulDirty_ |= DC_DIBSECTION; } else { - pdcattr->ulDirty_ &= ~DC_DIBSECTION; + /* Remove DIBSECTION attribute */ + pdc->pdcattr->ulDirty_ &= ~DC_DIBSECTION; } } @@ -339,37 +364,30 @@ /* Check if there was a bitmap selected before */ if (psurfOld) { - /* Get the old bitmap's handle */ - hbmpOld = psurfOld->BaseObject.hHmgr; - - /* Reset hdc of the old bitmap,it isn't selected anymore */ + /* Reset hdc of the old bitmap, it isn't selected anymore */ psurfOld->hdc = NULL; /* Dereference the old bitmap */ SURFACE_ShareUnlockSurface(psurfOld); } - else - { - /* Return default bitmap */ - hbmpOld = StockObjects[DEFAULT_BITMAP]; - } /* Mark the dc brushes invalid */ - pdcattr->ulDirty_ |= DIRTY_FILL | DIRTY_LINE; - - /* Unlock the DC */ - DC_UnlockDc(pdc); + pdc->pdcattr->ulDirty_ |= DIRTY_FILL | DIRTY_LINE; /* FIXME: Improve by using a region without a handle and selecting it */ hVisRgn = IntSysCreateRectRgn( 0, 0, - sizlBitmap.cx, - sizlBitmap.cy); + pdc->dclevel.sizl.cx, + pdc->dclevel.sizl.cy); + if (hVisRgn) { GdiSelectVisRgn(hdc, hVisRgn); GreDeleteObject(hVisRgn); } + + /* Unlock the DC */ + DC_UnlockDc(pdc); /* Return the old bitmap handle */ return hbmpOld;

1 0

[khornicek] 55670: [ROSAUTOTEST] If the last chunk of the string sent to StringOut isn't a whole line and forcePrint is set to false, send back what's left after processing. The caller is then resp...
by khornicek＠svn.reactos.org 17 Feb '12

17 Feb '12

Author: khornicek Date: Fri Feb 17 12:31:32 2012 New Revision: 55670 URL: http://svn.reactos.org/svn/reactos?rev=55670&view=rev Log: [ROSAUTOTEST] If the last chunk of the string sent to StringOut isn't a whole line and forcePrint is set to false, send back what's left after processing. The caller is then responsible for prepending that string next time it calls StringOut. Should fix the rest of debug log corruptions. Modified: trunk/rostests/rosautotest/CJournaledTestList.cpp trunk/rostests/rosautotest/CWebService.cpp trunk/rostests/rosautotest/CWineTest.cpp trunk/rostests/rosautotest/main.cpp trunk/rostests/rosautotest/precomp.h trunk/rostests/rosautotest/shutdown.cpp trunk/rostests/rosautotest/tools.cpp Modified: trunk/rostests/rosautotest/CJournaledTestList.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CJournaledTes… ============================================================================== --- trunk/rostests/rosautotest/CJournaledTestList.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CJournaledTestList.cpp [iso-8859-1] Fri Feb 17 12:31:32 2012 @@ -144,7 +144,7 @@ CTestInfo* TestInfo; DWORD BytesWritten; - StringOut("Writing initial journal file...\n\n"); + StringOut("Writing initial journal file...\n\n", TRUE); m_ListIterator = 0; @@ -189,7 +189,7 @@ DWORD BytesRead; DWORD RemainingSize; - StringOut("Loading journal file...\n\n"); + StringOut("Loading journal file...\n\n", TRUE); OpenJournal(GENERIC_READ); RemainingSize = GetFileSize(m_hJournal, NULL); Modified: trunk/rostests/rosautotest/CWebService.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CWebService.c… ============================================================================== --- trunk/rostests/rosautotest/CWebService.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CWebService.cpp [iso-8859-1] Fri Feb 17 12:31:32 2012 @@ -207,7 +207,7 @@ Response.reset(DoRequest(Data)); ss << "The server responded:" << endl << Response << endl; - StringOut(ss.str()); + StringOut(ss.str(), TRUE); if(strcmp(Response, "OK")) EXCEPTION("Aborted!\n"); Modified: trunk/rostests/rosautotest/CWineTest.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/CWineTest.cpp… ============================================================================== --- trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/CWineTest.cpp [iso-8859-1] Fri Feb 17 12:31:32 2012 @@ -266,9 +266,10 @@ stringstream ss, ssFinish; DWORD StartTime = GetTickCount(); float TotalTime; + string tailString; ss << "Running Wine Test, Module: " << TestInfo->Module << ", Test: " << TestInfo->Test << endl; - StringOut(ss.str()); + StringOut(ss.str(), TRUE); StartTime = GetTickCount(); @@ -299,9 +300,9 @@ if(!ReadFile(m_hReadPipe, Buffer, BytesAvailable, &Temp, NULL)) FATAL("ReadFile failed for the test run\n"); - /* Output all test output through StringOut, even while the test is still running */ + /* Output text through StringOut, even while the test is still running */ Buffer[BytesAvailable] = 0; - StringOut(string(Buffer)); + tailString = StringOut(tailString.append(string(Buffer)), FALSE); if(Configuration.DoSubmit()) TestInfo->Log += Buffer; @@ -310,10 +311,14 @@ while(!BreakLoop); } + /* Print what's left */ + if(!tailString.empty()) + StringOut(tailString, TRUE); + TotalTime = ((float)GetTickCount() - StartTime)/1000; ssFinish << "Test " << TestInfo->Test << " completed in "; ssFinish << setprecision(2) << fixed << TotalTime << " seconds." << endl; - StringOut(ssFinish.str()); + StringOut(ssFinish.str(), TRUE); } /** @@ -370,6 +375,6 @@ if(Configuration.DoSubmit() && !TestInfo->Log.empty()) WebService->Submit("wine", TestInfo); - StringOut("\n\n"); - } -} + StringOut("\n\n", TRUE); + } +} Modified: trunk/rostests/rosautotest/main.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/main.cpp?rev=… ============================================================================== --- trunk/rostests/rosautotest/main.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/main.cpp [iso-8859-1] Fri Feb 17 12:31:32 2012 @@ -60,7 +60,7 @@ ss << "\n\nSystem uptime " << setprecision(2) << fixed ; ss << ((float)GetTickCount()/1000) << " seconds\n"; - StringOut(ss.str()); + StringOut(ss.str(), TRUE); /* Run the tests */ WineTest.Run(); @@ -76,7 +76,7 @@ } catch(CSimpleException& e) { - StringOut(e.GetMessage()); + StringOut(e.GetMessage(), TRUE); } catch(CFatalException& e) { @@ -87,7 +87,7 @@ << "File: " << e.GetFile() << endl << "Line: " << e.GetLine() << endl << "Last Win32 Error: " << GetLastError() << endl; - StringOut(ss.str()); + StringOut(ss.str(), TRUE); } /* For sysreg2 to notice if rosautotest itself failed */ Modified: trunk/rostests/rosautotest/precomp.h URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/precomp.h?rev… ============================================================================== --- trunk/rostests/rosautotest/precomp.h [iso-8859-1] (original) +++ trunk/rostests/rosautotest/precomp.h [iso-8859-1] Fri Feb 17 12:31:32 2012 @@ -51,7 +51,7 @@ string EscapeString(const string& Input); string GetINIValue(PCWCH AppName, PCWCH KeyName, PCWCH FileName); bool IsNumber(const char* Input); -void StringOut(const string& String); +string StringOut(const string& String, const BOOL forcePrint); string UnicodeToAscii(PCWSTR UnicodeString); string UnicodeToAscii(const wstring& UnicodeString); Modified: trunk/rostests/rosautotest/shutdown.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/shutdown.cpp?… ============================================================================== --- trunk/rostests/rosautotest/shutdown.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/shutdown.cpp [iso-8859-1] Fri Feb 17 12:31:32 2012 @@ -20,14 +20,14 @@ if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES, &hToken)) { - StringOut("OpenProcessToken failed\n"); + StringOut("OpenProcessToken failed\n", TRUE); return false; } /* Get the LUID for the Shutdown privilege */ if (!LookupPrivilegeValueW(NULL, SE_SHUTDOWN_NAME, &Privileges.Privileges[0].Luid)) { - StringOut("LookupPrivilegeValue failed\n"); + StringOut("LookupPrivilegeValue failed\n", TRUE); return false; } @@ -37,14 +37,14 @@ if (!AdjustTokenPrivileges(hToken, FALSE, &Privileges, 0, NULL, NULL)) { - StringOut("AdjustTokenPrivileges failed\n"); + StringOut("AdjustTokenPrivileges failed\n", TRUE); return false; } /* Finally shut down the system */ if(!ExitWindowsEx(EWX_POWEROFF, SHTDN_REASON_MAJOR_OTHER | SHTDN_REASON_MINOR_OTHER | SHTDN_REASON_FLAG_PLANNED)) { - StringOut("ExitWindowsEx failed\n"); + StringOut("ExitWindowsEx failed\n", TRUE); return false; } Modified: trunk/rostests/rosautotest/tools.cpp URL: http://svn.reactos.org/svn/reactos/trunk/rostests/rosautotest/tools.cpp?rev… ============================================================================== --- trunk/rostests/rosautotest/tools.cpp [iso-8859-1] (original) +++ trunk/rostests/rosautotest/tools.cpp [iso-8859-1] Fri Feb 17 12:31:32 2012 @@ -92,8 +92,8 @@ * @param String * The std::string to output */ -void -StringOut(const string& String) +string +StringOut(const string& String, const BOOL forcePrint) { char DbgString[DBGPRINT_BUFSIZE + 1]; size_t i, start = 0, last_newline = 0, size = 0, curr_pos = 0; @@ -122,7 +122,7 @@ if((curr_pos - start) >= DBGPRINT_BUFSIZE) { /* No newlines so far, or the string just fits */ - if(last_newline <= start || (curr_pos - start) == DBGPRINT_BUFSIZE) + if(last_newline <= start || ((curr_pos - start == DBGPRINT_BUFSIZE) && NewString[curr_pos - 1] == '\n')) { size = curr_pos - start; memcpy(DbgString, NewString.c_str() + start, size); @@ -143,14 +143,24 @@ } } - /* The rest of the string is <= DBGPRINT_BUFSIZE so just print it*/ - size = curr_pos - start; - memcpy(DbgString, NewString.c_str() + start, size); - DbgString[size] = 0; - DbgPrint(DbgString); - /* Output the string */ cout << NewString; + + size = curr_pos - start; + + /* Only print if forced to or if the rest is a whole line */ + if(forcePrint == true || NewString[curr_pos - 1] == '\n') + { + memcpy(DbgString, NewString.c_str() + start, size); + DbgString[size] = 0; + DbgPrint(DbgString); + + NewString.clear(); + return NewString; + } + + /* Return the remaining chunk */ + return NewString.substr(start, size); } /**

1 0

[janderwald] 55669: [CDROM_NEW] - Misc build fixes for mingw and msvc with cmake
by janderwald＠svn.reactos.org 17 Feb '12

17 Feb '12

Author: janderwald Date: Fri Feb 17 12:07:17 2012 New Revision: 55669 URL: http://svn.reactos.org/svn/reactos?rev=55669&view=rev Log: [CDROM_NEW] - Misc build fixes for mingw and msvc with cmake Added: trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt (with props) Modified: trunk/reactos/drivers/storage/class/CMakeLists.txt trunk/reactos/drivers/storage/class/cdrom_new/cdrom.c trunk/reactos/drivers/storage/class/cdrom_new/cdrom.h trunk/reactos/drivers/storage/class/cdrom_new/ioctl.c trunk/reactos/drivers/storage/class/cdrom_new/mmc.c Modified: trunk/reactos/drivers/storage/class/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/CMak… ============================================================================== --- trunk/reactos/drivers/storage/class/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/CMakeLists.txt [iso-8859-1] Fri Feb 17 12:07:17 2012 @@ -1,5 +1,5 @@ - add_subdirectory(cdrom) +add_subdirectory(cdrom_new) add_subdirectory(class2) add_subdirectory(disk) add_subdirectory(disk_new) Added: trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt (added) +++ trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt [iso-8859-1] Fri Feb 17 12:07:17 2012 @@ -1,0 +1,15 @@ +include_directories(..) + +add_library(cdrom_new SHARED cdrom.c data.c ioctl.c mmc.c sec.c) + +target_link_libraries(cdrom_new libcntpr wdmguid) +if(ARCH MATCHES i386) + if(MSVC) + add_target_compile_flags(cdrom_new "/Gz") + else() + add_target_compile_flags(cdrom_new "-mrtd -fno-builtin -Wno-unused-variable -Wno-pointer-sign") + endif() +endif() + +set_module_type(cdrom_new kernelmodedriver) +add_importlibs(cdrom_new classpnp ntoskrnl hal) Propchange: trunk/reactos/drivers/storage/class/cdrom_new/CMakeLists.txt ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/storage/class/cdrom_new/cdrom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/cdrom.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/cdrom.c [iso-8859-1] Fri Feb 17 12:07:17 2012 @@ -114,7 +114,7 @@ status = IoAllocateDriverObjectExtension(DriverObject, CDROM_DRIVER_EXTENSION_ID, sizeof(CDROM_DRIVER_EXTENSION), - &driverExtension); + (PVOID*)&driverExtension); if (!NT_SUCCESS(status)) { TraceLog((CdromDebugWarning, @@ -555,7 +555,7 @@ PVOID senseData = NULL; ULONG timeOut; - PCDROM_DATA cddata; + PCDROM_DATA cddata = NULL; BOOLEAN changerDevice; BOOLEAN isMmcDevice = FALSE; @@ -3366,7 +3366,7 @@ } if ((startingOffset.QuadPart > commonExtension->PartitionLength.QuadPart) || - (transferByteCount & fdoExtension->DiskGeometry.BytesPerSector - 1)) { + (transferByteCount & (fdoExtension->DiskGeometry.BytesPerSector - 1))) { // // Fail request with status of invalid parameters. @@ -3390,18 +3390,18 @@ IN PVOID Context ) { - PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = DeviceObject->DeviceExtension; - PCOMMON_DEVICE_EXTENSION commonExtension = DeviceObject->DeviceExtension; - - PIO_STACK_LOCATION irpStack = IoGetCurrentIrpStackLocation(Irp); - PCDROM_DATA cdData = (PCDROM_DATA)(commonExtension->DriverData); - BOOLEAN use6Byte = TEST_FLAG(cdData->XAFlags, XA_USE_6_BYTE); PIO_STACK_LOCATION realIrpStack; PIO_STACK_LOCATION realIrpNextStack; - PSCSI_REQUEST_BLOCK srb = Context; PIRP realIrp = NULL; NTSTATUS status; BOOLEAN retry; + PSCSI_REQUEST_BLOCK srb = Context; + PFUNCTIONAL_DEVICE_EXTENSION fdoExtension = DeviceObject->DeviceExtension; + PCOMMON_DEVICE_EXTENSION commonExtension = DeviceObject->DeviceExtension; + PCDROM_DATA cdData = (PCDROM_DATA)(commonExtension->DriverData); + PIO_STACK_LOCATION irpStack = IoGetCurrentIrpStackLocation(Irp); + BOOLEAN use6Byte = TEST_FLAG(cdData->XAFlags, XA_USE_6_BYTE); + ULONG retryCount; // // Extract the 'real' irp from the irpstack. @@ -3454,7 +3454,17 @@ retry = TRUE; } - if (retry && realIrpNextStack->Parameters.Others.Argument1--) { + // + // get current retry count + // + retryCount = PtrToUlong(realIrpNextStack->Parameters.Others.Argument1); + + if (retry && retryCount) { + + // + // decrement retryCount and update + // + realIrpNextStack->Parameters.Others.Argument1 = UlongToPtr(retryCount-1); if (((ULONG)(ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1)) { @@ -5923,6 +5933,8 @@ ULONG pickDvdRegion; ULONG defaultDvdRegion; ULONG dvdRegion; + ULONG a, b; + PAGED_CODE(); @@ -5948,8 +5960,7 @@ } - ULONG a, b; - + a = max(sizeof(DVD_DESCRIPTOR_HEADER) + sizeof(DVD_COPYRIGHT_DESCRIPTOR), sizeof(DVD_READ_STRUCTURE) @@ -6434,7 +6445,9 @@ NTSTATUS --*/ -NTSTATUS + +VOID +NTAPI CdRomMmcErrorHandler( IN PDEVICE_OBJECT Fdo, IN PSCSI_REQUEST_BLOCK Srb, @@ -6600,8 +6613,6 @@ } // end of SenseKey switch } // end of SRB_STATUS_AUTOSENSE_VALID - - return STATUS_SUCCESS; } /*++ @@ -6748,6 +6759,7 @@ --*/ NTSTATUS +NTAPI CdRomShutdownFlushCompletion( IN PDEVICE_OBJECT Fdo, IN PIRP NewIrp, @@ -6836,7 +6848,7 @@ newIrpStack = IoGetCurrentIrpStackLocation(newIrp); newIrpStack->DeviceObject = Fdo; IoSetCompletionRoutine(newIrp, - CdRomShutdownFlushCompletion, + (PIO_COMPLETION_ROUTINE)CdRomShutdownFlushCompletion, OriginalIrp, TRUE, TRUE, TRUE); IoSetNextIrpStackLocation(newIrp); Modified: trunk/reactos/drivers/storage/class/cdrom_new/cdrom.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/cdrom.h [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/cdrom.h [iso-8859-1] Fri Feb 17 12:07:17 2012 @@ -45,7 +45,7 @@ CdromDebug = z, // set bit 0x00000000 in nt!kd_cdrom_mask #endif CdromDebugFeatures = 32 // set bit 0x80000000 in nt!kd_cdrom_mask -}; +}CdromError; #define CDROM_GET_CONFIGURATION_TIMEOUT (0x4) @@ -744,7 +744,8 @@ OUT PBOOLEAN IsMmc ); -NTSTATUS +VOID +NTAPI CdRomMmcErrorHandler( IN PDEVICE_OBJECT Fdo, IN PSCSI_REQUEST_BLOCK Srb, Modified: trunk/reactos/drivers/storage/class/cdrom_new/ioctl.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/ioctl.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/ioctl.c [iso-8859-1] Fri Feb 17 12:07:17 2012 @@ -2086,6 +2086,7 @@ NTSTATUS status; BOOLEAN retry; + ULONG retryCount; // // Extract the 'real' irp from the irpstack. @@ -2231,7 +2232,17 @@ } - if (retry && realIrpNextStack->Parameters.Others.Argument1--) { + // + // get current retry count + // + retryCount = PtrToUlong(realIrpNextStack->Parameters.Others.Argument1); + + if (retry && retryCount) { + + // + // update retry count + // + realIrpNextStack->Parameters.Others.Argument1 = UlongToPtr(retryCount-1); if (((ULONG)(ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1)) { @@ -2844,6 +2855,7 @@ PIRP realIrp = NULL; NTSTATUS status; BOOLEAN retry; + ULONG retryCount; // // Extract the 'real' irp from the irpstack. @@ -2901,7 +2913,18 @@ retry = TRUE; } - if (retry && realIrpNextStack->Parameters.Others.Argument1--) { + // + // get current retry count + // + retryCount = PtrToUlong(realIrpNextStack->Parameters.Others.Argument1); + + if (retry && retryCount) { + + // + // update retry count + // + realIrpNextStack->Parameters.Others.Argument1 = UlongToPtr(retryCount-1); + if (((ULONG)(ULONG_PTR)realIrpNextStack->Parameters.Others.Argument1)) { Modified: trunk/reactos/drivers/storage/class/cdrom_new/mmc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/class/cdro… ============================================================================== --- trunk/reactos/drivers/storage/class/cdrom_new/mmc.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/class/cdrom_new/mmc.c [iso-8859-1] Fri Feb 17 12:07:17 2012 @@ -837,6 +837,7 @@ } NTSTATUS +NTAPI CdRomUpdateMmcDriveCapabilitiesCompletion( IN PDEVICE_OBJECT Unused, IN PIRP Irp, @@ -851,6 +852,9 @@ PIO_STACK_LOCATION irpStack = IoGetCurrentIrpStackLocation(Irp); NTSTATUS status = STATUS_UNSUCCESSFUL; PIRP delayedIrp; + ULONG retryCount; + LARGE_INTEGER delay; + // completion routine should retry as neccessary. // when success, clear the flag to allow startio to proceed. @@ -910,9 +914,19 @@ retry = TRUE; } - if (retry && irpStack->Parameters.Others.Argument4--) { - - LARGE_INTEGER delay; + // + // get current retry count + // + retryCount = PtrToUlong(irpStack->Parameters.Others.Argument1); + + if (retry && retryCount) { + + // + // update retry count + // + irpStack->Parameters.Others.Argument1 = UlongToPtr(retryCount-1); + + delay.QuadPart = retryInterval; delay.QuadPart *= (LONGLONG)1000 * 1000 * 10; @@ -1038,7 +1052,7 @@ nextStack->Parameters.Scsi.Srb = srb; irp->MdlAddress = mmcData->CapabilitiesMdl; irp->AssociatedIrp.SystemBuffer = mmcData->CapabilitiesBuffer; - IoSetCompletionRoutine(irp, CdRomUpdateMmcDriveCapabilitiesCompletion, Fdo, + IoSetCompletionRoutine(irp, (PIO_COMPLETION_ROUTINE)CdRomUpdateMmcDriveCapabilitiesCompletion, Fdo, TRUE, TRUE, TRUE); return;

1 0

[tfaber] 55668: [CABMAN] - Fix MSVC build
by tfaber＠svn.reactos.org 17 Feb '12

17 Feb '12

Author: tfaber Date: Fri Feb 17 08:26:33 2012 New Revision: 55668 URL: http://svn.reactos.org/svn/reactos?rev=55668&view=rev Log: [CABMAN] - Fix MSVC build Modified: trunk/reactos/tools/cabman/cabinet.h Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.h [iso-8859-1] (original) +++ trunk/reactos/tools/cabman/cabinet.h [iso-8859-1] Fri Feb 17 08:26:33 2012 @@ -22,6 +22,10 @@ #include <stdio.h> #include <string.h> #include <limits.h> + +#ifndef PATH_MAX +#define PATH_MAX MAX_PATH +#endif #if defined(_WIN32) #define DIR_SEPARATOR_CHAR '\\'

1 0

[ion] 55667: [NTOSKRNL]: This second part of Richard's patch implements MmFreeLoaderBlock, which results in 932KB less RAM being used on my 3rd stage test after first boot. It deletes the boot regi...
by ion＠svn.reactos.org 17 Feb '12

17 Feb '12

Author: ion Date: Fri Feb 17 07:23:27 2012 New Revision: 55667 URL: http://svn.reactos.org/svn/reactos?rev=55667&view=rev Log: [NTOSKRNL]: This second part of Richard's patch implements MmFreeLoaderBlock, which results in 932KB less RAM being used on my 3rd stage test after first boot. It deletes the boot registry, NLS, and heap data. Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/mm/ARM3/mminit.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=556… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Fri Feb 17 07:23:27 2012 @@ -1285,6 +1285,10 @@ SharedUserData->ImageNumberLow = IMAGE_FILE_MACHINE_NATIVE; SharedUserData->ImageNumberHigh = IMAGE_FILE_MACHINE_NATIVE; } + +VOID +NTAPI +MmFreeLoaderBlock(IN PLOADER_PARAMETER_BLOCK LoaderBlock); VOID NTAPI @@ -1906,6 +1910,7 @@ /* Make sure nobody touches the loader block again */ if (LoaderBlock == KeLoaderBlock) KeLoaderBlock = NULL; + MmFreeLoaderBlock(LoaderBlock); LoaderBlock = Context = NULL; /* Update progress bar */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Fri Feb 17 07:23:27 2012 @@ -1067,6 +1067,116 @@ VOID NTAPI INIT_FUNCTION +MmFreeLoaderBlock(IN PLOADER_PARAMETER_BLOCK LoaderBlock) +{ + PLIST_ENTRY NextMd; + PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; + ULONG i; + PFN_NUMBER BasePage, LoaderPages; + PMMPFN Pfn1; + KIRQL OldIrql; + PPHYSICAL_MEMORY_RUN Buffer, Entry; + + /* Loop the descriptors in order to count them */ + i = 0; + NextMd = LoaderBlock->MemoryDescriptorListHead.Flink; + while (NextMd != &LoaderBlock->MemoryDescriptorListHead) + { + MdBlock = CONTAINING_RECORD(NextMd, + MEMORY_ALLOCATION_DESCRIPTOR, + ListEntry); + i++; + NextMd = MdBlock->ListEntry.Flink; + } + + /* Allocate a structure to hold the physical runs */ + Buffer = ExAllocatePoolWithTag(NonPagedPool, + i * sizeof(PHYSICAL_MEMORY_RUN), + 'lMmM'); + ASSERT(Buffer != NULL); + Entry = Buffer; + + /* Loop the descriptors again */ + NextMd = LoaderBlock->MemoryDescriptorListHead.Flink; + while (NextMd != &LoaderBlock->MemoryDescriptorListHead) + { + /* Check what kind this was */ + MdBlock = CONTAINING_RECORD(NextMd, + MEMORY_ALLOCATION_DESCRIPTOR, + ListEntry); + switch (MdBlock->MemoryType) + { + /* Registry, NLS, and heap data */ + case LoaderRegistryData: + case LoaderOsloaderHeap: + case LoaderNlsData: + /* Are all a candidate for deletion */ + Entry->BasePage = MdBlock->BasePage; + Entry->PageCount = MdBlock->PageCount; + Entry++; + + /* We keep the rest */ + default: + break; + } + + /* Move to the next descriptor */ + NextMd = MdBlock->ListEntry.Flink; + } + + /* Acquire the PFN lock */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Loop the runs */ + LoaderPages = 0; + while (--Entry >= Buffer) + { + /* See how many pages are in this run */ + i = Entry->PageCount; + BasePage = Entry->BasePage; + + /* Loop each page */ + Pfn1 = MiGetPfnEntry(BasePage); + while (i--) + { + /* Check if it has references or is in any kind of list */ + if (!(Pfn1->u3.e2.ReferenceCount) && (!Pfn1->u1.Flink)) + { + /* Set the new PTE address and put this page into the free list */ + Pfn1->PteAddress = (PMMPTE)(BasePage << PAGE_SHIFT); + MiInsertPageInFreeList(BasePage); + LoaderPages++; + } + else if (BasePage) + { + /* It has a reference, so simply drop it */ + ASSERT(MI_IS_PHYSICAL_ADDRESS(MiPteToAddress(Pfn1->PteAddress)) == FALSE); + + /* Drop a dereference on this page, which should delete it */ + Pfn1->PteAddress->u.Long = 0; + MI_SET_PFN_DELETED(Pfn1); + MiDecrementShareCount(Pfn1, BasePage); + LoaderPages++; + } + + /* Move to the next page */ + Pfn1++; + BasePage++; + } + } + + /* Release the PFN lock and flush the TLB */ + DPRINT1("Loader pages freed: %lx\n", LoaderPages); + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + KeFlushCurrentTb(); + + /* Free our run structure */ + ExFreePool(Buffer); +} + +VOID +NTAPI +INIT_FUNCTION MiAdjustWorkingSetManagerParameters(IN BOOLEAN Client) { /* This function needs to do more work, for now, we tune page minimums */

1 0

[ion] 55666: [NTOSKRNL]: This is kind of embarssing, but after doing a local grep for some of cgutman and zekflop's changes (respectively the patch that had added MmDeleteProcessPageDirectory, and ...
by ion＠svn.reactos.org 17 Feb '12

17 Feb '12

Author: ion Date: Fri Feb 17 07:07:47 2012 New Revision: 55666 URL: http://svn.reactos.org/svn/reactos?rev=55666&view=rev Log: [NTOSKRNL]: This is kind of embarssing, but after doing a local grep for some of cgutman and zekflop's changes (respectively the patch that had added MmDeleteProcessPageDirectory, and the mshtml fix patch), I fell upon a .patch file. It included 3 memory-leak-fixing patches from richard that had been sent to me during his last days -- which, had I paid attention, would've fixed the MSHTML bug and the memory leaks months ago! I've tried my best to now re-integrate a portion of the patch (the other two portions deal with freeing the loader block, and freeing .INIT sections, and I will commit them later) with the current state of trunk. Some things that patch did, no longer seem to work, and I've commented where appropriate. But in general it does seem to dereference/delete some PTEs that had been left behind before (such as deleted TEBs, and deleted VA mappings). It no longer seems to be able to delete the root PDE nor the shared data page however (this worked in the original patch's timeframe). Zekflop, tkreuzer, please take a look. I hope this will set us on a better path! Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c trunk/reactos/ntoskrnl/mm/amd64/page.c trunk/reactos/ntoskrnl/mm/i386/page.c trunk/reactos/ntoskrnl/mm/marea.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Fri Feb 17 07:07:47 2012 @@ -199,6 +199,9 @@ ASSERT(VadTree->NumberGenericTableElements >= 1); MiRemoveNode((PMMADDRESS_NODE)Vad, VadTree); + /* Delete the pages */ + MiDeleteVirtualAddresses((ULONG_PTR)Teb, TebEnd, NULL); + /* Release the working set */ MiUnlockProcessWorkingSet(Process, Thread); @@ -219,7 +222,7 @@ IN BOOLEAN GuiStack) { PMMPTE PointerPte; - PFN_NUMBER PageFrameNumber;//, PageTableFrameNumber; + PFN_NUMBER PageFrameNumber, PageTableFrameNumber; PFN_COUNT StackPages; PMMPFN Pfn1;//, Pfn2; ULONG i; @@ -253,13 +256,14 @@ /* Get the PTE's page */ PageFrameNumber = PFN_FROM_PTE(PointerPte); Pfn1 = MiGetPfnEntry(PageFrameNumber); -#if 0 // ARM3 might not own the page table, so don't take this risk. Leak it instead! +#if 1 // ARM3 might not own the page table, so don't take this risk. Leak it instead! /* Now get the page of the page table mapping it */ PageTableFrameNumber = Pfn1->u4.PteFrame; - Pfn2 = MiGetPfnEntry(PageTableFrameNumber); + //Pfn2 = MiGetPfnEntry(PageTableFrameNumber); /* Remove a shared reference, since the page is going away */ - MiDecrementShareCount(Pfn2, PageTableFrameNumber); + DPRINT("SystemPTE PDE: %lx\n", PageTableFrameNumber); + //MiDecrementShareCount(Pfn2, PageTableFrameNumber); #endif /* Set the special pending delete marker */ MI_SET_PFN_DELETED(Pfn1); @@ -1340,6 +1344,102 @@ MmUnlockAddressSpace(&Process->Vm); } +VOID +NTAPI +MmDeleteProcessAddressSpace2(IN PEPROCESS Process) +{ + PMMPFN Pfn1, Pfn2; + KIRQL OldIrql; + PFN_NUMBER PageFrameIndex; + PULONG PageDir; + ULONG i; + + //ASSERT(Process->CommitCharge == 0); + + /* Delete the shared user data section (Should be done in clean, not delete) */ + ASSERT(MmHighestUserAddress > (PVOID)USER_SHARED_DATA); + KeAttachProcess(&Process->Pcb); + //DPRINT1("Killing shared user data page no longer works -- has someone changed ARM3 in a way to make this fail now?\n"); + //MiDeleteVirtualAddresses(USER_SHARED_DATA, USER_SHARED_DATA, NULL); + //DPRINT1("Done\n"); + KeDetachProcess(); + + /* Acquire the PFN lock */ + OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); + + /* Check for fully initialized process */ + if (Process->AddressSpaceInitialized == 2) + { + /* Map the PDE */ + PageDir = MmCreateHyperspaceMapping(Process->Pcb.DirectoryTableBase[0] >> PAGE_SHIFT); + for (i = 0; i < ADDR_TO_PDE_OFFSET(MmSystemRangeStart); i++) + { + /* Loop all page tables */ + if (PageDir[i] != 0) + { + /* Check if they are RosMm-owned */ + if (MI_IS_ROS_PFN(MiGetPfnEntry(PageDir[i] >> PAGE_SHIFT))) + { + /* Free them through the RosMm ABI */ + //DPRINT1("Freeing MC_SYSTEM: %lx\n", PageDir[i]); + MmReleasePageMemoryConsumer(MC_SYSTEM, PageDir[i] >> PAGE_SHIFT); + } + } + } + + /* Unmap the PDE */ + //DPRINT1("Done\n"); + MmDeleteHyperspaceMapping(PageDir); + + /* Map the working set page and its page table */ + Pfn1 = MiGetPfnEntry(Process->WorkingSetPage); + Pfn2 = MiGetPfnEntry(Pfn1->u4.PteFrame); + + /* Nuke it */ + MI_SET_PFN_DELETED(Pfn1); + MiDecrementShareCount(Pfn2, Pfn1->u4.PteFrame); + MiDecrementShareCount(Pfn1, Process->WorkingSetPage); + ASSERT((Pfn1->u3.e2.ReferenceCount == 0) || (Pfn1->u3.e1.WriteInProgress)); + + /* Now map hyperspace and its page table */ + PageFrameIndex = Process->Pcb.DirectoryTableBase[1] >> PAGE_SHIFT; + Pfn1 = MiGetPfnEntry(PageFrameIndex); + Pfn2 = MiGetPfnEntry(Pfn1->u4.PteFrame); + + /* Nuke it */ + MI_SET_PFN_DELETED(Pfn1); + MiDecrementShareCount(Pfn2, Pfn1->u4.PteFrame); + MiDecrementShareCount(Pfn1, PageFrameIndex); + ASSERT((Pfn1->u3.e2.ReferenceCount == 0) || (Pfn1->u3.e1.WriteInProgress)); + + /* Finally, nuke the PDE itself */ + PageFrameIndex = Process->Pcb.DirectoryTableBase[0] >> PAGE_SHIFT; + Pfn1 = MiGetPfnEntry(PageFrameIndex); + MI_SET_PFN_DELETED(Pfn1); + MiDecrementShareCount(Pfn1, PageFrameIndex); + MiDecrementShareCount(Pfn1, PageFrameIndex); + + /* HACK: In Richard's original patch this ASSERT did work */ + //DPRINT1("Ref count: %lx %lx\n", Pfn1->u3.e2.ReferenceCount, Pfn1->u2.ShareCount); + //ASSERT((Pfn1->u3.e2.ReferenceCount == 0) || (Pfn1->u3.e1.WriteInProgress)); + } + else + { + /* A partly-initialized process should never exit through here */ + ASSERT(FALSE); + } + + /* Release the PFN lock */ + KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); + + /* No support for sessions yet */ + ASSERT(Process->Session == 0); + + /* Clear out the PDE pages */ + Process->Pcb.DirectoryTableBase[0] = 0; + Process->Pcb.DirectoryTableBase[1] = 0; +} + /* SESSION CODE TO MOVE TO SESSION.C ******************************************/ KGUARDED_MUTEX MiSessionIdMutex; 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] Fri Feb 17 07:07:47 2012 @@ -264,8 +264,21 @@ /* Drop the share count */ MiDecrementShareCount(Pfn1, PageFrameIndex); - /* No fork yet */ - if (PointerPte <= MiHighestUserPte) ASSERT(PrototypePte == Pfn1->PteAddress); + /* Either a fork, or this is the shared user data page */ + if (PointerPte <= MiHighestUserPte) + { + /* If it's not the shared user page, then crash, since there's no fork() yet */ + if ((PAGE_ALIGN(VirtualAddress) != (PVOID)USER_SHARED_DATA) || + (MmHighestUserAddress <= (PVOID)USER_SHARED_DATA)) + { + /* Must be some sort of memory corruption */ + KeBugCheckEx(MEMORY_MANAGEMENT, + 0x400, + (ULONG_PTR)PointerPte, + (ULONG_PTR)PrototypePte, + (ULONG_PTR)Pfn1->PteAddress); + } + } } else { @@ -284,7 +297,8 @@ ASSERT(Pfn1->u2.ShareCount == 1); /* FIXME: Drop the reference on the page table. For now, leak it until RosMM is gone */ - //MiDecrementShareCount(MiGetPfnEntry(Pfn1->u4.PteFrame), Pfn1->u4.PteFrame); + //DPRINT1("Dropping a ref...\n"); + MiDecrementShareCount(MiGetPfnEntry(Pfn1->u4.PteFrame), Pfn1->u4.PteFrame); /* Mark the PFN for deletion and dereference what should be the last ref */ MI_SET_PFN_DELETED(Pfn1); @@ -312,6 +326,7 @@ KIRQL OldIrql; BOOLEAN AddressGap = FALSE; PSUBSECTION Subsection; + PUSHORT UsedPageTableEntries; /* Get out if this is a fake VAD, RosMm will free the marea pages */ if ((Vad) && (Vad->u.VadFlags.Spare == 1)) return; @@ -368,6 +383,7 @@ /* Now we should have a valid PDE, mapped in, and still have some VA */ ASSERT(PointerPde->u.Hard.Valid == 1); ASSERT(Va <= EndingAddress); + UsedPageTableEntries = &MmWorkingSetList->UsedPageTableEntries[MiGetPdeOffset(Va)]; /* Check if this is a section VAD with gaps in it */ if ((AddressGap) && (LastPrototypePte)) @@ -397,6 +413,11 @@ TempPte = *PointerPte; if (TempPte.u.Long) { + DPRINT("Decrement used PTEs by address: %lx\n", Va); + (*UsedPageTableEntries)--; + ASSERT((*UsedPageTableEntries) < PTE_COUNT); + DPRINT("Refs: %lx\n", (*UsedPageTableEntries)); + /* Check if the PTE is actually mapped in */ if (TempPte.u.Long & 0xFFFFFC01) { @@ -456,6 +477,22 @@ /* The PDE should still be valid at this point */ ASSERT(PointerPde->u.Hard.Valid == 1); + DPRINT("Should check if handles for: %p are zero (PDE: %lx)\n", Va, PointerPde->u.Hard.PageFrameNumber); + if (!(*UsedPageTableEntries)) + { + DPRINT("They are!\n"); + if (PointerPde->u.Long != 0) + { + DPRINT("PDE active: %lx in %16s\n", PointerPde->u.Hard.PageFrameNumber, CurrentProcess->ImageFileName); + + /* Delete the PTE proper */ + MiDeletePte(PointerPde, + MiPteToAddress(PointerPde), + CurrentProcess, + NULL); + } + } + /* Release the lock and get out if we're done */ KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); if (Va > EndingAddress) return; Modified: trunk/reactos/ntoskrnl/mm/amd64/page.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/amd64/page.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/amd64/page.c [iso-8859-1] Fri Feb 17 07:07:47 2012 @@ -188,29 +188,6 @@ } } -VOID -NTAPI -MmDeleteProcessPageDirectory(PEPROCESS Process) -{ - PFN_NUMBER TableBasePfn; - PMMPTE PageDir; - - /* Get the page directory PFN */ - TableBasePfn = Process->Pcb.DirectoryTableBase[0] >> PAGE_SHIFT; - - /* Map the page directory in hyperspace */ - PageDir = (PMMPTE)MmCreateHyperspaceMapping(TableBasePfn); - - /* Free the hyperspace mapping page (ARM3) */ - //MmDeletePageTablePfn(PageDir[ADDR_TO_PDE_OFFSET(HYPERSPACE)].u.Hard.PageFrameNumber, 3); - - /* Delete the hyperspace mapping */ - MmDeleteHyperspaceMapping(PageDir); - - /* Recursively free the page directories */ - MmDeletePageTablePfn(TableBasePfn, 4); -} - static PMMPTE MiGetPteForProcess( 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] Fri Feb 17 07:07:47 2012 @@ -198,62 +198,6 @@ return(Attributes); } -VOID -FORCEINLINE -MmDeletePageDirectoryEntry(PMMPDE PointerPde) -{ - KIRQL OldIrql; - PMMPFN Page; - - Page = MiGetPfnEntry(PointerPde->u.Hard.PageFrameNumber); - - /* This should not be a legacy allocation*/ - ASSERT(MI_IS_ROS_PFN(Page) == FALSE); - - OldIrql = KeAcquireQueuedSpinLock(LockQueuePfnLock); - - /* Free it using the ARM3 API */ - MI_SET_PFN_DELETED(Page); - MiDecrementShareCount(Page, PointerPde->u.Hard.PageFrameNumber); - - KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); -} - -VOID -NTAPI -MmDeleteProcessPageDirectory(PEPROCESS Process) -{ - PMMPDE PdeBase, PointerPde; - ULONG PdeOffset; - KIRQL OldIrql; - - /* Map the page directory in hyperspace */ - PdeBase = MiMapPageInHyperSpace(PsGetCurrentProcess(), - Process->Pcb.DirectoryTableBase[0] >> PAGE_SHIFT, - &OldIrql); - - /* Loop the user land page directory */ - for (PdeOffset = 0; PdeOffset < MiGetPdeOffset(MmSystemRangeStart); PdeOffset++) - { - PointerPde = PdeBase + PdeOffset; - /* Check if a valid PDE exists here */ - if (PointerPde->u.Hard.Valid) - { - /* Free the page that backs it */ - MmDeletePageDirectoryEntry(PointerPde); - } - } - - /* Free the hyperspace mapping page (ARM3) */ - MmDeletePageDirectoryEntry(PdeBase + MiGetPdeOffset(HYPERSPACE)); - - /* Delete the hyperspace mapping */ - MiUnmapPageInHyperSpace(PsGetCurrentProcess(), PdeBase, OldIrql); - - /* Free the PDE page itself (ARM3) */ - MmDeletePageDirectoryEntry((PMMPDE)&Process->Pcb.DirectoryTableBase[0]); -} - /* Taken from ARM3/pagfault.c */ BOOLEAN FORCEINLINE Modified: trunk/reactos/ntoskrnl/mm/marea.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/marea.c?rev=55… ============================================================================== --- trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/marea.c [iso-8859-1] Fri Feb 17 07:07:47 2012 @@ -994,6 +994,10 @@ } } +VOID +NTAPI +MmDeleteProcessAddressSpace2(IN PEPROCESS Process); + NTSTATUS NTAPI MmDeleteProcessAddressSpace(PEPROCESS Process) @@ -1036,11 +1040,10 @@ } } - MmDeleteProcessPageDirectory(Process); - MmUnlockAddressSpace(&Process->Vm); DPRINT("Finished MmReleaseMmInfo()\n"); + MmDeleteProcessAddressSpace2(Process); return(STATUS_SUCCESS); }

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