Mercurial > projects > dwt-win

diff dwt/internal/win32/OS.d @ 253:fbb9174f2a2c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Reuse the tango windows api
author Frank Benoit <benoit@tionex.de>
date Fri, 11 Jul 2008 23:01:25 +0200
parents b3dbd786541a
children f617e6ba3055
line wrap: on
line diff
--- a/dwt/internal/win32/OS.d	Sun Jul 06 18:45:41 2008 +0200
+++ b/dwt/internal/win32/OS.d	Fri Jul 11 23:01:25 2008 +0200
@@ -13,8 +13,17 @@
 module dwt.internal.win32.OS;
 
 public import dwt.internal.win32.WINTYPES;
-private import dwt.internal.win32.WINAPI;
-alias dwt.internal.win32.WINAPI WINAPI;
+version(TANGOSVN){
+    private import dwt.internal.win32.WINAPI;
+    alias dwt.internal.win32.WINAPI DWTWINAPI;
+    private import tango.sys.win32.UserGdi;
+    alias tango.sys.win32.UserGdi WINAPI;
+}
+else{
+    private import dwt.internal.win32.WINAPI;
+    alias dwt.internal.win32.WINAPI WINAPI;
+    alias dwt.internal.win32.WINAPI USERGDIAPI;
+}
 
 import dwt.internal.C;
 import dwt.internal.Library;
@@ -2433,8 +2442,8 @@
     alias WINAPI.UnregisterClassA UnregisterClass;
     alias WINAPI.VkKeyScanA VkKeyScan;
 }else{
-    alias WINAPI.AddFontResourceExW AddFontResourceEx;
-    alias WINAPI.AssocQueryStringW AssocQueryString;
+    alias DWTWINAPI.AddFontResourceExW AddFontResourceEx;
+    alias DWTWINAPI.AssocQueryStringW AssocQueryString;
     alias WINAPI.CallWindowProcW CallWindowProc;
     alias WINAPI.CharLowerW CharLower;
     alias WINAPI.CharUpperW CharUpper;
@@ -2457,11 +2466,11 @@
     alias WINAPI.DrawTextW DrawText;
     alias WINAPI.EnumFontFamiliesExW EnumFontFamiliesEx;
     alias WINAPI.EnumFontFamiliesW EnumFontFamilies;
-    alias WINAPI.EnumSystemLanguageGroupsW EnumSystemLanguageGroups;
+    alias DWTWINAPI.EnumSystemLanguageGroupsW EnumSystemLanguageGroups;
     alias WINAPI.EnumSystemLocalesW EnumSystemLocales;
     alias WINAPI.ExpandEnvironmentStringsW ExpandEnvironmentStrings;
     alias WINAPI.ExtTextOutW ExtTextOut;
-    alias WINAPI.ExtractIconExW ExtractIconEx;
+    alias DWTWINAPI.ExtractIconExW ExtractIconEx;
     alias WINAPI.FindResourceW FindResource;
     alias WINAPI.FindWindowW FindWindow;
     alias WINAPI.FormatMessageW FormatMessage;
@@ -2479,7 +2488,7 @@
     alias WINAPI.GetMessageW GetMessage;
     alias WINAPI.GetModuleFileNameW GetModuleFileName;
     alias WINAPI.GetModuleHandleW GetModuleHandle;
-    alias WINAPI.GetMonitorInfoW GetMonitorInfo;
+    alias DWTWINAPI.GetMonitorInfoW GetMonitorInfo;
     alias WINAPI.GetObjectW GetObject;
     alias WINAPI.GetOpenFileNameW GetOpenFileName;
     alias WINAPI.GetOutlineTextMetricsW GetOutlineTextMetrics;
@@ -2523,8 +2532,8 @@
     alias WINAPI.RegOpenKeyExW RegOpenKeyEx;
     alias WINAPI.RegisterWindowMessageW RegisterWindowMessage;
     alias WINAPI.RemovePropW RemoveProp;
-    alias WINAPI.SHBrowseForFolderW SHBrowseForFolder;
-    alias WINAPI.SHGetPathFromIDListW SHGetPathFromIDList;
+    alias DWTWINAPI.SHBrowseForFolderW SHBrowseForFolder;
+    alias DWTWINAPI.SHGetPathFromIDListW SHGetPathFromIDList;
     alias WINAPI.SendMessageW SendMessage;
     alias WINAPI.SetMenuItemInfoW SetMenuItemInfo;
     alias WINAPI.SetWindowLongW SetWindowLong;
@@ -2532,8 +2541,8 @@
     alias WINAPI.SetWindowTextW SetWindowText;
     alias WINAPI.SetWindowsHookExW SetWindowsHookEx;
     alias WINAPI.SetPropW SetProp;
-    alias WINAPI.ShellExecuteExW ShellExecuteEx;
-    alias WINAPI.Shell_NotifyIconW Shell_NotifyIcon;
+    alias DWTWINAPI.ShellExecuteExW ShellExecuteEx;
+    alias DWTWINAPI.Shell_NotifyIconW Shell_NotifyIcon;
     alias WINAPI.StartDocW StartDoc;
     alias WINAPI.SystemParametersInfoW SystemParametersInfo;
     alias WINAPI.TranslateAcceleratorW TranslateAccelerator;
@@ -2812,7 +2821,7 @@
 alias WINAPI.AbortDoc AbortDoc;
 alias WINAPI.ActivateKeyboardLayout ActivateKeyboardLayout;
 alias WINAPI.AdjustWindowRectEx AdjustWindowRectEx;
-alias WINAPI.AlphaBlend AlphaBlend;
+alias DWTWINAPI.AlphaBlend AlphaBlend;
 alias WINAPI.Arc Arc;
 alias WINAPI.BeginDeferWindowPos BeginDeferWindowPos;
 alias WINAPI.BeginPaint BeginPaint;
@@ -2837,7 +2846,7 @@
 alias WINAPI.CloseEnhMetaFile CloseEnhMetaFile;
 alias WINAPI.CloseMetaFile CloseMetaFile;
 alias WINAPI.CombineRgn CombineRgn;
-alias WINAPI.CommDlgExtendedError CommDlgExtendedError;
+alias DWTWINAPI.CommDlgExtendedError CommDlgExtendedError;
 
 version(WinCE){
 alias WINAPI.CommandBar_AddAdornments CommandBar_AddAdornments;
@@ -2924,19 +2933,19 @@
 alias WINAPI.EnumFontFamiliesExA EnumFontFamiliesExA;
 alias WINAPI.EnumFontFamiliesExW EnumFontFamiliesExW;
 alias WINAPI.EnumFontFamiliesW EnumFontFamiliesW;
-alias WINAPI.EnumSystemLanguageGroupsA EnumSystemLanguageGroupsA;
-alias WINAPI.EnumSystemLanguageGroupsW EnumSystemLanguageGroupsW;
+alias DWTWINAPI.EnumSystemLanguageGroupsA EnumSystemLanguageGroupsA;
+alias DWTWINAPI.EnumSystemLanguageGroupsW EnumSystemLanguageGroupsW;
 alias WINAPI.EnumSystemLocalesA EnumSystemLocalesA;
-alias WINAPI.EnumSystemLocalesW EnumSystemLocalesW;
-alias WINAPI.EqualRect EqualRect;
+alias DWTWINAPI.EnumSystemLocalesW EnumSystemLocalesW;
+alias DWTWINAPI.EqualRect EqualRect;
 alias WINAPI.EqualRgn EqualRgn;
 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 DWTWINAPI.ExtractIconExA ExtractIconExA;
+alias DWTWINAPI.ExtractIconExW ExtractIconExW;
 alias WINAPI.ExtCreatePen ExtCreatePen;
 alias WINAPI.ExtCreateRegion ExtCreateRegion;
 alias WINAPI.FillRect FillRect;
@@ -2968,7 +2977,7 @@
 alias WINAPI.GetClipboardData GetClipboardData;
 alias WINAPI.GetClipboardFormatNameA GetClipboardFormatNameA;
 alias WINAPI.GetClipboardFormatNameW GetClipboardFormatNameW;
-alias WINAPI.GetComboBoxInfo GetComboBoxInfo;
+alias DWTWINAPI.GetComboBoxInfo GetComboBoxInfo;
 alias WINAPI.GetCurrentObject GetCurrentObject;
 alias WINAPI.GetCurrentProcessId GetCurrentProcessId;
 alias WINAPI.GetCurrentThreadId GetCurrentThreadId;
@@ -2985,7 +2994,7 @@
 alias WINAPI.GetDoubleClickTime GetDoubleClickTime;
 alias WINAPI.GetFocus GetFocus;
 alias WINAPI.GetFontLanguageInfo GetFontLanguageInfo;
-alias WINAPI.GetGUIThreadInfo GetGUIThreadInfo;
+alias DWTWINAPI.GetGUIThreadInfo GetGUIThreadInfo;
 alias WINAPI.GetIconInfo GetIconInfo;
 alias WINAPI.GetKeyNameTextA GetKeyNameTextA;
 alias WINAPI.GetKeyNameTextW GetKeyNameTextW;
@@ -2995,13 +3004,13 @@
 alias WINAPI.GetKeyboardState GetKeyboardState;
 alias WINAPI.GetLastActivePopup GetLastActivePopup;
 alias WINAPI.GetLastError GetLastError;
-alias WINAPI.GetLayout GetLayout;
+alias DWTWINAPI.GetLayout GetLayout;
 alias WINAPI.GetLocaleInfoA GetLocaleInfoA;
 alias WINAPI.GetLocaleInfoW GetLocaleInfoW;
 alias WINAPI.GetMenu GetMenu;
-alias WINAPI.GetMenuBarInfo GetMenuBarInfo;
+alias DWTWINAPI.GetMenuBarInfo GetMenuBarInfo;
 alias WINAPI.GetMenuDefaultItem GetMenuDefaultItem;
-alias WINAPI.GetMenuInfo GetMenuInfo;
+alias DWTWINAPI.GetMenuInfo GetMenuInfo;
 alias WINAPI.GetMenuItemCount GetMenuItemCount;
 alias WINAPI.GetMenuItemInfoA GetMenuItemInfoA;
 alias WINAPI.GetMenuItemInfoW GetMenuItemInfoW;
@@ -3016,7 +3025,7 @@
 alias WINAPI.GetModuleHandleA GetModuleHandleA;
 alias WINAPI.GetModuleHandleW GetModuleHandleW;
 alias WINAPI.GetMonitorInfoA GetMonitorInfoA;
-alias WINAPI.GetMonitorInfoW GetMonitorInfoW;
+alias DWTWINAPI.GetMonitorInfoW GetMonitorInfoW;
 alias WINAPI.GetNearestPaletteIndex GetNearestPaletteIndex;
 alias WINAPI.GetPath GetPath;
 alias WINAPI.GetObjectA GetObjectA;
@@ -3032,7 +3041,7 @@
 alias WINAPI.GetProfileStringA GetProfileStringA;
 alias WINAPI.GetProfileStringW GetProfileStringW;
 alias WINAPI.GetROP2 GetROP2;
-alias WINAPI.GetRandomRgn GetRandomRgn;
+alias DWTWINAPI.GetRandomRgn GetRandomRgn;
 alias WINAPI.GetRegionData GetRegionData;
 alias WINAPI.GetRgnBox GetRgnBox;
 alias WINAPI.GetSaveFileNameA GetSaveFileNameA;
@@ -3041,7 +3050,7 @@
 alias WINAPI.GetStockObject GetStockObject;
 alias WINAPI.GetSysColor GetSysColor;
 alias WINAPI.GetSysColorBrush GetSysColorBrush;
-alias WINAPI.GetSystemDefaultUILanguage GetSystemDefaultUILanguage;
+alias DWTWINAPI.GetSystemDefaultUILanguage GetSystemDefaultUILanguage;
 alias WINAPI.GetSystemMenu GetSystemMenu;
 alias WINAPI.GetSystemMetrics GetSystemMetrics;
 alias WINAPI.GetSystemPaletteEntries GetSystemPaletteEntries;
@@ -3075,11 +3084,11 @@
 alias WINAPI.GlobalLock GlobalLock;
 alias WINAPI.GlobalSize GlobalSize;
 alias WINAPI.GlobalUnlock GlobalUnlock;
-alias WINAPI.GradientFill GradientFill;
+alias DWTWINAPI.GradientFill GradientFill;
 alias WINAPI.HeapAlloc HeapAlloc;
 alias WINAPI.HeapFree HeapFree;
 alias WINAPI.HideCaret HideCaret;
-alias WINAPI.IIDFromString IIDFromString;
+alias DWTWINAPI.IIDFromString IIDFromString;
 alias WINAPI.ImageList_Add ImageList_Add;
 alias WINAPI.ImageList_AddMasked ImageList_AddMasked;
 alias WINAPI.ImageList_BeginDrag ImageList_BeginDrag;
@@ -3114,7 +3123,7 @@
 // alias WINAPI.ImmSetCompositionFontW ImmSetCompositionFontW;
 // alias WINAPI.ImmSetOpenStatus ImmSetOpenStatus;
 alias WINAPI.InitCommonControls InitCommonControls;
-alias WINAPI.InitCommonControlsEx InitCommonControlsEx;
+alias DWTWINAPI.InitCommonControlsEx InitCommonControlsEx;
 alias WINAPI.InsertMenuA InsertMenuA;
 alias WINAPI.InsertMenuItemA InsertMenuItemA;
 alias WINAPI.InsertMenuItemW InsertMenuItemW;
@@ -3126,7 +3135,7 @@
 alias WINAPI.InvalidateRect InvalidateRect;
 alias WINAPI.InvalidateRgn InvalidateRgn;
 alias WINAPI.IsDBCSLeadByte IsDBCSLeadByte;
-alias WINAPI.IsHungAppWindow IsHungAppWindow;
+alias DWTWINAPI.IsHungAppWindow IsHungAppWindow;
 alias WINAPI.IsIconic IsIconic;
 alias WINAPI.IsWindow IsWindow;
 alias WINAPI.IsWindowEnabled IsWindowEnabled;
@@ -3155,11 +3164,11 @@
 alias WINAPI.MessageBeep MessageBeep;
 alias WINAPI.MessageBoxA MessageBoxA;
 alias WINAPI.MessageBoxW MessageBoxW;
-alias WINAPI.MonitorFromWindow MonitorFromWindow;
+alias DWTWINAPI.MonitorFromWindow MonitorFromWindow;
 alias WINAPI.MoveToEx MoveToEx;
-alias WINAPI.MsgWaitForMultipleObjectsEx MsgWaitForMultipleObjectsEx;
+alias DWTWINAPI.MsgWaitForMultipleObjectsEx MsgWaitForMultipleObjectsEx;
 alias WINAPI.MultiByteToWideChar MultiByteToWideChar;
-alias WINAPI.NotifyWinEvent NotifyWinEvent;
+alias DWTWINAPI.NotifyWinEvent NotifyWinEvent;
 alias WINAPI.OffsetRect OffsetRect;
 alias WINAPI.OffsetRgn OffsetRgn;
 //alias WINAPI.OleInitialize OleInitialize;
@@ -3207,15 +3216,15 @@
 alias WINAPI.RemoveMenu RemoveMenu;
 alias WINAPI.RestoreDC RestoreDC;
 alias WINAPI.RoundRect RoundRect;
-alias WINAPI.RtlMoveMemory MoveMemory;
-alias WINAPI.SHBrowseForFolderA SHBrowseForFolderA;
-alias WINAPI.SHBrowseForFolderW SHBrowseForFolderW;
+alias DWTWINAPI.RtlMoveMemory MoveMemory;
+alias DWTWINAPI.SHBrowseForFolderA SHBrowseForFolderA;
+alias DWTWINAPI.SHBrowseForFolderW SHBrowseForFolderW;
 version(WinCE){
     alias WINAPI.SHCreateMenuBar SHCreateMenuBar;
 }
-alias WINAPI.SHGetMalloc SHGetMalloc;
-alias WINAPI.SHGetPathFromIDListA SHGetPathFromIDListA;
-alias WINAPI.SHGetPathFromIDListW SHGetPathFromIDListW;
+alias DWTWINAPI.SHGetMalloc SHGetMalloc;
+alias DWTWINAPI.SHGetPathFromIDListA SHGetPathFromIDListA;
+alias DWTWINAPI.SHGetPathFromIDListW SHGetPathFromIDListW;
 version(WinCE)
 {
     alias WINAPI.SHHandleWMSettingChange SHHandleWMSettingChange;
@@ -3226,31 +3235,31 @@
 }
 alias WINAPI.SaveDC SaveDC;
 alias WINAPI.ScreenToClient ScreenToClient;
-alias WINAPI.ScriptApplyDigitSubstitution ScriptApplyDigitSubstitution;
-alias WINAPI.ScriptBreak ScriptBreak;
-alias WINAPI.ScriptCPtoX ScriptCPtoX;
-alias WINAPI.ScriptCacheGetHeight ScriptCacheGetHeight;
-alias WINAPI.ScriptFreeCache ScriptFreeCache;
-alias WINAPI.ScriptGetFontProperties ScriptGetFontProperties;
-alias WINAPI.ScriptGetLogicalWidths ScriptGetLogicalWidths;
-alias WINAPI.ScriptGetProperties ScriptGetProperties;
-alias WINAPI.ScriptItemize ScriptItemize;
-alias WINAPI.ScriptJustify ScriptJustify;
-alias WINAPI.ScriptLayout ScriptLayout;
-alias WINAPI.ScriptPlace ScriptPlace;
-alias WINAPI.ScriptRecordDigitSubstitution ScriptRecordDigitSubstitution;
-alias WINAPI.ScriptGetCMap ScriptGetCMap;
-alias WINAPI.ScriptShape ScriptShape;
-alias WINAPI.ScriptStringAnalyse ScriptStringAnalyse;
-alias WINAPI.ScriptStringOut ScriptStringOut;
-alias WINAPI.ScriptStringFree ScriptStringFree;
-alias WINAPI.ScriptTextOut ScriptTextOut;
-alias WINAPI.ScriptXtoCP ScriptXtoCP;
+alias DWTWINAPI.ScriptApplyDigitSubstitution ScriptApplyDigitSubstitution;
+alias DWTWINAPI.ScriptBreak ScriptBreak;
+alias DWTWINAPI.ScriptCPtoX ScriptCPtoX;
+alias DWTWINAPI.ScriptCacheGetHeight ScriptCacheGetHeight;
+alias DWTWINAPI.ScriptFreeCache ScriptFreeCache;
+alias DWTWINAPI.ScriptGetFontProperties ScriptGetFontProperties;
+alias DWTWINAPI.ScriptGetLogicalWidths ScriptGetLogicalWidths;
+alias DWTWINAPI.ScriptGetProperties ScriptGetProperties;
+alias DWTWINAPI.ScriptItemize ScriptItemize;
+alias DWTWINAPI.ScriptJustify ScriptJustify;
+alias DWTWINAPI.ScriptLayout ScriptLayout;
+alias DWTWINAPI.ScriptPlace ScriptPlace;
+alias DWTWINAPI.ScriptRecordDigitSubstitution ScriptRecordDigitSubstitution;
+alias DWTWINAPI.ScriptGetCMap ScriptGetCMap;
+alias DWTWINAPI.ScriptShape ScriptShape;
+alias DWTWINAPI.ScriptStringAnalyse ScriptStringAnalyse;
+alias DWTWINAPI.ScriptStringOut ScriptStringOut;
+alias DWTWINAPI.ScriptStringFree ScriptStringFree;
+alias DWTWINAPI.ScriptTextOut ScriptTextOut;
+alias DWTWINAPI.ScriptXtoCP ScriptXtoCP;
 alias WINAPI.ScrollWindowEx ScrollWindowEx;
 alias WINAPI.SelectClipRgn SelectClipRgn;
 alias WINAPI.SelectObject SelectObject;
 alias WINAPI.SelectPalette SelectPalette;
-alias WINAPI.SendInput SendInput;
+alias DWTWINAPI.SendInput SendInput;
 alias WINAPI.SendMessageA SendMessageA;
 alias WINAPI.SendMessageW SendMessageW;
 alias WINAPI.SetActiveWindow SetActiveWindow;
@@ -3269,10 +3278,10 @@
 alias WINAPI.SetForegroundWindow SetForegroundWindow;
 alias WINAPI.SetGraphicsMode SetGraphicsMode;
 alias WINAPI.SetLastError SetLastError;
-alias WINAPI.SetLayout SetLayout;
+alias DWTWINAPI.SetLayout SetLayout;
 alias WINAPI.SetMenu SetMenu;
 alias WINAPI.SetMenuDefaultItem SetMenuDefaultItem;
-alias WINAPI.SetMenuInfo SetMenuInfo;
+alias DWTWINAPI.SetMenuInfo SetMenuInfo;
 alias WINAPI.SetMenuItemInfoA SetMenuItemInfoA;
 alias WINAPI.SetMenuItemInfoW SetMenuItemInfoW;
 alias WINAPI.SetMetaRgn SetMetaRgn;
@@ -3299,10 +3308,10 @@
 alias WINAPI.SetWindowTextW SetWindowTextW;
 alias WINAPI.SetWindowsHookExA SetWindowsHookExA;
 alias WINAPI.SetWindowsHookExW SetWindowsHookExW;
-alias WINAPI.ShellExecuteExA ShellExecuteExA;
-alias WINAPI.ShellExecuteExW ShellExecuteExW;
-alias WINAPI.Shell_NotifyIconA Shell_NotifyIconA;
-alias WINAPI.Shell_NotifyIconW Shell_NotifyIconW;
+alias DWTWINAPI.ShellExecuteExA ShellExecuteExA;
+alias DWTWINAPI.ShellExecuteExW ShellExecuteExW;
+alias DWTWINAPI.Shell_NotifyIconA Shell_NotifyIconA;
+alias DWTWINAPI.Shell_NotifyIconW Shell_NotifyIconW;
 alias WINAPI.SHGetFileInfo SHGetFileInfo;
 alias WINAPI.ShowCaret ShowCaret;
 alias WINAPI.ShowOwnedPopups ShowOwnedPopups;
@@ -3321,14 +3330,14 @@
 alias WINAPI.SystemParametersInfoW SystemParametersInfoW;
 alias WINAPI.ToAscii ToAscii;
 alias WINAPI.ToUnicode ToUnicode;
-alias WINAPI.TrackMouseEvent TrackMouseEvent;
+alias DWTWINAPI.TrackMouseEvent TrackMouseEvent;
 alias WINAPI.TrackPopupMenu TrackPopupMenu;
 alias WINAPI.TranslateAcceleratorA TranslateAcceleratorA;
 alias WINAPI.TranslateAcceleratorW TranslateAcceleratorW;
 alias WINAPI.TranslateCharsetInfo TranslateCharsetInfo;
 alias WINAPI.TranslateMDISysAccel TranslateMDISysAccel;
 alias WINAPI.TranslateMessage TranslateMessage;
-alias WINAPI.TransparentBlt TransparentBlt;
+alias DWTWINAPI.TransparentBlt TransparentBlt;
 version(WinCE){
     alias WINAPI.TransparentImage TransparentImage;
 }
@@ -3345,7 +3354,7 @@
 alias WINAPI.WideCharToMultiByte WideCharToMultiByte;
 alias WINAPI.WindowFromDC WindowFromDC;
 alias WINAPI.WindowFromPoint WindowFromPoint;
-alias WINAPI.wcslen wcslen;
+alias DWTWINAPI.wcslen wcslen;
 
 public static int VERSION (int major, int minor) {  return major << 16 | minor;}
 
@@ -3455,9 +3464,9 @@
 }
 
 
-alias WINAPI.OleInitialize OleInitialize;
-alias WINAPI.OleUninitialize OleUninitialize;
-alias WINAPI.CoCreateInstance CoCreateInstance;
+alias DWTWINAPI.OleInitialize OleInitialize;
+alias DWTWINAPI.OleUninitialize OleUninitialize;
+alias DWTWINAPI.CoCreateInstance CoCreateInstance;
 
 /**
  * <Shawn Liu>
@@ -3547,7 +3556,7 @@
     *cast(HTREEITEM *)prc = hitem;
     return cast(bool) SendMessage( hwnd, TVM_GETITEMRECT, code, cast(int)prc );
 }
-static int strlen( CHAR* ptr ){
+static int strlen( PCHAR ptr ){
     return tango.stdc.string.strlen( cast(char*)ptr );
 }
 
@@ -3556,7 +3565,7 @@
     pt.y = cast(SHORT) HIWORD(pts);
 }
 
-alias WINAPI.GetScrollBarInfo GetScrollBarInfo;
+alias DWTWINAPI.GetScrollBarInfo GetScrollBarInfo;
 } // END of OS
 //-----------------------------------------------------------------------------
 import tango.sys.win32.CodePage : CodePage;