Ros-diffs June 2009

ros-diffs@reactos.org

21 participants
496 discussions

[ros-arm-bringup] 41528: - Initialize nonpaged pool expansion system PTEs (MiInitializeSystemPtes): - Just supports expansion space for now, not system space. - Very basic initialization of the accounting structures required. - Sets up the first two system PTE clusters for the space (the first contains the linkage, the second contains the sizage). - Called from MiInitializeArmPool.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Mon Jun 22 12:51:28 2009 New Revision: 41528 URL: http://svn.reactos.org/svn/reactos?rev=41528&view=rev Log: - Initialize nonpaged pool expansion system PTEs (MiInitializeSystemPtes): - Just supports expansion space for now, not system space. - Very basic initialization of the accounting structures required. - Sets up the first two system PTE clusters for the space (the first contains the linkage, the second contains the sizage). - Called from MiInitializeArmPool. Added: trunk/reactos/ntoskrnl/mm/ARM3/syspte.c (with props) Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/mm/ARM3/pool.c trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Mon Jun 22 12:51:28 2009 @@ -10,6 +10,13 @@ #define MI_MAX_INIT_NONPAGED_POOL_SIZE (128 * 1024 * 1024) #define MI_MAX_NONPAGED_POOL_SIZE (128 * 1024 * 1024) #define MI_MAX_FREE_PAGE_LISTS 4 + +typedef enum _MMSYSTEM_PTE_POOL_TYPE +{ + SystemPteSpace, + NonPagedPoolExpansion, + MaximumPtePoolTypes +} MMSYSTEM_PTE_POOL_TYPE; extern MMPTE HyperTemplatePte; @@ -24,4 +31,12 @@ VOID ); +VOID +NTAPI +MiInitializeSystemPtes( + IN PMMPTE StartingPte, + IN ULONG NumberOfPtes, + IN MMSYSTEM_PTE_POOL_TYPE PoolType +); + /* EOF */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Mon Jun 22 12:51:28 2009 @@ -120,6 +120,9 @@ // guard page on top so make sure to skip it. The bottom guard page will be // guaranteed by the fact our size is off by one. // + MiInitializeSystemPtes(PointerPte + 1, + MiExpansionPoolPagesInitialCharge, + NonPagedPoolExpansion); } /* EOF */ Added: trunk/reactos/ntoskrnl/mm/ARM3/syspte.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/syspte.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/syspte.c (added) +++ trunk/reactos/ntoskrnl/mm/ARM3/syspte.c [iso-8859-1] Mon Jun 22 12:51:28 2009 @@ -1,0 +1,76 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/mm/ARM3/syspte.c + * PURPOSE: ARM Memory Manager System PTE Allocator + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +#line 15 "ARMÂ³::SYSPTE" +#define MODULE_INVOLVED_IN_ARM3 +#include "../ARM3/miarm.h" + +/* GLOBALS ********************************************************************/ + +PMMPTE MmSystemPteBase; +PMMPTE MmSystemPtesStart[MaximumPtePoolTypes]; +PMMPTE MmSystemPtesEnd[MaximumPtePoolTypes]; +MMPTE MmFirstFreeSystemPte[MaximumPtePoolTypes]; +ULONG MmTotalFreeSystemPtes[MaximumPtePoolTypes]; + +/* PRIVATE FUNCTIONS **********************************************************/ + +VOID +NTAPI +MiInitializeSystemPtes(IN PMMPTE StartingPte, + IN ULONG NumberOfPtes, + IN MMSYSTEM_PTE_POOL_TYPE PoolType) +{ + // + // Sanity checks + // + ASSERT(NumberOfPtes >= 1); + ASSERT(PoolType == NonPagedPoolExpansion); + + // + // Set the starting and ending PTE addresses for this space + // + MmSystemPteBase = (PVOID)PAGETABLE_MAP; + MmSystemPtesStart[PoolType] = StartingPte; + MmSystemPtesEnd[PoolType] = StartingPte + NumberOfPtes - 1; + DPRINT1("System PTE space for %d starting at: %p and ending at: %p\n", + PoolType, MmSystemPtesStart[PoolType], MmSystemPtesEnd[PoolType]); + + // + // Clear all the PTEs to start with + // + RtlZeroMemory(StartingPte, NumberOfPtes * sizeof(MMPTE)); + + // + // Make the first entry free and link it + // + StartingPte->u.List.NextEntry = -1; + MmFirstFreeSystemPte[PoolType].u.Long = 0; + MmFirstFreeSystemPte[PoolType].u.List.NextEntry = StartingPte - + MmSystemPteBase; + + // + // The second entry stores the size of this PTE space + // + StartingPte++; + StartingPte->u.Long = 0; + StartingPte->u.List.NextEntry = NumberOfPtes; + + // + // We also keep a global for it + // + MmTotalFreeSystemPtes[PoolType] = NumberOfPtes; +} + +/* EOF */ Propchange: trunk/reactos/ntoskrnl/mm/ARM3/syspte.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/mm/ARM3/syspte.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Mon Jun 22 12:51:28 2009 @@ -362,6 +362,7 @@ <directory name="ARM3"> <file>init.c</file> <file>pool.c</file> + <file>syspte.c</file> </directory> <file>anonmem.c</file> <file>balance.c</file>

