Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 26157: Thank CodeMercenary (CodeMercenary at hotmail dot com) that provide ms ddk example driver code is wrong for how to write a graphice driver with dx support. he gave me input and provide the ddk example code is wrong. Now I change the desgin after correct infomations so it lead to even less overhead of code.
by greatlrd＠svn.reactos.org 23 Mar '07

23 Mar '07

Author: greatlrd Date: Fri Mar 23 15:47:19 2007 New Revision: 26157 URL: http://svn.reactos.org/svn/reactos?rev=26157&view=rev Log: Thank CodeMercenary (CodeMercenary at hotmail dot com) that provide ms ddk example driver code is wrong for how to write a graphice driver with dx support. he gave me input and provide the ddk example code is wrong. Now I change the desgin after correct infomations so it lead to even less overhead of code. Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c Modified: trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/nt… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c (original) +++ trunk/reactos/subsystems/win32/win32k/ntddraw/dd.c Fri Mar 23 15:47:19 2007 @@ -206,66 +206,37 @@ pLocal = &phsurface->Local; pMore = &phsurface->More; pGlobal = &phsurface->Global; + /* FIXME we only support one surface for now */ phsurface->CreateSurfaceData.dwSCnt = 1; - - phsurface->lcllist[0] = 0; - phsurface->lcllist[1] = 0; + for (i = 0; i < phsurface->CreateSurfaceData.dwSCnt; i++) + { + phsurface->lcllist[i] = (PDD_SURFACE_LOCAL)pLocal; + pLocal->lpGbl = pGlobal; + pLocal->lpSurfMore = pMore; + + /* FIXME ? + pLocal->lpAttachList; + pLocal->lpAttachListFrom; + */ + + /* FIXME a countup to next pLocal, pMore, pGlobal */ + + } + + + /* FIXME support for more that one surface */ + + /* setup DD_CREATESURFACEDATA CreateSurfaceData for the driver */ phsurface->CreateSurfaceData.lplpSList = (PDD_SURFACE_LOCAL *) &phsurface->lcllist; - - i = 0; - // for (i = 0; i < phsurface->CreateSurfaceData.dwSCnt; i++) - //{ - phsurface->lcl.hDDSurface = (ULONG_PTR)myhSurface[i]; - phsurface->lcl.ddsCaps.dwCaps = pLocal->ddsCaps.dwCaps; - phsurface->lcl.dwFlags =pLocal->dwFlags; - - phsurface->gpl.wWidth = pGlobal->wWidth; - phsurface->gpl.wHeight = pGlobal->wHeight; - phsurface->gpl.lPitch = pGlobal->lPitch; - phsurface->gpl.fpVidMem = pGlobal->fpVidMem; - phsurface->gpl.dwBlockSizeX = pGlobal->dwBlockSizeX; - phsurface->gpl.dwBlockSizeY = pGlobal->dwBlockSizeY; - RtlCopyMemory( &phsurface->gpl.ddpfSurface , &pGlobal->ddpfSurface, sizeof(DDPIXELFORMAT)); - - /* FIXME more ?? */ - if (pMore) - { - phsurface->more.ddsCapsEx.dwCaps2 = pMore->ddsCapsEx.dwCaps2; - phsurface->more.ddsCapsEx.dwCaps3 = pMore->ddsCapsEx.dwCaps3; - phsurface->more.ddsCapsEx.dwCaps4 = pMore->ddsCapsEx.dwCaps4; - phsurface->lcl.dbnOverlayNode.object_int = (LPDDRAWI_DDRAWSURFACE_INT)pMore->dwSurfaceHandle; - } - - phsurface->lcllist[0] = (PDD_SURFACE_LOCAL)&phsurface->lcl; - /* FIXME count up everthing to next position */ - // } - - - /* FIXME support for more that one surface */ - - DPRINT1("setup CreateSurfaceData \n"); - /* setup DD_CREATESURFACEDATA CreateSurfaceData for the driver */ - phsurface->lcl.lpGbl = &phsurface->gpl; - phsurface->lcl.lpSurfMore = &phsurface->more; - - /* FIXME all phsurface->lcl should be in a array then add to lplpSList */ - //phsurface->CreateSurfaceData.lplpSList = (PDD_SURFACE_LOCAL *)&phsurface->lcl; phsurface->CreateSurfaceData.lpDDSurfaceDesc = &phsurface->desc; phsurface->CreateSurfaceData.CreateSurface = NULL; phsurface->CreateSurfaceData.ddRVal = DDERR_GENERIC; phsurface->CreateSurfaceData.lpDD = &pDirectDraw->Global; - /* is this correct the 3d drv whant this data */ - // phsurface->lcl.lpGbl->lpDD = &pDirectDraw->Global; - - - - /* the CreateSurface crash with lcl convering */ - DPRINT1("DDHAL_CB32_CREATESURFACE\n"); if ((pDirectDraw->DD.dwFlags & DDHAL_CB32_CREATESURFACE)) { DPRINT1("0x%04x",pDirectDraw->DD.CreateSurface);

1 0

[tkreuzer] 26156: fix build
by tkreuzer＠svn.reactos.org 23 Mar '07

23 Mar '07

Author: tkreuzer Date: Fri Mar 23 04:52:24 2007 New Revision: 26156 URL: http://svn.reactos.org/svn/reactos?rev=26156&view=rev Log: fix build Modified: trunk/rosapps/demos/ddraw/ddraw.rbuild Modified: trunk/rosapps/demos/ddraw/ddraw.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/demos/ddraw/ddraw.rbuild?r… ============================================================================== --- trunk/rosapps/demos/ddraw/ddraw.rbuild (original) +++ trunk/rosapps/demos/ddraw/ddraw.rbuild Fri Mar 23 04:52:24 2007 @@ -6,7 +6,6 @@ <library>gdi32</library> <library>ddraw</library> <library>dxguid</library> - <library>string</library> <library>user32</library> <file>main.cpp</file> </module>

