Michael Stefaniuc : joy.cpl: Avoid pointers to out of scope variables ( PVS-Studio).
Alexandre Julliard
julliard at wine.codeweavers.com
Thu Dec 4 16:01:09 CST 2014
Module: wine
Branch: master
Commit: 721c502db98fe020d0cde32c3b42d4c7432e2704
URL: http://source.winehq.org/git/wine.git/?a=commit;h=721c502db98fe020d0cde32c3b42d4c7432e2704
Author: Michael Stefaniuc <mstefani at redhat.de>
Date: Thu Dec 4 11:00:43 2014 +0100
joy.cpl: Avoid pointers to out of scope variables (PVS-Studio).
---
dlls/joy.cpl/main.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c
index 53c0eae..d6ba5d5 100644
--- a/dlls/joy.cpl/main.c
+++ b/dlls/joy.cpl/main.c
@@ -721,6 +721,9 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef)
DWORD axes[2] = {DIJOFS_X, DIJOFS_Y};
int direction[2] = {0, 0};
struct Joystick *joystick = pvRef;
+ DIRAMPFORCE rforce;
+ DICONSTANTFORCE cforce;
+ DIPERIODIC pforce;
if (joystick->effects == NULL)
{
@@ -744,8 +747,6 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef)
if (IsEqualGUID(&pdei->guid, &GUID_RampForce))
{
- DIRAMPFORCE rforce;
-
rforce.lStart = 0;
rforce.lEnd = DI_FFNOMINALMAX;
@@ -755,8 +756,6 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef)
}
else if (IsEqualGUID(&pdei->guid, &GUID_ConstantForce))
{
- DICONSTANTFORCE cforce;
-
cforce.lMagnitude = DI_FFNOMINALMAX;
dieffect.cbTypeSpecificParams = sizeof(cforce);
@@ -769,8 +768,6 @@ static BOOL CALLBACK ff_effects_callback(const DIEFFECTINFOW *pdei, void *pvRef)
IsEqualGUID(&pdei->guid, &GUID_SawtoothUp) ||
IsEqualGUID(&pdei->guid, &GUID_SawtoothDown))
{
- DIPERIODIC pforce;
-
pforce.dwMagnitude = DI_FFNOMINALMAX;
pforce.lOffset = 0;
pforce.dwPhase = 0;
More information about the wine-cvs
mailing list