22 Sep
2013
22 Sep
'13
9:04 p.m.
Author: tkreuzer
Date: Sun Sep 22 21:04:06 2013
New Revision: 60325
URL: http://svn.reactos.org/svn/reactos?rev=60325&view=rev
Log:
[TELNET] Don't compile it on MSVC
[CMAKE] Use the same MSVC build flags for x64 as for x86
[SMLIB] Fix MSVC warnings
[MODULES] Don't include optional modules on x64
[NTOSKRNL] Add some missing globals and definitions for x64
[CSRSRV] Fix an MSVC warning
Modified:
trunk/reactos/base/applications/network/CMakeLists.txt
trunk/reactos/cmake/msvc.cmake
trunk/reactos/include/reactos/subsys/csr/csrsrv.h
trunk/reactos/lib/smlib/lookupss.c
trunk/reactos/modules/CMakeLists.txt
trunk/reactos/ntoskrnl/include/internal/amd64/mm.h
trunk/reactos/ntoskrnl/mm/amd64/init.c
trunk/reactos/subsystems/win32/csrsrv/session.c
Modified: trunk/reactos/base/applications/network/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/network/…
==============================================================================
--- trunk/reactos/base/applications/network/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/base/applications/network/CMakeLists.txt [iso-8859-1] Sun Sep 22
21:04:06 2013
@@ -10,7 +10,9 @@
add_subdirectory(nslookup)
add_subdirectory(ping)
add_subdirectory(route)
-add_subdirectory(telnet)
+#if(NOT MSVC)
+ add_subdirectory(telnet)
+#endif()
add_subdirectory(tracert)
add_subdirectory(whois)
add_subdirectory(wlanconf)
Modified: trunk/reactos/cmake/msvc.cmake
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/cmake/msvc.cmake?rev=60325…
==============================================================================
--- trunk/reactos/cmake/msvc.cmake [iso-8859-1] (original)
+++ trunk/reactos/cmake/msvc.cmake [iso-8859-1] Sun Sep 22 21:04:06 2013
@@ -59,11 +59,9 @@
endif()
endif()
-if(${_MACHINE_ARCH_FLAG} MATCHES X86)
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO
/INCREMENTAL:NO /SAFESEH:NO /NODEFAULTLIB /RELEASE")
- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /MANIFEST:NO
/INCREMENTAL:NO /SAFESEH:NO /NODEFAULTLIB /RELEASE")
- set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO
/INCREMENTAL:NO /SAFESEH:NO /NODEFAULTLIB /RELEASE")
-endif()
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /MANIFEST:NO /INCREMENTAL:NO
/SAFESEH:NO /NODEFAULTLIB /RELEASE")
+set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} /MANIFEST:NO
/INCREMENTAL:NO /SAFESEH:NO /NODEFAULTLIB /RELEASE")
+set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} /MANIFEST:NO
/INCREMENTAL:NO /SAFESEH:NO /NODEFAULTLIB /RELEASE")
if(MSVC_IDE AND (CMAKE_VERSION MATCHES "ReactOS"))
# for VS builds we'll only have en-US in resource files
@@ -160,13 +158,13 @@
set(_def_file ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_exp.def)
set(_asm_stubs_file ${CMAKE_CURRENT_BINARY_DIR}/${_libname}_stubs.asm)
-
+
# Generate the asm stub file and the def file for import library
add_custom_command(
OUTPUT ${_asm_stubs_file} ${_def_file}
COMMAND native-spec2def --ms --kill-at -a=${SPEC2DEF_ARCH} --implib
-n=${_dllname} -d=${_def_file} -l=${_asm_stubs_file}
${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file}
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/${_spec_file} native-spec2def)
-
+
if(MSVC_IDE)
# Compile the generated asm stub file
add_custom_command(
Modified: trunk/reactos/include/reactos/subsys/csr/csrsrv.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/include/reactos/subsys/csr…
==============================================================================
--- trunk/reactos/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] (original)
+++ trunk/reactos/include/reactos/subsys/csr/csrsrv.h [iso-8859-1] Sun Sep 22 21:04:06
2013
@@ -225,7 +225,9 @@
PCSR_SHUTDOWNPROCESS_CALLBACK ShutdownProcessCallback;
ULONG Unknown2[3];
} CSR_SERVER_DLL, *PCSR_SERVER_DLL;
+#ifndef _WIN64
C_ASSERT(FIELD_OFFSET(CSR_SERVER_DLL, SharedSection) == 0x3C);
+#endif
typedef
NTSTATUS
Modified: trunk/reactos/lib/smlib/lookupss.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/lib/smlib/lookupss.c?rev=6…
==============================================================================
--- trunk/reactos/lib/smlib/lookupss.c [iso-8859-1] (original)
+++ trunk/reactos/lib/smlib/lookupss.c [iso-8859-1] Sun Sep 22 21:04:06 2013
@@ -109,12 +109,12 @@
}
else
{
- Source.Length = kvpi->DataLength;
- Source.MaximumLength = kvpi->DataLength;
+ Source.Length = (USHORT)kvpi->DataLength;
+ Source.MaximumLength = (USHORT)kvpi->DataLength;
Source.Buffer = (PWCHAR) & kvpi->Data;
Destination.Length = 0;
- Destination.MaximumLength = (2 * KeyValueInformationLength);
+ Destination.MaximumLength = (USHORT)(2 * KeyValueInformationLength);
Destination.Buffer = DestinationBuffer;
Status = RtlExpandEnvironmentStrings_U (Environment,
Modified: trunk/reactos/modules/CMakeLists.txt
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/modules/CMakeLists.txt?rev…
==============================================================================
--- trunk/reactos/modules/CMakeLists.txt [iso-8859-1] (original)
+++ trunk/reactos/modules/CMakeLists.txt [iso-8859-1] Sun Sep 22 21:04:06 2013
@@ -1,3 +1,5 @@
+
+if(NOT ARCH STREQUAL "amd64")
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/rostests/)
add_subdirectory(rostests)
@@ -10,3 +12,5 @@
if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/wallpaper/)
add_subdirectory(wallpaper)
endif()
+
+endif()
Modified: trunk/reactos/ntoskrnl/include/internal/amd64/mm.h
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/…
==============================================================================
--- trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/include/internal/amd64/mm.h [iso-8859-1] Sun Sep 22 21:04:06
2013
@@ -262,6 +262,20 @@
/* Sign extend 48 bits */
#define MiProtoPteToPte(x) (PMMPTE)(((LONG64)(x)->u.Long) >> 16)
+//
+// Decodes a Prototype PTE into the underlying PTE
+//
+#define MiSubsectionPteToSubsection(x) \
+ (PMMPTE)((x)->u.Subsect.SubsectionAddress >> 16)
+
+FORCEINLINE
+VOID
+MI_MAKE_SUBSECTION_PTE(IN PMMPTE NewPte,
+ IN PVOID Segment)
+{
+ ASSERT(FALSE);
+}
+
FORCEINLINE
VOID
MI_MAKE_PROTOTYPE_PTE(IN PMMPTE NewPte,
Modified: trunk/reactos/ntoskrnl/mm/amd64/init.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/amd64/init.c?r…
==============================================================================
--- trunk/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/mm/amd64/init.c [iso-8859-1] Sun Sep 22 21:04:06 2013
@@ -25,6 +25,10 @@
/* Template PTE and PDE for a kernel page */
MMPTE ValidKernelPde = {{PTE_VALID|PTE_READWRITE|PTE_DIRTY|PTE_ACCESSED}};
MMPTE ValidKernelPte = {{PTE_VALID|PTE_READWRITE|PTE_DIRTY|PTE_ACCESSED}};
+
+/* The same, but for local pages */
+MMPTE ValidKernelPdeLocal = {{PTE_VALID|PTE_READWRITE|PTE_DIRTY|PTE_ACCESSED}};
+MMPTE ValidKernelPteLocal = {{PTE_VALID|PTE_READWRITE|PTE_DIRTY|PTE_ACCESSED}};
/* Template PDE for a demand-zero page */
MMPDE DemandZeroPde = {{MM_READWRITE << MM_PTE_SOFTWARE_PROTECTION_BITS}};
Modified: trunk/reactos/subsystems/win32/csrsrv/session.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrsrv/se…
==============================================================================
--- trunk/reactos/subsystems/win32/csrsrv/session.c [iso-8859-1] (original)
+++ trunk/reactos/subsystems/win32/csrsrv/session.c [iso-8859-1] Sun Sep 22 21:04:06 2013
@@ -296,7 +296,9 @@
CsrDeallocateProcess(CsrProcess);
CsrDeallocateThread(CsrThread);
CsrReleaseProcessLock();
- return Status;
+
+ /* Strange as it seems, NTSTATUSes are actually returned */
+ return (BOOLEAN)Status;
}
/* Setup Process Data */