usp10: [RESEND] Add ScriptItemize, ScriptShape and ScriptPlace functionality

[Robert Shearman]

lats wrote:

>Index: dlls/usp10/usp10.c
>===================================================================
>RCS file: /home/wine/wine/dlls/usp10/usp10.c,v
>retrieving revision 1.7
>diff -u -r1.7 usp10.c
>--- dlls/usp10/usp10.c	9 Jan 2006 19:55:03 -0000	1.7
>+++ dlls/usp10/usp10.c	12 Feb 2006 05:25:09 -0000
>@@ -39,6 +39,42 @@
> 
> WINE_DEFAULT_DEBUG_CHANNEL(uniscribe);
> 
>+#define MAX_SCRIPTS  8
>+
>+/*  Set up a default for ScriptGetProperties    */
>+const SCRIPT_PROPERTIES Default_Script_0 = {0, 0, 0, 0, 0, 0, 0, 0, 
>+                                            0, 0, 0, 0, 0, 0, 0};
>  
>

This can be "static const" instead of just "const".

>@@ -69,9 +108,13 @@
>  */
> HRESULT WINAPI ScriptGetProperties(const SCRIPT_PROPERTIES ***ppSp, int *piNumScripts)
> {
>-    FIXME("%p,%p\n",ppSp,piNumScripts);
>+    FIXME("%p,%p,%p\n",ppSp, *ppSp, piNumScripts);
> 
>-    if (piNumScripts) *piNumScripts = 0;
>+/*  Set up a sensible default and intialise pointers  */
>+    *piNumScripts = MAX_SCRIPTS;
>+    *ppSp =  (SCRIPT_PROPERTIES *)Global_Script;
>+    TRACE("ppSp:%p, *ppSp:%p, **ppSp:%p, %d\n", ppSp, *ppSp, **ppSp, 
>+                                                *piNumScripts);
>     return 0;
> }
> 
>  
>

The identation of the comment is unusual.

>@@ -129,7 +172,60 @@
>     if (!pwcInChars || !cInChars || !pItems || cMaxItems < 2)
>         return E_INVALIDARG;
> 
>-    *pcItems = 0;
>+/*  Set a sensible default                              */
>+/*  Set SCRIPT_ITEM                                     */
>+    pItems[0].iCharPos = 0;
>+/*  Set the SCRIPT_ANALYSIS                             */
>+//    pItems[0].a.eScript = SCRIPT_UNDEFINED;
>+    pItems[0].a.eScript = 2;
>  
>

Which is it, SCRIPT_UNDEFINED or 2? Decide this and remove the dead code.

-- 
Rob Shearman