Ros-diffs

ros-diffs@reactos.org

81390 discussions

[greatlrd] 22197: fixing malloc and realloc so it return right value do not mix the doc over malloc and realloc. Thanks filip <filip2307> malloc(0) -> valid buffer <GreatLord> then I revert that change <filip2307> realloc(<non-null pointer>, 0) -> NULL <filip2307> realloc(NULL, 0) -> valid buffer
by greatlrd＠svn.reactos.org 03 Jun '06

03 Jun '06

Author: greatlrd Date: Sat Jun 3 21:40:23 2006 New Revision: 22197 URL: http://svn.reactos.ru/svn/reactos?rev=22197&view=rev Log: fixing malloc and realloc so it return right value do not mix the doc over malloc and realloc. Thanks filip <filip2307> malloc(0) -> valid buffer <GreatLord> then I revert that change <filip2307> realloc(<non-null pointer>, 0) -> NULL <filip2307> realloc(NULL, 0) -> valid buffer Modified: trunk/reactos/lib/crt/stdlib/malloc.c Modified: trunk/reactos/lib/crt/stdlib/malloc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/stdlib/malloc.c?rev… ============================================================================== --- trunk/reactos/lib/crt/stdlib/malloc.c (original) +++ trunk/reactos/lib/crt/stdlib/malloc.c Sat Jun 3 21:40:23 2006 @@ -36,12 +36,7 @@ */ void* malloc(size_t _size) { - size_t nSize; - - if ( _size == 0) - return NULL; - - nSize = ROUND_SIZE(_size); + size_t nSize = ROUND_SIZE(_size); if (nSize<_size) return NULL; @@ -65,7 +60,7 @@ size_t nSize = _nmemb * _size; size_t cSize = ROUND_SIZE(nSize); - if ((_nmemb > ((size_t)-1 / _size) || (nSize == 0) || (cSize<nSize)) + if ((_nmemb > ((size_t)-1 / _size) || (cSize<nSize)) return NULL; return HeapAlloc(hHeap, HEAP_ZERO_MEMORY, cSize ); @@ -78,7 +73,7 @@ { size_t nSize; - if ( _size == 0) + if (( _size == 0) && (_ptr !=NULL) return NULL; nSize = ROUND_SIZE(_size); @@ -98,10 +93,7 @@ void* _expand(void* _ptr, size_t _size) { size_t nSize; - - if ( _size == 0) - return NULL; - + nSize = ROUND_SIZE(_size); if (nSize<_size)

1 0

[greatlrd] 22196: Fix overflow caltions bugs in varus memmory functions, Thanks irc : Elrond (from TNG) for fixing calloc overflow bug.
by greatlrd＠svn.reactos.org 03 Jun '06

03 Jun '06

Author: greatlrd Date: Sat Jun 3 21:18:09 2006 New Revision: 22196 URL: http://svn.reactos.ru/svn/reactos?rev=22196&view=rev Log: Fix overflow caltions bugs in varus memmory functions, Thanks irc : Elrond (from TNG) for fixing calloc overflow bug. Modified: trunk/reactos/lib/crt/stdlib/malloc.c Modified: trunk/reactos/lib/crt/stdlib/malloc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/stdlib/malloc.c?rev… ============================================================================== --- trunk/reactos/lib/crt/stdlib/malloc.c (original) +++ trunk/reactos/lib/crt/stdlib/malloc.c Sat Jun 3 21:18:09 2006 @@ -36,10 +36,17 @@ */ void* malloc(size_t _size) { + size_t nSize; + if ( _size == 0) return NULL; - - return HeapAlloc(hHeap, 0, ROUND_SIZE(_size)); + + nSize = ROUND_SIZE(_size); + + if (nSize<_size) + return NULL; + + return HeapAlloc(hHeap, 0, nSize); } /* @@ -54,11 +61,14 @@ * @implemented */ void* calloc(size_t _nmemb, size_t _size) -{ - if ( _size == 0) - return NULL; - - return HeapAlloc(hHeap, HEAP_ZERO_MEMORY, ROUND_SIZE(_nmemb*_size) ); +{ + size_t nSize = _nmemb * _size; + size_t cSize = ROUND_SIZE(nSize); + + if ((_nmemb > ((size_t)-1 / _size) || (nSize == 0) || (cSize<nSize)) + return NULL; + + return HeapAlloc(hHeap, HEAP_ZERO_MEMORY, cSize ); } /* @@ -66,11 +76,18 @@ */ void* realloc(void* _ptr, size_t _size) { + size_t nSize; + if ( _size == 0) return NULL; - + + nSize = ROUND_SIZE(_size); + + if (nSize<_size) + return NULL; + if (!_ptr) return malloc(_size); - if (_size) return HeapReAlloc(hHeap, 0, _ptr, ROUND_SIZE(_size)); + if (_size) return HeapReAlloc(hHeap, 0, _ptr, nSize); free(_ptr); return NULL; } @@ -80,10 +97,17 @@ */ void* _expand(void* _ptr, size_t _size) { + size_t nSize; + if ( _size == 0) return NULL; + + nSize = ROUND_SIZE(_size); + + if (nSize<_size) + return NULL; - return HeapReAlloc(hHeap, HEAP_REALLOC_IN_PLACE_ONLY, _ptr, ROUND_SIZE(_size)); + return HeapReAlloc(hHeap, HEAP_REALLOC_IN_PLACE_ONLY, _ptr, nSize); } /*