15 years, 4 months

[ros-arm-bringup] 41527: - Initialize the ARM pool (MiInitializeArmPool): - Do some additional accounting to keep track of initial nonpaged pool range and size. - Create and initialize the free page lists, and free page entries. - Validate that the initial nonpaged pool address space was properly mapped. - Validate that the expansion nonpaged pool address space is unmapped, and prepare to map it.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Mon Jun 22 12:22:41 2009 New Revision: 41527 URL: http://svn.reactos.org/svn/reactos?rev=41527&view=rev Log: - Initialize the ARM pool (MiInitializeArmPool): - Do some additional accounting to keep track of initial nonpaged pool range and size. - Create and initialize the free page lists, and free page entries. - Validate that the initial nonpaged pool address space was properly mapped. - Validate that the expansion nonpaged pool address space is unmapped, and prepare to map it. Added: trunk/reactos/ntoskrnl/mm/ARM3/pool.c (with props) Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c trunk/reactos/ntoskrnl/mm/ARM3/miarm.h trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild Modified: trunk/reactos/ntoskrnl/mm/ARM3/init.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/init.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/init.c [iso-8859-1] Mon Jun 22 12:22:41 2009 @@ -362,6 +362,11 @@ 0, BoundaryAddressMultiple); ASSERT(Status == STATUS_SUCCESS); + + // + // Now go ahead and initialize the ARM pool + // + MiInitializeArmPool(); } // Modified: trunk/reactos/ntoskrnl/mm/ARM3/miarm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/miarm.h?r… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/miarm.h [iso-8859-1] Mon Jun 22 12:22:41 2009 @@ -9,7 +9,19 @@ #define MI_MIN_PAGES_FOR_NONPAGED_POOL_TUNING ((255*1024*1024) >> PAGE_SHIFT) #define MI_MAX_INIT_NONPAGED_POOL_SIZE (128 * 1024 * 1024) #define MI_MAX_NONPAGED_POOL_SIZE (128 * 1024 * 1024) +#define MI_MAX_FREE_PAGE_LISTS 4 extern MMPTE HyperTemplatePte; +extern ULONG MmSizeOfNonPagedPoolInBytes; +extern ULONG MmMaximumNonPagedPoolInBytes; +extern PVOID MmNonPagedPoolStart; +extern PVOID MmNonPagedPoolExpansionStart; + +VOID +NTAPI +MiInitializeArmPool( + VOID +); + /* EOF */ Added: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c (added) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Mon Jun 22 12:22:41 2009 @@ -1,0 +1,125 @@ +/* + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/mm/ARM3/pool.c + * PURPOSE: ARM Memory Manager Pool Allocator + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +/* INCLUDES *******************************************************************/ + +#include <ntoskrnl.h> +#define NDEBUG +#include <debug.h> + +#line 15 "ARMÂ³::POOL" +#define MODULE_INVOLVED_IN_ARM3 +#include "../ARM3/miarm.h" + +/* GLOBALS ********************************************************************/ + +LIST_ENTRY MmNonPagedPoolFreeListHead[MI_MAX_FREE_PAGE_LISTS]; +PFN_NUMBER MmNumberOfFreeNonPagedPool, MiExpansionPoolPagesInitialCharge; +PVOID MmNonPagedPoolEnd0; +PFN_NUMBER MiStartOfInitialPoolFrame, MiEndOfInitialPoolFrame; + +/* PRIVATE FUNCTIONS **********************************************************/ + +VOID +NTAPI +MiInitializeArmPool(VOID) +{ + ULONG i; + PFN_NUMBER PoolPages; + PMMFREE_POOL_ENTRY FreeEntry, FirstEntry; + PMMPTE PointerPte; + PAGED_CODE(); + + // + // We keep 4 lists of free pages (4 lists help avoid contention) + // + for (i = 0; i < MI_MAX_FREE_PAGE_LISTS; i++) + { + // + // Initialize each of them + // + InitializeListHead(&MmNonPagedPoolFreeListHead[i]); + } + + // + // Calculate how many pages the initial nonpaged pool has + // + PoolPages = BYTES_TO_PAGES(MmSizeOfNonPagedPoolInBytes); + MmNumberOfFreeNonPagedPool = PoolPages; + + // + // Initialize the first free entry + // + FreeEntry = MmNonPagedPoolStart; + FirstEntry = FreeEntry; + FreeEntry->Size = PoolPages; + FreeEntry->Owner = FirstEntry; + + // + // Insert it into the last list + // + InsertHeadList(&MmNonPagedPoolFreeListHead[MI_MAX_FREE_PAGE_LISTS - 1], + &FreeEntry->List); + + // + // Now create free entries for every single other page + // + while (PoolPages-- > 1) + { + // + // Link them all back to the original entry + // + FreeEntry = (PMMFREE_POOL_ENTRY)((ULONG_PTR)FreeEntry + PAGE_SIZE); + FreeEntry->Owner = FirstEntry; + } + + // + // Validate and remember first allocated pool page + // + PointerPte = MiAddressToPte(MmNonPagedPoolStart); + ASSERT(PointerPte->u.Hard.Valid == 1); + MiStartOfInitialPoolFrame = PFN_FROM_PTE(PointerPte); + + // + // Keep track of where initial nonpaged pool ends + // + MmNonPagedPoolEnd0 = (PVOID)((ULONG_PTR)MmNonPagedPoolStart + + MmSizeOfNonPagedPoolInBytes); + + // + // Validate and remember last allocated pool page + // + PointerPte = MiAddressToPte((PVOID)((ULONG_PTR)MmNonPagedPoolEnd0 - 1)); + ASSERT(PointerPte->u.Hard.Valid == 1); + MiEndOfInitialPoolFrame = PFN_FROM_PTE(PointerPte); + + // + // Validate the first nonpaged pool expansion page (which is a guard page) + // + PointerPte = MiAddressToPte(MmNonPagedPoolExpansionStart); + ASSERT(PointerPte->u.Hard.Valid == 0); + + // + // Calculate the size of the expansion region alone + // + MiExpansionPoolPagesInitialCharge = + BYTES_TO_PAGES(MmMaximumNonPagedPoolInBytes - MmSizeOfNonPagedPoolInBytes); + + // + // Remove 2 pages, since there's a guard page on top and on the bottom + // + MiExpansionPoolPagesInitialCharge -= 2; + + // + // Now initialize the nonpaged pool expansion PTE space. Remember there's a + // guard page on top so make sure to skip it. The bottom guard page will be + // guaranteed by the fact our size is off by one. + // +} + +/* EOF */ Propchange: trunk/reactos/ntoskrnl/mm/ARM3/pool.c ------------------------------------------------------------------------------ svn:eol-style = native Propchange: trunk/reactos/ntoskrnl/mm/ARM3/pool.c ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl-generic.… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl-generic.rbuild [iso-8859-1] Mon Jun 22 12:22:41 2009 @@ -361,6 +361,7 @@ </if> <directory name="ARM3"> <file>init.c</file> + <file>pool.c</file> </directory> <file>anonmem.c</file> <file>balance.c</file>

