Ros-diffs June 2015

ros-diffs@reactos.org

13 participants
343 discussions

[pschweitzer] 68137: [KERNEL32] Addendum to r68136: use appropriate define. Spotted by Thomas

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Jun 14 16:00:27 2015 New Revision: 68137 URL: http://svn.reactos.org/svn/reactos?rev=68137&view=rev Log: [KERNEL32] Addendum to r68136: use appropriate define. Spotted by Thomas Modified: trunk/reactos/dll/win32/kernel32/client/sysinfo.c Modified: trunk/reactos/dll/win32/kernel32/client/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/sysinfo.c [iso-8859-1] Sun Jun 14 16:00:27 2015 @@ -293,7 +293,7 @@ ULONGLONG Proc; /* Can't handle processor number >= 32 */ - if (Processor >= 0x20) + if (Processor >= MAXIMUM_PROCESSORS) { *NodeNumber = -1; SetLastError(ERROR_INVALID_PARAMETER); @@ -314,7 +314,7 @@ /* Find ourselves */ Node = 0; - Proc = (1ULL << Processor) >> 0x20; + Proc = (1ULL << Processor) >> MAXIMUM_PROCESSORS; while ((Proc & NumaInformation.ActiveProcessorsAffinityMask[Node]) == 0ULL) { ++Node;

9 years, 4 months

[pschweitzer] 68136: [KERNEL32] Implement GetNumaHighestNodeNumber() Implement GetNumaNodeProcessorMask() Implement GetNumaProcessorNode() Implement GetNumaAvailableMemoryNode() They won't work yet...

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Jun 14 15:52:28 2015 New Revision: 68136 URL: http://svn.reactos.org/svn/reactos?rev=68136&view=rev Log: [KERNEL32] Implement GetNumaHighestNodeNumber() Implement GetNumaNodeProcessorMask() Implement GetNumaProcessorNode() Implement GetNumaAvailableMemoryNode() They won't work yet though, given that the kernel mode counterpart is still unimplemented. CORE-9680 Modified: trunk/reactos/dll/win32/kernel32/client/sysinfo.c Modified: trunk/reactos/dll/win32/kernel32/client/sysinfo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/client/… ============================================================================== --- trunk/reactos/dll/win32/kernel32/client/sysinfo.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/client/sysinfo.c [iso-8859-1] Sun Jun 14 15:52:28 2015 @@ -211,50 +211,160 @@ } /* - * @unimplemented + * @implemented */ BOOL WINAPI GetNumaHighestNodeNumber(OUT PULONG HighestNodeNumber) { - STUB; - return 0; -} - -/* - * @unimplemented + NTSTATUS Status; + ULONG Length; + ULONG PartialInfo[2]; // First two members of SYSTEM_NUMA_INFORMATION + + /* Query partial NUMA info */ + Status = NtQuerySystemInformation(SystemNumaProcessorMap, + PartialInfo, + sizeof(PartialInfo), + &Length); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + if (Length < sizeof(ULONG)) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + /* First member of the struct is the highest node number */ + *HighestNodeNumber = PartialInfo[0]; + return TRUE; +} + +/* + * @implemented */ BOOL WINAPI GetNumaNodeProcessorMask(IN UCHAR Node, OUT PULONGLONG ProcessorMask) { - STUB; - return 0; -} - -/* - * @unimplemented + NTSTATUS Status; + SYSTEM_NUMA_INFORMATION NumaInformation; + ULONG Length; + + /* Query NUMA information */ + Status = NtQuerySystemInformation(SystemNumaProcessorMap, + &NumaInformation, + sizeof(NumaInformation), + &Length); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + /* Validate input node number */ + if (Node > NumaInformation.HighestNodeNumber) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + /* Return mask for that node */ + *ProcessorMask = NumaInformation.ActiveProcessorsAffinityMask[Node]; + return TRUE; +} + +/* + * @implemented */ BOOL WINAPI GetNumaProcessorNode(IN UCHAR Processor, OUT PUCHAR NodeNumber) { - STUB; - return 0; -} - -/* - * @unimplemented + NTSTATUS Status; + SYSTEM_NUMA_INFORMATION NumaInformation; + ULONG Length; + ULONG Node; + ULONGLONG Proc; + + /* Can't handle processor number >= 32 */ + if (Processor >= 0x20) + { + *NodeNumber = -1; + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + /* Query NUMA information */ + Status = NtQuerySystemInformation(SystemNumaProcessorMap, + &NumaInformation, + sizeof(NumaInformation), + &Length); + if (!NT_SUCCESS(Status)) + { + *NodeNumber = -1; + BaseSetLastNTError(Status); + return FALSE; + } + + /* Find ourselves */ + Node = 0; + Proc = (1ULL << Processor) >> 0x20; + while ((Proc & NumaInformation.ActiveProcessorsAffinityMask[Node]) == 0ULL) + { + ++Node; + /* Out of options */ + if (Node > NumaInformation.HighestNodeNumber) + { + *NodeNumber = -1; + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + } + + /* Return found node */ + *NodeNumber = Node; + return TRUE; +} + +/* + * @implemented */ BOOL WINAPI GetNumaAvailableMemoryNode(IN UCHAR Node, OUT PULONGLONG AvailableBytes) { - STUB; - return FALSE; + NTSTATUS Status; + SYSTEM_NUMA_INFORMATION NumaInformation; + ULONG Length; + + /* Query NUMA information */ + Status = NtQuerySystemInformation(SystemNumaAvailableMemory, + &NumaInformation, + sizeof(NumaInformation), + &Length); + if (!NT_SUCCESS(Status)) + { + BaseSetLastNTError(Status); + return FALSE; + } + + /* Validate input node number */ + if (Node > NumaInformation.HighestNodeNumber) + { + SetLastError(ERROR_INVALID_PARAMETER); + return FALSE; + } + + /* Return available memory for that node */ + *AvailableBytes = NumaInformation.AvailableMemory[Node]; + return TRUE; } /*

