Ros-diffs

ros-diffs@reactos.org

81390 discussions

[sir_richard] 47893: [NDK]: Add some missing RTL Range Functions needed by eVb.
by sir_richard＠svn.reactos.org 28 Jun '10

28 Jun '10

Author: sir_richard Date: Mon Jun 28 04:26:18 2010 New Revision: 47893 URL: http://svn.reactos.org/svn/reactos?rev=47893&view=rev Log: [NDK]: Add some missing RTL Range Functions needed by eVb. Modified: trunk/reactos/include/ndk/rtlfuncs.h Modified: trunk/reactos/include/ndk/rtlfuncs.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/ndk/rtlfuncs.h?rev… ============================================================================== --- trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] (original) +++ trunk/reactos/include/ndk/rtlfuncs.h [iso-8859-1] Mon Jun 28 04:26:18 2010 @@ -2631,7 +2631,29 @@ NTSYSAPI VOID NTAPI -RtlFreeRangeList(IN PRTL_RANGE_LIST RangeList); +RtlInitializeRangeList( + IN OUT PRTL_RANGE_LIST RangeList +); + +NTSYSAPI +VOID +NTAPI +RtlFreeRangeList( + IN PRTL_RANGE_LIST RangeList +); + +NTSYSAPI +NTSTATUS +NTAPI +RtlAddRange( + IN OUT PRTL_RANGE_LIST RangeList, + IN ULONGLONG Start, + IN ULONGLONG End, + IN UCHAR Attributes, + IN ULONG Flags, + IN PVOID UserData OPTIONAL, + IN PVOID Owner OPTIONAL +); // // Debug Functions

1 0

[sir_richard] 47892: [ACPI]: Share ACPI table structures and NT-specific registry data in a shared, internal ACPI header, instead of HAL's internal headers, because FreeLDR, the kernel's PnP Manager, the PCI Bus Driver and the ACPI Driver all need access to these types as well.
by sir_richard＠svn.reactos.org 28 Jun '10

28 Jun '10

Author: sir_richard Date: Mon Jun 28 04:25:38 2010 New Revision: 47892 URL: http://svn.reactos.org/svn/reactos?rev=47892&view=rev Log: [ACPI]: Share ACPI table structures and NT-specific registry data in a shared, internal ACPI header, instead of HAL's internal headers, because FreeLDR, the kernel's PnP Manager, the PCI Bus Driver and the ACPI Driver all need access to these types as well. Added: trunk/reactos/include/reactos/drivers/acpi/ trunk/reactos/include/reactos/drivers/acpi/acpi.h (with props) Modified: trunk/reactos/hal/halx86/include/hal.h trunk/reactos/hal/halx86/include/halacpi.h Modified: trunk/reactos/hal/halx86/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/hal.h?r… ============================================================================== --- trunk/reactos/hal/halx86/include/hal.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/hal.h [iso-8859-1] Mon Jun 28 04:25:38 2010 @@ -29,8 +29,9 @@ #include <arc/arc.h> #include <ntndk.h> -/* Internal shared PCI header */ +/* Internal shared PCI and ACPI header */ #include <drivers/pci/pci.h> +#include <drivers/acpi/acpi.h> /* Internal kernel headers */ #define KeGetCurrentThread _KeGetCurrentThread Modified: trunk/reactos/hal/halx86/include/halacpi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/halacpi… ============================================================================== --- trunk/reactos/hal/halx86/include/halacpi.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/halacpi.h [iso-8859-1] Mon Jun 28 04:25:38 2010 @@ -1,201 +1,4 @@ #pragma once - -// -// Should be shared with FreeLDR -// -typedef struct _ACPI_E820_ENTRY -{ - PHYSICAL_ADDRESS Base; - LARGE_INTEGER Length; - ULONGLONG Type; -} ACPI_E820_ENTRY, *PACPI_E820_ENTRY; - -typedef struct _ACPI_BIOS_MULTI_NODE -{ - PHYSICAL_ADDRESS RsdtAddress; - ULONGLONG Count; - ACPI_E820_ENTRY E820Entry[1]; -} ACPI_BIOS_MULTI_NODE, *PACPI_BIOS_MULTI_NODE; - -// -// ACPI Signatures -// -#define RSDP_SIGNATURE 0x2052545020445352 // "RSD PTR " -#define FACS_SIGNATURE 0x53434146 // "FACS" -#define FADT_SIGNATURE 0x50434146 // "FACP" -#define RSDT_SIGNATURE 0x54445352 // "RSDT" -#define APIC_SIGNATURE 0x43495041 // "APIC" -#define DSDT_SIGNATURE 0x54445344 // "DSDT" -#define SSDT_SIGNATURE 0x54445353 // "SSDT" -#define PSDT_SIGNATURE 0x54445350 // "PSDT" -#define SBST_SIGNATURE 0x54534253 // "SBST" -#define DBGP_SIGNATURE 0x50474244 // "DBGP" -#define XSDT_SIGNATURE 'TDSX' -#define BOOT_SIGNATURE 'TOOB' -#define SRAT_SIGNATURE 'TARS' - -// -// FADT Flags -// -#define ACPI_TMR_VAL_EXT 0x100 - -// -// ACPI Generic Register Address -// -typedef struct _GEN_ADDR -{ - UCHAR AddressSpaceID; - UCHAR BitWidth; - UCHAR BitOffset; - UCHAR Reserved; - PHYSICAL_ADDRESS Address; -} GEN_ADDR, *PGEN_ADDR; - -// -// ACPI BIOS Structures (packed) -// -#include <pshpack1.h> -typedef struct _RSDP -{ - ULONGLONG Signature; - UCHAR Checksum; - UCHAR OEMID[6]; - UCHAR Reserved[1]; - ULONG RsdtAddress; -} RSDP; -typedef RSDP *PRSDP; - -typedef struct _DESCRIPTION_HEADER -{ - ULONG Signature; - ULONG Length; - UCHAR Revision; - UCHAR Checksum; - UCHAR OEMID[6]; - UCHAR OEMTableID[8]; - ULONG OEMRevision; - UCHAR CreatorID[4]; - ULONG CreatorRev; -} DESCRIPTION_HEADER; -typedef DESCRIPTION_HEADER *PDESCRIPTION_HEADER; - -typedef struct _FACS -{ - ULONG Signature; - ULONG Length; - ULONG HardwareSignature; - ULONG pFirmwareWakingVector; - ULONG GlobalLock; - ULONG Flags; - PHYSICAL_ADDRESS x_FirmwareWakingVector; - UCHAR version; - UCHAR Reserved[32]; -} FACS; -typedef FACS *PFACS; - -typedef struct _FADT -{ - DESCRIPTION_HEADER Header; - ULONG facs; - ULONG dsdt; - UCHAR int_model; - UCHAR pm_profile; - USHORT sci_int_vector; - ULONG smi_cmd_io_port; - UCHAR acpi_on_value; - UCHAR acpi_off_value; - UCHAR s4bios_req; - UCHAR pstate_control; - ULONG pm1a_evt_blk_io_port; - ULONG pm1b_evt_blk_io_port; - ULONG pm1a_ctrl_blk_io_port; - ULONG pm1b_ctrl_blk_io_port; - ULONG pm2_ctrl_blk_io_port; - ULONG pm_tmr_blk_io_port; - ULONG gp0_blk_io_port; - ULONG gp1_blk_io_port; - UCHAR pm1_evt_len; - UCHAR pm1_ctrl_len; - UCHAR pm2_ctrl_len; - UCHAR pm_tmr_len; - UCHAR gp0_blk_len; - UCHAR gp1_blk_len; - UCHAR gp1_base; - UCHAR cstate_control; - USHORT lvl2_latency; - USHORT lvl3_latency; - USHORT flush_size; - USHORT flush_stride; - UCHAR duty_offset; - UCHAR duty_width; - UCHAR day_alarm_index; - UCHAR month_alarm_index; - UCHAR century_alarm_index; - USHORT boot_arch; - UCHAR reserved3[1]; - ULONG flags; - GEN_ADDR reset_reg; - UCHAR reset_val; - UCHAR reserved4[3]; - PHYSICAL_ADDRESS x_firmware_ctrl; - PHYSICAL_ADDRESS x_dsdt; - GEN_ADDR x_pm1a_evt_blk; - GEN_ADDR x_pm1b_evt_blk; - GEN_ADDR x_pm1a_ctrl_blk; - GEN_ADDR x_pm1b_ctrl_blk; - GEN_ADDR x_pm2_ctrl_blk; - GEN_ADDR x_pm_tmr_blk; - GEN_ADDR x_gp0_blk; - GEN_ADDR x_gp1_blk; -} FADT; -typedef FADT *PFADT; - -typedef struct _DSDT -{ - DESCRIPTION_HEADER Header; - UCHAR DiffDefBlock[ANYSIZE_ARRAY]; -} DSDT; -typedef DSDT *PDSDT; - -typedef struct _RSDT -{ - DESCRIPTION_HEADER Header; - ULONG Tables[ANYSIZE_ARRAY]; -} RSDT; -typedef RSDT *PRSDT; - -typedef struct _XSDT -{ - DESCRIPTION_HEADER Header; - PHYSICAL_ADDRESS Tables[ANYSIZE_ARRAY]; -} XSDT; -typedef XSDT *PXSDT; -#include <poppack.h> - -// -// Microsoft-specific (pretty much) ACPI Tables, normal MS ABI packing -// -typedef struct _DEBUG_PORT_TABLE -{ - DESCRIPTION_HEADER Header; - UCHAR InterfaceType; - UCHAR Reserved[3]; - GEN_ADDR BaseAddress; -} DEBUG_PORT_TABLE, *PDEBUG_PORT_TABLE; - -typedef struct _BOOT_TABLE -{ - DESCRIPTION_HEADER Header; - UCHAR CMOSIndex; - UCHAR Reserved[3]; -} BOOT_TABLE, *PBOOT_TABLE; - -typedef struct _ACPI_SRAT -{ - DESCRIPTION_HEADER Header; - UCHAR TableRevision; - ULONG Reserved[2]; -} ACPI_SRAT, *PACPI_SRAT; // // Internal HAL structure Added: trunk/reactos/include/reactos/drivers/acpi/acpi.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/ac… ============================================================================== --- trunk/reactos/include/reactos/drivers/acpi/acpi.h (added) +++ trunk/reactos/include/reactos/drivers/acpi/acpi.h [iso-8859-1] Mon Jun 28 04:25:38 2010 @@ -1,0 +1,222 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: include/reactos/drivers/acpi/acpi.h + * PURPOSE: ACPI Tables and NT Registry Data + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +// +// ACPI BIOS Registry Component Configuration Data +// +typedef struct _ACPI_E820_ENTRY +{ + PHYSICAL_ADDRESS Base; + LARGE_INTEGER Length; + ULONGLONG Type; +} ACPI_E820_ENTRY, *PACPI_E820_ENTRY; + +typedef struct _ACPI_BIOS_MULTI_NODE +{ + PHYSICAL_ADDRESS RsdtAddress; + ULONGLONG Count; + ACPI_E820_ENTRY E820Entry[1]; +} ACPI_BIOS_MULTI_NODE, *PACPI_BIOS_MULTI_NODE; + +// +// ACPI Signatures +// +#define RSDP_SIGNATURE 0x2052545020445352 // "RSD PTR " +#define FACS_SIGNATURE 0x53434146 // "FACS" +#define FADT_SIGNATURE 0x50434146 // "FACP" +#define RSDT_SIGNATURE 0x54445352 // "RSDT" +#define APIC_SIGNATURE 0x43495041 // "APIC" +#define DSDT_SIGNATURE 0x54445344 // "DSDT" +#define SSDT_SIGNATURE 0x54445353 // "SSDT" +#define PSDT_SIGNATURE 0x54445350 // "PSDT" +#define SBST_SIGNATURE 0x54534253 // "SBST" +#define DBGP_SIGNATURE 0x50474244 // "DBGP" +#define XSDT_SIGNATURE 'TDSX' +#define BOOT_SIGNATURE 'TOOB' +#define SRAT_SIGNATURE 'TARS' +#define WDRT_SIGNATURE 'TRDW' + +// +// FADT Flags +// +#define ACPI_TMR_VAL_EXT 0x100 + +// +// ACPI Generic Register Address +// +typedef struct _GEN_ADDR +{ + UCHAR AddressSpaceID; + UCHAR BitWidth; + UCHAR BitOffset; + UCHAR Reserved; + PHYSICAL_ADDRESS Address; +} GEN_ADDR, *PGEN_ADDR; + +// +// ACPI BIOS Structures (packed) +// +#include <pshpack1.h> +typedef struct _RSDP +{ + ULONGLONG Signature; + UCHAR Checksum; + UCHAR OEMID[6]; + UCHAR Reserved[1]; + ULONG RsdtAddress; +} RSDP; +typedef RSDP *PRSDP; + +typedef struct _DESCRIPTION_HEADER +{ + ULONG Signature; + ULONG Length; + UCHAR Revision; + UCHAR Checksum; + UCHAR OEMID[6]; + UCHAR OEMTableID[8]; + ULONG OEMRevision; + UCHAR CreatorID[4]; + ULONG CreatorRev; +} DESCRIPTION_HEADER; +typedef DESCRIPTION_HEADER *PDESCRIPTION_HEADER; + +typedef struct _FACS +{ + ULONG Signature; + ULONG Length; + ULONG HardwareSignature; + ULONG pFirmwareWakingVector; + ULONG GlobalLock; + ULONG Flags; + PHYSICAL_ADDRESS x_FirmwareWakingVector; + UCHAR version; + UCHAR Reserved[32]; +} FACS; +typedef FACS *PFACS; + +typedef struct _FADT +{ + DESCRIPTION_HEADER Header; + ULONG facs; + ULONG dsdt; + UCHAR int_model; + UCHAR pm_profile; + USHORT sci_int_vector; + ULONG smi_cmd_io_port; + UCHAR acpi_on_value; + UCHAR acpi_off_value; + UCHAR s4bios_req; + UCHAR pstate_control; + ULONG pm1a_evt_blk_io_port; + ULONG pm1b_evt_blk_io_port; + ULONG pm1a_ctrl_blk_io_port; + ULONG pm1b_ctrl_blk_io_port; + ULONG pm2_ctrl_blk_io_port; + ULONG pm_tmr_blk_io_port; + ULONG gp0_blk_io_port; + ULONG gp1_blk_io_port; + UCHAR pm1_evt_len; + UCHAR pm1_ctrl_len; + UCHAR pm2_ctrl_len; + UCHAR pm_tmr_len; + UCHAR gp0_blk_len; + UCHAR gp1_blk_len; + UCHAR gp1_base; + UCHAR cstate_control; + USHORT lvl2_latency; + USHORT lvl3_latency; + USHORT flush_size; + USHORT flush_stride; + UCHAR duty_offset; + UCHAR duty_width; + UCHAR day_alarm_index; + UCHAR month_alarm_index; + UCHAR century_alarm_index; + USHORT boot_arch; + UCHAR reserved3[1]; + ULONG flags; + GEN_ADDR reset_reg; + UCHAR reset_val; + UCHAR reserved4[3]; + PHYSICAL_ADDRESS x_firmware_ctrl; + PHYSICAL_ADDRESS x_dsdt; + GEN_ADDR x_pm1a_evt_blk; + GEN_ADDR x_pm1b_evt_blk; + GEN_ADDR x_pm1a_ctrl_blk; + GEN_ADDR x_pm1b_ctrl_blk; + GEN_ADDR x_pm2_ctrl_blk; + GEN_ADDR x_pm_tmr_blk; + GEN_ADDR x_gp0_blk; + GEN_ADDR x_gp1_blk; +} FADT; +typedef FADT *PFADT; + +typedef struct _DSDT +{ + DESCRIPTION_HEADER Header; + UCHAR DiffDefBlock[ANYSIZE_ARRAY]; +} DSDT; +typedef DSDT *PDSDT; + +typedef struct _RSDT +{ + DESCRIPTION_HEADER Header; + ULONG Tables[ANYSIZE_ARRAY]; +} RSDT; +typedef RSDT *PRSDT; + +typedef struct _XSDT +{ + DESCRIPTION_HEADER Header; + PHYSICAL_ADDRESS Tables[ANYSIZE_ARRAY]; +} XSDT; +typedef XSDT *PXSDT; +#include <poppack.h> + +// +// Microsoft-specific (pretty much) ACPI Tables, normal MS ABI packing +// +typedef struct _DEBUG_PORT_TABLE +{ + DESCRIPTION_HEADER Header; + UCHAR InterfaceType; + UCHAR Reserved[3]; + GEN_ADDR BaseAddress; +} DEBUG_PORT_TABLE, *PDEBUG_PORT_TABLE; + +typedef struct _WATCHDOG_TABLE +{ + DESCRIPTION_HEADER Header; + GEN_ADDR ControlRegister; + GEN_ADDR CountRegister; + USHORT PciDeviceId; + USHORT PciVendorId; + UCHAR PciBus; + UCHAR PciDevice; + UCHAR PciFunction; + UCHAR PciSegment; + USHORT MaxCount; + UCHAR Units; +} WATCHDOG_TABLE, *PWATCHDOG_TABLE; + +typedef struct _BOOT_TABLE +{ + DESCRIPTION_HEADER Header; + UCHAR CMOSIndex; + UCHAR Reserved[3]; +} BOOT_TABLE, *PBOOT_TABLE; + +typedef struct _ACPI_SRAT +{ + DESCRIPTION_HEADER Header; + UCHAR TableRevision; + ULONG Reserved[2]; +} ACPI_SRAT, *PACPI_SRAT; + +/* EOF */ Propchange: trunk/reactos/include/reactos/drivers/acpi/acpi.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tkreuzer] 47890: [WINED3D] Fix prototype of wined3d_event_query_supported (BOOL != HRESULT)
by tkreuzer＠svn.reactos.org 28 Jun '10

28 Jun '10

Author: tkreuzer Date: Mon Jun 28 02:27:53 2010 New Revision: 47890 URL: http://svn.reactos.org/svn/reactos?rev=47890&view=rev Log: [WINED3D] Fix prototype of wined3d_event_query_supported (BOOL != HRESULT) Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h Modified: trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/directx/wine/wined3d/w… ============================================================================== --- trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] (original) +++ trunk/reactos/dll/directx/wine/wined3d/wined3d_private.h [iso-8859-1] Mon Jun 28 02:27:53 2010 @@ -1029,7 +1029,7 @@ enum wined3d_event_query_result wined3d_event_query_test(struct wined3d_event_query *query, IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; enum wined3d_event_query_result wined3d_event_query_finish(struct wined3d_event_query *query, IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; void wined3d_event_query_issue(struct wined3d_event_query *query, IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; -HRESULT wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; +BOOL wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; struct wined3d_context {

1 0

[tkreuzer] 47889: usurp: Physicus: better use </if> in .rbuild ; ) So be it.
by tkreuzer＠svn.reactos.org 28 Jun '10

28 Jun '10

Author: tkreuzer Date: Mon Jun 28 01:29:27 2010 New Revision: 47889 URL: http://svn.reactos.org/svn/reactos?rev=47889&view=rev Log: usurp: Physicus: better use </if> in .rbuild ;) So be it. Modified: trunk/rostests/apitests/directory.rbuild Modified: trunk/rostests/apitests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/directory.rbuild… ============================================================================== --- trunk/rostests/apitests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/apitests/directory.rbuild [iso-8859-1] Mon Jun 28 01:29:27 2010 @@ -26,7 +26,7 @@ <directory name="w32knapi"> <xi:include href="w32knapi/w32knapi.rbuild" /> </directory> - </endif> + </if> <directory name="ws2_32"> <xi:include href="ws2_32/ws2_32.rbuild" />

1 0

[tkreuzer] 47888: build w32knapi only for x86
by tkreuzer＠svn.reactos.org 28 Jun '10

28 Jun '10

Author: tkreuzer Date: Mon Jun 28 00:32:35 2010 New Revision: 47888 URL: http://svn.reactos.org/svn/reactos?rev=47888&view=rev Log: build w32knapi only for x86 Modified: trunk/rostests/apitests/directory.rbuild Modified: trunk/rostests/apitests/directory.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rostests/apitests/directory.rbuild… ============================================================================== --- trunk/rostests/apitests/directory.rbuild [iso-8859-1] (original) +++ trunk/rostests/apitests/directory.rbuild [iso-8859-1] Mon Jun 28 00:32:35 2010 @@ -18,13 +18,15 @@ <xi:include href="user32api/user32api.rbuild" /> </directory> - <directory name="w32kdll"> - <xi:include href="w32kdll/directory.rbuild" /> - </directory> + <if property="ARCH" value="i386"> + <directory name="w32kdll"> + <xi:include href="w32kdll/directory.rbuild" /> + </directory> - <directory name="w32knapi"> - <xi:include href="w32knapi/w32knapi.rbuild" /> - </directory> + <directory name="w32knapi"> + <xi:include href="w32knapi/w32knapi.rbuild" /> + </directory> + </endif> <directory name="ws2_32"> <xi:include href="ws2_32/ws2_32.rbuild" />

1 0

[sir_richard] 47887: [PCI]: Add pciclass.rc to use the pciclass.mc/res-generated file by MC. eVb can now start committing his driver.
by sir_richard＠svn.reactos.org 28 Jun '10

28 Jun '10