15 years, 4 months

[cgutman] 41526: - Revert wininet back to pre-41059 - Fixes random corruption of downloads

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Jun 22 10:45:21 2009 New Revision: 41526 URL: http://svn.reactos.org/svn/reactos?rev=41526&view=rev Log: - Revert wininet back to pre-41059 - Fixes random corruption of downloads Modified: trunk/reactos/dll/win32/wininet/cookie.c trunk/reactos/dll/win32/wininet/dialogs.c trunk/reactos/dll/win32/wininet/ftp.c trunk/reactos/dll/win32/wininet/http.c trunk/reactos/dll/win32/wininet/internet.c trunk/reactos/dll/win32/wininet/internet.h trunk/reactos/dll/win32/wininet/netconnection.c trunk/reactos/dll/win32/wininet/urlcache.c trunk/reactos/dll/win32/wininet/utility.c trunk/reactos/dll/win32/wininet/wininet.rbuild trunk/reactos/dll/win32/wininet/wininet.spec [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/wininet/cookie.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/cookie.c… Modified: trunk/reactos/dll/win32/wininet/dialogs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/dialogs.… Modified: trunk/reactos/dll/win32/wininet/ftp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/ftp.c?re… Modified: trunk/reactos/dll/win32/wininet/http.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/http.c?r… Modified: trunk/reactos/dll/win32/wininet/internet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… Modified: trunk/reactos/dll/win32/wininet/internet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/internet… Modified: trunk/reactos/dll/win32/wininet/netconnection.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/netconne… Modified: trunk/reactos/dll/win32/wininet/urlcache.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/urlcache… Modified: trunk/reactos/dll/win32/wininet/utility.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/utility.… Modified: trunk/reactos/dll/win32/wininet/wininet.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet.… Modified: trunk/reactos/dll/win32/wininet/wininet.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/wininet/wininet.…

15 years, 4 months

