Ros-diffs July 2011

ros-diffs@reactos.org

24 participants
517 discussions

[tkreuzer] 52743: [USETUP] Fix formatting. No code change.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jul 20 17:54:28 2011 New Revision: 52743 URL: http://svn.reactos.org/svn/reactos?rev=52743&view=rev Log: [USETUP] Fix formatting. No code change. Modified: trunk/reactos/base/setup/usetup/bootsup.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.…

13 years, 2 months

[tkreuzer] 52742: [USETUP] Patch by Dmitry Gorbachev: Don't overwrite the OemName field in the bootsector. Although this field could theoretically contain any string, MS recommends using "MSWIN4.0"...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jul 20 17:00:28 2011 New Revision: 52742 URL: http://svn.reactos.org/svn/reactos?rev=52742&view=rev Log: [USETUP] Patch by Dmitry Gorbachev: Don't overwrite the OemName field in the bootsector. Although this field could theoretically contain any string, MS recommends using "MSWIN4.0" and MSDOS does even rely on it being this (or having higher last 2 characters) This way we preserve what is being put there when the disk is formatted, which is "MSWIN4.0" See issue #6386 for more details. Modified: trunk/reactos/base/setup/usetup/bootsup.c Modified: trunk/reactos/base/setup/usetup/bootsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/setup/usetup/bootsup.… ============================================================================== --- trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] (original) +++ trunk/reactos/base/setup/usetup/bootsup.c [iso-8859-1] Wed Jul 20 17:00:28 2011 @@ -788,13 +788,13 @@ UNICODE_STRING Name; HANDLE FileHandle; NTSTATUS Status; - PUCHAR OrigBootSector; - PUCHAR NewBootSector; + PFAT_BOOTSECTOR OrigBootSector; + PFAT_BOOTSECTOR NewBootSector; /* Allocate buffer for original bootsector */ - OrigBootSector = (PUCHAR)RtlAllocateHeap(ProcessHeap, - 0, - SECTORSIZE); + OrigBootSector = RtlAllocateHeap(ProcessHeap, + 0, + SECTORSIZE); if (OrigBootSector == NULL) return(STATUS_INSUFFICIENT_RESOURCES); @@ -836,11 +836,10 @@ return(Status); } - /* Allocate buffer for new bootsector */ - NewBootSector = (PUCHAR)RtlAllocateHeap(ProcessHeap, - 0, - SECTORSIZE); + NewBootSector = RtlAllocateHeap(ProcessHeap, + 0, + SECTORSIZE); if (NewBootSector == NULL) { RtlFreeHeap(ProcessHeap, 0, OrigBootSector); @@ -888,7 +887,10 @@ } /* Adjust bootsector (copy a part of the FAT BPB) */ - memcpy((NewBootSector + 11), (OrigBootSector + 11), 51 /*fat BPB length*/); + memcpy(&NewBootSector->OemName, + &OrigBootSector->OemName, + FIELD_OFFSET(FAT32_BOOTSECTOR, BootCodeAndData) - + FIELD_OFFSET(FAT32_BOOTSECTOR, OemName)); /* Free the original boot sector */ RtlFreeHeap(ProcessHeap, 0, OrigBootSector); @@ -951,14 +953,14 @@ UNICODE_STRING Name; HANDLE FileHandle; NTSTATUS Status; - PUCHAR OrigBootSector; - PUCHAR NewBootSector; + PFAT32_BOOTSECTOR OrigBootSector; + PFAT32_BOOTSECTOR NewBootSector; LARGE_INTEGER FileOffset; /* Allocate buffer for original bootsector */ - OrigBootSector = (PUCHAR)RtlAllocateHeap(ProcessHeap, - 0, - SECTORSIZE); + OrigBootSector = RtlAllocateHeap(ProcessHeap, + 0, + SECTORSIZE); if (OrigBootSector == NULL) return(STATUS_INSUFFICIENT_RESOURCES); @@ -1001,9 +1003,9 @@ } /* Allocate buffer for new bootsector (2 sectors) */ - NewBootSector = (PUCHAR)RtlAllocateHeap(ProcessHeap, - 0, - 2 * SECTORSIZE); + NewBootSector = RtlAllocateHeap(ProcessHeap, + 0, + 2 * SECTORSIZE); if (NewBootSector == NULL) { RtlFreeHeap(ProcessHeap, 0, OrigBootSector); @@ -1051,13 +1053,13 @@ } /* Adjust bootsector (copy a part of the FAT32 BPB) */ - memcpy((NewBootSector + 3), - (OrigBootSector + 3), - 87); /* FAT32 BPB length */ + memcpy(&NewBootSector->OemName, + &OrigBootSector->OemName, + FIELD_OFFSET(FAT32_BOOTSECTOR, BootCodeAndData) - + FIELD_OFFSET(FAT32_BOOTSECTOR, OemName)); /* Disable the backup boot sector */ - NewBootSector[0x32] = 0x00; - NewBootSector[0x33] = 0x00; + NewBootSector->BackupBootSector = 0; /* Free the original boot sector */ RtlFreeHeap(ProcessHeap, 0, OrigBootSector); @@ -1416,9 +1418,10 @@ } /* Adjust bootsector (copy a part of the FAT16 BPB) */ - memcpy(&NewBootSector->BytesPerSector, - &OrigBootSector->BytesPerSector, - 51); /* FAT16 BPB length */ + memcpy(&NewBootSector->OemName, + &OrigBootSector->OemName, + FIELD_OFFSET(FAT32_BOOTSECTOR, BootCodeAndData) - + FIELD_OFFSET(FAT32_BOOTSECTOR, OemName)); PartInfo = &PartitionList->CurrentPartition->PartInfo[PartitionList->CurrentPartitionNumber]; NewBootSector->HiddenSectors = PartInfo->HiddenSectors; @@ -1582,9 +1585,10 @@ } /* Adjust bootsector (copy a part of the FAT32 BPB) */ - memcpy(&NewBootSector->BytesPerSector, - &OrigBootSector->BytesPerSector, - 79); /* FAT32 BPB length */ + memcpy(&NewBootSector->OemName, + &OrigBootSector->OemName, + FIELD_OFFSET(FAT32_BOOTSECTOR, BootCodeAndData) - + FIELD_OFFSET(FAT32_BOOTSECTOR, OemName)); PartInfo = &PartitionList->CurrentPartition->PartInfo[PartitionList->CurrentPartitionNumber]; NewBootSector->HiddenSectors = PartInfo->HiddenSectors;

