commit c1c94ec80c607cf73f599b0221235cdd442cbbbc
author Alexandre Julliard <julliard@winehq.org> Wed Aug 23 19:15:02 2000 +0000
committer Alexandre Julliard <julliard@winehq.org> Wed Aug 23 19:15:02 2000 +0000
tree ae2873586f140e7028c9e41a61795cd72d7e66e0
parent 53d40899b1edaa5bc529f13d7609357dc4f25a61

Cleaned up major ugliness in __lfCheckSum.

graphics/x11drv/xfont.c

diff --git a/graphics/x11drv/xfont.c b/graphics/x11drv/xfont.c
index 4decaee..fbc6a1b 100644
--- a/graphics/x11drv/xfont.c
+++ b/graphics/x11drv/xfont.c
@@ -292,19 +292,17 @@
 {
     CHAR        font[LF_FACESIZE];
     UINT16      checksum = 0;
-    UINT16      i;
+    UINT16 *ptr;
+    int i;
 
-#define ptr ((UINT16*)plf)
-   for( i = 0; i < 9; i++ ) checksum ^= *ptr++;
-#undef ptr
-   i = 0;
-#define ptr ((CHAR*)plf)
-   do { font[i++] = tolower(*ptr++); } while (( i < LF_FACESIZE) && (*ptr) && (*ptr!=' '));
-   for( ptr = font, i >>= 1; i > 0; i-- ) 
-#undef ptr
-#define ptr ((UINT16*)plf)
-        checksum ^= *ptr++;
-#undef ptr
+    ptr = (UINT16 *)plf;
+    for (i = 0; i < 9; i++) checksum ^= *ptr++;
+    for (i = 0; i < LF_FACESIZE; i++)
+    {
+        font[i] = tolower(plf->lfFaceName[i]);
+        if (!font[i] || font[i] == ' ') break;
+    }
+    for (ptr = (UINT16 *)font, i >>= 1; i > 0; i-- ) checksum ^= *ptr++;
    return checksum;
 }