Author: greatlrd Date: Sun Feb 11 13:37:59 2007 New Revision: 25778
URL: http://svn.reactos.org/svn/reactos?rev=25778&view=rev Log: sorry I forget the rbuild for the usp10 it self :(
Added: trunk/reactos/dll/win32/usp10/usp10.rbuild (with props) trunk/reactos/dll/win32/usp10/usp10_ros.diff (with props)
Added: trunk/reactos/dll/win32/usp10/usp10.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.rbuil... ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10.rbuild (added) +++ trunk/reactos/dll/win32/usp10/usp10.rbuild Sun Feb 11 13:37:59 2007 @@ -1,0 +1,20 @@ +<module name="usp10" type="win32dll" entrypoint="0" installbase="system32" installname="usp10.dll" allowwarnings ="true" stdlib="host"> + <importlibrary definition="usp10.spec.def" /> + <include base="usp10">.</include> + <include base="ReactOS">include/reactos/wine</include> + <define name="UNICODE" /> + <define name="_UNICODE" /> + <define name="__REACTOS__" /> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x600</define> + <define name="_WIN32_WINNT">0x501</define> + <define name="WINVER">0x501</define> + <library>wine</library> + <library>uuid</library> + <library>ntdll</library> + <library>kernel32</library> + <library>user32</library> + <library>gdi32</library> + <file>usp10.c</file> + <file>usp10.spec</file> +</module>
Propchange: trunk/reactos/dll/win32/usp10/usp10.rbuild ------------------------------------------------------------------------------ svn:eol-style = native
Added: trunk/reactos/dll/win32/usp10/usp10_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10_ros.d... ============================================================================== --- trunk/reactos/dll/win32/usp10/usp10_ros.diff (added) +++ trunk/reactos/dll/win32/usp10/usp10_ros.diff Sun Feb 11 13:37:59 2007 @@ -1,0 +1,22 @@ +Index: usp10.c +=================================================================== +--- usp10.c (revision 25776) ++++ usp10.c (working copy) +@@ -35,6 +35,8 @@ + #include "wine/debug.h" + #include "wine/unicode.h" + ++DWORD STDCALL GetGlyphIndicesW( HDC hdc, LPCWSTR lpstr, int c, LPWORD pgi, DWORD fl); ++BOOL STDCALL GetCharABCWidthsI(HDC hdc, UINT giFirst, UINT cgi, LPWORD pgi, LPABC lpabc); + /** + * some documentation here: + * http://www.microsoft.com/typography/developers/uniscribe/uniscribe.htm +@@ -1241,7 +1243,7 @@ + TRACE("\n"); + + if (!psa->fNoGlyphIndex) { /* Glyph translate */ +- if (!(GetGlyphIndicesW(get_cache_hdc(psc), pwcChars, cChars, pwOutGlyphs, 0))) ++ if (!(GetGlyphIndicesW((HDC)get_cache_hdc(psc), (LPCWSTR) pwcChars, (int)cChars, (LPWORD) pwOutGlyphs,(DWORD) 0))) + return S_FALSE; + + TRACE("After: ");
Propchange: trunk/reactos/dll/win32/usp10/usp10_ros.diff ------------------------------------------------------------------------------ svn:eol-style = native