system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-02 12:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

joy.cpl: Read the effect DIEFFECTINFOW instead of storing it.

Browse source
This commit is contained in:
Rémi Bernon 2022-11-26 20:19:55 +01:00 committed by Alexandre Julliard
parent d9bd1c49bb
commit 1c94551ef8
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
dlls/joy.cpl/main.c
View file

@ -71,7 +71,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(joycpl);
struct Effect
{
IDirectInputEffect *effect;
DIEFFECTINFOW info;
};
struct Joystick
@ -216,7 +215,6 @@ static BOOL CALLBACK enum_effects( const DIEFFECTINFOW *info, void *context )
}
joystick->effects[joystick->cur_effect].effect = effect;
joystick->effects[joystick->cur_effect].info = *info;
joystick->cur_effect += 1;
return DIENUM_CONTINUE;
@ -866,9 +864,12 @@ static void initialize_effects_list(HWND hwnd, struct Joystick* joy)
for (i=0; i < joy->num_effects; i++)
{
/* Effect names start with GUID_, so we'll skip this part */
WCHAR *name = joy->effects[i].info.tszName + 5;
SendDlgItemMessageW(hwnd, IDC_FFEFFECTLIST, LB_ADDSTRING, 0, (LPARAM) name);
DIEFFECTINFOW info = {.dwSize = sizeof(DIEFFECTINFOW)};
GUID guid;
if (FAILED(IDirectInputEffect_GetEffectGuid( joy->effects[i].effect, &guid ))) continue;
if (FAILED(IDirectInputDevice8_GetEffectInfo( joy->device, &info, &guid ))) continue;
SendDlgItemMessageW(hwnd, IDC_FFEFFECTLIST, LB_ADDSTRING, 0, (LPARAM)(info.tszName + 5));
}
}