13 years, 2 months

[tkreuzer] 52741: [NTOSKRNL] Patch by Thomas Faber ExAcquireSharedStarveExclusive and ExAcquireSharedWaitForExclusive should return FALSE when they cannot immediately acquire the resource, and the ...

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jul 20 16:29:38 2011 New Revision: 52741 URL: http://svn.reactos.org/svn/reactos?rev=52741&view=rev Log: [NTOSKRNL] Patch by Thomas Faber ExAcquireSharedStarveExclusive and ExAcquireSharedWaitForExclusive should return FALSE when they cannot immediately acquire the resource, and the Wait parameter is false. They return TRUE instead, leading the caller to believe it acquired the resource, which will result in a bugcheck when it tries to release it. See issue #6375 for more details. Modified: trunk/reactos/ntoskrnl/ex/resource.c Modified: trunk/reactos/ntoskrnl/ex/resource.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/resource.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ex/resource.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/resource.c [iso-8859-1] Wed Jul 20 16:29:38 2011 @@ -1159,7 +1159,7 @@ { /* Release the lock and return */ ExReleaseResourceLock(Resource, &LockHandle); - return TRUE; + return FALSE; } /* Check if we have a shared waiters semaphore */ @@ -1276,7 +1276,7 @@ { /* So bail out if we're not allowed */ ExReleaseResourceLock(Resource, &LockHandle); - return TRUE; + return FALSE; } /* Check if we have a shared waiters semaphore */ @@ -1359,7 +1359,7 @@ { /* So bail out if we're not allowed */ ExReleaseResourceLock(Resource, &LockHandle); - return TRUE; + return FALSE; } /* Check if we have a shared waiters semaphore */

13 years, 2 months

[ion] 52740: NO CODE CHANGE. [KERNEL32]: Delete now empty directories.

by ion＠svn.reactos.org

Author: ion Date: Wed Jul 20 16:16:14 2011 New Revision: 52740 URL: http://svn.reactos.org/svn/reactos?rev=52740&view=rev Log: NO CODE CHANGE. [KERNEL32]: Delete now empty directories. Removed: trunk/reactos/dll/win32/kernel32/process/

13 years, 2 months

[ion] 52739: NO CODE CHANGE. [KERNEL32]: Delete now empty directories.

by ion＠svn.reactos.org

Author: ion Date: Wed Jul 20 16:15:56 2011 New Revision: 52739 URL: http://svn.reactos.org/svn/reactos?rev=52739&view=rev Log: NO CODE CHANGE. [KERNEL32]: Delete now empty directories. Removed: trunk/reactos/dll/win32/kernel32/debug/ trunk/reactos/dll/win32/kernel32/except/ trunk/reactos/dll/win32/kernel32/mem/ trunk/reactos/dll/win32/kernel32/synch/ trunk/reactos/dll/win32/kernel32/thread/ trunk/reactos/dll/win32/kernel32/vista/

13 years, 2 months

