From ef18c8e3f7cee85841344b56cf2b72f0d05ed3e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= Date: Mon, 9 Jan 2023 14:03:46 +0800 Subject: [PATCH] Users: remove `"wtsapi32_extend"` as mingw_w64 now officially supports these APIs Ref: https://github.com/mirror/mingw-w64/commit/931ca20b233e766950e7758cff71c270937b0b64 --- src/detection/users/users_windows.c | 1 - src/detection/users/wtsapi32_extend.h | 45 --------------------------- 2 files changed, 46 deletions(-) delete mode 100644 src/detection/users/wtsapi32_extend.h diff --git a/src/detection/users/users_windows.c b/src/detection/users/users_windows.c index 7ed1c70fa..5c78cfdd7 100644 --- a/src/detection/users/users_windows.c +++ b/src/detection/users/users_windows.c @@ -2,7 +2,6 @@ #include "util/windows/unicode.h" #include -#include "wtsapi32_extend.h" void ffDetectUsers(FFlist* users, FFstrbuf* error) { diff --git a/src/detection/users/wtsapi32_extend.h b/src/detection/users/wtsapi32_extend.h deleted file mode 100644 index 5c89beb2f..000000000 --- a/src/detection/users/wtsapi32_extend.h +++ /dev/null @@ -1,45 +0,0 @@ -#pragma once - -//at the time of writing, of MinGW doesn't have the definition of WTSEnumerateSessionsExW and friends - -#if (_WIN32_WINNT >= 0x0601) - -typedef struct _WTS_SESSION_INFO_1A { - DWORD ExecEnvId; - WTS_CONNECTSTATE_CLASS State; - DWORD SessionId; - LPSTR pSessionName; - LPSTR pHostName; - LPSTR pUserName; - LPSTR pDomainName; - LPSTR pFarmName; -} WTS_SESSION_INFO_1A, *PWTS_SESSION_INFO_1A; - -typedef struct _WTS_SESSION_INFO_1W { - DWORD ExecEnvId; - WTS_CONNECTSTATE_CLASS State; - DWORD SessionId; - LPWSTR pSessionName; - LPWSTR pHostName; - LPWSTR pUserName; - LPWSTR pDomainName; - LPWSTR pFarmName; -} WTS_SESSION_INFO_1W, * PWTS_SESSION_INFO_1W; - -#define WTS_SESSION_INFO_1 __MINGW_NAME_AW(WTS_SESSION_INFO_1) -#define PWTS_SESSION_INFO_1 __MINGW_NAME_AW(PWTS_SESSION_INFO_1) - -WINBOOL WINAPI WTSEnumerateSessionsExA(HANDLE hServer,DWORD* pLevel,DWORD Filter,PWTS_SESSION_INFO_1A* ppSessionInfo,DWORD* pCount); -WINBOOL WINAPI WTSEnumerateSessionsExW(HANDLE hServer,DWORD* pLevel,DWORD Filter,PWTS_SESSION_INFO_1W* ppSessionInfo,DWORD* pCount); -#define WTSEnumerateSessionsEx __MINGW_NAME_AW(WTSEnumerateSessionsEx) - -typedef enum _WTS_TYPE_CLASS { - WTSTypeProcessInfoLevel0, - WTSTypeProcessInfoLevel1, - WTSTypeSessionInfoLevel1 -} WTS_TYPE_CLASS; -BOOL WTSFreeMemoryExA(WTS_TYPE_CLASS WTSTypeClass,PVOID pMemory,ULONG NumberOfEntries); -BOOL WTSFreeMemoryExW(WTS_TYPE_CLASS WTSTypeClass,PVOID pMemory,ULONG NumberOfEntries); -#define WTSFreeMemoryEx __MINGW_NAME_AW(WTSFreeMemoryEx) - -#endif /*(_WIN32_WINNT >= 0x0601)*/