--- a/dwt/internal/win32/OS.d	Wed Feb 06 23:22:33 2008 +0100
+++ b/dwt/internal/win32/OS.d	Wed Feb 06 23:59:02 2008 +0100
@@ -19,11 +19,11 @@
 import dwt.internal.C;
 import dwt.internal.Library;
 import tango.sys.SharedLib : SharedLib;
+static import tango.stdc.stdlib;
+
 import tango.util.log.Trace;
-static import tango.stdc.stdlib;
-
 void trace(int line ){
-    Trace.formatln( "OS {}", line );
+    //Trace.formatln( "OS {}", line );
 }
 
 // declare of Callback functions
@@ -242,7 +242,7 @@
         if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (6, 0)) {
             loadLib( Symbols_User32, `User32.dll` );
         }
-        if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (5, 1)) {
+        if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (4, 0)) {
             loadLib( Symbols_Imm32, `Imm32.dll` );
         }
         if (!OS.IsWinCE && OS.WIN32_VERSION >= OS.VERSION (5, 1)) {
@@ -272,7 +272,7 @@
                 pActCtx.lpSource = pszText;
                 pActCtx.lpResourceName = cast(TCHAR*)MANIFEST_RESOURCE_ID;
 trace(__LINE__);
-Trace.formatln( "is loaded {}", ( OS.CreateActCtx !is null ));
+//Trace.formatln( "is loaded {}", ( OS.CreateActCtx !is null ));
                 HANDLE hActCtx = OS.CreateActCtx (&pActCtx);
 trace(__LINE__);
                 if (pszText !is null) OS.HeapFree (hHeap, 0, pszText);
@@ -4273,115 +4273,9 @@
 // this function vars exist primarily for link error elimination
 //----------------------------------------------------------------------
 public static extern(Windows) {
-
-HIMC function(
-    HWND hWnd,
-    HIMC hIMC
-) ImmAssociateContext;
-
-HIMC function(
-) ImmCreateContext;
-
-int function(
-    HIMC hIMC
-) ImmDestroyContext;
-
-HIMC function(
-    HWND hWnd
-) ImmGetContext;
-
-BOOL function(
-    HIMC hIMC,
-    LPDWORD lpfdwConversion,
-    LPDWORD lpfdwSentence
-) ImmGetConversionStatus;
-
-HWND function(
-    HWND hWnd
-) ImmGetDefaultIMEWnd;
-
-BOOL function(
-    HIMC hIMC
-) ImmGetOpenStatus;
-
-BOOL function(
-    HWND hWnd,
-    HIMC hIMC
-) ImmReleaseContext;
-
-version(ANSI) {
-    BOOL function(
-        HIMC hIMC,
-        LOGFONTA* lplf
-    ) ImmSetCompositionFont;
-
-    LONG function(
-        HIMC hIMC,
-        DWORD dwIndex,
-        LPVOID lpBuf,
-        DWORD dwBufLen
-    ) ImmGetCompositionString;
-
-    BOOL function(
-        HIMC hIMC,
-        LPLOGFONTA lplf
-    ) ImmGetCompositionFont;
-
-} else {
-    BOOL function(
-        HIMC hIMC,
-        LOGFONTW* lplf
-    ) ImmSetCompositionFont;
-
-    LONG function(
-        HIMC hIMC,
-        DWORD dwIndex,
-        LPVOID lpBuf,
-        DWORD dwBufLen
-    ) ImmGetCompositionString;
-
-    BOOL function(
-        HIMC hIMC,
-        LOGFONTW* lplf
-    ) ImmGetCompositionFont;
-}
-
-BOOL function(
-    HIMC hIMC,
-    LPCOMPOSITIONFORM lpCompForm
-) ImmSetCompositionWindow;
-
-BOOL function(
-    HIMC hIMC,
-    DWORD fdwConversion,
-    DWORD fdwSentence
-) ImmSetConversionStatus;
-
-BOOL function(
-    HIMC hIMC,
-    BOOL fOpen
-) ImmSetOpenStatus;
-
 } // public static extern(Windows)
 
 static Symbol[] Symbols_CoreImm = [
-    { "ImmAssociateContext", cast(void**)& ImmAssociateContext, 5, 1 },
-    { "ImmCreateContext", cast(void**)& ImmCreateContext, 5, 1 },
-    { "ImmDestroyContext", cast(void**)& ImmDestroyContext, 5, 1 },
-    { "ImmGetContext", cast(void**)& ImmGetContext, 5, 1 },
-    { "ImmGetConversionStatus", cast(void**)& ImmGetConversionStatus, 5, 1 },
-    { "ImmGetDefaultIMEWnd", cast(void**)& ImmGetDefaultIMEWnd, 5, 1 },
-    { "ImmGetOpenStatus", cast(void**)& ImmGetOpenStatus, 5, 1 },
-    { "ImmReleaseContext", cast(void**)& ImmReleaseContext, 5, 1 },
-    { "ImmSetCompositionFont", cast(void**)& ImmSetCompositionFont, 5, 1 },
-    { "ImmGetCompositionString", cast(void**)& ImmGetCompositionString, 5, 1 },
-    { "ImmGetCompositionFont", cast(void**)& ImmGetCompositionFont, 5, 1 },
-    { "ImmSetCompositionFont", cast(void**)& ImmSetCompositionFont, 5, 1 },
-    { "ImmGetCompositionString", cast(void**)& ImmGetCompositionString, 5, 1 },
-    { "ImmGetCompositionFont", cast(void**)& ImmGetCompositionFont, 5, 1 },
-    { "ImmSetCompositionWindow", cast(void**)& ImmSetCompositionWindow, 5, 1 },
-    { "ImmSetConversionStatus", cast(void**)& ImmSetConversionStatus, 5, 1 },
-    { "ImmSetOpenStatus", cast(void**)& ImmSetOpenStatus, 5, 1 },
 ];
 
 // user32.dll vista
@@ -4391,8 +4285,48 @@
 ];
 
 // Imm32.lib
