Mercurial > projects > dwt-win

changeset 268:1a74c57e2d49

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix depenency to updated user32.lib and kernel32.lib
author Frank Benoit <benoit@tionex.de>
date Sun, 27 Jul 2008 13:42:15 +0200
parents 2443a18f96b8
children 472615af96b2
files dwt/internal/win32/OS.d dwt/internal/win32/WINAPI.d
diffstat 2 files changed, 11 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/dwt/internal/win32/OS.d	Sat Jul 26 13:29:11 2008 +0200
+++ b/dwt/internal/win32/OS.d	Sun Jul 27 13:42:15 2008 +0200
@@ -281,7 +281,7 @@
         WIN32_MINOR = info.dwMinorVersion;
         WIN32_VERSION = VERSION (WIN32_MAJOR, WIN32_MINOR);
 
-        if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (5, 1)) {
+        if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (5, 0)) {
             loadLib( Symbols_Kernel32, `Kernel32.dll` );
         }
 
@@ -2738,11 +2738,13 @@
 
 // user32.dll vista
 public static extern(Windows) BOOL function() SetProcessDPIAware;
+public static extern(Windows) BOOL function( HWND hWnd )IsHungAppWindow;
 static Symbol[] Symbols_User32 = [
     { "SetProcessDPIAware", cast(void**)& SetProcessDPIAware, 6, 0 },
     { "GetLayeredWindowAttributes", cast(void**)& GetLayeredWindowAttributes, 5, 1 },
     { "SetLayeredWindowAttributes", cast(void**)& SetLayeredWindowAttributes, 5, 0 },
     { "PrintWindow", cast(void**)& PrintWindow, 5, 0 },
+    { "IsHungAppWindow", cast(void**)& IsHungAppWindow, 5, 0 },
 ];
 
 // Imm32.lib
@@ -2824,12 +2826,14 @@
 public static extern(Windows) {
 HANDLE function( ACTCTX* pActCtx ) CreateActCtx;
 BOOL function( HACTCTX hActCtx, uint* lpCookie ) ActivateActCtx;
+LANGID function() GetSystemDefaultUILanguage;
 }
 version(ANSI){
 }else{
 static Symbol[] Symbols_Kernel32 = [
     { "CreateActCtxW", cast(void**)& CreateActCtx, 5, 1 },
     { "ActivateActCtx", cast(void**)& ActivateActCtx, 5, 1 },
+    { "GetSystemDefaultUILanguage", cast(void**)& GetSystemDefaultUILanguage, 5, 0 },
 ];
 }
 
@@ -3068,7 +3072,7 @@
 alias WINAPI.GetStockObject GetStockObject;
 alias WINAPI.GetSysColor GetSysColor;
 alias WINAPI.GetSysColorBrush GetSysColorBrush;
-alias DWTWINAPI.GetSystemDefaultUILanguage GetSystemDefaultUILanguage;
+//alias DWTWINAPI.GetSystemDefaultUILanguage GetSystemDefaultUILanguage;
 alias WINAPI.GetSystemMenu GetSystemMenu;
 alias WINAPI.GetSystemMetrics GetSystemMetrics;
 alias WINAPI.GetSystemPaletteEntries GetSystemPaletteEntries;
@@ -3153,7 +3157,7 @@
 alias WINAPI.InvalidateRect InvalidateRect;
 alias WINAPI.InvalidateRgn InvalidateRgn;
 alias WINAPI.IsDBCSLeadByte IsDBCSLeadByte;
-alias DWTWINAPI.IsHungAppWindow IsHungAppWindow;
+//alias DWTWINAPI.IsHungAppWindow IsHungAppWindow;
 alias WINAPI.IsIconic IsIconic;
 alias WINAPI.IsWindow IsWindow;
 alias WINAPI.IsWindowEnabled IsWindowEnabled;
--- a/dwt/internal/win32/WINAPI.d	Sat Jul 26 13:29:11 2008 +0200
+++ b/dwt/internal/win32/WINAPI.d	Sun Jul 27 13:42:15 2008 +0200
@@ -1866,9 +1866,9 @@
     HTHEME hTheme
 );
 HRESULT BufferedPaintUnInit();
-BOOL IsHungAppWindow(
-    HWND hWnd
-);
+//BOOL IsHungAppWindow(
+//    HWND hWnd
+//);
 HPAINTBUFFER BeginBufferedPaint(
     HDC hdcTarget,
     RECT *prcTarget,
@@ -1900,7 +1900,7 @@
 );
 
 //Kernel32.lib
-LANGID GetSystemDefaultUILanguage();
+//LANGID GetSystemDefaultUILanguage();
 
 // Macro from winnt.h/windows.h
 WORD PRIMARYLANGID(