marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use typecasts to suppress compiler warnings.

oldstable
Ian Pilcher 2001-04-23 18:12:45 +00:00 committed by Alexandre Julliard
parent 67f0be15c5
commit 60268d1da9
2 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dlls/wineps/glyphlist.c
View File

@ -65,18 +65,11 @@ INT PSDRV_GlyphListInit()
* be initialized without generating compiler warnings
*
*/
typedef struct
inline static INT GlyphListInsert(LPCSTR szName, INT index)
{
INT index;
LPSTR sz;
} _glyphname;
GLYPHNAME *g;
inline INT GlyphListInsert(LPCSTR szName, INT index)
{
_glyphname *g;
g = (_glyphname *)HeapAlloc(PSDRV_Heap, 0,
sizeof(GLYPHNAME) + strlen(szName) + 1);
g = HeapAlloc(PSDRV_Heap, 0, sizeof(GLYPHNAME) + strlen(szName) + 1);
if (g == NULL)
{
ERR("Failed to allocate %i bytes of memory\n",
@ -86,7 +79,7 @@ inline INT GlyphListInsert(LPCSTR szName, INT index)
g->index = -1;
g->sz = (LPSTR)(g + 1);
strcpy(g->sz, szName);
strcpy((LPSTR)g->sz, szName);
if (glyphListSize % GLYPHLIST_ALLOCSIZE == 0) /* grow the list? */
{
@ -114,7 +107,7 @@ inline INT GlyphListInsert(LPCSTR szName, INT index)
(glyphListSize - index) * sizeof(GLYPHNAME *));
}
glyphList[index] = (GLYPHNAME *)g;
glyphList[index] = g;
++glyphListSize;
TRACE("Added '%s' at glyphList[%i] (glyphListSize now %i)\n",

8
dlls/wineps/psdrv.h
View File

@ -15,18 +15,18 @@
#include "winspool.h"
typedef struct {
INT index;
const LPCSTR sz;
INT index;
LPCSTR sz;
} GLYPHNAME;
typedef struct {
LONG UV;
const GLYPHNAME *const name;
const GLYPHNAME *name;
} UNICODEGLYPH;
typedef struct {
INT size;
const UNICODEGLYPH *const glyphs;
const UNICODEGLYPH *glyphs;
} UNICODEVECTOR;
extern const INT PSDRV_AGLGlyphNamesSize;