1 0

[greatlrd] 22195: make malloc, calloc and some other function return NULL if size is 0
by greatlrd＠svn.reactos.org 03 Jun '06

03 Jun '06

Author: greatlrd Date: Sat Jun 3 17:22:11 2006 New Revision: 22195 URL: http://svn.reactos.ru/svn/reactos?rev=22195&view=rev Log: make malloc, calloc and some other function return NULL if size is 0 Modified: trunk/reactos/lib/crt/stdlib/malloc.c Modified: trunk/reactos/lib/crt/stdlib/malloc.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/lib/crt/stdlib/malloc.c?rev… ============================================================================== --- trunk/reactos/lib/crt/stdlib/malloc.c (original) +++ trunk/reactos/lib/crt/stdlib/malloc.c Sat Jun 3 17:22:11 2006 @@ -36,6 +36,9 @@ */ void* malloc(size_t _size) { + if ( _size == 0) + return NULL; + return HeapAlloc(hHeap, 0, ROUND_SIZE(_size)); } @@ -52,6 +55,9 @@ */ void* calloc(size_t _nmemb, size_t _size) { + if ( _size == 0) + return NULL; + return HeapAlloc(hHeap, HEAP_ZERO_MEMORY, ROUND_SIZE(_nmemb*_size) ); } @@ -60,6 +66,9 @@ */ void* realloc(void* _ptr, size_t _size) { + if ( _size == 0) + return NULL; + if (!_ptr) return malloc(_size); if (_size) return HeapReAlloc(hHeap, 0, _ptr, ROUND_SIZE(_size)); free(_ptr); @@ -71,6 +80,9 @@ */ void* _expand(void* _ptr, size_t _size) { + if ( _size == 0) + return NULL; + return HeapReAlloc(hHeap, HEAP_REALLOC_IN_PLACE_ONLY, _ptr, ROUND_SIZE(_size)); }

1 0

[greatlrd] 22194: [AUDIT] this code is clear, no signs of revers is found it is only around 2-3 line of each functions
by greatlrd＠svn.reactos.org 03 Jun '06

03 Jun '06

Author: greatlrd Date: Sat Jun 3 17:20:03 2006 New Revision: 22194 URL: http://svn.reactos.ru/svn/reactos?rev=22194&view=rev Log: [AUDIT] this code is clear, no signs of revers is found it is only around 2-3 line of each functions Modified: trunk/reactos/lib/crt/stdlib/malloc.c (props changed) Propchange: trunk/reactos/lib/crt/stdlib/malloc.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[janderwald] 22193: re-enable lock
by janderwald＠svn.reactos.org 03 Jun '06

03 Jun '06

