WDK 10.0.22621.0

MSVC 14.33.31629

Author: ntoskrnl7

Diff for: CMakeLists.txt

@@ -39,7 +39,7 @@ else()
   set(LDK_USE_RAISE_EXCEPTION OFF)
   set(LDK_USE_RTL_RAISE_EXCEPTION OFF)
 endif()
-CPMAddPackage("gh:ntoskrnl7/[email protected].4")
+CPMAddPackage("gh:ntoskrnl7/[email protected].5")
 
 CPMAddPackage("gh:ntoskrnl7/FindWDK#master")
 list(APPEND CMAKE_MODULE_PATH "${FindWDK_SOURCE_DIR}/cmake")

Diff for: README.md

@@ -206,10 +206,12 @@ Provides features to support a better development environment in the kernel.
   * 14.26.28801
   * 14.29.30133
   * 14.31.31103
+  * 14.33.31629
 * Windows Kits (SDK, WDK)
   * 10.0.17763.0
   * 10.0.18362.0
   * 10.0.22000.0
+  * 10.0.22621.0
 
 If the SDK and WDK versions are different, builds are more likely to fail. **If possible, it is recommended to build in the same environment as the SDK and WDK versions.**
 
@@ -300,7 +302,7 @@ If the SDK and WDK versions are different, builds are more likely to fail. **If
         include(cmake/CPM.cmake)
 
         set(CRTSYS_NTL_MAIN ON) # use ntl::main
-        CPMAddPackage("gh:ntoskrnl7/[email protected].9")
+        CPMAddPackage("gh:ntoskrnl7/[email protected].10")
         include(${crtsys_SOURCE_DIR}/cmake/CrtSys.cmake)
 
         # add driver

Diff for: docs/ko-kr.md

@@ -206,10 +206,12 @@ crtsys의 장점은 아래와 같습니다.
   * 14.26.28801
   * 14.29.30133
   * 14.31.31103
+  * 14.33.31629
 * Windows Kits (SDK, WDK)
   * 10.0.17763.0
   * 10.0.18362.0
   * 10.0.22000.0
+  * 10.0.22621.0
 
 SDK와 WDK의 버전이 다르면 빌드가 실패할 가능성이 높으므로 **가능하다면 SDK와 WDK의 버전이 같은 환경에서 빌드하는것을 권장합니다.**
 
@@ -300,7 +302,7 @@ SDK와 WDK의 버전이 다르면 빌드가 실패할 가능성이 높으므로
         include(cmake/CPM.cmake)
 
         set(CRTSYS_NTL_MAIN ON) # use ntl::main
-        CPMAddPackage("gh:ntoskrnl7/[email protected].9")
+        CPMAddPackage("gh:ntoskrnl7/[email protected].10")
         include(${crtsys_SOURCE_DIR}/cmake/CrtSys.cmake)
 
         # add driver

Diff for: include/.internal/version

@@ -26,6 +26,6 @@ Environment:
 
 #define CRTSYS_VERSION_MAJOR 0
 #define CRTSYS_VERSION_MINOR 1
-#define CRTSYS_VERSION_PATCH 9
+#define CRTSYS_VERSION_PATCH 10
 
 #endif // _CRTSYS_VERSION_

Diff for: src/custom/crt/fenv/fenv.c

@@ -56,9 +56,11 @@ CrtSyspSaveXState (
 {
 	PXSTATE_SAVE StateSave = (PXSTATE_SAVE)FlsGetValue( CrtSyspFlsXStateSaveIndex );
 	if (StateSave == NULL) {
+#pragma warning(disable:4996)
 		StateSave = ExAllocatePoolWithTag( NonPagedPool,
 									   	   sizeof(XSTATE_SAVE),
 									       'ttsX' );
+#pragma warning(default:4996)
 		if (StateSave == NULL) {
 			return NULL;
 		}

Diff for: src/custom/misc/winapi.cpp

@@ -220,4 +220,110 @@ EnumSystemLocalesW (
     return FALSE; 
 }
 
-EXTERN_C_END
+//
+// https://github.com/ntoskrnl7/crtsys/issues/23
+//
+// Windows Kits\10\Include\10.0.22621.0\winrt\wrl\wrappers\corewrappers.h
+// Microsoft Visual Studio\2022\Preview\VC\Tools\MSVC\14.34.31721\crt\src\stl\ppltasks.cpp
+//
+// MutexTraits::Lock, SemaphoreTraits::Lock
+//
+WINBASEAPI
+BOOL
+WINAPI
+ReleaseSemaphore (
+    _In_ HANDLE hSemaphore,
+    _In_ LONG lReleaseCount,
+    _Out_opt_ LPLONG lpPreviousCount
+    )
+{
+    KdBreakPoint();
+    SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
+    return FALSE; 
+}
+
+WINBASEAPI
+BOOL
+WINAPI
+ReleaseMutex (
+    _In_ HANDLE hMutex
+    )
+{
+    KdBreakPoint();
+    SetLastError( ERROR_CALL_NOT_IMPLEMENTED );
+    return FALSE; 
+}
+
+#ifdef WINOLEAPI
+#undef WINOLEAPI
+#endif
+#ifdef WINOLEAPI_
+#undef WINOLEAPI_
+#endif
+
+#ifdef _OLE32_
+#define WINOLEAPI        STDAPI
+#define WINOLEAPI_(type) STDAPI_(type)
+#else
+
+#ifdef _68K_
+#ifndef REQUIRESAPPLEPASCAL
+#define WINOLEAPI        EXTERN_C HRESULT PASCAL
+#define WINOLEAPI_(type) EXTERN_C type PASCAL
+#else
+#define WINOLEAPI        EXTERN_C PASCAL HRESULT
+#define WINOLEAPI_(type) EXTERN_C PASCAL type
+#endif
+#else
+#define WINOLEAPI        EXTERN_C HRESULT STDAPICALLTYPE
+#define WINOLEAPI_(type) EXTERN_C type STDAPICALLTYPE
+#endif
+
+#endif
+
+_Check_return_
+WINOLEAPI
+CoGetObjectContext(
+    _In_ REFIID riid,
+    _Outptr_ LPVOID  FAR * ppv
+    )
+{
+    KdBreakPoint();
+    return E_NOTIMPL;
+}
+
+typedef 
+enum _APTTYPEQUALIFIER
+    {
+        APTTYPEQUALIFIER_NONE	= 0,
+        APTTYPEQUALIFIER_IMPLICIT_MTA	= 1,
+        APTTYPEQUALIFIER_NA_ON_MTA	= 2,
+        APTTYPEQUALIFIER_NA_ON_STA	= 3,
+        APTTYPEQUALIFIER_NA_ON_IMPLICIT_MTA	= 4,
+        APTTYPEQUALIFIER_NA_ON_MAINSTA	= 5,
+        APTTYPEQUALIFIER_APPLICATION_STA	= 6,
+        APTTYPEQUALIFIER_RESERVED_1	= 7
+    } 	APTTYPEQUALIFIER;
+
+typedef 
+enum _APTTYPE
+    {
+        APTTYPE_CURRENT	= -1,
+        APTTYPE_STA	= 0,
+        APTTYPE_MTA	= 1,
+        APTTYPE_NA	= 2,
+        APTTYPE_MAINSTA	= 3
+    } 	APTTYPE;
+
+_Check_return_
+WINOLEAPI
+CoGetApartmentType(
+    _Out_ APTTYPE* pAptType,
+    _Out_ APTTYPEQUALIFIER* pAptQualifier
+    )
+{
+    KdBreakPoint();
+    return E_NOTIMPL;
+}
+
+EXTERN_C_END

Diff for: src/custom/msvc/143/crt/src/vcruntime/frame_redirect.cpp

@@ -1,4 +1,11 @@
-#include <eh.h> 
+//
+// MSVC\14.33.31629\include\eh.h
+// _VCRT_COMPILER_PREPROCESSOR가 1이면서 _VCRT_BUILD가 정의되어있어야 unexpected 함수가 정의됩니다.
+//
+#define _VCRT_COMPILER_PREPROCESSOR 1
+#define _VCRT_BUILD
+
+#include <eh.h>
 #include <ehassert.h> 
 #include <ehdata.h>
 #include <ehdata4.h>

Diff for: src/custom/msvc/crt.props

@@ -18,7 +18,7 @@
       <CallingConvention>Cdecl</CallingConvention>
     </ClCompile>
   </ItemGroup>
-  <ItemGroup Condition="'$(Platform)'=='x64'">
+  <ItemGroup>
     <ClCompile Include="$(MSBuildThisFileDirectory)$(PlatformToolsetVersion)\crt\src\vcruntime\frame_redirect.cpp">
       <CallingConvention>Cdecl</CallingConvention>
     </ClCompile>

Diff for: src/custom/ucrt/10.0.22621.0/inc/corecrt_internal_state_isolation.h

@@ -0,0 +1,83 @@
+#pragma once
+
+#define __acrt_select_exit_lock() __acrt_exit_lock
+
+#pragma warning(disable : 4101)
+#ifdef __cplusplus
+
+extern "C++"
+{
+    namespace __crt_state_management
+    {
+    struct scoped_global_state_reset
+    {
+    };
+
+    const size_t state_index_count = 2;
+
+    inline bool initialize_global_state_isolation()
+    {
+        return true;
+    }
+
+    inline void uninitialize_global_state_isolation(bool const terminating)
+    {
+        terminating;
+    }
+
+    inline int get_current_state_index()
+    {
+        return 0;
+    }
+
+    inline int get_current_state_index(__crt_scoped_get_last_error_reset const &last_error_reset)
+    {
+        last_error_reset;
+        return 0;
+    }
+
+    template <typename T> class dual_state_global
+    {
+      public:
+        T &value()
+        {
+            return _value[0];
+        }
+
+        T &value_explicit(size_t const current_global_state_index)
+        {
+            return _value[current_global_state_index];
+        }
+
+        T &value(__crt_cached_ptd_host &ptd) throw();
+
+        T const &value(__crt_cached_ptd_host &ptd) const throw();
+
+        void initialize(const T &value)
+        {
+            for (size_t i = 0; i != state_index_count; i++)
+                _value[i] = value;
+        }
+
+        template <typename Ta> void initialize_from_array(Ta (&arr)[2])
+        {
+            for (size_t i = 0; i != state_index_count; i++)
+                _value[i] = arr[i];
+        }
+
+        template <class Fn> void uninitialize(Fn &&fn)
+        {
+            for (size_t i = 0; i != state_index_count; i++)
+                fn(_value[i]);
+        }
+
+        T *const dangerous_get_state_array()
+        {
+            return reinterpret_cast<T *const>(&_value);
+        }
+
+        T _value[state_index_count];
+    };
+    } // namespace __crt_state_management
+}
+#endif

Diff for: src/custom/ucrt/10.0.22621.0/inc/nt.h

@@ -0,0 +1,5 @@
+#pragma once
+
+#include <windows.h>
+#include <peb.h>
+#include <teb.h>

Diff for: src/custom/ucrt/10.0.22621.0/inc/ntrtl.h

@@ -11,6 +11,7 @@
 // winbase.h
 #include <wincontypes.h> // consoleapi.h 
 #include "fileapi.h"
+#include "synchapi.h"
 #include "processthreadsapi.h"
 // winbase.h
 

Diff for: src/custom/ucrt/10.0.22621.0/inc/nturtl.h

@@ -0,0 +1,10 @@
+#ifndef _CRTSYS_COMBASEAPI
+#define _CRTSYS_COMBASEAPI
+
+#pragma once
+
+#undef DECLSPEC_IMPORT
+#define DECLSPEC_IMPORT
+#include <../um/combaseapi.h>
+
+#endif  // _CRTSYS_COMBASEAPI

Diff for: src/custom/winsdk/include/um/crtsys/Windows.h

@@ -8,6 +8,42 @@
 
 EXTERN_C_START
 
+WINBASEAPI
+DWORD
+WINAPI
+GetTempPathA(
+    _In_ DWORD nBufferLength,
+    _Out_writes_to_opt_(nBufferLength,return + 1) LPSTR lpBuffer
+    );
+
+WINBASEAPI
+DWORD
+WINAPI
+GetTempPathW(
+    _In_ DWORD nBufferLength,
+    _Out_writes_to_opt_(nBufferLength,return + 1) LPWSTR lpBuffer
+    );
+
+WINBASEAPI
+UINT
+WINAPI
+GetTempFileNameA(
+    _In_ LPCSTR lpPathName,
+    _In_ LPCSTR lpPrefixString,
+    _In_ UINT uUnique,
+    _Out_writes_(MAX_PATH) LPSTR lpTempFileName
+    );
+
+WINBASEAPI
+UINT
+WINAPI
+GetTempFileNameW(
+    _In_ LPCWSTR lpPathName,
+    _In_ LPCWSTR lpPrefixString,
+    _In_ UINT uUnique,
+    _Out_writes_(MAX_PATH) LPWSTR lpTempFileName
+    );
+
 // ucrt/inc/corecrt_internal.h
 WINBASEAPI
 BOOL

Diff for: src/custom/winsdk/include/um/crtsys/combaseapi.h

@@ -0,0 +1,33 @@
+#ifndef _CRTSYS_SYNCHAPI_H_
+#define _CRTSYS_SYNCHAPI_H_
+
+#pragma once
+
+#include <apiset.h>
+#include <apisetcconv.h>
+#include <minwindef.h>
+#include <minwinbase.h>
+
+EXTERN_C_START
+
+WINBASEAPI
+BOOL
+WINAPI
+ReleaseSemaphore (
+    _In_ HANDLE hSemaphore,
+    _In_ LONG lReleaseCount,
+    _Out_opt_ LPLONG lpPreviousCount
+    );
+
+WINBASEAPI
+BOOL
+WINAPI
+ReleaseMutex (
+    _In_ HANDLE hMutex
+    );
+
+EXTERN_C_END
+
+#include <../Ldk/synchapi.h>
+
+#endif // _CRTSYS_SYNCHAPI_H_