--- a/dwt/internal/win32/WINAPI.d	Sat Jan 26 10:22:58 2008 +0100
+++ b/dwt/internal/win32/WINAPI.d	Sat Jan 26 14:06:27 2008 +0100
@@ -1,4 +1,4 @@
-/**
+/**
  * This module declared window APIs required by DWT but not in std.c.windows.windows,
  * The one in the std.c.windows.windows module are aliased
  */
@@ -7,8 +7,14 @@
 module dwt.internal.win32.WINAPI;
 
 public import dwt.internal.win32.WINTYPES;
-import tango.sys.win32.Types;
-import STDWIN = tango.sys.win32.UserGdi;
+import tango_sys_win32.Types;
+import STDWIN = tango_sys_win32.UserGdi;
+
+extern (Windows){
+int AddFontResourceExA(char* lpszFilename, int fl, void* pdv);
+int AddFontResourceExW(wchar* lpszFilename, int fl, void* pdv);
+
+}
 
 
 // Windows API
@@ -422,7 +428,7 @@
     UINT uEnable         // menu item flags
 );
 alias STDWIN.EnableScrollBar EnableScrollBar;
-BOOL EnableWindow(          
+BOOL EnableWindow(
     HWND hWnd,
     BOOL bEnable
 );
@@ -760,12 +766,12 @@
     LONG idItem,
     PMENUBARINFO pmbi
 );
-UINT GetMenuDefaultItem(          
+UINT GetMenuDefaultItem(
     HMENU hMenu,
     UINT fByPos,
     UINT gmdiFlags
 );
-BOOL GetMenuInfo(          
+BOOL GetMenuInfo(
     HMENU hmenu,
     LPCMENUINFO lpcmi
 );
@@ -783,10 +789,10 @@
     LPMENUITEMINFO lpmii
 );
 BOOL GetMenuItemRect(
-    HWND hWnd,       
-    HMENU hMenu,     
-    UINT uItem,      
-    LPRECT lprcItem  
+    HWND hWnd,
+    HMENU hMenu,
+    UINT uItem,
+    LPRECT lprcItem
 );
 alias STDWIN.GetMessageA GetMessageA;
 BOOL GetMessageW(
@@ -949,7 +955,7 @@
 );
 LONG GetWindowLongA(HWND hWnd, int nIndex);
 LONG GetWindowLongW(HWND hWnd, int nIndex);
-BOOL GetWindowPlacement(          
+BOOL GetWindowPlacement(
     HWND hWnd,
     WINDOWPLACEMENT *lpwndpl
 );
@@ -1063,28 +1069,28 @@
     LOGFONTW* lplf
 );
 LONG ImmGetCompositionStringA(
-    HIMC hIMC,      
-    DWORD dwIndex,  
-    LPVOID lpBuf,   
-    DWORD dwBufLen  
+    HIMC hIMC,
+    DWORD dwIndex,
+    LPVOID lpBuf,
+    DWORD dwBufLen
 );
 LONG ImmGetCompositionStringW(
-    HIMC hIMC,      
-    DWORD dwIndex,  
-    LPVOID lpBuf,   
-    DWORD dwBufLen  
+    HIMC hIMC,
+    DWORD dwIndex,
+    LPVOID lpBuf,
+    DWORD dwBufLen
 );
 HIMC ImmGetContext(
     HWND hWnd
 );
 BOOL ImmGetConversionStatus(
-    HIMC hIMC,             
-    LPDWORD lpfdwConversion,   
-    LPDWORD lpfdwSentence  
+    HIMC hIMC,
+    LPDWORD lpfdwConversion,
+    LPDWORD lpfdwSentence
 );
 HWND ImmGetDefaultIMEWnd(HWND hWnd );
 BOOL ImmGetOpenStatus(
-    HIMC hIMC  
+    HIMC hIMC
 );
 BOOL ImmReleaseContext(
     HWND hWnd,
@@ -1103,13 +1109,13 @@
     LPCOMPOSITIONFORM lpCompForm
 );
 BOOL ImmSetConversionStatus(
-    HIMC hIMC,             
-    DWORD fdwConversion,   
-    DWORD fdwSentence      
+    HIMC hIMC,
+    DWORD fdwConversion,
+    DWORD fdwSentence
 );
 BOOL ImmSetOpenStatus(
-    HIMC hIMC,  
-    BOOL fOpen  
+    HIMC hIMC,
+    BOOL fOpen
 );
 void InitCommonControls();
 BOOL InitCommonControlsEx(
@@ -1119,7 +1125,7 @@
   HMENU hMenu,      // handle to menu
   UINT uPosition,   // menu item that new menu item precedes
   UINT uFlags,      // menu item flags
-  UINT uIDNewItem,  // menu item identifier or handle to drop-down 
+  UINT uIDNewItem,  // menu item identifier or handle to drop-down
                     // menu or submenu
   LPCSTR lpNewItem // menu item content
 );
@@ -1127,22 +1133,22 @@
   HMENU hMenu,      // handle to menu
   UINT uPosition,   // menu item that new menu item precedes
   UINT uFlags,      // menu item flags
-  UINT uIDNewItem,  // menu item identifier or handle to drop-down 
+  UINT uIDNewItem,  // menu item identifier or handle to drop-down
                     // menu or submenu
   LPCWSTR lpNewItem // menu item content
 );
 
 BOOL InsertMenuItemA(
-  HMENU hMenu,          
-  UINT uItem,           
-  BOOL fByPosition,     
-  MENUITEMINFOA* lpmii  
+  HMENU hMenu,
+  UINT uItem,
+  BOOL fByPosition,
+  MENUITEMINFOA* lpmii
 );
 BOOL InsertMenuItemW(
-  HMENU hMenu,          
-  UINT uItem,           
-  BOOL fByPosition,     
-  MENUITEMINFOW* lpmii  
+  HMENU hMenu,
+  UINT uItem,
+  BOOL fByPosition,
+  MENUITEMINFOW* lpmii
 );
 BOOL IntersectRect(
     LPRECT lprcDst,        // pointer to structure for intersection
@@ -1208,13 +1214,13 @@
     HMODULE hModule, // resource-module handle
     HRSRC hResInfo   // resource handle
 );
