mirror of
https://github.com/reactos/reactos.git
synced 2024-08-20 10:23:22 +00:00
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.
svn path=/trunk/; revision=25777
This commit is contained in:
parent
9fbc2ee0f8
commit
42c37a20ce
|
@ -1,2 +0,0 @@
|
||||||
Makefile
|
|
||||||
libusp10.def
|
|
|
@ -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//
|
|
|
@ -1,5 +0,0 @@
|
||||||
/Makefile.in////*///
|
|
||||||
D/tests///////
|
|
||||||
/.cvsignore////*///
|
|
||||||
/usp10.c////*///
|
|
||||||
/usp10.spec////*///
|
|
|
@ -1,5 +0,0 @@
|
||||||
/.cvsignore////*///
|
|
||||||
/Makefile.in////*///
|
|
||||||
/usp10.c////*///
|
|
||||||
/usp10.spec////*///
|
|
||||||
D/tests///////
|
|
|
@ -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 +0,0 @@
|
||||||
wine/dlls/usp10
|
|
|
@ -1 +0,0 @@
|
||||||
:pserver:cvs@cvs.winehq.org:/home/wine
|
|
|
@ -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
|
|
|
@ -1,4 +0,0 @@
|
||||||
*.ok
|
|
||||||
Makefile
|
|
||||||
testlist.c
|
|
||||||
usp10_crosstest.exe
|
|
|
@ -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
|
|
|
@ -1,3 +0,0 @@
|
||||||
/Makefile.in////*///
|
|
||||||
/.cvsignore////*///
|
|
||||||
/usp10.c////*///
|
|
|
@ -1,3 +0,0 @@
|
||||||
/.cvsignore////*///
|
|
||||||
/Makefile.in////*///
|
|
||||||
/usp10.c////*///
|
|
|
@ -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 +0,0 @@
|
||||||
wine/dlls/usp10/tests
|
|
|
@ -1 +0,0 @@
|
||||||
:pserver:cvs@cvs.winehq.org:/home/wine
|
|
|
@ -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
|
|
File diff suppressed because it is too large
Load diff
|
@ -35,6 +35,8 @@
|
||||||
#include "wine/debug.h"
|
#include "wine/debug.h"
|
||||||
#include "wine/unicode.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:
|
* some documentation here:
|
||||||
* http://www.microsoft.com/typography/developers/uniscribe/uniscribe.htm
|
* 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");
|
TRACE("\n");
|
||||||
|
|
||||||
if (!psa->fNoGlyphIndex) { /* Glyph translate */
|
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;
|
return S_FALSE;
|
||||||
|
|
||||||
TRACE("After: ");
|
TRACE("After: ");
|
||||||
|
|
|
@ -247,6 +247,9 @@
|
||||||
<directory name="userenv">
|
<directory name="userenv">
|
||||||
<xi:include href="userenv/userenv.rbuild" />
|
<xi:include href="userenv/userenv.rbuild" />
|
||||||
</directory>
|
</directory>
|
||||||
|
<directory name="usp10">
|
||||||
|
<xi:include href="usp10/usp10.rbuild" />
|
||||||
|
</directory>
|
||||||
<directory name="uxtheme">
|
<directory name="uxtheme">
|
||||||
<xi:include href="uxtheme/uxtheme.rbuild" />
|
<xi:include href="uxtheme/uxtheme.rbuild" />
|
||||||
</directory>
|
</directory>
|
||||||
|
|
Loading…
Reference in a new issue