DTXManiaXG(Ver.K)4.00Series
修訂 | a9d02ecbdad02623e0a14c5988c74591e73c2f6e (tree) |
---|---|
時間 | 2019-09-02 23:06:23 |
作者 | ![]() |
Commiter | kairera0467 |
#xxxxx DTXMania Rev:71d2824daf5576ba07040f40397d934132ca9e88の修正を適用
@@ -1653,8 +1653,8 @@ namespace DTXMania | ||
1653 | 1653 | { |
1654 | 1654 | #region [ CPUコア数の取得 ] |
1655 | 1655 | CWin32.SYSTEM_INFO sysInfo = new CWin32.SYSTEM_INFO(); |
1656 | - CWin32.GetSystemInfo( ref sysInfo ); | |
1657 | - int nCPUCores = (int) sysInfo.dwNumberOfProcessors; | |
1656 | + CWin32.GetSystemInfo( out sysInfo ); | |
1657 | + int nCPUCores = (int) sysInfo.dwNumberOfProcessors; | |
1658 | 1658 | #endregion |
1659 | 1659 | #region [ BMP読み込み ] |
1660 | 1660 | if ( this.listBMP != null ) |
@@ -383,8 +383,8 @@ namespace FDK | ||
383 | 383 | [DllImport( "user32.dll", CharSet = CharSet.Auto, SetLastError = true )] |
384 | 384 | public static extern bool SystemParametersInfo( uint uiAction, uint uiParam, IntPtr pvParam, uint fWinIni ); |
385 | 385 | [DllImport( "kernel32.dll" )] |
386 | - public static extern void GetSystemInfo( ref SYSTEM_INFO ptmpsi ); | |
387 | - [DllImport( "kernel32.dll" )] | |
386 | + public static extern void GetSystemInfo( out SYSTEM_INFO ptmpsi ); | |
387 | + [DllImport( "kernel32.dll" )] | |
388 | 388 | internal static extern ExecutionState SetThreadExecutionState( ExecutionState esFlags ); |
389 | 389 | |
390 | 390 |
@@ -519,17 +519,17 @@ namespace FDK | ||
519 | 519 | [StructLayout( LayoutKind.Sequential )] |
520 | 520 | public struct SYSTEM_INFO |
521 | 521 | { |
522 | - public uint dwOemId; | |
523 | - public uint dwPageSize; | |
524 | - public uint lpMinimumApplicationAddress; | |
525 | - public uint lpMaximumApplicationAddress; | |
526 | - public uint dwActiveProcessorMask; | |
527 | - public uint dwNumberOfProcessors; | |
528 | - public uint dwProcessorType; | |
529 | - public uint dwAllocationGranularity; | |
530 | - public uint dwProcessorLevel; | |
531 | - public uint dwProcessorRevision; | |
532 | - } | |
522 | + public uint dwOemId; | |
523 | + public uint dwPageSize; | |
524 | + public IntPtr lpMinimumApplicationAddress; | |
525 | + public IntPtr lpMaximumApplicationAddress; | |
526 | + public UIntPtr dwActiveProcessorMask; | |
527 | + public uint dwNumberOfProcessors; | |
528 | + public uint dwProcessorType; | |
529 | + public uint dwAllocationGranularity; | |
530 | + public ushort dwProcessorLevel; | |
531 | + public ushort dwProcessorRevision; | |
532 | + } | |
533 | 533 | public struct BATTERY_REPORTING_SCALE |
534 | 534 | { |
535 | 535 | public ulong Granularity; |
@@ -360,7 +360,7 @@ namespace FDK | ||
360 | 360 | { |
361 | 361 | #region [ CPU論理コア数の取得 (HT含む) ] |
362 | 362 | CWin32.SYSTEM_INFO sysInfo = new CWin32.SYSTEM_INFO(); |
363 | - CWin32.GetSystemInfo(ref sysInfo); | |
363 | + CWin32.GetSystemInfo(out sysInfo); | |
364 | 364 | int nCPUCores = (int)sysInfo.dwNumberOfProcessors; |
365 | 365 | #endregion |
366 | 366 |