From 03c9810bee4e2e3fc961bd75b35d9e76eeb06ffa Mon Sep 17 00:00:00 2001
From: Alex Ionescu <aionescu@gmail.com>
Date: Thu, 21 Jul 2011 15:39:28 +0000
Subject: [PATCH] [NLS]: Kill this directory from the build. It produced
 nothing other than a Vista-calling DLL which was never even on the BootCD.
 [KERNEL32]: Remove GetLocaleInfoEx again. [KERNEL32]: It seems CMAKE build
 doesn't like kernel32 code calling "HeapAlloc" because HeapAlloc doesn't
 exist -- it's a forward to RtlAllocateHeap. As a hack, add compiler defines
 to do the forwarding in C code as well.

svn path=/trunk/; revision=52760
---
 reactos/dll/CMakeLists.txt                | 1 -
 reactos/dll/dll.rbuild                    | 3 ---
 reactos/dll/win32/kernel32/CMakeLists.txt | 4 ++++
 reactos/dll/win32/kernel32/kernel32.pspec | 1 -
 4 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/reactos/dll/CMakeLists.txt b/reactos/dll/CMakeLists.txt
index 77a2635c05c..dfba1ee53fd 100644
--- a/reactos/dll/CMakeLists.txt
+++ b/reactos/dll/CMakeLists.txt
@@ -3,7 +3,6 @@ add_subdirectory(3rdparty)
 add_subdirectory(cpl)
 add_subdirectory(directx)
 add_subdirectory(keyboard)
-add_subdirectory(nls)
 add_subdirectory(ntdll)
 add_subdirectory(shellext)
 add_subdirectory(win32)
diff --git a/reactos/dll/dll.rbuild b/reactos/dll/dll.rbuild
index c602a970785..99bf1e93179 100644
--- a/reactos/dll/dll.rbuild
+++ b/reactos/dll/dll.rbuild
@@ -13,9 +13,6 @@
 <directory name="keyboard">
 	<xi:include href="keyboard/keyboard.rbuild" />
 </directory>
-<directory name="nls">
-	<xi:include href="nls/nls.rbuild" />
-</directory>
 <directory name="ntdll">
 	<xi:include href="ntdll/ntdll.rbuild" />
 </directory>
diff --git a/reactos/dll/win32/kernel32/CMakeLists.txt b/reactos/dll/win32/kernel32/CMakeLists.txt
index 4b779fd199f..4c08677e5ff 100644
--- a/reactos/dll/win32/kernel32/CMakeLists.txt
+++ b/reactos/dll/win32/kernel32/CMakeLists.txt
@@ -1,6 +1,10 @@
 
 add_definitions(-D_KERNEL32_)
 
+add_definitions(-DHeapAlloc=RtlAllocateHeap)
+add_definitions(-DHeapFree=RtlFreeHeap)
+add_definitions(-DGetProcessHeap=RtlGetProcessHeap)
+
 remove_definitions(-D_WIN32_WINNT=0x502)
 add_definitions(-D_WIN32_WINNT=0x600)
 
diff --git a/reactos/dll/win32/kernel32/kernel32.pspec b/reactos/dll/win32/kernel32/kernel32.pspec
index b5937b502b7..06c102479f5 100644
--- a/reactos/dll/win32/kernel32/kernel32.pspec
+++ b/reactos/dll/win32/kernel32/kernel32.pspec
@@ -544,7 +544,6 @@
 @ stdcall GetLocalTime(ptr)
 @ stdcall GetLocaleInfoA(long long ptr long)
 @ stdcall GetLocaleInfoW(long long ptr long)
-@ stdcall GetLocaleInfoEx(wstr long wstr long) ; Vista+
 @ stdcall GetLogicalDriveStringsA(long ptr)
 @ stdcall GetLogicalDriveStringsW(long ptr)
 @ stdcall GetLogicalDrives()