Ros-diffs

ros-diffs@reactos.org

81390 discussions

[ion] 15509: Don't compile ROS-specific tab-debug commands on a retail build
by ion＠svn.reactos.com 26 May '05

26 May '05

Don't compile ROS-specific tab-debug commands on a retail build Modified: trunk/reactos/ntoskrnl/kd/kdmain.c _____ Modified: trunk/reactos/ntoskrnl/kd/kdmain.c --- trunk/reactos/ntoskrnl/kd/kdmain.c 2005-05-26 13:42:07 UTC (rev 15508) +++ trunk/reactos/ntoskrnl/kd/kdmain.c 2005-05-26 13:42:41 UTC (rev 15509) @@ -37,6 +37,7 @@ Result = KdpPrintString ((PANSI_STRING)Context1); break; +#ifdef DBG case TAG('R', 'o', 's', ' '): /* ROS-INTERNAL */ { switch ((ULONG)Context1) @@ -77,7 +78,7 @@ break; } } - +#endif default: HalDisplayString ("Invalid debug service call!\n"); break;

1 0

[ion] 15508: Fix typos in debug messages
by ion＠svn.reactos.com 26 May '05

26 May '05

Fix typos in debug messages Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c _____ Modified: trunk/reactos/ntoskrnl/ke/i386/exp.c --- trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-05-26 13:41:46 UTC (rev 15507) +++ trunk/reactos/ntoskrnl/ke/i386/exp.c 2005-05-26 13:42:07 UTC (rev 15508) @@ -725,7 +725,7 @@ &ResultLength ); if ( !NT_SUCCESS(Status) ) { - DPRINT1("Can't dump stack frames: NtQueryVirtualMemory() failed: %x\n", Status ); + DPRINT1("Can't dump stack frames: MiQueryVirtualMemory() failed: %x\n", Status ); return; } @@ -782,7 +782,7 @@ &ResultLength ); if ( !NT_SUCCESS(Status) ) { - DPRINT1("Can't dump stack frames: NtQueryVirtualMemory() failed: %x\n", Status ); + DPRINT1("Can't dump stack frames: MiQueryVirtualMemory() failed: %x\n", Status ); return; } @@ -834,7 +834,7 @@ &ResultLength ); if ( !NT_SUCCESS(Status) ) { - DPRINT1("Can't get stack frames: NtQueryVirtualMemory() failed: %x\n", Status ); + DPRINT1("Can't get stack frames: MiQueryVirtualMemory() failed: %x\n", Status ); return 0; }

1 0

[ion] 15507: Don't compile pool debug apis on a retail build
by ion＠svn.reactos.com 26 May '05

26 May '05

Don't compile pool debug apis on a retail build Modified: trunk/reactos/ntoskrnl/mm/npool.c _____ Modified: trunk/reactos/ntoskrnl/mm/npool.c --- trunk/reactos/ntoskrnl/mm/npool.c 2005-05-26 13:41:04 UTC (rev 15506) +++ trunk/reactos/ntoskrnl/mm/npool.c 2005-05-26 13:41:46 UTC (rev 15507) @@ -872,7 +872,7 @@ VOID MiDebugDumpNonPagedPool(BOOLEAN NewOnly) { -#ifndef WHOLE_PAGE_ALLOCATIONS +#if defined(POOL_DEBUG_APIS) && !defined(WHOLE_PAGE_ALLOCATIONS) BLOCK_HDR* current; PLIST_ENTRY current_entry; KIRQL oldIrql;

1 0

[ion] 15506: Don't allocate section segments in nonpaged pool
by ion＠svn.reactos.com 26 May '05

26 May '05

