Ros-diffs February 2007

ros-diffs@reactos.org

16 participants
265 discussions

[janderwald] 25672: - Use compiler intrinsics instead of hidden dependency of intrlck
by janderwald＠svn.reactos.org 01 Feb '07

01 Feb '07

Author: janderwald Date: Fri Feb 2 01:10:21 2007 New Revision: 25672 URL: http://svn.reactos.org/svn/reactos?rev=25672&view=rev Log: - Use compiler intrinsics instead of hidden dependency of intrlck Modified: trunk/reactos/lib/rtl/critical.c trunk/reactos/lib/rtl/rtl.h trunk/reactos/lib/rtl/srw.c trunk/reactos/lib/rtl/workitem.c Modified: trunk/reactos/lib/rtl/critical.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/critical.c?rev=256… ============================================================================== --- trunk/reactos/lib/rtl/critical.c (original) +++ trunk/reactos/lib/rtl/critical.c Fri Feb 2 01:10:21 2007 @@ -59,13 +59,13 @@ /* We failed, this is bad... */ DPRINT1("Failed to Create Event!\n"); - InterlockedDecrement(&CriticalSection->LockCount); + _InterlockedDecrement(&CriticalSection->LockCount); RtlRaiseStatus(Status); return; } DPRINT("Created Event: %p \n", hNewEvent); - if ((hEvent = InterlockedCompareExchangePointer((PVOID*)&CriticalSection->LockSemaphore, + if ((hEvent = _InterlockedCompareExchangePointer((PVOID*)&CriticalSection->LockSemaphore, (PVOID)hNewEvent, 0))) { @@ -427,7 +427,7 @@ HANDLE Thread = (HANDLE)NtCurrentTeb()->Cid.UniqueThread; /* Try to Lock it */ - if (InterlockedIncrement(&CriticalSection->LockCount) != 0) { + if (_InterlockedIncrement(&CriticalSection->LockCount) != 0) { /* * We've failed to lock it! Does this thread @@ -611,7 +611,7 @@ if (--CriticalSection->RecursionCount) { /* Someone still owns us, but we are free. This needs to be done atomically. */ - InterlockedDecrement(&CriticalSection->LockCount); + _InterlockedDecrement(&CriticalSection->LockCount); } else { @@ -620,7 +620,7 @@ CriticalSection->OwningThread = 0; /* Was someone wanting us? This needs to be done atomically. */ - if (-1 != InterlockedDecrement(&CriticalSection->LockCount)) { + if (-1 != _InterlockedDecrement(&CriticalSection->LockCount)) { /* Let him have us */ RtlpUnWaitCriticalSection(CriticalSection); @@ -652,9 +652,9 @@ RtlTryEnterCriticalSection(PRTL_CRITICAL_SECTION CriticalSection) { /* Try to take control */ - if (InterlockedCompareExchange(&CriticalSection->LockCount, - 0, - -1) == -1) { + if (_InterlockedCompareExchange(&CriticalSection->LockCount, + 0, + -1) == -1) { /* It's ours */ CriticalSection->OwningThread = NtCurrentTeb()->Cid.UniqueThread; @@ -664,7 +664,7 @@ } else if (CriticalSection->OwningThread == NtCurrentTeb()->Cid.UniqueThread) { /* It's already ours */ - InterlockedIncrement(&CriticalSection->LockCount); + _InterlockedIncrement(&CriticalSection->LockCount); CriticalSection->RecursionCount++; return TRUE; } Modified: trunk/reactos/lib/rtl/rtl.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/rtl.h?rev=25672&r1… ============================================================================== --- trunk/reactos/lib/rtl/rtl.h (original) +++ trunk/reactos/lib/rtl/rtl.h Fri Feb 2 01:10:21 2007 @@ -27,6 +27,7 @@ #include "rtlp.h" #include <pseh/pseh.h> +#include <intrin.h> #endif /* RTL_H */ Modified: trunk/reactos/lib/rtl/srw.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/srw.c?rev=25672&r1… ============================================================================== --- trunk/reactos/lib/rtl/srw.c (original) +++ trunk/reactos/lib/rtl/srw.c Fri Feb 2 01:10:21 2007 @@ -32,9 +32,9 @@ j = *Target; do { i = j; - j = InterlockedCompareExchange((PLONG)Target, - i & Set, - i); + j = _InterlockedCompareExchange((PLONG)Target, + i & Set, + i); } while (i != j); @@ -52,9 +52,9 @@ j = *Target; do { i = j; - j = InterlockedCompareExchange((PLONG)Target, - i | Set, - i); + j = _InterlockedCompareExchange((PLONG)Target, + i | Set, + i); } while (i != j); @@ -173,8 +173,8 @@ } } - (void)InterlockedExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue); + (void)_InterlockedExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue); if (FirstWaitBlock->Exclusive) { @@ -229,8 +229,8 @@ NewValue = RTL_SRWLOCK_OWNED; } - (void)InterlockedExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue); + (void)_InterlockedExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue); (void)InterlockedOr(&FirstWaitBlock->Wake, TRUE); @@ -464,9 +464,9 @@ NewValue = (CurrentValue >> RTL_SRWLOCK_BITS) + 1; NewValue = (NewValue << RTL_SRWLOCK_BITS) | (CurrentValue & RTL_SRWLOCK_MASK); - if (InterlockedCompareExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue, - (PVOID)CurrentValue) == (PVOID)CurrentValue) + if (_InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == (PVOID)CurrentValue) { /* Successfully incremented the shared count, we acquired the lock */ break; @@ -543,9 +543,9 @@ ASSERT_SRW_WAITBLOCK(&StackWaitBlock); NewValue = (ULONG_PTR)&StackWaitBlock | RTL_SRWLOCK_OWNED | RTL_SRWLOCK_CONTENDED; - if (InterlockedCompareExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue, - (PVOID)CurrentValue) == (PVOID)CurrentValue) + if (_InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == (PVOID)CurrentValue) { RtlpAcquireSRWLockSharedWait(SRWLock, &StackWaitBlock, @@ -565,9 +565,9 @@ RTL_SRWLOCK_SHARED nor the RTL_SRWLOCK_OWNED bit is set */ ASSERT(!(CurrentValue & RTL_SRWLOCK_CONTENDED)); - if (InterlockedCompareExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue, - (PVOID)CurrentValue) == (PVOID)CurrentValue) + if (_InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == (PVOID)CurrentValue) { /* Successfully set the shared count, we acquired the lock */ break; @@ -624,9 +624,9 @@ NewValue = (NewValue << RTL_SRWLOCK_BITS) | RTL_SRWLOCK_SHARED | RTL_SRWLOCK_OWNED; } - if (InterlockedCompareExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue, - (PVOID)CurrentValue) == (PVOID)CurrentValue) + if (_InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == (PVOID)CurrentValue) { /* Successfully released the lock */ break; @@ -683,9 +683,9 @@ NewValue = (ULONG_PTR)&StackWaitBlock | RTL_SRWLOCK_SHARED | RTL_SRWLOCK_CONTENDED | RTL_SRWLOCK_OWNED; - if (InterlockedCompareExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue, - (PVOID)CurrentValue) == (PVOID)CurrentValue) + if (_InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == (PVOID)CurrentValue) { RtlpAcquireSRWLockExclusiveWait(SRWLock, &StackWaitBlock); @@ -741,9 +741,9 @@ ASSERT_SRW_WAITBLOCK(&StackWaitBlock); NewValue = (ULONG_PTR)&StackWaitBlock | RTL_SRWLOCK_OWNED | RTL_SRWLOCK_CONTENDED; - if (InterlockedCompareExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue, - (PVOID)CurrentValue) == (PVOID)CurrentValue) + if (_InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == (PVOID)CurrentValue) { RtlpAcquireSRWLockExclusiveWait(SRWLock, &StackWaitBlock); @@ -811,9 +811,9 @@ ASSERT(!(CurrentValue & ~RTL_SRWLOCK_OWNED)); NewValue = 0; - if (InterlockedCompareExchangePointer(&SRWLock->Ptr, - (PVOID)NewValue, - (PVOID)CurrentValue) == (PVOID)CurrentValue) + if (_InterlockedCompareExchangePointer(&SRWLock->Ptr, + (PVOID)NewValue, + (PVOID)CurrentValue) == (PVOID)CurrentValue) { /* We released the lock */ break; Modified: trunk/reactos/lib/rtl/workitem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/workitem.c?rev=256… ============================================================================== --- trunk/reactos/lib/rtl/workitem.c (original) +++ trunk/reactos/lib/rtl/workitem.c Fri Feb 2 01:10:21 2007 @@ -55,9 +55,9 @@ do { - InitStatus = InterlockedCompareExchange(&ThreadPoolInitialized, - 2, - 0); + InitStatus = _InterlockedCompareExchange(&ThreadPoolInitialized, + 2, + 0); if (InitStatus == 0) { /* We're the first thread to initialize the thread pool */ @@ -91,8 +91,8 @@ Finish: /* Initialization done */ - InterlockedExchange(&ThreadPoolInitialized, - 1); + _InterlockedExchange(&ThreadPoolInitialized, + 1); break; } else if (InitStatus == 2) @@ -223,11 +223,11 @@ } /* update the requests counter */ - InterlockedDecrement(&ThreadPoolWorkerThreadsRequests); + _InterlockedDecrement(&ThreadPoolWorkerThreadsRequests); if (WorkItem.Flags & WT_EXECUTELONGFUNCTION) { - InterlockedDecrement(&ThreadPoolWorkerThreadsLongRequests); + _InterlockedDecrement(&ThreadPoolWorkerThreadsLongRequests); } } @@ -237,11 +237,11 @@ { NTSTATUS Status = STATUS_SUCCESS; - InterlockedIncrement(&ThreadPoolWorkerThreadsRequests); + _InterlockedIncrement(&ThreadPoolWorkerThreadsRequests); if (WorkItem->Flags & WT_EXECUTELONGFUNCTION) { - InterlockedIncrement(&ThreadPoolWorkerThreadsLongRequests); + _InterlockedIncrement(&ThreadPoolWorkerThreadsLongRequests); } if (WorkItem->Flags & WT_EXECUTEINPERSISTENTTHREAD) @@ -270,11 +270,11 @@ if (!NT_SUCCESS(Status)) { - InterlockedDecrement(&ThreadPoolWorkerThreadsRequests); + _InterlockedDecrement(&ThreadPoolWorkerThreadsRequests); if (WorkItem->Flags & WT_EXECUTELONGFUNCTION) { - InterlockedDecrement(&ThreadPoolWorkerThreadsLongRequests); + _InterlockedDecrement(&ThreadPoolWorkerThreadsLongRequests); } } @@ -351,11 +351,11 @@ } /* update the requests counter */ - InterlockedDecrement(&ThreadPoolIOWorkerThreadsRequests); + _InterlockedDecrement(&ThreadPoolIOWorkerThreadsRequests); if (WorkItem.Flags & WT_EXECUTELONGFUNCTION) { - InterlockedDecrement(&ThreadPoolIOWorkerThreadsLongRequests); + _InterlockedDecrement(&ThreadPoolIOWorkerThreadsLongRequests); } } @@ -461,14 +461,14 @@ ASSERT(IoThread != NULL); - InterlockedIncrement(&ThreadPoolIOWorkerThreadsRequests); + _InterlockedIncrement(&ThreadPoolIOWorkerThreadsRequests); if (WorkItem->Flags & WT_EXECUTELONGFUNCTION) { /* We're about to queue a long function, mark the thread */ IoThread->Flags |= WT_EXECUTELONGFUNCTION; - InterlockedIncrement(&ThreadPoolIOWorkerThreadsLongRequests); + _InterlockedIncrement(&ThreadPoolIOWorkerThreadsLongRequests); } /* It's time to queue the work item */ @@ -480,11 +480,11 @@ if (!NT_SUCCESS(Status)) { DPRINT1("Failed to queue APC for work item 0x%p\n", WorkItem->Function); - InterlockedDecrement(&ThreadPoolIOWorkerThreadsRequests); + _InterlockedDecrement(&ThreadPoolIOWorkerThreadsRequests); if (WorkItem->Flags & WT_EXECUTELONGFUNCTION) { - InterlockedDecrement(&ThreadPoolIOWorkerThreadsLongRequests); + _InterlockedDecrement(&ThreadPoolIOWorkerThreadsLongRequests); } } @@ -543,7 +543,7 @@ BOOLEAN Terminate; NTSTATUS Status = STATUS_SUCCESS; - if (InterlockedIncrement(&ThreadPoolIOWorkerThreads) > MAX_WORKERTHREADS) + if (_InterlockedIncrement(&ThreadPoolIOWorkerThreads) > MAX_WORKERTHREADS) { /* Oops, too many worker threads... */ goto InitFailed; @@ -562,10 +562,10 @@ DPRINT1("Failed to create handle to own thread! Status: 0x%x\n", Status); InitFailed: - InterlockedDecrement(&ThreadPoolIOWorkerThreads); + _InterlockedDecrement(&ThreadPoolIOWorkerThreads); /* Signal initialization completion */ - InterlockedExchange((PLONG)Parameter, + _InterlockedExchange((PLONG)Parameter, 1); RtlExitUserThread(Status); @@ -579,8 +579,8 @@ (PLIST_ENTRY)&ThreadInfo.ListEntry); /* Signal initialization completion */ - InterlockedExchange((PLONG)Parameter, - 1); + _InterlockedExchange((PLONG)Parameter, + 1); for (;;) { @@ -626,7 +626,7 @@ if (Terminate) { /* Rundown the thread and unlink it from the list */ - InterlockedDecrement(&ThreadPoolIOWorkerThreads); + _InterlockedDecrement(&ThreadPoolIOWorkerThreads); RemoveEntryList((PLIST_ENTRY)&ThreadInfo.ListEntry); } @@ -663,11 +663,11 @@ PKNORMAL_ROUTINE ApcRoutine; NTSTATUS Status = STATUS_SUCCESS; - if (InterlockedIncrement(&ThreadPoolWorkerThreads) > MAX_WORKERTHREADS) + if (_InterlockedIncrement(&ThreadPoolWorkerThreads) > MAX_WORKERTHREADS) { /* Signal initialization completion */ - InterlockedExchange((PLONG)Parameter, - 1); + _InterlockedExchange((PLONG)Parameter, + 1); /* Oops, too many worker threads... */ RtlExitUserThread(Status); @@ -675,8 +675,8 @@ } /* Signal initialization completion */ - InterlockedExchange((PLONG)Parameter, - 1); + _InterlockedExchange((PLONG)Parameter, + 1); for (;;) { @@ -736,7 +736,7 @@ if (Terminate) { - InterlockedDecrement(&ThreadPoolWorkerThreads); + _InterlockedDecrement(&ThreadPoolWorkerThreads); Status = STATUS_SUCCESS; break; }

