Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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.
by greatlrd＠svn.reactos.org 11 Feb '07

11 Feb '07

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>

1 0

[greatlrd] 25776: Copied remotely
by greatlrd＠svn.reactos.org 11 Feb '07

11 Feb '07

Author: greatlrd Date: Sun Feb 11 13:22:39 2007 New Revision: 25776 URL: http://svn.reactos.org/svn/reactos?rev=25776&view=rev Log: Copied remotely Added: trunk/reactos/dll/win32/usp10/ - copied from r25775, vendor/wine/dlls/usp10/current/

1 0

[greatlrd] 25775: Removed file/folder from wrong vendor drop I did
by greatlrd＠svn.reactos.org 11 Feb '07

11 Feb '07

Author: greatlrd Date: Sun Feb 11 13:20:06 2007 New Revision: 25775 URL: http://svn.reactos.org/svn/reactos?rev=25775&view=rev Log: Removed file/folder from wrong vendor drop I did Removed: vendor/wine/dlls/tests/

1 0

[greatlrd] 25774: vendor drop of usp10 from wine cvs 11/02-2007
by greatlrd＠svn.reactos.org 11 Feb '07

11 Feb '07

Author: greatlrd Date: Sun Feb 11 13:19:04 2007 New Revision: 25774 URL: http://svn.reactos.org/svn/reactos?rev=25774&view=rev Log: vendor drop of usp10 from wine cvs 11/02-2007 Added: vendor/wine/dlls/usp10/ vendor/wine/dlls/usp10/current/ vendor/wine/dlls/usp10/current/.cvsignore vendor/wine/dlls/usp10/current/CVS/ vendor/wine/dlls/usp10/current/CVS/Entries vendor/wine/dlls/usp10/current/CVS/Entries.Extra vendor/wine/dlls/usp10/current/CVS/Entries.Extra.Old vendor/wine/dlls/usp10/current/CVS/Entries.Old vendor/wine/dlls/usp10/current/CVS/Repository vendor/wine/dlls/usp10/current/CVS/Root vendor/wine/dlls/usp10/current/CVS/Template vendor/wine/dlls/usp10/current/Makefile.in vendor/wine/dlls/usp10/current/tests/ vendor/wine/dlls/usp10/current/tests/.cvsignore vendor/wine/dlls/usp10/current/tests/CVS/ vendor/wine/dlls/usp10/current/tests/CVS/Entries vendor/wine/dlls/usp10/current/tests/CVS/Entries.Extra vendor/wine/dlls/usp10/current/tests/CVS/Entries.Extra.Old vendor/wine/dlls/usp10/current/tests/CVS/Entries.Old vendor/wine/dlls/usp10/current/tests/CVS/Repository vendor/wine/dlls/usp10/current/tests/CVS/Root vendor/wine/dlls/usp10/current/tests/CVS/Template vendor/wine/dlls/usp10/current/tests/Makefile.in vendor/wine/dlls/usp10/current/tests/usp10.c vendor/wine/dlls/usp10/current/usp10.c vendor/wine/dlls/usp10/current/usp10.spec [This mail would be too long, it was shortened to contain the URLs only.] Added: vendor/wine/dlls/usp10/current/.cvsignore URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/.cvsignor… Added: vendor/wine/dlls/usp10/current/CVS/Entries URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/CVS/Entri… Added: vendor/wine/dlls/usp10/current/CVS/Entries.Extra URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/CVS/Entri… Added: vendor/wine/dlls/usp10/current/CVS/Entries.Extra.Old URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/CVS/Entri… Added: vendor/wine/dlls/usp10/current/CVS/Entries.Old URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/CVS/Entri… Added: vendor/wine/dlls/usp10/current/CVS/Repository URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/CVS/Repos… Added: vendor/wine/dlls/usp10/current/CVS/Root URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/CVS/Root?… Added: vendor/wine/dlls/usp10/current/CVS/Template URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/CVS/Templ… Added: vendor/wine/dlls/usp10/current/Makefile.in URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/Makefile.… Added: vendor/wine/dlls/usp10/current/tests/.cvsignore URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/tests/.cv… Added: vendor/wine/dlls/usp10/current/tests/CVS/Entries URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/tests/CVS… Added: vendor/wine/dlls/usp10/current/tests/CVS/Entries.Extra URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/tests/CVS… Added: vendor/wine/dlls/usp10/current/tests/CVS/Entries.Extra.Old URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/tests/CVS… Added: vendor/wine/dlls/usp10/current/tests/CVS/Entries.Old URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/tests/CVS… Added: vendor/wine/dlls/usp10/current/tests/CVS/Repository URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/tests/CVS… Added: vendor/wine/dlls/usp10/current/tests/CVS/Root URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/tests/CVS… Added: vendor/wine/dlls/usp10/current/tests/CVS/Template URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/tests/CVS… Added: vendor/wine/dlls/usp10/current/tests/Makefile.in URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/tests/Mak… Added: vendor/wine/dlls/usp10/current/tests/usp10.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/tests/usp… Added: vendor/wine/dlls/usp10/current/usp10.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/usp10.c?r… Added: vendor/wine/dlls/usp10/current/usp10.spec URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10/current/usp10.spe…

1 0

[greatlrd] 25773: Removed file/folder did the vendor wrong sorry
by greatlrd＠svn.reactos.org 11 Feb '07

11 Feb '07