Don't allocate section segments in nonpaged pool Modified: trunk/reactos/ntoskrnl/mm/section.c _____ Modified: trunk/reactos/ntoskrnl/mm/section.c --- trunk/reactos/ntoskrnl/mm/section.c 2005-05-26 13:40:40 UTC (rev 15505) +++ trunk/reactos/ntoskrnl/mm/section.c 2005-05-26 13:41:04 UTC (rev 15506) @@ -198,7 +198,7 @@ { Table = Segment->PageDirectory.PageTables[DirectoryOffset] = - ExAllocatePoolWithTag(NonPagedPool, sizeof(SECTION_PAGE_TABLE), + ExAllocatePoolWithTag(PagedPool, sizeof(SECTION_PAGE_TABLE), TAG_SECTION_PAGE_TABLE); if (Table == NULL) { @@ -2183,7 +2183,7 @@ KeInitializeSpinLock(&Section->ViewListLock); Section->FileObject = NULL; Section->MaximumSize = MaximumSize; - Segment = ExAllocatePoolWithTag(NonPagedPool, sizeof(MM_SECTION_SEGMENT), + Segment = ExAllocatePoolWithTag(PagedPool, sizeof(MM_SECTION_SEGMENT), TAG_MM_SECTION_SEGMENT); if (Segment == NULL) { @@ -2387,7 +2387,7 @@ */ if (FileObject->SectionObjectPointer->DataSectionObject == NULL) { - Segment = ExAllocatePoolWithTag(NonPagedPool, sizeof(MM_SECTION_SEGMENT), + Segment = ExAllocatePoolWithTag(PagedPool, sizeof(MM_SECTION_SEGMENT), TAG_MM_SECTION_SEGMENT); if (Segment == NULL) { @@ -3073,7 +3073,7 @@ SizeOfSegments = sizeof(MM_SECTION_SEGMENT) * ImageSectionObject->NrSegments; - Segments = ExAllocatePoolWithTag(NonPagedPool, + Segments = ExAllocatePoolWithTag(PagedPool, SizeOfSegments, TAG_MM_SECTION_SEGMENT); @@ -3188,7 +3188,7 @@ { NTSTATUS StatusExeFmt; - ImageSectionObject = ExAllocatePoolWithTag(NonPagedPool, sizeof(MM_IMAGE_SECTION_OBJECT), TAG_MM_SECTION_SEGMENT); + ImageSectionObject = ExAllocatePoolWithTag(PagedPool, sizeof(MM_IMAGE_SECTION_OBJECT), TAG_MM_SECTION_SEGMENT); if (ImageSectionObject == NULL) { ObDereferenceObject(FileObject);

1 0

[ion] 15505: Fix pool code to actually work when some other defines are used
by ion＠svn.reactos.com 26 May '05

26 May '05

Fix pool code to actually work when some other defines are used Modified: trunk/reactos/ntoskrnl/mm/rpoolmgr.h _____ Modified: trunk/reactos/ntoskrnl/mm/rpoolmgr.h --- trunk/reactos/ntoskrnl/mm/rpoolmgr.h 2005-05-26 13:39:40 UTC (rev 15504) +++ trunk/reactos/ntoskrnl/mm/rpoolmgr.h 2005-05-26 13:40:40 UTC (rev 15505) @@ -249,6 +249,10 @@ #endif//DBG } +#if !R_STACK +#define RFreeFillStack(free) +#define RUsedFillStack(used) +#else static void RFreeFillStack ( PR_FREE free ) { @@ -270,6 +274,7 @@ for ( i = 0; i < R_EXTRA_STACK_UP; i++ ) used->LastOwnerStack[i] = stack[i+2]; } +#endif static PR_FREE RFreeInit ( void* memory ) @@ -332,7 +337,7 @@ } #if !R_RZ -#define RUsedRedZoneCheck(pUsed,Addr,file,line) +#define RUsedRedZoneCheck(pUsed,Addr,file,line, printzone) #else//R_RZ static void RiBadBlock ( PR_USED pUsed, char* Addr, const char* violation, const char* file, int line, int printzone )

1 0

[ion] 15504: Do not allow virtual mem queries > 0x80000000 even if you're from kmode. Remove deprecated debug messages
by ion＠svn.reactos.com 26 May '05

26 May '05

Do not allow virtual mem queries > 0x80000000 even if you're from kmode. Remove deprecated debug messages Modified: trunk/reactos/ntoskrnl/mm/virtual.c _____ Modified: trunk/reactos/ntoskrnl/mm/virtual.c --- trunk/reactos/ntoskrnl/mm/virtual.c 2005-05-26 13:36:30 UTC (rev 15503) +++ trunk/reactos/ntoskrnl/mm/virtual.c 2005-05-26 13:39:40 UTC (rev 15504) @@ -207,15 +207,6 @@ *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); break; case MEMORY_AREA_SYSTEM: - { - static int warned = 0; - if ( !warned ) - { - DPRINT1("FIXME: MEMORY_AREA_SYSTEM case incomplete (or possibly wrong) for NtQueryVirtualMemory()\n"); - warned = 1; - } - } - /* FIXME - don't have a clue if this is right, but it's better than nothing */ Info->Type = 0; Info->State = MEM_COMMIT; Info->Protect = MemoryArea->Attributes; @@ -228,15 +219,6 @@ *ResultLength = sizeof(MEMORY_BASIC_INFORMATION); break; case MEMORY_AREA_KERNEL_STACK: - { - static int warned = 0; - if ( !warned ) - { - DPRINT1("FIXME: MEMORY_AREA_KERNEL_STACK case incomplete (or possibly wrong) for NtQueryVirtualMemory()\n"); - warned = 1; - } - } - /* FIXME - don't have a clue if this is right, but it's better than nothing */ Info->Type = 0; Info->State = MEM_COMMIT; Info->Protect = MemoryArea->Attributes; @@ -304,7 +286,7 @@ PrevMode = ExGetPreviousMode(); - if (PrevMode == UserMode && Address >= (PVOID)KERNEL_BASE) + if (Address >= (PVOID)KERNEL_BASE) { DPRINT1("Invalid parameter\n"); return STATUS_INVALID_PARAMETER;