Author: sir_richard Date: Mon Jun 28 00:02:20 2010 New Revision: 47887 URL: http://svn.reactos.org/svn/reactos?rev=47887&view=rev Log: [PCI]: Add pciclass.rc to use the pciclass.mc/res-generated file by MC. eVb can now start committing his driver. Modified: trunk/reactos/drivers/bus/pcix/pci.rc trunk/reactos/drivers/bus/pcix/pcix.rbuild Modified: trunk/reactos/drivers/bus/pcix/pci.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pci.rc?re… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pci.rc [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pci.rc [iso-8859-1] Mon Jun 28 00:02:20 2010 @@ -3,3 +3,5 @@ #define REACTOS_STR_INTERNAL_NAME "pci\0" #define REACTOS_STR_ORIGINAL_FILENAME "pci.sys\0" #include <reactos/version.rc> +#include "pciclass.rc" + Modified: trunk/reactos/drivers/bus/pcix/pcix.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/bus/pcix/pcix.rbui… ============================================================================== --- trunk/reactos/drivers/bus/pcix/pcix.rbuild [iso-8859-1] (original) +++ trunk/reactos/drivers/bus/pcix/pcix.rbuild [iso-8859-1] Mon Jun 28 00:02:20 2010 @@ -5,6 +5,7 @@ <include base="pcix">.</include> <library>ntoskrnl</library> <library>hal</library> + <dependency>pciclass</dependency> <directory name="arb"> <file>ar_busno.c</file> <file>ar_memio.c</file>

1 0

[sir_richard] 47886: [PCI]: Add PCI IRQ Routing Table structure to Shared, Internal PCI Header (based off the Microsoft Spec and the Apple SMBIOS Header). [PCI]: Remove HAL-internal PCI definitions from the existing "Shared/Internal" PCI Header which existed in NTOS's private include directory, and move them to HAL-internal headers. [PCI]: Remove remaining shared PCI definitions from that same header, and put them in the new Shared/Internal PCI Header. [PCI]: Remove duplicated PCI definitions fr
by sir_richard＠svn.reactos.org 27 Jun '10

27 Jun '10

Author: sir_richard Date: Sun Jun 27 23:54:47 2010 New Revision: 47886 URL: http://svn.reactos.org/svn/reactos?rev=47886&view=rev Log: [PCI]: Add PCI IRQ Routing Table structure to Shared, Internal PCI Header (based off the Microsoft Spec and the Apple SMBIOS Header). [PCI]: Remove HAL-internal PCI definitions from the existing "Shared/Internal" PCI Header which existed in NTOS's private include directory, and move them to HAL-internal headers. [PCI]: Remove remaining shared PCI definitions from that same header, and put them in the new Shared/Internal PCI Header. [PCI]: Remove duplicated PCI definitions from FreeLDR, and use thw new Shared/Internal PCI Header. Removed: trunk/reactos/ntoskrnl/include/internal/pci.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c trunk/reactos/boot/freeldr/freeldr/include/freeldr.h trunk/reactos/hal/halx86/include/bus.h trunk/reactos/hal/halx86/include/hal.h trunk/reactos/include/reactos/drivers/pci/pci.h Modified: trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/arch/… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/arch/i386/hwpci.c [iso-8859-1] Sun Jun 27 23:54:47 2010 @@ -23,49 +23,6 @@ #define NDEBUG #include <debug.h> -#include <pshpack1.h> - -typedef struct _ROUTING_SLOT -{ - UCHAR BusNumber; - UCHAR DeviceNumber; - UCHAR LinkA; - USHORT BitmapA; - UCHAR LinkB; - USHORT BitmapB; - UCHAR LinkC; - USHORT BitmapC; - UCHAR LinkD; - USHORT BitmapD; - UCHAR SlotNumber; - UCHAR Reserved; -} ROUTING_SLOT, *PROUTING_SLOT; - -typedef struct _PCI_IRQ_ROUTING_TABLE -{ - ULONG Signature; - USHORT Version; - USHORT Size; - UCHAR RouterBus; - UCHAR RouterSlot; - USHORT ExclusiveIRQs; - ULONG CompatibleRouter; - ULONG MiniportData; - UCHAR Reserved[11]; - UCHAR Checksum; - ROUTING_SLOT Slot[1]; -} PCI_IRQ_ROUTING_TABLE, *PPCI_IRQ_ROUTING_TABLE; - -#include <poppack.h> - -typedef struct _PCI_REGISTRY_INFO -{ - UCHAR MajorRevision; - UCHAR MinorRevision; - UCHAR NoBuses; - UCHAR HardwareMechanism; -} PCI_REGISTRY_INFO, *PPCI_REGISTRY_INFO; - static PPCI_IRQ_ROUTING_TABLE GetPciIrqRoutingTable(VOID) { @@ -77,14 +34,14 @@ Table = (PPCI_IRQ_ROUTING_TABLE)0xF0000; while ((ULONG_PTR)Table < 0x100000) { - if (Table->Signature == 0x52495024) + if (Table->Signature == 'RIP$') { DPRINTM(DPRINT_HWDETECT, "Found signature\n"); Ptr = (PUCHAR)Table; Sum = 0; - for (i = 0; i < Table->Size; i++) + for (i = 0; i < Table->TableSize; i++) { Sum += Ptr[i]; } @@ -156,11 +113,11 @@ Table = GetPciIrqRoutingTable(); if (Table != NULL) { - DPRINTM(DPRINT_HWDETECT, "Table size: %u\n", Table->Size); + DPRINTM(DPRINT_HWDETECT, "Table size: %u\n", Table->TableSize); /* Set 'Configuration Data' value */ Size = FIELD_OFFSET(CM_PARTIAL_RESOURCE_LIST, PartialDescriptors) + - 2 * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) + Table->Size; + 2 * sizeof(CM_PARTIAL_RESOURCE_DESCRIPTOR) + Table->TableSize; PartialResourceList = MmHeapAlloc(Size); if (PartialResourceList == NULL) { @@ -184,10 +141,10 @@ PartialDescriptor = &PartialResourceList->PartialDescriptors[1]; PartialDescriptor->Type = CmResourceTypeDeviceSpecific; PartialDescriptor->ShareDisposition = CmResourceShareUndetermined; - PartialDescriptor->u.DeviceSpecificData.DataSize = Table->Size; + PartialDescriptor->u.DeviceSpecificData.DataSize = Table->TableSize; memcpy(&PartialResourceList->PartialDescriptors[2], - Table, Table->Size); + Table, Table->TableSize); FldrCreateComponentKey(BusKey, PeripheralClass, Modified: trunk/reactos/boot/freeldr/freeldr/include/freeldr.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/inclu… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] (original) +++ trunk/reactos/boot/freeldr/freeldr/include/freeldr.h [iso-8859-1] Sun Jun 27 23:54:47 2010 @@ -112,6 +112,8 @@ #include <comm.h> /* Swap */ #include <bytesex.h> +/* Internal shared PCI header */ +#include <drivers/pci/pci.h> VOID BootMain(LPSTR CmdLine); VOID RunLoader(VOID); Modified: trunk/reactos/hal/halx86/include/bus.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/bus.h?r… ============================================================================== --- trunk/reactos/hal/halx86/include/bus.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/bus.h [iso-8859-1] Sun Jun 27 23:54:47 2010 @@ -158,6 +158,77 @@ PCI_CARD_DESCRIPTOR CardList[ANYSIZE_ARRAY]; } PCI_REGISTRY_INFO_INTERNAL, *PPCI_REGISTRY_INFO_INTERNAL; +// +// PCI Type 1 Ports +// +#define PCI_TYPE1_ADDRESS_PORT (PULONG)0xCF8 +#define PCI_TYPE1_DATA_PORT 0xCFC + +// +// PCI Type 2 Ports +// +#define PCI_TYPE2_CSE_PORT (PUCHAR)0xCF8 +#define PCI_TYPE2_FORWARD_PORT (PUCHAR)0xCFA +#define PCI_TYPE2_ADDRESS_BASE 0xC + +// +// PCI Type 1 Configuration Register +// +typedef struct _PCI_TYPE1_CFG_BITS +{ + union + { + struct + { + ULONG Reserved1:2; + ULONG RegisterNumber:6; + ULONG FunctionNumber:3; + ULONG DeviceNumber:5; + ULONG BusNumber:8; + ULONG Reserved2:7; + ULONG Enable:1; + } bits; + + ULONG AsULONG; + } u; +} PCI_TYPE1_CFG_BITS, *PPCI_TYPE1_CFG_BITS; + +// +// PCI Type 2 CSE Register +// +typedef struct _PCI_TYPE2_CSE_BITS +{ + union + { + struct + { + UCHAR Enable:1; + UCHAR FunctionNumber:3; + UCHAR Key:4; + } bits; + + UCHAR AsUCHAR; + } u; +} PCI_TYPE2_CSE_BITS, PPCI_TYPE2_CSE_BITS; + +// +// PCI Type 2 Address Register +// +typedef struct _PCI_TYPE2_ADDRESS_BITS +{ + union + { + struct + { + USHORT RegisterNumber:8; + USHORT Agent:4; + USHORT AddressBase:4; + } bits; + + USHORT AsUSHORT; + } u; +} PCI_TYPE2_ADDRESS_BITS, *PPCI_TYPE2_ADDRESS_BITS; + typedef struct _PCI_TYPE0_CFG_CYCLE_BITS { union Modified: trunk/reactos/hal/halx86/include/hal.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/hal/halx86/include/hal.h?r… ============================================================================== --- trunk/reactos/hal/halx86/include/hal.h [iso-8859-1] (original) +++ trunk/reactos/hal/halx86/include/hal.h [iso-8859-1] Sun Jun 27 23:54:47 2010 @@ -29,8 +29,10 @@ #include <arc/arc.h> #include <ntndk.h> +/* Internal shared PCI header */ +#include <drivers/pci/pci.h> + /* Internal kernel headers */ -#include "internal/pci.h" #define KeGetCurrentThread _KeGetCurrentThread #ifdef _M_AMD64 #include <internal/amd64/ke.h> Modified: trunk/reactos/include/reactos/drivers/pci/pci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/pc… ============================================================================== --- trunk/reactos/include/reactos/drivers/pci/pci.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/pci/pci.h [iso-8859-1] Sun Jun 27 23:54:47 2010 @@ -62,5 +62,64 @@ #define PCI_ASSERT_BRIDGE_RESET 0x0040 #define PCI_ENABLE_BRIDGE_VGA_16BIT 0x0010 +// +// PCI IRQ Routing Table in BIOS/Registry (Signature: PIR$) +// +#include <pshpack1.h> +typedef struct _PIN_INFO +{ + UCHAR Link; + USHORT InterruptMap; +} PIN_INFO, *PPIN_INFO; + +typedef struct _SLOT_INFO +{ + UCHAR BusNumber; + UCHAR DeviceNumber; + PIN_INFO PinInfo[4]; + UCHAR SlotNumber; + UCHAR Reserved; +} SLOT_INFO, *PSLOT_INFO; + +typedef struct _PCI_IRQ_ROUTING_TABLE +{ + ULONG Signature; + USHORT Version; + USHORT TableSize; + UCHAR RouterBus; + UCHAR RouterDevFunc; + USHORT ExclusiveIRQs; + ULONG CompatibleRouter; + ULONG MiniportData; + UCHAR Reserved[11]; + UCHAR Checksum; + SLOT_INFO Slot[ANYSIZE_ARRAY]; +} PCI_IRQ_ROUTING_TABLE, *PPCI_IRQ_ROUTING_TABLE; +#include <poppack.h> + +// +// PCI Registry Information +// +typedef struct _PCI_REGISTRY_INFO +{ + UCHAR MajorRevision; + UCHAR MinorRevision; + UCHAR NoBuses; // Number Of Buses + UCHAR HardwareMechanism; +} PCI_REGISTRY_INFO, *PPCI_REGISTRY_INFO; + +// +// PCI Card Descriptor in Registry +// +typedef struct _PCI_CARD_DESCRIPTOR +{ + ULONG Flags; + USHORT VendorID; + USHORT DeviceID; + USHORT RevisionID; + USHORT SubsystemVendorID; + USHORT SubsystemID; + USHORT Reserved; +} PCI_CARD_DESCRIPTOR, *PPCI_CARD_DESCRIPTOR; /* EOF */ Removed: trunk/reactos/ntoskrnl/include/internal/pci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/pci.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/pci.h (removed) @@ -1,105 +1,0 @@ -/* - * PROJECT: ReactOS Kernel - * LICENSE: GPL - See COPYING in the top level directory - * FILE: ntoskrnl/include/hal.h - * PURPOSE: Internal header for PCI Support - * PROGRAMMERS: Alex Ionescu (alex.ionescu(a)reactos.org) - */ - -#pragma once - -// -// PCI Type 1 Ports -// -#define PCI_TYPE1_ADDRESS_PORT (PULONG)0xCF8 -#define PCI_TYPE1_DATA_PORT 0xCFC - -// -// PCI Type 2 Ports -// -#define PCI_TYPE2_CSE_PORT (PUCHAR)0xCF8 -#define PCI_TYPE2_FORWARD_PORT (PUCHAR)0xCFA -#define PCI_TYPE2_ADDRESS_BASE 0xC - -// -// PCI Type 1 Configuration Register -// -typedef struct _PCI_TYPE1_CFG_BITS -{ - union - { - struct - { - ULONG Reserved1:2; - ULONG RegisterNumber:6; - ULONG FunctionNumber:3; - ULONG DeviceNumber:5; - ULONG BusNumber:8; - ULONG Reserved2:7; - ULONG Enable:1; - } bits; - - ULONG AsULONG; - } u; -} PCI_TYPE1_CFG_BITS, *PPCI_TYPE1_CFG_BITS; - -// -// PCI Type 2 CSE Register -// -typedef struct _PCI_TYPE2_CSE_BITS -{ - union - { - struct - { - UCHAR Enable:1; - UCHAR FunctionNumber:3; - UCHAR Key:4; - } bits; - - UCHAR AsUCHAR; - } u; -} PCI_TYPE2_CSE_BITS, PPCI_TYPE2_CSE_BITS; - -// -// PCI Type 2 Address Register -// -typedef struct _PCI_TYPE2_ADDRESS_BITS -{ - union - { - struct - { - USHORT RegisterNumber:8; - USHORT Agent:4; - USHORT AddressBase:4; - } bits; - - USHORT AsUSHORT; - } u; -} PCI_TYPE2_ADDRESS_BITS, *PPCI_TYPE2_ADDRESS_BITS; - -// -// PCI Registry Information -// -typedef struct _PCI_REGISTRY_INFO -{ - UCHAR MajorRevision; - UCHAR MinorRevision; - UCHAR NoBuses; // Number Of Buses - UCHAR HardwareMechanism; -} PCI_REGISTRY_INFO, *PPCI_REGISTRY_INFO; - -// -// PCI Card Descriptor in Registry -// -typedef struct _PCI_CARD_DESCRIPTOR -{ - ULONG Flags; - USHORT VendorID; - USHORT DeviceID; - USHORT RevisionID; - USHORT SubsystemVendorID; - USHORT SubsystemID; - USHORT Reserved; -} PCI_CARD_DESCRIPTOR, *PPCI_CARD_DESCRIPTOR;

1 0

[sir_richard] 47885: [PCI]: Add the PCI_ENABLE_BRIDGE definitions that can be present in PCI_COMMON_CONFIG/type1/BridgeControl. Microsoft does not document these in the public PCI headers, but the definitions were found in the Singularity headers. eVb's PCI driver uses these.
by sir_richard＠svn.reactos.org 27 Jun '10

27 Jun '10

Author: sir_richard Date: Sun Jun 27 22:22:34 2010 New Revision: 47885 URL: http://svn.reactos.org/svn/reactos?rev=47885&view=rev Log: [PCI]: Add the PCI_ENABLE_BRIDGE definitions that can be present in PCI_COMMON_CONFIG/type1/BridgeControl. Microsoft does not document these in the public PCI headers, but the definitions were found in the Singularity headers. eVb's PCI driver uses these. Modified: trunk/reactos/include/reactos/drivers/pci/pci.h Modified: trunk/reactos/include/reactos/drivers/pci/pci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/pc… ============================================================================== --- trunk/reactos/include/reactos/drivers/pci/pci.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/drivers/pci/pci.h [iso-8859-1] Sun Jun 27 22:22:34 2010 @@ -51,4 +51,16 @@ #define PCI_HACK_ENABLE_MSI_MAPPING 0x0000020000000000LL #define PCI_HACK_DISABLE_PM_DOWNSTREAM_PCI_BRIDGE 0x0000040000000000LL +// +// Bit encodes for PCI_COMMON_CONFIG.u.type1.BridgeControl +// +#define PCI_ENABLE_BRIDGE_PARITY_ERROR 0x0001 +#define PCI_ENABLE_BRIDGE_SERR 0x0002 +#define PCI_ENABLE_BRIDGE_ISA 0x0004 +#define PCI_ENABLE_BRIDGE_VGA 0x0008 +#define PCI_ENABLE_BRIDGE_MASTER_ABORT_SERR 0x0020 +#define PCI_ASSERT_BRIDGE_RESET 0x0040 +#define PCI_ENABLE_BRIDGE_VGA_16BIT 0x0010 + + /* EOF */

1 0

[tkreuzer] 47884: [USER32] Merge from amd64 branch: 36987: - Fix user32 compilation errors. (Samuel Serapion) 36988: - Make user32 compile and link by defining Get/SetClass/WindowLongPtrA/W (Stefan Ginsberg) 41480: - Fix 64bit issues, add a wine compatibility hack (Timo Kreuzer) 41540: - Make parameters for NtUserCallOneParam and NtUserCallTwoParam DWORD_PTR instead of DWORD (Timo Kreuzer) 43965: (Samuel Serapion) - Fix several user32 warnings. - Sync GetWindow*A/W with wine and unify all versio
by tkreuzer＠svn.reactos.org 27 Jun '10

27 Jun '10