[ros-arm-bringup] 41524: - The SVN pre-commit hook is broken: /srv/svn/reactos/hooks/commit-eol-style-check.pl: `/usr/bin/svnlook proplist /srv/svn/reactos -t 41523-w6z --verbose trunk/reactos/ntoskrnl/mm/ARM?\194?\179/init.c' failed with this output: svnlook: Path 'trunk/reactos/ntoskrnl/mm/ARM?\194?\179/init.c' does not exist.

by ros-arm-bringup＠svn.reactos.org

Author: ros-arm-bringup Date: Mon Jun 22 10:13:23 2009 New Revision: 41524 URL: http://svn.reactos.org/svn/reactos?rev=41524&view=rev Log: - The SVN pre-commit hook is broken: /srv/svn/reactos/hooks/commit-eol-style-check.pl: `/usr/bin/svnlook proplist /srv/svn/reactos -t 41523-w6z --verbose trunk/reactos/ntoskrnl/mm/ARM?\194?\179/init.c' failed with this output: svnlook: Path 'trunk/reactos/ntoskrnl/mm/ARM?\194?\179/init.c' does not exist. Added: trunk/reactos/ntoskrnl/mm/ARM3/ - copied from r41523, trunk/reactos/ntoskrnl/mm/ARM³/ Removed: trunk/reactos/ntoskrnl/mm/ARM³/

15 years, 4 months

[cgutman] 41522: - Fix a bug that caused translations of NdisParameterInteger values into unicode strings to produce bad results - Fix a bug that caused NdisParameterMultiString values to be written to the registry incorrectly

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Jun 22 05:10:58 2009 New Revision: 41522 URL: http://svn.reactos.org/svn/reactos?rev=41522&view=rev Log: - Fix a bug that caused translations of NdisParameterInteger values into unicode strings to produce bad results - Fix a bug that caused NdisParameterMultiString values to be written to the registry incorrectly Modified: trunk/reactos/drivers/network/ndis/ndis/config.c Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Mon Jun 22 05:10:58 2009 @@ -63,7 +63,7 @@ * I don't know why tho so i free everything before return. comments welcome. */ { - ULONG ParameterType = ParameterValue->ParameterType; + ULONG ParameterType; ULONG DataSize; PVOID Data; WCHAR Buff[25]; @@ -71,7 +71,7 @@ NDIS_DbgPrint(MAX_TRACE, ("Called.\n")); /* reset parameter type to standard reg types */ - switch(ParameterType) + switch(ParameterValue->ParameterType) { case NdisParameterHexInteger: case NdisParameterInteger: @@ -85,7 +85,7 @@ ParameterType = REG_SZ; if (!NT_SUCCESS(RtlIntegerToUnicodeString( ParameterValue->ParameterData.IntegerData, - (ParameterType == NdisParameterInteger) ? 10 : 16, &Str))) + (ParameterValue->ParameterType == NdisParameterInteger) ? 10 : 16, &Str))) { *Status = NDIS_STATUS_FAILURE; return; @@ -96,7 +96,7 @@ break; case NdisParameterString: case NdisParameterMultiString: - ParameterType = REG_SZ; + ParameterType = (ParameterValue->ParameterType == NdisParameterString) ? REG_SZ : REG_MULTI_SZ; Data = ParameterValue->ParameterData.StringData.Buffer; DataSize = ParameterValue->ParameterData.StringData.Length; break;

15 years, 4 months

[cgutman] 41521: - Partial rewrite of NdisReadConfiguration - It now determines the parameter type based on the key instead of the ParameterType passed by the caller (documented on MSDN) - It also always sets (*ParameterValue)->ParameterType to NdisParameterInteger when reading an integer or hex integer value (documented on MSDN) - This will fix miniport drivers that supply a bogus ParameterType value because it is ignored by NDIS on NT

by cgutman＠svn.reactos.org