1 0

[ion] 15503: Shut up i8042prt
by ion＠svn.reactos.com 26 May '05

26 May '05

Shut up i8042prt Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c Modified: trunk/reactos/drivers/input/i8042prt/mouse.c _____ Modified: trunk/reactos/drivers/input/i8042prt/keyboard.c --- trunk/reactos/drivers/input/i8042prt/keyboard.c 2005-05-26 13:35:08 UTC (rev 15502) +++ trunk/reactos/drivers/input/i8042prt/keyboard.c 2005-05-26 13:36:30 UTC (rev 15503) @@ -113,7 +113,7 @@ } while (Iterations < DevExt->Settings.PollStatusIterations); if (STATUS_SUCCESS != Status) { - DPRINT1("Spurious I8042 interrupt\n"); + DPRINT("Spurious I8042 interrupt\n"); return FALSE; } _____ Modified: trunk/reactos/drivers/input/i8042prt/mouse.c --- trunk/reactos/drivers/input/i8042prt/mouse.c 2005-05-26 13:35:08 UTC (rev 15502) +++ trunk/reactos/drivers/input/i8042prt/mouse.c 2005-05-26 13:36:30 UTC (rev 15503) @@ -334,7 +334,7 @@ case ExpectingFinalResolutionACK: I8042IsrWritePortMouse(DevExt, DevExt->Settings.MouseResolution & 0xff); - DPRINT1("%x\n", DevExt->Settings.MouseResolution); + DPRINT("%x\n", DevExt->Settings.MouseResolution); DevExt->MouseResetState = ExpectingFinalResolutionValueACK; return TRUE; case ExpectingFinalResolutionValueACK:

1 0

[ion] 15502: Don't free heap for string that we don't own
by ion＠svn.reactos.com 26 May '05

26 May '05

Don't free heap for string that we don't own Modified: trunk/reactos/lib/user32/misc/display.c _____ Modified: trunk/reactos/lib/user32/misc/display.c --- trunk/reactos/lib/user32/misc/display.c 2005-05-26 10:01:14 UTC (rev 15501) +++ trunk/reactos/lib/user32/misc/display.c 2005-05-26 13:35:08 UTC (rev 15502) @@ -110,7 +110,7 @@ lpDisplayDevice, dwFlags ); - RtlFreeUnicodeString ( &Device ); + //RtlFreeUnicodeString ( &Device ); return rc; }

1 0

[mbosma] 15501: PackageManager
by mbosma＠svn.reactos.com 26 May '05

26 May '05

PackageManager Modified: trunk/rosapps/packmgr/lib/options.cpp _____ Modified: trunk/rosapps/packmgr/lib/options.cpp --- trunk/rosapps/packmgr/lib/options.cpp 2005-05-26 09:46:02 UTC (rev 15500) +++ trunk/rosapps/packmgr/lib/options.cpp 2005-05-26 10:01:14 UTC (rev 15501) @@ -83,7 +83,7 @@ { Log("* Load options.xml from the Internet (Temporary Hack)"); - CopyFileA( PML_Download(tree, "http://svn.reactos.com/viewcvs/*checkout*/trunk/rosapps/packmgr/gui/opt ions.xml", NULL, "options.xml"), "options.xml", TRUE); + CopyFileA( PML_Download(tree, "http://svn.reactos.com/viewcvs/*checkout*/trunk/rosapps/packmgr/lib/opt ions.xml", NULL, "options.xml"), "options.xml", TRUE); return ERR_OK; }

1 0

[gvg] 15500: Sync to Wine-20050524:
by gvg＠svn.reactos.com 26 May '05

26 May '05

Sync to Wine-20050524: Michael Stefaniuc <mstefani(a)redhat.de> - Change the type of 1 bit wide bitfields to unsigned. Modified: trunk/reactos/tools/wrc/wrctypes.h _____ Modified: trunk/reactos/tools/wrc/wrctypes.h --- trunk/reactos/tools/wrc/wrctypes.h 2005-05-26 09:44:59 UTC (rev 15499) +++ trunk/reactos/tools/wrc/wrctypes.h 2005-05-26 09:46:02 UTC (rev 15500) @@ -535,13 +535,13 @@ int filetype; int filesubtype; struct { - int fv:1; - int pv:1; - int fo:1; - int ff:1; - int ffm:1; - int ft:1; - int fst:1; + unsigned fv:1; + unsigned pv:1; + unsigned fo:1; + unsigned ff:1; + unsigned ffm:1; + unsigned ft:1; + unsigned fst:1; } gotit; ver_block_t *blocks; lvc_t lvc;

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