Merge branch 'reactos:master' into AppleTV-Desktop

Author: DistroHopper39B

dll/win32/crtdll/dllmain.c

@@ -15,17 +15,12 @@
  *
  */
 
-#include "precomp.h"
-#include <mbctype.h>
 #include <sys/stat.h>
-#include <internal/wine/msvcrt.h>
 #include <assert.h>
 #include <stdlib.h>
-#include <string.h>
+#include <stdio.h>
 #include <mbstring.h>
-
-#include <wine/debug.h>
-WINE_DEFAULT_DEBUG_CHANNEL(crtdll);
+#include <windef.h>
 
 /* from msvcrt */
 extern void __getmainargs( int *argc, char ***argv, char ***envp,

dll/win32/crtdll/precomp.h

@@ -180,9 +180,6 @@ add_library(msvcrt MODULE
 target_compile_definitions(msvcrt PRIVATE _MSVCR_VER=0)
 set_module_type(msvcrt win32dll ENTRYPOINT DllMain 12)
 target_link_libraries(msvcrt msvcrt_static crtmath dbgrpt vcruntime wine chkstk ${PSEH_LIB})
-if(ARCH STREQUAL "i386")
-    target_link_libraries(msvcrt chkesp)
-endif()
 add_importlibs(msvcrt kernel32 kernel32_vista ntdll)
 add_delay_importlibs(msvcrt user32 advapi32)
 

dll/win32/msvcrt/CMakeLists.txt

@@ -3,4 +3,4 @@ if(CMAKE_C_COMPILER_ID STREQUAL "GNU" OR CMAKE_C_COMPILER_ID STREQUAL "Clang")
     add_compile_options(-fno-builtin)
 endif()
 
-include(static_crt_apitest.cmake)
+#include(static_crt_apitest.cmake)

modules/rostests/apitests/crt/CMakeLists.txt

@@ -1,29 +1,21 @@
 
 include_directories(include)
-#include_directories(.)
 
 add_definitions(-D_CRTBLD)
 
-include(conio/conio.cmake)
-include(direct/direct.cmake)
 include(except/except.cmake)
 include(float/float.cmake)
 include(math/math.cmake)
 include(mbstring/mbstring.cmake)
 include(mem/mem.cmake)
 include(misc/misc.cmake)
 include(printf/printf.cmake)
-include(process/process.cmake)
 include(search/search.cmake)
 include(startup/startup.cmake)
-include(stdio/stdio.cmake)
 include(stdlib/stdlib.cmake)
 include(string/string.cmake)
-include(time/time.cmake)
-include(wine/wine.cmake)
 include(wstring/wstring.cmake)
 
-include(crt.cmake)
 include(crtmath.cmake)
 include(libcntpr.cmake)
 include(msvcrtex.cmake)