Author: janderwald Date: Sat Jun 3 16:53:45 2006 New Revision: 22193 URL: http://svn.reactos.ru/svn/reactos?rev=22193&view=rev Log: re-enable lock Modified: trunk/reactos/ntoskrnl/cm/regfile.c (props changed) Propchange: trunk/reactos/ntoskrnl/cm/regfile.c ------------------------------------------------------------------------------ svn:needs-lock = *

1 0

[janderwald] 22192: fix bug in CmiCreateHiveFreeCellList when a cell has size 0 which leads to inifite loop fix bug in CmiCreateTempHive where only a pointer was allocated for the first cell but not object itself
by janderwald＠svn.reactos.org 03 Jun '06

03 Jun '06

Author: janderwald Date: Sat Jun 3 16:48:09 2006 New Revision: 22192 URL: http://svn.reactos.ru/svn/reactos?rev=22192&view=rev Log: fix bug in CmiCreateHiveFreeCellList when a cell has size 0 which leads to inifite loop fix bug in CmiCreateTempHive where only a pointer was allocated for the first cell but not object itself Modified: trunk/reactos/ntoskrnl/cm/regfile.c (contents, props changed) Modified: trunk/reactos/ntoskrnl/cm/regfile.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/ntoskrnl/cm/regfile.c?rev=2… ============================================================================== --- trunk/reactos/ntoskrnl/cm/regfile.c (original) +++ trunk/reactos/ntoskrnl/cm/regfile.c Sat Jun 3 16:48:09 2006 @@ -783,10 +783,24 @@ FreeOffset += FreeBlock->CellSize; } - else + else if (FreeBlock->CellSize < 0) { FreeOffset -= FreeBlock->CellSize; } + else + { +#ifdef HIVE_CHECK + /* Check and eventually fix a hive */ + Status = CmiCheckAndFixHive(Hive); + if (!NT_SUCCESS(Status)) + { + DPRINT1("CmiCheckAndFixHive() failed (Status %lx)\n", Status); + return(Status); + } +#else + break; +#endif + } } BlockIndex += Bin->BinSize / REG_BLOCK_SIZE; @@ -1164,7 +1178,7 @@ /* Allocate hive block list */ Hive->BlockList = ExAllocatePool (NonPagedPool, - sizeof(PBLOCK_LIST_ENTRY)); + sizeof(BLOCK_LIST_ENTRY)); if (Hive->BlockList == NULL) { DPRINT1 ("Failed to allocate hive block list\n"); Propchange: trunk/reactos/ntoskrnl/cm/regfile.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[hpoussin] 22191: Fix some little bugs
by hpoussin＠svn.reactos.org 03 Jun '06

03 Jun '06

