kernel32: Move some process functions to kernelbase.

dlls/kernel32/heap.c

@@ -252,14 +252,6 @@ BOOL WINAPI HeapUnlock(
 }
 
 
-/***********************************************************************
- *           GetProcessHeaps    (KERNEL32.@)
- */
-DWORD WINAPI GetProcessHeaps( DWORD count, HANDLE *heaps )
-{
-    return RtlGetProcessHeaps( count, heaps );
-}
-
 
 /* These are needed so that we can call the functions from inside kernel itself */
 

dlls/kernel32/kernel32.spec

@@ -517,7 +517,7 @@
 @ stdcall -import FlsSetValue(long ptr)
 @ stdcall FlushConsoleInputBuffer(long)
 @ stdcall FlushFileBuffers(long)
-@ stdcall FlushInstructionCache(long long long)
+@ stdcall -import FlushInstructionCache(long long long)
 @ stdcall FlushProcessWriteBuffers()
 @ stdcall FlushViewOfFile(ptr long)
 @ stdcall FoldStringA(long str long ptr long)
@@ -664,7 +664,7 @@
 @ stdcall GetEnvironmentVariableA(str ptr long)
 @ stdcall GetEnvironmentVariableW(wstr ptr long)
 # @ stub GetEraNameCountedString
-@ stdcall GetErrorMode()
+@ stdcall -import GetErrorMode()
 @ stdcall GetExitCodeProcess(long ptr)
 @ stdcall -import GetExitCodeThread(long ptr)
 @ stdcall GetExpandedNameA(str ptr)
@@ -763,7 +763,7 @@
 @ stdcall GetUserPreferredUILanguages(long ptr ptr ptr)
 @ stdcall GetPackageFullName(long ptr ptr)
 @ stdcall GetPhysicallyInstalledSystemMemory(ptr)
-@ stdcall GetPriorityClass(long)
+@ stdcall -import GetPriorityClass(long)
 @ stdcall GetPrivateProfileIntA(str str long str)
 @ stdcall GetPrivateProfileIntW(wstr wstr long wstr)
 @ stdcall GetPrivateProfileSectionA(str ptr long str)
@@ -779,22 +779,22 @@
 @ stdcall GetProcessDEPPolicy(long ptr ptr)
 @ stdcall GetProcessFlags(long)
 # @ stub GetProcessGroupAffinity
-@ stdcall GetProcessHandleCount(long ptr)
-@ stdcall -norelay GetProcessHeap() KERNEL32_GetProcessHeap
-@ stdcall GetProcessHeaps(long ptr)
-@ stdcall GetProcessId(long)
+@ stdcall -import GetProcessHandleCount(long ptr)
+@ stdcall -import GetProcessHeap()
+@ stdcall -import GetProcessHeaps(long ptr) RtlGetProcessHeaps
+@ stdcall -import GetProcessId(long)
 @ stdcall -import GetProcessIdOfThread(long)
 @ stdcall GetProcessIoCounters(long ptr)
-@ stdcall GetProcessMitigationPolicy(long long ptr long)
+@ stdcall -import GetProcessMitigationPolicy(long long ptr long)
 @ stdcall GetProcessPreferredUILanguages(long ptr ptr ptr)
-@ stdcall GetProcessPriorityBoost(long ptr)
-@ stdcall GetProcessShutdownParameters(ptr ptr)
+@ stdcall -import GetProcessPriorityBoost(long ptr)
+@ stdcall -import GetProcessShutdownParameters(ptr ptr)
 # @ stub GetProcessorSystemCycleTime
 @ stdcall GetProcessTimes(long ptr ptr ptr ptr)
 # @ stub GetProcessUserModeExceptionPolicy
 @ stdcall GetProcessVersion(long)
 @ stdcall GetProcessWorkingSetSize(long ptr ptr)
-@ stdcall GetProcessWorkingSetSizeEx(long ptr ptr ptr)
+@ stdcall -import GetProcessWorkingSetSizeEx(long ptr ptr ptr)
 @ stdcall GetProductInfo(long long long long ptr)
 @ stub GetProductName
 @ stdcall GetProfileIntA(str str long)
@@ -994,7 +994,7 @@
 @ stdcall IsValidLocale(long long)
 @ stdcall IsValidLocaleName(wstr)
 # @ stub IsValidUILanguage
-@ stdcall IsWow64Process(ptr ptr)
+@ stdcall -import IsWow64Process(ptr ptr)
 @ stdcall K32EmptyWorkingSet(long)
 @ stdcall K32EnumDeviceDrivers(ptr long ptr)
 @ stdcall K32EnumPageFilesA(ptr ptr)
@@ -1124,7 +1124,7 @@
 @ stdcall -import OpenMutexW(long long wstr)
 # @ stub OpenPrivateNamespaceA
 # @ stub OpenPrivateNamespaceW
