dxruby-mingw.patch

diff --git a/dxruby.c b/dxruby.c
index 0c4800a..d8f92a3 100644
--- a/dxruby.c
+++ b/dxruby.c
@@ -135,8 +135,6 @@ static VALUE Window_sync( VALUE );
 static VALUE Window_create( VALUE );
 static VALUE RenderTarget_update( VALUE );
 
-static void ShaderCore_release( struct DXRubyShaderCore *core );
-
 static VALUE RenderTarget_drawLine ( int argc, VALUE *argv, VALUE obj );
 static VALUE RenderTarget_draw     ( int argc, VALUE *argv, VALUE obj );
 static VALUE RenderTarget_drawAlpha( int argc, VALUE *argv, VALUE obj );
@@ -2046,7 +2044,7 @@ static VALUE ShaderCore_getParam( VALUE self )
         0 , NULL, &core->pD3DXEffect, &pErr )))
     {
         // シェーダの読み込みの失敗
-        rb_raise( eDXRubyError, pErr->lpVtbl->GetBufferPointer( pErr ) );
+        rb_raise( eDXRubyError, pErr ? pErr->lpVtbl->GetBufferPointer( pErr ) : "D3DXCreateEffect failed");
     }
     RELEASE( pErr );
 
@@ -4787,7 +4785,7 @@ static void InitWindow( void )
     g_WindowInfo.x        = rect.left;
     g_WindowInfo.y        = rect.top;
 
-    WINNLSEnableIME( g_hWnd, FALSE );
+    SendMessage( ImmGetDefaultIMEWnd( g_hWnd ), WM_IME_CONTROL, IMC_CLOSESTATUSWINDOW, 0 );
 }
 
 
diff --git a/extconf.rb b/extconf.rb
index af56bc3..d1e7036 100644
--- a/extconf.rb
+++ b/extconf.rb
@@ -3,7 +3,7 @@ require "mkmf"
 SYSTEM_LIBRARIES = [
   "dxguid",
   "d3d9",
-  "d3dx9",
+  ["d3dx9_40", "d3dx9"],
   "dinput8",
   "dsound",
   "gdi32",
@@ -11,11 +11,13 @@ SYSTEM_LIBRARIES = [
   "user32",
   "kernel32",
   "comdlg32",
-  "winmm"
+  "winmm",
+  "uuid",
+  "imm32"
 ]
 
-SYSTEM_LIBRARIES.each do |lib|
-  have_library(lib)
+SYSTEM_LIBRARIES.each do |libs|
+  [*libs].any? {|lib| have_library(lib) }
 end
 
 #ヘッダファイル足りてませんが調べるの面倒で(^-^;
diff --git a/input.c b/input.c
index a6bcdb6..b876be5 100644
--- a/input.c
+++ b/input.c
@@ -1855,7 +1855,9 @@ void Init_dxruby_Input( void )
     rb_define_const( mDXRuby, "K_YEN"        , INT2FIX(DIK_YEN) );
     rb_define_const( mDXRuby, "K_ABNT_C2"    , INT2FIX(DIK_ABNT_C2) );
     rb_define_const( mDXRuby, "K_NUMPADEQUALS", INT2FIX(DIK_NUMPADEQUALS) );
+#ifdef DIK_PREVTRACK
     rb_define_const( mDXRuby, "K_PREVTRACK"  , INT2FIX(DIK_PREVTRACK) );
+#endif
     rb_define_const( mDXRuby, "K_AT"         , INT2FIX(DIK_AT) );
     rb_define_const( mDXRuby, "K_COLON"      , INT2FIX(DIK_COLON) );
     rb_define_const( mDXRuby, "K_UNDERLINE"  , INT2FIX(DIK_UNDERLINE) );
diff --git a/sound.c b/sound.c
index 674d9f7..2def056 100644
--- a/sound.c
+++ b/sound.c
@@ -18,6 +18,11 @@
 #define WAVE_SAW 2
 #define WAVE_TRI 3
 
+#ifndef DS3DALG_DEFAULT
+#define DS3DALG_DEFAULT GUID_NULL
+#endif
+
+
 static VALUE cSound;        /* サウンドクラス       */
 static VALUE cSoundEffect;  /* 生成効果音クラス     */