• R/O
  • HTTP
  • SSH
  • HTTPS

dtxmaniaxg-verk-git: Commit

DTXManiaXG(Ver.K)4.00Series


Commit MetaInfo

Revision38af25861ef018c2ab36546e703dd878c8090b2c (tree)
Time2019-09-02 23:02:32
Authorkairera0467 <gennsou76573@gmai...>
Commiterkairera0467

Log Message

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

Change Summary

Incremental Difference

--- a/DTXCreatorプロジェクト/app.config
+++ b/DTXCreatorプロジェクト/app.config
@@ -1,7 +1,7 @@
11 <?xml version="1.0"?>
22 <configuration>
33 <startup useLegacyV2RuntimeActivationPolicy="true">
4- <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.1"/>
4+ <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.1"/>
55 <supportedRuntime version="v2.0.50727"/>
66 <supportedRuntime version="v1.1.4322"/>
77 <supportedRuntime version="v1.0.3705"/>
@@ -11,14 +11,6 @@
1111 <loadFromRemoteSources enabled="true"/>
1212 <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
1313 <probing privatePath="dll"/>
14- <dependentAssembly>
15- <assemblyIdentity name="SlimDX"
16- version="1002.0.10.43"
17- publicKeyToken="53d0e4ef1f1579f5"
18- culture="neutral" />
19- <codeBase version="1002.0.10.43"
20- href="dll\SlimDXc_net20x86_Jun2010.dll"/>
21- </dependentAssembly>
2214 </assemblyBinding>
2315 </runtime>
2416 </configuration>
--- a/FDK17プロジェクト/コード/00.共通/CWin32.cs
+++ b/FDK17プロジェクト/コード/00.共通/CWin32.cs
@@ -342,23 +342,23 @@ namespace FDK
342342 [return: MarshalAs( UnmanagedType.Bool )]
343343 [DllImport( "user32.dll", CharSet = CharSet.Auto )]
344344 public static extern bool IsZoomed( IntPtr hWnd );
345- [DllImport( "winmm.dll" )]
346- public static extern uint midiInClose( uint hMidiIn );
347- [DllImport( "winmm.dll" )]
348- public static extern uint midiInGetDevCaps( uint uDeviceID, ref MIDIINCAPS lpMidiInCaps, uint cbMidiInCaps );
349- [DllImport( "winmm.dll" )]
350- public static extern uint midiInGetID( uint hMidiIn, ref uint puDeviceID );
351- [DllImport( "winmm.dll" )]
352- public static extern uint midiInGetNumDevs();
353- [DllImport( "winmm.dll" )]
354- public static extern uint midiInOpen( ref uint phMidiIn, uint uDeviceID, MidiInProc dwCallback, int dwInstance, int fdwOpen );
355- [DllImport( "winmm.dll" )]
356- public static extern uint midiInReset( uint hMidiIn );
357- [DllImport( "winmm.dll" )]
358- public static extern uint midiInStart( uint hMidiIn );
359- [DllImport( "winmm.dll" )]
360- public static extern uint midiInStop( uint hMidiIn );
361- [DllImport( "user32.dll", CharSet = CharSet.Auto )]
345+ [DllImport( "winmm.dll" )]
346+ public static extern uint midiInClose( IntPtr hMidiIn );
347+ [DllImport( "winmm.dll" )]
348+ public static extern uint midiInGetDevCaps( uint uDeviceID, ref MIDIINCAPS lpMidiInCaps, uint cbMidiInCaps );
349+ [DllImport( "winmm.dll" )]
350+ public static extern uint midiInGetID( IntPtr hMidiIn, ref IntPtr puDeviceID );
351+ [DllImport( "winmm.dll" )]
352+ public static extern uint midiInGetNumDevs();
353+ [DllImport( "winmm.dll" )]
354+ public static extern uint midiInOpen( ref IntPtr phMidiIn, uint uDeviceID, MidiInProc dwCallback, IntPtr dwInstance, int fdwOpen );
355+ [DllImport( "winmm.dll" )]
356+ public static extern uint midiInReset( IntPtr hMidiIn );
357+ [DllImport( "winmm.dll" )]
358+ public static extern uint midiInStart( IntPtr hMidiIn );
359+ [DllImport( "winmm.dll" )]
360+ public static extern uint midiInStop( IntPtr hMidiIn );
361+ [DllImport( "user32.dll", CharSet = CharSet.Auto )]
362362 public static extern IntPtr MonitorFromWindow( IntPtr hwnd, uint dwFlags );
363363 [return: MarshalAs( UnmanagedType.Bool )]
364364 [DllImport( "user32.dll", CharSet = CharSet.Auto )]
@@ -806,8 +806,8 @@ namespace FDK
806806 }
807807
808808
809- // Win32 メッセージ処理デリゲート
809+ // Win32 メッセージ処理デリゲート
810810
811- public delegate void MidiInProc( uint hMidiIn, uint wMsg, int dwInstance, int dwParam1, int dwParam2 );
812- }
811+ public delegate void MidiInProc( IntPtr hMidiIn, uint wMsg, int dwInstance, int dwParam1, int dwParam2 );
812+ }
813813 }
--- a/FDK17プロジェクト/コード/02.入力/CInputMIDI.cs
+++ b/FDK17プロジェクト/コード/02.入力/CInputMIDI.cs
@@ -9,14 +9,14 @@ namespace FDK
99 {
1010 // プロパティ
1111
12- public uint hMidiIn;
12+ public IntPtr hMidiIn;
1313 public List<STInputEvent> listEventBuffer;
1414
1515 // コンストラクタ
1616
1717 public CInputMIDI( uint nID )
1818 {
19- this.hMidiIn = 0;
19+ this.hMidiIn = IntPtr.Zero;
2020 this.listEventBuffer = new List<STInputEvent>( 32 );
2121 this.list入力イベント = new List<STInputEvent>( 32 );
2222 this.e入力デバイス種別 = E入力デバイス種別.MidiIn;
--- a/FDK17プロジェクト/コード/02.入力/CInput管理.cs
+++ b/FDK17プロジェクト/コード/02.入力/CInput管理.cs
@@ -61,13 +61,9 @@ namespace FDK
6161 }
6262
6363
64- // コンストラクタ
65- public CInput管理( IntPtr hWnd )
66- {
67- CInput管理初期化( hWnd, true );
68- }
69- public CInput管理( IntPtr hWnd, bool bUseMidiIn )
70- {
64+ // コンストラクタ
65+ public CInput管理( IntPtr hWnd, bool bUseMidiIn = true )
66+ {
7167 CInput管理初期化( hWnd, bUseMidiIn );
7268 }
7369
@@ -117,8 +113,8 @@ namespace FDK
117113 {
118114 Trace.TraceError( "MIDI In: Device{0}: midiInDevCaps(): {1:X2}: ", i, num3 );
119115 }
120- else if ( ( CWin32.midiInOpen( ref item.hMidiIn, i, this.proc, 0, 0x30000 ) == 0 ) && ( item.hMidiIn != 0 ) )
121- {
116+ else if( ( CWin32.midiInOpen( ref item.hMidiIn, i, this.proc, IntPtr.Zero, 0x30000 ) == 0 ) && ( item.hMidiIn != IntPtr.Zero ) )
117+ {
122118 CWin32.midiInStart( item.hMidiIn );
123119 Trace.TraceInformation( "MIDI In: [{0}] \"{1}\" の入力受付を開始しました。", i, lpMidiInCaps.szPname );
124120 }
@@ -265,10 +261,10 @@ namespace FDK
265261 private List<uint> listHMIDIIN = new List<uint>( 8 );
266262 private object objMidiIn排他用 = new object();
267263 private CWin32.MidiInProc proc;
268-// private CTimer timer;
264+ // private CTimer timer;
269265
270- private void MidiInCallback( uint hMidiIn, uint wMsg, int dwInstance, int dwParam1, int dwParam2 )
271- {
266+ private void MidiInCallback( IntPtr hMidiIn, uint wMsg, int dwInstance, int dwParam1, int dwParam2 )
267+ {
272268 int p = dwParam1 & 0xF0;
273269 if( wMsg != CWin32.MIM_DATA || ( p != 0x80 && p != 0x90 && p != 0xB0 ) )
274270 return;
Binary files a/実行時フォルダ/DTXManiaGR.exe and b/実行時フォルダ/DTXManiaGR.exe differ
Show on old repository browser