Ros-diffs January 2012

ros-diffs@reactos.org

19 participants
559 discussions

[tfaber] 54867: [CLASSPNP] - Fix incorrect casts. Patch by Samuel Serapion
by tfaber＠svn.reactos.org 07 Jan '12

07 Jan '12

Author: tfaber Date: Sat Jan 7 18:08:10 2012 New Revision: 54867 URL: http://svn.reactos.org/svn/reactos?rev=54867&view=rev Log: [CLASSPNP] - Fix incorrect casts. Patch by Samuel Serapion Modified: trunk/reactos/drivers/storage/classpnp/class.c trunk/reactos/drivers/storage/classpnp/lock.c Modified: trunk/reactos/drivers/storage/classpnp/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/c… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/class.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/class.c [iso-8859-1] Sat Jan 7 18:08:10 2012 @@ -6564,7 +6564,7 @@ Irp->IoStatus.Status = ClassRetrieveDeviceRelations( Fdo, BusRelations, - (PDEVICE_RELATIONS)&Irp->IoStatus.Information); + (PDEVICE_RELATIONS*)&Irp->IoStatus.Information); InterlockedDecrement(&(fdoExtension->EnumerationInterlock)); return Irp->IoStatus.Status; Modified: trunk/reactos/drivers/storage/classpnp/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/storage/classpnp/l… ============================================================================== --- trunk/reactos/drivers/storage/classpnp/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/storage/classpnp/lock.c [iso-8859-1] Sat Jan 7 18:08:10 2012 @@ -133,7 +133,7 @@ } else { PREMOVE_TRACKING_BLOCK *removeTrackingList = - (PREMOVE_TRACKING_BLOCK)&commonExtension->RemoveTrackingList; + (PREMOVE_TRACKING_BLOCK*)&commonExtension->RemoveTrackingList; KIRQL oldIrql; @@ -219,7 +219,7 @@ #if DBG PREMOVE_TRACKING_BLOCK *listEntry = - (PREMOVE_TRACKING_BLOCK)&commonExtension->RemoveTrackingList; + (PREMOVE_TRACKING_BLOCK*)&commonExtension->RemoveTrackingList; BOOLEAN found = FALSE; @@ -382,7 +382,7 @@ #if DBG PCOMMON_DEVICE_EXTENSION commonExtension = DeviceObject->DeviceExtension; PREMOVE_TRACKING_BLOCK *listEntry = - (PREMOVE_TRACKING_BLOCK)&commonExtension->RemoveTrackingList; + (PREMOVE_TRACKING_BLOCK*)&commonExtension->RemoveTrackingList; KIRQL oldIrql;

1 0

[tfaber] 54866: [LSASRV] - Correctly set return values in LsapGetObjectAttribute [CDMAKE] - Handle out-of-memory condition - Patch by Samuel Serapion
by tfaber＠svn.reactos.org 07 Jan '12

07 Jan '12

Author: tfaber Date: Sat Jan 7 17:45:26 2012 New Revision: 54866 URL: http://svn.reactos.org/svn/reactos?rev=54866&view=rev Log: [LSASRV] - Correctly set return values in LsapGetObjectAttribute [CDMAKE] - Handle out-of-memory condition - Patch by Samuel Serapion Modified: trunk/reactos/dll/win32/lsasrv/database.c trunk/reactos/tools/cdmake/cdmake.c Modified: trunk/reactos/dll/win32/lsasrv/database.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/database.… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/database.c [iso-8859-1] Sat Jan 7 17:45:26 2012 @@ -510,13 +510,13 @@ if (AttributeData == NULL || *AttributeSize == 0) { *AttributeSize = ValueSize; - Status == STATUS_SUCCESS; + Status = STATUS_SUCCESS; goto Done; } else if (*AttributeSize < ValueSize) { *AttributeSize = ValueSize; - Status == STATUS_BUFFER_OVERFLOW; + Status = STATUS_BUFFER_OVERFLOW; goto Done; } Modified: trunk/reactos/tools/cdmake/cdmake.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cdmake/cdmake.c?rev=… ============================================================================== --- trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] (original) +++ trunk/reactos/tools/cdmake/cdmake.c [iso-8859-1] Sat Jan 7 17:45:26 2012 @@ -633,6 +633,8 @@ if (joliet_length > 64) error_exit ( "'%s' is not Joliet, aborting...", filename ); d->joliet_name = malloc(joliet_length + 1); + if (d->joliet_name == NULL) + error_exit("Insufficient memory"); strcpy(d->joliet_name, filename); } }

1 0

[tfaber] 54865: [NTOSKRNL/MM] - Fix memory type comparison in MiScanMemoryDescriptors. Spotted by Samuel Serapion
by tfaber＠svn.reactos.org 07 Jan '12

07 Jan '12

Author: tfaber Date: Sat Jan 7 17:05:41 2012 New Revision: 54865 URL: http://svn.reactos.org/svn/reactos?rev=54865&view=rev Log: [NTOSKRNL/MM] - Fix memory type comparison in MiScanMemoryDescriptors. Spotted by Samuel Serapion Modified: trunk/reactos/ntoskrnl/mm/ARM3/mminit.c 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] Sat Jan 7 17:05:41 2012 @@ -397,9 +397,9 @@ MiNumberDescriptors++; /* Check if this is invisible memory */ - if ((Descriptor->MemoryType == LoaderFirmwarePermanent) && - (Descriptor->MemoryType == LoaderSpecialMemory) && - (Descriptor->MemoryType == LoaderHALCachedMemory) && + if ((Descriptor->MemoryType == LoaderFirmwarePermanent) || + (Descriptor->MemoryType == LoaderSpecialMemory) || + (Descriptor->MemoryType == LoaderHALCachedMemory) || (Descriptor->MemoryType == LoaderBBTMemory)) { /* Skip this descriptor */

1 0

[tkreuzer] 54864: [CMAKE] Add inetcpl to msvc build
by tkreuzer＠svn.reactos.org 07 Jan '12

07 Jan '12

Author: tkreuzer Date: Sat Jan 7 16:31:13 2012 New Revision: 54864 URL: http://svn.reactos.org/svn/reactos?rev=54864&view=rev Log: [CMAKE] Add inetcpl to msvc build Modified: trunk/reactos/dll/cpl/CMakeLists.txt Modified: trunk/reactos/dll/cpl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/cpl/CMakeLists.txt?rev… ============================================================================== --- trunk/reactos/dll/cpl/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/cpl/CMakeLists.txt [iso-8859-1] Sat Jan 7 16:31:13 2012 @@ -4,9 +4,7 @@ add_subdirectory(console)#Warning: console\\/lang/cs-CZ.rc:143: unrecognized escape sequence add_subdirectory(desk) add_subdirectory(hdwwiz) -if(NOT MSVC) - add_subdirectory(inetcpl) # FIXME: msvc build. -endif() +add_subdirectory(inetcpl) add_subdirectory(input) add_subdirectory(intl) add_subdirectory(joy)

1 0

[tkreuzer] 54863: [DDK] Add wsk.h
by tkreuzer＠svn.reactos.org 07 Jan '12

07 Jan '12