-@ stdcall OpenProcess(long long long)
+@ stdcall -import OpenProcess(long long long)
 # @ stub OpenProcessToken
 @ stdcall OpenProfileUserMapping()
 @ stdcall OpenSemaphoreA(long long str)
@@ -1388,7 +1388,7 @@
 # @ stub SetEnvironmentStringsW
 @ stdcall SetEnvironmentVariableA(str str)
 @ stdcall SetEnvironmentVariableW(wstr wstr)
-@ stdcall SetErrorMode(long)
+@ stdcall -import SetErrorMode(long)
 @ stdcall -import SetEvent(long)
 @ stdcall SetEventWhenCallbackReturns(ptr long) ntdll.TpCallbackSetEventOnCompletion
 @ stdcall SetFileApisToANSI()
@@ -1424,17 +1424,17 @@
 @ stub SetMessageWaitingIndicator
 # @ stub SetNamedPipeAttribute
 @ stdcall -import SetNamedPipeHandleState(long ptr ptr ptr)
-@ stdcall SetPriorityClass(long long)
+@ stdcall -import SetPriorityClass(long long)
 @ stdcall SetProcessAffinityMask(long long)
-@ stdcall SetProcessAffinityUpdateMode(long long)
+@ stdcall -import SetProcessAffinityUpdateMode(long long)
 @ stdcall SetProcessDEPPolicy(long)
-@ stdcall SetProcessMitigationPolicy(long ptr long)
+@ stdcall -import SetProcessMitigationPolicy(long ptr long)
 @ stdcall SetProcessPreferredUILanguages(long ptr ptr)
-@ stdcall SetProcessPriorityBoost(long long)
-@ stdcall SetProcessShutdownParameters(long long)
+@ stdcall -import SetProcessPriorityBoost(long long)
+@ stdcall -import SetProcessShutdownParameters(long long)
 # @ stub SetProcessUserModeExceptionPolicy
 @ stdcall SetProcessWorkingSetSize(long long long)
-@ stdcall SetProcessWorkingSetSizeEx(long long long long)
+@ stdcall -import SetProcessWorkingSetSizeEx(long long long long)
 @ stdcall SetSearchPathMode(long)
 @ stdcall SetStdHandle(long long)
 # @ stub SetStdHandleEx
@@ -1496,7 +1496,7 @@
 @ stdcall SystemTimeToTzSpecificLocalTime (ptr ptr ptr)
 # @ stub SystemTimeToTzSpecificLocalTimeEx
 @ stdcall TerminateJobObject(long long)
-@ stdcall TerminateProcess(long long)
+@ stdcall -import TerminateProcess(long long)
 @ stdcall -import TerminateThread(long long)
 @ stdcall TermsrvAppInstallMode()
 @ stdcall Thread32First(long ptr)

dlls/kernel32/thread.c

@@ -160,11 +160,3 @@ DWORD WINAPI KERNEL32_GetCurrentThreadId(void)
 {
     return HandleToULong(NtCurrentTeb()->ClientId.UniqueThread);
 }
-
-/***********************************************************************
- *           GetProcessHeap    (KERNEL32.@)
- */
-HANDLE WINAPI KERNEL32_GetProcessHeap(void)
-{
-    return NtCurrentTeb()->Peb->ProcessHeap;
-}

dlls/kernelbase/Makefile.in

@@ -7,6 +7,7 @@ C_SRCS = \
 	loader.c \
 	main.c \
 	path.c \
+	process.c \
 	registry.c \
 	security.c \
 	string.c \

dlls/kernelbase/kernelbase.spec

@@ -381,7 +381,7 @@
 @ stdcall FlsSetValue(long ptr)
 @ stdcall FlushConsoleInputBuffer(long) kernel32.FlushConsoleInputBuffer
 @ stdcall FlushFileBuffers(long) kernel32.FlushFileBuffers
-@ stdcall FlushInstructionCache(long long long) kernel32.FlushInstructionCache
+@ stdcall FlushInstructionCache(long long long)
 @ stdcall FlushProcessWriteBuffers() kernel32.FlushProcessWriteBuffers
 @ stdcall FlushViewOfFile(ptr long) kernel32.FlushViewOfFile
 @ stdcall FoldStringW(long wstr long ptr long) kernel32.FoldStringW
@@ -464,8 +464,8 @@
 # @ stub GetCurrentPackagePath
 # @ stub GetCurrentPackageResourcesContext
 # @ stub GetCurrentPackageSecurityContext
