Changeset 276:240db000bbcd

Timestamp:

08/04/08 18:52:09 (4 months ago)

Author:

Frank Benoit <benoit@tionex.de>

branch:

default

Message:

Load some more WinAPI functions dynamically.

Files:

• dwt/internal/win32/OS.d (modified) (7 diffs)
• dwt/internal/win32/WINAPI.d (modified) (1 diff)

dwt/internal/win32/OS.d

@@ -148 +148 @@
-//         return IsWinCE ? NOTIFYICONDATAW.sizeof : cast(int)(&(cast(NOTIFYICONDATAW*)null).dwInfoFlags) + int.sizeof;
-//     }
+// kernel32 winxp/vista
+public static extern(Windows) {
+HANDLE function( ACTCTX* pActCtx ) CreateActCtx;
+BOOL function( HACTCTX hActCtx, uint* lpCookie ) ActivateActCtx;
+LANGID function() GetSystemDefaultUILanguage;
+BOOL function(
+    LANGUAGEGROUP_ENUMPROC pLangGroupEnumProc, // callback function
+    DWORD dwFlags,                             // language groups
+    LONG_PTR  lParam                           // callback parameter
+)EnumSystemLanguageGroupsA;
+BOOL function(
+    LANGUAGEGROUP_ENUMPROC pLangGroupEnumProc, // callback function
+    DWORD dwFlags,                             // language groups
+    LONG_PTR  lParam                           // callback parameter
+)EnumSystemLanguageGroupsW;
+BOOL function(
+    LOCALE_ENUMPROC lpLocaleEnumProc, // callback function
+    DWORD dwFlags                     // locales
+)EnumSystemLocalesA;
+BOOL function(
+    LOCALE_ENUMPROC lpLocaleEnumProc, // callback function
+    DWORD dwFlags                     // locales
+)EnumSystemLocalesW;
+}
-
-    /*
@@ -2379 +2403 @@
-    alias WINAPI.EnumFontFamiliesA EnumFontFamilies;
-    alias WINAPI.EnumSystemLanguageGroupsA EnumSystemLanguageGroups;
-WINAPI.
+
-    alias WINAPI.ExpandEnvironmentStringsA ExpandEnvironmentStrings;
-    alias WINAPI.ExtTextOutA ExtTextOut;
@@ -2484 +2508 @@
-    alias WINAPI.EnumFontFamiliesExW EnumFontFamiliesEx;
-    alias WINAPI.EnumFontFamiliesW EnumFontFamilies;
-DWTWINAPI.
-WINAPI.
+
+
-    alias WINAPI.ExpandEnvironmentStringsW ExpandEnvironmentStrings;
-    alias WINAPI.ExtTextOutW ExtTextOut;
@@ -2737 +2761 @@
-
-// user32.dll vista
-
-
+
+
+
+
+
-static Symbol[] Symbols_User32 = [
-    { "SetProcessDPIAware", cast(void**)& SetProcessDPIAware, 6, 0 },
@@ -2822 +2849 @@
-];
-
-// kernel32 winxp/vista
-public static extern(Windows) {
-HANDLE function( ACTCTX* pActCtx ) CreateActCtx;
-BOOL function( HACTCTX hActCtx, uint* lpCookie ) ActivateActCtx;
-LANGID function() GetSystemDefaultUILanguage;
-}
-version(ANSI){
-}else{
@@ -2834 +2855 @@
-    { "ActivateActCtx", cast(void**)& ActivateActCtx, 5, 1 },
-    { "GetSystemDefaultUILanguage", cast(void**)& GetSystemDefaultUILanguage, 5, 0 },
+    { "EnumSystemLanguageGroupsW", cast(void**)& EnumSystemLanguageGroupsW, 4, 0 },
+    { "EnumSystemLanguageGroupsA", cast(void**)& EnumSystemLanguageGroupsA, 4, 0 },
+    { "EnumSystemLocalesW", cast(void**)& EnumSystemLocalesW, 4, 0 },
+    { "EnumSystemLocalesA", cast(void**)& EnumSystemLocalesA, 4, 0 },
-];
-}
@@ -2955 +2980 @@
-alias WINAPI.EnumFontFamiliesExW EnumFontFamiliesExW;
-alias WINAPI.EnumFontFamiliesW EnumFontFamiliesW;
-alias DWTWINAPI.EnumSystemLanguageGroupsA EnumSystemLanguageGroupsA;
-alias DWTWINAPI.EnumSystemLanguageGroupsW EnumSystemLanguageGroupsW;
-alias WINAPI.EnumSystemLocalesA EnumSystemLocalesA;
-alias DWTWINAPI.EnumSystemLocalesW EnumSystemLocalesW;
-alias DWTWINAPI.EqualRect EqualRect;
-alias WINAPI.EqualRgn EqualRgn;

dwt/internal/win32/WINAPI.d

@@ -2394 +2394 @@
-    LPARAM lParam        // pointer to application-supplied data
-);
-BOOL EnumSystemLanguageGroupsA(
-    LANGUAGEGROUP_ENUMPROC pLangGroupEnumProc, // callback function
-    DWORD dwFlags,                             // language groups
-    LONG_PTR  lParam                           // callback parameter
-);
-BOOL EnumSystemLanguageGroupsW(
-    LANGUAGEGROUP_ENUMPROC pLangGroupEnumProc, // callback function
-    DWORD dwFlags,                             // language groups
-    LONG_PTR  lParam                           // callback parameter
-);
-BOOL EnumSystemLocalesA(
-    LOCALE_ENUMPROC lpLocaleEnumProc, // callback function
-    DWORD dwFlags                     // locales
-);
-BOOL EnumSystemLocalesW(
-    LOCALE_ENUMPROC lpLocaleEnumProc, // callback function
-    DWORD dwFlags                     // locales
-);
-BOOL EqualRect(
-    RECT *lprc1,  // pointer to structure with first rectangle