From 9564801ea8f7005c7cea4c1ff56c56776a70b97e Mon Sep 17 00:00:00 2001
From: Timo Kreuzer <timo.kreuzer@reactos.org>
Date: Tue, 23 Aug 2011 08:45:46 +0000
Subject: [PATCH] [RTL] Remove duplicate function [CRT] add _local_unwind stub
 and fix c++ symbols

svn path=/trunk/; revision=53398
---
 reactos/lib/rtl/amd64/stubs.c          | 13 -------------
 reactos/lib/sdk/crt/except/amd64/cpp.s |  8 ++++----
 reactos/lib/sdk/crt/except/amd64/seh.s |  6 ++++++
 3 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/reactos/lib/rtl/amd64/stubs.c b/reactos/lib/rtl/amd64/stubs.c
index 4327ea7e99f..83060c77619 100644
--- a/reactos/lib/rtl/amd64/stubs.c
+++ b/reactos/lib/rtl/amd64/stubs.c
@@ -61,17 +61,4 @@ RtlRestoreContext(
     UNIMPLEMENTED;
 }
 
-NTSYSAPI
-BOOLEAN
-RtlInstallFunctionTableCallback(
-    DWORD64 TableIdentifier,
-    DWORD64 BaseAddress,
-    DWORD Length,
-    PGET_RUNTIME_FUNCTION_CALLBACK Callback,
-    PVOID Context,
-    PCWSTR OutOfProcessCallbackDll)
-{
-    UNIMPLEMENTED;
-    return FALSE;
-}
 
diff --git a/reactos/lib/sdk/crt/except/amd64/cpp.s b/reactos/lib/sdk/crt/except/amd64/cpp.s
index fef42e875d2..fb9182f0213 100644
--- a/reactos/lib/sdk/crt/except/amd64/cpp.s
+++ b/reactos/lib/sdk/crt/except/amd64/cpp.s
@@ -34,10 +34,10 @@ EXTERN &orig:ABS
 ALIAS <&alias> = <&orig>
 ENDM
 
-DEFINE_ALIAS ??3@YAXPAX@Z, MSVCRT_operator_delete
-DEFINE_ALIAS ??_U@YAPAXI@Z, MSVCRT_operator_new
-DEFINE_ALIAS ??_V@YAXPAX@Z, MSVCRT_operator_delete
-DEFINE_ALIAS ??2@YAPAXI@Z, MSVCRT_operator_new
+DEFINE_ALIAS ??3@YAXPEAX@Z, MSVCRT_operator_delete
+DEFINE_ALIAS ??_U@YAPEAX_K@Z, MSVCRT_operator_new
+DEFINE_ALIAS ??_V@YAXPEAX@Z, MSVCRT_operator_delete
+DEFINE_ALIAS ??2@YAPEAX_K@Z, MSVCRT_operator_new
 DEFINE_ALIAS ?_query_new_handler@@YAP6AHI@ZXZ, MSVCRT__query_new_handler
 DEFINE_ALIAS ?_set_new_handler@@YAP6AHI@ZP6AHI@Z@Z, MSVCRT__set_new_handler
 DEFINE_ALIAS ?set_new_handler@@YAP6AXXZP6AXXZ@Z, MSVCRT_set_new_handler
diff --git a/reactos/lib/sdk/crt/except/amd64/seh.s b/reactos/lib/sdk/crt/except/amd64/seh.s
index b714dda8ef9..6f8cba65e36 100644
--- a/reactos/lib/sdk/crt/except/amd64/seh.s
+++ b/reactos/lib/sdk/crt/except/amd64/seh.s
@@ -18,6 +18,7 @@
 /* GLOBALS *******************************************************************/
 
 PUBLIC _global_unwind2
+PUBLIC _local_unwind
 PUBLIC _local_unwind2
 PUBLIC _abnormal_termination
 PUBLIC _except_handler2
@@ -41,6 +42,11 @@ FUNC _abnormal_termination
     ret
 ENDFUNC _abnormal_termination
 
+FUNC _local_unwind
+    .endprolog
+    ret
+ENDFUNC _local_unwind
+
 FUNC _local_unwind2
     .endprolog
     ret