[SDK][KERNELBASE] Build Wine KernelBase

Author: DarkFire01

dll/win32/CMakeLists.txt

@@ -76,6 +76,7 @@ add_subdirectory(itss)
 add_subdirectory(jscript)
 add_subdirectory(jsproxy)
 add_subdirectory(kernel32)
+add_subdirectory(kernelbase)
 add_subdirectory(loadperf)
 add_subdirectory(lpk)
 add_subdirectory(lsasrv)

dll/win32/kernelbase/CMakeLists.txt

@@ -1,13 +1,47 @@
 
 remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502)
-add_definitions(-D_WIN32_WINNT=0x601 -DWINVER=0x601)
+add_definitions(-D_WIN32_WINNT=0x600 -DWINVER=0x600)
 
-add_definitions(
-    -D__WINESRC__
-    -D_WINE
-    -D_KERNELBASE_)
+if (DLL_EXPORT_VERSION LESS 0x601)
+    set(kernelbase_name kernelbase)
+else()
+    set(kernelbase_name kernelbase)
+endif()
 
-include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine)
+add_subdirectory(wine)
 
-#add_subdirectory(wine)
-# TODO: ReactOS Isn't ready for Kernelbase.dll
+add_definitions(-D_KERNELBASE_)
+include_directories(${REACTOS_SOURCE_DIR}/sdk/include/reactos/subsys)
+spec2def(${kernelbase_name}.dll kernelbase.spec ADD_IMPORTLIB)
+
+if(MSVC)
+    # Disable warning C4267: 'initializing': conversion from 'size_t' to 'DWORD', possible loss of data
+    set_source_files_properties(kernel32/winnls/string/locale.c PROPERTIES COMPILE_OPTIONS "/wd4267")
+else()
+    # Disable warning: 'variable' defined but not used
+    set_source_files_properties(kernel32/winnls/string/locale.c PROPERTIES COMPILE_OPTIONS "-Wno-unused-variable")
+endif()
+
+# This isn't called KernelBase because apps will explode and we aren't win7 yet.
+add_library(${kernelbase_name} MODULE
+    wine/kernelbase.rc
+    ${CMAKE_CURRENT_BINARY_DIR}/${kernelbase_name}_stubs.c
+    ${CMAKE_CURRENT_BINARY_DIR}/${kernelbase_name}.def)
+
+if(MSVC)
+    # Disable warning C4133: 'function': incompatible types - from 'WICPixelFormatNumericRepresentation *' to 'DWORD *'
+    # Disable warning C4146: unary minus operator applied to unsigned type, result still unsigned
+    target_compile_options(${kernelbase_name} PRIVATE /wd4047 /wd4024 /wd4133 /wd4146)
+endif()
+
+set_module_type(${kernelbase_name} win32dll ENTRYPOINT DllMain 12)
+#############################################
+## HACK FOR MSVC COMPILATION WITH win32dll ##
+set_subsystem(${kernelbase_name} console)
+################# END  HACK #################
+
+target_link_libraries(${kernelbase_name} win32_registry kernelbase_path kernelbase_static cryptlib wine chkstk ${PSEH_LIB})
+add_importlibs(${kernelbase_name} ntdll)
+add_pch(${kernelbase_name} kernel32/k32.h SOURCE)
+add_dependencies(${kernelbase_name} psdk errcodes asm)
+add_cd_file(TARGET ${kernelbase_name} DESTINATION reactos/system32 FOR all)

dll/win32/kernelbase/wine/kernelbase.spec dll/win32/kernelbase/kernelbase.specdll/win32/kernelbase/wine/kernelbase.spec renamed to dll/win32/kernelbase/kernelbase.spec

@@ -1,12 +1,16 @@
-add_definitions(-D__WINESRC__ -D_KERNEL32_ -DWINVER=0x601 -D_WIN32_WINNT=0x601)
+remove_definitions(-D_WIN32_WINNT=0x502 -DWINVER=0x502)
+remove_definitions(-D_WIN32_WINNT=0x600 -DWINVER=0x600)
+add_definitions(-D_WIN32_WINNT=0x601 -DWINVER=0x601)
+
 add_definitions(
     -D__WINESRC__
     -D_WINE
     -Dwcsnicmp=_wcsnicmp
     -Dwcsicmp=_wcsicmp
     -Dstrnicmp=_strnicmp
     -Dswprintf=_swprintf
-    -D_KERNELBASE_)
+    -D_KERNELBASE_
+    -D_KERNEL32_)
 
 include_directories(BEFORE ${REACTOS_SOURCE_DIR}/sdk/include/wine)
 
