[KERNEL32]: While working on the CMAKE branch, Amine and myself discovered a rather serious issue in kernel32 (and perhaps other libraries as well). Unlike rbuild, CMake does not allow you to export non-existant DLL functions (try it: add "poopyhead" in kernel32's exports under RBuild, and will it export "poopyhead", God knowing what that will actually link to).

As an additional feature on top of the "allow non-existing functions to be exported" "feature", because rbuild generates and links STDCALL function names without the proper decoration (vs. enforcing decoration at linking, but only removing it at export-time), this allows the definition (as an export) of a STDCALL function that is completely different from the actual function itself.
            For example, the 5-parameter Foo function is normally Foo@20, while the 3-parameter Foo function woudl be Foo@12. Linking one against the other would fail (say, 2 parameters were added to Foo in a newer version). However, under RBUILD, both of these would appear as "Foo", and the linker/compiler would happilly connect the caller of Foo@3 (that has pushed 3 parameters) to the receiving side of Foo@5 (that is about to pop 5 parameters).
            Even -if- decorations WERE to be applied, Foo@12 would STILL succeed, because of the first feature, which would enable the export of Foo@12 even though no such function exist.
            In a further, bizare, twist of fate, the behavior of this RBUILD "feature", when the target function is not found, is to link the exported DLL TO ITSELF.
            Therefore, one can see how, previously to this patch, kernel32.dll would import a dozen functions from itself (all the non-existing functions).
            To really seal the deal, the behavior of exported functions used by kernel32, but that are actually forwarded to another DLL deserves a special mention.
            GetLastError, for example, merely forwards to RtlGetLastWin32Error, so it is normal behavior to use a #define in the C code so that all internal calls to the function are routed correctly.
            This did not happen, so instead, kernel32 tried importing/linking/exporting GetLastError, but this symbol is not found in the binary, because it is only a forwarder.
            This caused kernel32 to import from itself (the behavior when an exported symbol is not found). When importing from itself, the loader would now find the _forwarded_ for GetLastError, and correctly link with ntdll.
            What should be a one-liner of assembly (inline TEB access) thus became a triple-call indirection (GetLastError@0->StubLastError@0->__impGetLastError@0->__impRtlGetLastWin32Error->RtlGetLastWin32Error.
            While analyzing these issues, we also realized a strange macro SetLastErrorByStatus that manually tried to perform what there already exists a function for: RtlSetLastNtStatusFromWin32Error.
	    And, in an exciting coda, we also realized that our Server 2003 Kernel32 exports more than a dozen Windows 95 APIs, through an auto-stub generation mechanism within winebuild, that gets linked as an object behind the scenes.
[KERNEL32]: Removed all Win95 exports, cleaned up exports.
[KERNEL32]: Fixed up set/get error macros by making them inline and/or calling the correct ntdll function.
[KERNEL32]: Removed bizare calls to Wine-internal/specific APIs from our core Win32 DLL.
[KERNEL32]: Wrote stubs for all functions which should be exported, and set the correct number of parameters for them.
[KERNEL32]: Kernel32 is smaller, loads faster, does not export Windows 95 functions, does not export non-existing functions, and does not import from itself anymore.
Note: This is one of the many failings of RBUILD the CMAKE system has helped us discover. I believe these issues are serious enough to warrant an immediate sync with trunk, but rest assured, there are many more completely broken, infinitely-regressing things that we discovered while switching to CMAKE.


svn path=/trunk/; revision=48475

reactos/dll/win32/kernel32/file/backup.c

@@ -11,9 +11,8 @@
 /* INCLUDES *****************************************************************/
 
 #include <k32.h>
-#include <wine/debug.h>
+#define NDEBUG
-
+#include <debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
 
 /* FUNCTIONS ****************************************************************/
 

reactos/dll/win32/kernel32/file/bintype.c

@@ -13,9 +13,8 @@
 /* INCLUDES *****************************************************************/
 
 #include <k32.h>
-#include <wine/debug.h>
+#define NDEBUG
-
+#include <debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
 
 /* FUNCTIONS ****************************************************************/
 

reactos/dll/win32/kernel32/file/cnotify.c

@@ -10,9 +10,8 @@
  */
 
 #include <k32.h>
-#include <wine/debug.h>
+#define NDEBUG
-
+#include <debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
 
 /*
  * @implemented

reactos/dll/win32/kernel32/file/copy.c

@@ -13,9 +13,8 @@
 /* INCLUDES ****************************************************************/
 
 #include <k32.h>
-#include <wine/debug.h>
+#define NDEBUG
-
+#include <debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
 
 /* FUNCTIONS ****************************************************************/
 

reactos/dll/win32/kernel32/file/create.c

@@ -15,9 +15,8 @@
 /* INCLUDES *****************************************************************/
 
 #include <k32.h>
-#include <wine/debug.h>
+#define NDEBUG
-
+#include <debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
 
 #define SYMLINK_FLAG_RELATIVE   1
 

reactos/dll/win32/kernel32/file/curdir.c

@@ -17,9 +17,8 @@
 /* INCLUDES ******************************************************************/
 
 #include <k32.h>
-#include <wine/debug.h>
+#define NDEBUG
-
+#include <debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
 
 /* GLOBAL VARIABLES **********************************************************/
 

reactos/dll/win32/kernel32/file/delete.c

@@ -12,9 +12,8 @@
 /* INCLUDES ****************************************************************/
 
 #include <k32.h>
-#include <wine/debug.h>
+#define NDEBUG
-
+#include <reactos/debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
 
 /* FUNCTIONS ****************************************************************/
 

reactos/dll/win32/kernel32/file/dir.c

@@ -16,9 +16,8 @@
 /* INCLUDES ******************************************************************/
 
 #include <k32.h>
-#include <wine/debug.h>
+#define NDEBUG
-
+#include <debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
 
 UNICODE_STRING DllDirectory = {0, 0, NULL};
 

reactos/dll/win32/kernel32/file/dosdev.c

@@ -12,9 +12,8 @@
 /* INCLUDES ******************************************************************/
 
 #include <k32.h>
-#include <wine/debug.h>
+#define NDEBUG
-
+#include <debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
 
 /* FUNCTIONS *****************************************************************/
 

reactos/dll/win32/kernel32/file/file.c

@@ -13,9 +13,8 @@
 /* INCLUDES *****************************************************************/
 
 #include <k32.h>
-#include <wine/debug.h>
+#define NDEBUG
-
+#include <debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
 
 /* GLOBALS ******************************************************************/
 

reactos/dll/win32/kernel32/file/find.c

@@ -12,9 +12,8 @@
 /* INCLUDES *****************************************************************/
 
 #include <k32.h>
-#include <wine/debug.h>
+#define NDEBUG
-
+#include <debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
 
 /* TYPES ********************************************************************/
 

reactos/dll/win32/kernel32/file/hardlink.c

@@ -12,9 +12,8 @@
 /* INCLUDES *****************************************************************/
 
 #include <k32.h>
-#include <wine/debug.h>
+#define NDEBUG
-
+#include <debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
 
 /* FUNCTIONS ****************************************************************/
 

reactos/dll/win32/kernel32/file/iocompl.c

@@ -10,14 +10,13 @@
  */
 
 #include <k32.h>
-#include <wine/debug.h>
+#define NDEBUG
+#include <debug.h>
 
 #define NANOS_TO_100NS(nanos) (((LONGLONG)(nanos)) / 100)
 #define MICROS_TO_100NS(micros) (((LONGLONG)(micros)) * NANOS_TO_100NS(1000))
 #define MILLIS_TO_100NS(milli) (((LONGLONG)(milli)) * MICROS_TO_100NS(1000))
 
-WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
-
 /*
  * @implemented
  */

reactos/dll/win32/kernel32/file/lfile.c

@@ -10,9 +10,8 @@
  */
 
 #include <k32.h>
-#include <wine/debug.h>
+#define NDEBUG
-
+#include <debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
 
 /*
  * @implemented

reactos/dll/win32/kernel32/file/lock.c

@@ -14,9 +14,8 @@
 /* INCLUDES ****************************************************************/
 
 #include <k32.h>
-#include <wine/debug.h>
+#define NDEBUG
-
+#include <debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
 
 /* FUNCTIONS ****************************************************************/
 

reactos/dll/win32/kernel32/file/mailslot.c

@@ -11,9 +11,8 @@
 /* INCLUDES *****************************************************************/
 
 #include <k32.h>
-#include <wine/debug.h>
+#define NDEBUG
-
+#include <debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
 
 /* FUNCTIONS ****************************************************************/
 

reactos/dll/win32/kernel32/file/move.c

@@ -17,9 +17,8 @@
 
 #include <k32.h>
 #include <malloc.h>
-#include <wine/debug.h>
+#define NDEBUG
-
+#include <debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
 
 /* GLOBALS *****************************************************************/
 

reactos/dll/win32/kernel32/file/npipe.c

@@ -10,9 +10,8 @@
 /* INCLUDES *****************************************************************/
 
 #include <k32.h>
-#include <wine/debug.h>
+#define NDEBUG
-
+#include <debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
 
 //#define USING_PROPER_NPFS_WAIT_SEMANTICS
 

reactos/dll/win32/kernel32/file/pipe.c

@@ -11,9 +11,8 @@
 /* INCLUDES *****************************************************************/
 
 #include <k32.h>
-#include <wine/debug.h>
+#define NDEBUG
-
+#include <debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
 
 /* GLOBALS ******************************************************************/
 

reactos/dll/win32/kernel32/file/rw.c

@@ -12,9 +12,8 @@
 /* INCLUDES ****************************************************************/
 
 #include <k32.h>
-#include <wine/debug.h>
+#define NDEBUG
-
+#include <debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
 
 /* FUNCTIONS ****************************************************************/
 

reactos/dll/win32/kernel32/file/tape.c

@@ -12,9 +12,8 @@
 /* INCLUDES *****************************************************************/
 
 #include <k32.h>
-#include <wine/debug.h>
+#define NDEBUG
-
+#include <debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
 
 /* FUNCTIONS ****************************************************************/
 

reactos/dll/win32/kernel32/file/volume.c

@@ -20,9 +20,8 @@
  */
 
 #include <k32.h>
-#include <wine/debug.h>
+#define NDEBUG
-
+#include <debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(kernel32file);
 
 #define MAX_DOS_DRIVES 26
 

reactos/dll/win32/kernel32/include/kernel32.h

@@ -1,5 +1,15 @@
 #pragma once
 
+#define TRACE       DPRINT
+#define WARN        DPRINT1
+#define FIXME       DPRINT1
+#define ERR         DPRINT1
+#define debugstr_a  
+#define debugstr_w
+#define wine_dbgstr_w  
+#define debugstr_guid
+
+#include "wine/unicode.h"
 #include "baseheap.h"
 
 #define BINARY_UNKNOWN	(0)
@@ -40,8 +50,9 @@
 /* Undocumented CreateProcess flag */
 #define STARTF_SHELLPRIVATE         0x400
   
-#define SetLastErrorByStatus(__S__) \
+#define SetLastErrorByStatus(x) RtlSetLastWin32ErrorAndNtStatusFromNtStatus((x))
- ((void)SetLastError(RtlNtStatusToDosError(__S__)))
+#define GetLastError()          NtCurrentTeb()->LastErrorValue
+#define SetLastError(x)         NtCurrentTeb()->LastErrorValue = (x)
 
 typedef struct _CODEPAGE_ENTRY
 {
@@ -100,6 +111,7 @@ DWORD FilenameU2A_FitOrFail(LPSTR  DestA, INT destLen, PUNICODE_STRING SourceU);
 #define HeapAlloc RtlAllocateHeap
 #define HeapReAlloc RtlReAllocateHeap
 #define HeapFree RtlFreeHeap
+#define _lread  (_readfun)_hread
 
 POBJECT_ATTRIBUTES
 WINAPI

reactos/dll/win32/kernel32/kernel32.def

@@ -0,0 +1,997 @@
+LIBRARY kernel32.dll
+
+EXPORTS
+AcquireSRWLockExclusive@4=ntdll.RtlAcquireSRWLockExclusive
+AcquireSRWLockShared@4=ntdll.RtlAcquireSRWLockShared
+ActivateActCtx@8
+AddAtomA@4
+AddAtomW@4
+AddConsoleAliasA@12
+AddConsoleAliasW@12
+AddLocalAlternateComputerNameA@8
+AddLocalAlternateComputerNameW@8
+AddRefActCtx@4
+AddVectoredContinueHandler@8=ntdll.RtlAddVectoredContinueHandler
+AddVectoredExceptionHandler@8=ntdll.RtlAddVectoredExceptionHandler
+AllocConsole@0
+AllocateUserPhysicalPages@12
+AreFileApisANSI@0
+AssignProcessToJobObject@8
+AttachConsole@4
+BackupRead@28
+BackupSeek@24
+BackupWrite@28
+BaseCheckAppcompatCache@16
+BaseCheckRunApp@40
+BaseCleanupAppcompatCache@0
+BaseCleanupAppcompatCacheSupport@4
+BaseDumpAppcompatCache@0
+BaseFlushAppcompatCache@0
+BaseInitAppcompatCache@0
+BaseInitAppcompatCacheSupport@0
+BaseProcessInitPostImport@0
+BaseQueryModuleData@20
+BaseUpdateAppcompatCache@12
+BasepCheckWinSaferRestrictions@24
+Beep@8
+BeginUpdateResourceA@8
+BeginUpdateResourceW@8
+BindIoCompletionCallback@12
+BuildCommDCBA@8
+BuildCommDCBAndTimeoutsA@12
+BuildCommDCBAndTimeoutsW@12
+BuildCommDCBW@8
+CallNamedPipeA@28
+CallNamedPipeW@28
+CancelDeviceWakeupRequest@4
+CancelIo@4
+CancelIoEx@8
+CancelSynchronousIo@4
+CancelTimerQueueTimer@8
+CancelWaitableTimer@4
+ChangeTimerQueueTimer@16
+CheckNameLegalDOS8Dot3A@20
+CheckNameLegalDOS8Dot3W@20
+CheckRemoteDebuggerPresent@8
+ClearCommBreak@4
+ClearCommError@12
+CloseConsoleHandle@4
+CloseHandle@4
+CloseProfileUserMapping@0
+CmdBatNotification@4
+CommConfigDialogA@12
+CommConfigDialogW@12
+CompareFileTime@8
+CompareStringA@24
+CompareStringW@24
+ConnectNamedPipe@8
+ConsoleMenuControl@12
+ContinueDebugEvent@12
+ConvertDefaultLocale@4
+ConvertFiberToThread@0
+ConvertThreadToFiber@4
+ConvertThreadToFiberEx@8
+CopyFileA@12
+CopyFileExA@24
+CopyFileExW@24
+CopyFileW@12
+CopyLZFile@8=LZCopy@8
+CreateActCtxA@4
+CreateActCtxW@4
+CreateConsoleScreenBuffer@20
+CreateDirectoryA@8
+CreateDirectoryExA@12
+CreateDirectoryExW@12
+CreateDirectoryW@8
+CreateEventA@16
+CreateEventExA@16
+CreateEventExW@16
+CreateEventW@16
+CreateFiber@12
+CreateFiberEx@20
+CreateFileA@28
+CreateFileMappingA@24
+CreateFileMappingW@24
+CreateFileW@28
+CreateHardLinkA@12
+CreateHardLinkW@12
+CreateIoCompletionPort@16
+CreateJobObjectA@8
+CreateJobObjectW@8
+CreateJobSet@12
+CreateMailslotA@16
+CreateMailslotW@16
+CreateMemoryResourceNotification@4
+CreateMutexA@12
+CreateMutexExA@16
+CreateMutexExW@16
+CreateMutexW@12
+CreateNamedPipeA@32
+CreateNamedPipeW@32
+CreateNlsSecurityDescriptor@12
+CreatePipe@16
+CreateProcessA@40
+CreateProcessInternalA@48
+CreateProcessInternalW@48
+CreateProcessInternalWSecure@0
+CreateProcessW@40
+CreateRemoteThread@28
+CreateSemaphoreA@16
+CreateSemaphoreExA@24
+CreateSemaphoreExW@24
+CreateSemaphoreW@16
+CreateSocketHandle@0
+CreateSymbolicLinkA@12
+CreateSymbolicLinkW@12
+CreateTapePartition@16
+CreateThread@24
+CreateTimerQueue@0
+CreateTimerQueueTimer@28
+CreateToolhelp32Snapshot@8
+CreateVirtualBuffer@12
+CreateWaitableTimerA@12
+CreateWaitableTimerExA@16
+CreateWaitableTimerExW@16
+CreateWaitableTimerW@12
+DeactivateActCtx@8
+DebugActiveProcess@4
+DebugActiveProcessStop@4
+DebugBreak@0=ntdll.DbgBreakPoint
+DebugBreakProcess@4
+DebugSetProcessKillOnExit@4
+DecodePointer@4=ntdll.RtlDecodePointer
+DecodeSystemPointer@4=ntdll.RtlDecodeSystemPointer
+DefineDosDeviceA@12
+DefineDosDeviceW@12
+DelayLoadFailureHook@8
+DeleteAtom@4
+DeleteCriticalSection@4=ntdll.RtlDeleteCriticalSection
+DeleteFiber@4
+DeleteFileA@4
+DeleteFileW@4
+DeleteTimerQueue@4
+DeleteTimerQueueEx@8
+DeleteTimerQueueTimer@12
+DeleteVolumeMountPointA@4
+DeleteVolumeMountPointW@4
+DeviceIoControl@32
+DisableThreadLibraryCalls@4
+DisconnectNamedPipe@4
+DnsHostnameToComputerNameA@12
+DnsHostnameToComputerNameW@12
+DosDateTimeToFileTime@12
+DosPathToSessionPathA@12
+DosPathToSessionPathW@12
+DuplicateConsoleHandle@16
+DuplicateHandle@28
+EncodePointer@4=ntdll.RtlEncodePointer
+EncodeSystemPointer@4=ntdll.RtlEncodeSystemPointer
+EndUpdateResourceA@8
+EndUpdateResourceW@8
+EnterCriticalSection@4=ntdll.RtlEnterCriticalSection
+EnumCalendarInfoA@16
+EnumCalendarInfoExA@16
+EnumCalendarInfoExW@16
+EnumCalendarInfoW@16
+EnumDateFormatsA@12
+EnumDateFormatsExA@12
+EnumDateFormatsExW@12
+EnumDateFormatsW@12
+EnumLanguageGroupLocalesA@16
+EnumLanguageGroupLocalesW@16
+EnumResourceLanguagesA@20
+EnumResourceLanguagesW@20
+EnumResourceNamesA@16
+EnumResourceNamesW@16
+EnumResourceTypesA@12
+EnumResourceTypesW@12
+EnumSystemCodePagesA@8
+EnumSystemCodePagesW@8
+EnumSystemGeoID@12
+EnumSystemLanguageGroupsA@12
+EnumSystemLanguageGroupsW@12
+EnumSystemLocalesA@8
+EnumSystemLocalesW@8
+EnumTimeFormatsA@12
+EnumTimeFormatsW@12
+EnumUILanguagesA@12
+EnumUILanguagesW@12
+EnumerateLocalComputerNamesA@16
+EnumerateLocalComputerNamesW@16
+EraseTape@12
+EscapeCommFunction@8
+ExitProcess@4
+ExitThread@4
+ExitVDM@8
+ExpandEnvironmentStringsA@12
+ExpandEnvironmentStringsW@12
+ExpungeConsoleCommandHistoryA@4
+ExpungeConsoleCommandHistoryW@4
+ExtendVirtualBuffer@8
+FatalAppExitA@8
+FatalAppExitW@8
+FatalExit@4
+FileTimeToDosDateTime@12
+FileTimeToLocalFileTime@8
+FileTimeToSystemTime@8
+FillConsoleOutputAttribute@20
+FillConsoleOutputCharacterA@20
+FillConsoleOutputCharacterW@20
+FindActCtxSectionGuid@20
+FindActCtxSectionStringA@20
+FindActCtxSectionStringW@20
+FindAtomA@4
+FindAtomW@4
+FindClose@4
+FindCloseChangeNotification@4
+FindFirstChangeNotificationA@12
+FindFirstChangeNotificationW@12
+FindFirstFileA@8
+FindFirstFileExA@24
+FindFirstFileExW@24
+FindFirstFileW@8
+FindFirstStreamW@16
+FindFirstVolumeA@8
+FindFirstVolumeMountPointA@12
+FindFirstVolumeMountPointW@12
+FindFirstVolumeW@8
+FindNextChangeNotification@4
+FindNextFileA@8
+FindNextFileW@8
+FindNextVolumeA@12
+FindNextVolumeMountPointA@12
+FindNextVolumeMountPointW@12
+FindNextVolumeW@12
+FindResourceA@12
+FindResourceExA@16
+FindResourceExW@16
+FindResourceW@12
+FindVolumeClose@4
+FindVolumeMountPointClose@4
+FlushConsoleInputBuffer@4
+FlushFileBuffers@4
+FlushInstructionCache@12
+FlushViewOfFile@8
+FoldStringA@20
+FoldStringW@20
+FormatMessageA@28
+FormatMessageW@28
+FreeConsole@0
+FreeEnvironmentStringsA@4
+FreeEnvironmentStringsW@4
+FreeLibrary@4
+FreeLibraryAndExitThread@8
+FreeResource@4
+FreeUserPhysicalPages@12
+FreeVirtualBuffer@4
+GenerateConsoleCtrlEvent@8
+GetACP@0
+GetAtomNameA@12
+GetAtomNameW@12
+GetBinaryType@8=GetBinaryTypeA@8
+GetBinaryTypeA@8
+GetBinaryTypeW@8
+GetCPFileNameFromRegistry@12
+GetCPInfo@8
+GetCPInfoExA@12
+GetCPInfoExW@12
+GetCalendarInfoA@24
+GetCalendarInfoW@24
+GetComPlusPackageInstallStatus@0
+GetCommConfig@12
+GetCommMask@8
+GetCommModemStatus@8
+GetCommProperties@8
+GetCommState@8
+GetCommTimeouts@8
+GetCommandLineA@0
+GetCommandLineW@0
+GetCompressedFileSizeA@8
+GetCompressedFileSizeW@8
+GetComputerNameA@8
+GetComputerNameExA@12
+GetComputerNameExW@12
+GetComputerNameW@8
+GetConsoleAliasA@16
+GetConsoleAliasExesA@8
+GetConsoleAliasExesLengthA@0
+GetConsoleAliasExesLengthW@0
+GetConsoleAliasExesW@8
+GetConsoleAliasW@16
+GetConsoleAliasesA@12
+GetConsoleAliasesLengthA@4
+GetConsoleAliasesLengthW@4
+GetConsoleAliasesW@12
+GetConsoleCP@0
+GetConsoleCharType@12
+GetConsoleCommandHistoryA@12
+GetConsoleCommandHistoryLengthA@4
+GetConsoleCommandHistoryLengthW@4
+GetConsoleCommandHistoryW@12
+GetConsoleCursorInfo@8
+GetConsoleCursorMode@12
+GetConsoleDisplayMode@4
+GetConsoleFontInfo@16
+GetConsoleFontSize@8
+GetConsoleHardwareState@12
+GetConsoleHistoryInfo@4
+GetConsoleInputExeNameA@8
+GetConsoleInputExeNameW@8
+GetConsoleInputWaitHandle@0
+GetConsoleKeyboardLayoutNameA@4
+GetConsoleKeyboardLayoutNameW@4
+GetConsoleMode@8
+GetConsoleNlsMode@8
+GetConsoleOutputCP@0
+GetConsoleProcessList@8
+GetConsoleScreenBufferInfo@8
+GetConsoleSelectionInfo@4
+GetConsoleTitleA@8
+GetConsoleTitleW@8
+GetConsoleWindow@0
+GetCurrencyFormatA@24
+GetCurrencyFormatW@24
+GetCurrentActCtx@4
+GetCurrentConsoleFont@12
+GetCurrentDirectoryA@8
+GetCurrentDirectoryW@8
+GetCurrentProcess@0
+GetCurrentProcessId@0
+GetCurrentProcessorNumber@0=ntdll.RtlGetCurrentProcessorNumber
+GetCurrentThread@0
+GetCurrentThreadId@0
+GetDateFormatA@24
+GetDateFormatW@24
+GetDefaultCommConfigA@12
+GetDefaultCommConfigW@12
+GetDefaultSortkeySize@4
+GetDevicePowerState@8
+GetDiskFreeSpaceA@20
+GetDiskFreeSpaceExA@16
+GetDiskFreeSpaceExW@16
+GetDiskFreeSpaceW@20
+GetDllDirectoryA@8
+GetDllDirectoryW@8
+GetDriveTypeA@4
+GetDriveTypeW@4
+GetEnvironmentStrings@0
+GetEnvironmentStringsA@0=GetEnvironmentStrings@0
+GetEnvironmentStringsW@0
+GetEnvironmentVariableA@12
+GetEnvironmentVariableW@12
+GetErrorMode@0
+GetExitCodeProcess@8
+GetExitCodeThread@8
+GetExpandedNameA@8
+GetExpandedNameW@8
+GetFileAttributesA@4
+GetFileAttributesByHandle@12
+GetFileAttributesExA@12
+GetFileAttributesExW@12
+GetFileAttributesW@4
+GetFileBandwidthReservation@24
+GetFileInformationByHandle@8
+GetFileSize@8
+GetFileSizeEx@8
+GetFileTime@16
+GetFileType@4
+GetFinalPathNameByHandleA@16
+GetFinalPathNameByHandleW@16
+GetFirmwareEnvironmentVariableA@16
+GetFirmwareEnvironmentVariableW@16
+GetFullPathNameA@16
+GetFullPathNameW@16
+GetGeoInfoA@20
+GetGeoInfoW@20
+GetHandleContext@4
+GetHandleInformation@8
+GetLargePageMinimum@0
+GetLargestConsoleWindowSize@4
+GetLastError@0=ntdll.RtlGetLastWin32Error
+GetLinguistLangSize@4
+GetLocalTime@4
+GetLocaleInfoA@16
+GetLocaleInfoEx@16
+GetLocaleInfoW@16
+GetLogicalDriveStringsA@8
+GetLogicalDriveStringsW@8
+GetLogicalDrives@0
+GetLogicalProcessorInformation@8
+GetLongPathNameA@12
+GetLongPathNameW@12
+GetMailslotInfo@20
+GetModuleFileNameA@12
+GetModuleFileNameW@12
+GetModuleHandleA@4
+GetModuleHandleExA@12
+GetModuleHandleExW@12
+GetModuleHandleW@4
+GetNamedPipeHandleStateA@28
+GetNamedPipeHandleStateW@28
+GetNamedPipeInfo@20
+GetNativeSystemInfo@4
+GetNextVDMCommand@4
+GetNlsSectionName@24
+GetNumaAvailableMemory@12
+GetNumaAvailableMemoryNode@8
+GetNumaHighestNodeNumber@4
+GetNumaNodeProcessorMask@8
+GetNumaProcessorMap@12
+GetNumaProcessorNode@8
+GetNumberFormatA@24
+GetNumberFormatW@24
+GetNumberOfConsoleFonts@0
+GetNumberOfConsoleInputEvents@8
+GetNumberOfConsoleMouseButtons@4
+GetOEMCP@0
+GetOverlappedResult@16
+GetPriorityClass@4
+GetPrivateProfileIntA@16
+GetPrivateProfileIntW@16
+GetPrivateProfileSectionA@16
+GetPrivateProfileSectionNamesA@12
+GetPrivateProfileSectionNamesW@12
+GetPrivateProfileSectionW@16
+GetPrivateProfileStringA@24
+GetPrivateProfileStringW@24
+GetPrivateProfileStructA@20
+GetPrivateProfileStructW@20
+GetProcAddress@8
+GetProcessAffinityMask@12
+GetProcessHandleCount@8
+GetProcessHeap@0
+GetProcessHeaps@8
+GetProcessId@4
+GetProcessIoCounters@8
+GetProcessPriorityBoost@8
+GetProcessShutdownParameters@8
+GetProcessTimes@20
+GetProcessVersion@4
+GetProcessWorkingSetSize@12
+GetProfileIntA@12
+GetProfileIntW@12
+GetProfileSectionA@12
+GetProfileSectionW@12
+GetProfileStringA@20
+GetProfileStringW@20
+GetQueuedCompletionStatus@20
+GetShortPathNameA@12
+GetShortPathNameW@12
+GetStartupInfoA@4
+GetStartupInfoW@4
+GetStdHandle@4
+GetStringTypeA@20
+GetStringTypeExA@20
+GetStringTypeExW@20
+GetStringTypeW@16
+GetSystemDefaultLCID@0
+GetSystemDefaultLangID@0
+GetSystemDefaultUILanguage@0
+GetSystemDirectoryA@8
+GetSystemDirectoryW@8
+GetSystemInfo@4
+GetSystemPowerStatus@4
+GetSystemRegistryQuota@8
+GetSystemTime@4
+GetSystemTimeAdjustment@12
+GetSystemTimeAsFileTime@4
+GetSystemTimes@12
+GetSystemWindowsDirectoryA@8
+GetSystemWindowsDirectoryW@8
+GetSystemWow64DirectoryA@8
+GetSystemWow64DirectoryW@8
+GetTapeParameters@16
+GetTapePosition@20
+GetTapeStatus@4
+GetTempFileNameA@16
+GetTempFileNameW@16
+GetTempPathA@8
+GetTempPathW@8
+GetThreadContext@8
+GetThreadIOPendingFlag@8
+GetThreadId@4
+GetThreadLocale@0
+GetThreadPriority@4
+GetThreadPriorityBoost@8
+GetThreadSelectorEntry@12
+GetThreadTimes@20
+GetTickCount@0
+GetTickCount64@0
+GetTimeFormatA@24
+GetTimeFormatW@24
+GetTimeZoneInformation@4
+GetUserDefaultLCID@0
+GetUserDefaultLangID@0
+GetUserDefaultUILanguage@0
+GetUserGeoID@4
+GetVDMCurrentDirectories@8
+GetVersion@0
+GetVersionExA@4
+GetVersionExW@4
+GetVolumeInformationA@32
+GetVolumeInformationW@32
+GetVolumeNameForVolumeMountPointA@12
+GetVolumeNameForVolumeMountPointW@12
+GetVolumePathNameA@12
+GetVolumePathNameW@12
+GetVolumePathNamesForVolumeNameA@16
+GetVolumePathNamesForVolumeNameW@16
+GetWindowsDirectoryA@8
+GetWindowsDirectoryW@8
+GetWriteWatch@24
+GlobalAddAtomA@4
+GlobalAddAtomW@4
+GlobalAlloc@8
+GlobalCompact@4
+GlobalDeleteAtom@4
+GlobalFindAtomA@4
+GlobalFindAtomW@4
+GlobalFix@4
+GlobalFlags@4
+GlobalFree@4
+GlobalGetAtomNameA@12
+GlobalGetAtomNameW@12
+GlobalHandle@4
+GlobalLock@4
+GlobalMemoryStatus@4
+GlobalMemoryStatusEx@4
+GlobalReAlloc@12
+GlobalSize@4
+GlobalUnWire@4
+GlobalUnfix@4
+GlobalUnlock@4
+GlobalWire@4
+Heap32First@12
+Heap32ListFirst@8
+Heap32ListNext@8
+Heap32Next@4
+HeapAlloc@12=ntdll.RtlAllocateHeap
+HeapCompact@8
+HeapCreate@12
+HeapCreateTagsW@16
+HeapDestroy@4
+HeapExtend@16
+HeapFree@12=ntdll.RtlFreeHeap
+HeapLock@4
+HeapQueryInformation@20
+HeapQueryTagW@20
+HeapReAlloc@16=ntdll.RtlReAllocateHeap
+HeapSetInformation@16
+HeapSize@12=ntdll.RtlSizeHeap
+HeapSummary@12
+HeapUnlock@4
+HeapUsage@20
+HeapValidate@12
+HeapWalk@8
+InitAtomTable@4
+InitializeCriticalSection@4
+InitializeCriticalSectionAndSpinCount@8
+InitializeCriticalSectionEx@12
+InitializeSListHead@4=ntdll.RtlInitializeSListHead
+InitializeSRWLock@4=ntdll.RtlInitializeSRWLock
+InterlockedCompareExchange@12
+InterlockedCompareExchange64@20=ntdll.RtlInterlockedCompareExchange64
+InterlockedDecrement@4
+InterlockedExchange@8
+InterlockedExchangeAdd@8
+InterlockedFlushSList@4=ntdll.RtlInterlockedFlushSList
+InterlockedIncrement@4
+InterlockedPopEntrySList@4=ntdll.RtlInterlockedPopEntrySList
+InterlockedPushEntrySList@8=ntdll.RtlInterlockedPushEntrySList
+InvalidateConsoleDIBits@8
+IsBadCodePtr@4
+IsBadHugeReadPtr@8
+IsBadHugeWritePtr@8
+IsBadReadPtr@8
+IsBadStringPtrA@8
+IsBadStringPtrW@8
+IsBadWritePtr@8
+IsDBCSLeadByte@4
+IsDBCSLeadByteEx@8
+IsDebuggerPresent@0
+IsProcessInJob@12
+IsProcessorFeaturePresent@4
+IsSystemResumeAutomatic@0
+IsThreadAFiber@0
+IsValidCodePage@4
+IsValidLanguageGroup@8
+IsValidLocale@8
+IsValidUILanguage@4
+IsWow64Process@8
+LCIDToLocaleName@16
+LCMapStringA@24
+LCMapStringW@24
+LZClose@4
+LZCopy@8
+LZDone@0
+LZInit@4
+LZOpenFileA@12
+LZOpenFileW@12
+LZRead@12
+LZSeek@12
+LZStart@0
+LeaveCriticalSection@4=ntdll.RtlLeaveCriticalSection
+LoadLibraryA@4
+LoadLibraryExA@12
+LoadLibraryExW@12
+LoadLibraryW@4
+LoadModule@8
+LoadResource@8
+LocalAlloc@8
+LocalCompact@4
+LocalFileTimeToFileTime@8
+LocalFlags@4
+LocalFree@4
+LocalHandle@4
+LocalLock@4
+LocalReAlloc@12
+LocalShrink@8
+LocalSize@4
+LocalUnlock@4
+LockFile@20
+LockFileEx@24
+LockResource@4
+MapUserPhysicalPages@12
+MapUserPhysicalPagesScatter@12
+MapViewOfFile@20
+MapViewOfFileEx@24
+Module32First@8
+Module32FirstW@8
+Module32Next@8
+Module32NextW@8
+MoveFileA@8
+MoveFileExA@12
+MoveFileExW@12
+MoveFileW@8
+MoveFileWithProgressA@20
+MoveFileWithProgressW@20
+MulDiv@12
+MultiByteToWideChar@24
+NeedCurrentDirectoryForExePathA@4
+NeedCurrentDirectoryForExePathW@4
+NlsConvertIntegerToString@20
+NlsGetCacheUpdateCount@0
+NumaVirtualQueryNode@16
+OpenConsoleW@16
+OpenDataFile@8
+OpenEventA@12
+OpenEventW@12
+OpenFile@12
+OpenFileMappingA@12
+OpenFileMappingW@12
+OpenJobObjectA@12
+OpenJobObjectW@12
+OpenMutexA@12
+OpenMutexW@12
+OpenProcess@12
+OpenProfileUserMapping@0
+OpenSemaphoreA@12
+OpenSemaphoreW@12
+OpenThread@12
+OpenWaitableTimerA@12
+OpenWaitableTimerW@12
+OutputDebugStringA@4
+OutputDebugStringW@4
+PeekConsoleInputA@16
+PeekConsoleInputW@16
+PeekNamedPipe@24
+PostQueuedCompletionStatus@16
+PrepareTape@12
+PrivCopyFileExW@24
+PrivMoveFileIdentityW@12
+Process32First@8
+Process32FirstW@8
+Process32Next@8
+Process32NextW@8
+ProcessIdToSessionId@8
+PulseEvent@4
+PurgeComm@8
+QueryActCtxW@28
+QueryDepthSList@4=ntdll.RtlQueryDepthSList
+QueryDosDeviceA@12
+QueryDosDeviceW@12
+QueryFullProcessImageNameA@16
+QueryFullProcessImageNameW@16
+QueryInformationJobObject@20
+QueryMemoryResourceNotification@8
+QueryPerformanceCounter@4
+QueryPerformanceFrequency@4
+QueryWin31IniFilesMappedToRegistry@16
+QueueUserAPC@12
+QueueUserWorkItem@12
+RaiseException@16
+ReOpenFile@16
+ReadConsoleA@20
+ReadConsoleInputA@16
+ReadConsoleInputExA@20
+ReadConsoleInputExW@20
+ReadConsoleInputW@16
+ReadConsoleOutputA@20
+ReadConsoleOutputAttribute@20
+ReadConsoleOutputCharacterA@20
+ReadConsoleOutputCharacterW@20
+ReadConsoleOutputW@20
+ReadConsoleW@20
+ReadDirectoryChangesW@32
+ReadFile@20
+ReadFileEx@20
+ReadFileScatter@20
+ReadProcessMemory@20
+RegisterApplicationRestart@8
+RegisterConsoleIME@8
+RegisterConsoleOS2@4
+RegisterConsoleVDM@44
+RegisterWaitForInputIdle@4
+RegisterWaitForSingleObject@24
+RegisterWaitForSingleObjectEx@20
+RegisterWowBaseHandlers@4
+RegisterWowExec@4
+ReleaseActCtx@4
+ReleaseMutex@4
+ReleaseSRWLockExclusive@4=ntdll.RtlReleaseSRWLockExclusive
+ReleaseSRWLockShared@4=ntdll.RtlReleaseSRWLockShared
+ReleaseSemaphore@12
+RemoveDirectoryA@4
+RemoveDirectoryW@4
+RemoveLocalAlternateComputerNameA@8
+RemoveLocalAlternateComputerNameW@8
+RemoveVectoredContinueHandler@4=ntdll.RtlRemoveVectoredContinueHandler
+RemoveVectoredExceptionHandler@4=ntdll.RtlRemoveVectoredExceptionHandler
+ReplaceFile@24=ReplaceFileW@24
+ReplaceFileA@24
+ReplaceFileW@24
+RequestDeviceWakeup@4
+RequestWakeupLatency@4
+ResetEvent@4
+ResetWriteWatch@8
+RestoreLastError@4=ntdll.RtlRestoreLastWin32Error
+ResumeThread@4
+RtlCaptureContext@4=ntdll.RtlCaptureContext
+RtlCaptureStackBackTrace@16=ntdll.RtlCaptureStackBackTrace
+RtlFillMemory@12=ntdll.RtlFillMemory
+RtlMoveMemory@12=ntdll.RtlMoveMemory
+RtlUnwind@16=ntdll.RtlUnwind
+RtlZeroMemory@8=ntdll.RtlZeroMemory
+ScrollConsoleScreenBufferA@20
+ScrollConsoleScreenBufferW@20
+SearchPathA@24
+SearchPathW@24
+SetCPGlobal@4
+SetCalendarInfoA@16
+SetCalendarInfoW@16
+SetClientTimeZoneInformation@4
+SetComPlusPackageInstallStatus@4
+SetCommBreak@4
+SetCommConfig@12
+SetCommMask@8
+SetCommState@8
+SetCommTimeouts@8
+SetComputerNameA@4
+SetComputerNameExA@8
+SetComputerNameExW@8
+SetComputerNameW@4
+SetConsoleActiveScreenBuffer@4
+SetConsoleCP@4
+SetConsoleCommandHistoryMode@4
+SetConsoleCtrlHandler@8
+SetConsoleCursor@8
+SetConsoleCursorInfo@8
+SetConsoleCursorMode@12
+SetConsoleCursorPosition@8
+SetConsoleDisplayMode@12
+SetConsoleFont@8
+SetConsoleHardwareState@12
+SetConsoleHistoryInfo@4
+SetConsoleIcon@4
+SetConsoleInputExeNameA@4
+SetConsoleInputExeNameW@4
+SetConsoleKeyShortcuts@16
+SetConsoleLocalEUDC@16
+SetConsoleMaximumWindowSize@8
+SetConsoleMenuClose@4
+SetConsoleMode@8
+SetConsoleNlsMode@8
+SetConsoleNumberOfCommandsA@8
+SetConsoleNumberOfCommandsW@8
+SetConsoleOS2OemFormat@4
+SetConsoleOutputCP@4
+SetConsolePalette@12
+SetConsoleScreenBufferSize@8
+SetConsoleTextAttribute@8
+SetConsoleTitleA@4
+SetConsoleTitleW@4
+SetConsoleWindowInfo@12
+SetCriticalSectionSpinCount@8=ntdll.RtlSetCriticalSectionSpinCount
+SetCurrentDirectoryA@4
+SetCurrentDirectoryW@4
+SetDefaultCommConfigA@12
+SetDefaultCommConfigW@12
+SetDllDirectoryA@4
+SetDllDirectoryW@4
+SetEndOfFile@4
+SetEnvironmentVariableA@8
+SetEnvironmentVariableW@8
+SetErrorMode@4
+SetEvent@4
+SetFileApisToANSI@0
+SetFileApisToOEM@0
+SetFileAttributesA@8
+SetFileAttributesW@8
+SetFilePointer@16
+SetFilePointerEx@20
+SetFileShortNameA@8
+SetFileShortNameW@8
+SetFileTime@16
+SetFileValidData@12
+SetFirmwareEnvironmentVariableA@16
+SetFirmwareEnvironmentVariableW@16
+SetHandleContext@8
+SetHandleCount@4
+SetHandleInformation@12
+SetInformationJobObject@16
+SetLastConsoleEventActive@0
+SetLastError@4=ntdll.RtlSetLastWin32Error
+SetLocalPrimaryComputerNameA@8
+SetLocalPrimaryComputerNameW@8
+SetLocalTime@4
+SetLocaleInfoA@12
+SetLocaleInfoW@12
+SetMailslotInfo@8
+SetMessageWaitingIndicator@8
+SetNamedPipeHandleState@16
+SetPriorityClass@8
+SetProcessAffinityMask@8
+SetProcessPriorityBoost@8
+SetProcessShutdownParameters@8
+SetProcessWorkingSetSize@12
+SetStdHandle@8
+SetSystemPowerState@8
+SetSystemTime@4
+SetSystemTimeAdjustment@8
+SetTapeParameters@12
+SetTapePosition@24
+SetTermsrvAppInstallMode@4
+SetThreadAffinityMask@8
+SetThreadContext@8
+SetThreadExecutionState@4
+SetThreadIdealProcessor@8
+SetThreadLocale@4
+SetThreadPriority@8
+SetThreadPriorityBoost@8
+SetThreadUILanguage@4
+SetTimeZoneInformation@4
+SetTimerQueueTimer@24
+SetUnhandledExceptionFilter@4
+SetUserGeoID@4
+SetVDMCurrentDirectories@8
+SetVolumeLabelA@8
+SetVolumeLabelW@8
+SetVolumeMountPointA@8
+SetVolumeMountPointW@8
+SetWaitableTimer@24
+SetupComm@12
+ShowConsoleCursor@8
+SignalObjectAndWait@16
+SizeofResource@8
+Sleep@4
+SleepEx@8
+SuspendThread@4
+SwitchToFiber@4
+SwitchToThread@0
+SystemTimeToFileTime@8
+SystemTimeToTzSpecificLocalTime@12
+TerminateJobObject@8
+TerminateProcess@8
+TerminateThread@8
+TermsrvAppInstallMode@0
+Thread32First@8
+Thread32Next@8
+TlsAlloc@0
+TlsFree@4
+TlsGetValue@4
+TlsSetValue@8
+Toolhelp32ReadProcessMemory@20
+TransactNamedPipe@28
+TransmitCommChar@8
+TrimVirtualBuffer@4
+TryEnterCriticalSection@4=ntdll.RtlTryEnterCriticalSection
+TzSpecificLocalTimeToSystemTime@12
+UTRegister@28
+UTUnRegister@4
+UnhandledExceptionFilter@4
+UnlockFile@20
+UnlockFileEx@20
+UnmapViewOfFile@4
+UnregisterConsoleIME@0
+UnregisterWait@4
+UnregisterWaitEx@8
+UpdateResourceA@24
+UpdateResourceW@24
+VDMConsoleOperation@8
+VDMOperationStarted@4
+VerLanguageNameA@12
+VerLanguageNameW@12
+VerSetConditionMask@16=ntdll.VerSetConditionMask
+VerifyConsoleIoHandle@4
+VerifyVersionInfoA@16
+VerifyVersionInfoW@16
+VirtualAlloc@16
+VirtualAllocEx@20
+VirtualBufferExceptionHandler@12
+VirtualFree@12
+VirtualFreeEx@16
+VirtualLock@8
+VirtualProtect@16
+VirtualProtectEx@20
+VirtualQuery@12
+VirtualQueryEx@16
+VirtualUnlock@8
+WaitCommEvent@12
+WaitForDebugEvent@8
+WaitForMultipleObjects@16
+WaitForMultipleObjectsEx@20
+WaitForSingleObject@8
+WaitForSingleObjectEx@12
+WaitNamedPipeA@8
+WaitNamedPipeW@8
+WakeAllConditionVariable@4=ntdll.RtlWakeAllConditionVariable
+WakeConditionVariable@4=ntdll.RtlWakeConditionVariable
+WideCharToMultiByte@32
+WinExec@8
+Wow64DisableWow64FsRedirection@4
+Wow64EnableWow64FsRedirection@4
+Wow64RevertWow64FsRedirection@4
+WriteConsoleA@20
+WriteConsoleInputA@16
+WriteConsoleInputVDMA@16
+WriteConsoleInputVDMW@16
+WriteConsoleInputW@16
+WriteConsoleOutputA@20
+WriteConsoleOutputAttribute@20
+WriteConsoleOutputCharacterA@20
+WriteConsoleOutputCharacterW@20
+WriteConsoleOutputW@20
+WriteConsoleW@20
+WriteFile@20
+WriteFileEx@20
+WriteFileGather@20
+WritePrivateProfileSectionA@12
+WritePrivateProfileSectionW@12
+WritePrivateProfileStringA@16
+WritePrivateProfileStringW@16
+WritePrivateProfileStructA@20
+WritePrivateProfileStructW@20
+WriteProcessMemory@20
+WriteProfileSectionA@8
+WriteProfileSectionW@8
+WriteProfileStringA@12
+WriteProfileStringW@12
+WriteTapemark@16
+WTSGetActiveConsoleSessionId@0
+ZombifyActCtx@4
+_hread@12
+_hwrite@12
+_lclose@4
+_lcreat@8
+_llseek@12
+_lopen@8
+_lread@12=_hread@12
+_lwrite@12=_hwrite@12
+lstrcat@8=lstrcatA@8
+lstrcatA@8
+lstrcatW@8
+lstrcmp@8=lstrcmpA@8
+lstrcmpA@8
+lstrcmpW@8
+lstrcmpi@8=lstrcmpiA@8
+lstrcmpiA@8
+lstrcmpiW@8
+lstrcpy@8=lstrcpyA@8
+lstrcpyA@8
+lstrcpyW@8
+lstrcpyn@12=lstrcpynA@12
+lstrcpynA@12
+lstrcpynW@12
+lstrlen@4=lstrlenA@4
+lstrlenA@4
+lstrlenW@4

reactos/dll/win32/kernel32/kernel32.rbuild

@@ -1,12 +1,11 @@
 <?xml version="1.0"?>
 <!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
 <module name="kernel32" type="win32dll" crt="dll" baseaddress="${BASEADDRESS_KERNEL32}" installbase="system32" installname="kernel32.dll">
-	<importlibrary definition="kernel32.pspec" />
+	<importlibrary definition="kernel32.def" />
 	<include base="kernel32">.</include>
 	<include base="kernel32" root="intermediate">.</include>
 	<include base="kernel32">include</include>
 	<include base="ReactOS">include/reactos/subsys</include>
-	<library>wine</library>
 	<library>pseh</library>
 	<library>normalize</library>
 	<library>ntdll</library>

reactos/dll/win32/kernel32/misc/actctx.c

@@ -13,10 +13,8 @@
 /* synched with wine 1.1.26 */
 
 #include <k32.h>
-
+#define NDEBUG
-#include "wine/debug.h"
+#include <debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(actctx);
 
 #define ACTCTX_FAKE_HANDLE ((HANDLE) 0xf00baa)
 

reactos/dll/win32/kernel32/misc/console.c

@@ -1371,20 +1371,6 @@ SetConsolePalette(DWORD Unknown0,
     return FALSE;
 }
 
-
-/*
- * @unimplemented (Undocumented)
- */
-BOOL
-WINAPI
-SetLastConsoleEventActive(VOID)
-{
-    DPRINT1("SetLastConsoleEventActive() UNIMPLEMENTED!\n");
-    SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
-    return FALSE;
-}
-
-
 /*
  * @unimplemented (Undocumented)
  */

reactos/dll/win32/kernel32/misc/format_msg.c

@@ -20,12 +20,8 @@
  */
 
 #include <k32.h>
-
+#define NDEBUG
-
+#include <debug.h>
-#include "wine/unicode.h"
-#include "wine/debug.h"
-
-WINE_DEFAULT_DEBUG_CHANNEL(resource);
 
 struct format_args
 {

reactos/dll/win32/kernel32/misc/lcformat.c

@@ -30,12 +30,8 @@
  */
 
 #include <k32.h>
-
+#define NDEBUG
-#include "wine/config.h"
+#include <debug.h>
-#include "wine/unicode.h"
-#include <wine/debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(nls);
 
 #define DATE_DATEVARSONLY 0x0100  /* only date stuff: yMdg */
 #define TIME_TIMEVARSONLY 0x0200  /* only time stuff: hHmst */

reactos/dll/win32/kernel32/misc/stubs.c

@@ -958,17 +958,6 @@ SetThreadStackGuarantee(IN OUT PULONG StackSizeInBytes)
     return FALSE;
 }
 
-HANDLE
-WINAPI
-ReOpenFile(IN HANDLE hOriginalFile,
-           IN DWORD dwDesiredAccess,
-           IN DWORD dwShareMode,
-           IN DWORD dwFlags)
-{
-    STUB;
-    return INVALID_HANDLE_VALUE;
-}
-
 BOOL
 WINAPI
 SetProcessWorkingSetSizeEx(IN HANDLE hProcess,
@@ -1259,3 +1248,134 @@ UnregisterConsoleIME(VOID)
     STUB;
     return FALSE;
 }
+
+/*
+ * @unimplemented
+ */
+BOOL
+WINAPI
+BaseCheckRunApp(IN DWORD Unknown1,
+                IN DWORD Unknown2,
+                IN DWORD Unknown3,
+                IN DWORD Unknown4,
+                IN DWORD Unknown5,
+                IN DWORD Unknown6,
+                IN DWORD Unknown7,
+                IN DWORD Unknown8,
+                IN DWORD Unknown9,
+                IN DWORD Unknown10)
+{
+    STUB;
+    return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+BOOL
+WINAPI
+BasepCheckWinSaferRestrictions(IN DWORD Unknown1,
+                               IN DWORD Unknown2,
+                               IN DWORD Unknown3,
+                               IN DWORD Unknown4,
+                               IN DWORD Unknown5,
+                               IN DWORD Unknown6)
+{
+    STUB;
+    return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+BOOL
+WINAPI
+NumaVirtualQueryNode(IN DWORD Unknown1,
+                     IN DWORD Unknown2,
+                     IN DWORD Unknown3,
+                     IN DWORD Unknown4)
+{
+    STUB;
+    return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+HANDLE
+WINAPI
+ReOpenFile(IN HANDLE hOriginalFile,
+           IN DWORD dwDesiredAccess,
+           IN DWORD dwShareMode,
+           IN DWORD dwFlags)
+{
+   STUB;
+   return INVALID_HANDLE_VALUE;
+}
+
+/*
+ * @unimplemented
+ */
+BOOL
+WINAPI
+SetLastConsoleEventActive(VOID)
+{
+    STUB;
+    return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+BOOL
+WINAPI
+SetConsoleCommandHistoryMode(IN DWORD dwMode)
+{
+    STUB;
+    return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+BOOL
+WINAPI
+SetLocalPrimaryComputerNameA(IN DWORD Unknown1,
+                             IN DWORD Unknown2)
+{
+    STUB;
+    return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+BOOL
+WINAPI
+SetLocalPrimaryComputerNameW(IN DWORD Unknown1,
+                             IN DWORD Unknown2)
+{
+    STUB;
+    return FALSE;
+}
+
+/*
+ * @unimplemented
+ */
+VOID
+WINAPI
+SetTermsrvAppInstallMode(IN BOOL bInstallMode)
+{
+    STUB;
+}
+
+/*
+ * @unimplemented
+ */
+BOOL
+WINAPI
+TermsrvAppInstallMode(VOID)
+{
+    STUB;
+    return FALSE;
+}

reactos/dll/win32/kernel32/misc/version.c

@@ -9,10 +9,8 @@
 
 #include <k32.h>
 #include <reactos/buildno.h>
-
+#define NDEBUG
-#include <wine/debug.h>
+#include <debug.h>
-
-WINE_DEFAULT_DEBUG_CHANNEL(kernel32Ver);
 
 #define UNICODIZE1(x) L##x
 #define UNICODIZE(x) UNICODIZE1(x)

reactos/dll/win32/kernel32/process/session.c

@@ -9,9 +9,8 @@
  *     2001-12-07 created
  */
 #include <k32.h>
-#include <wine/debug.h>
+#define NDEBUG
-
+#include <debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(kernel32session);
 
 DWORD ActiveConsoleSessionId = 0;