--- a/dwt/internal/win32/OS.d	Mon Feb 11 22:30:50 2008 -0800
+++ b/dwt/internal/win32/OS.d	Tue Feb 12 21:25:00 2008 +0100
@@ -3971,7 +3971,7 @@
 // Unicode/Ansi alias
 version(ANSI) {
     alias WINAPI.AddFontResourceExA AddFontResourceEx;
-    alias STDWIN.CallWindowProcA CallWindowProc;
+    alias WINAPI.CallWindowProcA CallWindowProc;
     alias WINAPI.CharLowerA CharLower;
     alias WINAPI.CharUpperA CharUpper;
     alias WINAPI.ChooseColorA ChooseColor;
@@ -4004,7 +4004,7 @@
     alias WINAPI.GetCharWidthA GetCharWidth;
     alias WINAPI.GetCharacterPlacementA GetCharacterPlacement;
     alias WINAPI.GetClassInfoA GetClassInfo;
-    alias STDWIN.GetClassNameA GetClassName;
+    alias WINAPI.GetClassNameA GetClassName;
     alias WINAPI.GetClipboardFormatNameA GetClipboardFormatName;
     alias WINAPI.GetKeyNameTextA GetKeyNameText;
     alias WINAPI.GetLocaleInfoA GetLocaleInfo;
@@ -4016,16 +4016,16 @@
     alias WINAPI.GetObjectA GetObject;
     alias WINAPI.GetOpenFileNameA GetOpenFileName;
     alias WINAPI.GetProfileStringA _GetProfileString;
-    alias STDWIN.GetPropA GetProp;
+    alias WINAPI.GetPropA GetProp;
     alias WINAPI.GetSaveFileNameA GetSaveFileName;
-    alias STDWIN.GetStartupInfoA GetStartupInfo;
+    alias WINAPI.GetStartupInfoA GetStartupInfo;
     alias WINAPI.GetTextExtentPoint32A GetTextExtentPoint32;
     alias WINAPI.GetTextMetricsA GetTextMetrics;
     alias WINAPI.GetVersionExA GetVersionEx;
     alias WINAPI.GetWindowLongA GetWindowLong;
     alias WINAPI.GetWindowTextA _GetWindowText;
     alias WINAPI.GetWindowTextLengthA GetWindowTextLength;
-    alias STDWIN.GlobalAddAtomA GlobalAddAtom;
+    alias WINAPI.GlobalAddAtomA GlobalAddAtom;
 //     alias WINAPI.ImmGetCompositionFontA ImmGetCompositionFont;
 //     alias WINAPI.ImmGetCompositionStringA ImmGetCompositionString;
 //     alias WINAPI.ImmSetCompositionFontA ImmSetCompositionFont;
@@ -4052,12 +4052,12 @@
     alias WINAPI.RegisterClipboardFormatA RegisterClipboardFormat;
     alias WINAPI.RegOpenKeyExA RegOpenKeyEx;
     alias WINAPI.RegisterWindowMessageA RegisterWindowMessage;
-    alias STDWIN.RemovePropA RemoveProp;
+    alias WINAPI.RemovePropA RemoveProp;
     alias WINAPI.SHBrowseForFolderA SHBrowseForFolder;
     alias WINAPI.SHGetPathFromIDListA SHGetPathFromIDList;
     alias WINAPI.SendMessageA SendMessage;
     alias WINAPI.SetMenuItemInfoA SetMenuItemInfo;
-    alias STDWIN.SetPropA SetProp;
+    alias WINAPI.SetPropA SetProp;
     alias WINAPI.SetWindowLongA SetWindowLong;
     alias WINAPI.SetWindowTextA SetWindowText;
     alias WINAPI.SetWindowsHookExA SetWindowsHookEx;
@@ -4070,7 +4070,7 @@
     alias WINAPI.VkKeyScanA VkKeyScan;
 }else{
     alias WINAPI.AddFontResourceExW AddFontResourceEx;
-    alias STDWIN.CallWindowProcW CallWindowProc;
+    alias WINAPI.CallWindowProcW CallWindowProc;
     alias WINAPI.CharLowerW CharLower;
     alias WINAPI.CharUpperW CharUpper;
     alias WINAPI.ChooseColorW ChooseColor;
@@ -4103,7 +4103,7 @@
     alias WINAPI.GetCharWidthW GetCharWidth;
     alias WINAPI.GetCharacterPlacementW GetCharacterPlacement;
     alias WINAPI.GetClassInfoW GetClassInfo;
-    alias STDWIN.GetClassNameW GetClassName;
+    alias WINAPI.GetClassNameW GetClassName;
     alias WINAPI.GetClipboardFormatNameW GetClipboardFormatName;
     alias WINAPI.GetKeyNameTextW GetKeyNameText;
     alias WINAPI.GetLocaleInfoW GetLocaleInfo;
@@ -4115,16 +4115,16 @@
     alias WINAPI.GetObjectW GetObject;
     alias WINAPI.GetOpenFileNameW GetOpenFileName;
     alias WINAPI.GetProfileStringW _GetProfileString;
-    alias STDWIN.GetPropW GetProp;
+    alias WINAPI.GetPropW GetProp;
     alias WINAPI.GetSaveFileNameW GetSaveFileName;
-    alias STDWIN.GetStartupInfoW GetStartupInfo;
+    alias WINAPI.GetStartupInfoW GetStartupInfo;
     alias WINAPI.GetTextExtentPoint32W GetTextExtentPoint32;
     alias WINAPI.GetTextMetricsW GetTextMetrics;
     alias WINAPI.GetVersionExW GetVersionEx;
     alias WINAPI.GetWindowLongW GetWindowLong;
     alias WINAPI.GetWindowTextW _GetWindowText;
     alias WINAPI.GetWindowTextLengthW GetWindowTextLength;
-    alias STDWIN.GlobalAddAtomW GlobalAddAtom;
+    alias WINAPI.GlobalAddAtomW GlobalAddAtom;
 //     alias WINAPI.ImmGetCompositionFontW ImmGetCompositionFont;
 //     alias WINAPI.ImmGetCompositionStringW ImmGetCompositionString;
 //     alias WINAPI.ImmSetCompositionFontW ImmSetCompositionFont;
@@ -4151,7 +4151,7 @@
     alias WINAPI.RegisterClipboardFormatW RegisterClipboardFormat;
     alias WINAPI.RegOpenKeyExW RegOpenKeyEx;
     alias WINAPI.RegisterWindowMessageW RegisterWindowMessage;
-    alias STDWIN.RemovePropW RemoveProp;
+    alias WINAPI.RemovePropW RemoveProp;
     alias WINAPI.SHBrowseForFolderW SHBrowseForFolder;
     alias WINAPI.SHGetPathFromIDListW SHGetPathFromIDList;
     alias WINAPI.SendMessageW SendMessage;
@@ -4159,7 +4159,7 @@
     alias WINAPI.SetWindowLongW SetWindowLong;
     alias WINAPI.SetWindowTextW SetWindowText;
     alias WINAPI.SetWindowsHookExW SetWindowsHookEx;
-    alias STDWIN.SetPropW SetProp;
+    alias WINAPI.SetPropW SetProp;
     alias WINAPI.ShellExecuteExW ShellExecuteEx;
     alias WINAPI.Shell_NotifyIconW Shell_NotifyIcon;
     alias WINAPI.StartDocW StartDoc;
@@ -4391,7 +4391,7 @@
 alias WINAPI.Arc Arc;
 alias WINAPI.BeginDeferWindowPos BeginDeferWindowPos;
 alias WINAPI.BeginPaint BeginPaint;
-alias STDWIN.BeginPath BeginPath;
+alias WINAPI.BeginPath BeginPath;
 alias WINAPI.BitBlt BitBlt;
 alias WINAPI.BringWindowToTop BringWindowToTop;
 alias WINAPI.CallNextHookEx CallNextHookEx;
@@ -4489,7 +4489,7 @@
 alias WINAPI.EndDoc EndDoc;
 alias WINAPI.EndPage EndPage;
 alias WINAPI.EndPaint EndPaint;
-alias STDWIN.EndPath EndPath;
+alias WINAPI.EndPath EndPath;
 alias WINAPI.EnumDisplayMonitors EnumDisplayMonitors;
 alias WINAPI.EnumFontFamiliesA EnumFontFamiliesA;
 alias WINAPI.EnumFontFamiliesExA EnumFontFamiliesExA;
@@ -4501,15 +4501,15 @@
 alias WINAPI.EnumSystemLocalesW EnumSystemLocalesW;
 alias WINAPI.EqualRect EqualRect;
 alias WINAPI.EqualRgn EqualRgn;
-alias STDWIN.ExcludeClipRect ExcludeClipRect;
+alias WINAPI.ExcludeClipRect ExcludeClipRect;
 alias WINAPI.ExpandEnvironmentStringsA ExpandEnvironmentStringsA;
 alias WINAPI.ExpandEnvironmentStringsW ExpandEnvironmentStringsW;
 alias WINAPI.ExtTextOutA ExtTextOutA;
 alias WINAPI.ExtTextOutW ExtTextOutW;
 alias WINAPI.ExtractIconExA ExtractIconExA;
 alias WINAPI.ExtractIconExW ExtractIconExW;
-alias STDWIN.ExtCreatePen ExtCreatePen;
-alias STDWIN.ExtCreateRegion ExtCreateRegion;
+alias WINAPI.ExtCreatePen ExtCreatePen;
+alias WINAPI.ExtCreateRegion ExtCreateRegion;
 alias WINAPI.FillRect FillRect;
 alias WINAPI.FindResourceA FindResourceA;
 alias WINAPI.FindResourceW FindResourceW;
@@ -4520,7 +4520,7 @@
 alias WINAPI.FreeLibrary FreeLibrary;
 alias WINAPI.GdiSetBatchLimit GdiSetBatchLimit;
 alias WINAPI.GetACP GetACP;
-alias STDWIN.GetAsyncKeyState GetAsyncKeyState;
+alias WINAPI.GetAsyncKeyState GetAsyncKeyState;
 alias WINAPI.GetActiveWindow GetActiveWindow;
 alias WINAPI.GetBkColor GetBkColor;
 alias WINAPI.GetCapture GetCapture;
@@ -4580,7 +4580,7 @@
 alias WINAPI.GetMessageA GetMessageA;
 alias WINAPI.GetMessagePos GetMessagePos;
 alias WINAPI.GetMessageTime GetMessageTime;
-alias STDWIN.GetMetaRgn GetMetaRgn;
+alias WINAPI.GetMetaRgn GetMetaRgn;
 alias WINAPI.GetMessageW GetMessageW;
 alias WINAPI.GetModuleFileNameA GetModuleFileNameA;
 alias WINAPI.GetModuleFileNameW GetModuleFileNameW;
@@ -4589,7 +4589,7 @@
 alias WINAPI.GetMonitorInfoA GetMonitorInfoA;
 alias WINAPI.GetMonitorInfoW GetMonitorInfoW;
 alias WINAPI.GetNearestPaletteIndex GetNearestPaletteIndex;
-alias STDWIN.GetPath GetPath;
+alias WINAPI.GetPath GetPath;
 alias WINAPI.GetObjectA GetObjectA;
 alias WINAPI.GetObjectW GetObjectW;
 alias WINAPI.GetOpenFileNameA GetOpenFileNameA;
@@ -4597,7 +4597,7 @@
 alias WINAPI.GetPaletteEntries GetPaletteEntries;
 alias WINAPI.GetParent GetParent;
 alias WINAPI.GetPixel GetPixel;
-alias STDWIN.GetPolyFillMode GetPolyFillMode;
+alias WINAPI.GetPolyFillMode GetPolyFillMode;
 alias WINAPI.GetProcAddress GetProcAddress;
 alias WINAPI.GetProcessHeap GetProcessHeap;
 alias WINAPI.GetProfileStringA GetProfileStringA;
@@ -4629,8 +4629,8 @@
 alias WINAPI.GetVersionExA GetVersionExA;
 alias WINAPI.GetVersionExW GetVersionExW;
 alias WINAPI.GetWindow GetWindow;
-alias STDWIN.GetWindowDC GetWindowDC;
-alias STDWIN.GetWindowOrgEx GetWindowOrgEx;
+alias WINAPI.GetWindowDC GetWindowDC;
+alias WINAPI.GetWindowOrgEx GetWindowOrgEx;
 alias WINAPI.GetWindowLongA GetWindowLongA;
 alias WINAPI.GetWindowLongW GetWindowLongW;
 alias WINAPI.GetWindowPlacement GetWindowPlacement;
@@ -4724,7 +4724,7 @@
 alias WINAPI.MsgWaitForMultipleObjectsEx MsgWaitForMultipleObjectsEx;
 alias WINAPI.MultiByteToWideChar MultiByteToWideChar;
 alias WINAPI.NotifyWinEvent NotifyWinEvent;
-alias STDWIN.OffsetRect OffsetRect;
+alias WINAPI.OffsetRect OffsetRect;
 alias WINAPI.OffsetRgn OffsetRgn;
 //alias WINAPI.OleInitialize OleInitialize;
 //alias WINAPI.OleUninitialize OleUninitialize;
@@ -4816,7 +4816,7 @@
 alias WINAPI.SetActiveWindow SetActiveWindow;
 alias WINAPI.SetBkColor SetBkColor;
 alias WINAPI.SetBkMode SetBkMode;
-alias STDWIN.SetBrushOrgEx SetBrushOrgEx;
+alias WINAPI.SetBrushOrgEx SetBrushOrgEx;
 alias WINAPI.SetCapture SetCapture;
 alias WINAPI.SetCaretPos SetCaretPos;
 alias WINAPI.SetClipboardData SetClipboardData;
@@ -4827,7 +4827,7 @@
 alias WINAPI.SetEvent SetEvent;
 alias WINAPI.SetFocus SetFocus;
 alias WINAPI.SetForegroundWindow SetForegroundWindow;
-alias STDWIN.SetGraphicsMode SetGraphicsMode;
+alias WINAPI.SetGraphicsMode SetGraphicsMode;
 alias WINAPI.SetLastError SetLastError;
 alias WINAPI.SetLayout SetLayout;
 alias WINAPI.SetMenu SetMenu;
@@ -4835,11 +4835,11 @@
 alias WINAPI.SetMenuInfo SetMenuInfo;
 alias WINAPI.SetMenuItemInfoA SetMenuItemInfoA;
 alias WINAPI.SetMenuItemInfoW SetMenuItemInfoW;
-alias STDWIN.SetMetaRgn SetMetaRgn;
+alias WINAPI.SetMetaRgn SetMetaRgn;
 alias WINAPI.SetPaletteEntries SetPaletteEntries;
 alias WINAPI.SetParent SetParent;
 alias WINAPI.SetPixel SetPixel;
-alias STDWIN.SetPolyFillMode SetPolyFillMode;
+alias WINAPI.SetPolyFillMode SetPolyFillMode;
 alias WINAPI.SetROP2 SetROP2;
 alias WINAPI.SetRect SetRect;
 alias WINAPI.SetRectRgn SetRectRgn;
@@ -4850,11 +4850,11 @@
 alias WINAPI.SetTimer SetTimer;
 alias WINAPI.SetWindowLongA SetWindowLongA;
 alias WINAPI.SetWindowLongW SetWindowLongW;
-alias STDWIN.SetWindowOrgEx SetWindowOrgEx;
+alias WINAPI.SetWindowOrgEx SetWindowOrgEx;
 alias WINAPI.SetWindowPlacement SetWindowPlacement;
 alias WINAPI.SetWindowPos SetWindowPos;
 alias WINAPI.SetWindowRgn SetWindowRgn;
-alias STDWIN.SetWorldTransform SetWorldTransform;
+alias WINAPI.SetWorldTransform SetWorldTransform;
 alias WINAPI.SetWindowTextA SetWindowTextA;
 alias WINAPI.SetWindowTextW SetWindowTextW;
 alias WINAPI.SetWindowsHookExA SetWindowsHookExA;
@@ -5071,7 +5071,7 @@
 
 } // END of OS
 
-private import tango_sys_win32.CodePage;
+import tango.sys.win32.CodePage : CodePage;
 private import tango.text.convert.Utf;
 private import tango.stdc.stringz;
 
@@ -5108,7 +5108,7 @@
         }
         char[] dst;
         dst.length = sc.length;
-        return toStringz( tango_sys_win32.CodePage.CodePage.into( sc, dst ));
+        return toStringz( tango.sys.win32.CodePage.CodePage.into( sc, dst ));
     }catch(Exception e){
         // do nothing
         ret = "";