-int LoadStringA(          
+int LoadStringA(
     HINSTANCE hInstance,
     UINT uID,
     LPSTR lpBuffer,
     int nBufferMax
 );
-int LoadStringW(          
+int LoadStringW(
     HINSTANCE hInstance,
     UINT uID,
     LPWSTR lpBuffer,
@@ -1273,7 +1279,7 @@
     LPVOID pvReserved  //Reserved; must be NULL.
 );
 void OleUninitialize();
-BOOL OpenClipboard(          
+BOOL OpenClipboard(
     HWND hWndNewOwner
 );
 void OutputDebugStringA(
@@ -1319,13 +1325,13 @@
     POINT *lppt,  // pointer to array containing endpoints
     int cPoints         // number of points in the array
 );
-BOOL PostMessageA(          
+BOOL PostMessageA(
     HWND hWnd,
     UINT Msg,
     WPARAM_I wParam,
     LPARAM lParam
 );
-BOOL PostMessageW(          
+BOOL PostMessageW(
     HWND hWnd,
     UINT Msg,
     WPARAM_I wParam,
@@ -1343,10 +1349,10 @@
     WPARAM_I wParam,
     LPARAM lParam
 );
-BOOL PrintDlgA(          
+BOOL PrintDlgA(
     LPPRINTDLGA lppd
 );
-BOOL PrintDlgW(          
+BOOL PrintDlgW(
     LPPRINTDLGW lppd
 );
 BOOL PtInRect(
@@ -1457,27 +1463,27 @@
   LPDWORD lpcbData
 );
 
-ATOM RegisterClassA(          
+ATOM RegisterClassA(
     WNDCLASSA *lpWndClass
 );
-ATOM RegisterClassW(          
+ATOM RegisterClassW(
     WNDCLASSW *lpWndClass
 );
-UINT RegisterClipboardFormatA(          
+UINT RegisterClipboardFormatA(
     LPCSTR lpszFormat
 );
-UINT RegisterClipboardFormatW(          
+UINT RegisterClipboardFormatW(
     LPCWSTR lpszFormat
 );
-UINT RegisterWindowMessageA(          
+UINT RegisterWindowMessageA(
     LPCSTR lpString
 );
-UINT RegisterWindowMessageW(          
+UINT RegisterWindowMessageW(
     LPCWSTR lpString
 );
 BOOL ReleaseCapture();
 alias STDWIN.ReleaseDC ReleaseDC;
-BOOL RemoveMenu(          
+BOOL RemoveMenu(
     HMENU hMenu,
     UINT uPosition,
     UINT uFlags
@@ -1495,24 +1501,24 @@
 void RtlMoveMemory(void* Destination, int Source, DWORD Length);
 void RtlMoveMemory(int Destination, int Source, DWORD Length);
 
-LPITEMIDLIST SHBrowseForFolderA(          
+LPITEMIDLIST SHBrowseForFolderA(
     BROWSEINFOA* lpbi
 );
-LPITEMIDLIST SHBrowseForFolderW(          
+LPITEMIDLIST SHBrowseForFolderW(
     BROWSEINFOW* lpbi
 );
 version(WinCE){
     int SHCreateMenuBar(SHMENUBARINFO* pmb);
 }
-HRESULT SHGetMalloc(          
+HRESULT SHGetMalloc(
 //  LPMALLOC *ppMalloc
     LPVOID   *ppMalloc
 );
-BOOL SHGetPathFromIDListA(          
+BOOL SHGetPathFromIDListA(
     LPCITEMIDLIST pidl,
     LPSTR pszPath
 );
-BOOL SHGetPathFromIDListW(          
+BOOL SHGetPathFromIDListW(
     LPCITEMIDLIST pidl,
     LPWSTR pszPath
 );
@@ -1527,36 +1533,36 @@
 alias STDWIN.SaveDC SaveDC;
 alias STDWIN.ScreenToClient ScreenToClient;
 
-// USP methods (Unicode Complex Script processor) 
-HRESULT ScriptBreak( 
-  WCHAR *pwcChars, 
-  int cChars, 
-  SCRIPT_ANALYSIS *psa, 
-  SCRIPT_LOGATTR *psla 
+// USP methods (Unicode Complex Script processor)
+HRESULT ScriptBreak(
+  WCHAR *pwcChars,
+  int cChars,
+  SCRIPT_ANALYSIS *psa,
+  SCRIPT_LOGATTR *psla
 );
-HRESULT ScriptCPtoX( 
-  int iCP, 
-  BOOL fTrailing, 
-  int cChars, 
-  int cGlyphs, 
-  WORD *pwLogClust, 
-  SCRIPT_VISATTR *psva, 
-  int *piAdvance, 
-  SCRIPT_ANALYSIS *psa, 
-  int *piX 
+HRESULT ScriptCPtoX(
+  int iCP,
+  BOOL fTrailing,
+  int cChars,
+  int cGlyphs,
+  WORD *pwLogClust,
+  SCRIPT_VISATTR *psva,
+  int *piAdvance,
+  SCRIPT_ANALYSIS *psa,
+  int *piX
 );
 HRESULT ScriptCacheGetHeight(
-  HDC hdc, 
-  SCRIPT_CACHE *psc, 
-  long *tmHeight 
+  HDC hdc,
+  SCRIPT_CACHE *psc,
+  long *tmHeight
 );
 HRESULT ScriptFreeCache(
-  SCRIPT_CACHE *psc 
+  SCRIPT_CACHE *psc
 );
 HRESULT ScriptGetFontProperties(
-  HDC hdc, 
-  SCRIPT_CACHE *psc, 
-  SCRIPT_FONTPROPERTIES *sfp 
+  HDC hdc,
+  SCRIPT_CACHE *psc,
+  SCRIPT_FONTPROPERTIES *sfp
 );
 HRESULT ScriptGetLogicalWidths(
   SCRIPT_ANALYSIS *psa,
@@ -1568,79 +1574,79 @@
   int *piDx
 );
 HRESULT ScriptGetProperties(
-  SCRIPT_PROPERTIES ***ppSp, 
-  int *piNumScripts 
+  SCRIPT_PROPERTIES ***ppSp,
+  int *piNumScripts
 );
 HRESULT ScriptItemize(
-  WCHAR *pwcInChars, 
-  int cInChars, 
-  int cMaxItems, 
-  SCRIPT_CONTROL *psControl, 
-  SCRIPT_STATE *psState, 
-  SCRIPT_ITEM *pItems, 
-  int *pcItems 
+  WCHAR *pwcInChars,
+  int cInChars,
+  int cMaxItems,
+  SCRIPT_CONTROL *psControl,
+  SCRIPT_STATE *psState,
+  SCRIPT_ITEM *pItems,
+  int *pcItems
 );
 HRESULT ScriptLayout(
-  int cRuns, 
-  BYTE *pbLevel, 
-  int *piVisualToLogical, 
-  int *piLogicalToVisual 
+  int cRuns,
+  BYTE *pbLevel,
+  int *piVisualToLogical,
+  int *piLogicalToVisual
 );
 HRESULT ScriptPlace(
-  HDC hdc, 
-  SCRIPT_CACHE *psc, 
-  WORD *pwGlyphs, 
-  int cGlyphs, 
-  SCRIPT_VISATTR *psva, 
-  SCRIPT_ANALYSIS *psa, 
-  int *piAdvance, 
-  GOFFSET *pGoffset, 
-  ABC *pABC 
+  HDC hdc,
+  SCRIPT_CACHE *psc,
+  WORD *pwGlyphs,
+  int cGlyphs,
+  SCRIPT_VISATTR *psva,
+  SCRIPT_ANALYSIS *psa,
+  int *piAdvance,
+  GOFFSET *pGoffset,
+  ABC *pABC
 );
 HRESULT ScriptShape(
-  HDC hdc,              // in   
+  HDC hdc,              // in
   SCRIPT_CACHE *psc,    // in/out
-  WCHAR *pwcChars,      //  
-  int cChars, 
-  int cMaxGlyphs, 
-  SCRIPT_ANALYSIS *psa, 
-  WORD *pwOutGlyphs, 
-  WORD *pwLogClust, 
-  SCRIPT_VISATTR *psva, 
-  int *pcGlyphs 
+  WCHAR *pwcChars,      //
+  int cChars,
+  int cMaxGlyphs,
+  SCRIPT_ANALYSIS *psa,
+  WORD *pwOutGlyphs,
+  WORD *pwLogClust,
+  SCRIPT_VISATTR *psva,
+  int *pcGlyphs
 );
 HRESULT ScriptTextOut(
   HDC hdc,              // const
-  SCRIPT_CACHE *psc, 
-  int x, 
-  int y, 
-  UINT fuOptions, 
+  SCRIPT_CACHE *psc,
+  int x,
+  int y,
+  UINT fuOptions,
   RECT *lprc,           // const
   SCRIPT_ANALYSIS *psa, // const
   WCHAR *pwcReserved,   // const
-  int iReserved, 
-  WORD *pwGlyphs,       // 
-  int cGlyphs, 
+  int iReserved,
+  WORD *pwGlyphs,       //
+  int cGlyphs,
   int *piAdvance,       // const
   int *piJustify,       // const
   GOFFSET *pGoffset     // const
 );
 HRESULT ScriptXtoCP(
-  int iX, 
-  int cChars, 
-  int cGlyphs, 
-  WORD *pwLogClust,         // 
-  SCRIPT_VISATTR *psva,     //  
-  int *piAdvance,           //      
-  SCRIPT_ANALYSIS *psa,     // 
-  int *piCP, 
-  int *piTrailing 
+  int iX,
+  int cChars,
+  int cGlyphs,
+  WORD *pwLogClust,         //
+  SCRIPT_VISATTR *psva,     //
+  int *piAdvance,           //
+  SCRIPT_ANALYSIS *psa,     //
+  int *piCP,
+  int *piTrailing
 );
 alias STDWIN.ScrollWindowEx ScrollWindowEx;
 alias STDWIN.SelectClipRgn SelectClipRgn;
 alias STDWIN.SelectObject SelectObject;
 alias STDWIN.SelectPalette SelectPalette;
-UINT SendInput(          
+UINT SendInput(
     UINT nInputs,
     LPINPUT pInputs,
     int cbSize
@@ -1659,14 +1665,14 @@
 alias STDWIN.SetActiveWindow SetActiveWindow;
 alias STDWIN.SetBkColor SetBkColor;
 alias STDWIN.SetBkMode SetBkMode;
-HWND SetCapture(          
+HWND SetCapture(
     HWND hWnd
 );
-BOOL SetCaretPos(          
+BOOL SetCaretPos(
     int X,
     int Y
 );
-HANDLE SetClipboardData(          
+HANDLE SetClipboardData(
     UINT uFormat,
     HANDLE hMem
 );
@@ -1693,26 +1699,26 @@
     HDC hdc,             // handle to DC
     DWORD dwLayout       // layout options
 );
-BOOL SetMenu(          
+BOOL SetMenu(
     HWND hWnd,
     HMENU hMenu
 );
-BOOL SetMenuDefaultItem(         
+BOOL SetMenuDefaultItem(
     HMENU hMenu,
     UINT uItem,
     UINT fByPos
 );
-BOOL SetMenuInfo(          
+BOOL SetMenuInfo(
     HMENU hmenu,
     LPCMENUINFO lpcmi
 );
-BOOL SetMenuItemInfoA(          
+BOOL SetMenuItemInfoA(
     HMENU hMenu,
     UINT uItem,
     BOOL fByPosition,
     LPMENUITEMINFOA lpmii
 );
-BOOL SetMenuItemInfoW(          
+BOOL SetMenuItemInfoW(
     HMENU hMenu,
     UINT uItem,
     BOOL fByPosition,
@@ -1724,7 +1730,7 @@
     UINT cEntries,             // number of entries to set
     PALETTEENTRY *lppe              // array of palette entries
 );
-HWND SetParent(          
+HWND SetParent(
     HWND hWndChild,
     HWND hWndNewParent
 );
@@ -1738,7 +1744,7 @@
     int yBottom  // bottom side
 );
 alias STDWIN.SetRectRgn SetRectRgn;
-int SetScrollInfo(          
+int SetScrollInfo(
     HWND hwnd,
     int fnBar,
     LPCSCROLLINFO lpsi,
@@ -1747,23 +1753,23 @@
 alias STDWIN.SetStretchBltMode SetStretchBltMode;
 alias STDWIN.SetTextAlign SetTextAlign;
 alias STDWIN.SetTextColor SetTextColor;
-UINT_PTR SetTimer(          
+UINT_PTR SetTimer(
     HWND hWnd,
     UINT_PTR nIDEvent,
     UINT uElapse,
     TIMERPROC_I lpTimerFunc
 );
-LONG SetWindowLongA( 
+LONG SetWindowLongA(
     HWND hWnd,
     int nIndex,
     LONG dwNewLong
 );
-LONG SetWindowLongW( 
+LONG SetWindowLongW(
     HWND hWnd,
     int nIndex,
     LONG dwNewLong
 );
-BOOL SetWindowPlacement(          
+BOOL SetWindowPlacement(
     HWND hWnd,
     WINDOWPLACEMENT *lpwndpl
 );
@@ -1777,11 +1783,11 @@
     UINT uFlags            // window-positioning flags
 );
 alias STDWIN.SetWindowRgn SetWindowRgn;
-BOOL SetWindowTextA(          
+BOOL SetWindowTextA(
     HWND hWnd,
     LPCSTR lpString
 );
-BOOL SetWindowTextW(          
+BOOL SetWindowTextW(
     HWND hWnd,
     LPCWSTR lpString
 );
@@ -1797,22 +1803,22 @@
     HINSTANCE hMod,    // handle to application instance
     DWORD dwThreadId   // identity of thread to install hook for
 );
-BOOL ShellExecuteExA(          
+BOOL ShellExecuteExA(
     LPSHELLEXECUTEINFOA lpExecInfo
 );
-BOOL ShellExecuteExW(          
+BOOL ShellExecuteExW(
     LPSHELLEXECUTEINFOW lpExecInfo
 );
-BOOL Shell_NotifyIconA( 
+BOOL Shell_NotifyIconA(
     DWORD dwMessage,
     PNOTIFYICONDATAA lpdata
 );
-BOOL Shell_NotifyIconW( 
+BOOL Shell_NotifyIconW(
     DWORD dwMessage,
     PNOTIFYICONDATAW lpdata
 );
 alias STDWIN.ShowCaret ShowCaret;
-BOOL ShowOwnedPopups(          
+BOOL ShowOwnedPopups(
     HWND hWnd,
     BOOL fShow
 );
@@ -1855,14 +1861,14 @@
     PVOID pvParam,
     UINT fWinIni
 );
-int ToAscii(          
+int ToAscii(
     UINT uVirtKey,
     UINT uScanCode,
     PBYTE lpKeyState,
     LPWORD lpChar,
     UINT uFlags
 );
-int ToUnicode(          
+int ToUnicode(
     UINT wVirtKey,
     UINT wScanCode,
     PBYTE lpKeyState,
@@ -1885,11 +1891,11 @@
     LPMSG lpMsg        // address of structure with message
 );
 UINT TranslateCharsetInfo(
-    DWORD *lpSrc,     
-    LPCHARSETINFO lpCs,   
-    DWORD dwFlags         
+    DWORD *lpSrc,
+    LPCHARSETINFO lpCs,
+    DWORD dwFlags
 );
-BOOL TranslateMDISysAccel(          
+BOOL TranslateMDISysAccel(
     HWND hWndClient,
     LPMSG lpMsg
 );
@@ -1899,16 +1905,16 @@
 version(WinCE)
 {
 BOOL TransparentImage(
-HDC hdcDest, 
-LONG DstX, 
-LONG DstY, 
-LONG DstCx, 
+HDC hdcDest,
+LONG DstX,
+LONG DstY,
+LONG DstCx,
 LONG DstCy,
-HANDLE hSrc, 
-LONG SrcX, 
-LONG SrcY, 
-LONG SrcCx, 
-LONG SrcCy, 
+HANDLE hSrc,
+LONG SrcX,
+LONG SrcY,
+LONG SrcCx,
+LONG SrcCy,
 COLORREF TransparentColor
 );
 }