Ros-diffs July 2010

ros-diffs@reactos.org

17 participants
467 discussions

[akhaldi] 48096: [DDK] - Move netevent.h to PSDK.
by akhaldi＠svn.reactos.org 17 Jul '10

17 Jul '10

Author: akhaldi Date: Sat Jul 17 10:09:09 2010 New Revision: 48096 URL: http://svn.reactos.org/svn/reactos?rev=48096&view=rev Log: [DDK] - Move netevent.h to PSDK. Added: trunk/reactos/include/psdk/netevent.h - copied unchanged from r48093, trunk/reactos/include/ddk/netevent.h Removed: trunk/reactos/include/ddk/netevent.h Removed: trunk/reactos/include/ddk/netevent.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/netevent.h?rev… ============================================================================== --- trunk/reactos/include/ddk/netevent.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/netevent.h (removed) @@ -1,38 +1,0 @@ -/* - * netevent.h - * - * Network events - * - * This file is part of the w32api package. - * - * Contributors: - * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> - * - * 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. - * - */ - -#ifndef __NETEVENT_H -#define __NETEVENT_H - -#define EVENT_TRANSPORT_REGISTER_FAILED 0xC000232CL - -#define EVENT_TRANSPORT_ADAPTER_NOT_FOUND 0xC000232EL - -#ifdef __cplusplus -extern "C" { -#endif - -#ifdef __cplusplus -} -#endif - -#endif /* __NETEVENT_H */

1 0

[akhaldi] 48095: [DDK] - Move ntddndis.h to PSDK.
by akhaldi＠svn.reactos.org 17 Jul '10

17 Jul '10

Author: akhaldi Date: Sat Jul 17 09:42:56 2010 New Revision: 48095 URL: http://svn.reactos.org/svn/reactos?rev=48095&view=rev Log: [DDK] - Move ntddndis.h to PSDK. Added: trunk/reactos/include/psdk/ntddndis.h - copied unchanged from r48093, trunk/reactos/include/ddk/ntddndis.h Removed: trunk/reactos/include/ddk/ntddndis.h Removed: trunk/reactos/include/ddk/ntddndis.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ddk/ntddndis.h?rev… ============================================================================== --- trunk/reactos/include/ddk/ntddndis.h [iso-8859-1] (original) +++ trunk/reactos/include/ddk/ntddndis.h (removed) @@ -1,305 +1,0 @@ -/* - * ntddndis.h - * - * NDIS device driver interface - * - * This file is part of the w32api package. - * - * Contributors: - * Created by Casper S. Hornstrup <chorns(a)users.sourceforge.net> - * - * 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. - * - */ - -#ifndef __NTDDNDIS_H -#define __NTDDNDIS_H - -#ifdef __cplusplus -extern "C" { -#endif - -typedef enum _NDIS_WAN_QUALITY { - NdisWanRaw, - NdisWanErrorControl, - NdisWanReliable -} NDIS_WAN_QUALITY, *PNDIS_WAN_QUALITY; - -typedef enum _NDIS_DEVICE_POWER_STATE { - NdisDeviceStateUnspecified = 0, - NdisDeviceStateD0, - NdisDeviceStateD1, - NdisDeviceStateD2, - NdisDeviceStateD3, - NdisDeviceStateMaximum -} NDIS_DEVICE_POWER_STATE, *PNDIS_DEVICE_POWER_STATE; - -typedef enum _NDIS_802_11_NETWORK_INFRASTRUCTURE -{ - Ndis802_11IBSS, - Ndis802_11Infrastructure, - Ndis802_11AutoUnknown, - Ndis802_11InfrastructureMax -} NDIS_802_11_NETWORK_INFRASTRUCTURE, *PNDIS_802_11_NETWORK_INFRASTRUCTURE; - -typedef enum _NDIS_802_11_NETWORK_TYPE -{ - Ndis802_11FH, - Ndis802_11DS, - Ndis802_11OFDM5, - Ndis802_11OFDM24, - Ndis802_11Automode, - Ndis802_11NetworkTypeMax -} NDIS_802_11_NETWORK_TYPE, *PNDIS_802_11_NETWORK_TYPE; - -typedef struct _NDIS_OBJECT_HEADER -{ - UCHAR Type; - UCHAR Revision; - USHORT Size; -} NDIS_OBJECT_HEADER, *PNDIS_OBJECT_HEADER; - -#define NDIS_802_11_LENGTH_SSID 32 -#define NDIS_802_11_LENGTH_RATES 8 - -typedef UCHAR NDIS_802_11_MAC_ADDRESS[6]; -typedef LONG NDIS_802_11_RSSI; -typedef UCHAR NDIS_802_11_RATES[NDIS_802_11_LENGTH_RATES]; - -typedef struct _NDIS_802_11_SSID -{ - ULONG SsidLength; - UCHAR Ssid[NDIS_802_11_LENGTH_SSID]; -} NDIS_802_11_SSID, *PNDIS_802_11_SSID; - -typedef struct _NDIS_802_11_CONFIGURATION_FH -{ - ULONG Length; - ULONG HopPattern; - ULONG HopSet; - ULONG DwellTime; -} NDIS_802_11_CONFIGURATION_FH, *PNDIS_802_11_CONFIGURATION_FH; - -typedef struct _NDIS_802_11_CONFIGURATION -{ - ULONG Length; - ULONG BeaconPeriod; - ULONG ATIMWindow; - ULONG DSConfig; - NDIS_802_11_CONFIGURATION_FH FHConfig; -} NDIS_802_11_CONFIGURATION, *PNDIS_802_11_CONFIGURATION; - -typedef struct _NDIS_WLAN_BSSID -{ - ULONG Length; - NDIS_802_11_MAC_ADDRESS MacAddress; - UCHAR Reserved[2]; - NDIS_802_11_SSID Ssid; - ULONG Privacy; - NDIS_802_11_RSSI Rssi; - NDIS_802_11_NETWORK_TYPE NetworkTypeInUse; - NDIS_802_11_CONFIGURATION Configuration; - NDIS_802_11_NETWORK_INFRASTRUCTURE InfrastructureMode; - NDIS_802_11_RATES SupportedRates; -} NDIS_WLAN_BSSID, *PNDIS_WLAN_BSSID; - -typedef struct _NDIS_802_11_BSSID_LIST -{ - ULONG NumberOfItems; - NDIS_WLAN_BSSID Bssid[1]; -} NDIS_802_11_BSSID_LIST, *PNDIS_802_11_BSSID_LIST; - -typedef struct _NDIS_PM_WAKE_UP_CAPABILITIES { - NDIS_DEVICE_POWER_STATE MinMagicPacketWakeUp; - NDIS_DEVICE_POWER_STATE MinPatternWakeUp; - NDIS_DEVICE_POWER_STATE MinLinkChangeWakeUp; -} NDIS_PM_WAKE_UP_CAPABILITIES, *PNDIS_PM_WAKE_UP_CAPABILITIES; - -/* NDIS_PNP_CAPABILITIES.Flags constants */ -#define NDIS_DEVICE_WAKE_UP_ENABLE 0x00000001 -#define NDIS_DEVICE_WAKE_ON_PATTERN_MATCH_ENABLE 0x00000002 -#define NDIS_DEVICE_WAKE_ON_MAGIC_PACKET_ENABLE 0x00000004 - -typedef struct _NDIS_PNP_CAPABILITIES { - ULONG Flags; - NDIS_PM_WAKE_UP_CAPABILITIES WakeUpCapabilities; -} NDIS_PNP_CAPABILITIES, *PNDIS_PNP_CAPABILITIES; - -/* NDIS driver medium (OID_GEN_MEDIA_SUPPORTED / OID_GEN_MEDIA_IN_USE) */ -typedef enum _NDIS_MEDIUM { - NdisMedium802_3, - NdisMedium802_5, - NdisMediumFddi, - NdisMediumWan, - NdisMediumLocalTalk, - NdisMediumDix, - NdisMediumArcnetRaw, - NdisMediumArcnet878_2, - NdisMediumAtm, - NdisMediumWirelessWan, - NdisMediumIrda, - NdisMediumBpc, - NdisMediumCoWan, - NdisMedium1394, - NdisMediumMax -} NDIS_MEDIUM, *PNDIS_MEDIUM; - -typedef enum _NDIS_PHYSICAL_MEDIUM -{ - NdisPhysicalMediumUnspecified, - NdisPhysicalMediumWirelessLan, - NdisPhysicalMediumCableModem, - NdisPhysicalMediumPhoneLine, - NdisPhysicalMediumPowerLine, - NdisPhysicalMediumDSL, - NdisPhysicalMediumFibreChannel, - NdisPhysicalMedium1394, - NdisPhysicalMediumWirelessWan, - NdisPhysicalMediumNative802_11, - NdisPhysicalMediumBluetooth, - NdisPhysicalMediumInfiniband, - NdisPhysicalMediumWiMax, - NdisPhysicalMediumUWB, - NdisPhysicalMedium802_3, - NdisPhysicalMedium802_5, - NdisPhysicalMediumIrda, - NdisPhysicalMediumWiredWAN, - NdisPhysicalMediumWiredCoWan, - NdisPhysicalMediumOther, - NdisPhysicalMediumMax -} NDIS_PHYSICAL_MEDIUM, *PNDIS_PHYSICAL_MEDIUM; - -/* Required Object IDs (OIDs) */ -#define OID_GEN_SUPPORTED_LIST 0x00010101 -#define OID_GEN_HARDWARE_STATUS 0x00010102 -#define OID_GEN_MEDIA_SUPPORTED 0x00010103 -#define OID_GEN_MEDIA_IN_USE 0x00010104 -#define OID_GEN_MAXIMUM_LOOKAHEAD 0x00010105 -#define OID_GEN_MAXIMUM_FRAME_SIZE 0x00010106 -#define OID_GEN_LINK_SPEED 0x00010107 -#define OID_GEN_TRANSMIT_BUFFER_SPACE 0x00010108 -#define OID_GEN_RECEIVE_BUFFER_SPACE 0x00010109 -#define OID_GEN_TRANSMIT_BLOCK_SIZE 0x0001010A -#define OID_GEN_RECEIVE_BLOCK_SIZE 0x0001010B -#define OID_GEN_VENDOR_ID 0x0001010C -#define OID_GEN_VENDOR_DESCRIPTION 0x0001010D -#define OID_GEN_CURRENT_PACKET_FILTER 0x0001010E -#define OID_GEN_CURRENT_LOOKAHEAD 0x0001010F -#define OID_GEN_DRIVER_VERSION 0x00010110 -#define OID_GEN_MAXIMUM_TOTAL_SIZE 0x00010111 -#define OID_GEN_PROTOCOL_OPTIONS 0x00010112 -#define OID_GEN_MAC_OPTIONS 0x00010113 -#define OID_GEN_MEDIA_CONNECT_STATUS 0x00010114 -#define OID_GEN_MAXIMUM_SEND_PACKETS 0x00010115 -#define OID_GEN_VENDOR_DRIVER_VERSION 0x00010116 -#define OID_GEN_SUPPORTED_GUIDS 0x00010117 -#define OID_GEN_NETWORK_LAYER_ADDRESSES 0x00010118 -#define OID_GEN_TRANSPORT_HEADER_OFFSET 0x00010119 -#define OID_GEN_MACHINE_NAME 0x0001021A -#define OID_GEN_RNDIS_CONFIG_PARAMETER 0x0001021B -#define OID_GEN_VLAN_ID 0x0001021C - -/* Optional OIDs */ -#define OID_GEN_MEDIA_CAPABILITIES 0x00010201 -#define OID_GEN_PHYSICAL_MEDIUM 0x00010202 - -/* Required statistics OIDs */ -#define OID_GEN_XMIT_OK 0x00020101 -#define OID_GEN_RCV_OK 0x00020102 -#define OID_GEN_XMIT_ERROR 0x00020103 -#define OID_GEN_RCV_ERROR 0x00020104 -#define OID_GEN_RCV_NO_BUFFER 0x00020105 - -/* Optional statistics OIDs */ -#define OID_GEN_DIRECTED_BYTES_XMIT 0x00020201 -#define OID_GEN_DIRECTED_FRAMES_XMIT 0x00020202 -#define OID_GEN_MULTICAST_BYTES_XMIT 0x00020203 -#define OID_GEN_MULTICAST_FRAMES_XMIT 0x00020204 -#define OID_GEN_BROADCAST_BYTES_XMIT 0x00020205 -#define OID_GEN_BROADCAST_FRAMES_XMIT 0x00020206 -#define OID_GEN_DIRECTED_BYTES_RCV 0x00020207 -#define OID_GEN_DIRECTED_FRAMES_RCV 0x00020208 -#define OID_GEN_MULTICAST_BYTES_RCV 0x00020209 -#define OID_GEN_MULTICAST_FRAMES_RCV 0x0002020A -#define OID_GEN_BROADCAST_BYTES_RCV 0x0002020B -#define OID_GEN_BROADCAST_FRAMES_RCV 0x0002020C -#define OID_GEN_RCV_CRC_ERROR 0x0002020D -#define OID_GEN_TRANSMIT_QUEUE_LENGTH 0x0002020E -#define OID_GEN_GET_TIME_CAPS 0x0002020F -#define OID_GEN_GET_NETCARD_TIME 0x00020210 -#define OID_GEN_NETCARD_LOAD 0x00020211 -#define OID_GEN_DEVICE_PROFILE 0x00020212 -#define OID_GEN_INIT_TIME_MS 0x00020213 -#define OID_GEN_RESET_COUNTS 0x00020214 -#define OID_GEN_MEDIA_SENSE_COUNTS 0x00020215 -#define OID_GEN_FRIENDLY_NAME 0x00020216 -#define OID_GEN_MINIPORT_INFO 0x00020217 -#define OID_GEN_RESET_VERIFY_PARAMETERS 0x00020218 - -/* IEEE 802.3 (Ethernet) OIDs */ -#define NDIS_802_3_MAC_OPTION_PRIORITY 0x00000001 - -#define OID_802_3_PERMANENT_ADDRESS 0x01010101 -#define OID_802_3_CURRENT_ADDRESS 0x01010102 -#define OID_802_3_MULTICAST_LIST 0x01010103 -#define OID_802_3_MAXIMUM_LIST_SIZE 0x01010104 -#define OID_802_3_MAC_OPTIONS 0x01010105 -#define OID_802_3_RCV_ERROR_ALIGNMENT 0x01020101 -#define OID_802_3_XMIT_ONE_COLLISION 0x01020102 -#define OID_802_3_XMIT_MORE_COLLISIONS 0x01020103 -#define OID_802_3_XMIT_DEFERRED 0x01020201 -#define OID_802_3_XMIT_MAX_COLLISIONS 0x01020202 -#define OID_802_3_RCV_OVERRUN 0x01020203 -#define OID_802_3_XMIT_UNDERRUN 0x01020204 -#define OID_802_3_XMIT_HEARTBEAT_FAILURE 0x01020205 -#define OID_802_3_XMIT_TIMES_CRS_LOST 0x01020206 -#define OID_802_3_XMIT_LATE_COLLISIONS 0x01020207 - -#define OID_802_11_BSSID_LIST 0x0D010217 -#define OID_802_11_BSSID_LIST_SCAN 0x0D01011A - -/* OID_GEN_MINIPORT_INFO constants */ -#define NDIS_MINIPORT_BUS_MASTER 0x00000001 -#define NDIS_MINIPORT_WDM_DRIVER 0x00000002 -#define NDIS_MINIPORT_SG_LIST 0x00000004 -#define NDIS_MINIPORT_SUPPORTS_MEDIA_QUERY 0x00000008 -#define NDIS_MINIPORT_INDICATES_PACKETS 0x00000010 -#define NDIS_MINIPORT_IGNORE_PACKET_QUEUE 0x00000020 -#define NDIS_MINIPORT_IGNORE_REQUEST_QUEUE 0x00000040 -#define NDIS_MINIPORT_IGNORE_TOKEN_RING_ERRORS 0x00000080 -#define NDIS_MINIPORT_INTERMEDIATE_DRIVER 0x00000100 -#define NDIS_MINIPORT_IS_NDIS_5 0x00000200 -#define NDIS_MINIPORT_IS_CO 0x00000400 -#define NDIS_MINIPORT_DESERIALIZE 0x00000800 -#define NDIS_MINIPORT_REQUIRES_MEDIA_POLLING 0x00001000 -#define NDIS_MINIPORT_SUPPORTS_MEDIA_SENSE 0x00002000 -#define NDIS_MINIPORT_NETBOOT_CARD 0x00004000 -#define NDIS_MINIPORT_PM_SUPPORTED 0x00008000 -#define NDIS_MINIPORT_SUPPORTS_MAC_ADDRESS_OVERWRITE 0x00010000 -#define NDIS_MINIPORT_USES_SAFE_BUFFER_APIS 0x00020000 -#define NDIS_MINIPORT_HIDDEN 0x00040000 -#define NDIS_MINIPORT_SWENUM 0x00080000 -#define NDIS_MINIPORT_SURPRISE_REMOVE_OK 0x00100000 -#define NDIS_MINIPORT_NO_HALT_ON_SUSPEND 0x00200000 -#define NDIS_MINIPORT_HARDWARE_DEVICE 0x00400000 -#define NDIS_MINIPORT_SUPPORTS_CANCEL_SEND_PACKETS 0x00800000 -#define NDIS_MINIPORT_64BITS_DMA 0x01000000 - -#define IOCTL_NDIS_QUERY_GLOBAL_STATS CTL_CODE(FILE_DEVICE_PHYSICAL_NETCARD, \ - 0, \ - METHOD_OUT_DIRECT, \ - FILE_ANY_ACCESS) - -#ifdef __cplusplus -} -#endif - -#endif /* __NTDDNDIS_H */

1 0

[akhaldi] 48094: [PSDK] - Fix a couple of typos
by akhaldi＠svn.reactos.org 17 Jul '10

17 Jul '10

Author: akhaldi Date: Sat Jul 17 09:01:00 2010 New Revision: 48094 URL: http://svn.reactos.org/svn/reactos?rev=48094&view=rev Log: [PSDK] - Fix a couple of typos Modified: trunk/reactos/include/psdk/ksuuids.h Modified: trunk/reactos/include/psdk/ksuuids.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/ksuuids.h?rev… ============================================================================== --- trunk/reactos/include/psdk/ksuuids.h [iso-8859-1] (original) +++ trunk/reactos/include/psdk/ksuuids.h [iso-8859-1] Sat Jul 17 09:01:00 2010 @@ -54,11 +54,11 @@ OUR_GUID_ENTRY(AM_KSCATEGORY_TVAUDIO, 0xA799A802, 0xA46D, 0x11D0, 0xA1, 0x8C, 0x00, 0xa0, 0x24, 0x01, 0xDC, 0xD4) OUR_GUID_ENTRY(AM_KSCATEGORY_VBICODEC, 0x07DAD660, 0x22F1, 0x11D1, 0xa9, 0xF4, 0x00, 0xc0, 0x4F, 0xBB, 0xDE, 0x8F) OUR_GUID_ENTRY(AM_KSCATEGORY_SPLITTER, 0x0A4252A0, 0x7E70, 0x11D0, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00) -OUR_GUID_ENTRY(IID_IKsInterfACeHandler, 0xD3ABC7E0, 0x9A61, 0x11D0, 0xA4, 0x0D, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) +OUR_GUID_ENTRY(IID_IKsInterfaceHandler, 0xD3ABC7E0, 0x9A61, 0x11D0, 0xA4, 0x0D, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) OUR_GUID_ENTRY(IID_IKsDataTypeHandler, 0x5FFBAA02, 0x49A3, 0x11D0, 0x9F, 0x36, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xA1) OUR_GUID_ENTRY(IID_IKsPin, 0xB61178D1, 0xA2D9, 0x11CF, 0x9E, 0x53, 0x00, 0xAA, 0x00, 0xA2, 0x16, 0xa1) OUR_GUID_ENTRY(IID_IKsControl, 0x28F54685, 0x06FD, 0x11D2, 0xB2, 0x7A, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) -OUR_GUID_ENTRY(IID_IKsPinFACtory, 0xCD5EBE6B, 0x8B6E, 0x11D1, 0x8A, 0xE0, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) +OUR_GUID_ENTRY(IID_IKsPinFactory, 0xCD5EBE6B, 0x8B6E, 0x11D1, 0x8A, 0xE0, 0x00, 0xA0, 0xC9, 0x22, 0x31, 0x96) OUR_GUID_ENTRY(AM_INTERFACESETID_Standard, 0x1A8766A0, 0x62CE, 0x11CF, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00) #if ( (NTDDI_VERSION >= NTDDI_WINXPSP2) && (NTDDI_VERSION < NTDDI_WS03) ) || (NTDDI_VERSION >= NTDDI_WS03SP1)

1 0

[ekohl] 48093: [LSASRV] Use a single table for mapping privilege names to values and values to names.
by ekohl＠svn.reactos.org 17 Jul '10

17 Jul '10

Author: ekohl Date: Sat Jul 17 07:37:47 2010 New Revision: 48093 URL: http://svn.reactos.org/svn/reactos?rev=48093&view=rev Log: [LSASRV] Use a single table for mapping privilege names to values and values to names. Modified: trunk/reactos/dll/win32/lsasrv/privileges.c Modified: trunk/reactos/dll/win32/lsasrv/privileges.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/lsasrv/privilege… ============================================================================== --- trunk/reactos/dll/win32/lsasrv/privileges.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/lsasrv/privileges.c [iso-8859-1] Sat Jul 17 07:37:47 2010 @@ -11,166 +11,91 @@ #include <wine/debug.h> -static const WCHAR SE_CREATE_TOKEN_NAME_W[] = - { 'S','e','C','r','e','a','t','e','T','o','k','e','n','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_ASSIGNPRIMARYTOKEN_NAME_W[] = - { 'S','e','A','s','s','i','g','n','P','r','i','m','a','r','y','T','o','k','e','n','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_LOCK_MEMORY_NAME_W[] = - { 'S','e','L','o','c','k','M','e','m','o','r','y','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_INCREASE_QUOTA_NAME_W[] = - { 'S','e','I','n','c','r','e','a','s','e','Q','u','o','t','a','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_MACHINE_ACCOUNT_NAME_W[] = - { 'S','e','M','a','c','h','i','n','e','A','c','c','o','u','n','t','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_TCB_NAME_W[] = - { 'S','e','T','c','b','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_SECURITY_NAME_W[] = - { 'S','e','S','e','c','u','r','i','t','y','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_TAKE_OWNERSHIP_NAME_W[] = - { 'S','e','T','a','k','e','O','w','n','e','r','s','h','i','p','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_LOAD_DRIVER_NAME_W[] = - { 'S','e','L','o','a','d','D','r','i','v','e','r','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_SYSTEM_PROFILE_NAME_W[] = - { 'S','e','S','y','s','t','e','m','P','r','o','f','i','l','e','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_SYSTEMTIME_NAME_W[] = - { 'S','e','S','y','s','t','e','m','t','i','m','e','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_PROF_SINGLE_PROCESS_NAME_W[] = - { 'S','e','P','r','o','f','i','l','e','S','i','n','g','l','e','P','r','o','c','e','s','s','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_INC_BASE_PRIORITY_NAME_W[] = - { 'S','e','I','n','c','r','e','a','s','e','B','a','s','e','P','r','i','o','r','i','t','y','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_CREATE_PAGEFILE_NAME_W[] = - { 'S','e','C','r','e','a','t','e','P','a','g','e','f','i','l','e','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_CREATE_PERMANENT_NAME_W[] = - { 'S','e','C','r','e','a','t','e','P','e','r','m','a','n','e','n','t','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_BACKUP_NAME_W[] = - { 'S','e','B','a','c','k','u','p','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_RESTORE_NAME_W[] = - { 'S','e','R','e','s','t','o','r','e','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_SHUTDOWN_NAME_W[] = - { 'S','e','S','h','u','t','d','o','w','n','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_DEBUG_NAME_W[] = - { 'S','e','D','e','b','u','g','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_AUDIT_NAME_W[] = - { 'S','e','A','u','d','i','t','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_SYSTEM_ENVIRONMENT_NAME_W[] = - { 'S','e','S','y','s','t','e','m','E','n','v','i','r','o','n','m','e','n','t','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_CHANGE_NOTIFY_NAME_W[] = - { 'S','e','C','h','a','n','g','e','N','o','t','i','f','y','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_REMOTE_SHUTDOWN_NAME_W[] = - { 'S','e','R','e','m','o','t','e','S','h','u','t','d','o','w','n','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_UNDOCK_NAME_W[] = - { 'S','e','U','n','d','o','c','k','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_SYNC_AGENT_NAME_W[] = - { 'S','e','S','y','n','c','A','g','e','n','t','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_ENABLE_DELEGATION_NAME_W[] = - { 'S','e','E','n','a','b','l','e','D','e','l','e','g','a','t','i','o','n','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_MANAGE_VOLUME_NAME_W[] = - { 'S','e','M','a','n','a','g','e','V','o','l','u','m','e','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_IMPERSONATE_NAME_W[] = - { 'S','e','I','m','p','e','r','s','o','n','a','t','e','P','r','i','v','i','l','e','g','e',0 }; -static const WCHAR SE_CREATE_GLOBAL_NAME_W[] = - { 'S','e','C','r','e','a','t','e','G','l','o','b','a','l','P','r','i','v','i','l','e','g','e',0 }; +typedef struct +{ + LUID Luid; + LPCWSTR Name; +} PRIVILEGE_DATA; -static const WCHAR * const WellKnownPrivNames[SE_MAX_WELL_KNOWN_PRIVILEGE + 1] = + +static const PRIVILEGE_DATA WellKnownPrivileges[] = { - NULL, - NULL, - SE_CREATE_TOKEN_NAME_W, - SE_ASSIGNPRIMARYTOKEN_NAME_W, - SE_LOCK_MEMORY_NAME_W, - SE_INCREASE_QUOTA_NAME_W, - SE_MACHINE_ACCOUNT_NAME_W, - SE_TCB_NAME_W, - SE_SECURITY_NAME_W, - SE_TAKE_OWNERSHIP_NAME_W, - SE_LOAD_DRIVER_NAME_W, - SE_SYSTEM_PROFILE_NAME_W, - SE_SYSTEMTIME_NAME_W, - SE_PROF_SINGLE_PROCESS_NAME_W, - SE_INC_BASE_PRIORITY_NAME_W, - SE_CREATE_PAGEFILE_NAME_W, - SE_CREATE_PERMANENT_NAME_W, - SE_BACKUP_NAME_W, - SE_RESTORE_NAME_W, - SE_SHUTDOWN_NAME_W, - SE_DEBUG_NAME_W, - SE_AUDIT_NAME_W, - SE_SYSTEM_ENVIRONMENT_NAME_W, - SE_CHANGE_NOTIFY_NAME_W, - SE_REMOTE_SHUTDOWN_NAME_W, - SE_UNDOCK_NAME_W, - SE_SYNC_AGENT_NAME_W, - SE_ENABLE_DELEGATION_NAME_W, - SE_MANAGE_VOLUME_NAME_W, - SE_IMPERSONATE_NAME_W, - SE_CREATE_GLOBAL_NAME_W, + {{SE_CREATE_TOKEN_PRIVILEGE, 0}, L"SeCreateTokenPrivilege"}, + {{SE_ASSIGNPRIMARYTOKEN_PRIVILEGE, 0}, L"SeAssignPrimaryTokenPrivilege"}, + {{SE_LOCK_MEMORY_PRIVILEGE, 0}, L"SeLockMemoryPrivilege"}, + {{SE_INCREASE_QUOTA_PRIVILEGE, 0}, L"SeIncreaseQuotaPrivilege"}, + {{SE_MACHINE_ACCOUNT_PRIVILEGE, 0}, L"SeMachineAccountPrivilege"}, + {{SE_TCB_PRIVILEGE, 0}, L"SeTcbPrivilege"}, + {{SE_SECURITY_PRIVILEGE, 0}, L"SeSecurityPrivilege"}, + {{SE_TAKE_OWNERSHIP_PRIVILEGE, 0}, L"SeTakeOwnershipPrivilege"}, + {{SE_LOAD_DRIVER_PRIVILEGE, 0}, L"SeLoadDriverPrivilege"}, + {{SE_SYSTEM_PROFILE_PRIVILEGE, 0}, L"SeSystemProfilePrivilege"}, + {{SE_SYSTEMTIME_PRIVILEGE, 0}, L"SeSystemtimePrivilege"}, + {{SE_PROF_SINGLE_PROCESS_PRIVILEGE, 0}, L"SeProfileSingleProcessPrivilege"}, + {{SE_INC_BASE_PRIORITY_PRIVILEGE, 0}, L"SeIncreaseBasePriorityPrivilege"}, + {{SE_CREATE_PAGEFILE_PRIVILEGE, 0}, L"SeCreatePagefilePrivilege"}, + {{SE_CREATE_PERMANENT_PRIVILEGE, 0}, L"SeCreatePermanentPrivilege"}, + {{SE_BACKUP_PRIVILEGE, 0}, L"SeBackupPrivilege"}, + {{SE_RESTORE_PRIVILEGE, 0}, L"SeRestorePrivilege"}, + {{SE_SHUTDOWN_PRIVILEGE, 0}, L"SeShutdownPrivilege"}, + {{SE_DEBUG_PRIVILEGE, 0}, L"SeDebugPrivilege"}, + {{SE_AUDIT_PRIVILEGE, 0}, L"SeAuditPrivilege"}, + {{SE_SYSTEM_ENVIRONMENT_PRIVILEGE, 0}, L"SeSystemEnvironmentPrivilege"}, + {{SE_CHANGE_NOTIFY_PRIVILEGE, 0}, L"SeChangeNotifyPrivilege"}, + {{SE_REMOTE_SHUTDOWN_PRIVILEGE, 0}, L"SeRemoteShutdownPrivilege"}, + {{SE_UNDOCK_PRIVILEGE, 0}, L"SeUndockPrivilege"}, + {{SE_SYNC_AGENT_PRIVILEGE, 0}, L"SeSyncAgentPrivilege"}, + {{SE_ENABLE_DELEGATION_PRIVILEGE, 0}, L"SeEnableDelegationPrivilege"}, + {{SE_MANAGE_VOLUME_PRIVILEGE, 0}, L"SeManageVolumePrivilege"}, + {{SE_IMPERSONATE_PRIVILEGE, 0}, L"SeImpersonatePrivilege"}, + {{SE_CREATE_GLOBAL_PRIVILEGE, 0}, L"SeCreateGlobalPrivilege"} }; -static const WCHAR * const DefaultPrivNames[] = -{ - L"SeCreateTokenPrivilege", - L"SeAssignPrimaryTokenPrivilege", - L"SeLockMemoryPrivilege", - L"SeIncreaseQuotaPrivilege", - L"SeMachineAccountPrivilege", - L"SeTcbPrivilege", - L"SeSecurityPrivilege", - L"SeTakeOwnershipPrivilege", - L"SeLoadDriverPrivilege", - L"SeSystemProfilePrivilege", - L"SeSystemtimePrivilege", - L"SeProfileSingleProcessPrivilege", - L"SeIncreaseBasePriorityPrivilege", - L"SeCreatePagefilePrivilege", - L"SeCreatePermanentPrivilege", - L"SeBackupPrivilege", - L"SeRestorePrivilege", - L"SeShutdownPrivilege", - L"SeDebugPrivilege", - L"SeAuditPrivilege", - L"SeSystemEnvironmentPrivilege", - L"SeChangeNotifyPrivilege", - L"SeRemoteShutdownPrivilege", - L"SeUndockPrivilege", - L"SeSyncAgentPrivilege", - L"SeEnableDelegationPrivilege", - L"SeManageVolumePrivilege", - L"SeImpersonatePrivilege", - L"SeCreateGlobalPrivilege" -}; +/* FUNCTIONS ***************************************************************/ NTSTATUS LsarpLookupPrivilegeName(PLUID Value, PUNICODE_STRING *Name) { PUNICODE_STRING NameBuffer; + ULONG Priv; - if (Value->HighPart || + if (Value->HighPart != 0 || (Value->LowPart < SE_MIN_WELL_KNOWN_PRIVILEGE || Value->LowPart > SE_MAX_WELL_KNOWN_PRIVILEGE)) { return STATUS_NO_SUCH_PRIVILEGE; } - NameBuffer = MIDL_user_allocate(sizeof(UNICODE_STRING)); - if (NameBuffer == NULL) - return STATUS_NO_MEMORY; + for (Priv = 0; Priv < sizeof(WellKnownPrivileges) / sizeof(WellKnownPrivileges[0]); Priv++) + { + if (Value->LowPart == WellKnownPrivileges[Priv].Luid.LowPart && + Value->HighPart == WellKnownPrivileges[Priv].Luid.HighPart) + { + NameBuffer = MIDL_user_allocate(sizeof(UNICODE_STRING)); + if (NameBuffer == NULL) + return STATUS_NO_MEMORY; - NameBuffer->Length = wcslen(WellKnownPrivNames[Value->LowPart]) * sizeof(WCHAR); - NameBuffer->MaximumLength = NameBuffer->Length + sizeof(WCHAR); + NameBuffer->Length = wcslen(WellKnownPrivileges[Priv].Name) * sizeof(WCHAR); + NameBuffer->MaximumLength = NameBuffer->Length + sizeof(WCHAR); - NameBuffer->Buffer = MIDL_user_allocate(NameBuffer->MaximumLength); - if (NameBuffer == NULL) - { - MIDL_user_free(NameBuffer); - return STATUS_NO_MEMORY; + NameBuffer->Buffer = MIDL_user_allocate(NameBuffer->MaximumLength); + if (NameBuffer == NULL) + { + MIDL_user_free(NameBuffer); + return STATUS_NO_MEMORY; + } + + wcscpy(NameBuffer->Buffer, WellKnownPrivileges[Priv].Name); + + *Name = NameBuffer; + + return STATUS_SUCCESS; + } } - wcscpy(NameBuffer->Buffer, WellKnownPrivNames[Value->LowPart]); - - *Name = NameBuffer; - - return STATUS_SUCCESS; + return STATUS_NO_SUCH_PRIVILEGE; } @@ -183,12 +108,12 @@ if (Name->Length == 0 || Name->Buffer == NULL) return STATUS_NO_SUCH_PRIVILEGE; - for (Priv = 0; Priv < sizeof(DefaultPrivNames) / sizeof(DefaultPrivNames[0]); Priv++) + for (Priv = 0; Priv < sizeof(WellKnownPrivileges) / sizeof(WellKnownPrivileges[0]); Priv++) { - if (0 == _wcsicmp(Name->Buffer, DefaultPrivNames[Priv])) + if (_wcsicmp(Name->Buffer, WellKnownPrivileges[Priv].Name) == 0) { - Value->LowPart = Priv + SE_MIN_WELL_KNOWN_PRIVILEGE; - Value->HighPart = 0; + Value->LowPart = WellKnownPrivileges[Priv].Luid.LowPart; + Value->HighPart = WellKnownPrivileges[Priv].Luid.HighPart; return STATUS_SUCCESS; } }

1 0

[tkreuzer] 48092: [KERNEL32] DWORD -> SIZE_T in ReadProcessMemory
by tkreuzer＠svn.reactos.org 17 Jul '10

17 Jul '10

Author: tkreuzer Date: Sat Jul 17 05:18:31 2010 New Revision: 48092 URL: http://svn.reactos.org/svn/reactos?rev=48092&view=rev Log: [KERNEL32] DWORD -> SIZE_T in ReadProcessMemory Modified: trunk/reactos/dll/win32/kernel32/mem/procmem.c Modified: trunk/reactos/dll/win32/kernel32/mem/procmem.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/mem/pro… ============================================================================== --- trunk/reactos/dll/win32/kernel32/mem/procmem.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/mem/procmem.c [iso-8859-1] Sat Jul 17 05:18:31 2010 @@ -23,8 +23,8 @@ ReadProcessMemory(IN HANDLE hProcess, IN LPCVOID lpBaseAddress, IN LPVOID lpBuffer, - IN DWORD nSize, - OUT LPDWORD lpNumberOfBytesRead) + IN SIZE_T nSize, + OUT SIZE_T* lpNumberOfBytesRead) { NTSTATUS Status;

1 0

[evb] 48091: Add config interface start (PciReadWriteConfigSpace, PciReadSlotConfig) Add PDO_EXTENSION structure and PCI_FUNCTION_RESOURCES, now delete #if0 in old code since PDO_EXTENSION is now exist defintion Add ID Class/Subclass to description functions (PciGetDeviceDescriptionMessage, PciGetDescriptionMessage), use pciclass.mc from sir_richard New debug: PciDebugDumpCommonConfig Implement IRP_MN_QUERY_DEVICE_RELATIONS with PciFdoIrpQueryDeviceRelations and PciQueryDeviceRelations Begin Pci
by evb＠svn.reactos.org 17 Jul '10

17 Jul '10

Author: evb Date: Sat Jul 17 01:31:26 2010 New Revision: 48091 URL: http://svn.reactos.org/svn/reactos?rev=48091&view=rev Log: Add config interface start (PciReadWriteConfigSpace, PciReadSlotConfig) Add PDO_EXTENSION structure and PCI_FUNCTION_RESOURCES, now delete #if0 in old code since PDO_EXTENSION is now exist defintion Add ID Class/Subclass to description functions (PciGetDeviceDescriptionMessage, PciGetDescriptionMessage), use pciclass.mc from sir_richard New debug: PciDebugDumpCommonConfig Implement IRP_MN_QUERY_DEVICE_RELATIONS with PciFdoIrpQueryDeviceRelations and PciQueryDeviceRelations Begin PciScanBus, now just dump all found device with no more work (0 QDR return) Modified: trunk/reactos/drivers/bus/pcix/arb/arb_comn.c trunk/reactos/drivers/bus/pcix/debug.c trunk/reactos/drivers/bus/pcix/enum.c trunk/reactos/drivers/bus/pcix/fdo.c trunk/reactos/drivers/bus/pcix/intrface/agpintrf.c trunk/reactos/drivers/bus/pcix/pci.h trunk/reactos/drivers/bus/pcix/pci/config.c trunk/reactos/drivers/bus/pcix/pci/id.c Modified: trunk/reactos/drivers/bus/pcix/arb/arb_comn.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/arb/arb_c… ============================================================================== --- trunk/reactos/drivers/bus/pcix/arb/arb_comn.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/arb/arb_comn.c [iso-8859-1] Sat Jul 17 01:31:26 2010 @@ -38,6 +38,7 @@ PciInitializeArbiters(IN PPCI_FDO_EXTENSION FdoExtension) { PPCI_INTERFACE CurrentInterface, *Interfaces; + PPCI_PDO_EXTENSION PdoExtension; PPCI_ARBITER_INSTANCE ArbiterInterface; NTSTATUS Status; PCI_SIGNATURE ArbiterType; @@ -49,19 +50,17 @@ /* Check if this is the extension for the Root PCI Bus */ if (!PCI_IS_ROOT_FDO(FdoExtension)) { -#if 0 // at next sync when PDO add /* Get the PDO extension */ PdoExtension = FdoExtension->PhysicalDeviceObject->DeviceExtension; ASSERT_PDO(PdoExtension); /* Skip this bus if it does subtractive decode */ - if (PdoExtension->Substractive) + if (PdoExtension->Dependent.type1.SubtractiveDecode) { DPRINT1("PCI Not creating arbiters for subtractive bus %d\n", - PdoExtension->Substractive); + PdoExtension->Dependent.type1.SubtractiveDecode); continue; } -#endif } /* Query all the registered arbiter interfaces */ @@ -127,7 +126,7 @@ PciInitializeArbiterRanges(IN PPCI_FDO_EXTENSION DeviceExtension, IN PCM_RESOURCE_LIST Resources) { - //PPCI_PDO_EXTENSION PdoExtension; + PPCI_PDO_EXTENSION PdoExtension; CM_RESOURCE_TYPE DesiredType; PVOID Instance; PCI_SIGNATURE ArbiterType; @@ -144,10 +143,9 @@ if (!PCI_IS_ROOT_FDO(DeviceExtension)) { /* Grab the PDO */ -#if 0 // when pdo support PdoExtension = (PPCI_PDO_EXTENSION)DeviceExtension->PhysicalDeviceObject->DeviceExtension; ASSERT(PdoExtension->ExtensionType == PciPdoExtensionType); -#endif + /* Multiple FDOs are not yet supported */ UNIMPLEMENTED; while (TRUE); Modified: trunk/reactos/drivers/bus/pcix/debug.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/debug.c?r… ============================================================================== --- trunk/reactos/drivers/bus/pcix/debug.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/debug.c [iso-8859-1] Sat Jul 17 01:31:26 2010 @@ -104,7 +104,7 @@ IN PPCI_FDO_EXTENSION DeviceExtension, IN USHORT MaxMinor) { - //PPCI_PDO_EXTENSION PdoDeviceExtension; + PPCI_PDO_EXTENSION PdoDeviceExtension; ULONG BreakMask, DebugLevel = 0; PCHAR IrpString; @@ -147,7 +147,7 @@ { DebugLevel = 0x200; } -#if 0 // after commit PDO support + /* For a PDO, print out the bus, device, and function number */ PdoDeviceExtension = (PVOID)DeviceExtension; DPRINT1("PDO(b=0x%x, d=0x%x, f=0x%x)<-%s\n", @@ -155,7 +155,6 @@ PdoDeviceExtension->Slot.u.bits.DeviceNumber, PdoDeviceExtension->Slot.u.bits.FunctionNumber, IrpString); -#endif } else if (DeviceExtension->ExtensionType == PciFdoExtensionType) { @@ -181,4 +180,18 @@ return ((1 << IoStackLocation->MinorFunction) & BreakMask); } +VOID +NTAPI +PciDebugDumpCommonConfig(IN PPCI_COMMON_HEADER PciData) +{ + USHORT i; + + /* Loop the PCI header */ + for (i = 0; i < PCI_COMMON_HDR_LENGTH; i += 4) + { + /* Dump each DWORD and its offset */ + DPRINT1(" %02x - %08x\n", i, *(PULONG)((ULONG_PTR)PciData + i)); + } +} + /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/enum.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/enum.c?re… ============================================================================== --- trunk/reactos/drivers/bus/pcix/enum.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/enum.c [iso-8859-1] Sat Jul 17 01:31:26 2010 @@ -16,4 +16,205 @@ /* FUNCTIONS ******************************************************************/ +NTSTATUS +NTAPI +PciScanBus(IN PPCI_FDO_EXTENSION DeviceExtension) +{ + ULONG MaxDevice = PCI_MAX_DEVICES; + ULONG i, j, k; + UCHAR Buffer[PCI_COMMON_HDR_LENGTH]; + PPCI_COMMON_HEADER PciData = (PVOID)Buffer; + PCI_SLOT_NUMBER PciSlot; + PWCHAR DescriptionText; + DPRINT1("PCI Scan Bus: FDO Extension @ 0x%x, Base Bus = 0x%x\n", + DeviceExtension, DeviceExtension->BaseBus); + + /* Is this the root FDO? */ + if (!PCI_IS_ROOT_FDO(DeviceExtension)) + { + /* Other FDOs are not currently supported */ + UNIMPLEMENTED; + while (TRUE); + } + + /* Loop every device on the bus */ + PciSlot.u.bits.Reserved = 0; + i = DeviceExtension->BaseBus; + for (j = 0; j < MaxDevice; j++) + { + /* Loop every function of each device */ + PciSlot.u.bits.DeviceNumber = j; + for (k = 0; k < PCI_MAX_FUNCTION; k++) + { + /* Build the final slot structure */ + PciSlot.u.bits.FunctionNumber = k; + + /* Read the vendor for this slot */ + PciReadSlotConfig(DeviceExtension, + PciSlot, + PciData, + 0, + sizeof(USHORT)); + + /* Skip invalid device */ + if (PciData->VendorID == PCI_INVALID_VENDORID) continue; + + /* Now read the whole header */ + PciReadSlotConfig(DeviceExtension, + PciSlot, + &PciData->DeviceID, + sizeof(USHORT), + PCI_COMMON_HDR_LENGTH - sizeof(USHORT)); + + /* Dump device that was found */ + DPRINT1("Scan Found Device 0x%x (b=0x%x, d=0x%x, f=0x%x)\n", + PciSlot.u.AsULONG, + i, + j, + k); + + /* Dump the device's header */ + PciDebugDumpCommonConfig(PciData); + + /* Find description for this device for the debugger's sake */ + DescriptionText = PciGetDeviceDescriptionMessage(PciData->BaseClass, + PciData->SubClass); + DPRINT1("Device Description \"%S\".\n", DescriptionText ? DescriptionText : L"(NULL)"); + if (DescriptionText) ExFreePoolWithTag(DescriptionText, 0); + + /* Check if there is an ACPI Watchdog Table */ + if (WdTable) + { + /* Check if this PCI device is the ACPI Watchdog Device... */ + UNIMPLEMENTED; + while (TRUE); + } + } + } + + /* Enumeration is completed */ + return STATUS_SUCCESS; +} + +NTSTATUS +NTAPI +PciQueryDeviceRelations(IN PPCI_FDO_EXTENSION DeviceExtension, + IN OUT PDEVICE_RELATIONS *pDeviceRelations) +{ + NTSTATUS Status; + PPCI_PDO_EXTENSION PdoExtension; + ULONG PdoCount = 0; + PDEVICE_RELATIONS DeviceRelations, NewRelations; + SIZE_T Size; + PDEVICE_OBJECT DeviceObject, *ObjectArray; + PAGED_CODE(); + + /* Make sure the FDO is started */ + ASSERT(DeviceExtension->DeviceState == PciStarted); + + /* Synchronize while we enumerate the bus */ + Status = PciBeginStateTransition(DeviceExtension, PciSynchronizedOperation); + if (!NT_SUCCESS(Status)) return Status; + + /* Scan all children PDO */ + for (PdoExtension = DeviceExtension->ChildPdoList; + PdoExtension; + PdoExtension = PdoExtension->Next) + { + /* Invalidate them */ + PdoExtension->NotPresent = TRUE; + } + + /* Scan the PCI Bus */ + Status = PciScanBus(DeviceExtension); + ASSERT(NT_SUCCESS(Status)); + + /* Enumerate all children PDO again */ + for (PdoExtension = DeviceExtension->ChildPdoList; + PdoExtension; + PdoExtension = PdoExtension->Next) + { + /* Check for PDOs that are still invalidated */ + if (PdoExtension->NotPresent) + { + /* This means this PDO existed before, but not anymore */ + PdoExtension->ReportedMissing = TRUE; + DPRINT1("PCI - Old device (pdox) %08x not found on rescan.\n", + PdoExtension); + } + else + { + /* Increase count of detected PDOs */ + PdoCount++; + } + } + + /* Read the current relations and add the newly discovered relations */ + DeviceRelations = *pDeviceRelations; + Size = FIELD_OFFSET(DEVICE_RELATIONS, Objects) + + PdoCount * sizeof(PDEVICE_OBJECT); + if (DeviceRelations) Size += sizeof(PDEVICE_OBJECT) * DeviceRelations->Count; + + /* Allocate the device relations */ + NewRelations = (PDEVICE_RELATIONS)ExAllocatePoolWithTag(0, Size, 'BicP'); + if (!NewRelations) + { + /* Out of space, cancel the operation */ + PciCancelStateTransition(DeviceExtension, PciSynchronizedOperation); + return STATUS_INSUFFICIENT_RESOURCES; + } + + /* Check if there were any older relations */ + NewRelations->Count = 0; + if (DeviceRelations) + { + /* Copy the old relations into the new buffer, then free the old one */ + RtlCopyMemory(NewRelations, + DeviceRelations, + FIELD_OFFSET(DEVICE_RELATIONS, Objects) + + DeviceRelations->Count * sizeof(PDEVICE_OBJECT)); + ExFreePoolWithTag(DeviceRelations, 0); + } + + /* Print out that we're ready to dump relations */ + DPRINT1("PCI QueryDeviceRelations/BusRelations FDOx %08x (bus 0x%02x)\n", + DeviceExtension, + DeviceExtension->BaseBus); + + /* Loop the current PDO children and the device relation object array */ + PdoExtension = DeviceExtension->ChildPdoList; + ObjectArray = &NewRelations->Objects[NewRelations->Count]; + while (PdoExtension) + { + /* Dump this relation */ + DPRINT1(" QDR PDO %08x (x %08x)%s\n", + PdoExtension->PhysicalDeviceObject, + PdoExtension, + PdoExtension->NotPresent ? + "<Omitted, device flaged not present>" : ""); + + /* Is this PDO present? */ + if (!PdoExtension->NotPresent) + { + /* Reference it and add it to the array */ + DeviceObject = PdoExtension->PhysicalDeviceObject; + ObfReferenceObject(DeviceObject); + *ObjectArray++ = DeviceObject; + } + + /* Go to the next PDO */ + PdoExtension = PdoExtension->Next; + } + + /* Terminate dumping the relations */ + DPRINT1(" QDR Total PDO count = %d (%d already in list)\n", + NewRelations->Count + PdoCount, + NewRelations->Count); + + /* Return the final count and the new buffer */ + NewRelations->Count += PdoCount; + *pDeviceRelations = NewRelations; + return STATUS_SUCCESS; +} + /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/fdo.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/fdo.c?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/fdo.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/fdo.c [iso-8859-1] Sat Jul 17 01:31:26 2010 @@ -193,9 +193,25 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_FDO_EXTENSION DeviceExtension) { - UNIMPLEMENTED; - while (TRUE); - return STATUS_NOT_SUPPORTED; + NTSTATUS Status; + PAGED_CODE(); + + /* Are bus relations being queried? */ + if (IoStackLocation->Parameters.QueryDeviceRelations.Type != BusRelations) + { + /* The FDO is a bus, so only bus relations can be obtained */ + Status = STATUS_NOT_SUPPORTED; + } + else + { + /* Scan the PCI bus and build the device relations for the caller */ + Status = PciQueryDeviceRelations(DeviceExtension, + (PDEVICE_RELATIONS*) + &Irp->IoStatus.Information); + } + + /* Return the enumeration status back */ + return Status; } NTSTATUS Modified: trunk/reactos/drivers/bus/pcix/intrface/agpintrf.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/intrface/… ============================================================================== --- trunk/reactos/drivers/bus/pcix/intrface/agpintrf.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/intrface/agpintrf.c [iso-8859-1] Sat Jul 17 01:31:26 2010 @@ -47,7 +47,6 @@ IN USHORT Size, IN PINTERFACE Interface) { -#if 0 // when have PDO commit PPCI_PDO_EXTENSION PdoExtension = (PPCI_PDO_EXTENSION)DeviceExtension; /* Only AGP bridges are supported (which are PCI-to-PCI Bridge Devices) */ @@ -57,7 +56,6 @@ /* Fail any other PDO */ return STATUS_NOT_SUPPORTED; } -#endif /* Not yet implemented */ UNIMPLEMENTED; Modified: trunk/reactos/drivers/bus/pcix/pci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci.h?rev… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci.h [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci.h [iso-8859-1] Sat Jul 17 01:31:26 2010 @@ -189,6 +189,93 @@ LONG BusHackFlags; } PCI_FDO_EXTENSION, *PPCI_FDO_EXTENSION; +typedef struct _PCI_FUNCTION_RESOURCES +{ + IO_RESOURCE_DESCRIPTOR Limit[7]; + CM_PARTIAL_RESOURCE_DESCRIPTOR Current[7]; +} PCI_FUNCTION_RESOURCES, *PPCI_FUNCTION_RESOURCES; + +typedef union _PCI_HEADER_TYPE_DEPENDENT +{ + struct + { + UCHAR Spare[4]; + } type0; + struct + { + UCHAR PrimaryBus; + UCHAR SecondaryBus; + UCHAR SubordinateBus; + UCHAR SubtractiveDecode:1; + UCHAR IsaBitSet:1; + UCHAR VgaBitSet:1; + UCHAR WeChangedBusNumbers:1; + UCHAR IsaBitRequired:1; + } type1; + struct + { + UCHAR Spare[4]; + } type2; +} PCI_HEADER_TYPE_DEPENDENT, *PPCI_HEADER_TYPE_DEPENDENT; + +typedef struct _PCI_PDO_EXTENSION +{ + PVOID Next; + ULONG ExtensionType; + struct _PCI_MJ_DISPATCH_TABLE *IrpDispatchTable; + BOOLEAN DeviceState; + BOOLEAN TentativeNextState; + + KEVENT SecondaryExtLock; + PCI_SLOT_NUMBER Slot; + PDEVICE_OBJECT PhysicalDeviceObject; + PPCI_FDO_EXTENSION ParentFdoExtension; + SINGLE_LIST_ENTRY SecondaryExtension; + LONG BusInterfaceReferenceCount; + LONG AgpInterfaceReferenceCount; + USHORT VendorId; + USHORT DeviceId; + USHORT SubsystemVendorId; + USHORT SubsystemId; + BOOLEAN RevisionId; + BOOLEAN ProgIf; + BOOLEAN SubClass; + BOOLEAN BaseClass; + BOOLEAN AdditionalResourceCount; + BOOLEAN AdjustedInterruptLine; + BOOLEAN InterruptPin; + BOOLEAN RawInterruptLine; + BOOLEAN CapabilitiesPtr; + BOOLEAN SavedLatencyTimer; + BOOLEAN SavedCacheLineSize; + BOOLEAN HeaderType; + BOOLEAN NotPresent; + BOOLEAN ReportedMissing; + BOOLEAN ExpectedWritebackFailure; + BOOLEAN NoTouchPmeEnable; + BOOLEAN LegacyDriver; + BOOLEAN UpdateHardware; + BOOLEAN MovedDevice; + BOOLEAN DisablePowerDown; + BOOLEAN NeedsHotPlugConfiguration; + BOOLEAN SwitchedIDEToNativeMode; + BOOLEAN BIOSAllowsIDESwitchToNativeMode; + BOOLEAN IoSpaceUnderNativeIdeControl; + BOOLEAN OnDebugPath; + PCI_POWER_STATE PowerState; + PCI_HEADER_TYPE_DEPENDENT Dependent; + ULONGLONG HackFlags; + PCI_FUNCTION_RESOURCES *Resources; + PCI_FDO_EXTENSION *BridgeFdoExtension; + struct _PCI_PDO_EXTENSION *NextBridge; + struct _PCI_PDO_EXTENSION *NextHashEntry; + PCI_LOCK Lock; + PCI_PMC PowerCapabilities; + BOOLEAN TargetAgpCapabilityId; + USHORT CommandEnables; + USHORT InitialCommand; +} PCI_PDO_EXTENSION, *PPCI_PDO_EXTENSION; + // // IRP Dispatch Function Type // @@ -579,6 +666,16 @@ IN PPCI_FDO_EXTENSION FdoExtension ); +VOID +NTAPI +PciReadSlotConfig( + IN PPCI_FDO_EXTENSION DeviceExtension, + IN PCI_SLOT_NUMBER Slot, + IN PVOID Buffer, + IN ULONG Offset, + IN ULONG Length +); + // // State Machine Logic Transition Routines // @@ -635,6 +732,12 @@ IN PIO_STACK_LOCATION IoStackLocation, IN PPCI_FDO_EXTENSION DeviceExtension, IN USHORT MaxMinor +); + +VOID +NTAPI +PciDebugDumpCommonConfig( + IN PPCI_COMMON_HEADER PciData ); // @@ -854,6 +957,26 @@ IN USHORT Version, IN USHORT Size, IN PINTERFACE Interface +); + +// +// PCI Enumeration and Resources +// +NTSTATUS +NTAPI +PciQueryDeviceRelations( + IN PPCI_FDO_EXTENSION DeviceExtension, + IN OUT PDEVICE_RELATIONS *pDeviceRelations +); + +// +// Identification Functions +// +PWCHAR +NTAPI +PciGetDeviceDescriptionMessage( + IN UCHAR BaseClass, + IN UCHAR SubClass ); // @@ -875,5 +998,7 @@ extern PCI_INTERFACE PciLocationInterface; extern PCI_INTERFACE AgpTargetInterface; extern PCI_INTERFACE TranslatorInterfaceInterrupt; +extern PDRIVER_OBJECT PciDriverObject; +extern PWATCHDOG_TABLE WdTable; /* EOF */ Modified: trunk/reactos/drivers/bus/pcix/pci/config.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/confi… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/config.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci/config.c [iso-8859-1] Sat Jul 17 01:31:26 2010 @@ -17,6 +17,61 @@ BOOLEAN PciAssignBusNumbers; /* FUNCTIONS ******************************************************************/ + +VOID +NTAPI +PciReadWriteConfigSpace(IN PPCI_FDO_EXTENSION DeviceExtension, + IN PCI_SLOT_NUMBER Slot, + IN PVOID Buffer, + IN ULONG Offset, + IN ULONG Length, + IN BOOLEAN Read) +{ + PPCI_BUS_INTERFACE_STANDARD PciInterface; + PBUS_HANDLER BusHandler; + PPCIBUSDATA BusData; + PciReadWriteConfig HalFunction; + + /* Only the root FDO can access configuration space */ + ASSERT(PCI_IS_ROOT_FDO(DeviceExtension->BusRootFdoExtension)); + + /* Get the ACPI-compliant PCI interface */ + PciInterface = DeviceExtension->BusRootFdoExtension->PciBusInterface; + if (PciInterface) + { + /* Currently this driver only supports the legacy HAL interface */ + UNIMPLEMENTED; + while (TRUE); + } + else + { + /* Make sure there's a registered HAL bus handler */ + ASSERT(DeviceExtension->BusHandler); + + /* PCI Bus Number assignment is only valid on ACPI systems */ + ASSERT(!PciAssignBusNumbers); + + /* Grab the HAL PCI Bus Handler data */ + BusHandler = (PBUS_HANDLER)DeviceExtension->BusHandler; + BusData = (PPCIBUSDATA)BusHandler->BusData; + + /* Choose the appropriate read or write function, and call it */ + HalFunction = Read ? BusData->ReadConfig : BusData->WriteConfig; + HalFunction(BusHandler, Slot, Buffer, Offset, Length); + } +} + +VOID +NTAPI +PciReadSlotConfig(IN PPCI_FDO_EXTENSION DeviceExtension, + IN PCI_SLOT_NUMBER Slot, + IN PVOID Buffer, + IN ULONG Offset, + IN ULONG Length) +{ + /* Call the generic worker function */ + PciReadWriteConfigSpace(DeviceExtension, Slot, Buffer, Offset, Length, TRUE); +} NTSTATUS NTAPI Modified: trunk/reactos/drivers/bus/pcix/pci/id.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci/id.c?… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci/id.c [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci/id.c [iso-8859-1] Sat Jul 17 01:31:26 2010 @@ -16,4 +16,95 @@ /* FUNCTIONS ******************************************************************/ +PWCHAR +NTAPI +PciGetDescriptionMessage(IN ULONG Identifier, + OUT PULONG Length) +{ + PMESSAGE_RESOURCE_ENTRY Entry; + ULONG TextLength; + PWCHAR Description, Buffer; + ANSI_STRING MessageString; + UNICODE_STRING UnicodeString; + NTSTATUS Status; + + /* Find the message identifier in the message table */ + MessageString.Buffer = NULL; + Status = RtlFindMessage(PciDriverObject->DriverStart, + 11, // RT_MESSAGETABLE + LANG_NEUTRAL, + Identifier, + &Entry); + if (!NT_SUCCESS(Status)) return NULL; + + /* Check if the resource data is Unicode or ANSI */ + if (Entry->Flags & MESSAGE_RESOURCE_UNICODE) + { + /* Subtract one space for the end-of-message terminator */ + TextLength = Entry->Length - + FIELD_OFFSET(MESSAGE_RESOURCE_ENTRY, Text) - + sizeof(WCHAR); + + /* Grab the text */ + Description = (PWCHAR)Entry->Text; + + /* Validate valid message length, ending with a newline character */ + ASSERT(TextLength > 1); + ASSERT(Description[TextLength / sizeof(WCHAR) == L'\n']); + + /* Allocate the buffer to hold the message string */ + Buffer = ExAllocatePoolWithTag(PagedPool, TextLength, 'BicP'); + if (!Buffer) return NULL; + + /* Copy the message, minus the newline character, and terminate it */ + RtlCopyMemory(Buffer, Entry->Text, TextLength - 1); + Buffer[TextLength / sizeof(WCHAR)] = UNICODE_NULL; + + /* Return the length to the caller */ + if (Length) *Length = UnicodeString.Length; + } + else + { + /* Initialize the entry as a string */ + RtlInitAnsiString(&MessageString, (PCHAR)Entry->Text); + + /* Remove the newline character */ + MessageString.Length -= sizeof(CHAR); + + /* Convert it to Unicode */ + RtlAnsiStringToUnicodeString(&UnicodeString, &MessageString, TRUE); + Buffer = UnicodeString.Buffer; + + /* Return the length to the caller */ + if (Length) *Length = UnicodeString.Length; + } + + /* Return the message buffer to the caller */ + return Buffer; +} + +PWCHAR +NTAPI +PciGetDeviceDescriptionMessage(IN UCHAR BaseClass, + IN UCHAR SubClass) +{ + PWCHAR Message; + ULONG Identifier; + + /* The message identifier in the table is encoded based on the PCI class */ + Identifier = (BaseClass << 8) | SubClass; + + /* Go grab the description message for this device */ + Message = PciGetDescriptionMessage(Identifier, NULL); + if (!Message) + { + /* It wasn't found, allocate a buffer for a generic description */ + Message = ExAllocatePoolWithTag(PagedPool, sizeof(L"PCI Device"), 'bicP'); + if (Message) RtlCopyMemory(Message, L"PCI Device", sizeof(L"PCI Device")); + } + + /* Return the description message */ + return Message; +} + /* EOF */

1 0

[tkreuzer] 48090: Fix CryptReleaseContext parameter, wine uses an outdated version (< NTDDI_WINXP)
by tkreuzer＠svn.reactos.org 16 Jul '10

16 Jul '10

Author: tkreuzer Date: Fri Jul 16 21:30:29 2010 New Revision: 48090 URL: http://svn.reactos.org/svn/reactos?rev=48090&view=rev Log: Fix CryptReleaseContext parameter, wine uses an outdated version (< NTDDI_WINXP) Added: trunk/reactos/dll/win32/advapi32/crypt/ros_diff.patch (with props) Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c Modified: trunk/reactos/dll/win32/advapi32/crypt/crypt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/c… ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/advapi32/crypt/crypt.c [iso-8859-1] Fri Jul 16 21:30:29 2010 @@ -618,7 +618,7 @@ * Success: TRUE * Failure: FALSE */ -BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, ULONG_PTR dwFlags) +BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) { PCRYPTPROV pProv = (PCRYPTPROV)hProv; BOOL ret = TRUE; Added: trunk/reactos/dll/win32/advapi32/crypt/ros_diff.patch URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/advapi32/crypt/r… ============================================================================== --- trunk/reactos/dll/win32/advapi32/crypt/ros_diff.patch (added) +++ trunk/reactos/dll/win32/advapi32/crypt/ros_diff.patch [iso-8859-1] Fri Jul 16 21:30:29 2010 @@ -1,0 +1,13 @@ +Index: crypt.c +=================================================================== +--- crypt.c (Revision 48087) ++++ crypt.c (Arbeitskopie) +@@ -618,7 +618,7 @@ + * Success: TRUE + * Failure: FALSE + */ +-BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, ULONG_PTR dwFlags) ++BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags) + { + PCRYPTPROV pProv = (PCRYPTPROV)hProv; + BOOL ret = TRUE; Propchange: trunk/reactos/dll/win32/advapi32/crypt/ros_diff.patch ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 48089: [WS2_32] DWORD -> DWORD_PTR
by tkreuzer＠svn.reactos.org 16 Jul '10

16 Jul '10

Author: tkreuzer Date: Fri Jul 16 20:24:32 2010 New Revision: 48089 URL: http://svn.reactos.org/svn/reactos?rev=48089&view=rev Log: [WS2_32] DWORD -> DWORD_PTR Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c Modified: trunk/reactos/dll/win32/ws2_32/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/ws2_32/misc/dllm… ============================================================================== --- trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/ws2_32/misc/dllmain.c [iso-8859-1] Fri Jul 16 20:24:32 2010 @@ -607,7 +607,7 @@ OUT LPSOCKADDR addr, IN OUT LPINT addrlen, IN LPCONDITIONPROC lpfnCondition, - IN DWORD dwCallbackData) + IN DWORD_PTR dwCallbackData) { PCATALOG_ENTRY Provider; SOCKET Socket;

1 0

[tkreuzer] 48088: [VIDEOPRT] Merge r40926 from amd64 branch: return ERROR_INVALID_FUNCTION on amd64, not ERROR_INVALID_ACCESS from VideoPortEn/DisableInterrupt. Fixes compilation of videoprt for amd64.
by tkreuzer＠svn.reactos.org 16 Jul '10

16 Jul '10

Author: tkreuzer Date: Fri Jul 16 19:20:49 2010 New Revision: 48088 URL: http://svn.reactos.org/svn/reactos?rev=48088&view=rev Log: [VIDEOPRT] Merge r40926 from amd64 branch: return ERROR_INVALID_FUNCTION on amd64, not ERROR_INVALID_ACCESS from VideoPortEn/DisableInterrupt. Fixes compilation of videoprt for amd64. Modified: trunk/reactos/ (props changed) trunk/reactos/drivers/video/videoprt/interrupt.c Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Fri Jul 16 19:20:49 2010 @@ -1,4 +1,4 @@ /branches/header-work:45691-47721 /branches/reactos-yarotows:46372,46848,46966,47800,48026,48064 /branches/ros-amd64-bringup:36852 -/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36445,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36992,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40927-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43965,43969,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,47472,47846-47847,47878,47882 +/branches/ros-amd64-bringup/reactos:34711-34712,34741,34743,34780-34782,34803,34812,34839,34842,34864,34870,34874,34877,34908-34909,34917,34965,35323-35324,35347-35348,35361,35436,35509,35515,35588,35655,35683,35739,35746,35762,35771,35777,35781,35789,35805,35823,35827,35902,35904-35906,35942,35947-35949,35952-35953,35966,36011-36013,36172,36360,36380,36388-36389,36393,36397,36445,36502-36503,36505,36570,36614,36852,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36992,37322-37323,37333-37334,37434,37472,37475,37536,37820-37821,37868-37869,37873,37990-37991,38013-38014,38092,38100,38148-38151,38264-38265,38268,38355,39151,39333,39335,39345,39639,40120,40122-40123,40125,40127-40128,40155,40247,40324,40608,40753,40926-40928,40986-40987,40989,40991,40993,40995-40996,41000-41001,41027-41030,41044-41045,41047-41050,41052,41070,41082-41086,41097-41098,41101,41449,41479-41480,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43451,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43965,43969,43992,44002,44036-44037,44039-44040,44044-44045,44053,44065,44095,44123,44143-44144,44205,44238,44257,44259,44294,44338-44339,44385,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,44818,45124,45126-45127,46394,46404,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,47472,47846-47847,47878,47882 Modified: trunk/reactos/drivers/video/videoprt/interrupt.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/video/videoprt/int… ============================================================================== --- trunk/reactos/drivers/video/videoprt/interrupt.c [iso-8859-1] (original) +++ trunk/reactos/drivers/video/videoprt/interrupt.c [iso-8859-1] Fri Jul 16 19:20:49 2010 @@ -137,7 +137,7 @@ #else /* FIXME: Function still present? If so what to use instead of HalEnableSystemInterrupt? */ UNIMPLEMENTED; - return ERROR_INVALID_ACCESS; + return ERROR_INVALID_FUNCTION; #endif } @@ -168,6 +168,6 @@ #else /* FIXME: Function still present? If so what to use instead of HalDisableSystemInterrupt? */ UNIMPLEMENTED; - return ERROR_INVALID_ACCESS; + return ERROR_INVALID_FUNCTION; #endif }

1 0

[tkreuzer] 48087: [NTOSKRNL] - #if out RtlpCaptureStackLimits on amd64 as well
by tkreuzer＠svn.reactos.org 16 Jul '10

16 Jul '10

Author: tkreuzer Date: Fri Jul 16 17:53:00 2010 New Revision: 48087 URL: http://svn.reactos.org/svn/reactos?rev=48087&view=rev Log: [NTOSKRNL] - #if out RtlpCaptureStackLimits on amd64 as well Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c Modified: trunk/reactos/ntoskrnl/rtl/libsupp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/rtl/libsupp.c?rev… ============================================================================== --- trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/rtl/libsupp.c [iso-8859-1] Fri Jul 16 17:53:00 2010 @@ -225,7 +225,7 @@ return FALSE; } -#ifndef _ARM_ +#if !defined(_ARM_) && !defined(_AMD64_) BOOLEAN NTAPI

1 0

← Newer
1
...
27
28
29
30
31
32
33
...
47
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 July 2010