@@ -23,26 +27,47 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR
     add_compile_options($<$<COMPILE_LANGUAGE:CXX>:-Wno-reorder>)
 endif()
 
-#list(APPEND SOURCE_PATH
-#    path.c
-#    )
-#
-#add_library(kernelbase_path ${SOURCE_PATH})
-#target_link_libraries(kernelbase_path ${PSEH_LIB})
-#add_dependencies(kernelbase_path psdk)
+list(APPEND SOURCE_PATH
+    path.c
+    )
 
+add_library(kernelbase_path ${SOURCE_PATH})
+target_link_libraries(kernelbase_path ${PSEH_LIB})
+add_dependencies(kernelbase_path psdk)
 if(NOT MSVC)
     target_compile_options(kernelbase_path PRIVATE -Wno-unused-variable)
     target_compile_options(kernelbase_path PRIVATE -Wno-unused-function)
 endif()
 
 list(APPEND SOURCE_STATIC
-    #console.c #looks like ReactOS console.c is nothing like wine.
+    console.c
+    debug.c
+    file.c
+    loader.c
+    locale.c
+    main.c
+    memory.c
+    process.c
+    registry.c
+    security.c
+    string.c
+    sync.c
+    thread.c
+    version.c #mostly Version.dll
+    volume.c
     )
 
 add_library(kernelbase_static ${SOURCE_STATIC})
 target_link_libraries(kernelbase_static psapi_static ${PSEH_LIB})
 add_dependencies(kernelbase_static psdk)
+if(MSVC)
+    # Disable warning C4090: 'function': different 'const' qualifiers
+    # Disable warning C4133: 'function': incompatible types - from 'UINT *' to 'MSIINSTALLCONTEXT *'
+    # Disable warning C4146: unary minus operator applied to unsigned type, result still unsigned
+    # Disable warning C4312: 'type cast': conversion from 'unsigned int' to 'HANDLE' of greater size
+    target_compile_options(kernelbase_static PRIVATE /wd4090 /wd4133 /wd4146 /wd4312)
+endif()
+
 
 if(NOT MSVC)
     target_compile_options(kernelbase_static PRIVATE -Wno-unused-variable)

dll/win32/kernelbase/wine/CMakeLists.txt

@@ -335,7 +335,7 @@ static BOOL init_console_std_handles( BOOL override_all )
 /******************************************************************
  *	AddConsoleAliasA   (kernelbase.@)
  */