Author: greatlrd Date: Sun Feb 11 13:16:20 2007 New Revision: 25773 URL: http://svn.reactos.org/svn/reactos?rev=25773&view=rev Log: Removed file/folder did the vendor wrong sorry Removed: vendor/wine/dlls/.cvsignore vendor/wine/dlls/Makefile.in vendor/wine/dlls/usp10.c vendor/wine/dlls/usp10.spec Removed: vendor/wine/dlls/.cvsignore URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/.cvsignore?rev=25772&vi… ============================================================================== --- vendor/wine/dlls/.cvsignore (original) +++ vendor/wine/dlls/.cvsignore (removed) @@ -1,2 +1,0 @@ -Makefile -libusp10.def Removed: vendor/wine/dlls/Makefile.in URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/Makefile.in?rev=25772&v… ============================================================================== --- vendor/wine/dlls/Makefile.in (original) +++ vendor/wine/dlls/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 Removed: vendor/wine/dlls/usp10.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10.c?rev=25772&view=… ============================================================================== --- vendor/wine/dlls/usp10.c (original) +++ vendor/wine/dlls/usp10.c (removed) @@ -1,1684 +1,0 @@ -/* - * Implementation of Uniscribe Script Processor (usp10.dll) - * - * Copyright 2005 Steven Edwards for CodeWeavers - * Copyright 2006 Hans Leidekker - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - * - * Notes: - * Uniscribe allows for processing of complex scripts such as joining - * and filtering characters and bi-directional text with custom line breaks. - */ - -#include <stdarg.h> - -#include "windef.h" -#include "winbase.h" -#include "wingdi.h" -#include "winuser.h" -#include "winnls.h" -#include "usp10.h" - -#include "wine/debug.h" -#include "wine/unicode.h" - -/** - * some documentation here: - * http://www.microsoft.com/typography/developers/uniscribe/uniscribe.htm - */ - -WINE_DEFAULT_DEBUG_CHANNEL(uniscribe); - -static const SCRIPT_PROPERTIES props[] = -{ - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 9, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 8, 0, 0, 0, 0, 161, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 25, 0, 0, 0, 0, 204, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 43, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 55, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 42, 0, 0, 0, 0, 163, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 9, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 0, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 18, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 18, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 9, 0, 1, 0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 13, 0, 1, 0, 1, 177, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 13, 0, 1, 0, 0, 177, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 1, 0, 1, 0, 0, 178, 0, 0, 0, 0, 0, 0, 1, 1, 0 }, - { 1, 1, 1, 0, 0, 178, 0, 0, 0, 0, 0, 0, 1, 0, 0 }, - { 41, 1, 1, 0, 0, 178, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 32, 1, 1, 0, 0, 178, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 90, 0, 1, 0, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0 }, - { 30, 0, 1, 1, 1, 222, 0, 0, 1, 0, 1, 0, 0, 0, 1 }, - { 30, 1, 1, 0, 0, 222, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 30, 0, 1, 0, 0, 222, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 57, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 57, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 73, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 73, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 69, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 69, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 69, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 70, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 70, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 71, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 71, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 72, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 72, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 74, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 74, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 75, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 75, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 76, 0, 1, 0, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 76, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 81, 0, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0 }, - { 81, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 84, 0, 1, 1, 1, 1, 0, 0, 1, 0, 1, 0, 0, 0, 0 }, - { 84, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 83, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 83, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 85, 0, 1, 1, 1, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0 }, - { 85, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 80, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 80, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 94, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 94, 1, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 101, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 93, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 92, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 9, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 0, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 91, 0, 1, 0, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, - { 9, 0, 1, 0, 1, 0, 0, 0, 0, 0, 0, 1, 1, 0, 0 }, - { 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }, -}; - -static const SCRIPT_PROPERTIES *script_props[] = -{ - &props[0], &props[1], &props[2], &props[3], - &props[4], &props[5], &props[6], &props[7], - &props[8], &props[9], &props[11], &props[12], - &props[13], &props[14], &props[15], &props[16], - &props[17], &props[18], &props[19], &props[20], - &props[21], &props[22], &props[23], &props[24], - &props[25], &props[26], &props[27], &props[28], - &props[29], &props[30], &props[31], &props[32], - &props[33], &props[34], &props[35], &props[36], - &props[37], &props[38], &props[39], &props[40], - &props[41], &props[42], &props[43], &props[44], - &props[45], &props[46], &props[47], &props[48], - &props[49], &props[50], &props[51], &props[52], - &props[53], &props[54], &props[55], &props[56], - &props[57], &props[58], &props[59], &props[60], - &props[61], &props[62], &props[63], &props[64], - &props[65], &props[66], &props[67], &props[68], - &props[69], &props[70], &props[71], &props[72], - &props[73] -}; - -typedef struct { - HDC hdc; - LONG height; - WCHAR default_char; -} ScriptCache; - -typedef struct { - int numGlyphs; - WORD* glyphs; - WORD* pwLogClust; - int* piAdvance; - SCRIPT_VISATTR* psva; - GOFFSET* pGoffset; - ABC* abc; -} StringGlyphs; - -typedef struct { - BOOL invalid; - int clip_len; - ScriptCache *sc; - int cItems; - int cMaxGlyphs; - SCRIPT_ITEM* pItem; - int numItems; - StringGlyphs* glyphs; - SCRIPT_LOGATTR* logattrs; - SIZE* sz; -} StringAnalysis; - -static inline void *usp_alloc(SIZE_T size) -{ - return HeapAlloc(GetProcessHeap(), 0, size); -} - -static inline void *usp_zero_alloc(SIZE_T size) -{ - return HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, size); -} - -static inline void *usp_zero_realloc(LPVOID mem, SIZE_T size) -{ - return HeapReAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mem, size); -} - -static inline void usp_free(LPVOID mem) -{ - HeapFree(GetProcessHeap(), 0, mem); -} - -static HDC get_cache_hdc(SCRIPT_CACHE *psc) -{ - return ((ScriptCache *)*psc)->hdc; -} - -static WCHAR get_cache_default_char(SCRIPT_CACHE *psc) -{ - return ((ScriptCache *)*psc)->default_char; -} - -static LONG get_cache_height(SCRIPT_CACHE *psc) -{ - return ((ScriptCache *)*psc)->height; -} - -static HRESULT init_script_cache(const HDC hdc, ScriptCache *sc) -{ - TEXTMETRICW metric; - - if (!GetTextMetricsW(hdc, &metric)) return E_INVALIDARG; - sc->height = metric.tmHeight; - sc->default_char = metric.tmDefaultChar; - sc->hdc = hdc; - return S_OK; -} - -static HRESULT get_script_cache(const HDC hdc, SCRIPT_CACHE *psc) -{ - if (!psc) return E_INVALIDARG; - if (!*psc) - { - HRESULT ret; - ScriptCache *sc; - - if (!hdc) return E_PENDING; - if (!(sc = usp_zero_alloc(sizeof(ScriptCache)))) return E_OUTOFMEMORY; - if ((ret = init_script_cache(hdc, sc))) - { - usp_free(sc); - return ret; - } - *psc = sc; - } - TRACE("<- %p\n", *psc); - return S_OK; -} - -/*********************************************************************** - * DllMain - * - */ -BOOL WINAPI DllMain(HINSTANCE hInstDLL, DWORD fdwReason, LPVOID lpv) -{ - switch(fdwReason) - { - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hInstDLL); - break; - case DLL_PROCESS_DETACH: - break; - } - return TRUE; -} - -/*********************************************************************** - * ScriptFreeCache (USP10.@) - * - * Free a script cache. - * - * PARAMS - * psc [I/O] Script cache. - * - * RETURNS - * Success: S_OK - * Failure: Non-zero HRESULT value. - */ -HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc) -{ - TRACE("%p\n", psc); - - if (psc) - { - usp_free(*psc); - *psc = NULL; - } - return S_OK; -} - -/*********************************************************************** - * ScriptGetProperties (USP10.@) - * - * Retrieve a list of script properties. - * - * PARAMS - * props [I] Pointer to an array of SCRIPT_PROPERTIES pointers. - * num [I] Pointer to the number of scripts. - * - * RETURNS - * Success: S_OK - * Failure: Non-zero HRESULT value. - * - * NOTES - * Behaviour matches WinXP. - */ -HRESULT WINAPI ScriptGetProperties(const SCRIPT_PROPERTIES ***props, int *num) -{ - TRACE("(%p,%p)\n", props, num); - - if (!props && !num) return E_INVALIDARG; - - if (num) *num = sizeof(script_props)/sizeof(script_props[0]); - if (props) *props = script_props; - - return S_OK; -} - -/*********************************************************************** - * ScriptGetFontProperties (USP10.@) - * - * Get information on special glyphs. - * - * PARAMS - * hdc [I] Device context. - * psc [I/O] Opaque pointer to a script cache. - * sfp [O] Font properties structure. - */ -HRESULT WINAPI ScriptGetFontProperties(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_FONTPROPERTIES *sfp) -{ - HRESULT hr; - - TRACE("%p,%p,%p\n", hdc, psc, sfp); - - if (!sfp) return E_INVALIDARG; - if ((hr = get_script_cache(hdc, psc))) return hr; - - if (sfp->cBytes != sizeof(SCRIPT_FONTPROPERTIES)) - return E_INVALIDARG; - - /* return something sensible? */ - sfp->wgBlank = 0; - sfp->wgDefault = get_cache_default_char(psc); - sfp->wgInvalid = 0; - sfp->wgKashida = 0xffff; - sfp->iKashidaWidth = 0; - - return S_OK; -} - -/*********************************************************************** - * ScriptRecordDigitSubstitution (USP10.@) - * - * Record digit substitution settings for a given locale. - * - * PARAMS - * locale [I] Locale identifier. - * sds [I] Structure to record substitution settings. - * - * RETURNS - * Success: S_OK - * Failure: E_POINTER if sds is NULL, E_INVALIDARG otherwise. - * - * SEE ALSO - * http://blogs.msdn.com/michkap/archive/2006/02/22/536877.aspx - */ -HRESULT WINAPI ScriptRecordDigitSubstitution(LCID locale, SCRIPT_DIGITSUBSTITUTE *sds) -{ - DWORD plgid, sub; - - TRACE("0x%x, %p\n", locale, sds); - - /* This implementation appears to be correct for all languages, but it's - * not clear if sds->DigitSubstitute is ever set to anything except - * CONTEXT or NONE in reality */ - - if (!sds) return E_POINTER; - - locale = ConvertDefaultLocale(locale); - - if (!IsValidLocale(locale, LCID_INSTALLED)) - return E_INVALIDARG; - - plgid = PRIMARYLANGID(LANGIDFROMLCID(locale)); - sds->TraditionalDigitLanguage = plgid; - - if (plgid == LANG_ARABIC || plgid == LANG_FARSI) - sds->NationalDigitLanguage = plgid; - else - sds->NationalDigitLanguage = LANG_ENGLISH; - - if (!GetLocaleInfoW(locale, LOCALE_IDIGITSUBSTITUTION | LOCALE_RETURN_NUMBER, - (LPWSTR)&sub, sizeof(sub)/sizeof(WCHAR))) return E_INVALIDARG; - - switch (sub) - { - case 0: - if (plgid == LANG_ARABIC || plgid == LANG_FARSI) - sds->DigitSubstitute = SCRIPT_DIGITSUBSTITUTE_CONTEXT; - else - sds->DigitSubstitute = SCRIPT_DIGITSUBSTITUTE_NONE; - break; - case 1: - sds->DigitSubstitute = SCRIPT_DIGITSUBSTITUTE_NONE; - break; - case 2: - sds->DigitSubstitute = SCRIPT_DIGITSUBSTITUTE_NATIONAL; - break; - default: - sds->DigitSubstitute = SCRIPT_DIGITSUBSTITUTE_TRADITIONAL; - break; - } - - sds->dwReserved = 0; - return S_OK; -} - -/*********************************************************************** - * ScriptApplyDigitSubstitution (USP10.@) - * - * Apply digit substitution settings. - * - * PARAMS - * sds [I] Structure with recorded substitution settings. - * sc [I] Script control structure. - * ss [I] Script state structure. - * - * RETURNS - * Success: S_OK - * Failure: E_INVALIDARG if sds is invalid. Otherwise an HRESULT. - */ -HRESULT WINAPI ScriptApplyDigitSubstitution(const SCRIPT_DIGITSUBSTITUTE *sds, - SCRIPT_CONTROL *sc, SCRIPT_STATE *ss) -{ - SCRIPT_DIGITSUBSTITUTE psds; - - TRACE("%p, %p, %p\n", sds, sc, ss); - - if (!sc || !ss) return E_POINTER; - if (!sds) - { - sds = &psds; - if (ScriptRecordDigitSubstitution(LOCALE_USER_DEFAULT, &psds) != S_OK) - return E_INVALIDARG; - } - - sc->uDefaultLanguage = LANG_ENGLISH; - sc->fContextDigits = 0; - ss->fDigitSubstitute = 0; - - switch (sds->DigitSubstitute) { - case SCRIPT_DIGITSUBSTITUTE_CONTEXT: - case SCRIPT_DIGITSUBSTITUTE_NATIONAL: - case SCRIPT_DIGITSUBSTITUTE_NONE: - case SCRIPT_DIGITSUBSTITUTE_TRADITIONAL: - return S_OK; - default: - return E_INVALIDARG; - } -} - -/*********************************************************************** - * ScriptItemize (USP10.@) - * - * Split a Unicode string into shapeable parts. - * - * PARAMS - * pwcInChars [I] String to split. - * cInChars [I] Number of characters in pwcInChars. - * cMaxItems [I] Maximum number of items to return. - * psControl [I] Pointer to a SCRIPT_CONTROL structure. - * psState [I] Pointer to a SCRIPT_STATE structure. - * pItems [O] Buffer to receive SCRIPT_ITEM structures. - * pcItems [O] Number of script items returned. - * - * RETURNS - * Success: S_OK - * Failure: Non-zero HRESULT value. - */ -HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItems, - const SCRIPT_CONTROL *psControl, const SCRIPT_STATE *psState, - SCRIPT_ITEM *pItems, int *pcItems) -{ - -#define Numeric_start 0x0030 -#define Numeric_stop 0x0039 -#define Numeric_space 0x0020 -#define Arabic_start 0x0600 -#define Arabic_stop 0x06ff -#define Latin_start 0x0001 -#define Latin_stop 0x024f -#define Script_Arabic 6 -#define Script_Latin 1 -#define Script_Numeric 5 - - int cnt = 0, index = 0; - int New_Script = SCRIPT_UNDEFINED; - - TRACE("%s,%d,%d,%p,%p,%p,%p\n", debugstr_wn(pwcInChars, cInChars), cInChars, cMaxItems, - psControl, psState, pItems, pcItems); - - if (!pwcInChars || !cInChars || !pItems || cMaxItems < 2) - return E_INVALIDARG; - - pItems[index].iCharPos = 0; - memset(&pItems[index].a, 0, sizeof(SCRIPT_ANALYSIS)); - - if (pwcInChars[cnt] >= Numeric_start && pwcInChars[cnt] <= Numeric_stop) - pItems[index].a.eScript = Script_Numeric; - else - if (pwcInChars[cnt] >= Arabic_start && pwcInChars[cnt] <= Arabic_stop) - pItems[index].a.eScript = Script_Arabic; - else - if (pwcInChars[cnt] >= Latin_start && pwcInChars[cnt] <= Latin_stop) - pItems[index].a.eScript = Script_Latin; - - if (pItems[index].a.eScript == Script_Arabic) - pItems[index].a.s.uBidiLevel = 1; - - TRACE("New_Script=%d, eScript=%d index=%d cnt=%d iCharPos=%d\n", - New_Script, pItems[index].a.eScript, index, cnt, - pItems[index].iCharPos = cnt); - - for (cnt=0; cnt < cInChars; cnt++) - { - if ((pwcInChars[cnt] >= Numeric_start && pwcInChars[cnt] <= Numeric_stop) - || (New_Script == Script_Numeric && pwcInChars[cnt] == Numeric_space)) - New_Script = Script_Numeric; - else - if ((pwcInChars[cnt] >= Arabic_start && pwcInChars[cnt] <= Arabic_stop) - || (New_Script == Script_Arabic && pwcInChars[cnt] == Numeric_space)) - New_Script = Script_Arabic; - else - if ((WCHAR) pwcInChars[cnt] >= Latin_start && (WCHAR) pwcInChars[cnt] <= Latin_stop) - New_Script = Script_Latin; - else - New_Script = SCRIPT_UNDEFINED; - - if (New_Script != pItems[index].a.eScript) - { - TRACE("New_Script=%d, eScript=%d ", New_Script, pItems[index].a.eScript); - index++; - if (index+1 > cMaxItems) - return E_OUTOFMEMORY; - - pItems[index].iCharPos = cnt; - memset(&pItems[index].a, 0, sizeof(SCRIPT_ANALYSIS)); - - if (New_Script == Script_Arabic) - pItems[index].a.s.uBidiLevel = 1; - - pItems[index].a.eScript = New_Script; - if (New_Script == Script_Arabic) - pItems[index].a.s.uBidiLevel = 1; - - TRACE("index=%d cnt=%d iCharPos=%d\n", index, cnt, pItems[index].iCharPos = cnt); - } - } - - /* While not strictly necessary according to the spec, make sure the n+1 - * item is set up to prevent random behaviour if the caller erroneously - * checks the n+1 structure */ - memset(&pItems[index+1].a, 0, sizeof(SCRIPT_ANALYSIS)); - - TRACE("index=%d cnt=%d iCharPos=%d\n", index+1, cnt, pItems[index+1].iCharPos = cnt); - - /* Set one SCRIPT_STATE item being returned */ - *pcItems = index + 1; - - /* Set SCRIPT_ITEM */ - pItems[index+1].iCharPos = cnt; /* the last + 1 item - contains the ptr to the lastchar */ - return S_OK; -} - -/*********************************************************************** - * ScriptStringAnalyse (USP10.@) - * - */ -HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, - int cGlyphs, int iCharset, DWORD dwFlags, - int iReqWidth, SCRIPT_CONTROL *psControl, - SCRIPT_STATE *psState, const int *piDx, - SCRIPT_TABDEF *pTabdef, const BYTE *pbInClass, - SCRIPT_STRING_ANALYSIS *pssa) -{ - HRESULT hr = E_OUTOFMEMORY; - StringAnalysis *analysis = NULL; - int i, num_items = 255; - - TRACE("(%p,%p,%d,%d,%d,0x%x,%d,%p,%p,%p,%p,%p,%p)\n", - hdc, pString, cString, cGlyphs, iCharset, dwFlags, iReqWidth, - psControl, psState, piDx, pTabdef, pbInClass, pssa); - - if (iCharset != -1) - { - FIXME("Only Unicode strings are supported\n"); - return E_INVALIDARG; - } - if (cString < 1 || !pString) return E_INVALIDARG; - if ((dwFlags & SSA_GLYPHS) && !hdc) return E_PENDING; - - if (!(analysis = usp_zero_alloc(sizeof(StringAnalysis)))) return E_OUTOFMEMORY; - if (!(analysis->pItem = usp_zero_alloc(num_items * sizeof(SCRIPT_ITEM) + 1))) goto error; - - /* FIXME: handle clipping */ - analysis->clip_len = cString; - - hr = ScriptItemize(pString, cString, num_items, psControl, psState, analysis->pItem, - &analysis->numItems); - - while (hr == E_OUTOFMEMORY) - { - SCRIPT_ITEM *tmp; - - num_items *= 2; - if (!(tmp = usp_zero_realloc(analysis->pItem, num_items * sizeof(SCRIPT_ITEM) + 1))) - goto error; - - analysis->pItem = tmp; - hr = ScriptItemize(pString, cString, num_items, psControl, psState, analysis->pItem, - &analysis->numItems); - } - if (hr) goto error; - - if ((analysis->logattrs = usp_alloc(sizeof(SCRIPT_LOGATTR) * cString))) - ScriptBreak(pString, cString, (SCRIPT_STRING_ANALYSIS)analysis, analysis->logattrs); - else - goto error; - - if (!(analysis->glyphs = usp_zero_alloc(sizeof(StringGlyphs) * analysis->numItems))) - goto error; - - for (i = 0; i < analysis->numItems; i++) - { - SCRIPT_CACHE *sc = (SCRIPT_CACHE *)&analysis->sc; - int cChar = analysis->pItem[i+1].iCharPos - analysis->pItem[i].iCharPos; - int numGlyphs = 1.5 * cChar + 16; - WORD *glyphs = usp_zero_alloc(sizeof(WORD) * numGlyphs); - WORD *pwLogClust = usp_zero_alloc(sizeof(WORD) * cChar); - int *piAdvance = usp_zero_alloc(sizeof(int) * numGlyphs); - SCRIPT_VISATTR *psva = usp_zero_alloc(sizeof(SCRIPT_VISATTR) * cChar); - GOFFSET *pGoffset = usp_zero_alloc(sizeof(GOFFSET) * numGlyphs); - ABC *abc = usp_zero_alloc(sizeof(ABC)); - int numGlyphsReturned; - - /* FIXME: non unicode strings */ - WCHAR* pStr = (WCHAR*)pString; - hr = ScriptShape(hdc, sc, &pStr[analysis->pItem[i].iCharPos], - cChar, numGlyphs, &analysis->pItem[i].a, - glyphs, pwLogClust, psva, &numGlyphsReturned); - hr = ScriptPlace(hdc, sc, glyphs, numGlyphsReturned, psva, &analysis->pItem[i].a, - piAdvance, pGoffset, abc); - - analysis->glyphs[i].numGlyphs = numGlyphsReturned; - analysis->glyphs[i].glyphs = glyphs; - analysis->glyphs[i].pwLogClust = pwLogClust; - analysis->glyphs[i].piAdvance = piAdvance; - analysis->glyphs[i].psva = psva; - analysis->glyphs[i].pGoffset = pGoffset; - analysis->glyphs[i].abc = abc; - } - - *pssa = analysis; - return S_OK; - -error: - usp_free(analysis->glyphs); - usp_free(analysis->logattrs); - usp_free(analysis->pItem); - usp_free(analysis); - return hr; -} - -/*********************************************************************** - * ScriptStringOut (USP10.@) - * - * This function takes the output of ScriptStringAnalyse and joins the segments - * of glyphs and passes the resulting string to ScriptTextOut. ScriptStringOut - * only processes glyphs. - * - * Parameters: - * ssa [I] buffer to hold the analysed string components - * iX [I] X axis displacement for output - * iY [I] Y axis displacement for output - * uOptions [I] flags controling output processing - * prc [I] rectangle coordinates - * iMinSel [I] starting pos for substringing output string - * iMaxSel [I] ending pos for substringing output string - * fDisabled [I] controls text highlighting - * - * RETURNS - * Success: S_OK - * Failure: is the value returned by ScriptTextOut - */ -HRESULT WINAPI ScriptStringOut(SCRIPT_STRING_ANALYSIS ssa, - int iX, - int iY, - UINT uOptions, - const RECT *prc, - int iMinSel, - int iMaxSel, - BOOL fDisabled) -{ - StringAnalysis *analysis; - WORD *glyphs; - int item, cnt, x; - HRESULT hr; - - TRACE("(%p,%d,%d,0x%1x,%p,%d,%d,%d)\n", - ssa, iX, iY, uOptions, prc, iMinSel, iMaxSel, fDisabled); - - if (!(analysis = ssa)) return E_INVALIDARG; - - /* - * Get storage for the output buffer for the consolidated strings - */ - cnt = 0; - for (item = 0; item < analysis->numItems; item++) - { - cnt += analysis->glyphs[item].numGlyphs; - } - if (!(glyphs = usp_alloc(sizeof(WCHAR) * cnt))) return E_OUTOFMEMORY; - - /* - * ScriptStringOut only processes glyphs hence set ETO_GLYPH_INDEX - */ - uOptions |= ETO_GLYPH_INDEX; - analysis->pItem[0].a.fNoGlyphIndex = FALSE; /* say that we have glyphs */ - - /* - * Copy the string items into the output buffer - */ - - TRACE("numItems %d\n", analysis->numItems); - - cnt = 0; - for (item = 0; item < analysis->numItems; item++) - { - memcpy(&glyphs[cnt], analysis->glyphs[item].glyphs, - sizeof(WCHAR) * analysis->glyphs[item].numGlyphs); - - TRACE("Item %d, Glyphs %d ", item, analysis->glyphs[item].numGlyphs); - for (x = cnt; x < analysis->glyphs[item].numGlyphs + cnt; x ++) - TRACE("%04x", glyphs[x]); - TRACE("\n"); - - cnt += analysis->glyphs[item].numGlyphs; /* point to the end of the copied text */ - } - - hr = ScriptTextOut(analysis->sc->hdc, (SCRIPT_CACHE *)&analysis->sc, iX, iY, - uOptions, prc, &analysis->pItem->a, NULL, 0, glyphs, cnt, - analysis->glyphs->piAdvance, NULL, analysis->glyphs->pGoffset); - TRACE("ScriptTextOut hr=%08x\n", hr); - - /* - * Free the output buffer and script cache - */ - usp_free(glyphs); - return hr; -} - -/*********************************************************************** - * ScriptStringCPtoX (USP10.@) - * - */ -HRESULT WINAPI ScriptStringCPtoX(SCRIPT_STRING_ANALYSIS ssa, int icp, BOOL fTrailing, int* pX) -{ - int i, j; - int runningX = 0; - int runningCp = 0; - StringAnalysis* analysis = ssa; - - TRACE("(%p), %d, %d, (%p)\n", ssa, icp, fTrailing, pX); - - if (!ssa || !pX) return S_FALSE; - - /* icp out of range */ - if(icp < 0) - { - analysis->invalid = TRUE; - return E_INVALIDARG; - } - - for(i=0; i<analysis->numItems; i++) - { - for(j=0; j<analysis->glyphs[i].numGlyphs; j++) - { - if(runningCp == icp && fTrailing == FALSE) - { - *pX = runningX; - return S_OK; - } - runningX += analysis->glyphs[i].piAdvance[j]; - if(runningCp == icp && fTrailing == TRUE) - { - *pX = runningX; - return S_OK; - } - runningCp++; - } - } - - /* icp out of range */ - analysis->invalid = TRUE; - return E_INVALIDARG; -} - -/*********************************************************************** - * ScriptStringXtoCP (USP10.@) - * - */ -HRESULT WINAPI ScriptStringXtoCP(SCRIPT_STRING_ANALYSIS ssa, int iX, int* piCh, int* piTrailing) -{ - StringAnalysis* analysis = ssa; - int i; - int j; - int runningX = 0; - int runningCp = 0; - int width; - - TRACE("(%p), %d, (%p), (%p)\n", ssa, iX, piCh, piTrailing); - - if (!ssa || !piCh || !piTrailing) return S_FALSE; - - /* out of range */ - if(iX < 0) - { - *piCh = -1; - *piTrailing = TRUE; - return S_OK; - } - - for(i=0; i<analysis->numItems; i++) - { - for(j=0; j<analysis->glyphs[i].numGlyphs; j++) - { - width = analysis->glyphs[i].piAdvance[j]; - if(iX < (runningX + width)) - { - *piCh = runningCp; - if((iX - runningX) > width/2) - *piTrailing = TRUE; - else - *piTrailing = FALSE; - return S_OK; - } - runningX += width; - runningCp++; - } - } - - /* out of range */ - *piCh = analysis->pItem[analysis->numItems].iCharPos; - *piTrailing = FALSE; - - return S_OK; -} - - -/*********************************************************************** - * ScriptStringFree (USP10.@) - * - * Free a string analysis. - * - * PARAMS - * pssa [I] string analysis. - * - * RETURNS - * Success: S_OK - * Failure: Non-zero HRESULT value. - */ -HRESULT WINAPI ScriptStringFree(SCRIPT_STRING_ANALYSIS *pssa) -{ - StringAnalysis* analysis; - BOOL invalid; - int i; - - TRACE("(%p)\n", pssa); - - if (!pssa || !(analysis = *pssa)) return E_INVALIDARG; - invalid = analysis->invalid; - - for (i = 0; i < analysis->numItems; i++) - { - usp_free(analysis->glyphs[i].glyphs); - usp_free(analysis->glyphs[i].pwLogClust); - usp_free(analysis->glyphs[i].piAdvance); - usp_free(analysis->glyphs[i].psva); - usp_free(analysis->glyphs[i].pGoffset); - usp_free(analysis->glyphs[i].abc); - } - - usp_free(analysis->glyphs); - usp_free(analysis->pItem); - usp_free(analysis->logattrs); - usp_free(analysis->sz); - usp_free(analysis); - - if (invalid) return E_INVALIDARG; - return S_OK; -} - -/*********************************************************************** - * ScriptCPtoX (USP10.@) - * - */ -HRESULT WINAPI ScriptCPtoX(int iCP, - BOOL fTrailing, - int cChars, - int cGlyphs, - const WORD *pwLogClust, - const SCRIPT_VISATTR *psva, - const int *piAdvance, - const SCRIPT_ANALYSIS *psa, - int *piX) -{ - int item; - int iPosX; - float fMaxPosX = 0; - TRACE("(%d,%d,%d,%d,%p,%p,%p,%p,%p)\n", - iCP, fTrailing, cChars, cGlyphs, pwLogClust, psva, piAdvance, - psa, piX); - for (item=0; item < cGlyphs; item++) /* total piAdvance */ - fMaxPosX += piAdvance[item]; - iPosX = (fMaxPosX/cGlyphs)*(iCP+fTrailing); - if (iPosX > fMaxPosX) - iPosX = fMaxPosX; - *piX = iPosX; /* Return something in range */ - - TRACE("*piX=%d\n", *piX); - return S_OK; -} - -/*********************************************************************** - * ScriptXtoCP (USP10.@) - * - */ -HRESULT WINAPI ScriptXtoCP(int iX, - int cChars, - int cGlyphs, - const WORD *pwLogClust, - const SCRIPT_VISATTR *psva, - const int *piAdvance, - const SCRIPT_ANALYSIS *psa, - int *piCP, - int *piTrailing) -{ - int item; - int iPosX; - float fMaxPosX = 1; - float fAvePosX; - TRACE("(%d,%d,%d,%p,%p,%p,%p,%p,%p)\n", - iX, cChars, cGlyphs, pwLogClust, psva, piAdvance, - psa, piCP, piTrailing); - if (iX < 0) /* iX is before start of run */ - { - *piCP = -1; - *piTrailing = TRUE; - return S_OK; - } - - for (item=0; item < cGlyphs; item++) /* total piAdvance */ - fMaxPosX += piAdvance[item]; - - if (iX >= fMaxPosX) /* iX too large */ - { - *piCP = cChars; - *piTrailing = FALSE; - return S_OK; - } - - fAvePosX = fMaxPosX / cGlyphs; - iPosX = fAvePosX; - for (item = 1; item < cGlyphs && iPosX < iX; item++) - iPosX += fAvePosX; - if (iPosX - iX > fAvePosX/2) - *piTrailing = 0; - else - *piTrailing = 1; /* yep we are over halfway */ - - *piCP = item -1; /* Return character position */ - TRACE("*piCP=%d iPposX=%d\n", *piCP, iPosX); - return S_OK; -} - -/*********************************************************************** - * ScriptBreak (USP10.@) - * - * Retrieve line break information. - * - * PARAMS - * chars [I] Array of characters. - * sa [I] String analysis. - * la [I] Array of logical attribute structures. - * - * RETURNS - * Success: S_OK - * Failure: S_FALSE - */ -HRESULT WINAPI ScriptBreak(const WCHAR *chars, int count, const SCRIPT_ANALYSIS *sa, SCRIPT_LOGATTR *la) -{ - unsigned int i; - - TRACE("(%s, %d, %p, %p)\n", debugstr_wn(chars, count), count, sa, la); - - if (!la) return S_FALSE; - - for (i = 0; i < count; i++) - { - memset(&la[i], 0, sizeof(SCRIPT_LOGATTR)); - - /* FIXME: set the other flags */ - la[i].fWhiteSpace = isspaceW(chars[i]); - la[i].fCharStop = 1; - } - return S_OK; -} - -static const struct -{ - WCHAR start; - WCHAR end; - DWORD flag; -} -complex_ranges[] = -{ - { 0, 0x0b, SIC_COMPLEX }, - { 0x0c, 0x0c, SIC_NEUTRAL }, - { 0x0d, 0x1f, SIC_COMPLEX }, - { 0x20, 0x2f, SIC_NEUTRAL }, - { 0x30, 0x39, SIC_ASCIIDIGIT }, - { 0x3a, 0x40, SIC_NEUTRAL }, - { 0x5b, 0x60, SIC_NEUTRAL }, - { 0x7b, 0x7e, SIC_NEUTRAL }, - { 0x7f, 0x9f, SIC_COMPLEX }, - { 0xa0, 0xa5, SIC_NEUTRAL }, - { 0xa7, 0xa8, SIC_NEUTRAL }, - { 0xab, 0xab, SIC_NEUTRAL }, - { 0xad, 0xad, SIC_NEUTRAL }, - { 0xaf, 0xaf, SIC_NEUTRAL }, - { 0xb0, 0xb1, SIC_NEUTRAL }, - { 0xb4, 0xb4, SIC_NEUTRAL }, - { 0xb6, 0xb8, SIC_NEUTRAL }, - { 0xbb, 0xbf, SIC_NEUTRAL }, - { 0xd7, 0xd7, SIC_NEUTRAL }, - { 0xf7, 0xf7, SIC_NEUTRAL }, - { 0x2b9, 0x2ba, SIC_NEUTRAL }, - { 0x2c2, 0x2cf, SIC_NEUTRAL }, - { 0x2d2, 0x2df, SIC_NEUTRAL }, - { 0x2e5, 0x2e9, SIC_COMPLEX }, - { 0x2ea, 0x2ed, SIC_NEUTRAL }, - { 0x300, 0x362, SIC_COMPLEX }, - { 0x530, 0x60b, SIC_COMPLEX }, - { 0x60c, 0x60d, SIC_NEUTRAL }, - { 0x60e, 0x669, SIC_COMPLEX }, - { 0x66a, 0x66a, SIC_NEUTRAL }, - { 0x66b, 0x6e8, SIC_COMPLEX }, - { 0x6e9, 0x6e9, SIC_NEUTRAL }, - { 0x6ea, 0x7bf, SIC_COMPLEX }, - { 0x900, 0x1360, SIC_COMPLEX }, - { 0x137d, 0x137f, SIC_COMPLEX }, - { 0x1680, 0x1680, SIC_NEUTRAL }, - { 0x1780, 0x18af, SIC_COMPLEX }, - { 0x2000, 0x200a, SIC_NEUTRAL }, - { 0x200b, 0x200f, SIC_COMPLEX }, - { 0x2010, 0x2016, SIC_NEUTRAL }, - { 0x2018, 0x2022, SIC_NEUTRAL }, - { 0x2024, 0x2028, SIC_NEUTRAL }, - { 0x2029, 0x202e, SIC_COMPLEX }, - { 0x202f, 0x2037, SIC_NEUTRAL }, - { 0x2039, 0x203c, SIC_NEUTRAL }, - { 0x2044, 0x2046, SIC_NEUTRAL }, - { 0x206a, 0x206f, SIC_COMPLEX }, - { 0x207a, 0x207e, SIC_NEUTRAL }, - { 0x208a, 0x20aa, SIC_NEUTRAL }, - { 0x20ac, 0x20cf, SIC_NEUTRAL }, - { 0x20d0, 0x20ff, SIC_COMPLEX }, - { 0x2103, 0x2103, SIC_NEUTRAL }, - { 0x2105, 0x2105, SIC_NEUTRAL }, - { 0x2109, 0x2109, SIC_NEUTRAL }, - { 0x2116, 0x2116, SIC_NEUTRAL }, - { 0x2121, 0x2122, SIC_NEUTRAL }, - { 0x212e, 0x212e, SIC_NEUTRAL }, - { 0x2153, 0x2154, SIC_NEUTRAL }, - { 0x215b, 0x215e, SIC_NEUTRAL }, - { 0x2190, 0x2199, SIC_NEUTRAL }, - { 0x21b8, 0x21b9, SIC_NEUTRAL }, - { 0x21d2, 0x21d2, SIC_NEUTRAL }, - { 0x21d4, 0x21d4, SIC_NEUTRAL }, - { 0x21e7, 0x21e7, SIC_NEUTRAL }, - { 0x2200, 0x2200, SIC_NEUTRAL }, - { 0x2202, 0x2203, SIC_NEUTRAL }, - { 0x2207, 0x2208, SIC_NEUTRAL }, - { 0x220b, 0x220b, SIC_NEUTRAL }, - { 0x220f, 0x220f, SIC_NEUTRAL }, - { 0x2211, 0x2213, SIC_NEUTRAL }, - { 0x2215, 0x2215, SIC_NEUTRAL }, - { 0x221a, 0x221a, SIC_NEUTRAL }, - { 0x221d, 0x2220, SIC_NEUTRAL }, - { 0x2223, 0x2223, SIC_NEUTRAL }, - { 0x2225, 0x2225, SIC_NEUTRAL }, - { 0x2227, 0x222c, SIC_NEUTRAL }, - { 0x222e, 0x222e, SIC_NEUTRAL }, - { 0x2234, 0x2237, SIC_NEUTRAL }, - { 0x223c, 0x223d, SIC_NEUTRAL }, - { 0x2248, 0x2248, SIC_NEUTRAL }, - { 0x224c, 0x224c, SIC_NEUTRAL }, - { 0x2252, 0x2252, SIC_NEUTRAL }, - { 0x2260, 0x2261, SIC_NEUTRAL }, - { 0x2264, 0x2267, SIC_NEUTRAL }, - { 0x226a, 0x226b, SIC_NEUTRAL }, - { 0x226e, 0x226f, SIC_NEUTRAL }, - { 0x2282, 0x2283, SIC_NEUTRAL }, - { 0x2286, 0x2287, SIC_NEUTRAL }, - { 0x2295, 0x2295, SIC_NEUTRAL }, - { 0x2299, 0x2299, SIC_NEUTRAL }, - { 0x22a5, 0x22a5, SIC_NEUTRAL }, - { 0x22bf, 0x22bf, SIC_NEUTRAL }, - { 0x2312, 0x2312, SIC_NEUTRAL }, - { 0x24ea, 0x24ea, SIC_COMPLEX }, - { 0x2500, 0x254b, SIC_NEUTRAL }, - { 0x2550, 0x256d, SIC_NEUTRAL }, - { 0x256e, 0x2574, SIC_NEUTRAL }, - { 0x2581, 0x258f, SIC_NEUTRAL }, - { 0x2592, 0x2595, SIC_NEUTRAL }, - { 0x25a0, 0x25a1, SIC_NEUTRAL }, - { 0x25a3, 0x25a9, SIC_NEUTRAL }, - { 0x25b2, 0x25b3, SIC_NEUTRAL }, - { 0x25b6, 0x25b7, SIC_NEUTRAL }, - { 0x25bc, 0x25bd, SIC_NEUTRAL }, - { 0x25c0, 0x25c1, SIC_NEUTRAL }, - { 0x25c6, 0x25c8, SIC_NEUTRAL }, - { 0x25cb, 0x25cb, SIC_NEUTRAL }, - { 0x25ce, 0x25d1, SIC_NEUTRAL }, - { 0x25e2, 0x25e5, SIC_NEUTRAL }, - { 0x25ef, 0x25ef, SIC_NEUTRAL }, - { 0x2605, 0x2606, SIC_NEUTRAL }, - { 0x2609, 0x2609, SIC_NEUTRAL }, - { 0x260e, 0x260f, SIC_NEUTRAL }, - { 0x261c, 0x261c, SIC_NEUTRAL }, - { 0x261e, 0x261e, SIC_NEUTRAL }, - { 0x2640, 0x2640, SIC_NEUTRAL }, - { 0x2642, 0x2642, SIC_NEUTRAL }, - { 0x2660, 0x2661, SIC_NEUTRAL }, - { 0x2663, 0x2665, SIC_NEUTRAL }, - { 0x2667, 0x266a, SIC_NEUTRAL }, - { 0x266c, 0x266d, SIC_NEUTRAL }, - { 0x266f, 0x266f, SIC_NEUTRAL }, - { 0x273d, 0x273d, SIC_NEUTRAL }, - { 0x2e80, 0x312f, SIC_COMPLEX }, - { 0x3190, 0x31bf, SIC_COMPLEX }, - { 0x31f0, 0x31ff, SIC_COMPLEX }, - { 0x3220, 0x325f, SIC_COMPLEX }, - { 0x3280, 0xa4ff, SIC_COMPLEX }, - { 0xd800, 0xdfff, SIC_COMPLEX }, - { 0xe000, 0xf8ff, SIC_NEUTRAL }, - { 0xf900, 0xfaff, SIC_COMPLEX }, - { 0xfb13, 0xfb28, SIC_COMPLEX }, - { 0xfb29, 0xfb29, SIC_NEUTRAL }, - { 0xfb2a, 0xfb4f, SIC_COMPLEX }, - { 0xfd3e, 0xfd3f, SIC_NEUTRAL }, - { 0xfdd0, 0xfdef, SIC_COMPLEX }, - { 0xfe20, 0xfe6f, SIC_COMPLEX }, - { 0xfeff, 0xfeff, SIC_COMPLEX }, - { 0xff01, 0xff5e, SIC_COMPLEX }, - { 0xff61, 0xff9f, SIC_COMPLEX }, - { 0xffe0, 0xffe6, SIC_COMPLEX }, - { 0xffe8, 0xffee, SIC_COMPLEX }, - { 0xfff9, 0xfffb, SIC_COMPLEX }, - { 0xfffe, 0xfffe, SIC_COMPLEX } -}; - -/*********************************************************************** - * ScriptIsComplex (USP10.@) - * - * Determine if a string is complex. - * - * PARAMS - * chars [I] Array of characters to test. - * len [I] Length in characters. - * flag [I] Flag. - * - * RETURNS - * Success: S_OK - * Failure: S_FALSE - * - * NOTES - * Behaviour matches that of WinXP. - */ -HRESULT WINAPI ScriptIsComplex(const WCHAR *chars, int len, DWORD flag) -{ - unsigned int i, j; - - TRACE("(%s,%d,0x%x)\n", debugstr_wn(chars, len), len, flag); - - for (i = 0; i < len; i++) - { - for (j = 0; j < sizeof(complex_ranges)/sizeof(complex_ranges[0]); j++) - { - if (chars[i] >= complex_ranges[j].start && - chars[i] <= complex_ranges[j].end && - (flag & complex_ranges[j].flag)) return S_OK; - } - } - return S_FALSE; -} - -/*********************************************************************** - * ScriptShape (USP10.@) - * - * Produce glyphs and visual attributes for a run. - * - * PARAMS - * hdc [I] Device context. - * psc [I/O] Opaque pointer to a script cache. - * pwcChars [I] Array of characters specifying the run. - * cChars [I] Number of characters in pwcChars. - * cMaxGlyphs [I] Length of pwOutGlyphs. - * psa [I/O] String analysis. - * pwOutGlyphs [O] Array of glyphs. - * pwLogClust [O] Array of logical cluster info. - * psva [O] Array of visual attributes. - * pcGlyphs [O] Number of glyphs returned. - * - * RETURNS - * Success: S_OK - * Failure: Non-zero HRESULT value. - */ -HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, - int cChars, int cMaxGlyphs, - SCRIPT_ANALYSIS *psa, WORD *pwOutGlyphs, WORD *pwLogClust, - SCRIPT_VISATTR *psva, int *pcGlyphs) -{ - int cnt; - HRESULT hr; - *pcGlyphs = cChars; - - TRACE("(%p, %p, %p, %d, %d, %p)\n", hdc, psc, pwcChars, cChars, cMaxGlyphs, psa); - if (psa) TRACE("psa values: %d, %d, %d, %d, %d, %d, %d\n", psa->eScript, psa->fRTL, psa->fLayoutRTL, - psa->fLinkBefore, psa->fLinkAfter, psa->fLogicalOrder, psa->fNoGlyphIndex); - - if (cChars > cMaxGlyphs) return E_OUTOFMEMORY; - if ((hr = get_script_cache(hdc, psc))) return hr; - - TRACE("Before: "); - for (cnt = 0; cnt < cChars; cnt++) - TRACE("%4x",pwcChars[cnt]); - TRACE("\n"); - - if (!psa->fNoGlyphIndex) { /* Glyph translate */ - if (!(GetGlyphIndicesW(get_cache_hdc(psc), pwcChars, cChars, pwOutGlyphs, 0))) - return S_FALSE; - - TRACE("After: "); - for (cnt = 0; cnt < cChars; cnt++) { - TRACE("%04x",pwOutGlyphs[cnt]); - } - TRACE("\n"); - } - else { - TRACE("After: "); - for (cnt = 0; cnt < cChars; cnt++) { /* no translate so set up */ - pwOutGlyphs[cnt] = pwcChars[cnt]; /* copy in to out and */ - TRACE("%04x",pwOutGlyphs[cnt]); - } - TRACE("\n"); - } - - /* Set up a valid SCRIPT_VISATTR and LogClust for each char in this run */ - for (cnt = 0; cnt < cChars; cnt++) { - /* FIXME: set to better values */ - psva[cnt].uJustification = 2; - psva[cnt].fClusterStart = 1; - psva[cnt].fDiacritic = 0; - psva[cnt].fZeroWidth = 0; - pwLogClust[cnt] = cnt; - } - return S_OK; -} - -/*********************************************************************** - * ScriptPlace (USP10.@) - * - * Produce advance widths for a run. - * - * PARAMS - * hdc [I] Device context. - * psc [I/O] Opaque pointer to a script cache. - * pwGlyphs [I] Array of glyphs. - * cGlyphs [I] Number of glyphs in pwGlyphs. - * psva [I] Array of visual attributes. - * psa [I/O] String analysis. - * piAdvance [O] Array of advance widths. - * pGoffset [O] Glyph offsets. - * pABC [O] Combined ABC width. - * - * RETURNS - * Success: S_OK - * Failure: Non-zero HRESULT value. - */ -HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, - int cGlyphs, const SCRIPT_VISATTR *psva, - SCRIPT_ANALYSIS *psa, int *piAdvance, GOFFSET *pGoffset, ABC *pABC ) -{ - int wcnt; - HRESULT hr; - LPABC lpABC; - - TRACE("(%p, %p, %p, %s, %d, %p, %p, %p)\n", hdc, psc, pwGlyphs, - debugstr_wn(pwGlyphs, cGlyphs), cGlyphs, psva, psa, piAdvance); - - if ((hr = get_script_cache(hdc, psc))) return hr; - - /* Here we need to calculate the width of the run unit. At this point the input string - * has been converted to glyphs and we still need to translate back to the original chars - * to get the correct ABC widths. */ - - if (!(lpABC = usp_zero_alloc(sizeof(ABC) * cGlyphs))) return E_OUTOFMEMORY; - - memset(pABC, 0, sizeof(ABC)); - - /* FIXME: set pGoffset to more reasonable values */ - if (!GetCharABCWidthsI(get_cache_hdc(psc), 0, cGlyphs, (WORD *) pwGlyphs, lpABC )) - { - WARN("Could not get ABC values\n"); - for (wcnt = 0; wcnt < cGlyphs; wcnt++) { - piAdvance[wcnt] = 0; - pGoffset[wcnt].du = 0; - pGoffset[wcnt].dv = 0; - } - } - else - { - for (wcnt = 0; wcnt < cGlyphs ; wcnt++) { /* add up the char lengths */ - TRACE(" Glyph=%04x, abcA=%d, abcB=%d, abcC=%d wcnt=%d\n", - pwGlyphs[wcnt], - lpABC[wcnt].abcA, - lpABC[wcnt].abcB, - lpABC[wcnt].abcC, wcnt); - pABC->abcA += lpABC[wcnt].abcA; - pABC->abcB += lpABC[wcnt].abcB; - pABC->abcC += lpABC[wcnt].abcC; - piAdvance[wcnt] = lpABC[wcnt].abcA + lpABC[wcnt].abcB + lpABC[wcnt].abcC; - pGoffset[wcnt].du = 0; - pGoffset[wcnt].dv = 0; - } - } - TRACE("Total for run: abcA=%d, abcB=%d, abcC=%d\n", pABC->abcA, pABC->abcB, pABC->abcC); - - usp_free(lpABC); - return S_OK; -} - -/*********************************************************************** - * ScriptGetCMap (USP10.@) - * - * Retrieve glyph indices. - * - * PARAMS - * hdc [I] Device context. - * psc [I/O] Opaque pointer to a script cache. - * pwcInChars [I] Array of Unicode characters. - * cChars [I] Number of characters in pwcInChars. - * dwFlags [I] Flags. - * pwOutGlyphs [O] Buffer to receive the array of glyph indices. - * - * RETURNS - * Success: S_OK - * Failure: Non-zero HRESULT value. - */ -HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars, - int cChars, DWORD dwFlags, WORD *pwOutGlyphs) -{ - int cnt; - HRESULT hr; - - TRACE("(%p,%p,%s,%d,0x%x,%p)\n", hdc, psc, debugstr_wn(pwcInChars, cChars), - cChars, dwFlags, pwOutGlyphs); - - if ((hr = get_script_cache(hdc, psc))) return hr; - - TRACE("Before: "); - for (cnt = 0; cnt < cChars; cnt++) - TRACE("%4x",pwcInChars[cnt]); - TRACE("\n"); - - GetGlyphIndicesW(get_cache_hdc(psc), pwcInChars, cChars, pwOutGlyphs, 0); - - TRACE("After: "); - for (cnt = 0; cnt < cChars; cnt++) { - TRACE("%04x",pwOutGlyphs[cnt]); - } - TRACE("\n"); - - return S_OK; -} - -/*********************************************************************** - * ScriptTextOut (USP10.@) - * - */ -HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UINT fuOptions, - const RECT *lprc, const SCRIPT_ANALYSIS *psa, const WCHAR *pwcReserved, - int iReserved, const WORD *pwGlyphs, int cGlyphs, const int *piAdvance, - const int *piJustify, const GOFFSET *pGoffset) -{ - HRESULT hr; - - TRACE("(%p, %p, %d, %d, %04x, %p, %p, %p, %d, %p, %d, %p, %p, %p)\n", - hdc, psc, x, y, fuOptions, lprc, psa, pwcReserved, iReserved, pwGlyphs, cGlyphs, - piAdvance, piJustify, pGoffset); - - if (!hdc && psc && !*psc) return E_INVALIDARG; - if (!piAdvance || !psa || !pwGlyphs) return E_INVALIDARG; - if ((hr = get_script_cache(hdc, psc))) return hr; - - fuOptions &= ETO_CLIPPED + ETO_OPAQUE; - if (!psa->fNoGlyphIndex) /* Have Glyphs? */ - fuOptions |= ETO_GLYPH_INDEX; /* Say don't do translation to glyph */ - - if (!ExtTextOutW(get_cache_hdc(psc), x, y, fuOptions, lprc, pwGlyphs, cGlyphs, NULL)) - return S_FALSE; - - return S_OK; -} - -/*********************************************************************** - * ScriptCacheGetHeight (USP10.@) - * - * Retrieve the height of the font in the cache. - * - * PARAMS - * hdc [I] Device context. - * psc [I/O] Opaque pointer to a script cache. - * height [O] Receives font height. - * - * RETURNS - * Success: S_OK - * Failure: Non-zero HRESULT value. - */ -HRESULT WINAPI ScriptCacheGetHeight(HDC hdc, SCRIPT_CACHE *psc, LONG *height) -{ - HRESULT hr; - - TRACE("(%p, %p, %p)\n", hdc, psc, height); - - if (!height) return E_INVALIDARG; - if ((hr = get_script_cache(hdc, psc))) return hr; - - *height = get_cache_height(psc); - return S_OK; -} - -/*********************************************************************** - * ScriptGetGlyphABCWidth (USP10.@) - * - * Retrieve the width of a glyph. - * - * PARAMS - * hdc [I] Device context. - * psc [I/O] Opaque pointer to a script cache. - * glyph [I] Glyph to retrieve the width for. - * abc [O] ABC widths of the glyph. - * - * RETURNS - * Success: S_OK - * Failure: Non-zero HRESULT value. - */ -HRESULT WINAPI ScriptGetGlyphABCWidth(HDC hdc, SCRIPT_CACHE *psc, WORD glyph, ABC *abc) -{ - HRESULT hr; - - TRACE("(%p, %p, 0x%04x, %p)\n", hdc, psc, glyph, abc); - - if ((hr = get_script_cache(hdc, psc))) return hr; - - /* FIXME: get this from the cache */ - if (!GetCharABCWidthsW(get_cache_hdc(psc), glyph, glyph, abc)) return E_HANDLE; - return S_OK; -} - -/*********************************************************************** - * ScriptLayout (USP10.@) - * - * Map embedding levels to visual and/or logical order. - * - * PARAMS - * runs [I] Size of level array. - * level [I] Array of embedding levels. - * vistolog [O] Map of embedding levels from visual to logical order. - * logtovis [O] Map of embedding levels from logical to visual order. - * - * RETURNS - * Success: S_OK - * Failure: Non-zero HRESULT value. - * - * BUGS - * This stub works correctly for any sequence of a single - * embedding level but not for sequences of different - * embedding levels, i.e. mixtures of RTL and LTR scripts. - */ -HRESULT WINAPI ScriptLayout(int runs, const BYTE *level, int *vistolog, int *logtovis) -{ - int i, j = runs - 1, k = 0; - - TRACE("(%d, %p, %p, %p)\n", runs, level, vistolog, logtovis); - - if (!level || (!vistolog && !logtovis)) - return E_INVALIDARG; - - for (i = 0; i < runs; i++) - { - if (level[i] % 2) - { - if (vistolog) *vistolog++ = j; - if (logtovis) *logtovis++ = j; - j--; - } - else - { - if (vistolog) *vistolog++ = k; - if (logtovis) *logtovis++ = k; - k++; - } - } - return S_OK; -} - -/*********************************************************************** - * ScriptStringGetLogicalWidths (USP10.@) - * - * Returns logical widths from a string analysis. - * - * PARAMS - * ssa [I] string analysis. - * piDx [O] logical widths returned. - * - * RETURNS - * Success: S_OK - * Failure: a non-zero HRESULT. - */ -HRESULT WINAPI ScriptStringGetLogicalWidths(SCRIPT_STRING_ANALYSIS ssa, int *piDx) -{ - int i, j, next = 0; - StringAnalysis *analysis = ssa; - - TRACE("%p, %p\n", ssa, piDx); - - if (!analysis) return S_FALSE; - - for (i = 0; i < analysis->numItems; i++) - { - for (j = 0; j < analysis->glyphs[i].numGlyphs; j++) - { - piDx[next] = analysis->glyphs[i].piAdvance[j]; - next++; - } - } - return S_OK; -} - -/*********************************************************************** - * ScriptStringValidate (USP10.@) - * - * Validate a string analysis. - * - * PARAMS - * ssa [I] string analysis. - * - * RETURNS - * Success: S_OK - * Failure: S_FALSE if invalid sequences are found - * or a non-zero HRESULT if it fails. - */ -HRESULT WINAPI ScriptStringValidate(SCRIPT_STRING_ANALYSIS ssa) -{ - StringAnalysis *analysis = ssa; - - TRACE("(%p)\n", ssa); - - if (!analysis) return E_INVALIDARG; - return (analysis->invalid) ? S_FALSE : S_OK; -} - -/*********************************************************************** - * ScriptString_pSize (USP10.@) - * - * Retrieve width and height of an analysed string. - * - * PARAMS - * ssa [I] string analysis. - * - * RETURNS - * Success: Pointer to a SIZE structure. - * Failure: NULL - */ -const SIZE * WINAPI ScriptString_pSize(SCRIPT_STRING_ANALYSIS ssa) -{ - unsigned int i, j; - StringAnalysis *analysis = ssa; - - TRACE("(%p)\n", ssa); - - if (!analysis) return NULL; - - if (!analysis->sz) - { - if (!(analysis->sz = usp_alloc(sizeof(SIZE)))) return NULL; - analysis->sz->cy = analysis->sc->height; - - analysis->sz->cx = 0; - for (i = 0; i < analysis->numItems; i++) - for (j = 0; j < analysis->glyphs[i].numGlyphs; j++) - analysis->sz->cx += analysis->glyphs[i].piAdvance[j]; - } - return analysis->sz; -} - -/*********************************************************************** - * ScriptString_pLogAttr (USP10.@) - * - * Retrieve logical attributes of an analysed string. - * - * PARAMS - * ssa [I] string analysis. - * - * RETURNS - * Success: Pointer to an array of SCRIPT_LOGATTR structures. - * Failure: NULL - */ -const SCRIPT_LOGATTR * WINAPI ScriptString_pLogAttr(SCRIPT_STRING_ANALYSIS ssa) -{ - StringAnalysis *analysis = ssa; - - TRACE("(%p)\n", ssa); - - if (!analysis) return NULL; - return analysis->logattrs; -} - -/*********************************************************************** - * ScriptString_pcOutChars (USP10.@) - * - * Retrieve the length of a string after clipping. - * - * PARAMS - * ssa [I] String analysis. - * - * RETURNS - * Success: Pointer to the length. - * Failure: NULL - */ -const int * WINAPI ScriptString_pcOutChars(SCRIPT_STRING_ANALYSIS ssa) -{ - StringAnalysis *analysis = ssa; - - TRACE("(%p)\n", ssa); - - if (!analysis) return NULL; - return &analysis->clip_len; -} - -/*********************************************************************** - * ScriptStringGetOrder (USP10.@) - * - * Retrieve a glyph order map. - * - * PARAMS - * ssa [I] String analysis. - * order [I/O] Array of glyph positions. - * - * RETURNS - * Success: S_OK - * Failure: a non-zero HRESULT. - */ -HRESULT WINAPI ScriptStringGetOrder(SCRIPT_STRING_ANALYSIS ssa, UINT *order) -{ - unsigned int i, j, k; - StringAnalysis *analysis = ssa; - - TRACE("(%p)\n", ssa); - - if (!analysis) return S_FALSE; - - /* FIXME: handle RTL scripts */ - for (i = 0, k = 0; i < analysis->numItems; i++) - for (j = 0; j < analysis->glyphs[i].numGlyphs; j++, k++) - order[k] = k; - - return S_OK; -} Removed: vendor/wine/dlls/usp10.spec URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10.spec?rev=25772&vi… ============================================================================== --- vendor/wine/dlls/usp10.spec (original) +++ vendor/wine/dlls/usp10.spec (removed) @@ -1,35 +1,0 @@ -@ stub LpkPresent -@ stdcall ScriptApplyDigitSubstitution(ptr ptr ptr) -@ stub ScriptApplyLogicalWidth -@ stdcall ScriptBreak(ptr long ptr ptr) -@ stdcall ScriptCPtoX(long long long long ptr ptr ptr ptr ptr) -@ stdcall ScriptCacheGetHeight(ptr ptr ptr) -@ stdcall ScriptFreeCache(ptr) -@ stdcall ScriptGetCMap(ptr ptr ptr long long ptr) -@ stdcall ScriptGetFontProperties(long ptr ptr) -@ stdcall ScriptGetGlyphABCWidth(ptr ptr long ptr) -@ stub ScriptGetLogicalWidths -@ stdcall ScriptGetProperties(ptr long) -@ stdcall ScriptIsComplex(wstr long long) -@ stdcall ScriptItemize(wstr long long ptr ptr ptr ptr) -@ stub ScriptJustify -@ stdcall ScriptLayout(long ptr ptr ptr) -@ stdcall ScriptPlace(ptr ptr ptr long ptr ptr ptr ptr ptr) -@ stdcall ScriptRecordDigitSubstitution(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 ScriptStringCPtoX(ptr long long ptr) -@ stdcall ScriptStringFree(ptr) -@ stdcall ScriptStringGetLogicalWidths(ptr ptr) -@ stdcall ScriptStringGetOrder(ptr ptr) -@ stdcall ScriptStringOut(ptr long long long ptr long long long) -@ stdcall ScriptStringValidate(ptr) -@ stdcall ScriptStringXtoCP(ptr long ptr ptr) -@ stdcall ScriptString_pLogAttr(ptr) -@ stdcall ScriptString_pSize(ptr) -@ stdcall ScriptString_pcOutChars(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) -@ stub UspAllocCache -@ stub UspAllocTemp -@ stub UspFreeMem