Author: cgutman Date: Mon Jun 22 04:49:06 2009 New Revision: 41521 URL: http://svn.reactos.org/svn/reactos?rev=41521&view=rev Log: - Partial rewrite of NdisReadConfiguration - It now determines the parameter type based on the key instead of the ParameterType passed by the caller (documented on MSDN) - It also always sets (*ParameterValue)->ParameterType to NdisParameterInteger when reading an integer or hex integer value (documented on MSDN) - This will fix miniport drivers that supply a bogus ParameterType value because it is ignored by NDIS on NT Modified: trunk/reactos/drivers/network/ndis/ndis/config.c Modified: trunk/reactos/drivers/network/ndis/ndis/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/ndis/ndis/… ============================================================================== --- trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/ndis/ndis/config.c [iso-8859-1] Mon Jun 22 04:49:06 2009 @@ -323,21 +323,10 @@ ULONG KeyDataLength; PMINIPORT_RESOURCE MiniportResource; PMINIPORT_CONFIGURATION_CONTEXT ConfigurationContext = (PMINIPORT_CONFIGURATION_CONTEXT)ConfigurationHandle; + PVOID Buffer; *ParameterValue = NULL; *Status = NDIS_STATUS_FAILURE; - - if(ParameterType != NdisParameterInteger && - ParameterType != NdisParameterHexInteger && - ParameterType != NdisParameterString && - ParameterType != NdisParameterMultiString && - ParameterType != NdisParameterBinary - ) - { - NDIS_DbgPrint(MIN_TRACE,("unsupported parameter type\n")); - *Status = NDIS_STATUS_NOT_SUPPORTED; - return; - } NDIS_DbgPrint(MAX_TRACE,("requested read of %wZ\n", Keyword)); @@ -498,152 +487,105 @@ return; } - switch(ParameterType) - { - case NdisParameterInteger: - case NdisParameterHexInteger: + *ParameterValue = ExAllocatePool(PagedPool, sizeof(NDIS_CONFIGURATION_PARAMETER)); + if (!*ParameterValue) + { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + ExFreePool(MiniportResource); + ExFreePool(KeyInformation); + *Status = NDIS_STATUS_RESOURCES; + return; + } + + RtlZeroMemory(*ParameterValue, sizeof(NDIS_CONFIGURATION_PARAMETER)); + + if (KeyInformation->Type == REG_BINARY) + { + NDIS_DbgPrint(MAX_TRACE, ("NdisParameterBinary\n")); + + (*ParameterValue)->ParameterType = NdisParameterBinary; + + Buffer = ExAllocatePool(NonPagedPool, KeyInformation->DataLength); + if (!Buffer) { - UNICODE_STRING str; - - *ParameterValue = ExAllocatePool(PagedPool, sizeof(NDIS_CONFIGURATION_PARAMETER)); - if(!*ParameterValue) - { - NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); - ExFreePool(KeyInformation); - *Status = NDIS_STATUS_RESOURCES; - return; - } - - str.Length = str.MaximumLength = (USHORT)KeyInformation->DataLength; - str.Buffer = (PWCHAR)KeyInformation->Data; - - (*ParameterValue)->ParameterType = ParameterType; - - /* - If ParameterType is NdisParameterInteger then the base of str is decimal. - If ParameterType is NdisParameterHexInteger then the base of str is hexadecimal. - */ - if (ParameterType == NdisParameterInteger) - *Status = RtlUnicodeStringToInteger(&str, 10, &(*ParameterValue)->ParameterData.IntegerData); - else if (ParameterType == NdisParameterHexInteger) - *Status = RtlUnicodeStringToInteger(&str, 16, &(*ParameterValue)->ParameterData.IntegerData); - - + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + ExFreePool(MiniportResource); ExFreePool(KeyInformation); - - if(*Status != STATUS_SUCCESS) { - ExFreePool(*ParameterValue); - *ParameterValue = NULL; - *Status = NDIS_STATUS_FAILURE; - return; - } - - MiniportResource->ResourceType = 0; - MiniportResource->Resource = *ParameterValue; - NDIS_DbgPrint(MID_TRACE,("inserting 0x%x into the resource list\n", MiniportResource->Resource)); - ExInterlockedInsertTailList(&ConfigurationContext->ResourceListHead, &MiniportResource->ListEntry, &ConfigurationContext->ResourceLock); - - *Status = NDIS_STATUS_SUCCESS; - + *Status = NDIS_STATUS_RESOURCES; return; } - case NdisParameterString: - case NdisParameterMultiString: + RtlCopyMemory(Buffer, KeyInformation->Data, KeyInformation->DataLength); + + (*ParameterValue)->ParameterData.BinaryData.Buffer = Buffer; + (*ParameterValue)->ParameterData.BinaryData.Length = KeyInformation->DataLength; + } + else if (KeyInformation->Type == REG_MULTI_SZ) + { + NDIS_DbgPrint(MAX_TRACE, ("NdisParameterMultiString\n")); + + (*ParameterValue)->ParameterType = NdisParameterMultiString; + + Buffer = ExAllocatePool(NonPagedPool, KeyInformation->DataLength); + if (!Buffer) { - PWCHAR RegData = 0; - - if(KeyInformation->Type != REG_SZ && KeyInformation->Type != REG_MULTI_SZ) - { - NDIS_DbgPrint(MIN_TRACE,("requested type does not match actual value type\n")); - ExFreePool(KeyInformation); - *ParameterValue = NULL; - *Status = NDIS_STATUS_FAILURE; - return; - } - - *ParameterValue = ExAllocatePool(PagedPool, sizeof(NDIS_CONFIGURATION_PARAMETER)); - if(!*ParameterValue) - { - NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); - ExFreePool(KeyInformation); - *Status = NDIS_STATUS_RESOURCES; - return; - } - - RegData = ExAllocatePool(PagedPool, KeyInformation->DataLength); - if(!RegData) - { - NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); - ExFreePool(KeyInformation); - ExFreePool(*ParameterValue); - *ParameterValue = NULL; - *Status = NDIS_STATUS_FAILURE; - return; - } - - MiniportResource->ResourceType = 0; - MiniportResource->Resource = *ParameterValue; - NDIS_DbgPrint(MID_TRACE,("inserting 0x%x into the resource list\n", MiniportResource->Resource)); - ExInterlockedInsertTailList(&ConfigurationContext->ResourceListHead, &MiniportResource->ListEntry, &ConfigurationContext->ResourceLock); - - memcpy(RegData, KeyInformation->Data, KeyInformation->DataLength); - - (*ParameterValue)->ParameterType = ParameterType; - (*ParameterValue)->ParameterData.StringData.Length = (USHORT)KeyInformation->DataLength; - (*ParameterValue)->ParameterData.StringData.Buffer = RegData; - + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + ExFreePool(MiniportResource); ExFreePool(KeyInformation); - - *Status = NDIS_STATUS_SUCCESS; - + *Status = NDIS_STATUS_RESOURCES; return; } - case NdisParameterBinary: - { - if(KeyInformation->Type != REG_BINARY) - { - NDIS_DbgPrint(MIN_TRACE,("requested type does not match actual value type\n")); - *Status = NDIS_STATUS_FAILURE; - ExFreePool(KeyInformation); - return; - } - - *ParameterValue = ExAllocatePool(PagedPool, sizeof(NDIS_CONFIGURATION_PARAMETER) + KeyInformation->DataLength); - if(!*ParameterValue) - { - NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); - ExFreePool(KeyInformation); - *Status = NDIS_STATUS_RESOURCES; - return; - } - - (*ParameterValue)->ParameterData.BinaryData.Buffer = ExAllocatePool(PagedPool, KeyInformation->DataLength); - if (!(*ParameterValue)->ParameterData.BinaryData.Buffer) - { - NDIS_DbgPrint(MIN_TRACE,("Insufficient resources.\n")); - ExFreePool(KeyInformation); - *Status = NDIS_STATUS_RESOURCES; - return; - } - - (*ParameterValue)->ParameterType = ParameterType; - (*ParameterValue)->ParameterData.BinaryData.Length = KeyInformation->DataLength; - memcpy((*ParameterValue)->ParameterData.BinaryData.Buffer, KeyInformation->Data, KeyInformation->DataLength); - - MiniportResource->ResourceType = 0; - MiniportResource->Resource = *ParameterValue; - NDIS_DbgPrint(MID_TRACE,("inserting 0x%x into the resource list\n", MiniportResource->Resource)); - ExInterlockedInsertTailList(&ConfigurationContext->ResourceListHead, &MiniportResource->ListEntry, &ConfigurationContext->ResourceLock); - - ExFreePool(KeyInformation); - - *Status = NDIS_STATUS_SUCCESS; - - return; - } - } + RtlCopyMemory(Buffer, KeyInformation->Data, KeyInformation->DataLength); + + (*ParameterValue)->ParameterData.StringData.Buffer = Buffer; + (*ParameterValue)->ParameterData.StringData.Length = KeyInformation->DataLength; + } + else + { + UNICODE_STRING str; + + str.Length = str.MaximumLength = (USHORT)KeyInformation->DataLength; + str.Buffer = (PWCHAR)KeyInformation->Data; + + if ((*Status = RtlUnicodeStringToInteger(&str, 0, + &(*ParameterValue)->ParameterData.IntegerData)) == STATUS_SUCCESS) + { + NDIS_DbgPrint(MAX_TRACE, ("NdisParameterInteger\n")); + + (*ParameterValue)->ParameterType = NdisParameterInteger; + } + else + { + NDIS_DbgPrint(MAX_TRACE, ("NdisParameterString\n")); + + (*ParameterValue)->ParameterType = NdisParameterString; + + Buffer = ExAllocatePool(NonPagedPool, KeyInformation->DataLength); + if (!Buffer) + { + NDIS_DbgPrint(MIN_TRACE, ("Insufficient resources.\n")); + ExFreePool(MiniportResource); + ExFreePool(KeyInformation); + *Status = NDIS_STATUS_RESOURCES; + return; + } + + RtlCopyMemory(Buffer, KeyInformation->Data, KeyInformation->DataLength); + + (*ParameterValue)->ParameterData.StringData.Buffer = Buffer; + (*ParameterValue)->ParameterData.StringData.Length = KeyInformation->DataLength; + } + } + + MiniportResource->ResourceType = MINIPORT_RESOURCE_TYPE_MEMORY; + MiniportResource->Resource = *ParameterValue; + + ExInterlockedInsertTailList(&ConfigurationContext->ResourceListHead, &MiniportResource->ListEntry, &ConfigurationContext->ResourceLock); + + ExFreePool(KeyInformation); + + *Status = NDIS_STATUS_SUCCESS; }