Author: tkreuzer Date: Sat Jan 7 16:14:00 2012 New Revision: 54863 URL: http://svn.reactos.org/svn/reactos?rev=54863&view=rev Log: [DDK] Add wsk.h Added: trunk/reactos/include/ddk/wsk.h (with props) Added: trunk/reactos/include/ddk/wsk.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/wsk.h?rev=5486… ============================================================================== --- trunk/reactos/include/ddk/wsk.h (added) +++ trunk/reactos/include/ddk/wsk.h [iso-8859-1] Sat Jan 7 16:14:00 2012 @@ -1,0 +1,617 @@ +/* + * wsk.h + * + * Windows Sockets Kernel-Mode Interface + * + * This file is part of the ReactOS DDK package. + * + * Contributors: + * Timo Kreuzer (timo.kreuzer(a)reactos.org) + * + * THIS SOFTWARE IS NOT COPYRIGHTED + * + * This source code is offered for use in the public domain. You may + * use, modify or distribute it freely. + * + * This code is distributed in the hope that it will be useful but + * WITHOUT ANY WARRANTY. ALL WARRANTIES, EXPRESS OR IMPLIED ARE HEREBY + * DISCLAIMED. This includes but is not limited to warranties of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + */ +#pragma once +#define _WSK_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <netioddk.h> +#include <ws2def.h> +#include <mswsockdef.h> + +extern CONST NPIID NPI_WSK_INTERFACE_ID; + +#define WSKAPI NTAPI + +#define MAKE_WSK_VERSION(Mj, Mn) ((USHORT)((Mj) << 8) | (USHORT)((Mn) & 0xff)) +#define WSK_MAJOR_VERSION(V) ((UCHAR)((V) >> 8)) +#define WSK_MINOR_VERSION(V) ((UCHAR)(V)) +#define WSK_FLAG_AT_DISPATCH_LEVEL 0x00000008 +#define WSK_FLAG_RELEASE_ASAP 0x00000002 +#define WSK_FLAG_ENTIRE_MESSAGE 0x00000004 +#define WSK_FLAG_ABORTIVE 0x00000001 +#define WSK_FLAG_BASIC_SOCKET 0x00000000 +#define WSK_FLAG_LISTEN_SOCKET 0x00000001 +#define WSK_FLAG_CONNECTION_SOCKET 0x00000002 +#define WSK_FLAG_DATAGRAM_SOCKET 0x00000004 +#define WSK_TRANSPORT_LIST_QUERY 2 +#define WSK_TRANSPORT_LIST_CHANGE 3 +#define WSK_CACHE_SD 4 +#define WSK_RELEASE_SD 5 +#define WSK_TDI_DEVICENAME_MAPPING 6 +#define WSK_SET_STATIC_EVENT_CALLBACKS 7 +#define WSK_TDI_BEHAVIOR 8 +#define WSK_TDI_BEHAVIOR_BYPASS_TDI 0x00000001 +#define SO_WSK_SECURITY (WSK_SO_BASE+1) +#define SO_WSK_EVENT_CALLBACK (WSK_SO_BASE+2) +#define WSK_EVENT_RECEIVE_FROM 0x00000100 +#define WSK_EVENT_ACCEPT 0x00000200 +#define WSK_EVENT_SEND_BACKLOG 0x00000010 +#define WSK_EVENT_RECEIVE 0x00000040 +#define WSK_EVENT_DISCONNECT 0x00000080 +#define WSK_EVENT_DISABLE 0x80000000 +#define SIO_WSK_SET_REMOTE_ADDRESS _WSAIOW(IOC_WSK,0x1) +#define SIO_WSK_REGISTER_EXTENSION _WSAIORW(IOC_WSK,0x2) +#define SIO_WSK_QUERY_IDEAL_SEND_BACKLOG _WSAIOR(IOC_WSK,0x3) +#define SIO_WSK_QUERY_RECEIVE_BACKLOG _WSAIOR(IOC_WSK,0x4) +#define SIO_WSK_QUERY_INSPECT_ID _WSAIOR(IOC_WSK,0x5) +#define SIO_WSK_SET_SENDTO_ADDRESS _WSAIOW(IOC_WSK,0x6) +#define WSK_FLAG_NODELAY 0x00000002 +#define WSK_FLAG_WAITALL 0x00000002 +#define WSK_FLAG_DRAIN 0x00000004 +#define WSK_NO_WAIT 0 +#define WSK_INFINITE_WAIT 0xffffffff + +typedef enum +{ + WskInspectReject, + WskInspectAccept, + WskInspectPend, + WskInspectMax +} WSK_INSPECT_ACTION, *PWSK_INSPECT_ACTION; + +typedef enum +{ + WskSetOption, + WskGetOption, + WskIoctl, + WskControlMax +} WSK_CONTROL_SOCKET_TYPE, *PWSK_CONTROL_SOCKET_TYPE; + +typedef PVOID PWSK_CLIENT; + +typedef struct _WSK_SOCKET +{ + const VOID *Dispatch; +} WSK_SOCKET, *PWSK_SOCKET; + +typedef struct _WSK_BUF +{ + PMDL Mdl; + ULONG Offset; + SIZE_T Length; +} WSK_BUF, *PWSK_BUF; + +typedef struct _WSK_INSPECT_ID +{ + ULONG_PTR Key; + ULONG SerialNumber; +} WSK_INSPECT_ID, *PWSK_INSPECT_ID; + +typedef struct _WSK_DATAGRAM_INDICATION +{ + struct _WSK_DATAGRAM_INDICATION *Next; + WSK_BUF Buffer; + _Field_size_bytes_(ControlInfoLength) PCMSGHDR ControlInfo; + ULONG ControlInfoLength; + PSOCKADDR RemoteAddress; +} WSK_DATAGRAM_INDICATION, *PWSK_DATAGRAM_INDICATION; + +typedef +_Must_inspect_result_ +NTSTATUS +(WSKAPI * PFN_WSK_RECEIVE_FROM_EVENT)( + _In_opt_ PVOID SocketContext, + _In_ ULONG Flags, + _In_opt_ PWSK_DATAGRAM_INDICATION DataIndication); + +typedef struct _WSK_DATA_INDICATION +{ + struct _WSK_DATA_INDICATION *Next; + WSK_BUF Buffer; +} WSK_DATA_INDICATION, *PWSK_DATA_INDICATION; + +typedef +_Must_inspect_result_ +NTSTATUS +(WSKAPI * PFN_WSK_RECEIVE_EVENT)( + _In_opt_ PVOID SocketContext, + _In_ ULONG Flags, + _In_opt_ PWSK_DATA_INDICATION DataIndication, + _In_ SIZE_T BytesIndicated, + _Inout_ SIZE_T *BytesAccepted); + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_DISCONNECT_EVENT)( + _In_opt_ PVOID SocketContext, + _In_ ULONG Flags); + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_SEND_BACKLOG_EVENT)( + _In_opt_ PVOID SocketContext, + _In_ SIZE_T IdealBacklogSize); + +typedef struct _WSK_CLIENT_CONNECTION_DISPATCH +{ + PFN_WSK_RECEIVE_EVENT WskReceiveEvent; + PFN_WSK_DISCONNECT_EVENT WskDisconnectEvent; + PFN_WSK_SEND_BACKLOG_EVENT WskSendBacklogEvent; +} WSK_CLIENT_CONNECTION_DISPATCH, *PWSK_CLIENT_CONNECTION_DISPATCH; + +typedef +_Must_inspect_result_ +_At_(AcceptSocket, __drv_aliasesMem) +NTSTATUS +(WSKAPI * PFN_WSK_ACCEPT_EVENT)( + _In_opt_ PVOID SocketContext, + _In_ ULONG Flags, + _In_ PSOCKADDR LocalAddress, + _In_ PSOCKADDR RemoteAddress, + _In_opt_ PWSK_SOCKET AcceptSocket, + _Outptr_result_maybenull_ PVOID *AcceptSocketContext, + _Outptr_result_maybenull_ const WSK_CLIENT_CONNECTION_DISPATCH **AcceptSocketDispatch); + +typedef +_At_(Irp->IoStatus.Information, __drv_allocatesMem(Mem)) +NTSTATUS +(WSKAPI * PFN_WSK_SOCKET_CONNECT)( + _In_ PWSK_CLIENT Client, + _In_ USHORT SocketType, + _In_ ULONG Protocol, + _In_ PSOCKADDR LocalAddress, + _In_ PSOCKADDR RemoteAddress, + _Reserved_ ULONG Flags, + _In_opt_ PVOID SocketContext, + _In_opt_ const WSK_CLIENT_CONNECTION_DISPATCH *Dispatch, + _In_opt_ PEPROCESS OwningProcess, + _In_opt_ PETHREAD OwningThread, + _In_opt_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _Inout_ PIRP Irp); + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_CONTROL_SOCKET)( + _In_ PWSK_SOCKET Socket, + _In_ WSK_CONTROL_SOCKET_TYPE RequestType, + _In_ ULONG ControlCode, + _In_ ULONG Level, + _In_ SIZE_T InputSize, + _In_reads_bytes_opt_(InputSize) PVOID InputBuffer, + _In_ SIZE_T OutputSize, + _Out_writes_bytes_opt_(OutputSize) PVOID OutputBuffer, + _Out_opt_ SIZE_T *OutputSizeReturned, + _Inout_opt_ PIRP Irp); + +typedef +_At_(Socket, __drv_freesMem(Mem)) +NTSTATUS +(WSKAPI * PFN_WSK_CLOSE_SOCKET)( + _In_ PWSK_SOCKET Socket, + _Inout_ PIRP Irp); + +typedef struct _WSK_PROVIDER_BASIC_DISPATCH +{ + PFN_WSK_CONTROL_SOCKET WskControlSocket; + PFN_WSK_CLOSE_SOCKET WskCloseSocket; +} WSK_PROVIDER_BASIC_DISPATCH, *PWSK_PROVIDER_BASIC_DISPATCH; + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_BIND) ( + _In_ PWSK_SOCKET Socket, + _In_ PSOCKADDR LocalAddress, + _Reserved_ ULONG Flags, + _Inout_ PIRP Irp); + +typedef +_At_(Irp->IoStatus.Information, __drv_allocatesMem(Mem)) +NTSTATUS +(WSKAPI * PFN_WSK_ACCEPT)( + _In_ PWSK_SOCKET ListenSocket, + _Reserved_ ULONG Flags, + _In_opt_ PVOID AcceptSocketContext, + _In_opt_ const WSK_CLIENT_CONNECTION_DISPATCH *AcceptSocketDispatch, + _Out_opt_ PSOCKADDR LocalAddress, + _Out_opt_ PSOCKADDR RemoteAddress, + _Inout_ PIRP Irp); + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_INSPECT_COMPLETE)( + _In_ PWSK_SOCKET ListenSocket, + _In_ PWSK_INSPECT_ID InspectID, + _In_ WSK_INSPECT_ACTION Action, + _Inout_ PIRP Irp); + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_GET_LOCAL_ADDRESS)( + _In_ PWSK_SOCKET Socket, + _Out_ PSOCKADDR LocalAddress, + _Inout_ PIRP Irp); + +typedef struct _WSK_PROVIDER_LISTEN_DISPATCH +{ +#ifdef __cplusplus + WSK_PROVIDER_BASIC_DISPATCH Basic; +#else + WSK_PROVIDER_BASIC_DISPATCH; +#endif + PFN_WSK_BIND WskBind; + PFN_WSK_ACCEPT WskAccept; + PFN_WSK_INSPECT_COMPLETE WskInspectComplete; + PFN_WSK_GET_LOCAL_ADDRESS WskGetLocalAddress; +} WSK_PROVIDER_LISTEN_DISPATCH, *PWSK_PROVIDER_LISTEN_DISPATCH; + +#if (NTDDI_VERSION >= NTDDI_WIN8) +typedef struct _WSK_BUF_LIST { + struct _WSK_BUF_LIST *Next; + WSK_BUF Buffer; +} WSK_BUF_LIST, *PWSK_BUF_LIST; + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_SEND_MESSAGES)( + _In_ PWSK_SOCKET Socket, + _In_ PWSK_BUF_LIST BufferList, + _Reserved_ ULONG Flags, + _In_opt_ PSOCKADDR RemoteAddress, + _In_ ULONG ControlInfoLength, + _In_reads_bytes_opt_(ControlInfoLength) PCMSGHDR ControlInfo, + _Inout_ PIRP Irp); +#endif /* (NTDDI_VERSION >= NTDDI_WIN8) */ + +typedef struct _WSK_PROVIDER_DATAGRAM_DISPATCH +{ +#ifdef __cplusplus + WSK_PROVIDER_BASIC_DISPATCH Basic; +#else + WSK_PROVIDER_BASIC_DISPATCH; +#endif + PFN_WSK_BIND WskBind; + PFN_WSK_SEND_TO WskSendTo; + PFN_WSK_RECEIVE_FROM WskReceiveFrom; + PFN_WSK_RELEASE_DATAGRAM_INDICATION_LIST WskRelease; + PFN_WSK_GET_LOCAL_ADDRESS WskGetLocalAddress; +#if (NTDDI_VERSION >= NTDDI_WIN8) + PFN_WSK_SEND_MESSAGES WskSendMessages; +#endif +} WSK_PROVIDER_DATAGRAM_DISPATCH, *PWSK_PROVIDER_DATAGRAM_DISPATCH; + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_CONNECT) ( + _In_ PWSK_SOCKET Socket, + _In_ PSOCKADDR RemoteAddress, + _Reserved_ ULONG Flags, + _Inout_ PIRP Irp); + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_GET_REMOTE_ADDRESS)( + _In_ PWSK_SOCKET Socket, + _Out_ PSOCKADDR RemoteAddress, + _Inout_ PIRP Irp); + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_SEND)( + _In_ PWSK_SOCKET Socket, + _In_ PWSK_BUF Buffer, + _In_ ULONG Flags, + _Inout_ PIRP Irp); + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_RECEIVE)( + _In_ PWSK_SOCKET Socket, + _In_ PWSK_BUF Buffer, + _In_ ULONG Flags, + _Inout_ PIRP Irp); + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_DISCONNECT)( + _In_ PWSK_SOCKET Socket, + _In_opt_ PWSK_BUF Buffer, + _In_ ULONG Flags, + _Inout_ PIRP Irp); + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_RELEASE_DATA_INDICATION_LIST)( + _In_ PWSK_SOCKET Socket, + _In_ PWSK_DATA_INDICATION DataIndication); + +typedef struct _WSK_PROVIDER_CONNECTION_DISPATCH +{ +#ifdef __cplusplus + WSK_PROVIDER_BASIC_DISPATCH Basic; +#else + WSK_PROVIDER_BASIC_DISPATCH; +#endif + PFN_WSK_BIND WskBind; + PFN_WSK_CONNECT WskConnect; + PFN_WSK_GET_LOCAL_ADDRESS WskGetLocalAddress; + PFN_WSK_GET_REMOTE_ADDRESS WskGetRemoteAddress; + PFN_WSK_SEND WskSend; + PFN_WSK_RECEIVE WskReceive; + PFN_WSK_DISCONNECT WskDisconnect; + PFN_WSK_RELEASE_DATA_INDICATION_LIST WskRelease; +} WSK_PROVIDER_CONNECTION_DISPATCH, *PWSK_PROVIDER_CONNECTION_DISPATCH; + +typedef +_Must_inspect_result_ +WSK_INSPECT_ACTION +(WSKAPI * PFN_WSK_INSPECT_EVENT)( + _In_opt_ PVOID SocketContext, + _In_ PSOCKADDR LocalAddress, + _In_ PSOCKADDR RemoteAddress, + _In_opt_ PWSK_INSPECT_ID InspectID); + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_ABORT_EVENT) ( + _In_opt_ PVOID SocketContext, + _In_ PWSK_INSPECT_ID InspectID); + +typedef +_At_(Irp->IoStatus.Information, __drv_allocatesMem(Mem)) +NTSTATUS +(WSKAPI * PFN_WSK_SOCKET)( + _In_ PWSK_CLIENT Client, + _In_ ADDRESS_FAMILY AddressFamily, + _In_ USHORT SocketType, + _In_ ULONG Protocol, + _In_ ULONG Flags, + _In_opt_ PVOID SocketContext, + _In_opt_ const VOID *Dispatch, + _In_opt_ PEPROCESS OwningProcess, + _In_opt_ PETHREAD OwningThread, + _In_opt_ PSECURITY_DESCRIPTOR SecurityDescriptor, + _Inout_ PIRP Irp); + +typedef struct _WSK_TDI_MAP +{ + USHORT SocketType; + ADDRESS_FAMILY AddressFamily; + ULONG Protocol; + PCWSTR TdiDeviceName; +} WSK_TDI_MAP, *PWSK_TDI_MAP; + +typedef struct _WSK_TDI_MAP_INFO +{ + const ULONG ElementCount; + _Field_size_(ElementCount) const WSK_TDI_MAP *Map; +} WSK_TDI_MAP_INFO, *PWSK_TDI_MAP_INFO; + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_CONTROL_CLIENT)( + _In_ PWSK_CLIENT Client, + _In_ ULONG ControlCode, + _In_ SIZE_T InputSize, + _In_reads_bytes_opt_(InputSize) PVOID InputBuffer, + _In_ SIZE_T OutputSize, + _Out_writes_bytes_opt_(OutputSize) PVOID OutputBuffer, + _Out_opt_ SIZE_T *OutputSizeReturned, + _Inout_opt_ PIRP Irp); + +#if (NTDDI_VERSION >= NTDDI_WIN7) + +typedef +_At_(*Result, __drv_allocatesMem(Mem)) +NTSTATUS +(WSKAPI * PFN_WSK_GET_ADDRESS_INFO)( + _In_ PWSK_CLIENT Client, + _In_opt_ PUNICODE_STRING NodeName, + _In_opt_ PUNICODE_STRING ServiceName, + _In_opt_ ULONG NameSpace, + _In_opt_ GUID *Provider, + _In_opt_ PADDRINFOEXW Hints, + _Outptr_ PADDRINFOEXW *Result, + _In_opt_ PEPROCESS OwningProcess, + _In_opt_ PETHREAD OwningThread, + _Inout_ PIRP Irp); + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_GET_NAME_INFO)( + _In_ PWSK_CLIENT Client, + _In_ PSOCKADDR SockAddr, + _In_ ULONG SockAddrLength, + _Out_opt_ PUNICODE_STRING NodeName, + _Out_opt_ PUNICODE_STRING ServiceName, + _In_ ULONG Flags, + _In_opt_ PEPROCESS OwningProcess, + _In_opt_ PETHREAD OwningThread, + _Inout_ PIRP Irp); + +typedef +_At_(AddrInfo, __drv_freesMem(Mem)) +VOID +(WSKAPI * PFN_WSK_FREE_ADDRESS_INFO)( + _In_ PWSK_CLIENT Client, + _In_ PADDRINFOEXW AddrInfo); + +#endif /* if (NTDDI_VERSION >= NTDDI_WIN7) */ + +typedef struct _WSK_EVENT_CALLBACK_CONTROL +{ + PNPIID NpiId; + ULONG EventMask; +} WSK_EVENT_CALLBACK_CONTROL, *PWSK_EVENT_CALLBACK_CONTROL; + +typedef struct _WSK_EXTENSION_CONTROL_IN +{ + PNPIID NpiId; + PVOID ClientContext; + const VOID* ClientDispatch; +} WSK_EXTENSION_CONTROL_IN, *PWSK_EXTENSION_CONTROL_IN; + +typedef struct _WSK_EXTENSION_CONTROL_OUT +{ + PVOID ProviderContext; + const VOID* ProviderDispatch; +} WSK_EXTENSION_CONTROL_OUT, *PWSK_EXTENSION_CONTROL_OUT; + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_SEND_TO)( + _In_ PWSK_SOCKET Socket, + _In_ PWSK_BUF Buffer, + _Reserved_ ULONG Flags, + _In_opt_ PSOCKADDR RemoteAddress, + _In_ ULONG ControlInfoLength, + _In_reads_bytes_opt_(ControlInfoLength) PCMSGHDR ControlInfo, + _Inout_ PIRP Irp); + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_RECEIVE_FROM)( + _In_ PWSK_SOCKET Socket, + _In_ PWSK_BUF Buffer, + _Reserved_ ULONG Flags, + _Out_opt_ PSOCKADDR RemoteAddress, + _Inout_ PULONG ControlLength, + _Out_writes_bytes_opt_(*ControlLength) PCMSGHDR ControlInfo, + _Out_opt_ PULONG ControlFlags, + _Inout_ PIRP Irp); + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_RELEASE_DATAGRAM_INDICATION_LIST)( + _In_ PWSK_SOCKET Socket, + _In_ PWSK_DATAGRAM_INDICATION DatagramIndication); + +typedef +NTSTATUS +(WSKAPI * PFN_WSK_CLIENT_EVENT)( + _In_opt_ PVOID ClientContext, + _In_ ULONG EventType, + _In_reads_bytes_opt_(InformationLength) PVOID Information, + _In_ SIZE_T InformationLength); + +typedef struct _WSK_CLIENT_DISPATCH +{ + USHORT Version; + USHORT Reserved; + PFN_WSK_CLIENT_EVENT WskClientEvent; +} WSK_CLIENT_DISPATCH, *PWSK_CLIENT_DISPATCH; + +typedef struct _WSK_CLIENT_LISTEN_DISPATCH +{ + PFN_WSK_ACCEPT_EVENT WskAcceptEvent; + PFN_WSK_INSPECT_EVENT WskInspectEvent; + PFN_WSK_ABORT_EVENT WskAbortEvent; +} WSK_CLIENT_LISTEN_DISPATCH, *PWSK_CLIENT_LISTEN_DISPATCH; + +typedef struct _WSK_CLIENT_DATAGRAM_DISPATCH +{ + PFN_WSK_RECEIVE_FROM_EVENT WskReceiveFromEvent; +} WSK_CLIENT_DATAGRAM_DISPATCH, *PWSK_CLIENT_DATAGRAM_DISPATCH; + +typedef struct _WSK_PROVIDER_DISPATCH +{ + USHORT Version; + USHORT Reserved; + PFN_WSK_SOCKET WskSocket; + PFN_WSK_SOCKET_CONNECT WskSocketConnect; + PFN_WSK_CONTROL_CLIENT WskControlClient; +#if (NTDDI_VERSION >= NTDDI_WIN7) + PFN_WSK_GET_ADDRESS_INFO WskGetAddressInfo; + PFN_WSK_FREE_ADDRESS_INFO WskFreeAddressInfo; + PFN_WSK_GET_NAME_INFO WskGetNameInfo; +#endif +} WSK_PROVIDER_DISPATCH, *PWSK_PROVIDER_DISPATCH; + + +typedef struct _WSK_CLIENT_NPI +{ + PVOID ClientContext; + const WSK_CLIENT_DISPATCH *Dispatch; +} WSK_CLIENT_NPI, *PWSK_CLIENT_NPI; + +typedef struct _WSK_PROVIDER_NPI +{ + PWSK_CLIENT Client; + const WSK_PROVIDER_DISPATCH *Dispatch; +} WSK_PROVIDER_NPI, *PWSK_PROVIDER_NPI; + +typedef struct _WSK_REGISTRATION +{ + ULONGLONG ReservedRegistrationState; + PVOID ReservedRegistrationContext; + KSPIN_LOCK ReservedRegistrationLock; +} WSK_REGISTRATION, *PWSK_REGISTRATION; + +typedef struct _WSK_PROVIDER_CHARACTERISTICS +{ + USHORT HighestVersion; + USHORT LowestVersion; +} WSK_PROVIDER_CHARACTERISTICS, *PWSK_PROVIDER_CHARACTERISTICS; + +typedef struct _WSK_TRANSPORT +{ + USHORT Version; + USHORT SocketType; + ULONG Protocol; + ADDRESS_FAMILY AddressFamily; + GUID ProviderId; +} WSK_TRANSPORT, *PWSK_TRANSPORT; + +_Must_inspect_result_ +NTSTATUS +WskRegister( + _In_ PWSK_CLIENT_NPI WskClientNpi, + _Out_ PWSK_REGISTRATION WskRegistration); + +_Must_inspect_result_ +NTSTATUS +WskCaptureProviderNPI( + _In_ PWSK_REGISTRATION WskRegistration, + _In_ ULONG WaitTimeout, + _Out_ PWSK_PROVIDER_NPI WskProviderNpi); + +VOID +WskReleaseProviderNPI( + _In_ PWSK_REGISTRATION WskRegistration); + +_Must_inspect_result_ +NTSTATUS +WskQueryProviderCharacteristics( + _In_ PWSK_REGISTRATION WskRegistration, + _Out_ PWSK_PROVIDER_CHARACTERISTICS WskProviderCharacteristics); + +VOID +WskDeregister( + _In_ PWSK_REGISTRATION WskRegistration); + +#ifdef __cplusplus +} +#endif + + Propchange: trunk/reactos/include/ddk/wsk.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 54862: [CMAKE] add _PREFAST_ option for amd64, too
by tkreuzer＠svn.reactos.org 07 Jan '12

