Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-23 17:05:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

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.

Browse source 
svn path=/trunk/; revision=25777
This commit is contained in:
Magnus Olsen 2007-02-11 10:35:19 +00:00
parent 9fbc2ee0f8
commit 42c37a20ce
21 changed files with 6 additions and 1315 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reactos/dll/win32/usp10/.cvsignore
View file

@ -1,2 +0,0 @@
Makefile
libusp10.def

5
reactos/dll/win32/usp10/CVS/Entries
View file

@ -1,5 +0,0 @@
/Makefile.in/1.7/Thu Oct 5 10:04:29 2006//
D/tests////
/.cvsignore/1.7/Sat Jan 27 13:53:46 2007//
/usp10.c/1.70/Sat Jan 27 13:53:46 2007//
/usp10.spec/1.19/Sat Jan 27 13:53:46 2007//

5
reactos/dll/win32/usp10/CVS/Entries.Extra
View file

@ -1,5 +0,0 @@
/Makefile.in////*///
D/tests///////
/.cvsignore////*///
/usp10.c////*///
/usp10.spec////*///

5
reactos/dll/win32/usp10/CVS/Entries.Extra.Old
View file

@ -1,5 +0,0 @@
/.cvsignore////*///
/Makefile.in////*///
/usp10.c////*///
/usp10.spec////*///
D/tests///////

5
reactos/dll/win32/usp10/CVS/Entries.Old
View file

@ -1,5 +0,0 @@
/.cvsignore/1.5/Thu Sep 14 15:11:49 2006//
/Makefile.in/1.7/Thu Oct 5 10:04:29 2006//
/usp10.c/1.44/Tue Oct 17 11:13:45 2006//
/usp10.spec/1.15/Fri Oct 6 18:38:07 2006//
D/tests////

1
reactos/dll/win32/usp10/CVS/Repository
View file

@ -1 +0,0 @@
wine/dlls/usp10

1
reactos/dll/win32/usp10/CVS/Root
View file

@ -1 +0,0 @@
:pserver:cvs@cvs.winehq.org:/home/wine

0
reactos/dll/win32/usp10/CVS/Template
View file

14
reactos/dll/win32/usp10/Makefile.in
View file

@ -1,14 +0,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

4
reactos/dll/win32/usp10/tests/.cvsignore
View file

@ -1,4 +0,0 @@
*.ok
Makefile
testlist.c
usp10_crosstest.exe

4
reactos/dll/win32/usp10/tests/CVS/Entries
View file

@ -1,4 +0,0 @@
/Makefile.in/1.4/Wed Oct 11 10:53:49 2006//
/.cvsignore/1.8/Sat Jan 27 13:53:46 2007//
/usp10.c/1.41/Sat Jan 27 13:53:47 2007//
D

3
reactos/dll/win32/usp10/tests/CVS/Entries.Extra
View file

@ -1,3 +0,0 @@
/Makefile.in////*///
/.cvsignore////*///
/usp10.c////*///

3
reactos/dll/win32/usp10/tests/CVS/Entries.Extra.Old
View file

@ -1,3 +0,0 @@
/.cvsignore////*///
/Makefile.in////*///
/usp10.c////*///

4
reactos/dll/win32/usp10/tests/CVS/Entries.Old
View file

@ -1,4 +0,0 @@
/.cvsignore/1.5/Thu Sep 14 15:11:49 2006//
/Makefile.in/1.4/Wed Oct 11 10:53:49 2006//
/usp10.c/1.28/Tue Oct 24 18:41:31 2006//
D

1
reactos/dll/win32/usp10/tests/CVS/Repository
View file

@ -1 +0,0 @@
wine/dlls/usp10/tests

1
reactos/dll/win32/usp10/tests/CVS/Root
View file

@ -1 +0,0 @@
:pserver:cvs@cvs.winehq.org:/home/wine

0
reactos/dll/win32/usp10/tests/CVS/Template
View file

13
reactos/dll/win32/usp10/tests/Makefile.in
View file

@ -1,13 +0,0 @@
TOPSRCDIR = @top_srcdir@
TOPOBJDIR = ../../..
SRCDIR = @srcdir@
VPATH = @srcdir@
TESTDLL = usp10.dll
IMPORTS = usp10 user32 gdi32 kernel32
CTESTS = \
usp10.c
@MAKE_TEST_RULES@
@DEPENDENCIES@ # everything below this line is overwritten by make depend

1243
reactos/dll/win32/usp10/tests/usp10.c
View file

File diff suppressed because it is too large Load diff

4
reactos/dll/win32/usp10/usp10.c
View file

@ -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 @@ HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars,
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: ");

3
reactos/dll/win32/win32.rbuild
View file

@ -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>