1 0

[greatlrd] 25772: vendor drop of usp10 from wine cvs 11/02-2007
by greatlrd＠svn.reactos.org 11 Feb '07

11 Feb '07

Author: greatlrd Date: Sun Feb 11 13:14:39 2007 New Revision: 25772 URL: http://svn.reactos.org/svn/reactos?rev=25772&view=rev Log: vendor drop of usp10 from wine cvs 11/02-2007 Added: vendor/wine/dlls/.cvsignore vendor/wine/dlls/CVS/ vendor/wine/dlls/CVS/Entries vendor/wine/dlls/CVS/Entries.Extra vendor/wine/dlls/CVS/Entries.Extra.Old vendor/wine/dlls/CVS/Entries.Old vendor/wine/dlls/CVS/Repository vendor/wine/dlls/CVS/Root vendor/wine/dlls/CVS/Template vendor/wine/dlls/Makefile.in vendor/wine/dlls/tests/ vendor/wine/dlls/tests/.cvsignore vendor/wine/dlls/tests/CVS/ vendor/wine/dlls/tests/CVS/Entries vendor/wine/dlls/tests/CVS/Entries.Extra vendor/wine/dlls/tests/CVS/Entries.Extra.Old vendor/wine/dlls/tests/CVS/Entries.Old vendor/wine/dlls/tests/CVS/Repository vendor/wine/dlls/tests/CVS/Root vendor/wine/dlls/tests/CVS/Template vendor/wine/dlls/tests/Makefile.in vendor/wine/dlls/tests/usp10.c vendor/wine/dlls/usp10.c vendor/wine/dlls/usp10.spec [This mail would be too long, it was shortened to contain the URLs only.] Added: vendor/wine/dlls/.cvsignore URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/.cvsignore?rev=25772&vi… Added: vendor/wine/dlls/CVS/Entries URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/CVS/Entries?rev=25772&v… Added: vendor/wine/dlls/CVS/Entries.Extra URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/CVS/Entries.Extra?rev=2… Added: vendor/wine/dlls/CVS/Entries.Extra.Old URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/CVS/Entries.Extra.Old?r… Added: vendor/wine/dlls/CVS/Entries.Old URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/CVS/Entries.Old?rev=257… Added: vendor/wine/dlls/CVS/Repository URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/CVS/Repository?rev=2577… Added: vendor/wine/dlls/CVS/Root URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/CVS/Root?rev=25772&view… Added: vendor/wine/dlls/CVS/Template URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/CVS/Template?rev=25772&… Added: vendor/wine/dlls/Makefile.in URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/Makefile.in?rev=25772&v… Added: vendor/wine/dlls/tests/.cvsignore URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/tests/.cvsignore?rev=25… Added: vendor/wine/dlls/tests/CVS/Entries URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/tests/CVS/Entries?rev=2… Added: vendor/wine/dlls/tests/CVS/Entries.Extra URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/tests/CVS/Entries.Extra… Added: vendor/wine/dlls/tests/CVS/Entries.Extra.Old URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/tests/CVS/Entries.Extra… Added: vendor/wine/dlls/tests/CVS/Entries.Old URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/tests/CVS/Entries.Old?r… Added: vendor/wine/dlls/tests/CVS/Repository URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/tests/CVS/Repository?re… Added: vendor/wine/dlls/tests/CVS/Root URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/tests/CVS/Root?rev=2577… Added: vendor/wine/dlls/tests/CVS/Template URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/tests/CVS/Template?rev=… Added: vendor/wine/dlls/tests/Makefile.in URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/tests/Makefile.in?rev=2… Added: vendor/wine/dlls/tests/usp10.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/tests/usp10.c?rev=25772… Added: vendor/wine/dlls/usp10.c URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10.c?rev=25772&view=… Added: vendor/wine/dlls/usp10.spec URL: http://svn.reactos.org/svn/reactos/vendor/wine/dlls/usp10.spec?rev=25772&vi…