07 Jan '12

Author: tkreuzer Date: Sat Jan 7 16:05:25 2012 New Revision: 54862 URL: http://svn.reactos.org/svn/reactos?rev=54862&view=rev Log: [CMAKE] add _PREFAST_ option for amd64, too Modified: trunk/reactos/cmake/config-amd64.cmake Modified: trunk/reactos/cmake/config-amd64.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/config-amd64.cmake?r… ============================================================================== --- trunk/reactos/cmake/config-amd64.cmake [iso-8859-1] (original) +++ trunk/reactos/cmake/config-amd64.cmake [iso-8859-1] Sat Jan 7 16:05:25 2012 @@ -41,3 +41,8 @@ set(USERMODE TRUE CACHE BOOL "Whether to compile any usermode parts. This is while kernel mode is under heavy development and usermode part not relevant for bootcd.") + +if(MSVC) +set(_PREFAST_ FALSE CACHE BOOL +"Whether to enable PREFAST while compiling.") +endif()

1 0

[janderwald] 54861: [WDMAUD] - Improve error check
by janderwald＠svn.reactos.org 07 Jan '12

07 Jan '12

Author: janderwald Date: Sat Jan 7 15:42:53 2012 New Revision: 54861 URL: http://svn.reactos.org/svn/reactos?rev=54861&view=rev Log: [WDMAUD] - Improve error check Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c Modified: trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/wdm/audio/legacy/w… ============================================================================== --- trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] (original) +++ trunk/reactos/drivers/wdm/audio/legacy/wdmaud/control.c [iso-8859-1] Sat Jan 7 15:42:53 2012 @@ -334,7 +334,7 @@ return SetIrpIoStatus(Irp, STATUS_INVALID_PARAMETER, 0); } - if (!IoStack->FileObject) + if (!IoStack->FileObject || !IoStack->FileObject->FsContext) { /* file object parameter */ DPRINT1("Error: file object is not attached\n");

1 0

[janderwald] 54860: [SHELL32] - Check if querying shell details failed
by janderwald＠svn.reactos.org 07 Jan '12

07 Jan '12

Author: janderwald Date: Sat Jan 7 15:40:27 2012 New Revision: 54860 URL: http://svn.reactos.org/svn/reactos?rev=54860&view=rev Log: [SHELL32] - Check if querying shell details failed Modified: trunk/reactos/dll/win32/shell32/shlview.cpp Modified: trunk/reactos/dll/win32/shell32/shlview.cpp URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/shell32/shlview.… ============================================================================== --- trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] (original) +++ trunk/reactos/dll/win32/shell32/shlview.cpp [iso-8859-1] Sat Jan 7 15:40:27 2012 @@ -1682,7 +1682,12 @@ if (pSF2Parent) { SHELLDETAILS sd; - pSF2Parent->GetDetailsOf(pidl, lpdi->item.iSubItem, &sd); + if (FAILED(pSF2Parent->GetDetailsOf(pidl, lpdi->item.iSubItem, &sd))) + { + FIXME("failed to get details\n"); + break; + } + if (lpnmh->code == LVN_GETDISPINFOA) { /* shouldn't happen */

1 0

[janderwald] 54859: [USB-BRINGUP] - Sync obname.c with trunk - Implement ObIsDosDeviceLocallyMapped function
by janderwald＠svn.reactos.org 07 Jan '12

