diff --git a/compat/stdbool/stdbool.h b/compat/stdbool/stdbool.h deleted file mode 100644 index 331a4492f..000000000 --- a/compat/stdbool/stdbool.h +++ /dev/null @@ -1,22 +0,0 @@ -/*===---- stdbool.h - Standard header for booleans -------------------------=== - * - * Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. - * See https://llvm.org/LICENSE.txt for license information. - * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception - * - *===-----------------------------------------------------------------------=== - */ - -#ifndef __STDBOOL_H -#define __STDBOOL_H - -/* Don't define bool, true, and false in C++, except as a GNU extension. */ -#ifndef __cplusplus -typedef int bool; -#define true 1 -#define false 0 -#endif - -#define __bool_true_false_are_defined 1 - -#endif /* __STDBOOL_H */ diff --git a/winpr/CMakeLists.txt b/winpr/CMakeLists.txt index 0bd54cde3..1d80f8396 100644 --- a/winpr/CMakeLists.txt +++ b/winpr/CMakeLists.txt @@ -189,42 +189,38 @@ else() endif() include(CheckTypeSize) +set(CMAKE_EXTRA_INCLUDE_FILES "sys/types.h") check_type_size(ssize_t SSIZE_T) + +set(CMAKE_EXTRA_INCLUDE_FILES "BaseTsd.h") +check_type_size(SSIZE_T WIN_SSIZE_T) + set(WINPR_HAVE_SSIZE_T ${HAVE_SSIZE_T}) +set(WINPR_HAVE_WIN_SSIZE_T ${HAVE_WIN_SSIZE_T}) -if(NOT IOS) - check_symbol_exists(strndup string.h WINPR_HAVE_STRNDUP) - check_include_files(unistd.h WINPR_HAVE_UNISTD_H) - check_include_files(execinfo.h WINPR_HAVE_EXECINFO_HEADER) - if(WINPR_HAVE_EXECINFO_HEADER) - check_symbol_exists(backtrace execinfo.h WINPR_HAVE_EXECINFO_BACKTRACE) - check_symbol_exists(backtrace_symbols execinfo.h WINPR_HAVE_EXECINFO_BACKTRACE_SYMBOLS) - check_symbol_exists(backtrace_symbols_fd execinfo.h WINPR_HAVE_EXECINFO_BACKTRACE_SYMBOLS_FD) +check_symbol_exists(strndup string.h WINPR_HAVE_STRNDUP) +check_include_files(unistd.h WINPR_HAVE_UNISTD_H) +check_include_files(execinfo.h WINPR_HAVE_EXECINFO_HEADER) +if(WINPR_HAVE_EXECINFO_HEADER) + check_symbol_exists(backtrace execinfo.h WINPR_HAVE_EXECINFO_BACKTRACE) + check_symbol_exists(backtrace_symbols execinfo.h WINPR_HAVE_EXECINFO_BACKTRACE_SYMBOLS) + check_symbol_exists(backtrace_symbols_fd execinfo.h WINPR_HAVE_EXECINFO_BACKTRACE_SYMBOLS_FD) - # Some implementations (e.g. Android NDK API < 33) provide execinfo.h but do not define - # the backtrace functions. Disable detection for these cases - if(WINPR_HAVE_EXECINFO_BACKTRACE AND WINPR_HAVE_EXECINFO_BACKTRACE_SYMBOLS - AND WINPR_HAVE_EXECINFO_BACKTRACE_SYMBOLS_FD - ) - set(WINPR_HAVE_EXECINFO_H ON) - endif() + # Some implementations (e.g. Android NDK API < 33) provide execinfo.h but do not define + # the backtrace functions. Disable detection for these cases + if(WINPR_HAVE_EXECINFO_BACKTRACE AND WINPR_HAVE_EXECINFO_BACKTRACE_SYMBOLS + AND WINPR_HAVE_EXECINFO_BACKTRACE_SYMBOLS_FD + ) + set(WINPR_HAVE_EXECINFO_H ON) endif() - check_include_files(inttypes.h WINPR_HAVE_INTTYPES_H) - check_include_files(stdint.h WINPR_HAVE_STDINT_H) - check_include_files(inttypes.h WINPR_HAVE_INTTYPES_H) -else(NOT IOS) - set(WINPR_HAVE_STDINT_H 1) - set(WINPR_HAVE_STRNDUP 1) - set(WINPR_HAVE_INTTYPES_H 1) -endif(NOT IOS) +endif() -if(NOT IOS) - check_include_files(stdbool.h WINPR_HAVE_STDBOOL_H) - if(NOT WINPR_HAVE_STDBOOL_H) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/../compat/stdbool) - endif() -else() - set(WINPR_HAVE_STDBOOL_H 1) +check_include_files(stdint.h WINPR_HAVE_STDINT_H) +check_include_files(inttypes.h WINPR_HAVE_INTTYPES_H) +check_include_files(stdbool.h WINPR_HAVE_STDBOOL_H) + +if(NOT WINPR_HAVE_INTTYPES_H OR NOT WINPR_HAVE_STDINT_H OR NOT WINPR_HAVE_STDBOOL_H) + message(FATAL_ERROR "c11 headers stdint.h, stdbool.h and inttypes.h are required, giving up") endif() set(CMAKE_THREAD_PREFER_PTHREAD TRUE) diff --git a/winpr/include/CMakeLists.txt b/winpr/include/CMakeLists.txt index b6ce1ea81..a85dbdb34 100644 --- a/winpr/include/CMakeLists.txt +++ b/winpr/include/CMakeLists.txt @@ -19,7 +19,6 @@ include(CFlagsToVar) cflagstovar(C_FLAGS) cleaning_configure_file(config/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/version.h) -cleaning_configure_file(config/wtypes.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/wtypes.h) cleaning_configure_file(config/build-config.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/build-config.h) cleaning_configure_file(config/buildflags.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/buildflags.h) cleaning_configure_file(config/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/winpr/config.h) diff --git a/winpr/include/config/config.h.in b/winpr/include/config/config.h.in index 0d53e7749..ce419556a 100644 --- a/winpr/include/config/config.h.in +++ b/winpr/include/config/config.h.in @@ -24,6 +24,7 @@ #cmakedefine WINPR_HAVE_STRNDUP #cmakedefine WINPR_HAVE_UNWIND_H #cmakedefine WINPR_HAVE_SSIZE_T +#cmakedefine WINPR_HAVE_WIN_SSIZE_T #cmakedefine WINPR_WITH_PNG #cmakedefine WINPR_HAVE_STRERROR_R /** @since version 3.3.0 */ diff --git a/winpr/include/config/wtypes.h.in b/winpr/include/config/wtypes.h.in deleted file mode 100644 index e34f1cd35..000000000 --- a/winpr/include/config/wtypes.h.in +++ /dev/null @@ -1,676 +0,0 @@ -/** - * WinPR: Windows Portable Runtime - * Windows Data Types - * - * Copyright 2012 Marc-Andre Moreau - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef WINPR_WTYPES_H -#define WINPR_WTYPES_H - -#include - -/* Set by CMake during configuration */ -#cmakedefine WINPR_HAVE_STDINT_H -#cmakedefine WINPR_HAVE_STDBOOL_H - -#if !defined(_MSC_VER) || _MSC_VER >= 1900 -/* Microsoft's inttypes.h is broken before MSVC 2015 */ -#cmakedefine WINPR_HAVE_INTTYPES_H -#endif - -/* MSDN: Windows Data Types - http://msdn.microsoft.com/en-us/library/aa383751/ */ -/* [MS-DTYP]: Windows Data Types - http://msdn.microsoft.com/en-us/library/cc230273/ */ - -#include -#include - -#include - -#ifdef WINPR_HAVE_STDBOOL_H -#include -#endif - -#ifdef WINPR_HAVE_STDINT_H -#include -#endif - -#ifdef WINPR_HAVE_INTTYPES_H -#include -#endif - -#include - -#if defined(_WIN32) || defined(__MINGW32__) -#include - -/* Handle missing ssize_t on Windows */ -#ifdef _WIN64 -typedef long long LONG_PTR; -#else -typedef long LONG_PTR; -#endif - -#if ssize_t -typedef ssize_t SSIZE_T -#else -typedef LONG_PTR SSIZE_T; -#endif - -#endif - -#if defined(__OBJC__) && defined(__APPLE__) -#include -#endif - -#ifndef CONST -#define CONST const -#endif - -#ifndef VOID -#define VOID void -#endif - - WINPR_PRAGMA_DIAG_PUSH - WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO - WINPR_PRAGMA_DIAG_IGNORED_RESERVED_IDENTIFIER - -#if !defined(_WIN32) && !defined(__MINGW32__) - -#define CALLBACK - -#define WINAPI -#define CDECL - -#ifndef FAR -#define FAR -#endif - -#ifndef NEAR -#define NEAR -#endif - -#ifdef WINPR_HAVE_STDINT_H - typedef int8_t __int8; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) -typedef uint8_t __uint8; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef int16_t __int16; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef uint16_t __uint16; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) -typedef int32_t __int32; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef uint32_t __uint32; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) -typedef int64_t __int64; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef uint64_t __uint64; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) -#else -#if UCHAR_MAX == 0xFF - typedef signed char __int8; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef unsigned char __uint8; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -#else -#error "8-bit type not configured" -#endif -#if USHRT_MAX == 0xFFFF -typedef short __int16; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef unsigned short __uint16; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -#elif UINT_MAX == 0xFFFF - typedef int __int16; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef unsigned int __uint16; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -#error "16-bit type not configured" -#endif -#if UINT_MAX == 0xFFFFFFFF -typedef int __int32; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef unsigned int __uint32; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -#elif ULONG_MAX == 0xFFFFFFFF -typedef long __int32; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef unsigned long __uint32; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -#else -#error "32-bit type not configured" -#endif -#if ULONG_MAX == 0xFFFFFFFFFFFFFFFF -typedef long __int64; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef unsigned long __uint64; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -#elif ULLONG_MAX == 0xFFFFFFFFFFFFFFFF -typedef long long __int64; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef unsigned long long - __uint64; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -#else -#error "64-bit type not configured" -#endif -#endif /* WINPR_HAVE_STDINT_H */ - -#ifdef WINPR_HAVE_STDINT_H -#if defined(__ILP64__) || defined(__LP64__) -#define __int3264 int64_t // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -#define __uint3264 uint64_t // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -#else -#define __int3264 int32_t // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -#define __uint3264 uint32_t // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -#endif -#else -#if defined(__ILP64__) || defined(__LP64__) -#define __int3264 __int64 // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -#define __uint3264 __uint64 // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -#else -#define __int3264 __int32 // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -#define __uint3264 __uint32 // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -#endif -#endif /* WINPR_HAVE_STDINT_H */ - -typedef void *PVOID, *LPVOID, *PVOID64, *LPVOID64; - -#ifndef XMD_H /* X11/Xmd.h typedef collision with BOOL */ -#ifndef __OBJC__ /* objc.h typedef collision with BOOL */ -#ifndef __APPLE__ -typedef __int32 BOOL; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -#else /* __APPLE__ */ -#include - -/* ensure compatibility with objc libraries */ -#if (defined(TARGET_OS_IPHONE) && (TARGET_OS_IPHONE != 0) && defined(__LP64__)) || \ - (defined(TARGET_OS_WATCH) && (TARGET_OS_WATCH != 0)) -typedef bool BOOL; -#else -typedef signed char BOOL; -#endif -#endif /* __APPLE__ */ -#endif /* __OBJC__ */ -#endif /* XMD_H */ - -typedef BOOL *PBOOL, *LPBOOL; - -#ifndef FALSE -#define FALSE 0 -#endif - -#ifndef TRUE -#define TRUE 1 -#endif - -#ifndef XMD_H /* X11/Xmd.h typedef collision with BYTE */ -typedef __uint8 BYTE; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -#endif /* XMD_H */ -typedef BYTE byte, *PBYTE, *LPBYTE; -typedef BYTE BOOLEAN, PBOOLEAN; - -#if CHAR_BIT == 8 -typedef char CHAR; -typedef unsigned char UCHAR; -#else -typedef __int8 CHAR; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef __uint8 UCHAR; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -#endif -typedef CHAR CCHAR, *PCHAR, *LPCH, *PCH, *PSTR, *LPSTR; -typedef const CHAR *LPCCH, *PCCH, *LPCSTR, *PCSTR; -typedef UCHAR* PUCHAR; - -typedef __uint16 WCHAR; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef WCHAR UNICODE, *PWCHAR, *LPWCH, *PWCH, *BSTR, *LMSTR, *LPWSTR, *PWSTR; -typedef const WCHAR *LPCWCH, *PCWCH, *LMCSTR, *LPCWSTR, *PCWSTR; - -typedef __int16 SHORT, *PSHORT; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef __int32 INT, *PINT, - *LPINT; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef __int32 LONG, *PLONG, - *LPLONG; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef __int64 LONGLONG, - *PLONGLONG; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef __uint32 UINT, *PUINT, - *LPUINT; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef __uint16 USHORT, - *PUSHORT; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef __uint32 ULONG, *PULONG; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef __uint64 ULONGLONG, - *PULONGLONG; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -#ifndef XMD_H /* X11/Xmd.h typedef collisions */ -typedef __int8 INT8; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef __int16 INT16; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef __int32 INT32; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef __int64 INT64; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -#endif -typedef INT8* PINT8; -typedef INT16* PINT16; -typedef INT32* PINT32; -typedef INT64* PINT64; - -typedef __int32 LONG32, - *PLONG32; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -#ifndef LONG64 /* X11/Xmd.h uses/defines LONG64 */ -typedef __int64 LONG64, - *PLONG64; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -#endif - -typedef __uint8 UINT8, *PUINT8; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef __uint16 UINT16, - *PUINT16; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef __uint32 UINT32, - *PUINT32; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef __uint64 UINT64, - *PUINT64; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef __uint64 ULONG64, - *PULONG64; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef __uint16 WORD, *PWORD, - *LPWORD; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef __uint32 DWORD, DWORD32, *PDWORD, *LPDWORD, - *PDWORD32; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef __uint64 DWORD64, DWORDLONG, QWORD, *PDWORD64, *PDWORDLONG, - *PQWORD; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef __int3264 INT_PTR, - *PINT_PTR; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef __uint3264 UINT_PTR, - *PUINT_PTR; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef __int3264 LONG_PTR, - *PLONG_PTR; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef __uint3264 ULONG_PTR, - *PULONG_PTR; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef __uint3264 DWORD_PTR, - *PDWORD_PTR; // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef ULONG_PTR SIZE_T, *PSIZE_T; /** deprecated */ -#if defined(WINPR_HAVE_SSIZE_T) -#include -typedef ssize_t SSIZE_T, *PSSIZE_T; -#else -typedef LONG_PTR SSIZE_T, *PSSIZE_T; -#endif - -typedef float FLOAT; - -typedef double DOUBLE; - -typedef void *HANDLE, *PHANDLE, *LPHANDLE; -typedef HANDLE HINSTANCE; -typedef HANDLE HMODULE; -typedef HANDLE HWND; -typedef HANDLE HBITMAP; -typedef HANDLE HICON; -typedef HANDLE HCURSOR; -typedef HANDLE HBRUSH; -typedef HANDLE HMENU; - -typedef DWORD HCALL; - -typedef ULONG error_status_t; -typedef LONG HRESULT; -typedef LONG SCODE; -typedef SCODE* PSCODE; - -typedef struct s_POINTL /* ptl */ -{ - LONG x; - LONG y; -} POINTL, *PPOINTL; - -typedef struct tagSIZE -{ - LONG cx; - LONG cy; -} SIZE, *PSIZE, *LPSIZE; - -typedef SIZE SIZEL; - -typedef struct s_GUID -{ - UINT32 Data1; - UINT16 Data2; - UINT16 Data3; - BYTE Data4[8]; -} GUID, UUID, *PGUID, *LPGUID, *LPCGUID; -typedef GUID CLSID; - -typedef struct s_LUID -{ - DWORD LowPart; - LONG HighPart; -} LUID, *PLUID; - -typedef GUID IID; -typedef IID* REFIID; - -#ifdef UNICODE -#define _T(x) L##x // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -#else -#define _T(x) x // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -#endif - -#ifdef UNICODE -typedef LPWSTR PTSTR; -typedef LPWSTR LPTCH; -typedef LPWSTR LPTSTR; -typedef LPCWSTR LPCTSTR; -#else -typedef LPSTR PTSTR; -typedef LPSTR LPTCH; -typedef LPSTR LPTSTR; -typedef LPCSTR LPCTSTR; -#endif - -typedef union u_ULARGE_INTEGER -{ - struct - { - DWORD LowPart; - DWORD HighPart; - } DUMMYSTRUCTNAME; - - struct - { - DWORD LowPart; - DWORD HighPart; - } u; - - ULONGLONG QuadPart; -} ULARGE_INTEGER, *PULARGE_INTEGER; - -typedef union u_LARGE_INTEGER -{ - struct - { - DWORD LowPart; - LONG HighPart; - } DUMMYSTRUCTNAME; - - struct - { - DWORD LowPart; - LONG HighPart; - } u; - - LONGLONG QuadPart; -} LARGE_INTEGER, *PLARGE_INTEGER; - -typedef struct s_FILETIME -{ - DWORD dwLowDateTime; - DWORD dwHighDateTime; -} FILETIME, *PFILETIME, *LPFILETIME; - -typedef struct s_SYSTEMTIME -{ - WORD wYear; - WORD wMonth; - WORD wDayOfWeek; - WORD wDay; - WORD wHour; - WORD wMinute; - WORD wSecond; - WORD wMilliseconds; -} SYSTEMTIME, *PSYSTEMTIME, *LPSYSTEMTIME; - -typedef struct s_RPC_SID_IDENTIFIER_AUTHORITY -{ - BYTE Value[6]; -} RPC_SID_IDENTIFIER_AUTHORITY; - -typedef DWORD SECURITY_INFORMATION, *PSECURITY_INFORMATION; - -typedef struct s_RPC_SID -{ - UCHAR Revision; - UCHAR SubAuthorityCount; - RPC_SID_IDENTIFIER_AUTHORITY IdentifierAuthority; - ULONG SubAuthority[1]; -} RPC_SID, *PRPC_SID, *PSID; - -typedef struct s_ACL -{ - UCHAR AclRevision; - UCHAR Sbz1; - USHORT AclSize; - USHORT AceCount; - USHORT Sbz2; -} ACL, *PACL; - -typedef struct s_SECURITY_DESCRIPTOR -{ - UCHAR Revision; - UCHAR Sbz1; - USHORT Control; - PSID Owner; - PSID Group; - PACL Sacl; - PACL Dacl; -} SECURITY_DESCRIPTOR, *PSECURITY_DESCRIPTOR; - -typedef WORD SECURITY_DESCRIPTOR_CONTROL, *PSECURITY_DESCRIPTOR_CONTROL; - -typedef struct s_SECURITY_ATTRIBUTES -{ - DWORD nLength; - LPVOID lpSecurityDescriptor; - BOOL bInheritHandle; -} SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES; - -typedef struct s_PROCESS_INFORMATION -{ - HANDLE hProcess; - HANDLE hThread; - DWORD dwProcessId; - DWORD dwThreadId; -} PROCESS_INFORMATION, *PPROCESS_INFORMATION, *LPPROCESS_INFORMATION; - -typedef DWORD (*PTHREAD_START_ROUTINE)(LPVOID lpThreadParameter); -typedef PTHREAD_START_ROUTINE LPTHREAD_START_ROUTINE; - -typedef void* FARPROC; - -typedef struct tagDEC -{ - USHORT wReserved; - union - { - struct - { - BYTE scale; - BYTE sign; - } DUMMYSTRUCTNAME; - USHORT signscale; - } DUMMYUNIONNAME; - ULONG Hi32; - union - { - struct - { - ULONG Lo32; - ULONG Mid32; - } DUMMYSTRUCTNAME2; - ULONGLONG Lo64; - } DUMMYUNIONNAME2; -} DECIMAL; - -typedef DECIMAL* LPDECIMAL; - -#define DECIMAL_NEG ((BYTE)0x80) -#define DECIMAL_SETZERO(dec) \ - { \ - (dec).Lo64 = 0; \ - (dec).Hi32 = 0; \ - (dec).signscale = 0; \ - } - -typedef DWORD LCID; -typedef PDWORD PLCID; -typedef WORD LANGID; - -#endif /* _WIN32 not defined */ - -typedef void* PCONTEXT_HANDLE; -typedef PCONTEXT_HANDLE* PPCONTEXT_HANDLE; - -#ifndef _NTDEF -typedef LONG NTSTATUS; -typedef NTSTATUS* PNTSTATUS; -#endif - -#ifndef _LPCVOID_DEFINED // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -#define _LPCVOID_DEFINED // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef const VOID* LPCVOID; -#endif - -#ifndef _LPCBYTE_DEFINED // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -#define _LPCBYTE_DEFINED // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) - -typedef const BYTE* LPCBYTE; -#endif - -/* integer format specifiers */ -#ifndef WINPR_HAVE_INTTYPES_H -#define PRId8 "hhd" -#define PRIi8 "hhi" -#define PRIu8 "hhu" -#define PRIo8 "hho" -#define PRIx8 "hhx" -#define PRIX8 "hhX" -#define PRId16 "hd" -#define PRIi16 "hi" -#define PRIu16 "hu" -#define PRIo16 "ho" -#define PRIx16 "hx" -#define PRIX16 "hX" -#if defined(_MSC_VER) -#define PRId32 "I32d" -#define PRIi32 "I32i" -#define PRIu32 "I32u" -#define PRIo32 "I32o" -#define PRIx32 "I32x" -#define PRIX32 "I32X" -#define PRId64 "I64d" -#define PRIi64 "I64i" -#define PRIu64 "I64u" -#define PRIo64 "I64o" -#define PRIx64 "I64x" -#define PRIX64 "I64X" -#else -#define PRId32 "d" -#define PRIi32 "i" -#define PRIu32 "u" -#define PRIo32 "o" -#define PRIx32 "x" -#define PRIX32 "X" -#if ULONG_MAX == 0xFFFFFFFFFFFFFFFF -#define PRId64 "ld" -#define PRIi64 "li" -#define PRIu64 "lu" -#define PRIo64 "lo" -#define PRIx64 "lx" -#define PRIX64 "lX" -#else -#define PRId64 "lld" -#define PRIi64 "lli" -#define PRIu64 "llu" -#define PRIo64 "llo" -#define PRIx64 "llx" -#define PRIX64 "llX" -#endif -#endif /* _MSC_VER */ -#endif /* WINPR_HAVE_INTTYPES_H not defined*/ - -#ifndef SSIZE_MAX -#if defined(_POSIX_SSIZE_MAX) -#define SSIZE_MAX _POSIX_SSIZE_MAX -#elif defined(_WIN64) -#define SSIZE_MAX _I64_MAX -#elif defined(_WIN32) -#define SSIZE_MAX LONG_MAX -#else -#define SSIZE_MAX LONG_MAX -#endif -#endif - -#if defined(_MSC_VER) && _MSC_VER < 1900 -/* %z not supported before MSVC 2015 */ -#define PRIdz "Id" -#define PRIiz "Ii" -#define PRIuz "Iu" -#define PRIoz "Io" -#define PRIxz "Ix" -#define PRIXz "IX" -#else -#define PRIdz "zd" -#define PRIiz "zi" -#define PRIuz "zu" -#define PRIoz "zo" -#define PRIxz "zx" -#define PRIXz "zX" -#endif - -#include - -#ifndef _WIN32 -#define _fseeki64(fp, offset, origin) fseeko(fp, offset, origin) -#define _ftelli64(fp) ftello(fp) -#endif - -WINPR_PRAGMA_DIAG_POP - -#endif /* WINPR_WTYPES_H */ diff --git a/winpr/include/winpr/wtypes.h b/winpr/include/winpr/wtypes.h new file mode 100644 index 000000000..cdc75fee2 --- /dev/null +++ b/winpr/include/winpr/wtypes.h @@ -0,0 +1,498 @@ +/** + * WinPR: Windows Portable Runtime + * Windows Data Types + * + * Copyright 2012 Marc-Andre Moreau + * Copyright 2024 Armin Novak + * Copyright 2024 Thincast Technologies GmbH + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef WINPR_WTYPES_H +#define WINPR_WTYPES_H + +#include + +#include +#include + +/* MSDN: Windows Data Types - http://msdn.microsoft.com/en-us/library/aa383751/ */ +/* [MS-DTYP]: Windows Data Types - http://msdn.microsoft.com/en-us/library/cc230273/ */ + +#include +#include + +#include + +#include +#include +#include + +#include + +#if defined(_WIN32) || defined(__MINGW32__) +#include + +/* Handle missing ssize_t on Windows */ +#if defined(WINPR_HAVE_SSIZE_T) +typedef ssize_t SSIZE_T; +#elif !defined(WINPR_HAVE_WIN_SSIZE_T) +typedef intptr_t SSIZE_T; +#endif + +#endif + +#if defined(__OBJC__) && defined(__APPLE__) +#include +#endif + +#ifndef CONST +#define CONST const +#endif + +#ifndef VOID +#define VOID void +#endif + +WINPR_PRAGMA_DIAG_PUSH WINPR_PRAGMA_DIAG_IGNORED_RESERVED_ID_MACRO + WINPR_PRAGMA_DIAG_IGNORED_RESERVED_IDENTIFIER + +#if !defined(_WIN32) && !defined(__MINGW32__) + +#define CALLBACK + +#define WINAPI +#define CDECL + +#ifndef FAR +#define FAR +#endif + +#ifndef NEAR +#define NEAR +#endif + + typedef void *PVOID, + *LPVOID, *PVOID64, *LPVOID64; + +#ifndef XMD_H /* X11/Xmd.h typedef collision with BOOL */ +#ifndef __OBJC__ /* objc.h typedef collision with BOOL */ +#ifndef __APPLE__ +typedef int32_t BOOL; + +#else /* __APPLE__ */ +#include + +/* ensure compatibility with objc libraries */ +#if (defined(TARGET_OS_IPHONE) && (TARGET_OS_IPHONE != 0) && defined(__LP64__)) || \ + (defined(TARGET_OS_WATCH) && (TARGET_OS_WATCH != 0)) +typedef bool BOOL; +#else +typedef signed char BOOL; +#endif +#endif /* __APPLE__ */ +#endif /* __OBJC__ */ +#endif /* XMD_H */ + +typedef BOOL *PBOOL, *LPBOOL; + +#ifndef FALSE +#define FALSE false +#endif + +#ifndef TRUE +#define TRUE true +#endif + +#ifndef XMD_H /* X11/Xmd.h typedef collision with BYTE */ +typedef uint8_t BYTE; + +#endif /* XMD_H */ +typedef BYTE byte, *PBYTE, *LPBYTE; +typedef BYTE BOOLEAN, PBOOLEAN; + +#if CHAR_BIT == 8 +typedef char CHAR; +typedef unsigned char UCHAR; +#else +typedef int8_t CHAR; + +typedef uint8_t UCHAR; + +#endif +typedef CHAR CCHAR, *PCHAR, *LPCH, *PCH, *PSTR, *LPSTR; +typedef const CHAR *LPCCH, *PCCH, *LPCSTR, *PCSTR; +typedef UCHAR* PUCHAR; + +typedef uint16_t WCHAR; + +typedef WCHAR UNICODE, *PWCHAR, *LPWCH, *PWCH, *BSTR, *LMSTR, *LPWSTR, *PWSTR; +typedef const WCHAR *LPCWCH, *PCWCH, *LMCSTR, *LPCWSTR, *PCWSTR; + +typedef int16_t SHORT, *PSHORT; + +typedef int32_t INT, *PINT, *LPINT; + +typedef int32_t LONG, *PLONG, *LPLONG; + +typedef int64_t LONGLONG, *PLONGLONG; + +typedef uint32_t UINT, *PUINT, *LPUINT; + +typedef uint16_t USHORT, *PUSHORT; + +typedef uint32_t ULONG, *PULONG; + +typedef uint64_t ULONGLONG, *PULONGLONG; + +#ifndef XMD_H /* X11/Xmd.h typedef collisions */ +typedef int8_t INT8; + +typedef int16_t INT16; + +typedef int32_t INT32; + +typedef int64_t INT64; + +#endif +typedef INT8* PINT8; +typedef INT16* PINT16; +typedef INT32* PINT32; +typedef INT64* PINT64; + +typedef int32_t LONG32, *PLONG32; + +#ifndef LONG64 /* X11/Xmd.h uses/defines LONG64 */ +typedef int64_t LONG64, *PLONG64; + +#endif + +typedef uint8_t UINT8, *PUINT8; + +typedef uint16_t UINT16, *PUINT16; + +typedef uint32_t UINT32, *PUINT32; + +typedef uint64_t UINT64, *PUINT64; + +typedef uint64_t ULONG64, *PULONG64; + +typedef uint16_t WORD, *PWORD, *LPWORD; + +typedef uint32_t DWORD, DWORD32, *PDWORD, *LPDWORD, *PDWORD32; + +typedef uint64_t DWORD64, DWORDLONG, QWORD, *PDWORD64, *PDWORDLONG, *PQWORD; + +typedef intptr_t INT_PTR, *PINT_PTR; + +typedef uintptr_t UINT_PTR, *PUINT_PTR; + +typedef intptr_t LONG_PTR, *PLONG_PTR; + +typedef uintptr_t ULONG_PTR, *PULONG_PTR; + +typedef uintptr_t DWORD_PTR, *PDWORD_PTR; + +typedef ULONG_PTR SIZE_T, *PSIZE_T; /** deprecated */ +#if defined(WINPR_HAVE_SSIZE_T) +#include +typedef ssize_t SSIZE_T; +#elif !defined(WINPR_HAVE_WIN_SSIZE_T) +typedef LONG_PTR SSIZE_T; +#endif + +typedef float FLOAT; + +typedef double DOUBLE; + +typedef void *HANDLE, *PHANDLE, *LPHANDLE; +typedef HANDLE HINSTANCE; +typedef HANDLE HMODULE; +typedef HANDLE HWND; +typedef HANDLE HBITMAP; +typedef HANDLE HICON; +typedef HANDLE HCURSOR; +typedef HANDLE HBRUSH; +typedef HANDLE HMENU; + +typedef DWORD HCALL; + +typedef ULONG error_status_t; +typedef LONG HRESULT; +typedef LONG SCODE; +typedef SCODE* PSCODE; + +typedef struct s_POINTL /* ptl */ +{ + LONG x; + LONG y; +} POINTL, *PPOINTL; + +typedef struct tagSIZE +{ + LONG cx; + LONG cy; +} SIZE, *PSIZE, *LPSIZE; + +typedef SIZE SIZEL; + +typedef struct s_GUID +{ + UINT32 Data1; + UINT16 Data2; + UINT16 Data3; + BYTE Data4[8]; +} GUID, UUID, *PGUID, *LPGUID, *LPCGUID; +typedef GUID CLSID; + +typedef struct s_LUID +{ + DWORD LowPart; + LONG HighPart; +} LUID, *PLUID; + +typedef GUID IID; +typedef IID* REFIID; + +#ifdef UNICODE +#define _T(x) u##x // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) + +#else +#define _T(x) x // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) + +#endif + +#ifdef UNICODE +typedef LPWSTR PTSTR; +typedef LPWSTR LPTCH; +typedef LPWSTR LPTSTR; +typedef LPCWSTR LPCTSTR; +#else +typedef LPSTR PTSTR; +typedef LPSTR LPTCH; +typedef LPSTR LPTSTR; +typedef LPCSTR LPCTSTR; +#endif + +typedef union u_ULARGE_INTEGER +{ + struct + { + DWORD LowPart; + DWORD HighPart; + } DUMMYSTRUCTNAME; + + struct + { + DWORD LowPart; + DWORD HighPart; + } u; + + ULONGLONG QuadPart; +} ULARGE_INTEGER, *PULARGE_INTEGER; + +typedef union u_LARGE_INTEGER +{ + struct + { + DWORD LowPart; + LONG HighPart; + } DUMMYSTRUCTNAME; + + struct + { + DWORD LowPart; + LONG HighPart; + } u; + + LONGLONG QuadPart; +} LARGE_INTEGER, *PLARGE_INTEGER; + +typedef struct s_FILETIME +{ + DWORD dwLowDateTime; + DWORD dwHighDateTime; +} FILETIME, *PFILETIME, *LPFILETIME; + +typedef struct s_SYSTEMTIME +{ + WORD wYear; + WORD wMonth; + WORD wDayOfWeek; + WORD wDay; + WORD wHour; + WORD wMinute; + WORD wSecond; + WORD wMilliseconds; +} SYSTEMTIME, *PSYSTEMTIME, *LPSYSTEMTIME; + +typedef struct s_RPC_SID_IDENTIFIER_AUTHORITY +{ + BYTE Value[6]; +} RPC_SID_IDENTIFIER_AUTHORITY; + +typedef DWORD SECURITY_INFORMATION, *PSECURITY_INFORMATION; + +typedef struct s_RPC_SID +{ + UCHAR Revision; + UCHAR SubAuthorityCount; + RPC_SID_IDENTIFIER_AUTHORITY IdentifierAuthority; + ULONG SubAuthority[1]; +} RPC_SID, *PRPC_SID, *PSID; + +typedef struct s_ACL +{ + UCHAR AclRevision; + UCHAR Sbz1; + USHORT AclSize; + USHORT AceCount; + USHORT Sbz2; +} ACL, *PACL; + +typedef struct s_SECURITY_DESCRIPTOR +{ + UCHAR Revision; + UCHAR Sbz1; + USHORT Control; + PSID Owner; + PSID Group; + PACL Sacl; + PACL Dacl; +} SECURITY_DESCRIPTOR, *PSECURITY_DESCRIPTOR; + +typedef WORD SECURITY_DESCRIPTOR_CONTROL, *PSECURITY_DESCRIPTOR_CONTROL; + +typedef struct s_SECURITY_ATTRIBUTES +{ + DWORD nLength; + LPVOID lpSecurityDescriptor; + BOOL bInheritHandle; +} SECURITY_ATTRIBUTES, *PSECURITY_ATTRIBUTES, *LPSECURITY_ATTRIBUTES; + +typedef struct s_PROCESS_INFORMATION +{ + HANDLE hProcess; + HANDLE hThread; + DWORD dwProcessId; + DWORD dwThreadId; +} PROCESS_INFORMATION, *PPROCESS_INFORMATION, *LPPROCESS_INFORMATION; + +typedef DWORD (*PTHREAD_START_ROUTINE)(LPVOID lpThreadParameter); +typedef PTHREAD_START_ROUTINE LPTHREAD_START_ROUTINE; + +typedef void* FARPROC; + +typedef struct tagDEC +{ + USHORT wReserved; + union + { + struct + { + BYTE scale; + BYTE sign; + } DUMMYSTRUCTNAME; + USHORT signscale; + } DUMMYUNIONNAME; + ULONG Hi32; + union + { + struct + { + ULONG Lo32; + ULONG Mid32; + } DUMMYSTRUCTNAME2; + ULONGLONG Lo64; + } DUMMYUNIONNAME2; +} DECIMAL; + +typedef DECIMAL* LPDECIMAL; + +#define DECIMAL_NEG ((BYTE)0x80) +#define DECIMAL_SETZERO(dec) \ + { \ + (dec).Lo64 = 0; \ + (dec).Hi32 = 0; \ + (dec).signscale = 0; \ + } + +typedef DWORD LCID; +typedef PDWORD PLCID; +typedef WORD LANGID; + +#endif /* _WIN32 not defined */ + +typedef void* PCONTEXT_HANDLE; +typedef PCONTEXT_HANDLE* PPCONTEXT_HANDLE; + +#ifndef _NTDEF +typedef LONG NTSTATUS; +typedef NTSTATUS* PNTSTATUS; +#endif + +#ifndef _LPCVOID_DEFINED // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) + +#define _LPCVOID_DEFINED // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) + +typedef const VOID* LPCVOID; +#endif + +#ifndef _LPCBYTE_DEFINED // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) + +#define _LPCBYTE_DEFINED // NOLINT(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) + +typedef const BYTE* LPCBYTE; +#endif + +#ifndef SSIZE_MAX +#if defined(_POSIX_SSIZE_MAX) +#define SSIZE_MAX _POSIX_SSIZE_MAX +#elif defined(_WIN64) +#define SSIZE_MAX _I64_MAX +#elif defined(_WIN32) +#define SSIZE_MAX LONG_MAX +#else +#define SSIZE_MAX INTPTR_MAX +#endif +#endif + +#define PRIdz "zd" +#define PRIiz "zi" +#define PRIuz "zu" +#define PRIoz "zo" +#define PRIxz "zx" +#define PRIXz "zX" + +#include + +#ifndef _WIN32 +#include + +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) +static inline int _fseeki64(FILE* fp, INT64 offset, int origin) +{ + return fseeko(fp, offset, origin); +} + +// NOLINTNEXTLINE(bugprone-reserved-identifier,cert-dcl37-c,cert-dcl51-cpp) +static inline INT64 _ftelli64(FILE* fp) +{ + return ftello(fp); +} +#endif + +WINPR_PRAGMA_DIAG_POP + +#endif /* WINPR_WTYPES_H */