--- a/dwt/internal/win32/WINAPI.d	Tue Jul 01 10:18:15 2008 +0200
+++ b/dwt/internal/win32/WINAPI.d	Sun Jul 06 17:23:35 2008 +0200
@@ -273,7 +273,7 @@
 //     HDC ResetDCA(HDC, LPDEVMODE);
 //     WINBOOL RemoveFontResourceA(LPCSTR);
 //     HENHMETAFILE CopyEnhMetaFileA(HENHMETAFILE, LPCSTR);
-//     HDC CreateEnhMetaFileA(HDC, LPCSTR, LPRECT, LPCSTR);
+    HDC CreateEnhMetaFileA(HDC, LPCSTR, LPRECT, LPCSTR);
 //     HENHMETAFILE GetEnhMetaFileA(LPCSTR);
 //     UINT GetEnhMetaFileDescriptionA(HENHMETAFILE, UINT, LPSTR);
     WINBOOL GetTextMetricsA(HDC, LPTEXTMETRIC);
@@ -664,7 +664,7 @@
 //     HDC ResetDCW(HDC, LPDEVMODE);
 //     WINBOOL RemoveFontResourceW(LPCWSTR);
 //     HENHMETAFILE CopyEnhMetaFileW(HENHMETAFILE, LPCWSTR);
-//     HDC CreateEnhMetaFileW(HDC, LPCWSTR, LPRECT, LPCWSTR);
+    HDC CreateEnhMetaFileW(HDC, LPCWSTR, LPRECT, LPCWSTR);
 //     HENHMETAFILE GetEnhMetaFileW(LPCWSTR);
 //     UINT GetEnhMetaFileDescriptionW(HENHMETAFILE, UINT, LPWSTR);
 //     WINBOOL GetTextMetricsW(HDC, LPTEXTMETRIC);
@@ -1369,7 +1369,7 @@
 //     WINBOOL BitBlt(HDC, int, int, int, int, HDC, int, int, DWORD);
 //     WINBOOL CancelDC(HDC);
 //     WINBOOL Chord(HDC, int, int, int, int, int, int, int, int);
-//     HMETAFILE CloseMetaFile(HDC);
+    HMETAFILE CloseMetaFile(HDC);
 //     int CombineRgn(HRGN, HRGN, HRGN, int);
 //     HBITMAP CreateBitmap(int, int, UINT, UINT, POINTER);
 //     HBITMAP CreateBitmapIndirect(BITMAP*);
@@ -1506,9 +1506,9 @@
 //     WINBOOL UpdateColors(HDC);
 //     WINBOOL PlayMetaFileRecord(HDC, LPHANDLETABLE, LPMETARECORD, UINT);
 //     WINBOOL EnumMetaFile(HDC, HMETAFILE, ENUMMETAFILEPROC, LPARAM);
-//     HENHMETAFILE CloseEnhMetaFile(HDC);
-//     WINBOOL DeleteEnhMetaFile(HENHMETAFILE);
-//     WINBOOL EnumEnhMetaFile(HDC, HENHMETAFILE, ENHMETAFILEPROC, LPVOID, RECT*);
+    HENHMETAFILE CloseEnhMetaFile(HDC);
+    WINBOOL DeleteEnhMetaFile(HENHMETAFILE);
+    WINBOOL EnumEnhMetaFile(HDC, HENHMETAFILE, ENHMETAFILEPROC, LPVOID, RECT*);
 //     UINT GetEnhMetaFileHeader(HENHMETAFILE, UINT, LPENHMETAHEADER);
 //     UINT GetEnhMetaFilePaletteEntries(HENHMETAFILE, UINT, LPPALETTEENTRY);
 //     UINT GetWinMetaFileBits(HENHMETAFILE, UINT, LPBYTE, WINT, HDC);
@@ -3463,6 +3463,43 @@
   SCRIPT_PROPERTIES ***ppSp,
   int *piNumScripts
 );
+HRESULT ScriptGetCMap(
+  HDC hdc,
+  SCRIPT_CACHE* psc,
+  WCHAR* pwcInChars,
+  int cChars,
+  DWORD dwFlags,
+  WORD* pwOutGlyphs
+);
+HRESULT ScriptStringAnalyse(
+  HDC hdc,
+  void* pString,
+  int cString,
+  int cGlyphs,
+  int iCharset,
+  DWORD dwFlags,
+  int iReqWidth,
+  SCRIPT_CONTROL* psControl,
+  SCRIPT_STATE* psState,
+  int* piDx,
+  SCRIPT_TABDEF* pTabdef,
+  BYTE* pbInClass,
+  SCRIPT_STRING_ANALYSIS* pssa
+);
+HRESULT ScriptStringOut(
+  SCRIPT_STRING_ANALYSIS ssa, 
+  int iX, 
+  int iY, 
+  UINT uOptions, 
+  RECT* prc, 
+  int iMinSel, 
+  int iMaxSel, 
+  BOOL fDisabled 
+);
+HRESULT ScriptStringFree(
+  SCRIPT_STRING_ANALYSIS* pssa  
+);
+
 HRESULT ScriptItemize(
   WCHAR *pwcInChars,
   int cInChars,