Ros-diffs February 2015

ros-diffs@reactos.org

16 participants
372 discussions

[tfaber] 66207: [NTOS] - Avoid removing list entry if the list is empty in IopUnQueueIrpFromThread CORE-8419

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Feb 8 14:15:45 2015 New Revision: 66207 URL: http://svn.reactos.org/svn/reactos?rev=66207&view=rev Log: [NTOS] - Avoid removing list entry if the list is empty in IopUnQueueIrpFromThread CORE-8419 Modified: trunk/reactos/ntoskrnl/include/internal/io_x.h Modified: trunk/reactos/ntoskrnl/include/internal/io_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io_x.h [iso-8859-1] Sun Feb 8 14:15:45 2015 @@ -51,6 +51,8 @@ IopUnQueueIrpFromThread(IN PIRP Irp) { /* Remove it from the list and reset it */ + if (IsListEmpty(&Irp->ThreadListEntry)) + return; RemoveEntryList(&Irp->ThreadListEntry); InitializeListHead(&Irp->ThreadListEntry); }

9 years, 7 months

[tfaber] 66206: [DDK] - Add list entry security checks equivalent to those in current WDKs. This is useful for ROS because it detects memory corruption very quickly. CORE-8419

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Feb 8 13:22:06 2015 New Revision: 66206 URL: http://svn.reactos.org/svn/reactos?rev=66206&view=rev Log: [DDK] - Add list entry security checks equivalent to those in current WDKs. This is useful for ROS because it detects memory corruption very quickly. CORE-8419 Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/include/xdk/rtlfuncs.h Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=6620… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sun Feb 8 13:22:06 2015 @@ -9617,6 +9617,10 @@ __fastfail(Code); } +#if !defined(NO_KERNEL_LIST_ENTRY_CHECKS) && (defined(_M_CEE_PURE) || defined(_M_CEE_SAFE)) +#define NO_KERNEL_LIST_ENTRY_CHECKS +#endif + #if !defined(MIDL_PASS) && !defined(SORTPP_PASS) #define RTL_STATIC_LIST_HEAD(x) LIST_ENTRY x = { &x, &x } @@ -9640,6 +9644,46 @@ FORCEINLINE BOOLEAN +RemoveEntryListUnsafe( + _In_ PLIST_ENTRY Entry) +{ + PLIST_ENTRY OldFlink; + PLIST_ENTRY OldBlink; + + OldFlink = Entry->Flink; + OldBlink = Entry->Blink; + OldFlink->Blink = OldBlink; + OldBlink->Flink = OldFlink; + return (BOOLEAN)(OldFlink == OldBlink); +} + +#if !defined(NO_KERNEL_LIST_ENTRY_CHECKS) +FORCEINLINE +VOID +FatalListEntryError( + _In_ PVOID P1, + _In_ PVOID P2, + _In_ PVOID P3) +{ + UNREFERENCED_PARAMETER(P1); + UNREFERENCED_PARAMETER(P2); + UNREFERENCED_PARAMETER(P3); + + RtlFailFast(FAST_FAIL_CORRUPT_LIST_ENTRY); +} + +FORCEINLINE +VOID +RtlpCheckListEntry( + _In_ PLIST_ENTRY Entry) +{ + if (Entry->Flink->Blink != Entry || Entry->Blink->Flink != Entry) + FatalListEntryError(Entry->Blink, Entry, Entry->Flink); +} +#endif + +FORCEINLINE +BOOLEAN RemoveEntryList( _In_ PLIST_ENTRY Entry) { @@ -9648,6 +9692,10 @@ OldFlink = Entry->Flink; OldBlink = Entry->Blink; +#if !defined(NO_KERNEL_LIST_ENTRY_CHECKS) + if (OldFlink->Blink != Entry || OldBlink->Flink != Entry) + FatalListEntryError(OldBlink, Entry, OldFlink); +#endif OldFlink->Blink = OldBlink; OldBlink->Flink = OldFlink; return (BOOLEAN)(OldFlink == OldBlink); @@ -9661,8 +9709,15 @@ PLIST_ENTRY Flink; PLIST_ENTRY Entry; +#if !defined(NO_KERNEL_LIST_ENTRY_CHECKS) && DBG + RtlpCheckListEntry(ListHead); +#endif Entry = ListHead->Flink; Flink = Entry->Flink; +#if !defined(NO_KERNEL_LIST_ENTRY_CHECKS) + if (Entry->Blink != ListHead || Flink->Blink != Entry) + FatalListEntryError(ListHead, Entry, Flink); +#endif ListHead->Flink = Flink; Flink->Blink = ListHead; return Entry; @@ -9676,8 +9731,15 @@ PLIST_ENTRY Blink; PLIST_ENTRY Entry; +#if !defined(NO_KERNEL_LIST_ENTRY_CHECKS) && DBG + RtlpCheckListEntry(ListHead); +#endif Entry = ListHead->Blink; Blink = Entry->Blink; +#if !defined(NO_KERNEL_LIST_ENTRY_CHECKS) + if (Blink->Flink != Entry || Entry->Flink != ListHead) + FatalListEntryError(Blink, Entry, ListHead); +#endif ListHead->Blink = Blink; Blink->Flink = ListHead; return Entry; @@ -9690,9 +9752,16 @@ _Inout_ __drv_aliasesMem PLIST_ENTRY Entry) { PLIST_ENTRY OldBlink; +#if !defined(NO_KERNEL_LIST_ENTRY_CHECKS) && DBG + RtlpCheckListEntry(ListHead); +#endif OldBlink = ListHead->Blink; Entry->Flink = ListHead; Entry->Blink = OldBlink; +#if !defined(NO_KERNEL_LIST_ENTRY_CHECKS) + if (OldBlink->Flink != ListHead) + FatalListEntryError(OldBlink->Blink, OldBlink, ListHead); +#endif OldBlink->Flink = Entry; ListHead->Blink = Entry; } @@ -9704,9 +9773,16 @@ _Inout_ __drv_aliasesMem PLIST_ENTRY Entry) { PLIST_ENTRY OldFlink; +#if !defined(NO_KERNEL_LIST_ENTRY_CHECKS) && DBG + RtlpCheckListEntry(ListHead); +#endif OldFlink = ListHead->Flink; Entry->Flink = OldFlink; Entry->Blink = ListHead; +#if !defined(NO_KERNEL_LIST_ENTRY_CHECKS) + if (OldFlink->Blink != ListHead) + FatalListEntryError(ListHead, OldFlink, OldFlink->Flink); +#endif OldFlink->Blink = Entry; ListHead->Flink = Entry; } @@ -9719,6 +9795,10 @@ { PLIST_ENTRY ListEnd = ListHead->Blink; +#if !defined(NO_KERNEL_LIST_ENTRY_CHECKS) + RtlpCheckListEntry(ListHead); + RtlpCheckListEntry(ListToAppend); +#endif ListHead->Blink->Flink = ListToAppend; ListHead->Blink = ListToAppend->Blink; ListToAppend->Blink->Flink = ListHead; Modified: trunk/reactos/include/xdk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/xdk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/rtlfuncs.h [iso-8859-1] Sun Feb 8 13:22:06 2015 @@ -31,6 +31,10 @@ __fastfail(Code); } +#if !defined(NO_KERNEL_LIST_ENTRY_CHECKS) && (defined(_M_CEE_PURE) || defined(_M_CEE_SAFE)) +#define NO_KERNEL_LIST_ENTRY_CHECKS +#endif + #if !defined(MIDL_PASS) && !defined(SORTPP_PASS) #define RTL_STATIC_LIST_HEAD(x) LIST_ENTRY x = { &x, &x } @@ -54,7 +58,7 @@ FORCEINLINE BOOLEAN -RemoveEntryList( +RemoveEntryListUnsafe( _In_ PLIST_ENTRY Entry) { PLIST_ENTRY OldFlink; @@ -67,6 +71,50 @@ return (BOOLEAN)(OldFlink == OldBlink); } +#if !defined(NO_KERNEL_LIST_ENTRY_CHECKS) +FORCEINLINE +VOID +FatalListEntryError( + _In_ PVOID P1, + _In_ PVOID P2, + _In_ PVOID P3) +{ + UNREFERENCED_PARAMETER(P1); + UNREFERENCED_PARAMETER(P2); + UNREFERENCED_PARAMETER(P3); + + RtlFailFast(FAST_FAIL_CORRUPT_LIST_ENTRY); +} + +FORCEINLINE +VOID +RtlpCheckListEntry( + _In_ PLIST_ENTRY Entry) +{ + if (Entry->Flink->Blink != Entry || Entry->Blink->Flink != Entry) + FatalListEntryError(Entry->Blink, Entry, Entry->Flink); +} +#endif + +FORCEINLINE +BOOLEAN +RemoveEntryList( + _In_ PLIST_ENTRY Entry) +{ + PLIST_ENTRY OldFlink; + PLIST_ENTRY OldBlink; + + OldFlink = Entry->Flink; + OldBlink = Entry->Blink; +#if !defined(NO_KERNEL_LIST_ENTRY_CHECKS) + if (OldFlink->Blink != Entry || OldBlink->Flink != Entry) + FatalListEntryError(OldBlink, Entry, OldFlink); +#endif + OldFlink->Blink = OldBlink; + OldBlink->Flink = OldFlink; + return (BOOLEAN)(OldFlink == OldBlink); +} + FORCEINLINE PLIST_ENTRY RemoveHeadList( @@ -75,8 +123,15 @@ PLIST_ENTRY Flink; PLIST_ENTRY Entry; +#if !defined(NO_KERNEL_LIST_ENTRY_CHECKS) && DBG + RtlpCheckListEntry(ListHead); +#endif Entry = ListHead->Flink; Flink = Entry->Flink; +#if !defined(NO_KERNEL_LIST_ENTRY_CHECKS) + if (Entry->Blink != ListHead || Flink->Blink != Entry) + FatalListEntryError(ListHead, Entry, Flink); +#endif ListHead->Flink = Flink; Flink->Blink = ListHead; return Entry; @@ -90,8 +145,15 @@ PLIST_ENTRY Blink; PLIST_ENTRY Entry; +#if !defined(NO_KERNEL_LIST_ENTRY_CHECKS) && DBG + RtlpCheckListEntry(ListHead); +#endif Entry = ListHead->Blink; Blink = Entry->Blink; +#if !defined(NO_KERNEL_LIST_ENTRY_CHECKS) + if (Blink->Flink != Entry || Entry->Flink != ListHead) + FatalListEntryError(Blink, Entry, ListHead); +#endif ListHead->Blink = Blink; Blink->Flink = ListHead; return Entry; @@ -104,9 +166,16 @@ _Inout_ __drv_aliasesMem PLIST_ENTRY Entry) { PLIST_ENTRY OldBlink; +#if !defined(NO_KERNEL_LIST_ENTRY_CHECKS) && DBG + RtlpCheckListEntry(ListHead); +#endif OldBlink = ListHead->Blink; Entry->Flink = ListHead; Entry->Blink = OldBlink; +#if !defined(NO_KERNEL_LIST_ENTRY_CHECKS) + if (OldBlink->Flink != ListHead) + FatalListEntryError(OldBlink->Blink, OldBlink, ListHead); +#endif OldBlink->Flink = Entry; ListHead->Blink = Entry; } @@ -118,9 +187,16 @@ _Inout_ __drv_aliasesMem PLIST_ENTRY Entry) { PLIST_ENTRY OldFlink; +#if !defined(NO_KERNEL_LIST_ENTRY_CHECKS) && DBG + RtlpCheckListEntry(ListHead); +#endif OldFlink = ListHead->Flink; Entry->Flink = OldFlink; Entry->Blink = ListHead; +#if !defined(NO_KERNEL_LIST_ENTRY_CHECKS) + if (OldFlink->Blink != ListHead) + FatalListEntryError(ListHead, OldFlink, OldFlink->Flink); +#endif OldFlink->Blink = Entry; ListHead->Flink = Entry; } @@ -133,6 +209,10 @@ { PLIST_ENTRY ListEnd = ListHead->Blink; +#if !defined(NO_KERNEL_LIST_ENTRY_CHECKS) + RtlpCheckListEntry(ListHead); + RtlpCheckListEntry(ListToAppend); +#endif ListHead->Blink->Flink = ListToAppend; ListHead->Blink = ListToAppend->Blink; ListToAppend->Blink->Flink = ListHead;

