Ros-diffs

ros-diffs@reactos.org

81390 discussions

[hbelusca] 57414: [BOOTDATA] - Revert rev.57413. Indeed, when one boots ReactOS without debugging (selecting the first entry in the boot menu), the COM1 symbolic link (corresponding to \Device\Seri...
by hbelusca＠svn.reactos.org 28 Sep '12

28 Sep '12

Author: hbelusca Date: Fri Sep 28 19:04:37 2012 New Revision: 57414 URL: http://svn.reactos.org/svn/reactos?rev=57414&view=rev Log: [BOOTDATA] - Revert rev.57413. Indeed, when one boots ReactOS without debugging (selecting the first entry in the boot menu), the COM1 symbolic link (corresponding to \Device\Serial0) is created automatically by the serial driver. However, when one boots in debugging mode (selecting the second entry -- ReactOS (Debug) --), then for some reason the COM1 link isn't created (albeit \Device\Serial0 is). Therefore the real problem is elsewhere. Seems that it has something to share with http://jira.reactos.org/browse/CORE-4263 Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_amd6… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Fri Sep 28 19:04:37 2012 @@ -1192,10 +1192,6 @@ ; DOS devices HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","AUX",0x00000000,"\DosDevices\COM1" -;; ReactOS specific - add a symbolic link to the first COM port, because it happens for whatever -;; reason that the serial.sys driver doesn't create it when it creates the Serial0 device. -;; When this functionality is repaired, the following line shall disappear. -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","COM1",0x00000000,"\Device\Serial0" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","MAILSLOT",0x00000000,"\Device\MailSlot" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","NUL",0x00000000,"\Device\Null" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","PIPE",0x00000000,"\Device\NamedPipe" Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Fri Sep 28 19:04:37 2012 @@ -747,10 +747,6 @@ ; DOS devices HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","AUX",0x00000000,"\DosDevices\COM1" -;; ReactOS specific - add a symbolic link to the first COM port, because it happens for whatever -;; reason that the serial.sys driver doesn't create it when it creates the Serial0 device. -;; When this functionality is repaired, the following line shall disappear. -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","COM1",0x00000000,"\Device\Serial0" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","MAILSLOT",0x00000000,"\Device\MailSlot" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","NUL",0x00000000,"\Device\Null" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","PIPE",0x00000000,"\Device\NamedPipe" Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Fri Sep 28 19:04:37 2012 @@ -1192,10 +1192,6 @@ ; DOS devices HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","AUX",0x00000000,"\DosDevices\COM1" -;; ReactOS specific - add a symbolic link to the first COM port, because it happens for whatever -;; reason that the serial.sys driver doesn't create it when it creates the Serial0 device. -;; When this functionality is repaired, the following line shall disappear. -HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","COM1",0x00000000,"\Device\Serial0" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","MAILSLOT",0x00000000,"\Device\MailSlot" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","NUL",0x00000000,"\Device\Null" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","PIPE",0x00000000,"\Device\NamedPipe"

1 0

[hbelusca] 57413: [BOOTDATA] - HACK: Add artificially a symbolic link to the first COM port, because it happens for whatever reason that the serial.sys driver doesn't create it when it creates the ...
by hbelusca＠svn.reactos.org 28 Sep '12

28 Sep '12

Author: hbelusca Date: Fri Sep 28 18:46:46 2012 New Revision: 57413 URL: http://svn.reactos.org/svn/reactos?rev=57413&view=rev Log: [BOOTDATA] - HACK: Add artificially a symbolic link to the first COM port, because it happens for whatever reason that the serial.sys driver doesn't create it when it creates the Serial0 device. When this functionality is repaired, the HACK shall disappear. Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf trunk/reactos/boot/bootdata/hivesys_arm.inf trunk/reactos/boot/bootdata/hivesys_i386.inf Modified: trunk/reactos/boot/bootdata/hivesys_amd64.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_amd6… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_amd64.inf [iso-8859-1] Fri Sep 28 18:46:46 2012 @@ -1192,6 +1192,10 @@ ; DOS devices HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","AUX",0x00000000,"\DosDevices\COM1" +;; ReactOS specific - add a symbolic link to the first COM port, because it happens for whatever +;; reason that the serial.sys driver doesn't create it when it creates the Serial0 device. +;; When this functionality is repaired, the following line shall disappear. +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","COM1",0x00000000,"\Device\Serial0" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","MAILSLOT",0x00000000,"\Device\MailSlot" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","NUL",0x00000000,"\Device\Null" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","PIPE",0x00000000,"\Device\NamedPipe" Modified: trunk/reactos/boot/bootdata/hivesys_arm.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_arm.… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_arm.inf [iso-8859-1] Fri Sep 28 18:46:46 2012 @@ -747,6 +747,10 @@ ; DOS devices HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","AUX",0x00000000,"\DosDevices\COM1" +;; ReactOS specific - add a symbolic link to the first COM port, because it happens for whatever +;; reason that the serial.sys driver doesn't create it when it creates the Serial0 device. +;; When this functionality is repaired, the following line shall disappear. +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","COM1",0x00000000,"\Device\Serial0" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","MAILSLOT",0x00000000,"\Device\MailSlot" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","NUL",0x00000000,"\Device\Null" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","PIPE",0x00000000,"\Device\NamedPipe" Modified: trunk/reactos/boot/bootdata/hivesys_i386.inf URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/hivesys_i386… ============================================================================== --- trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] (original) +++ trunk/reactos/boot/bootdata/hivesys_i386.inf [iso-8859-1] Fri Sep 28 18:46:46 2012 @@ -1192,6 +1192,10 @@ ; DOS devices HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","AUX",0x00000000,"\DosDevices\COM1" +;; ReactOS specific - add a symbolic link to the first COM port, because it happens for whatever +;; reason that the serial.sys driver doesn't create it when it creates the Serial0 device. +;; When this functionality is repaired, the following line shall disappear. +HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","COM1",0x00000000,"\Device\Serial0" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","MAILSLOT",0x00000000,"\Device\MailSlot" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","NUL",0x00000000,"\Device\Null" HKLM,"SYSTEM\CurrentControlSet\Control\Session Manager\DOS Devices","PIPE",0x00000000,"\Device\NamedPipe"

1 0

[hbelusca] 57412: [NTOSKRNL] - ExFreePool --> ExFreePoolWithTag in some places. - Remove dead code (section.c) - Free resource (sysldr.c)
by hbelusca＠svn.reactos.org 28 Sep '12

28 Sep '12

Author: hbelusca Date: Fri Sep 28 12:17:23 2012 New Revision: 57412 URL: http://svn.reactos.org/svn/reactos?rev=57412&view=rev Log: [NTOSKRNL] - ExFreePool --> ExFreePoolWithTag in some places. - Remove dead code (section.c) - Free resource (sysldr.c) Modified: trunk/reactos/ntoskrnl/cache/section/data.c trunk/reactos/ntoskrnl/io/iomgr/iofunc.c trunk/reactos/ntoskrnl/io/iomgr/irq.c trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c trunk/reactos/ntoskrnl/mm/ARM3/expool.c trunk/reactos/ntoskrnl/mm/ARM3/mminit.c trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c trunk/reactos/ntoskrnl/mm/ARM3/procsup.c trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c trunk/reactos/ntoskrnl/mm/ARM3/virtual.c trunk/reactos/ntoskrnl/mm/section.c Modified: trunk/reactos/ntoskrnl/cache/section/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cache/section/dat… ============================================================================== --- trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/cache/section/data.c [iso-8859-1] Fri Sep 28 12:17:23 2012 @@ -555,7 +555,7 @@ { KeReleaseSpinLock(&FileObject->IrpListLock, OldIrql); DPRINTC("Free Segment %x\n", Segment); - ExFreePool(Segment); + ExFreePoolWithTag(Segment, TAG_MM_SECTION_SEGMENT); DPRINT("Filling out Segment info (previous data section)\n"); 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] Fri Sep 28 12:17:23 2012 @@ -1347,7 +1347,7 @@ { /* Allocating failed, clean up and return the exception code */ IopCleanupAfterException(FileObject, Irp, Event, NULL); - if (LocalLength) ExFreePool(LocalLength); + if (LocalLength) ExFreePoolWithTag(LocalLength, TAG_LOCK); /* Return the exception code */ _SEH2_YIELD(return _SEH2_GetExceptionCode()); @@ -1450,7 +1450,7 @@ _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* Free buffer and return the exception code */ - if (AuxBuffer) ExFreePool(AuxBuffer); + if (AuxBuffer) ExFreePoolWithTag(AuxBuffer, TAG_SYSB); _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; @@ -1466,7 +1466,7 @@ if (!NT_SUCCESS(Status)) { /* Fail */ - if (AuxBuffer) ExFreePool(AuxBuffer); + if (AuxBuffer) ExFreePoolWithTag(AuxBuffer, TAG_SYSB); return Status; } @@ -1539,7 +1539,7 @@ { /* Allocating failed, clean up and return the exception code */ IopCleanupAfterException(FileObject, Irp, Event, NULL); - if (AuxBuffer) ExFreePool(AuxBuffer); + if (AuxBuffer) ExFreePoolWithTag(AuxBuffer, TAG_SYSB); /* Return the exception code */ _SEH2_YIELD(return _SEH2_GetExceptionCode()); @@ -1863,7 +1863,7 @@ _SEH2_END; /* Free the event */ - ExFreePool(Event); + ExFreePoolWithTag(Event, TAG_IO); } else { @@ -2465,7 +2465,7 @@ * Someone else set the completion port in the * meanwhile, so dereference the port and fail. */ - ExFreePool(Context); + ExFreePoolWithTag(Context, IOC_TAG); ObDereferenceObject(Queue); Status = STATUS_INVALID_PARAMETER; } @@ -2524,7 +2524,7 @@ _SEH2_END; /* Free the event */ - ExFreePool(Event); + ExFreePoolWithTag(Event, TAG_IO); } else { @@ -2555,7 +2555,7 @@ { /* Clear it in the IRP for completion */ Irp->UserEvent = NULL; - ExFreePool(Event); + ExFreePoolWithTag(Event, TAG_IO); } /* Set the caller IOSB */ @@ -2722,7 +2722,7 @@ /* Allocate a buffer */ LocalLength = ExAllocatePoolWithTag(NonPagedPool, sizeof(LARGE_INTEGER), - TAG_LOCK); + TAG_LOCK); /* Set the length */ *LocalLength = CapturedLength; @@ -2733,7 +2733,7 @@ { /* Allocating failed, clean up and return the exception code */ IopCleanupAfterException(FileObject, Irp, NULL, Event); - if (LocalLength) ExFreePool(LocalLength); + if (LocalLength) ExFreePoolWithTag(LocalLength, TAG_LOCK); /* Return the exception code */ _SEH2_YIELD(return _SEH2_GetExceptionCode()); Modified: trunk/reactos/ntoskrnl/io/iomgr/irq.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/irq.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/irq.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/irq.c [iso-8859-1] Fri Sep 28 12:17:23 2012 @@ -103,7 +103,7 @@ if (FirstRun) { /* We failed early so just free this */ - ExFreePool(IoInterrupt); + ExFreePoolWithTag(IoInterrupt, TAG_KINTERRUPT); } else { @@ -163,7 +163,7 @@ } /* Free the I/O Interrupt */ - ExFreePool(IoInterrupt); + ExFreePool(IoInterrupt); // ExFreePoolWithTag(IoInterrupt, TAG_KINTERRUPT); } /* EOF */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/drvmgmt.c [iso-8859-1] Fri Sep 28 12:17:23 2012 @@ -200,7 +200,7 @@ // // Free the table if we failed and return status // - if (DriverThunks) ExFreePool(DriverThunks); + if (DriverThunks) ExFreePoolWithTag(DriverThunks, 'tVmM'); return Status; } Modified: trunk/reactos/ntoskrnl/mm/ARM3/expool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/expool.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/expool.c [iso-8859-1] Fri Sep 28 12:17:23 2012 @@ -358,7 +358,7 @@ // Finally, AND with the bucket mask to generate a valid index/bucket into // the table // - ULONGLONG Result = 40543 * Tag; + ULONGLONG Result = (ULONGLONG)40543 * Tag; return (ULONG)BucketMask & ((ULONG)Result ^ (Result >> 32)); } @@ -1185,7 +1185,7 @@ // // Free the "Generic DPC" temporary buffer, return the buffer length and status // - ExFreePool(Buffer); + ExFreePoolWithTag(Buffer, 'ofnI'); if (ReturnLength) *ReturnLength = CurrentLength; return Status; } Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/mminit.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/mminit.c [iso-8859-1] Fri Sep 28 12:17:23 2012 @@ -1172,7 +1172,7 @@ KeFlushCurrentTb(); /* Free our run structure */ - ExFreePool(Buffer); + ExFreePoolWithTag(Buffer, 'lMmM'); } VOID Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Fri Sep 28 12:17:23 2012 @@ -663,7 +663,7 @@ ASSERT(Pfn1->u3.e1.ReadInProgress == 0); /* Windows checks there's some free pages and this isn't an in-page error */ - ASSERT(MmAvailablePages >= 0); + ASSERT(MmAvailablePages > 0); ASSERT(Pfn1->u4.InPageError == 0); /* ReactOS checks for this */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/procsup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/procsup.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/procsup.c [iso-8859-1] Fri Sep 28 12:17:23 2012 @@ -118,7 +118,11 @@ Base, &Parent); /* Bail out, if still nothing free was found */ - if (Result == TableFoundNode) return STATUS_NO_MEMORY; + if (Result == TableFoundNode) + { + ExFreePoolWithTag(Vad, 'ldaV'); + return STATUS_NO_MEMORY; + } } /* Validate that it came from the VAD ranges */ @@ -1857,6 +1861,7 @@ { /* We ran out of session IDs, we should expand */ DPRINT1("Too many sessions created. Expansion not yet supported\n"); + ExFreePoolWithTag(PageTables, 'tHmM'); return STATUS_NO_MEMORY; } Modified: trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c?… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/sysldr.c [iso-8859-1] Fri Sep 28 12:17:23 2012 @@ -1,11 +1,11 @@ /* -* PROJECT: ReactOS Kernel -* LICENSE: BSD - See COPYING.ARM in the top level directory -* FILE: ntoskrnl/mm/ARM3/sysldr.c -* PURPOSE: Contains the Kernel Loader (SYSLDR) for loading PE files. -* PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) -* ReactOS Portable Systems Group -*/ + * PROJECT: ReactOS Kernel + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: ntoskrnl/mm/ARM3/sysldr.c + * PURPOSE: Contains the Kernel Loader (SYSLDR) for loading PE files. + * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) + * ReactOS Portable Systems Group + */ /* INCLUDES *******************************************************************/ @@ -2179,9 +2179,13 @@ NewEntry->FullDllName.Buffer = ExAllocatePoolWithTag(PagedPool, LdrEntry->FullDllName.MaximumLength + - sizeof(UNICODE_NULL), + sizeof(UNICODE_NULL), TAG_LDR_WSTR); - if (!NewEntry->FullDllName.Buffer) return FALSE; + if (!NewEntry->FullDllName.Buffer) + { + ExFreePoolWithTag(NewEntry, TAG_MODULE_OBJECT); + return FALSE; + } /* Set the base name */ NewEntry->BaseDllName.Buffer = (PVOID)(NewEntry + 1); @@ -3436,3 +3440,4 @@ return ProcAddress; } +/* EOF */ Modified: trunk/reactos/ntoskrnl/mm/ARM3/virtual.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/virtual.c… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/virtual.c [iso-8859-1] Fri Sep 28 12:17:23 2012 @@ -1099,7 +1099,7 @@ // // Check if we had allocated pool // - if (HavePoolAddress) ExFreePool(PoolAddress); + if (HavePoolAddress) ExFreePoolWithTag(PoolAddress, 'VmRw'); // // Check if we failed during the probe @@ -1160,7 +1160,7 @@ // // Check if we had allocated pool // - if (HavePoolAddress) ExFreePool(PoolAddress); + if (HavePoolAddress) ExFreePoolWithTag(PoolAddress, 'VmRw'); // // All bytes read 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] Fri Sep 28 12:17:23 2012 @@ -1761,17 +1761,12 @@ Region->Protect, &NewPage, 1); - if (!NT_SUCCESS(Status)) - { - DPRINT("MmCreateVirtualMapping failed, not out of memory\n"); - KeBugCheck(MEMORY_MANAGEMENT); - return(Status); - } - if (!NT_SUCCESS(Status)) - { - DPRINT1("Unable to create virtual mapping\n"); - KeBugCheck(MEMORY_MANAGEMENT); - } + if (!NT_SUCCESS(Status)) + { + DPRINT1("MmCreateVirtualMapping failed, unable to create virtual mapping, not out of memory\n"); + KeBugCheck(MEMORY_MANAGEMENT); + return(Status); + } /* * Unshare the old page. @@ -3786,7 +3781,7 @@ if(ImageSectionObject->Segments != NULL) ExFreePool(ImageSectionObject->Segments); - ExFreePool(ImageSectionObject); + ExFreePoolWithTag(ImageSectionObject, TAG_MM_SECTION_SEGMENT); ObDereferenceObject(Section); ObDereferenceObject(FileObject); return(StatusExeFmt);

1 0

[hbelusca] 57411: [NTOSKRNL] - Revert rev.57400 only for this file since CID 701342 was a false-positive from Coverity (because Coverity doesn't know what the aim of the POOL_RAISE_IF_ALLOCATION_FA...
by hbelusca＠svn.reactos.org 28 Sep '12

28 Sep '12

Author: hbelusca Date: Fri Sep 28 10:01:00 2012 New Revision: 57411 URL: http://svn.reactos.org/svn/reactos?rev=57411&view=rev Log: [NTOSKRNL] - Revert rev.57400 only for this file since CID 701342 was a false-positive from Coverity (because Coverity doesn't know what the aim of the POOL_RAISE_IF_ALLOCATION_FAILURE is). Modified: trunk/reactos/ntoskrnl/fsrtl/notify.c Modified: trunk/reactos/ntoskrnl/fsrtl/notify.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/fsrtl/notify.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/fsrtl/notify.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/fsrtl/notify.c [iso-8859-1] Fri Sep 28 10:01:00 2012 @@ -586,13 +586,6 @@ /* Allocate new notification */ NotifyChange = ExAllocatePoolWithTag(PagedPool | POOL_RAISE_IF_ALLOCATION_FAILURE, sizeof(NOTIFY_CHANGE), 'FSrN'); - - /* - * If NotifyChange == NULL then an - * exception was already raised. - */ - ASSERT(NotifyChange != NULL); - RtlZeroMemory(NotifyChange, sizeof(NOTIFY_CHANGE)); /* Set basic information */

1 0

[ekohl] 57410: [ADVAPI32] - Implement LsaRemovePrivilegesFromAccount. - Add stubs for LsaGetRemoteUserName, LsaLookupPrivilegeDisplayName, LsaOpenPolicySce and LsaSetInformationTrustedDomain. - Fix...
by ekohl＠svn.reactos.org 28 Sep '12

28 Sep '12

Author: ekohl Date: Fri Sep 28 09:19:37 2012 New Revision: 57410 URL: http://svn.reactos.org/svn/reactos?rev=57410&view=rev Log: [ADVAPI32] - Implement LsaRemovePrivilegesFromAccount. - Add stubs for LsaGetRemoteUserName, LsaLookupPrivilegeDisplayName, LsaOpenPolicySce and LsaSetInformationTrustedDomain. - Fix some issues in the spec file. Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec trunk/reactos/dll/win32/advapi32/sec/lsa.c trunk/reactos/include/psdk/ntsecapi.h Modified: trunk/reactos/dll/win32/advapi32/advapi32.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/advapi3… ============================================================================== --- trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/advapi32.spec [iso-8859-1] Fri Sep 28 09:19:37 2012 @@ -363,29 +363,29 @@ @ stdcall LsaEnumerateTrustedDomainsEx(ptr ptr ptr long ptr) @ stdcall LsaFreeMemory(ptr) @ stdcall LsaGetQuotasForAccount(ptr ptr) -@ stub LsaGetRemoteUserName +@ stdcall LsaGetRemoteUserName(ptr ptr ptr) @ stdcall LsaGetSystemAccessAccount(ptr ptr) @ stdcall LsaGetUserName(ptr ptr) @ stub LsaICLookupNames @ stub LsaICLookupNamesWithCreds @ stub LsaICLookupSids @ stub LsaICLookupSidsWithCreds -@ stdcall LsaLookupNames(long long ptr ptr ptr) +@ stdcall LsaLookupNames(ptr long ptr ptr ptr) @ stdcall LsaLookupNames2(ptr long long ptr ptr ptr) -@ stub LsaLookupPrivilegeDisplayName +@ stdcall LsaLookupPrivilegeDisplayName(ptr ptr ptr ptr) @ stdcall LsaLookupPrivilegeName(ptr ptr ptr) @ stdcall LsaLookupPrivilegeValue(ptr ptr ptr) @ stdcall LsaLookupSids(ptr long ptr ptr ptr) @ stdcall LsaNtStatusToWinError(long) @ stdcall LsaOpenAccount(ptr ptr long ptr) @ stdcall LsaOpenPolicy(ptr ptr long ptr) -@ stub LsaOpenPolicySce +@ stdcall LsaOpenPolicySce(ptr ptr long ptr) @ stdcall LsaOpenSecret(ptr ptr long ptr) @ stdcall LsaOpenTrustedDomain(ptr ptr long ptr) @ stdcall LsaOpenTrustedDomainByName(ptr ptr long ptr) @ stdcall LsaQueryDomainInformationPolicy(ptr long ptr) @ stdcall LsaQueryForestTrustInformation(ptr ptr ptr) -@ stdcall LsaQueryInfoTrustedDomain(long long long) +@ stdcall LsaQueryInfoTrustedDomain(ptr long ptr) @ stdcall LsaQueryInformationPolicy(ptr long ptr) @ stdcall LsaQuerySecret(ptr ptr ptr ptr ptr) @ stdcall LsaQuerySecurityObject(ptr long ptr) @@ -393,12 +393,12 @@ @ stdcall LsaQueryTrustedDomainInfoByName(ptr ptr long ptr) @ stdcall LsaRegisterPolicyChangeNotification(long long) @ stdcall LsaRemoveAccountRights(ptr ptr long ptr long) -@ stub LsaRemovePrivilegesFromAccount +@ stdcall LsaRemovePrivilegesFromAccount(ptr long ptr) @ stdcall LsaRetrievePrivateData(ptr ptr ptr) @ stdcall LsaSetDomainInformationPolicy(ptr long ptr) @ stdcall LsaSetForestTrustInformation(ptr ptr ptr long ptr) -@ stdcall LsaSetInformationPolicy(long long ptr) -@ stub LsaSetInformationTrustedDomain +@ stdcall LsaSetInformationPolicy(ptr long ptr) +@ stdcall LsaSetInformationTrustedDomain(ptr long ptr) @ stdcall LsaSetQuotasForAccount(ptr ptr) @ stdcall LsaSetSecret(ptr ptr ptr) @ stdcall LsaSetSecurityObject(ptr long ptr) Modified: trunk/reactos/dll/win32/advapi32/sec/lsa.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/sec/lsa… ============================================================================== --- trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/sec/lsa.c [iso-8859-1] Fri Sep 28 09:19:37 2012 @@ -163,7 +163,7 @@ * @implemented */ NTSTATUS -NTAPI +WINAPI LsaClearAuditLog(IN LSA_HANDLE PolicyHandle) { NTSTATUS Status; @@ -676,6 +676,21 @@ RpcEndExcept; return Status; +} + + +/* + * @unimplemented + */ +NTSTATUS +WINAPI +LsaGetRemoteUserName(IN PLSA_UNICODE_STRING SystemName OPTIONAL, + OUT PLSA_UNICODE_STRING *UserName, + OUT PLSA_UNICODE_STRING *DomainName OPTIONAL) +{ + FIXME("LsaGetUserName(%p %p %p)\n", + SystemName, UserName, DomainName); + return STATUS_NOT_IMPLEMENTED; } @@ -855,6 +870,22 @@ /* + * @unimplemented + */ +NTSTATUS +WINAPI +LsaLookupPrivilegeDisplayName(IN LSA_HANDLE PolicyHandle, + IN PLSA_UNICODE_STRING Name, + OUT PLSA_UNICODE_STRING *DisplayName, + OUT PSHORT LanguageReturned) +{ + FIXME("LsaLookupPrivilegeDisplayName(%p %p %p %p)\n", + PolicyHandle, Name, DisplayName, LanguageReturned); + return STATUS_NOT_IMPLEMENTED; +} + + +/* * @implemented */ NTSTATUS @@ -1078,6 +1109,26 @@ } +/* + * @unimplemented + */ +NTSTATUS +WINAPI +LsaOpenPolicySce(IN PLSA_UNICODE_STRING SystemName OPTIONAL, + IN PLSA_OBJECT_ATTRIBUTES ObjectAttributes, + IN ACCESS_MASK DesiredAccess, + OUT PLSA_HANDLE PolicyHandle) +{ + FIXME("LsaOpenPolicySce(%s %p 0x%08lx %p)\n", + SystemName ? debugstr_w(SystemName->Buffer) : "(null)", + ObjectAttributes, DesiredAccess, PolicyHandle); + return STATUS_NOT_IMPLEMENTED; +} + + +/* + * @implemented + */ NTSTATUS WINAPI LsaOpenSecret(IN LSA_HANDLE PolicyHandle, @@ -1528,6 +1579,33 @@ /* + * @implemented + */ +NTSTATUS +WINAPI +LsaRemovePrivilegesFromAccount(IN LSA_HANDLE AccountHandle, + IN BOOLEAN AllPrivileges, + IN PPRIVILEGE_SET Privileges OPTIONAL) +{ + NTSTATUS Status; + + RpcTryExcept + { + Status = LsarRemovePrivilegesFromAccount((LSAPR_HANDLE)AccountHandle, + AllPrivileges, + (PLSAPR_PRIVILEGE_SET)Privileges); + } + RpcExcept(EXCEPTION_EXECUTE_HANDLER) + { + Status = I_RpcMapWin32Status(RpcExceptionCode()); + } + RpcEndExcept; + + return Status; +} + + +/* * @unimplemented */ NTSTATUS @@ -1601,6 +1679,21 @@ RpcEndExcept; return Status; +} + + +/* + * @unimplemented + */ +NTSTATUS +WINAPI +LsaSetInformationTrustedDomain(IN LSA_HANDLE TrustedDomainHandle, + IN TRUSTED_INFORMATION_CLASS InformationClass, + IN PVOID Buffer) +{ + FIXME("LsaSetInformationTrustedDomain(%p %d %p)\n", + TrustedDomainHandle, InformationClass, Buffer); + return STATUS_NOT_IMPLEMENTED; } Modified: trunk/reactos/include/psdk/ntsecapi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntsecapi.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntsecapi.h [iso-8859-1] Fri Sep 28 09:19:37 2012 @@ -70,6 +70,7 @@ #define POLICY_AUDIT_LOG_ADMIN 512 #define POLICY_SERVER_ADMIN 1024 #define POLICY_LOOKUP_NAMES 2048 +#define POLICY_NOTIFICATION 4096 #define POLICY_READ (STANDARD_RIGHTS_READ|6) #define POLICY_WRITE (STANDARD_RIGHTS_WRITE|2040) #define POLICY_EXECUTE (STANDARD_RIGHTS_EXECUTE|2049) @@ -690,6 +691,8 @@ NTSTATUS NTAPI LsaFreeMemory(PVOID); NTSTATUS NTAPI LsaFreeReturnBuffer(PVOID); NTSTATUS NTAPI LsaGetQuotasForAccount(LSA_HANDLE,PQUOTA_LIMITS); +NTSTATUS NTAPI LsaGetRemoteUserName(PLSA_UNICODE_STRING, PLSA_UNICODE_STRING*, + PLSA_UNICODE_STRING*); NTSTATUS NTAPI LsaGetSystemAccessAccount(LSA_HANDLE, PULONG); NTSTATUS NTAPI LsaGetUserName(PUNICODE_STRING*,PUNICODE_STRING*); NTSTATUS NTAPI LsaLogonUser(HANDLE,PLSA_STRING,SECURITY_LOGON_TYPE,ULONG,PVOID, @@ -700,6 +703,8 @@ PLSA_REFERENCED_DOMAIN_LIST*,PLSA_TRANSLATED_SID*); NTSTATUS NTAPI LsaLookupNames2(LSA_HANDLE,ULONG,ULONG,PLSA_UNICODE_STRING, PLSA_REFERENCED_DOMAIN_LIST*,PLSA_TRANSLATED_SID2*); +NTSTATUS NTAPI LsaLookupPrivilegeDisplayName(LSA_HANDLE,PLSA_UNICODE_STRING, + PLSA_UNICODE_STRING*,PSHORT); NTSTATUS NTAPI LsaLookupPrivilegeName(LSA_HANDLE,PLUID,PLSA_UNICODE_STRING*); NTSTATUS NTAPI LsaLookupPrivilegeValue(LSA_HANDLE,PLSA_UNICODE_STRING,PLUID); NTSTATUS NTAPI LsaLookupSids(LSA_HANDLE,ULONG,PSID*, @@ -707,6 +712,8 @@ ULONG NTAPI LsaNtStatusToWinError(NTSTATUS); NTSTATUS NTAPI LsaOpenAccount(LSA_HANDLE,PSID,ACCESS_MASK,PLSA_HANDLE); NTSTATUS NTAPI LsaOpenPolicy(PLSA_UNICODE_STRING,PLSA_OBJECT_ATTRIBUTES, + ACCESS_MASK,PLSA_HANDLE); +NTSTATUS NTAPI LsaOpenPolicySce(PLSA_UNICODE_STRING,PLSA_OBJECT_ATTRIBUTES, ACCESS_MASK,PLSA_HANDLE); NTSTATUS NTAPI LsaOpenSecret(LSA_HANDLE, PLSA_UNICODE_STRING, ACCESS_MASK, PLSA_HANDLE); NTSTATUS NTAPI LsaQuerySecurityObject(LSA_HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR*); @@ -725,11 +732,14 @@ NTSTATUS NTAPI LsaRegisterLogonProcess(PLSA_STRING,PHANDLE,PLSA_OPERATIONAL_MODE); NTSTATUS NTAPI LsaRemoveAccountRights(LSA_HANDLE,PSID,BOOLEAN, PLSA_UNICODE_STRING,ULONG); +NTSTATUS NTAPI LsaRemovePrivilegesFromAccount(LSA_HANDLE,BOOLEAN,PPRIVILEGE_SET); NTSTATUS NTAPI LsaRetrievePrivateData(LSA_HANDLE,PLSA_UNICODE_STRING, PLSA_UNICODE_STRING*); NTSTATUS NTAPI LsaSetDomainInformationPolicy(LSA_HANDLE, POLICY_DOMAIN_INFORMATION_CLASS,PVOID); NTSTATUS NTAPI LsaSetInformationPolicy(LSA_HANDLE,POLICY_INFORMATION_CLASS,PVOID); +NTSTATUS NTAPI LsaSetInformationTrustedDomain(LSA_HANDLE,TRUSTED_INFORMATION_CLASS, + PVOID); NTSTATUS NTAPI LsaSetQuotasForAccount(LSA_HANDLE,PQUOTA_LIMITS); NTSTATUS NTAPI LsaSetSecret(LSA_HANDLE,PLSA_UNICODE_STRING,PLSA_UNICODE_STRING); NTSTATUS NTAPI LsaSetSecurityObject(LSA_HANDLE,SECURITY_INFORMATION,PSECURITY_DESCRIPTOR);

1 0

[tfaber] 57409: [KMTESTS] - Fix GCC build
by tfaber＠svn.reactos.org 28 Sep '12

28 Sep '12

Author: tfaber Date: Fri Sep 28 07:13:26 2012 New Revision: 57409 URL: http://svn.reactos.org/svn/reactos?rev=57409&view=rev Log: [KMTESTS] - Fix GCC build Modified: trunk/rostests/kmtests/ntos_ke/KeMutex.c Modified: trunk/rostests/kmtests/ntos_ke/KeMutex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ke/KeMutex.c… ============================================================================== --- trunk/rostests/kmtests/ntos_ke/KeMutex.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/ntos_ke/KeMutex.c [iso-8859-1] Fri Sep 28 07:13:26 2012 @@ -56,7 +56,6 @@ TestMutant(VOID) { KMUTANT Mutant; - PKTHREAD Thread = KeGetCurrentThread(); LONG State; RtlFillMemory(&Mutant, sizeof(Mutant), 0x55);

1 0

[tfaber] 57408: [KMTESTS:KE] - Add test for KeInitializeMutant vs KeInitializeMutex. Dedicated to Mike.
by tfaber＠svn.reactos.org 28 Sep '12

28 Sep '12

Author: tfaber Date: Fri Sep 28 07:09:08 2012 New Revision: 57408 URL: http://svn.reactos.org/svn/reactos?rev=57408&view=rev Log: [KMTESTS:KE] - Add test for KeInitializeMutant vs KeInitializeMutex. Dedicated to Mike. Added: trunk/rostests/kmtests/ntos_ke/KeMutex.c (with props) Modified: trunk/rostests/kmtests/CMakeLists.txt trunk/rostests/kmtests/kmtest_drv/testlist.c Modified: trunk/rostests/kmtests/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/CMakeLists.txt?re… ============================================================================== --- trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] (original) +++ trunk/rostests/kmtests/CMakeLists.txt [iso-8859-1] Fri Sep 28 07:09:08 2012 @@ -45,6 +45,7 @@ ntos_ke/KeEvent.c ntos_ke/KeGuardedMutex.c ntos_ke/KeIrql.c + ntos_ke/KeMutex.c ntos_ke/KeProcessor.c ntos_ke/KeSpinLock.c ntos_ke/KeTimer.c Modified: trunk/rostests/kmtests/kmtest_drv/testlist.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/kmtest_drv/testli… ============================================================================== --- trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] (original) +++ trunk/rostests/kmtests/kmtest_drv/testlist.c [iso-8859-1] Fri Sep 28 07:09:08 2012 @@ -30,6 +30,7 @@ KMT_TESTFUNC Test_KeEvent; KMT_TESTFUNC Test_KeGuardedMutex; KMT_TESTFUNC Test_KeIrql; +KMT_TESTFUNC Test_KeMutex; KMT_TESTFUNC Test_KeProcessor; KMT_TESTFUNC Test_KeTimer; KMT_TESTFUNC Test_KernelType; @@ -70,6 +71,7 @@ { "KeEvent", Test_KeEvent }, { "KeGuardedMutex", Test_KeGuardedMutex }, { "KeIrql", Test_KeIrql }, + { "KeMutex", Test_KeMutex }, { "-KeProcessor", Test_KeProcessor }, { "KeTimer", Test_KeTimer }, { "-KernelType", Test_KernelType }, Added: trunk/rostests/kmtests/ntos_ke/KeMutex.c URL: http://svn.reactos.org/svn/reactos/trunk/rostests/kmtests/ntos_ke/KeMutex.c… ============================================================================== --- trunk/rostests/kmtests/ntos_ke/KeMutex.c (added) +++ trunk/rostests/kmtests/ntos_ke/KeMutex.c [iso-8859-1] Fri Sep 28 07:09:08 2012 @@ -1,0 +1,98 @@ +/* + * PROJECT: ReactOS kernel-mode tests + * LICENSE: GPLv2+ - See COPYING in the top level directory + * PURPOSE: Kernel-Mode Test Suite Mutant/Mutex test + * PROGRAMMER: Thomas Faber <thfabba(a)gmx.de> + */ + +#include <kmt_test.h> + +#define ULONGS_PER_POINTER (sizeof(PVOID) / sizeof(ULONG)) +#define MUTANT_SIZE (2 + 6 * ULONGS_PER_POINTER) + +C_ASSERT(sizeof(DISPATCHER_HEADER) == 8 + 2 * sizeof(PVOID)); +C_ASSERT(sizeof(KMUTANT) == sizeof(DISPATCHER_HEADER) + 3 * sizeof(PVOID) + sizeof(PVOID)); +C_ASSERT(sizeof(KMUTANT) == MUTANT_SIZE * sizeof(ULONG)); + +#define CheckMutex(Mutex, Held, New, ExpectedApcDisable) do { \ + PKTHREAD Thread = KeGetCurrentThread(); \ + ok_eq_uint((Mutex)->Header.Type, MutantObject); \ + ok_eq_uint((Mutex)->Header.Abandoned, 0x55); \ + ok_eq_uint((Mutex)->Header.Size, MUTANT_SIZE); \ + ok_eq_uint((Mutex)->Header.DpcActive, 0x55); \ + ok_eq_pointer((Mutex)->Header.WaitListHead.Flink, \ + &(Mutex)->Header.WaitListHead); \ + ok_eq_pointer((Mutex)->Header.WaitListHead.Blink, \ + &(Mutex)->Header.WaitListHead); \ + if (Held) \ + { \ + ok_eq_long((Mutex)->Header.SignalState, 0); \ + ok_eq_pointer((Mutex)->MutantListEntry.Flink, &Thread->MutantListHead); \ + ok_eq_pointer((Mutex)->MutantListEntry.Blink, &Thread->MutantListHead); \ + ok_eq_pointer(Thread->MutantListHead.Flink, &(Mutex)->MutantListEntry); \ + ok_eq_pointer(Thread->MutantListHead.Blink, &(Mutex)->MutantListEntry); \ + ok_eq_pointer((Mutex)->OwnerThread, Thread); \ + } \ + else \ + { \ + ok_eq_long((Mutex)->Header.SignalState, 1); \ + if (New) \ + { \ + ok_eq_pointer((Mutex)->MutantListEntry.Flink, \ + (PVOID)0x5555555555555555ULL); \ + ok_eq_pointer((Mutex)->MutantListEntry.Blink, \ + (PVOID)0x5555555555555555ULL); \ + } \ + ok_eq_pointer(Thread->MutantListHead.Flink, &Thread->MutantListHead); \ + ok_eq_pointer(Thread->MutantListHead.Blink, &Thread->MutantListHead); \ + ok_eq_pointer((Mutex)->OwnerThread, NULL); \ + } \ + ok_eq_uint((Mutex)->Abandoned, 0); \ + ok_eq_uint((Mutex)->ApcDisable, ExpectedApcDisable); \ +} while (0) + +static +VOID +TestMutant(VOID) +{ + KMUTANT Mutant; + PKTHREAD Thread = KeGetCurrentThread(); + LONG State; + + RtlFillMemory(&Mutant, sizeof(Mutant), 0x55); + KeInitializeMutant(&Mutant, FALSE); + ok_irql(PASSIVE_LEVEL); + CheckMutex(&Mutant, FALSE, TRUE, 0); + + RtlFillMemory(&Mutant, sizeof(Mutant), 0x55); + KeInitializeMutant(&Mutant, TRUE); + ok_irql(PASSIVE_LEVEL); + CheckMutex(&Mutant, TRUE, TRUE, 0); + State = KeReleaseMutant(&Mutant, 1, FALSE, FALSE); + ok_eq_long(State, 0); + ok_irql(PASSIVE_LEVEL); + CheckMutex(&Mutant, FALSE, FALSE, 0); +} + +static +VOID +TestMutex(VOID) +{ + KMUTEX Mutex; + + RtlFillMemory(&Mutex, sizeof(Mutex), 0x55); + KeInitializeMutex(&Mutex, 0); + ok_irql(PASSIVE_LEVEL); + CheckMutex(&Mutex, FALSE, TRUE, 1); + + RtlFillMemory(&Mutex, sizeof(Mutex), 0x55); + KeInitializeMutex(&Mutex, 123); + ok_irql(PASSIVE_LEVEL); + CheckMutex(&Mutex, FALSE, TRUE, 1); +} + +START_TEST(KeMutex) +{ + TestMutant(); + TestMutex(); +} Propchange: trunk/rostests/kmtests/ntos_ke/KeMutex.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[hbelusca] 57407: [KERNEL32] - Reworking the Find* APIs in kernel32. Fixes some kernel32_winetest:file failures. - The FindExInfoBasic information level for FindFirstFileEx, is also implemented. - ...
by hbelusca＠svn.reactos.org 27 Sep '12

27 Sep '12

Author: hbelusca Date: Thu Sep 27 22:07:06 2012 New Revision: 57407 URL: http://svn.reactos.org/svn/reactos?rev=57407&view=rev Log: [KERNEL32] - Reworking the Find* APIs in kernel32. Fixes some kernel32_winetest:file failures. - The FindExInfoBasic information level for FindFirstFileEx, is also implemented. - Update ndk and psdk headers regarding to this work. CORE-6623 #comment Committed in rev.57407. #resolve Modified: trunk/reactos/dll/win32/kernel32/client/file/find.c trunk/reactos/include/ndk/iotypes.h trunk/reactos/include/psdk/winbase.h Modified: trunk/reactos/dll/win32/kernel32/client/file/find.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/file/find.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/file/find.c [iso-8859-1] Thu Sep 27 22:07:06 2012 @@ -1,452 +1,256 @@ -/* $Id: find.c 53068 2011-08-04 22:18:01Z ion $ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS system libraries - * FILE: lib/kernel32/file/find.c + * FILE: dll/win32/kernel32/client/file/find.c * PURPOSE: Find functions - * PROGRAMMER: Ariadne ( ariadne(a)xs4all.nl) + * PROGRAMMERS: Ariadne (ariadne(a)xs4all.nl) * Pierre Schweitzer (pierre.schweitzer(a)reactos.org) - * UPDATE HISTORY: - * Created 01/11/98 + * Hermes BELUSCA - MAITO (hermes.belusca(a)sfr.fr) */ -/* INCLUDES *****************************************************************/ +/* INCLUDES *******************************************************************/ #include <k32.h> #define NDEBUG #include <debug.h> DEBUG_CHANNEL(kernel32file); -/* TYPES ********************************************************************/ - -#define FIND_DATA_SIZE 0x4000 - -#define FIND_DEVICE_HANDLE ((HANDLE)0x1) - -typedef struct _KERNEL32_FIND_FILE_DATA -{ - HANDLE DirectoryHandle; - RTL_CRITICAL_SECTION Lock; - PFILE_BOTH_DIR_INFORMATION pFileInfo; - BOOLEAN DirectoryOnly; - BOOLEAN HasMoreData; - BOOLEAN HasData; - BOOLEAN LockInitialized; -} KERNEL32_FIND_FILE_DATA, *PKERNEL32_FIND_FILE_DATA; - -typedef struct _KERNEL32_FIND_STREAM_DATA + +/* TYPES **********************************************************************/ + +#define FIND_DATA_SIZE 0x4000 +#define FIND_DEVICE_HANDLE ((HANDLE)0x1) + +typedef enum _FIND_DATA_TYPE +{ + FindFile = 1, + FindStream = 2 +} FIND_DATA_TYPE; + +/* + * FILE_FULL_DIR_INFORMATION and FILE_BOTH_DIR_INFORMATION structures layout. + * + * + * struct FILE_FULL_DIR_INFORMATION | struct FILE_BOTH_DIR_INFORMATION + * ------------------------------------+--------------------------------------- + * ULONG NextEntryOffset; | ULONG NextEntryOffset; + * ULONG FileIndex; | ULONG FileIndex; + * LARGE_INTEGER CreationTime; | LARGE_INTEGER CreationTime; + * LARGE_INTEGER LastAccessTime; | LARGE_INTEGER LastAccessTime; + * LARGE_INTEGER LastWriteTime; | LARGE_INTEGER LastWriteTime; + * LARGE_INTEGER ChangeTime; | LARGE_INTEGER ChangeTime; + * LARGE_INTEGER EndOfFile; | LARGE_INTEGER EndOfFile; + * LARGE_INTEGER AllocationSize; | LARGE_INTEGER AllocationSize; + * ULONG FileAttributes; | ULONG FileAttributes; + * ULONG FileNameLength; | ULONG FileNameLength; + * ULONG EaSize; | ULONG EaSize; + * ------------------------------------+--------------------------------------- + * WCHAR FileName[1]; | CCHAR ShortNameLength; + * | WCHAR ShortName[12]; + * | WCHAR FileName[1]; + * + * Therefore we can use pointers to FILE_FULL_DIR_INFORMATION when one doesn't + * want to refer to the ShortName* fields and FileName (useful for implementing + * the FindExInfoBasic functionality for FindFirstFileEx), however a cast to + * FILE_BOTH_DIR_INFORMATION is required when one wants to use FileName and + * ShortName* fields (needed for the FindExInfoStandard functionality). + * + */ +typedef union _DIR_INFORMATION +{ + PVOID DirInfo; + PFILE_FULL_DIR_INFORMATION FullDirInfo; + PFILE_BOTH_DIR_INFORMATION BothDirInfo; +} DIR_INFORMATION; + +typedef struct _FIND_FILE_DATA +{ + HANDLE Handle; + FINDEX_INFO_LEVELS InfoLevel; + FINDEX_SEARCH_OPS SearchOp; + + /* + * For handling STATUS_BUFFER_OVERFLOW errors emitted by + * NtQueryDirectoryFile in the FildNextFile function. + */ + BOOLEAN HasMoreData; + + /* + * "Pointer" to the next file info structure in the buffer. + * The type is defined by the 'InfoLevel' parameter. + */ + DIR_INFORMATION NextDirInfo; + + BYTE Buffer[FIND_DATA_SIZE]; +} FIND_FILE_DATA, *PFIND_FILE_DATA; + +typedef struct _FIND_STREAM_DATA { STREAM_INFO_LEVELS InfoLevel; - PFILE_STREAM_INFORMATION pFileStreamInfo; - PFILE_STREAM_INFORMATION pCurrent; -} KERNEL32_FIND_STREAM_DATA, *PKERNEL32_FIND_STREAM_DATA; - -typedef enum _KERNEL32_FIND_DATA_TYPE -{ - FileFind, - StreamFind -} KERNEL32_FIND_DATA_TYPE; - -typedef struct _KERNEL32_FIND_DATA_HEADER -{ - KERNEL32_FIND_DATA_TYPE Type; -} KERNEL32_FIND_DATA_HEADER, *PKERNEL32_FIND_DATA_HEADER; - - -/* FUNCTIONS ****************************************************************/ + PFILE_STREAM_INFORMATION FileStreamInfo; + PFILE_STREAM_INFORMATION CurrentInfo; +} FIND_STREAM_DATA, *PFIND_STREAM_DATA; + +typedef struct _FIND_DATA_HANDLE +{ + FIND_DATA_TYPE Type; + RTL_CRITICAL_SECTION Lock; + + /* + * Pointer to the following finding data, located at + * (this + 1). The type is defined by the 'Type' parameter. + */ + union + { + PFIND_FILE_DATA FindFileData; + PFIND_STREAM_DATA FindStreamData; + } u; + +} FIND_DATA_HANDLE, *PFIND_DATA_HANDLE; + + +/* PRIVATE FUNCTIONS **********************************************************/ static VOID -InternalCopyDeviceFindDataW(LPWIN32_FIND_DATAW lpFindFileData, - LPCWSTR lpFileName, - ULONG DeviceNameInfo) +CopyDeviceFindData(OUT LPWIN32_FIND_DATAW lpFindFileData, + IN LPCWSTR lpFileName, + IN ULONG DeviceNameInfo) { UNICODE_STRING DeviceName; - DeviceName.Length = DeviceName.MaximumLength = (USHORT)(DeviceNameInfo & 0xFFFF); - DeviceName.Buffer = (LPWSTR)((ULONG_PTR)lpFileName + (DeviceNameInfo >> 16)); - - /* Return the data */ - RtlZeroMemory(lpFindFileData, - sizeof(*lpFindFileData)); - lpFindFileData->dwFileAttributes = FILE_ATTRIBUTE_ARCHIVE; - RtlCopyMemory(lpFindFileData->cFileName, - DeviceName.Buffer, - DeviceName.Length); + _SEH2_TRY + { + /* DeviceNameInfo == { USHORT Offset; USHORT Length } */ + DeviceName.Length = DeviceName.MaximumLength = (USHORT)(DeviceNameInfo & 0xFFFF); + DeviceName.Buffer = (LPWSTR)((ULONG_PTR)lpFileName + ((DeviceNameInfo >> 16) & 0xFFFF)); + + /* Return the data */ + RtlZeroMemory(lpFindFileData, sizeof(*lpFindFileData)); + lpFindFileData->dwFileAttributes = FILE_ATTRIBUTE_ARCHIVE; + RtlCopyMemory(lpFindFileData->cFileName, + DeviceName.Buffer, + DeviceName.Length); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + + return; } static VOID -InternalCopyFindDataW(LPWIN32_FIND_DATAW lpFindFileData, - PFILE_BOTH_DIR_INFORMATION lpFileInfo) -{ - lpFindFileData->dwFileAttributes = lpFileInfo->FileAttributes; - - lpFindFileData->ftCreationTime.dwHighDateTime = lpFileInfo->CreationTime.u.HighPart; - lpFindFileData->ftCreationTime.dwLowDateTime = lpFileInfo->CreationTime.u.LowPart; - - lpFindFileData->ftLastAccessTime.dwHighDateTime = lpFileInfo->LastAccessTime.u.HighPart; - lpFindFileData->ftLastAccessTime.dwLowDateTime = lpFileInfo->LastAccessTime.u.LowPart; - - lpFindFileData->ftLastWriteTime.dwHighDateTime = lpFileInfo->LastWriteTime.u.HighPart; - lpFindFileData->ftLastWriteTime.dwLowDateTime = lpFileInfo->LastWriteTime.u.LowPart; - - lpFindFileData->nFileSizeHigh = lpFileInfo->EndOfFile.u.HighPart; - lpFindFileData->nFileSizeLow = lpFileInfo->EndOfFile.u.LowPart; - - memcpy (lpFindFileData->cFileName, lpFileInfo->FileName, lpFileInfo->FileNameLength); - lpFindFileData->cFileName[lpFileInfo->FileNameLength / sizeof(WCHAR)] = 0; - - memcpy (lpFindFileData->cAlternateFileName, lpFileInfo->ShortName, lpFileInfo->ShortNameLength); - lpFindFileData->cAlternateFileName[lpFileInfo->ShortNameLength / sizeof(WCHAR)] = 0; -} - - -/* - * @implemented - */ -BOOL -WINAPI -InternalFindNextFile ( - HANDLE hFindFile, - PUNICODE_STRING SearchPattern, - PVOID lpFindFileData - ) -{ - PKERNEL32_FIND_DATA_HEADER IHeader; - PKERNEL32_FIND_FILE_DATA IData; - IO_STATUS_BLOCK IoStatusBlock; - BOOLEAN Locked = FALSE; - PFILE_BOTH_DIR_INFORMATION Buffer, FoundFile = NULL; - NTSTATUS Status = STATUS_SUCCESS; - - TRACE("InternalFindNextFile(%lx, %wZ)\n", hFindFile, SearchPattern); - - if (hFindFile != FIND_DEVICE_HANDLE) - { - IHeader = (PKERNEL32_FIND_DATA_HEADER)hFindFile; - if (hFindFile == NULL || hFindFile == INVALID_HANDLE_VALUE || - IHeader->Type != FileFind) - { - SetLastError (ERROR_INVALID_HANDLE); - return FALSE; - } - - IData = (PKERNEL32_FIND_FILE_DATA)(IHeader + 1); - Buffer = (PFILE_BOTH_DIR_INFORMATION)((ULONG_PTR)IData + sizeof(KERNEL32_FIND_FILE_DATA)); - - if (SearchPattern == NULL) - { - RtlEnterCriticalSection(&IData->Lock); - Locked = TRUE; - } - - do - { - if (IData->HasData) - { - if (!IData->DirectoryOnly || (IData->pFileInfo->FileAttributes & FILE_ATTRIBUTE_DIRECTORY)) - { - FoundFile = IData->pFileInfo; - } - - if (IData->pFileInfo->NextEntryOffset != 0) - { - ULONG_PTR BufferEnd; - - IData->pFileInfo = (PFILE_BOTH_DIR_INFORMATION)((ULONG_PTR)IData->pFileInfo + IData->pFileInfo->NextEntryOffset); - - /* Be paranoid and make sure that the next entry is completely there */ - BufferEnd = (ULONG_PTR)Buffer + FIND_DATA_SIZE; - if (BufferEnd < (ULONG_PTR)IData->pFileInfo || - BufferEnd < (ULONG_PTR)&IData->pFileInfo->FileNameLength + sizeof(IData->pFileInfo->FileNameLength) || - BufferEnd <= (ULONG_PTR)&IData->pFileInfo->FileName[IData->pFileInfo->FileNameLength]) - { - goto NeedMoreData; - } - } - else - { -NeedMoreData: - IData->HasData = FALSE; - - if (!IData->HasMoreData) - break; - } - } - else - { - IData->pFileInfo = Buffer; - IData->pFileInfo->NextEntryOffset = 0; - Status = NtQueryDirectoryFile (IData->DirectoryHandle, - NULL, - NULL, - NULL, - &IoStatusBlock, - (PVOID)IData->pFileInfo, - FIND_DATA_SIZE, - FileBothDirectoryInformation, - FALSE, - SearchPattern, - SearchPattern != NULL); - - if (Status == STATUS_BUFFER_OVERFLOW) - { - IData->HasMoreData = TRUE; - Status = STATUS_SUCCESS; - } - else - { - if (!NT_SUCCESS(Status)) - break; - - IData->HasMoreData = FALSE; - } - - IData->HasData = TRUE; - SearchPattern = NULL; - } - - } while (FoundFile == NULL); - - if (FoundFile != NULL) - { - _SEH2_TRY - { - InternalCopyFindDataW(lpFindFileData, - FoundFile); - } - _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) - { - } - _SEH2_END; - } - - if (Locked) - RtlLeaveCriticalSection(&IData->Lock); - } - - if (!NT_SUCCESS(Status)) - { - BaseSetLastNTError (Status); - return FALSE; - } - else if (FoundFile == NULL) - { - SetLastError (ERROR_NO_MORE_FILES); - return FALSE; - } - - return TRUE; -} - - -/* - * @implemented - */ -HANDLE -WINAPI -InternalFindFirstFile ( - LPCWSTR lpFileName, - BOOLEAN DirectoryOnly, - PVOID lpFindFileData - ) -{ - OBJECT_ATTRIBUTES ObjectAttributes; - PKERNEL32_FIND_DATA_HEADER IHeader; - PKERNEL32_FIND_FILE_DATA IData; - IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING NtPathU, FileName, PathFileName; - NTSTATUS Status; - PWSTR NtPathBuffer; - BOOLEAN RemovedLastChar = FALSE; - BOOL bResult; - RTL_RELATIVE_NAME_U DirInfo; - ULONG DeviceNameInfo; - HANDLE hDirectory = NULL; - - TRACE("FindFirstFileW(lpFileName %S)\n", - lpFileName); - - RtlZeroMemory(&PathFileName, - sizeof(PathFileName)); - RtlInitUnicodeString(&FileName, - lpFileName); - - bResult = RtlDosPathNameToNtPathName_U (lpFileName, - &NtPathU, - (PCWSTR *)((ULONG_PTR)&PathFileName.Buffer), - &DirInfo); - if (FALSE == bResult) - { - SetLastError(ERROR_PATH_NOT_FOUND); - return INVALID_HANDLE_VALUE; - } - - /* Save the buffer pointer for later, we need to free it! */ - NtPathBuffer = NtPathU.Buffer; - - /* If there is a file name/pattern then determine it's length */ - if (PathFileName.Buffer != NULL) - { - PathFileName.Length = NtPathU.Length - - (USHORT)((ULONG_PTR)PathFileName.Buffer - (ULONG_PTR)NtPathU.Buffer); - } - PathFileName.MaximumLength = PathFileName.Length; - - if (DirInfo.RelativeName.Length != 0 && DirInfo.RelativeName.Buffer != PathFileName.Buffer) - { - if (PathFileName.Buffer != NULL) - { - /* This is a relative path to DirInfo.ContainingDirectory, adjust NtPathU! */ - NtPathU.Length = NtPathU.MaximumLength = - (USHORT)((ULONG_PTR)PathFileName.Buffer - (ULONG_PTR)DirInfo.RelativeName.Buffer); - NtPathU.Buffer = DirInfo.RelativeName.Buffer; - } - } - else - { - /* This is an absolute path, NtPathU receives the full path */ - DirInfo.ContainingDirectory = NULL; - if (PathFileName.Buffer != NULL) - { - NtPathU.Length = NtPathU.MaximumLength = - (USHORT)((ULONG_PTR)PathFileName.Buffer - (ULONG_PTR)NtPathU.Buffer); - } - } - - /* Remove the last character of the path (Unless the path is a drive and - ends with ":\"). If the caller however supplies a path to a device, such - as "C:\NUL" then the last character gets cut off, which later results in - NtOpenFile to return STATUS_OBJECT_NAME_NOT_FOUND, which in turn triggers - a fake DOS device check with RtlIsDosDeviceName_U. However, if there is a - real device with a name eg. "NU" in the system, FindFirstFile will succeed, - rendering the fake DOS device check useless... Why would they invent such a - stupid and broken behavior?! */ - if (NtPathU.Length >= 2 * sizeof(WCHAR) && - NtPathU.Buffer[(NtPathU.Length / sizeof(WCHAR)) - 1] != L'\\' && - NtPathU.Buffer[(NtPathU.Length / sizeof(WCHAR)) - 2] != L':') - { - NtPathU.Length -= sizeof(WCHAR); - RemovedLastChar = TRUE; - } - - TRACE("lpFileName: \"%ws\"\n", lpFileName); - TRACE("NtPathU: \"%wZ\"\n", &NtPathU); - TRACE("PathFileName: \"%wZ\"\n", &PathFileName); - TRACE("RelativeTo: 0x%p\n", DirInfo.ContainingDirectory); - - InitializeObjectAttributes (&ObjectAttributes, - &NtPathU, - OBJ_CASE_INSENSITIVE, - DirInfo.ContainingDirectory, - NULL); - - Status = NtOpenFile (&hDirectory, - FILE_LIST_DIRECTORY | SYNCHRONIZE, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ|FILE_SHARE_WRITE, - FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT); - - if (Status == STATUS_NOT_A_DIRECTORY && RemovedLastChar) - { - /* Try again, this time with the last character ... */ - NtPathU.Length += sizeof(WCHAR); - - Status = NtOpenFile (&hDirectory, - FILE_LIST_DIRECTORY | SYNCHRONIZE, - &ObjectAttributes, - &IoStatusBlock, - FILE_SHARE_READ|FILE_SHARE_WRITE, - FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT); - - NtPathU.Length += sizeof(WCHAR); - } - - if (!NT_SUCCESS(Status)) - { - RtlFreeHeap (RtlGetProcessHeap(), - 0, - NtPathBuffer); - - /* See if the application tries to look for a DOS device */ - DeviceNameInfo = RtlIsDosDeviceName_U((PWSTR)((ULONG_PTR)lpFileName)); - if (DeviceNameInfo != 0) - { - InternalCopyDeviceFindDataW(lpFindFileData, - lpFileName, - DeviceNameInfo); - - return FIND_DEVICE_HANDLE; - } - - BaseSetLastNTError (Status); - return INVALID_HANDLE_VALUE; - } - - if (PathFileName.Length == 0) - { - /* No file part?! */ - NtClose(hDirectory); - RtlFreeHeap (RtlGetProcessHeap(), - 0, - NtPathBuffer); - SetLastError(ERROR_FILE_NOT_FOUND); - return INVALID_HANDLE_VALUE; - } - - IHeader = RtlAllocateHeap (RtlGetProcessHeap(), - HEAP_ZERO_MEMORY, - sizeof(KERNEL32_FIND_DATA_HEADER) + - sizeof(KERNEL32_FIND_FILE_DATA) + FIND_DATA_SIZE); - if (NULL == IHeader) - { - RtlFreeHeap (RtlGetProcessHeap(), - 0, - NtPathBuffer); - NtClose(hDirectory); - - SetLastError(ERROR_NOT_ENOUGH_MEMORY); - return INVALID_HANDLE_VALUE; - } - - IHeader->Type = FileFind; - IData = (PKERNEL32_FIND_FILE_DATA)(IHeader + 1); - IData->DirectoryHandle = hDirectory; - IData->HasMoreData = TRUE; - - /* change pattern: "*.*" --> "*" */ - if (PathFileName.Length == 6 && - RtlCompareMemory(PathFileName.Buffer, - L"*.*", - 6) == 6) - { - PathFileName.Length = 2; - } - - IData->pFileInfo = (PVOID)((ULONG_PTR)IData + sizeof(KERNEL32_FIND_FILE_DATA)); - IData->pFileInfo->FileIndex = 0; - IData->DirectoryOnly = DirectoryOnly; - - bResult = InternalFindNextFile((HANDLE)IHeader, - &PathFileName, - lpFindFileData); - - RtlFreeHeap (RtlGetProcessHeap(), - 0, - NtPathBuffer); - - if (!bResult) - { - FindClose((HANDLE)IHeader); - return INVALID_HANDLE_VALUE; - } - - RtlInitializeCriticalSection(&IData->Lock); - IData->LockInitialized = TRUE; - - return (HANDLE)IHeader; -} - +CopyFindData(OUT LPWIN32_FIND_DATAW lpFindFileData, + IN FINDEX_INFO_LEVELS fInfoLevelId, + IN DIR_INFORMATION DirInfo) +{ +#define ULARGE_INTEGER_2_FILETIME(ft, ul) \ +do { \ + (ft).dwHighDateTime = (ul).u.HighPart; \ + (ft).dwLowDateTime = (ul).u.LowPart ; \ +} while(0) + + _SEH2_TRY + { + RtlZeroMemory(lpFindFileData, sizeof(*lpFindFileData)); + + lpFindFileData->dwFileAttributes = DirInfo.FullDirInfo->FileAttributes; + + ULARGE_INTEGER_2_FILETIME(lpFindFileData->ftCreationTime, DirInfo.FullDirInfo->CreationTime); + ULARGE_INTEGER_2_FILETIME(lpFindFileData->ftLastAccessTime, DirInfo.FullDirInfo->LastAccessTime); + ULARGE_INTEGER_2_FILETIME(lpFindFileData->ftLastWriteTime, DirInfo.FullDirInfo->LastWriteTime); + + lpFindFileData->nFileSizeHigh = DirInfo.FullDirInfo->EndOfFile.u.HighPart; + lpFindFileData->nFileSizeLow = DirInfo.FullDirInfo->EndOfFile.u.LowPart; + + /* dwReserved0 contains the NTFS reparse point tag, if any. */ + if (DirInfo.FullDirInfo->FileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) + lpFindFileData->dwReserved0 = DirInfo.FullDirInfo->EaSize; + else + lpFindFileData->dwReserved0 = 0; + + /* Unused dwReserved1 field */ + lpFindFileData->dwReserved1 = 0; + + if (fInfoLevelId == FindExInfoStandard) + { + RtlCopyMemory(lpFindFileData->cFileName, + DirInfo.BothDirInfo->FileName, + DirInfo.BothDirInfo->FileNameLength); + lpFindFileData->cFileName[DirInfo.BothDirInfo->FileNameLength / sizeof(WCHAR)] = UNICODE_NULL; + + RtlCopyMemory(lpFindFileData->cAlternateFileName, + DirInfo.BothDirInfo->ShortName, + DirInfo.BothDirInfo->ShortNameLength); + lpFindFileData->cAlternateFileName[DirInfo.BothDirInfo->ShortNameLength / sizeof(WCHAR)] = UNICODE_NULL; + } + else if (fInfoLevelId == FindExInfoBasic) + { + RtlCopyMemory(lpFindFileData->cFileName, + DirInfo.FullDirInfo->FileName, + DirInfo.FullDirInfo->FileNameLength); + lpFindFileData->cFileName[DirInfo.FullDirInfo->FileNameLength / sizeof(WCHAR)] = UNICODE_NULL; + + lpFindFileData->cAlternateFileName[0] = UNICODE_NULL; + } + else + { + /* Invalid InfoLevelId */ + ASSERT(FALSE); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + + return; +} + +static VOID +CopyStreamData(IN OUT PFIND_STREAM_DATA FindStreamData, + OUT PWIN32_FIND_STREAM_DATA lpFindStreamData) +{ + _SEH2_TRY + { + ASSERT(FindStreamData->CurrentInfo); + + switch (FindStreamData->InfoLevel) + { + case FindStreamInfoStandard: + { + ULONG StreamNameLen = min(FindStreamData->CurrentInfo->StreamNameLength, + sizeof(lpFindStreamData->cStreamName) - sizeof(WCHAR)); + + RtlZeroMemory(lpFindStreamData, sizeof(*lpFindStreamData)); + + lpFindStreamData->StreamSize.QuadPart = FindStreamData->CurrentInfo->StreamSize.QuadPart; + RtlCopyMemory(lpFindStreamData->cStreamName, + FindStreamData->CurrentInfo->StreamName, + StreamNameLen); + lpFindStreamData->cStreamName[StreamNameLen / sizeof(WCHAR)] = UNICODE_NULL; + + break; + } + + default: + { + /* Invalid InfoLevel */ + ASSERT(FALSE); + break; + } + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + } + _SEH2_END; + + return; +} + + +/* PUBLIC FUNCTIONS ***********************************************************/ /* * @implemented @@ -464,27 +268,23 @@ WIN32_FIND_DATAW FindFileDataW; lpFileNameW = Basep8BitStringToStaticUnicodeString(lpFileName); - if (!lpFileNameW) - { - return INVALID_HANDLE_VALUE; - } + if (!lpFileNameW) return INVALID_HANDLE_VALUE; hSearch = FindFirstFileExW(lpFileNameW->Buffer, FindExInfoStandard, &FindFileDataW, FindExSearchNameMatch, NULL, 0); - if (hSearch == INVALID_HANDLE_VALUE) - { - return INVALID_HANDLE_VALUE; - } - - memcpy(lpFindFileData, &FindFileDataW, FIELD_OFFSET(WIN32_FIND_DATA, cFileName)); + if (hSearch == INVALID_HANDLE_VALUE) return INVALID_HANDLE_VALUE; + + RtlCopyMemory(lpFindFileData, + &FindFileDataW, + FIELD_OFFSET(WIN32_FIND_DATAA, cFileName)); RtlInitUnicodeString(&UTF8, FindFileDataW.cFileName); Ansi.Buffer = lpFindFileData->cFileName; Ansi.Length = 0; - Ansi.MaximumLength = MAX_PATH; + Ansi.MaximumLength = sizeof(lpFindFileData->cFileName); Status = BasepUnicodeStringTo8BitString(&Ansi, &UTF8, FALSE); if (!NT_SUCCESS(Status)) { @@ -496,7 +296,7 @@ RtlInitUnicodeString(&UTF8, FindFileDataW.cAlternateFileName); Ansi.Buffer = lpFindFileData->cAlternateFileName; Ansi.Length = 0; - Ansi.MaximumLength = 14; + Ansi.MaximumLength = sizeof(lpFindFileData->cAlternateFileName); Status = BasepUnicodeStringTo8BitString(&Ansi, &UTF8, FALSE); if (!NT_SUCCESS(Status)) { @@ -506,6 +306,22 @@ } return hSearch; +} + + +/* + * @implemented + */ +HANDLE +WINAPI +FindFirstFileW(IN LPCWSTR lpFileName, + OUT LPWIN32_FIND_DATAW lpFindFileData) +{ + return FindFirstFileExW(lpFileName, + FindExInfoStandard, + lpFindFileData, + FindExSearchNameMatch, + NULL, 0); } @@ -523,16 +339,16 @@ WIN32_FIND_DATAW FindFileDataW; if (!FindNextFileW(hFindFile, &FindFileDataW)) - { return FALSE; - } - - memcpy(lpFindFileData, &FindFileDataW, FIELD_OFFSET(WIN32_FIND_DATA, cFileName)); + + RtlCopyMemory(lpFindFileData, + &FindFileDataW, + FIELD_OFFSET(WIN32_FIND_DATAA, cFileName)); RtlInitUnicodeString(&UTF8, FindFileDataW.cFileName); Ansi.Buffer = lpFindFileData->cFileName; Ansi.Length = 0; - Ansi.MaximumLength = MAX_PATH; + Ansi.MaximumLength = sizeof(lpFindFileData->cFileName); Status = BasepUnicodeStringTo8BitString(&Ansi, &UTF8, FALSE); if (!NT_SUCCESS(Status)) { @@ -543,7 +359,7 @@ RtlInitUnicodeString(&UTF8, FindFileDataW.cAlternateFileName); Ansi.Buffer = lpFindFileData->cAlternateFileName; Ansi.Length = 0; - Ansi.MaximumLength = 14; + Ansi.MaximumLength = sizeof(lpFindFileData->cAlternateFileName); Status = BasepUnicodeStringTo8BitString(&Ansi, &UTF8, FALSE); if (!NT_SUCCESS(Status)) { @@ -554,79 +370,6 @@ return TRUE; } - -/* - * @implemented - */ -BOOL -WINAPI -FindClose ( - HANDLE hFindFile - ) -{ - PKERNEL32_FIND_DATA_HEADER IHeader; - - TRACE("FindClose(hFindFile %x)\n",hFindFile); - - if (hFindFile == FIND_DEVICE_HANDLE) - return TRUE; - - if (!hFindFile || hFindFile == INVALID_HANDLE_VALUE) - { - SetLastError (ERROR_INVALID_HANDLE); - return FALSE; - } - - IHeader = (PKERNEL32_FIND_DATA_HEADER)hFindFile; - - switch (IHeader->Type) - { - case FileFind: - { - PKERNEL32_FIND_FILE_DATA IData = (PKERNEL32_FIND_FILE_DATA)(IHeader + 1); - CloseHandle (IData->DirectoryHandle); - if (IData->LockInitialized) - RtlDeleteCriticalSection(&IData->Lock); - IData->LockInitialized = FALSE; - break; - } - - case StreamFind: - { - PKERNEL32_FIND_STREAM_DATA IData = (PKERNEL32_FIND_STREAM_DATA)(IHeader + 1); - if (IData->pFileStreamInfo != NULL) - { - RtlFreeHeap (RtlGetProcessHeap(), 0, IData->pFileStreamInfo); - } - break; - } - - default: - SetLastError (ERROR_INVALID_HANDLE); - return FALSE; - } - - RtlFreeHeap (RtlGetProcessHeap(), 0, IHeader); - - return TRUE; -} - - -/* - * @implemented - */ -HANDLE -WINAPI -FindFirstFileW(IN LPCWSTR lpFileName, - OUT LPWIN32_FIND_DATAW lpFindFileData) -{ - return FindFirstFileExW(lpFileName, - FindExInfoStandard, - lpFindFileData, - FindExSearchNameMatch, - NULL, - 0); -} /* * @implemented @@ -636,9 +379,261 @@ FindNextFileW(IN HANDLE hFindFile, OUT LPWIN32_FIND_DATAW lpFindFileData) { - return InternalFindNextFile(hFindFile, - NULL, - lpFindFileData); + NTSTATUS Status = STATUS_SUCCESS; + DIR_INFORMATION FoundFile = {NULL}; + + TRACE("FindNextFileW(%lx, 0x%p)\n", hFindFile, lpFindFileData); + + if (hFindFile != FIND_DEVICE_HANDLE) + { + PFIND_DATA_HANDLE FindDataHandle = (PFIND_DATA_HANDLE)hFindFile; + PFIND_FILE_DATA FindFileData; + FINDEX_INFO_LEVELS InfoLevel; + IO_STATUS_BLOCK IoStatusBlock; + DIR_INFORMATION DirInfo = {NULL}, NextDirInfo = {NULL}; + + if (hFindFile == NULL || hFindFile == INVALID_HANDLE_VALUE || + FindDataHandle->Type != FindFile) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + RtlEnterCriticalSection(&FindDataHandle->Lock); + + FindFileData = FindDataHandle->u.FindFileData; + InfoLevel = FindFileData->InfoLevel; + + do + { + if (FindFileData->NextDirInfo.DirInfo == NULL) + { + Status = NtQueryDirectoryFile(FindFileData->Handle, + NULL, NULL, NULL, + &IoStatusBlock, + &FindFileData->Buffer, + sizeof(FindFileData->Buffer), + (InfoLevel == FindExInfoStandard + ? FileBothDirectoryInformation + : FileFullDirectoryInformation), + FALSE, + NULL, /* Use the file pattern from the first call */ + FALSE); + if (Status == STATUS_BUFFER_OVERFLOW) + { + FindFileData->HasMoreData = TRUE; + Status = STATUS_SUCCESS; + } + else + { + if (!NT_SUCCESS(Status)) break; + FindFileData->HasMoreData = FALSE; + } + + FindFileData->NextDirInfo.DirInfo = &FindFileData->Buffer; + } + + DirInfo = FindFileData->NextDirInfo; + + if (DirInfo.FullDirInfo->NextEntryOffset != 0) + { + ULONG_PTR BufferEnd = (ULONG_PTR)&FindFileData->Buffer + sizeof(FindFileData->Buffer); + PWSTR pFileName; + + NextDirInfo.DirInfo = FindFileData->NextDirInfo.DirInfo = + (PVOID)((ULONG_PTR)DirInfo.DirInfo + DirInfo.FullDirInfo->NextEntryOffset); + + pFileName = (InfoLevel == FindExInfoStandard + ? NextDirInfo.BothDirInfo->FileName + : NextDirInfo.FullDirInfo->FileName); + + /* Be paranoid and make sure that the next entry is completely there */ + if (BufferEnd < (ULONG_PTR)NextDirInfo.DirInfo || + BufferEnd < (ULONG_PTR)&NextDirInfo.FullDirInfo->FileNameLength + sizeof(NextDirInfo.FullDirInfo->FileNameLength) || + BufferEnd <= (ULONG_PTR)((ULONG_PTR)pFileName + NextDirInfo.FullDirInfo->FileNameLength)) + { + FindFileData->NextDirInfo.DirInfo = NULL; + } + } + else + { + FindFileData->NextDirInfo.DirInfo = NULL; + } + + if ((FindFileData->SearchOp != FindExSearchLimitToDirectories) || + (DirInfo.FullDirInfo->FileAttributes & FILE_ATTRIBUTE_DIRECTORY)) + { + FoundFile = DirInfo; + } + } while ( FoundFile.DirInfo == NULL && (FindFileData->NextDirInfo.DirInfo || FindFileData->HasMoreData) ); + + if (FoundFile.DirInfo != NULL) + { + /* Return the information */ + CopyFindData(lpFindFileData, InfoLevel, FoundFile); + } + + RtlLeaveCriticalSection(&FindDataHandle->Lock); + } + + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + else if (FoundFile.DirInfo == NULL) + { + SetLastError(ERROR_NO_MORE_FILES); + return FALSE; + } + + return TRUE; +} + + +/* + * @implemented + */ +BOOL +WINAPI +FindClose(HANDLE hFindFile) +{ + TRACE("FindClose(hFindFile %x)\n", hFindFile); + + if (hFindFile == FIND_DEVICE_HANDLE) + return TRUE; + + if (!hFindFile || hFindFile == INVALID_HANDLE_VALUE) + { + SetLastError(ERROR_INVALID_HANDLE); + return FALSE; + } + + /* Protect with SEH against closing attempts on invalid handles. */ + _SEH2_TRY + { + PFIND_DATA_HANDLE FindDataHandle = (PFIND_DATA_HANDLE)hFindFile; + + switch (FindDataHandle->Type) + { + case FindFile: + { + RtlEnterCriticalSection(&FindDataHandle->Lock); + NtClose(FindDataHandle->u.FindFileData->Handle); + RtlLeaveCriticalSection(&FindDataHandle->Lock); + RtlDeleteCriticalSection(&FindDataHandle->Lock); + break; + } + + case FindStream: + { + RtlEnterCriticalSection(&FindDataHandle->Lock); + if (FindDataHandle->u.FindStreamData->FileStreamInfo != NULL) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, + FindDataHandle->u.FindStreamData->FileStreamInfo); + } + RtlLeaveCriticalSection(&FindDataHandle->Lock); + RtlDeleteCriticalSection(&FindDataHandle->Lock); + break; + } + + default: + { + SetLastError(ERROR_INVALID_HANDLE); + _SEH2_YIELD(return FALSE); + } + } + + RtlFreeHeap(RtlGetProcessHeap(), 0, FindDataHandle); + _SEH2_YIELD(return TRUE); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + BaseSetLastNTError(_SEH2_GetExceptionCode()); + _SEH2_YIELD(return FALSE); + } + _SEH2_END; +} + + +/* + * @unimplemented + */ +HANDLE +WINAPI +FindFirstFileExA(IN LPCSTR lpFileName, + IN FINDEX_INFO_LEVELS fInfoLevelId, + OUT LPVOID lpFindFileData, + IN FINDEX_SEARCH_OPS fSearchOp, + LPVOID lpSearchFilter, + IN DWORD dwAdditionalFlags) +{ + HANDLE hSearch; + NTSTATUS Status; + ANSI_STRING Ansi; + UNICODE_STRING UTF8; + PUNICODE_STRING lpFileNameW; + WIN32_FIND_DATAW FindFileDataW; + LPWIN32_FIND_DATAA lpFindFileDataA = (LPWIN32_FIND_DATAA)lpFindFileData; + + if ((fInfoLevelId != FindExInfoStandard && fInfoLevelId != FindExInfoBasic) || + fSearchOp == FindExSearchLimitToDevices || + dwAdditionalFlags & ~FIND_FIRST_EX_CASE_SENSITIVE /* only supported flag for now */) + { + SetLastError(fSearchOp == FindExSearchLimitToDevices + ? ERROR_NOT_SUPPORTED + : ERROR_INVALID_PARAMETER); + return INVALID_HANDLE_VALUE; + } + + lpFileNameW = Basep8BitStringToStaticUnicodeString(lpFileName); + if (!lpFileNameW) return INVALID_HANDLE_VALUE; + + hSearch = FindFirstFileExW(lpFileNameW->Buffer, + fInfoLevelId, + &FindFileDataW, + fSearchOp, + lpSearchFilter, + dwAdditionalFlags); + if (hSearch == INVALID_HANDLE_VALUE) return INVALID_HANDLE_VALUE; + + RtlCopyMemory(lpFindFileDataA, + &FindFileDataW, + FIELD_OFFSET(WIN32_FIND_DATAA, cFileName)); + + RtlInitUnicodeString(&UTF8, FindFileDataW.cFileName); + Ansi.Buffer = lpFindFileDataA->cFileName; + Ansi.Length = 0; + Ansi.MaximumLength = sizeof(lpFindFileDataA->cFileName); + Status = BasepUnicodeStringTo8BitString(&Ansi, &UTF8, FALSE); + if (!NT_SUCCESS(Status)) + { + FindClose(hSearch); + BaseSetLastNTError(Status); + return INVALID_HANDLE_VALUE; + } + + if (fInfoLevelId != FindExInfoBasic) + { + RtlInitUnicodeString(&UTF8, FindFileDataW.cAlternateFileName); + Ansi.Buffer = lpFindFileDataA->cAlternateFileName; + Ansi.Length = 0; + Ansi.MaximumLength = sizeof(lpFindFileDataA->cAlternateFileName); + Status = BasepUnicodeStringTo8BitString(&Ansi, &UTF8, FALSE); + if (!NT_SUCCESS(Status)) + { + FindClose(hSearch); + BaseSetLastNTError(Status); + return INVALID_HANDLE_VALUE; + } + } + else + { + lpFindFileDataA->cAlternateFileName[0] = ANSI_NULL; + } + + return hSearch; } @@ -654,123 +649,241 @@ LPVOID lpSearchFilter, IN DWORD dwAdditionalFlags) { - if (fInfoLevelId != FindExInfoStandard) - { - SetLastError(ERROR_INVALID_PARAMETER); + TRACE("FindFirstFileExW(lpFileName %S)\n", lpFileName); + + if ((fInfoLevelId != FindExInfoStandard && fInfoLevelId != FindExInfoBasic) || + fSearchOp == FindExSearchLimitToDevices || + dwAdditionalFlags & ~FIND_FIRST_EX_CASE_SENSITIVE /* only supported flag for now */) + { + SetLastError(fSearchOp == FindExSearchLimitToDevices + ? ERROR_NOT_SUPPORTED + : ERROR_INVALID_PARAMETER); return INVALID_HANDLE_VALUE; } - if (fSearchOp == FindExSearchNameMatch || fSearchOp == FindExSearchLimitToDirectories) - { + if (fSearchOp == FindExSearchNameMatch || + fSearchOp == FindExSearchLimitToDirectories) + { + LPWIN32_FIND_DATAW Win32FindData = (LPWIN32_FIND_DATAW)lpFindFileData; + PFIND_DATA_HANDLE FindDataHandle; + PFIND_FILE_DATA FindFileData; + + UNICODE_STRING NtPath, FilePattern; + PWSTR NtPathBuffer; + RTL_RELATIVE_NAME_U RelativePath; + ULONG DeviceNameInfo = 0; + + NTSTATUS Status; + OBJECT_ATTRIBUTES ObjectAttributes; + IO_STATUS_BLOCK IoStatusBlock; + HANDLE hDirectory = NULL; + + /* + * May represent many FILE_BOTH_DIR_INFORMATION + * or many FILE_FULL_DIR_INFORMATION structures. + */ + BYTE DirectoryInfo[FIND_DATA_SIZE]; + DIR_INFORMATION DirInfo = {&DirectoryInfo}; + + /* The search filter is always unused */ if (lpSearchFilter) { SetLastError(ERROR_INVALID_PARAMETER); return INVALID_HANDLE_VALUE; } - return InternalFindFirstFile (lpFileName, - fSearchOp == FindExSearchLimitToDirectories, - lpFindFileData); - } - - SetLastError(ERROR_INVALID_PARAMETER); - return INVALID_HANDLE_VALUE; -} - -/* - * @unimplemented - */ -HANDLE -WINAPI -FindFirstFileExA(IN LPCSTR lpFileName, - IN FINDEX_INFO_LEVELS fInfoLevelId, - OUT LPVOID lpFindFileData, - IN FINDEX_SEARCH_OPS fSearchOp, - LPVOID lpSearchFilter, - IN DWORD dwAdditionalFlags) -{ - HANDLE hSearch; - NTSTATUS Status; - ANSI_STRING Ansi; - UNICODE_STRING UTF8; - PUNICODE_STRING lpFileNameW; - WIN32_FIND_DATAW FindFileDataW; - - lpFileNameW = Basep8BitStringToStaticUnicodeString(lpFileName); - if (!lpFileNameW) - { + if (!RtlDosPathNameToNtPathName_U(lpFileName, + &NtPath, + (PCWSTR*)&FilePattern.Buffer, + &RelativePath)) + { + SetLastError(ERROR_PATH_NOT_FOUND); + return INVALID_HANDLE_VALUE; + } + + DPRINT("lpFileName = '%S'\n", lpFileName); + DPRINT("FilePattern.Buffer = '%S'\n", FilePattern.Buffer); + DPRINT("RelativePath.RelativeName = '%wZ'\n", &RelativePath.RelativeName); + DPRINT("NtPath.Buffer = '%S'\n", NtPath.Buffer); + DPRINT("NtPath - Before = '%wZ'\n", &NtPath); + + /* Save the buffer pointer for later, we need to free it! */ + NtPathBuffer = NtPath.Buffer; + + /* + * Contrary to what Windows does, check NOW whether or not + * lpFileName is a DOS driver. Therefore we don't have to + * write broken code to check that. + */ + if (!FilePattern.Buffer || !*FilePattern.Buffer) + { + /* No file pattern specified, or DOS device */ + + DeviceNameInfo = RtlIsDosDeviceName_U(lpFileName); + if (DeviceNameInfo != 0) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, NtPathBuffer); + + /* OK, it's really a DOS device */ + CopyDeviceFindData(Win32FindData, lpFileName, DeviceNameInfo); + return FIND_DEVICE_HANDLE; + } + } + + /* A file pattern was specified, or it was not a DOS device */ + + /* If there is a file pattern then determine its length */ + if (FilePattern.Buffer != NULL) + { + FilePattern.Length = NtPath.Length - + (USHORT)((ULONG_PTR)FilePattern.Buffer - (ULONG_PTR)NtPath.Buffer); + } + else + { + FilePattern.Length = 0; + } + FilePattern.MaximumLength = FilePattern.Length; + + if (RelativePath.RelativeName.Length != 0 && + RelativePath.RelativeName.Buffer != FilePattern.Buffer) + { + if (FilePattern.Buffer != NULL) + { + /* This is a relative path to RelativePath.ContainingDirectory, adjust NtPath! */ + NtPath.Length = NtPath.MaximumLength = + (USHORT)((ULONG_PTR)FilePattern.Buffer - (ULONG_PTR)RelativePath.RelativeName.Buffer); + NtPath.Buffer = RelativePath.RelativeName.Buffer; + } + } + else + { + /* This is an absolute path, NtPath receives the full path */ + RelativePath.ContainingDirectory = NULL; + if (FilePattern.Buffer != NULL) + { + NtPath.Length = NtPath.MaximumLength = + (USHORT)((ULONG_PTR)FilePattern.Buffer - (ULONG_PTR)NtPath.Buffer); + } + } + + DPRINT("NtPath - After = '%wZ'\n", &NtPath); + DPRINT("FilePattern = '%wZ'\n", &FilePattern); + DPRINT("RelativeTo = 0x%p\n", RelativePath.ContainingDirectory); + + InitializeObjectAttributes(&ObjectAttributes, + &NtPath, + (dwAdditionalFlags & FIND_FIRST_EX_CASE_SENSITIVE) ? 0 : OBJ_CASE_INSENSITIVE, + RelativePath.ContainingDirectory, + NULL); + + Status = NtOpenFile(&hDirectory, + FILE_LIST_DIRECTORY | SYNCHRONIZE, + &ObjectAttributes, + &IoStatusBlock, + FILE_SHARE_READ | FILE_SHARE_WRITE, + FILE_DIRECTORY_FILE | FILE_SYNCHRONOUS_IO_NONALERT); + + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, NtPathBuffer); + + /* Adjust the last error codes */ + if (Status == STATUS_OBJECT_NAME_NOT_FOUND) + Status = STATUS_OBJECT_PATH_NOT_FOUND; + else if (Status == STATUS_OBJECT_TYPE_MISMATCH) + Status = STATUS_OBJECT_PATH_NOT_FOUND; + + BaseSetLastNTError(Status); + return INVALID_HANDLE_VALUE; + } + + /* + * Fail if there is not any file pattern, + * since we are not looking for a device. + */ + if (FilePattern.Length == 0) + { + NtClose(hDirectory); + RtlFreeHeap(RtlGetProcessHeap(), 0, NtPathBuffer); + + SetLastError(ERROR_FILE_NOT_FOUND); + return INVALID_HANDLE_VALUE; + } + + /* Change pattern: "*.*" --> "*" */ + if (FilePattern.Length == 6 && + RtlCompareMemory(FilePattern.Buffer, L"*.*", 6) == 6) + { + FilePattern.Length = 2; + } + + Status = NtQueryDirectoryFile(hDirectory, + NULL, NULL, NULL, + &IoStatusBlock, + DirInfo.DirInfo, // == &DirectoryInfo + sizeof(DirectoryInfo), + (fInfoLevelId == FindExInfoStandard + ? FileBothDirectoryInformation + : FileFullDirectoryInformation), + TRUE, /* Return a single entry */ + &FilePattern, + TRUE); + + RtlFreeHeap(RtlGetProcessHeap(), 0, NtPathBuffer); + + if (!NT_SUCCESS(Status)) + { + NtClose(hDirectory); + BaseSetLastNTError(Status); + return INVALID_HANDLE_VALUE; + } + + ASSERT(DirInfo.FullDirInfo->NextEntryOffset == 0); + + /* Return the information */ + CopyFindData(Win32FindData, fInfoLevelId, DirInfo); + + /* + * Initialization of the search handle. + */ + FindDataHandle = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(FIND_DATA_HANDLE) + + sizeof(FIND_FILE_DATA)); + if (!FindDataHandle) + { + NtClose(hDirectory); + SetLastError(ERROR_NOT_ENOUGH_MEMORY); + return INVALID_HANDLE_VALUE; + } + + FindDataHandle->Type = FindFile; + FindDataHandle->u.FindFileData = (PFIND_FILE_DATA)(FindDataHandle + 1); + FindFileData = FindDataHandle->u.FindFileData; + + FindFileData->Handle = hDirectory; + FindFileData->InfoLevel = fInfoLevelId; + FindFileData->SearchOp = fSearchOp; + FindFileData->HasMoreData = FALSE; + FindFileData->NextDirInfo.DirInfo = NULL; + + /* The critical section must always be initialized */ + Status = RtlInitializeCriticalSection(&FindDataHandle->Lock); + if (!NT_SUCCESS(Status)) + { + NtClose(hDirectory); + RtlFreeHeap(RtlGetProcessHeap(), 0, FindDataHandle); + + BaseSetLastNTError(Status); + return INVALID_HANDLE_VALUE; + } + + return (HANDLE)FindDataHandle; + } + else + { + SetLastError(ERROR_NOT_SUPPORTED); return INVALID_HANDLE_VALUE; - } - - hSearch = FindFirstFileExW(lpFileNameW->Buffer, - fInfoLevelId, - &FindFileDataW, - fSearchOp, - lpSearchFilter, - dwAdditionalFlags); - if (hSearch == INVALID_HANDLE_VALUE) - { - return INVALID_HANDLE_VALUE; - } - - memcpy(lpFindFileData, &FindFileDataW, FIELD_OFFSET(WIN32_FIND_DATA, cFileName)); - - RtlInitUnicodeString(&UTF8, FindFileDataW.cFileName); - Ansi.Buffer = ((LPWIN32_FIND_DATAA)lpFindFileData)->cFileName; - Ansi.Length = 0; - Ansi.MaximumLength = MAX_PATH; - Status = BasepUnicodeStringTo8BitString(&Ansi, &UTF8, FALSE); - if (!NT_SUCCESS(Status)) - { - FindClose(hSearch); - BaseSetLastNTError(Status); - return INVALID_HANDLE_VALUE; - } - - RtlInitUnicodeString(&UTF8, FindFileDataW.cAlternateFileName); - Ansi.Buffer = ((LPWIN32_FIND_DATAA)lpFindFileData)->cAlternateFileName; - Ansi.Length = 0; - Ansi.MaximumLength = 14; - Status = BasepUnicodeStringTo8BitString(&Ansi, &UTF8, FALSE); - if (!NT_SUCCESS(Status)) - { - FindClose(hSearch); - BaseSetLastNTError(Status); - return INVALID_HANDLE_VALUE; - } - - return hSearch; -} - - -static VOID -InternalCopyStreamInfo(IN OUT PKERNEL32_FIND_STREAM_DATA IData, - OUT LPVOID lpFindStreamData) -{ - ASSERT(IData->pCurrent); - - switch (IData->InfoLevel) - { - case FindStreamInfoStandard: - { - ULONG StreamNameLen; - WIN32_FIND_STREAM_DATA *StreamData = (WIN32_FIND_STREAM_DATA*)lpFindStreamData; - - StreamNameLen = IData->pCurrent->StreamNameLength; - if (StreamNameLen > sizeof(StreamData->cStreamName) - sizeof(WCHAR)) - StreamNameLen = sizeof(StreamData->cStreamName) - sizeof(WCHAR); - - StreamData->StreamSize.QuadPart = IData->pCurrent->StreamSize.QuadPart; - RtlCopyMemory(StreamData->cStreamName, - IData->pCurrent->StreamName, - StreamNameLen); - StreamData->cStreamName[StreamNameLen / sizeof(WCHAR)] = L'\0'; - break; - } - - default: - ASSERT(FALSE); - break; } } @@ -785,11 +898,11 @@ OUT LPVOID lpFindStreamData, IN DWORD dwFlags) { - PKERNEL32_FIND_DATA_HEADER IHeader = NULL; - PKERNEL32_FIND_STREAM_DATA IData = NULL; + PFIND_DATA_HANDLE FindDataHandle = NULL; + PFIND_STREAM_DATA FindStreamData; OBJECT_ATTRIBUTES ObjectAttributes; IO_STATUS_BLOCK IoStatusBlock; - UNICODE_STRING NtPathU; + UNICODE_STRING NtFilePath; HANDLE FileHandle = NULL; NTSTATUS Status; ULONG BufferSize = 0; @@ -801,19 +914,18 @@ return INVALID_HANDLE_VALUE; } - /* validate & translate the filename */ + /* Validate and translate the filename */ if (!RtlDosPathNameToNtPathName_U(lpFileName, - &NtPathU, - NULL, - NULL)) + &NtFilePath, + NULL, NULL)) { SetLastError(ERROR_PATH_NOT_FOUND); return INVALID_HANDLE_VALUE; } - /* open the file */ + /* Open the file */ InitializeObjectAttributes(&ObjectAttributes, - &NtPathU, + &NtFilePath, OBJ_CASE_INSENSITIVE, NULL, NULL); @@ -822,47 +934,52 @@ 0, &ObjectAttributes, &IoStatusBlock, - NULL, - 0, + NULL, 0, FILE_SHARE_DELETE | FILE_SHARE_READ | FILE_SHARE_WRITE, FILE_OPEN, - 0, - NULL, - 0); - if (!NT_SUCCESS(Status)) - { - goto Cleanup; - } - - /* create the search context */ - IHeader = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - sizeof(KERNEL32_FIND_DATA_HEADER) + - sizeof(KERNEL32_FIND_STREAM_DATA)); - if (IHeader == NULL) + 0, NULL, 0); + if (!NT_SUCCESS(Status)) goto Cleanup; + + /* + * Initialization of the search handle. + */ + FindDataHandle = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + sizeof(FIND_DATA_HANDLE) + + sizeof(FIND_STREAM_DATA)); + if (!FindDataHandle) { Status = STATUS_NO_MEMORY; goto Cleanup; } - IHeader->Type = StreamFind; - IData = (PKERNEL32_FIND_STREAM_DATA)(IHeader + 1); - - /* capture all information about the streams */ - IData->InfoLevel = InfoLevel; - IData->pCurrent = NULL; - IData->pFileStreamInfo = NULL; - + FindDataHandle->Type = FindStream; + FindDataHandle->u.FindStreamData = (PFIND_STREAM_DATA)(FindDataHandle + 1); + FindStreamData = FindDataHandle->u.FindStreamData; + + FindStreamData->InfoLevel = InfoLevel; + FindStreamData->FileStreamInfo = NULL; + FindStreamData->CurrentInfo = NULL; + + /* The critical section must always be initialized */ + Status = RtlInitializeCriticalSection(&FindDataHandle->Lock); + if (!NT_SUCCESS(Status)) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, FindDataHandle); + goto Cleanup; + } + + /* Capture all information about the streams */ do { BufferSize += 0x1000; - if (IData->pFileStreamInfo == NULL) - { - IData->pFileStreamInfo = RtlAllocateHeap(RtlGetProcessHeap(), - 0, - BufferSize); - if (IData->pFileStreamInfo == NULL) + if (FindStreamData->FileStreamInfo == NULL) + { + FindStreamData->FileStreamInfo = RtlAllocateHeap(RtlGetProcessHeap(), + HEAP_ZERO_MEMORY, + BufferSize); + if (FindStreamData->FileStreamInfo == NULL) { Status = STATUS_NO_MEMORY; break; @@ -873,8 +990,8 @@ PFILE_STREAM_INFORMATION pfsi; pfsi = RtlReAllocateHeap(RtlGetProcessHeap(), - 0, - IData->pFileStreamInfo, + 0, // HEAP_ZERO_MEMORY, + FindStreamData->FileStreamInfo, BufferSize); if (pfsi == NULL) { @@ -882,12 +999,12 @@ break; } - IData->pFileStreamInfo = pfsi; + FindStreamData->FileStreamInfo = pfsi; } Status = NtQueryInformationFile(FileHandle, &IoStatusBlock, - IData->pFileStreamInfo, + FindStreamData->FileStreamInfo, BufferSize, FileStreamInformation); @@ -895,49 +1012,37 @@ if (NT_SUCCESS(Status)) { - NtClose(FileHandle); - FileHandle = NULL; - - /* select the first stream and return the information */ - IData->pCurrent = IData->pFileStreamInfo; - InternalCopyStreamInfo(IData, - lpFindStreamData); - - /* all done */ + /* Select the first stream and return the information */ + FindStreamData->CurrentInfo = FindStreamData->FileStreamInfo; + CopyStreamData(FindStreamData, lpFindStreamData); + + /* All done */ Status = STATUS_SUCCESS; } + else + { + if (FindStreamData->FileStreamInfo) + { + RtlFreeHeap(RtlGetProcessHeap(), 0, FindStreamData->FileStreamInfo); + } + + RtlFreeHeap(RtlGetProcessHeap(), 0, FindDataHandle); + } Cleanup: - if (FileHandle != NULL) - { - NtClose(FileHandle); - } - - RtlFreeHeap(RtlGetProcessHeap(), - 0, - NtPathU.Buffer); - - if (!NT_SUCCESS(Status)) - { - if (IHeader != NULL) - { - if (IData->pFileStreamInfo != NULL) - { - RtlFreeHeap(RtlGetProcessHeap(), - 0, - IData->pFileStreamInfo); - } - - RtlFreeHeap(RtlGetProcessHeap(), - 0, - IHeader); - } - + if (FileHandle) NtClose(FileHandle); + + RtlFreeHeap(RtlGetProcessHeap(), 0, NtFilePath.Buffer); + + if (NT_SUCCESS(Status)) + { + return (HANDLE)FindDataHandle; + } + else + { BaseSetLastNTError(Status); return INVALID_HANDLE_VALUE; } - - return (HANDLE)IHeader; } @@ -949,37 +1054,39 @@ FindNextStreamW(IN HANDLE hFindStream, OUT LPVOID lpFindStreamData) { - PKERNEL32_FIND_DATA_HEADER IHeader; - PKERNEL32_FIND_STREAM_DATA IData; - - IHeader = (PKERNEL32_FIND_DATA_HEADER)hFindStream; + PFIND_DATA_HANDLE FindDataHandle = (PFIND_DATA_HANDLE)hFindStream; + PFIND_STREAM_DATA FindStreamData; + if (hFindStream == NULL || hFindStream == INVALID_HANDLE_VALUE || - IHeader->Type != StreamFind) - { - SetLastError (ERROR_INVALID_HANDLE); + FindDataHandle->Type != FindStream) + { + SetLastError(ERROR_INVALID_HANDLE); return FALSE; } - IData = (PKERNEL32_FIND_STREAM_DATA)(IHeader + 1); - - /* select next stream if possible */ - if (IData->pCurrent->NextEntryOffset != 0) - { - IData->pCurrent = (PFILE_STREAM_INFORMATION)((ULONG_PTR)IData->pFileStreamInfo + - IData->pCurrent->NextEntryOffset); + RtlEnterCriticalSection(&FindDataHandle->Lock); + + FindStreamData = FindDataHandle->u.FindStreamData; + + /* Select next stream if possible */ + if (FindStreamData->CurrentInfo->NextEntryOffset != 0) + { + FindStreamData->CurrentInfo = (PFILE_STREAM_INFORMATION)((ULONG_PTR)FindStreamData->FileStreamInfo + + FindStreamData->CurrentInfo->NextEntryOffset); + + /* Return the information */ + CopyStreamData(FindStreamData, lpFindStreamData); + + RtlLeaveCriticalSection(&FindDataHandle->Lock); + return TRUE; } else { + RtlLeaveCriticalSection(&FindDataHandle->Lock); + SetLastError(ERROR_HANDLE_EOF); return FALSE; } - - /* return the information */ - InternalCopyStreamInfo(IData, - lpFindStreamData); - - return TRUE; -} - +} /* EOF */ Modified: trunk/reactos/include/ndk/iotypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/iotypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/iotypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/iotypes.h [iso-8859-1] Thu Sep 27 22:07:06 2012 @@ -523,6 +523,22 @@ { PLARGE_INTEGER ReadTimeout; } FILE_MAILSLOT_SET_INFORMATION, *PFILE_MAILSLOT_SET_INFORMATION; + +typedef struct _FILE_FULL_DIR_INFORMATION +{ + ULONG NextEntryOffset; + ULONG FileIndex; + LARGE_INTEGER CreationTime; + LARGE_INTEGER LastAccessTime; + LARGE_INTEGER LastWriteTime; + LARGE_INTEGER ChangeTime; + LARGE_INTEGER EndOfFile; + LARGE_INTEGER AllocationSize; + ULONG FileAttributes; + ULONG FileNameLength; + ULONG EaSize; + WCHAR FileName[1]; +} FILE_FULL_DIR_INFORMATION, *PFILE_FULL_DIR_INFORMATION; typedef struct _FILE_BOTH_DIR_INFORMATION { Modified: trunk/reactos/include/psdk/winbase.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/winbase.h?rev… ============================================================================== --- trunk/reactos/include/psdk/winbase.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/winbase.h [iso-8859-1] Thu Sep 27 22:07:06 2012 @@ -228,6 +228,7 @@ #define CLRBREAK 9 #define STILL_ACTIVE 0x103 #define FIND_FIRST_EX_CASE_SENSITIVE 1 +#define FIND_FIRST_EX_LARGE_FETCH 2 #define SCS_32BIT_BINARY 0 #define SCS_64BIT_BINARY 6 #define SCS_DOS_BINARY 1 @@ -923,6 +924,7 @@ typedef enum _FINDEX_INFO_LEVELS { FindExInfoStandard, + FindExInfoBasic, FindExInfoMaxInfoLevel } FINDEX_INFO_LEVELS;

1 0

[tkreuzer] 57406: Fix build
by tkreuzer＠svn.reactos.org 27 Sep '12

27 Sep '12

Author: tkreuzer Date: Thu Sep 27 22:01:26 2012 New Revision: 57406 URL: http://svn.reactos.org/svn/reactos?rev=57406&view=rev Log: Fix build Modified: trunk/reactos/lib/sdk/crt/string/mbstowcs_s.c Modified: trunk/reactos/lib/sdk/crt/string/mbstowcs_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/mbstowc… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/mbstowcs_s.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/mbstowcs_s.c [iso-8859-1] Thu Sep 27 22:01:26 2012 @@ -96,7 +96,7 @@ else { /* Get the length of the string, plus 0 terminator */ - cwcWritten = _mbsnlen(pmbstr, count) + 1; + cwcWritten = _mbsnlen((const unsigned char *)pmbstr, count) + 1; } } else

1 0

[tkreuzer] 57405: [CRT] Implement wcstombs_s
by tkreuzer＠svn.reactos.org 27 Sep '12

27 Sep '12

Author: tkreuzer Date: Thu Sep 27 21:56:13 2012 New Revision: 57405 URL: http://svn.reactos.org/svn/reactos?rev=57405&view=rev Log: [CRT] Implement wcstombs_s Added: trunk/reactos/lib/sdk/crt/string/wcstombs_s.c (with props) Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec trunk/reactos/lib/sdk/crt/crt.cmake trunk/reactos/lib/sdk/crt/string/mbstowcs_s.c Modified: trunk/reactos/dll/win32/msvcrt/msvcrt.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msvcrt/msvcrt.sp… ============================================================================== --- trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msvcrt/msvcrt.spec [iso-8859-1] Thu Sep 27 21:56:13 2012 @@ -435,7 +435,7 @@ # stub _get_fmode # @ cdecl _get_heap_handle() @ cdecl _get_osfhandle(long) -@ cdecl _get_osplatform(ptr) +@ cdecl _get_osplatform(ptr) # stub _get_osver @ cdecl _get_output_format() @ cdecl _get_pgmptr(ptr) @@ -477,9 +477,9 @@ @ cdecl _heapwalk(ptr) @ cdecl _hypot(double double) @ cdecl _i64toa(long long ptr long) -@ cdecl _i64toa_s(long long ptr long long) +@ cdecl _i64toa_s(long long ptr long long) @ cdecl _i64tow(long long ptr long) -@ cdecl _i64tow_s(long long ptr long long) +@ cdecl _i64tow_s(long long ptr long long) @ cdecl _initterm(ptr ptr) @ cdecl _initterm_e(ptr ptr) @ cdecl -arch=i386 _inp(long) MSVCRT__inp @@ -1396,7 +1396,7 @@ @ cdecl wcsncmp(wstr wstr long) @ cdecl wcsncpy(ptr wstr long) @ cdecl wcsncpy_s(ptr long wstr long) -# stub wcsnlen +@ cdecl wcsnlen(wstr long) @ cdecl wcspbrk(wstr wstr) @ cdecl wcsrchr(wstr long) # stub wcsrtombs @@ -1408,7 +1408,7 @@ @ cdecl wcstok_s(ptr wstr ptr) @ cdecl wcstol(wstr ptr long) @ cdecl wcstombs(ptr ptr long) -# @ cdecl wcstombs_s(ptr ptr long wstr long) +@ cdecl wcstombs_s(ptr ptr long wstr long) @ cdecl wcstoul(wstr ptr long) @ cdecl wcsxfrm(ptr wstr long) # stub wctob Modified: trunk/reactos/lib/sdk/crt/crt.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/crt.cmake?rev=… ============================================================================== --- trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/crt.cmake [iso-8859-1] Thu Sep 27 21:56:13 2012 @@ -247,6 +247,8 @@ stdlib/wsenv.c stdlib/wmakpath.c stdlib/wmakpath_s.c + string/_mbsnlen.c + string/_mbstrnlen.c string/atof.c string/atoi.c string/atoi64.c @@ -283,6 +285,7 @@ string/strxfrm.c string/wcs.c string/wcstol.c + string/wcstombs_s.c string/wcstoul.c string/wctype.c string/wsplitp.c Modified: trunk/reactos/lib/sdk/crt/string/mbstowcs_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/mbstowc… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/mbstowcs_s.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/string/mbstowcs_s.c [iso-8859-1] Thu Sep 27 21:56:13 2012 @@ -7,17 +7,15 @@ */ #include <precomp.h> -#include <specstrings.h> - -#define _mbsnlen strnlen +#include <mbstring.h> _CRTIMP _Check_return_opt_ errno_t __cdecl mbstowcs_s( - _Out_opt_ size_t *pReturnValue, - _Out_writes_to_opt_(sizeInWords, *pReturnValue) wchar_t *pwcstr, + _Out_opt_ size_t *pcchConverted, + _Out_writes_to_opt_(sizeInWords, *pcchConverted) wchar_t *pwcstr, _In_ size_t sizeInWords, _In_reads_or_z_(count) const char *pmbstr, _In_ size_t count) @@ -34,10 +32,10 @@ } /* Check if we have a return value pointer */ - if (pReturnValue) + if (pcchConverted) { /* Default to 0 bytes written */ - *pReturnValue = 0; + *pcchConverted = 0; } if (!MSVCRT_CHECK_PMT((count == 0) || (pmbstr != 0))) @@ -107,10 +105,10 @@ } /* Check if we have a return value pointer */ - if (pReturnValue) + if (pcchConverted) { /* Default to 0 bytes written */ - *pReturnValue = cwcWritten; + *pcchConverted = cwcWritten; } return retval; Added: trunk/reactos/lib/sdk/crt/string/wcstombs_s.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/string/wcstomb… ============================================================================== --- trunk/reactos/lib/sdk/crt/string/wcstombs_s.c (added) +++ trunk/reactos/lib/sdk/crt/string/wcstombs_s.c [iso-8859-1] Thu Sep 27 21:56:13 2012 @@ -1,0 +1,115 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: ReactOS CRT + * PURPOSE: Implementation of mbstowcs_s + * FILE: lib/sdk/crt/stdlib/mbstowcs_s.c + * PROGRAMMER: Timo Kreuzer + */ + +#include <precomp.h> + +_Check_return_wat_ +_CRTIMP +errno_t +__cdecl +wcstombs_s( + _Out_opt_ size_t * pcchConverted, + _Out_writes_bytes_to_opt_(cjDstSize, *pcchConverted) + char * pmbstrDst, + _In_ size_t cjDstSize, + _In_z_ const wchar_t * pwszSrc, + _In_ size_t cjMaxCount) +{ + size_t cchMax, cchConverted; + errno_t retval = 0; + + /* Make sure, either we have a target buffer > 0 bytes, or no buffer */ + if (!MSVCRT_CHECK_PMT( ((cjDstSize != 0) && (pmbstrDst != 0)) || + ((cjDstSize == 0) && (pmbstrDst == 0)) )) + { + _set_errno(EINVAL); + return EINVAL; + } + + /* Check if we have a return value pointer */ + if (pcchConverted) + { + /* Default to 0 bytes written */ + *pcchConverted = 0; + } + + if (!MSVCRT_CHECK_PMT((cjMaxCount == 0) || (pwszSrc != 0))) + { + _set_errno(EINVAL); + return EINVAL; + } + + /* Check if there is anything to do */ + if ((pmbstrDst == 0) && (pwszSrc == 0)) + { + _set_errno(EINVAL); + return EINVAL; + } + + /* Check if we have a wchar string */ + if (pwszSrc) + { + /* Check if we also have a multibyte buffer */ + if (pmbstrDst) + { + /* Calculate the maximum that we can write */ + cchMax = (cjMaxCount < cjDstSize) ? cjMaxCount + 1 : cjDstSize; + + /* Now do the conversion */ + cchConverted = wcstombs(pmbstrDst, pwszSrc, cchMax); + + /* Check if the buffer was not zero terminated */ + if (cchConverted == cchMax) + { + /* Check if we reached the max size of the dest buffer */ + if (cchConverted == cjDstSize) + { + /* Does the caller allow this? */ + if (cjMaxCount != _TRUNCATE) + { + /* Not allowed, truncate to 0 length */ + pmbstrDst[0] = L'\0'; + + /* Return error */ + _set_errno(ERANGE); + return ERANGE; + } + + /* Inform the caller about truncation */ + retval = STRUNCATE; + } + + /* zero teminate the buffer */ + pmbstrDst[cchConverted - 1] = L'\0'; + } + else + { + /* The buffer is zero terminated, count the terminating char */ + cchConverted++; + } + } + else + { + /* Get the length of the string, plus 0 terminator */ + cchConverted = wcsnlen(pwszSrc, cjMaxCount) + 1; + } + } + else + { + cchConverted = cjMaxCount + 1; + } + + /* Check if we have a return value pointer */ + if (pcchConverted) + { + /* Default to 0 bytes written */ + *pcchConverted = cchConverted; + } + + return retval; +} Propchange: trunk/reactos/lib/sdk/crt/string/wcstombs_s.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs