Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-29 10:35:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

[REACTOS] Fix x64 build

Browse source 
- SIZE_T -> ULONG in KsecGatherEntropyData
- Add missing ZwQueryInformationProcess() prototype for x64 build of btrfs
- Fix ml.exe path for VS 2017 Community Edition
- Add missing Handle32ToHandle to basetsd.h
This commit is contained in:
Timo Kreuzer 2017-10-19 10:18:19 +02:00
parent 547b38e022
commit 6073359086
4 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
drivers/crypto/ksecdd/random.c
View file

@ -96,7 +96,7 @@ KsecGatherEntropyData(
PTEB Teb; PTEB Teb;
PPEB Peb; PPEB Peb;
PWSTR String; PWSTR String;
SIZE_T ReturnLength; ULONG ReturnLength;
NTSTATUS Status; NTSTATUS Status;
/* Query some generic values */ /* Query some generic values */

12
drivers/filesystems/btrfs/create.c
View file

@ -2266,6 +2266,18 @@ static NTSTATUS create_stream(_Requires_lock_held_(_Curr_->tree_lock) _Requires_
// LXSS programs can be distinguished by the fact they have a NULL PEB. // LXSS programs can be distinguished by the fact they have a NULL PEB.
#ifdef _AMD64_ #ifdef _AMD64_
#ifdef __REACTOS__
NTSYSAPI
NTSTATUS
NTAPI
ZwQueryInformationProcess (
_In_ HANDLE ProcessHandle,
_In_ PROCESSINFOCLASS ProcessInformationClass,
_Out_ PVOID ProcessInformation,
_In_ ULONG ProcessInformationLength,
_Out_opt_ PULONG ReturnLength
);
#endif
static __inline BOOL called_from_lxss() { static __inline BOOL called_from_lxss() {
NTSTATUS Status; NTSTATUS Status;
PROCESS_BASIC_INFORMATION pbi; PROCESS_BASIC_INFORMATION pbi;

4
sdk/cmake/msvc.cmake
View file

@ -407,7 +407,9 @@ set(PSEH_LIB "pseh")
# Use a full path for the x86 version of ml when using x64 VS. # Use a full path for the x86 version of ml when using x64 VS.
# It's not a problem when using the DDK/WDK because, in x64 mode, # It's not a problem when using the DDK/WDK because, in x64 mode,
# both the x86 and x64 versions of ml are available. # both the x86 and x64 versions of ml are available.
if((ARCH STREQUAL "amd64") AND (DEFINED ENV{VCINSTALLDIR})) if((ARCH STREQUAL "amd64") AND (DEFINED ENV{VCToolsInstallDir}))
set(CMAKE_ASM16_COMPILER $ENV{VCToolsInstallDir}/bin/HostX86/x86/ml.exe)
elseif((ARCH STREQUAL "amd64") AND (DEFINED ENV{VCINSTALLDIR}))
set(CMAKE_ASM16_COMPILER $ENV{VCINSTALLDIR}/bin/ml.exe) set(CMAKE_ASM16_COMPILER $ENV{VCINSTALLDIR}/bin/ml.exe)
elseif(ARCH STREQUAL "arm") elseif(ARCH STREQUAL "arm")
set(CMAKE_ASM16_COMPILER armasm.exe) set(CMAKE_ASM16_COMPILER armasm.exe)

1
sdk/include/psdk/basetsd.h
View file

@ -68,6 +68,7 @@ typedef unsigned __int64 HANDLE_PTR;
typedef unsigned int UHALF_PTR, *PUHALF_PTR; typedef unsigned int UHALF_PTR, *PUHALF_PTR;
typedef int HALF_PTR, *PHALF_PTR; typedef int HALF_PTR, *PHALF_PTR;
#define ADDRESS_TAG_BIT 0x40000000000UI64 #define ADDRESS_TAG_BIT 0x40000000000UI64
#define Handle32ToHandle( h ) ((HANDLE)(LONG_PTR)(LONG)(h))
#else /* !_WIN64 */ #else /* !_WIN64 */
#define __int3264 __int32 #define __int3264 __int32
#define ADDRESS_TAG_BIT 0x80000000UL #define ADDRESS_TAG_BIT 0x80000000UL