1 0

11 Feb '07

Author: greatlrd Date: Sun Feb 11 13:06:35 2007 New Revision: 25771 URL: http://svn.reactos.org/svn/reactos?rev=25771&view=rev Log: perpare import of usp10 from wine, import wine usp10.h (from wine cvs 11/02-2007 rev 1.8) from wine log Revision 1.8 Hans Leidekker <hans(a)it.vu.nl> usp10: Implement ScriptString_pSize. -------------------------------------------------------------------------------- Revision 1.7 Francois Gouget <fgouget(a)free.fr> include/usp10.h: Add missing include directives. -------------------------------------------------------------------------------- Revision 1.6 Jonathan Ernst <jonathan(a)ernstfamily.ch> Update the address of the Free Software Foundation. -------------------------------------------------------------------------------- Revision 1.5 Vijay Kiran Kamuju <infyquest(a)gmail.com> Added some missing definitions in usp10.h. -------------------------------------------------------------------------------- Revision 1.4 Marcus Meissner <meissner(a)suse.de> extern "C" wrappers for usp10.h. -------------------------------------------------------------------------------- Revision 1.3 Raphael Junqueira <fenix(a)club-internet.fr> Add stubs around ScriptStringAnalyse to avoid PAF crash. -------------------------------------------------------------------------------- Revision 1.2 Oliver Stieber <oliver_stieber(a)yahoo.co.uk> Added stubbed support for ScriptGetFontProperties. -------------------------------------------------------------------------------- Revision 1.1 Steven Edwards <steven(a)codeweavers.com> Add stub implementation of the Uniscribe Script Processor. Added: trunk/reactos/include/psdk/usp10.h (with props) Added: trunk/reactos/include/psdk/usp10.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/usp10.h?rev=2… ============================================================================== --- trunk/reactos/include/psdk/usp10.h (added) +++ trunk/reactos/include/psdk/usp10.h Sun Feb 11 13:06:35 2007 @@ -1,0 +1,270 @@ +/* + * Copyright (C) 2005 Steven Edwards + * Copyright (C) 2005 Vijay Kiran Kamuju + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __USP10_H +#define __USP10_H + +#ifndef __WINESRC__ +# include <windows.h> +#endif +/* FIXME: #include <specstrings.h> */ + +#ifdef __cplusplus +extern "C" { +#endif + +/** ScriptStringAnalyse */ +#define SSA_PASSWORD 0x00000001 +#define SSA_TAB 0x00000002 +#define SSA_CLIP 0x00000004 +#define SSA_FIT 0x00000008 +#define SSA_DZWG 0x00000010 +#define SSA_FALLBACK 0x00000020 +#define SSA_BREAK 0x00000040 +#define SSA_GLYPHS 0x00000080 +#define SSA_RTL 0x00000100 +#define SSA_GCP 0x00000200 +#define SSA_HOTKEY 0x00000400 +#define SSA_METAFILE 0x00000800 +#define SSA_LINK 0x00001000 +#define SSA_HIDEHOTKEY 0x00002000 +#define SSA_HOTKEYONLY 0x00002400 +#define SSA_FULLMEASURE 0x04000000 +#define SSA_LPKANSIFALLBACK 0x08000000 +#define SSA_PIDX 0x10000000 +#define SSA_LAYOUTRTL 0x20000000 +#define SSA_DONTGLYPH 0x40000000 +#define SSA_NOKASHIDA 0x80000000 + +/** StringIsComplex */ +#define SIC_COMPLEX 1 +#define SIC_ASCIIDIGIT 2 +#define SIC_NEUTRAL 4 + +/** ScriptGetCMap */ +#define SGCM_RTL 0x00000001 + +/** ScriptApplyDigitSubstitution */ +#define SCRIPT_DIGITSUBSTITUTE_CONTEXT 0 +#define SCRIPT_DIGITSUBSTITUTE_NONE 1 +#define SCRIPT_DIGITSUBSTITUTE_NATIONAL 2 +#define SCRIPT_DIGITSUBSTITUTE_TRADITIONAL 3 + +#define SCRIPT_UNDEFINED 0 + +#define USP_E_SCRIPT_NOT_IN_FONT MAKE_HRESULT(SEVERITY_ERROR,FACILITY_ITF,0x200) + +typedef enum tag_SCRIPT_JUSTIFY { + SCRIPT_JUSTIFY_NONE = 0, + SCRIPT_JUSTIFY_ARABIC_BLANK = 1, + SCRIPT_JUSTIFY_CHARACTER = 2, + SCRIPT_JUSTIFY_RESERVED1 = 3, + SCRIPT_JUSTIFY_BLANK = 4, + SCRIPT_JUSTIFY_RESERVED2 = 5, + SCRIPT_JUSTIFY_RESERVED3 = 6, + SCRIPT_JUSTIFY_ARABIC_NORMAL = 7, + SCRIPT_JUSTIFY_ARABIC_KASHIDA = 8, + SCRIPT_JUSTIFY_ARABIC_ALEF = 9, + SCRIPT_JUSTIFY_ARABIC_HA = 10, + SCRIPT_JUSTIFY_ARABIC_RA = 11, + SCRIPT_JUSTIFY_ARABIC_BA = 12, + SCRIPT_JUSTIFY_ARABIC_BARA = 13, + SCRIPT_JUSTIFY_ARABIC_SEEN = 14, + SCRIPT_JUSTIFY_RESERVED4 = 15, +} SCRIPT_JUSTIFY; + +typedef struct tag_SCRIPT_CONTROL { + DWORD uDefaultLanguage :16; + DWORD fContextDigits :1; + DWORD fInvertPreBoundDir :1; + DWORD fInvertPostBoundDir :1; + DWORD fLinkStringBefore :1; + DWORD fLinkStringAfter :1; + DWORD fNeutralOverride :1; + DWORD fNumericOverride :1; + DWORD fLegacyBidiClass :1; + DWORD fReserved :8; +} SCRIPT_CONTROL; + +typedef struct { + DWORD langid :16; + DWORD fNumeric :1; + DWORD fComplex :1; + DWORD fNeedsWordBreaking :1; + DWORD fNeedsCaretInfo :1; + DWORD bCharSet :8; + DWORD fControl :1; + DWORD fPrivateUseArea :1; + DWORD fNeedsCharacterJustify :1; + DWORD fInvalidGlyph :1; + DWORD fInvalidLogAttr :1; + DWORD fCDM :1; + DWORD fAmbiguousCharSet :1; + DWORD fClusterSizeVaries :1; + DWORD fRejectInvalid :1; +} SCRIPT_PROPERTIES; + +typedef struct tag_SCRIPT_STATE { + WORD uBidiLevel :5; + WORD fOverrideDirection :1; + WORD fInhibitSymSwap :1; + WORD fCharShape :1; + WORD fDigitSubstitute :1; + WORD fInhibitLigate :1; + WORD fDisplayZWG :1; + WORD fArabicNumContext :1; + WORD fGcpClusters :1; + WORD fReserved :1; + WORD fEngineReserved :2; +} SCRIPT_STATE; + +typedef struct tag_SCRIPT_ANALYSIS { + WORD eScript :10; + WORD fRTL :1; + WORD fLayoutRTL :1; + WORD fLinkBefore :1; + WORD fLinkAfter :1; + WORD fLogicalOrder :1; + WORD fNoGlyphIndex :1; + SCRIPT_STATE s; +} SCRIPT_ANALYSIS; + +typedef struct tag_SCRIPT_ITEM { + int iCharPos; + SCRIPT_ANALYSIS a; +} SCRIPT_ITEM; + +typedef struct tag_SCRIPT_DIGITSUBSTITUTE { + DWORD NationalDigitLanguage :16; + DWORD TraditionalDigitLanguage :16; + DWORD DigitSubstitute :8; + DWORD dwReserved; +} SCRIPT_DIGITSUBSTITUTE; + +typedef struct tag_SCRIPT_FONTPROPERTIES { + int cBytes; + WORD wgBlank; + WORD wgDefault; + WORD wgInvalid; + WORD wgKashida; + int iKashidaWidth; +} SCRIPT_FONTPROPERTIES; + +typedef struct tag_SCRIPT_TABDEF { + int cTabStops; + int iScale; + int *pTabStops; + int iTabOrigin; +} SCRIPT_TABDEF; + +typedef struct tag_SCRIPT_VISATTR { + WORD uJustification :4; + WORD fClusterStart :1; + WORD fDiacritic :1; + WORD fZeroWidth :1; + WORD fReserved :1; + WORD fShapeReserved :8; +} SCRIPT_VISATTR; + +typedef struct tag_SCRIPT_LOGATTR { + BYTE fSoftBreak :1; + BYTE fWhiteSpace :1; + BYTE fCharStop :1; + BYTE fWordStop :1; + BYTE fInvalid :1; + BYTE fReserved :3; +} SCRIPT_LOGATTR; + +typedef void *SCRIPT_CACHE; +typedef void *SCRIPT_STRING_ANALYSIS; + +#ifndef LSDEFS_DEFINED +typedef struct tagGOFFSET { + LONG du; + LONG dv; +} GOFFSET; +#endif + +/* Function Declarations */ + +HRESULT WINAPI ScriptApplyDigitSubstitution(const SCRIPT_DIGITSUBSTITUTE* psds, + SCRIPT_CONTROL* psc, SCRIPT_STATE* pss); +HRESULT WINAPI ScriptApplyLogicalWidth(const int *piDx, int cChars, int cGlyphs, const WORD *pwLogClust, + const SCRIPT_VISATTR *psva, const int *piAdvance, + const SCRIPT_ANALYSIS *psa, ABC *pABC, int *piJustify); +HRESULT WINAPI ScriptRecordDigitSubstitution(LCID Locale, SCRIPT_DIGITSUBSTITUTE *psds); +HRESULT WINAPI ScriptItemize(const WCHAR *pwcInChars, int cInChars, int cMaxItems, + const SCRIPT_CONTROL *psControl, const SCRIPT_STATE *psState, + SCRIPT_ITEM *pItems, int *pcItems); +HRESULT WINAPI ScriptGetCMap(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcInChars, int cChars, + DWORD dwFlags, WORD *pwOutGlyphs); +HRESULT WINAPI ScriptGetFontProperties(HDC hdc, SCRIPT_CACHE *psc, SCRIPT_FONTPROPERTIES *sfp); +HRESULT WINAPI ScriptGetGlyphABCWidth(HDC hdc, SCRIPT_CACHE *psc, WORD wGlyph, ABC *pABC); +HRESULT WINAPI ScriptGetLogicalWidths(const SCRIPT_ANALYSIS *psa, int cChars, int cGlyphs, + const int *piGlyphWidth, const WORD *pwLogClust, + const SCRIPT_VISATTR *psva, int *piDx); +HRESULT WINAPI ScriptGetProperties(const SCRIPT_PROPERTIES ***ppSp, int *piNumScripts); +HRESULT WINAPI ScriptStringAnalyse(HDC hdc, + const void *pString, + int cString, + int cGlyphs, + int iCharset, + DWORD dwFlags, + int iReqWidth, + SCRIPT_CONTROL *psControl, + SCRIPT_STATE *psState, + const int *piDx, + SCRIPT_TABDEF *pTabdef, + const BYTE *pbInClass, + SCRIPT_STRING_ANALYSIS *pssa); +HRESULT WINAPI ScriptStringValidate(SCRIPT_STRING_ANALYSIS ssa); +HRESULT WINAPI ScriptStringFree(SCRIPT_STRING_ANALYSIS *pssa); +HRESULT WINAPI ScriptFreeCache(SCRIPT_CACHE *psc); +HRESULT WINAPI ScriptIsComplex(const WCHAR* pwcInChars, int cInChars, DWORD dwFlags); +HRESULT WINAPI ScriptJustify(const SCRIPT_VISATTR *psva, const int *piAdvance, int cGlyphs, + int iDx, int iMinKashida, int *piJustify); +HRESULT WINAPI ScriptLayout(int cRuns, const BYTE *pbLevel, int *piVisualToLogical, int *piLogicalToVisual); +HRESULT WINAPI ScriptShape(HDC hdc, SCRIPT_CACHE *psc, const WCHAR *pwcChars, int cChars, int cMaxGlyphs, + SCRIPT_ANALYSIS *psa, WORD *pwOutGlyphs, WORD *pwLogClust, SCRIPT_VISATTR *psva, int *pcGlyphs); +HRESULT WINAPI ScriptPlace(HDC hdc, SCRIPT_CACHE *psc, const WORD *pwGlyphs, int cGlyphs, const SCRIPT_VISATTR *psva, + SCRIPT_ANALYSIS *psa, int *piAdvance, GOFFSET *pGoffset, ABC *pABC ); +HRESULT WINAPI ScriptBreak(const WCHAR *pwcChars, int cChars, const SCRIPT_ANALYSIS *psa, SCRIPT_LOGATTR *psla); +HRESULT WINAPI ScriptCacheGetHeight(HDC hdc, SCRIPT_CACHE *psc, LONG *tmHeight); +HRESULT WINAPI ScriptCPtoX(int iCP, BOOL fTrailing, int cChars, int cGlyphs, const WORD *pwLogClust, const SCRIPT_VISATTR *psva, + const int *piAdvance, const SCRIPT_ANALYSIS *psa, int *piX); +HRESULT WINAPI ScriptXtoCP(int iX, int cChars, int cGlyphs, const WORD *pwLogClust, const SCRIPT_VISATTR *psva, + const int *piAdvance, const SCRIPT_ANALYSIS *psa, int *piCP, int *piTrailing); +HRESULT WINAPI ScriptStringCPtoX(SCRIPT_STRING_ANALYSIS ssa, int icp, BOOL fTrailing, int *pX); +HRESULT WINAPI ScriptStringXtoCP(SCRIPT_STRING_ANALYSIS ssa, int iX, int *piCh , int *piTrailing); +HRESULT WINAPI ScriptStringGetLogicalWidths(SCRIPT_STRING_ANALYSIS ssa, int *piDx); +HRESULT WINAPI ScriptStringGetOrder(SCRIPT_STRING_ANALYSIS ssa, UINT *puOrder); +HRESULT WINAPI ScriptStringOut(SCRIPT_STRING_ANALYSIS ssa, int iX, int iY, UINT uOptions, const RECT *prc, + int iMinSel, int iMaxSel, BOOL fDisabled); +HRESULT WINAPI ScriptTextOut(const HDC hdc, SCRIPT_CACHE *psc, int x, int y, UINT fuOptions, const RECT *lprc, + const SCRIPT_ANALYSIS *psa, const WCHAR *pwcReserved, int iReserved, const WORD *pwGlyphs, + int cGlyphs, const int *piAdvance, const int *piJustify, const GOFFSET *pGoffset); +const int* WINAPI ScriptString_pcOutChars(SCRIPT_STRING_ANALYSIS ssa); +const SCRIPT_LOGATTR* WINAPI ScriptString_pLogAttr(SCRIPT_STRING_ANALYSIS ssa); +const SIZE* WINAPI ScriptString_pSize(SCRIPT_STRING_ANALYSIS ssa); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* __USP10_H */ Propchange: trunk/reactos/include/psdk/usp10.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[greatlrd] 25770: update my private doc
by greatlrd＠svn.reactos.org 10 Feb '07

