2006-03-26 Hansres Engel <engel@node.ch>

         Add Uniscribe API for typography and for complex scripts.
	 * include/usp10.h: New file.
         * lib/usp10.def: New file.

	* include/winver.h:  Change first argument of GetFileVersionInfo[...] to const.

        * include/imm.h (IMECHARPOSITION): Add structure.
	(RECONVERTSTRING): Likwise.

	* include/commdlg.h (OPENFILENAME_SIZE_VERSION_400): Define.

        * lib/uuid.c (CMultiLanguage): Add UUID definition.
	(IMLangFontLink2): Likewise.
	(IMultiLanguage): Likewise.

3 files changed, 46 insertions, 0 deletions

diff --git a/winsup/w32api/lib/test.c b/winsup/w32api/lib/test.c
index 71f63c389..d44465e43 100644
--- a/winsup/w32api/lib/test.c
+++ b/winsup/w32api/lib/test.c
@@ -83,6 +83,7 @@
 #include <dhcpcsdk.h>
 #include <errorrep.h>
 #include <windns.h>
+#include <usp10.h>
 
 #ifndef __OBJC__  /* problems with BOOL */
 #include <ole2.h>
diff --git a/winsup/w32api/lib/usp10.def b/winsup/w32api/lib/usp10.def
new file mode 100755
index 000000000..f4f0deae1
--- /dev/null
+++ b/winsup/w32api/lib/usp10.def
@@ -0,0 +1,42 @@
+LIBRARY USP10.DLL
+EXPORTS
+    ScriptApplyDigitSubstitution@12
+    ScriptApplyLogicalWidth@36
+    ScriptBreak@16
+    ScriptCPtoX@36
+    ScriptCacheGetHeight@12
+    ScriptFreeCache@4
+    ScriptGetCMap@24
+    ScriptGetFontAlternateGlyphs@40
+    ScriptGetFontFeatureTags@32
+    ScriptGetFontLanguageTags@28
+    ScriptGetFontProperties@12
+    ScriptGetFontScriptTags@24
+    ScriptGetGlyphABCWidth@16
+    ScriptGetLogicalWidths@28
+    ScriptGetProperties@8
+    ScriptIsComplex@12
+    ScriptItemize@28
+    ScriptItemizeOpenType@32
+    ScriptJustify@24
+    ScriptLayout@16
+    ScriptPlace@36
+    ScriptPlaceOpenType@72
+    ScriptPositionSingleGlyph@52
+    ScriptRecordDigitSubstitution@8
+    ScriptShape@40
+    ScriptShapeOpenType@64
+    ScriptStringAnalyse@52
+    ScriptStringCPtoX@16
+    ScriptStringFree@4
+    ScriptStringGetLogicalWidths@8
+    ScriptStringGetOrder@8
+    ScriptStringOut@32
+    ScriptStringValidate@4
+    ScriptStringXtoCP@16
+    ScriptString_pLogAttr@4
+    ScriptString_pSize@4
+    ScriptString_pcOutChars@4
+    ScriptSubstituteSingleGlyph@36
+    ScriptTextOut@56
+    ScriptXtoCP@36
diff --git a/winsup/w32api/lib/uuid.c b/winsup/w32api/lib/uuid.c
index 4598fbe04..0006f4f4f 100644
--- a/winsup/w32api/lib/uuid.c
+++ b/winsup/w32api/lib/uuid.c
@@ -35,6 +35,7 @@ DEFINE_GUID(CATID_SafeForScripting,0x7dd95801,0x9882,0x11cf,0x9f,0xa9,0,0xaa,0,0
 DEFINE_GUID(CLSID_AllClasses,0x330,0,0,0xc0,0,0,0,0,0,0,0x46);
 DEFINE_GUID(CLSID_CColorPropPage,0xbe35201,0x8f91,0x11ce,0x9d,0xe3,0,0xaa,0,0x4b,0xb8,0x51);
 DEFINE_GUID(CLSID_CFontPropPage, 0x0be35200,0x8f91,0x11ce,0x9d,0xe3,0x00,0xaa,0x00,0x4b,0xb8,0x51);
+DEFINE_GUID(CLSID_CMultiLanguage,0x275c23e2,0x3747,0x11d0,0x9f,0xea,0,0xaa,0,0x3f,0x86,0x46);
 DEFINE_GUID(CLSID_CPicturePropPage,0xbe35202,0x8f91,0x11ce,0x9d,0xe3,0,0xaa,0,0x4b,0xb8,0x51);
 DEFINE_GUID(CLSID_ConvertVBX,0xfb8f0822,0x164,0x101b,0x84,0xed,0x8,0,0x2b,0x2e,0xc7,0x13);
 DEFINE_GUID(CLSID_CurrentUserClasses,0x332,0,0,0xc0,0,0,0,0,0,0,0x46);
@@ -190,7 +191,9 @@ DEFINE_GUID(IID_IMallocSpy,0x1d,0,0,0xc0,0,0,0,0,0,0,0x46);
 DEFINE_GUID(IID_IMarshal,0x3,0,0,0xc0,0,0,0,0,0,0,0x46);
 DEFINE_GUID(IID_IMessageFilter,0x16,0,0,0xc0,0,0,0,0,0,0,0x46);
 DEFINE_GUID(IID_IMimeInfo,0xf77459a0,0xbf9a,0x11cf,0xba,0x4e,0,0xc0,0x4f,0xd7,0x8,0x16);
+DEFINE_GUID(IID_IMLangFontLink2,0xdccfc162,0x2b38,0x11d2,0xb7,0xec,0,0xc0,0x4f,0x8f,0x5d,0x9a);
 DEFINE_GUID(IID_IMoniker,0xf,0,0,0xc0,0,0,0,0,0,0,0x46);
+DEFINE_GUID(IID_IMultiLanguage,0x275c23e1,0x3747,0x11d0,0x9f,0xea,0,0xaa,0,0x3f,0x86,0x46);
 DEFINE_GUID(IID_IMultiQI,0x20,0,0,0xc0,0,0,0,0,0,0,0x46);
 DEFINE_GUID(IID_IObjectSafety,0xcb5bdc81,0x93c1,0x11cf,0x8f,0x20,0,0x80,0x5f,0x2c,0xd0,0x64);
 DEFINE_GUID(IID_IObjectWithSite,0xfc4801a3,0x2ba9,0x11cf,0xa2,0x29,0,0xaa,0,0x3d,0x73,0x52);