mirror of
https://github.com/reactos/reactos.git
synced 2024-09-30 14:37:45 +00:00
[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
This commit is contained in:
parent
abbef1be00
commit
03c9810bee
|
@ -3,7 +3,6 @@ add_subdirectory(3rdparty)
|
||||||
add_subdirectory(cpl)
|
add_subdirectory(cpl)
|
||||||
add_subdirectory(directx)
|
add_subdirectory(directx)
|
||||||
add_subdirectory(keyboard)
|
add_subdirectory(keyboard)
|
||||||
add_subdirectory(nls)
|
|
||||||
add_subdirectory(ntdll)
|
add_subdirectory(ntdll)
|
||||||
add_subdirectory(shellext)
|
add_subdirectory(shellext)
|
||||||
add_subdirectory(win32)
|
add_subdirectory(win32)
|
||||||
|
|
|
@ -13,9 +13,6 @@
|
||||||
<directory name="keyboard">
|
<directory name="keyboard">
|
||||||
<xi:include href="keyboard/keyboard.rbuild" />
|
<xi:include href="keyboard/keyboard.rbuild" />
|
||||||
</directory>
|
</directory>
|
||||||
<directory name="nls">
|
|
||||||
<xi:include href="nls/nls.rbuild" />
|
|
||||||
</directory>
|
|
||||||
<directory name="ntdll">
|
<directory name="ntdll">
|
||||||
<xi:include href="ntdll/ntdll.rbuild" />
|
<xi:include href="ntdll/ntdll.rbuild" />
|
||||||
</directory>
|
</directory>
|
||||||
|
|
|
@ -1,6 +1,10 @@
|
||||||
|
|
||||||
add_definitions(-D_KERNEL32_)
|
add_definitions(-D_KERNEL32_)
|
||||||
|
|
||||||
|
add_definitions(-DHeapAlloc=RtlAllocateHeap)
|
||||||
|
add_definitions(-DHeapFree=RtlFreeHeap)
|
||||||
|
add_definitions(-DGetProcessHeap=RtlGetProcessHeap)
|
||||||
|
|
||||||
remove_definitions(-D_WIN32_WINNT=0x502)
|
remove_definitions(-D_WIN32_WINNT=0x502)
|
||||||
add_definitions(-D_WIN32_WINNT=0x600)
|
add_definitions(-D_WIN32_WINNT=0x600)
|
||||||
|
|
||||||
|
|
|
@ -544,7 +544,6 @@
|
||||||
@ stdcall GetLocalTime(ptr)
|
@ stdcall GetLocalTime(ptr)
|
||||||
@ stdcall GetLocaleInfoA(long long ptr long)
|
@ stdcall GetLocaleInfoA(long long ptr long)
|
||||||
@ stdcall GetLocaleInfoW(long long ptr long)
|
@ stdcall GetLocaleInfoW(long long ptr long)
|
||||||
@ stdcall GetLocaleInfoEx(wstr long wstr long) ; Vista+
|
|
||||||
@ stdcall GetLogicalDriveStringsA(long ptr)
|
@ stdcall GetLogicalDriveStringsA(long ptr)
|
||||||
@ stdcall GetLogicalDriveStringsW(long ptr)
|
@ stdcall GetLogicalDriveStringsW(long ptr)
|
||||||
@ stdcall GetLogicalDrives()
|
@ stdcall GetLogicalDrives()
|
||||||
|
|
Loading…
Reference in a new issue