gdi32: Fixed freetype working function

Сергей Мосин svmosin at gmail.com
Thu Sep 27 04:03:29 CDT 2012


The function WineEngAddFontMemResourceEx in gdi32/fretype.c contained
strange XOR operation with some random number 0x87654321, instead of
returning the real font handle.

>From d13e416366549effd77495d490964c4ff23a267b Mon Sep 17 00:00:00 2001
From: Serge Mosin <svmosin at gmail.com>
Date: Tue, 18 Sep 2012 12:51:33 +0700
Subject: Removed XOR operation for returning value of
 WineEngAddFontMemResourceEx function

---
 dlls/gdi32/freetype.c |    7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c
index 8222a18..940e623 100644
--- a/dlls/gdi32/freetype.c
+++ b/dlls/gdi32/freetype.c
@@ -2821,11 +2821,8 @@ HANDLE WineEngAddFontMemResourceEx(PVOID pbFont,
DWORD cbFont, PVOID pdv, DWORD
             HeapFree(GetProcessHeap(), 0, pFontCopy);
             return 0;
         }
-        /* FIXME: is the handle only for use in RemoveFontMemResourceEx or
should it be a true handle?
-         * For now return something unique but quite random
-         */
-        TRACE("Returning handle %lx\n", ((INT_PTR)pFontCopy)^0x87654321);
-        return (HANDLE)(((INT_PTR)pFontCopy)^0x87654321);
+        TRACE("Returning handle %lx\n", (INT_PTR)pFontCopy);
+        return (HANDLE)((INT_PTR)pFontCopy);
     }

     *pcFonts = 0;
-- 
1.7.9.5
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://www.winehq.org/pipermail/wine-patches/attachments/20120927/8f1f95b1/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Removed-XOR-operation-for-returning-value-of-WineEng.patch
Type: application/octet-stream
Size: 1129 bytes
Desc: not available
URL: <http://www.winehq.org/pipermail/wine-patches/attachments/20120927/8f1f95b1/attachment.obj>


More information about the wine-patches mailing list