[ion] 52738: NO CODE CHANGE [KERNEL32]: Reorganize the source tree into a "client" section (The Win32 API proper and its wrapping of the NT base system -- unsynchable with Wine until they have a pr...

by ion＠svn.reactos.org

Author: ion Date: Wed Jul 20 16:14:21 2011 New Revision: 52738 URL: http://svn.reactos.org/svn/reactos?rev=52738&view=rev Log: NO CODE CHANGE [KERNEL32]: Reorganize the source tree into a "client" section (The Win32 API proper and its wrapping of the NT base system -- unsynchable with Wine until they have a proper NtDll and choose to use our code) and a "winnls" section (string/language/etc stuff easily synchable with Wine). [KERNEL32]: Note: this is not perfect yet, but a step in the right direction. Added: trunk/reactos/dll/win32/kernel32/client/ trunk/reactos/dll/win32/kernel32/client/amd64/ - copied from r52737, trunk/reactos/dll/win32/kernel32/thread/amd64/ trunk/reactos/dll/win32/kernel32/client/debugger.c - copied unchanged from r52737, trunk/reactos/dll/win32/kernel32/debug/debugger.c trunk/reactos/dll/win32/kernel32/client/except.c - copied unchanged from r52737, trunk/reactos/dll/win32/kernel32/except/except.c trunk/reactos/dll/win32/kernel32/client/fiber.c - copied unchanged from r52737, trunk/reactos/dll/win32/kernel32/thread/fiber.c trunk/reactos/dll/win32/kernel32/client/file/ - copied from r52737, trunk/reactos/dll/win32/kernel32/file/ trunk/reactos/dll/win32/kernel32/client/heapmem.c - copied unchanged from r52737, trunk/reactos/dll/win32/kernel32/mem/heap.c trunk/reactos/dll/win32/kernel32/client/i386/ - copied from r52737, trunk/reactos/dll/win32/kernel32/thread/i386/ trunk/reactos/dll/win32/kernel32/client/job.c - copied unchanged from r52737, trunk/reactos/dll/win32/kernel32/process/job.c trunk/reactos/dll/win32/kernel32/client/misc/ - copied from r52737, trunk/reactos/dll/win32/kernel32/misc/ trunk/reactos/dll/win32/kernel32/client/proc.c - copied unchanged from r52737, trunk/reactos/dll/win32/kernel32/process/proc.c trunk/reactos/dll/win32/kernel32/client/session.c - copied unchanged from r52737, trunk/reactos/dll/win32/kernel32/process/session.c trunk/reactos/dll/win32/kernel32/client/synch.c - copied unchanged from r52737, trunk/reactos/dll/win32/kernel32/synch/synch.c trunk/reactos/dll/win32/kernel32/client/thread.c - copied unchanged from r52737, trunk/reactos/dll/win32/kernel32/thread/thread.c trunk/reactos/dll/win32/kernel32/client/virtmem.c - copied unchanged from r52737, trunk/reactos/dll/win32/kernel32/mem/virtual.c trunk/reactos/dll/win32/kernel32/client/vista.c - copied unchanged from r52737, trunk/reactos/dll/win32/kernel32/vista/vista.c trunk/reactos/dll/win32/kernel32/winnls/ trunk/reactos/dll/win32/kernel32/winnls/lang/ - copied from r52737, trunk/reactos/dll/win32/kernel32/lang/ trunk/reactos/dll/win32/kernel32/winnls/locale_rc.rc - copied unchanged from r52737, trunk/reactos/dll/win32/kernel32/locale_rc.rc trunk/reactos/dll/win32/kernel32/winnls/nls/ - copied from r52737, trunk/reactos/dll/win32/kernel32/nls/ trunk/reactos/dll/win32/kernel32/winnls/string/ - copied from r52737, trunk/reactos/dll/win32/kernel32/string/ Removed: trunk/reactos/dll/win32/kernel32/debug/debugger.c trunk/reactos/dll/win32/kernel32/except/except.c trunk/reactos/dll/win32/kernel32/file/ trunk/reactos/dll/win32/kernel32/lang/ trunk/reactos/dll/win32/kernel32/locale_rc.rc trunk/reactos/dll/win32/kernel32/mem/heap.c trunk/reactos/dll/win32/kernel32/mem/virtual.c trunk/reactos/dll/win32/kernel32/misc/ trunk/reactos/dll/win32/kernel32/nls/ trunk/reactos/dll/win32/kernel32/process/job.c trunk/reactos/dll/win32/kernel32/process/proc.c trunk/reactos/dll/win32/kernel32/process/session.c trunk/reactos/dll/win32/kernel32/string/ trunk/reactos/dll/win32/kernel32/synch/synch.c trunk/reactos/dll/win32/kernel32/thread/amd64/ trunk/reactos/dll/win32/kernel32/thread/fiber.c trunk/reactos/dll/win32/kernel32/thread/i386/ trunk/reactos/dll/win32/kernel32/thread/thread.c trunk/reactos/dll/win32/kernel32/vista/vista.c Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/kernel32/kernel32.rbuild trunk/reactos/dll/win32/kernel32/kernel32.rc [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… Removed: trunk/reactos/dll/win32/kernel32/debug/debugger.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/debug/d… Removed: trunk/reactos/dll/win32/kernel32/except/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/except/… Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… Modified: trunk/reactos/dll/win32/kernel32/kernel32.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… Removed: trunk/reactos/dll/win32/kernel32/locale_rc.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/locale_… Removed: trunk/reactos/dll/win32/kernel32/mem/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/hea… Removed: trunk/reactos/dll/win32/kernel32/mem/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/vir… Removed: trunk/reactos/dll/win32/kernel32/process/job.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… Removed: trunk/reactos/dll/win32/kernel32/process/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… Removed: trunk/reactos/dll/win32/kernel32/process/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… Removed: trunk/reactos/dll/win32/kernel32/synch/synch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/s… Removed: trunk/reactos/dll/win32/kernel32/thread/fiber.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… Removed: trunk/reactos/dll/win32/kernel32/thread/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… Removed: trunk/reactos/dll/win32/kernel32/vista/vista.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/vista/v…

13 years, 2 months

[ion] 52737: NO CODE CHANGES. [KERNEL32]: Reorganize certain functions in different files, and move files into more appropriate locations. Will lead to a simplification of the directory structure.

by ion＠svn.reactos.org

Author: ion Date: Wed Jul 20 15:54:21 2011 New Revision: 52737 URL: http://svn.reactos.org/svn/reactos?rev=52737&view=rev Log: NO CODE CHANGES. [KERNEL32]: Reorganize certain functions in different files, and move files into more appropriate locations. Will lead to a simplification of the directory structure. Added: trunk/reactos/dll/win32/kernel32/file/console.c - copied unchanged from r52722, trunk/reactos/dll/win32/kernel32/misc/console.c trunk/reactos/dll/win32/kernel32/file/filemap.c - copied unchanged from r52722, trunk/reactos/dll/win32/kernel32/mem/section.c trunk/reactos/dll/win32/kernel32/misc/resntfy.c - copied unchanged from r52722, trunk/reactos/dll/win32/kernel32/mem/resnotify.c trunk/reactos/dll/win32/kernel32/string/casemap.c - copied unchanged from r52722, trunk/reactos/dll/win32/kernel32/misc/casemap.c trunk/reactos/dll/win32/kernel32/string/chartype.c - copied unchanged from r52722, trunk/reactos/dll/win32/kernel32/misc/chartype.c trunk/reactos/dll/win32/kernel32/string/collation.c - copied unchanged from r52722, trunk/reactos/dll/win32/kernel32/misc/collation.c trunk/reactos/dll/win32/kernel32/string/fold.c - copied unchanged from r52722, trunk/reactos/dll/win32/kernel32/misc/fold.c trunk/reactos/dll/win32/kernel32/string/format_msg.c - copied unchanged from r52722, trunk/reactos/dll/win32/kernel32/misc/format_msg.c trunk/reactos/dll/win32/kernel32/string/lang.c - copied unchanged from r52722, trunk/reactos/dll/win32/kernel32/misc/lang.c trunk/reactos/dll/win32/kernel32/string/lcformat.c - copied unchanged from r52722, trunk/reactos/dll/win32/kernel32/misc/lcformat.c trunk/reactos/dll/win32/kernel32/string/lcformat_private.h - copied unchanged from r52722, trunk/reactos/dll/win32/kernel32/misc/lcformat_private.h trunk/reactos/dll/win32/kernel32/string/nls.c - copied unchanged from r52722, trunk/reactos/dll/win32/kernel32/misc/nls.c trunk/reactos/dll/win32/kernel32/string/sortkey.c - copied unchanged from r52722, trunk/reactos/dll/win32/kernel32/misc/sortkey.c trunk/reactos/dll/win32/kernel32/synch/synch.c - copied, changed from r52722, trunk/reactos/dll/win32/kernel32/synch/wait.c trunk/reactos/dll/win32/kernel32/vista/ trunk/reactos/dll/win32/kernel32/vista/vista.c - copied, changed from r52722, trunk/reactos/dll/win32/kernel32/synch/condvar.c Removed: trunk/reactos/dll/win32/kernel32/debug/output.c trunk/reactos/dll/win32/kernel32/mem/global.c trunk/reactos/dll/win32/kernel32/mem/isbad.c trunk/reactos/dll/win32/kernel32/mem/local.c trunk/reactos/dll/win32/kernel32/mem/procmem.c trunk/reactos/dll/win32/kernel32/mem/resnotify.c trunk/reactos/dll/win32/kernel32/mem/section.c trunk/reactos/dll/win32/kernel32/misc/casemap.c trunk/reactos/dll/win32/kernel32/misc/chartype.c trunk/reactos/dll/win32/kernel32/misc/collation.c trunk/reactos/dll/win32/kernel32/misc/commdcb.c trunk/reactos/dll/win32/kernel32/misc/console.c trunk/reactos/dll/win32/kernel32/misc/error.c trunk/reactos/dll/win32/kernel32/misc/fold.c trunk/reactos/dll/win32/kernel32/misc/format_msg.c trunk/reactos/dll/win32/kernel32/misc/icustubs.cpp trunk/reactos/dll/win32/kernel32/misc/lang.c trunk/reactos/dll/win32/kernel32/misc/lcformat.c trunk/reactos/dll/win32/kernel32/misc/lcformat_private.h trunk/reactos/dll/win32/kernel32/misc/nls.c trunk/reactos/dll/win32/kernel32/misc/recovery.c trunk/reactos/dll/win32/kernel32/misc/sortkey.c trunk/reactos/dll/win32/kernel32/process/cmdline.c trunk/reactos/dll/win32/kernel32/process/procsup.c trunk/reactos/dll/win32/kernel32/synch/condvar.c trunk/reactos/dll/win32/kernel32/synch/critical.c trunk/reactos/dll/win32/kernel32/synch/event.c trunk/reactos/dll/win32/kernel32/synch/mutex.c trunk/reactos/dll/win32/kernel32/synch/sem.c trunk/reactos/dll/win32/kernel32/synch/timer.c trunk/reactos/dll/win32/kernel32/synch/wait.c trunk/reactos/dll/win32/kernel32/thread/fls.c trunk/reactos/dll/win32/kernel32/thread/tls.c Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/kernel32/debug/debugger.c trunk/reactos/dll/win32/kernel32/except/except.c trunk/reactos/dll/win32/kernel32/include/kernel32.h trunk/reactos/dll/win32/kernel32/kernel32.rbuild trunk/reactos/dll/win32/kernel32/mem/heap.c trunk/reactos/dll/win32/kernel32/process/proc.c trunk/reactos/dll/win32/kernel32/process/session.c trunk/reactos/dll/win32/kernel32/thread/fiber.c trunk/reactos/dll/win32/kernel32/thread/thread.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLi… Modified: trunk/reactos/dll/win32/kernel32/debug/debugger.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/debug/d… Removed: trunk/reactos/dll/win32/kernel32/debug/output.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/debug/o… Modified: trunk/reactos/dll/win32/kernel32/except/except.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/except/… Modified: trunk/reactos/dll/win32/kernel32/include/kernel32.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/include… Modified: trunk/reactos/dll/win32/kernel32/kernel32.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel3… Removed: trunk/reactos/dll/win32/kernel32/mem/global.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/glo… Modified: trunk/reactos/dll/win32/kernel32/mem/heap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/hea… Removed: trunk/reactos/dll/win32/kernel32/mem/isbad.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/isb… Removed: trunk/reactos/dll/win32/kernel32/mem/local.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/loc… Removed: trunk/reactos/dll/win32/kernel32/mem/procmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/pro… Removed: trunk/reactos/dll/win32/kernel32/mem/resnotify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/res… Removed: trunk/reactos/dll/win32/kernel32/mem/section.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/sec… Removed: trunk/reactos/dll/win32/kernel32/misc/casemap.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ca… Removed: trunk/reactos/dll/win32/kernel32/misc/chartype.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ch… Removed: trunk/reactos/dll/win32/kernel32/misc/collation.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… Removed: trunk/reactos/dll/win32/kernel32/misc/commdcb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… Removed: trunk/reactos/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… Removed: trunk/reactos/dll/win32/kernel32/misc/error.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/er… Removed: trunk/reactos/dll/win32/kernel32/misc/fold.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/fo… Removed: trunk/reactos/dll/win32/kernel32/misc/format_msg.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/fo… Removed: trunk/reactos/dll/win32/kernel32/misc/icustubs.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/ic… Removed: trunk/reactos/dll/win32/kernel32/misc/lang.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/la… Removed: trunk/reactos/dll/win32/kernel32/misc/lcformat.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/lc… Removed: trunk/reactos/dll/win32/kernel32/misc/lcformat_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/lc… Removed: trunk/reactos/dll/win32/kernel32/misc/nls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/nl… Removed: trunk/reactos/dll/win32/kernel32/misc/recovery.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/re… Removed: trunk/reactos/dll/win32/kernel32/misc/sortkey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/so… Removed: trunk/reactos/dll/win32/kernel32/process/cmdline.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… Modified: trunk/reactos/dll/win32/kernel32/process/proc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… Removed: trunk/reactos/dll/win32/kernel32/process/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… Modified: trunk/reactos/dll/win32/kernel32/process/session.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/process… Removed: trunk/reactos/dll/win32/kernel32/synch/condvar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/c… Removed: trunk/reactos/dll/win32/kernel32/synch/critical.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/c… Removed: trunk/reactos/dll/win32/kernel32/synch/event.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/e… Removed: trunk/reactos/dll/win32/kernel32/synch/mutex.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/m… Removed: trunk/reactos/dll/win32/kernel32/synch/sem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/s… Copied: trunk/reactos/dll/win32/kernel32/synch/synch.c (from r52722, trunk/reactos/dll/win32/kernel32/synch/wait.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/s… Removed: trunk/reactos/dll/win32/kernel32/synch/timer.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/t… Removed: trunk/reactos/dll/win32/kernel32/synch/wait.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/synch/w… Modified: trunk/reactos/dll/win32/kernel32/thread/fiber.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… Removed: trunk/reactos/dll/win32/kernel32/thread/fls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… Modified: trunk/reactos/dll/win32/kernel32/thread/thread.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… Removed: trunk/reactos/dll/win32/kernel32/thread/tls.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/thread/… Copied: trunk/reactos/dll/win32/kernel32/vista/vista.c (from r52722, trunk/reactos/dll/win32/kernel32/synch/condvar.c) URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/vista/v…

13 years, 2 months

[ion] 52736: [PSDK]: Add missing QUOTA_LIMITS_EX. [NDK]: Fix certain SxS functions. [RTL]: "Implement" RtlActivateActivationContextEx which lets you specify a TEB. RtlActivateActivationContext uses...

by ion＠svn.reactos.org

Author: ion Date: Wed Jul 20 14:46:15 2011 New Revision: 52736 URL: http://svn.reactos.org/svn/reactos?rev=52736&view=rev Log: [PSDK]: Add missing QUOTA_LIMITS_EX. [NDK]: Fix certain SxS functions. [RTL]: "Implement" RtlActivateActivationContextEx which lets you specify a TEB. RtlActivateActivationContext uses the current TEB. NOTE: All these functions are broken because they copy-paste Win32 wine code into NT Native functions (with different parameters/structures). [NDK]: Fix pstypes.h -- it was a #define mess, and worked by luck because we are a < Vista OS. [NDK]: Add RtlInitEmptyAnsiString. Modified: trunk/reactos/include/ndk/pstypes.h trunk/reactos/include/ndk/rtlfuncs.h trunk/reactos/include/ndk/rtltypes.h trunk/reactos/include/psdk/winnt.h trunk/reactos/lib/rtl/actctx.c Modified: trunk/reactos/include/ndk/pstypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/pstypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/pstypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/pstypes.h [iso-8859-1] Wed Jul 20 14:46:15 2011 @@ -117,7 +117,6 @@ #define PSP_LONG_QUANTUMS 16 #ifndef NTOS_MODE_USER - // // Thread Access Types // @@ -149,6 +148,7 @@ #define PROCESS_ALL_ACCESS (STANDARD_RIGHTS_REQUIRED | \ SYNCHRONIZE | \ 0xFFF) +#endif // // Thread Base Priorities @@ -162,7 +162,6 @@ // TLS Slots // #define TLS_MINIMUM_AVAILABLE 64 -#endif // // Job Access Types @@ -194,7 +193,6 @@ #define JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK 0x1000 #define JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE 0x2000 - // // Cross Thread Flags // @@ -223,9 +221,7 @@ #define STA_LPC_EXIT_THREAD_CALLED_BIT 0x2 #define STA_ADDRESS_SPACE_OWNER_BIT 0x4 #define STA_OWNS_WORKING_SET_BITS 0x1F8 -#endif - -#define TLS_EXPANSION_SLOTS 1024 + // // Process Flags // @@ -261,8 +257,22 @@ // Vista Process Flags // #define PSF2_PROTECTED_BIT 0x800 +#endif + +// +// TLS/FLS Defines +// +#define TLS_EXPANSION_SLOTS 1024 #ifdef NTOS_MODE_USER +// +// Thread Native Base Priorities +// +#define LOW_PRIORITY 0 +#define LOW_REALTIME_PRIORITY 16 +#define HIGH_PRIORITY 31 +#define MAXIMUM_PRIORITY 32 + // // Current Process/Thread built-in 'special' handles // Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Wed Jul 20 14:46:15 2011 @@ -171,6 +171,17 @@ UnicodeString->MaximumLength = BufferSize; UnicodeString->Buffer = Buffer; } + +FORCEINLINE +VOID +RtlInitEmptyAnsiString(OUT PANSI_STRING AnsiString, + IN PSTR Buffer, + IN USHORT BufferSize) +{ + AnsiString->Length = 0; + AnsiString->MaximumLength = BufferSize; + AnsiString->Buffer = Buffer; +} // // LUID Macros @@ -3046,12 +3057,21 @@ // Activation Context Functions // #ifdef NTOS_MODE_USER +NTSYSAPI +NTSTATUS +NTAPI +RtlActivateActivationContextEx( + IN ULONG Flags, + IN PTEB Teb, + IN PVOID Context, + IN PULONG_PTR Cookie +); NTSYSAPI NTSTATUS NTAPI RtlActivateActivationContext( - IN ULONG Unknown, + IN ULONG Flags, IN HANDLE Handle, OUT PULONG_PTR Cookie ); @@ -3062,7 +3082,6 @@ RtlAddRefActivationContext( PVOID Context ); - NTSYSAPI PRTL_ACTIVATION_CONTEXT_STACK_FRAME Modified: trunk/reactos/include/ndk/rtltypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtltypes.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtltypes.h [iso-8859-1] Wed Jul 20 14:46:15 2011 @@ -257,6 +257,11 @@ #define NLS_OEM_LEAD_BYTE_INFO NlsOemLeadByteInfo // +// Activation Contexts +// +#define INVALID_ACTIVATION_CONTEXT (PVOID)0xFFFFFFFF + +// // C++ CONST casting // #if defined(__cplusplus) @@ -758,20 +763,28 @@ struct _RTL_ACTIVATION_CONTEXT_STACK_FRAME *Previous; PACTIVATION_CONTEXT ActivationContext; ULONG Flags; -} RTL_ACTIVATION_CONTEXT_STACK_FRAME, - *PRTL_ACTIVATION_CONTEXT_STACK_FRAME; +} RTL_ACTIVATION_CONTEXT_STACK_FRAME, *PRTL_ACTIVATION_CONTEXT_STACK_FRAME; + +typedef struct _RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_BASIC +{ + SIZE_T Size; + ULONG Format; + RTL_ACTIVATION_CONTEXT_STACK_FRAME Frame; +} RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_BASIC, *PRTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_BASIC; typedef struct _RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED { - ULONG Size; + SIZE_T Size; ULONG Format; RTL_ACTIVATION_CONTEXT_STACK_FRAME Frame; PVOID Extra1; PVOID Extra2; PVOID Extra3; PVOID Extra4; -} RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED, - *PRTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED; +} RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED, *PRTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED; + +typedef RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED RTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME; +typedef PRTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME_EXTENDED PRTL_CALLER_ALLOCATED_ACTIVATION_CONTEXT_STACK_FRAME; #if (NTDDI_VERSION >= NTDDI_WS03) typedef struct _ACTIVATION_CONTEXT_STACK @@ -781,8 +794,7 @@ ULONG Flags; ULONG NextCookieSequenceNumber; ULONG StackId; -} ACTIVATION_CONTEXT_STACK, - *PACTIVATION_CONTEXT_STACK; +} ACTIVATION_CONTEXT_STACK, *PACTIVATION_CONTEXT_STACK; #else typedef struct _ACTIVATION_CONTEXT_STACK { Modified: trunk/reactos/include/psdk/winnt.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winnt.h?rev=5… ============================================================================== --- trunk/reactos/include/psdk/winnt.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winnt.h [iso-8859-1] Wed Jul 20 14:46:15 2011 @@ -3302,6 +3302,21 @@ SIZE_T PagefileLimit; LARGE_INTEGER TimeLimit; } QUOTA_LIMITS,*PQUOTA_LIMITS; + +typedef struct _QUOTA_LIMITS_EX { + SIZE_T PagedPoolLimit; + SIZE_T NonPagedPoolLimit; + SIZE_T MinimumWorkingSetSize; + SIZE_T MaximumWorkingSetSize; + SIZE_T PagefileLimit; + LARGE_INTEGER TimeLimit; + SIZE_T Reserved1; + SIZE_T Reserved2; + SIZE_T Reserved3; + SIZE_T Reserved4; + ULONG Flags; + ULONG Reserved5; +} QUOTA_LIMITS_EX, *PQUOTA_LIMITS_EX; typedef struct _IO_COUNTERS { ULONGLONG ReadOperationCount; Modified: trunk/reactos/lib/rtl/actctx.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/actctx.c?rev=52736… ============================================================================== --- trunk/reactos/lib/rtl/actctx.c [iso-8859-1] (original) +++ trunk/reactos/lib/rtl/actctx.c [iso-8859-1] Wed Jul 20 14:46:15 2011 @@ -2370,25 +2370,31 @@ } NTSTATUS -NTAPI RtlActivateActivationContext( ULONG unknown, HANDLE handle, PULONG_PTR cookie ) +NTAPI RtlActivateActivationContextEx( ULONG flags, PTEB tebAddress, HANDLE handle, PULONG_PTR cookie ) { RTL_ACTIVATION_CONTEXT_STACK_FRAME *frame; - + if (!(frame = RtlAllocateHeap( RtlGetProcessHeap(), 0, sizeof(*frame) ))) return STATUS_NO_MEMORY; - - frame->Previous = NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame; + + frame->Previous = tebAddress->ActivationContextStackPointer->ActiveFrame; frame->ActivationContext = handle; frame->Flags = 0; - - NtCurrentTeb()->ActivationContextStackPointer->ActiveFrame = frame; + + tebAddress->ActivationContextStackPointer->ActiveFrame = frame; RtlAddRefActivationContext( handle ); - + *cookie = (ULONG_PTR)frame; DPRINT( "%p cookie=%lx\n", handle, *cookie ); return STATUS_SUCCESS; } + +NTSTATUS +NTAPI RtlActivateActivationContext( ULONG flags, HANDLE handle, PULONG_PTR cookie ) +{ + return RtlActivateActivationContextEx(flags, NtCurrentTeb(), handle, cookie); +} NTSTATUS NTAPI

13 years, 2 months

[tkreuzer] 52735: [NTOSKRNL] Patch by Thomas Faber: Fix broken interlocked functions See issue #6374 for more details.

by tkreuzer＠svn.reactos.org

Author: tkreuzer Date: Wed Jul 20 13:48:06 2011 New Revision: 52735 URL: http://svn.reactos.org/svn/reactos?rev=52735&view=rev Log: [NTOSKRNL] Patch by Thomas Faber: Fix broken interlocked functions See issue #6374 for more details. Modified: trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S trunk/reactos/ntoskrnl/ntoskrnl.pspec trunk/reactos/ntoskrnl/ntoskrnl.spec Modified: trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/i386/fastinter… ============================================================================== --- trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/i386/fastinterlck_asm.S [iso-8859-1] Wed Jul 20 13:48:06 2011 @@ -155,8 +155,8 @@ /*PLIST_ENTRY *FASTCALL *ExfInterlockedInsertTailList(IN PLIST_ENTRY ListHead, - * IN PLIST_ENTRY ListEntry, - * IN PKSPIN_LOCK Lock) + * IN PLIST_ENTRY ListEntry, + * IN PKSPIN_LOCK Lock) */ PUBLIC @ExfInterlockedInsertTailList@12 @ExfInterlockedInsertTailList@12: @@ -537,7 +537,7 @@ /*ULONG *FASTCALL - *Exfi386InterlockedExchangeUlong(IN PULONG Taget, + *Exfi386InterlockedExchangeUlong(IN PULONG Target, * IN ULONG Value) */ PUBLIC @Exfi386InterlockedExchangeUlong@8 @@ -591,16 +591,16 @@ /*PVOID *FASTCALL - *ExfInterlockedCompareExchange64(IN PLONGLONG Destination, - * IN PLONGLONG Exchange, - * IN PLONGLONG Comperand, - * IN PKSPIN_LOCK Lock) + *ExInterlockedCompareExchange64(IN PLONGLONG Destination, + * IN PLONGLONG Exchange, + * IN PLONGLONG Comperand, + * IN PKSPIN_LOCK Lock) */ PUBLIC @ExInterlockedCompareExchange64@16 @ExInterlockedCompareExchange64@16: /* Save registers */ - push ebp + push ebx push ebp /* Get destination pointer, exchange value and comperand value/address */ Modified: trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ex/i386/interlck_… ============================================================================== --- trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ex/i386/interlck_asm.S [iso-8859-1] Wed Jul 20 13:48:06 2011 @@ -5,7 +5,7 @@ * PURPOSE: STDCALL Interlocked Functions * PROGRAMMERS: Alex Ionescu (alex(a)relsoft.net) */ - + /* INCLUDES ******************************************************************/ #include <asm.inc> @@ -26,8 +26,8 @@ /*PLIST_ENTRY *NTAPI - *ExInterlockedAddLargeInteger(IN PLIST_ENTRY ListHead, - * IN PLIST_ENTRY ListEntry, + *ExInterlockedAddLargeInteger(IN PLARGE_INTEGER Addend, + * IN LARGE_INTEGER Increment, * IN PKSPIN_LOCK Lock) */ PUBLIC _ExInterlockedAddLargeInteger@16 @@ -92,9 +92,9 @@ /*PLIST_ENTRY *NTAPI - *ExInterlockedInsertHeadList(IN PLIST_ENTRY ListHead, - * IN PLIST_ENTRY ListEntry, - * IN PKSPIN_LOCK Lock) + *ExInterlockedAddUlong(IN PULONG Addend, + * IN ULONG Increment, + * IN PKSPIN_LOCK Lock) */ PUBLIC _ExInterlockedAddUlong@12 _ExInterlockedAddUlong@12: @@ -471,14 +471,18 @@ PUBLIC _ExInterlockedExchangeUlong@12 _ExInterlockedExchangeUlong@12: +#ifdef CONFIG_SMP /* Get pointers */ mov edx, [esp+4] mov eax, [esp+8] -#ifdef CONFIG_SMP /* On MP, do the exchange */ xchg [edx], eax #else + /* Get pointers */ + mov edx, [esp+4] + mov ecx, [esp+8] + /* On UP, disable interrupts and save flags */ pushfd cli @@ -494,8 +498,7 @@ /*INTERLOCKED_RESULT *NTAPI - *Exi386InterlockedIncrementLong(IN PLONG Addend, - * IN PKSPIN_LOCK Lock) + *Exi386InterlockedIncrementLong(IN PLONG Addend) */ PUBLIC _Exi386InterlockedIncrementLong@4 _Exi386InterlockedIncrementLong@4: @@ -513,8 +516,7 @@ /*INTERLOCKED_RESULT *NTAPI - *Exi386InterlockedDecrementLong(IN PLONG Addend, - * IN PKSPIN_LOCK Lock) + *Exi386InterlockedDecrementLong(IN PLONG Addend) */ PUBLIC _Exi386InterlockedDecrementLong@4 _Exi386InterlockedDecrementLong@4: @@ -528,25 +530,28 @@ /* Return */ lahf and eax, EFLAG_SELECT - ret 8 + ret 4 /*ULONG *NTAPI *Exi386InterlockedExchangeUlong(IN PULONG Target, - * IN ULONG Value, - * IN PKSPIN_LOCK Lock) - */ -PUBLIC _Exi386InterlockedExchangeUlong@12 -_Exi386InterlockedExchangeUlong@12: - + * IN ULONG Value) + */ +PUBLIC _Exi386InterlockedExchangeUlong@8 +_Exi386InterlockedExchangeUlong@8: + +#ifdef CONFIG_SMP /* Get pointers */ mov edx, [esp+4] mov eax, [esp+8] -#ifdef CONFIG_SMP /* On MP, do the exchange */ xchg [edx], eax #else + /* Get pointers */ + mov edx, [esp+4] + mov ecx, [esp+8] + /* On UP, disable interrupts and save flags */ pushfd cli Modified: trunk/reactos/ntoskrnl/ntoskrnl.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.pspec?re… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.pspec [iso-8859-1] Wed Jul 20 13:48:06 2011 @@ -198,7 +198,7 @@ @ FASTCALL -arch=i386 Exfi386InterlockedExchangeUlong(ptr long) @ FASTCALL -arch=i386 Exfi386InterlockedIncrementLong(ptr) @ stdcall -arch=i386 Exi386InterlockedDecrementLong(ptr) -@ stdcall -arch=i386 Exi386InterlockedExchangeUlong(ptr long long) +@ stdcall -arch=i386 Exi386InterlockedExchangeUlong(ptr long) @ stdcall -arch=i386 Exi386InterlockedIncrementLong(ptr) @ FASTCALL -arch=i386 ExiAcquireFastMutex(ptr) ExAcquireFastMutex @ FASTCALL -arch=i386 ExiReleaseFastMutex(ptr) ExReleaseFastMutex Modified: trunk/reactos/ntoskrnl/ntoskrnl.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ntoskrnl.spec?rev… ============================================================================== --- trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ntoskrnl.spec [iso-8859-1] Wed Jul 20 13:48:06 2011 @@ -178,7 +178,7 @@ @ fastcall -arch=i386 Exfi386InterlockedExchangeUlong(ptr long) @ fastcall -arch=i386 Exfi386InterlockedIncrementLong(ptr) @ stdcall -arch=i386 Exi386InterlockedDecrementLong(ptr) -@ stdcall -arch=i386 Exi386InterlockedExchangeUlong(ptr long long) +@ stdcall -arch=i386 Exi386InterlockedExchangeUlong(ptr long) @ stdcall -arch=i386 Exi386InterlockedIncrementLong(ptr) @ fastcall -arch=i386 ExiAcquireFastMutex(ptr) ExAcquireFastMutex @ fastcall -arch=i386 ExiReleaseFastMutex(ptr) ExReleaseFastMutex

13 years, 2 months

[cmihail] 52734: [lwIP] - Fix another race condition caused crash bug

by cmihail＠svn.reactos.org

Author: cmihail Date: Wed Jul 20 11:11:40 2011 New Revision: 52734 URL: http://svn.reactos.org/svn/reactos?rev=52734&view=rev Log: [lwIP] - Fix another race condition caused crash bug Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c Modified: branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/branches/GSoC_2011/TcpIpDriver/lib/drive… ============================================================================== --- branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c [iso-8859-1] (original) +++ branches/GSoC_2011/TcpIpDriver/lib/drivers/lwip/src/rostcp.c [iso-8859-1] Wed Jul 20 11:11:40 2011 @@ -60,6 +60,8 @@ { DbgPrint("[lwIP, InternalSendEventHandler] SendEvent (0x%x, 0x%x, %d)\n", arg, pcb, (unsigned int)space); + + ASSERT(pcb->sent != 0); /* Make sure the socket didn't get closed */ if (!arg) return ERR_OK; @@ -79,6 +81,8 @@ DbgPrint("[lwIP, InternalRecvEventHandler] RecvEvent (0x%x, pcb = 0x%x, pbuf = 0x%x, err = %d)\n", arg, pcb, p, (unsigned int)err); + + ASSERT(pcb->recv != NULL); /* Make sure the socket didn't get closed */ if (!arg) @@ -588,7 +592,12 @@ { struct shutdown_callback_msg *msg = arg; - if (msg->Pcb->state == ESTABLISHED || msg->Pcb->state == SYN_RCVD) + /* + We check here if the pcb is in state ESTABLISHED or SYN_RECV because otherwise + it means lwIP will take care of it anyway and if it does so before us it will + cause memory corruption. + */ + if ((msg->Pcb->state == ESTABLISHED) || (msg->Pcb->state == SYN_RCVD)) { msg->Error = tcp_shutdown(msg->Pcb, msg->shut_rx, msg->shut_tx); } @@ -604,7 +613,7 @@ struct shutdown_callback_msg *msg; err_t ret; - DbgPrint("[lwIP, LibTCPShutdown] Called on pcb = 0x%x with rx = %d, tx = %d\n", pcb, shut_rx, shut_tx); + DbgPrint("[lwIP, LibTCPShutdown] Called on pcb = 0x%x, rx = %d, tx = %d\n", pcb, shut_rx, shut_tx); if (!pcb) { @@ -658,6 +667,12 @@ { struct close_callback_msg *msg = arg; + if (msg->Pcb->state == CLOSED) + { + DbgPrint("[lwIP, LibTCPCloseCallback] Connection was closed on us\n"); + msg->Error = ERR_OK; + } + if (msg->Pcb->state == LISTEN) { DbgPrint("[lwIP, LibTCPCloseCallback] Closing a listener\n");

13 years, 2 months

← Newer
1
...
25
26
27
28
29
30
31
...
52
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs July 2011