diff --git a/3rdparty/smartheap/SHLW32MT.LIB b/3rdparty/smartheap/SHLW32MT.LIB deleted file mode 100644 index 732aedf8..00000000 Binary files a/3rdparty/smartheap/SHLW32MT.LIB and /dev/null differ diff --git a/3rdparty/smartheap/SHMALLOC.H b/3rdparty/smartheap/SHMALLOC.H deleted file mode 100644 index 709c19b8..00000000 --- a/3rdparty/smartheap/SHMALLOC.H +++ /dev/null @@ -1,63 +0,0 @@ -/* shmalloc.h -- SmartHeap ANSI Standard C memory API - * Professional Memory Management Library - * - * Copyright (C) 1991-1996 by Arthur D. Applegate. All Rights Reserved. - * All Rights Reserved. - * - * No part of this source code may be copied, modified or reproduced - * in any form without retaining the above copyright notice. - * This source code, or source code derived from it, may not be redistributed - * without express written permission of the author. - */ - -#if !(defined(_SHMALLOC_H)) -#define _SHMALLOC_H - -#include "smrtheap.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/* ANSI Standard Memory Management API */ - -#if (!defined(MEM_DEBUG) && !defined(NO_MALLOC_MACRO)) || defined(MALLOC_MACRO) -#ifdef malloc -#undef malloc -#endif -#define malloc(s) MEM_malloc(s) -#ifdef calloc -#undef calloc -#endif -#define calloc(s,c) MEM_calloc(s,c) -#ifdef realloc -#undef realloc -#endif -#define realloc(p,s) MEM_realloc(p,s) -#ifdef free -#undef free -#endif -#define free(p) MEM_free(p) - -#endif /* NO_MALLOC_MACRO */ - -#ifndef MEM_malloc -void MEM_FAR * MEM_ENTRY_ANSI MEM_malloc(size_t size); -void MEM_FAR * MEM_ENTRY_ANSI MEM_calloc(size_t nobj, size_t size); -void MEM_FAR * MEM_ENTRY_ANSI MEM_realloc(void MEM_FAR *p, size_t size); -void MEM_ENTRY_ANSI MEM_free(void MEM_FAR *p); -#endif /* MEM_malloc */ - -#if defined(__WATCOMC__) && defined(__SW_3S) -/* Watcom stack calling convention */ - #pragma aux (syscall) MEM_malloc - #pragma aux (syscall) MEM_realloc - #pragma aux (syscall) MEM_calloc - #pragma aux (syscall) MEM_free -#endif /* __WATCOMC__ */ - -#ifdef __cplusplus -} -#endif - -#endif /* !defined(_SHMALLOC_H) */ diff --git a/3rdparty/smartheap/SHMFC4M.LIB b/3rdparty/smartheap/SHMFC4M.LIB deleted file mode 100644 index a8f04163..00000000 Binary files a/3rdparty/smartheap/SHMFC4M.LIB and /dev/null differ diff --git a/3rdparty/smartheap/SMRTHEAP.H b/3rdparty/smartheap/SMRTHEAP.H deleted file mode 100644 index b4f17a74..00000000 --- a/3rdparty/smartheap/SMRTHEAP.H +++ /dev/null @@ -1,656 +0,0 @@ -/* smrtheap.h -- SmartHeap (tm) public C header file - * Professional Memory Management Library - * - * Copyright (C) 1991-1997 by Arthur D. Applegate. All Rights Reserved. - * All Rights Reserved. - * - * No part of this source code may be copied, modified or reproduced - * in any form without retaining the above copyright notice. - * This source code, or source code derived from it, may not be redistributed - * without express written permission of the author. - * - */ - -#if !defined(_SMARTHEAP_H) -#define _SMARTHEAP_H - -#include -#include - -#if !defined(macintosh) && !defined(THINK_C) && !defined(__MWERKS__) \ - && !defined(SHANSI) && UINT_MAX == 0xFFFFu \ - && (defined(_Windows) || defined(_WINDOWS) || defined(__WINDOWS__)) - #define MEM_WIN16 -#endif - -#if (UINT_MAX == 0xFFFFu) && (defined(MEM_WIN16) \ - || defined(MSDOS) || defined(__MSDOS__) || defined(__DOS__)) - /* 16-bit X86 */ - #if defined(SYS_DLL) - #if defined(_MSC_VER) && _MSC_VER <= 600 - #define MEM_ENTRY _export _loadds far pascal - #else - #define MEM_ENTRY _export far pascal - #endif - #else - #define MEM_ENTRY far pascal - #endif - #ifdef __WATCOMC__ - #define MEM_ENTRY_ANSI __far - #else - #define MEM_ENTRY_ANSI far cdecl - #endif - #define MEM_FAR far - #if defined(MEM_WIN16) - #define MEM_ENTRY2 _export far pascal - #elif defined(DOS16M) || defined(DOSX286) - #define MEM_ENTRY2 _export _loadds far pascal - #endif - -#else /* not 16-bit X86 */ - -#if defined(WIN32) || defined(_WIN32) || defined(__WIN32) \ - || defined(__WIN32__) || defined(__NT__) - #define MEM_WIN32 - #if defined(_MSC_VER) - #if defined(_SHI_Pool) && defined(SYS_DLL) - #define MEM_ENTRY1 __declspec(dllexport) - #define MEM_ENTRY4 __declspec(dllexport) extern - #elif !defined(_SHI_Pool) && (defined(MEM_DEBUG) || defined(MEM_DLL)) - #define MEM_ENTRY1 __declspec(dllimport) - #if defined(_M_IX86) || defined(_X86_) - #define MemDefaultPool shi_MemDefaultPool - #define MEM_ENTRY4 __declspec(dllimport) - #endif - #endif - #endif - #if !defined(_MSC_VER) || defined(_M_IX86) || defined(_X86_) - #define MEM_ENTRY __stdcall - #else - #define MEM_ENTRY __cdecl /* for NT/RISC */ - #endif - #ifndef __WATCOMC__ - #define MEM_ENTRY_ANSI __cdecl - #endif - -#elif defined(__OS2__) - #if defined(__BORLANDC__) || defined(__WATCOMC__) - #if defined(SYS_DLL) - #define MEM_ENTRY __export __syscall - #else - #define MEM_ENTRY __syscall - #endif /* SYS_DLL */ - #ifdef __BORLANDC__ - #define MEM_ENTRY_ANSI __stdcall - #endif - #elif defined(__IBMC__) || defined(__IBMCPP__) - #if defined(SYS_DLL) && 0 - #define MEM_ENTRY _Export _System - #else - #define MEM_ENTRY _System - #endif - #define MEM_ENTRY_ANSI _Optlink - #define MEM_ENTRY3 MEM_ENTRY - #define MEM_CALLBACK MEM_ENTRY3 - #define MEM_ENTRY2 - #endif -#endif /* __OS2__ */ - -#if defined(__WATCOMC__) && defined(__SW_3S) - /* Watcom stack calling convention */ -#ifndef __OS2__ -#ifdef __WINDOWS_386__ - #pragma aux syscall "*_" parm routine [eax ebx ecx edx fs gs] modify [eax]; -#else - #pragma aux syscall "*_" parm routine [eax ebx ecx edx] modify [eax]; -#endif -#ifndef MEM_ENTRY - #define MEM_ENTRY __syscall -#endif /* MEM_ENTRY */ -#endif -#endif /* Watcom stack calling convention */ - -#endif /* end of system-specific declarations */ - -#ifndef MEM_ENTRY - #define MEM_ENTRY -#endif -#ifndef MEM_ENTRY1 - #define MEM_ENTRY1 -#endif -#ifndef MEM_ENTRY2 - #define MEM_ENTRY2 MEM_ENTRY -#endif -#ifndef MEM_ENTRY3 - #define MEM_ENTRY3 -#endif -#ifndef MEM_ENTRY4 - #define MEM_ENTRY4 extern -#endif -#ifndef MEM_CALLBACK -#define MEM_CALLBACK MEM_ENTRY2 -#endif -#ifndef MEM_ENTRY_ANSI - #define MEM_ENTRY_ANSI -#endif -#ifndef MEM_FAR - #define MEM_FAR -#endif - -#ifdef applec -/* Macintosh: Apple MPW C/C++ passes char/short parms as longs (4 bytes), - * whereas Symantec C/C++ for MPW passes these as words (2 bytes); - * therefore, canonicalize all integer parms as 'int' for this platform. - */ - #define MEM_USHORT unsigned - #define MEM_UCHAR unsigned -#else - #define MEM_USHORT unsigned short - #define MEM_UCHAR unsigned char -#endif /* applec */ - -#ifdef MEM_DEBUG -#include "heapagnt.h" -#endif - -#ifdef __cplusplus -extern "C" { -#endif - -/*** Types ***/ - -#ifndef MEM_BOOL_DEFINED -#define MEM_BOOL_DEFINED -typedef int MEM_BOOL; -#endif - -/* Version Masks */ -typedef unsigned MEM_VERSION; -#define MEM_MAJOR_VERSION(v) (((v) & 0xF000u) >> 12) -#define MEM_MINOR_VERSION(v) (((v) & 0x0F00u) >> 8) -#define MEM_UPDATE_VERSION(v) ((v) & 0x00FFu) - -/* Note: these types are struct's rather than integral types to facilitate - * compile-time type-checking. MEM_POOL and MEM_HANDLE should be regarded - * as black boxes, and treated just like handles. - * You should not have any type casts to or from MEM_POOL or MEM_HANDLE; - * nor should you dereference variables of type MEM_POOL or MEM_HANDLE - * (unless you are using SmartHeap to replace NewHandle on the Mac, and - * you have existing code that dereferences handles). - */ -#ifndef MEM_POOL_DEFINED -#define MEM_POOL_DEFINED -#ifdef _SHI_Pool - typedef struct _SHI_Pool MEM_FAR *MEM_POOL; - typedef struct _SHI_MovHandle MEM_FAR *MEM_HANDLE; -#else - #ifdef THINK_C - typedef void *MEM_POOL; - typedef void **MEM_HANDLE; - #else - typedef struct _SHI_Pool { int reserved; } MEM_FAR *MEM_POOL; - typedef struct _SHI_MovHandle { int reserved; } MEM_FAR *MEM_HANDLE; - #endif -#endif -#endif /* MEM_POOL_DEFINED */ - - -#if !defined(MEM_DEBUG) || !(defined(MEM_WIN16) || defined(MEM_WIN32)) -#define SHI_MAJOR_VERSION 3 -#define SHI_MINOR_VERSION 3 -#define SHI_UPDATE_LEVEL 0 -#endif /* !WINDOWS */ - -#ifndef MEM_DEBUG - -/* Error codes: errorCode field of MEM_ERROR_INFO */ -#ifndef MEM_ERROR_CODE_DEFINED -#define MEM_ERROR_CODE_DEFINED -typedef enum -{ - MEM_NO_ERROR=0, - MEM_INTERNAL_ERROR, - MEM_OUT_OF_MEMORY, - MEM_BLOCK_TOO_BIG, - MEM_ALLOC_ZERO, - MEM_RESIZE_FAILED, - MEM_LOCK_ERROR, - MEM_EXCEEDED_CEILING, - MEM_TOO_MANY_PAGES, - MEM_TOO_MANY_TASKS, - MEM_BAD_MEM_POOL, - MEM_BAD_BLOCK, - MEM_BAD_FREE_BLOCK, - MEM_BAD_HANDLE, - MEM_BAD_POINTER, - MEM_WRONG_TASK, - MEM_NOT_FIXED_SIZE, - MEM_BAD_FLAGS, - MEM_ERROR_CODE_INT_MAX = INT_MAX /* to ensure enum is full int in size */ -} MEM_ERROR_CODE; -#endif /* MEM_ERROR_CODE_DEFINED */ - - -/* ### we should have packing pragma around these structure decls in case - * ### user is compiling with non-default packing directive (only needed - * ### if user is packing more strictly than native int size *and* if - * ### native int size is != native long and ptr sizes) - */ - -/* Error info, passed to error-handling callback routine */ -#ifndef MEM_ERROR_INFO_DEFINED -#define MEM_ERROR_INFO_DEFINED -typedef struct _MEM_ERROR_INFO -{ - MEM_ERROR_CODE errorCode; /* error code identifying type of error */ - MEM_POOL pool; /* pool in which error occurred, if known */ -} MEM_ERROR_INFO; - -/* Error handling callback function */ -typedef MEM_BOOL (MEM_ENTRY2 * MEM_ENTRY3 MEM_ERROR_FN) - (MEM_ERROR_INFO MEM_FAR *); - -#endif /* MEM_ERROR_INFO_DEFINED */ - -#endif /* MEM_DEBUG */ - - -#ifndef MEM_BLOCK_TYPE_DEFINED -#define MEM_BLOCK_TYPE_DEFINED -/* Block Type: field of MEM_POOL_ENTRY, field of MEM_POOL_INFO, - * parameter to MemPoolPreAllocate - */ -typedef enum -{ - MEM_FS_BLOCK = 0x0001u, - MEM_VAR_MOVEABLE_BLOCK = 0x0002u, - MEM_VAR_FIXED_BLOCK = 0x0004u, - MEM_EXTERNAL_BLOCK = 0x0008u, - MEM_BLOCK_TYPE_INT_MAX = INT_MAX /* to ensure enum is full int in size */ -} MEM_BLOCK_TYPE; -#endif /* MEM_BLOCK_TYPE_DEFINED */ - -#ifndef MEM_POOL_ENTRY_DEFINED -#define MEM_POOL_ENTRY_DEFINED -/* Pool Entry: parameter to MemPoolWalk */ -typedef struct -{ - void MEM_FAR *entry; - MEM_POOL pool; - MEM_BLOCK_TYPE type; - MEM_BOOL isInUse; - unsigned long size; - MEM_HANDLE handle; - unsigned lockCount; - void MEM_FAR *reserved_ptr; -} MEM_POOL_ENTRY; -#endif /* MEM_POOL_ENTRY_DEFINED */ - -#ifndef MEM_POOL_STATUS_DEFINED -#define MEM_POOL_STATUS_DEFINED -/* Pool Status: returned by MemPoolWalk, MemPoolFirst, MemPoolNext */ -typedef enum -{ - MEM_POOL_OK = 1, - MEM_POOL_CORRUPT = -1, - MEM_POOL_CORRUPT_FATAL = -2, - MEM_POOL_END = 0, - MEM_POOL_STATUS_INT_MAX = INT_MAX /* to ensure enum is full int in size */ -} MEM_POOL_STATUS; -#endif /* MEM_POOL_STATUS_DEFINED */ - -#ifndef MEM_POINTER_STATUS_DEFINED -#define MEM_POINTER_STATUS_DEFINED -/* Pointer Status: returned by MemCheckPtr */ -typedef enum -{ - MEM_POINTER_OK = 1, - MEM_POINTER_WILD = 0, - MEM_POINTER_FREE = -1, - MEM_POINTER_STATUS_INT_MAX = INT_MAX /* to ensure enum is full int in size */ -} MEM_POINTER_STATUS; -#endif /* MEM_POINTER_STATUS_DEFINED */ - -/* Pool Info: parameter to MemPoolInfo, MemPoolFirst, MemPoolNext */ -typedef struct -{ - MEM_POOL pool; - MEM_BLOCK_TYPE type; /* disjunctive combination of block type flags */ - unsigned short blockSizeFS; - unsigned short smallBlockSize; - unsigned pageSize; - unsigned long floor; - unsigned long ceiling; - unsigned flags; - MEM_ERROR_FN errorFn; -} MEM_POOL_INFO; - -/* Flags passed to MemAlloc, MemAllocPtr, MemReAlloc, MemReAllocPtr */ -#define MEM_FIXED 0x0000u /* fixed handle-based block */ -#define MEM_ZEROINIT 0x0001u /* == TRUE for SH 1.5 compatibility */ -#define MEM_MOVEABLE 0x0002u /* moveable handle-based block */ -#define MEM_RESIZEABLE 0x0004u /* reserve space above block */ -#define MEM_RESIZE_IN_PLACE 0x0008u /* do not move block (realloc) */ -#define MEM_NOGROW 0x0010u /* do not grow heap to satisfy request */ -#define MEM_NOEXTERNAL 0x0020u /* reserved for internal use */ -#define MEM_NOCOMPACT 0x0040u /* do not compact to satisfy request */ -#define MEM_NO_SERIALIZE 0x0080u /* do not serialize this request */ -#define MEM_HANDLEBASED 0x4000u /* for internal use */ -#define MEM_RESERVED 0x8000u /* for internal use */ - -#define MEM_UNLOCK_FAILED USHRT_MAX - -/* Flags passed to MemPoolInit, MemPoolInitFS */ -#ifndef MEM_POOL_SHARED -#define MEM_POOL_SHARED 0x0001u /* == TRUE for SH 1.5 compatibility */ -#define MEM_POOL_SERIALIZE 0x0002u /* pool used in more than one thread */ -#define MEM_POOL_VIRTUAL_LOCK 0x0004u /* pool is locked in physical memory */ -#define MEM_POOL_ZEROINIT 0x0008u /* malloc/new from pool zero-inits */ -#define MEM_POOL_REGION 0x0010u /* store pool in user-supplied region*/ -#define MEM_POOL_DEFAULT 0x8000u /* pool with default characteristics */ -#endif /* MEM_POOL_SHARED */ - -MEM_ENTRY4 MEM_POOL MemDefaultPool; - -/* Default memory pool for C malloc, C++ new (for backwards compatibility) */ -#define MEM_DEFAULT_POOL MemDefaultPool - -/* define and initialize these variables at file scope to change defaults */ -extern unsigned short MemDefaultPoolBlockSizeFS; -extern unsigned MemDefaultPoolPageSize; -extern unsigned MemDefaultPoolFlags; - -/* define SmartHeap_malloc at file scope if you - * are intentionally _NOT_ linking in the SmartHeap malloc definition - * ditto for SmartHeap operator new, and fmalloc et al. - */ -extern int SmartHeap_malloc; -extern int SmartHeap_far_malloc; -extern int SmartHeap_new; - -#define MEM_ERROR_RET ULONG_MAX - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* !defined(_SMARTHEAP_H) */ - - -/*** Function Prototypes ***/ - -#ifndef _SMARTHEAP_PROT -#define _SMARTHEAP_PROT - -#ifdef __cplusplus -extern "C" { -#endif - -#ifndef _shAPI - #if defined(MEM_DEBUG) && !defined(SHI_NO_MEM_DEBUG) - #define _shAPI(ret, name) MEM_ENTRY1 ret MEM_ENTRY _dbg ## name - #else - #define _shAPI(ret, name) MEM_ENTRY1 ret MEM_ENTRY name - #endif -#endif - -#ifndef _dbgARGS - #if defined(MEM_DEBUG) && !defined(SHI_NO_MEM_DEBUG) - #define _dbgARGS1 const char MEM_FAR *, int - #define _dbgARGS , _dbgARGS1 - #else - #define _dbgARGS1 void - #define _dbgARGS - #endif -#endif - - -/**** HOW TO READ SmartHeap PROTOTYPES **** - * prototypes below have the follow syntax in order to support both debug - * and non-debug APIs with single-source: - * - * _shiAPI(, )([] _dbgARGS); - * - * the above translates to a C prototype as follows: - * - * ([]); - */ - -/* Library Version */ -MEM_ENTRY1 MEM_VERSION MEM_ENTRY MemVersion(void); - -/* Library Registration */ -_shAPI(MEM_BOOL, MemRegisterTask)(_dbgARGS1); -_shAPI(MEM_BOOL, MemUnregisterTask)(_dbgARGS1); - -/* Memory Pool Functions */ -_shAPI(MEM_POOL, MemPoolInit)(unsigned _dbgARGS); -_shAPI(MEM_POOL, MemPoolInitFS)(MEM_USHORT, unsigned long, - unsigned _dbgARGS); -_shAPI(MEM_POOL, MemPoolInitRegion)(void MEM_FAR *, - unsigned long size, unsigned _dbgARGS); -_shAPI(MEM_POOL, MemPoolInitNamedShared)(const char MEM_FAR *, - unsigned long size,unsigned _dbgARGS); -_shAPI(MEM_POOL, MemPoolInitNamedSharedEx)(void MEM_FAR *addr, - unsigned pidCount, unsigned long MEM_FAR *pids, void MEM_FAR *security, - const char MEM_FAR *name, unsigned long size, unsigned flags _dbgARGS); -_shAPI(MEM_POOL, MemPoolAttachShared)(MEM_POOL, const char MEM_FAR * _dbgARGS); -_shAPI(MEM_BOOL, MemPoolFree)(MEM_POOL _dbgARGS); -MEM_POOL MEM_ENTRY MemInitDefaultPool(void); -MEM_BOOL MEM_ENTRY MemFreeDefaultPool(void); -_shAPI(unsigned, MemPoolSetPageSize)(MEM_POOL, unsigned _dbgARGS); -_shAPI(MEM_BOOL, MemPoolSetBlockSizeFS)(MEM_POOL, MEM_USHORT _dbgARGS); -_shAPI(MEM_BOOL, MemPoolSetSmallBlockSize)(MEM_POOL, MEM_USHORT _dbgARGS); -_shAPI(unsigned long, MemPoolSetFloor)(MEM_POOL, unsigned long _dbgARGS); -_shAPI(unsigned long, MemPoolSetCeiling)(MEM_POOL, unsigned long _dbgARGS); -_shAPI(unsigned long, MemPoolPreAllocate)(MEM_POOL, unsigned long, - MEM_BLOCK_TYPE _dbgARGS); -_shAPI(unsigned long, MemPoolPreAllocateHandles)(MEM_POOL, - unsigned long _dbgARGS); -_shAPI(unsigned long, MemPoolShrink)(MEM_POOL _dbgARGS); -_shAPI(unsigned long, MemPoolSize)(MEM_POOL _dbgARGS); -_shAPI(unsigned long, MemPoolCount)(MEM_POOL _dbgARGS); -_shAPI(MEM_BOOL, MemPoolInfo)(MEM_POOL, void MEM_FAR *, - MEM_POOL_INFO MEM_FAR* _dbgARGS); -_shAPI(MEM_POOL_STATUS, MemPoolFirst)(MEM_POOL_INFO MEM_FAR *, - MEM_BOOL _dbgARGS); -_shAPI(MEM_POOL_STATUS,MemPoolNext)(MEM_POOL_INFO MEM_FAR*,MEM_BOOL _dbgARGS); -_shAPI(MEM_POOL_STATUS,MemPoolWalk)(MEM_POOL,MEM_POOL_ENTRY MEM_FAR*_dbgARGS); -_shAPI(MEM_BOOL, MemPoolCheck)(MEM_POOL _dbgARGS); -_shAPI(MEM_BOOL, MemPoolLock)(MEM_POOL _dbgARGS); -_shAPI(MEM_BOOL, MemPoolUnlock)(MEM_POOL _dbgARGS); - -/* Handle-based API for moveable memory within heap. */ -_shAPI(MEM_HANDLE, MemAlloc)(MEM_POOL, unsigned, unsigned long _dbgARGS); -_shAPI(MEM_HANDLE, MemReAlloc)(MEM_HANDLE,unsigned long,unsigned _dbgARGS); -_shAPI(MEM_BOOL, MemFree)(MEM_HANDLE _dbgARGS); -_shAPI(void MEM_FAR *, MemLock)(MEM_HANDLE _dbgARGS); -_shAPI(unsigned, MemUnlock)(MEM_HANDLE _dbgARGS); -_shAPI(void MEM_FAR *, MemFix)(MEM_HANDLE _dbgARGS); -_shAPI(unsigned, MemUnfix)(MEM_HANDLE _dbgARGS); -_shAPI(unsigned, MemLockCount)(MEM_HANDLE _dbgARGS); -#ifndef MemFlags -#define MemFlags(mem) MemLockCount(mem) -#endif -_shAPI(MEM_BOOL, MemIsMoveable)(MEM_HANDLE _dbgARGS); -_shAPI(unsigned long, MemSize)(MEM_HANDLE _dbgARGS); -_shAPI(unsigned long, MemSizeRequested)(MEM_HANDLE _dbgARGS); -_shAPI(MEM_HANDLE, MemHandle)(void MEM_FAR * _dbgARGS); -#ifndef MEM_REFERENCE - #ifdef MEM_DEBUG - MEM_ENTRY1 void MEM_FAR * MEM_ENTRY _dbgMemReference(MEM_HANDLE, - const char MEM_FAR *, int); - #define MEM_REFERENCE(handle) \ - _dbgMemReference(handle, __FILE__, __LINE__) - #else - #define MEM_REFERENCE(handle) (*(void MEM_FAR * MEM_FAR *)handle) - #endif -#endif - -/* General Heap Allocator (returns direct pointer to memory) */ -_shAPI(void MEM_FAR*,MemAllocPtr)(MEM_POOL,unsigned long,unsigned _dbgARGS); -_shAPI(void MEM_FAR *, MemReAllocPtr)(void MEM_FAR *, unsigned long, - unsigned _dbgARGS); -_shAPI(MEM_BOOL, MemFreePtr)(void MEM_FAR * _dbgARGS); -_shAPI(unsigned long, MemSizePtr)(void MEM_FAR * _dbgARGS); -_shAPI(MEM_POINTER_STATUS, MemCheckPtr)(MEM_POOL, void MEM_FAR * _dbgARGS); - -/* Fixed-Size Allocator */ -_shAPI(void MEM_FAR *, MemAllocFS)(MEM_POOL _dbgARGS); -_shAPI(MEM_BOOL, MemFreeFS)(void MEM_FAR * _dbgARGS); - -/* Error Handling Functions */ -MEM_ENTRY1 MEM_ERROR_FN MEM_ENTRY MemSetErrorHandler(MEM_ERROR_FN); -MEM_ENTRY1 MEM_BOOL MEM_ENTRY MemDefaultErrorHandler(MEM_ERROR_INFO MEM_FAR*); -MEM_ENTRY1 void MEM_ENTRY MemErrorUnwind(void); - -#ifdef MEM_WIN32 -/* patching control */ - -#ifndef MEM_PATCHING_DEFINED -#define MEM_PATCHING_DEFINED -typedef enum -{ - MEM_PATCH_ALL = 0, - MEM_SKIP_PATCHING_THIS_DLL = 1, - MEM_DISABLE_SYSTEM_HEAP_PATCHING = 2, - MEM_DISABLE_ALL_PATCHING = 4|2|1, - MEM_PATCHING_INT_MAX = INT_MAX /* to ensure enum is full int in size */ -} MEM_PATCHING; -#endif /* MEM_PATCHING_DEFINED */ - -#ifdef _MSC_VER -__declspec(dllexport) -#endif -MEM_PATCHING MEM_ENTRY MemSetPatching(const char ***skipDLLs); - -#endif /* MEM_WIN32 */ - -/* internal routines */ -MEM_ENTRY1 MEM_BOOL MEM_ENTRY _shi_enterCriticalSection(void); -MEM_ENTRY1 void MEM_ENTRY _shi_leaveCriticalSection(void); -MEM_BOOL shi_call_new_handler_msc(size_t, MEM_BOOL); - - -/* Wrapper macros for debugging API */ -#ifndef _SHI_dbgMacros -#ifdef MEM_DEBUG -#define MemRegisterTask() _dbgMemRegisterTask(__FILE__, __LINE__) -#define MemUnregisterTask() _dbgMemUnregisterTask(__FILE__, __LINE__) -#define MemPoolInit(flags) _dbgMemPoolInit(flags, __FILE__, __LINE__) -#define MemPoolInitFS(bs, bc, f) _dbgMemPoolInitFS(bs,bc,f,__FILE__,__LINE__) -#define MemPoolInitRegion(addr, sz, f) \ - _dbgMemPoolInitRegion(addr, sz, f, __FILE__, __LINE__) -#define MemPoolInitNamedShared(nm, sz, f) \ - _dbgMemPoolInitNamedShared(nm, sz, f, __FILE__, __LINE__) -#define MemPoolInitNamedSharedEx(a, c, p, sec, nm, sz, f) \ - _dbgMemPoolInitNamedSharedEx(a, c, p, sec, nm, sz, f, __FILE__, __LINE__) -#define MemPoolAttachShared(p, n) \ - _dbgMemPoolAttachShared(p, n, __FILE__, __LINE__) -#define MemPoolFree(pool) _dbgMemPoolFree(pool, __FILE__, __LINE__) -#define MemPoolSetPageSize(p, s) _dbgMemPoolSetPageSize(p,s,__FILE__,__LINE__) -#define MemPoolSetBlockSizeFS(p, s) \ - _dbgMemPoolSetBlockSizeFS(p, s, __FILE__, __LINE__) -#define MemPoolSetSmallBlockSize(p, s) \ - _dbgMemPoolSetSmallBlockSize(p, s, __FILE__, __LINE__) -#define MemPoolSetFloor(p, f) _dbgMemPoolSetFloor(p, f, __FILE__, __LINE__) -#define MemPoolSetCeiling(p, c) _dbgMemPoolSetCeiling(p,c,__FILE__, __LINE__) -#define MemPoolPreAllocate(p,s,t) \ - _dbgMemPoolPreAllocate(p,s,t,__FILE__, __LINE__) -#define MemPoolPreAllocateHandles(p,h) \ - _dbgMemPoolPreAllocateHandles(p,h,__FILE__, __LINE__) -#define MemPoolShrink(p) _dbgMemPoolShrink(p, __FILE__, __LINE__) -#define MemPoolCheck(p) _dbgMemPoolCheck(p, __FILE__, __LINE__) -#define MemPoolWalk(p, e) _dbgMemPoolWalk(p, e, __FILE__, __LINE__) -#define MemPoolSize(p) _dbgMemPoolSize(p, __FILE__, __LINE__) -#define MemPoolCount(p) _dbgMemPoolCount(p, __FILE__, __LINE__) -#define MemPoolInfo(p,x,i) _dbgMemPoolInfo(p,x,i, __FILE__, __LINE__) -#define MemPoolFirst(i, b) _dbgMemPoolFirst(i, b, __FILE__, __LINE__) -#define MemPoolNext(i, b) _dbgMemPoolNext(i, b, __FILE__, __LINE__) -#define MemPoolLock(p) _dbgMemPoolLock(p, __FILE__, __LINE__) -#define MemPoolUnlock(p) _dbgMemPoolUnlock(p, __FILE__, __LINE__) -#define MemAlloc(p, f, s) _dbgMemAlloc(p, f, s, __FILE__, __LINE__) -#define MemReAlloc(h, s, f) _dbgMemReAlloc(h, s, f, __FILE__, __LINE__) -#define MemFree(h) _dbgMemFree(h, __FILE__, __LINE__) -#define MemLock(h) _dbgMemLock(h, __FILE__, __LINE__) -#define MemUnlock(h) _dbgMemUnlock(h, __FILE__, __LINE__) -#define MemFix(h) _dbgMemFix(h, __FILE__, __LINE__) -#define MemUnfix(h) _dbgMemUnfix(h, __FILE__, __LINE__) -#define MemSize(h) _dbgMemSize(h, __FILE__, __LINE__) -#define MemSizeRequested(h) _dbgMemSizeRequested(h, __FILE__, __LINE__) -#define MemLockCount(h) _dbgMemLockCount(h, __FILE__, __LINE__) -#define MemIsMoveable(h) _dbgMemIsMoveable(h, __FILE__, __LINE__) -#define MemHandle(p) _dbgMemHandle(p, __FILE__, __LINE__) -#define MemAllocPtr(p, s, f) _dbgMemAllocPtr(p, s, f, __FILE__, __LINE__) -#define MemReAllocPtr(p, s, f) _dbgMemReAllocPtr(p, s, f, __FILE__,__LINE__) -#define MemFreePtr(p) _dbgMemFreePtr(p, __FILE__, __LINE__) -#define MemSizePtr(p) _dbgMemSizePtr(p, __FILE__, __LINE__) -#define MemCheckPtr(p, x) _dbgMemCheckPtr(p, x, __FILE__, __LINE__) -#define MemAllocFS(p) _dbgMemAllocFS(p, __FILE__, __LINE__) -#define MemFreeFS(p) _dbgMemFreeFS(p, __FILE__, __LINE__) - -#else /* MEM_DEBUG */ - -/* MEM_DEBUG not defined: define dbgMemXXX as no-op macros - * each macro returns "success" value when MEM_DEBUG not defined - */ -#ifndef dbgMemBreakpoint -#define dbgMemBreakpoint() ((void)0) -#define dbgMemCheckAll() 1 -#define dbgMemCheckPtr(p, f, s) 1 -#define dbgMemDeferFreeing(b) 1 -#define dbgMemFormatCall(i, b, s) 0 -#define dbgMemFormatErrorInfo(i, b, s) 0 -#define dbgMemPoolDeferFreeing(p, b) 1 -#define dbgMemFreeDeferred() 1 -#define dbgMemPoolFreeDeferred(p) 1 -#define dbgMemPoolInfo(p, b) 1 -#define dbgMemPoolSetCheckFrequency(p, f) 1 -#define dbgMemPoolSetDeferQueueLen(p, b) 1 -#define dbgMemPoolSetName(p, n) 1 -#define dbgMemProtectPtr(p, f) 1 -#define dbgMemPtrInfo(p, b) 1 -#define dbgMemReallocMoves(b) 1 -#define dbgMemReportLeakage(p, c1, c2) 1 -#define dbgMemReportWrongTaskRef(b) 1 -#define dbgMemScheduleChecking(b, p, i) 1 -#define dbgMemSetCheckFrequency(f) 1 -#define dbgMemSetCheckpoint(c) 1 -#define dbgMemSetDefaultErrorOutput(x, f) 1 -#define dbgMemSetDeferQueueLen(l) 1 -#define dbgMemSetDeferSizeThreshold(s) 1 -#define dbgMemSetEntryHandler(f) 0 -#define dbgMemSetExitHandler(f) 0 -#define dbgMemSetFreeFill(c) 1 -#define dbgMemSetGuardFill(c) 1 -#define dbgMemSetGuardSize(s) 1 -#define dbgMemSetInUseFill(c) 1 -#define dbgMemSetCallstackChains(s) 1 -#define dbgMemSetStackChecking(s) 1 -#define dbgMemSetSafetyLevel(s) 1 -#define dbgMemSettingsInfo(b) 1 -#define dbgMemSuppressFreeFill(b) 1 -#define dbgMemTotalCount() 1 -#define dbgMemTotalSize() 1 -#define dbgMemWalkHeap(b) MEM_POOL_OK -#endif /* dbgMemBreakpoint */ - -#endif /* MEM_DEBUG */ -#endif /* _SHI_dbgMacros */ - -#if defined(__WATCOMC__) && defined(__SW_3S) -/* Watcom stack calling convention */ - #pragma aux MemDefaultPool "_*"; - #pragma aux MemDefaultPoolBlockSizeFS "_*"; - #pragma aux MemDefaultPoolPageSize "_*"; - #pragma aux MemDefaultPoolFlags "_*"; - #pragma aux SmartHeap_malloc "_*"; - #pragma aux SmartHeap_far_malloc "_*"; - #pragma aux SmartHeap_new "_*"; -#endif - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* !defined(_SMARTHEAP_PROT) */ diff --git a/3rdparty/smartheap/SMRTHEAP.HPP b/3rdparty/smartheap/SMRTHEAP.HPP deleted file mode 100644 index 663b6c90..00000000 --- a/3rdparty/smartheap/SMRTHEAP.HPP +++ /dev/null @@ -1,159 +0,0 @@ -// smrtheap.hpp -- SmartHeap public C++ header file -// Professional Memory Management Library -// -// Copyright (C) 1991-1996 by Arthur D. Applegate -// All Rights Reserved. -// -// No part of this source code may be copied, modified or reproduced -// in any form without retaining the above copyright notice. -// This source code, or source code derived from it, may not be redistributed -// without express written permission of the author. -// -// COMMENTS: -// - Include this header file to call the SmartHeap-specific versions of -// operators new (i.e. with placement syntax), to: -// o allocate from a specific memory pool; -// o specify allocation flags, such as zero-initialization; -// o resize an allocation. -// -// - If you include this header file, you must compile and link shnew.cpp, or -// link with one of the SmartHeap static operator new libraries: -// sh[l|d]XXXX.lib -// -// - Can be used in both EXEs and DLLs. -// -// - For 16-bit x86 platforms, use only in large or compact memory model. -// -// - If you do not want to use SmartHeap's global operator new but you do -// want to use SmartHeap's other facilities in a C++ application, then -// include the smrtheap.h header file but do not include this header file, -// and do not link with shnew.cpp. The two ".Xpp" files are present -// ONLY for the purpose of defining operator new and operator delete. -// -// - Use the MemDefaultPool global variable to refer to a memory pool to pass -// to SmartHeap functions that accept a pool as a parameter, -// e.g. MemPoolCount, MemPoolSize, MemPoolWalk, etc. -// - -#if !defined(_SMARTHEAP_HPP) -#define _SMARTHEAP_HPP - -#if defined(_MSC_VER) \ - && (defined(M_I86LM) || defined(M_I86CM) || defined(M_I86HM)) \ - && !defined(MEM_HUGE) -#define MEM_HUGE 0x8000u -#endif - -#ifndef __BORLANDC__ -/* Borland C++ does not treat extern "C++" correctly */ -extern "C++" -{ -#endif /* __BORLANDC__ */ - -#if defined(_MSC_VER) && _MSC_VER >= 900 -#pragma warning(disable : 4507) -#endif - -#if defined(new) -#if defined(MEM_DEBUG) -#undef new -#endif -#endif - -#include - -#include "smrtheap.h" - -#if defined(new) -#if defined(MEM_DEBUG) -#undef new -#endif -#endif - -#if ((defined(__BORLANDC__) && (__BORLANDC__ >= 0x450)) \ - || (defined(__WATCOMC__) && __WATCOMC__ >= 1000) \ - || (defined(__IBMCPP__) && __IBMCPP__ >= 250)) -#define SHI_ARRAY_NEW 1 -#endif - -void MEM_FAR * MEM_ENTRY_ANSI shi_New(unsigned long sz, unsigned flags=0, MEM_POOL pool=0); - -// operator new variants: - - -// version of new that passes memory allocation flags -// (e.g. MEM_ZEROINIT to zero-initialize memory) -// call with syntax 'ptr = new (flags) ' -inline void MEM_FAR *operator new(size_t sz, unsigned flags) - { return shi_New(sz, flags); } - -// version of new that allocates from a specified memory pool with alloc flags -// call with the syntax 'ptr = new (pool, [flags=0]) ' -inline void MEM_FAR *operator new(size_t sz, MEM_POOL pool, unsigned flags=0) - { return shi_New(sz, flags, pool); } -#ifdef SHI_ARRAY_NEW -inline void MEM_FAR *operator new[](size_t sz, MEM_POOL pool, unsigned flags=0) - { return shi_New(sz, flags, pool); } -#endif - -// version of new that changes the size of a memory block previously allocated -// from an SmartHeap memory pool -// call with the syntax 'ptr = new (ptr, flags) ' -#if !defined(MEM_DEBUG) || !defined(__HIGHC__) -/* bug in MetaWare High C++ parser confuses this with new(file,line) */ -inline void MEM_FAR *operator new(size_t new_sz, void MEM_FAR *lpMem, - unsigned flags) - { return MemReAllocPtr(lpMem, new_sz, flags); } -#ifdef SHI_ARRAY_NEW -inline void MEM_FAR *operator new[](size_t new_sz, void MEM_FAR *lpMem, - unsigned flags) - { return MemReAllocPtr(lpMem, new_sz, flags); } -#endif // SHI_ARRAY_NEW -#endif - - -// new_handler prototypes: note that MSC/C++ prototype differs from the -// protosed ANSI standard prototype for set_new_handler -#ifdef __MWERKS__ -#define MEM_CPP_THROW throw() -#else -#define MEM_CPP_THROW -#endif // __MWERKS__ -#ifndef _CRTIMP -#define _CRTIMP -#endif // _CRTIMP -#ifdef _MSC_VER -_CRTIMP _PNH MEM_ENTRY_ANSI _set_new_handler(_PNH); -#if UINT_MAX == 0xFFFFu -_PNH MEM_ENTRY_ANSI _set_fnew_handler(_PNH); -_PNHH MEM_ENTRY_ANSI _set_hnew_handler(_PNHH); -#endif // UINT_MAX -#endif // _MSC_VER -typedef void (MEM_ENTRY_ANSI * pnh)(); -_CRTIMP pnh MEM_ENTRY_ANSI set_new_handler(pnh) MEM_CPP_THROW; - -#ifndef DBG_FORMAL -#define DBG_FORMAL -#define DBG_ACTUAL -#ifndef DEBUG_NEW -#define DEBUG_NEW new -#endif // DEBUG_NEW -#define DEBUG_NEW1(x_) new(x_) -#define DEBUG_NEW2(x_, y_) new(x_, y_) -#define DEBUG_NEW3(x_, y_, z_) new(x_, y_, z_) -#define DEBUG_DELETE delete -#endif - -#ifdef DEFINE_NEW_MACRO -#define new DEBUG_NEW -#endif - -#if defined(_MSC_VER) && _MSC_VER >= 900 -#pragma warning(default : 4507) -#endif - -#ifndef __BORLANDC__ -} -#endif /* __BORLANDC__ */ - -#endif /* !defined(_SMARTHEAP_HPP) */ diff --git a/CMakeLists.txt b/CMakeLists.txt index 2efc545e..802c70ff 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -64,7 +64,6 @@ message(STATUS "MSVC for decompilation: ${MSVC_FOR_DECOMP}") option(ISLE_WERROR "Treat warnings as errors" OFF) option(ISLE_BUILD_APP "Build ISLE.EXE application" ON) cmake_dependent_option(ISLE_BUILD_CONFIG "Build CONFIG.EXE application" ON "NOT MINGW" OFF) -option(ISLE_USE_SMARTHEAP "Build with SmartHeap" ${MSVC_FOR_DECOMP}) option(ISLE_USE_DX5 "Build with internal DirectX 5 SDK" ON) cmake_dependent_option(ISLE_USE_DX5_LIBS "Build with internal DirectX 5 SDK Libraries" ON ISLE_USE_DX5 OFF) @@ -79,11 +78,6 @@ endif() add_library(Vec::Vec INTERFACE IMPORTED) target_include_directories(Vec::Vec INTERFACE "${CMAKE_SOURCE_DIR}/3rdparty/vec") -add_library(SmartHeap::SmartHeap STATIC IMPORTED) -set_property(TARGET SmartHeap::SmartHeap PROPERTY IMPORTED_LOCATION "${CMAKE_SOURCE_DIR}/3rdparty/smartheap/SHLW32MT.LIB") -set_property(TARGET SmartHeap::SmartHeap PROPERTY INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_SOURCE_DIR}/3rdparty/smartheap") -set_property(TARGET SmartHeap::SmartHeap PROPERTY INTERFACE_COMPILE_OPTIONS "/FI${CMAKE_SOURCE_DIR}/3rdparty/smartheap/SMRTHEAP.HPP") - add_library(libsmacker STATIC 3rdparty/libsmacker/smacker.c ) @@ -445,11 +439,6 @@ target_include_directories(lego1 PUBLIC "${CMAKE_SOURCE_DIR}/LEGO1/lego/legoomni # Link libraries target_link_libraries(lego1 PRIVATE tglrl viewmanager realtime mxdirectx roi geom anim Vec::Vec dinput dxguid misc 3dmanager omni) -if (ISLE_USE_SMARTHEAP) - foreach(tgt IN LISTS lego1_targets) - target_link_libraries(${tgt} PRIVATE SmartHeap::SmartHeap) - endforeach() -endif() foreach(tgt IN LISTS lego1_targets) target_link_libraries(${tgt} PRIVATE $<$:DirectX5::DirectX5>) endforeach() @@ -470,10 +459,6 @@ if (ISLE_BUILD_APP) # Use internal DirectX 5 if required target_link_libraries(isle PRIVATE $<$:DirectX5::DirectX5>) - if (ISLE_USE_SMARTHEAP) - target_link_libraries(isle PRIVATE SmartHeap::SmartHeap) - endif() - # Link DSOUND, WINMM, and LEGO1 target_link_libraries(isle PRIVATE dsound winmm lego1)