9 years, 4 months

[pschweitzer] 68135: [NDK] Add definition for SYSTEM_NUMA_INFORMATION Source: http://fy5388.blog.163.com/blog/static/564995372009112711571197/

by pschweitzer＠svn.reactos.org

Author: pschweitzer Date: Sun Jun 14 15:49:39 2015 New Revision: 68135 URL: http://svn.reactos.org/svn/reactos?rev=68135&view=rev Log: [NDK] Add definition for SYSTEM_NUMA_INFORMATION Source: http://fy5388.blog.163.com/blog/static/564995372009112711571197/ Modified: trunk/reactos/include/ndk/extypes.h Modified: trunk/reactos/include/ndk/extypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/extypes.h?rev=… ============================================================================== --- trunk/reactos/include/ndk/extypes.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/extypes.h [iso-8859-1] Sun Jun 14 15:49:39 2015 @@ -1369,7 +1369,22 @@ PVOID Buffer; // Same format as in SystemProcessInformation } SYSTEM_SESSION_PROCESS_INFORMATION, *PSYSTEM_SESSION_PROCESS_INFORMATION; -// FIXME: Class 54-97 +// FIXME: Class 54 + +// Class 55 +#define MAXIMUM_NUMA_NODES 16 +typedef struct _SYSTEM_NUMA_INFORMATION +{ + ULONG HighestNodeNumber; + ULONG Reserved; + union + { + ULONGLONG ActiveProcessorsAffinityMask[MAXIMUM_NUMA_NODES]; + ULONGLONG AvailableMemory[MAXIMUM_NUMA_NODES]; + }; +} SYSTEM_NUMA_INFORMATION, *PSYSTEM_NUMA_INFORMATION; + +// FIXME: Class 56-97 // // Hotpatch flags

9 years, 4 months

[hbelusca] 68134: [NTVDM] - Stubplement the font generator functions for text-mode. - Store in plane 2+ the font ONLY in text mode (guilty r68085). Fixes spurious graphics corruption in gfx modes. ...

by hbelusca＠svn.reactos.org

