提交: 38af25861ef018c2ab36546e703dd878c8090b2c - dtxmaniaxg-verk-git (git)

DTXManiaXG(Ver.K)4.00Series

Commit MetaInfo

• 修訂: 38af25861ef018c2ab36546e703dd878c8090b2c (tree)
• 時間: 2019-09-02 23:02:32
• 作者: kairera0467 <gennsou76573@gmai...>
• Commiter: kairera0467

Log Message

#xxxxx DTXMania Rev:0c282febd430a19882761187d8704f9829cc36c7の修正を適用
#xxxxx DTXCreatorのapp.configを微修正

Change Summary

• delete: "DTXCreator\343\203\227\343\203\255\343\202\270\343\202\247\343\202\257\343\203\210/app.config"
• delete: "FDK17\343\203\227\343\203\255\343\202\270\343\202\247\343\202\257\343\203\210/\343\202\263\343\203\274\343\203\211/00.\345\205\261\351\200\232/CWin32.cs"
• delete: "FDK17\343\203\227\343\203\255\343\202\270\343\202\247\343\202\257\343\203\210/\343\202\263\343\203\274\343\203\211/02.\345\205\245\345\212\233/CInputMIDI.cs"
• delete: "FDK17\343\203\227\343\203\255\343\202\270\343\202\247\343\202\257\343\203\210/\343\202\263\343\203\274\343\203\211/02.\345\205\245\345\212\233/CInput\347\256\241\347\220\206.cs"
• delete: "\345\256\237\350\241\214\346\231\202\343\203\225\343\202\251\343\203\253\343\203\200/DTXManiaGR.exe"

差異

--- "a/DTXCreator\343\203\227\343\203\255\343\202\270\343\202\247\343\202\257\343\203\210/app.config"
+++ "b/DTXCreator\343\203\227\343\203\255\343\202\270\343\202\247\343\202\257\343\203\210/app.config"
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <configuration>
   <startup useLegacyV2RuntimeActivationPolicy="true">
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
     <supportedRuntime version="v2.0.50727"/>
     <supportedRuntime version="v1.1.4322"/>
     <supportedRuntime version="v1.0.3705"/>
@@ -11,14 +11,6 @@
     <loadFromRemoteSources enabled="true"/>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <probing privatePath="dll"/>
-      <dependentAssembly>
-        <assemblyIdentity name="SlimDX"
-                          version="1002.0.10.43"
-                          publicKeyToken="53d0e4ef1f1579f5"
-                          culture="neutral" />
-        <codeBase version="1002.0.10.43"
-          href="dll\SlimDXc_net20x86_Jun2010.dll"/>
-      </dependentAssembly>
     </assemblyBinding>
   </runtime>
 </configuration>

--- "a/FDK17\343\203\227\343\203\255\343\202\270\343\202\247\343\202\257\343\203\210/\343\202\263\343\203\274\343\203\211/00.\345\205\261\351\200\232/CWin32.cs"
+++ "b/FDK17\343\203\227\343\203\255\343\202\270\343\202\247\343\202\257\343\203\210/\343\202\263\343\203\274\343\203\211/00.\345\205\261\351\200\232/CWin32.cs"
@@ -342,23 +342,23 @@ namespace FDK
 		[return: MarshalAs( UnmanagedType.Bool )]
 		[DllImport( "user32.dll", CharSet = CharSet.Auto )]
 		public static extern bool IsZoomed( IntPtr hWnd );
-		[DllImport( "winmm.dll" )]
-		public static extern uint midiInClose( uint hMidiIn );
-		[DllImport( "winmm.dll" )]
-		public static extern uint midiInGetDevCaps( uint uDeviceID, ref MIDIINCAPS lpMidiInCaps, uint cbMidiInCaps );
-		[DllImport( "winmm.dll" )]
-		public static extern uint midiInGetID( uint hMidiIn, ref uint puDeviceID );
-		[DllImport( "winmm.dll" )]
-		public static extern uint midiInGetNumDevs();
-		[DllImport( "winmm.dll" )]
-		public static extern uint midiInOpen( ref uint phMidiIn, uint uDeviceID, MidiInProc dwCallback, int dwInstance, int fdwOpen );
-		[DllImport( "winmm.dll" )]
-		public static extern uint midiInReset( uint hMidiIn );
-		[DllImport( "winmm.dll" )]
-		public static extern uint midiInStart( uint hMidiIn );
-		[DllImport( "winmm.dll" )]
-		public static extern uint midiInStop( uint hMidiIn );
-		[DllImport( "user32.dll", CharSet = CharSet.Auto )]
+        [DllImport( "winmm.dll" )]
+        public static extern uint midiInClose( IntPtr hMidiIn );
+        [DllImport( "winmm.dll" )]
+        public static extern uint midiInGetDevCaps( uint uDeviceID, ref MIDIINCAPS lpMidiInCaps, uint cbMidiInCaps );
+        [DllImport( "winmm.dll" )]
+        public static extern uint midiInGetID( IntPtr hMidiIn, ref IntPtr puDeviceID );
+        [DllImport( "winmm.dll" )]
+        public static extern uint midiInGetNumDevs();
+        [DllImport( "winmm.dll" )]
+        public static extern uint midiInOpen( ref IntPtr phMidiIn, uint uDeviceID, MidiInProc dwCallback, IntPtr dwInstance, int fdwOpen );
+        [DllImport( "winmm.dll" )]
+        public static extern uint midiInReset( IntPtr hMidiIn );
+        [DllImport( "winmm.dll" )]
+        public static extern uint midiInStart( IntPtr hMidiIn );
+        [DllImport( "winmm.dll" )]
+        public static extern uint midiInStop( IntPtr hMidiIn );
+        [DllImport( "user32.dll", CharSet = CharSet.Auto )]
 		public static extern IntPtr MonitorFromWindow( IntPtr hwnd, uint dwFlags );
 		[return: MarshalAs( UnmanagedType.Bool )]
 		[DllImport( "user32.dll", CharSet = CharSet.Auto )]
