Author: ion Date: Thu Jul 21 15:39:28 2011 New Revision: 52760
URL: http://svn.reactos.org/svn/reactos?rev=52760&view=rev Log: [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.
Modified: trunk/reactos/dll/CMakeLists.txt trunk/reactos/dll/dll.rbuild trunk/reactos/dll/win32/kernel32/CMakeLists.txt trunk/reactos/dll/win32/kernel32/kernel32.pspec
Modified: trunk/reactos/dll/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/CMakeLists.txt?rev=5276... ============================================================================== --- trunk/reactos/dll/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/CMakeLists.txt [iso-8859-1] Thu Jul 21 15:39:28 2011 @@ -3,7 +3,6 @@ add_subdirectory(cpl) add_subdirectory(directx) add_subdirectory(keyboard) -add_subdirectory(nls) add_subdirectory(ntdll) add_subdirectory(shellext) add_subdirectory(win32)
Modified: trunk/reactos/dll/dll.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/dll.rbuild?rev=52760&am... ============================================================================== --- trunk/reactos/dll/dll.rbuild [iso-8859-1] (original) +++ trunk/reactos/dll/dll.rbuild [iso-8859-1] Thu Jul 21 15:39:28 2011 @@ -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>
Modified: trunk/reactos/dll/win32/kernel32/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/CMakeLis... ============================================================================== --- trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/CMakeLists.txt [iso-8859-1] Thu Jul 21 15:39:28 2011 @@ -1,5 +1,9 @@
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)
Modified: trunk/reactos/dll/win32/kernel32/kernel32.pspec URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/kernel32... ============================================================================== --- trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] (original) +++ trunk/reactos/dll/win32/kernel32/kernel32.pspec [iso-8859-1] Thu Jul 21 15:39:28 2011 @@ -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()