This gets us better warnings when compiling with `-fanalyzer` on GCC 14.
From: Alex Henrie alexhenrie24@gmail.com
--- include/fdi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/fdi.h b/include/fdi.h index 2044c59bea6..a4928b06f95 100644 --- a/include/fdi.h +++ b/include/fdi.h @@ -203,7 +203,7 @@ typedef struct {
/**********************************************************************/
-typedef void * (__cdecl *PFNALLOC)(ULONG cb); +typedef void * (__WINE_ALLOC_SIZE(1) __cdecl *PFNALLOC)(ULONG cb); #define FNALLOC(fn) void * __cdecl fn(ULONG cb)
typedef void (__cdecl *PFNFREE)(void *pv);
From: Alex Henrie alexhenrie24@gmail.com
--- include/fontsub.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/fontsub.h b/include/fontsub.h index aa83f034fcc..4eebe49706b 100644 --- a/include/fontsub.h +++ b/include/fontsub.h @@ -23,8 +23,8 @@ extern "C" { #endif
-typedef void *(__cdecl *CFP_ALLOCPROC)(size_t); -typedef void *(__cdecl *CFP_REALLOCPROC)(void *, size_t); +typedef void *(__WINE_ALLOC_SIZE(1) __cdecl *CFP_ALLOCPROC)(size_t); +typedef void *(__WINE_ALLOC_SIZE(2) __cdecl *CFP_REALLOCPROC)(void *, size_t); typedef void (__cdecl *CFP_FREEPROC)(void *);
#define TTFCFP_SUBSET 0
From: Alex Henrie alexhenrie24@gmail.com
--- include/ntsecpkg.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/ntsecpkg.h b/include/ntsecpkg.h index 99b9ec7d407..609be585d24 100644 --- a/include/ntsecpkg.h +++ b/include/ntsecpkg.h @@ -179,7 +179,7 @@ typedef NTSTATUS (NTAPI *PLSA_ADD_CREDENTIAL)(PLUID, ULONG, PLSA_STRING, typedef NTSTATUS (NTAPI *PLSA_GET_CREDENTIALS)(PLUID, ULONG, PULONG, BOOLEAN, PLSA_STRING, PULONG, PLSA_STRING); typedef NTSTATUS (NTAPI *PLSA_DELETE_CREDENTIAL)(PLUID, ULONG, PLSA_STRING); -typedef PVOID (NTAPI *PLSA_ALLOCATE_LSA_HEAP)(ULONG); +typedef PVOID (__WINE_ALLOC_SIZE(1) NTAPI *PLSA_ALLOCATE_LSA_HEAP)(ULONG); typedef VOID (NTAPI *PLSA_FREE_LSA_HEAP)(PVOID); typedef NTSTATUS (NTAPI *PLSA_ALLOCATE_CLIENT_BUFFER)(PLSA_CLIENT_REQUEST, ULONG, PVOID*); @@ -213,7 +213,7 @@ typedef BOOLEAN (NTAPI *PLSA_GET_CALL_INFO)(PSECPKG_CALL_INFO); typedef NTSTATUS (NTAPI *PLSA_CALL_PACKAGEEX)(PUNICODE_STRING, PVOID, PVOID, ULONG, PVOID*, PULONG, PNTSTATUS); typedef PVOID (NTAPI *PLSA_CREATE_SHARED_MEMORY)(ULONG, ULONG); -typedef PVOID (NTAPI *PLSA_ALLOCATE_SHARED_MEMORY)(PVOID, ULONG); +typedef PVOID (__WINE_ALLOC_SIZE(2) NTAPI *PLSA_ALLOCATE_SHARED_MEMORY)(PVOID, ULONG); typedef VOID (NTAPI *PLSA_FREE_SHARED_MEMORY)(PVOID, PVOID); typedef BOOLEAN (NTAPI *PLSA_DELETE_SHARED_MEMORY)(PVOID); typedef NTSTATUS (NTAPI *PLSA_OPEN_SAM_USER)(PUNICODE_STRING, SECPKG_NAME_TYPE,
From: Alex Henrie alexhenrie24@gmail.com
--- include/perflib.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/perflib.h b/include/perflib.h index 232ac308fce..188f26e3e74 100644 --- a/include/perflib.h +++ b/include/perflib.h @@ -23,7 +23,7 @@ extern "C" { #endif
-typedef LPVOID (CDECL * PERF_MEM_ALLOC)(SIZE_T,LPVOID); +typedef void * (__WINE_ALLOC_SIZE(1) CDECL * PERF_MEM_ALLOC)(SIZE_T,void*); typedef void (CDECL * PERF_MEM_FREE)(LPVOID,LPVOID); typedef ULONG (WINAPI * PERFLIBREQUEST)(ULONG,PVOID,ULONG);
From: Alex Henrie alexhenrie24@gmail.com
--- include/twain.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/twain.h b/include/twain.h index 28eaddf0840..151f89bc18f 100644 --- a/include/twain.h +++ b/include/twain.h @@ -1850,7 +1850,7 @@ typedef TW_UINT16 (*DSENTRYPROC)(pTW_IDENTITY, #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ -typedef TW_HANDLE (PASCAL *DSM_MEMALLOCATE)(TW_UINT32 _size); +typedef TW_HANDLE (__WINE_ALLOC_SIZE(1) PASCAL *DSM_MEMALLOCATE)(TW_UINT32 _size); typedef void (PASCAL *DSM_MEMFREE)(TW_HANDLE _handle); typedef TW_MEMREF (PASCAL *DSM_MEMLOCK)(TW_HANDLE _handle); typedef void (PASCAL *DSM_MEMUNLOCK)(TW_HANDLE _handle);
From: Alex Henrie alexhenrie24@gmail.com
--- include/ddk/fltkernel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/ddk/fltkernel.h b/include/ddk/fltkernel.h index 8ebebfa2e81..49c9d55dbaa 100644 --- a/include/ddk/fltkernel.h +++ b/include/ddk/fltkernel.h @@ -585,7 +585,7 @@ typedef struct _FLT_CALLBACK_DATA KPROCESSOR_MODE RequestorMode; } FLT_CALLBACK_DATA, *PFLT_CALLBACK_DATA;
-typedef void* (WINAPI *PFLT_CONTEXT_ALLOCATE_CALLBACK)(POOL_TYPE,SIZE_T,FLT_CONTEXT_TYPE); +typedef void* (__WINE_ALLOC_SIZE(2) WINAPI *PFLT_CONTEXT_ALLOCATE_CALLBACK)(POOL_TYPE,SIZE_T,FLT_CONTEXT_TYPE); typedef void (WINAPI *PFLT_CONTEXT_CLEANUP_CALLBACK)(PFLT_CONTEXT, FLT_CONTEXT_TYPE); typedef void (WINAPI *PFLT_CONTEXT_FREE_CALLBACK)(void *, FLT_CONTEXT_TYPE); typedef NTSTATUS (WINAPI *PFLT_FILTER_UNLOAD_CALLBACK)(FLT_FILTER_UNLOAD_FLAGS);
From: Alex Henrie alexhenrie24@gmail.com
--- include/ddk/ntddk.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/ddk/ntddk.h b/include/ddk/ntddk.h index 9072b9121a0..e8d9bb89ad4 100644 --- a/include/ddk/ntddk.h +++ b/include/ddk/ntddk.h @@ -163,7 +163,7 @@ typedef struct _RTL_SPLAY_LINKS struct _RTL_GENERIC_TABLE;
typedef RTL_GENERIC_COMPARE_RESULTS (WINAPI *PRTL_GENERIC_COMPARE_ROUTINE)(struct _RTL_GENERIC_TABLE *, void *, void *); -typedef void * (WINAPI *PRTL_GENERIC_ALLOCATE_ROUTINE)(struct _RTL_GENERIC_TABLE *, LONG); +typedef void * (__WINE_ALLOC_SIZE(2) WINAPI *PRTL_GENERIC_ALLOCATE_ROUTINE)(struct _RTL_GENERIC_TABLE *, LONG); typedef void (WINAPI *PRTL_GENERIC_FREE_ROUTINE)(struct _RTL_GENERIC_TABLE *Table, void *);
typedef struct _RTL_GENERIC_TABLE @@ -193,7 +193,7 @@ struct _RTL_AVL_TABLE;
typedef RTL_GENERIC_COMPARE_RESULTS (WINAPI *PRTL_AVL_COMPARE_ROUTINE)(struct _RTL_AVL_TABLE *, void *, void *);
-typedef void * (WINAPI *PRTL_AVL_ALLOCATE_ROUTINE)(struct _RTL_AVL_TABLE *, LONG); +typedef void * (__WINE_ALLOC_SIZE(2) WINAPI *PRTL_AVL_ALLOCATE_ROUTINE)(struct _RTL_AVL_TABLE *, LONG);
typedef void (WINAPI *PRTL_AVL_FREE_ROUTINE )(struct _RTL_AVL_TABLE *, void *buffer);
From: Alex Henrie alexhenrie24@gmail.com
--- include/ddk/wdm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 79c88315c2e..45503f48a4e 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1407,8 +1407,8 @@ typedef struct _KLOCK_QUEUE_HANDLE { KIRQL OldIrql; } KLOCK_QUEUE_HANDLE, *PKLOCK_QUEUE_HANDLE;
-typedef void * (NTAPI *PALLOCATE_FUNCTION)(POOL_TYPE, SIZE_T, ULONG); -typedef void * (NTAPI *PALLOCATE_FUNCTION_EX)(POOL_TYPE, SIZE_T, ULONG, PLOOKASIDE_LIST_EX); +typedef void * (__WINE_ALLOC_SIZE(2) NTAPI *PALLOCATE_FUNCTION)(POOL_TYPE, SIZE_T, ULONG); +typedef void * (__WINE_ALLOC_SIZE(2) NTAPI *PALLOCATE_FUNCTION_EX)(POOL_TYPE, SIZE_T, ULONG, PLOOKASIDE_LIST_EX); typedef void (NTAPI *PFREE_FUNCTION)(void *); typedef void (NTAPI *PFREE_FUNCTION_EX)(void *, PLOOKASIDE_LIST_EX); typedef void (NTAPI *PCALLBACK_FUNCTION)(void *, void *, void *);