一部の機種でITuner::get_SignalStrength()の値が不正になる不具合を修正

radi-sh · Aug 17, 2018 · 8063d5f · 8063d5f
1 parent 7eac0c9
commit 8063d5f
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/BonDriver_BDA/BonTuner.cpp b/BonDriver_BDA/BonTuner.cpp
@@ -2087,14 +2087,14 @@ void CBonTuner::GetSignalState(int* pnStrength, int* pnQuality, int* pnLock)
 				(m_bSignalLockedJudgeTypeTuner && pnLock)) {
 			longVal = 0;
 			if (SUCCEEDED(hr = m_pITuner->get_SignalStrength(&longVal))) {
-				int strength = (int)(longVal & 0xffff);
-				int quality = (int)(longVal >> 16);
+				__int16 strength = (__int16)(longVal & 0xffffL);
+				__int16 quality = (__int16)(longVal >> 16);
 				if (m_bSignalLevelNeedStrength && pnStrength)
-					*pnStrength = strength < 0 ? 0xffff - strength : strength;
+					*pnStrength = (int)(strength < 0xffffi16 ? 0xffffi16 - strength : strength);
 				if (m_bSignalLevelNeedQuality && pnQuality)
-					*pnQuality = min(max(quality, 0), 100);
+					*pnQuality = min(max((int)quality, 0), 100);
 				if (m_bSignalLockedJudgeTypeTuner && pnLock)
-					*pnLock = strength > 0 ? 1 : 0;
+					*pnLock = strength != 0i16 ? 1 : 0;
 			}
 		}
 	}