Ros-diffs September 2013

ros-diffs@reactos.org

16 participants
554 discussions

[akhaldi] 60046: [NTOSKRNL] * Fix a copy pasted typo.
by akhaldi＠svn.reactos.org 11 Sep '13

11 Sep '13

Author: akhaldi Date: Wed Sep 11 22:09:41 2013 New Revision: 60046 URL: http://svn.reactos.org/svn/reactos?rev=60046&view=rev Log: [NTOSKRNL] * Fix a copy pasted typo. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Wed Sep 11 22:09:41 2013 @@ -1763,7 +1763,7 @@ if (CreateOptions & ~FILE_VALID_OPTION_FLAGS) { - DPRINT1("File Create 'CreateOptions' Prameter contains invalid flags!\n"); + DPRINT1("File Create 'CreateOptions' parameter contains invalid flags!\n"); ExFreePool(OpenPacket); return STATUS_INVALID_PARAMETER; } @@ -1771,14 +1771,14 @@ if ((CreateOptions & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && (!(DesiredAccess & SYNCHRONIZE))) { - DPRINT1("File Create 'CreateOptions' Prameter FILE_SYNCHRONOUS_IO_* requested, but 'DesiredAccess' does not have SYNCHRONIZE!\n"); + DPRINT1("File Create 'CreateOptions' parameter FILE_SYNCHRONOUS_IO_* requested, but 'DesiredAccess' does not have SYNCHRONIZE!\n"); ExFreePool(OpenPacket); return STATUS_INVALID_PARAMETER; } if ((CreateOptions & FILE_DELETE_ON_CLOSE) && (!(DesiredAccess & DELETE))) { - DPRINT1("File Create 'CreateOptions' Prameter FILE_DELETE_ON_CLOSE requested, but 'DesiredAccess' does not have DELETE!\n"); + DPRINT1("File Create 'CreateOptions' parameter FILE_DELETE_ON_CLOSE requested, but 'DesiredAccess' does not have DELETE!\n"); ExFreePool(OpenPacket); return STATUS_INVALID_PARAMETER; } @@ -1786,7 +1786,7 @@ if ((CreateOptions & (FILE_SYNCHRONOUS_IO_NONALERT | FILE_SYNCHRONOUS_IO_ALERT)) == (FILE_SYNCHRONOUS_IO_NONALERT | FILE_SYNCHRONOUS_IO_ALERT)) { - DPRINT1("File Create 'FileAttributes' Prameter both FILE_SYNCHRONOUS_IO_NONALERT and FILE_SYNCHRONOUS_IO_ALERT specified!\n"); + DPRINT1("File Create 'FileAttributes' parameter both FILE_SYNCHRONOUS_IO_NONALERT and FILE_SYNCHRONOUS_IO_ALERT specified!\n"); ExFreePool(OpenPacket); return STATUS_INVALID_PARAMETER; } @@ -1826,7 +1826,7 @@ if ((CreateOptions & FILE_NO_INTERMEDIATE_BUFFERING) && (DesiredAccess & FILE_APPEND_DATA)) { - DPRINT1("File Create 'CreateOptions' Prameter FILE_NO_INTERMEDIATE_BUFFERING requested, but 'DesiredAccess' FILE_APPEND_DATA requires it!\n"); + DPRINT1("File Create 'CreateOptions' parameter FILE_NO_INTERMEDIATE_BUFFERING requested, but 'DesiredAccess' FILE_APPEND_DATA requires it!\n"); ExFreePool(OpenPacket); return STATUS_INVALID_PARAMETER; }

1 0

[akhaldi] 60045: [NTOSKRNL] * Break down the checks as suggested by Alex. Brought to you by David Quintana.
by akhaldi＠svn.reactos.org 11 Sep '13

11 Sep '13

Author: akhaldi Date: Wed Sep 11 21:50:15 2013 New Revision: 60045 URL: http://svn.reactos.org/svn/reactos?rev=60045&view=rev Log: [NTOSKRNL] * Break down the checks as suggested by Alex. Brought to you by David Quintana. Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Wed Sep 11 21:50:15 2013 @@ -1740,45 +1740,93 @@ if ((AccessMode != KernelMode) || (Options & IO_CHECK_CREATE_PARAMETERS)) { /* Validate parameters */ - if ((FileAttributes & ~FILE_ATTRIBUTE_VALID_FLAGS) || - - (ShareAccess & ~FILE_SHARE_VALID_FLAGS) || - - (Disposition > FILE_MAXIMUM_DISPOSITION) || - - (CreateOptions & ~FILE_VALID_OPTION_FLAGS) || - - ((CreateOptions & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && - (!(DesiredAccess & SYNCHRONIZE))) || - - ((CreateOptions & FILE_DELETE_ON_CLOSE) && (!(DesiredAccess & DELETE))) || - - ((CreateOptions & (FILE_SYNCHRONOUS_IO_NONALERT | FILE_SYNCHRONOUS_IO_ALERT)) == - (FILE_SYNCHRONOUS_IO_NONALERT | FILE_SYNCHRONOUS_IO_ALERT)) || - - ((CreateOptions & FILE_DIRECTORY_FILE) && !(CreateOptions & FILE_NON_DIRECTORY_FILE) && - ((CreateOptions & ~(FILE_DIRECTORY_FILE | - FILE_SYNCHRONOUS_IO_ALERT | - FILE_SYNCHRONOUS_IO_NONALERT | - FILE_WRITE_THROUGH | - FILE_COMPLETE_IF_OPLOCKED | - FILE_OPEN_FOR_BACKUP_INTENT | - FILE_DELETE_ON_CLOSE | - FILE_OPEN_FOR_FREE_SPACE_QUERY | - FILE_OPEN_BY_FILE_ID | - FILE_NO_COMPRESSION | - FILE_OPEN_REPARSE_POINT)) || - ((Disposition != FILE_CREATE) && (Disposition != FILE_OPEN) && (Disposition != FILE_OPEN_IF)))) || - - ((CreateOptions & FILE_COMPLETE_IF_OPLOCKED) && (CreateOptions & FILE_RESERVE_OPFILTER)) || - - ((CreateOptions & FILE_NO_INTERMEDIATE_BUFFERING) && (DesiredAccess & FILE_APPEND_DATA))) - { - /* - * Parameter failure. We'll be as unspecific as NT as to - * why this happened though, to make debugging a pain! - */ - DPRINT1("File Create Parameter Failure!\n"); + if (FileAttributes & ~FILE_ATTRIBUTE_VALID_FLAGS) + { + DPRINT1("File Create 'FileAttributes' Parameter contains invalid flags!\n"); + ExFreePool(OpenPacket); + return STATUS_INVALID_PARAMETER; + } + + if (ShareAccess & ~FILE_SHARE_VALID_FLAGS) + { + DPRINT1("File Create 'ShareAccess' Parameter contains invalid flags!\n"); + ExFreePool(OpenPacket); + return STATUS_INVALID_PARAMETER; + } + + if (Disposition > FILE_MAXIMUM_DISPOSITION) + { + DPRINT1("File Create 'Disposition' Parameter is out of range!\n"); + ExFreePool(OpenPacket); + return STATUS_INVALID_PARAMETER; + } + + if (CreateOptions & ~FILE_VALID_OPTION_FLAGS) + { + DPRINT1("File Create 'CreateOptions' Prameter contains invalid flags!\n"); + ExFreePool(OpenPacket); + return STATUS_INVALID_PARAMETER; + } + + if ((CreateOptions & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && + (!(DesiredAccess & SYNCHRONIZE))) + { + DPRINT1("File Create 'CreateOptions' Prameter FILE_SYNCHRONOUS_IO_* requested, but 'DesiredAccess' does not have SYNCHRONIZE!\n"); + ExFreePool(OpenPacket); + return STATUS_INVALID_PARAMETER; + } + + if ((CreateOptions & FILE_DELETE_ON_CLOSE) && (!(DesiredAccess & DELETE))) + { + DPRINT1("File Create 'CreateOptions' Prameter FILE_DELETE_ON_CLOSE requested, but 'DesiredAccess' does not have DELETE!\n"); + ExFreePool(OpenPacket); + return STATUS_INVALID_PARAMETER; + } + + if ((CreateOptions & (FILE_SYNCHRONOUS_IO_NONALERT | FILE_SYNCHRONOUS_IO_ALERT)) == + (FILE_SYNCHRONOUS_IO_NONALERT | FILE_SYNCHRONOUS_IO_ALERT)) + { + DPRINT1("File Create 'FileAttributes' Prameter both FILE_SYNCHRONOUS_IO_NONALERT and FILE_SYNCHRONOUS_IO_ALERT specified!\n"); + ExFreePool(OpenPacket); + return STATUS_INVALID_PARAMETER; + } + + if ((CreateOptions & FILE_DIRECTORY_FILE) && !(CreateOptions & FILE_NON_DIRECTORY_FILE) && + (CreateOptions & ~(FILE_DIRECTORY_FILE | + FILE_SYNCHRONOUS_IO_ALERT | + FILE_SYNCHRONOUS_IO_NONALERT | + FILE_WRITE_THROUGH | + FILE_COMPLETE_IF_OPLOCKED | + FILE_OPEN_FOR_BACKUP_INTENT | + FILE_DELETE_ON_CLOSE | + FILE_OPEN_FOR_FREE_SPACE_QUERY | + FILE_OPEN_BY_FILE_ID | + FILE_NO_COMPRESSION | + FILE_OPEN_REPARSE_POINT))) + { + DPRINT1("File Create 'CreateOptions' Parameter has flags incompatible with FILE_DIRECTORY_FILE!\n"); + ExFreePool(OpenPacket); + return STATUS_INVALID_PARAMETER; + } + + if ((CreateOptions & FILE_DIRECTORY_FILE) && !(CreateOptions & FILE_NON_DIRECTORY_FILE) && + (Disposition != FILE_CREATE) && (Disposition != FILE_OPEN) && (Disposition != FILE_OPEN_IF)) + { + DPRINT1("File Create 'CreateOptions' Parameter FILE_DIRECTORY_FILE requested, but 'Disposition' is not FILE_CREATE/FILE_OPEN/FILE_OPEN_IF!\n"); + ExFreePool(OpenPacket); + return STATUS_INVALID_PARAMETER; + } + + if ((CreateOptions & FILE_COMPLETE_IF_OPLOCKED) && (CreateOptions & FILE_RESERVE_OPFILTER)) + { + DPRINT1("File Create 'CreateOptions' Parameter both FILE_COMPLETE_IF_OPLOCKED and FILE_RESERVE_OPFILTER specified!\n"); + ExFreePool(OpenPacket); + return STATUS_INVALID_PARAMETER; + } + + if ((CreateOptions & FILE_NO_INTERMEDIATE_BUFFERING) && (DesiredAccess & FILE_APPEND_DATA)) + { + DPRINT1("File Create 'CreateOptions' Prameter FILE_NO_INTERMEDIATE_BUFFERING requested, but 'DesiredAccess' FILE_APPEND_DATA requires it!\n"); ExFreePool(OpenPacket); return STATUS_INVALID_PARAMETER; }

