Merge from amd64-branch:
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Thu, 25 Mar 2010 03:50:46 +0000 (03:50 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Thu, 25 Mar 2010 03:50:46 +0000 (03:50 +0000)
commiteb884f4969e08cce4eff9c9f7e558d499dda8a59
treedaa3aad8e8e8cb9acad5bd6d62f6ace81a8cb978
parentbec2c26ca364fc707f0f9c032b0c629ce95093eb
parent91fa4b7fd0284309c4f8e23c02bde1782665b574
parent941fdb3f0bce0765b869ebf83cd73ed102118caf
Merge from amd64-branch:

36380 (tkreuzer)
[SCSIPORT]
Implement some functions that are forwarded to HAL on x86 build, but not on x64. Modify spec file (use preprocessor macro).

36397 (tkreuzer)
[SCSIPORT]
rename .spec to .pspec

36949 (sginsberg)
- Fix NTFS FSD compilation

36951 (sginsgerb)
[NE2000]
- Fix ne2000 compilation (treat pointer size as ULONG_PTR, correct function prototypes)

36958 (sginsberg)
[ISAPNP]
- Fix isapnp compilation for 64-bit

36961 (sginsberg)
[SERIAL]
- Make serial build for 64 bit -- explicitly cast first parameter to InterlockedCompareExchangePointer
to PVOID

36964 (sginsberg)
- Fix DXG 64-bit compilation

36972 (sserapion)
[VGA]
- When doing pointer arithmetic, ULONG_PTR is your friend

37234 (tkreuzer)
[SCSIPORT]
Fix scsiport, by using pspec again.

40927 (tkreuzer)
[BMFD]
HGLYPH is an ULONG. Use offset to glyph entry as HGLYPH instead of the pointer to fix 64bit build.

41070 (tkreuzer)
[TCPIP]
fix a pointer to ULONG cast

41500 (tkreuzer)
[NDIS]
Pass ULONG* to MiniQueryInformation for the number of written bytes instead of ULONG_PTR*

41502 (tkreuzer)
[WDMAUD]
Make DeviceIndex a ULONG_PTR

44339 (sserapion)
[NDIS]
Fix ndis build.

svn path=/trunk/; revision=46424
reactos/drivers/bus/isapnp/isapnp.c
reactos/drivers/directx/dxg/ddhmg.c
reactos/drivers/filesystems/ntfs/attrib.c
reactos/drivers/network/dd/ne2000/include/ne2000.h
reactos/drivers/network/dd/ne2000/ne2000/8390.c
reactos/drivers/serial/serial/devctrl.c
reactos/drivers/storage/scsiport/scsiport.rbuild
reactos/drivers/video/displays/vga/main/enable.c