• R/O
  • HTTP
  • SSH
  • HTTPS

dtxmania: 提交


Commit MetaInfo

修订版71d2824daf5576ba07040f40397d934132ca9e88 (tree)
时间2019-06-18 01:31:06
作者yyagi <yyagi.dtxmania@gmai...>
Commiteryyagi

Log Message

#34763 x64での動作時、CPUコア数が異常な値となり、(CPUコア数と同じ数だけ確保する)サウンド更新スレッド数が異常になっていたのを修正。

更改概述

差异

--- a/DTXMania/コード/スコア、曲/CDTX.cs
+++ b/DTXMania/コード/スコア、曲/CDTX.cs
@@ -373,7 +373,7 @@ namespace DTXMania
373373 {
374374 #region [ CPUコア数の取得 ]
375375 CWin32.SYSTEM_INFO sysInfo = new CWin32.SYSTEM_INFO();
376- CWin32.GetSystemInfo(ref sysInfo);
376+ CWin32.GetSystemInfo(out sysInfo);
377377 int nCPUCores = (int)sysInfo.dwNumberOfProcessors;
378378 #endregion
379379 #region [ BMP読み込み ]
--- a/FDK/コード/00.共通/CWin32.cs
+++ b/FDK/コード/00.共通/CWin32.cs
@@ -383,7 +383,7 @@ namespace FDK
383383 [DllImport( "user32.dll", CharSet = CharSet.Auto, SetLastError = true )]
384384 public static extern bool SystemParametersInfo( uint uiAction, uint uiParam, IntPtr pvParam, uint fWinIni );
385385 [DllImport( "kernel32.dll" )]
386- public static extern void GetSystemInfo( ref SYSTEM_INFO ptmpsi );
386+ public static extern void GetSystemInfo( out SYSTEM_INFO ptmpsi );
387387 [DllImport( "kernel32.dll" )]
388388 internal static extern ExecutionState SetThreadExecutionState( ExecutionState esFlags );
389389
@@ -521,14 +521,14 @@ namespace FDK
521521 {
522522 public uint dwOemId;
523523 public uint dwPageSize;
524- public uint lpMinimumApplicationAddress;
525- public uint lpMaximumApplicationAddress;
526- public uint dwActiveProcessorMask;
524+ public IntPtr lpMinimumApplicationAddress;
525+ public IntPtr lpMaximumApplicationAddress;
526+ public IntPtr dwActiveProcessorMask;
527527 public uint dwNumberOfProcessors;
528528 public uint dwProcessorType;
529529 public uint dwAllocationGranularity;
530- public uint dwProcessorLevel;
531- public uint dwProcessorRevision;
530+ public ushort dwProcessorLevel;
531+ public ushort dwProcessorRevision;
532532 }
533533 public struct BATTERY_REPORTING_SCALE
534534 {
--- a/FDK/コード/03.サウンド/CSound.cs
+++ b/FDK/コード/03.サウンド/CSound.cs
@@ -359,7 +359,7 @@ namespace FDK
359359 {
360360 #region [ CPU論理コア数の取得 (HT含む) ]
361361 CWin32.SYSTEM_INFO sysInfo = new CWin32.SYSTEM_INFO();
362- CWin32.GetSystemInfo(ref sysInfo);
362+ CWin32.GetSystemInfo(out sysInfo);
363363 int nCPUCores = (int)sysInfo.dwNumberOfProcessors;
364364 #endregion
365365
Show on old repository browser