gdi32: Multi-character character constants aren't portable as their behaviour is compiler dependent according to the C standard. Found by sparse. (2nd try)

[Michael Stefaniuc]

Please use this patch instead (thx James).

bye
	michael
---
 dlls/gdi32/freetype.c |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 424fb3d..c9e03fd 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -590,8 +590,9 @@ static char **expand_mac_font(const char *path)
         unsigned short *num_faces_ptr, num_faces, face;
         AsscEntry *assoc;
         Handle fond;
+        ResType fond_res = 0x464f4e44   /* 'FOND' */;
 
-        fond = Get1IndResource('FOND', idx);
+        fond = Get1IndResource(fond_res, idx);
         if(!fond) break;
         TRACE("got fond resource %d\n", idx);
         HLock(fond);
@@ -605,6 +606,7 @@ static char **expand_mac_font(const char *path)
         for(face = 0; face < num_faces; face++, assoc++)
         {
             Handle sfnt;
+            ResType sfnt_res = 0x73666e74       /* 'sfnt' */
             unsigned short size, font_id;
             char *output;
 
@@ -617,7 +619,7 @@ static char **expand_mac_font(const char *path)
             }
 
             TRACE("trying to load sfnt id %04x\n", font_id);
-            sfnt = GetResource('sfnt', font_id);
+            sfnt = GetResource(sfnt_res, font_id);
             if(!sfnt)
             {
                 TRACE("can't get sfnt resource %04x\n", font_id);
-- 
1.5.0.6


-- 
Michael Stefaniuc               Tel.: +49-711-96437-199
Sr. Network Engineer            Fax.: +49-711-96437-111
Red Hat GmbH                    Email: mstefani at redhat.com
Hauptstaetterstr. 58            http://www.redhat.de/
D-70178 Stuttgart
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://www.winehq.org/pipermail/wine-patches/attachments/20070625/6a3605d6/attachment.pgp