Skip to content

W
wine-winehq
Commit 15a33ab2 authored by Vincent Pelletier's avatar Vincent Pelletier Committed by Alexandre Julliard
Browse files
Options

dinput: Fix gain-related bugs.

parent 667a1ed5
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
dlls/dinput/effect_linuxinput.c
View file @ 15a33ab2
...@@ -380,7 +380,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_GetParameters( ...@@ -380,7 +380,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_GetParameters(
} }
if (dwFlags & DIEP_GAIN) { if (dwFlags & DIEP_GAIN) {
peff->dwGain = This->gain; peff->dwGain = This->gain * 10000 / 0xFFFF;
} }
if (dwFlags & DIEP_SAMPLEPERIOD) { if (dwFlags & DIEP_SAMPLEPERIOD) {
...@@ -628,7 +628,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters( ...@@ -628,7 +628,7 @@ static HRESULT WINAPI LinuxInputEffectImpl_SetParameters(
/* Gain and Sample Period settings are not supported by the linux /* Gain and Sample Period settings are not supported by the linux
* event system */ * event system */
if (dwFlags & DIEP_GAIN) if (dwFlags & DIEP_GAIN)
This->gain = 0xFFFF * peff->dwGain / 1000; This->gain = 0xFFFF * peff->dwGain / 10000;
if (dwFlags & DIEP_SAMPLEPERIOD) if (dwFlags & DIEP_SAMPLEPERIOD)
TRACE("Sample period requested but no sample period functionality present.\n"); TRACE("Sample period requested but no sample period functionality present.\n");
...@@ -792,6 +792,7 @@ HRESULT linuxinput_create_effect( ...@@ -792,6 +792,7 @@ HRESULT linuxinput_create_effect(
newEffect->ref = 1; newEffect->ref = 1;
newEffect->guid = *rguid; newEffect->guid = *rguid;
newEffect->fd = fd; newEffect->fd = fd;
newEffect->gain = 0xFFFF;
/* set the type. this cannot be changed over the effect's life. */ /* set the type. this cannot be changed over the effect's life. */
switch (type) { switch (type) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment