interesting
/
andlabs-ui
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Changed the memory allocator used in util.h so that code will work on real Windowss because LocalAlloc() doesn't want to.

This commit is contained in:
Pietro Gagliardi 2014-12-22 21:51:01 -05:00
parent 733254586b
commit c016143d80
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
wintable/new/util.h
View File

@ -16,31 +16,39 @@ static BOOL runHandlers(const handlerfunc list[], struct table *t, UINT uMsg, WP
// memory allocation stuff // memory allocation stuff
// each of these functions do an implicit ZeroMemory() // each of these functions do an implicit ZeroMemory()
// these also make tableRealloc(NULL, ...)/tableFree(NULL) act like realloc(NULL, ...)/free(NULL) (that is, same as tableAlloc(...)/malloc(...) and a no-op, respectively) // these also make tableRealloc(NULL, ...)/tableFree(NULL) act like realloc(NULL, ...)/free(NULL) (that is, same as tableAlloc(...)/malloc(...) and a no-op, respectively)
// we're using LocalAlloc() because: // we /would/ use LocalAlloc() here because
// - whether the malloc() family supports the last-error code is undefined // - whether the malloc() family supports the last-error code is undefined
// - the HeapAlloc() family DOES NOT support the last-error code; you're supposed to use Windows exceptions, and I can't find a clean way to do this with MinGW-w64 that doesn't rely on inline assembly or external libraries (unless they added __try/__except blocks) // - the HeapAlloc() family DOES NOT support the last-error code; you're supposed to use Windows exceptions, and I can't find a clean way to do this with MinGW-w64 that doesn't rely on inline assembly or external libraries (unless they added __try/__except blocks)
// - there's no VirtualReAlloc() to complement VirtualAlloc() and I'm not sure if we can even get the original allocated size back out reliably to write it ourselves (http://blogs.msdn.com/b/oldnewthing/archive/2012/03/16/10283988.aspx) // - there's no VirtualReAlloc() to complement VirtualAlloc() and I'm not sure if we can even get the original allocated size back out reliably to write it ourselves (http://blogs.msdn.com/b/oldnewthing/archive/2012/03/16/10283988.aspx)
// alas, LocalAlloc() doesn't want to work on real Windows 7 after a few times, throwing up ERROR_NOT_ENOUGH_MEMORY after three (3) ints or so :|
// we'll use malloc() until then
// needless to say, TODO // needless to say, TODO
static void *tableAlloc(size_t size, const char *panicMessage) static void *tableAlloc(size_t size, const char *panicMessage)
{ {
HLOCAL out; // HLOCAL out;
void *out;
out = LocalAlloc(LMEM_FIXED | LMEM_ZEROINIT, size); // out = LocalAlloc(LMEM_FIXED | LMEM_ZEROINIT, size);
out = malloc(size);
if (out == NULL) if (out == NULL)
panic(panicMessage); panic(panicMessage);
ZeroMemory(out, size);
return (void *) out; return (void *) out;
} }
static void *tableRealloc(void *p, size_t size, const char *panicMessage) static void *tableRealloc(void *p, size_t size, const char *panicMessage)
{ {
HLOCAL out; // HLOCAL out;
void *out;
if (p == NULL) if (p == NULL)
return tableAlloc(size, panicMessage); return tableAlloc(size, panicMessage);
out = LocalReAlloc((HLOCAL) p, size, LMEM_ZEROINIT); // out = LocalReAlloc((HLOCAL) p, size, LMEM_ZEROINIT);
out = realloc(p, size);
if (out == NULL) if (out == NULL)
panic(panicMessage); panic(panicMessage);
// TODO zero the extra memory
return (void *) out; return (void *) out;
} }
@ -48,8 +56,9 @@ static void tableFree(void *p, const char *panicMessage)
{ {
if (p == NULL) if (p == NULL)
return; return;
if (LocalFree((HLOCAL) p) != NULL) // if (LocalFree((HLOCAL) p) != NULL)
panic(panicMessage); // panic(panicMessage);
free(p);
} }
// font selection // font selection