07 Jan '12

Author: janderwald Date: Sat Jan 7 15:39:22 2012 New Revision: 54859 URL: http://svn.reactos.org/svn/reactos?rev=54859&view=rev Log: [USB-BRINGUP] - Sync obname.c with trunk - Implement ObIsDosDeviceLocallyMapped function Modified: branches/usb-bringup/ntoskrnl/ob/obname.c Modified: branches/usb-bringup/ntoskrnl/ob/obname.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/ntoskrnl/ob/obname.… ============================================================================== --- branches/usb-bringup/ntoskrnl/ob/obname.c [iso-8859-1] (original) +++ branches/usb-bringup/ntoskrnl/ob/obname.c [iso-8859-1] Sat Jan 7 15:39:22 2012 @@ -113,24 +113,28 @@ NTAPI ObDereferenceDeviceMap(IN PEPROCESS Process) { - //KIRQL OldIrql; - PDEVICE_MAP DeviceMap = Process->DeviceMap; - - /* FIXME: We don't use Process Devicemaps yet */ + PDEVICE_MAP DeviceMap; + + /* Get the pointer to this process devicemap and reset it + holding devicemap lock */ + KeAcquireGuardedMutex(&ObpDeviceMapLock); + DeviceMap = Process->DeviceMap; + Process->DeviceMap = NULL; + KeReleaseGuardedMutex(&ObpDeviceMapLock); + + /* Continue only if there is a devicemap to dereference */ if (DeviceMap) { - /* FIXME: Acquire the DeviceMap Spinlock */ - // KeAcquireSpinLock(DeviceMap->Lock, &OldIrql); + KeAcquireGuardedMutex(&ObpDeviceMapLock); /* Delete the device map link and dereference it */ - Process->DeviceMap = NULL; if (--DeviceMap->ReferenceCount) { /* Nobody is referencing it anymore, unlink the DOS directory */ DeviceMap->DosDevicesDirectory->DeviceMap = NULL; - /* FIXME: Release the DeviceMap Spinlock */ - // KeReleasepinLock(DeviceMap->Lock, OldIrql); + /* Release the devicemap lock */ + KeReleaseGuardedMutex(&ObpDeviceMapLock); /* Dereference the DOS Devices Directory and free the Device Map */ ObDereferenceObject(DeviceMap->DosDevicesDirectory); @@ -138,8 +142,8 @@ } else { - /* FIXME: Release the DeviceMap Spinlock */ - // KeReleasepinLock(DeviceMap->Lock, OldIrql); + /* Release the devicemap lock */ + KeReleaseGuardedMutex(&ObpDeviceMapLock); } } } @@ -540,7 +544,7 @@ } /* Reparse */ - while (Reparse) + while (Reparse && MaxReparse) { /* Get the name */ RemainingName = *ObjectName; @@ -690,7 +694,7 @@ ObjectHeader))) { /* Either couldn't allocate the name, or insert failed */ - if (NewName) ExFreePool(NewName); + if (NewName) ExFreePoolWithTag(NewName, OB_NAME_TAG); /* Fail due to memory reasons */ Status = STATUS_INSUFFICIENT_RESOURCES; @@ -791,6 +795,7 @@ { /* Reparse again */ Reparse = TRUE; + --MaxReparse; /* Start over from root if we got sent back there */ if ((Status == STATUS_REPARSE_OBJECT) || @@ -981,6 +986,7 @@ ULONG NameSize; PWCH ObjectName; BOOLEAN ObjectIsNamed; + NTSTATUS Status = STATUS_SUCCESS; /* Get the Kernel Meta-Structures */ ObjectHeader = OBJECT_TO_OBJECT_HEADER(Object); @@ -989,28 +995,57 @@ /* Check if a Query Name Procedure is available */ if (ObjectHeader->Type->TypeInfo.QueryNameProcedure) { - /* Call the procedure */ + /* Call the procedure inside SEH */ ObjectIsNamed = ((LocalInfo) && (LocalInfo->Name.Length > 0)); - return ObjectHeader->Type->TypeInfo.QueryNameProcedure(Object, + + _SEH2_TRY + { + Status = ObjectHeader->Type->TypeInfo.QueryNameProcedure(Object, ObjectIsNamed, ObjectNameInfo, Length, ReturnLength, KernelMode); + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + return Status; } /* Check if the object doesn't even have a name */ if (!(LocalInfo) || !(LocalInfo->Name.Buffer)) { - /* We're returning the name structure */ - *ReturnLength = sizeof(OBJECT_NAME_INFORMATION); - - /* Check if we were given enough space */ - if (*ReturnLength > Length) return STATUS_INFO_LENGTH_MISMATCH; - - /* Return an empty buffer */ - RtlInitEmptyUnicodeString(&ObjectNameInfo->Name, NULL, 0); - return STATUS_SUCCESS; + Status = STATUS_SUCCESS; + + _SEH2_TRY + { + /* We're returning the name structure */ + *ReturnLength = sizeof(OBJECT_NAME_INFORMATION); + + /* Check if we were given enough space */ + if (*ReturnLength > Length) + { + Status = STATUS_INFO_LENGTH_MISMATCH; + } + else + { + /* Return an empty buffer */ + RtlInitEmptyUnicodeString(&ObjectNameInfo->Name, NULL, 0); + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; + + return Status; } /* @@ -1020,123 +1055,136 @@ * enough right at the beginning, not work our way through * and find out at the end */ - if (Object == ObpRootDirectoryObject) - { - /* Size of the '\' string */ - NameSize = sizeof(OBJ_NAME_PATH_SEPARATOR); - } - else - { - /* Get the Object Directory and add name of Object */ - ParentDirectory = LocalInfo->Directory; - NameSize = sizeof(OBJ_NAME_PATH_SEPARATOR) + LocalInfo->Name.Length; - - /* Loop inside the directory to get the top-most one (meaning root) */ - while ((ParentDirectory != ObpRootDirectoryObject) && (ParentDirectory)) - { - /* Get the Name Information */ - LocalInfo = OBJECT_HEADER_TO_NAME_INFO( - OBJECT_TO_OBJECT_HEADER(ParentDirectory)); - - /* Add the size of the Directory Name */ - if (LocalInfo && LocalInfo->Directory) - { - /* Size of the '\' string + Directory Name */ - NameSize += sizeof(OBJ_NAME_PATH_SEPARATOR) + - LocalInfo->Name.Length; - - /* Move to next parent Directory */ - ParentDirectory = LocalInfo->Directory; - } - else - { - /* Directory with no name. We append "...\" */ - NameSize += sizeof(L"...") + sizeof(OBJ_NAME_PATH_SEPARATOR); - break; - } - } - } - - /* Finally, add the name of the structure and the null char */ - *ReturnLength = NameSize + - sizeof(OBJECT_NAME_INFORMATION) + - sizeof(UNICODE_NULL); - - /* Check if we were given enough space */ - if (*ReturnLength > Length) return STATUS_INFO_LENGTH_MISMATCH; - - /* - * Now we will actually create the name. We work backwards because - * it's easier to start off from the Name we have and walk up the - * parent directories. We use the same logic as Name Length calculation. - */ - LocalInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); - ObjectName = (PWCH)((ULONG_PTR)ObjectNameInfo + *ReturnLength); - *--ObjectName = UNICODE_NULL; - - /* Check if the object is actually the Root directory */ - if (Object == ObpRootDirectoryObject) - { - /* This is already the Root Directory, return "\\" */ - *--ObjectName = OBJ_NAME_PATH_SEPARATOR; - ObjectNameInfo->Name.Length = (USHORT)NameSize; - ObjectNameInfo->Name.MaximumLength = (USHORT)(NameSize + - sizeof(UNICODE_NULL)); - ObjectNameInfo->Name.Buffer = ObjectName; - return STATUS_SUCCESS; - } - else - { - /* Start by adding the Object's Name */ - ObjectName = (PWCH)((ULONG_PTR)ObjectName - - LocalInfo->Name.Length); - RtlCopyMemory(ObjectName, - LocalInfo->Name.Buffer, - LocalInfo->Name.Length); - - /* Now parse the Parent directories until we reach the top */ - ParentDirectory = LocalInfo->Directory; - while ((ParentDirectory != ObpRootDirectoryObject) && (ParentDirectory)) - { - /* Get the name information */ - LocalInfo = OBJECT_HEADER_TO_NAME_INFO( - OBJECT_TO_OBJECT_HEADER(ParentDirectory)); - - /* Add the "\" */ + _SEH2_TRY + { + if (Object == ObpRootDirectoryObject) + { + /* Size of the '\' string */ + NameSize = sizeof(OBJ_NAME_PATH_SEPARATOR); + } + else + { + /* Get the Object Directory and add name of Object */ + ParentDirectory = LocalInfo->Directory; + NameSize = sizeof(OBJ_NAME_PATH_SEPARATOR) + LocalInfo->Name.Length; + + /* Loop inside the directory to get the top-most one (meaning root) */ + while ((ParentDirectory != ObpRootDirectoryObject) && (ParentDirectory)) + { + /* Get the Name Information */ + LocalInfo = OBJECT_HEADER_TO_NAME_INFO( + OBJECT_TO_OBJECT_HEADER(ParentDirectory)); + + /* Add the size of the Directory Name */ + if (LocalInfo && LocalInfo->Directory) + { + /* Size of the '\' string + Directory Name */ + NameSize += sizeof(OBJ_NAME_PATH_SEPARATOR) + + LocalInfo->Name.Length; + + /* Move to next parent Directory */ + ParentDirectory = LocalInfo->Directory; + } + else + { + /* Directory with no name. We append "...\" */ + NameSize += sizeof(L"...") + sizeof(OBJ_NAME_PATH_SEPARATOR); + break; + } + } + } + + /* Finally, add the name of the structure and the null char */ + *ReturnLength = NameSize + + sizeof(OBJECT_NAME_INFORMATION) + + sizeof(UNICODE_NULL); + + /* Check if we were given enough space */ + if (*ReturnLength > Length) _SEH2_YIELD(return STATUS_INFO_LENGTH_MISMATCH); + + /* + * Now we will actually create the name. We work backwards because + * it's easier to start off from the Name we have and walk up the + * parent directories. We use the same logic as Name Length calculation. + */ + LocalInfo = OBJECT_HEADER_TO_NAME_INFO(ObjectHeader); + ObjectName = (PWCH)((ULONG_PTR)ObjectNameInfo + *ReturnLength); + *--ObjectName = UNICODE_NULL; + + /* Check if the object is actually the Root directory */ + if (Object == ObpRootDirectoryObject) + { + /* This is already the Root Directory, return "\\" */ + *--ObjectName = OBJ_NAME_PATH_SEPARATOR; + ObjectNameInfo->Name.Length = (USHORT)NameSize; + ObjectNameInfo->Name.MaximumLength = (USHORT)(NameSize + + sizeof(UNICODE_NULL)); + ObjectNameInfo->Name.Buffer = ObjectName; + _SEH2_YIELD(return STATUS_SUCCESS); + } + else + { + /* Start by adding the Object's Name */ + ObjectName = (PWCH)((ULONG_PTR)ObjectName - + LocalInfo->Name.Length); + RtlCopyMemory(ObjectName, + LocalInfo->Name.Buffer, + LocalInfo->Name.Length); + + /* Now parse the Parent directories until we reach the top */ + ParentDirectory = LocalInfo->Directory; + while ((ParentDirectory != ObpRootDirectoryObject) && (ParentDirectory)) + { + /* Get the name information */ + LocalInfo = OBJECT_HEADER_TO_NAME_INFO( + OBJECT_TO_OBJECT_HEADER(ParentDirectory)); + + /* Add the "\" */ + *(--ObjectName) = OBJ_NAME_PATH_SEPARATOR; + + /* Add the Parent Directory's Name */ + if (LocalInfo && LocalInfo->Name.Buffer) + { + /* Add the name */ + ObjectName = (PWCH)((ULONG_PTR)ObjectName - + LocalInfo->Name.Length); + RtlCopyMemory(ObjectName, + LocalInfo->Name.Buffer, + LocalInfo->Name.Length); + + /* Move to next parent */ + ParentDirectory = LocalInfo->Directory; + } + else + { + /* Directory without a name, we add "..." */ + ObjectName = (PWCH)((ULONG_PTR)ObjectName - + sizeof(L"...") + + sizeof(UNICODE_NULL)); + RtlCopyMemory(ObjectName, + L"...", + sizeof(L"...") + sizeof(UNICODE_NULL)); + break; + } + } + + /* Add Root Directory Name */ *(--ObjectName) = OBJ_NAME_PATH_SEPARATOR; - - /* Add the Parent Directory's Name */ - if (LocalInfo && LocalInfo->Name.Buffer) - { - /* Add the name */ - ObjectName = (PWCH)((ULONG_PTR)ObjectName - - LocalInfo->Name.Length); - RtlCopyMemory(ObjectName, - LocalInfo->Name.Buffer, - LocalInfo->Name.Length); - - /* Move to next parent */ - ParentDirectory = LocalInfo->Directory; - } - else - { - /* Directory without a name, we add "..." */ - ObjectName -= sizeof(L"..."); - ObjectName = L"..."; - break; - } - } - - /* Add Root Directory Name */ - *(--ObjectName) = OBJ_NAME_PATH_SEPARATOR; - ObjectNameInfo->Name.Length = (USHORT)NameSize; - ObjectNameInfo->Name.MaximumLength = (USHORT)(NameSize + - sizeof(UNICODE_NULL)); - ObjectNameInfo->Name.Buffer = ObjectName; - } + ObjectNameInfo->Name.Length = (USHORT)NameSize; + ObjectNameInfo->Name.MaximumLength = + (USHORT)(NameSize + sizeof(UNICODE_NULL)); + ObjectNameInfo->Name.Buffer = ObjectName; + } + } + _SEH2_EXCEPT(EXCEPTION_EXECUTE_HANDLER) + { + /* Return the exception code */ + Status = _SEH2_GetExceptionCode(); + } + _SEH2_END; /* Return success */ - return STATUS_SUCCESS; + return Status; } VOID @@ -1144,15 +1192,12 @@ ObQueryDeviceMapInformation(IN PEPROCESS Process, IN PPROCESS_DEVICEMAP_INFORMATION DeviceMapInfo) { - //KIRQL OldIrql ; - /* * FIXME: This is an ugly hack for now, to always return the System Device Map * instead of returning the Process Device Map. Not important yet since we don't use it */ - /* FIXME: Acquire the DeviceMap Spinlock */ - // KeAcquireSpinLock(DeviceMap->Lock, &OldIrql); + KeAcquireGuardedMutex(&ObpDeviceMapLock); /* Make a copy */ DeviceMapInfo->Query.DriveMap = ObSystemDeviceMap->DriveMap; @@ -1160,8 +1205,33 @@ ObSystemDeviceMap->DriveType, sizeof(ObSystemDeviceMap->DriveType)); - /* FIXME: Release the DeviceMap Spinlock */ - // KeReleasepinLock(DeviceMap->Lock, OldIrql); + KeReleaseGuardedMutex(&ObpDeviceMapLock); } +NTSTATUS +NTAPI +ObIsDosDeviceLocallyMapped( + IN ULONG Index, + OUT PUCHAR DosDeviceState) +{ + /* check parameters */ + if (Index < 1 || Index > 26) + { + /* invalid index */ + return STATUS_INVALID_PARAMETER; + } + + /* acquire lock */ + KeAcquireGuardedMutex(&ObpDeviceMapLock); + + /* get drive mapping status */ + *DosDeviceState = (ObSystemDeviceMap->DriveMap & (1 << Index)) != 0; + + /* release lock */ + KeReleaseGuardedMutex(&ObpDeviceMapLock); + + /* done */ + return STATUS_SUCCESS; +} + /* EOF */

1 0

[janderwald] 54858: [USB-BRINGUP] - Partly implement HidP_TranslateUsageAndPagesToI8042ScanCodes - Needs key modifier state function to work correctly - KBDHID should now receive translated keys (w...
by janderwald＠svn.reactos.org 07 Jan '12

07 Jan '12

Author: janderwald Date: Sat Jan 7 10:24:10 2012 New Revision: 54858 URL: http://svn.reactos.org/svn/reactos?rev=54858&view=rev Log: [USB-BRINGUP] - Partly implement HidP_TranslateUsageAndPagesToI8042ScanCodes - Needs key modifier state function to work correctly - KBDHID should now receive translated keys (without key modifiers) Modified: branches/usb-bringup/drivers/hid/hidparse/hidparse.c branches/usb-bringup/lib/drivers/hidparser/api.c branches/usb-bringup/lib/drivers/hidparser/hidparser.c branches/usb-bringup/lib/drivers/hidparser/hidparser.h Modified: branches/usb-bringup/drivers/hid/hidparse/hidparse.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/drivers/hid/hidpars… ============================================================================== --- branches/usb-bringup/drivers/hid/hidparse/hidparse.c [iso-8859-1] (original) +++ branches/usb-bringup/drivers/hid/hidparse/hidparse.c [iso-8859-1] Sat Jan 7 10:24:10 2012 @@ -322,6 +322,37 @@ HIDAPI NTSTATUS NTAPI +HidP_TranslateUsageAndPagesToI8042ScanCodes( + IN PUSAGE_AND_PAGE ChangedUsageList, + IN ULONG UsageListLength, + IN HIDP_KEYBOARD_DIRECTION KeyAction, + IN OUT PHIDP_KEYBOARD_MODIFIER_STATE ModifierState, + IN PHIDP_INSERT_SCANCODES InsertCodesProcedure, + IN PVOID InsertCodesContext) +{ + HID_PARSER Parser; + + // + // sanity check + // + ASSERT(ReportType == HidP_Input || ReportType == HidP_Output || ReportType == HidP_Feature); + + // + // init parser + // + HidParser_InitParser(AllocFunction, FreeFunction, ZeroFunction, CopyFunction, DebugFunction, NULL, &Parser); + + // + // translate usage pages + // + return HidParser_TranslateUsageAndPagesToI8042ScanCodes(Parser, UsageListLength, KeyAction, ModifierState, InsertCodesProcedure, InsertCodesContext); +} + + + +HIDAPI +NTSTATUS +NTAPI HidP_GetButtonCaps( HIDP_REPORT_TYPE ReportType, PHIDP_BUTTON_CAPS ButtonCaps, @@ -491,22 +522,6 @@ HIDAPI NTSTATUS NTAPI -HidP_TranslateUsageAndPagesToI8042ScanCodes( - IN PUSAGE_AND_PAGE ChangedUsageList, - IN ULONG UsageListLength, - IN HIDP_KEYBOARD_DIRECTION KeyAction, - IN OUT PHIDP_KEYBOARD_MODIFIER_STATE ModifierState, - IN PHIDP_INSERT_SCANCODES InsertCodesProcedure, - IN PVOID InsertCodesContext) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI HidP_SetUsages( IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, Modified: branches/usb-bringup/lib/drivers/hidparser/api.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/lib/drivers/hidpars… ============================================================================== --- branches/usb-bringup/lib/drivers/hidparser/api.c [iso-8859-1] (original) +++ branches/usb-bringup/lib/drivers/hidparser/api.c [iso-8859-1] Sat Jan 7 10:24:10 2012 @@ -11,6 +11,27 @@ #include "parser.h" +static ULONG KeyboardScanCodes[256] = +{ + 0, 0, 0, 0, 30, 48, 46, 32, 18, 33, 34, 35, 23, 36, 37, 38, + 50, 49, 24, 25, 16, 19, 31, 20, 22, 47, 17, 45, 21, 44, 2, 3, + 4, 5, 6, 7, 8, 9, 10, 11, 28, 1, 14, 15, 57, 12, 13, 26, + 27, 43, 43, 39, 40, 41, 51, 52, 53, 58, 59, 60, 61, 62, 63, 64, + 65, 66, 67, 68, 87, 88, 99, 70,119,110,102,104,111,107,109,106, + 105,108,103, 69, 98, 55, 74, 78, 96, 79, 80, 81, 75, 76, 77, 71, + 72, 73, 82, 83, 86,127,116,117,183,184,185,186,187,188,189,190, + 191,192,193,194,134,138,130,132,128,129,131,137,133,135,136,113, + 115,114, 0, 0, 0,121, 0, 89, 93,124, 92, 94, 95, 0, 0, 0, + 122,123, 90, 91, 85, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, + 29, 42, 56,125, 97, 54,100,126,164,166,165,163,161,115,114,113, + 150,158,159,128,136,177,178,176,142,152,173,140 +}; + + ULONG HidParser_NumberOfTopCollections( @@ -951,3 +972,106 @@ // return HIDPARSER_STATUS_USAGE_NOT_FOUND; } + +ULONG +HidParser_GetScanCode( + IN USAGE Usage) +{ + if (Usage < sizeof(KeyboardScanCodes) / sizeof(KeyboardScanCodes[0])) + { + // + // valid usage + // + return KeyboardScanCodes[Usage]; + } + + // + // invalid usage + // + return 0; +} + +VOID +HidParser_DispatchKey( + IN PCHAR ScanCodes, + IN HIDP_KEYBOARD_DIRECTION KeyAction, + IN PHIDP_INSERT_SCANCODES InsertCodesProcedure, + IN PVOID InsertCodesContext) +{ + ULONG Index; + ULONG Length = 0; + + // + // count code length + // + for(Index = 0; Index < sizeof(ULONG); Index++) + { + if (ScanCodes[Index] == 0) + { + // + // last scan code + // + break; + } + + // + // is this a key break + // + if (KeyAction == HidP_KeyboardBreak) + { + // + // add break + // + ScanCodes[Index] |= KEY_BREAK; + } + + // + // more scan counts + // + Length++; + } + + if (Length > 0) + { + // + // dispatch scan codes + // + InsertCodesProcedure(InsertCodesContext, ScanCodes, Length); + } +} + + +HIDPARSER_STATUS +HidParser_TranslateUsage( + IN PHID_PARSER Parser, + IN USAGE Usage, + IN HIDP_KEYBOARD_DIRECTION KeyAction, + IN OUT PHIDP_KEYBOARD_MODIFIER_STATE ModifierState, + IN PHIDP_INSERT_SCANCODES InsertCodesProcedure, + IN PVOID InsertCodesContext) +{ + ULONG ScanCode; + + // + // get scan code + // + ScanCode = HidParser_GetScanCode(Usage); + if (!ScanCode) + { + // + // invalid lookup or no scan code available + // + return HIDPARSER_STATUS_I8042_TRANS_UNKNOWN; + } + + // + // FIXME: translate modifier states + // + + HidParser_DispatchKey((PCHAR)&ScanCode, KeyAction, InsertCodesProcedure, InsertCodesContext); + + // + // done + // + return HIDPARSER_STATUS_SUCCESS; +} Modified: branches/usb-bringup/lib/drivers/hidparser/hidparser.c URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/lib/drivers/hidpars… ============================================================================== --- branches/usb-bringup/lib/drivers/hidparser/hidparser.c [iso-8859-1] (original) +++ branches/usb-bringup/lib/drivers/hidparser/hidparser.c [iso-8859-1] Sat Jan 7 10:24:10 2012 @@ -14,8 +14,29 @@ TranslateHidParserStatus( IN HIDPARSER_STATUS Status) { - UNIMPLEMENTED - return STATUS_NOT_IMPLEMENTED; + switch(Status) + { + case HIDPARSER_STATUS_INSUFFICIENT_RESOURCES: + return HIDP_STATUS_INTERNAL_ERROR; + case HIDPARSER_STATUS_NOT_IMPLEMENTED: + return HIDP_STATUS_NOT_IMPLEMENTED; + case HIDPARSER_STATUS_REPORT_NOT_FOUND: + return HIDP_STATUS_REPORT_DOES_NOT_EXIST; + case HIDPARSER_STATUS_INVALID_REPORT_LENGTH: + return HIDP_STATUS_INVALID_REPORT_LENGTH; + case HIDPARSER_STATUS_INVALID_REPORT_TYPE: + return HIDP_STATUS_INVALID_REPORT_TYPE; + case HIDPARSER_STATUS_BUFFER_TOO_SMALL: + return HIDP_STATUS_BUFFER_TOO_SMALL; + case HIDPARSER_STATUS_USAGE_NOT_FOUND: + return HIDP_STATUS_USAGE_NOT_FOUND; + case HIDPARSER_STATUS_I8042_TRANS_UNKNOWN: + return HIDP_STATUS_I8042_TRANS_UNKNOWN; + case HIDPARSER_STATUS_COLLECTION_NOT_FOUND: + return HIDP_STATUS_NOT_IMPLEMENTED; //FIXME + } + DPRINT1("TranslateHidParserStatus Status %ld not implemented\n", Status); + return HIDP_STATUS_NOT_IMPLEMENTED; } NTSTATUS @@ -631,6 +652,77 @@ // return TranslateHidParserStatus(ParserStatus); } + +HIDAPI +NTSTATUS +NTAPI +HidParser_TranslateUsageAndPagesToI8042ScanCodes( + IN PHID_PARSER Parser, + IN PUSAGE_AND_PAGE ChangedUsageList, + IN ULONG UsageListLength, + IN HIDP_KEYBOARD_DIRECTION KeyAction, + IN OUT PHIDP_KEYBOARD_MODIFIER_STATE ModifierState, + IN PHIDP_INSERT_SCANCODES InsertCodesProcedure, + IN PVOID InsertCodesContext) +{ + ULONG Index; + HIDPARSER_STATUS Status = HIDPARSER_STATUS_SUCCESS; + + for(Index = 0; Index < UsageListLength; Index++) + { + // + // check current usage + // + if (ChangedUsageList[Index].UsagePage == HID_USAGE_PAGE_KEYBOARD) + { + // + // process usage + // + Status = HidParser_TranslateUsage(Parser, ChangedUsageList[Index].Usage, KeyAction, ModifierState, InsertCodesProcedure, InsertCodesContext); + } + else if (ChangedUsageList[Index].UsagePage == HID_USAGE_PAGE_CONSUMER) + { + // + // FIXME: implement me + // + UNIMPLEMENTED + Status = HIDPARSER_STATUS_NOT_IMPLEMENTED; + } + else + { + // + // invalid page + // + DPRINT1("[HIDPARSE] Error unexpected usage page %x\n", ChangedUsageList[Index].UsagePage); + return HIDP_STATUS_I8042_TRANS_UNKNOWN; + } + + // + // check status + // + if (Status != HIDPARSER_STATUS_SUCCESS) + { + // + // failed + // + return TranslateHidParserStatus(Status); + } + } + + if (Status != HIDPARSER_STATUS_SUCCESS) + { + // + // failed + // + return TranslateHidParserStatus(Status); + } + + // + // done + // + return HIDP_STATUS_SUCCESS; +} + HIDAPI NTSTATUS @@ -937,22 +1029,6 @@ HIDAPI NTSTATUS NTAPI -HidParser_TranslateUsageAndPagesToI8042ScanCodes( - IN PUSAGE_AND_PAGE ChangedUsageList, - IN ULONG UsageListLength, - IN HIDP_KEYBOARD_DIRECTION KeyAction, - IN OUT PHIDP_KEYBOARD_MODIFIER_STATE ModifierState, - IN PHIDP_INSERT_SCANCODES InsertCodesProcedure, - IN PVOID InsertCodesContext) -{ - UNIMPLEMENTED - ASSERT(FALSE); - return STATUS_NOT_IMPLEMENTED; -} - -HIDAPI -NTSTATUS -NTAPI HidParser_SetUsages( IN HIDP_REPORT_TYPE ReportType, IN USAGE UsagePage, Modified: branches/usb-bringup/lib/drivers/hidparser/hidparser.h URL: http://svn.reactos.org/svn/reactos/branches/usb-bringup/lib/drivers/hidpars… ============================================================================== --- branches/usb-bringup/lib/drivers/hidparser/hidparser.h [iso-8859-1] (original) +++ branches/usb-bringup/lib/drivers/hidparser/hidparser.h [iso-8859-1] Sat Jan 7 10:24:10 2012 @@ -44,7 +44,8 @@ HIDPARSER_STATUS_INVALID_REPORT_LENGTH = -5, HIDPARSER_STATUS_INVALID_REPORT_TYPE = -6, HIDPARSER_STATUS_BUFFER_TOO_SMALL = -7, - HIDPARSER_STATUS_USAGE_NOT_FOUND = 8 + HIDPARSER_STATUS_USAGE_NOT_FOUND = -8, + HIDPARSER_STATUS_I8042_TRANS_UNKNOWN = -9 }HIDPARSER_STATUS_CODES; typedef struct

1 0

← Newer
1
...
47
48
49
50
51
52
53
...
56
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2012