1 0

[janderwald] 25671: - Compile csrss with intrinsics - Remove the intrlck dependency
by janderwald＠svn.reactos.org 01 Feb '07

01 Feb '07

Author: janderwald Date: Fri Feb 2 00:44:23 2007 New Revision: 25671 URL: http://svn.reactos.org/svn/reactos?rev=25671&view=rev Log: - Compile csrss with intrinsics - Remove the intrlck dependency Modified: trunk/reactos/subsystems/win32/csrss/api/handle.c trunk/reactos/subsystems/win32/csrss/csrss.h trunk/reactos/subsystems/win32/csrss/csrss.rbuild Modified: trunk/reactos/subsystems/win32/csrss/api/handle.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/api… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/api/handle.c (original) +++ trunk/reactos/subsystems/win32/csrss/api/handle.c Fri Feb 2 00:44:23 2007 @@ -88,7 +88,7 @@ unsigned DefIndex; /* dec ref count */ - if (InterlockedDecrement(&Object->ReferenceCount) == 0) + if (_InterlockedDecrement(&Object->ReferenceCount) == 0) { Found = FALSE; for (DefIndex = 0; ! Found && DefIndex < ObjectDefinitionsCount; DefIndex++) @@ -166,13 +166,13 @@ RtlCopyMemory(Block, ProcessData->HandleTable, ProcessData->HandleTableSize * sizeof(HANDLE)); - Block = InterlockedExchangePointer(&ProcessData->HandleTable, Block); + Block = _InterlockedExchangePointer((volatile void*)&ProcessData->HandleTable, Block); RtlFreeHeap( CsrssApiHeap, 0, Block ); ProcessData->HandleTableSize += 64; } ProcessData->HandleTable[i] = Object; *Handle = (HANDLE)(((i + 1) << 2) | 0x3); - InterlockedIncrement( &Object->ReferenceCount ); + _InterlockedIncrement( &Object->ReferenceCount ); RtlLeaveCriticalSection(&ProcessData->HandleTableLock); return(STATUS_SUCCESS); } @@ -207,7 +207,7 @@ if (SourceProcessData->HandleTable[i]) { TargetProcessData->HandleTable[i] = SourceProcessData->HandleTable[i]; - InterlockedIncrement( &SourceProcessData->HandleTable[i]->ReferenceCount ); + _InterlockedIncrement( &SourceProcessData->HandleTable[i]->ReferenceCount ); } } RtlLeaveCriticalSection(&SourceProcessData->HandleTableLock); Modified: trunk/reactos/subsystems/win32/csrss/csrss.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrss.h (original) +++ trunk/reactos/subsystems/win32/csrss/csrss.h Fri Feb 2 00:44:23 2007 @@ -4,6 +4,8 @@ #include <windows.h> #define NTOS_MODE_USER #include <ndk/ntndk.h> + +#include <intrin.h> /* Build Number */ #include <reactos/buildno.h> Modified: trunk/reactos/subsystems/win32/csrss/csrss.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/csr… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/csrss.rbuild (original) +++ trunk/reactos/subsystems/win32/csrss/csrss.rbuild Fri Feb 2 00:44:23 2007 @@ -10,7 +10,6 @@ <define name="NTLPC" /> </if> <library>nt</library> - <library>intrlck</library> <library>ntdll</library> <library>smdll</library> <directory name="api">

