Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-05-21 10:05:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

[MSVCRT] Fix export of __uncaught_exception

Browse source 
[MSHTML] Add x64 asm wrappers

svn path=/trunk/; revision=63219
This commit is contained in:
Timo Kreuzer 2014-05-10 14:16:11 +00:00
parent 2e1ac56d1c
commit a74ecc13fd
2 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
reactos/dll/win32/mshtml/msvc.S
View file

@ -4,6 +4,7 @@
.code .code
MACRO(DEFINE_WRAPPER_FUNC, n, off, x) MACRO(DEFINE_WRAPPER_FUNC, n, off, x)
#ifdef _M_IX86
PUBLIC _wrapper_func_&n& PUBLIC _wrapper_func_&n&
_wrapper_func_&n&: _wrapper_func_&n&:
mov eax, [esp+4] mov eax, [esp+4]
@ -11,6 +12,15 @@ mov eax, [eax+4]
mov [esp+4], eax mov [esp+4], eax
mov eax, [eax] mov eax, [eax]
jmp dword ptr [eax+off] jmp dword ptr [eax+off]
#elif defined(_M_AMD64)
PUBLIC wrapper_func_&n&
wrapper_func_&n&:
mov rcx, [rcx+4]
mov rax, [rcx]
jmp qword ptr [rax+off]
#else
#error Unimplemented
#endif
ENDM ENDM
DEFINE_WRAPPER_FUNC 3, 12, 24 DEFINE_WRAPPER_FUNC 3, 12, 24

3
reactos/dll/win32/msvcrt/msvcrt.spec
View file

@ -73,7 +73,7 @@
# @ cdecl ??_U@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg # @ cdecl ??_U@YAPAXIHPBDH@Z(long long str long) MSVCRT_operator_new_dbg
@ cdecl -arch=win32 ??_V@YAXPAX@Z(ptr) MSVCRT_operator_delete @ cdecl -arch=win32 ??_V@YAXPAX@Z(ptr) MSVCRT_operator_delete
@ cdecl -arch=win64 ??_V@YAXPEAX@Z(ptr) MSVCRT_operator_delete @ cdecl -arch=win64 ??_V@YAXPEAX@Z(ptr) MSVCRT_operator_delete
@ cdecl -arch=win64 -norelay __uncaught_exception(ptr) @ cdecl -norelay __uncaught_exception(ptr)
@ cdecl -arch=win32 -norelay ?_query_new_handler@@YAP6AHI@ZXZ() MSVCRT__query_new_handler @ cdecl -arch=win32 -norelay ?_query_new_handler@@YAP6AHI@ZXZ() MSVCRT__query_new_handler
@ cdecl -arch=win64 -norelay ?_query_new_handler@@YAP6AH_K@ZXZ() MSVCRT__query_new_handler @ cdecl -arch=win64 -norelay ?_query_new_handler@@YAP6AH_K@ZXZ() MSVCRT__query_new_handler
@ cdecl ?_query_new_mode@@YAHXZ() MSVCRT__query_new_mode @ cdecl ?_query_new_mode@@YAHXZ() MSVCRT__query_new_mode
@ -256,7 +256,6 @@
@ cdecl __threadhandle() kernel32.GetCurrentThread @ cdecl __threadhandle() kernel32.GetCurrentThread
@ cdecl __threadid() kernel32.GetCurrentThreadId @ cdecl __threadid() kernel32.GetCurrentThreadId
@ cdecl __toascii(long) @ cdecl __toascii(long)
@ cdecl __uncaught_exception()
@ cdecl __unDName(ptr str long ptr ptr long) @ cdecl __unDName(ptr str long ptr ptr long)
@ cdecl __unDNameEx(ptr str long ptr ptr ptr long) @ cdecl __unDNameEx(ptr str long ptr ptr ptr long)
@ extern __unguarded_readlc_active @ extern __unguarded_readlc_active