15 years, 4 months

[hyperion] 41520: Move gcc -g and -Wall options out of rbuild and into .rbuild files Move non-architecture-specific msc options to ReactOS-generic.rbuild

by hyperion＠svn.reactos.org

Author: hyperion Date: Mon Jun 22 02:13:28 2009 New Revision: 41520 URL: http://svn.reactos.org/svn/reactos?rev=41520&view=rev Log: Move gcc -g and -Wall options out of rbuild and into .rbuild files Move non-architecture-specific msc options to ReactOS-generic.rbuild Modified: trunk/reactos/ReactOS-arm.rbuild trunk/reactos/ReactOS-generic.rbuild trunk/reactos/ReactOS-i386.rbuild trunk/reactos/ReactOS-ppc.rbuild trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp Modified: trunk/reactos/ReactOS-arm.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-arm.rbuild?rev=415… ============================================================================== --- trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-arm.rbuild [iso-8859-1] Mon Jun 22 02:13:28 2009 @@ -13,6 +13,9 @@ <define name="_ARM_" /> <define name="__arm__" /> <define name="TARGET_arm" host="true" /> + + <compilerflag compiler="cc,cxx">-gstabs+</compilerflag> + <compilerflag compiler="as">-gstabs+</compilerflag> <if property="DBG" value="1"> <define name="DBG">1</define> Modified: trunk/reactos/ReactOS-generic.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-generic.rbuild?rev… ============================================================================== --- trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-generic.rbuild [iso-8859-1] Mon Jun 22 02:13:28 2009 @@ -126,7 +126,14 @@ <xi:include href="tools/tools.rbuild" /> </directory> - <compilerflag compiler="cxx" compilerset="gcc">-Wno-non-virtual-dtor</compilerflag> + <group compilerset="gcc"> + <compilerflag>-Wall</compilerflag> + <compilerflag compiler="cxx">-Wno-non-virtual-dtor</compilerflag> + </group> - <compilerflag compilerset="msc">/wd4711</compilerflag> + <group compilerset="msc"> + <compilerflag>/Zl</compilerflag> + <compilerflag>/Zi</compilerflag> + <compilerflag>/W1</compilerflag> + </group> </group> Modified: trunk/reactos/ReactOS-i386.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-i386.rbuild?rev=41… ============================================================================== --- trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-i386.rbuild [iso-8859-1] Mon Jun 22 02:13:28 2009 @@ -43,6 +43,8 @@ <compilerflag>-Wno-strict-aliasing</compilerflag> <compilerflag>-Wpointer-arith</compilerflag> <compilerflag>-Wno-multichar</compilerflag> + + <compilerflag>-gstabs+</compilerflag>  </group> @@ -70,10 +72,9 @@ </if> <compilerflag>/GS-</compilerflag> - <compilerflag>/Zl</compilerflag> - <compilerflag>/Zi</compilerflag> - <compilerflag>/Wall</compilerflag> </group> + + <compilerflag compiler="as">-gstabs+</compilerflag> <group linkerset="ld"> <linkerflag>-disable-stdcall-fixup</linkerflag> Modified: trunk/reactos/ReactOS-ppc.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ReactOS-ppc.rbuild?rev=415… ============================================================================== --- trunk/reactos/ReactOS-ppc.rbuild [iso-8859-1] (original) +++ trunk/reactos/ReactOS-ppc.rbuild [iso-8859-1] Mon Jun 22 02:13:28 2009 @@ -20,4 +20,6 @@ <compilerflag>-meabi</compilerflag> <compilerflag>-O2</compilerflag> <compilerflag>-Wno-strict-aliasing</compilerflag> + <compilerflag compiler="cc,cxx">-gstabs+</compilerflag> + <compilerflag compiler="as">-gstabs+</compilerflag> </project> Modified: trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/mingw… ============================================================================== --- trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/mingw/mingw.cpp [iso-8859-1] Mon Jun 22 02:13:28 2009 @@ -455,8 +455,6 @@ if ( ProjectNode.configuration.Compiler == GnuGcc ) { - fprintf ( fMakefile, "PROJECT_CFLAGS += -Wall\n" ); - fprintf ( fMakefile, "PROJECT_CXXFLAGS += -Wall\n" ); fprintf ( fMakefile, "ifneq ($(OARCH),)\n" ); fprintf ( fMakefile, "PROJECT_CFLAGS += -march=$(OARCH)\n" ); fprintf ( fMakefile, "PROJECT_CXXFLAGS += -march=$(OARCH)\n" ); @@ -465,10 +463,6 @@ fprintf ( fMakefile, "PROJECT_CFLAGS += -mtune=$(TUNE)\n" ); fprintf ( fMakefile, "PROJECT_CXXFLAGS += -mtune=$(TUNE)\n" ); fprintf ( fMakefile, "endif\n" ); - - fprintf ( fMakefile, "PROJECT_CFLAGS += -g%s\n", Environment::GetArch() == "amd64" ? "dwarf-2" : "stabs+" ); - fprintf ( fMakefile, "PROJECT_CXXFLAGS += -g%s\n", Environment::GetArch() == "amd64" ? "dwarf-2" : "stabs+" ); - fprintf ( fMakefile, "PROJECT_ASFLAGS += -g%s\n", Environment::GetArch() == "amd64" ? "dwarf-2" : "stabs+" ); if ( usePipe ) {

15 years, 4 months

[hyperion] 41519: Compilers other than GCC deserve offsetof, don't they?

by hyperion＠svn.reactos.org

Author: hyperion Date: Mon Jun 22 01:40:37 2009 New Revision: 41519 URL: http://svn.reactos.org/svn/reactos?rev=41519&view=rev Log: Compilers other than GCC deserve offsetof, don't they? Modified: trunk/reactos/include/crt/stddef.h Modified: trunk/reactos/include/crt/stddef.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/crt/stddef.h?rev=4… ============================================================================== --- trunk/reactos/include/crt/stddef.h [iso-8859-1] (original) +++ trunk/reactos/include/crt/stddef.h [iso-8859-1] Mon Jun 22 01:40:37 2009 @@ -287,7 +287,7 @@ symbols in the _FOO_T_ family, stays defined even after its corresponding type is defined). If we define wchar_t, then we must undef _WCHAR_T_; for BSD/386 1.1 (and perhaps others), if - we undef _WCHAR_T_, then we must also define rune_t, since + we undef _WCHAR_T_, then we must also define rune_t, since headers like runetype.h assume that if machine/ansi.h is included, and _BSD_WCHAR_T_ is not defined, then rune_t is available. machine/ansi.h says, "Note that _WCHAR_T_ and _RUNE_T_ must be of @@ -390,7 +390,11 @@ #ifndef offsetof /* Offset of member MEMBER in a struct of type TYPE. */ +#if defined(__GNUC__) #define offsetof(TYPE, MEMBER) __builtin_offsetof (TYPE, MEMBER) +#else +#define offsetof(TYPE, MEMBER) ((size_t)&(((TYPE *)0)->MEMBER)) +#endif #endif /* !offsetof */

15 years, 4 months

[hyperion] 41518: Don't change an std::set in the loop that enumerates it. Patch by Daniel Zimmermann <netzimme@aim.com> See issue #3128 for more details.

by hyperion＠svn.reactos.org

Author: hyperion Date: Mon Jun 22 01:37:47 2009 New Revision: 41518 URL: http://svn.reactos.org/svn/reactos?rev=41518&view=rev Log: Don't change an std::set in the loop that enumerates it. Patch by Daniel Zimmermann <netzimme(a)aim.com> See issue #3128 for more details. Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp Modified: trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/rbuild/backend/msvc/… ============================================================================== --- trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp [iso-8859-1] (original) +++ trunk/reactos/tools/rbuild/backend/msvc/vcprojmaker.cpp [iso-8859-1] Mon Jun 22 01:37:47 2009 @@ -400,11 +400,7 @@ fprintf ( OUT, ";" ); string unescaped = *it1; - defines.erase(unescaped); - const string& escaped = _replace_str(unescaped, "\"",""); - - defines.insert(escaped); - fprintf ( OUT, "%s", escaped.c_str() ); + fprintf ( OUT, "%s", _replace_str(unescaped, "\"","").c_str() ); } fprintf ( OUT, "\"\r\n" ); fprintf ( OUT, "\t\t\t\tForcedIncludeFiles=\"%s\"\r\n", "warning.h");

15 years, 4 months

[janderwald] 41517: - Fix a buffer overrun

by janderwald＠svn.reactos.org

Author: janderwald Date: Mon Jun 22 01:35:40 2009 New Revision: 41517 URL: http://svn.reactos.org/svn/reactos?rev=41517&view=rev Log: - Fix a buffer overrun Modified: trunk/reactos/drivers/ksfilter/ks/irp.c Modified: trunk/reactos/drivers/ksfilter/ks/irp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/ksfilter/ks/irp.c?… ============================================================================== --- trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] (original) +++ trunk/reactos/drivers/ksfilter/ks/irp.c [iso-8859-1] Mon Jun 22 01:35:40 2009 @@ -775,9 +775,9 @@ if (IoStack->FileObject->FileName.Buffer[0] != L'{') { RtlMoveMemory(IoStack->FileObject->FileName.Buffer, &IoStack->FileObject->FileName.Buffer[Length+1], - IoStack->FileObject->FileName.Length - Length * sizeof(WCHAR)); - - IoStack->FileObject->FileName.Length -= Length * sizeof(WCHAR); + IoStack->FileObject->FileName.Length - (Length + 1) * sizeof(WCHAR)); + + IoStack->FileObject->FileName.Length -= (Length + 1)* sizeof(WCHAR); }

15 years, 4 months

← Newer
1
...
17
18
19
20
21
22
23
...
50
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs June 2009