@@ -806,8 +806,8 @@ namespace FDK
 		}
 
 
-		// Win32 メッセージ処理デリゲート
+        // Win32 メッセージ処理デリゲート
 
-		public delegate void MidiInProc( uint hMidiIn, uint wMsg, int dwInstance, int dwParam1, int dwParam2 );
-	}
+        public delegate void MidiInProc( IntPtr hMidiIn, uint wMsg, int dwInstance, int dwParam1, int dwParam2 );
+    }
 }

--- "a/FDK17\343\203\227\343\203\255\343\202\270\343\202\247\343\202\257\343\203\210/\343\202\263\343\203\274\343\203\211/02.\345\205\245\345\212\233/CInputMIDI.cs"
+++ "b/FDK17\343\203\227\343\203\255\343\202\270\343\202\247\343\202\257\343\203\210/\343\202\263\343\203\274\343\203\211/02.\345\205\245\345\212\233/CInputMIDI.cs"
@@ -9,14 +9,14 @@ namespace FDK
 	{
 		// プロパティ
 
-		public uint hMidiIn;
+		public IntPtr hMidiIn;
 		public List<STInputEvent> listEventBuffer;
 
 		// コンストラクタ
 
 		public CInputMIDI( uint nID )
 		{
-			this.hMidiIn = 0;
+			this.hMidiIn = IntPtr.Zero;
 			this.listEventBuffer = new List<STInputEvent>( 32 );
 			this.list入力イベント = new List<STInputEvent>( 32 );
 			this.e入力デバイス種別 = E入力デバイス種別.MidiIn;

--- "a/FDK17\343\203\227\343\203\255\343\202\270\343\202\247\343\202\257\343\203\210/\343\202\263\343\203\274\343\203\211/02.\345\205\245\345\212\233/CInput\347\256\241\347\220\206.cs"
+++ "b/FDK17\343\203\227\343\203\255\343\202\270\343\202\247\343\202\257\343\203\210/\343\202\263\343\203\274\343\203\211/02.\345\205\245\345\212\233/CInput\347\256\241\347\220\206.cs"
@@ -61,13 +61,9 @@ namespace FDK
 		}
 
 
-		// コンストラクタ
-		public CInput管理( IntPtr hWnd )
-		{
-			CInput管理初期化( hWnd, true );
-		}
-		public CInput管理( IntPtr hWnd, bool bUseMidiIn )
-		{
+        // コンストラクタ
+        public CInput管理( IntPtr hWnd, bool bUseMidiIn = true )
+        {
 			CInput管理初期化( hWnd, bUseMidiIn );
 		}
 
@@ -117,8 +113,8 @@ namespace FDK
 					{
 						Trace.TraceError( "MIDI In: Device{0}: midiInDevCaps(): {1:X2}: ", i, num3 );
 					}
-					else if ( ( CWin32.midiInOpen( ref item.hMidiIn, i, this.proc, 0, 0x30000 ) == 0 ) && ( item.hMidiIn != 0 ) )
-					{
+                    else if( ( CWin32.midiInOpen( ref item.hMidiIn, i, this.proc, IntPtr.Zero, 0x30000 ) == 0 ) && ( item.hMidiIn != IntPtr.Zero ) )
+                    {
 						CWin32.midiInStart( item.hMidiIn );
 						Trace.TraceInformation( "MIDI In: [{0}] \"{1}\" の入力受付を開始しました。", i, lpMidiInCaps.szPname );
 					}
@@ -265,10 +261,10 @@ namespace FDK
 		private List<uint> listHMIDIIN = new List<uint>( 8 );
 		private object objMidiIn排他用 = new object();
 		private CWin32.MidiInProc proc;
-//		private CTimer timer;
+        //		private CTimer timer;
 
-		private void MidiInCallback( uint hMidiIn, uint wMsg, int dwInstance, int dwParam1, int dwParam2 )
-		{
+        private void MidiInCallback( IntPtr hMidiIn, uint wMsg, int dwInstance, int dwParam1, int dwParam2 )
+        {
 			int p = dwParam1 & 0xF0;
 			if( wMsg != CWin32.MIM_DATA || ( p != 0x80 && p != 0x90 && p != 0xB0 ) )
 				return;

Binary files "a/\345\256\237\350\241\214\346\231\202\343\203\225\343\202\251\343\203\253\343\203\200/DTXManiaGR.exe" and "b/\345\256\237\350\241\214\346\231\202\343\203\225\343\202\251\343\203\253\343\203\200/DTXManiaGR.exe" differ