Author: hbelusca Date: Sun Jun 14 15:35:38 2015 New Revision: 68134 URL: http://svn.reactos.org/svn/reactos?rev=68134&view=rev Log: [NTVDM] - Stubplement the font generator functions for text-mode. - Store in plane 2+ the font ONLY in text mode (guilty r68085). Fixes spurious graphics corruption in gfx modes. CORE-9791 CORE-9794 #resolve #comment Should be fixed in r68134. Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.h Modified: trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/bios… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/bios/vidbios.c [iso-8859-1] Sun Jun 14 15:35:38 2015 @@ -2491,25 +2491,30 @@ switch (Bda->CharacterHeight) { /* - * Write the default font to the VGA font plane - * and update the BIOS INT 43h vector (far pointer - * to the character range 00h-...) + * Write the default font to the VGA font plane for text-modes only. + * Update the BIOS INT 43h vector (far pointer to the character range 00h-...). */ case 8: { - VgaWriteFont(0, Font8x8, ARRAYSIZE(Font8x8) / VGA_FONT_CHARACTERS); + if (ModeNumber <= 3) + VgaWriteTextModeFont(0, Font8x8, ARRAYSIZE(Font8x8) / VGA_FONT_CHARACTERS); + ((PULONG)BaseAddress)[0x43] = MAKELONG(FONT_8x8_OFFSET, VIDEO_BIOS_DATA_SEG); break; } case 14: { - VgaWriteFont(0, Font8x14, ARRAYSIZE(Font8x14) / VGA_FONT_CHARACTERS); + if (ModeNumber <= 3) + VgaWriteTextModeFont(0, Font8x14, ARRAYSIZE(Font8x14) / VGA_FONT_CHARACTERS); + ((PULONG)BaseAddress)[0x43] = MAKELONG(FONT_8x14_OFFSET, VIDEO_BIOS_DATA_SEG); break; } case 16: { - VgaWriteFont(0, Font8x16, ARRAYSIZE(Font8x16) / VGA_FONT_CHARACTERS); + if (ModeNumber <= 3) + VgaWriteTextModeFont(0, Font8x16, ARRAYSIZE(Font8x16) / VGA_FONT_CHARACTERS); + ((PULONG)BaseAddress)[0x43] = MAKELONG(FONT_8x16_OFFSET, VIDEO_BIOS_DATA_SEG); break; } @@ -3371,6 +3376,58 @@ { // FIXME: At the moment we support only graphics-mode functions! + /* Load User-specified Patterns (Character Set) for Text Mode */ + case 0x00: + case 0x10: // FIXME: 0x1x performs a full mode reset + { + // FIXME: BL == ?? + + /* Write the default font to the VGA font plane */ + // VgaWriteTextModeFont(0, Font8x8, ARRAYSIZE(Font8x8) / VGA_FONT_CHARACTERS); + + UNIMPLEMENTED; + break; + } + + /* Load ROM Monochrome 8x14 Patterns (Character Set) for Text Mode */ + case 0x01: + case 0x11: // FIXME: 0x1x performs a full mode reset + { + // FIXME: BL == ?? + + /* Write the default font to the VGA font plane */ + VgaWriteTextModeFont(0, Font8x14, ARRAYSIZE(Font8x14) / VGA_FONT_CHARACTERS); + + UNIMPLEMENTED; + break; + } + + /* Load ROM 8x8 Double-dot Patterns (Character Set) for Text Mode */ + case 0x02: + case 0x12: // FIXME: 0x1x performs a full mode reset + { + // FIXME: BL == ?? + + /* Write the default font to the VGA font plane */ + VgaWriteTextModeFont(0, Font8x8, ARRAYSIZE(Font8x8) / VGA_FONT_CHARACTERS); + + UNIMPLEMENTED; + break; + } + + /* Load ROM 8x16 Character Set for Text Mode */ + case 0x04: + case 0x14: // FIXME: 0x1x performs a full mode reset + { + // FIXME: BL == ?? + + /* Write the default font to the VGA font plane */ + VgaWriteTextModeFont(0, Font8x16, ARRAYSIZE(Font8x16) / VGA_FONT_CHARACTERS); + + UNIMPLEMENTED; + break; + } + /* Set User 8x8 Graphics Chars (Setup INT 1Fh Vector) */ case 0x20: { @@ -3383,10 +3440,10 @@ /* Set User Graphics Characters */ case 0x21: { - // /* Write the font to the VGA font plane */ - // VgaWriteFont(0, Font8x8, ARRAYSIZE(Font8x8) / VGA_FONT_CHARACTERS); - - /* Update the BIOS INT 43h vector */ + /* + * Update the BIOS INT 43h vector (far pointer + * to the character range 00h-...) + */ ((PULONG)BaseAddress)[0x43] = MAKELONG(getBP(), getES()); /* Update BDA */ @@ -3407,11 +3464,9 @@ case 0x22: { /* - * Write the default font to the VGA font plane - * and update the BIOS INT 43h vector (far pointer + * Update the BIOS INT 43h vector (far pointer * to the character range 00h-...) */ - VgaWriteFont(0, Font8x14, ARRAYSIZE(Font8x14) / VGA_FONT_CHARACTERS); ((PULONG)BaseAddress)[0x43] = MAKELONG(FONT_8x14_OFFSET, VIDEO_BIOS_DATA_SEG); /* Update BDA */ @@ -3432,11 +3487,9 @@ case 0x23: { /* - * Write the default font to the VGA font plane - * and update the BIOS INT 43h vector (far pointer + * Update the BIOS INT 43h vector (far pointer * to the character range 00h-...) */ - VgaWriteFont(0, Font8x8, ARRAYSIZE(Font8x8) / VGA_FONT_CHARACTERS); ((PULONG)BaseAddress)[0x43] = MAKELONG(FONT_8x8_OFFSET, VIDEO_BIOS_DATA_SEG); /* Update BDA */ @@ -3457,11 +3510,9 @@ case 0x24: { /* - * Write the default font to the VGA font plane - * and update the BIOS INT 43h vector (far pointer - * to the character range 00h-...) + * Update the BIOS INT 43h vector (far pointer + * to the character range 00h-...). */ - VgaWriteFont(0, Font8x16, ARRAYSIZE(Font8x16) / VGA_FONT_CHARACTERS); ((PULONG)BaseAddress)[0x43] = MAKELONG(FONT_8x16_OFFSET, VIDEO_BIOS_DATA_SEG); /* Update BDA */ @@ -3715,7 +3766,6 @@ VOID VidBiosAttachToConsole(VOID) { - // VgaRefreshDisplay(); if (!Attached) { VgaAttachToConsole(); Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.c [iso-8859-1] Sun Jun 14 15:35:38 2015 @@ -22,7 +22,7 @@ /* PRIVATE VARIABLES **********************************************************/ static CONST DWORD MemoryBase[] = { 0xA0000, 0xA0000, 0xB0000, 0xB8000 }; -static CONST DWORD MemorySize[] = { 0x20000, 0x10000, 0x8000, 0x8000 }; +static CONST DWORD MemorySize[] = { 0x20000, 0x10000, 0x08000, 0x08000 }; /* * Activate this line if you want to use the real @@ -2086,7 +2086,7 @@ RtlZeroMemory(VgaMemory, sizeof(VgaMemory)); } -VOID VgaWriteFont(UINT FontNumber, CONST UCHAR* FontData, UINT Height) +VOID VgaWriteTextModeFont(UINT FontNumber, CONST UCHAR* FontData, UINT Height) { UINT i, j; PUCHAR FontMemory = (PUCHAR)&VgaMemory[VGA_BANK_SIZE * VGA_FONT_BANK + (FontNumber * VGA_FONT_SIZE)]; Modified: trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/mvdm/ntvdm/hard… ============================================================================== --- trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/mvdm/ntvdm/hardware/video/vga.h [iso-8859-1] Sun Jun 14 15:35:38 2015 @@ -258,7 +258,7 @@ VOID VgaRefreshDisplay(VOID); VOID FASTCALL VgaReadMemory(ULONG Address, PVOID Buffer, ULONG Size); BOOLEAN FASTCALL VgaWriteMemory(ULONG Address, PVOID Buffer, ULONG Size); -VOID VgaWriteFont(UINT FontNumber, CONST UCHAR *FontData, UINT Height); +VOID VgaWriteTextModeFont(UINT FontNumber, CONST UCHAR *FontData, UINT Height); VOID VgaClearMemory(VOID); BOOLEAN VgaGetDoubleVisionState(PBOOLEAN Horizontal, PBOOLEAN Vertical);