Author: hpoussin Date: Sat Jun 3 15:47:04 2006 New Revision: 22191 URL: http://svn.reactos.ru/svn/reactos?rev=22191&view=rev Log: Fix some little bugs Modified: trunk/reactos/base/system/services/database.c trunk/reactos/base/system/services/groupdb.c trunk/reactos/base/system/services/rpcserver.c trunk/reactos/base/system/services/services.h Modified: trunk/reactos/base/system/services/database.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/system/services/databa… ============================================================================== --- trunk/reactos/base/system/services/database.c (original) +++ trunk/reactos/base/system/services/database.c Sat Jun 3 15:47:04 2006 @@ -741,10 +741,10 @@ } -static NTSTATUS -ScmStartService(PSERVICE Service, - PSERVICE_GROUP Group) -{ +NTSTATUS +ScmStartService(PSERVICE Service) +{ + PSERVICE_GROUP Group = Service->lpGroup; NTSTATUS Status; DPRINT("ScmStartService() called\n"); @@ -849,8 +849,7 @@ (CurrentService->dwTag == CurrentGroup->TagArray[i])) { CurrentService->ServiceVisited = TRUE; - ScmStartService(CurrentService, - CurrentGroup); + ScmStartService(CurrentService); } ServiceEntry = ServiceEntry->Flink; @@ -868,8 +867,7 @@ (CurrentService->ServiceVisited == FALSE)) { CurrentService->ServiceVisited = TRUE; - ScmStartService(CurrentService, - CurrentGroup); + ScmStartService(CurrentService); } ServiceEntry = ServiceEntry->Flink; @@ -889,8 +887,7 @@ (CurrentService->ServiceVisited == FALSE)) { CurrentService->ServiceVisited = TRUE; - ScmStartService(CurrentService, - NULL); + ScmStartService(CurrentService); } ServiceEntry = ServiceEntry->Flink; @@ -907,8 +904,7 @@ (CurrentService->ServiceVisited == FALSE)) { CurrentService->ServiceVisited = TRUE; - ScmStartService(CurrentService, - NULL); + ScmStartService(CurrentService); } ServiceEntry = ServiceEntry->Flink; Modified: trunk/reactos/base/system/services/groupdb.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/system/services/groupd… ============================================================================== --- trunk/reactos/base/system/services/groupdb.c (original) +++ trunk/reactos/base/system/services/groupdb.c Sat Jun 3 15:47:04 2006 @@ -63,6 +63,7 @@ wcscpy(lpGroup->szGroupName, lpGroupName); lpGroup->lpGroupName = lpGroup->szGroupName; lpGroup->dwRefCount = 1; + lpService->lpGroup = lpGroup; InsertTailList(&UnknownGroupListHead, &lpGroup->GroupListEntry); Modified: trunk/reactos/base/system/services/rpcserver.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/system/services/rpcser… ============================================================================== --- trunk/reactos/base/system/services/rpcserver.c (original) +++ trunk/reactos/base/system/services/rpcserver.c Sat Jun 3 15:47:04 2006 @@ -1605,7 +1605,7 @@ LPQUERY_SERVICE_CONFIGW lpConfig; LPWSTR lpStr; - DPRINT1("ScmrQueryServiceConfigW() called\n"); + DPRINT("ScmrQueryServiceConfigW() called\n"); if (ScmShutdown) return ERROR_SHUTDOWN_IN_PROGRESS; @@ -1725,7 +1725,7 @@ /* FIXME: Unlock the service database */ - DPRINT1("ScmrQueryServiceConfigW() done\n"); + DPRINT("ScmrQueryServiceConfigW() done\n"); return dwError; } @@ -1755,6 +1755,7 @@ DWORD dwError = ERROR_SUCCESS; PSERVICE_HANDLE hSvc; PSERVICE lpService = NULL; + NTSTATUS Status; DPRINT1("ScmrStartServiceW() called\n"); @@ -1788,7 +1789,10 @@ if (lpService->bDeleted) return ERROR_SERVICE_MARKED_FOR_DELETE; - /* FIXME: Start the service */ + /* Start the service */ + Status = STATUS_SUCCESS; /* FIXME: ScmStartService(lpService); */ + if (!NT_SUCCESS(Status)) + return RtlNtStatusToDosError(Status); return dwError; } Modified: trunk/reactos/base/system/services/services.h URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/base/system/services/servic… ============================================================================== --- trunk/reactos/base/system/services/services.h (original) +++ trunk/reactos/base/system/services/services.h Sat Jun 3 15:47:04 2006 @@ -121,7 +121,7 @@ /* services.c */ VOID PrintString(LPCSTR fmt, ...); - +NTSTATUS ScmStartService(PSERVICE Service); /* EOF */

1 0

[gedmurphy] 22189: [AUDIT] services.exe Eric Kohl and Filip Navara have both confirmed their contributions are clean. Public documentation, like "Inside Microsoft Windows 2000", and tests were used to implement it
by gedmurphy＠svn.reactos.org 03 Jun '06

03 Jun '06

Author: gedmurphy Date: Sat Jun 3 15:25:47 2006 New Revision: 22189 URL: http://svn.reactos.ru/svn/reactos?rev=22189&view=rev Log: [AUDIT] services.exe Eric Kohl and Filip Navara have both confirmed their contributions are clean. Public documentation, like "Inside Microsoft Windows 2000", and tests were used to implement it Modified: trunk/reactos/base/system/services/config.c (props changed) trunk/reactos/base/system/services/database.c (props changed) trunk/reactos/base/system/services/driver.c (props changed) trunk/reactos/base/system/services/groupdb.c (props changed) trunk/reactos/base/system/services/rpcserver.c (props changed) trunk/reactos/base/system/services/services.c (props changed) trunk/reactos/base/system/services/services.h (props changed) trunk/reactos/base/system/services/services.rc (props changed) Propchange: trunk/reactos/base/system/services/config.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/services/database.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/services/driver.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/services/groupdb.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/services/rpcserver.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/services/services.c ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/services/services.h ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -* Propchange: trunk/reactos/base/system/services/services.rc ------------------------------------------------------------------------------ --- svn:needs-lock (original) +++ svn:needs-lock (removed) @@ -1,1 +1,0 @@ -*

1 0

[jimtabor] 22188: Fix compiling. Well for me anyway.
by jimtabor＠svn.reactos.org 03 Jun '06

03 Jun '06

Author: jimtabor Date: Sat Jun 3 11:00:09 2006 New Revision: 22188 URL: http://svn.reactos.ru/svn/reactos?rev=22188&view=rev Log: Fix compiling. Well for me anyway. Modified: trunk/reactos/hal/hal/hal.c Modified: trunk/reactos/hal/hal/hal.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/hal/hal/hal.c?rev=22188&r1=… ============================================================================== --- trunk/reactos/hal/hal/hal.c (original) +++ trunk/reactos/hal/hal/hal.c Sat Jun 3 11:00:09 2006 @@ -1051,4 +1051,28 @@ UNIMPLEMENTED; } +/* + * @unimplemented + */ +KIRQL +FASTCALL +KeAcquireQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @unimplemented + */ +VOID +FASTCALL +KeReleaseQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle, + IN KIRQL OldIrql) +{ + UNIMPLEMENTED; +} + + + /* EOF */

1 0

[fireball] 22187: Add forgotten KeAcquire/ReleaseQueuedSpinLock exported funcs to hal.def
by fireball＠svn.reactos.org 02 Jun '06

02 Jun '06

Author: fireball Date: Sat Jun 3 00:15:54 2006 New Revision: 22187 URL: http://svn.reactos.ru/svn/reactos?rev=22187&view=rev Log: Add forgotten KeAcquire/ReleaseQueuedSpinLock exported funcs to hal.def Modified: trunk/reactos/hal/hal/hal.def trunk/reactos/hal/halx86/mp/spinlock.c Modified: trunk/reactos/hal/hal/hal.def URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/hal/hal/hal.def?rev=22187&r… ============================================================================== --- trunk/reactos/hal/hal/hal.def (original) +++ trunk/reactos/hal/hal/hal.def Sat Jun 3 00:15:54 2006 @@ -72,6 +72,7 @@ KeAcquireSpinLock@8 @KeAcquireInStackQueuedSpinLock@8 @KeAcquireSpinLockRaiseToSynch@4 +@KeAcquireQueuedSpinLock@4 KeGetCurrentIrql@0 KeFlushWriteBuffer@0 KeLowerIrql@4 @@ -81,6 +82,7 @@ KeRaiseIrqlToSynchLevel@0 @KeReleaseInStackQueuedSpinLock@4 KeReleaseSpinLock@8 +@KeReleaseQueuedSpinLock@8 KeStallExecutionProcessor@4 @KfAcquireSpinLock@4 @KfLowerIrql@4 Modified: trunk/reactos/hal/halx86/mp/spinlock.c URL: http://svn.reactos.ru/svn/reactos/trunk/reactos/hal/halx86/mp/spinlock.c?re… ============================================================================== --- trunk/reactos/hal/halx86/mp/spinlock.c (original) +++ trunk/reactos/hal/halx86/mp/spinlock.c Sat Jun 3 00:15:54 2006 @@ -130,4 +130,26 @@ UNIMPLEMENTED; } +/* + * @unimplemented + */ +KIRQL +FASTCALL +KeAcquireQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @unimplemented + */ +VOID +FASTCALL +KeReleaseQueuedSpinLock(IN PKLOCK_QUEUE_HANDLE LockHandle, + IN KIRQL OldIrql) +{ + UNIMPLEMENTED; +} + /* EOF */

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