1 0

[janderwald] 25670: - Fix typo in Italian translation by Daniele Forsi (dforsi at gmail dot com) - Fixes bug 2006 See issue #2006 for more details.
by janderwald＠svn.reactos.org 01 Feb '07

01 Feb '07

Author: janderwald Date: Thu Feb 1 23:04:32 2007 New Revision: 25670 URL: http://svn.reactos.org/svn/reactos?rev=25670&view=rev Log: - Fix typo in Italian translation by Daniele Forsi (dforsi at gmail dot com) - Fixes bug 2006 See issue #2006 for more details. Modified: trunk/reactos/dll/win32/setupapi/res/lang/It.rc Modified: trunk/reactos/dll/win32/setupapi/res/lang/It.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/setupapi/res/lan… ============================================================================== --- trunk/reactos/dll/win32/setupapi/res/lang/It.rc (original) +++ trunk/reactos/dll/win32/setupapi/res/lang/It.rc Thu Feb 1 23:04:32 2007 @@ -26,7 +26,7 @@ CAPTION "Copia dei file in corso..." FONT 8, "MS Shell Dlg" BEGIN - PUSHBUTTON "Anulla", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP + PUSHBUTTON "Annulla", IDCANCEL, 79, 84, 50, 14, WS_CHILD | WS_VISIBLE | WS_TABSTOP LTEXT "Origine:", -1, 7, 7, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "", SOURCESTRORD, 7, 18, 194, 11, WS_CHILD | WS_VISIBLE | WS_GROUP LTEXT "Destinazione:", -1, 7, 30, 77, 11, WS_CHILD | WS_VISIBLE | WS_GROUP