-@ stdcall -norelay GetCurrentProcess() kernel32.GetCurrentProcess
-@ stdcall -norelay GetCurrentProcessId() kernel32.GetCurrentProcessId
+@ stdcall -norelay GetCurrentProcess() kernelbase_GetCurrentProcess
+@ stdcall -norelay GetCurrentProcessId() kernelbase_GetCurrentProcessId
 @ stdcall GetCurrentProcessorNumber() ntdll.NtGetCurrentProcessorNumber
 @ stdcall GetCurrentProcessorNumberEx(ptr) ntdll.RtlGetCurrentProcessorNumberEx
 # @ stub GetCurrentTargetPlatformContext
@@ -498,8 +498,8 @@
 @ stdcall GetEnvironmentVariableA(str ptr long) kernel32.GetEnvironmentVariableA
 @ stdcall GetEnvironmentVariableW(wstr ptr long) kernel32.GetEnvironmentVariableW
 @ stub GetEraNameCountedString
-@ stdcall GetErrorMode() kernel32.GetErrorMode
-@ stdcall GetExitCodeProcess(long ptr) kernel32.GetExitCodeProcess
+@ stdcall GetErrorMode()
+@ stdcall GetExitCodeProcess(long ptr)
 @ stdcall GetExitCodeThread(long ptr)
 @ stub GetFallbackDisplayName
 @ stdcall GetFileAttributesA(str) kernel32.GetFileAttributesA
@@ -617,28 +617,28 @@
 # @ stub GetPerformanceInfo
 @ stdcall GetPhysicallyInstalledSystemMemory(ptr) kernel32.GetPhysicallyInstalledSystemMemory
 # @ stub GetPreviousFgPolicyRefreshInfoInternal
-@ stdcall GetPriorityClass(long) kernel32.GetPriorityClass
+@ stdcall GetPriorityClass(long)
 @ stdcall GetPrivateObjectSecurity(ptr long ptr long ptr)
 @ stdcall GetProcAddress(long str) kernel32.GetProcAddress
 # @ stub GetProcAddressForCaller
 # @ stub GetProcessDefaultCpuSets
 # @ stub GetProcessGroupAffinity
-@ stdcall GetProcessHandleCount(long ptr) kernel32.GetProcessHandleCount
-@ stdcall -norelay GetProcessHeap() kernel32.GetProcessHeap
-@ stdcall GetProcessHeaps(long ptr) kernel32.GetProcessHeaps
-@ stdcall GetProcessId(long) kernel32.GetProcessId
+@ stdcall GetProcessHandleCount(long ptr)
+@ stdcall -norelay GetProcessHeap() kernelbase_GetProcessHeap
+@ stdcall -import GetProcessHeaps(long ptr) RtlGetProcessHeaps
+@ stdcall GetProcessId(long)
 @ stdcall GetProcessIdOfThread(long)
 # @ stub GetProcessImageFileNameA
 # @ stub GetProcessImageFileNameW
 # @ stub GetProcessInformation
 # @ stub GetProcessMemoryInfo
-@ stdcall GetProcessMitigationPolicy(long long ptr long) kernel32.GetProcessMitigationPolicy
+@ stdcall GetProcessMitigationPolicy(long long ptr long)
 @ stdcall GetProcessPreferredUILanguages(long ptr ptr ptr) kernel32.GetProcessPreferredUILanguages
-@ stdcall GetProcessPriorityBoost(long ptr) kernel32.GetProcessPriorityBoost
-@ stdcall GetProcessShutdownParameters(ptr ptr) kernel32.GetProcessShutdownParameters
+@ stdcall GetProcessPriorityBoost(long ptr)
+@ stdcall GetProcessShutdownParameters(ptr ptr)
 @ stdcall GetProcessTimes(long ptr ptr ptr ptr) kernel32.GetProcessTimes
 @ stdcall GetProcessVersion(long) kernel32.GetProcessVersion
-@ stdcall GetProcessWorkingSetSizeEx(long ptr ptr ptr) kernel32.GetProcessWorkingSetSizeEx
+@ stdcall GetProcessWorkingSetSizeEx(long ptr ptr ptr)
 # @ stub GetProcessorSystemCycleTime
 @ stdcall GetProductInfo(long long long long ptr) kernel32.GetProductInfo
 @ stub GetPtrCalData
@@ -884,7 +884,7 @@
 @ stdcall IsValidSecurityDescriptor(ptr)
 @ stdcall IsValidSid(ptr)
 @ stdcall IsWellKnownSid(ptr long)
-@ stdcall IsWow64Process(ptr ptr) kernel32.IsWow64Process
+@ stdcall IsWow64Process(ptr ptr)
 # @ stub IsWow64Process2
 @ stdcall K32EmptyWorkingSet(long) kernel32.K32EmptyWorkingSet
 @ stdcall K32EnumDeviceDrivers(ptr long ptr) kernel32.K32EnumDeviceDrivers
