kolan
/
gkrellm
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix building with mingw-w64 environment which contains some updated windows-heeaders. Remove dependency on liblargeint which does not exist on win64 and is unneeded as gcc has native 64bit integer support.

This commit is contained in:
Stefan Gehn 2010-06-21 14:47:25 +00:00
parent f3c095a4f6
commit 61ef995a7c
1 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/sysdeps/win32.c
View File

@ -42,16 +42,17 @@
#include "../win32-plugin.h" #include "../win32-plugin.h"
#endif #endif
#include <largeint.h> // For disk space calculation
#include <winioctl.h> // For cdrom eject #include <winioctl.h> // For cdrom eject
#include <iphlpapi.h> // For tcp connection stats #include <iphlpapi.h> // For tcp connection stats
// Following two are for cpu, proc, disk and network stats // Following two are for cpu, proc, disk and network stats
// which are queried via "performance data counters" // which are queried via "performance data counters"
#include <pdh.h> #include <pdh.h>
#include <pdhmsg.h> #include <pdhmsg.h>
// Following two are used to determine number of logged in users and // Following two are used to determine number of logged in users and
// pagefile usage via NT-APIs // pagefile usage via NT-APIs
#include <ntdef.h> #include <subauth.h>
#include <ntsecapi.h> #include <ntsecapi.h>
#if _WIN32_WINNT >= 0x501 // Windows XP or newer #if _WIN32_WINNT >= 0x501 // Windows XP or newer
@ -86,10 +87,12 @@ typedef struct _SYSTEM_PAGEFILE_INFORMATION
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------
// Structs and typedefs used to determine the number of logged in users. /* Structs and typedefs used to determine the number of logged in users.
// These should be in ntsecapi.h but are missing in MinGW currently. * These should be in ntsecapi.h but are missing in MinGW currently, they
// Docs: http://msdn.microsoft.com/en-us/library/aa378290(VS.85).aspx * are present in the headers provided by mingw-w64.
* Docs: http://msdn.microsoft.com/en-us/library/aa378290(VS.85).aspx
*/
#if defined(__MINGW32__) && !defined(WIN64)
typedef struct _SECURITY_LOGON_SESSION_DATA typedef struct _SECURITY_LOGON_SESSION_DATA
{ {
ULONG Size; ULONG Size;
@ -106,6 +109,7 @@ typedef struct _SECURITY_LOGON_SESSION_DATA
LSA_UNICODE_STRING Upn; LSA_UNICODE_STRING Upn;
} }
SECURITY_LOGON_SESSION_DATA; SECURITY_LOGON_SESSION_DATA;
#endif
// Definitions for function pointers (functions resolved manually at runtime) // Definitions for function pointers (functions resolved manually at runtime)
typedef NTSTATUS (NTAPI *pfLsaEnumerateLogonSessions)( typedef NTSTATUS (NTAPI *pfLsaEnumerateLogonSessions)(
@ -1436,7 +1440,7 @@ gkrellm_sys_disk_cleanup(void)
static PDH_HCOUNTER processCounter = NULL; static PDH_HCOUNTER processCounter = NULL;
static PDH_HCOUNTER waitQueueCounter = NULL; static PDH_HCOUNTER waitQueueCounter = NULL;
// Library handle for secur32.dll, lib is loaded at runtime // Library handle for secur32.dll, lib is loaded at runtime
static HANDLE hSecur32 = NULL; static HINSTANCE hSecur32 = NULL;
// Function pointers to various functions from secur32.dll // Function pointers to various functions from secur32.dll
static pfLsaEnumerateLogonSessions pfLELS = NULL; static pfLsaEnumerateLogonSessions pfLELS = NULL;
static pfLsaFreeReturnBuffer pfLFRB = NULL; static pfLsaFreeReturnBuffer pfLFRB = NULL;
@ -1754,7 +1758,7 @@ typedef struct _PERFORMANCE_INFORMATION {
typedef BOOL (WINAPI *pfGetPerformanceInfo)(PERFORMANCE_INFORMATION *, DWORD); typedef BOOL (WINAPI *pfGetPerformanceInfo)(PERFORMANCE_INFORMATION *, DWORD);
static HINSTANCE psapi_instance = NULL; static HINSTANCE hPsapi = NULL;
static pfGetPerformanceInfo pGPI = NULL; static pfGetPerformanceInfo pGPI = NULL;
static DWORD page_size = 1; static DWORD page_size = 1;
@ -1874,10 +1878,10 @@ gkrellm_sys_mem_init(void)
GetSystemInfo(&si); GetSystemInfo(&si);
page_size = si.dwPageSize; page_size = si.dwPageSize;
psapi_instance = LoadLibraryW(L"PSAPI.DLL"); hPsapi = LoadLibraryW(L"PSAPI.DLL");
if (psapi_instance) if (hPsapi)
{ {
pGPI = GetProcAddress(psapi_instance, "GetPerformanceInfo"); pGPI = (pfGetPerformanceInfo)GetProcAddress(hPsapi, "GetPerformanceInfo");
if (pGPI == NULL) if (pGPI == NULL)
{ {
gkrellm_debug(DEBUG_SYSDEP, "No GetPerformanceInfo() in " \ gkrellm_debug(DEBUG_SYSDEP, "No GetPerformanceInfo() in " \
@ -1896,9 +1900,9 @@ static void
gkrellm_sys_mem_cleanup(void) gkrellm_sys_mem_cleanup(void)
{ {
pGPI = NULL; pGPI = NULL;
if (psapi_instance) if (hPsapi != NULL)
FreeLibrary(psapi_instance); FreeLibrary(hPsapi);
psapi_instance = NULL; hPsapi = NULL;
} }
@ -2014,9 +2018,9 @@ void gkrellm_sys_fs_get_fsusage(gpointer fs, gchar *dir)
{ {
// fs, blocks, avail, free, size // fs, blocks, avail, free, size
gkrellm_fs_assign_fsusage_data(fs gkrellm_fs_assign_fsusage_data(fs
, EnlargedUnsignedDivide(totalBytes, 1024, 0) /* total */ , totalBytes.QuadPart / (ULONGLONG)1024
, EnlargedUnsignedDivide(availToCaller, 1024, 0) /* free to caller */ , availToCaller.QuadPart / (ULONGLONG)1024 /* free to caller */
, EnlargedUnsignedDivide(freeBytes, 1024, 0) /* free */ , freeBytes.QuadPart / (ULONGLONG)1024 /* free */
, 1024 /* block size */ , 1024 /* block size */
); );
} }
@ -2109,7 +2113,7 @@ void gkrellm_sys_fs_get_fstab_list(void)
/* ===================================================================== */ /* ===================================================================== */
// Library handle for Iphlpapi.dll, lib is loaded at runtime // Library handle for Iphlpapi.dll, lib is loaded at runtime
static HANDLE hIphlpapi = NULL; static HINSTANCE hIphlpapi = NULL;
// Function pointer to GetTcp6Table() which only exists on Vista and newer // Function pointer to GetTcp6Table() which only exists on Vista and newer
static GetTcp6TableFunc pfGetTcp6Table = NULL; static GetTcp6TableFunc pfGetTcp6Table = NULL;