1 0

[fireball] 26155: When initial setup is running it asks to press enter to format the drive, then it displays the exact same message again before finally formatting the drive. Thanks Colin_Finck. See issue #1964 for more details.
by fireball＠svn.reactos.org 22 Mar '07

22 Mar '07

Author: fireball Date: Thu Mar 22 21:38:48 2007 New Revision: 26155 URL: http://svn.reactos.org/svn/reactos?rev=26155&view=rev Log: When initial setup is running it asks to press enter to format the drive, then it displays the exact same message again before finally formatting the drive. Thanks Colin_Finck. See issue #1964 for more details. Modified: trunk/reactos/base/setup/usetup/interface/usetup.c Modified: trunk/reactos/base/setup/usetup/interface/usetup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/interfac… ============================================================================== --- trunk/reactos/base/setup/usetup/interface/usetup.c (original) +++ trunk/reactos/base/setup/usetup/interface/usetup.c Thu Mar 22 21:38:48 2007 @@ -2210,7 +2210,6 @@ PartEntry->PartInfo[0].PartitionType = PARTITION_FAT32_XINT13; } } - break; } else if (!FileSystemList->Selected->FormatFunc) return QUIT_PAGE;

1 0

[gedmurphy] 26154: fix icon
by gedmurphy＠svn.reactos.org 22 Mar '07

22 Mar '07

Author: gedmurphy Date: Thu Mar 22 21:37:23 2007 New Revision: 26154 URL: http://svn.reactos.org/svn/reactos?rev=26154&view=rev Log: fix icon Modified: trunk/reactos/base/applications/calc/calculator.ico Modified: trunk/reactos/base/applications/calc/calculator.ico URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/calc/cal… ============================================================================== Binary files - no diff available.

1 0

[hpoussin] 26153: Send service name to pnproot driver (not used yet)
by hpoussin＠svn.reactos.org 22 Mar '07

22 Mar '07

