ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Use sysinfo to report correct number of physical pages. 

Signed-off-by: Michael Müller <michael@fds-team.de>
Signed-off-by: Sebastian Lackner <sebastian@fds-team.de>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Müller 2016-07-08 05:40:22 +02:00 committed by Alexandre Julliard
parent a8044bebe8
commit d0832cdf42
4 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
configure vendored
View File

@ -6809,6 +6809,7 @@ for ac_header in \
sys/statvfs.h \ sys/statvfs.h \
sys/strtio.h \ sys/strtio.h \
sys/syscall.h \ sys/syscall.h \
sys/sysinfo.h \
sys/tihdr.h \ sys/tihdr.h \
sys/time.h \ sys/time.h \
sys/timeout.h \ sys/timeout.h \

1
configure.ac
View File

@ -494,6 +494,7 @@ AC_CHECK_HEADERS(\
sys/statvfs.h \ sys/statvfs.h \
sys/strtio.h \ sys/strtio.h \
sys/syscall.h \ sys/syscall.h \
sys/sysinfo.h \
sys/tihdr.h \ sys/tihdr.h \
sys/time.h \ sys/time.h \
sys/timeout.h \ sys/timeout.h \

14
dlls/ntdll/virtual.c
View File

@ -38,6 +38,9 @@
#ifdef HAVE_SYS_MMAN_H #ifdef HAVE_SYS_MMAN_H
# include <sys/mman.h> # include <sys/mman.h>
#endif #endif
#ifdef HAVE_SYS_SYSINFO_H
# include <sys/sysinfo.h>
#endif
#ifdef HAVE_VALGRIND_VALGRIND_H #ifdef HAVE_VALGRIND_VALGRIND_H
# include <valgrind/valgrind.h> # include <valgrind/valgrind.h>
#endif #endif
@ -1356,11 +1359,22 @@ void virtual_init_threading(void)
*/ */
void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info ) void virtual_get_system_info( SYSTEM_BASIC_INFORMATION *info )
{ {
#ifdef HAVE_SYS_SYSINFO_H
struct sysinfo sinfo;
#endif
info->unknown = 0; info->unknown = 0;
info->KeMaximumIncrement = 0; /* FIXME */ info->KeMaximumIncrement = 0; /* FIXME */
info->PageSize = page_size; info->PageSize = page_size;
info->MmLowestPhysicalPage = 1; info->MmLowestPhysicalPage = 1;
info->MmHighestPhysicalPage = 0x7fffffff / page_size; info->MmHighestPhysicalPage = 0x7fffffff / page_size;
#ifdef HAVE_SYS_SYSINFO_H
if (!sysinfo(&sinfo))
{
ULONG64 total = (ULONG64)sinfo.totalram * sinfo.mem_unit;
info->MmHighestPhysicalPage = max(1, total / page_size);
}
#endif
info->MmNumberOfPhysicalPages = info->MmHighestPhysicalPage - info->MmLowestPhysicalPage; info->MmNumberOfPhysicalPages = info->MmHighestPhysicalPage - info->MmLowestPhysicalPage;
info->AllocationGranularity = get_mask(0) + 1; info->AllocationGranularity = get_mask(0) + 1;
info->LowestUserAddress = (void *)0x10000; info->LowestUserAddress = (void *)0x10000;

3
include/config.h.in
View File

@ -1119,6 +1119,9 @@
/* Define to 1 if you have the <sys/sysctl.h> header file. */ /* Define to 1 if you have the <sys/sysctl.h> header file. */
#undef HAVE_SYS_SYSCTL_H #undef HAVE_SYS_SYSCTL_H
/* Define to 1 if you have the <sys/sysinfo.h> header file. */
#undef HAVE_SYS_SYSINFO_H
/* Define to 1 if you have the <sys/thr.h> header file. */ /* Define to 1 if you have the <sys/thr.h> header file. */
#undef HAVE_SYS_THR_H #undef HAVE_SYS_THR_H