Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-07-10 04:44:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Autosyncing with Wine HEAD

Browse source 
svn path=/trunk/; revision=33072
This commit is contained in:
The Wine Synchronizer 2008-04-20 17:07:15 +00:00
parent c1e47ef0a6
commit 14d17cbecf
4 changed files with 1780 additions and 1755 deletions
Download patch file Download diff file Expand all files Collapse all files

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

File diff suppressed because it is too large Load diff

24
reactos/dll/win32/usp10/usp10.rbuild
View file

@ -1,18 +1,18 @@
<module name="usp10" type="win32dll" installbase="system32" installname="usp10.dll" allowwarnings ="true"> <?xml version="1.0"?>
<!DOCTYPE module SYSTEM "../../../tools/rbuild/project.dtd">
<group>
<module name="usp10" type="win32dll" baseaddress="${BASEADDRESS_USP10}" installbase="system32" installname="usp10.dll" allowwarnings="true">
<importlibrary definition="usp10.spec.def" /> <importlibrary definition="usp10.spec.def" />
<include base="usp10">.</include> <include base="usp10">.</include>
<include base="ReactOS">include/reactos/wine</include> <include base="ReactOS">include/reactos/wine</include>
<define name="UNICODE" /> <define name="__WINESRC__" />
<define name="_UNICODE" /> <define name="WINVER">0x600</define>
<define name="_WIN32_IE">0x600</define> <define name="_WIN32_WINNT">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.c</file>
<file>usp10.spec</file> <file>usp10.spec</file>
<library>wine</library>
<library>gdi32</library>
<library>kernel32</library>
<library>ntdll</library>
</module> </module>
</group>

70
reactos/dll/win32/usp10/usp10.spec
View file

@ -1,35 +1,35 @@
@ stub LpkPresent @ stub LpkPresent
@ stdcall ScriptApplyDigitSubstitution(ptr ptr ptr) @ stdcall ScriptApplyDigitSubstitution(ptr ptr ptr)
@ stub ScriptApplyLogicalWidth @ stub ScriptApplyLogicalWidth
@ stdcall ScriptBreak(ptr long ptr ptr) @ stdcall ScriptBreak(ptr long ptr ptr)
@ stdcall ScriptCPtoX(long long long long ptr ptr ptr ptr ptr) @ stdcall ScriptCPtoX(long long long long ptr ptr ptr ptr ptr)
@ stdcall ScriptCacheGetHeight(ptr ptr ptr) @ stdcall ScriptCacheGetHeight(ptr ptr ptr)
@ stdcall ScriptFreeCache(ptr) @ stdcall ScriptFreeCache(ptr)
@ stdcall ScriptGetCMap(ptr ptr ptr long long ptr) @ stdcall ScriptGetCMap(ptr ptr ptr long long ptr)
@ stdcall ScriptGetFontProperties(long ptr ptr) @ stdcall ScriptGetFontProperties(long ptr ptr)
@ stdcall ScriptGetGlyphABCWidth(ptr ptr long ptr) @ stdcall ScriptGetGlyphABCWidth(ptr ptr long ptr)
@ stub ScriptGetLogicalWidths @ stdcall ScriptGetLogicalWidths(ptr long long ptr ptr ptr ptr)
@ stdcall ScriptGetProperties(ptr long) @ stdcall ScriptGetProperties(ptr long)
@ stdcall ScriptIsComplex(wstr long long) @ stdcall ScriptIsComplex(wstr long long)
@ stdcall ScriptItemize(wstr long long ptr ptr ptr ptr) @ stdcall ScriptItemize(wstr long long ptr ptr ptr ptr)
@ stub ScriptJustify @ stub ScriptJustify
@ stdcall ScriptLayout(long ptr ptr ptr) @ stdcall ScriptLayout(long ptr ptr ptr)
@ stdcall ScriptPlace(ptr ptr ptr long ptr ptr ptr ptr ptr) @ stdcall ScriptPlace(ptr ptr ptr long ptr ptr ptr ptr ptr)
@ stdcall ScriptRecordDigitSubstitution(ptr ptr) @ stdcall ScriptRecordDigitSubstitution(ptr ptr)
@ stdcall ScriptShape(ptr ptr ptr long long ptr ptr ptr ptr ptr) @ stdcall ScriptShape(ptr ptr ptr long long ptr ptr ptr ptr ptr)
@ stdcall ScriptStringAnalyse(ptr ptr long long long long long ptr ptr ptr ptr ptr ptr) @ stdcall ScriptStringAnalyse(ptr ptr long long long long long ptr ptr ptr ptr ptr ptr)
@ stdcall ScriptStringCPtoX(ptr long long ptr) @ stdcall ScriptStringCPtoX(ptr long long ptr)
@ stdcall ScriptStringFree(ptr) @ stdcall ScriptStringFree(ptr)
@ stdcall ScriptStringGetLogicalWidths(ptr ptr) @ stdcall ScriptStringGetLogicalWidths(ptr ptr)
@ stdcall ScriptStringGetOrder(ptr ptr) @ stdcall ScriptStringGetOrder(ptr ptr)
@ stdcall ScriptStringOut(ptr long long long ptr long long long) @ stdcall ScriptStringOut(ptr long long long ptr long long long)
@ stdcall ScriptStringValidate(ptr) @ stdcall ScriptStringValidate(ptr)
@ stdcall ScriptStringXtoCP(ptr long ptr ptr) @ stdcall ScriptStringXtoCP(ptr long ptr ptr)
@ stdcall ScriptString_pLogAttr(ptr) @ stdcall ScriptString_pLogAttr(ptr)
@ stdcall ScriptString_pSize(ptr) @ stdcall ScriptString_pSize(ptr)
@ stdcall ScriptString_pcOutChars(ptr) @ stdcall ScriptString_pcOutChars(ptr)
@ stdcall ScriptTextOut(ptr ptr long long long ptr ptr ptr long ptr long ptr ptr ptr) @ stdcall ScriptTextOut(ptr ptr long long long ptr ptr ptr long ptr long ptr ptr ptr)
@ stdcall ScriptXtoCP(long long long ptr ptr ptr ptr ptr ptr) @ stdcall ScriptXtoCP(long long long ptr ptr ptr ptr ptr ptr)
@ stub UspAllocCache @ stub UspAllocCache
@ stub UspAllocTemp @ stub UspAllocTemp
@ stub UspFreeMem @ stub UspFreeMem

22
reactos/dll/win32/usp10/usp10_ros.diff
View file

@ -1,22 +0,0 @@
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: ");