Merge pull request #42 from silver3-github/fixbug

修复x86编译bug
MiroKaku · Jul 1, 2024 · 545e40f · 545e40f
2 parents 8d249a2 + acfe5ad
commit 545e40f
Show file tree

Hide file tree

Showing 10 changed files with 46 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -20,6 +20,7 @@ bld/
 [Oo]bj/
 [Bb]in/
 [Ll]ib/
+ucxxrt/
 
 # Visual Studio 2015 cache/options directory
 .vs/

diff --git a/msvc/ucxxrt.test.vcxproj b/msvc/ucxxrt.test.vcxproj
@@ -45,6 +45,8 @@
     <DriverType>WDM</DriverType>
     <DriverTargetPlatform>Desktop</DriverTargetPlatform>
     <Driver_SpectreMitigation>Spectre</Driver_SpectreMitigation>
+    <TargetVersion Condition="'$(Platform)' == 'ARM64'">Windows10</TargetVersion>
+    <DriverTargetPlatform Condition="'$(Platform)' == 'ARM64'"></DriverTargetPlatform>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />

diff --git a/src/crt/i386/chandler4.cpp b/src/crt/i386/chandler4.cpp
@@ -190,10 +190,16 @@ _EH4_LocalUnwind(
 
 #endif
 
-extern void
+extern "C"
+void
+__cdecl
 __except_validate_context_record(
     _In_ PCONTEXT ContextRecord
-    );
+);
+
+#if defined(_X86_)
+_VEIL_DECLARE_ALTERNATE_NAME(__except_validate_context_record, _UCXXRT___except_validate_context_record);
+#endif
 
 /***
 *ValidateLocalCookies - perform local cookie validation during SEH processing

diff --git a/src/crt/i386/trnsctrl.cpp b/src/crt/i386/trnsctrl.cpp
@@ -328,10 +328,16 @@ extern "C" _VCRTIMP __declspec(naked) DECLSPEC_GUARD_SUPPRESS EXCEPTION_DISPOSIT
         }
 }
 
-extern "C" void
+extern "C"
+void
+__cdecl
 __except_validate_jump_buffer (
     _In_ _JUMP_BUFFER *JumpBuffer
-    );
+);
+
+#if defined(_X86_)
+_VEIL_DECLARE_ALTERNATE_NAME(__except_validate_jump_buffer, _UCXXRT___except_validate_jump_buffer);
+#endif
 
 /////////////////////////////////////////////////////////////////////////////
 //

diff --git a/src/crt/vcruntime/ehhelpers.h b/src/crt/vcruntime/ehhelpers.h
@@ -25,10 +25,12 @@
 // V4 and later managed exception code
 #define MANAGED_EXCEPTION_CODE_V4  0XE0434352
 
-extern "C" void
+extern "C"
+void
+__cdecl
 __except_validate_context_record(
     _In_ PCONTEXT ContextRecord
-    );
+);
 
 extern "C" _VCRTIMP void * __cdecl __AdjustPointer(
     void *,
@@ -59,7 +61,7 @@ extern "C" _VCRTIMP int __cdecl RENAME_EH_EXTERN(__TypeMatch4)(
     FH4::HandlerType4 *,
     CatchableType *,
     ThrowInfo *
-    );
+);
 
 extern "C" _VCRTIMP int __cdecl RENAME_EH_EXTERN(__TypeMatch)(
     HandlerType *,

diff --git a/src/crt/vcruntime/frame.cpp b/src/crt/vcruntime/frame.cpp
@@ -28,6 +28,10 @@
 #include "winapi_thunks.h"
 
 
+#if defined(_X86_)
+_VEIL_DECLARE_ALTERNATE_NAME(__except_validate_context_record, _UCXXRT___except_validate_context_record);
+#endif
+
 // Make non-namespace prefixed names available for FH4
 using namespace FH4;
 

diff --git a/src/crt/vcruntime/jbcxrval.c b/src/crt/vcruntime/jbcxrval.c
@@ -169,8 +169,13 @@ __except_validate_jump_buffer(
 
 void
 __cdecl
+#if defined(_X86_)
+_UCXXRT___except_validate_context_record(
+    _In_ PCONTEXT ContextRecord
+#else
 __except_validate_context_record(
     _In_ PCONTEXT ContextRecord
+#endif
 )
 
 /*++
@@ -213,6 +218,7 @@ Return Value:
     }
 }
 
+
 __forceinline
 void
 __except_validate_jump_buffer_common(
@@ -277,10 +283,17 @@ static PVOID __except_get_jumpbuf_sp(_In_reads_(_JBLEN) jmp_buf JumpBuffer)
 
 void
 __cdecl
+#if defined(_X86_)
+_UCXXRT___except_validate_jump_buffer(
+    _In_reads_(_JBLEN) jmp_buf JumpBuffer
+#else
 __except_validate_jump_buffer(
     _In_reads_(_JBLEN) jmp_buf JumpBuffer
+#endif
 )
 {
     __except_validate_jump_buffer_common(JumpBuffer, __except_get_jumpbuf_sp);
 }
+
+
 #endif // !defined(NTOS_KERNEL_RUNTIME)
diff --git a/src/crt/vcruntime/sys_common.inl b/src/crt/vcruntime/sys_common.inl
@@ -67,7 +67,6 @@ _CRTALLOC(".CRT$XIAA") static _PIFV pre_c_initializer    = pre_c_initialization;
 _CRTALLOC(".CRT$XCAA") static _PVFV pre_cpp_initializer  = pre_cpp_initialization;
 
 
-//extern PDRIVER_OBJECT __drvobj     = nullptr;
 static PDRIVER_UNLOAD __drv_unload = nullptr;
 
 static __declspec(noinline) void __scrt_common_exit(PDRIVER_OBJECT drvobj)
@@ -84,8 +83,6 @@ static __declspec(noinline) void __scrt_common_exit(PDRIVER_OBJECT drvobj)
 
 static __declspec(noinline) long __cdecl __scrt_common_main_seh(PDRIVER_OBJECT drvobj, PUNICODE_STRING regpath)
 {
-//    __drvobj = drvobj;
-
     if (!__scrt_initialize_crt())
         __scrt_fastfail(FAST_FAIL_FATAL_APP_EXIT);
 

diff --git a/src/ucrt/startup/exit.cpp b/src/ucrt/startup/exit.cpp
@@ -31,7 +31,6 @@ static int __cdecl atexit_exception_filter(unsigned long const _exception_code)
     return EXCEPTION_CONTINUE_SEARCH;
 }
 
-//extern PDRIVER_OBJECT __drvobj;
 
 static void __cdecl common_exit(
     int                    const /*return_code*/,

diff --git a/src/ucxxrt.h b/src/ucxxrt.h
@@ -1 +1,5 @@
-#pragma once
+#pragma once
+
+
+// 这是一个标识文件
+// 用于属性表识别当前目录是否存在ucxxrt库，请勿删除！