-BOOL WINAPI AddConsoleAliasA( LPSTR source, LPSTR target, LPSTR exename )
+BOOL WINAPI AddConsoleAliasA( LPCSTR source, LPCSTR target, LPCSTR exename )
 {
     FIXME( ": (%s, %s, %s) stub!\n", debugstr_a(source), debugstr_a(target), debugstr_a(exename) );
     SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
@@ -346,7 +346,7 @@ BOOL WINAPI AddConsoleAliasA( LPSTR source, LPSTR target, LPSTR exename )
 /******************************************************************
  *	AddConsoleAliasW   (kernelbase.@)
  */
-BOOL WINAPI AddConsoleAliasW( LPWSTR source, LPWSTR target, LPWSTR exename )
+BOOL WINAPI AddConsoleAliasW( LPCWSTR source, LPCWSTR target, LPCWSTR exename )
 {
     FIXME( ": (%s, %s, %s) stub!\n", debugstr_w(source), debugstr_w(target), debugstr_w(exename) );
     SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
@@ -455,8 +455,8 @@ static BOOL alloc_console( BOOL headless )
 
     UpdateProcThreadAttribute( console_si.lpAttributeList, 0, PROC_THREAD_ATTRIBUTE_HANDLE_LIST,
                                &server, sizeof(server), NULL, NULL );
-    swprintf( conhost_path, ARRAY_SIZE(conhost_path), L"%s\\conhost.exe", system_dir );
-    swprintf( cmd, ARRAY_SIZE(cmd),  L"\"%s\" --server 0x%x", conhost_path, condrv_handle( server ));
+    _snwprintf( conhost_path, ARRAY_SIZE(conhost_path), L"%s\\conhost.exe", system_dir );
+    _snwprintf( cmd, ARRAY_SIZE(cmd),  L"\"%s\" --server 0x%x", conhost_path, condrv_handle( server ));
     if (headless) wcscat( cmd, L" --headless" );
     Wow64DisableWow64FsRedirection( &redir );
     ret = CreateProcessW( conhost_path, cmd, NULL, NULL, TRUE, DETACHED_PROCESS | EXTENDED_STARTUPINFO_PRESENT,
@@ -499,7 +499,7 @@ BOOL WINAPI AllocConsole(void)
  *	CreateConsoleScreenBuffer   (kernelbase.@)
  */
 HANDLE WINAPI DECLSPEC_HOTPATCH CreateConsoleScreenBuffer( DWORD access, DWORD share,
-                                                           SECURITY_ATTRIBUTES *sa, DWORD flags,
+                                                           CONST SECURITY_ATTRIBUTES *sa, DWORD flags,
                                                            void *data )
 {
     OBJECT_ATTRIBUTES attr = {sizeof(attr)};
@@ -708,7 +708,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GenerateConsoleCtrlEvent( DWORD event, DWORD group
 /******************************************************************
  *	GetConsoleAliasA   (kernelbase.@)
  */
-DWORD WINAPI GetConsoleAliasA( LPSTR source, LPSTR buffer, DWORD len, LPSTR exename )
+DWORD WINAPI GetConsoleAliasA( LPCSTR source, LPSTR buffer, DWORD len, LPCSTR exename )
 {
     FIXME( "(%s,%p,%ld,%s): stub\n", debugstr_a(source), buffer, len, debugstr_a(exename) );
     SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
@@ -719,7 +719,7 @@ DWORD WINAPI GetConsoleAliasA( LPSTR source, LPSTR buffer, DWORD len, LPSTR exen
 /******************************************************************
  *	GetConsoleAliasW   (kernelbase.@)
  */
-DWORD WINAPI GetConsoleAliasW( LPWSTR source, LPWSTR buffer, DWORD len, LPWSTR exename )
+DWORD WINAPI GetConsoleAliasW( LPCWSTR source, LPWSTR buffer, DWORD len, LPCWSTR exename )
 {
     FIXME( "(%s,%p,%ld,%s): stub\n", debugstr_w(source), buffer, len, debugstr_w(exename) );
     SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
@@ -752,7 +752,7 @@ DWORD WINAPI GetConsoleAliasExesLengthW(void)
 /******************************************************************
  *	GetConsoleAliasesLengthA   (kernelbase.@)
  */
-DWORD WINAPI GetConsoleAliasesLengthA( LPSTR unknown )
+DWORD WINAPI GetConsoleAliasesLengthA( LPCSTR unknown )
 {
     FIXME( ": (%s) stub!\n", debugstr_a(unknown) );
     SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
@@ -763,7 +763,7 @@ DWORD WINAPI GetConsoleAliasesLengthA( LPSTR unknown )
 /******************************************************************
  *	GetConsoleAliasesLengthW   (kernelbase.@)
  */
-DWORD WINAPI GetConsoleAliasesLengthW( LPWSTR unknown )
+DWORD WINAPI GetConsoleAliasesLengthW( LPCWSTR unknown )
 {
     FIXME( ": (%s) stub!\n", debugstr_w(unknown) );
     SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
@@ -1538,7 +1538,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleCtrlHandler( PHANDLER_ROUTINE func, BOOL
 /******************************************************************************
  *	SetConsoleCursorInfo   (kernelbase.@)
  */
-BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleCursorInfo( HANDLE handle, CONSOLE_CURSOR_INFO *info )
+BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleCursorInfo( HANDLE handle, CONST CONSOLE_CURSOR_INFO *info )
 {
     struct condrv_output_info_params params = { SET_CONSOLE_OUTPUT_INFO_CURSOR_GEOM };
 
@@ -1733,7 +1733,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleTitleW( LPCWSTR title )
 /******************************************************************************
  *	SetConsoleWindowInfo   (kernelbase.@)
  */
-BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleWindowInfo( HANDLE handle, BOOL absolute, SMALL_RECT *window )
+BOOL WINAPI DECLSPEC_HOTPATCH SetConsoleWindowInfo( HANDLE handle, BOOL absolute, CONST SMALL_RECT *window )
 {
     struct condrv_output_info_params params = { SET_CONSOLE_OUTPUT_INFO_DISPLAY_WINDOW };
     SMALL_RECT rect = *window;
@@ -2063,7 +2063,8 @@ BOOL WINAPI DECLSPEC_HOTPATCH WriteConsoleOutputCharacterW( HANDLE handle, LPCWS
 /***********************************************************************
  *            ReadConsoleA   (kernelbase.@)
  */
-BOOL WINAPI ReadConsoleA( HANDLE handle, void *buffer, DWORD length, DWORD *count, void *reserved )
+BOOL WINAPI ReadConsoleA( HANDLE handle, void *buffer, DWORD length, DWORD *count,
+                          PCONSOLE_READCONSOLE_CONTROL reserved )
 {
     if (length > INT_MAX)
     {
@@ -2078,7 +2079,8 @@ BOOL WINAPI ReadConsoleA( HANDLE handle, void *buffer, DWORD length, DWORD *coun
 /***********************************************************************
  *            ReadConsoleW   (kernelbase.@)
  */
-BOOL WINAPI ReadConsoleW( HANDLE handle, void *buffer, DWORD length, DWORD *count, void *reserved )
+BOOL WINAPI ReadConsoleW( HANDLE handle, void *buffer, DWORD length, DWORD *count,
+                          PCONSOLE_READCONSOLE_CONTROL reserved )
 {
     BOOL ret;
 
@@ -2113,7 +2115,7 @@ BOOL WINAPI ReadConsoleW( HANDLE handle, void *buffer, DWORD length, DWORD *coun
                              tmp, sizeof(DWORD) + length * sizeof(WCHAR), count );
         if (ret)
         {
-            memcpy( &crc->dwConsoleKeyState, tmp, sizeof(DWORD) );
+            memcpy( &crc->dwControlKeyState, tmp, sizeof(DWORD) );
             *count -= sizeof(DWORD);
             memcpy( buffer, tmp + sizeof(DWORD), *count );
         }
@@ -2226,18 +2228,19 @@ static HANDLE create_pseudo_console( COORD size, HANDLE input, HANDLE output, HA
     UpdateProcThreadAttribute( si.lpAttributeList, 0, PROC_THREAD_ATTRIBUTE_HANDLE_LIST,
                                inherit, sizeof(*inherit) * inherit_count, NULL, NULL );
 
-    swprintf( conhost_path, ARRAY_SIZE(conhost_path), L"%s\\conhost.exe", system_dir );
+    _snwprintf( conhost_path, ARRAY_SIZE(conhost_path), L"%s\\conhost.exe", system_dir );
     if (signal)
     {
-        swprintf( cmd, ARRAY_SIZE(cmd),
-                  L"\"%s\" --headless %s--width %u --height %u --signal 0x%x --server 0x%x",
+        _snwprintf( cmd, ARRAY_SIZE(cmd),
+                  L"\"%s\" --headless %s--width %u --height %u --signal 0x%llx --server 0x%llx",
                   conhost_path, (flags & PSEUDOCONSOLE_INHERIT_CURSOR) ? L"--inheritcursor " : L"",
-                  size.X, size.Y, signal, server );
+                  size.X, size.Y, (unsigned long long)(ULONG_PTR)signal,
+                  (unsigned long long)(ULONG_PTR)server );
     }
     else
     {
-        swprintf( cmd, ARRAY_SIZE(cmd), L"\"%s\" --unix --width %u --height %u --server 0x%x",
-                  conhost_path, size.X, size.Y, server );
+        _snwprintf( cmd, ARRAY_SIZE(cmd), L"\"%s\" --unix --width %u --height %u --server 0x%llx",
+                  conhost_path, size.X, size.Y, (unsigned long long)(ULONG_PTR)server );
     }
     Wow64DisableWow64FsRedirection( &redir );
     res = CreateProcessW( conhost_path, cmd, NULL, NULL, TRUE, DETACHED_PROCESS | EXTENDED_STARTUPINFO_PRESENT,
@@ -2273,7 +2276,7 @@ HRESULT WINAPI CreatePseudoConsole( COORD size, HANDLE input, HANDLE output, DWO
 
     if (!(pseudo_console = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*pseudo_console) ))) return E_OUTOFMEMORY;
 
-    swprintf( pipe_name, ARRAY_SIZE(pipe_name),  L"\\\\.\\pipe\\wine_pty_signal_pipe%x",
+    _snwprintf( pipe_name, ARRAY_SIZE(pipe_name),  L"\\\\.\\pipe\\wine_pty_signal_pipe%x",
               GetCurrentThreadId() );
     signal = CreateNamedPipeW( pipe_name, PIPE_ACCESS_INBOUND | FILE_FLAG_OVERLAPPED, PIPE_TYPE_BYTE,
                                PIPE_UNLIMITED_INSTANCES, 4096, 4096, NMPWAIT_USE_DEFAULT_WAIT, &inherit_attr );

dll/win32/kernelbase/wine/console.c

@@ -26,6 +26,7 @@
 #define WIN32_NO_STATUS
 #include "windef.h"
 #include "winbase.h"
+#include "winreg.h"
 #include "winternl.h"
 #include "winnls.h"
 #include "wingdi.h"
@@ -39,6 +40,8 @@
 #include "kernelbase.h"
 #include "wine/debug.h"
 
+UINT WINAPI GetErrorMode(void);
+
 WINE_DEFAULT_DEBUG_CHANNEL(seh);
 WINE_DECLARE_DEBUG_CHANNEL(winedbg);
 
@@ -309,7 +312,7 @@ void WINAPI DECLSPEC_HOTPATCH OutputDebugStringW( LPCWSTR str )
     }
 }
 
-
+#ifndef __REACTOS__
 /*******************************************************************
  *           RaiseException  (kernelbase.@)
  */
@@ -410,6 +413,7 @@ __ASM_STDCALL_IMPORT(RaiseException,16)
 #else
 __ASM_GLOBAL_IMPORT(RaiseException)
 #endif
+#endif
 
 /*******************************************************************
  *           RaiseFailFastException  (kernelbase.@)
@@ -576,13 +580,13 @@ static BOOL start_debugger( EXCEPTION_POINTERS *epointers, HANDLE event )
     {
         size_t format_size = lstrlenW( format ) + 2*20;
         cmdline = HeapAlloc( GetProcessHeap(), 0, format_size * sizeof(WCHAR) );
-        swprintf( cmdline, format_size, format, GetCurrentProcessId(), HandleToLong(event) );
+        _snwprintf( cmdline, format_size, format, GetCurrentProcessId(), HandleToLong(event) );
         HeapFree( GetProcessHeap(), 0, format );
     }
     else
     {
         cmdline = HeapAlloc( GetProcessHeap(), 0, 80 * sizeof(WCHAR) );
-        swprintf( cmdline, 80, L"winedbg --auto %ld %ld", GetCurrentProcessId(), HandleToLong(event) );
+        _snwprintf( cmdline, 80, L"winedbg --auto %ld %ld", GetCurrentProcessId(), HandleToLong(event) );
     }
 
     if (!autostart)
@@ -849,7 +853,7 @@ HRESULT WINAPI /* DECLSPEC_HOTPATCH */ WerUnregisterRuntimeExceptionModule( cons
     return S_OK;
 }
 
-
+#ifndef __REACTOS__
 /***********************************************************************
  * psapi functions
  ***********************************************************************/
@@ -1669,7 +1673,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetWsChanges( HANDLE process, PSAPI_WS_WATCH_INFOR
     TRACE( "(%p, %p, %ld)\n", process, info, size );
     return set_ntstatus( NtQueryInformationProcess( process, ProcessWorkingSetWatch, info, size, NULL ));
 }
-
+#endif
 
 /***********************************************************************
  *         GetWsChangesEx   (kernelbase.@)
@@ -1684,6 +1688,7 @@ BOOL WINAPI DECLSPEC_HOTPATCH GetWsChangesEx( HANDLE process, PSAPI_WS_WATCH_INF
 }
 
 
+#ifndef __REACTOS__
 /***********************************************************************
  *         InitializeProcessForWsWatch   (kernelbase.@)
  *         K32InitializeProcessForWsWatch   (kernelbase.@)
@@ -1694,7 +1699,6 @@ BOOL WINAPI /* DECLSPEC_HOTPATCH */ InitializeProcessForWsWatch( HANDLE process
     return TRUE;
 }
 
-
 /***********************************************************************
  *         QueryWorkingSet   (kernelbase.@)
  *         K32QueryWorkingSet   (kernelbase.@)
@@ -1818,3 +1822,4 @@ BOOL WINAPI DECLSPEC_HOTPATCH QueryFullProcessImageNameW( HANDLE process, DWORD
     HeapFree( GetProcessHeap(), 0, dynamic_buffer );
     return set_ntstatus( status );
 }
+#endif