@@ -991,7 +991,7 @@
 # @ stub OpenPackageInfoByFullName
 # @ stub OpenPackageInfoByFullNameForUser
 # @ stub OpenPrivateNamespaceW
-@ stdcall OpenProcess(long long long) kernel32.OpenProcess
+@ stdcall OpenProcess(long long long)
 @ stdcall OpenProcessToken(long long ptr)
 @ stub OpenRegKey
 @ stdcall OpenSemaphoreW(long long wstr)
@@ -1426,7 +1426,7 @@
 @ stub SetEnvironmentStringsW
 @ stdcall SetEnvironmentVariableA(str str) kernel32.SetEnvironmentVariableA
 @ stdcall SetEnvironmentVariableW(wstr wstr) kernel32.SetEnvironmentVariableW
-@ stdcall SetErrorMode(long) kernel32.SetErrorMode
+@ stdcall SetErrorMode(long)
 @ stdcall SetEvent(long)
 @ stdcall SetEventWhenCallbackReturns(ptr long) ntdll.TpCallbackSetEventOnCompletion
 @ stdcall SetFileApisToANSI() kernel32.SetFileApisToANSI
@@ -1450,19 +1450,19 @@
 @ stdcall SetLocalTime(ptr) kernel32.SetLocalTime
 @ stdcall SetLocaleInfoW(long long wstr) kernel32.SetLocaleInfoW
 @ stdcall SetNamedPipeHandleState(long ptr ptr ptr)
-@ stdcall SetPriorityClass(long long) kernel32.SetPriorityClass
+@ stdcall SetPriorityClass(long long)
 @ stdcall SetPrivateObjectSecurity(long ptr ptr ptr long)
 @ stub SetPrivateObjectSecurityEx
-@ stdcall SetProcessAffinityUpdateMode(long long) kernel32.SetProcessAffinityUpdateMode
+@ stdcall SetProcessAffinityUpdateMode(long long)
 # @ stub SetProcessDefaultCpuSets
 # @ stub SetProcessGroupAffinity
 # @ stub SetProcessInformation
-@ stdcall SetProcessMitigationPolicy(long ptr long) kernel32.SetProcessMitigationPolicy
+@ stdcall SetProcessMitigationPolicy(long ptr long)
 @ stdcall SetProcessPreferredUILanguages(long ptr ptr) kernel32.SetProcessPreferredUILanguages
-@ stdcall SetProcessPriorityBoost(long long) kernel32.SetProcessPriorityBoost
-@ stdcall SetProcessShutdownParameters(long long) kernel32.SetProcessShutdownParameters
+@ stdcall SetProcessPriorityBoost(long long)
+@ stdcall SetProcessShutdownParameters(long long)
 # @ stub SetProcessValidCallTargets
-@ stdcall SetProcessWorkingSetSizeEx(long long long long) kernel32.SetProcessWorkingSetSizeEx
+@ stdcall SetProcessWorkingSetSizeEx(long long long long)
 # @ stub SetProtectedPolicy
 # @ stub SetRoamingLastObservedChangeTime
 @ stub SetSecurityAccessMask
@@ -1594,7 +1594,7 @@
 @ stdcall SystemTimeToFileTime(ptr ptr) kernel32.SystemTimeToFileTime
 @ stdcall SystemTimeToTzSpecificLocalTime(ptr ptr ptr) kernel32.SystemTimeToTzSpecificLocalTime
 @ stub SystemTimeToTzSpecificLocalTimeEx
-@ stdcall TerminateProcess(long long) kernel32.TerminateProcess
+@ stdcall TerminateProcess(long long)
 # @ stub TerminateProcessOnMemoryExhaustion
 @ stdcall TerminateThread(long long)
 @ stdcall TlsAlloc()

include/winbase.h

@@ -2236,6 +2236,7 @@ WINBASEAPI BOOL        WINAPI GetProcessShutdownParameters(LPDWORD,LPDWORD);
 WINBASEAPI BOOL        WINAPI GetProcessTimes(HANDLE,LPFILETIME,LPFILETIME,LPFILETIME,LPFILETIME);
 WINBASEAPI DWORD       WINAPI GetProcessVersion(DWORD);
 WINBASEAPI BOOL        WINAPI GetProcessWorkingSetSize(HANDLE,PSIZE_T,PSIZE_T);
+WINBASEAPI BOOL        WINAPI GetProcessWorkingSetSizeEx(HANDLE,SIZE_T*,SIZE_T*,DWORD*);
 WINBASEAPI BOOL        WINAPI GetProductInfo(DWORD,DWORD,DWORD,DWORD,PDWORD);
 WINBASEAPI UINT        WINAPI GetProfileIntA(LPCSTR,LPCSTR,INT);
 WINBASEAPI UINT        WINAPI GetProfileIntW(LPCWSTR,LPCWSTR,INT);