1 0

[ion] 25669: - Fix a bug in NtSetInformationThread which was causing 2nd-stage setup to freeze/crash. Fixes regression from 25631.
by ion＠svn.reactos.org 01 Feb '07

01 Feb '07

Author: ion Date: Thu Feb 1 22:25:04 2007 New Revision: 25669 URL: http://svn.reactos.org/svn/reactos?rev=25669&view=rev Log: - Fix a bug in NtSetInformationThread which was causing 2nd-stage setup to freeze/crash. Fixes regression from 25631. Modified: trunk/reactos/ntoskrnl/ps/query.c Modified: trunk/reactos/ntoskrnl/ps/query.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/query.c?rev=25… ============================================================================== --- trunk/reactos/ntoskrnl/ps/query.c (original) +++ trunk/reactos/ntoskrnl/ps/query.c Thu Feb 1 22:25:04 2007 @@ -730,6 +730,7 @@ PTEB Teb; ULONG TlsIndex = 0; PVOID *ExpansionSlots; + PETHREAD ProcThread; PAGED_CODE(); /* Verify Information Class validity */ @@ -1021,14 +1022,14 @@ Process = Thread->ThreadsProcess; /* Loop the threads */ - Thread = PsGetNextProcessThread(Process, NULL); - while (Thread) + ProcThread = PsGetNextProcessThread(Process, NULL); + while (ProcThread) { /* Acquire rundown */ - if (ExAcquireRundownProtection(&Thread->RundownProtect)) + if (ExAcquireRundownProtection(&ProcThread->RundownProtect)) { /* Get the TEB */ - Teb = Thread->Tcb.Teb; + Teb = ProcThread->Tcb.Teb; if (Teb) { /* Check if we're in the expansion range */ @@ -1054,11 +1055,11 @@ } /* Release rundown */ - ExReleaseRundownProtection(&Thread->RundownProtect); + ExReleaseRundownProtection(&ProcThread->RundownProtect); } /* Go to the next thread */ - Thread = PsGetNextProcessThread(Process, Thread); + ProcThread = PsGetNextProcessThread(Process, ProcThread); } /* All done */

1 0

[dgorbachev] 25668: Commit attachment #1151
by dgorbachev＠svn.reactos.org 01 Feb '07

01 Feb '07

Author: dgorbachev Date: Thu Feb 1 11:04:23 2007 New Revision: 25668 URL: http://svn.reactos.org/svn/reactos?rev=25668&view=rev Log: Commit attachment #1151 Modified: trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c Modified: trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inifi… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c (original) +++ trunk/reactos/boot/freeldr/freeldr/inifile/inifile.c Thu Feb 1 11:04:23 2007 @@ -104,12 +104,12 @@ DbgPrint((DPRINT_INIFILE, "IniReadSettingByNumber() Setting value = %s\n", SectionItem->ItemValue)); DbgPrint((DPRINT_INIFILE, "1 NameSize = %d ValueSize = %d\n", NameSize, ValueSize)); - RtlZeroMemory(SettingName, NameSize); - RtlZeroMemory(SettingValue, ValueSize); DbgPrint((DPRINT_INIFILE, "2 NameSize = %d ValueSize = %d\n", NameSize, ValueSize)); - strncpy(SettingName, SectionItem->ItemName, NameSize); + strncpy(SettingName, SectionItem->ItemName, NameSize - 1); + SettingName[NameSize - 1] = '\0'; DbgPrint((DPRINT_INIFILE, "3 NameSize = %d ValueSize = %d\n", NameSize, ValueSize)); - strncpy(SettingValue, SectionItem->ItemValue, ValueSize); + strncpy(SettingValue, SectionItem->ItemValue, ValueSize - 1); + SettingValue[ValueSize - 1] = '\0'; DbgPrint((DPRINT_INIFILE, "4 NameSize = %d ValueSize = %d\n", NameSize, ValueSize)); DbgDumpBuffer(DPRINT_INIFILE, SettingName, NameSize); DbgDumpBuffer(DPRINT_INIFILE, SettingValue, ValueSize); @@ -146,8 +146,8 @@ DbgPrint((DPRINT_INIFILE, "IniReadSettingByName() Setting \'%s\' found.\n", SettingName)); DbgPrint((DPRINT_INIFILE, "IniReadSettingByName() Setting value = %s\n", SectionItem->ItemValue)); - RtlZeroMemory(Buffer, BufferSize); - strncpy(Buffer, SectionItem->ItemValue, BufferSize); + strncpy(Buffer, SectionItem->ItemValue, BufferSize - 1); + Buffer[BufferSize - 1] = '\0'; return TRUE; }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2007