Merge from amd64-branch:
authorTimo Kreuzer <timo.kreuzer@reactos.org>
Thu, 25 Mar 2010 01:06:20 +0000 (01:06 +0000)
committerTimo Kreuzer <timo.kreuzer@reactos.org>
Thu, 25 Mar 2010 01:06:20 +0000 (01:06 +0000)
commit720c15e46d3159d582966313063f1e31a014c452
treee7b53bcd6c740208ef2c70f848737a358c8d1a4d
parente10113d22d8df87f26635d1a0e7f07c840839c23
Merge from amd64-branch:

36898 (sserapion)
- Fix 64bit advapi32 build.

35655 (sserapion)
Misc WIN64 fixes.
Implement InitializeCriticalSectionEx

43836 (sserapion)
Fix avicap32 build.

44510 (tkreuzer)
[IPHLPAPI]
Don't redefine _WIN32_WINNT to 0x500. When using the NDK we need at least 0x503 when compiling for 64 bit (XP64 is 502)

39335 (tkreuzer)
[IPHLPAPI]
Fix prototype of RtlAllocateHeap

38092 (sserapion)
[RPCRT4]
Fix 64bit-warnings.

44499 (sserapion)
[SYSSETUP]
Eliminate warning.

38100 (sserapion)
[ADVAPI32]
ULONG -> ULONG_PTR

svn path=/trunk/; revision=46418
15 files changed:
reactos/dll/win32/advapi32/reg/reg.c
reactos/dll/win32/advapi32/sec/misc.c
reactos/dll/win32/avicap32/avicap32.c
reactos/dll/win32/iphlpapi/iphlpapi_private.h
reactos/dll/win32/iphlpapi/resinfo_reactos.c
reactos/dll/win32/kernel32/misc/dllmain.c
reactos/dll/win32/kernel32/misc/toolhelp.c
reactos/dll/win32/kernel32/synch/critical.c
reactos/dll/win32/rpcrt4/rpc_transport.c
reactos/dll/win32/shell32/autocomplete.c
reactos/dll/win32/syssetup/install.c
reactos/dll/win32/user32/include/dde_private.h
reactos/dll/win32/user32/include/user32.h
reactos/dll/win32/user32/windows/draw.c
reactos/dll/win32/ws2_32/misc/stubs.c