[PATCH] annotate more with buffer size

Marcus Meissner meissner at suse.de
Thu Sep 11 08:20:25 CDT 2008


Hi,

Annotate more functions with attribute alloc_size.

(Yesterdays patch had the wrong emailaddress.)

Ciao, Marcus
---
 dlls/wintrust/wintrust_priv.h |    4 +-
 include/fci.h                 |    2 +-
 include/gdiplusmem.h          |    2 +-
 include/lmapibuf.h            |    4 +-
 include/mapix.h               |    4 +-
 include/setupapi.h            |    2 +-
 include/snmp.h                |    2 +-
 include/wintrust.h            |    2 +-
 9 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/dlls/wintrust/wintrust_priv.h b/dlls/wintrust/wintrust_priv.h
index c73f666..f55a1b2 100644
--- a/dlls/wintrust/wintrust_priv.h
+++ b/dlls/wintrust/wintrust_priv.h
@@ -18,8 +18,8 @@
 #ifndef __WINTRUST_PRIV_H__
 #define __WINTRUST_PRIV_H__
 
-void * WINAPI WINTRUST_Alloc(DWORD cb);
-void * WINAPI WINTRUST_ReAlloc(void *ptr, DWORD cb);
+void * WINAPI WINTRUST_Alloc(DWORD cb) __WINE_ALLOC_SIZE(1);
+void * WINAPI WINTRUST_ReAlloc(void *ptr, DWORD cb) __WINE_ALLOC_SIZE(2);
 void WINAPI WINTRUST_Free(void *p);
 BOOL WINAPI WINTRUST_AddStore(CRYPT_PROVIDER_DATA *data, HCERTSTORE store);
 BOOL WINAPI WINTRUST_AddSgnr(CRYPT_PROVIDER_DATA *data,
diff --git a/include/fci.h b/include/fci.h
index 6ced99f..6ac95fa 100644
--- a/include/fci.h
+++ b/include/fci.h
@@ -163,7 +163,7 @@ typedef struct {
 
 /**********************************************************************/
 
-typedef void * (__cdecl *PFNFCIALLOC)(ULONG cb);
+typedef void * (__cdecl __WINE_ALLOC_SIZE(1) *PFNFCIALLOC)(ULONG cb);
 #define FNFCIALLOC(fn) void * __cdecl fn(ULONG cb)
 
 typedef void (__cdecl *PFNFCIFREE)(void *memory);
diff --git a/include/gdiplusmem.h b/include/gdiplusmem.h
index a0496ba..fad8ed6 100644
--- a/include/gdiplusmem.h
+++ b/include/gdiplusmem.h
@@ -25,7 +25,7 @@
 extern "C" {
 #endif
 
-void* WINGDIPAPI GdipAlloc(SIZE_T);
+void* WINGDIPAPI GdipAlloc(SIZE_T) __WINE_ALLOC_SIZE(1);
 void WINGDIPAPI GdipFree(void*);
 
 #ifdef __cplusplus
diff --git a/include/lmapibuf.h b/include/lmapibuf.h
index 2362d08..129b2ed 100644
--- a/include/lmapibuf.h
+++ b/include/lmapibuf.h
@@ -26,12 +26,12 @@ extern "C" {
 #endif
 
 /* Buffer functions */
-NET_API_STATUS WINAPI NetApiBufferAllocate(DWORD ByteCount, LPVOID* Buffer);
+NET_API_STATUS WINAPI NetApiBufferAllocate(DWORD ByteCount, LPVOID* Buffer) __WINE_ALLOC_SIZE(1);
 NET_API_STATUS WINAPI NetApiBufferFree(LPVOID Buffer);
 NET_API_STATUS WINAPI NetApiBufferReallocate(LPVOID OldBuffer, DWORD NewByteCount,
                                              LPVOID* NewBuffer);
 NET_API_STATUS WINAPI NetApiBufferSize(LPVOID Buffer, LPDWORD ByteCount);
-NET_API_STATUS WINAPI NetapipBufferAllocate(DWORD ByteCount, LPVOID* Buffer);
+NET_API_STATUS WINAPI NetapipBufferAllocate(DWORD ByteCount, LPVOID* Buffer) __WINE_ALLOC_SIZE(1);
 
 #ifdef __cplusplus
 }
diff --git a/include/mapix.h b/include/mapix.h
index 1ca7aaf..89df86f 100644
--- a/include/mapix.h
+++ b/include/mapix.h
@@ -91,11 +91,11 @@ typedef HRESULT (STDMETHODCALLTYPE MAPILOGONEX)(ULONG_PTR,LPSTR,LPSTR,ULONG,LPMA
 typedef MAPILOGONEX *LPMAPILOGONEX;
 MAPILOGONEX MAPILogonEx;
 
-typedef SCODE (WINAPI MAPIALLOCATEBUFFER)(ULONG,LPVOID*);
+typedef SCODE (__WINE_ALLOC_SIZE(1) WINAPI MAPIALLOCATEBUFFER)(ULONG,LPVOID*);
 typedef MAPIALLOCATEBUFFER *LPMAPIALLOCATEBUFFER;
 MAPIALLOCATEBUFFER MAPIAllocateBuffer;
 
-typedef SCODE (WINAPI MAPIALLOCATEMORE)(ULONG,LPVOID,LPVOID*);
+typedef SCODE (__WINE_ALLOC_SIZE(1) WINAPI MAPIALLOCATEMORE)(ULONG,LPVOID,LPVOID*);
 typedef MAPIALLOCATEMORE *LPMAPIALLOCATEMORE;
 MAPIALLOCATEMORE MAPIAllocateMore;
 
diff --git a/include/setupapi.h b/include/setupapi.h
index cb680d2..174a7a3 100644
--- a/include/setupapi.h
+++ b/include/setupapi.h
@@ -1393,7 +1393,7 @@ void     WINAPI InstallHinfSectionW( HWND hwnd, HINSTANCE handle, PCWSTR cmdline
 BOOL     WINAPI IsUserAdmin(VOID);
 PWSTR    WINAPI MultiByteToUnicode(PCSTR lpMultiByteStr, UINT uCodePage);
 VOID     WINAPI MyFree(PVOID lpMem);
-PVOID    WINAPI MyMalloc(DWORD dwSize);
+PVOID    WINAPI MyMalloc(DWORD dwSize) __WINE_ALLOC_SIZE(1);
 PVOID    WINAPI MyRealloc(PVOID lpSrc, DWORD dwSize);
 DWORD    WINAPI OpenAndMapForRead(PCWSTR, PDWORD, PHANDLE, PHANDLE, PVOID *);
 LONG     WINAPI QueryRegistryValue(HKEY, PCWSTR, PBYTE *, PDWORD, PDWORD);
diff --git a/include/snmp.h b/include/snmp.h
index b41243b..0edff22 100644
--- a/include/snmp.h
+++ b/include/snmp.h
@@ -275,7 +275,7 @@ INT WINAPI SnmpUtilVarBindListCpy(SnmpVarBindList *pVblDst,
  SnmpVarBindList *pVblSrc);
 VOID WINAPI SnmpUtilVarBindListFree(SnmpVarBindList *pVbl);
 
-LPVOID WINAPI SnmpUtilMemAlloc(UINT nBytes);
+LPVOID WINAPI SnmpUtilMemAlloc(UINT nBytes) __WINE_ALLOC_SIZE(1);
 LPVOID WINAPI SnmpUtilMemReAlloc(LPVOID pMem, UINT nBytes);
 VOID WINAPI SnmpUtilMemFree(LPVOID pMem);
 
diff --git a/include/wintrust.h b/include/wintrust.h
index 5408ad4..2e4006b 100644
--- a/include/wintrust.h
+++ b/include/wintrust.h
@@ -260,7 +260,7 @@ struct _CRYPT_PROVIDER_DATA;
 
 #define TRUSTERROR_MAX_STEPS                   38
 
-typedef void * (WINAPI *PFN_CPD_MEM_ALLOC)(DWORD cbSize);
+typedef void * (__WINE_ALLOC_SIZE(1) WINAPI *PFN_CPD_MEM_ALLOC)(DWORD cbSize);
 typedef void (WINAPI *PFN_CPD_MEM_FREE)(void *pvMem2Free);
 typedef BOOL (WINAPI *PFN_CPD_ADD_STORE)(struct _CRYPT_PROVIDER_DATA *pProvData,
  HCERTSTORE hStore2Add);
-- 
1.5.6



More information about the wine-patches mailing list