[ros-diffs] [greatlrd] 25777: adding usp10 to the building system. and small diff file as well. thuse change should not have been need it, maybe some whant take a look at them in the diff file and found 100% proper fix.

Author: greatlrd
Date: Sun Feb 11 13:35:19 2007
New Revision: 25777

URL: http://svn.reactos.org/svn/reactos?rev=25777&view=rev
Log:
adding usp10 to the building system. and small diff file as well. thuse change should not
have been need it, maybe some whant take a look at them in the diff file and found 100%
proper fix.

Removed:
    trunk/reactos/dll/win32/usp10/.cvsignore
    trunk/reactos/dll/win32/usp10/CVS/
    trunk/reactos/dll/win32/usp10/Makefile.in
    trunk/reactos/dll/win32/usp10/tests/
Modified:
    trunk/reactos/dll/win32/usp10/usp10.c
    trunk/reactos/dll/win32/win32.rbuild

Removed: trunk/reactos/dll/win32/usp10/.cvsignore
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/.cvsignore…
==============================================================================
--- trunk/reactos/dll/win32/usp10/.cvsignore (original)
+++ trunk/reactos/dll/win32/usp10/.cvsignore (removed)
@@ -1,2 +1,0 @@
-Makefile
-libusp10.def

Removed: trunk/reactos/dll/win32/usp10/Makefile.in
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/Makefile.i…
==============================================================================
--- trunk/reactos/dll/win32/usp10/Makefile.in (original)
+++ trunk/reactos/dll/win32/usp10/Makefile.in (removed)
@@ -1,14 +1,0 @@
-TOPSRCDIR = @top_srcdir@
-TOPOBJDIR = ../..
-SRCDIR    = @srcdir@
-VPATH     = @srcdir@
-MODULE    = usp10.dll
-IMPORTLIB = libusp10.$(IMPLIBEXT)
-IMPORTS   = gdi32 kernel32
-
-C_SRCS = \
-	usp10.c
-
-@MAKE_DLL_RULES@
-
-@DEPENDENCIES@  # everything below this line is overwritten by make depend

Modified: trunk/reactos/dll/win32/usp10/usp10.c
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/usp10/usp10.c?re…
==============================================================================
--- trunk/reactos/dll/win32/usp10/usp10.c (original)
+++ trunk/reactos/dll/win32/usp10/usp10.c Sun Feb 11 13:35:19 2007
@@ -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:  ");

Modified: trunk/reactos/dll/win32/win32.rbuild
URL:
http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/win32.rbuild?rev…
==============================================================================
--- trunk/reactos/dll/win32/win32.rbuild (original)
+++ trunk/reactos/dll/win32/win32.rbuild Sun Feb 11 13:35:19 2007
@@ -247,6 +247,9 @@
 <directory name="userenv">
 	<xi:include href="userenv/userenv.rbuild" />
 </directory>
+<directory name="usp10">
+	<xi:include href="usp10/usp10.rbuild" />
+</directory>
 <directory name="uxtheme">
 	<xi:include href="uxtheme/uxtheme.rbuild" />
 </directory>