diff -ru vnc-4.0-winsrc.orig/rfb_win32/SInput.cxx vnc-4.0-winsrc/rfb_win32/SInput.cxx
--- vnc-4.0-winsrc.orig/rfb_win32/SInput.cxx	Tue Nov 11 10:41:14 2003
+++ vnc-4.0-winsrc/rfb_win32/SInput.cxx	Mon Nov 29 17:53:41 2004
@@ -24,6 +24,7 @@
 #define XK_MISCELLANY
 #define XK_LATIN1
 #define XK_CURRENCY
+#define XK_KOREAN
 #include <rfb/keysymdef.h>
 
 // * Force the windows headers to include all the SendInput stuff
diff -ru vnc-4.0-winsrc.orig/rfb_win32/keymap.h vnc-4.0-winsrc/rfb_win32/keymap.h
--- vnc-4.0-winsrc.orig/rfb_win32/keymap.h	Fri Jun 11 16:25:36 2004
+++ vnc-4.0-winsrc/rfb_win32/keymap.h	Mon Nov 29 18:03:25 2004
@@ -141,9 +141,14 @@
   { XK_Super_R,          VK_RWIN, 0 },
   { XK_Menu,             VK_APPS, 0 },
 
+#ifndef XK_KOREAN
   // Japanese stuff - almost certainly wrong...
 
   { XK_Kanji,            VK_KANJI, 0 },
   { XK_Kana_Shift,       VK_KANA, 0 },
+#else
+  { XK_Hangul_Hanja,     VK_HANJA, 0 },
+  { XK_Hangul,           VK_HANGUL, 0 },
+#endif
 
 };
diff -ru vnc-4.0-winsrc.orig/vncviewer/cview.cxx vnc-4.0-winsrc/vncviewer/cview.cxx
--- vnc-4.0-winsrc.orig/vncviewer/cview.cxx	Fri Jun 11 16:25:42 2004
+++ vnc-4.0-winsrc/vncviewer/cview.cxx	Mon Nov 29 18:05:05 2004
@@ -812,6 +812,7 @@
         return 0;
       }
     }
+    if (wParam == VK_PROCESSKEY) wParam = ImmGetVirtualKey(hwnd);
 	case WM_SYSKEYDOWN:
 	case WM_SYSKEYUP:
     writeKeyEvent(wParam, lParam, (msg == WM_KEYDOWN) || (msg == WM_SYSKEYDOWN));
diff -ru vnc-4.0-winsrc.orig/vncviewer/vncviewer.dsp vnc-4.0-winsrc/vncviewer/vncviewer.dsp
--- vnc-4.0-winsrc.orig/vncviewer/vncviewer.dsp	Tue Jun 15 14:45:28 2004
+++ vnc-4.0-winsrc/vncviewer/vncviewer.dsp	Mon Nov 29 17:56:31 2004
@@ -52,7 +52,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
-# ADD LINK32 user32.lib gdi32.lib advapi32.lib ws2_32.lib version.lib comctl32.lib shell32.lib comdlg32.lib /nologo /subsystem:windows /machine:I386
+# ADD LINK32 user32.lib gdi32.lib advapi32.lib ws2_32.lib version.lib comctl32.lib shell32.lib comdlg32.lib imm32.lib /nologo /subsystem:windows /machine:I386
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PreLink_Desc=Updating buildTime
@@ -81,7 +81,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib gdi32.lib advapi32.lib ws2_32.lib version.lib comctl32.lib shell32.lib comdlg32.lib /nologo /subsystem:windows /incremental:no /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 user32.lib gdi32.lib advapi32.lib ws2_32.lib version.lib comctl32.lib shell32.lib comdlg32.lib imm32.lib /nologo /subsystem:windows /incremental:no /debug /machine:I386 /pdbtype:sept
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PreLink_Desc=Updating buildTime
@@ -111,7 +111,7 @@
 # ADD BSC32 /nologo
 LINK32=link.exe
 # ADD BASE LINK32 user32.lib gdi32.lib advapi32.lib ws2_32.lib version.lib comctl32.lib shell32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
-# ADD LINK32 user32.lib gdi32.lib advapi32.lib ws2_32.lib version.lib comctl32.lib shell32.lib comdlg32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
+# ADD LINK32 user32.lib gdi32.lib advapi32.lib ws2_32.lib version.lib comctl32.lib shell32.lib comdlg32.lib imm32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
 # Begin Special Build Tool
 SOURCE="$(InputPath)"
 PreLink_Desc=Updating buildTime