9 years, 4 months

[tfaber] 68133: [MC] - Add missing status codes STATUS_SMARTCARD_CERT_EXPIRED through STATUS_NO_S4U_PROT_SUPPORT. CORE-8373

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jun 14 11:19:02 2015 New Revision: 68133 URL: http://svn.reactos.org/svn/reactos?rev=68133&view=rev Log: [MC] - Add missing status codes STATUS_SMARTCARD_CERT_EXPIRED through STATUS_NO_S4U_PROT_SUPPORT. CORE-8373 Modified: trunk/reactos/include/reactos/mc/ntstatus.mc Modified: trunk/reactos/include/reactos/mc/ntstatus.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/ntstatu… ============================================================================== --- trunk/reactos/include/reactos/mc/ntstatus.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/ntstatus.mc [iso-8859-1] Sun Jun 14 11:19:02 2015 @@ -4251,6 +4251,113 @@ contact your system administrator. . +MessageId=0x38d +Severity=Error +Facility=System +SymbolicName=STATUS_SMARTCARD_CERT_EXPIRED +Language=English +The smartcard certificate used for authentication has expired. Please +contact your system administrator. + +. +MessageId=0x38e +Severity=Error +Facility=System +SymbolicName=STATUS_DRIVER_FAILED_PRIOR_UNLOAD +Language=English +The driver could not be installed because a previous version is still loaded. + +. +MessageId=0x38f +Severity=Error +Facility=System +SymbolicName=STATUS_SMARTCARD_SILENT_CONTEXT +Language=English +The smartcard operation requires user interaction but the context was acquired as silent. + +. +MessageId=0x401 +Severity=Error +Facility=System +SymbolicName=STATUS_PER_USER_TRUST_QUOTA_EXCEEDED +Language=English +The quota for delegated trust creation was exceeded for the current user. + +. +MessageId=0x402 +Severity=Error +Facility=System +SymbolicName=STATUS_ALL_USER_TRUST_QUOTA_EXCEEDED +Language=English +The overall quota for delegated trust creation was exceeded. + +. +MessageId=0x403 +Severity=Error +Facility=System +SymbolicName=STATUS_USER_DELETE_TRUST_QUOTA_EXCEEDED +Language=English +The quota for delegated trust deletion was exceeded for the current user. + +. +MessageId=0x404 +Severity=Error +Facility=System +SymbolicName=STATUS_DS_NAME_NOT_UNIQUE +Language=English +The specified Directory Services name already exists. + +. +MessageId=0x405 +Severity=Error +Facility=System +SymbolicName=STATUS_DS_DUPLICATE_ID_FOUND +Language=English +The requested object could not be retrieved because the specified identifier is not unique. + +. +MessageId=0x406 +Severity=Error +Facility=System +SymbolicName=STATUS_DS_GROUP_CONVERSION_ERROR +Language=English +The Directory Services group cannot be converted. + +. +MessageId=0x407 +Severity=Error +Facility=System +SymbolicName=STATUS_VOLSNAP_PREPARE_HIBERNATE +Language=English +{Volume Shadow Copy Service} +The volume %hs is busy because it is being prepared for hibernation. + +. +MessageId=0x408 +Severity=Error +Facility=System +SymbolicName=STATUS_USER2USER_REQUIRED +Language=English +The Kerberos User to User protocol is required. + +. +MessageId=0x409 +Severity=Error +Facility=System +SymbolicName=STATUS_STACK_BUFFER_OVERRUN +Language=English +An out-of-bounds access to a stack buffer was detected. This indicates an +error in the application that could be exploited by a malicious user. + +. +MessageId=0x40a +Severity=Error +Facility=System +SymbolicName=STATUS_NO_S4U_PROT_SUPPORT +Language=English +The domain controller does not support the Kerberos Service for User protocol. + +. MessageId=0x9898 Severity=Error Facility=System @@ -4259,7 +4366,7 @@ WOW Assertion Error. . -MessageId=0xA000 +MessageId=0xa000 Severity=Error Facility=System SymbolicName=STATUS_INVALID_SIGNATURE @@ -4267,7 +4374,7 @@ The cryptographic signature is invalid. . -MessageId=0xA001 +MessageId=0xa001 Severity=Error Facility=System SymbolicName=STATUS_HMAC_NOT_SUPPORTED @@ -4275,7 +4382,7 @@ Keyed-hash message authentication code (HMAC) is not supported. . -MessageId=0xA010 +MessageId=0xa010 Severity=Error Facility=System SymbolicName=STATUS_IPSEC_QUEUE_OVERFLOW @@ -4283,7 +4390,7 @@ An overflow of the IPSec queue was encountered. . -MessageId=0xA011 +MessageId=0xa011 Severity=Error Facility=System SymbolicName=STATUS_ND_QUEUE_OVERFLOW @@ -4291,7 +4398,7 @@ An overflow of the Neighbor Discovery (NDP) queue was encountered. . -MessageId=0xA012 +MessageId=0xa012 Severity=Error Facility=System SymbolicName=STATUS_HOPLIMIT_EXCEEDED @@ -4299,7 +4406,7 @@ An ICMP "Time Exceeded" error message was received. . -MessageId=0xA013 +MessageId=0xa013 Severity=Error Facility=System SymbolicName=STATUS_PROTOCOL_NOT_SUPPORTED