Author: hpoussin Date: Thu Mar 22 20:13:14 2007 New Revision: 26153 URL: http://svn.reactos.org/svn/reactos?rev=26153&view=rev Log: Send service name to pnproot driver (not used yet) Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h Thu Mar 22 20:13:14 2007 @@ -480,6 +480,7 @@ IopCreateDeviceNode( IN PDEVICE_NODE ParentNode, IN PDEVICE_OBJECT PhysicalDeviceObject, + IN PUNICODE_STRING ServiceName, OUT PDEVICE_NODE *DeviceNode ); @@ -781,6 +782,7 @@ NTSTATUS PnpRootCreateDevice( + IN PUNICODE_STRING ServiceName, IN OUT PDEVICE_OBJECT *PhysicalDeviceObject ); Modified: trunk/reactos/ntoskrnl/io/iomgr/driver.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/driver.c… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/driver.c (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c Thu Mar 22 20:13:14 2007 @@ -726,7 +726,9 @@ PWCHAR FileNameWithoutPath; LPWSTR FileExtension; PUNICODE_STRING ModuleName = &LdrEntry->BaseDllName; + UNICODE_STRING ServiceName; #if 1 // Disable for FreeLDR 2.5 + UNICODE_STRING ServiceNameWithExtension; PLDR_DATA_TABLE_ENTRY ModuleObject; #endif @@ -736,18 +738,6 @@ IopDisplayLoadingMessage(ModuleName->Buffer, TRUE); /* - * Determine the right device object - */ - /* Use IopRootDeviceNode for now */ - Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, &DeviceNode); - if (!NT_SUCCESS(Status)) - { - CPRINT("Driver '%wZ' load failed, status (%x)\n", ModuleName, Status); - return(Status); - } - - - /* * Generate filename without path (not needed by freeldr) */ FileNameWithoutPath = wcsrchr(ModuleName->Buffer, L'\\'); @@ -763,13 +753,11 @@ /* * Load the module. */ - RtlCreateUnicodeString(&DeviceNode->ServiceName, FileNameWithoutPath); - #if 1 // Remove for FreeLDR 2.5. - Status = LdrProcessDriverModule(LdrEntry, &DeviceNode->ServiceName, &ModuleObject); - if (!NT_SUCCESS(Status)) - { - IopFreeDeviceNode(DeviceNode); + RtlCreateUnicodeString(&ServiceNameWithExtension, FileNameWithoutPath); + Status = LdrProcessDriverModule(LdrEntry, &ServiceNameWithExtension, &ModuleObject); + if (!NT_SUCCESS(Status)) + { CPRINT("Driver '%wZ' load failed, status (%x)\n", ModuleName, Status); return Status; } @@ -778,12 +766,25 @@ /* * Strip the file extension from ServiceName */ - FileExtension = wcsrchr(DeviceNode->ServiceName.Buffer, '.'); + RtlCreateUnicodeString(&ServiceName, FileNameWithoutPath); + FileExtension = wcsrchr(ServiceName.Buffer, '.'); if (FileExtension != NULL) { - DeviceNode->ServiceName.Length -= wcslen(FileExtension) * sizeof(WCHAR); + ServiceName.Length -= wcslen(FileExtension) * sizeof(WCHAR); FileExtension[0] = 0; } + + /* + * Determine the right device object + */ + /* Use IopRootDeviceNode for now */ + Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, &ServiceName, &DeviceNode); + if (!NT_SUCCESS(Status)) + { + CPRINT("Driver '%wZ' load failed, status (%x)\n", ModuleName, Status); + return(Status); + } + DeviceNode->ServiceName = ServiceName; /* * Initialize the driver @@ -793,7 +794,7 @@ if (!NT_SUCCESS(Status)) { - IopFreeDeviceNode(DeviceNode); + IopFreeDeviceNode(DeviceNode); CPRINT("Driver '%wZ' load failed, status (%x)\n", ModuleName, Status); return Status; } @@ -830,7 +831,7 @@ NTSTATUS Status; /* Use IopRootDeviceNode for now */ - Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, &DeviceNode); + Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, NULL, &DeviceNode); if (!NT_SUCCESS(Status)) return; /* Setup the module object for the RAW FS Driver */ @@ -1577,7 +1578,7 @@ */ /* Use IopRootDeviceNode for now */ - Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, &DeviceNode); + Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, &ServiceName, &DeviceNode); if (!NT_SUCCESS(Status)) { 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 (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpmgr.c Thu Mar 22 20:13:14 2007 @@ -789,14 +789,15 @@ NTSTATUS IopCreateDeviceNode(PDEVICE_NODE ParentNode, PDEVICE_OBJECT PhysicalDeviceObject, + PUNICODE_STRING ServiceName, PDEVICE_NODE *DeviceNode) { PDEVICE_NODE Node; NTSTATUS Status; KIRQL OldIrql; - DPRINT("ParentNode 0x%p PhysicalDeviceObject 0x%p\n", - ParentNode, PhysicalDeviceObject); + DPRINT("ParentNode 0x%p PhysicalDeviceObject 0x%p ServiceName %wZ\n", + ParentNode, PhysicalDeviceObject, ServiceName); Node = (PDEVICE_NODE)ExAllocatePool(NonPagedPool, sizeof(DEVICE_NODE)); if (!Node) @@ -808,7 +809,7 @@ if (!PhysicalDeviceObject) { - Status = PnpRootCreateDevice(&PhysicalDeviceObject); + Status = PnpRootCreateDevice(ServiceName, &PhysicalDeviceObject); if (!NT_SUCCESS(Status)) { ExFreePool(Node); @@ -2386,7 +2387,8 @@ DeviceNode->ServiceName.Buffer, Status); } } - } else + } + else { DPRINT("Service %S is disabled or already initialized\n", DeviceNode->ServiceName.Buffer); @@ -2531,6 +2533,7 @@ Status = IopCreateDeviceNode( DeviceNode, DeviceRelations->Objects[i], + NULL, &ChildDeviceNode); DeviceNode->Flags |= DNF_ENUMERATED; if (!NT_SUCCESS(Status)) @@ -3297,7 +3300,7 @@ KEBUGCHECKEX(PHASE1_INITIALIZATION_FAILED, Status, 0, 0, 0); } - Status = IopCreateDeviceNode(NULL, Pdo, &IopRootDeviceNode); + Status = IopCreateDeviceNode(NULL, Pdo, NULL, &IopRootDeviceNode); if (!NT_SUCCESS(Status)) { CPRINT("Insufficient resources\n"); Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnprepo… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnpreport.c Thu Mar 22 20:13:14 2007 @@ -45,8 +45,12 @@ Pdo = *DeviceObject; else { + UNICODE_STRING ServiceName; + ServiceName.Buffer = DriverObject->DriverName.Buffer + sizeof(DRIVER_ROOT_NAME) / sizeof(WCHAR) - 1; + ServiceName.Length = ServiceName.MaximumLength = DriverObject->DriverName.Length - sizeof(DRIVER_ROOT_NAME) + sizeof(WCHAR); + /* create a new PDO and return it in *DeviceObject */ - Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, &DeviceNode); + Status = IopCreateDeviceNode(IopRootDeviceNode, NULL, &ServiceName, &DeviceNode); if (!NT_SUCCESS(Status)) { DPRINT("IopCreateDeviceNode() failed (Status 0x%08lx)\n", Status); Modified: trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/pnpmgr/pnproot… ============================================================================== --- trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c (original) +++ trunk/reactos/ntoskrnl/io/pnpmgr/pnproot.c Thu Mar 22 20:13:14 2007 @@ -108,6 +108,7 @@ NTSTATUS PnpRootCreateDevice( + PUNICODE_STRING ServiceName, PDEVICE_OBJECT *PhysicalDeviceObject) { PPNPROOT_PDO_DEVICE_EXTENSION PdoDeviceExtension;

1 0

[fireball] 26152: - Clear DPC request when delivering DPCs from the idle loop (by Alex Ionescu).
by fireball＠svn.reactos.org 21 Mar '07

21 Mar '07

Author: fireball Date: Thu Mar 22 00:28:58 2007 New Revision: 26152 URL: http://svn.reactos.org/svn/reactos?rev=26152&view=rev Log: - Clear DPC request when delivering DPCs from the idle loop (by Alex Ionescu). Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Modified: trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/ctxswitch… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S (original) +++ trunk/reactos/ntoskrnl/ke/i386/ctxswitch.S Thu Mar 22 00:28:58 2007 @@ -679,6 +679,9 @@ #endif jz CheckSchedule + mov cl, DISPATCH_LEVEL + call @HalClearSoftwareInterrupt@4 + /* Handle the above */ lea ecx, [ebx+KPCR_PRCB_DATA] call @KiRetireDpcList@4

1 0

[hpoussin] 26151: Add svn:eol-style property
by hpoussin＠svn.reactos.org 21 Mar '07

21 Mar '07

Author: hpoussin Date: Wed Mar 21 23:32:38 2007 New Revision: 26151 URL: http://svn.reactos.org/svn/reactos?rev=26151&view=rev Log: Add svn:eol-style property Modified: trunk/reactos/drivers/multimedia/sb16_nt4/control.c (props changed) trunk/reactos/drivers/multimedia/sb16_nt4/interrupt.c (props changed) trunk/reactos/drivers/multimedia/sb16_nt4/main.c (contents, props changed) trunk/reactos/drivers/multimedia/sb16_nt4/sb16_nt4.def (props changed) trunk/reactos/drivers/multimedia/sb16_nt4/sb16_nt4.rbuild (props changed) trunk/reactos/drivers/multimedia/sb16_nt4/sndblst.h (props changed) Propchange: trunk/reactos/drivers/multimedia/sb16_nt4/control.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/multimedia/sb16_nt4/interrupt.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/drivers/multimedia/sb16_nt4/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/multimedia/sb16_nt… ============================================================================== --- trunk/reactos/drivers/multimedia/sb16_nt4/main.c (original) +++ trunk/reactos/drivers/multimedia/sb16_nt4/main.c Wed Mar 21 23:32:38 2007 @@ -9,8 +9,10 @@ Compatible with NT4 */ +#define NDEBUG #include <sndblst.h> +#define TAG(A, B, C, D) (IN ULONG)(((A)<<0) + ((B)<<8) + ((C)<<16) + ((D)<<24)) /* IRP DISPATCH ROUTINES @@ -41,7 +43,7 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PSOUND_BLASTER_PARAMETERS sb_device = DeviceObject->DeviceExtension; + //PSOUND_BLASTER_PARAMETERS sb_device = DeviceObject->DeviceExtension; DPRINT("CloseSoundBlaster() called\n"); @@ -58,7 +60,7 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PSOUND_BLASTER_PARAMETERS sb_device = DeviceObject->DeviceExtension; + //PSOUND_BLASTER_PARAMETERS sb_device = DeviceObject->DeviceExtension; DPRINT("CleanupSoundBlaster() called\n"); @@ -76,7 +78,7 @@ PIRP Irp) { PIO_STACK_LOCATION stack; - PSOUND_BLASTER_PARAMETERS sb_device = DeviceObject->DeviceExtension; + //PSOUND_BLASTER_PARAMETERS sb_device = DeviceObject->DeviceExtension; DPRINT("ControlSoundBlaster() called\n"); @@ -100,7 +102,7 @@ PDEVICE_OBJECT DeviceObject, PIRP Irp) { - PSOUND_BLASTER_PARAMETERS sb_device = DeviceObject->DeviceExtension; + //PSOUND_BLASTER_PARAMETERS sb_device = DeviceObject->DeviceExtension; DPRINT("WriteSoundBlaster() called\n"); @@ -205,8 +207,8 @@ ExFreePool(ptr) -#define TAG_REG_INFO (ULONG)'IgeR' -#define TAG_REG_NAME (ULONG)'NgeR' +#define TAG_REG_INFO TAG('I','g','e','R') +#define TAG_REG_NAME TAG('N','g','e','R') NTSTATUS STDCALL EnumerateSubkey( Propchange: trunk/reactos/drivers/multimedia/sb16_nt4/main.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/multimedia/sb16_nt4/sb16_nt4.def ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/multimedia/sb16_nt4/sb16_nt4.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/drivers/multimedia/sb16_nt4/sndblst.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hpoussin] 26150: Clear DO_DEVICE_INITIALIZING flag when device is initialized. See issue #1790 for more details.
by hpoussin＠svn.reactos.org 21 Mar '07

21 Mar '07

Author: hpoussin Date: Wed Mar 21 21:13:32 2007 New Revision: 26150 URL: http://svn.reactos.org/svn/reactos?rev=26150&view=rev Log: Clear DO_DEVICE_INITIALIZING flag when device is initialized. See issue #1790 for more details. Modified: trunk/reactos/drivers/storage/cdrom/cdrom.c trunk/reactos/drivers/storage/disk/disk.c Modified: trunk/reactos/drivers/storage/cdrom/cdrom.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/cdrom/cdro… ============================================================================== --- trunk/reactos/drivers/storage/cdrom/cdrom.c (original) +++ trunk/reactos/drivers/storage/cdrom/cdrom.c Wed Mar 21 21:13:32 2007 @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS kernel * FILE: services/storage/cdrom/cdrom.c @@ -924,6 +923,8 @@ CdromTimerRoutine, NULL); IoStartTimer(DiskDeviceObject); + + DiskDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; DPRINT("CdromClassCreateDeviceObjects() done\n"); Modified: trunk/reactos/drivers/storage/disk/disk.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/disk/disk.… ============================================================================== --- trunk/reactos/drivers/storage/disk/disk.c (original) +++ trunk/reactos/drivers/storage/disk/disk.c Wed Mar 21 21:13:32 2007 @@ -919,6 +919,8 @@ if (PartitionList != NULL) ExFreePool(PartitionList); + DiskDeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + DPRINT("DiskClassCreateDeviceObjects() done\n"); return(STATUS_SUCCESS); @@ -2056,6 +2058,8 @@ DiskData->NextPartition = DeviceExtension; DiskData = (PDISK_DATA)(DeviceExtension + 1); DiskData->NextPartition = NULL; + + DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; } else {

1 0

[janderwald] 26149: - revert 26147
by janderwald＠svn.reactos.org 21 Mar '07

21 Mar '07

Author: janderwald Date: Wed Mar 21 20:16:26 2007 New Revision: 26149 URL: http://svn.reactos.org/svn/reactos?rev=26149&view=rev Log: - revert 26147 Modified: trunk/reactos/tools/bin2c.mak trunk/reactos/tools/bin2res/bin2res.mak trunk/reactos/tools/buildno/buildno.mak trunk/reactos/tools/cdmake/cdmake.mak trunk/reactos/tools/dbgprint/dbgprint.mak trunk/reactos/tools/gendib/gendib.mak trunk/reactos/tools/mkhive/mkhive.mak trunk/reactos/tools/nci/nci.mak trunk/reactos/tools/pefixup.mak trunk/reactos/tools/rgenstat/rgenstat.mak trunk/reactos/tools/rsym.mak trunk/reactos/tools/sysreg/sysreg.mak trunk/reactos/tools/unicode/unicode.mak trunk/reactos/tools/widl/widl.mak trunk/reactos/tools/winebuild/winebuild.mak trunk/reactos/tools/wmc/wmc.mak trunk/reactos/tools/wpp/wpp.mak trunk/reactos/tools/wrc/wrc.mak Modified: trunk/reactos/tools/bin2c.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/bin2c.mak?rev=26149&… ============================================================================== --- trunk/reactos/tools/bin2c.mak (original) +++ trunk/reactos/tools/bin2c.mak Wed Mar 21 20:16:26 2007 @@ -3,7 +3,7 @@ BIN2C_INT = $(INTERMEDIATE_)$(BIN2C_BASE) BIN2C_INT_ = $(BIN2C_INT)$(SEP) -BIN2C_OUT = $(TOOLS_OUT_)$(BIN2C_BASE) +BIN2C_OUT = $(OUTPUT_)$(BIN2C_BASE) BIN2C_OUT_ = $(BIN2C_OUT)$(SEP) BIN2C_TARGET = \ Modified: trunk/reactos/tools/bin2res/bin2res.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/bin2res/bin2res.mak?… ============================================================================== --- trunk/reactos/tools/bin2res/bin2res.mak (original) +++ trunk/reactos/tools/bin2res/bin2res.mak Wed Mar 21 20:16:26 2007 @@ -2,7 +2,7 @@ BIN2RES_BASE_ = $(BIN2RES_BASE)$(SEP) BIN2RES_INT = $(INTERMEDIATE_)$(BIN2RES_BASE) BIN2RES_INT_ = $(BIN2RES_INT)$(SEP) -BIN2RES_OUT = $(TOOLS_OUT_)$(BIN2RES_BASE) +BIN2RES_OUT = $(OUTPUT_)$(BIN2RES_BASE) BIN2RES_OUT_ = $(BIN2RES_OUT)$(SEP) $(BIN2RES_INT): | $(TOOLS_INT) Modified: trunk/reactos/tools/buildno/buildno.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/buildno/buildno.mak?… ============================================================================== --- trunk/reactos/tools/buildno/buildno.mak (original) +++ trunk/reactos/tools/buildno/buildno.mak Wed Mar 21 20:16:26 2007 @@ -2,7 +2,7 @@ BUILDNO_BASE_ = $(BUILDNO_BASE)$(SEP) BUILDNO_INT = $(INTERMEDIATE_)$(BUILDNO_BASE) BUILDNO_INT_ = $(BUILDNO_INT)$(SEP) -BUILDNO_OUT = $(TOOLS_OUT_)$(BUILDNO_BASE) +BUILDNO_OUT = $(OUTPUT_)$(BUILDNO_BASE) BUILDNO_OUT_ = $(BUILDNO_OUT)$(SEP) $(BUILDNO_INT): | $(TOOLS_INT) Modified: trunk/reactos/tools/cdmake/cdmake.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.mak?re… ============================================================================== --- trunk/reactos/tools/cdmake/cdmake.mak (original) +++ trunk/reactos/tools/cdmake/cdmake.mak Wed Mar 21 20:16:26 2007 @@ -2,7 +2,7 @@ CDMAKE_BASE_ = $(CDMAKE_BASE)$(SEP) CDMAKE_INT = $(INTERMEDIATE_)$(CDMAKE_BASE) CDMAKE_INT_ = $(CDMAKE_INT)$(SEP) -CDMAKE_OUT = $(TOOLS_OUT_)$(CDMAKE_BASE) +CDMAKE_OUT = $(OUTPUT_)$(CDMAKE_BASE) CDMAKE_OUT_ = $(CDMAKE_OUT)$(SEP) $(CDMAKE_INT): | $(TOOLS_INT) Modified: trunk/reactos/tools/dbgprint/dbgprint.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/dbgprint/dbgprint.ma… ============================================================================== --- trunk/reactos/tools/dbgprint/dbgprint.mak (original) +++ trunk/reactos/tools/dbgprint/dbgprint.mak Wed Mar 21 20:16:26 2007 @@ -2,7 +2,7 @@ DBGPRINT_BASE_ = $(DBGPRINT_BASE)$(SEP) DBGPRINT_INT = $(INTERMEDIATE_)$(DBGPRINT_BASE) DBGPRINT_INT_ = $(DBGPRINT_INT)$(SEP) -DBGPRINT_OUT = $(TOOLS_OUT_)$(DBGPRINT_BASE) +DBGPRINT_OUT = $(OUTPUT_)$(DBGPRINT_BASE) DBGPRINT_OUT_ = $(DBGPRINT_OUT)$(SEP) $(DBGPRINT_INT): | $(TOOLS_INT) Modified: trunk/reactos/tools/gendib/gendib.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/gendib/gendib.mak?re… ============================================================================== --- trunk/reactos/tools/gendib/gendib.mak (original) +++ trunk/reactos/tools/gendib/gendib.mak Wed Mar 21 20:16:26 2007 @@ -2,7 +2,7 @@ GENDIB_BASE_ = $(GENDIB_BASE)$(SEP) GENDIB_INT = $(INTERMEDIATE_)$(GENDIB_BASE) GENDIB_INT_ = $(GENDIB_INT)$(SEP) -GENDIB_OUT = $(TOOLS_OUT_)$(GENDIB_BASE) +GENDIB_OUT = $(OUTPUT_)$(GENDIB_BASE) GENDIB_OUT_ = $(GENDIB_OUT)$(SEP) $(GENDIB_INT): | $(TOOLS_INT) Modified: trunk/reactos/tools/mkhive/mkhive.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/mkhive/mkhive.mak?re… ============================================================================== --- trunk/reactos/tools/mkhive/mkhive.mak (original) +++ trunk/reactos/tools/mkhive/mkhive.mak Wed Mar 21 20:16:26 2007 @@ -2,7 +2,7 @@ MKHIVE_BASE_ = $(MKHIVE_BASE)$(SEP) MKHIVE_INT = $(INTERMEDIATE_)$(MKHIVE_BASE) MKHIVE_INT_ = $(MKHIVE_INT)$(SEP) -MKHIVE_OUT = $(TOOLS_OUT_)$(MKHIVE_BASE) +MKHIVE_OUT = $(OUTPUT_)$(MKHIVE_BASE) MKHIVE_OUT_ = $(MKHIVE_OUT)$(SEP) $(MKHIVE_INT): | $(TOOLS_INT) Modified: trunk/reactos/tools/nci/nci.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/nci/nci.mak?rev=2614… ============================================================================== --- trunk/reactos/tools/nci/nci.mak (original) +++ trunk/reactos/tools/nci/nci.mak Wed Mar 21 20:16:26 2007 @@ -2,7 +2,7 @@ NCI_BASE_ = $(NCI_BASE)$(SEP) NCI_INT = $(INTERMEDIATE_)$(NCI_BASE) NCI_INT_ = $(NCI_INT)$(SEP) -NCI_OUT = $(TOOLS_OUT_)$(NCI_BASE) +NCI_OUT = $(OUTPUT_)$(NCI_BASE) NCI_OUT_ = $(NCI_OUT)$(SEP) $(NCI_INT): | $(TOOLS_INT) Modified: trunk/reactos/tools/pefixup.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/pefixup.mak?rev=2614… ============================================================================== --- trunk/reactos/tools/pefixup.mak (original) +++ trunk/reactos/tools/pefixup.mak Wed Mar 21 20:16:26 2007 @@ -3,7 +3,7 @@ PEFIXUP_INT = $(INTERMEDIATE_)$(PEFIXUP_BASE) PEFIXUP_INT_ = $(PEFIXUP_INT)$(SEP) -PEFIXUP_OUT = $(ROS_TOOLS_)$(PEFIXUP_BASE) +PEFIXUP_OUT = $(OUTPUT_)$(PEFIXUP_BASE) PEFIXUP_OUT_ = $(PEFIXUP_OUT)$(SEP) PEFIXUP_TARGET = \ Modified: trunk/reactos/tools/rgenstat/rgenstat.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rgenstat/rgenstat.ma… ============================================================================== --- trunk/reactos/tools/rgenstat/rgenstat.mak (original) +++ trunk/reactos/tools/rgenstat/rgenstat.mak Wed Mar 21 20:16:26 2007 @@ -2,7 +2,7 @@ RGENSTAT_BASE_ = $(RGENSTAT_BASE)$(SEP) RGENSTAT_INT = $(INTERMEDIATE_)$(RGENSTAT_BASE) RGENSTAT_INT_ = $(RGENSTAT_INT)$(SEP) -RGENSTAT_OUT = $(TOOLS_OUT_)$(RGENSTAT_BASE) +RGENSTAT_OUT = $(OUTPUT_)$(RGENSTAT_BASE) RGENSTAT_OUT_ = $(RGENSTAT_OUT)$(SEP) $(RGENSTAT_INT): | $(TOOLS_INT) Modified: trunk/reactos/tools/rsym.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rsym.mak?rev=26149&r… ============================================================================== --- trunk/reactos/tools/rsym.mak (original) +++ trunk/reactos/tools/rsym.mak Wed Mar 21 20:16:26 2007 @@ -3,7 +3,7 @@ RSYM_INT = $(INTERMEDIATE_)$(RSYM_BASE) RSYM_INT_ = $(RSYM_INT)$(SEP) -RSYM_OUT = $(ROS_TOOLS_)$(RSYM_BASE) +RSYM_OUT = $(OUTPUT_)$(RSYM_BASE) RSYM_OUT_ = $(RSYM_OUT)$(SEP) RSYM_TARGET = \ Modified: trunk/reactos/tools/sysreg/sysreg.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/sysreg/sysreg.mak?re… ============================================================================== --- trunk/reactos/tools/sysreg/sysreg.mak (original) +++ trunk/reactos/tools/sysreg/sysreg.mak Wed Mar 21 20:16:26 2007 @@ -2,7 +2,7 @@ SYSREGBUILD_BASE_ = $(SYSREGBUILD_BASE)$(SEP) SYSREGBUILD_INT = $(INTERMEDIATE_)$(SYSREGBUILD_BASE) SYSREGBUILD_INT_ = $(SYSREGBUILD_INT)$(SEP) -SYSREGBUILD_OUT = $(TOOLS_OUT_)$(SYSREGBUILD_BASE) +SYSREGBUILD_OUT = $(OUTPUT_)$(SYSREGBUILD_BASE) SYSREGBUILD_OUT_ = $(SYSREGBUILD_OUT)$(SEP) $(SYSREGBUILD_INT): | $(TOOLS_INT) Modified: trunk/reactos/tools/unicode/unicode.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/unicode/unicode.mak?… ============================================================================== --- trunk/reactos/tools/unicode/unicode.mak (original) +++ trunk/reactos/tools/unicode/unicode.mak Wed Mar 21 20:16:26 2007 @@ -2,7 +2,7 @@ UNICODE_BASE_ = $(UNICODE_BASE)$(SEP) UNICODE_INT = $(INTERMEDIATE_)$(UNICODE_BASE) UNICODE_INT_ = $(UNICODE_INT)$(SEP) -UNICODE_OUT = $(TOOLS_OUT_)$(UNICODE_BASE) +UNICODE_OUT = $(OUTPUT_)$(UNICODE_BASE) UNICODE_OUT_ = $(UNICODE_OUT)$(SEP) $(UNICODE_INT): | $(TOOLS_INT) Modified: trunk/reactos/tools/widl/widl.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/widl/widl.mak?rev=26… ============================================================================== --- trunk/reactos/tools/widl/widl.mak (original) +++ trunk/reactos/tools/widl/widl.mak Wed Mar 21 20:16:26 2007 @@ -2,7 +2,7 @@ WIDL_BASE_ = $(WIDL_BASE)$(SEP) WIDL_INT = $(INTERMEDIATE_)$(WIDL_BASE) WIDL_INT_ = $(WIDL_INT)$(SEP) -WIDL_OUT = $(TOOLS_OUT_)$(WIDL_BASE) +WIDL_OUT = $(OUTPUT_)$(WIDL_BASE) WIDL_OUT_ = $(WIDL_OUT)$(SEP) $(WIDL_INT): | $(TOOLS_INT) Modified: trunk/reactos/tools/winebuild/winebuild.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/winebuild/winebuild.… ============================================================================== --- trunk/reactos/tools/winebuild/winebuild.mak (original) +++ trunk/reactos/tools/winebuild/winebuild.mak Wed Mar 21 20:16:26 2007 @@ -2,7 +2,7 @@ WINEBUILD_BASE_ = $(WINEBUILD_BASE)$(SEP) WINEBUILD_INT = $(INTERMEDIATE_)$(WINEBUILD_BASE) WINEBUILD_INT_ = $(WINEBUILD_INT)$(SEP) -WINEBUILD_OUT = $(TOOLS_OUT_)$(WINEBUILD_BASE) +WINEBUILD_OUT = $(OUTPUT_)$(WINEBUILD_BASE) WINEBUILD_OUT_ = $(WINEBUILD_OUT)$(SEP) $(WINEBUILD_INT): | $(TOOLS_INT) Modified: trunk/reactos/tools/wmc/wmc.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wmc/wmc.mak?rev=2614… ============================================================================== --- trunk/reactos/tools/wmc/wmc.mak (original) +++ trunk/reactos/tools/wmc/wmc.mak Wed Mar 21 20:16:26 2007 @@ -2,7 +2,7 @@ WMC_BASE_ = $(WMC_BASE)$(SEP) WMC_INT = $(INTERMEDIATE_)$(WMC_BASE) WMC_INT_ = $(WMC_INT)$(SEP) -WMC_OUT = $(TOOLS_OUT_)$(WMC_BASE) +WMC_OUT = $(OUTPUT_)$(WMC_BASE) WMC_OUT_ = $(WMC_OUT)$(SEP) $(WMC_INT): | $(TOOLS_INT) Modified: trunk/reactos/tools/wpp/wpp.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wpp/wpp.mak?rev=2614… ============================================================================== --- trunk/reactos/tools/wpp/wpp.mak (original) +++ trunk/reactos/tools/wpp/wpp.mak Wed Mar 21 20:16:26 2007 @@ -2,7 +2,7 @@ WPP_BASE_ = $(WPP_BASE)$(SEP) WPP_INT = $(INTERMEDIATE_)$(WPP_BASE) WPP_INT_ = $(WPP_INT)$(SEP) -WPP_OUT = $(TOOLS_OUT_)$(WPP_BASE) +WPP_OUT = $(OUTPUT_)$(WPP_BASE) WPP_OUT_ = $(WPP_OUT)$(SEP) $(WPP_INT): | $(TOOLS_INT) Modified: trunk/reactos/tools/wrc/wrc.mak URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/wrc/wrc.mak?rev=2614… ============================================================================== --- trunk/reactos/tools/wrc/wrc.mak (original) +++ trunk/reactos/tools/wrc/wrc.mak Wed Mar 21 20:16:26 2007 @@ -2,7 +2,7 @@ WRC_BASE_ = $(WRC_BASE)$(SEP) WRC_INT = $(INTERMEDIATE_)$(WRC_BASE) WRC_INT_ = $(WRC_INT)$(SEP) -WRC_OUT = $(TOOLS_OUT_)$(WRC_BASE) +WRC_OUT = $(OUTPUT_)$(WRC_BASE) WRC_OUT_ = $(WRC_OUT)$(SEP) $(WRC_INT): | $(TOOLS_INT)