Author: tkreuzer Date: Sun Jun 27 22:19:17 2010 New Revision: 47884 URL: http://svn.reactos.org/svn/reactos?rev=47884&view=rev Log: [USER32] Merge from amd64 branch: 36987: - Fix user32 compilation errors. (Samuel Serapion) 36988: - Make user32 compile and link by defining Get/SetClass/WindowLongPtrA/W (Stefan Ginsberg) 41480: - Fix 64bit issues, add a wine compatibility hack (Timo Kreuzer) 41540: - Make parameters for NtUserCallOneParam and NtUserCallTwoParam DWORD_PTR instead of DWORD (Timo Kreuzer) 43965: (Samuel Serapion) - Fix several user32 warnings. - Sync GetWindow*A/W with wine and unify all versions, commenting out a wine hack. - As a bonus implement GetWindowLongPtrA/W. - Tested to work in trunk. 43992: - Fix user32 build. (Samuel Serapion) 45124: - Fix user32 build. (Samuel Serapion) 47472: - Remove wine hack and allow user32 to compile again. (Samuel Serapion) 47878: (Timo Kreuzer) - Use UlongToHandle instead of LongToHandle - case to ULONG_PTR instead of using HandleToUlong - SetSysColorsTemp: don't truncate the pointer sized n value, remove a comment - IntGetClsWndProc: fix a bug - IntGetWindowLong: pass !unicode to IntGetWndProc 47882: - Make the uiLo and uiHi members of the KMDDELPARAM structure UINT_PTRs (Timo Kreuzer) Modified: trunk/reactos/ (props changed) trunk/reactos/dll/win32/user32/controls/listbox.c trunk/reactos/dll/win32/user32/controls/scrollbar.c trunk/reactos/dll/win32/user32/include/ntwrapper.h trunk/reactos/dll/win32/user32/include/user32p.h trunk/reactos/dll/win32/user32/include/window.h trunk/reactos/dll/win32/user32/misc/exit.c trunk/reactos/dll/win32/user32/misc/misc.c trunk/reactos/dll/win32/user32/misc/resources.c trunk/reactos/dll/win32/user32/misc/stubs.c trunk/reactos/dll/win32/user32/misc/winhelp.c trunk/reactos/dll/win32/user32/windows/class.c trunk/reactos/dll/win32/user32/windows/clipboard.c trunk/reactos/dll/win32/user32/windows/dialog.c trunk/reactos/dll/win32/user32/windows/hook.c trunk/reactos/dll/win32/user32/windows/menu.c trunk/reactos/dll/win32/user32/windows/message.c trunk/reactos/dll/win32/user32/windows/messagebox.c trunk/reactos/dll/win32/user32/windows/nonclient.c trunk/reactos/dll/win32/user32/windows/prop.c trunk/reactos/dll/win32/user32/windows/spy.c trunk/reactos/dll/win32/user32/windows/window.c trunk/reactos/include/reactos/win32k/ntuser.h Propchange: trunk/reactos/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Sun Jun 27 22:19:17 2010 @@ -1,4 +1,4 @@ /branches/header-work:45691-47721 /branches/reactos-yarotows:46848,46966,47800 /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,36397,36445,36502-36503,36505,36570,36614,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36992,37323,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,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,41484-41485,41499-41500,41502,41531,41536,41540,41546-41547,41549,43080,43426,43454,43506,43566,43574,43598,43600-43602,43604-43605,43677,43682,43757,43775,43836,43838-43840,43857-43858,43860,43905-43907,43969,44002,44036-44037,44039-44040,44044-44045,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44772,45124,45126-45127,46394,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805 +/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,36898-36899,36930,36936,36949,36951,36958,36961,36964,36969,36972,36987-36988,36992,37323,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,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,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,44065,44095,44123,44144,44205,44238,44294,44338-44339,44389,44391,44426,44460,44467-44468,44470-44471,44499,44501,44503-44504,44506,44510-44512,44521,44523-44526,44530,44540,44601,44634,44639,44772,45124,45126-45127,46394,46478,46511,46523-46524,46526,46534-46535,46537-46539,46589,46805,47472,47846-47847,47878,47882 Modified: trunk/reactos/dll/win32/user32/controls/listbox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/listbox.c [iso-8859-1] Sun Jun 27 22:19:17 2010 @@ -44,7 +44,7 @@ #define WS_EX_DRAGDETECT 0x00000002L #define WM_BEGINDRAG 0x022C -UINT WINAPI SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC); +UINT_PTR WINAPI SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC); BOOL WINAPI KillSystemTimer(HWND,UINT_PTR); /* End of hack section -------------------------------- */ Modified: trunk/reactos/dll/win32/user32/controls/scrollbar.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/controls/… ============================================================================== --- trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/controls/scrollbar.c [iso-8859-1] Sun Jun 27 22:19:17 2010 @@ -68,7 +68,7 @@ HBRUSH DefWndControlColor(HDC hDC, UINT ctlType); -UINT WINAPI SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC); +UINT_PTR WINAPI SetSystemTimer(HWND,UINT_PTR,UINT,TIMERPROC); BOOL WINAPI KillSystemTimer(HWND,UINT_PTR); /********************************************************************* Modified: trunk/reactos/dll/win32/user32/include/ntwrapper.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/n… ============================================================================== --- trunk/reactos/dll/win32/user32/include/ntwrapper.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/ntwrapper.h [iso-8859-1] Sun Jun 27 22:19:17 2010 @@ -85,7 +85,7 @@ } EXTINLINE DWORD WINAPI -DragObject(HWND hwnd1, HWND hwnd2, UINT u1, DWORD dw1, HCURSOR hc1) +DragObject(HWND hwnd1, HWND hwnd2, UINT u1, ULONG_PTR dw1, HCURSOR hc1) { return NtUserDragObject(hwnd1, hwnd2, u1, dw1, hc1); } Modified: trunk/reactos/dll/win32/user32/include/user32p.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/u… ============================================================================== --- trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/user32p.h [iso-8859-1] Sun Jun 27 22:19:17 2010 @@ -93,7 +93,7 @@ NtUserCallOneParam((DWORD_PTR)bShow, ONEPARAM_ROUTINE_SHOWCURSOR) #define NtUserGetDesktopMapping(Ptr) \ - (PVOID)NtUserCallOneParam((DWORD)Ptr, ONEPARAM_ROUTINE_GETDESKTOPMAPPING) + (PVOID)NtUserCallOneParam((DWORD_PTR)Ptr, ONEPARAM_ROUTINE_GETDESKTOPMAPPING) #define NtUserSetCursorPos(x, y) \ (BOOL)NtUserCallTwoParam((DWORD)x, (DWORD)y, TWOPARAM_ROUTINE_SETCURSORPOS) Modified: trunk/reactos/dll/win32/user32/include/window.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/include/w… ============================================================================== --- trunk/reactos/dll/win32/user32/include/window.h [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/include/window.h [iso-8859-1] Sun Jun 27 22:19:17 2010 @@ -65,5 +65,5 @@ BOOL Unicode); HWND* WIN_ListChildren (HWND hWndparent); -ULONG_PTR FASTCALL IntGetWndProc(PWND, BOOL); +WNDPROC FASTCALL IntGetWndProc(PWND, BOOL); DWORD WINAPI GetRealWindowOwner(HWND); Modified: trunk/reactos/dll/win32/user32/misc/exit.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/exit… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/exit.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/exit.c [iso-8859-1] Sun Jun 27 22:19:17 2010 @@ -1,5 +1,4 @@ -/* $Id$ - * +/* * COPYRIGHT: See COPYING in the top level directory * PROJECT: ReactOS user32.dll * FILE: lib/user32/misc/exit.c @@ -101,7 +100,7 @@ NTSTATUS Status; CsrRequest = MAKE_CSR_API(REGISTER_SERVICES_PROCESS, CSR_GUI); - Request.Data.RegisterServicesProcessRequest.ProcessId = (HANDLE)ServicesProcessId; + Request.Data.RegisterServicesProcessRequest.ProcessId = UlongToHandle(ServicesProcessId); Status = CsrClientCallServer(&Request, NULL, Modified: trunk/reactos/dll/win32/user32/misc/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/misc… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/misc.c [iso-8859-1] Sun Jun 27 22:19:17 2010 @@ -267,7 +267,7 @@ return TRUE; else return (NtUserQueryWindow(Wnd->head.h, QUERY_WINDOW_UNIQUE_PROCESS_ID) == - (DWORD)NtCurrentTeb()->ClientId.UniqueProcess ); + (DWORD_PTR)NtCurrentTeb()->ClientId.UniqueProcess ); } BOOL @@ -293,7 +293,7 @@ INT Index; USHORT generation; - Index = (((UINT)handle & 0xffff) - FIRST_USER_HANDLE) >> 1; + Index = (((UINT_PTR)handle & 0xffff) - FIRST_USER_HANDLE) >> 1; if (Index < 0 || Index >= gHandleTable->nb_handles) return NULL; @@ -301,7 +301,7 @@ if (!gHandleEntries[Index].type || !gHandleEntries[Index].ptr) return NULL; - generation = (UINT)handle >> 16; + generation = (UINT_PTR)handle >> 16; if (generation == gHandleEntries[Index].generation || !generation || generation == 0xffff) return &gHandleEntries[Index]; Modified: trunk/reactos/dll/win32/user32/misc/resources.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/reso… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/resources.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/resources.c [iso-8859-1] Sun Jun 27 22:19:17 2010 @@ -174,7 +174,7 @@ return FALSE; } - ConfigRet = UnRegNotify((ULONG) Handle ); + ConfigRet = UnRegNotify((ULONG_PTR)Handle ); if (ConfigRet != CR_SUCCESS) { switch (ConfigRet) Modified: trunk/reactos/dll/win32/user32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/stub… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/stubs.c [iso-8859-1] Sun Jun 27 22:19:17 2010 @@ -197,7 +197,7 @@ } if (!pPens && !pBrushes) /* "restore" call */ { - LPVOID pOldCol = (LPVOID)n; /* FIXME: not 64-bit safe */ + LPVOID pOldCol = (LPVOID)n; LPVOID p = pOldCol; DWORD nCount = *(DWORD *)p; p = (char*)p + sizeof(DWORD); Modified: trunk/reactos/dll/win32/user32/misc/winhelp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/misc/winh… ============================================================================== --- trunk/reactos/dll/win32/user32/misc/winhelp.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/misc/winhelp.c [iso-8859-1] Sun Jun 27 22:19:17 2010 @@ -16,8 +16,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ -/* $Id$ - * +/* * PROJECT: ReactOS user32.dll * FILE: lib/user32/misc/winhelp.c * PURPOSE: WinHelp @@ -51,7 +50,7 @@ */ BOOL WINAPI -WinHelpA(HWND hWnd, LPCSTR lpszHelp, UINT uCommand, DWORD dwData) +WinHelpA(HWND hWnd, LPCSTR lpszHelp, UINT uCommand, DWORD_PTR dwData) { static WORD WM_WINHELP = 0; HWND hDest; @@ -137,7 +136,7 @@ */ BOOL WINAPI -WinHelpW(HWND hWnd, LPCWSTR lpszHelp, UINT uCommand, DWORD dwData) +WinHelpW(HWND hWnd, LPCWSTR lpszHelp, UINT uCommand, DWORD_PTR dwData) { INT len; LPSTR file; Modified: trunk/reactos/dll/win32/user32/windows/class.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/class.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/class.c [iso-8859-1] Sun Jun 27 22:19:17 2010 @@ -266,11 +266,11 @@ // // Based on IntGetClsWndProc // -ULONG_PTR FASTCALL +WNDPROC FASTCALL IntGetWndProc(PWND pWnd, BOOL Ansi) { INT i; - ULONG_PTR gcpd, Ret = 0; + WNDPROC gcpd, Ret = 0; PCLS Class = DesktopPtrToUser(pWnd->pcls); if (!Class) return Ret; @@ -282,9 +282,9 @@ if (GETPFNSERVER(i) == pWnd->lpfnWndProc) { if (Ansi) - Ret = (ULONG_PTR)GETPFNCLIENTA(i); + Ret = GETPFNCLIENTA(i); else - Ret = (ULONG_PTR)GETPFNCLIENTW(i); + Ret = GETPFNCLIENTW(i); } } return Ret; @@ -296,36 +296,36 @@ is treated specially. */ if (Class->fnid == FNID_EDIT) - Ret = (ULONG_PTR)pWnd->lpfnWndProc; + Ret = pWnd->lpfnWndProc; else { // Set return proc. - Ret = (ULONG_PTR)pWnd->lpfnWndProc; + Ret = pWnd->lpfnWndProc; if (Class->fnid <= FNID_GHOST && Class->fnid >= FNID_BUTTON) { if (Ansi) { if (GETPFNCLIENTW(Class->fnid) == pWnd->lpfnWndProc) - Ret = (ULONG_PTR)GETPFNCLIENTA(Class->fnid); + Ret = GETPFNCLIENTA(Class->fnid); } else { if (GETPFNCLIENTA(Class->fnid) == pWnd->lpfnWndProc) - Ret = (ULONG_PTR)GETPFNCLIENTW(Class->fnid); + Ret = GETPFNCLIENTW(Class->fnid); } } // Return on the change. - if ( Ret != (ULONG_PTR)pWnd->lpfnWndProc) + if ( Ret != pWnd->lpfnWndProc) return Ret; } if ( Ansi == !!(pWnd->state & WNDS_ANSIWINDOWPROC) ) return Ret; - gcpd = NtUserGetCPD( UserHMGetHandle(pWnd), - (Ansi ? UserGetCPDA2U : UserGetCPDU2A )|UserGetCPDWindow, - Ret); + gcpd = (WNDPROC)NtUserGetCPD( UserHMGetHandle(pWnd), + (Ansi ? UserGetCPDA2U : UserGetCPDU2A )|UserGetCPDWindow, + (ULONG_PTR)Ret); return (gcpd ? gcpd : Ret); } @@ -538,6 +538,32 @@ return Ret; } +#ifdef _WIN64 +/* + * @unimplemented + */ +ULONG_PTR +WINAPI +GetClassLongPtrA(HWND hWnd, + INT nIndex) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @unimplemented + */ +ULONG_PTR +WINAPI +GetClassLongPtrW(HWND hWnd, + INT nIndex) +{ + UNIMPLEMENTED; + return 0; +} +#endif + /* * @implemented @@ -627,141 +653,133 @@ } -/* - * @implemented - */ -LONG -WINAPI -GetWindowLongA ( HWND hWnd, int nIndex ) -{ - PWND Wnd; - - Wnd = ValidateHwnd(hWnd); - if (Wnd == NULL) +LONG_PTR IntGetWindowLong( HWND hwnd, INT offset, UINT size, BOOL unicode ) +{ + LONG_PTR retvalue = 0; + WND *wndPtr; + + if (offset == GWLP_HWNDPARENT) + { + HWND parent = GetAncestor( hwnd, GA_PARENT ); + if (parent == GetDesktopWindow()) parent = GetWindow( hwnd, GW_OWNER ); + return (ULONG_PTR)parent; + } + + if (!(wndPtr = ValidateHwnd( hwnd ))) + { + SetLastError( ERROR_INVALID_WINDOW_HANDLE ); return 0; - - if (nIndex >= 0) - { - if ((DWORD)nIndex + sizeof(LONG) > Wnd->cbwndExtra) + } + + if (offset >= 0) + { + if (offset > (int)(wndPtr->cbwndExtra - size)) { - SetLastError(ERROR_INVALID_PARAMETER); + WARN("Invalid offset %d\n", offset ); + SetLastError( ERROR_INVALID_INDEX ); return 0; } - return *((LONG *)((PCHAR)(Wnd + 1) + nIndex)); - } - else - { - switch (nIndex) + retvalue = *((LONG_PTR *)((PCHAR)(wndPtr + 1) + offset)); + + /* WINE: special case for dialog window procedure */ + //if ((offset == DWLP_DLGPROC) && (size == sizeof(LONG_PTR)) && (wndPtr->flags & WIN_ISDIALOG)) + // retvalue = (LONG_PTR)IntGetWndProc( (WNDPROC)retvalue, unicode ); + return retvalue; + } + + switch(offset) + { + case GWLP_USERDATA: retvalue = wndPtr->dwUserData; break; + case GWL_STYLE: retvalue = wndPtr->style; break; + case GWL_EXSTYLE: retvalue = wndPtr->ExStyle; break; + case GWLP_ID: retvalue = wndPtr->IDMenu; break; + case GWLP_HINSTANCE: retvalue = (ULONG_PTR)wndPtr->hModule; break; + case GWLP_WNDPROC: + { + if (!TestWindowProcess(wndPtr)) + { + SetLastError(ERROR_ACCESS_DENIED); + retvalue = 0; + } + retvalue = (ULONG_PTR)IntGetWndProc(wndPtr, !unicode); + break; + } + default: + WARN("Unknown offset %d\n", offset ); + SetLastError( ERROR_INVALID_INDEX ); + break; + } + return retvalue; + +} +/* + * @implemented + */ +LONG +WINAPI +GetWindowLongA ( HWND hWnd, int nIndex ) +{ + return IntGetWindowLong( hWnd, nIndex, sizeof(LONG), FALSE ); +} + +/* + * @implemented + */ +LONG +WINAPI +GetWindowLongW(HWND hWnd, int nIndex) +{ + return IntGetWindowLong( hWnd, nIndex, sizeof(LONG), TRUE ); +} + +#ifdef _WIN64 +/* + * @implemented + */ +LONG_PTR +WINAPI +GetWindowLongPtrA(HWND hWnd, + INT nIndex) +{ + return IntGetWindowLong( hWnd, nIndex, sizeof(LONG_PTR), FALSE ); +} + +/* + * @implemented + */ +LONG_PTR +WINAPI +GetWindowLongPtrW(HWND hWnd, + INT nIndex) +{ + return IntGetWindowLong( hWnd, nIndex, sizeof(LONG_PTR), TRUE ); + +} +#endif // _WIN64 + +/* + * @implemented + */ +WORD +WINAPI +GetWindowWord(HWND hWnd, int nIndex) +{ + switch(nIndex) + { + case GWLP_ID: + case GWLP_HINSTANCE: + case GWLP_HWNDPARENT: + break; + default: + if (nIndex < 0) { - case GWL_EXSTYLE: - return Wnd->ExStyle; - case GWL_STYLE: - return Wnd->style; - case GWL_HINSTANCE: - return (LONG)Wnd->hModule; - case GWL_ID: - return Wnd->IDMenu; - case GWL_USERDATA: - return Wnd->dwUserData; - - case GWL_HWNDPARENT: - { - HWND parent = GetAncestor( hWnd, GA_PARENT ); - if (parent == GetDesktopWindow()) parent = GetWindow( hWnd, GW_OWNER ); - return (LONG)parent; - } - case GWL_WNDPROC: - if (!TestWindowProcess(Wnd)) - { - SetLastError(ERROR_ACCESS_DENIED); - return 0; - } - return IntGetWndProc(Wnd, TRUE); - - default: - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - } -} - - -/* - * @implemented - */ -LONG -WINAPI -GetWindowLongW(HWND hWnd, int nIndex) -{ - PWND Wnd; - - Wnd = ValidateHwnd(hWnd); - if (Wnd == NULL) - return 0; - - if (nIndex >= 0) - { - if ((DWORD)nIndex + sizeof(LONG) > Wnd->cbwndExtra) - { - SetLastError(ERROR_INVALID_PARAMETER); + WARN("Invalid offset %d\n", nIndex ); + SetLastError( ERROR_INVALID_INDEX ); return 0; } - return *((LONG *)((PCHAR)(Wnd + 1) + nIndex)); - } - else - { - switch (nIndex) - { - case GWL_EXSTYLE: - return Wnd->ExStyle; - case GWL_STYLE: - return Wnd->style; - case GWL_HINSTANCE: - return (LONG)Wnd->hModule; - case GWL_ID: - return Wnd->IDMenu; - case GWL_USERDATA: - return Wnd->dwUserData; - - case GWL_HWNDPARENT: - { - HWND parent = GetAncestor( hWnd, GA_PARENT ); - if (parent == GetDesktopWindow()) parent = GetWindow( hWnd, GW_OWNER ); - return (LONG)parent; - } - case GWL_WNDPROC: - if (!TestWindowProcess(Wnd)) - { - SetLastError(ERROR_ACCESS_DENIED); - return 0; - } - return IntGetWndProc(Wnd, FALSE); - - default: - SetLastError(ERROR_INVALID_PARAMETER); - return 0; - } - } -} - -/* - * @implemented - */ -WORD -WINAPI -GetWindowWord(HWND hWnd, int nIndex) -{ - return (WORD)GetWindowLongW(hWnd, nIndex); -} - -/* - * @implemented - */ -WORD -WINAPI -SetWindowWord ( HWND hWnd,int nIndex,WORD wNewWord ) -{ - return (WORD)NtUserSetWindowLong ( hWnd, nIndex, (LONG)wNewWord, TRUE ); + break; + } + return IntGetWindowLong( hWnd, nIndex, sizeof(WORD), FALSE ); } /* @@ -1167,7 +1185,7 @@ int nIndex, LONG dwNewLong) { - PSTR lpStr = (PSTR)dwNewLong; + PSTR lpStr = (PSTR)(ULONG_PTR)dwNewLong; UNICODE_STRING Value = {0}; BOOL Allocated = FALSE; DWORD Ret; @@ -1190,7 +1208,7 @@ else Value.Buffer = (PWSTR)lpStr; - dwNewLong = (LONG)&Value; + dwNewLong = (LONG_PTR)&Value; } else if (nIndex == GCW_ATOM && lpStr != NULL) { @@ -1208,7 +1226,7 @@ else Value.Buffer = (PWSTR)lpStr; - dwNewLong = (LONG)&Value; + dwNewLong = (LONG_PTR)&Value; } Ret = (DWORD)NtUserSetClassLong(hWnd, @@ -1234,7 +1252,7 @@ int nIndex, LONG dwNewLong) { - PWSTR lpStr = (PWSTR)dwNewLong; + PWSTR lpStr = (PWSTR)(ULONG_PTR)dwNewLong; UNICODE_STRING Value = {0}; TRACE("%p %d %lx\n", hWnd, nIndex, dwNewLong); @@ -1251,7 +1269,7 @@ else Value.Buffer = lpStr; - dwNewLong = (LONG)&Value; + dwNewLong = (LONG_PTR)&Value; } else if (nIndex == GCW_ATOM && lpStr != NULL) { @@ -1263,7 +1281,7 @@ else Value.Buffer = lpStr; - dwNewLong = (LONG)&Value; + dwNewLong = (LONG_PTR)&Value; } return (DWORD)NtUserSetClassLong(hWnd, @@ -1272,6 +1290,33 @@ FALSE); } +#ifdef _WIN64 +/* + * @unimplemented + */ +ULONG_PTR +WINAPI +SetClassLongPtrA(HWND hWnd, + INT nIndex, + LONG_PTR dwNewLong) +{ + UNIMPLEMENTED; + return 0; +} + +/* + * @unimplemented + */ +ULONG_PTR +WINAPI +SetClassLongPtrW(HWND hWnd, + INT nIndex, + LONG_PTR dwNewLong) +{ + UNIMPLEMENTED; + return 0; +} +#endif // _WIN64 /* * @implemented @@ -1292,6 +1337,30 @@ return (WORD) SetClassLongW ( hWnd, nIndex, wNewWord ); } +/* + * @implemented + */ +WORD +WINAPI +SetWindowWord ( HWND hWnd,int nIndex,WORD wNewWord ) +{ + switch(nIndex) + { + case GWLP_ID: + case GWLP_HINSTANCE: + case GWLP_HWNDPARENT: + break; + default: + if (nIndex < 0) + { + WARN("Invalid offset %d\n", nIndex ); + SetLastError( ERROR_INVALID_INDEX ); + return 0; + } + break; + } + return NtUserSetWindowLong( hWnd, nIndex, wNewWord, FALSE ); +} /* * @implemented @@ -1306,7 +1375,6 @@ return NtUserSetWindowLong(hWnd, nIndex, dwNewLong, TRUE); } - /* * @implemented */ @@ -1320,6 +1388,31 @@ return NtUserSetWindowLong(hWnd, nIndex, dwNewLong, FALSE); } +#ifdef _WIN64 +/* + * @implemented + */ +LONG_PTR +WINAPI +SetWindowLongPtrA(HWND hWnd, + INT nIndex, + LONG_PTR dwNewLong) +{ + return NtUserSetWindowLong(hWnd, nIndex, dwNewLong, FALSE); +} + +/* + * @implemented + */ +LONG_PTR +WINAPI +SetWindowLongPtrW(HWND hWnd, + INT nIndex, + LONG_PTR dwNewLong) +{ + return NtUserSetWindowLong(hWnd, nIndex, dwNewLong, FALSE); +} +#endif /* * @implemented Modified: trunk/reactos/dll/win32/user32/windows/clipboard.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/c… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/clipboard.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/clipboard.c [iso-8859-1] Sun Jun 27 22:19:17 2010 @@ -54,19 +54,19 @@ { HGLOBAL hGlobal = NULL; PVOID pGlobal = NULL; - DWORD size = 0; + DWORD_PTR size = 0; /* dealing with bitmap object */ if (uFormat != CF_BITMAP) { - size = (DWORD)NtUserGetClipboardData(uFormat, NULL); + size = (DWORD_PTR)NtUserGetClipboardData(uFormat, NULL); if (size) { hGlobal = GlobalAlloc(GMEM_DDESHARE | GMEM_MOVEABLE, size); pGlobal = GlobalLock(hGlobal); - size = (DWORD)NtUserGetClipboardData(uFormat, pGlobal); + size = (DWORD_PTR)NtUserGetClipboardData(uFormat, pGlobal); GlobalUnlock(hGlobal); } Modified: trunk/reactos/dll/win32/user32/windows/dialog.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/dialog.c [iso-8859-1] Sun Jun 27 22:19:17 2010 @@ -159,7 +159,7 @@ SETDLGINFO( hWnd, dlgInfo ); - NtUserCallHwndParam( hWnd, (DWORD)dlgInfo, HWNDPARAM_ROUTINE_SETDIALOGPOINTER ); + NtUserCallHwndParam( hWnd, (DWORD_PTR)dlgInfo, HWNDPARAM_ROUTINE_SETDIALOGPOINTER ); } else { @@ -342,7 +342,7 @@ MulDiv(info.y, dlgInfo->yBaseUnit, 8), MulDiv(info.cx, dlgInfo->xBaseUnit, 4), MulDiv(info.cy, dlgInfo->yBaseUnit, 8), - hwnd, (HMENU)info.id, + hwnd, (HMENU)(ULONG_PTR)info.id, hInst, (LPVOID)info.data ); } else @@ -373,7 +373,7 @@ MulDiv(info.y, dlgInfo->yBaseUnit, 8), MulDiv(info.cx, dlgInfo->xBaseUnit, 4), MulDiv(info.cy, dlgInfo->yBaseUnit, 8), - hwnd, (HMENU)info.id, + hwnd, (HMENU)(ULONG_PTR)info.id, hInst, (LPVOID)info.data ); } else @@ -618,7 +618,7 @@ p++; break; case 0xffff: - result->menuName = (LPCWSTR)(UINT)GET_WORD( p + 1 ); + result->menuName = (LPCWSTR)(UINT_PTR)GET_WORD( p + 1 ); p += 2; break; default: @@ -636,7 +636,7 @@ p++; break; case 0xffff: - result->className = (LPCWSTR)(UINT)GET_WORD( p + 1 ); + result->className = (LPCWSTR)(UINT_PTR)GET_WORD( p + 1 ); p += 2; break; default: Modified: trunk/reactos/dll/win32/user32/windows/hook.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/h… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/hook.c [iso-8859-1] Sun Jun 27 22:19:17 2010 @@ -441,12 +441,12 @@ if (NULL != CbtCreatewndExtra->Cs.lpszName) { Csw.lpszName = (LPCWSTR)((PCHAR) CbtCreatewndExtra - + (ULONG) CbtCreatewndExtra->Cs.lpszName); + + (ULONG_PTR) CbtCreatewndExtra->Cs.lpszName); } if (0 != HIWORD(CbtCreatewndExtra->Cs.lpszClass)) { Csw.lpszClass = (LPCWSTR)((PCHAR) CbtCreatewndExtra - + LOWORD((ULONG) CbtCreatewndExtra->Cs.lpszClass)); + + LOWORD((ULONG_PTR) CbtCreatewndExtra->Cs.lpszClass)); } wParam = Common->wParam; if (Common->Ansi) Modified: trunk/reactos/dll/win32/user32/windows/menu.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/menu.c [iso-8859-1] Sun Jun 27 22:19:17 2010 @@ -1804,7 +1804,7 @@ case WM_CREATE: { CREATESTRUCTA *cs = (CREATESTRUCTA *) lParam; - SetWindowLongPtrA(Wnd, 0, (LONG) cs->lpCreateParams); + SetWindowLongPtrA(Wnd, 0, (LONG_PTR)cs->lpCreateParams); return 0; } @@ -1877,7 +1877,7 @@ case WM_CREATE: { CREATESTRUCTW *cs = (CREATESTRUCTW *) lParam; - SetWindowLongPtrW(Wnd, 0, (LONG) cs->lpCreateParams); + SetWindowLongPtrW(Wnd, 0, (LONG_PTR)cs->lpCreateParams); return 0; } @@ -3722,7 +3722,7 @@ { mii->fType |= MFT_OWNERDRAW; mii->fMask |= MIIM_DATA; - mii->dwItemData = (DWORD) NewItem; + mii->dwItemData = (DWORD_PTR) NewItem; } else if (Flags & MF_SEPARATOR) { @@ -4140,7 +4140,7 @@ if (!Wnd) return NULL; - return (HMENU)Wnd->IDMenu; + return UlongToHandle(Wnd->IDMenu); } Modified: trunk/reactos/dll/win32/user32/windows/message.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/message.c [iso-8859-1] Sun Jun 27 22:19:17 2010 @@ -172,11 +172,11 @@ if (0 != HIWORD(DdeLparam->Value.Packed.uiHi)) { /* uiHi should contain a hMem from WM_DDE_EXECUTE */ - HGLOBAL h = DdeGetPair((HGLOBAL) DdeLparam->Value.Packed.uiHi); + HGLOBAL h = DdeGetPair((HGLOBAL)(ULONG_PTR)DdeLparam->Value.Packed.uiHi); if (NULL != h) { - GlobalFree((HGLOBAL) DdeLparam->Value.Packed.uiHi); - DdeLparam->Value.Packed.uiHi = (UINT) h; + GlobalFree((HGLOBAL)(ULONG_PTR)DdeLparam->Value.Packed.uiHi); + DdeLparam->Value.Packed.uiHi = (UINT_PTR) h; } } FreeDDElParam(UMMsg->message, UMMsg->lParam); @@ -686,7 +686,7 @@ return FALSE; } CsA->lpszName = AnsiString.Buffer; - if (HIWORD((ULONG)CsW->lpszClass) != 0) + if (HIWORD((ULONG_PTR)CsW->lpszClass) != 0) { RtlInitUnicodeString(&UnicodeString, CsW->lpszClass); Status = RtlUnicodeStringToAnsiString(&AnsiString, &UnicodeString, TRUE); @@ -850,7 +850,7 @@ Cs = (CREATESTRUCTA*) AnsiMsg->lParam; RtlInitAnsiString(&AnsiString, Cs->lpszName); RtlFreeAnsiString(&AnsiString); - if (HIWORD((ULONG)Cs->lpszClass) != 0) + if (HIWORD((ULONG_PTR)Cs->lpszClass) != 0) { RtlInitAnsiString(&AnsiString, Cs->lpszClass); RtlFreeAnsiString(&AnsiString); @@ -947,7 +947,7 @@ MSG UnicodeMsg; MSG AnsiMsg; PMSG FinalMsg; - ULONG LParamSize; + SIZE_T LParamSize; } MSGCONVERSION, *PMSGCONVERSION; static PMSGCONVERSION MsgConversions = NULL; @@ -2452,7 +2452,7 @@ * @implemented */ BOOL WINAPI -TranslateMessageEx(CONST MSG *lpMsg, DWORD unk) +TranslateMessageEx(CONST MSG *lpMsg, UINT Flags) { switch (lpMsg->message) { @@ -2460,7 +2460,7 @@ case WM_KEYUP: case WM_SYSKEYDOWN: case WM_SYSKEYUP: - return(NtUserTranslateMessage((LPMSG)lpMsg, unk)); + return(NtUserTranslateMessage((LPMSG)lpMsg, Flags)); default: if ( lpMsg->message & ~WM_MAXIMUM ) Modified: trunk/reactos/dll/win32/user32/windows/messagebox.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/m… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/messagebox.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/messagebox.c [iso-8859-1] Sun Jun 27 22:19:17 2010 @@ -423,7 +423,7 @@ } /* create static for text */ - dest = (BYTE*)(((DWORD)dest + 3) & ~3); + dest = (BYTE*)(((UINT_PTR)dest + 3) & ~3); itxt = (DLGITEMTEMPLATE *)dest; itxt->style = WS_CHILD | WS_VISIBLE | SS_NOPREFIX; if(lpMsgBoxParams->dwStyle & MB_RIGHT) @@ -450,7 +450,7 @@ btnrect.left = btnrect.top = 0; for(i = 0; i < nButtons; i++) { - dest = (BYTE*)(((DWORD)dest + 3) & ~3); + dest = (BYTE*)(((UINT_PTR)dest + 3) & ~3); ibtn[i] = (DLGITEMTEMPLATE *)dest; ibtn[i]->style = WS_CHILD | WS_VISIBLE | WS_TABSTOP; if(!defbtn && (i == ((lpMsgBoxParams->dwStyle & MB_DEFMASK) >> 8))) @@ -699,7 +699,7 @@ UNICODE_STRING textW, captionW, iconW; int ret; - if (HIWORD((UINT)lpMsgBoxParams->lpszText)) + if (HIWORD((UINT_PTR)lpMsgBoxParams->lpszText)) { RtlCreateUnicodeStringFromAsciiz(&textW, (PCSZ)lpMsgBoxParams->lpszText); /* @@ -711,7 +711,7 @@ else textW.Buffer = (LPWSTR)lpMsgBoxParams->lpszText; - if (HIWORD((UINT)lpMsgBoxParams->lpszCaption)) + if (HIWORD((UINT_PTR)lpMsgBoxParams->lpszCaption)) { RtlCreateUnicodeStringFromAsciiz(&captionW, (PCSZ)lpMsgBoxParams->lpszCaption); /* @@ -725,7 +725,7 @@ if(lpMsgBoxParams->dwStyle & MB_USERICON) { - if (HIWORD((UINT)lpMsgBoxParams->lpszIcon)) + if (HIWORD((UINT_PTR)lpMsgBoxParams->lpszIcon)) { RtlCreateUnicodeStringFromAsciiz(&iconW, (PCSZ)lpMsgBoxParams->lpszIcon); /* @@ -753,13 +753,13 @@ ret = MessageBoxTimeoutIndirectW(&msgboxW, (UINT)-1); - if (HIWORD((UINT)lpMsgBoxParams->lpszText)) + if (HIWORD((UINT_PTR)lpMsgBoxParams->lpszText)) RtlFreeUnicodeString(&textW); - if (HIWORD((UINT)lpMsgBoxParams->lpszCaption)) + if (HIWORD((UINT_PTR)lpMsgBoxParams->lpszCaption)) RtlFreeUnicodeString(&captionW); - if ((lpMsgBoxParams->dwStyle & MB_USERICON) && HIWORD((UINT)iconW.Buffer)) + if ((lpMsgBoxParams->dwStyle & MB_USERICON) && HIWORD((UINT_PTR)iconW.Buffer)) RtlFreeUnicodeString(&iconW); return ret; @@ -809,12 +809,12 @@ UNICODE_STRING textW, captionW; int ret; - if (HIWORD((UINT)lpText)) + if (HIWORD((UINT_PTR)lpText)) RtlCreateUnicodeStringFromAsciiz(&textW, (PCSZ)lpText); else textW.Buffer = (LPWSTR)lpText; - if (HIWORD((UINT)lpCaption)) + if (HIWORD((UINT_PTR)lpCaption)) RtlCreateUnicodeStringFromAsciiz(&captionW, (PCSZ)lpCaption); else captionW.Buffer = (LPWSTR)lpCaption; Modified: trunk/reactos/dll/win32/user32/windows/nonclient.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/n… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/nonclient.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/nonclient.c [iso-8859-1] Sun Jun 27 22:19:17 2010 @@ -122,13 +122,13 @@ { HICON hIcon = 0; - SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, 1000, (LPDWORD)&hIcon); + SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL2, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); if (!hIcon) - SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, 1000, (LPDWORD)&hIcon); + SendMessageTimeout(hwnd, WM_GETICON, ICON_SMALL, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); if (!hIcon) - SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000, (LPDWORD)&hIcon); + SendMessageTimeout(hwnd, WM_GETICON, ICON_BIG, 0, SMTO_ABORTIFHUNG, 1000, (PDWORD_PTR)&hIcon); if (!hIcon) hIcon = (HICON)GetClassLongPtr(hwnd, GCL_HICONSM); Modified: trunk/reactos/dll/win32/user32/windows/prop.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/p… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/prop.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/prop.c [iso-8859-1] Sun Jun 27 22:19:17 2010 @@ -377,7 +377,7 @@ } else { - Atom = LOWORD((DWORD)lpString); + Atom = LOWORD((DWORD_PTR)lpString); } Prop = IntGetProp(hWnd, Atom); if (Prop != NULL) Data = Prop->Data; @@ -428,7 +428,7 @@ } else { - Atom = LOWORD((DWORD)lpString); + Atom = LOWORD((DWORD_PTR)lpString); } return(NtUserRemoveProp(hWnd, Atom)); } @@ -476,7 +476,7 @@ } else { - Atom = LOWORD((DWORD)lpString); + Atom = LOWORD((DWORD_PTR)lpString); } return(NtUserSetProp(hWnd, Atom, hData)); Modified: trunk/reactos/dll/win32/user32/windows/spy.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/s… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/spy.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/spy.c [iso-8859-1] Sun Jun 27 22:19:17 2010 @@ -2117,7 +2117,7 @@ /* save and restore error code over the next call */ save_error = GetLastError(); /* special code to detect a property sheet dialog */ - if ((GetClassLongPtrW(sp_e->msg_hwnd, GCW_ATOM) == (LONG)WC_DIALOG) && + if ((GetClassLongPtrW(sp_e->msg_hwnd, GCW_ATOM) == (ULONG_PTR)WC_DIALOG) && (GetPropW(sp_e->msg_hwnd, PropSheetInfoStr))) { strcpyW(sp_e->wnd_class, WC_PROPSHEETW); } Modified: trunk/reactos/dll/win32/user32/windows/window.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/w… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/user32/windows/window.c [iso-8859-1] Sun Jun 27 22:19:17 2010 @@ -135,7 +135,7 @@ { SendMessageA(hWnd, WM_SYSCOMMAND, SC_CLOSE, 0); - return (BOOL)(hWnd); + return HandleToUlong(hWnd); } VOID @@ -402,7 +402,7 @@ MDI_CalcDefaultChildPos(hWndParent, -1, mPos, 0, &id); - if (!(dwStyle & WS_POPUP)) hMenu = (HMENU)id; + if (!(dwStyle & WS_POPUP)) hMenu = UlongToHandle(id); if (dwStyle & (WS_CHILD | WS_POPUP)) { @@ -532,7 +532,7 @@ MDI_CalcDefaultChildPos(hWndParent, -1, mPos, 0, &id); - if (!(dwStyle & WS_POPUP)) hMenu = (HMENU)id; + if (!(dwStyle & WS_POPUP)) hMenu = UlongToHandle(id); if (dwStyle & (WS_CHILD | WS_POPUP)) { @@ -692,7 +692,7 @@ * Once that's fixed, we shouldn't have to check for a NULL HWND * here */ - if (!(ULONG)pHwnd[i]) /* don't enumerate a NULL HWND */ + if (!pHwnd[i]) /* don't enumerate a NULL HWND */ continue; if (!(*lpfn)(pHwnd[i], lParam)) { @@ -1442,8 +1442,8 @@ { // We are current. //FIXME("Current!\n"); if (lpdwProcessId) - *lpdwProcessId = (DWORD)NtCurrentTeb()->ClientId.UniqueProcess; - Ret = (DWORD)NtCurrentTeb()->ClientId.UniqueThread; + *lpdwProcessId = (DWORD_PTR)NtCurrentTeb()->ClientId.UniqueProcess; + Ret = (DWORD_PTR)NtCurrentTeb()->ClientId.UniqueThread; } else { // Ask kernel for info. Modified: trunk/reactos/include/reactos/win32k/ntuser.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/win32k/ntu… ============================================================================== --- trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] (original) +++ trunk/reactos/include/reactos/win32k/ntuser.h [iso-8859-1] Sun Jun 27 22:19:17 2010 @@ -3118,8 +3118,8 @@ { struct { - UINT uiLo; - UINT uiHi; + UINT_PTR uiLo; + UINT_PTR uiHi; } Packed; LPARAM Unpacked; } Value;

