[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

@@ -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)

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>

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)
 

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()