1 0

[fireball] 26148: - KiRosFrldrLpbToNtLpb(): Round up to the correct size in pages (I don't see a reason to provide a "cropped" size of modules). - Change "FreeLDR BIAS hack" to a better one: measure sizes of all 3 codepages, and place them contiguously. Is this still required at all? On my system I didn't see a case when these tables are placed not contiguously by freeldr. - This fixes early bugcheck in ExpInitNls().
by fireball＠svn.reactos.org 21 Mar '07

21 Mar '07

Author: fireball Date: Wed Mar 21 17:31:57 2007 New Revision: 26148 URL: http://svn.reactos.org/svn/reactos?rev=26148&view=rev Log: - KiRosFrldrLpbToNtLpb(): Round up to the correct size in pages (I don't see a reason to provide a "cropped" size of modules). - Change "FreeLDR BIAS hack" to a better one: measure sizes of all 3 codepages, and place them contiguously. Is this still required at all? On my system I didn't see a case when these tables are placed not contiguously by freeldr. - This fixes early bugcheck in ExpInitNls(). Modified: trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/ke/freeldr.c Modified: trunk/reactos/ntoskrnl/ex/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=261… ============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c (original) +++ trunk/reactos/ntoskrnl/ex/init.c Wed Mar 21 17:31:57 2007 @@ -191,6 +191,8 @@ LARGE_INTEGER SectionOffset = {{0}}; PLIST_ENTRY ListHead, NextEntry; PMEMORY_ALLOCATION_DESCRIPTOR MdBlock; + ULONG NlsTablesEncountered = 0; + ULONG NlsTableSizes[3]; /* 3 NLS tables */ /* Check if this is boot-time phase 0 initialization */ if (!ExpInitializationPhase) @@ -210,17 +212,16 @@ { /* Increase the table size */ ExpNlsTableSize += MdBlock->PageCount * PAGE_SIZE; + + /* FreeLdr-specific */ + NlsTableSizes[NlsTablesEncountered] = MdBlock->PageCount * PAGE_SIZE; + NlsTablesEncountered++; + ASSERT(NlsTablesEncountered < 4); } /* Go to the next block */ NextEntry = MdBlock->ListEntry.Flink; } - - /* - * In NT, the memory blocks are contiguous, but in ReactOS they aren't, - * so unless someone fixes FreeLdr, we'll have to use this icky hack. - */ - ExpNlsTableSize += 2 * PAGE_SIZE; // BIAS FOR FREELDR. HACK! /* Allocate the a new buffer since loader memory will be freed */ ExpNlsTableBase = ExAllocatePoolWithTag(NonPagedPool, @@ -229,9 +230,27 @@ if (!ExpNlsTableBase) KeBugCheck(PHASE0_INITIALIZATION_FAILED); /* Copy the codepage data in its new location. */ + //RtlCopyMemory(ExpNlsTableBase, + // LoaderBlock->NlsData->AnsiCodePageData, + // ExpNlsTableSize); + + /* + * In NT, the memory blocks are contiguous, but in ReactOS they aren't, + * so unless someone fixes FreeLdr, we'll have to use this icky hack. + */ RtlCopyMemory(ExpNlsTableBase, LoaderBlock->NlsData->AnsiCodePageData, - ExpNlsTableSize); + NlsTableSizes[0]); + + RtlCopyMemory((PVOID)((ULONG_PTR)ExpNlsTableBase + NlsTableSizes[0]), + LoaderBlock->NlsData->OemCodePageData, + NlsTableSizes[1]); + + RtlCopyMemory((PVOID)((ULONG_PTR)ExpNlsTableBase + NlsTableSizes[0] + + NlsTableSizes[1]), + LoaderBlock->NlsData->UnicodeCodePageData, + NlsTableSizes[2]); + /* End of Hack */ /* Initialize and reset the NLS TAbles */ RtlInitNlsTables((PVOID)((ULONG_PTR)ExpNlsTableBase + Modified: trunk/reactos/ntoskrnl/ke/freeldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/freeldr.c?rev=… ============================================================================== --- trunk/reactos/ntoskrnl/ke/freeldr.c (original) +++ trunk/reactos/ntoskrnl/ke/freeldr.c Wed Mar 21 17:31:57 2007 @@ -105,7 +105,7 @@ MdEntry = &BldrMemoryDescriptors[i]; MdEntry->MemoryType = LoaderNlsData; MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; - MdEntry->PageCount = ModSize >> PAGE_SHIFT; + MdEntry->PageCount = (ModSize + PAGE_SIZE - 1)>> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); continue; @@ -120,7 +120,7 @@ MdEntry = &BldrMemoryDescriptors[i]; MdEntry->MemoryType = LoaderNlsData; MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; - MdEntry->PageCount = ModSize >> PAGE_SHIFT; + MdEntry->PageCount = (ModSize + PAGE_SIZE - 1) >> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); continue; @@ -135,7 +135,7 @@ MdEntry = &BldrMemoryDescriptors[i]; MdEntry->MemoryType = LoaderNlsData; MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; - MdEntry->PageCount = ModSize >> PAGE_SHIFT; + MdEntry->PageCount = (ModSize + PAGE_SIZE - 1) >> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); continue; @@ -157,7 +157,7 @@ MdEntry = &BldrMemoryDescriptors[i]; MdEntry->MemoryType = LoaderRegistryData; MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; - MdEntry->PageCount = ModSize >> PAGE_SHIFT; + MdEntry->PageCount = (ModSize + PAGE_SIZE - 1) >> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); continue; @@ -172,7 +172,7 @@ MdEntry = &BldrMemoryDescriptors[i]; MdEntry->MemoryType = LoaderRegistryData; MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; - MdEntry->PageCount = ModSize >> PAGE_SHIFT; + MdEntry->PageCount = (ModSize + PAGE_SIZE - 1) >> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); continue; @@ -185,7 +185,7 @@ MdEntry = &BldrMemoryDescriptors[i]; MdEntry->MemoryType = LoaderSystemCode; MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; - MdEntry->PageCount = ModSize >> PAGE_SHIFT; + MdEntry->PageCount = (ModSize + PAGE_SIZE - 1) >> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); } @@ -195,7 +195,7 @@ MdEntry = &BldrMemoryDescriptors[i]; MdEntry->MemoryType = LoaderHalCode; MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; - MdEntry->PageCount = ModSize >> PAGE_SHIFT; + MdEntry->PageCount = (ModSize + PAGE_SIZE - 1) >> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); } @@ -205,7 +205,7 @@ MdEntry = &BldrMemoryDescriptors[i]; MdEntry->MemoryType = LoaderBootDriver; MdEntry->BasePage = (ULONG_PTR)ModStart >> PAGE_SHIFT; - MdEntry->PageCount = ModSize >> PAGE_SHIFT; + MdEntry->PageCount = (ModSize + PAGE_SIZE - 1) >> PAGE_SHIFT; InsertTailList(&LoaderBlock->MemoryDescriptorListHead, &MdEntry->ListEntry); }

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