Merge from amd64-branch:
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Thu, 25 Mar 2010 05:03:29 +0000 (05:03 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Thu, 25 Mar 2010 05:03:29 +0000 (05:03 +0000)
commitfe68057a58a0bca971809de24bfe6f0c424375f1
treec2464d7db63fa1f01b97a89b3acdb513f146c776
parenta00ac160d546ff429df698ce584cdada444c3ba6
Merge from amd64-branch:

46394 (tkreuzer)
[FRAMEBUF_NEW]
- use compiler flags for x86 only

36969 (sginsberg)
[VIDEOPRT]
- Make videoprt compile for 64-bit
- Disable Int10 support as it uses x86 specific structures (is this support still available on amd64?)
- Disable VideoPortEnable/DisableInterrupt -- HalEnable/DisableSystemInterrupt are not apparently present on NT AMD64, so need to figure out what else to use (and if these routine are still present on amd64 videoprt)

The following this time for real:

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=46427
13 files changed:
reactos/drivers/network/ndis/ndis/miniport.c
reactos/drivers/network/ndis/ndis/misc.c
reactos/drivers/network/tcpip/datalink/lan.c
reactos/drivers/video/displays/framebuf_new/framebuf_new.rbuild
reactos/drivers/video/font/bmfd/font.c
reactos/drivers/video/font/bmfd/glyph.c
reactos/drivers/video/videoprt/agp.c
reactos/drivers/video/videoprt/int10.c
reactos/drivers/video/videoprt/interrupt.c
reactos/drivers/video/videoprt/resource.c
reactos/drivers/video/videoprt/services.c
reactos/drivers/video/videoprt/videoprt.c
reactos/drivers/wdm/audio/legacy/wdmaud/interface.h