10 Feb '07

Author: greatlrd Date: Sun Feb 11 01:32:06 2007 New Revision: 25770 URL: http://svn.reactos.org/svn/reactos?rev=25770&view=rev Log: update my private doc Modified: branches/ros-branch-0_3_1/reactos/regress_greatlord.rtf Modified: branches/ros-branch-0_3_1/reactos/regress_greatlord.rtf URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/regres… ============================================================================== --- branches/ros-branch-0_3_1/reactos/regress_greatlord.rtf (original) +++ branches/ros-branch-0_3_1/reactos/regress_greatlord.rtf Sun Feb 11 01:32:06 2007 @@ -3,12 +3,15 @@ \ul\b GreatLord Status of 0.3.1 branch \ulnone\b0\par Current known regress that need be fixed ?\par \b\par -Second Boot\par -\b0 1. Keyboard does not work to navigate in the install menu. \b\line\par CMD\par \b0 1. MD (makedir) does not create folder with right name \par workaround : unkonwn \par posible fix/patch : known at moment \par + more info : it is posible from a patch I commited will examie it bit more\par + if it is the patch I will revers it from 0.3.1 and trunk or trying fix that\par + patch. I should have tested a patch from buzgila I commited bit harder\par + \par +\par \par \b VMWARE\par \par @@ -37,8 +40,10 @@ 4. Windows redrawing problem cpl \par \line 5. update backgound from some windows. \par \par -6. OpenGL\line\line\b Known regress from 0.3.0 to 0.3.1 branch\line\b0 1. LiveCD\par -2. cmd md\b\par +6. OpenGL\line\line\b Known regress from 0.3.0 to 0.3.1 branch\b0\par +1. cmd md\par +2. vmware can not change resultions. \par +\b\line\par \par }

1 0

[greatlrd] 25769: merge 25768 from trunk to 0.3.1 : fixed Property sheet: - Set focus to defpushbutton or to first WC_EDIT child window if present, like it works on windows. - update wine diff This fixes the regression in 2nd stage setup when no keyboard focus was present.
by greatlrd＠svn.reactos.org 10 Feb '07

10 Feb '07

Author: greatlrd Date: Sun Feb 11 01:26:45 2007 New Revision: 25769 URL: http://svn.reactos.org/svn/reactos?rev=25769&view=rev Log: merge 25768 from trunk to 0.3.1 : fixed Property sheet: - Set focus to defpushbutton or to first WC_EDIT child window if present, like it works on windows. - update wine diff This fixes the regression in 2nd stage setup when no keyboard focus was present. Modified: branches/ros-branch-0_3_1/reactos/dll/win32/comctl32/comctl32_ros.diff branches/ros-branch-0_3_1/reactos/dll/win32/comctl32/propsheet.c Modified: branches/ros-branch-0_3_1/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/win32/comctl32/comctl32_ros.diff (original) +++ branches/ros-branch-0_3_1/reactos/dll/win32/comctl32/comctl32_ros.diff Sun Feb 11 01:26:45 2007 @@ -13,4 +13,97 @@ - (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL); } - /* Don't bother painting item being edited */ + /* Don't bother painting item being edited */ +Index: propsheet.c +=================================================================== +--- propsheet.c (revision 25766) ++++ propsheet.c (working copy) +@@ -2422,6 +2422,28 @@ + return FALSE; + } + ++BOOL CALLBACK ++EnumChildProc(HWND hwnd, LPARAM lParam) ++{ ++ WCHAR szType[20]; ++ RealGetWindowClassW(hwnd, szType, 20); ++ ++ if (strcmpW(szType, WC_EDITW) == 0) ++ { ++ if (IsWindowEnabled(hwnd) && IsWindowVisible(hwnd)) ++ { ++ SetFocus(hwnd); ++ return FALSE; ++ } ++ } ++ else ++ { ++ EnumChildWindows(hwnd, EnumChildProc, 0); ++ } ++ ++ return TRUE; ++} ++ + /****************************************************************************** + * PROPSHEET_SetWizButtons + * +@@ -2444,17 +2466,6 @@ + EnableWindow(hwndNext, FALSE); + EnableWindow(hwndFinish, FALSE); + +- /* set the default pushbutton to an enabled button */ +- if (((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH)) +- SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0); +- else if (dwFlags & PSWIZB_NEXT) +- SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0); +- else if (dwFlags & PSWIZB_BACK) +- SendMessageW(hwndDlg, DM_SETDEFID, IDC_BACK_BUTTON, 0); +- else +- SendMessageW(hwndDlg, DM_SETDEFID, IDCANCEL, 0); +- +- + if (dwFlags & PSWIZB_BACK) + EnableWindow(hwndBack, TRUE); + +@@ -2484,6 +2495,32 @@ + } + else if (!(dwFlags & PSWIZB_DISABLEDFINISH)) + EnableWindow(hwndFinish, TRUE); ++ ++ /* set the default pushbutton to an enabled button and give it focus */ ++ if (((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH)) ++ { ++ SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0); ++ SetFocus(hwndFinish); ++ } ++ else if (dwFlags & PSWIZB_NEXT) ++ { ++ SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0); ++ SetFocus(hwndNext); ++ } ++ else if (dwFlags & PSWIZB_BACK) ++ { ++ SendMessageW(hwndDlg, DM_SETDEFID, IDC_BACK_BUTTON, 0); ++ SetFocus(hwndBack); ++ } ++ else ++ { ++ SendMessageW(hwndDlg, DM_SETDEFID, IDCANCEL, 0); ++ SetFocus(GetDlgItem(hwndDlg, IDCANCEL)); ++ } ++ ++ /* Now try to find an edit control that deserves focus */ ++ EnumChildWindows(PropSheet_GetCurrentPageHwnd(hwndDlg), EnumChildProc, 0); ++ + } + + /****************************************************************************** +@@ -3548,7 +3585,7 @@ + + return FALSE; + } +- ++ + case WM_SYSCOLORCHANGE: + COMCTL32_RefreshSysColors(); + return FALSE; Modified: branches/ros-branch-0_3_1/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_1/reactos/dll/wi… ============================================================================== --- branches/ros-branch-0_3_1/reactos/dll/win32/comctl32/propsheet.c (original) +++ branches/ros-branch-0_3_1/reactos/dll/win32/comctl32/propsheet.c Sun Feb 11 01:26:45 2007 @@ -2422,6 +2422,28 @@ return FALSE; } +BOOL CALLBACK +EnumChildProc(HWND hwnd, LPARAM lParam) +{ + WCHAR szType[20]; + RealGetWindowClassW(hwnd, szType, 20); + + if (strcmpW(szType, WC_EDITW) == 0) + { + if (IsWindowEnabled(hwnd) && IsWindowVisible(hwnd)) + { + SetFocus(hwnd); + return FALSE; + } + } + else + { + EnumChildWindows(hwnd, EnumChildProc, 0); + } + + return TRUE; +} + /****************************************************************************** * PROPSHEET_SetWizButtons * @@ -2444,17 +2466,6 @@ EnableWindow(hwndNext, FALSE); EnableWindow(hwndFinish, FALSE); - /* set the default pushbutton to an enabled button */ - if (((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH)) - SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0); - else if (dwFlags & PSWIZB_NEXT) - SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0); - else if (dwFlags & PSWIZB_BACK) - SendMessageW(hwndDlg, DM_SETDEFID, IDC_BACK_BUTTON, 0); - else - SendMessageW(hwndDlg, DM_SETDEFID, IDCANCEL, 0); - - if (dwFlags & PSWIZB_BACK) EnableWindow(hwndBack, TRUE); @@ -2484,6 +2495,32 @@ } else if (!(dwFlags & PSWIZB_DISABLEDFINISH)) EnableWindow(hwndFinish, TRUE); + + /* set the default pushbutton to an enabled button and give it focus */ + if (((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH)) + { + SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0); + SetFocus(hwndFinish); + } + else if (dwFlags & PSWIZB_NEXT) + { + SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0); + SetFocus(hwndNext); + } + else if (dwFlags & PSWIZB_BACK) + { + SendMessageW(hwndDlg, DM_SETDEFID, IDC_BACK_BUTTON, 0); + SetFocus(hwndBack); + } + else + { + SendMessageW(hwndDlg, DM_SETDEFID, IDCANCEL, 0); + SetFocus(GetDlgItem(hwndDlg, IDCANCEL)); + } + + /* Now try to find an edit control that deserves focus */ + EnumChildWindows(PropSheet_GetCurrentPageHwnd(hwndDlg), EnumChildProc, 0); + } /****************************************************************************** @@ -3548,7 +3585,7 @@ return FALSE; } - + case WM_SYSCOLORCHANGE: COMCTL32_RefreshSysColors(); return FALSE;

1 0

[tkreuzer] 25768: Property sheet: - Set focus to defpushbutton or to first WC_EDIT child window if present, like it works on windows. - update wine diff This fixes the regression in 2nd stage setup when no keyboard focus was present.
by tkreuzer＠svn.reactos.org 10 Feb '07

10 Feb '07

Author: tkreuzer Date: Sun Feb 11 01:02:45 2007 New Revision: 25768 URL: http://svn.reactos.org/svn/reactos?rev=25768&view=rev Log: Property sheet: - Set focus to defpushbutton or to first WC_EDIT child window if present, like it works on windows. - update wine diff This fixes the regression in 2nd stage setup when no keyboard focus was present. Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff trunk/reactos/dll/win32/comctl32/propsheet.c Modified: trunk/reactos/dll/win32/comctl32/comctl32_ros.diff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/comctl3… ============================================================================== --- trunk/reactos/dll/win32/comctl32/comctl32_ros.diff (original) +++ trunk/reactos/dll/win32/comctl32/comctl32_ros.diff Sun Feb 11 01:02:45 2007 @@ -13,4 +13,97 @@ - (lvItem.state & LVIS_SELECTED) && (infoPtr->bFocus) ? ILD_SELECTED : ILD_NORMAL); } - /* Don't bother painting item being edited */ + /* Don't bother painting item being edited */ +Index: propsheet.c +=================================================================== +--- propsheet.c (revision 25766) ++++ propsheet.c (working copy) +@@ -2422,6 +2422,28 @@ + return FALSE; + } + ++BOOL CALLBACK ++EnumChildProc(HWND hwnd, LPARAM lParam) ++{ ++ WCHAR szType[20]; ++ RealGetWindowClassW(hwnd, szType, 20); ++ ++ if (strcmpW(szType, WC_EDITW) == 0) ++ { ++ if (IsWindowEnabled(hwnd) && IsWindowVisible(hwnd)) ++ { ++ SetFocus(hwnd); ++ return FALSE; ++ } ++ } ++ else ++ { ++ EnumChildWindows(hwnd, EnumChildProc, 0); ++ } ++ ++ return TRUE; ++} ++ + /****************************************************************************** + * PROPSHEET_SetWizButtons + * +@@ -2444,17 +2466,6 @@ + EnableWindow(hwndNext, FALSE); + EnableWindow(hwndFinish, FALSE); + +- /* set the default pushbutton to an enabled button */ +- if (((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH)) +- SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0); +- else if (dwFlags & PSWIZB_NEXT) +- SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0); +- else if (dwFlags & PSWIZB_BACK) +- SendMessageW(hwndDlg, DM_SETDEFID, IDC_BACK_BUTTON, 0); +- else +- SendMessageW(hwndDlg, DM_SETDEFID, IDCANCEL, 0); +- +- + if (dwFlags & PSWIZB_BACK) + EnableWindow(hwndBack, TRUE); + +@@ -2484,6 +2495,32 @@ + } + else if (!(dwFlags & PSWIZB_DISABLEDFINISH)) + EnableWindow(hwndFinish, TRUE); ++ ++ /* set the default pushbutton to an enabled button and give it focus */ ++ if (((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH)) ++ { ++ SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0); ++ SetFocus(hwndFinish); ++ } ++ else if (dwFlags & PSWIZB_NEXT) ++ { ++ SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0); ++ SetFocus(hwndNext); ++ } ++ else if (dwFlags & PSWIZB_BACK) ++ { ++ SendMessageW(hwndDlg, DM_SETDEFID, IDC_BACK_BUTTON, 0); ++ SetFocus(hwndBack); ++ } ++ else ++ { ++ SendMessageW(hwndDlg, DM_SETDEFID, IDCANCEL, 0); ++ SetFocus(GetDlgItem(hwndDlg, IDCANCEL)); ++ } ++ ++ /* Now try to find an edit control that deserves focus */ ++ EnumChildWindows(PropSheet_GetCurrentPageHwnd(hwndDlg), EnumChildProc, 0); ++ + } + + /****************************************************************************** +@@ -3548,7 +3585,7 @@ + + return FALSE; + } +- ++ + case WM_SYSCOLORCHANGE: + COMCTL32_RefreshSysColors(); + return FALSE; Modified: trunk/reactos/dll/win32/comctl32/propsheet.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/comctl32/propshe… ============================================================================== --- trunk/reactos/dll/win32/comctl32/propsheet.c (original) +++ trunk/reactos/dll/win32/comctl32/propsheet.c Sun Feb 11 01:02:45 2007 @@ -2422,6 +2422,28 @@ return FALSE; } +BOOL CALLBACK +EnumChildProc(HWND hwnd, LPARAM lParam) +{ + WCHAR szType[20]; + RealGetWindowClassW(hwnd, szType, 20); + + if (strcmpW(szType, WC_EDITW) == 0) + { + if (IsWindowEnabled(hwnd) && IsWindowVisible(hwnd)) + { + SetFocus(hwnd); + return FALSE; + } + } + else + { + EnumChildWindows(hwnd, EnumChildProc, 0); + } + + return TRUE; +} + /****************************************************************************** * PROPSHEET_SetWizButtons * @@ -2444,17 +2466,6 @@ EnableWindow(hwndNext, FALSE); EnableWindow(hwndFinish, FALSE); - /* set the default pushbutton to an enabled button */ - if (((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH)) - SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0); - else if (dwFlags & PSWIZB_NEXT) - SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0); - else if (dwFlags & PSWIZB_BACK) - SendMessageW(hwndDlg, DM_SETDEFID, IDC_BACK_BUTTON, 0); - else - SendMessageW(hwndDlg, DM_SETDEFID, IDCANCEL, 0); - - if (dwFlags & PSWIZB_BACK) EnableWindow(hwndBack, TRUE); @@ -2484,6 +2495,32 @@ } else if (!(dwFlags & PSWIZB_DISABLEDFINISH)) EnableWindow(hwndFinish, TRUE); + + /* set the default pushbutton to an enabled button and give it focus */ + if (((dwFlags & PSWIZB_FINISH) || psInfo->hasFinish) && !(dwFlags & PSWIZB_DISABLEDFINISH)) + { + SendMessageW(hwndDlg, DM_SETDEFID, IDC_FINISH_BUTTON, 0); + SetFocus(hwndFinish); + } + else if (dwFlags & PSWIZB_NEXT) + { + SendMessageW(hwndDlg, DM_SETDEFID, IDC_NEXT_BUTTON, 0); + SetFocus(hwndNext); + } + else if (dwFlags & PSWIZB_BACK) + { + SendMessageW(hwndDlg, DM_SETDEFID, IDC_BACK_BUTTON, 0); + SetFocus(hwndBack); + } + else + { + SendMessageW(hwndDlg, DM_SETDEFID, IDCANCEL, 0); + SetFocus(GetDlgItem(hwndDlg, IDCANCEL)); + } + + /* Now try to find an edit control that deserves focus */ + EnumChildWindows(PropSheet_GetCurrentPageHwnd(hwndDlg), EnumChildProc, 0); + } /****************************************************************************** @@ -3548,7 +3585,7 @@ return FALSE; } - + case WM_SYSCOLORCHANGE: COMCTL32_RefreshSysColors(); return FALSE;

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs