ReactOS.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
List overview
Download
Ros-diffs
August 2008
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
ros-diffs@reactos.org
27 participants
853 discussions
Start a n
N
ew thread
[hpoussin] 35835: Check if tags match in ExFreePoolWithTag Check if provided tag is valid in ExAllocatePoolWithTag Add lots of BugCheck(BAD_POOL_CALLER)
by hpoussin@svn.reactos.org
Author: hpoussin Date: Sun Aug 31 10:52:56 2008 New Revision: 35835 URL:
http://svn.reactos.org/svn/reactos?rev=35835&view=rev
Log: Check if tags match in ExFreePoolWithTag Check if provided tag is valid in ExAllocatePoolWithTag Add lots of BugCheck(BAD_POOL_CALLER) Modified: trunk/reactos/ntoskrnl/mm/npool.c trunk/reactos/ntoskrnl/mm/pool.c trunk/reactos/ntoskrnl/mm/ppool.c Modified: trunk/reactos/ntoskrnl/mm/npool.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/npool.c?rev=35…
============================================================================== --- trunk/reactos/ntoskrnl/mm/npool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/npool.c [iso-8859-1] Sun Aug 31 10:52:56 2008 @@ -1556,14 +1556,12 @@ { if (blk->hdr.Magic == BLOCK_HDR_FREE_MAGIC) { - DbgPrint("ExFreePool of already freed address %x\n", block); + KeBugCheckEx(BAD_POOL_CALLER, 0x07, 0, (ULONG_PTR)blk, (ULONG_PTR)block); } else { - DbgPrint("ExFreePool of non-allocated address %x (magic %x)\n", - block, blk->hdr.Magic); - } - ASSERT(FALSE); + KeBugCheckEx(BAD_POOL_CALLER, 0x46, (ULONG_PTR)block, 0, 0); + } return; } @@ -1682,6 +1680,12 @@ block = (PVOID)((ULONG_PTR)best + HDR_USED_SIZE); /* RtlZeroMemory(block, Size);*/ return(block); +} + +ULONG NTAPI +EiGetNonPagedPoolTag(PVOID Block) +{ + return ((HDR_USED*)((ULONG_PTR)Block - HDR_USED_SIZE))->Tag; } VOID Modified: trunk/reactos/ntoskrnl/mm/pool.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/pool.c?rev=358…
============================================================================== --- trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/pool.c [iso-8859-1] Sun Aug 31 10:52:56 2008 @@ -21,6 +21,12 @@ /* FUNCTIONS ***************************************************************/ +ULONG NTAPI +EiGetPagedPoolTag(IN PVOID Block); + +ULONG NTAPI +EiGetNonPagedPoolTag(IN PVOID Block); + static PVOID STDCALL EiAllocatePool(POOL_TYPE PoolType, ULONG NumberOfBytes, @@ -28,22 +34,39 @@ PVOID Caller) { PVOID Block; - - /* FIXME: Handle SESSION_POOL_MASK, VERIFIER_POOL_MASK, QUOTA_POOL_MASK */ - if (PoolType & PAGED_POOL_MASK) - { - Block = ExAllocatePagedPoolWithTag(PoolType,NumberOfBytes,Tag); - } - else - { - Block = ExAllocateNonPagedPoolWithTag(PoolType,NumberOfBytes,Tag,Caller); - } - - if ((PoolType & MUST_SUCCEED_POOL_MASK) && Block==NULL) - { - KeBugCheck(MUST_SUCCEED_POOL_EMPTY); - } - return(Block); + PCHAR TagChars = (PCHAR)&Tag; + + if (NumberOfBytes == 0) + KeBugCheckEx(BAD_POOL_CALLER, 0x00, 0, PoolType, Tag); + if (Tag == 0) + KeBugCheckEx(BAD_POOL_CALLER, 0x9b, PoolType, NumberOfBytes, (ULONG_PTR)Caller); + if (Tag == TAG('B','I','G',0)) + KeBugCheckEx(BAD_POOL_CALLER, 0x9c, PoolType, NumberOfBytes, (ULONG_PTR)Caller); + +#define IS_LETTER_OR_DIGIT(c) (((c) >= 'a' && (c) <= 'z') || ((c) >= 'A' && (c) <= 'Z') || ((c) >= '0' && (c) <= '9')) + if (!IS_LETTER_OR_DIGIT(TagChars[0]) && + !IS_LETTER_OR_DIGIT(TagChars[1]) && + !IS_LETTER_OR_DIGIT(TagChars[2]) && + !IS_LETTER_OR_DIGIT(TagChars[3])) + KeBugCheckEx(BAD_POOL_CALLER, 0x9d, Tag, PoolType, (ULONG_PTR)Caller); + + /* FIXME: Handle SESSION_POOL_MASK, VERIFIER_POOL_MASK, QUOTA_POOL_MASK */ + if (PoolType & PAGED_POOL_MASK) + { + if (KeGetCurrentIrql() > APC_LEVEL) + KeBugCheckEx(BAD_POOL_CALLER, 0x08, KeGetCurrentIrql(), PoolType, Tag); + Block = ExAllocatePagedPoolWithTag(PoolType, NumberOfBytes, Tag); + } + else + { + if (KeGetCurrentIrql() > DISPATCH_LEVEL) + KeBugCheckEx(BAD_POOL_CALLER, 0x08, KeGetCurrentIrql(), PoolType, Tag); + Block = ExAllocateNonPagedPoolWithTag(PoolType, NumberOfBytes, Tag, Caller); + } + + if ((PoolType & MUST_SUCCEED_POOL_MASK) && !Block) + KeBugCheckEx(BAD_POOL_CALLER, 0x9a, PoolType, NumberOfBytes, Tag); + return Block; } /* @@ -222,29 +245,40 @@ * @implemented */ #undef ExFreePool -VOID STDCALL +VOID NTAPI ExFreePool(IN PVOID Block) { - ASSERT_IRQL_LESS_OR_EQUAL(DISPATCH_LEVEL); - - if (Block >= MmPagedPoolBase && (char*)Block < ((char*)MmPagedPoolBase + MmPagedPoolSize)) - { - ExFreePagedPool(Block); - } - else - { - ExFreeNonPagedPool(Block); - } -} - -/* - * @implemented - */ -VOID STDCALL + if (Block >= MmPagedPoolBase && (char*)Block < ((char*)MmPagedPoolBase + MmPagedPoolSize)) + { + if (KeGetCurrentIrql() > APC_LEVEL) + KeBugCheckEx(BAD_POOL_CALLER, 0x09, KeGetCurrentIrql(), PagedPool, (ULONG_PTR)Block); + ExFreePagedPool(Block); + } + else + { + if (KeGetCurrentIrql() > DISPATCH_LEVEL) + KeBugCheckEx(BAD_POOL_CALLER, 0x09, KeGetCurrentIrql(), NonPagedPool, (ULONG_PTR)Block); + ExFreeNonPagedPool(Block); + } +} + +/* + * @implemented + */ +VOID NTAPI ExFreePoolWithTag(IN PVOID Block, IN ULONG Tag) { - /* FIXME: Validate the tag */ - ExFreePool(Block); + ULONG BlockTag; + + if (Block >= MmPagedPoolBase && (char*)Block < ((char*)MmPagedPoolBase + MmPagedPoolSize)) + BlockTag = EiGetPagedPoolTag(Block); + else + BlockTag = EiGetNonPagedPoolTag(Block); + + if (BlockTag != Tag) + KeBugCheckEx(BAD_POOL_CALLER, 0x0a, (ULONG_PTR)Block, BlockTag, Tag); + + ExFreePool(Block); } /* Modified: trunk/reactos/ntoskrnl/mm/ppool.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ppool.c?rev=35…
============================================================================== --- trunk/reactos/ntoskrnl/mm/ppool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ppool.c [iso-8859-1] Sun Aug 31 10:52:56 2008 @@ -103,6 +103,12 @@ RPoolFree ( MmPagedPool, Block ); } +ULONG NTAPI +EiGetPagedPoolTag(IN PVOID Block) +{ + return RBodyToHdr(Block)->Tag; +} + #ifdef PPOOL_UMODE_TEST
16 years, 3 months
1
0
0
0
[hpoussin] 35834: Replace some ExFreePool by ExFreePoolWithTag
by hpoussin@svn.reactos.org
Author: hpoussin Date: Sun Aug 31 10:29:21 2008 New Revision: 35834 URL:
http://svn.reactos.org/svn/reactos?rev=35834&view=rev
Log: Replace some ExFreePool by ExFreePoolWithTag Modified: trunk/reactos/ntoskrnl/config/cmalloc.c trunk/reactos/ntoskrnl/config/cmconfig.c trunk/reactos/ntoskrnl/config/cmse.c trunk/reactos/ntoskrnl/config/cmsysini.c trunk/reactos/ntoskrnl/config/i386/cmhardwr.c trunk/reactos/ntoskrnl/ex/init.c trunk/reactos/ntoskrnl/fstub/disksup.c trunk/reactos/ntoskrnl/io/iomgr/arcname.c trunk/reactos/ntoskrnl/io/iomgr/device.c trunk/reactos/ntoskrnl/io/iomgr/driver.c trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c trunk/reactos/ntoskrnl/io/iomgr/file.c trunk/reactos/ntoskrnl/io/iomgr/iofunc.c trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c trunk/reactos/ntoskrnl/io/iomgr/irp.c trunk/reactos/ntoskrnl/mm/section.c trunk/reactos/ntoskrnl/mm/sysldr.c trunk/reactos/ntoskrnl/ob/obdir.c trunk/reactos/ntoskrnl/ob/obhandle.c trunk/reactos/ntoskrnl/ob/obname.c trunk/reactos/ntoskrnl/ob/obsecure.c trunk/reactos/ntoskrnl/ob/obwait.c trunk/reactos/ntoskrnl/rtl/libsupp.c trunk/reactos/ntoskrnl/se/sd.c Modified: trunk/reactos/ntoskrnl/config/cmalloc.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmalloc.c?…
============================================================================== --- trunk/reactos/ntoskrnl/config/cmalloc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmalloc.c [iso-8859-1] Sun Aug 31 10:29:21 2008 @@ -62,7 +62,7 @@ if (!Kcb->PrivateAlloc) { /* Free it from the pool */ - ExFreePool(Kcb); + ExFreePoolWithTag(Kcb, TAG_CM); return; } @@ -99,7 +99,7 @@ } /* Free the page */ - ExFreePool(AllocPage); + ExFreePoolWithTag(AllocPage, TAG_CM); } /* Release the lock */ @@ -296,7 +296,7 @@ } /* Now free the page */ - ExFreePool(AllocPage); + ExFreePoolWithTag(AllocPage, TAG_CM); } /* Release the lock */ Modified: trunk/reactos/ntoskrnl/config/cmconfig.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmconfig.c…
============================================================================== --- trunk/reactos/ntoskrnl/config/cmconfig.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmconfig.c [iso-8859-1] Sun Aug 31 10:29:21 2008 @@ -386,7 +386,7 @@ } /* Close our handle, free the buffer and return status */ - ExFreePool(CmpConfigurationData); + ExFreePoolWithTag(CmpConfigurationData, TAG_CM); NtClose(KeyHandle); return Status; } Modified: trunk/reactos/ntoskrnl/config/cmse.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmse.c?rev…
============================================================================== --- trunk/reactos/ntoskrnl/config/cmse.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmse.c [iso-8859-1] Sun Aug 31 10:29:21 2008 @@ -129,8 +129,8 @@ if (!NT_SUCCESS(Status)) KeBugCheckEx(REGISTRY_ERROR, 11, 8, Status, 0); /* Free the SIDs and original ACL */ - for (i = 0; i < 4; i++) ExFreePool(Sid[i]); - ExFreePool(Acl); + for (i = 0; i < 4; i++) ExFreePoolWithTag(Sid[i], TAG_CM); + ExFreePoolWithTag(Acl, TAG_CM); /* Return the security descriptor */ return SecurityDescriptor; Modified: trunk/reactos/ntoskrnl/config/cmsysini.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmsysini.c…
============================================================================== --- trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmsysini.c [iso-8859-1] Sun Aug 31 10:29:21 2008 @@ -804,7 +804,7 @@ SecurityDescriptor); /* Free the security descriptor */ - ExFreePool(SecurityDescriptor); + ExFreePoolWithTag(SecurityDescriptor, TAG_CM); if (!NT_SUCCESS(Status)) return FALSE; /* Add the hive to the hive list */ @@ -944,7 +944,7 @@ 0, 0, (PVOID*)&RootKey); - ExFreePool(SecurityDescriptor); + ExFreePoolWithTag(SecurityDescriptor, TAG_CM); if (!NT_SUCCESS(Status)) return FALSE; /* Sanity check, and get the key cell */ @@ -1041,7 +1041,7 @@ if (!NT_SUCCESS(Status)) { /* Fail */ - ExFreePool(ValueInfo); + ExFreePoolWithTag(ValueInfo, TAG_CM); return Status; } @@ -1050,7 +1050,7 @@ ValueInfo->Data, ValueInfo->DataLength); ConfigPath[ValueInfo->DataLength / sizeof(WCHAR)] = UNICODE_NULL; - ExFreePool(ValueInfo); + ExFreePoolWithTag(ValueInfo, TAG_CM); } else { @@ -1356,7 +1356,7 @@ } /* Get rid of the SD */ - ExFreePool(SecurityDescriptor); + ExFreePoolWithTag(SecurityDescriptor, TAG_CM); /* FIXME: Link SECURITY to SAM */ @@ -1541,7 +1541,7 @@ /* FIXME: Add to HiveList key */ /* Free the security descriptor */ - ExFreePool(SecurityDescriptor); + ExFreePoolWithTag(SecurityDescriptor, TAG_CM); /* Fill out the Hardware key with the ARC Data from the Loader */ Status = CmpInitializeHardwareConfiguration(KeLoaderBlock); @@ -1568,7 +1568,7 @@ } /* Free the load options */ - ExFreePool(CmpLoadOptions.Buffer); + ExFreePoolWithTag(CmpLoadOptions.Buffer, TAG_CM); /* If we got here, all went well */ return TRUE; Modified: trunk/reactos/ntoskrnl/config/i386/cmhardwr.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/i386/cmhar…
============================================================================== --- trunk/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/i386/cmhardwr.c [iso-8859-1] Sun Aug 31 10:29:21 2008 @@ -546,7 +546,7 @@ } /* Free the configuration data */ - ExFreePool(CmpConfigurationData); + ExFreePoolWithTag(CmpConfigurationData, TAG_CM); } /* Open physical memory */ @@ -824,7 +824,7 @@ ZwClose(SectionHandle); /* Free the BIOS version string buffer */ - if (BiosVersion) ExFreePool(BiosVersion); + if (BiosVersion) ExFreePoolWithTag(BiosVersion, TAG_CM); Quickie: /* Close the procesor handle */ Modified: trunk/reactos/ntoskrnl/ex/init.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/init.c?rev=358…
============================================================================== --- trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/init.c [iso-8859-1] Sun Aug 31 10:29:21 2008 @@ -324,7 +324,7 @@ RtlCopyMemory(SectionBase, ExpNlsTableBase, ExpNlsTableSize); /* Free the previously allocated buffer and set the new location */ - ExFreePool(ExpNlsTableBase); + ExFreePoolWithTag(ExpNlsTableBase, TAG('R', 't', 'l', 'i')); ExpNlsTableBase = SectionBase; /* Initialize the NLS Tables */ Modified: trunk/reactos/ntoskrnl/fstub/disksup.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fstub/disksup.c?r…
============================================================================== --- trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fstub/disksup.c [iso-8859-1] Sun Aug 31 10:29:21 2008 @@ -948,7 +948,7 @@ if (!Irp) { /* Fail, free the event */ - ExFreePool(Event); + ExFreePoolWithTag(Event, TAG_FILE_SYSTEM); return STATUS_INSUFFICIENT_RESOURCES; } @@ -977,7 +977,7 @@ if (!Irp) { /* Fail, free the event */ - ExFreePool(Event); + ExFreePoolWithTag(Event, TAG_FILE_SYSTEM); return STATUS_INSUFFICIENT_RESOURCES; } @@ -1000,7 +1000,7 @@ } /* Free the event and return the Status */ - ExFreePool(Event); + ExFreePoolWithTag(Event, TAG_FILE_SYSTEM); return Status; } @@ -1200,7 +1200,7 @@ Cleanup: /* Free all the pointers */ - if (Event) ExFreePool(Event); + if (Event) ExFreePoolWithTag(Event, TAG_FILE_SYSTEM); if (IoStatusBlock) ExFreePool(IoStatusBlock); if (DiskGeometry) ExFreePool(DiskGeometry); return; @@ -1251,7 +1251,7 @@ if (!Irp) { /* Failed */ - ExFreePool(Buffer); + ExFreePoolWithTag(Buffer, TAG_FILE_SYSTEM); return; } @@ -1275,7 +1275,7 @@ if (((PUSHORT)Buffer)[BOOT_SIGNATURE_OFFSET] != BOOT_RECORD_SIGNATURE) { /* Failed */ - ExFreePool(Buffer); + ExFreePoolWithTag(Buffer, TAG_FILE_SYSTEM); return; } @@ -1287,7 +1287,7 @@ if (PartitionDescriptor->PartitionType != MbrTypeIdentifier) { /* It's not, free our buffer */ - ExFreePool(Buffer); + ExFreePoolWithTag(Buffer, TAG_FILE_SYSTEM); } else { @@ -1367,7 +1367,7 @@ Status = HalpGetFullGeometry(DeviceObject, &DiskGeometry, &MaxOffset); if (!NT_SUCCESS(Status)) { - ExFreePool(*PartitionBuffer); + ExFreePoolWithTag(*PartitionBuffer, TAG_FILE_SYSTEM); *PartitionBuffer = NULL; return Status; } @@ -1383,7 +1383,8 @@ if (!Buffer) { /* Fail, free the input buffer */ - ExFreePool(*PartitionBuffer); + ExFreePoolWithTag(*PartitionBuffer, TAG_FILE_SYSTEM); + *PartitionBuffer = NULL; return STATUS_INSUFFICIENT_RESOURCES; } @@ -1549,7 +1550,7 @@ BufferSize); /* Free the old buffer and set this one as the new one */ - ExFreePool(*PartitionBuffer); + ExFreePoolWithTag(*PartitionBuffer, TAG_FILE_SYSTEM); *PartitionBuffer = DriveLayoutInfo; /* Double the size */ @@ -1732,8 +1733,8 @@ if (!i) (*PartitionBuffer)->Signature = 0; /* Free the buffer and check for success */ - if (Buffer) ExFreePool(Buffer); - if (!NT_SUCCESS(Status)) ExFreePool(*PartitionBuffer); + if (Buffer) ExFreePoolWithTag(Buffer, TAG_FILE_SYSTEM); + if (!NT_SUCCESS(Status)) ExFreePoolWithTag(*PartitionBuffer, TAG_FILE_SYSTEM); /* Return status */ return Status; @@ -2212,7 +2213,7 @@ } /* If we had a buffer, free it, then return status */ - if (Buffer) ExFreePool(Buffer); + if (Buffer) ExFreePoolWithTag(Buffer, TAG_FILE_SYSTEM); return Status; } Modified: trunk/reactos/ntoskrnl/io/iomgr/arcname.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/arcname.…
============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/arcname.c [iso-8859-1] Sun Aug 31 10:29:21 2008 @@ -242,8 +242,8 @@ if (!NT_SUCCESS(Status)) { /* Try again */ - ExFreePool(PartitionBuffer); - ExFreePool(DriveLayout); + ExFreePoolWithTag(PartitionBuffer, TAG_IO); + ExFreePoolWithTag(DriveLayout, TAG_FILE_SYSTEM); return FALSE; } @@ -257,8 +257,8 @@ *PartitionCount = DriveLayout->PartitionCount; /* Free the buffer */ - ExFreePool(PartitionBuffer); - ExFreePool(DriveLayout); + ExFreePoolWithTag(PartitionBuffer, TAG_IO); + ExFreePoolWithTag(DriveLayout, TAG_FILE_SYSTEM); return TRUE; } @@ -574,7 +574,7 @@ } /* Free the buffer */ - ExFreePool(PartitionBuffer); + ExFreePoolWithTag(PartitionBuffer, TAG_IO); } /* Return success */ Modified: trunk/reactos/ntoskrnl/io/iomgr/device.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/device.c…
============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/device.c [iso-8859-1] Sun Aug 31 10:29:21 2008 @@ -122,7 +122,7 @@ } /* Free the shutdown entry and reset the event */ - ExFreePool(ShutdownEntry); + ExFreePoolWithTag(ShutdownEntry, TAG_SHUTDOWN_ENTRY); KeClearEvent(&Event); /* Go to the next entry */ @@ -317,7 +317,7 @@ if (DeviceObject->SecurityDescriptor) { /* Free it */ - ExFreePool(DeviceObject->SecurityDescriptor); + ExFreePoolWithTag(DeviceObject->SecurityDescriptor, TAG_SD); } /* Remove the device from the list */ @@ -1328,7 +1328,7 @@ NextEntry = NextEntry->Blink; /* Free the entry */ - ExFreePool(ShutdownEntry); + ExFreePoolWithTag(ShutdownEntry, TAG_SHUTDOWN_ENTRY); } /* Go to the next entry */ @@ -1352,7 +1352,7 @@ NextEntry = NextEntry->Blink; /* Free the entry */ - ExFreePool(ShutdownEntry); + ExFreePoolWithTag(ShutdownEntry, TAG_SHUTDOWN_ENTRY); } /* Go to the next entry */ 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 [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/driver.c [iso-8859-1] Sun Aug 31 10:29:21 2008 @@ -28,6 +28,8 @@ RTL_CONSTANT_STRING(L"\\REGISTRY\\MACHINE\\HARDWARE\\DESCRIPTION\\SYSTEM"); POBJECT_TYPE IoDriverObjectType = NULL; + +#define TAG_RTLREGISTRY TAG('R', 'q', 'r', 'v') extern BOOLEAN ExpInTextModeSetup; @@ -246,7 +248,7 @@ RtlAppendUnicodeStringToString(ImagePath, &InputImagePath); /* Free caller's string */ - RtlFreeUnicodeString(&InputImagePath); + ExFreePoolWithTag(InputImagePath.Buffer, TAG_RTLREGISTRY); } return STATUS_SUCCESS; Modified: trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/drvrlist…
============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/drvrlist.c [iso-8859-1] Sun Aug 31 10:29:21 2008 @@ -36,6 +36,8 @@ /* BOOLEAN ServiceRunning;*/ // needed ?? } SERVICE, *PSERVICE; + +#define TAG_RTLREGISTRY TAG('R', 'q', 'r', 'v') /* GLOBALS ********************************************************************/ @@ -205,11 +207,11 @@ */ if (Service->ServiceGroup.Buffer) { - ExFreePool(Service->ServiceGroup.Buffer); + ExFreePoolWithTag(Service->ServiceGroup.Buffer, TAG_RTLREGISTRY); } if (Service->ImagePath.Buffer) { - ExFreePool(Service->ImagePath.Buffer); + ExFreePoolWithTag(Service->ImagePath.Buffer, TAG_RTLREGISTRY); } ExFreePool(Service); return(Status); Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r…
============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Sun Aug 31 10:29:21 2008 @@ -1031,7 +1031,7 @@ /* Clear the file name */ if (FileObject->FileName.Buffer) { - ExFreePool(FileObject->FileName.Buffer); + ExFreePoolWithTag(FileObject->FileName.Buffer, TAG_IO_NAME); FileObject->FileName.Buffer = NULL; } Modified: trunk/reactos/ntoskrnl/io/iomgr/iofunc.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iofunc.c…
============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iofunc.c [iso-8859-1] Sun Aug 31 10:29:21 2008 @@ -1890,7 +1890,7 @@ { /* Clear it in the IRP for completion */ Irp->UserEvent = NULL; - ExFreePool(Event); + ExFreePoolWithTag(Event, TAG_IO); } /* Set the caller IOSB */ Modified: trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/iorsrce.…
============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/iorsrce.c [iso-8859-1] Sun Aug 31 10:29:21 2008 @@ -179,7 +179,7 @@ if (!NT_SUCCESS(Status)) { if (ControllerFullInformation != NULL) - ExFreePool(ControllerFullInformation); + ExFreePoolWithTag(ControllerFullInformation, TAG_IO_RESOURCE); return Status; } @@ -188,7 +188,7 @@ MaximumControllerNumber = ControllerFullInformation->SubKeys; /* Free Memory */ - ExFreePool(ControllerFullInformation); + ExFreePoolWithTag(ControllerFullInformation, TAG_IO_RESOURCE); ControllerFullInformation = NULL; } @@ -318,7 +318,7 @@ MaximumPeripheralNumber = PeripheralFullInformation->SubKeys; /* Free Memory */ - ExFreePool(PeripheralFullInformation); + ExFreePoolWithTag(PeripheralFullInformation, TAG_IO_RESOURCE); PeripheralFullInformation = NULL; } @@ -400,7 +400,7 @@ { if (PeripheralInformation[PeripheralLoop]) { - ExFreePool(PeripheralInformation[PeripheralLoop]); + ExFreePoolWithTag(PeripheralInformation[PeripheralLoop], TAG_IO_RESOURCE); PeripheralInformation[PeripheralLoop] = NULL; } } @@ -416,7 +416,7 @@ { if (ControllerInformation[ControllerLoop]) { - ExFreePool(ControllerInformation[ControllerLoop]); + ExFreePoolWithTag(ControllerInformation[ControllerLoop], TAG_IO_RESOURCE); ControllerInformation[ControllerLoop] = NULL; } } @@ -498,7 +498,7 @@ } /* Deallocate the old Buffer */ - ExFreePool(FullInformation); + ExFreePoolWithTag(FullInformation, TAG_IO_RESOURCE); /* Try to find a Bus */ for (BusLoop = 0; NT_SUCCESS(Status); BusLoop++) @@ -619,7 +619,7 @@ { if (BusInformation[SubBusLoop]) { - ExFreePool(BusInformation[SubBusLoop]); + ExFreePoolWithTag(BusInformation[SubBusLoop], TAG_IO_RESOURCE); BusInformation[SubBusLoop] = NULL; } } @@ -645,7 +645,7 @@ /* Free the last remaining Allocated Memory */ if (BasicInformation) - ExFreePool(BasicInformation); + ExFreePoolWithTag(BasicInformation, TAG_IO_RESOURCE); return Status; } @@ -788,7 +788,7 @@ } /* Free Memory */ - ExFreePool(RootRegKey.Buffer); + ExFreePoolWithTag(RootRegKey.Buffer, TAG_IO_RESOURCE); return Status; } Modified: trunk/reactos/ntoskrnl/io/iomgr/irp.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irp.c?re…
============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irp.c [iso-8859-1] Sun Aug 31 10:29:21 2008 @@ -1499,7 +1499,7 @@ if (!(Irp->AllocationFlags & IRP_ALLOCATED_FIXED_SIZE)) { /* Free it */ - ExFreePool(Irp); + ExFreePoolWithTag(Irp, TAG_IRP); } else { @@ -1528,7 +1528,7 @@ { /* All lists failed, use the pool */ List->L.FreeMisses++; - ExFreePool(Irp); + ExFreePoolWithTag(Irp, TAG_IRP); Irp = NULL; } } Modified: trunk/reactos/ntoskrnl/mm/section.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/section.c?rev=…
============================================================================== --- trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/section.c [iso-8859-1] Sun Aug 31 10:29:21 2008 @@ -136,7 +136,7 @@ if (!NT_SUCCESS(Status)) { /* Failed, free memory */ - ExFreePool(ObjectNameInfo); + ExFreePoolWithTag(ObjectNameInfo, TAG('M', 'm', ' ', ' ')); return Status; } @@ -2759,7 +2759,7 @@ } else { - ExFreePool(Buffer); + ExFreePoolWithTag(Buffer, TAG('M', 'm', 'X', 'r')); } return Status; @@ -3168,7 +3168,7 @@ break; } - ExFreePool(FileHeaderBuffer); + ExFreePoolWithTag(FileHeaderBuffer, TAG('M', 'm', 'X', 'r')); /* * No loader handled the format @@ -3963,7 +3963,7 @@ { CurrentEntry = RemoveHeadList(RegionListHead); CurrentRegion = CONTAINING_RECORD(CurrentEntry, MM_REGION, RegionListEntry); - ExFreePool(CurrentRegion); + ExFreePoolWithTag(CurrentRegion, TAG_MM_REGION); } if (Section->AllocationAttributes & SEC_PHYSICALMEMORY) Modified: trunk/reactos/ntoskrnl/mm/sysldr.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/sysldr.c?rev=3…
============================================================================== --- trunk/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/sysldr.c [iso-8859-1] Sun Aug 31 10:29:21 2008 @@ -660,7 +660,7 @@ &MissingForwarder); /* Free the forwarder name and set the thunk */ - ExFreePool(ForwardName); + ExFreePoolWithTag(ForwardName, TAG_LDR_WSTR); Address->u1 = ForwardThunk.u1; break; } @@ -876,7 +876,7 @@ { /* Failed */ MiDereferenceImports(LoadedImports); - if (LoadedImports) ExFreePool(LoadedImports); + if (LoadedImports) ExFreePoolWithTag(LoadedImports, TAG_LDR_WSTR); return Status; } @@ -997,7 +997,7 @@ /* Cleanup and return */ RtlFreeUnicodeString(&NameString); MiDereferenceImports(LoadedImports); - if (LoadedImports) ExFreePool(LoadedImports); + if (LoadedImports) ExFreePoolWithTag(LoadedImports, TAG_LDR_WSTR); return Status; } @@ -1030,7 +1030,7 @@ { /* Cleanup and return */ MiDereferenceImports(LoadedImports); - if (LoadedImports) ExFreePool(LoadedImports); + if (LoadedImports) ExFreePoolWithTag(LoadedImports, TAG_LDR_WSTR); return STATUS_DRIVER_ENTRYPOINT_NOT_FOUND; } @@ -1059,7 +1059,7 @@ { /* Cleanup and return */ MiDereferenceImports(LoadedImports); - if (LoadedImports) ExFreePool(LoadedImports); + if (LoadedImports) ExFreePoolWithTag(LoadedImports, TAG_LDR_WSTR); return Status; } @@ -1091,13 +1091,13 @@ if (!ImportCount) { /* Free the list and set it to no imports */ - ExFreePool(LoadedImports); + ExFreePoolWithTag(LoadedImports, TAG_LDR_WSTR); LoadedImports = (PVOID)-2; } else if (ImportCount == 1) { /* Just one entry, we can free the table and only use our entry */ - ExFreePool(LoadedImports); + ExFreePoolWithTag(LoadedImports, TAG_LDR_WSTR); LoadedImports = (PLOAD_IMPORTS)ImportEntry; } else if (ImportCount != LoadedImports->Count) @@ -1125,7 +1125,7 @@ } /* Free the old copy */ - ExFreePool(LoadedImports); + ExFreePoolWithTag(LoadedImports, TAG_LDR_WSTR); LoadedImports = NewImports; } } @@ -1834,7 +1834,7 @@ } /* Free the entry itself */ - ExFreePool(LdrEntry); + ExFreePoolWithTag(LdrEntry, TAG_MODULE_OBJECT); LdrEntry = NULL; goto Quickie; } @@ -1924,7 +1924,7 @@ if (NamePrefix) ExFreePool(PrefixName.Buffer); /* Free the name buffer and return status */ - ExFreePool(Buffer); + ExFreePoolWithTag(Buffer, TAG_LDR_WSTR); return Status; } Modified: trunk/reactos/ntoskrnl/ob/obdir.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obdir.c?rev=35…
============================================================================== --- trunk/reactos/ntoskrnl/ob/obdir.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obdir.c [iso-8859-1] Sun Aug 31 10:29:21 2008 @@ -326,7 +326,7 @@ CurrentEntry->ChainLink = NULL; /* Free it */ - ExFreePool(CurrentEntry); + ExFreePoolWithTag(CurrentEntry, OB_DIR_TAG); /* Return */ return TRUE; @@ -529,7 +529,7 @@ if (!NT_SUCCESS(Status)) { /* Free the buffer and fail */ - ExFreePool(LocalBuffer); + ExFreePoolWithTag(LocalBuffer, OB_NAME_TAG); return Status; } @@ -701,7 +701,7 @@ /* Dereference the directory and free our buffer */ ObDereferenceObject(Directory); - ExFreePool(LocalBuffer); + ExFreePoolWithTag(LocalBuffer, OB_NAME_TAG); /* Return status to caller */ return Status; Modified: trunk/reactos/ntoskrnl/ob/obhandle.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obhandle.c?rev…
============================================================================== --- trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obhandle.c [iso-8859-1] Sun Aug 31 10:29:21 2008 @@ -289,7 +289,7 @@ else { /* Otherwise we had a DB, free it */ - ExFreePool(OldHandleDatabase); + ExFreePoolWithTag(OldHandleDatabase, TAG_OB_HANDLE); } /* Find the end of the copy and zero out the new data */ @@ -2425,7 +2425,7 @@ if (!NT_SUCCESS(Status)) { /* Fail */ - ExFreePool(TempBuffer); + ExFreePoolWithTag(TempBuffer, TAG_OB_TEMP_STORAGE); return Status; } @@ -2533,7 +2533,7 @@ /* Release the object attributes and temporary buffer */ ObpReleaseObjectCreateInformation(&TempBuffer->ObjectCreateInfo); if (ObjectName.Buffer) ObpFreeObjectNameBuffer(&ObjectName); - ExFreePool(TempBuffer); + ExFreePoolWithTag(TempBuffer, TAG_OB_TEMP_STORAGE); /* Return status */ OBTRACE(OB_HANDLE_DEBUG, Modified: trunk/reactos/ntoskrnl/ob/obname.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obname.c?rev=3…
============================================================================== --- trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obname.c [iso-8859-1] Sun Aug 31 10:29:21 2008 @@ -720,7 +720,7 @@ if (ObjectNameInfo->Name.Buffer) { /* Free it */ - ExFreePool(ObjectNameInfo->Name.Buffer); + ExFreePoolWithTag(ObjectNameInfo->Name.Buffer, OB_NAME_TAG ); } /* Write new one */ Modified: trunk/reactos/ntoskrnl/ob/obsecure.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obsecure.c?rev…
============================================================================== --- trunk/reactos/ntoskrnl/ob/obsecure.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obsecure.c [iso-8859-1] Sun Aug 31 10:29:21 2008 @@ -40,7 +40,7 @@ if (NT_SUCCESS(Status)) { /* Free the old copy */ - ExFreePool(SecurityDescriptor); + ExFreePoolWithTag(SecurityDescriptor, TAG_SD); /* Set the new pointer */ ASSERT(NewSd); @@ -633,7 +633,7 @@ if (!NT_SUCCESS(Status)) { /* Free the descriptor and tell the caller we failed */ - ExFreePool(*SecurityDescriptor); + ExFreePoolWithTag(*SecurityDescriptor, TAG_SEC_QUERY); *MemoryAllocated = FALSE; } Modified: trunk/reactos/ntoskrnl/ob/obwait.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obwait.c?rev=3…
============================================================================== --- trunk/reactos/ntoskrnl/ob/obwait.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obwait.c [iso-8859-1] Sun Aug 31 10:29:21 2008 @@ -279,7 +279,7 @@ } /* Free wait block array */ - if (WaitBlockArray) ExFreePool(WaitBlockArray); + if (WaitBlockArray) ExFreePoolWithTag(WaitBlockArray, TAG_WAIT); /* Re-enable APCs if needed */ if (LockInUse) KeLeaveCriticalRegion(); Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev…
============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Sun Aug 31 10:29:21 2008 @@ -12,6 +12,8 @@ #include <ntoskrnl.h> #define NDEBUG #include <debug.h> + +#define TAG_ATMT TAG('A', 't', 'o', 'T') /* Atom table */ extern ULONG NtGlobalFlag; @@ -482,21 +484,21 @@ PRTL_ATOM_TABLE_ENTRY RtlpAllocAtomTableEntry(ULONG Size) { - PRTL_ATOM_TABLE_ENTRY Entry = ExAllocatePool(NonPagedPool, - Size); - if (Entry != NULL) - { - RtlZeroMemory(Entry, - Size); - } - - return Entry; + PRTL_ATOM_TABLE_ENTRY Entry; + + Entry = ExAllocatePoolWithTag(NonPagedPool, Size, TAG_ATMT); + if (Entry != NULL) + { + RtlZeroMemory(Entry, Size); + } + + return Entry; } VOID RtlpFreeAtomTableEntry(PRTL_ATOM_TABLE_ENTRY Entry) { - ExFreePool(Entry); + ExFreePoolWithTag(Entry, TAG_ATMT); } VOID Modified: trunk/reactos/ntoskrnl/se/sd.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/se/sd.c?rev=35834…
============================================================================== --- trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/se/sd.c [iso-8859-1] Sun Aug 31 10:29:21 2008 @@ -619,8 +619,9 @@ /* allocate enough memory to store a complete copy of a self-relative security descriptor */ - NewDescriptor = ExAllocatePool(PoolType, - DescriptorSize); + NewDescriptor = ExAllocatePoolWithTag(PoolType, + DescriptorSize, + TAG_SD); if(NewDescriptor != NULL) { ULONG_PTR Offset = sizeof(SECURITY_DESCRIPTOR); @@ -872,7 +873,7 @@ (CurrentMode == KernelMode && CaptureIfKernelMode))) { /* only delete the descriptor when SeCaptureSecurityDescriptor() allocated one! */ - ExFreePool(CapturedSecurityDescriptor); + ExFreePoolWithTag(CapturedSecurityDescriptor, TAG_SD); } return STATUS_SUCCESS; @@ -1450,8 +1451,9 @@ DaclLength, SaclLength); - Descriptor = ExAllocatePool(PagedPool, - Length); + Descriptor = ExAllocatePoolWithTag(PagedPool, + Length, + TAG_SD); if (Descriptor == NULL) { DPRINT1("ExAlloctePool() failed\n");
16 years, 3 months
1
0
0
0
[cwittich] 35833: -add a xml config file -load and parse settings
by cwittich@svn.reactos.org
Author: cwittich Date: Sun Aug 31 10:21:45 2008 New Revision: 35833 URL:
http://svn.reactos.org/svn/reactos?rev=35833&view=rev
Log: -add a xml config file -load and parse settings Added: trunk/tools/sysreg2/options.c (with props) trunk/tools/sysreg2/sysreg.xml (with props) Modified: trunk/tools/sysreg2/console.c trunk/tools/sysreg2/makefile trunk/tools/sysreg2/sysreg.h trunk/tools/sysreg2/virt.c Modified: trunk/tools/sysreg2/console.c URL:
http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/console.c?rev=35833&…
============================================================================== --- trunk/tools/sysreg2/console.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/console.c [iso-8859-1] Sun Aug 31 10:21:45 2008 @@ -2,7 +2,7 @@ #include <termios.h> #include <poll.h> -void ProcessDebugData(const char* tty, int timeout) +void ProcessDebugData(const char* tty, int timeout, int stage ) { int ttyfd, i; struct termios ttyattr, rawattr; Modified: trunk/tools/sysreg2/makefile URL:
http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/makefile?rev=35833&r…
============================================================================== --- trunk/tools/sysreg2/makefile [iso-8859-1] (original) +++ trunk/tools/sysreg2/makefile [iso-8859-1] Sun Aug 31 10:21:45 2008 @@ -10,7 +10,7 @@ LIBS := -lgcc -lm -lvirt -ltasn1 -lz -lxml2 -lgnutls INC := -I/usr/include/libvirt/ -I/usr/include/libxml2/ -SRCS := virt.c utils.c console.c +SRCS := virt.c utils.c console.c options.c OBJS := $(SRCS:.c=.o) Added: trunk/tools/sysreg2/options.c URL:
http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/options.c?rev=35833&…
============================================================================== --- trunk/tools/sysreg2/options.c (added) +++ trunk/tools/sysreg2/options.c [iso-8859-1] Sun Aug 31 10:21:45 2008 @@ -1,0 +1,64 @@ +#include "sysreg.h" + +bool LoadSettings(const char* XmlConfig) +{ + xmlDocPtr xml = NULL; + xmlXPathObjectPtr obj = NULL; + xmlXPathContextPtr ctxt = NULL; + char TempStr[255]; + int Stage; + const char* StageNames[] = { + "firststage", + "secondstage", + "thirdstage" + }; + + xml = xmlReadFile(XmlConfig, NULL, 0); + if (!xml) + return false; + ctxt = xmlXPathNewContext(xml); + if (!ctxt) + { + xmlFreeDoc(xml); + return false; + } + + obj = xmlXPathEval(BAD_CAST"string(/settings/@file)",ctxt); + if ((obj != NULL) && ((obj->type == XPATH_STRING) && + (obj->stringval != NULL) && (obj->stringval[0] != 0))) + { + strncpy(AppSettings.Filename, obj->stringval, 254); + } + + obj = xmlXPathEval(BAD_CAST"string(/settings/@name)",ctxt); + if ((obj != NULL) && ((obj->type == XPATH_STRING) && + (obj->stringval != NULL) && (obj->stringval[0] != 0))) + { + strncpy(AppSettings.Name, obj->stringval, 79); + } + + obj = xmlXPathEval(BAD_CAST"number(/settings/general/timeout/@ms)",ctxt); + if ((obj != NULL) && (obj->type == XPATH_NUMBER)) + { + /* when no value is set - return value is negative + * which means infinite */ + AppSettings.Timeout = (int)obj->floatval; + } + + for (Stage=0;Stage<3;Stage++) + { + strcpy(TempStr, "string(/settings/"); + strcat(TempStr, StageNames[Stage]); + strcat(TempStr, "/@bootdevice)"); + obj = xmlXPathEval((xmlChar*) TempStr,ctxt); + if ((obj != NULL) && ((obj->type == XPATH_STRING) && + (obj->stringval != NULL) && (obj->stringval[0] != 0))) + { + strncpy(AppSettings.Stage[Stage].BootDevice, obj->stringval, 7); + } + } + xmlFreeDoc(xml); + xmlXPathFreeContext(ctxt); + return true; +} + Propchange: trunk/tools/sysreg2/options.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/sysreg2/sysreg.h URL:
http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/sysreg.h?rev=35833&r…
============================================================================== --- trunk/tools/sysreg2/sysreg.h [iso-8859-1] (original) +++ trunk/tools/sysreg2/sysreg.h [iso-8859-1] Sun Aug 31 10:21:45 2008 @@ -10,6 +10,25 @@ #include <libxml/xpath.h> #include <libxml/xpathInternals.h> -char* ReadFile (const char *filename); -void ProcessDebugData(const char* tty, int timeout); +typedef struct { + char BootDevice[8]; +} stage; + +typedef struct { + int Timeout; + char Filename[255]; + char Name[80]; + stage Stage[3]; +} Settings; + +Settings AppSettings; + +/* utils.c */ +char* ReadFile (const char* filename); ssize_t safewrite(int fd, const void *buf, size_t count); + +/* options.c */ +bool LoadSettings(const char* XmlConfig); + +/* console.c */ +void ProcessDebugData(const char* tty, int timeout, int stage); Added: trunk/tools/sysreg2/sysreg.xml URL:
http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/sysreg.xml?rev=35833…
============================================================================== --- trunk/tools/sysreg2/sysreg.xml (added) +++ trunk/tools/sysreg2/sysreg.xml [iso-8859-1] Sun Aug 31 10:21:45 2008 @@ -1,0 +1,13 @@ +<settings vm="ReactOS" file="/opt/buildbot/kvmtest/reactos.xml"> + <general> + <!-- kill the VM after n milliseconds without debug msg --> + <timeout ms="20000"/> + </general2 + <firststage bootdevice="cdrom"> + <success on="SYSREG_CHECKPOINT:USETUP_COMPLETE"/> + </firststage> + <secondstage bootdevice="hd"> + </secondstage> + <thirdstage bootdevice="hd"> + </thirdstage> +</settings> Propchange: trunk/tools/sysreg2/sysreg.xml ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/tools/sysreg2/virt.c URL:
http://svn.reactos.org/svn/reactos/trunk/tools/sysreg2/virt.c?rev=35833&r1=…
============================================================================== --- trunk/tools/sysreg2/virt.c [iso-8859-1] (original) +++ trunk/tools/sysreg2/virt.c [iso-8859-1] Sun Aug 31 10:21:45 2008 @@ -51,7 +51,7 @@ int i; for(i=0; i<iDomains; i++) { - if (strcmp(name, names[i]) == 0) + if (strcasecmp(name, names[i]) == 0) return true; } } @@ -111,7 +111,6 @@ name = virDomainGetName(vDomPtr); domname = strdup(name); virDomainFree(vDomPtr); - vDomPtr = virDomainLookupByName(vConn, domname); free(domname); } } @@ -121,32 +120,42 @@ int main() { - virConnectPtr vConn; virDomainPtr vDom; + int Stage; + int Stages = 1; /* 1 for testing, should be set to 3 later */ + + if (!LoadSettings("sysreg.xml")) + { + printf("Can not load configuration file\n"); + return EXIT_FAILURE; + } vConn = virConnectOpen("qemu:///session"); - if (IsVirtualMachineRunning(vConn, "reactos")) - printf("Virtual Machine is already running\n"); - else + for (Stage=0;Stage<Stages; Stage++) { - vDom = LaunchVirtualMachine(vConn, "/opt/buildbot/kvmtest/reactos.xml", "cdrom"); + if (IsVirtualMachineRunning(vConn, AppSettings.Name)) + printf("Virtual Machine is already running\n"); + else { - if (vDom) + vDom = LaunchVirtualMachine(vConn, AppSettings.Filename, + AppSettings.Stage[Stage].BootDevice); { - printf("Domain %s started.\n", virDomainGetName(vDom)); - printf("%s\n", GetConsole(vDom)); - ProcessDebugData(GetConsole(vDom), 10000 /*10 sec */); - - virDomainDestroy(vDom); - virDomainUndefine(vDom); - virDomainFree(vDom); - } + if (vDom) + { + printf("Domain %s started.\n", virDomainGetName(vDom)); + ProcessDebugData(GetConsole(vDom), + AppSettings.Timeout, Stage); + virDomainDestroy(vDom); + virDomainUndefine(vDom); + virDomainFree(vDom); + } + } } } virConnectClose(vConn); - return 1; + return EXIT_SUCCESS; }
16 years, 3 months
1
0
0
0
[sginsberg] 35832: - Make ntdll exports compatible with 2003 SP2 (except for some Vista routines) - "Implement" Nt* and Zw* routines, and export 3 missing Dbg* routines which we implement - Remove range list routines (those appear to be kernel mode only) - Remove strtoull export
by sginsberg@svn.reactos.org
Author: sginsberg Date: Sun Aug 31 07:45:56 2008 New Revision: 35832 URL:
http://svn.reactos.org/svn/reactos?rev=35832&view=rev
Log: - Make ntdll exports compatible with 2003 SP2 (except for some Vista routines) - "Implement" Nt* and Zw* routines, and export 3 missing Dbg* routines which we implement - Remove range list routines (those appear to be kernel mode only) - Remove strtoull export Modified: trunk/reactos/dll/ntdll/def/ntdll_i386.def Modified: trunk/reactos/dll/ntdll/def/ntdll_i386.def URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/ntdll/def/ntdll_i386.d…
============================================================================== --- trunk/reactos/dll/ntdll/def/ntdll_i386.def [iso-8859-1] (original) +++ trunk/reactos/dll/ntdll/def/ntdll_i386.def [iso-8859-1] Sun Aug 31 07:45:56 2008 @@ -1,4 +1,3 @@ -; $Id$ ; ; ReactOS Operating System ; @@ -23,11 +22,14 @@ DbgBreakPoint@0 DbgPrint DbgPrintEx +DbgPrintReturnControlC DbgPrompt@12 +DbgQueryDebugFilterState@8 +DbgSetDebugFilterState@12 +DbgUiConnectToDbg@0 +DbgUiContinue@8 DbgUiConvertStateChangeStructure@8 DbgUiDebugActiveProcess@4 -DbgUiConnectToDbg@0 -DbgUiContinue@8 DbgUiGetThreadDebugObject@0 DbgUiIssueRemoteBreakin@4 DbgUiRemoteBreakin@0 @@ -35,30 +37,89 @@ DbgUiStopDebugging@4 DbgUiWaitStateChange@8 DbgUserBreakPoint@0 +;EtwControlTraceA +;EtwControlTraceW +;EtwControlTraceW +;EtwCreateTraceInstanceId +;EtwEnableTrace +;EtwEnumerateTraceGuids +;EtwFlushTraceA +;EtwFlushTraceW +;EtwGetTraceEnableFlags +;EtwGetTraceEnableLevel +;EtwGetTraceLoggerHandle +;EtwNotificationRegistrationA +;EtwNotificationRegistrationW +;EtwQueryAllTracesA +;EtwQueryAllTracesW +;EtwQueryTraceA +;EtwQueryTraceW +;EtwReceiveNotificationsA +;EtwReceiveNotificationsW +;EtwRegisterTraceGuidsA +;EtwRegisterTraceGuidsW +;EtwStartTraceA +;EtwStartTraceW +;EtwStopTraceA +;EtwStopTraceW +;EtwTraceEvent +;EtwTraceEventInstance +;EtwTraceMessage +;EtwTraceMessageVa +;EtwUnregisterTraceGuids +;EtwUpdateTraceA +;EtwUpdateTraceW +;EtwpGetTraceBuffer +;EtwpSetHWConfigFunction +;ExpInterlockedPopEntrySListEnd +;ExpInterlockedPopEntrySListFault +;ExpInterlockedPopEntrySListResume +KiFastSystemCall@0 +KiFastSystemCallRet@0 +KiIntSystemCall@0 KiRaiseUserExceptionDispatcher@0 KiUserApcDispatcher@16 KiUserCallbackDispatcher@12 KiUserExceptionDispatcher@8 -KiIntSystemCall@0 -KiFastSystemCallRet@0 -KiFastSystemCall@0 +;LdrAccessOutOfProcessResource LdrAccessResource@16 LdrAddRefDll@8 +;LdrAlternateResourcesEnabled +;LdrCreateOutOfProcessImage +;LdrDestroyOutOfProcessImage LdrDisableThreadCalloutsForDll@4 LdrEnumResources@20 LdrFindEntryForAddress@8 +;LdrEnumerateLoadedModules +;LdrFindCreateProcessManifest +;LdrFindEntryForAddress LdrFindResourceDirectory_U@16 +;LdrFindResourceEx_U LdrFindResource_U@16 LdrGetDllHandle@16 +;LdrFlushAlternateResourceModules +;LdrGetDllHandle +;LdrGetDllHandleEx LdrGetProcedureAddress@16 +;LdrHotPatchRoutine +;LdrInitShimEngineDynamic LdrInitializeThunk@16 +;LdrLoadAlternateResourceModule LdrLoadDll@16 +;LdrLockLoaderLock +;LdrOpenImageFileOptionsKey LdrProcessRelocationBlock@16 LdrQueryImageFileExecutionOptions@24 +;LdrQueryImageFileExecutionOptionsEx +;LdrQueryImageFileKeyOption LdrQueryProcessModuleInformation@12 +;LdrSetAppCompatDllRedirectionCallback +;LdrSetDllManifestProber LdrShutdownProcess@0 LdrShutdownThread@0 +;LdrUnloadAlternateResourceModule LdrUnloadDll@4 +;LdrUnlockLoaderLock LdrVerifyImageMatchesChecksum@16 NlsAnsiCodePage DATA NlsMbCodePageTag DATA @@ -66,24 +127,36 @@ NtAcceptConnectPort@24 NtAccessCheck@32 NtAccessCheckAndAuditAlarm@44 +NtAccessCheckByType@44 +NtAccessCheckByTypeAndAuditAlarm@64 +NtAccessCheckByTypeResultList@44 +NtAccessCheckByTypeResultListAndAuditAlarm@64 +NtAccessCheckByTypeResultListAndAuditAlarmByHandle@68 NtAddAtom@12 NtAddBootEntry@8 +NtAddDriverEntry@8 NtAdjustGroupsToken@24 NtAdjustPrivilegesToken@24 NtAlertResumeThread@8 NtAlertThread@4 NtAllocateLocallyUniqueId@4 +NtAllocateUserPhysicalPages@12 NtAllocateUuids@16 NtAllocateVirtualMemory@24 +NtApphelpCacheControl@8 +NtAreMappedFilesTheSame@8 NtAssignProcessToJobObject@8 NtCallbackReturn@12 +NtCancelDeviceWakeupRequest@4 NtCancelIoFile@8 NtCancelTimer@8 NtClearEvent@4 NtClose@4 NtCloseObjectAuditAlarm@12 +NtCompactKeys@8 NtCompareTokens@12 NtCompleteConnectPort@4 +NtCompressKey@4 NtConnectPort@32 NtContinue@8 NtCreateDebugObject@16 @@ -93,13 +166,16 @@ NtCreateFile@44 NtCreateIoCompletion@16 NtCreateJobObject@12 +NtCreateJobSet@12 NtCreateKey@28 +NtCreateKeyedEvent@16 NtCreateMailslotFile@32 NtCreateMutant@16 NtCreateNamedPipeFile@56 NtCreatePagingFile@16 NtCreatePort@20 NtCreateProcess@32 +NtCreateProcessEx@36 NtCreateProfile@36 NtCreateSection@28 NtCreateSemaphore@20 @@ -109,9 +185,12 @@ NtCreateToken@52 NtCreateWaitablePort@20 NtCurrentTeb=_NtCurrentTeb@0 +NtDebugActiveProcess@8 NtDebugContinue@12 NtDelayExecution@8 NtDeleteAtom@4 +NtDeleteBootEntry@4 +NtDeleteDriverEntry@4 NtDeleteFile@4 NtDeleteKey@4 NtDeleteObjectAuditAlarm@12 @@ -120,34 +199,54 @@ NtDisplayString@4 NtDuplicateObject@28 NtDuplicateToken@24 +NtEnumerateBootEntries@8 +NtEnumerateDriverEntries@8 NtEnumerateKey@24 +NtEnumerateSystemEnvironmentValuesEx@12 NtEnumerateValueKey@24 NtExtendSection@8 +NtFilterToken@24 NtFindAtom@12 NtFlushBuffersFile@8 NtFlushInstructionCache@12 NtFlushKey@4 NtFlushVirtualMemory@16 NtFlushWriteBuffer@0 +NtFreeUserPhysicalPages@12 NtFreeVirtualMemory@16 NtFsControlFile@40 NtGetContextThread@8 +NtGetCurrentProcessorNumber@0 +NtGetDevicePowerState@8 NtGetPlugPlayEvent@16 +;NtGetTickCount +NtGetWriteWatch@28 NtImpersonateAnonymousToken@4 NtImpersonateClientOfPort@8 NtImpersonateThread@12 NtInitializeRegistry@4 +NtInitiatePowerAction@16 NtIsProcessInJob@8 +NtIsSystemResumeAutomatic@0 NtListenPort@8 NtLoadDriver@4 NtLoadKey@8 NtLoadKey2@12 +NtLoadKeyEx@16 NtLockFile@40 +NtLockProductActivationKeys@8 +NtLockRegistryKey@4 NtLockVirtualMemory@16 +NtMakePermanentObject@4 NtMakeTemporaryObject@4 +NtMapUserPhysicalPages@12 +NtMapUserPhysicalPagesScatter@12 NtMapViewOfSection@40 +NtModifyBootEntry@4 +NtModifyDriverEntry@4 NtNotifyChangeDirectoryFile@36 NtNotifyChangeKey@40 +NtNotifyChangeMultipleKeys@48 NtOpenDirectoryObject@12 NtOpenEvent@12 NtOpenEventPair@12 @@ -155,29 +254,35 @@ NtOpenIoCompletion@12 NtOpenJobObject@12 NtOpenKey@12 +NtOpenKeyedEvent@12 NtOpenMutant@12 NtOpenObjectAuditAlarm@48 NtOpenProcess@16 NtOpenProcessToken@12 +NtOpenProcessTokenEx@16 NtOpenSection@12 NtOpenSemaphore@12 NtOpenSymbolicLinkObject@12 NtOpenThread@16 NtOpenThreadToken@16 +NtOpenThreadTokenEx@20 NtOpenTimer@12 NtPlugPlayControl@12 NtPowerInformation@20 NtPrivilegeCheck@12 +NtPrivilegeObjectAuditAlarm@24 NtPrivilegedServiceAuditAlarm@20 -NtPrivilegeObjectAuditAlarm@24 NtProtectVirtualMemory@20 NtPulseEvent@8 NtQueryAttributesFile@8 +NtQueryBootEntryOrder@8 +NtQueryBootOptions@8 NtQueryDebugFilterState@8 NtQueryDefaultLocale@8 NtQueryDefaultUILanguage@4 NtQueryDirectoryFile@44 NtQueryDirectoryObject@28 +NtQueryDriverEntryOrder@8 NtQueryEaFile@36 NtQueryEvent@20 NtQueryFullAttributesFile@8 @@ -195,12 +300,17 @@ NtQueryMultipleValueKey@24 NtQueryMutant@20 NtQueryObject@20 +NtQueryOpenSubKeys@8 +NtQueryOpenSubKeysEx@16 NtQueryPerformanceCounter@8 +NtQueryPortInformationProcess@0 +NtQueryQuotaInformationFile@36 NtQuerySection@20 NtQuerySecurityObject@20 NtQuerySemaphore@20 NtQuerySymbolicLinkObject@12 NtQuerySystemEnvironmentValue@16 +NtQuerySystemEnvironmentValueEx@20 NtQuerySystemInformation@16 NtQuerySystemTime@4 NtQueryTimer@20 @@ -216,29 +326,41 @@ NtReadRequestData@24 NtReadVirtualMemory@20 NtRegisterThreadTerminatePort@4 +NtReleaseKeyedEvent@16 NtReleaseMutant@8 NtReleaseSemaphore@12 NtRemoveIoCompletion@20 +NtRemoveProcessDebug@8 +NtRenameKey@8 NtReplaceKey@12 NtReplyPort@8 NtReplyWaitReceivePort@16 NtReplyWaitReceivePortEx@20 NtReplyWaitReplyPort@8 +NtRequestDeviceWakeup@4 NtRequestPort@8 NtRequestWaitReplyPort@12 +NtRequestWakeupLatency@4 NtResetEvent@8 +NtResetWriteWatch@12 NtRestoreKey@12 NtResumeProcess@4 NtResumeThread@8 NtSaveKey@8 +NtSaveKeyEx@12 +NtSaveMergedKeys@12 NtSecureConnectPort@36 +NtSetBootEntryOrder@8 +NtSetBootOptions@8 NtSetContextThread@8 NtSetDebugFilterState@12 NtSetDefaultHardErrorPort@4 NtSetDefaultLocale@8 NtSetDefaultUILanguage@4 +NtSetDriverEntryOrder@8 NtSetEaFile@16 NtSetEvent@8 +NtSetEventBoostPriority@4 NtSetHighEventPair@4 NtSetHighWaitLowEventPair@4 NtSetInformationDebugObject@20 @@ -254,11 +376,14 @@ NtSetLdtEntries@24 NtSetLowEventPair@4 NtSetLowWaitHighEventPair@4 +NtSetQuotaInformationFile@16 NtSetSecurityObject@12 NtSetSystemEnvironmentValue@8 +NtSetSystemEnvironmentValueEx@8 NtSetSystemInformation@12 NtSetSystemPowerState@12 NtSetSystemTime@8 +NtSetThreadExecutionState@8 NtSetTimer@28 NtSetTimerResolution@12 NtSetUuidSeed@4 @@ -275,14 +400,20 @@ NtTerminateProcess@8 NtTerminateThread@8 NtTestAlert@0 +NtTraceEvent@16 +NtTranslateFilePath@16 NtUnloadDriver@4 NtUnloadKey@4 +NtUnloadKey2@8 +NtUnloadKeyEx@8 NtUnlockFile@20 NtUnlockVirtualMemory@16 NtUnmapViewOfSection@8 NtVdmControl@8 NtWaitForDebugEvent@16 +NtWaitForKeyedEvent@16 NtWaitForMultipleObjects@20 +NtWaitForMultipleObjects32@20 NtWaitForSingleObject@12 NtWaitHighEventPair@4 NtWaitLowEventPair@4 @@ -291,20 +422,22 @@ NtWriteRequestData@24 NtWriteVirtualMemory@20 NtYieldExecution@0 -NtGetCurrentProcessorNumber@0 ;PfxFindPrefix ;PfxInitialize ;PfxInsertPrefix ;PfxRemovePrefix ;PropertyLengthAsVariant -;RestoreEm87Context ;RtlAbortRXact RtlAbsoluteToSelfRelativeSD@12 RtlAcquirePebLock@0 +;RtlAcquirePrivilege RtlAcquireResourceExclusive@8 RtlAcquireResourceShared@8 RtlAcquireSRWLockExclusive@4 RtlAcquireSRWLockShared@4 +;RtlActivateActivationContext +;RtlActivateActivationContextEx +;RtlActivateActivationContextUnsafeFast RtlAddAccessAllowedAce@16 RtlAddAccessAllowedAceEx@20 RtlAddAccessAllowedObjectAce@28 @@ -320,9 +453,13 @@ RtlAddAuditAccessObjectAce@36 ;RtlAddCompoundAce RtlAddMandatoryAce@24 -RtlAddRange@36 +;RtlAddRefActivationContext +;RtlAddRefMemoryStream +;RtlAddVectoredContinueHandler RtlAddVectoredExceptionHandler@8 +;RtlAddressInSectionTable RtlAdjustPrivilege@16 +;RtlAllocateActivationContextStack RtlAllocateAndInitializeSid@44 RtlAllocateHandle@8 RtlAllocateHeap@12 @@ -330,6 +467,7 @@ RtlAnsiStringToUnicodeSize@4=RtlxAnsiStringToUnicodeSize@4 RtlAnsiStringToUnicodeString@12 RtlAppendAsciizToString@8 +;RtlAppendPathElement RtlAppendStringToString@8 RtlAppendUnicodeStringToString@8 RtlAppendUnicodeToString@8 @@ -340,11 +478,18 @@ RtlAreBitsClear@12 RtlAreBitsSet@12 RtlAssert@16 +;RtlCancelTimer +;RtlCaptureContext RtlCaptureStackBackTrace@16 +;RtlCaptureStackContext RtlCharToInteger@12 +;RtlCheckForOrphanedCriticalSections +;RtlCheckProcessParameters RtlCheckRegistryKey@8 RtlClearAllBits@4 RtlClearBits@12 +;RtlCloneMemoryStream +;RtlCommitMemoryStream RtlCompactHeap@8 RtlCompareMemory@12 RtlCompareMemoryUlong@12 @@ -352,30 +497,40 @@ RtlCompareUnicodeString@12 RtlCompressBuffer@32 RtlComputeCrc32@12 +;RtlComputeImportTableHash +;RtlComputePrivatizedDllName_U ;RtlConsoleMultiByteToUnicodeN RtlConvertExclusiveToShared@4 RtlConvertLongToLargeInteger@4 +;RtlConvertPropertyToVariant RtlConvertSharedToExclusive@4 RtlConvertSidToUnicodeString@12 +;RtlConvertToAutoInheritSecurityObject ;RtlConvertUiListToApiList RtlConvertUlongToLargeInteger@4 +;RtlConvertVariantToProperty RtlCopyLuid@8 RtlCopyLuidAndAttributesArray@12 -RtlCopyRangeList@8 +;RtlCopyMappedMemory +;RtlCopyMemoryStreamTo +;RtlCopyOutOfProcessMemoryStreamTo RtlCopySecurityDescriptor@8 RtlCopySid@12 RtlCopySidAndAttributesArray@28 RtlCopyString@8 RtlCopyUnicodeString@8 RtlCreateAcl@12 +;RtlCreateActivationContext ;RtlCreateAndSetSD RtlCreateAtomTable@8 +;RtlCreateBootStatusDataFile RtlCreateEnvironment@8 RtlCreateHeap@24 RtlCreateProcessParameters@40 RtlCreateQueryDebugBuffer@8 RtlCreateRegistryKey@8 RtlCreateSecurityDescriptor@8 +;RtlCreateSystemVolumeInformationFolder RtlCreateTagHeap@16 RtlCreateTimer@28 RtlCreateTimerQueue@4 @@ -387,9 +542,12 @@ RtlCustomCPToUnicodeN@24 RtlCutoverTimeToSystemTime@16 RtlDeNormalizeProcessParams@4 +;RtlDeactivateActivationContext RtlDecodePointer=RtlEncodePointer@4 +;RtlDecodeSystemPointer RtlDecompressBuffer@24 RtlDecompressFragment@32 +;RtlDefaultNpAcl RtlDelete@4 RtlDeleteAce@8 RtlDeleteAtomFromAtomTable@8 @@ -397,8 +555,6 @@ RtlDeleteElementGenericTable@8 RtlDeleteElementGenericTableAvl@8 RtlDeleteNoSplay@8 -RtlDeleteOwnersRanges@8 -RtlDeleteRange@24 RtlDeleteRegistryValue@12 RtlDeleteResource@4 RtlDeleteSecurityObject@4 @@ -415,16 +571,23 @@ RtlDestroyQueryDebugBuffer@4 RtlDetermineDosPathNameType_U@4 RtlDllShutdownInProgress@0 +;RtlDnsHostNameToComputerName RtlDoesFileExists_U@4 +;RtlDosApplyFileIsolationRedirection_Ustr RtlDosPathNameToNtPathName_U@16 +;RtlDosPathNameToNtPathName_U_WithStatus RtlDosPathNameToRelativeNtPathName_U@16 +;RtlDosPathNameToRelativeNtPathName_U_WithStatus RtlDosSearchPath_U@24 +;RtlDosSearchPath_Ustr RtlDowncaseUnicodeChar@4 RtlDowncaseUnicodeString@12 RtlDumpResource@4 RtlDuplicateUnicodeString@12 RtlEmptyAtomTable@8 +;RtlEnableEarlyCriticalSectionEventCreation RtlEncodePointer@4 +;RtlEncodeSystemPointer RtlEnlargedIntegerMultiply@8 RtlEnlargedUnsignedDivide@16 RtlEnlargedUnsignedMultiply@8 @@ -451,47 +614,60 @@ RtlExtendedMagicDivide@20 RtlFillMemory@12 RtlFillMemoryUlong@12 +;RtlFinalReleaseOutOfProcessMemoryStream +;RtlFindActivationContextSectionGuid +;RtlFindActivationContextSectionString +;RtlFindCharInUnicodeString RtlFindClearBits@12 RtlFindClearBitsAndSet@12 RtlFindClearRuns@16 RtlFindLastBackwardRunClear@12 RtlFindLeastSignificantBit@8 RtlFindLongestRunClear@8 -RtlFindLongestRunSet@8 RtlFindMessage@20 RtlFindMostSignificantBit@8 RtlFindNextForwardRunClear@12 -RtlFindRange@48 RtlFindSetBits@12 RtlFindSetBitsAndClear@12 +;RtlFirstEntrySList RtlFirstFreeAce@8 +;RtlFlushSecureMemoryCache RtlFormatCurrentUserKeyPath@4 RtlFormatMessage@32 +;RtlFormatMessageEx +;RtlFreeActivationContextStack RtlFreeAnsiString@4 RtlFreeHandle@8 RtlFreeHeap@12 RtlFreeOemString@4 -RtlFreeRangeList@4 RtlFreeSid@4 +;RtlFreeThreadActivationContextStack RtlFreeUnicodeString@4 RtlFreeUserThreadStack@8 RtlGUIDFromString@8 RtlGenerate8dot3Name@16 RtlGetAce@12 +;RtlGetActiveActivationContext ;RtlGetCallersAddress RtlGetCompressionWorkSpaceSize@12 RtlGetControlSecurityDescriptor@12 +;RtlGetCriticalSectionRecursionCount RtlGetCurrentDirectory_U@8 +;RtlGetCurrentPeb +;RtlGetCurrentProcessorNumber RtlGetDaclSecurityDescriptor@16 RtlGetElementGenericTable@8 RtlGetElementGenericTableAvl@8 -RtlGetFirstRange@12 +;RtlGetFrame RtlGetFullPathName_U@16 +;RtlGetFullPathName_UstrEx RtlGetGroupSecurityDescriptor@12 RtlGetLastNtStatus@0 RtlGetLastWin32Error@0 +;RtlGetLengthWithoutLastFullDosOrNtPathElement +;RtlGetLengthWithoutTrailingPathSeperators RtlGetLongestNtPathLength@0 -RtlGetNextRange@12 +;RtlGetNativeSystemInformation RtlGetNtGlobalFlags@0 RtlGetNtProductType@4 RtlGetNtVersionNumbers@12 @@ -500,18 +676,24 @@ RtlGetSaclSecurityDescriptor@16 RtlGetSecurityDescriptorRMControl@8 RtlGetSetBootStatusData@24 +;RtlGetThreadErrorMode +;RtlGetUnloadEventTrace RtlGetUserInfoHeap@20 RtlGetVersion@4 RtlHashUnicodeString@16 RtlIdentifierAuthoritySid@4 RtlImageDirectoryEntryToData@16 RtlImageNtHeader@4 +;RtlImageNtHeaderEx RtlImageRvaToSection@12 RtlImageRvaToVa@16 RtlImpersonateSelf@4 RtlInitAnsiString@8 +;RtlInitAnsiStringEx RtlInitCodePageTable@8 +;RtlInitMemoryStream RtlInitNlsTables@16 +;RtlInitOutOfProcessMemoryStream RtlInitString@8 RtlInitUnicodeString@8 RtlInitUnicodeStringEx@8 @@ -524,9 +706,9 @@ RtlInitializeGenericTable@20 RtlInitializeGenericTableAvl@20 RtlInitializeHandleTable@12 -RtlInitializeRangeList@4 +;RtlInitializeRXact RtlInitializeResource@4 -;RtlInitializeRXact +;RtlInitializeSListHead RtlInitializeSid@12 RtlInitializeSRWLock@4 RtlInsertElementGenericTable@16 @@ -536,7 +718,11 @@ RtlInt64ToUnicodeString@16 RtlIntegerToChar@16 RtlIntegerToUnicodeString@12 -RtlInvertRangeList@8 +;RtlInterlockedCompareExchange64 +;RtlInterlockedFlushSList +;RtlInterlockedPopEntrySList +;RtlInterlockedPushEntrySList +;RtlInterlockedPushListSList RtlIpv4AddressToStringA@8 RtlIpv4AddressToStringExA@16 RtlIpv4AddressToStringExW@16 @@ -553,12 +739,15 @@ RtlIpv6StringToAddressExA@16 RtlIpv6StringToAddressExW@16 RtlIpv6StringToAddressW@12 +;RtlIsActivationContextActive +;RtlIsCriticalSectionLocked +;RtlIsCriticalSectionLockedByThread RtlIsDosDeviceName_U@4 RtlIsGenericTableEmpty@4 RtlIsGenericTableEmptyAvl@4 RtlIsNameLegalDOS8Dot3@12 -RtlIsRangeAvailable@40 RtlIsTextUnicode@12 +;RtlIsThreadWithinLoaderCallout RtlIsValidHandle@8 RtlIsValidIndexHandle@12 RtlLargeIntegerAdd@16 @@ -576,6 +765,8 @@ RtlLocalTimeToSystemTime@8 RtlLockBootStatusData@4 RtlLockHeap@4 +;RtlLockMemoryStreamRegion +;RtlLogStackBackTrace RtlLookupAtomInAtomTable@12 RtlLookupElementGenericTable@8 RtlLookupElementGenericTableAvl@8 @@ -583,16 +774,22 @@ RtlLookupElementGenericTableFullAvl@16 RtlMakeSelfRelativeSD@12 RtlMapGenericMask@8 -RtlMergeRangeLists@16 +;RtlMapSecurityErrorToNtStatus RtlMoveMemory@12 +;RtlMultiAppendUnicodeStringBuffer RtlMultiByteToUnicodeN@20 RtlMultiByteToUnicodeSize@12 +;RtlMultipleAllocateHeap +;RtlMultipleFreeHeap ;RtlNewInstanceSecurityObject ;RtlNewSecurityGrantedAccess RtlNewSecurityObject@24 +;RtlNewSecurityObjectEx +;RtlNewSecurityObjectWithMultipleInheritance RtlNormalizeProcessParams@4 RtlNtPathNameToDosPathName@16 RtlNtStatusToDosError@4 +;RtlNtStatusToDosErrorNoTeb RtlNumberGenericTableElements@4 RtlNumberGenericTableElementsAvl@4 RtlNumberOfClearBits@4 @@ -603,12 +800,19 @@ RtlOpenCurrentUser@8 RtlPcToFileHeader@8 RtlPinAtomInAtomTable@8 +;RtlPopFrame RtlPrefixString@12 RtlPrefixUnicodeString@12 ;RtlProtectHeap +;RtlPushFrame RtlQueryAtomInAtomTable@24 +;RtlQueryDepthSList RtlQueryEnvironmentVariable_U@12 +;RtlQueryHeapInformation RtlQueryInformationAcl@16 +;RtlQueryInformationActivationContext +;RtlQueryInformationActiveActivationContext +;RtlQueryInterfaceMemoryStream ;RtlQueryProcessBackTraceInformation RtlQueryProcessDebugInformation@12 ;RtlQueryProcessHeapInformation @@ -617,30 +821,40 @@ RtlQuerySecurityObject@20 RtlQueryTagHeap@20 RtlQueryTimeZoneInformation@4 +;RtlQueueApcWow64Thread RtlQueueWorkItem@12 RtlRaiseException@4 RtlRaiseStatus@4 RtlRandom@4 RtlRandomEx=RtlRandom@4 RtlReAllocateHeap@16 +;RtlReadMemoryStream +;RtlReadOutOfProcessMemoryStream RtlRealPredecessor@4 RtlRealSuccessor@4 +;RtlRegisterSecureMemoryCacheCallback RtlRegisterWait@24 +;RtlReleaseActivationContext +;RtlReleaseMemoryStream RtlReleasePebLock@0 +;RtlReleasePrivilege RtlReleaseRelativeName@4 RtlReleaseResource@4 RtlReleaseSRWLockExclusive@4 RtlReleaseSRWLockShared@4 ;RtlRemoteCall +;RtlRemoveVectoredContinueHandler RtlRemoveVectoredExceptionHandler@4 RtlResetRtlTranslations@4 RtlRestoreLastWin32Error@4=RtlSetLastWin32Error@4 +;RtlRevertMemoryStream RtlRunDecodeUnicodeString@8 RtlRunEncodeUnicodeString@8 RtlSecondsSince1970ToTime@8 RtlSecondsSince1980ToTime@8 +;RtlSeekMemoryStream +RtlSelfRelativeToAbsoluteSD@44 RtlSelfRelativeToAbsoluteSD2@8 -RtlSelfRelativeToAbsoluteSD@44 RtlSetAllBits@4 RtlSetAttributesSecurityDescriptor@12 RtlSetBits@12 @@ -649,17 +863,27 @@ RtlSetCurrentDirectory_U@4 RtlSetCurrentEnvironment@8 RtlSetDaclSecurityDescriptor@16 +;RtlSetEnvironmentStrings RtlSetEnvironmentVariable@12 RtlSetGroupSecurityDescriptor@12 +;RtlSetHeapInformation RtlSetInformationAcl@16 +;RtlSetIoCompletionCallback RtlSetLastWin32Error@4 RtlSetLastWin32ErrorAndNtStatusFromNtStatus@4 +;RtlSetMemoryStreamSize RtlSetOwnerSecurityDescriptor@12 RtlSetProcessIsCritical@12 RtlSetSaclSecurityDescriptor@16 RtlSetSecurityDescriptorRMControl@8 RtlSetSecurityObject@20 +;RtlSetSecurityObjectEx +;RtlSetThreadErrorMode +;RtlSetThreadIsCritical +;RtlSetThreadPoolStartFunc RtlSetTimeZoneInformation@4 +;RtlSetTimer +;RtlSetUnhandledExceptionFilter ;RtlSetUnicodeCallouts RtlSetUserFlagsHeap@16 RtlSetUserValueHeap@16 @@ -668,6 +892,7 @@ RtlSleepConditionVariableSRW@16 RtlSplay@4 ;RtlStartRXact +;RtlStatMemoryStream RtlStringFromGUID@8 RtlSubAuthorityCountSid@4 RtlSubAuthoritySid@8 @@ -679,10 +904,19 @@ RtlTimeToSecondsSince1970@8 RtlTimeToSecondsSince1980@8 RtlTimeToTimeFields@8 +;RtlTraceDatabaseAdd +;RtlTraceDatabaseCreate +;RtlTraceDatabaseDestroy +;RtlTraceDatabaseEnumerate +;RtlTraceDatabaseFind +;RtlTraceDatabaseLock +;RtlTraceDatabaseUnlock +;RtlTraceDatabaseValidate RtlTryEnterCriticalSection@4 @RtlUlongByteSwap@4 @RtlUlonglongByteSwap@8 RtlUnhandledExceptionFilter@4 +;RtlUnhandledExceptionFilter2 RtlUnicodeStringToAnsiSize@4=RtlxUnicodeStringToAnsiSize@4 RtlUnicodeStringToAnsiString@12 RtlUnicodeStringToCountedOemString@12 @@ -696,6 +930,7 @@ RtlUniform@4 RtlUnlockBootStatusData@4 RtlUnlockHeap@4 +;RtlUnlockMemoryStreamRegion RtlUnwind@16 RtlUpcaseUnicodeChar@4 RtlUpcaseUnicodeString@12 @@ -718,13 +953,21 @@ RtlValidateProcessHeaps@0 RtlValidateUnicodeString@8 RtlVerifyVersionInfo@16 +;RtlWalkFrameChain ;RtlWalkHeap +;RtlWow64EnableFsRedirection +;RtlWow64EnableFsRedirectionEx RtlWakeAllConditionVariable@4 RtlWakeConditionVariable@4 RtlWriteRegistryValue@24 +;RtlWriteMemoryStream +;RtlWriteRegistryValue ;RtlZeroHeap RtlZeroMemory@8 +;RtlZombifyActivationContext +;RtlpApplyLengthFunction RtlpEnsureBufferSize@12 +;RtlpNotOwnerCriticalSection RtlpNtCreateKey@24 RtlpNtEnumerateSubKey@16 RtlpNtMakeTemporaryKey@4 @@ -737,28 +980,39 @@ RtlxOemStringToUnicodeSize@4 RtlxUnicodeStringToAnsiSize@4 RtlxUnicodeStringToOemSize@4 -;SaveEm87Context VerSetConditionMask@16 ZwAcceptConnectPort@24 ZwAccessCheck@32 ZwAccessCheckAndAuditAlarm@44 +ZwAccessCheckByType@44 +ZwAccessCheckByTypeAndAuditAlarm@64 +ZwAccessCheckByTypeResultList@44 +ZwAccessCheckByTypeResultListAndAuditAlarm@64 +ZwAccessCheckByTypeResultListAndAuditAlarmByHandle@68 ZwAddAtom@12 +ZwAddBootEntry@8 +ZwAddDriverEntry@8 ZwAdjustGroupsToken@24 ZwAdjustPrivilegesToken@24 ZwAlertResumeThread@8 ZwAlertThread@4 ZwAllocateLocallyUniqueId@4 +ZwAllocateUserPhysicalPages@12 ZwAllocateUuids@16 ZwAllocateVirtualMemory@24 +ZwApphelpCacheControl@8 ZwAssignProcessToJobObject@8 ZwCallbackReturn@12 +ZwCancelDeviceWakeupRequest@4 ZwCancelIoFile@8 ZwCancelTimer@8 ZwClearEvent@4 ZwClose@4 ZwCloseObjectAuditAlarm@12 +ZwCompactKeys@8 ZwCompareTokens@12 ZwCompleteConnectPort@4 +ZwCompressKey@4 ZwConnectPort@32 ZwContinue@8 ZwCreateDebugObject@16 @@ -768,13 +1022,16 @@ ZwCreateFile@44 ZwCreateIoCompletion@16 ZwCreateJobObject@12 +ZwCreateJobSet@12 ZwCreateKey@28 +ZwCreateKeyedEvent@16 ZwCreateMailslotFile@32 ZwCreateMutant@16 ZwCreateNamedPipeFile@56 ZwCreatePagingFile@16 ZwCreatePort@20 ZwCreateProcess@32 +ZwCreateProcessEx@36 ZwCreateProfile@36 ZwCreateSection@28 ZwCreateSemaphore@20 @@ -783,9 +1040,12 @@ ZwCreateTimer@16 ZwCreateToken@52 ZwCreateWaitablePort@20 +ZwDebugActiveProcess@8 ZwDebugContinue@12 ZwDelayExecution@8 ZwDeleteAtom@4 +ZwDeleteBootEntry@4 +ZwDeleteDriverEntry@4 ZwDeleteFile@4 ZwDeleteKey@4 ZwDeleteObjectAuditAlarm@12 @@ -794,9 +1054,13 @@ ZwDisplayString@4 ZwDuplicateObject@28 ZwDuplicateToken@24 +ZwEnumerateBootEntries@8 +ZwEnumerateDriverEntries@8 ZwEnumerateKey@24 +ZwEnumerateSystemEnvironmentValuesEx@12 ZwEnumerateValueKey@24 ZwExtendSection@8 +ZwFilterToken@24 ZwFindAtom@12 ZwFlushBuffersFile@8 ZwFlushInstructionCache@12 @@ -806,22 +1070,36 @@ ZwFreeVirtualMemory@16 ZwFsControlFile@40 ZwGetContextThread@8 +ZwGetCurrentProcessorNumber@0 +ZwGetDevicePowerState@8 ZwGetPlugPlayEvent@16 +ZwGetWriteWatch@28 ZwImpersonateAnonymousToken@4 ZwImpersonateClientOfPort@8 ZwImpersonateThread@12 ZwInitializeRegistry@4 +ZwInitiatePowerAction@16 ZwIsProcessInJob@8 +ZwIsSystemResumeAutomatic@0 ZwListenPort@8 ZwLoadDriver@4 ZwLoadKey@8 ZwLoadKey2@12 +ZwLoadKeyEx@16 ZwLockFile@40 +ZwLockProductActivationKeys@8 +ZwLockRegistryKey@4 ZwLockVirtualMemory@16 +ZwMakePermanentObject@4 ZwMakeTemporaryObject@4 +ZwMapUserPhysicalPages@12 +ZwMapUserPhysicalPagesScatter@12 ZwMapViewOfSection@40 +ZwModifyBootEntry@4 +ZwModifyDriverEntry@4 ZwNotifyChangeDirectoryFile@36 ZwNotifyChangeKey@40 +ZwNotifyChangeMultipleKeys@48 ZwOpenDirectoryObject@12 ZwOpenEvent@12 ZwOpenEventPair@12 @@ -829,29 +1107,35 @@ ZwOpenIoCompletion@12 ZwOpenJobObject@12 ZwOpenKey@12 +ZwOpenKeyedEvent@12 ZwOpenMutant@12 ZwOpenObjectAuditAlarm@48 ZwOpenProcess@16 ZwOpenProcessToken@12 +ZwOpenProcessTokenEx@16 ZwOpenSection@12 ZwOpenSemaphore@12 ZwOpenSymbolicLinkObject@12 ZwOpenThread@16 ZwOpenThreadToken@16 +ZwOpenThreadTokenEx@20 ZwOpenTimer@12 ZwPlugPlayControl@12 ZwPowerInformation@20 ZwPrivilegeCheck@12 +ZwPrivilegeObjectAuditAlarm@24 ZwPrivilegedServiceAuditAlarm@20 -ZwPrivilegeObjectAuditAlarm@24 ZwProtectVirtualMemory@20 ZwPulseEvent@8 ZwQueryAttributesFile@8 +ZwQueryBootEntryOrder@8 +ZwQueryBootOptions@8 ZwQueryDebugFilterState@8 ZwQueryDefaultLocale@8 ZwQueryDefaultUILanguage@4 ZwQueryDirectoryFile@44 ZwQueryDirectoryObject@28 +ZwQueryDriverEntryOrder@8 ZwQueryEaFile@36 ZwQueryEvent@20 ZwQueryFullAttributesFile@8 @@ -869,12 +1153,17 @@ ZwQueryMultipleValueKey@24 ZwQueryMutant@20 ZwQueryObject@20 +ZwQueryOpenSubKeys@8 +ZwQueryOpenSubKeysEx@16 ZwQueryPerformanceCounter@8 +ZwQueryPortInformationProcess@0 +ZwQueryQuotaInformationFile@36 ZwQuerySection@20 ZwQuerySecurityObject@20 ZwQuerySemaphore@20 ZwQuerySymbolicLinkObject@12 ZwQuerySystemEnvironmentValue@16 +ZwQuerySystemEnvironmentValueEx@20 ZwQuerySystemInformation@16 ZwQuerySystemTime@4 ZwQueryTimer@20 @@ -890,29 +1179,41 @@ ZwReadRequestData@24 ZwReadVirtualMemory@20 ZwRegisterThreadTerminatePort@4 +ZwReleaseKeyedEvent@16 ZwReleaseMutant@8 ZwReleaseSemaphore@12 ZwRemoveIoCompletion@20 +ZwRemoveProcessDebug@8 +ZwRenameKey@8 ZwReplaceKey@12 ZwReplyPort@8 ZwReplyWaitReceivePort@16 ZwReplyWaitReceivePortEx@20 ZwReplyWaitReplyPort@8 +ZwRequestDeviceWakeup@4 ZwRequestPort@8 ZwRequestWaitReplyPort@12 +ZwRequestWakeupLatency@4 ZwResetEvent@8 +ZwResetWriteWatch@12 ZwRestoreKey@12 ZwResumeProcess@4 ZwResumeThread@8 ZwSaveKey@8 +ZwSaveKeyEx@12 +ZwSaveMergedKeys@12 ZwSecureConnectPort@36 +ZwSetBootEntryOrder@8 +ZwSetBootOptions@8 ZwSetContextThread@8 ZwSetDebugFilterState@12 ZwSetDefaultHardErrorPort@4 ZwSetDefaultLocale@8 ZwSetDefaultUILanguage@4 +ZwSetDriverEntryOrder@8 ZwSetEaFile@16 ZwSetEvent@8 +ZwSetEventBoostPriority@4 ZwSetHighEventPair@4 ZwSetHighWaitLowEventPair@4 ZwSetInformationDebugObject@20 @@ -928,11 +1229,14 @@ ZwSetLdtEntries@24 ZwSetLowEventPair@4 ZwSetLowWaitHighEventPair@4 +ZwSetQuotaInformationFile@16 ZwSetSecurityObject@12 ZwSetSystemEnvironmentValue@8 +ZwSetSystemEnvironmentValueEx@8 ZwSetSystemInformation@12 ZwSetSystemPowerState@12 ZwSetSystemTime@8 +ZwSetThreadExecutionState@8 ZwSetTimer@28 ZwSetTimerResolution@12 ZwSetUuidSeed@4 @@ -949,14 +1253,20 @@ ZwTerminateProcess@8 ZwTerminateThread@8 ZwTestAlert@0 +ZwTraceEvent@16 +ZwTranslateFilePath@16 ZwUnloadDriver@4 ZwUnloadKey@4 +ZwUnloadKey2@8 +ZwUnloadKeyEx@8 ZwUnlockFile@20 ZwUnlockVirtualMemory@16 ZwUnmapViewOfSection@8 ZwVdmControl@8 ZwWaitForDebugEvent@16 +ZwWaitForKeyedEvent@16 ZwWaitForMultipleObjects@20 +ZwWaitForMultipleObjects32@20 ZwWaitForSingleObject@12 ZwWaitHighEventPair@4 ZwWaitLowEventPair@4 @@ -965,11 +1275,17 @@ ZwWriteRequestData@24 ZwWriteVirtualMemory@20 ZwYieldExecution@0 +;_CIcos +;_CIlog +;_CIpow +;_CIsin +;_CIsqrt __isascii __iscsym __iscsymf __toascii _alldiv +;_alldvrm _allmul _alloca_probe _allrem @@ -977,6 +1293,7 @@ _allshr _atoi64 _aulldiv +;_aulldvrm _aullrem _aullshr _chkstk @@ -1005,11 +1322,13 @@ _ui64tow _ultoa _ultow +;_vscwprintf _vsnprintf _vsnwprintf _wcsicmp _wcslwr _wcsnicmp +;_wcstoui64 _wcsupr _wtoi _wtoi64 @@ -1069,15 +1388,15 @@ strstr strtol strtoul -strtoull swprintf tan tolower toupper towlower towupper +vDbgPrintEx@16 +vDbgPrintExWithPrefix@20 vsprintf -vDbgPrintExWithPrefix@20 wcscat wcschr wcscmp @@ -1094,4 +1413,3 @@ wcstol wcstombs wcstoul -; EOF
16 years, 3 months
1
0
0
0
[fireball] 35831: - Fix over-reading the input buffer (sometimes by even more than 400 bytes), and hashing random pool contents instead of the specified buffer.
by fireball@svn.reactos.org
Author: fireball Date: Sun Aug 31 06:55:17 2008 New Revision: 35831 URL:
http://svn.reactos.org/svn/reactos?rev=35831&view=rev
Log: - Fix over-reading the input buffer (sometimes by even more than 400 bytes), and hashing random pool contents instead of the specified buffer. Modified: trunk/reactos/ntoskrnl/ob/obsdcach.c Modified: trunk/reactos/ntoskrnl/ob/obsdcach.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ob/obsdcach.c?rev…
============================================================================== --- trunk/reactos/ntoskrnl/ob/obsdcach.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ob/obsdcach.c [iso-8859-1] Sun Aug 31 06:55:17 2008 @@ -81,11 +81,12 @@ PULONG p, pp; PUCHAR pb, ppb; ULONG Hash = 0; - + /* Setup aligned and byte buffers */ p = Buffer; + pb = (PUCHAR)p; ppb = (PUCHAR)((ULONG_PTR)Buffer + Length); - pp = (PULONG)ALIGN_DOWN(p + Length, ULONG); + pp = (PULONG)ALIGN_DOWN(pb + Length, ULONG); /* Loop aligned data */ while (p < pp) @@ -94,7 +95,7 @@ Hash ^= *p++; Hash = _rotl(Hash, 3); } - + /* Loop non-aligned data */ pb = (PUCHAR)p; while (pb < ppb)
16 years, 3 months
1
0
0
0
[gbrunmar] 35830: D3D9: * Replaced depricated IsBadWritePtr() call to a simple NULL check instead (see http://blogs.msdn.com/oldnewthing/archive/2006/09/27/773741.aspx for more info) * Implemented correct device hierarchy for the HAL Device
by gbrunmar@svn.reactos.org
Author: gbrunmar Date: Sun Aug 31 06:36:55 2008 New Revision: 35830 URL:
http://svn.reactos.org/svn/reactos?rev=35830&view=rev
Log: D3D9: * Replaced depricated IsBadWritePtr() call to a simple NULL check instead (see
http://blogs.msdn.com/oldnewthing/archive/2006/09/27/773741.aspx
for more info) * Implemented correct device hierarchy for the HAL Device Added: trunk/reactos/dll/directx/d3d9/d3d9_haldevice.c (with props) trunk/reactos/dll/directx/d3d9/d3d9_haldevice.h (with props) trunk/reactos/dll/directx/d3d9/d3d9_puredevice.c (with props) trunk/reactos/dll/directx/d3d9/d3d9_puredevice.h (with props) Modified: trunk/reactos/dll/directx/d3d9/d3d9.rbuild trunk/reactos/dll/directx/d3d9/d3d9_device.c trunk/reactos/dll/directx/d3d9/d3d9_device.h trunk/reactos/dll/directx/d3d9/d3d9_impl.c trunk/reactos/dll/directx/d3d9/d3d9_surface.h trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c trunk/reactos/dll/directx/d3d9/device.c trunk/reactos/dll/directx/d3d9/device.h [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/directx/d3d9/d3d9.rbuild URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9.rbui…
Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_devi…
Modified: trunk/reactos/dll/directx/d3d9/d3d9_device.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_devi…
Added: trunk/reactos/dll/directx/d3d9/d3d9_haldevice.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_hald…
Added: trunk/reactos/dll/directx/d3d9/d3d9_haldevice.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_hald…
Modified: trunk/reactos/dll/directx/d3d9/d3d9_impl.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_impl…
Added: trunk/reactos/dll/directx/d3d9/d3d9_puredevice.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_pure…
Added: trunk/reactos/dll/directx/d3d9/d3d9_puredevice.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_pure…
Modified: trunk/reactos/dll/directx/d3d9/d3d9_surface.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_surf…
Modified: trunk/reactos/dll/directx/d3d9/d3d9_swapchain.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/d3d9_swap…
Modified: trunk/reactos/dll/directx/d3d9/device.c URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/device.c?…
Modified: trunk/reactos/dll/directx/d3d9/device.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/d3d9/device.h?…
16 years, 3 months
1
0
0
0
[sserapion] 35828: Minor WIN64 fixes.
by sserapion@svn.reactos.org
Author: sserapion Date: Sat Aug 30 22:18:20 2008 New Revision: 35828 URL:
http://svn.reactos.org/svn/reactos?rev=35828&view=rev
Log: Minor WIN64 fixes. Modified: branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/listen.c branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/lock.c branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/main.c branches/ros-amd64-bringup/reactos/drivers/network/dd/pcnet/pcnet.c Modified: branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/listen.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive…
============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Sat Aug 30 22:18:20 2008 @@ -299,7 +299,7 @@ RemoveEntryList( PendingConn ); Status = ObReferenceObjectByHandle - ( (HANDLE)AcceptData->ListenHandle, + ( (HANDLE)(ULONG_PTR)AcceptData->ListenHandle, FILE_ALL_ACCESS, NULL, KernelMode, Modified: branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/lock.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive…
============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Sat Aug 30 22:18:20 2008 @@ -140,7 +140,7 @@ HandleArray[i].Events = HandleArray[i].Events; FileObjects[i].Handle = 0; Status = ObReferenceObjectByHandle - ( (PVOID)HandleArray[i].Handle, + ( (PVOID)(ULONG_PTR)HandleArray[i].Handle, FILE_ALL_ACCESS, NULL, KernelMode, @@ -156,7 +156,7 @@ for( i = 0; i < HandleCount; i++ ) { if( HandleArray[i].Handle ) - ObDereferenceObject( (PVOID)HandleArray[i].Handle ); + ObDereferenceObject( (PVOID)(ULONG_PTR)HandleArray[i].Handle ); } ExFreePool( HandleArray ); Modified: branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/main.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive…
============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Sat Aug 30 22:18:20 2008 @@ -30,7 +30,7 @@ for( i = 0; i < Len; i++ ) { if( i && !(i & 0xf) ) DbgPrint( "\n" ); - if( !(i & 0xf) ) DbgPrint( "%08x: ", (UINT)(Data + i) ); + if( !(i & 0xf) ) DbgPrint( "%08x: ", (UINT_PTR)(Data + i) ); DbgPrint( " %02x", Data[i] & 0xff ); } DbgPrint("\n"); Modified: branches/ros-amd64-bringup/reactos/drivers/network/dd/pcnet/pcnet.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/drive…
============================================================================== --- branches/ros-amd64-bringup/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/drivers/network/dd/pcnet/pcnet.c [iso-8859-1] Sat Aug 30 22:18:20 2008 @@ -137,7 +137,7 @@ RtlZeroMemory(Descriptor, sizeof(RECEIVE_DESCRIPTOR)); Descriptor->RBADR = - (ULONG)(Adapter->ReceiveBufferPtrPhys + Adapter->CurrentReceiveDescriptorIndex * BUFFER_SIZE); + (ULONG_PTR)(Adapter->ReceiveBufferPtrPhys + Adapter->CurrentReceiveDescriptorIndex * BUFFER_SIZE); Descriptor->BCNT = (-BUFFER_SIZE) | 0xf000; Descriptor->FLAGS |= RD_OWN; @@ -323,14 +323,14 @@ return NDIS_STATUS_RESOURCES; } - if(((ULONG)Adapter->InitializationBlockVirt & 0x00000003) != 0) + if(((ULONG_PTR)Adapter->InitializationBlockVirt & 0x00000003) != 0) { DPRINT("address 0x%x not dword-aligned\n", Adapter->InitializationBlockVirt); BREAKPOINT; return NDIS_STATUS_RESOURCES; } - Adapter->InitializationBlockPhys = (PINITIALIZATION_BLOCK)NdisGetPhysicalAddressLow(PhysicalAddress); + Adapter->InitializationBlockPhys = (PINITIALIZATION_BLOCK)(ptrdiff_t)NdisGetPhysicalAddressLow(PhysicalAddress); /* allocate the transport descriptor ring */ Adapter->TransmitDescriptorRingLength = sizeof(TRANSMIT_DESCRIPTOR) * NUMBER_OF_BUFFERS; @@ -343,14 +343,14 @@ return NDIS_STATUS_RESOURCES; } - if(((ULONG)Adapter->TransmitDescriptorRingVirt & 0x00000003) != 0) + if(((ULONG_PTR)Adapter->TransmitDescriptorRingVirt & 0x00000003) != 0) { DPRINT("address 0x%x not dword-aligned\n", Adapter->TransmitDescriptorRingVirt); BREAKPOINT; return NDIS_STATUS_RESOURCES; } - Adapter->TransmitDescriptorRingPhys = (PTRANSMIT_DESCRIPTOR)NdisGetPhysicalAddressLow(PhysicalAddress); + Adapter->TransmitDescriptorRingPhys = (PTRANSMIT_DESCRIPTOR)(ptrdiff_t)NdisGetPhysicalAddressLow(PhysicalAddress); RtlZeroMemory(Adapter->TransmitDescriptorRingVirt, sizeof(TRANSMIT_DESCRIPTOR) * NUMBER_OF_BUFFERS); /* allocate the receive descriptor ring */ @@ -364,14 +364,14 @@ return NDIS_STATUS_RESOURCES; } - if(((ULONG)Adapter->ReceiveDescriptorRingVirt & 0x00000003) != 0) + if(((ULONG_PTR)Adapter->ReceiveDescriptorRingVirt & 0x00000003) != 0) { DPRINT("address 0x%x not dword-aligned\n", Adapter->ReceiveDescriptorRingVirt); BREAKPOINT; return NDIS_STATUS_RESOURCES; } - Adapter->ReceiveDescriptorRingPhys = (PRECEIVE_DESCRIPTOR)NdisGetPhysicalAddressLow(PhysicalAddress); + Adapter->ReceiveDescriptorRingPhys = (PRECEIVE_DESCRIPTOR)(ptrdiff_t)NdisGetPhysicalAddressLow(PhysicalAddress); RtlZeroMemory(Adapter->ReceiveDescriptorRingVirt, sizeof(RECEIVE_DESCRIPTOR) * NUMBER_OF_BUFFERS); /* allocate transmit buffers */ @@ -385,14 +385,14 @@ return NDIS_STATUS_RESOURCES; } - if(((ULONG)Adapter->TransmitBufferPtrVirt & 0x00000003) != 0) + if(((ULONG_PTR)Adapter->TransmitBufferPtrVirt & 0x00000003) != 0) { DPRINT("address 0x%x not dword-aligned\n", Adapter->TransmitBufferPtrVirt); BREAKPOINT; return NDIS_STATUS_RESOURCES; } - Adapter->TransmitBufferPtrPhys = (PCHAR)NdisGetPhysicalAddressLow(PhysicalAddress); + Adapter->TransmitBufferPtrPhys = (PCHAR)(ULONG_PTR)NdisGetPhysicalAddressLow(PhysicalAddress); RtlZeroMemory(Adapter->TransmitBufferPtrVirt, BUFFER_SIZE * NUMBER_OF_BUFFERS); /* allocate receive buffers */ @@ -406,21 +406,21 @@ return NDIS_STATUS_RESOURCES; } - if(((ULONG)Adapter->ReceiveBufferPtrVirt & 0x00000003) != 0) + if(((ULONG_PTR)Adapter->ReceiveBufferPtrVirt & 0x00000003) != 0) { DPRINT("address 0x%x not dword-aligned\n", Adapter->ReceiveBufferPtrVirt); BREAKPOINT; return NDIS_STATUS_RESOURCES; } - Adapter->ReceiveBufferPtrPhys = (PCHAR)NdisGetPhysicalAddressLow(PhysicalAddress); + Adapter->ReceiveBufferPtrPhys = (PCHAR)(ULONG_PTR)NdisGetPhysicalAddressLow(PhysicalAddress); RtlZeroMemory(Adapter->ReceiveBufferPtrVirt, BUFFER_SIZE * NUMBER_OF_BUFFERS); /* initialize tx descriptors */ TransmitDescriptor = Adapter->TransmitDescriptorRingVirt; for(i = 0; i < NUMBER_OF_BUFFERS; i++) { - (TransmitDescriptor+i)->TBADR = (ULONG)Adapter->TransmitBufferPtrPhys + i * BUFFER_SIZE; + (TransmitDescriptor+i)->TBADR = (ULONG_PTR)Adapter->TransmitBufferPtrPhys + i * BUFFER_SIZE; (TransmitDescriptor+i)->BCNT = 0xf000 | -BUFFER_SIZE; /* 2's compliment + set top 4 bits */ (TransmitDescriptor+i)->FLAGS = TD1_STP | TD1_ENP; } @@ -431,7 +431,7 @@ ReceiveDescriptor = Adapter->ReceiveDescriptorRingVirt; for(i = 0; i < NUMBER_OF_BUFFERS; i++) { - (ReceiveDescriptor+i)->RBADR = (ULONG)Adapter->ReceiveBufferPtrPhys + i * BUFFER_SIZE; + (ReceiveDescriptor+i)->RBADR = (ULONG_PTR)Adapter->ReceiveBufferPtrPhys + i * BUFFER_SIZE; (ReceiveDescriptor+i)->BCNT = 0xf000 | -BUFFER_SIZE; /* 2's compliment + set top 4 bits */ (ReceiveDescriptor+i)->FLAGS = RD_OWN; } @@ -467,12 +467,12 @@ /* set up receive ring */ DPRINT("Receive ring physical address: 0x%x\n", Adapter->ReceiveDescriptorRingPhys); - Adapter->InitializationBlockVirt->RDRA = (ULONG)Adapter->ReceiveDescriptorRingPhys; + Adapter->InitializationBlockVirt->RDRA = (ULONG_PTR)Adapter->ReceiveDescriptorRingPhys; Adapter->InitializationBlockVirt->RLEN = (LOG_NUMBER_OF_BUFFERS << 4) & 0xf0; /* set up transmit ring */ DPRINT("Transmit ring physical address: 0x%x\n", Adapter->TransmitDescriptorRingPhys); - Adapter->InitializationBlockVirt->TDRA = (ULONG)Adapter->TransmitDescriptorRingPhys; + Adapter->InitializationBlockVirt->TDRA = (ULONG_PTR)Adapter->TransmitDescriptorRingPhys; Adapter->InitializationBlockVirt->TLEN = (LOG_NUMBER_OF_BUFFERS << 4) & 0xf0; } @@ -491,35 +491,35 @@ if(Adapter->InitializationBlockVirt) { - PhysicalAddress.u.LowPart = (ULONG)Adapter->InitializationBlockPhys; + PhysicalAddress.u.LowPart = (ULONG_PTR)Adapter->InitializationBlockPhys; NdisMFreeSharedMemory(Adapter->MiniportAdapterHandle, Adapter->InitializationBlockLength, FALSE, Adapter->InitializationBlockVirt, PhysicalAddress); } if(Adapter->TransmitDescriptorRingVirt) { - PhysicalAddress.u.LowPart = (ULONG)Adapter->TransmitDescriptorRingPhys; + PhysicalAddress.u.LowPart = (ULONG_PTR)Adapter->TransmitDescriptorRingPhys; NdisMFreeSharedMemory(Adapter->MiniportAdapterHandle, Adapter->TransmitDescriptorRingLength, FALSE, Adapter->TransmitDescriptorRingVirt, PhysicalAddress); } if(Adapter->ReceiveDescriptorRingVirt) { - PhysicalAddress.u.LowPart = (ULONG)Adapter->ReceiveDescriptorRingPhys; + PhysicalAddress.u.LowPart = (ULONG_PTR)Adapter->ReceiveDescriptorRingPhys; NdisMFreeSharedMemory(Adapter->MiniportAdapterHandle, Adapter->ReceiveDescriptorRingLength, FALSE, Adapter->ReceiveDescriptorRingVirt, PhysicalAddress); } if(Adapter->TransmitBufferPtrVirt) { - PhysicalAddress.u.LowPart = (ULONG)Adapter->TransmitBufferPtrPhys; + PhysicalAddress.u.LowPart = (ULONG_PTR)Adapter->TransmitBufferPtrPhys; NdisMFreeSharedMemory(Adapter->MiniportAdapterHandle, Adapter->TransmitBufferLength, FALSE, Adapter->TransmitBufferPtrVirt, PhysicalAddress); } if(Adapter->ReceiveBufferPtrVirt) { - PhysicalAddress.u.LowPart = (ULONG)Adapter->ReceiveBufferPtrPhys; + PhysicalAddress.u.LowPart = (ULONG_PTR)Adapter->ReceiveBufferPtrPhys; NdisMFreeSharedMemory(Adapter->MiniportAdapterHandle, Adapter->ReceiveBufferLength, FALSE, Adapter->ReceiveBufferPtrVirt, PhysicalAddress); } @@ -693,9 +693,9 @@ /* set up csr1 and csr2 with init block */ NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR1); - NdisRawWritePortUshort(Adapter->PortOffset + RDP, (USHORT)((ULONG)Adapter->InitializationBlockPhys & 0xffff)); + NdisRawWritePortUshort(Adapter->PortOffset + RDP, (USHORT)((ULONG_PTR)Adapter->InitializationBlockPhys & 0xffff)); NdisRawWritePortUshort(Adapter->PortOffset + RAP, CSR2); - NdisRawWritePortUshort(Adapter->PortOffset + RDP, (USHORT)((ULONG)Adapter->InitializationBlockPhys >> 16) & 0xffff); + NdisRawWritePortUshort(Adapter->PortOffset + RDP, (USHORT)((ULONG_PTR)Adapter->InitializationBlockPhys >> 16) & 0xffff); DPRINT("programmed with init block\n");
16 years, 3 months
2
1
0
0
[sginsberg] 35822: - Fix build...
by sginsberg@svn.reactos.org
Author: sginsberg Date: Sat Aug 30 18:06:13 2008 New Revision: 35822 URL:
http://svn.reactos.org/svn/reactos?rev=35822&view=rev
Log: - Fix build... Modified: trunk/reactos/include/psdk/winnt.h Modified: trunk/reactos/include/psdk/winnt.h URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=3…
============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Sat Aug 30 18:06:13 2008 @@ -4695,10 +4695,7 @@ MemoryBarrier(VOID) { LONG Barrier; - __asm__ __volatile__ - { - xchg Barrier, eax - } + __asm__ __volatile__("xchgl %%eax, %[Barrier]" : : [Barrier] "m" (Barrier) : "memory"); } #elif defined (_M_AMD64) #define MemoryBarrier()
16 years, 3 months
2
1
0
0
[sserapion] 35829: Make crt call win32 time APIs, like WINE
by sserapion@svn.reactos.org
Author: sserapion Date: Sat Aug 30 22:22:13 2008 New Revision: 35829 URL:
http://svn.reactos.org/svn/reactos?rev=35829&view=rev
Log: Make crt call win32 time APIs, like WINE Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/strdate.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/strtime.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/wstrdate.c branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/wstrtime.c Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/strdate.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s…
============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/strdate.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/strdate.c [iso-8859-1] Sat Aug 30 22:22:13 2008 @@ -12,18 +12,12 @@ /* * @implemented */ -char* _strdate(char* datestr) +char* _strdate(char* date) { - time_t t; - struct tm* d; - char* dt = (char*)datestr; + static const char format[] = "MM'/'dd'/'yy"; - if (datestr == NULL) { - __set_errno(EINVAL); - return NULL; - } - t = time(NULL); - d = localtime(&t); - sprintf(dt,"%d/%d/%d",d->tm_mday,d->tm_mon+1,d->tm_year); - return dt; + GetDateFormatA(LOCALE_NEUTRAL, 0, NULL, format, date, 9); + + return date; + } Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/strtime.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s…
============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/strtime.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/strtime.c [iso-8859-1] Sat Aug 30 22:22:13 2008 @@ -12,18 +12,11 @@ /* * @implemented */ -char* _strtime(char* buf) +char* _strtime(char* time) { - time_t t; - struct tm *d; - char* dt = (char*)buf; + static const char format[] = "HH':'mm':'ss"; - if ( buf == NULL ) { - __set_errno(EINVAL); - return NULL; - } - t = time(NULL); - d = localtime(&t); - sprintf(dt,"%d:%d:%d",d->tm_hour,d->tm_min,d->tm_sec); - return dt; + GetTimeFormatA(LOCALE_NEUTRAL, 0, NULL, format, time, 9); + + return time; } Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/wstrdate.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s…
============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/wstrdate.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/wstrdate.c [iso-8859-1] Sat Aug 30 22:22:13 2008 @@ -12,18 +12,12 @@ /* * @implemented */ -wchar_t* _wstrdate(wchar_t* datestr) +wchar_t* _wstrdate(wchar_t* date) { - time_t t; - struct tm* d; - wchar_t* dt = (wchar_t*)datestr; + static const WCHAR format[] = { 'M','M','\'','/','\'','d','d','\'','/','\'','y','y',0 }; - if (datestr == NULL) { - __set_errno(EINVAL); - return NULL; - } - t = time(NULL); - d = localtime(&t); - swprintf(dt,L"%d/%d/%d",d->tm_mday,d->tm_mon+1,d->tm_year); - return dt; + GetDateFormatW(LOCALE_NEUTRAL, 0, NULL, format, (LPWSTR)date, 9); + + return date; + } Modified: branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/wstrtime.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/lib/s…
============================================================================== --- branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/wstrtime.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/lib/sdk/crt/time/wstrtime.c [iso-8859-1] Sat Aug 30 22:22:13 2008 @@ -12,18 +12,11 @@ /* * @implemented */ -wchar_t* _wstrtime(wchar_t* buf) +wchar_t* _wstrtime(wchar_t* time) { - time_t t; - struct tm* d; - wchar_t* dt = (wchar_t*)buf; + static const WCHAR format[] = { 'H','H','\'',':','\'','m','m','\'',':','\'','s','s',0 }; - if ( buf == NULL ) { - __set_errno(EINVAL); - return NULL; - } - t = time(NULL); - d = localtime(&t); - swprintf(dt,L"%d:%d:%d",d->tm_hour,d->tm_min,d->tm_sec); - return dt; + GetTimeFormatW(LOCALE_NEUTRAL, 0, NULL, format, (LPWSTR)time, 9); + + return time; }
16 years, 3 months
1
0
0
0
[sserapion] 35827: minor fix.
by sserapion@svn.reactos.org
Author: sserapion Date: Sat Aug 30 22:16:59 2008 New Revision: 35827 URL:
http://svn.reactos.org/svn/reactos?rev=35827&view=rev
Log: minor fix. Modified: branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/cproxy.c Modified: branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/cproxy.c URL:
http://svn.reactos.org/svn/reactos/branches/ros-amd64-bringup/reactos/dll/w…
============================================================================== --- branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/cproxy.c [iso-8859-1] (original) +++ branches/ros-amd64-bringup/reactos/dll/win32/rpcrt4/cproxy.c [iso-8859-1] Sat Aug 30 22:16:59 2008 @@ -56,7 +56,7 @@ static const IRpcProxyBufferVtbl StdProxy_Vtbl; -#define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - offsetof(impl,field)) +#define ICOM_THIS_MULTI(impl,field,iface) impl* const This=(impl*)((char*)(iface) - FIELD_OFFSET(impl,field)) /* How the Windows stubless proxy thunks work is explained at *
http://msdn.microsoft.com/library/en-us/dnmsj99/html/com0199.asp
,
16 years, 3 months
1
0
0
0
← Newer
1
2
3
4
5
...
86
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
Results per page:
10
25
50
100
200