1 0

[tfaber] 60044: [NTOS:IO] - Fix pool corruption resulting form a combination of r60038 and dubious SEH programming patterns
by tfaber＠svn.reactos.org 11 Sep '13

11 Sep '13

Author: tfaber Date: Wed Sep 11 21:23:23 2013 New Revision: 60044 URL: http://svn.reactos.org/svn/reactos?rev=60044&view=rev Log: [NTOS:IO] - Fix pool corruption resulting form a combination of r60038 and dubious SEH programming patterns Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Wed Sep 11 21:23:23 2013 @@ -1890,7 +1890,7 @@ /* Return the exception code */ if (OpenPacket->EaBuffer != NULL) ExFreePool(OpenPacket->EaBuffer); ExFreePool(OpenPacket); - Status = _SEH2_GetExceptionCode(); + _SEH2_YIELD(return _SEH2_GetExceptionCode()); } _SEH2_END; }

1 0

[akhaldi] 60043: [NTOSKRNL] * Silence some debug prints.
by akhaldi＠svn.reactos.org 11 Sep '13

11 Sep '13

Author: akhaldi Date: Wed Sep 11 19:59:59 2013 New Revision: 60043 URL: http://svn.reactos.org/svn/reactos?rev=60043&view=rev Log: [NTOSKRNL] * Silence some debug prints. Modified: 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/pool.c trunk/reactos/ntoskrnl/po/events.c 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] Wed Sep 11 19:59:59 2013 @@ -1008,9 +1008,9 @@ // // During development, print this out so we can see what's happening // - DPRINT1("EXPOOL: Pool Tracker Table at: 0x%p with 0x%lx bytes\n", + DPRINT("EXPOOL: Pool Tracker Table at: 0x%p with 0x%lx bytes\n", PoolTrackTable, PoolTrackTableSize * sizeof(POOL_TRACKER_TABLE)); - DPRINT1("EXPOOL: Big Pool Tracker Table at: 0x%p with 0x%lx bytes\n", + DPRINT("EXPOOL: Big Pool Tracker Table at: 0x%p with 0x%lx bytes\n", PoolBigPageTable, PoolBigPageTableSize * sizeof(POOL_TRACKER_BIG_PAGES)); // 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] Wed Sep 11 19:59:59 2013 @@ -1180,7 +1180,7 @@ } /* Release the PFN lock and flush the TLB */ - DPRINT1("Loader pages freed: %lx\n", LoaderPages); + DPRINT("Loader pages freed: %lx\n", LoaderPages); KeReleaseQueuedSpinLock(LockQueuePfnLock, OldIrql); KeFlushCurrentTb(); 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] Wed Sep 11 19:59:59 2013 @@ -56,7 +56,7 @@ StackBase = Teb->NtTib.StackBase; DeallocationStack = Teb->DeallocationStack; GuranteedSize = Teb->GuaranteedStackBytes; - DPRINT1("Handling guard page fault with Stacks Addresses 0x%p and 0x%p, guarantee: %lx\n", + DPRINT("Handling guard page fault with Stacks Addresses 0x%p and 0x%p, guarantee: %lx\n", StackBase, DeallocationStack, GuranteedSize); /* Guarantees make this code harder, for now, assume there aren't any */ @@ -101,7 +101,7 @@ if ((NT_SUCCESS(Status) || (Status == STATUS_ALREADY_COMMITTED))) { /* We did it! */ - DPRINT1("Guard page handled successfully for %p\n", Address); + DPRINT("Guard page handled successfully for %p\n", Address); return STATUS_PAGE_FAULT_GUARD_PAGE; } Modified: trunk/reactos/ntoskrnl/mm/ARM3/pool.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pool.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pool.c [iso-8859-1] Wed Sep 11 19:59:59 2013 @@ -482,7 +482,7 @@ // Get the page bit count // i = ((SizeInPages - 1) / PTE_COUNT) + 1; - DPRINT1("Paged pool expansion: %lu %x\n", i, SizeInPages); + DPRINT("Paged pool expansion: %lu %x\n", i, SizeInPages); // // Check if there is enougn paged pool expansion space left Modified: trunk/reactos/ntoskrnl/po/events.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/po/events.c?rev=6… ============================================================================== --- trunk/reactos/ntoskrnl/po/events.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/po/events.c [iso-8859-1] Wed Sep 11 19:59:59 2013 @@ -264,11 +264,11 @@ /* FIXME: What do do with the capabilities? */ { - DPRINT1("Device capabilities: 0x%x (", Caps); - if (Caps & SYS_BUTTON_POWER) DbgPrint(" POWER"); - if (Caps & SYS_BUTTON_SLEEP) DbgPrint(" SLEEP"); - if (Caps & SYS_BUTTON_LID) DbgPrint(" LID"); - DbgPrint(" )\n"); + DPRINT("Device capabilities: 0x%x (", Caps); + if (Caps & SYS_BUTTON_POWER) DPRINT(" POWER"); + if (Caps & SYS_BUTTON_SLEEP) DPRINT(" SLEEP"); + if (Caps & SYS_BUTTON_LID) DPRINT(" LID"); + DPRINT(" )\n"); } SysButtonContext = ExAllocatePool(NonPagedPool, sizeof(SYS_BUTTON_CONTEXT));

1 0

[ion] 60042: [NPFS-NEW]: ntdll_winetest pipe : 107 tests executed (0 marked as todo, 0 failures), 0 skipped.
by ion＠svn.reactos.org 11 Sep '13

11 Sep '13

Author: ion Date: Wed Sep 11 19:36:51 2013 New Revision: 60042 URL: http://svn.reactos.org/svn/reactos?rev=60042&view=rev Log: [NPFS-NEW]: ntdll_winetest pipe : 107 tests executed (0 marked as todo, 0 failures), 0 skipped. Modified: trunk/reactos/drivers/filesystems/npfs_new/create.c Modified: trunk/reactos/drivers/filesystems/npfs_new/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/npfs_n… ============================================================================== --- trunk/reactos/drivers/filesystems/npfs_new/create.c [iso-8859-1] (original) +++ trunk/reactos/drivers/filesystems/npfs_new/create.c [iso-8859-1] Wed Sep 11 19:36:51 2013 @@ -148,8 +148,8 @@ SeUnlockSubjectContext(SubjectSecurityContext); if (!AccessGranted) return IoStatus; - if (((AccessGranted & FILE_READ_DATA) && (NamedPipeConfiguration == FILE_PIPE_INBOUND)) || - ((AccessGranted & FILE_WRITE_DATA) && (NamedPipeConfiguration == FILE_PIPE_OUTBOUND))) + if (((GrantedAccess & FILE_READ_DATA) && (NamedPipeConfiguration == FILE_PIPE_INBOUND)) || + ((GrantedAccess & FILE_WRITE_DATA) && (NamedPipeConfiguration == FILE_PIPE_OUTBOUND))) { IoStatus.Status = STATUS_ACCESS_DENIED; return IoStatus; @@ -391,7 +391,6 @@ AccessState->RemainingDesiredAccess &= ~(GrantedAccess | 0x2000000); } - ObjectTypeName.Buffer = L"NamedPipe"; ObjectTypeName.Length = 18; SeOpenObjectAuditAlarm(&ObjectTypeName,

1 0

[tfaber] 60041: [CMAKE] - Improve MSVC warning settings
by tfaber＠svn.reactos.org 11 Sep '13

11 Sep '13

Author: tfaber Date: Wed Sep 11 19:25:48 2013 New Revision: 60041 URL: http://svn.reactos.org/svn/reactos?rev=60041&view=rev Log: [CMAKE] - Improve MSVC warning settings Modified: trunk/reactos/cmake/msvc.cmake Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=60041… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Wed Sep 11 19:25:48 2013 @@ -23,13 +23,17 @@ add_compile_flags("/X /GR- /EHs-c- /GS- /Zl /W3") # HACK: for VS 11+ we need to explicitly disable SSE, which is off by -# default for older compilers. See bug #7174 +# default for older compilers. See CORE-6507 if (MSVC_VERSION GREATER 1699 AND ARCH STREQUAL "i386") add_compile_flags("/arch:IA32") endif () -# C4700 is almost always likely to result in broken code, so mark it as an error -add_compile_flags("/we4700") +# C++ exception specification ignored... yeah we don't care +add_compile_flags("/wd4290") + +# different level of indirection, void function returning a value and +# uninitialized variable usage should be errors. +add_compile_flags("/we4047 /we4098 /we4700") # Debugging #if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")

1 0

[hbelusca] 60040: [SAC]: Don't return things from a VOID function (MSVC_warning--; )
by hbelusca＠svn.reactos.org 11 Sep '13

11 Sep '13

Author: hbelusca Date: Wed Sep 11 19:23:20 2013 New Revision: 60040 URL: http://svn.reactos.org/svn/reactos?rev=60040&view=rev Log: [SAC]: Don't return things from a VOID function (MSVC_warning--;) Modified: trunk/reactos/drivers/sac/driver/data.c Modified: trunk/reactos/drivers/sac/driver/data.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/sac/driver/data.c?… ============================================================================== --- trunk/reactos/drivers/sac/driver/data.c [iso-8859-1] (original) +++ trunk/reactos/drivers/sac/driver/data.c [iso-8859-1] Wed Sep 11 19:23:20 2013 @@ -28,7 +28,7 @@ WorkerProcessEvents(IN PSAC_DEVICE_EXTENSION DeviceExtension) { /* Call the worker function */ - return ConMgrWorkerProcessEvents(DeviceExtension); + ConMgrWorkerProcessEvents(DeviceExtension); } VOID

1 0

[tfaber] 60039: [SPEC2DEF] - Allow C++ redirects aka fix MSVC build
by tfaber＠svn.reactos.org 11 Sep '13

11 Sep '13

Author: tfaber Date: Wed Sep 11 19:19:11 2013 New Revision: 60039 URL: http://svn.reactos.org/svn/reactos?rev=60039&view=rev Log: [SPEC2DEF] - Allow C++ redirects aka fix MSVC build Modified: trunk/reactos/tools/spec2def/spec2def.c Modified: trunk/reactos/tools/spec2def/spec2def.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/spec2def/spec2def.c?… ============================================================================== --- trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] (original) +++ trunk/reactos/tools/spec2def/spec2def.c [iso-8859-1] Wed Sep 11 19:19:11 2013 @@ -349,18 +349,11 @@ } else if (pexp->pcRedirection) { - if (gbMSComp && (pexp->pcName[0] == '?')) - { - /* ignore c++ redirection, since link doesn't like that! */ - } - else - { - int fDeco; - - fDeco = ((giArch == ARCH_X86) && !ScanToken(pexp->pcRedirection, '.')); - fprintf(fileDest, "="); - PrintName(fileDest, pexp, "", 1, fDeco && !gbMSComp); - } + int fDeco; + + fDeco = ((giArch == ARCH_X86) && !ScanToken(pexp->pcRedirection, '.')); + fprintf(fileDest, "="); + PrintName(fileDest, pexp, "", 1, fDeco && !gbMSComp); } else if (((pexp->uFlags & FL_STUB) || (pexp->nCallingConvention == CC_STUB)) && (pexp->pcName[0] == '?'))

1 0

[ion] 60038: [NTOSKRNL]: Fix a literal metric fuckton of missing parameter checks in IoCreateFile. I know for a fact this fixes two ntdll pipe tests, it probably fixes a bunch of other tests too. [...
by ion＠svn.reactos.org 11 Sep '13

11 Sep '13

Author: ion Date: Wed Sep 11 18:50:28 2013 New Revision: 60038 URL: http://svn.reactos.org/svn/reactos?rev=60038&view=rev Log: [NTOSKRNL]: Fix a literal metric fuckton of missing parameter checks in IoCreateFile. I know for a fact this fixes two ntdll pipe tests, it probably fixes a bunch of other tests too. [NTOSKRNL]: Fix OPEN_PACKET definition. Also, allocate it from the pool in IoCreateFile, instead of the stack (Windows does too). [NTOSKRNL]: IoCreateFile should only be setting IO_STATUS_BLOCK Information/Status if EA Buffer validation *Fails*, not if it succeeds! Modified: trunk/reactos/ntoskrnl/include/internal/io.h trunk/reactos/ntoskrnl/io/iomgr/file.c Modified: trunk/reactos/ntoskrnl/include/internal/io.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io.h [iso-8859-1] Wed Sep 11 18:50:28 2013 @@ -368,14 +368,15 @@ PFILE_BASIC_INFORMATION BasicInformation; PFILE_NETWORK_OPEN_INFORMATION NetworkInformation; CREATE_FILE_TYPE CreateFileType; - PVOID MailslotOrPipeParameters; + PVOID ExtraCreateParameters; BOOLEAN Override; BOOLEAN QueryOnly; BOOLEAN DeleteOnly; BOOLEAN FullAttributes; - PDUMMY_FILE_OBJECT DummyFileObject; + PDUMMY_FILE_OBJECT LocalFileObject; + BOOLEAN TraversedMountPoint; ULONG InternalFlags; - //PIO_DRIVER_CREATE_CONTEXT DriverCreateContext; Vista only, needs ROS DDK Update + PDEVICE_OBJECT TopDeviceObjectHint; } OPEN_PACKET, *POPEN_PACKET; // Modified: trunk/reactos/ntoskrnl/io/iomgr/file.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/io/iomgr/file.c?r… ============================================================================== --- trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/io/iomgr/file.c [iso-8859-1] Wed Sep 11 18:50:28 2013 @@ -188,7 +188,7 @@ BOOLEAN DirectOpen = FALSE, OpenCancelled, UseDummyFile; OBJECT_ATTRIBUTES ObjectAttributes; KIRQL OldIrql; - PDUMMY_FILE_OBJECT DummyFileObject; + PDUMMY_FILE_OBJECT LocalFileObject; PFILE_BASIC_INFORMATION FileBasicInfo; ULONG ReturnLength; KPROCESSOR_MODE CheckMode; @@ -503,9 +503,7 @@ /* Now set the IRP data */ Irp->RequestorMode = AccessMode; - Irp->Flags = IRP_CREATE_OPERATION | - IRP_SYNCHRONOUS_API | - IRP_DEFER_IO_COMPLETION; + Irp->Flags = IRP_CREATE_OPERATION | IRP_SYNCHRONOUS_API | IRP_DEFER_IO_COMPLETION; Irp->Tail.Overlay.Thread = PsGetCurrentThread(); Irp->UserIosb = &IoStatusBlock; Irp->MdlAddress = NULL; @@ -537,8 +535,7 @@ /* Set the flags */ StackLoc->Flags = (UCHAR)OpenPacket->Options; - StackLoc->Flags |= !(Attributes & OBJ_CASE_INSENSITIVE) ? - SL_CASE_SENSITIVE: 0; + StackLoc->Flags |= !(Attributes & OBJ_CASE_INSENSITIVE) ? SL_CASE_SENSITIVE: 0; break; /* Named pipe */ @@ -546,8 +543,7 @@ /* Set the named pipe MJ and set the parameters */ StackLoc->MajorFunction = IRP_MJ_CREATE_NAMED_PIPE; - StackLoc->Parameters.CreatePipe.Parameters = - OpenPacket->MailslotOrPipeParameters; + StackLoc->Parameters.CreatePipe.Parameters = OpenPacket->ExtraCreateParameters; break; /* Mailslot */ @@ -555,8 +551,7 @@ /* Set the mailslot MJ and set the parameters */ StackLoc->MajorFunction = IRP_MJ_CREATE_MAILSLOT; - StackLoc->Parameters.CreateMailslot.Parameters = - OpenPacket->MailslotOrPipeParameters; + StackLoc->Parameters.CreateMailslot.Parameters = OpenPacket->ExtraCreateParameters; break; } @@ -658,13 +653,13 @@ else { /* Use the dummy object instead */ - DummyFileObject = OpenPacket->DummyFileObject; - RtlZeroMemory(DummyFileObject, sizeof(DUMMY_FILE_OBJECT)); + LocalFileObject = OpenPacket->LocalFileObject; + RtlZeroMemory(LocalFileObject, sizeof(DUMMY_FILE_OBJECT)); /* Set it up */ - FileObject = (PFILE_OBJECT)&DummyFileObject->ObjectHeader.Body; - DummyFileObject->ObjectHeader.Type = IoFileObjectType; - DummyFileObject->ObjectHeader.PointerCount = 1; + FileObject = (PFILE_OBJECT)&LocalFileObject->ObjectHeader.Body; + LocalFileObject->ObjectHeader.Type = IoFileObjectType; + LocalFileObject->ObjectHeader.PointerCount = 1; } /* Setup the file header */ @@ -1541,7 +1536,7 @@ { NTSTATUS Status; KPROCESSOR_MODE AccessMode = ExGetPreviousMode(); - DUMMY_FILE_OBJECT DummyFileObject; + DUMMY_FILE_OBJECT LocalFileObject; FILE_NETWORK_OPEN_INFORMATION NetworkOpenInfo; HANDLE Handle; OPEN_PACKET OpenPacket; @@ -1582,7 +1577,7 @@ &NetworkOpenInfo : FileInformation; OpenPacket.QueryOnly = TRUE; OpenPacket.FullAttributes = IsBasic ? FALSE : TRUE; - OpenPacket.DummyFileObject = &DummyFileObject; + OpenPacket.LocalFileObject = &LocalFileObject; /* Update the operation count */ IopUpdateOperationCount(IopOtherTransfer); @@ -1717,14 +1712,18 @@ KPROCESSOR_MODE AccessMode; HANDLE LocalHandle = 0; LARGE_INTEGER SafeAllocationSize; - volatile PVOID SystemEaBuffer = NULL; NTSTATUS Status = STATUS_SUCCESS; - OPEN_PACKET OpenPacket; + PNAMED_PIPE_CREATE_PARAMETERS NamedPipeCreateParameters; + POPEN_PACKET OpenPacket; ULONG EaErrorOffset; - PAGED_CODE(); IOTRACE(IO_FILE_DEBUG, "FileName: %wZ\n", ObjectAttributes->ObjectName); + /* Allocate the open packet */ + OpenPacket = ExAllocatePoolWithTag(NonPagedPool, sizeof(*OpenPacket), 'pOoI'); + if (!OpenPacket) return STATUS_INSUFFICIENT_RESOURCES; + RtlZeroMemory(OpenPacket, sizeof(*OpenPacket)); + /* Check if we have no parameter checking to do */ if (Options & IO_NO_PARAMETER_CHECKING) { @@ -1738,12 +1737,112 @@ } /* Check if the call came from user mode */ - if (AccessMode != KernelMode) - { + if ((AccessMode != KernelMode) || (Options & IO_CHECK_CREATE_PARAMETERS)) + { + /* Validate parameters */ + if ((FileAttributes & ~FILE_ATTRIBUTE_VALID_FLAGS) || + + (ShareAccess & ~FILE_SHARE_VALID_FLAGS) || + + (Disposition > FILE_MAXIMUM_DISPOSITION) || + + (CreateOptions & ~FILE_VALID_OPTION_FLAGS) || + + ((CreateOptions & (FILE_SYNCHRONOUS_IO_ALERT | FILE_SYNCHRONOUS_IO_NONALERT)) && + (!(DesiredAccess & SYNCHRONIZE))) || + + ((CreateOptions & FILE_DELETE_ON_CLOSE) && (!(DesiredAccess & DELETE))) || + + ((CreateOptions & (FILE_SYNCHRONOUS_IO_NONALERT | FILE_SYNCHRONOUS_IO_ALERT)) == + (FILE_SYNCHRONOUS_IO_NONALERT | FILE_SYNCHRONOUS_IO_ALERT)) || + + ((CreateOptions & FILE_DIRECTORY_FILE) && !(CreateOptions & FILE_NON_DIRECTORY_FILE) && + ((CreateOptions & ~(FILE_DIRECTORY_FILE | + FILE_SYNCHRONOUS_IO_ALERT | + FILE_SYNCHRONOUS_IO_NONALERT | + FILE_WRITE_THROUGH | + FILE_COMPLETE_IF_OPLOCKED | + FILE_OPEN_FOR_BACKUP_INTENT | + FILE_DELETE_ON_CLOSE | + FILE_OPEN_FOR_FREE_SPACE_QUERY | + FILE_OPEN_BY_FILE_ID | + FILE_NO_COMPRESSION | + FILE_OPEN_REPARSE_POINT)) || + ((Disposition != FILE_CREATE) && (Disposition != FILE_OPEN) && (Disposition != FILE_OPEN_IF)))) || + + ((CreateOptions & FILE_COMPLETE_IF_OPLOCKED) && (CreateOptions & FILE_RESERVE_OPFILTER)) || + + ((CreateOptions & FILE_NO_INTERMEDIATE_BUFFERING) && (DesiredAccess & FILE_APPEND_DATA))) + { + /* + * Parameter failure. We'll be as unspecific as NT as to + * why this happened though, to make debugging a pain! + */ + DPRINT1("File Create Parameter Failure!\n"); + ExFreePool(OpenPacket); + return STATUS_INVALID_PARAMETER; + } + + /* Now check if this is a named pipe */ + if (CreateFileType == CreateFileTypeNamedPipe) + { + /* Make sure we have extra parameters */ + if (!ExtraCreateParameters) + { + ExFreePool(OpenPacket); + return STATUS_INVALID_PARAMETER; + } + + /* Get the parameters and validate them */ + NamedPipeCreateParameters = ExtraCreateParameters; + if ((NamedPipeCreateParameters->NamedPipeType > FILE_PIPE_MESSAGE_TYPE) || + + (NamedPipeCreateParameters->ReadMode > FILE_PIPE_MESSAGE_MODE) || + + (NamedPipeCreateParameters->CompletionMode > FILE_PIPE_COMPLETE_OPERATION) || + + (ShareAccess & FILE_SHARE_DELETE) || + + ((Disposition < FILE_OPEN) || (Disposition > FILE_OPEN_IF)) || + + (CreateOptions & ~FILE_VALID_PIPE_OPTION_FLAGS)) + { + /* Invalid named pipe create */ + ExFreePool(OpenPacket); + return STATUS_INVALID_PARAMETER; + } + } + else if (CreateFileType == CreateFileTypeMailslot) + { + /* Make sure we have extra parameters */ + if (!ExtraCreateParameters) + { + ExFreePool(OpenPacket); + return STATUS_INVALID_PARAMETER; + } + + /* Get the parameters and validate them */ + if ((ShareAccess & FILE_SHARE_DELETE) || + + !(ShareAccess & ~FILE_SHARE_WRITE) || + + (Disposition != FILE_CREATE) || + + (CreateOptions & ~FILE_VALID_MAILSLOT_OPTION_FLAGS)) + { + /* Invalid mailslot create */ + ExFreePool(OpenPacket); + return STATUS_INVALID_PARAMETER; + } + } + _SEH2_TRY { + /* Probe the output parameters */ ProbeForWriteHandle(FileHandle); ProbeForWriteIoStatusBlock(IoStatusBlock); + + /* Probe the allocation size if one was passed in */ if (AllocationSize) { SafeAllocationSize = ProbeForReadLargeInteger(AllocationSize); @@ -1753,32 +1852,44 @@ SafeAllocationSize.QuadPart = 0; } + /* Make sure it's valid */ + if (SafeAllocationSize.QuadPart < 0) + { + RtlRaiseStatus(STATUS_INVALID_PARAMETER); + } + + /* Check if EA was passed in */ if ((EaBuffer) && (EaLength)) { + /* Probe it */ ProbeForRead(EaBuffer, EaLength, sizeof(ULONG)); - /* marshal EaBuffer */ - SystemEaBuffer = ExAllocatePoolWithTag(NonPagedPool, - EaLength, - TAG_EA); - if (!SystemEaBuffer) - { - _SEH2_YIELD(return STATUS_INSUFFICIENT_RESOURCES); - } - - RtlCopyMemory(SystemEaBuffer, EaBuffer, EaLength); + /* And marshall it */ + OpenPacket->EaBuffer = ExAllocatePoolWithTag(NonPagedPool, + EaLength, + TAG_EA); + OpenPacket->EaLength = EaLength; + RtlCopyMemory(OpenPacket->EaBuffer, EaBuffer, EaLength); /* Validate the buffer */ - Status = IoCheckEaBufferValidity(SystemEaBuffer, + Status = IoCheckEaBufferValidity(OpenPacket->EaBuffer, EaLength, &EaErrorOffset); - IoStatusBlock->Status = Status; - IoStatusBlock->Information = EaErrorOffset; + if (!NT_SUCCESS(Status)) + { + /* Undo everything if it's invalid */ + DPRINT1("Invalid EA buffer\n"); + IoStatusBlock->Status = Status; + IoStatusBlock->Information = EaErrorOffset; + RtlRaiseStatus(Status); + } } } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { /* Return the exception code */ + if (OpenPacket->EaBuffer != NULL) ExFreePool(OpenPacket->EaBuffer); + ExFreePool(OpenPacket); Status = _SEH2_GetExceptionCode(); } _SEH2_END; @@ -1809,47 +1920,47 @@ if ((EaBuffer) && (EaLength)) { /* Allocate the kernel copy */ - SystemEaBuffer = ExAllocatePoolWithTag(NonPagedPool, - EaLength, - TAG_EA); - if (!SystemEaBuffer) return STATUS_INSUFFICIENT_RESOURCES; + OpenPacket->EaBuffer = ExAllocatePoolWithTag(NonPagedPool, + EaLength, + TAG_EA); + if (!OpenPacket->EaBuffer) + { + ExFreePool(OpenPacket); + return STATUS_INSUFFICIENT_RESOURCES; + } /* Copy the data */ - RtlCopyMemory(SystemEaBuffer, EaBuffer, EaLength); + OpenPacket->EaLength = EaLength; + RtlCopyMemory(OpenPacket->EaBuffer, EaBuffer, EaLength); /* Validate the buffer */ - Status = IoCheckEaBufferValidity(SystemEaBuffer, + Status = IoCheckEaBufferValidity(OpenPacket->EaBuffer, EaLength, &EaErrorOffset); - IoStatusBlock->Status = Status; - IoStatusBlock->Information = EaErrorOffset; - } - } - - if (!NT_SUCCESS(Status)) - { - DPRINT1("FIXME: IoCheckEaBufferValidity() failed with Status: %lx\n", - Status); - - /* Free SystemEaBuffer if needed and return the error */ - if (SystemEaBuffer) ExFreePoolWithTag(SystemEaBuffer, TAG_EA); - return Status; + if (!NT_SUCCESS(Status)) + { + /* Undo everything if it's invalid */ + DPRINT1("Invalid EA buffer\n"); + ExFreePool(OpenPacket->EaBuffer); + IoStatusBlock->Status = Status; + IoStatusBlock->Information = EaErrorOffset; + ExFreePool(OpenPacket); + return Status; + } + } } /* Setup the Open Packet */ - RtlZeroMemory(&OpenPacket, sizeof(OPEN_PACKET)); - OpenPacket.Type = IO_TYPE_OPEN_PACKET; - OpenPacket.Size = sizeof(OPEN_PACKET); - OpenPacket.AllocationSize = SafeAllocationSize; - OpenPacket.CreateOptions = CreateOptions; - OpenPacket.FileAttributes = (USHORT)FileAttributes; - OpenPacket.ShareAccess = (USHORT)ShareAccess; - OpenPacket.EaBuffer = SystemEaBuffer; - OpenPacket.EaLength = EaLength; - OpenPacket.Options = Options; - OpenPacket.Disposition = Disposition; - OpenPacket.CreateFileType = CreateFileType; - OpenPacket.MailslotOrPipeParameters = ExtraCreateParameters; + OpenPacket->Type = IO_TYPE_OPEN_PACKET; + OpenPacket->Size = sizeof(*OpenPacket); + OpenPacket->AllocationSize = SafeAllocationSize; + OpenPacket->CreateOptions = CreateOptions; + OpenPacket->FileAttributes = (USHORT)FileAttributes; + OpenPacket->ShareAccess = (USHORT)ShareAccess; + OpenPacket->Options = Options; + OpenPacket->Disposition = Disposition; + OpenPacket->CreateFileType = CreateFileType; + OpenPacket->ExtraCreateParameters = ExtraCreateParameters; /* Update the operation count */ IopUpdateOperationCount(IopOtherTransfer); @@ -1867,14 +1978,14 @@ AccessMode, NULL, DesiredAccess, - &OpenPacket, + OpenPacket, &LocalHandle); /* Free the EA Buffer */ - if (OpenPacket.EaBuffer) ExFreePool(OpenPacket.EaBuffer); + if (OpenPacket->EaBuffer) ExFreePool(OpenPacket->EaBuffer); /* Now check for Ob or Io failure */ - if (!(NT_SUCCESS(Status)) || (OpenPacket.ParseCheck != TRUE)) + if (!(NT_SUCCESS(Status)) || (OpenPacket->ParseCheck != TRUE)) { /* Check if Ob thinks well went well */ if (NT_SUCCESS(Status)) @@ -1888,10 +1999,10 @@ } /* Now check the Io status */ - if (!NT_SUCCESS(OpenPacket.FinalStatus)) + if (!NT_SUCCESS(OpenPacket->FinalStatus)) { /* Use this status instead of Ob's */ - Status = OpenPacket.FinalStatus; + Status = OpenPacket->FinalStatus; /* Check if it was only a warning */ if (NT_WARNING(Status)) @@ -1900,8 +2011,8 @@ _SEH2_TRY { /* In this case, we copy the I/O Status back */ - IoStatusBlock->Information = OpenPacket.Information; - IoStatusBlock->Status = OpenPacket.FinalStatus; + IoStatusBlock->Information = OpenPacket->Information; + IoStatusBlock->Status = OpenPacket->FinalStatus; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -1911,39 +2022,40 @@ _SEH2_END; } } - else if ((OpenPacket.FileObject) && (OpenPacket.ParseCheck != 1)) + else if ((OpenPacket->FileObject) && (OpenPacket->ParseCheck != 1)) { /* * This can happen in the very bizarre case where the parse routine * actually executed more then once (due to a reparse) and ended * up failing after already having created the File Object. */ - if (OpenPacket.FileObject->FileName.Length) + if (OpenPacket->FileObject->FileName.Length) { /* It had a name, free it */ - ExFreePoolWithTag(OpenPacket.FileObject->FileName.Buffer, TAG_IO_NAME); + ExFreePoolWithTag(OpenPacket->FileObject->FileName.Buffer, TAG_IO_NAME); } /* Clear the device object to invalidate the FO, and dereference */ - OpenPacket.FileObject->DeviceObject = NULL; - ObDereferenceObject(OpenPacket.FileObject); + OpenPacket->FileObject->DeviceObject = NULL; + ObDereferenceObject(OpenPacket->FileObject); } } else { /* We reached success and have a valid file handle */ - OpenPacket.FileObject->Flags |= FO_HANDLE_CREATED; + OpenPacket->FileObject->Flags |= FO_HANDLE_CREATED; + ASSERT(OpenPacket->FileObject->Type == IO_TYPE_FILE); /* Enter SEH for write back */ _SEH2_TRY { /* Write back the handle and I/O Status */ *FileHandle = LocalHandle; - IoStatusBlock->Information = OpenPacket.Information; - IoStatusBlock->Status = OpenPacket.FinalStatus; + IoStatusBlock->Information = OpenPacket->Information; + IoStatusBlock->Status = OpenPacket->FinalStatus; /* Get the Io status */ - Status = OpenPacket.FinalStatus; + Status = OpenPacket->FinalStatus; } _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) { @@ -1954,13 +2066,14 @@ } /* Check if we were 100% successful */ - if ((OpenPacket.ParseCheck == TRUE) && (OpenPacket.FileObject)) + if ((OpenPacket->ParseCheck == TRUE) && (OpenPacket->FileObject)) { /* Dereference the File Object */ - ObDereferenceObject(OpenPacket.FileObject); + ObDereferenceObject(OpenPacket->FileObject); } /* Return status */ + ExFreePool(OpenPacket); return Status; } @@ -2190,7 +2303,7 @@ OUT PFILE_NETWORK_OPEN_INFORMATION Buffer) { NTSTATUS Status; - DUMMY_FILE_OBJECT DummyFileObject; + DUMMY_FILE_OBJECT LocalFileObject; HANDLE Handle; OPEN_PACKET OpenPacket; PAGED_CODE(); @@ -2207,7 +2320,7 @@ OpenPacket.NetworkInformation = Buffer; OpenPacket.QueryOnly = TRUE; OpenPacket.FullAttributes = TRUE; - OpenPacket.DummyFileObject = &DummyFileObject; + OpenPacket.LocalFileObject = &LocalFileObject; /* * Attempt opening the file. This will call the I/O Parse Routine for @@ -3000,7 +3113,7 @@ NtDeleteFile(IN POBJECT_ATTRIBUTES ObjectAttributes) { NTSTATUS Status; - DUMMY_FILE_OBJECT DummyFileObject; + DUMMY_FILE_OBJECT LocalFileObject; HANDLE Handle; KPROCESSOR_MODE AccessMode = KeGetPreviousMode(); OPEN_PACKET OpenPacket; @@ -3017,7 +3130,7 @@ FILE_SHARE_DELETE; OpenPacket.Disposition = FILE_OPEN; OpenPacket.DeleteOnly = TRUE; - OpenPacket.DummyFileObject = &DummyFileObject; + OpenPacket.LocalFileObject = &LocalFileObject; /* Update the operation counts */ IopUpdateOperationCount(IopOtherTransfer);

1 0

[tfaber] 60037: [FRAMEDYN] - Fix MSVC build - Fix some name mangling issues - Add stub libraries to make the dll actually usable. The GCC alias library is still broken though.
by tfaber＠svn.reactos.org 11 Sep '13

11 Sep '13

Author: tfaber Date: Wed Sep 11 18:36:27 2013 New Revision: 60037 URL: http://svn.reactos.org/svn/reactos?rev=60037&view=rev Log: [FRAMEDYN] - Fix MSVC build - Fix some name mangling issues - Add stub libraries to make the dll actually usable. The GCC alias library is still broken though. Added: trunk/reactos/dll/win32/framedyn/alias_gcc.s (with props) trunk/reactos/dll/win32/framedyn/alias_msvc.s (with props) Modified: trunk/reactos/dll/win32/framedyn/CMakeLists.txt trunk/reactos/dll/win32/framedyn/chstring.cpp trunk/reactos/dll/win32/framedyn/framedyn_gcc.spec trunk/reactos/dll/win32/framedyn/framedyn_msvc.spec trunk/reactos/include/psdk/chstring.h Modified: trunk/reactos/dll/win32/framedyn/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/CMakeLi… ============================================================================== --- trunk/reactos/dll/win32/framedyn/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/CMakeLists.txt [iso-8859-1] Wed Sep 11 18:36:27 2013 @@ -1,16 +1,32 @@ -set_cpp(WITH_RUNTIME) -list(APPEND SOURCE main.c chstring.cpp) +set_cpp(WITH_RUNTIME WITH_EXCEPTIONS) + +if(NOT MSVC) + spec2def(framedyn.dll framedyn_gcc.spec ADD_IMPORTLIB) +else() + spec2def(framedyn.dll framedyn_msvc.spec ADD_IMPORTLIB) +endif() + +list(APPEND SOURCE + main.c + chstring.cpp + ${CMAKE_CURRENT_BINARY_DIR}/framedyn.def) + add_library(framedyn SHARED ${SOURCE}) set_module_type(framedyn win32dll UNICODE) add_importlibs(framedyn oleaut32 msvcrt kernel32 ntdll) if(NOT MSVC) # FIXME: http://www.cmake.org/Bug/view.php?id=12998 - #add_target_compile_flags(framedyn "-fexceptions -Wno-deprecated-declarations") - set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-fexceptions -Wno-deprecated-declarations") - spec2def(framedyn.dll framedyn_gcc.spec ADD_IMPORTLIB) - list(APPEND SOURCE ${CMAKE_CURRENT_BINARY_DIR}/framedyn.def) + #add_target_compile_flags(framedyn "-Wno-deprecated-declarations") + set_source_files_properties(${SOURCE} PROPERTIES COMPILE_FLAGS "-Wno-error=deprecated-declarations") endif() add_cd_file(TARGET framedyn DESTINATION reactos/system32/wbem FOR all) + +if(MSVC) + add_asm_files(framedynex_asm alias_msvc.s) +else() + add_asm_files(framedynex_asm alias_gcc.s) +endif() +add_library(framedynex ${framedynex_asm}) Added: trunk/reactos/dll/win32/framedyn/alias_gcc.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/alias_g… ============================================================================== --- trunk/reactos/dll/win32/framedyn/alias_gcc.s (added) +++ trunk/reactos/dll/win32/framedyn/alias_gcc.s [iso-8859-1] Wed Sep 11 18:36:27 2013 @@ -0,0 +1,92 @@ +#include <asm.inc> + +.code64 +.align 4 + +MACRO(DEFINE_ALIAS, alias, alias2, origstring) +PUBLIC alias +.weakref alias2, origstring +alias: + jmp alias2 +ENDM + +#define DEFINE_ALIAS(alias, orig) DEFINE_ALIAS alias, __wrap_ ## alias, #orig + +DEFINE_ALIAS(__ZN8CHString16AllocBeforeWriteEi, ?AllocBeforeWrite@CHString@@IAEXH@Z) +DEFINE_ALIAS(__ZN8CHString11AllocBufferEi, ?AllocBuffer@CHString@@IAEXH@Z) +DEFINE_ALIAS(__ZNK8CHString9AllocCopyERS_iii, ?AllocCopy@CHString@@IBEXAAV1@HHH@Z) +DEFINE_ALIAS(__ZNK8CHString14AllocSysStringEv, ?AllocSysString@CHString@@QBEPAGXZ) +DEFINE_ALIAS(__ZN8CHString10AssignCopyEiPKw, ?AssignCopy@CHString@@IAEXHPBG@Z) +DEFINE_ALIAS(__ZN8CHStringC1ERKS_, ??0CHString@@QAE@ABV0@@Z) +DEFINE_ALIAS(__ZN8CHStringC1EPKc, ??0CHString@@QAE@PBD@Z) +DEFINE_ALIAS(__ZN8CHStringC1EPKh, ??0CHString@@QAE@PBE@Z) +DEFINE_ALIAS(__ZN8CHStringC1EPKw, ??0CHString@@QAE@PBG@Z) +DEFINE_ALIAS(__ZN8CHStringC1EPKwi, ??0CHString@@QAE@PBGH@Z) +DEFINE_ALIAS(__ZN8CHStringC1Ewi, ??0CHString@@QAE@GH@Z) +DEFINE_ALIAS(__ZN8CHStringC1Ev, ??0CHString@@QAE@XZ) +DEFINE_ALIAS(__ZNK8CHString7CollateEPKw, ?Collate@CHString@@QBEHPBG@Z) +DEFINE_ALIAS(__ZNK8CHString7CompareEPKw, ?Compare@CHString@@QBEHPBG@Z) +DEFINE_ALIAS(__ZNK8CHString13CompareNoCaseEPKw, ?CompareNoCase@CHString@@QBEHPBG@Z) +DEFINE_ALIAS(__ZN8CHString10ConcatCopyEiPKwiS1_, ?ConcatCopy@CHString@@IAEXHPBGH0@Z) +DEFINE_ALIAS(__ZN8CHString13ConcatInPlaceEiPKw, ?ConcatInPlace@CHString@@IAEXHPBG@Z) +DEFINE_ALIAS(__ZN8CHString15CopyBeforeWriteEv, ?CopyBeforeWrite@CHString@@IAEXXZ) +DEFINE_ALIAS(__ZN8CHString5EmptyEv, ?Empty@CHString@@QAEXXZ) +DEFINE_ALIAS(__ZNK8CHString4FindEPKw, ?Find@CHString@@QBEHPBG@Z) +DEFINE_ALIAS(__ZNK8CHString4FindEw, ?Find@CHString@@QBEHG@Z) +DEFINE_ALIAS(__ZNK8CHString9FindOneOfEPKw, ?FindOneOf@CHString@@QBEHPBG@Z) +DEFINE_ALIAS(__ZN8CHString6FormatEjz, ?Format@CHString@@QAAXIZZ) +DEFINE_ALIAS(__ZN8CHString6FormatEPKwz, ?Format@CHString@@QAAXPBGZZ) +DEFINE_ALIAS(__ZN8CHString14FormatMessageWEjz, ?FormatMessageW@CHString@@QAAXIZZ) +DEFINE_ALIAS(__ZN8CHString14FormatMessageWEPKwz, ?FormatMessageW@CHString@@QAAXPBGZZ) +DEFINE_ALIAS(__ZN8CHString7FormatVEPKwPc, ?FormatV@CHString@@QAEXPBGPAD@Z) +DEFINE_ALIAS(__ZN8CHString9FreeExtraEv, ?FreeExtra@CHString@@QAEXXZ) +DEFINE_ALIAS(__ZNK8CHString14GetAllocLengthEv, ?GetAllocLength@CHString@@QBEHXZ) +DEFINE_ALIAS(__ZNK8CHString5GetAtEi, ?GetAt@CHString@@QBEGH@Z) +DEFINE_ALIAS(__ZN8CHString9GetBufferEi, ?GetBuffer@CHString@@QAEPAGH@Z) +DEFINE_ALIAS(__ZN8CHString18GetBufferSetLengthEi, ?GetBufferSetLength@CHString@@QAEPAGH@Z) +DEFINE_ALIAS(__ZNK8CHString7GetDataEv, ?GetData@CHString@@IBEPAUCHStringData@@XZ) +DEFINE_ALIAS(__ZNK8CHString9GetLengthEv, ?GetLength@CHString@@QBEHXZ) +DEFINE_ALIAS(__ZN8CHString4InitEv, ?Init@CHString@@IAEXXZ) +DEFINE_ALIAS(__ZNK8CHString7IsEmptyEv, ?IsEmpty@CHString@@QBEHXZ) +DEFINE_ALIAS(__ZNK8CHString4LeftEi, ?Left@CHString@@QBE?AV1@H@Z) +DEFINE_ALIAS(__ZN8CHString11LoadStringWEj, ?LoadStringW@CHString@@QAEHI@Z) +DEFINE_ALIAS(__ZN8CHString11LoadStringWEjPwj, ?LoadStringW@CHString@@IAEHIPAGI@Z) +DEFINE_ALIAS(__ZN8CHString10LockBufferEv, ?LockBuffer@CHString@@QAEPAGXZ) +DEFINE_ALIAS(__ZN8CHString9MakeLowerEv, ?MakeLower@CHString@@QAEXXZ) +DEFINE_ALIAS(__ZN8CHString11MakeReverseEv, ?MakeReverse@CHString@@QAEXXZ) +DEFINE_ALIAS(__ZN8CHString9MakeUpperEv, ?MakeUpper@CHString@@QAEXXZ) +DEFINE_ALIAS(__ZNK8CHString3MidEi, ?Mid@CHString@@QBE?AV1@H@Z) +DEFINE_ALIAS(__ZNK8CHString3MidEii, ?Mid@CHString@@QBE?AV1@HH@Z) +DEFINE_ALIAS(__ZN8CHString7ReleaseEP12CHStringData@4, ?Release@CHString@@KGXPAUCHStringData@@@Z) +DEFINE_ALIAS(__ZN8CHString7ReleaseEv, ?Release@CHString@@IAEXXZ) +DEFINE_ALIAS(__ZN8CHString13ReleaseBufferEi, ?ReleaseBuffer@CHString@@QAEXH@Z) +DEFINE_ALIAS(__ZNK8CHString11ReverseFindEw, ?ReverseFind@CHString@@QBEHG@Z) +DEFINE_ALIAS(__ZNK8CHString5RightEi, ?Right@CHString@@QBE?AV1@H@Z) +DEFINE_ALIAS(__ZN8CHString10SafeStrlenEPKw, ?SafeStrlen@CHString@@KGHPBG@Z) +DEFINE_ALIAS(__ZN8CHString5SetAtEiw, ?SetAt@CHString@@QAEXHG@Z) +DEFINE_ALIAS(__ZNK8CHString13SpanExcludingEPKw, ?SpanExcluding@CHString@@QBE?AV1@PBG@Z) +DEFINE_ALIAS(__ZNK8CHString13SpanIncludingEPKw, ?SpanIncluding@CHString@@QBE?AV1@PBG@Z) +DEFINE_ALIAS(__ZN8CHString8TrimLeftEv, ?TrimLeft@CHString@@QAEXXZ) +DEFINE_ALIAS(__ZN8CHString9TrimRightEv, ?TrimRight@CHString@@QAEXXZ) +DEFINE_ALIAS(__ZN8CHString12UnlockBufferEv, ?UnlockBuffer@CHString@@QAEXXZ) +DEFINE_ALIAS(__ZNK8CHStringcvPKwEv, ??BCHString@@QBEPBGXZ) +DEFINE_ALIAS(__ZN8CHStringpLERKS_, ??YCHString@@QAEABV0@ABV0@@Z) +DEFINE_ALIAS(__ZN8CHStringpLEc, ??YCHString@@QAEABV0@D@Z) +DEFINE_ALIAS(__ZN8CHStringpLEPKw, ??YCHString@@QAEABV0@PBG@Z) +DEFINE_ALIAS(__ZN8CHStringpLEw, ??YCHString@@QAEABV0@G@Z) +DEFINE_ALIAS(__ZN8CHStringaSEPS_, ??4CHString@@QAEABV0@PAV0@@Z) +DEFINE_ALIAS(__ZN8CHStringaSERKS_, ??4CHString@@QAEABV0@ABV0@@Z) +DEFINE_ALIAS(__ZN8CHStringaSEPKc, ??4CHString@@QAEABV0@PBD@Z) +DEFINE_ALIAS(__ZN8CHStringaSEc, ??4CHString@@QAEABV0@D@Z) +DEFINE_ALIAS(__ZN8CHStringaSEPKh, ??4CHString@@QAEABV0@PBE@Z) +DEFINE_ALIAS(__ZN8CHStringaSEPKw, ??4CHString@@QAEABV0@PBG@Z) +DEFINE_ALIAS(__ZN8CHStringaSEw, ??4CHString@@QAEABV0@G@Z) +DEFINE_ALIAS(__ZNK8CHStringixEi, ??ACHString@@QBEGH@Z) +DEFINE_ALIAS(__ZN8CHStringD1Ev, ??1CHString@@QAE@XZ) +DEFINE_ALIAS(__ZplwRK8CHString, ??H@YG?AVCHString@@GABV0@@Z) +DEFINE_ALIAS(__ZplRK8CHStringw, ??H@YG?AVCHString@@ABV0@G@Z) +DEFINE_ALIAS(__ZplRK8CHStringPKw, ??H@YG?AVCHString@@ABV0@PBG@Z) +DEFINE_ALIAS(__ZplPKwRK8CHString, ??H@YG?AVCHString@@PBGABV0@@Z) +DEFINE_ALIAS(__ZplRK8CHStringS1_, ??H@YG?AVCHString@@ABV0@0@Z) + +END Propchange: trunk/reactos/dll/win32/framedyn/alias_gcc.s ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/dll/win32/framedyn/alias_msvc.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/alias_m… ============================================================================== --- trunk/reactos/dll/win32/framedyn/alias_msvc.s (added) +++ trunk/reactos/dll/win32/framedyn/alias_msvc.s [iso-8859-1] Wed Sep 11 18:36:27 2013 @@ -0,0 +1,48 @@ +#include <asm.inc> + +.code64 +.align 4 + +MACRO(DEFINE_ALIAS, alias, orig) +EXTERN &orig:ABS +ALIAS <&alias> = <&orig> +ENDM + +DEFINE_ALIAS ?AllocSysString@CHString@@QBEPA_WXZ, ?AllocSysString@CHString@@QBEPAGXZ +DEFINE_ALIAS ?AssignCopy@CHString@@IAEXHPB_W@Z, ?AssignCopy@CHString@@IAEXHPBG@Z +DEFINE_ALIAS ??0CHString@@QAE@PB_W@Z, ??0CHString@@QAE@PBG@Z +DEFINE_ALIAS ??0CHString@@QAE@PB_WH@Z, ??0CHString@@QAE@PBGH@Z +DEFINE_ALIAS ??0CHString@@QAE@_WH@Z, ??0CHString@@QAE@GH@Z +DEFINE_ALIAS ?Collate@CHString@@QBEHPB_W@Z, ?Collate@CHString@@QBEHPBG@Z +DEFINE_ALIAS ?Compare@CHString@@QBEHPB_W@Z, ?Compare@CHString@@QBEHPBG@Z +DEFINE_ALIAS ?CompareNoCase@CHString@@QBEHPB_W@Z, ?CompareNoCase@CHString@@QBEHPBG@Z +DEFINE_ALIAS ?ConcatCopy@CHString@@IAEXHPB_WH0@Z, ?ConcatCopy@CHString@@IAEXHPBGH0@Z +DEFINE_ALIAS ?ConcatInPlace@CHString@@IAEXHPB_W@Z, ?ConcatInPlace@CHString@@IAEXHPBG@Z +DEFINE_ALIAS ?Find@CHString@@QBEHPB_W@Z, ?Find@CHString@@QBEHPBG@Z +DEFINE_ALIAS ?Find@CHString@@QBEH_W@Z, ?Find@CHString@@QBEHG@Z +DEFINE_ALIAS ?FindOneOf@CHString@@QBEHPB_W@Z, ?FindOneOf@CHString@@QBEHPBG@Z +DEFINE_ALIAS ?Format@CHString@@QAAXPB_WZZ, ?Format@CHString@@QAAXPBGZZ +DEFINE_ALIAS ?FormatMessageW@CHString@@QAAXPB_WZZ, ?FormatMessageW@CHString@@QAAXPBGZZ +DEFINE_ALIAS ?FormatV@CHString@@QAEXPB_WPAD@Z, ?FormatV@CHString@@QAEXPBGPAD@Z +DEFINE_ALIAS ?GetAt@CHString@@QBE_WH@Z, ?GetAt@CHString@@QBEGH@Z +DEFINE_ALIAS ?GetBuffer@CHString@@QAEPA_WH@Z, ?GetBuffer@CHString@@QAEPAGH@Z +DEFINE_ALIAS ?GetBufferSetLength@CHString@@QAEPA_WH@Z, ?GetBufferSetLength@CHString@@QAEPAGH@Z +DEFINE_ALIAS ?LoadStringW@CHString@@IAEHIPA_WI@Z, ?LoadStringW@CHString@@IAEHIPAGI@Z +DEFINE_ALIAS ?LockBuffer@CHString@@QAEPA_WXZ, ?LockBuffer@CHString@@QAEPAGXZ +DEFINE_ALIAS ?ReverseFind@CHString@@QBEH_W@Z, ?ReverseFind@CHString@@QBEHG@Z +DEFINE_ALIAS ?SafeStrlen@CHString@@KGHPB_W@Z, ?SafeStrlen@CHString@@KGHPBG@Z +DEFINE_ALIAS ?SetAt@CHString@@QAEXH_W@Z, ?SetAt@CHString@@QAEXHG@Z +DEFINE_ALIAS ?SpanExcluding@CHString@@QBE?AV1@PB_W@Z, ?SpanExcluding@CHString@@QBE?AV1@PBG@Z +DEFINE_ALIAS ?SpanIncluding@CHString@@QBE?AV1@PB_W@Z, ?SpanIncluding@CHString@@QBE?AV1@PBG@Z +DEFINE_ALIAS ??BCHString@@QBEPB_WXZ, ??BCHString@@QBEPBGXZ +DEFINE_ALIAS ??YCHString@@QAEABV0@PB_W@Z, ??YCHString@@QAEABV0@PBG@Z +DEFINE_ALIAS ??YCHString@@QAEABV0@_W@Z, ??YCHString@@QAEABV0@G@Z +DEFINE_ALIAS ??4CHString@@QAEABV0@PB_W@Z, ??4CHString@@QAEABV0@PBG@Z +DEFINE_ALIAS ??4CHString@@QAEABV0@_W@Z, ??4CHString@@QAEABV0@G@Z +DEFINE_ALIAS ??ACHString@@QBE_WH@Z, ??ACHString@@QBEGH@Z +DEFINE_ALIAS ??H@YG?AVCHString@@_WABV0@@Z, ??H@YG?AVCHString@@GABV0@@Z +DEFINE_ALIAS ??H@YG?AVCHString@@ABV0@_W@Z, ??H@YG?AVCHString@@ABV0@G@Z +DEFINE_ALIAS ??H@YG?AVCHString@@ABV0@PB_W@Z, ??H@YG?AVCHString@@ABV0@PBG@Z +DEFINE_ALIAS ??H@YG?AVCHString@@PB_WABV0@@Z, ??H@YG?AVCHString@@PBGABV0@@Z + +END Propchange: trunk/reactos/dll/win32/framedyn/alias_msvc.s ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/reactos/dll/win32/framedyn/chstring.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/chstrin… ============================================================================== --- trunk/reactos/dll/win32/framedyn/chstring.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/chstring.cpp [iso-8859-1] Wed Sep 11 18:36:27 2013 @@ -940,7 +940,7 @@ /* * @implemented */ -void CHString::Release(CHStringData* pData) +void WINAPI CHString::Release(CHStringData* pData) { // If empty string, ignore if (pData == &afxNullData) Modified: trunk/reactos/dll/win32/framedyn/framedyn_gcc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/framedy… ============================================================================== --- trunk/reactos/dll/win32/framedyn/framedyn_gcc.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/framedyn_gcc.spec [iso-8859-1] Wed Sep 11 18:36:27 2013 @@ -3,13 +3,13 @@ @ thiscall ?AllocCopy@CHString@@IBEXAAV1@HHH@Z(ptr long long long) _ZNK8CHString9AllocCopyERS_iii @ thiscall ?AllocSysString@CHString@@QBEPAGXZ() _ZNK8CHString14AllocSysStringEv @ thiscall ?AssignCopy@CHString@@IAEXHPBG@Z(long wstr) _ZN8CHString10AssignCopyEiPKw -@ thiscall ??0CHString@@QAE@ABV0@@Z(ptr) _ZN8CHStringC2ERKS_ -@ thiscall ??0CHString@@QAE@PBD@Z(str) _ZN8CHStringC2EPKc -@ thiscall ??0CHString@@QAE@PBE@Z(str) _ZN8CHStringC2EPKh -@ thiscall ??0CHString@@QAE@PBG@Z(wstr) _ZN8CHStringC2EPKw -@ thiscall ??0CHString@@QAE@PBGH@Z(wstr long) _ZN8CHStringC2EPKwi -@ thiscall ??0CHString@@QAE@GH@Z(long long) _ZN8CHStringC2Ewi -@ thiscall ??0CHString@@QAE@XZ() _ZN8CHStringC2Ev +@ thiscall ??0CHString@@QAE@ABV0@@Z(ptr) _ZN8CHStringC1ERKS_ +@ thiscall ??0CHString@@QAE@PBD@Z(str) _ZN8CHStringC1EPKc +@ thiscall ??0CHString@@QAE@PBE@Z(str) _ZN8CHStringC1EPKh +@ thiscall ??0CHString@@QAE@PBG@Z(wstr) _ZN8CHStringC1EPKw +@ thiscall ??0CHString@@QAE@PBGH@Z(wstr long) _ZN8CHStringC1EPKwi +@ thiscall ??0CHString@@QAE@GH@Z(long long) _ZN8CHStringC1Ewi +@ thiscall ??0CHString@@QAE@XZ() _ZN8CHStringC1Ev @ thiscall ?Collate@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString7CollateEPKw @ thiscall ?Compare@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString7CompareEPKw @ thiscall ?CompareNoCase@CHString@@QBEHPBG@Z(wstr) _ZNK8CHString13CompareNoCaseEPKw @@ -43,7 +43,7 @@ @ thiscall ?MakeUpper@CHString@@QAEXXZ() _ZN8CHString9MakeUpperEv @ thiscall ?Mid@CHString@@QBE?AV1@H@Z(long) _ZNK8CHString3MidEi @ thiscall ?Mid@CHString@@QBE?AV1@HH@Z(long long) _ZNK8CHString3MidEii -@ thiscall ?Release@CHString@@KGXPAUCHStringData@@@Z(ptr) _ZN8CHString7ReleaseEP12CHStringData +@ thiscall ?Release@CHString@@KGXPAUCHStringData@@@Z(ptr) _ZN8CHString7ReleaseEP12CHStringData@4 @ thiscall ?Release@CHString@@IAEXXZ() _ZN8CHString7ReleaseEv @ thiscall ?ReleaseBuffer@CHString@@QAEXH@Z(long) _ZN8CHString13ReleaseBufferEi @ thiscall ?ReverseFind@CHString@@QBEHG@Z(long) _ZNK8CHString11ReverseFindEw @@ -55,7 +55,7 @@ @ thiscall ?TrimLeft@CHString@@QAEXXZ() _ZN8CHString8TrimLeftEv @ thiscall ?TrimRight@CHString@@QAEXXZ() _ZN8CHString9TrimRightEv @ thiscall ?UnlockBuffer@CHString@@QAEXXZ() _ZN8CHString12UnlockBufferEv -@ thiscall ??BCHString@@QBEPBGXZ(ptr) _ZN8CHStringcvPwEv +@ thiscall ??BCHString@@QBEPBGXZ(ptr) _ZNK8CHStringcvPKwEv @ thiscall ??YCHString@@QAEABV0@ABV0@@Z(ptr) _ZN8CHStringpLERKS_ @ thiscall ??YCHString@@QAEABV0@D@Z(long) _ZN8CHStringpLEc @ thiscall ??YCHString@@QAEABV0@PBG@Z(wstr) _ZN8CHStringpLEPKw @@ -68,7 +68,7 @@ @ thiscall ??4CHString@@QAEABV0@PBG@Z(wstr) _ZN8CHStringaSEPKw @ thiscall ??4CHString@@QAEABV0@G@Z(long) _ZN8CHStringaSEw @ thiscall ??ACHString@@QBEGH@Z(long) _ZNK8CHStringixEi -@ thiscall ??1CHString@@QAE@XZ() _ZN8CHStringD2Ev +@ thiscall ??1CHString@@QAE@XZ() _ZN8CHStringD1Ev @ stdcall ??H@YG?AVCHString@@GABV0@@Z(long ptr) _ZplwRK8CHString @ stdcall ??H@YG?AVCHString@@ABV0@G@Z(ptr long) _ZplRK8CHStringw @ stdcall ??H@YG?AVCHString@@ABV0@PBG@Z(ptr wstr) _ZplRK8CHStringPKw Modified: trunk/reactos/dll/win32/framedyn/framedyn_msvc.spec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/framedyn/framedy… ============================================================================== --- trunk/reactos/dll/win32/framedyn/framedyn_msvc.spec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/framedyn/framedyn_msvc.spec [iso-8859-1] Wed Sep 11 18:36:27 2013 @@ -1,76 +1,76 @@ @ thiscall ?AllocBeforeWrite@CHString@@IAEXH@Z(long) @ thiscall ?AllocBuffer@CHString@@IAEXH@Z(long) @ thiscall ?AllocCopy@CHString@@IBEXAAV1@HHH@Z(ptr long long long) -#@ thiscall ?AllocSysString@CHString@@QBEPAGXZ() -#@ thiscall ?AssignCopy@CHString@@IAEXHPBG@Z(long wstr) +@ thiscall ?AllocSysString@CHString@@QBEPAGXZ() ?AllocSysString@CHString@@QBEPA_WXZ +@ thiscall ?AssignCopy@CHString@@IAEXHPBG@Z(long wstr) ?AssignCopy@CHString@@IAEXHPB_W@Z @ thiscall ??0CHString@@QAE@ABV0@@Z(ptr) @ thiscall ??0CHString@@QAE@PBD@Z(str) @ thiscall ??0CHString@@QAE@PBE@Z(str) -#@ thiscall ??0CHString@@QAE@PBG@Z(wstr) -#@ thiscall ??0CHString@@QAE@PBGH@Z(wstr long) -#@ thiscall ??0CHString@@QAE@GH@Z(long long) +@ thiscall ??0CHString@@QAE@PBG@Z(wstr) ??0CHString@@QAE@PB_W@Z +@ thiscall ??0CHString@@QAE@PBGH@Z(wstr long) ??0CHString@@QAE@PB_WH@Z +@ thiscall ??0CHString@@QAE@GH@Z(long long) ??0CHString@@QAE@_WH@Z @ thiscall ??0CHString@@QAE@XZ() -#@ thiscall ?Collate@CHString@@QBEHPBG@Z(wstr) -#@ thiscall ?Compare@CHString@@QBEHPBG@Z(wstr) -#@ thiscall ?CompareNoCase@CHString@@QBEHPBG@Z(wstr) -#@ thiscall ?ConcatCopy@CHString@@IAEXHPBGH0@Z(long wstr long wstr) -#@ thiscall ?ConcatInPlace@CHString@@IAEXHPBG@Z(long wstr) +@ thiscall ?Collate@CHString@@QBEHPBG@Z(wstr) ?Collate@CHString@@QBEHPB_W@Z +@ thiscall ?Compare@CHString@@QBEHPBG@Z(wstr) ?Compare@CHString@@QBEHPB_W@Z +@ thiscall ?CompareNoCase@CHString@@QBEHPBG@Z(wstr) ?CompareNoCase@CHString@@QBEHPB_W@Z +@ thiscall ?ConcatCopy@CHString@@IAEXHPBGH0@Z(long wstr long wstr) ?ConcatCopy@CHString@@IAEXHPB_WH0@Z +@ thiscall ?ConcatInPlace@CHString@@IAEXHPBG@Z(long wstr) ?ConcatInPlace@CHString@@IAEXHPB_W@Z @ thiscall ?CopyBeforeWrite@CHString@@IAEXXZ() @ thiscall ?Empty@CHString@@QAEXXZ() -#@ thiscall ?Find@CHString@@QBEHPBG@Z(wstr) -#@ thiscall ?Find@CHString@@QBEHG@Z(long) -#@ thiscall ?FindOneOf@CHString@@QBEHPBG@Z(wstr) +@ thiscall ?Find@CHString@@QBEHPBG@Z(wstr) ?Find@CHString@@QBEHPB_W@Z +@ thiscall ?Find@CHString@@QBEHG@Z(long) ?Find@CHString@@QBEH_W@Z +@ thiscall ?FindOneOf@CHString@@QBEHPBG@Z(wstr) ?FindOneOf@CHString@@QBEHPB_W@Z @ thiscall ?Format@CHString@@QAAXIZZ(long long long) -#@ thiscall ?Format@CHString@@QAAXPBGZZ(long wstr long) +@ thiscall ?Format@CHString@@QAAXPBGZZ(long wstr long) ?Format@CHString@@QAAXPB_WZZ @ thiscall ?FormatMessageW@CHString@@QAAXIZZ(long long long) -#@ thiscall ?FormatMessageW@CHString@@QAAXPBGZZ(long ptr long) -#@ thiscall ?FormatV@CHString@@QAEXPBGPAD@Z(wstr long) +@ thiscall ?FormatMessageW@CHString@@QAAXPBGZZ(long ptr long) ?FormatMessageW@CHString@@QAAXPB_WZZ +@ thiscall ?FormatV@CHString@@QAEXPBGPAD@Z(wstr long) ?FormatV@CHString@@QAEXPB_WPAD@Z @ thiscall ?FreeExtra@CHString@@QAEXXZ() @ thiscall ?GetAllocLength@CHString@@QBEHXZ() -#@ thiscall ?GetAt@CHString@@QBEGH@Z(long) -#@ thiscall ?GetBuffer@CHString@@QAEPAGH@Z(long) -#@ thiscall ?GetBufferSetLength@CHString@@QAEPAGH@Z(long) +@ thiscall ?GetAt@CHString@@QBEGH@Z(long) ?GetAt@CHString@@QBE_WH@Z +@ thiscall ?GetBuffer@CHString@@QAEPAGH@Z(long) ?GetBuffer@CHString@@QAEPA_WH@Z +@ thiscall ?GetBufferSetLength@CHString@@QAEPAGH@Z(long) ?GetBufferSetLength@CHString@@QAEPA_WH@Z @ thiscall ?GetData@CHString@@IBEPAUCHStringData@@XZ() @ thiscall ?GetLength@CHString@@QBEHXZ() @ thiscall ?Init@CHString@@IAEXXZ() @ thiscall ?IsEmpty@CHString@@QBEHXZ() @ thiscall ?Left@CHString@@QBE?AV1@H@Z(long) -#@ thiscall ?LoadStringW@CHString@@QAEHI@Z(long) -#@ thiscall ?LoadStringW@CHString@@IAEHIPAGI@Z(long wstr long) -#@ thiscall ?LockBuffer@CHString@@QAEPAGXZ() +@ thiscall ?LoadStringW@CHString@@QAEHI@Z(long) +@ thiscall ?LoadStringW@CHString@@IAEHIPAGI@Z(long wstr long) ?LoadStringW@CHString@@IAEHIPA_WI@Z +@ thiscall ?LockBuffer@CHString@@QAEPAGXZ() ?LockBuffer@CHString@@QAEPA_WXZ @ thiscall ?MakeLower@CHString@@QAEXXZ() @ thiscall ?MakeReverse@CHString@@QAEXXZ() @ thiscall ?MakeUpper@CHString@@QAEXXZ() @ thiscall ?Mid@CHString@@QBE?AV1@H@Z(long) @ thiscall ?Mid@CHString@@QBE?AV1@HH@Z(long long) @ thiscall ?Release@CHString@@KGXPAUCHStringData@@@Z(ptr) -#@ thiscall ?Release@CHString@@IAEXXZ() -#@ thiscall ?ReleaseBuffer@CHString@@QAEXH@Z(long) -#@ thiscall ?ReverseFind@CHString@@QBEHG@Z(long) +@ thiscall ?Release@CHString@@IAEXXZ() +@ thiscall ?ReleaseBuffer@CHString@@QAEXH@Z(long) +@ thiscall ?ReverseFind@CHString@@QBEHG@Z(long) ?ReverseFind@CHString@@QBEH_W@Z @ thiscall ?Right@CHString@@QBE?AV1@H@Z(long) -#@ stdcall ?SafeStrlen@CHString@@KGHPBG@Z(wstr) -#@ thiscall ?SetAt@CHString@@QAEXHG@Z(long long) -#@ thiscall ?SpanExcluding@CHString@@QBE?AV1@PBG@Z(long wstr) -#@ thiscall ?SpanIncluding@CHString@@QBE?AV1@PBG@Z(long wstr) +@ stdcall ?SafeStrlen@CHString@@KGHPBG@Z(wstr) ?SafeStrlen@CHString@@KGHPB_W@Z +@ thiscall ?SetAt@CHString@@QAEXHG@Z(long long) ?SetAt@CHString@@QAEXH_W@Z +@ thiscall ?SpanExcluding@CHString@@QBE?AV1@PBG@Z(long wstr) ?SpanExcluding@CHString@@QBE?AV1@PB_W@Z +@ thiscall ?SpanIncluding@CHString@@QBE?AV1@PBG@Z(long wstr) ?SpanIncluding@CHString@@QBE?AV1@PB_W@Z @ thiscall ?TrimLeft@CHString@@QAEXXZ() @ thiscall ?TrimRight@CHString@@QAEXXZ() @ thiscall ?UnlockBuffer@CHString@@QAEXXZ() -#@ thiscall ??BCHString@@QBEPBGXZ(ptr) +@ thiscall ??BCHString@@QBEPBGXZ(ptr) ??BCHString@@QBEPB_WXZ @ thiscall ??YCHString@@QAEABV0@ABV0@@Z(ptr) @ thiscall ??YCHString@@QAEABV0@D@Z(long) -#@ thiscall ??YCHString@@QAEABV0@PBG@Z(wstr) -#@ thiscall ??YCHString@@QAEABV0@G@Z(long) +@ thiscall ??YCHString@@QAEABV0@PBG@Z(wstr) ??YCHString@@QAEABV0@PB_W@Z +@ thiscall ??YCHString@@QAEABV0@G@Z(long) ??YCHString@@QAEABV0@_W@Z @ thiscall ??4CHString@@QAEABV0@PAV0@@Z(ptr) @ thiscall ??4CHString@@QAEABV0@ABV0@@Z(ptr) @ thiscall ??4CHString@@QAEABV0@PBD@Z(str) @ thiscall ??4CHString@@QAEABV0@D@Z(long) @ thiscall ??4CHString@@QAEABV0@PBE@Z(str) -#@ thiscall ??4CHString@@QAEABV0@PBG@Z(wstr) -#@ thiscall ??4CHString@@QAEABV0@G@Z(long) -@ thiscall ??ACHString@@QBEGH@Z(long) +@ thiscall ??4CHString@@QAEABV0@PBG@Z(wstr) ??4CHString@@QAEABV0@PB_W@Z +@ thiscall ??4CHString@@QAEABV0@G@Z(long) ??4CHString@@QAEABV0@_W@Z +@ thiscall ??ACHString@@QBEGH@Z(long) ??ACHString@@QBE_WH@Z @ thiscall ??1CHString@@QAE@XZ() -#@ stdcall ??H@YG?AVCHString@@GABV0@@Z(long ptr) -#@ stdcall ??H@YG?AVCHString@@ABV0@G@Z(ptr long) -#@ stdcall ??H@YG?AVCHString@@ABV0@PBG@Z(ptr wstr) -#@ stdcall ??H@YG?AVCHString@@PBGABV0@@Z(wstr ptr) +@ stdcall ??H@YG?AVCHString@@GABV0@@Z(long ptr) ??H@YG?AVCHString@@_WABV0@@Z +@ stdcall ??H@YG?AVCHString@@ABV0@G@Z(ptr long) ??H@YG?AVCHString@@ABV0@_W@Z +@ stdcall ??H@YG?AVCHString@@ABV0@PBG@Z(ptr wstr) ??H@YG?AVCHString@@ABV0@PB_W@Z +@ stdcall ??H@YG?AVCHString@@PBGABV0@@Z(wstr ptr) ??H@YG?AVCHString@@PB_WABV0@@Z @ stdcall ??H@YG?AVCHString@@ABV0@0@Z(ptr ptr) Modified: trunk/reactos/include/psdk/chstring.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/chstring.h?re… ============================================================================== --- trunk/reactos/include/psdk/chstring.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/chstring.h [iso-8859-1] Wed Sep 11 18:36:27 2013 @@ -14,7 +14,7 @@ WCHAR* data() { - return (WCHAR*)(this+1); + return (WCHAR*)(this+1); } }; @@ -51,14 +51,13 @@ int GetLength() const; BOOL IsEmpty() const; CHString Left(int nCount) const throw (CHeap_Exception); + int LoadStringW(UINT nID) throw (CHeap_Exception); LPWSTR LockBuffer(); void MakeLower() throw (CHeap_Exception); void MakeReverse() throw (CHeap_Exception); void MakeUpper() throw (CHeap_Exception); CHString Mid(int nFirst) const throw (CHeap_Exception); CHString Mid(int nFirst, int nCount) const throw (CHeap_Exception); - void Release(); - void Release(CHStringData* pData); void ReleaseBuffer(int nNewLength = -1) throw (CHeap_Exception); int ReverseFind(WCHAR ch) const; CHString Right(int nCount) const throw (CHeap_Exception); @@ -104,8 +103,9 @@ void CopyBeforeWrite() throw (CHeap_Exception); CHStringData* GetData() const; void Init(); - int LoadStringW(UINT nID) throw (CHeap_Exception); int LoadStringW(UINT nID, LPWSTR lpszBuf, UINT nMaxBuf) throw (CHeap_Exception); + void Release(); + static void WINAPI Release(CHStringData* pData); static int WINAPI SafeStrlen(LPCWSTR lpsz); };

1 0

← Newer
1
...
42
43
44
45
46
47
48
...
56
Older →

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 September 2013