9 years, 4 months

[tfaber] 68132: [MSAFD] - Fix error mapping for STATUS_INVALID_CONNECTION CORE-9810 CORE-9807 #resolve

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jun 14 08:03:15 2015 New Revision: 68132 URL: http://svn.reactos.org/svn/reactos?rev=68132&view=rev Log: [MSAFD] - Fix error mapping for STATUS_INVALID_CONNECTION CORE-9810 CORE-9807 #resolve Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Sun Jun 14 08:03:15 2015 @@ -341,6 +341,9 @@ return WSAENOBUFS; case STATUS_INVALID_CONNECTION: + return WSAENOTCONN; + + case STATUS_PROTOCOL_NOT_SUPPORTED: return WSAEAFNOSUPPORT; case STATUS_INVALID_ADDRESS: @@ -1375,7 +1378,7 @@ { NtClose(SockEvent); WSPCloseSocket( AcceptSocket, lpErrno ); - MsafdReturnWithErrno( STATUS_INVALID_CONNECTION, lpErrno, 0, NULL ); + MsafdReturnWithErrno( STATUS_PROTOCOL_NOT_SUPPORTED, lpErrno, 0, NULL ); return INVALID_SOCKET; }

9 years, 4 months

[tfaber] 68131: [AFD] - Immediately finish a zero-length request in TdiSendDatagram. This may not be completely correct (should possibly get forwarded to tcpip instead) but is better than asserting...

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jun 14 07:58:58 2015 New Revision: 68131 URL: http://svn.reactos.org/svn/reactos?rev=68131&view=rev Log: [AFD] - Immediately finish a zero-length request in TdiSendDatagram. This may not be completely correct (should possibly get forwarded to tcpip instead) but is better than asserting. CORE-9810 Modified: trunk/reactos/drivers/network/afd/afd/tdi.c Modified: trunk/reactos/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/td… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/tdi.c [iso-8859-1] Sun Jun 14 07:58:58 2015 @@ -1175,6 +1175,12 @@ return STATUS_INVALID_PARAMETER; } + if (BufferLength == 0) + { + AFD_DbgPrint(MID_TRACE, ("Succeeding send with length 0.\n")); + return STATUS_SUCCESS; + } + *Irp = TdiBuildInternalDeviceControlIrp(TDI_SEND_DATAGRAM, /* Sub function */ DeviceObject, /* Device object */ TransportObject, /* File object */

9 years, 4 months

[tfaber] 68130: [AFD] - Don't leave the IRP queued if TdiSendDatagram does not perform its downcall. Complete it instead. CORE-9810

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jun 14 07:54:19 2015 New Revision: 68130 URL: http://svn.reactos.org/svn/reactos?rev=68130&view=rev Log: [AFD] - Don't leave the IRP queued if TdiSendDatagram does not perform its downcall. Complete it instead. CORE-9810 Modified: trunk/reactos/drivers/network/afd/afd/write.c Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Sun Jun 14 07:54:19 2015 @@ -379,13 +379,23 @@ Status = QueueUserModeIrp(FCB, Irp, FUNCTION_SEND); if (Status == STATUS_PENDING) { - TdiSendDatagram(&FCB->SendIrp.InFlightRequest, - FCB->AddressFile.Object, - SendReq->BufferArray[0].buf, - SendReq->BufferArray[0].len, - TargetAddress, - PacketSocketSendComplete, - FCB); + Status = TdiSendDatagram(&FCB->SendIrp.InFlightRequest, + FCB->AddressFile.Object, + SendReq->BufferArray[0].buf, + SendReq->BufferArray[0].len, + TargetAddress, + PacketSocketSendComplete, + FCB); + if (Status != STATUS_PENDING) + { + NT_VERIFY(RemoveHeadList(&FCB->PendingIrpList[FUNCTION_SEND]) == &Irp->Tail.Overlay.ListEntry); + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + (void)IoSetCancelRoutine(Irp, NULL); + UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, FALSE); + UnlockRequest(Irp, IoGetCurrentIrpStackLocation(Irp)); + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + } } ExFreePool( TargetAddress ); @@ -631,13 +641,23 @@ Status = QueueUserModeIrp(FCB, Irp, FUNCTION_SEND); if (Status == STATUS_PENDING) { - TdiSendDatagram(&FCB->SendIrp.InFlightRequest, - FCB->AddressFile.Object, - SendReq->BufferArray[0].buf, - SendReq->BufferArray[0].len, - TargetAddress, - PacketSocketSendComplete, - FCB); + Status = TdiSendDatagram(&FCB->SendIrp.InFlightRequest, + FCB->AddressFile.Object, + SendReq->BufferArray[0].buf, + SendReq->BufferArray[0].len, + TargetAddress, + PacketSocketSendComplete, + FCB); + if (Status != STATUS_PENDING) + { + NT_VERIFY(RemoveHeadList(&FCB->PendingIrpList[FUNCTION_SEND]) == &Irp->Tail.Overlay.ListEntry); + Irp->IoStatus.Status = Status; + Irp->IoStatus.Information = 0; + (void)IoSetCancelRoutine(Irp, NULL); + UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, FALSE); + UnlockRequest(Irp, IoGetCurrentIrpStackLocation(Irp)); + IoCompleteRequest(Irp, IO_NETWORK_INCREMENT); + } } ExFreePool(TargetAddress);

9 years, 4 months

[tfaber] 68129: [AFD] - Fail sends on sockets that are not connected in AfdConnectedSocketWriteData CORE-9810

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jun 14 07:48:28 2015 New Revision: 68129 URL: http://svn.reactos.org/svn/reactos?rev=68129&view=rev Log: [AFD] - Fail sends on sockets that are not connected in AfdConnectedSocketWriteData CORE-9810 Modified: trunk/reactos/drivers/network/afd/afd/write.c Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Sun Jun 14 07:48:28 2015 @@ -442,15 +442,9 @@ AFD_DbgPrint(MID_TRACE,("Socket state %u\n", FCB->State)); if( FCB->State != SOCKET_STATE_CONNECTED ) { - if (!(SendReq->AfdFlags & AFD_OVERLAPPED) && - ((SendReq->AfdFlags & AFD_IMMEDIATE) || (FCB->NonBlocking))) { - AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); - UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); - return UnlockAndMaybeComplete( FCB, STATUS_CANT_WAIT, Irp, 0 ); - } else { - AFD_DbgPrint(MID_TRACE,("Queuing request\n")); - return LeaveIrpUntilLater( FCB, Irp, FUNCTION_SEND ); - } + AFD_DbgPrint(MID_TRACE,("Socket not connected\n")); + UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); + return UnlockAndMaybeComplete( FCB, STATUS_INVALID_CONNECTION, Irp, 0 ); } AFD_DbgPrint(MID_TRACE,("FCB->Send.BytesUsed = %u\n",

9 years, 4 months

[tfaber] 68128: [PSDK] - Add STATUS_INVALID_SIGNATURE through STATUS_PROTOCOL_NOT_SUPPORTED

by tfaber＠svn.reactos.org

Author: tfaber Date: Sun Jun 14 07:44:06 2015 New Revision: 68128 URL: http://svn.reactos.org/svn/reactos?rev=68128&view=rev Log: [PSDK] - Add STATUS_INVALID_SIGNATURE through STATUS_PROTOCOL_NOT_SUPPORTED Modified: trunk/reactos/include/psdk/ntstatus.h trunk/reactos/include/reactos/mc/ntstatus.mc Modified: trunk/reactos/include/psdk/ntstatus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ntstatus.h?re… ============================================================================== --- trunk/reactos/include/psdk/ntstatus.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ntstatus.h [iso-8859-1] Sun Jun 14 07:44:06 2015 @@ -942,6 +942,12 @@ #define STATUS_ASSERTION_FAILURE ((NTSTATUS)0xC0000420L) #define STATUS_CALLBACK_POP_STACK ((NTSTATUS)0xC0000423) #define STATUS_WOW_ASSERTION ((NTSTATUS)0xC0009898) +#define STATUS_INVALID_SIGNATURE ((NTSTATUS)0xC000A000) +#define STATUS_HMAC_NOT_SUPPORTED ((NTSTATUS)0xC000A001) +#define STATUS_IPSEC_QUEUE_OVERFLOW ((NTSTATUS)0xC000A010) +#define STATUS_ND_QUEUE_OVERFLOW ((NTSTATUS)0xC000A011) +#define STATUS_HOPLIMIT_EXCEEDED ((NTSTATUS)0xC000A012) +#define STATUS_PROTOCOL_NOT_SUPPORTED ((NTSTATUS)0xC000A013) #define RPC_NT_INVALID_STRING_BINDING ((NTSTATUS)0xC0020001) #define RPC_NT_WRONG_KIND_OF_BINDING ((NTSTATUS)0xC0020002) Modified: trunk/reactos/include/reactos/mc/ntstatus.mc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/mc/ntstatu… ============================================================================== --- trunk/reactos/include/reactos/mc/ntstatus.mc [iso-8859-1] (original) +++ trunk/reactos/include/reactos/mc/ntstatus.mc [iso-8859-1] Sun Jun 14 07:44:06 2015 @@ -4259,6 +4259,54 @@ WOW Assertion Error. . +MessageId=0xA000 +Severity=Error +Facility=System +SymbolicName=STATUS_INVALID_SIGNATURE +Language=English +The cryptographic signature is invalid. + +. +MessageId=0xA001 +Severity=Error +Facility=System +SymbolicName=STATUS_HMAC_NOT_SUPPORTED +Language=English +Keyed-hash message authentication code (HMAC) is not supported. + +. +MessageId=0xA010 +Severity=Error +Facility=System +SymbolicName=STATUS_IPSEC_QUEUE_OVERFLOW +Language=English +An overflow of the IPSec queue was encountered. + +. +MessageId=0xA011 +Severity=Error +Facility=System +SymbolicName=STATUS_ND_QUEUE_OVERFLOW +Language=English +An overflow of the Neighbor Discovery (NDP) queue was encountered. + +. +MessageId=0xA012 +Severity=Error +Facility=System +SymbolicName=STATUS_HOPLIMIT_EXCEEDED +Language=English +An ICMP "Time Exceeded" error message was received. + +. +MessageId=0xA013 +Severity=Error +Facility=System +SymbolicName=STATUS_PROTOCOL_NOT_SUPPORTED +Language=English +The protocol is not installed. + +. MessageId=0x1 Severity=Error Facility=Debuger

9 years, 4 months

← Newer
1
...
17
18
19
20
21
22
23
...
35
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 June 2015