9 years, 7 months

[ekohl] 66205: [NTOSKRNL] Implement NtSaveMergedKeys and its backend CmSaveMergedKeys.

by ekohl＠svn.reactos.org

Author: ekohl Date: Sun Feb 8 11:49:58 2015 New Revision: 66205 URL: http://svn.reactos.org/svn/reactos?rev=66205&view=rev Log: [NTOSKRNL] Implement NtSaveMergedKeys and its backend CmSaveMergedKeys. Modified: trunk/reactos/ntoskrnl/config/cmapi.c trunk/reactos/ntoskrnl/config/ntapi.c trunk/reactos/ntoskrnl/include/internal/cm.h Modified: trunk/reactos/ntoskrnl/config/cmapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmapi.c [iso-8859-1] Sun Feb 8 11:49:58 2015 @@ -2444,3 +2444,79 @@ return Status; } + +NTSTATUS +NTAPI +CmSaveMergedKeys(IN PCM_KEY_CONTROL_BLOCK HighKcb, + IN PCM_KEY_CONTROL_BLOCK LowKcb, + IN HANDLE FileHandle) +{ + PCMHIVE KeyHive = NULL; + NTSTATUS Status = STATUS_SUCCESS; + + PAGED_CODE(); + + DPRINT("CmSaveKey(%p, %p, %p)\n", HighKcb, LowKcb, FileHandle); + + /* Lock the registry and the KCBs */ + CmpLockRegistry(); + CmpAcquireKcbLockShared(HighKcb); + CmpAcquireKcbLockShared(LowKcb); + + if (LowKcb->Delete || HighKcb->Delete) + { + /* The source key has been deleted, do nothing */ + Status = STATUS_KEY_DELETED; + goto done; + } + + /* Create a new hive that will hold the key */ + Status = CmpInitializeHive(&KeyHive, + HINIT_CREATE, + HIVE_VOLATILE, + HFILE_TYPE_PRIMARY, + NULL, + NULL, + NULL, + NULL, + NULL, + 0); + if (!NT_SUCCESS(Status)) + goto done; + + /* Copy the low precedence key recursively into the new hive */ + Status = CmpDeepCopyKey(LowKcb->KeyHive, + LowKcb->KeyCell, + &KeyHive->Hive, + Stable, + &KeyHive->Hive.BaseBlock->RootCell); + if (!NT_SUCCESS(Status)) + goto done; + + /* Copy the high precedence key recursively into the new hive */ + Status = CmpDeepCopyKey(HighKcb->KeyHive, + HighKcb->KeyCell, + &KeyHive->Hive, + Stable, + &KeyHive->Hive.BaseBlock->RootCell); + if (!NT_SUCCESS(Status)) + goto done; + + /* Set the primary handle of the hive */ + KeyHive->FileHandles[HFILE_TYPE_PRIMARY] = FileHandle; + + /* Dump the hive into the file */ + HvWriteHive(&KeyHive->Hive); + +done: + /* Free the hive */ + if (KeyHive) + CmpDestroyHive(KeyHive); + + /* Release the locks */ + CmpReleaseKcbLock(LowKcb); + CmpReleaseKcbLock(HighKcb); + CmpUnlockRegistry(); + + return Status; +} Modified: trunk/reactos/ntoskrnl/config/ntapi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/ntapi.c?re… ============================================================================== --- trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/ntapi.c [iso-8859-1] Sun Feb 8 11:49:58 2015 @@ -1258,7 +1258,7 @@ PAGED_CODE(); - DPRINT("NtSaveKeyEx(0x%08X, 0x%08X, %lu)\n", KeyHandle, FileHandle, Flags); + DPRINT("NtSaveKeyEx(0x%p, 0x%p, %lu)\n", KeyHandle, FileHandle, Flags); /* Verify the flags */ if ((Flags != REG_STANDARD_FORMAT) @@ -1297,8 +1297,56 @@ IN HANDLE LowPrecedenceKeyHandle, IN HANDLE FileHandle) { - UNIMPLEMENTED; - return STATUS_NOT_IMPLEMENTED; + KPROCESSOR_MODE PreviousMode; + PCM_KEY_BODY HighPrecedenceKeyObject = NULL; + PCM_KEY_BODY LowPrecedenceKeyObject = NULL; + NTSTATUS Status; + + PAGED_CODE(); + + DPRINT("NtSaveMergedKeys(0x%p, 0x%p, 0x%p)\n", + HighPrecedenceKeyHandle, LowPrecedenceKeyHandle, FileHandle); + + PreviousMode = ExGetPreviousMode(); + + /* Check for the SeBackupPrivilege */ + if (!SeSinglePrivilegeCheck(SeBackupPrivilege, PreviousMode)) + { + return STATUS_PRIVILEGE_NOT_HELD; + } + + /* Verify that the handles are valid and are registry keys */ + Status = ObReferenceObjectByHandle(HighPrecedenceKeyHandle, + KEY_READ, + CmpKeyObjectType, + PreviousMode, + (PVOID*)&HighPrecedenceKeyObject, + NULL); + if (!NT_SUCCESS(Status)) + goto done; + + Status = ObReferenceObjectByHandle(LowPrecedenceKeyHandle, + KEY_READ, + CmpKeyObjectType, + PreviousMode, + (PVOID*)&LowPrecedenceKeyObject, + NULL); + if (!NT_SUCCESS(Status)) + goto done; + + /* Call the internal API */ + Status = CmSaveMergedKeys(HighPrecedenceKeyObject->KeyControlBlock, + LowPrecedenceKeyObject->KeyControlBlock, + FileHandle); + +done: + if (LowPrecedenceKeyObject) + ObDereferenceObject(LowPrecedenceKeyObject); + + if (HighPrecedenceKeyObject) + ObDereferenceObject(HighPrecedenceKeyObject); + + return Status; } NTSTATUS Modified: trunk/reactos/ntoskrnl/include/internal/cm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/cm.h [iso-8859-1] Sun Feb 8 11:49:58 2015 @@ -1575,6 +1575,14 @@ IN ULONG Flags ); +NTSTATUS +NTAPI +CmSaveMergedKeys( + IN PCM_KEY_CONTROL_BLOCK HighKcb, + IN PCM_KEY_CONTROL_BLOCK LowKcb, + IN HANDLE FileHandle +); + // // Startup and Shutdown //

9 years, 7 months

[tfaber] 66204: [DDK] - Add RtlFailFast and FAST_FAIL_* codes CORE-8419

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Feb 8 10:57:47 2015 New Revision: 66204 URL: http://svn.reactos.org/svn/reactos?rev=66204&view=rev Log: [DDK] - Add RtlFailFast and FAST_FAIL_* codes CORE-8419 Modified: trunk/reactos/include/ddk/wdm.h trunk/reactos/include/xdk/rtlfuncs.h Modified: trunk/reactos/include/ddk/wdm.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wdm.h?rev=6620… ============================================================================== --- trunk/reactos/include/ddk/wdm.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/wdm.h [iso-8859-1] Sun Feb 8 10:57:47 2015 @@ -9589,6 +9589,33 @@ * Runtime Library Functions * ******************************************************************************/ +#define FAST_FAIL_LEGACY_GS_VIOLATION 0 +#define FAST_FAIL_VTGUARD_CHECK_FAILURE 1 +#define FAST_FAIL_STACK_COOKIE_CHECK_FAILURE 2 +#define FAST_FAIL_CORRUPT_LIST_ENTRY 3 +#define FAST_FAIL_INCORRECT_STACK 4 +#define FAST_FAIL_INVALID_ARG 5 +#define FAST_FAIL_GS_COOKIE_INIT 6 +#define FAST_FAIL_FATAL_APP_EXIT 7 +#define FAST_FAIL_RANGE_CHECK_FAILURE 8 +#define FAST_FAIL_UNSAFE_REGISTRY_ACCESS 9 +#define FAST_FAIL_GUARD_ICALL_CHECK_FAILURE 10 +#define FAST_FAIL_GUARD_WRITE_CHECK_FAILURE 11 +#define FAST_FAIL_INVALID_FIBER_SWITCH 12 +#define FAST_FAIL_INVALID_SET_OF_CONTEXT 13 +#define FAST_FAIL_INVALID_REFERENCE_COUNT 14 +#define FAST_FAIL_INVALID_JUMP_BUFFER 18 +#define FAST_FAIL_MRDATA_MODIFIED 19 +#define FAST_FAIL_INVALID_FAST_FAIL_CODE 0xFFFFFFFF + +DECLSPEC_NORETURN +FORCEINLINE +VOID +RtlFailFast( + _In_ ULONG Code) +{ + __fastfail(Code); +} #if !defined(MIDL_PASS) && !defined(SORTPP_PASS) Modified: trunk/reactos/include/xdk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/xdk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/xdk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/xdk/rtlfuncs.h [iso-8859-1] Sun Feb 8 10:57:47 2015 @@ -3,6 +3,33 @@ ******************************************************************************/ $if (_WDMDDK_) +#define FAST_FAIL_LEGACY_GS_VIOLATION 0 +#define FAST_FAIL_VTGUARD_CHECK_FAILURE 1 +#define FAST_FAIL_STACK_COOKIE_CHECK_FAILURE 2 +#define FAST_FAIL_CORRUPT_LIST_ENTRY 3 +#define FAST_FAIL_INCORRECT_STACK 4 +#define FAST_FAIL_INVALID_ARG 5 +#define FAST_FAIL_GS_COOKIE_INIT 6 +#define FAST_FAIL_FATAL_APP_EXIT 7 +#define FAST_FAIL_RANGE_CHECK_FAILURE 8 +#define FAST_FAIL_UNSAFE_REGISTRY_ACCESS 9 +#define FAST_FAIL_GUARD_ICALL_CHECK_FAILURE 10 +#define FAST_FAIL_GUARD_WRITE_CHECK_FAILURE 11 +#define FAST_FAIL_INVALID_FIBER_SWITCH 12 +#define FAST_FAIL_INVALID_SET_OF_CONTEXT 13 +#define FAST_FAIL_INVALID_REFERENCE_COUNT 14 +#define FAST_FAIL_INVALID_JUMP_BUFFER 18 +#define FAST_FAIL_MRDATA_MODIFIED 19 +#define FAST_FAIL_INVALID_FAST_FAIL_CODE 0xFFFFFFFF + +DECLSPEC_NORETURN +FORCEINLINE +VOID +RtlFailFast( + _In_ ULONG Code) +{ + __fastfail(Code); +} #if !defined(MIDL_PASS) && !defined(SORTPP_PASS)

9 years, 7 months

[janderwald] 66203: [PORTCLS] - fix crash / assert triggered with cwawdm driver - fix irp leak - CORE 7822

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Feb 8 08:11:51 2015 New Revision: 66203 URL: http://svn.reactos.org/svn/reactos?rev=66203&view=rev Log: [PORTCLS] - fix crash / assert triggered with cwawdm driver - fix irp leak - CORE 7822 Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/irpstream.cpp [iso-8859-1] Sun Feb 8 08:11:51 2015 @@ -552,6 +552,7 @@ { // no irp available m_OutOfMapping = TRUE; + DPRINT("GetMappingWithTag no mapping available\n"); return STATUS_NOT_FOUND; } @@ -611,6 +612,7 @@ StreamData->CurStreamHeader = (PKSSTREAM_HEADER)((ULONG_PTR)StreamData->CurStreamHeader + StreamData->CurStreamHeader->Size); } + DPRINT("GetMappingWithTag Tag %p Buffer %p Flags %lu ByteCount %lx\n", Tag, VirtualAddress, *Flags, *ByteCount); // done return STATUS_SUCCESS; } @@ -654,6 +656,12 @@ // remove irp from used list CurEntry = ExInterlockedRemoveHeadList(&m_FreeIrpList, &m_IrpListLock); + if (CurEntry == NULL) + { + // this should not happen + DPRINT("ReleaseMappingWithTag Tag %p not found\n", Tag); + return STATUS_NOT_FOUND; + } // sanity check PC_ASSERT(CurEntry); @@ -743,6 +751,11 @@ // complete the request IoCompleteRequest(Irp, IO_SOUND_INCREMENT); } + else + { + // there are still some headers not consumed + ExInterlockedInsertHeadList(&m_FreeIrpList, &Irp->Tail.Overlay.ListEntry, &m_IrpListLock); + } return STATUS_SUCCESS; } Modified: trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/backpln/… ============================================================================== --- trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/backpln/portcls/port_wavepci.cpp [iso-8859-1] Sun Feb 8 08:11:51 2015 @@ -228,7 +228,7 @@ IN PRESOURCELIST ResourceList) { IMiniportWavePci * Miniport; - PSERVICEGROUP ServiceGroup; + PSERVICEGROUP ServiceGroup = 0; NTSTATUS Status; PPINCOUNT PinCount; PPOWERNOTIFY PowerNotify;

9 years, 7 months

[hbelusca] 66202: [WINSRV]: Remove some deprecated code, keep other parts for reusage later on; cleanup SrvExitWindowsEx. If you enable the NotifyAndTerminateProcess call, you get a basic win32 pro...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Feb 8 00:54:22 2015 New Revision: 66202 URL: http://svn.reactos.org/svn/reactos?rev=66202&view=rev Log: [WINSRV]: Remove some deprecated code, keep other parts for reusage later on; cleanup SrvExitWindowsEx. If you enable the NotifyAndTerminateProcess call, you get a basic win32 process termination. This is now where the real work starts: do not kill CSRSS nor Winlogon, do not kill processes from other sessions, etc... Deal with console apps; display timeout dialog, and focus on the app that blocks shutdown by switching to the correct desktop. And we MUST NOT use user32 desktop APIs for switching to the different desktops, but we need to directly call win32k!! (for reasons that will appear later on; not implemented at the moment). Giannis, I will need your help for that! Part 10/X CORE-8322 Modified: trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c Modified: trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/win32ss/user/winsrv/usersr… ============================================================================== --- trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1] (original) +++ trunk/reactos/win32ss/user/winsrv/usersrv/shutdown.c [iso-8859-1] Sun Feb 8 00:54:22 2015 @@ -31,6 +31,8 @@ DWORD HungAppTimeout; DWORD WaitToKillAppTimeout; } SHUTDOWN_SETTINGS, *PSHUTDOWN_SETTINGS; + +SHUTDOWN_SETTINGS ShutdownSettings = {0}; #define DEFAULT_AUTO_END_TASKS FALSE #define DEFAULT_HUNG_APP_TIMEOUT 5000 @@ -84,16 +86,7 @@ /* FUNCTIONS ******************************************************************/ -/* -NTSTATUS FASTCALL -Win32CsrEnumProcesses(CSRSS_ENUM_PROCESS_PROC EnumProc, - PVOID Context) -{ - return CsrEnumProcesses(EnumProc, Context); -} -*/ - -static void FASTCALL +static VOID FASTCALL UpdateProgressBar(HWND ProgressBar, PNOTIFY_CONTEXT NotifyContext) { DWORD Passed; @@ -185,20 +178,21 @@ return Result; } -static void -CallInitCommonControls() +HMODULE hComCtl32Lib = NULL; + +static VOID +CallInitCommonControls(VOID) { static BOOL Initialized = FALSE; - HMODULE Lib; INITCOMMONCONTROLS_PROC InitProc; if (Initialized) return; - Lib = LoadLibraryW(L"COMCTL32.DLL"); - if (NULL == Lib) return; - - InitProc = (INITCOMMONCONTROLS_PROC) GetProcAddress(Lib, "InitCommonControls"); - if (NULL == InitProc) return; + hComCtl32Lib = LoadLibraryW(L"COMCTL32.DLL"); + if (hComCtl32Lib == NULL) return; + + InitProc = (INITCOMMONCONTROLS_PROC)GetProcAddress(hComCtl32Lib, "InitCommonControls"); + if (InitProc == NULL) return; (*InitProc)(); @@ -292,88 +286,74 @@ return FALSE; } - if (ProcessId == NotifyContext->ProcessId) - { - Now = GetTickCount(); - if (0 == NotifyContext->StartTime) - { - NotifyContext->StartTime = Now; - } - /* Note: Passed is computed correctly even when GetTickCount() wraps due - to unsigned arithmetic */ - Passed = Now - NotifyContext->StartTime; - MessageContext.Wnd = Wnd; - MessageContext.Msg = NotifyContext->Msg; - MessageContext.wParam = NotifyContext->wParam; - MessageContext.lParam = NotifyContext->lParam; - MessageContext.Timeout = NotifyContext->ShutdownSettings->HungAppTimeout; - if (! NotifyContext->ShutdownSettings->AutoEndTasks) - { - MessageContext.Timeout += NotifyContext->ShutdownSettings->WaitToKillAppTimeout; - } - if (Passed < MessageContext.Timeout) - { - MessageContext.Timeout -= Passed; - MessageThread = CreateThread(NULL, 0, NotifyContext->SendMessageProc, - (LPVOID) &MessageContext, 0, NULL); - if (NULL == MessageThread) + if (ProcessId != NotifyContext->ProcessId) + goto Quit; + + Now = GetTickCount(); + if (0 == NotifyContext->StartTime) + { + NotifyContext->StartTime = Now; + } + /* + * Note: Passed is computed correctly even when GetTickCount() + * wraps due to unsigned arithmetic. + */ + Passed = Now - NotifyContext->StartTime; + MessageContext.Wnd = Wnd; + MessageContext.Msg = NotifyContext->Msg; + MessageContext.wParam = NotifyContext->wParam; + MessageContext.lParam = NotifyContext->lParam; + MessageContext.Timeout = NotifyContext->ShutdownSettings->HungAppTimeout; + if (! NotifyContext->ShutdownSettings->AutoEndTasks) + { + MessageContext.Timeout += NotifyContext->ShutdownSettings->WaitToKillAppTimeout; + } + if (Passed < MessageContext.Timeout) + { + MessageContext.Timeout -= Passed; + MessageThread = CreateThread(NULL, 0, NotifyContext->SendMessageProc, + (LPVOID) &MessageContext, 0, NULL); + if (NULL == MessageThread) + { + NotifyContext->QueryResult = QUERY_RESULT_ERROR; + return FALSE; + } + Timeout = NotifyContext->ShutdownSettings->HungAppTimeout; + if (Passed < Timeout) + { + Timeout -= Passed; + WaitStatus = WaitForSingleObjectEx(MessageThread, Timeout, FALSE); + } + else + { + WaitStatus = WAIT_TIMEOUT; + } + if (WAIT_TIMEOUT == WaitStatus) + { + NotifyContext->WndClient = Wnd; + if (NULL == NotifyContext->UIThread && NotifyContext->ShowUI) { - NotifyContext->QueryResult = QUERY_RESULT_ERROR; - return FALSE; + NotifyContext->UIThread = CreateThread(NULL, 0, + EndNowThreadProc, + (LPVOID) NotifyContext, + 0, NULL); } - Timeout = NotifyContext->ShutdownSettings->HungAppTimeout; - if (Passed < Timeout) + Threads[0] = MessageThread; + Threads[1] = NotifyContext->UIThread; + WaitStatus = WaitForMultipleObjectsEx(NULL == NotifyContext->UIThread ? + 1 : 2, + Threads, FALSE, INFINITE, + FALSE); + if (WAIT_OBJECT_0 == WaitStatus) { - Timeout -= Passed; - WaitStatus = WaitForSingleObjectEx(MessageThread, Timeout, FALSE); - } - else - { - WaitStatus = WAIT_TIMEOUT; - } - if (WAIT_TIMEOUT == WaitStatus) - { - NotifyContext->WndClient = Wnd; - if (NULL == NotifyContext->UIThread && NotifyContext->ShowUI) - { - NotifyContext->UIThread = CreateThread(NULL, 0, - EndNowThreadProc, - (LPVOID) NotifyContext, - 0, NULL); - } - Threads[0] = MessageThread; - Threads[1] = NotifyContext->UIThread; - WaitStatus = WaitForMultipleObjectsEx(NULL == NotifyContext->UIThread ? - 1 : 2, - Threads, FALSE, INFINITE, - FALSE); - if (WAIT_OBJECT_0 == WaitStatus) - { - if (! GetExitCodeThread(MessageThread, &NotifyContext->QueryResult)) - { - NotifyContext->QueryResult = QUERY_RESULT_ERROR; - } - } - else if (WAIT_OBJECT_0 + 1 == WaitStatus) - { - if (! GetExitCodeThread(NotifyContext->UIThread, - &NotifyContext->QueryResult)) - { - NotifyContext->QueryResult = QUERY_RESULT_ERROR; - } - } - else + if (! GetExitCodeThread(MessageThread, &NotifyContext->QueryResult)) { NotifyContext->QueryResult = QUERY_RESULT_ERROR; } - if (WAIT_OBJECT_0 != WaitStatus) - { - TerminateThread(MessageThread, QUERY_RESULT_TIMEOUT); - } } - else if (WAIT_OBJECT_0 == WaitStatus) + else if (WAIT_OBJECT_0 + 1 == WaitStatus) { - if (! GetExitCodeThread(MessageThread, + if (! GetExitCodeThread(NotifyContext->UIThread, &NotifyContext->QueryResult)) { NotifyContext->QueryResult = QUERY_RESULT_ERROR; @@ -383,15 +363,33 @@ { NotifyContext->QueryResult = QUERY_RESULT_ERROR; } - CloseHandle(MessageThread); + if (WAIT_OBJECT_0 != WaitStatus) + { + TerminateThread(MessageThread, QUERY_RESULT_TIMEOUT); + } + } + else if (WAIT_OBJECT_0 == WaitStatus) + { + if (! GetExitCodeThread(MessageThread, + &NotifyContext->QueryResult)) + { + NotifyContext->QueryResult = QUERY_RESULT_ERROR; + } } else { - NotifyContext->QueryResult = QUERY_RESULT_TIMEOUT; - } - } - - return QUERY_RESULT_CONTINUE == NotifyContext->QueryResult; + NotifyContext->QueryResult = QUERY_RESULT_ERROR; + } + CloseHandle(MessageThread); + } + else + { + NotifyContext->QueryResult = QUERY_RESULT_TIMEOUT; + } + +Quit: + DPRINT1("NotifyContext->QueryResult == %d\n", NotifyContext->QueryResult); + return (NotifyContext->QueryResult == QUERY_RESULT_CONTINUE); } static BOOL CALLBACK @@ -470,7 +468,7 @@ #endif /************************************************/ -static BOOL FASTCALL +BOOL FASTCALL NotifyAndTerminateProcess(PCSR_PROCESS ProcessData, PSHUTDOWN_SETTINGS ShutdownSettings, UINT Flags) @@ -629,32 +627,7 @@ } #endif -static int -ProcessDataCompare(const void *Elem1, const void *Elem2) -{ - const PCSR_PROCESS *ProcessData1 = (PCSR_PROCESS *) Elem1; - const PCSR_PROCESS *ProcessData2 = (PCSR_PROCESS *) Elem2; - - if ((*ProcessData1)->ShutdownLevel < (*ProcessData2)->ShutdownLevel) - { - return +1; - } - else if ((*ProcessData2)->ShutdownLevel < (*ProcessData1)->ShutdownLevel) - { - return -1; - } - else if ((*ProcessData1)->ClientId.UniqueProcess < (*ProcessData2)->ClientId.UniqueProcess) - { - return +1; - } - else if ((*ProcessData2)->ClientId.UniqueProcess < (*ProcessData1)->ClientId.UniqueProcess) - { - return -1; - } - - return 0; -} - +#if 0 static DWORD FASTCALL GetShutdownSettings(HKEY DesktopKey, LPCWSTR ValueName, DWORD DefaultValue) { @@ -695,7 +668,7 @@ return DefaultValue; } -static void FASTCALL +static VOID FASTCALL LoadShutdownSettings(PSID Sid, PSHUTDOWN_SETTINGS ShutdownSettings) { static WCHAR Subkey[] = L"\\Control Panel\\Desktop"; @@ -761,150 +734,56 @@ NTSTATUS FASTCALL InternalExitReactos(DWORD ProcessId, DWORD ThreadId, UINT Flags) { - HANDLE CallerThread; - HANDLE CallerToken; - NTSTATUS Status; - PROCESS_ENUM_CONTEXT Context; - DWORD ReturnLength; + // PROCESS_ENUM_CONTEXT Context; HWND ShellWnd; - UINT ProcessIndex; char FixedUserInfo[64]; TOKEN_USER *UserInfo; SHUTDOWN_SETTINGS ShutdownSettings; - if (ProcessId != LogonProcessId) - { - DPRINT1("Internal ExitWindowsEx call not from winlogon\n"); - return STATUS_ACCESS_DENIED; - } - - // FIXME: HAAAAACK!! - DPRINT1("FIXME: Need to close all user processes!\n"); + LoadShutdownSettings(UserInfo->User.Sid, &ShutdownSettings); + + // Context.CsrssProcess = GetCurrentProcessId(); + // ShellWnd = GetShellWindow(); + // if (NULL == ShellWnd) + // { + // DPRINT("No shell present\n"); + // Context.ShellProcess = 0; + // } + // else if (0 == GetWindowThreadProcessId(ShellWnd, &Context.ShellProcess)) + // { + // DPRINT1("Can't get process id of shell window\n"); + // Context.ShellProcess = 0; + // } + return STATUS_SUCCESS; - - CallerThread = OpenThread(THREAD_QUERY_INFORMATION, FALSE, ThreadId); - if (NULL == CallerThread) - { - DPRINT1("OpenThread failed with error %d\n", GetLastError()); - return STATUS_UNSUCCESSFUL; - } - if (! OpenThreadToken(CallerThread, TOKEN_QUERY, FALSE, &CallerToken)) - { - DPRINT1("OpenThreadToken failed with error %d\n", GetLastError()); - CloseHandle(CallerThread); - return STATUS_UNSUCCESSFUL; - } - CloseHandle(CallerThread); - - Context.ProcessCount = 0; - Context.ProcessData = NULL; - if (! GetTokenInformation(CallerToken, TokenOrigin, &Context.TokenOrigin, - sizeof(TOKEN_ORIGIN), &ReturnLength)) - { - DPRINT1("GetTokenInformation failed with error %d\n", GetLastError()); - CloseHandle(CallerToken); - return STATUS_UNSUCCESSFUL; - } - if (! GetTokenInformation(CallerToken, TokenUser, FixedUserInfo, - sizeof(FixedUserInfo), &ReturnLength)) - { - if (sizeof(FixedUserInfo) < ReturnLength) - { - UserInfo = HeapAlloc(UserServerHeap, 0, ReturnLength); - if (NULL == UserInfo) - { - DPRINT1("Unable to allocate %u bytes for user info\n", - (unsigned) ReturnLength); - CloseHandle(CallerToken); - return STATUS_NO_MEMORY; - } - if (! GetTokenInformation(CallerToken, TokenUser, UserInfo, - ReturnLength, &ReturnLength)) - { - DPRINT1("GetTokenInformation failed with error %d\n", - GetLastError()); - HeapFree(UserServerHeap, 0, UserInfo); - CloseHandle(CallerToken); - return STATUS_UNSUCCESSFUL; - } - } - else - { - DPRINT1("GetTokenInformation failed with error %d\n", GetLastError()); - CloseHandle(CallerToken); - return STATUS_UNSUCCESSFUL; - } - } - else - { - UserInfo = (TOKEN_USER *) FixedUserInfo; - } - CloseHandle(CallerToken); - LoadShutdownSettings(UserInfo->User.Sid, &ShutdownSettings); - if (UserInfo != (TOKEN_USER *) FixedUserInfo) - { - HeapFree(UserServerHeap, 0, UserInfo); - } - Context.CsrssProcess = GetCurrentProcessId(); - ShellWnd = GetShellWindow(); - if (NULL == ShellWnd) - { - DPRINT("No shell present\n"); - Context.ShellProcess = 0; - } - else if (0 == GetWindowThreadProcessId(ShellWnd, &Context.ShellProcess)) - { - DPRINT1("Can't get process id of shell window\n"); - Context.ShellProcess = 0; - } - - // Status = Win32CsrEnumProcesses(ExitReactosProcessEnum, &Context); - if (! NT_SUCCESS(Status)) - { - DPRINT1("Failed to enumerate registered processes, status 0x%x\n", - Status); - if (NULL != Context.ProcessData) - { - HeapFree(UserServerHeap, 0, Context.ProcessData); - } - return Status; - } - - qsort(Context.ProcessData, Context.ProcessCount, sizeof(PCSR_PROCESS), - ProcessDataCompare); - - /* Terminate processes, stop if we find one kicking and screaming it doesn't - want to die */ - Status = STATUS_SUCCESS; - for (ProcessIndex = 0; - ProcessIndex < Context.ProcessCount && NT_SUCCESS(Status); - ProcessIndex++) - { - if (! NotifyAndTerminateProcess(Context.ProcessData[ProcessIndex], - &ShutdownSettings, Flags)) - { - Status = STATUS_REQUEST_ABORTED; - } - } - - /* Cleanup */ - if (NULL != Context.ProcessData) - { - HeapFree(UserServerHeap, 0, Context.ProcessData); - } - - return Status; -} +} +#endif static NTSTATUS FASTCALL UserExitReactos(PCSR_THREAD CsrThread, UINT Flags) { NTSTATUS Status; LUID CallerLuid; + + DWORD ProcessId = HandleToUlong(CsrThread->ClientId.UniqueProcess); + DWORD ThreadId = HandleToUlong(CsrThread->ClientId.UniqueThread); + + DPRINT1("SrvExitWindowsEx(ClientId: %lx.%lx, Flags: 0x%x)\n", + ProcessId, ThreadId, Flags); /* * Check for flags validity */ + + if (Flags & EWX_INTERNAL_FLAG) + { + /* Only Winlogon can call this */ + if (ProcessId != LogonProcessId) + { + DPRINT1("SrvExitWindowsEx call not from Winlogon\n"); + return STATUS_ACCESS_DENIED; + } + } /* Implicitely add the shutdown flag when we poweroff or reboot */ if (Flags & (EWX_POWEROFF | EWX_REBOOT)) @@ -984,14 +863,6 @@ { DPRINT1("Failed to shutdown processes, Status = 0x%08x\n", Status); } - /* - * FIXME: - * At the moment the callbacks just do nothing so no process will be killed. - * It's not dramatic since: - * 1- We didn't do that before, - * 2- Related to point 1, the hackish InternalExitReactos call will end back - * into Winlogon that will directly call NtShutdownSystem. - */ // FIXME: If Status == STATUS_CANCELLED, call RecordShutdownReason @@ -1018,7 +889,29 @@ DPRINT1("UserClientShutdown(0x%p, 0x%x, %s)\n", CsrProcess, Flags, FirstPhase ? "FirstPhase" : "LastPhase"); - UNIMPLEMENTED; + /* + * Check for process validity + */ + + /* Do not kill WinLogon or CSRSS */ + if (CsrProcess->ClientId.UniqueProcess == NtCurrentProcess() || + CsrProcess->ClientId.UniqueProcess == UlongToHandle(LogonProcessId)) + { + DPRINT1("Not killing %s; CsrProcess->ShutdownFlags = %lu\n", + CsrProcess->ClientId.UniqueProcess == NtCurrentProcess() ? "CSRSS" : "Winlogon", + CsrProcess->ShutdownFlags); + + return CsrShutdownNonCsrProcess; + } + + DPRINT1("Killing process with ShutdownFlags = %lu\n", CsrProcess->ShutdownFlags); + +#if 0 + if (!NotifyAndTerminateProcess(CsrProcess, &ShutdownSettings, Flags)) + { + return CsrShutdownCancelled; + } +#endif return CsrShutdownNonCsrProcess; } @@ -1030,41 +923,11 @@ { NTSTATUS Status; PUSER_EXIT_REACTOS ExitReactosRequest = &((PUSER_API_MESSAGE)ApiMessage)->Data.ExitReactosRequest; - PCSR_THREAD CsrThread = CsrGetClientThread(); - ULONG Flags = ExitReactosRequest->Flags; - - DWORD ProcessId = HandleToUlong(CsrThread->ClientId.UniqueProcess); - DWORD ThreadId = HandleToUlong(CsrThread->ClientId.UniqueThread); - - DPRINT1("SrvExitWindowsEx(ClientId: %lx.%lx, Flags: 0x%x)\n", - ProcessId, ThreadId, Flags); - - - // FIXME: Everything else starting after this line is a HAAACK!! - - - if (Flags & EWX_INTERNAL_FLAG) - { - /* Only Winlogon can call this */ - if (ProcessId != LogonProcessId) - { - DPRINT1("SrvExitWindowsEx call not from Winlogon\n"); - return STATUS_ACCESS_DENIED; - } - - // This function is a HACK!! - // EWX_INTERNAL_FLAG --> For Winlogon only!! - // Status = InternalExitReactos(ProcessId, ThreadId, Flags); - - // This is this function that we need to call instead! - Status = UserExitReactos(CsrThread, Flags); - } - else - { - Status = UserExitReactos(CsrThread, Flags); - } - - ExitReactosRequest->Success = NT_SUCCESS(Status); + + Status = UserExitReactos(CsrGetClientThread(), ExitReactosRequest->Flags); + ExitReactosRequest->Success = NT_SUCCESS(Status); + ExitReactosRequest->LastError = GetLastError(); + return Status; } @@ -1082,7 +945,7 @@ { if (EndTaskRequest->Force) { - EndTaskRequest->Success = DestroyWindow(EndTaskRequest->WndHandle); + EndTaskRequest->Success = DestroyWindow(EndTaskRequest->WndHandle); EndTaskRequest->LastError = GetLastError(); } else @@ -1092,8 +955,8 @@ } else { + EndTaskRequest->Success = TRUE; EndTaskRequest->LastError = ERROR_SUCCESS; - EndTaskRequest->Success = TRUE; } return STATUS_SUCCESS;

9 years, 7 months

[tfaber] 66201: [SPEC2DEF] - Don't warn about symbols that should be private on MSVC builds. Link already does this. CORE-8445

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Feb 8 00:00:30 2015 New Revision: 66201 URL: http://svn.reactos.org/svn/reactos?rev=66201&view=rev Log: [SPEC2DEF] - Don't warn about symbols that should be private on MSVC builds. Link already does this. CORE-8445 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] Sun Feb 8 00:00:30 2015 @@ -1043,7 +1043,7 @@ return -1; } - if (!gbNotPrivateNoWarn && gbImportLib && !(exp.uFlags & FL_PRIVATE)) + if (!gbMSComp && !gbNotPrivateNoWarn && gbImportLib && !(exp.uFlags & FL_PRIVATE)) { for (i = 0; i < ARRAYSIZE(astrShouldBePrivate); i++) {

9 years, 7 months

[tfaber] 66200: [CMAKE] - Support NO_PRIVATE_WARNINGS parameter when invoking spec2def to suppress warnings about symbols that should be private - Disable such warnings for msxml3, ole32 and rsaenh...

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Feb 7 23:54:15 2015 New Revision: 66200 URL: http://svn.reactos.org/svn/reactos?rev=66200&view=rev Log: [CMAKE] - Support NO_PRIVATE_WARNINGS parameter when invoking spec2def to suppress warnings about symbols that should be private - Disable such warnings for msxml3, ole32 and rsaenh CORE-8445 Modified: trunk/reactos/cmake/gcc.cmake trunk/reactos/cmake/msvc.cmake trunk/reactos/dll/win32/msxml3/CMakeLists.txt trunk/reactos/dll/win32/ole32/CMakeLists.txt trunk/reactos/dll/win32/rsaenh/CMakeLists.txt Modified: trunk/reactos/cmake/gcc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/gcc.cmake?rev=66200&… ============================================================================== --- trunk/reactos/cmake/gcc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/gcc.cmake [iso-8859-1] Sat Feb 7 23:54:15 2015 @@ -310,7 +310,7 @@ # Generate the def for the import lib add_custom_command( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def - COMMAND native-spec2def -n=${_dllname} -a=${ARCH2} --implib -d=${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} + COMMAND native-spec2def -n=${_dllname} -a=${ARCH2} ${ARGN} --implib -d=${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) set_source_files_properties(${CMAKE_CURRENT_BINARY_DIR}/${_libname}_implib.def PROPERTIES EXTERNAL_OBJECT TRUE) @@ -328,7 +328,7 @@ set(CMAKE_IMPLIB_DELAYED_CREATE_STATIC_LIBRARY "${CMAKE_DLLTOOL} --def <OBJECTS> --kill-at --output-delaylib=<TARGET>") function(spec2def _dllname _spec_file) - cmake_parse_arguments(__spec2def "ADD_IMPORTLIB;WITH_RELAY" "" "" ${ARGN}) + cmake_parse_arguments(__spec2def "ADD_IMPORTLIB;NO_PRIVATE_WARNINGS;WITH_RELAY" "" "" ${ARGN}) # Get library basename get_filename_component(_file ${_dllname} NAME_WE) @@ -349,7 +349,12 @@ DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) if(__spec2def_ADD_IMPORTLIB) - generate_import_lib(lib${_file} ${_dllname} ${_spec_file}) + set(_extraflags) + if(__spec2def_NO_PRIVATE_WARNINGS) + set(_extraflags --no-private-warnings) + endif() + + generate_import_lib(lib${_file} ${_dllname} ${_spec_file} ${_extraflags}) endif() endfunction() Modified: trunk/reactos/cmake/msvc.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=66200… ============================================================================== --- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sat Feb 7 23:54:15 2015 @@ -315,14 +315,8 @@ set(SPEC2DEF_ARCH i386) endif() function(spec2def _dllname _spec_file) - # Do we also want to add importlib targets? - if(${ARGC} GREATER 2) - if(${ARGN} STREQUAL "ADD_IMPORTLIB") - set(__add_importlib TRUE) - else() - message(FATAL_ERROR "Wrong argument passed to spec2def, ${ARGN}") - endif() - endif() + + cmake_parse_arguments(__spec2def "ADD_IMPORTLIB;NO_PRIVATE_WARNINGS" "" "" ${ARGN}) # Get library basename get_filename_component(_file ${_dllname} NAME_WE) @@ -338,7 +332,10 @@ COMMAND native-spec2def --ms -a=${SPEC2DEF_ARCH} -n=${_dllname} -d=${CMAKE_CURRENT_BINARY_DIR}/${_file}.def -s=${CMAKE_CURRENT_BINARY_DIR}/${_file}_stubs.c ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def) - if(__add_importlib) + if(__spec2def_ADD_IMPORTLIB) + # TODO: NO_PRIVATE_WARNINGS should add /IGNORE:4104 to the link command + # line. However that should be on all command lines outside of + # generate_import_lib in the first place. generate_import_lib(lib${_file} ${_dllname} ${_spec_file}) endif() endfunction() Modified: trunk/reactos/dll/win32/msxml3/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msxml3/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/msxml3/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msxml3/CMakeLists.txt [iso-8859-1] Sat Feb 7 23:54:15 2015 @@ -13,7 +13,7 @@ ${REACTOS_SOURCE_DIR}/include/reactos/wine ${REACTOS_SOURCE_DIR}/lib/3rdparty/libwin-iconv) -spec2def(msxml3.dll msxml3.spec ADD_IMPORTLIB) +spec2def(msxml3.dll msxml3.spec ADD_IMPORTLIB NO_PRIVATE_WARNINGS) add_typelib(msxml3_v1.idl) list(APPEND SOURCE Modified: trunk/reactos/dll/win32/ole32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ole32/CMakeLists… ============================================================================== --- trunk/reactos/dll/win32/ole32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ole32/CMakeLists.txt [iso-8859-1] Sat Feb 7 23:54:15 2015 @@ -11,7 +11,7 @@ -DWINE_REGISTER_DLL) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(ole32.dll ole32.spec ADD_IMPORTLIB) +spec2def(ole32.dll ole32.spec ADD_IMPORTLIB NO_PRIVATE_WARNINGS) generate_idl_iids(dcom.idl) add_idl_headers(ole32idl dcom.idl irot.idl) add_rpc_files(client irot.idl) Modified: trunk/reactos/dll/win32/rsaenh/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/rsaenh/CMakeList… ============================================================================== --- trunk/reactos/dll/win32/rsaenh/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/rsaenh/CMakeLists.txt [iso-8859-1] Sat Feb 7 23:54:15 2015 @@ -1,7 +1,7 @@ add_definitions(-D__WINESRC__) include_directories(${REACTOS_SOURCE_DIR}/include/reactos/wine) -spec2def(rsaenh.dll rsaenh.spec ADD_IMPORTLIB) +spec2def(rsaenh.dll rsaenh.spec ADD_IMPORTLIB NO_PRIVATE_WARNINGS) list(APPEND SOURCE aes.c

9 years, 7 months

[hbelusca] 66199: [SPEC2DEF]: Display the -private exports warning *only* when making import libs. CORE-8445 #comment -private warning only displayed for import libs.

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sat Feb 7 21:42:26 2015 New Revision: 66199 URL: http://svn.reactos.org/svn/reactos?rev=66199&view=rev Log: [SPEC2DEF]: Display the -private exports warning *only* when making import libs. CORE-8445 #comment -private warning only displayed for import libs. 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] Sat Feb 7 21:42:26 2015 @@ -1043,7 +1043,7 @@ return -1; } - if (!gbNotPrivateNoWarn && !(exp.uFlags & FL_PRIVATE)) + if (!gbNotPrivateNoWarn && gbImportLib && !(exp.uFlags & FL_PRIVATE)) { for (i = 0; i < ARRAYSIZE(astrShouldBePrivate); i++) {

9 years, 7 months

[tfaber] 66198: [SPEC2DEF] - Remove space before colon in error messages

by tfaber＠svn.reactos.org

Author: tfaber Date: Sat Feb 7 21:20:15 2015 New Revision: 66198 URL: http://svn.reactos.org/svn/reactos?rev=66198&view=rev Log: [SPEC2DEF] - Remove space before colon in error messages 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] Sat Feb 7 21:20:15 2015 @@ -756,7 +756,7 @@ /* Go to next token (type) */ if (!(pc = NextToken(pc))) { - fprintf(stderr, "%s line %d : error: unexpected end of line\n", pszSourceFileName, nLine); + fprintf(stderr, "%s line %d: error: unexpected end of line\n", pszSourceFileName, nLine); return -10; } @@ -790,7 +790,7 @@ } else { - fprintf(stderr, "%s line %d : error: expected callconv, got '%.*s' %d\n", + fprintf(stderr, "%s line %d: error: expected callconv, got '%.*s' %d\n", pszSourceFileName, nLine, TokenLength(pc), pc, *pc); return -11; } @@ -901,14 +901,14 @@ /* Go to next token */ if (!(pc = NextToken(pc))) { - fprintf(stderr, "%s line %d : error: expected token\n", pszSourceFileName, nLine); + fprintf(stderr, "%s line %d: error: expected token\n", pszSourceFileName, nLine); return -13; } /* Verify syntax */ if (*pc++ != '(') { - fprintf(stderr, "%s line %d : error: expected '('\n", pszSourceFileName, nLine); + fprintf(stderr, "%s line %d: error: expected '('\n", pszSourceFileName, nLine); return -14; } @@ -959,7 +959,7 @@ exp.anArgs[exp.nArgCount] = ARG_FLOAT; } else - fprintf(stderr, "%s line %d : error: expected type, got: %.10s\n", pszSourceFileName, nLine, pc); + fprintf(stderr, "%s line %d: error: expected type, got: %.10s\n", pszSourceFileName, nLine, pc); exp.nArgCount++; @@ -974,7 +974,7 @@ /* Check syntax */ if (*pc++ != ')') { - fprintf(stderr, "%s line %d : error: expected ')'\n", pszSourceFileName, nLine); + fprintf(stderr, "%s line %d: error: expected ')'\n", pszSourceFileName, nLine); return -16; } } @@ -1000,7 +1000,7 @@ exp.strName.len = (int)(p - pc); if (exp.strName.len < 1) { - fprintf(stderr, "%s line %d : error: unexpected @ found\n", pszSourceFileName, nLine); + fprintf(stderr, "%s line %d: error: unexpected @ found\n", pszSourceFileName, nLine); return -1; } exp.nStackBytes = atoi(p + 1); @@ -1023,7 +1023,7 @@ /* Check syntax (end of line) */ if (NextToken(pc)) { - fprintf(stderr, "%s line %d : error: additional tokens after ')'\n", pszSourceFileName, nLine); + fprintf(stderr, "%s line %d: error: additional tokens after ')'\n", pszSourceFileName, nLine); return -17; } @@ -1039,7 +1039,7 @@ /* Check for no-name without ordinal */ if ((exp.uFlags & FL_ORDINAL) && (exp.nOrdinal == -1)) { - fprintf(stderr, "%s line %d : error: ordinal export without ordinal!\n", pszSourceFileName, nLine); + fprintf(stderr, "%s line %d: error: ordinal export without ordinal!\n", pszSourceFileName, nLine); return -1; } @@ -1050,7 +1050,7 @@ if (strlen(astrShouldBePrivate[i]) == exp.strName.len && strncmp(exp.strName.buf, astrShouldBePrivate[i], exp.strName.len) == 0) { - fprintf(stderr, "%s line %d : warning: export of '%.*s' should be PRIVATE\n", + fprintf(stderr, "%s line %d: warning: export of '%.*s' should be PRIVATE\n", pszSourceFileName, nLine, exp.strName.len, exp.strName.buf); } }

9 years, 7 months

← Newer
1
...
28
29
30
31
32
33
34
...
38
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2015