Changeset 1072 for trunk/dll/fortify.h

Timestamp:

07/17/08 19:39:14 (4 months ago)

Author:

stevenhl

Message:

Add Fortify_SetOwner Fortify_ChangeOwner to support cross thread allocations

Files:

• trunk/dll/fortify.h (modified) (10 diffs)

trunk/dll/fortify.h

@@ -27 +27 @@
  */
 
-/*  
+/*
  *     If  you use this software at all, I'd love to hear from
  * you.   All  questions,  criticisms, suggestions, praise and
  * postcards are most welcome.
- * 
+ *
  *            email:    sbullen@cybergraphic.com.au
- * 
+ *
  *            snail:    Simon P. Bullen
  *                      PO BOX 12138
@@ -41 +41 @@
  */
 
+ /* 06 May 08 SHL Rework scope logic to be MT capable
+    17 Jul 08 SHL Add Fortify_SetOwner Fortify_ChangeOwner
+ */
+
 #ifndef __FORTIFY_H__
 #define __FORTIFY_H__
 
 #include <stdlib.h>                     // Must include before fortify defintions
-// 16 Jan 08 SHL Ensure 
+// 16 Jan 08 SHL Ensure
 #ifdef __BORLANDC__
 #ifdef __OS2__
@@ -56 +60 @@
 #include "ufortify.h"
 
+#if defined(__WATCOMC__) && defined(_MT)
+#define MT_SCOPES 1
+#endif
+
 /* Ensure the configuration parameters have sensible defaults */
 #ifndef FORTIFY_STORAGE
@@ -80 +88 @@
 #endif
 
-#ifndef FORTIFY_FILL_ON_ALLOCATE_VALUE    
+#ifndef FORTIFY_FILL_ON_ALLOCATE_VALUE
     #define FORTIFY_FILL_ON_ALLOCATE_VALUE       0xA7
 #endif
@@ -89 +97 @@
 
 #ifndef FORTIFY_LOCK
-    #define FORTIFY_LOCK()   
+    #define FORTIFY_LOCK()
 #endif
 
 #ifndef FORTIFY_UNLOCK
-    #define FORTIFY_UNLOCK()  
+    #define FORTIFY_UNLOCK()
 #endif
 
@@ -113 +121 @@
  */
 
-#ifdef __GNUG__ 
+#ifdef __GNUG__
     /* GCC configuration */
     #define FORTIFY_PROVIDE_ARRAY_NEW
@@ -181 +189 @@
 void  Fortify_Disable(const char *file, unsigned long line);
 
+#ifdef MT_SCOPES
+void  Fortify_SetOwner(long lOwnerTID);
+void  Fortify_ChangeOwner(void *pBlock);
+#endif
+
 /* Fortify versions of the ANSI C memory allocation functions */
 void *Fortify_malloc(size_t size, const char *file, unsigned long line);
@@ -242 +255 @@
     #define Fortify_OutputStatistics()     Fortify_OutputStatistics(__FILE__, __LINE__)
     #define Fortify_GetCurrentAllocation() Fortify_GetCurrentAllocation(__FILE__, __LINE__)
-    #define Fortify_SetAllocationLimit(x)  Fortify_SetAllocationLimit(x, __FILE__, __LINE__)    
+    #define Fortify_SetAllocationLimit(x)  Fortify_SetAllocationLimit(x, __FILE__, __LINE__)
     #define Fortify_Disable()              Fortify_Disable(__FILE__, __LINE__)
 
@@ -269 +282 @@
 #else /* Define the special fortify functions away to nothing */
 
+    // 17 Jul 08 SHL fixme to avoid spurious OpenWatcom warnings
     #define Fortify_CheckAllMemory()       0
     #define Fortify_ListAllMemory()        0
     #define Fortify_DumpAllMemory()        0
-    #define Fortify_CheckPointer(ptr)      1 
-    #define Fortify_LabelPointer(ptr,str)  
+    #define Fortify_CheckPointer(ptr)      1
+    #define Fortify_LabelPointer(ptr,str)
     #define Fortify_SetOutputFunc()        0
     #define Fortify_SetMallocFailRate(p)   0
@@ -282 +296 @@
     #define Fortify_SetAllocationLimit(x)  0
     #define Fortify_Disable()              0
-
-    #ifdef __cplusplus    
-        #define Fortify_New                    new
-        #define Fortify_Delete                 delete
+    #define Fortify_SetOwner()             0
+    #define Fortify_ChangeOwner            0
+
+    #ifdef __cplusplus
+        #define Fortify_New                    new
+        #define Fortify_Delete                 delete
     #endif /* __cplusplus */