ntdll: Get rid of the almost empty nt.c.

dlls/ntdll/Makefile.in

@@ -22,7 +22,6 @@ C_SRCS = \
 	loader.c \
 	locale.c \
 	misc.c \
-	nt.c \
 	path.c \
 	printf.c \
 	process.c \

dlls/ntdll/nt.c

-/*
- * NT basis DLL
- *
- * This file contains the Nt* API functions of NTDLL.DLL.
- * In the original ntdll.dll they all seem to just call int 0x2e (down to the NTOSKRNL)
- *
- * Copyright 1996-1998 Marcus Meissner
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
- */
-
-#include <string.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#define NONAMELESSUNION
-#include "ntstatus.h"
-#define WIN32_NO_STATUS
-#include "wine/debug.h"
-#include "windef.h"
-#include "winternl.h"
-#include "ntdll_misc.h"
-#include "ddk/wdm.h"
-
-
-/***********************************************************************
- * RtlIsProcessorFeaturePresent [NTDLL.@]
- */
-BOOLEAN WINAPI RtlIsProcessorFeaturePresent( UINT feature )
-{
-    return feature < PROCESSOR_FEATURE_MAX && user_shared_data->ProcessorFeatures[feature];
-}
-
-/******************************************************************************
- *        VerSetConditionMask   (NTDLL.@)
- */
-ULONGLONG WINAPI VerSetConditionMask( ULONGLONG dwlConditionMask, DWORD dwTypeBitMask,
-                                      BYTE dwConditionMask)
-{
-    if(dwTypeBitMask == 0)
-	return dwlConditionMask;
-    dwConditionMask &= 0x07;
-    if(dwConditionMask == 0)
-	return dwlConditionMask;
-
-    if(dwTypeBitMask & VER_PRODUCT_TYPE)
-	dwlConditionMask |= dwConditionMask << 7*3;
-    else if (dwTypeBitMask & VER_SUITENAME)
-	dwlConditionMask |= dwConditionMask << 6*3;
-    else if (dwTypeBitMask & VER_SERVICEPACKMAJOR)
-	dwlConditionMask |= dwConditionMask << 5*3;
-    else if (dwTypeBitMask & VER_SERVICEPACKMINOR)
-	dwlConditionMask |= dwConditionMask << 4*3;
-    else if (dwTypeBitMask & VER_PLATFORMID)
-	dwlConditionMask |= dwConditionMask << 3*3;
-    else if (dwTypeBitMask & VER_BUILDNUMBER)
-	dwlConditionMask |= dwConditionMask << 2*3;
-    else if (dwTypeBitMask & VER_MAJORVERSION)
-	dwlConditionMask |= dwConditionMask << 1*3;
-    else if (dwTypeBitMask & VER_MINORVERSION)
-	dwlConditionMask |= dwConditionMask << 0*3;
-    return dwlConditionMask;
-}

dlls/ntdll/rtl.c

@@ -2141,6 +2141,14 @@ void WINAPI RtlGetCurrentProcessorNumberEx(PROCESSOR_NUMBER *processor)
 }
 
 /***********************************************************************
+ *           RtlIsProcessorFeaturePresent [NTDLL.@]
+ */
+BOOLEAN WINAPI RtlIsProcessorFeaturePresent( UINT feature )
+{
+    return feature < PROCESSOR_FEATURE_MAX && user_shared_data->ProcessorFeatures[feature];
+}
+
+/***********************************************************************
  *           RtlInitializeGenericTableAvl  (NTDLL.@)
  */
 void WINAPI RtlInitializeGenericTableAvl(PRTL_AVL_TABLE table, PRTL_AVL_COMPARE_ROUTINE compare,

dlls/ntdll/version.c

@@ -759,3 +759,21 @@ NTSTATUS WINAPI RtlVerifyVersionInfo( const RTL_OSVERSIONINFOEXW *info,
 
     return STATUS_SUCCESS;
 }
+
+
+/******************************************************************************
+ *        VerSetConditionMask   (NTDLL.@)
+ */
+ULONGLONG WINAPI VerSetConditionMask( ULONGLONG condition_mask, DWORD type_mask, BYTE condition )
+{
+    condition &= 0x07;
+    if (type_mask & VER_PRODUCT_TYPE) condition_mask |= condition << 7*3;
+    else if (type_mask & VER_SUITENAME) condition_mask |= condition << 6*3;
+    else if (type_mask & VER_SERVICEPACKMAJOR) condition_mask |= condition << 5*3;
+    else if (type_mask & VER_SERVICEPACKMINOR) condition_mask |= condition << 4*3;
+    else if (type_mask & VER_PLATFORMID) condition_mask |= condition << 3*3;
+    else if (type_mask & VER_BUILDNUMBER) condition_mask |= condition << 2*3;
+    else if (type_mask & VER_MAJORVERSION) condition_mask |= condition << 1*3;
+    else if (type_mask & VER_MINORVERSION) condition_mask |= condition << 0*3;
+    return condition_mask;
+}