wine-commits May 2021

wine-commits@winehq.org

2 participants
770 discussions

Jacek Caban : ntdll: Make get_machine_wow64_dir static.
by Alexandre Julliard 26 May '21

26 May '21

Module: wine Branch: master Commit: 4e789932c6dad5c10b887fa677d9e0e40b2555d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e789932c6dad5c10b887fa6… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Wed May 26 17:25:27 2021 +0200 ntdll: Make get_machine_wow64_dir static. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/unix/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c index ff49cd5f26b..ee66807997b 100644 --- a/dlls/ntdll/unix/loader.c +++ b/dlls/ntdll/unix/loader.c @@ -1458,7 +1458,7 @@ NTSTATUS load_builtin( const pe_image_info_t *image_info, WCHAR *filename, * * cf. GetSystemWow64Directory2. */ -const WCHAR *get_machine_wow64_dir( WORD machine ) +static const WCHAR *get_machine_wow64_dir( WORD machine ) { static const WCHAR system32[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','t','e','m','3','2','\\',0}; static const WCHAR syswow64[] = {'\\','?','?','\\','C',':','\\','w','i','n','d','o','w','s','\\','s','y','s','w','o','w','6','4','\\',0};

1 0

Arkadiusz Hiler : dinput8: Use scan codes to test uAppData.
by Alexandre Julliard 26 May '21

26 May '21

Module: wine Branch: master Commit: 6b777d0b20270aff3c7296f9ca16f2e0a7866fe6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b777d0b20270aff3c7296f9… Author: Arkadiusz Hiler <ahiler(a)codeweavers.com> Date: Wed May 26 14:10:58 2021 +0300 dinput8: Use scan codes to test uAppData. Virtual key codes are layout dependant while direct input works with scan codes. Using virtual key code for 'A' with AZERTY layout resulted in scan code for 'Q' being sent out, which in turn made the tests fail. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50987 Signed-off-by: Arkadiusz Hiler <ahiler(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput8/tests/device.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/dinput8/tests/device.c b/dlls/dinput8/tests/device.c index 3e6da23b4ab..17deed193dd 100644 --- a/dlls/dinput8/tests/device.c +++ b/dlls/dinput8/tests/device.c @@ -91,7 +91,7 @@ static void test_device_input(IDirectInputDevice8A *lpdid, DWORD event_type, DWO ok (SUCCEEDED(hr), "Failed to acquire device hr=%08x\n", hr); if (event_type == INPUT_KEYBOARD) - keybd_event(event, MapVirtualKeyA(event, MAPVK_VK_TO_VSC), 0, 0); + keybd_event(0, event, KEYEVENTF_SCANCODE, 0); if (event_type == INPUT_MOUSE) mouse_event( event, 0, 0, 0, 0); @@ -307,7 +307,7 @@ static void test_appdata_property_vs_map(struct enum_data *data) hr = IDirectInputDevice8_SetProperty(data->keyboard, DIPROP_APPDATA, &(dp.diph)); ok(SUCCEEDED(hr), "IDirectInputDevice8_SetProperty failed hr=%08x\n", hr); - test_device_input(data->keyboard, INPUT_KEYBOARD, VK_SPACE, 10); + test_device_input(data->keyboard, INPUT_KEYBOARD, DIK_SPACE, 10); dp.diph.dwHow = DIPH_BYID; dp.diph.dwObj = DIDFT_MAKEINSTANCE(DIK_V) | DIDFT_PSHBUTTON; @@ -319,7 +319,7 @@ static void test_appdata_property_vs_map(struct enum_data *data) hr = IDirectInputDevice8_SetDataFormat(data->keyboard, &c_dfDIKeyboard); ok(SUCCEEDED(hr), "SetDataFormat failed: %08x\n", hr); - test_device_input(data->keyboard, INPUT_KEYBOARD, VK_SPACE, -1); + test_device_input(data->keyboard, INPUT_KEYBOARD, DIK_SPACE, -1); dp.diph.dwHow = DIPH_BYID; dp.diph.dwObj = DIDFT_MAKEINSTANCE(DIK_V) | DIDFT_PSHBUTTON; @@ -327,13 +327,13 @@ static void test_appdata_property_vs_map(struct enum_data *data) hr = IDirectInputDevice8_SetProperty(data->keyboard, DIPROP_APPDATA, &(dp.diph)); ok(SUCCEEDED(hr), "IDirectInputDevice8_SetProperty failed hr=%08x\n", hr); - test_device_input(data->keyboard, INPUT_KEYBOARD, 'V', 11); + test_device_input(data->keyboard, INPUT_KEYBOARD, DIK_V, 11); /* back to action map */ hr = IDirectInputDevice8_SetActionMap(data->keyboard, data->lpdiaf, NULL, 0); ok(SUCCEEDED(hr), "SetActionMap failed hr=%08x\n", hr); - test_device_input(data->keyboard, INPUT_KEYBOARD, VK_SPACE, 2); + test_device_input(data->keyboard, INPUT_KEYBOARD, DIK_SPACE, 2); } static void test_action_mapping(void) @@ -402,19 +402,19 @@ static void test_action_mapping(void) /* Test keyboard BuildActionMap */ test_build_action_map(data.keyboard, data.lpdiaf, DITEST_KEYBOARDSPACE, DIDFT_PSHBUTTON, DIK_SPACE); /* Test keyboard input */ - test_device_input(data.keyboard, INPUT_KEYBOARD, VK_SPACE, 2); + test_device_input(data.keyboard, INPUT_KEYBOARD, DIK_SPACE, 2); /* setting format should reset action map */ hr = IDirectInputDevice8_SetDataFormat(data.keyboard, &c_dfDIKeyboard); ok (SUCCEEDED(hr), "IDirectInputDevice8_SetDataFormat failed: %08x\n", hr); - test_device_input(data.keyboard, INPUT_KEYBOARD, VK_SPACE, -1); + test_device_input(data.keyboard, INPUT_KEYBOARD, DIK_SPACE, -1); /* back to action map */ hr = IDirectInputDevice8_SetActionMap(data.keyboard, data.lpdiaf, NULL, 0); ok (SUCCEEDED(hr), "SetActionMap should succeed hr=%08x\n", hr); - test_device_input(data.keyboard, INPUT_KEYBOARD, VK_SPACE, 2); + test_device_input(data.keyboard, INPUT_KEYBOARD, DIK_SPACE, 2); test_appdata_property_vs_map(&data); @@ -958,7 +958,7 @@ static void test_appdata_property(void) ok(SUCCEEDED(hr), "IDirectInputDevice8_SetProperty failed hr=%08x\n", hr); /* the default value */ - test_device_input(di_keyboard, INPUT_KEYBOARD, 'A', -1); + test_device_input(di_keyboard, INPUT_KEYBOARD, DIK_A, -1); dp.diph.dwHow = DIPH_DEVICE; dp.diph.dwObj = 0; @@ -992,19 +992,19 @@ static void test_appdata_property(void) hr = IDirectInputDevice8_SetProperty(di_keyboard, DIPROP_APPDATA, &(dp.diph)); ok(SUCCEEDED(hr), "IDirectInputDevice8_SetProperty failed hr=%08x\n", hr); - test_device_input(di_keyboard, INPUT_KEYBOARD, VK_SPACE, 3); - test_device_input(di_keyboard, INPUT_KEYBOARD, 'A', 4); - test_device_input(di_keyboard, INPUT_KEYBOARD, 'B', 5); - test_device_input(di_keyboard, INPUT_KEYBOARD, 'C', -1); + test_device_input(di_keyboard, INPUT_KEYBOARD, DIK_SPACE, 3); + test_device_input(di_keyboard, INPUT_KEYBOARD, DIK_A, 4); + test_device_input(di_keyboard, INPUT_KEYBOARD, DIK_B, 5); + test_device_input(di_keyboard, INPUT_KEYBOARD, DIK_C, -1); /* setting data format resets APPDATA */ hr = IDirectInputDevice8_SetDataFormat(di_keyboard, &c_dfDIKeyboard); ok(SUCCEEDED(hr), "IDirectInputDevice8_SetDataFormat failed: %08x\n", hr); test_device_input(di_keyboard, INPUT_KEYBOARD, VK_SPACE, -1); - test_device_input(di_keyboard, INPUT_KEYBOARD, 'A', -1); - test_device_input(di_keyboard, INPUT_KEYBOARD, 'B', -1); - test_device_input(di_keyboard, INPUT_KEYBOARD, 'C', -1); + test_device_input(di_keyboard, INPUT_KEYBOARD, DIK_A, -1); + test_device_input(di_keyboard, INPUT_KEYBOARD, DIK_B, -1); + test_device_input(di_keyboard, INPUT_KEYBOARD, DIK_C, -1); DestroyWindow(hwnd); IDirectInputDevice_Release(di_keyboard);

1 0

Rémi Bernon : dinput: Implement IDirectInputDevice_WriteEffectToFile WtoA conversion.
by Alexandre Julliard 26 May '21

26 May '21

Module: wine Branch: master Commit: 06fa39cd7657146ad4b90dee74143daee408c86f URL: https://source.winehq.org/git/wine.git/?a=commit;h=06fa39cd7657146ad4b90dee… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 26 11:23:08 2021 +0200 dinput: Implement IDirectInputDevice_WriteEffectToFile WtoA conversion. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 13 +++++++++++++ dlls/dinput/device.c | 12 ------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/dinput/ansi.c b/dlls/dinput/ansi.c index 05fc42440d7..5d1ea9f0b4e 100644 --- a/dlls/dinput/ansi.c +++ b/dlls/dinput/ansi.c @@ -318,3 +318,16 @@ HRESULT WINAPI IDirectInputDevice7AImpl_EnumEffectsInFile( IDirectInputDevice8A return IDirectInputDevice8_EnumEffectsInFile( iface_w, filename_w, callback, ref, flags ); } + +HRESULT WINAPI IDirectInputDevice7AImpl_WriteEffectToFile( IDirectInputDevice8A *iface_a, const char *filename_a, DWORD entries, + DIFILEEFFECT *file_effect, DWORD flags ) +{ + IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8A( iface_a ); + IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + WCHAR buffer[MAX_PATH], *filename_w = buffer; + + if (!filename_a) filename_w = NULL; + else MultiByteToWideChar( CP_ACP, 0, filename_a, -1, buffer, MAX_PATH ); + + return IDirectInputDevice8_WriteEffectToFile( iface_w, filename_w, entries, file_effect, flags ); +} diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index fe9510d539d..541f39954f6 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1670,18 +1670,6 @@ HRESULT WINAPI IDirectInputDevice7WImpl_EnumEffectsInFile(LPDIRECTINPUTDEVICE8W return DI_OK; } -HRESULT WINAPI IDirectInputDevice7AImpl_WriteEffectToFile(LPDIRECTINPUTDEVICE8A iface, - LPCSTR lpszFileName, - DWORD dwEntries, - LPDIFILEEFFECT rgDiFileEft, - DWORD dwFlags) -{ - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); - FIXME("(%p)->(%s,%08x,%p,%08x): stub !\n", This, lpszFileName, dwEntries, rgDiFileEft, dwFlags); - - return DI_OK; -} - HRESULT WINAPI IDirectInputDevice7WImpl_WriteEffectToFile(LPDIRECTINPUTDEVICE8W iface, LPCWSTR lpszFileName, DWORD dwEntries,

1 0

Rémi Bernon : dinput: Implement IDirectInputDevice_EnumEffectsInFile WtoA conversion.
by Alexandre Julliard 26 May '21

26 May '21

Module: wine Branch: master Commit: aa2da27e5258272852d59c282d95b1528b985c79 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa2da27e5258272852d59c28… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 26 11:23:07 2021 +0200 dinput: Implement IDirectInputDevice_EnumEffectsInFile WtoA conversion. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 13 +++++++++++++ dlls/dinput/device.c | 12 ------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/dlls/dinput/ansi.c b/dlls/dinput/ansi.c index eb331891f25..05fc42440d7 100644 --- a/dlls/dinput/ansi.c +++ b/dlls/dinput/ansi.c @@ -305,3 +305,16 @@ HRESULT WINAPI IDirectInputDevice2AImpl_SendDeviceData( IDirectInputDevice8A *if IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); return IDirectInputDevice8_SendDeviceData( iface_w, count, data, inout, flags ); } + +HRESULT WINAPI IDirectInputDevice7AImpl_EnumEffectsInFile( IDirectInputDevice8A *iface_a, const char *filename_a, LPDIENUMEFFECTSINFILECALLBACK callback, + void *ref, DWORD flags ) +{ + IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8A( iface_a ); + IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + WCHAR buffer[MAX_PATH], *filename_w = buffer; + + if (!filename_a) filename_w = NULL; + else MultiByteToWideChar( CP_ACP, 0, filename_a, -1, buffer, MAX_PATH ); + + return IDirectInputDevice8_EnumEffectsInFile( iface_w, filename_w, callback, ref, flags ); +} diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index abdb235c097..fe9510d539d 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1658,18 +1658,6 @@ HRESULT WINAPI IDirectInputDevice2WImpl_SendDeviceData(LPDIRECTINPUTDEVICE8W ifa return DI_OK; } -HRESULT WINAPI IDirectInputDevice7AImpl_EnumEffectsInFile(LPDIRECTINPUTDEVICE8A iface, - LPCSTR lpszFileName, - LPDIENUMEFFECTSINFILECALLBACK pec, - LPVOID pvRef, - DWORD dwFlags) -{ - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); - FIXME("(%p)->(%s,%p,%p,%08x): stub !\n", This, lpszFileName, pec, pvRef, dwFlags); - - return DI_OK; -} - HRESULT WINAPI IDirectInputDevice7WImpl_EnumEffectsInFile(LPDIRECTINPUTDEVICE8W iface, LPCWSTR lpszFileName, LPDIENUMEFFECTSINFILECALLBACK pec,

1 0

Rémi Bernon : dinput: Implement IDirectInputDevice_EnumEffects WtoA conversion.
by Alexandre Julliard 26 May '21

26 May '21

Module: wine Branch: master Commit: 6340a296808128cb2d7f80caac0b47e1f3ea3190 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6340a296808128cb2d7f80ca… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 26 11:23:06 2021 +0200 dinput: Implement IDirectInputDevice_EnumEffects WtoA conversion. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 27 ++++++++++++++ dlls/dinput/device.c | 12 ------- dlls/dinput/joystick_linuxinput.c | 76 +-------------------------------------- 3 files changed, 28 insertions(+), 87 deletions(-) diff --git a/dlls/dinput/ansi.c b/dlls/dinput/ansi.c index 36b17812f32..eb331891f25 100644 --- a/dlls/dinput/ansi.c +++ b/dlls/dinput/ansi.c @@ -219,6 +219,33 @@ HRESULT WINAPI IDirectInputDevice2AImpl_CreateEffect( IDirectInputDevice8A *ifac return IDirectInputDevice8_CreateEffect( iface_w, guid, effect, out, outer ); } +struct enum_effects_wtoa_params +{ + LPDIENUMEFFECTSCALLBACKA callback; + void *ref; +}; + +static BOOL CALLBACK enum_effects_wtoa_callback( const DIEFFECTINFOW *info_w, void *ref ) +{ + struct enum_effects_wtoa_params *params = ref; + DIEFFECTINFOA info_a = {sizeof(info_a)}; + + dieffectinfo_wtoa( info_w, &info_a ); + return params->callback( &info_a, params->ref ); +} + +HRESULT WINAPI IDirectInputDevice2AImpl_EnumEffects( IDirectInputDevice8A *iface_a, LPDIENUMEFFECTSCALLBACKA callback, + void *ref, DWORD type ) +{ + struct enum_effects_wtoa_params params = {callback, ref}; + IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8A( iface_a ); + IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + + if (!callback) return DIERR_INVALIDPARAM; + + return IDirectInputDevice8_EnumEffects( iface_w, enum_effects_wtoa_callback, &params, type ); +} + HRESULT WINAPI IDirectInputDevice2AImpl_GetEffectInfo( IDirectInputDevice8A *iface_a, DIEFFECTINFOA *info_a, REFGUID guid ) { IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8A( iface_a ); diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 850a4a09c37..abdb235c097 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1587,18 +1587,6 @@ HRESULT WINAPI IDirectInputDevice2WImpl_CreateEffect(LPDIRECTINPUTDEVICE8W iface return DIERR_UNSUPPORTED; } -HRESULT WINAPI IDirectInputDevice2AImpl_EnumEffects( - LPDIRECTINPUTDEVICE8A iface, - LPDIENUMEFFECTSCALLBACKA lpCallback, - LPVOID lpvRef, - DWORD dwFlags) -{ - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); - FIXME("%p)->(%p,%p,0x%08x): stub!\n", This, lpCallback, lpvRef, dwFlags); - - return DI_OK; -} - HRESULT WINAPI IDirectInputDevice2WImpl_EnumEffects( LPDIRECTINPUTDEVICE8W iface, LPDIENUMEFFECTSCALLBACKW lpCallback, diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index dc7f5491c81..307b447d237 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -1093,80 +1093,6 @@ static HRESULT WINAPI JoystickWImpl_CreateEffect(LPDIRECTINPUTDEVICE8W iface, RE /******************************************************************************* * EnumEffects - Enumerate available FF effects */ -static HRESULT WINAPI JoystickAImpl_EnumEffects(LPDIRECTINPUTDEVICE8A iface, - LPDIENUMEFFECTSCALLBACKA lpCallback, - LPVOID pvRef, - DWORD dwEffType) -{ -#ifdef HAVE_STRUCT_FF_EFFECT_DIRECTION - DIEFFECTINFOA dei; /* feif */ - DWORD type = DIEFT_GETTYPE(dwEffType); - JoystickImpl* This = impl_from_IDirectInputDevice8A(iface); - - TRACE("(this=%p,%p,%d) type=%d\n", This, pvRef, dwEffType, type); - - dei.dwSize = sizeof(DIEFFECTINFOA); - - if ((type == DIEFT_ALL || type == DIEFT_CONSTANTFORCE) - && test_bit(This->joydev->ffbits, FF_CONSTANT)) { - IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_ConstantForce); - (*lpCallback)(&dei, pvRef); - } - - if ((type == DIEFT_ALL || type == DIEFT_PERIODIC) - && test_bit(This->joydev->ffbits, FF_PERIODIC)) { - if (test_bit(This->joydev->ffbits, FF_SQUARE)) { - IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Square); - (*lpCallback)(&dei, pvRef); - } - if (test_bit(This->joydev->ffbits, FF_SINE)) { - IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Sine); - (*lpCallback)(&dei, pvRef); - } - if (test_bit(This->joydev->ffbits, FF_TRIANGLE)) { - IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Triangle); - (*lpCallback)(&dei, pvRef); - } - if (test_bit(This->joydev->ffbits, FF_SAW_UP)) { - IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_SawtoothUp); - (*lpCallback)(&dei, pvRef); - } - if (test_bit(This->joydev->ffbits, FF_SAW_DOWN)) { - IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_SawtoothDown); - (*lpCallback)(&dei, pvRef); - } - } - - if ((type == DIEFT_ALL || type == DIEFT_RAMPFORCE) - && test_bit(This->joydev->ffbits, FF_RAMP)) { - IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_RampForce); - (*lpCallback)(&dei, pvRef); - } - - if (type == DIEFT_ALL || type == DIEFT_CONDITION) { - if (test_bit(This->joydev->ffbits, FF_SPRING)) { - IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Spring); - (*lpCallback)(&dei, pvRef); - } - if (test_bit(This->joydev->ffbits, FF_DAMPER)) { - IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Damper); - (*lpCallback)(&dei, pvRef); - } - if (test_bit(This->joydev->ffbits, FF_INERTIA)) { - IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Inertia); - (*lpCallback)(&dei, pvRef); - } - if (test_bit(This->joydev->ffbits, FF_FRICTION)) { - IDirectInputDevice8_GetEffectInfo(iface, &dei, &GUID_Friction); - (*lpCallback)(&dei, pvRef); - } - } - -#endif - - return DI_OK; -} - static HRESULT WINAPI JoystickWImpl_EnumEffects(LPDIRECTINPUTDEVICE8W iface, LPDIENUMEFFECTSCALLBACKW lpCallback, LPVOID pvRef, @@ -1428,7 +1354,7 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_RunControlPanel, IDirectInputDevice2AImpl_Initialize, IDirectInputDevice2AImpl_CreateEffect, - JoystickAImpl_EnumEffects, + IDirectInputDevice2AImpl_EnumEffects, IDirectInputDevice2AImpl_GetEffectInfo, IDirectInputDevice2AImpl_GetForceFeedbackState, IDirectInputDevice2AImpl_SendForceFeedbackCommand,

1 0

Rémi Bernon : dinput: Implement IDirectInputDevice_GetEffectInfo WtoA conversion.
by Alexandre Julliard 26 May '21

26 May '21

Module: wine Branch: master Commit: 70b25ccfaae48172278800f660fd92e40735ec69 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70b25ccfaae48172278800f6… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 26 11:23:05 2021 +0200 dinput: Implement IDirectInputDevice_GetEffectInfo WtoA conversion. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 25 +++++++++++++++++++++++++ dlls/dinput/device.c | 10 ---------- dlls/dinput/effect_linuxinput.c | 34 ---------------------------------- dlls/dinput/joystick_linuxinput.c | 18 +----------------- 4 files changed, 26 insertions(+), 61 deletions(-) diff --git a/dlls/dinput/ansi.c b/dlls/dinput/ansi.c index eafbeafbf18..36b17812f32 100644 --- a/dlls/dinput/ansi.c +++ b/dlls/dinput/ansi.c @@ -64,6 +64,15 @@ static void dideviceobjectinstance_wtoa( const DIDEVICEOBJECTINSTANCEW *in, DIDE out->wReserved = in->wReserved; } +static void dieffectinfo_wtoa( const DIEFFECTINFOW *in, DIEFFECTINFOA *out ) +{ + out->guid = in->guid; + out->dwEffType = in->dwEffType; + out->dwStaticParams = in->dwStaticParams; + out->dwDynamicParams = in->dwDynamicParams; + WideCharToMultiByte( CP_ACP, 0, in->tszName, -1, out->tszName, sizeof(out->tszName), NULL, NULL ); +} + HRESULT WINAPI IDirectInputDevice2AImpl_QueryInterface( IDirectInputDevice8A *iface_a, REFIID iid, void **out ) { IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8A( iface_a ); @@ -210,6 +219,22 @@ HRESULT WINAPI IDirectInputDevice2AImpl_CreateEffect( IDirectInputDevice8A *ifac return IDirectInputDevice8_CreateEffect( iface_w, guid, effect, out, outer ); } +HRESULT WINAPI IDirectInputDevice2AImpl_GetEffectInfo( IDirectInputDevice8A *iface_a, DIEFFECTINFOA *info_a, REFGUID guid ) +{ + IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8A( iface_a ); + IDirectInputDevice8W *iface_w = IDirectInputDevice8W_from_impl( impl ); + DIEFFECTINFOW info_w = {sizeof(info_w)}; + HRESULT hr; + + if (!info_a) return E_POINTER; + if (info_a->dwSize != sizeof(DIEFFECTINFOA)) return DIERR_INVALIDPARAM; + + hr = IDirectInputDevice8_GetEffectInfo( iface_w, &info_w, guid ); + dieffectinfo_wtoa( &info_w, info_a ); + + return hr; +} + HRESULT WINAPI IDirectInputDevice2AImpl_GetForceFeedbackState( IDirectInputDevice8A *iface_a, DWORD *state ) { IDirectInputDeviceImpl *impl = impl_from_IDirectInputDevice8A( iface_a ); diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 16bf4c663a1..850a4a09c37 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1611,16 +1611,6 @@ HRESULT WINAPI IDirectInputDevice2WImpl_EnumEffects( return DI_OK; } -HRESULT WINAPI IDirectInputDevice2AImpl_GetEffectInfo( - LPDIRECTINPUTDEVICE8A iface, - LPDIEFFECTINFOA lpdei, - REFGUID rguid) -{ - IDirectInputDeviceImpl *This = impl_from_IDirectInputDevice8A(iface); - FIXME("(%p)->(%p,%s): stub!\n", This, lpdei, debugstr_guid(rguid)); - return DI_OK; -} - HRESULT WINAPI IDirectInputDevice2WImpl_GetEffectInfo( LPDIRECTINPUTDEVICE8W iface, LPDIEFFECTINFOW lpdei, diff --git a/dlls/dinput/effect_linuxinput.c b/dlls/dinput/effect_linuxinput.c index ec4b00b873a..486163aeffa 100644 --- a/dlls/dinput/effect_linuxinput.c +++ b/dlls/dinput/effect_linuxinput.c @@ -852,40 +852,6 @@ DECLSPEC_HIDDEN HRESULT linuxinput_create_effect( return DI_OK; } -DECLSPEC_HIDDEN HRESULT linuxinput_get_info_A( - int fd, - REFGUID rguid, - LPDIEFFECTINFOA info) -{ - DWORD type = typeFromGUID(rguid); - - TRACE("(%d, %s, %p) type=%d\n", fd, _dump_dinput_GUID(rguid), info, type); - - if (!info) return E_POINTER; - - if (info->dwSize != sizeof(DIEFFECTINFOA)) return DIERR_INVALIDPARAM; - - info->guid = *rguid; - - info->dwEffType = type; - /* the event device API does not support querying for all these things - * therefore we assume that we have support for them - * that's not as dangerous as it sounds, since drivers are allowed to - * ignore parameters they claim to support anyway */ - info->dwEffType |= DIEFT_DEADBAND | DIEFT_FFATTACK | DIEFT_FFFADE - | DIEFT_POSNEGCOEFFICIENTS | DIEFT_POSNEGSATURATION - | DIEFT_SATURATION | DIEFT_STARTDELAY; - - /* again, assume we have support for everything */ - info->dwStaticParams = DIEP_ALLPARAMS; - info->dwDynamicParams = info->dwStaticParams; - - /* yes, this is windows behavior (print the GUID_Name for name) */ - strcpy(info->tszName, _dump_dinput_GUID(rguid)); - - return DI_OK; -} - DECLSPEC_HIDDEN HRESULT linuxinput_get_info_W( int fd, REFGUID rguid, diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 49eaf3ed44d..dc7f5491c81 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -86,7 +86,6 @@ struct wine_input_absinfo { /* implemented in effect_linuxinput.c */ HRESULT linuxinput_create_effect(int* fd, REFGUID rguid, struct list *parent_list_entry, LPDIRECTINPUTEFFECT* peff); -HRESULT linuxinput_get_info_A(int fd, REFGUID rguid, LPDIEFFECTINFOA info); HRESULT linuxinput_get_info_W(int fd, REFGUID rguid, LPDIEFFECTINFOW info); static HRESULT WINAPI JoystickWImpl_SendForceFeedbackCommand(LPDIRECTINPUTDEVICE8W iface, DWORD dwFlags); @@ -1251,21 +1250,6 @@ static HRESULT WINAPI JoystickWImpl_EnumEffects(LPDIRECTINPUTDEVICE8W iface, /******************************************************************************* * GetEffectInfo - Get information about a particular effect */ -static HRESULT WINAPI JoystickAImpl_GetEffectInfo(LPDIRECTINPUTDEVICE8A iface, - LPDIEFFECTINFOA pdei, - REFGUID guid) -{ - JoystickImpl* This = impl_from_IDirectInputDevice8A(iface); - - TRACE("(this=%p,%p,%s)\n", This, pdei, _dump_dinput_GUID(guid)); - -#ifdef HAVE_STRUCT_FF_EFFECT_DIRECTION - return linuxinput_get_info_A(This->joyfd, guid, pdei); -#else - return DI_OK; -#endif -} - static HRESULT WINAPI JoystickWImpl_GetEffectInfo(LPDIRECTINPUTDEVICE8W iface, LPDIEFFECTINFOW pdei, REFGUID guid) @@ -1445,7 +1429,7 @@ static const IDirectInputDevice8AVtbl JoystickAvt = IDirectInputDevice2AImpl_Initialize, IDirectInputDevice2AImpl_CreateEffect, JoystickAImpl_EnumEffects, - JoystickAImpl_GetEffectInfo, + IDirectInputDevice2AImpl_GetEffectInfo, IDirectInputDevice2AImpl_GetForceFeedbackState, IDirectInputDevice2AImpl_SendForceFeedbackCommand, IDirectInputDevice2AImpl_EnumCreatedEffectObjects,

1 0

Rémi Bernon : dinput: Factor out IDirectInputDevice_GetObjectInfo WtoA conversions.
by Alexandre Julliard 26 May '21

26 May '21

Module: wine Branch: master Commit: 08d07c4cc26410a62ee074913cd9a1d9a5fbf01d URL: https://source.winehq.org/git/wine.git/?a=commit;h=08d07c4cc26410a62ee07491… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 26 11:23:04 2021 +0200 dinput: Factor out IDirectInputDevice_GetObjectInfo WtoA conversions. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/ansi.c | 19 +++++++++++++++++++ dlls/dinput/device.c | 32 -------------------------------- dlls/dinput/joystick.c | 27 --------------------------- dlls/dinput/joystick_linux.c | 2 +- dlls/dinput/joystick_linuxinput.c | 2 +- dlls/dinput/joystick_osx.c | 2 +- dlls/dinput/joystick_private.h | 3 --- dlls/dinput/keyboard.c | 25 +------------------------ dlls/dinput/mouse.c | 29 +---------------------------- 9 files changed, 24 insertions(+), 117 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=08d07c4cc26410a62ee0…

1 0

Rémi Bernon : dinput/tests: Check IDirectInputDevice2AImpl_GetObjectInfo error codes.
by Alexandre Julliard 26 May '21

26 May '21

Module: wine Branch: master Commit: 49c66a3a94725bfee143ca1d7ed0012f025ee451 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49c66a3a94725bfee143ca1d… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Wed May 26 11:23:03 2021 +0200 dinput/tests: Check IDirectInputDevice2AImpl_GetObjectInfo error codes. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/device.c | 12 ++++++------ dlls/dinput/joystick.c | 8 +++++++- dlls/dinput/mouse.c | 8 +++++++- dlls/dinput/tests/device.c | 10 ++++++++++ 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/dlls/dinput/device.c b/dlls/dinput/device.c index 31b859801c7..c1388551644 100644 --- a/dlls/dinput/device.c +++ b/dlls/dinput/device.c @@ -1457,9 +1457,9 @@ HRESULT WINAPI IDirectInputDevice2AImpl_GetObjectInfo( DIDEVICEOBJECTINSTANCEW didoiW; HRESULT res; - if (!pdidoi || - (pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCEA) && - pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3A))) + if (!pdidoi) return E_POINTER; + if (pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCEA) && + pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3A)) return DIERR_INVALIDPARAM; didoiW.dwSize = sizeof(didoiW); @@ -1492,9 +1492,9 @@ HRESULT WINAPI IDirectInputDevice2WImpl_GetObjectInfo( TRACE("(%p) %d(0x%08x) -> %p\n", This, dwHow, dwObj, pdidoi); - if (!pdidoi || - (pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCEW) && - pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3W))) + if (!pdidoi) return E_POINTER; + if (pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCEW) && + pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3W)) return DIERR_INVALIDPARAM; switch (dwHow) diff --git a/dlls/dinput/joystick.c b/dlls/dinput/joystick.c index 3749eed7efe..ab8b87f552b 100644 --- a/dlls/dinput/joystick.c +++ b/dlls/dinput/joystick.c @@ -580,12 +580,18 @@ HRESULT WINAPI JoystickAGenericImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8A iface, JoystickGenericImpl *This = impl_from_IDirectInputDevice8A(iface); HRESULT res; DIDEVICEOBJECTINSTANCEW didoiW; - DWORD dwSize = pdidoi->dwSize; + DWORD dwSize; + + if (!pdidoi) return E_POINTER; + if (pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCEA) && + pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3A)) + return DIERR_INVALIDPARAM; didoiW.dwSize = sizeof(didoiW); res = JoystickWGenericImpl_GetObjectInfo(IDirectInputDevice8W_from_impl(This), &didoiW, dwObj, dwHow); if (res != DI_OK) return res; + dwSize = pdidoi->dwSize; memset(pdidoi, 0, pdidoi->dwSize); memcpy(pdidoi, &didoiW, FIELD_OFFSET(DIDEVICEOBJECTINSTANCEW, tszName)); pdidoi->dwSize = dwSize; diff --git a/dlls/dinput/mouse.c b/dlls/dinput/mouse.c index 65f173daa81..bc99ea37c68 100644 --- a/dlls/dinput/mouse.c +++ b/dlls/dinput/mouse.c @@ -802,12 +802,18 @@ static HRESULT WINAPI SysMouseAImpl_GetObjectInfo(LPDIRECTINPUTDEVICE8A iface, SysMouseImpl *This = impl_from_IDirectInputDevice8A(iface); HRESULT res; DIDEVICEOBJECTINSTANCEW didoiW; - DWORD dwSize = pdidoi->dwSize; + DWORD dwSize; + + if (!pdidoi) return E_POINTER; + if (pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCEA) && + pdidoi->dwSize != sizeof(DIDEVICEOBJECTINSTANCE_DX3A)) + return DIERR_INVALIDPARAM; didoiW.dwSize = sizeof(didoiW); res = SysMouseWImpl_GetObjectInfo(IDirectInputDevice8W_from_impl(This), &didoiW, dwObj, dwHow); if (res != DI_OK) return res; + dwSize = pdidoi->dwSize; memset(pdidoi, 0, pdidoi->dwSize); memcpy(pdidoi, &didoiW, FIELD_OFFSET(DIDEVICEOBJECTINSTANCEW, tszName)); pdidoi->dwSize = dwSize; diff --git a/dlls/dinput/tests/device.c b/dlls/dinput/tests/device.c index 9be00a671fb..485acca4f61 100644 --- a/dlls/dinput/tests/device.c +++ b/dlls/dinput/tests/device.c @@ -158,6 +158,16 @@ static void test_object_info(IDirectInputDeviceA *device, HWND hwnd) hr = IDirectInputDevice_GetDeviceData(device, sizeof(buffer[0]), buffer, &cnt, 0); ok(hr == DI_OK, "GetDeviceData() failed: %08x\n", hr); + hr = IDirectInputDevice_GetObjectInfo(device, NULL, 16, DIPH_BYOFFSET); + ok(hr == E_POINTER, "IDirectInputDevice_GetObjectInfo returned %08x, expected %08x\n", hr, E_POINTER); + + obj_info.dwSize = 1; + hr = IDirectInputDevice_GetObjectInfo(device, &obj_info, 16, DIPH_BYOFFSET); + ok(hr == DIERR_INVALIDPARAM, "IDirectInputDevice_GetObjectInfo returned %08x, expected %08x\n", hr, DIERR_INVALIDPARAM); + obj_info.dwSize = 0xdeadbeef; + hr = IDirectInputDevice_GetObjectInfo(device, &obj_info, 16, DIPH_BYOFFSET); + ok(hr == DIERR_INVALIDPARAM, "IDirectInputDevice_GetObjectInfo returned %08x, expected %08x\n", hr, DIERR_INVALIDPARAM); + /* No need to test devices without axis */ obj_info.dwSize = sizeof(obj_info); hr = IDirectInputDevice_GetObjectInfo(device, &obj_info, 16, DIPH_BYOFFSET);

1 0

Paul Gofman : ntdll/tests: Do not test old xstate structure details in test_user_shared_data().
by Alexandre Julliard 26 May '21

26 May '21

Module: wine Branch: master Commit: 2fac2e6b325455295300580c7e1a58450c52b029 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fac2e6b325455295300580c… Author: Paul Gofman <pgofman(a)codeweavers.com> Date: Wed May 26 15:10:09 2021 +0300 ntdll/tests: Do not test old xstate structure details in test_user_shared_data(). Fixes test failures on 32 bit Testbot machines. Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/virtual.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/dlls/ntdll/tests/virtual.c b/dlls/ntdll/tests/virtual.c index 7d457e2d5b8..22ee7f06ac7 100644 --- a/dlls/ntdll/tests/virtual.c +++ b/dlls/ntdll/tests/virtual.c @@ -928,12 +928,10 @@ static void test_user_shared_data(void) struct old_xstate_configuration *xs_old = (struct old_xstate_configuration *)((char *)user_shared_data + 0x3e0); - memset(&xstate, 0, sizeof(xstate)); - xstate.EnabledFeatures = xstate.EnabledVolatileFeatures = xs_old->EnabledFeatures; - memcpy(&xstate.Size, &xs_old->Size, sizeof(*xs_old) - offsetof(struct old_xstate_configuration, Size)); - for (i = 0; i < 3; ++i) - xstate.AllFeatures[i] = xs_old->Features[i].Size; - xstate.AllFeatureSize = 512 + sizeof(XSTATE); + ok(feature_mask == xs_old->EnabledFeatures, "Got unexpected xs_old->EnabledFeatures %s.\n", + wine_dbgstr_longlong(xs_old->EnabledFeatures)); + win_skip("Old structure layout.\n"); + return; } trace("XState EnabledFeatures %s.\n", wine_dbgstr_longlong(xstate.EnabledFeatures)); @@ -960,7 +958,7 @@ static void test_user_shared_data(void) for (i = 0; i < ARRAY_SIZE(feature_sizes); ++i) { ok(xstate.AllFeatures[i] == feature_sizes[i] - || broken(!xstate.AllFeatures[i]) /* win10pro */, + || broken(!xstate.AllFeatures[i]) /* win10 on Testbot VMs */, "Got unexpected AllFeatures[%u] %u, expected %u.\n", i, xstate.AllFeatures[i], feature_sizes[i]); ok(xstate.Features[i].Size == feature_sizes[i], "Got unexpected Features[%u].Size %u, expected %u.\n", i,

1 0

Hans Leidekker : webservices: Support IPv6 address format in WsDecodeUrl.
by Alexandre Julliard 26 May '21

26 May '21

Module: wine Branch: master Commit: ea931c82ef5d7a42ba59ac00b17e057068f95818 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ea931c82ef5d7a42ba59ac00… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Wed May 26 10:57:48 2021 +0200 webservices: Support IPv6 address format in WsDecodeUrl. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/webservices/tests/url.c | 4 ++++ dlls/webservices/url.c | 16 +++++++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/dlls/webservices/tests/url.c b/dlls/webservices/tests/url.c index 718f072f19c..4343dc6a3dd 100644 --- a/dlls/webservices/tests/url.c +++ b/dlls/webservices/tests/url.c @@ -50,6 +50,8 @@ static void test_WsDecodeUrl(void) static const WCHAR url25[] = L"http://host?query%202"; static const WCHAR url26[] = L"http://host#frag%202"; static const WCHAR url27[] = L"http://host/%c3%ab/"; + static const WCHAR url28[] = L"net.tcp://[::1]"; + static const WCHAR url29[] = L"net.tcp://[::1]:1111"; static const struct { const WCHAR *str; @@ -97,6 +99,8 @@ static void test_WsDecodeUrl(void) { url25, S_OK, WS_URL_HTTP_SCHEME_TYPE, url25 + 7, 4, 80, NULL, 0, NULL, 0, L"query 2", 7 }, { url26, S_OK, WS_URL_HTTP_SCHEME_TYPE, url26 + 7, 4, 80, NULL, 0, NULL, 0, NULL, 0, L"frag 2", 6 }, { url27, S_OK, WS_URL_HTTP_SCHEME_TYPE, url27 + 7, 4, 80, NULL, 0, L"/\x00eb/", 3 }, + { url28, S_OK, WS_URL_NETTCP_SCHEME_TYPE, url28 + 10, 5, 808, NULL, 0, NULL, 0 }, + { url29, S_OK, WS_URL_NETTCP_SCHEME_TYPE, url29 + 10, 5, 1111, url29 + 16, 4, NULL, 0 }, }; WS_HEAP *heap; WS_STRING str; diff --git a/dlls/webservices/url.c b/dlls/webservices/url.c index f2fbda83c1f..b44ee468e27 100644 --- a/dlls/webservices/url.c +++ b/dlls/webservices/url.c @@ -169,16 +169,14 @@ static WCHAR *url_decode( WCHAR *str, ULONG len, WS_HEAP *heap, ULONG *ret_len ) /************************************************************************** * WsDecodeUrl [webservices.@] */ -HRESULT WINAPI WsDecodeUrl( const WS_STRING *str, ULONG flags, WS_HEAP *heap, WS_URL **ret, - WS_ERROR *error ) +HRESULT WINAPI WsDecodeUrl( const WS_STRING *str, ULONG flags, WS_HEAP *heap, WS_URL **ret, WS_ERROR *error ) { HRESULT hr = WS_E_QUOTA_EXCEEDED; WCHAR *p, *q, *decoded = NULL; WS_HTTP_URL *url = NULL; ULONG len, len_decoded, port = 0; - TRACE( "%s %08x %p %p %p\n", str ? debugstr_wn(str->chars, str->length) : "null", flags, - heap, ret, error ); + TRACE( "%s %08x %p %p %p\n", str ? debugstr_wn(str->chars, str->length) : "null", flags, heap, ret, error ); if (error) FIXME( "ignoring error parameter\n" ); if (!str || !heap) return E_INVALIDARG; @@ -203,7 +201,15 @@ HRESULT WINAPI WsDecodeUrl( const WS_STRING *str, ULONG flags, WS_HEAP *heap, WS if (!--len || *++q != '/') goto done; p = ++q; len--; - while (len && *q != '/' && *q != ':' && *q != '?' && *q != '#') { q++; len--; }; + if (*q == '[') + { + while (len && *q != ']') { q++; len--; }; + if (*q++ != ']') goto done; + } + else + { + while (len && *q != '/' && *q != ':' && *q != '?' && *q != '#') { q++; len--; }; + } if (q == p) goto done; url->host.length = q - p; url->host.chars = p;

1 0

← Newer
1
...
11
12
13
14
15
16
17
...
77
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits May 2021