-public static extern(Windows) BOOL function( DWORD idThread ) ImmDisableTextFrameService;
+public static extern(Windows) {
+HIMC function( HWND hWnd ) ImmGetContext;
+BOOL function( DWORD idThread ) ImmDisableTextFrameService;
+HIMC function( HWND hWnd, HIMC hIMC ) ImmAssociateContext;
+
+HIMC function() ImmCreateContext;
+int function( HIMC hIMC ) ImmDestroyContext;
+BOOL function( HIMC hIMC, LPDWORD lpfdwConversion, LPDWORD lpfdwSentence ) ImmGetConversionStatus;
+HWND function( HWND hWnd ) ImmGetDefaultIMEWnd;
+BOOL function( HIMC hIMC ) ImmGetOpenStatus;
+BOOL function( HWND hWnd, HIMC hIMC ) ImmReleaseContext;
+version(ANSI) {
+    BOOL function( HIMC hIMC, LOGFONTA* lplf ) ImmSetCompositionFont;
+    LONG function( HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen ) ImmGetCompositionString;
+    BOOL function( HIMC hIMC, LPLOGFONTA lplf ) ImmGetCompositionFont;
+
+} else {
+    BOOL function( HIMC hIMC, LOGFONTW* lplf ) ImmSetCompositionFont;
+    LONG function( HIMC hIMC, DWORD dwIndex, LPVOID lpBuf, DWORD dwBufLen ) ImmGetCompositionString;
+    BOOL function( HIMC hIMC, LOGFONTW* lplf ) ImmGetCompositionFont;
+}
+BOOL function( HIMC hIMC, LPCOMPOSITIONFORM lpCompForm ) ImmSetCompositionWindow;
+BOOL function( HIMC hIMC, DWORD fdwConversion, DWORD fdwSentence ) ImmSetConversionStatus;
+BOOL function( HIMC hIMC, BOOL fOpen ) ImmSetOpenStatus;
+
+}
+
 static Symbol[] Symbols_Imm32 = [
+    { "ImmAssociateContext", cast(void**)& ImmAssociateContext, 5, 1 },
+    { "ImmCreateContext", cast(void**)& ImmCreateContext, 5, 1 },
+    { "ImmDestroyContext", cast(void**)& ImmDestroyContext, 5, 1 },
+    { "ImmGetContext", cast(void**)& ImmGetContext, 5, 1 },
+    { "ImmGetConversionStatus", cast(void**)& ImmGetConversionStatus, 5, 1 },
+    { "ImmGetDefaultIMEWnd", cast(void**)& ImmGetDefaultIMEWnd, 5, 1 },
+    { "ImmGetOpenStatus", cast(void**)& ImmGetOpenStatus, 5, 1 },
+    { "ImmReleaseContext", cast(void**)& ImmReleaseContext, 5, 1 },
+    { "ImmSetCompositionFontW", cast(void**)& ImmSetCompositionFont, 5, 1 },
+    { "ImmGetCompositionStringW", cast(void**)& ImmGetCompositionString, 5, 1 },
+    { "ImmGetCompositionFontW", cast(void**)& ImmGetCompositionFont, 5, 1 },
+    { "ImmSetCompositionWindow", cast(void**)& ImmSetCompositionWindow, 5, 1 },
+    { "ImmSetConversionStatus", cast(void**)& ImmSetConversionStatus, 5, 1 },
+    { "ImmSetOpenStatus", cast(void**)& ImmSetOpenStatus, 5, 1 },
     { "ImmDisableTextFrameService", cast(void**)& ImmDisableTextFrameService, 5, 1 },
 ];