1 0

[sir_richard] 47883: [PCI]: Add the 40 different PCI erratas ("hack flags") that Windows can apply to broken PCI devices. eVb's driver knowss to apply these by parsing the PCI\Parameters list. These are the actual internal symbolic names used by Microsoft, which accidentally leaked out in the Vista Errata Manager .INF file.
by sir_richard＠svn.reactos.org 27 Jun '10

27 Jun '10

Author: sir_richard Date: Sun Jun 27 22:17:37 2010 New Revision: 47883 URL: http://svn.reactos.org/svn/reactos?rev=47883&view=rev Log: [PCI]: Add the 40 different PCI erratas ("hack flags") that Windows can apply to broken PCI devices. eVb's driver knowss to apply these by parsing the PCI\Parameters list. These are the actual internal symbolic names used by Microsoft, which accidentally leaked out in the Vista Errata Manager .INF file. Added: trunk/reactos/include/reactos/drivers/pci/ trunk/reactos/include/reactos/drivers/pci/pci.h (with props) Added: trunk/reactos/include/reactos/drivers/pci/pci.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/drivers/pc… ============================================================================== --- trunk/reactos/include/reactos/drivers/pci/pci.h (added) +++ trunk/reactos/include/reactos/drivers/pci/pci.h [iso-8859-1] Sun Jun 27 22:17:37 2010 @@ -1,0 +1,54 @@ +/* + * PROJECT: ReactOS PCI Bus Driver + * LICENSE: BSD - See COPYING.ARM in the top level directory + * FILE: include/reactos/drivers/pci/pci.h + * PURPOSE: Internal, Shared, PCI Definitions + * PROGRAMMERS: ReactOS Portable Systems Group + */ + +// +// PCI Hack Flags +// +#define PCI_HACK_LOCK_RESOURCES 0x0000000000000004LL +#define PCI_HACK_NO_ENUM_AT_ALL 0x0000000000000008LL +#define PCI_HACK_ENUM_NO_RESOURCE 0x0000000000000010LL +#define PCI_HACK_AVOID_D1D2_FOR_SLD 0x0000000000000020LL +#define PCI_HACK_NEVER_DISCONNECT 0x0000000000000040LL +#define PCI_HACK_DONT_DISABLE 0x0000000000000080LL +#define PCI_HACK_MULTIFUNCTION 0x0000000000000100LL +#define PCI_HACK_UNUSED_200 0x0000000000000200LL +#define PCI_HACK_IGNORE_NON_STICKY_ISA 0x0000000000000400LL +#define PCI_HACK_UNUSED_800 0x0000000000000800LL +#define PCI_HACK_DOUBLE_DECKER 0x0000000000001000LL +#define PCI_HACK_ONE_CHILD 0x0000000000002000LL +#define PCI_HACK_PRESERVE_COMMAND 0x0000000000004000LL +#define PCI_HACK_DEFAULT_CARDBUS_WINDOWS 0x0000000000008000LL +#define PCI_HACK_CB_SHARE_CMD_BITS 0x0000000000010000LL +#define PCI_HACK_IGNORE_ROOT_TOPOLOGY 0x0000000000020000LL +#define PCI_HACK_SUBTRACTIVE_DECODE 0x0000000000040000LL +#define PCI_HACK_NO_EXPRESS_CAP 0x0000000000080000LL +#define PCI_HACK_NO_ASPM_FOR_EXPRESS_LINK 0x0000000000100000LL +#define PCI_HACK_CLEAR_INT_DISABLE_FOR_MSI 0x0000000000200000LL +#define PCI_HACK_NO_SUBSYSTEM 0x0000000000400000LL +#define PCI_HACK_COMMAND_REWRITE 0x0000000000800000LL +#define PCI_HACK_AVOID_HARDWARE_ISA_BIT 0x0000000001000000LL +#define PCI_HACK_FORCE_BRIDGE_WINDOW_ALIGNMENT 0x0000000002000000LL +#define PCI_HACK_NOT_MSI_HT_CONVERTER 0x0000000004000000LL +#define PCI_HACK_PCI_HACK_SBR_ON_LINK_STATE_CHANGE 0x0000000008000000LL +#define PCI_HACK_PCI_HACK_LINK_DISABLE_ON_SLOT_PWRDN 0x0000000010000000LL +#define PCI_HACK_NO_PM_CAPS 0x0000000020000000LL +#define PCI_HACK_DONT_DISABLE_DECODES 0x0000000040000000LL +#define PCI_HACK_NO_SUBSYSTEM_AFTER_D3 0x0000000080000000LL +#define PCI_HACK_VIDEO_LEGACY_DECODE 0x0000000100000000LL +#define PCI_HACK_FAKE_CLASS_CODE 0x0000000200000000LL +#define PCI_HACK_UNUSED_40000000 0x0000000400000000LL +#define PCI_HACK_UNUSED_80000000 0x0000000800000000LL +#define PCI_HACK_FAIL_QUERY_REMOVE 0x0000001000000000LL +#define PCI_HACK_CRITICAL_DEVICE 0x0000002000000000LL +#define PCI_HACK_UNUSED_4000000000 0x0000004000000000LL +#define PCI_HACK_BROKEN_SUBTRACTIVE_DECODE 0x0000008000000000LL +#define PCI_HACK_NO_REVISION_AFTER_D3 0x0000010000000000LL +#define PCI_HACK_ENABLE_MSI_MAPPING 0x0000020000000000LL +#define PCI_HACK_DISABLE_PM_DOWNSTREAM_PCI_BRIDGE 0x0000040000000000LL + +/* EOF */ Propchange: trunk/reactos/include/reactos/drivers/pci/pci.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs