May 2021 - Wine-Commits - list.winehq.org

Esme Povirk : gdiplus: Implement reference counting for private font families.
by Alexandre Julliard May 27, 2021

May 27, 2021

Module: wine Branch: master Commit: a5540798605b3ef9abcf654bc28d9dd8d8736e53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5540798605b3ef9abcf654b… Author: Esme Povirk <esme(a)codeweavers.com> Date: Wed May 26 15:49:18 2021 -0500 gdiplus: Implement reference counting for private font families. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50896 Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/font.c | 22 ++++++++++++++++------ dlls/gdiplus/gdiplus_private.h | 2 ++ dlls/gdiplus/tests/font.c | 13 ++++++++++++- 3 files changed, 30 insertions(+), 7 deletions(-) diff --git a/dlls/gdiplus/font.c b/dlls/gdiplus/font.c index cf43985d02a..64604367da3 100644 --- a/dlls/gdiplus/font.c +++ b/dlls/gdiplus/font.c @@ -190,7 +190,7 @@ GpStatus WINGDIPAPI GdipCreateFont(GDIPCONST GpFontFamily *fontFamily, (*font)->unit = unit; (*font)->emSize = emSize; (*font)->otm = otm; - (*font)->family = (GpFontFamily *)fontFamily; + GdipCloneFontFamily((GpFontFamily*)fontFamily, &(*font)->family); TRACE("<-- %p\n", *font); @@ -323,8 +323,7 @@ GpStatus WINGDIPAPI GdipGetFamily(GpFont *font, GpFontFamily **family) if (!(font && family)) return InvalidParameter; - *family = font->family; - return Ok; + return GdipCloneFontFamily(font->family, family); } static REAL get_font_size(const GpFont *font) @@ -746,9 +745,8 @@ GpStatus WINGDIPAPI GdipCreateFontFamilyFromName(GDIPCONST WCHAR *name, { if (!wcsicmp(lf.lfFaceName, collection->FontFamilies[i]->FamilyName)) { - *family = collection->FontFamilies[i]; + status = GdipCloneFontFamily(collection->FontFamilies[i], family); TRACE("<-- %p\n", *family); - status = Ok; break; } } @@ -778,6 +776,10 @@ GpStatus WINGDIPAPI GdipCloneFontFamily(GpFontFamily *family, GpFontFamily **clo TRACE("%p (%s), %p\n", family, debugstr_w(family->FamilyName), clone); *clone = family; + + if (!family->installed) + InterlockedIncrement(&family->ref); + return Ok; } @@ -835,6 +837,11 @@ GpStatus WINGDIPAPI GdipDeleteFontFamily(GpFontFamily *FontFamily) if (!FontFamily) return InvalidParameter; + if (!FontFamily->installed && !InterlockedDecrement(&FontFamily->ref)) + { + heap_free(FontFamily); + } + return Ok; } @@ -1079,7 +1086,7 @@ GpStatus WINGDIPAPI GdipDeletePrivateFontCollection(GpFontCollection **fontColle if (!fontCollection) return InvalidParameter; - for (i = 0; i < (*fontCollection)->count; i++) heap_free((*fontCollection)->FontFamilies[i]); + for (i = 0; i < (*fontCollection)->count; i++) GdipDeleteFontFamily((*fontCollection)->FontFamilies[i]); heap_free((*fontCollection)->FontFamilies); heap_free(*fontCollection); @@ -1541,6 +1548,7 @@ GpStatus WINGDIPAPI GdipGetFontCollectionFamilyList( for (i = 0; i < numSought && i < fontCollection->count; i++) { + /* caller is responsible for cloning these if it keeps references */ gpfamilies[i] = fontCollection->FontFamilies[i]; } @@ -1641,6 +1649,8 @@ static INT CALLBACK add_font_proc(const LOGFONTW *lfw, const TEXTMETRICW *ntm, family->descent = fm.descent; family->line_spacing = fm.line_spacing; family->dpi = fm.dpi; + family->installed = param->is_system; + family->ref = 1; lstrcpyW(family->FamilyName, lfw->lfFaceName); diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 2b0f920473d..22213e9f278 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -543,6 +543,8 @@ struct GpFontFamily{ WCHAR FamilyName[LF_FACESIZE]; UINT16 em_height, ascent, descent, line_spacing; /* in font units */ int dpi; + BOOL installed; + LONG ref; }; /* internal use */ diff --git a/dlls/gdiplus/tests/font.c b/dlls/gdiplus/tests/font.c index 32cd1ff2c4f..b208989c054 100644 --- a/dlls/gdiplus/tests/font.c +++ b/dlls/gdiplus/tests/font.c @@ -72,7 +72,7 @@ static void test_long_name(void) GpStatus stat; GpFontCollection *fonts; INT num_families; - GpFontFamily *family; + GpFontFamily *family, *cloned_family; WCHAR family_name[LF_FACESIZE]; GpFont *font; @@ -98,6 +98,10 @@ static void test_long_name(void) stat = GdipCreateFont(family, 256.0, FontStyleRegular, UnitPixel, &font); ok(stat == Ok, "GdipCreateFont failed: %d\n", stat); + stat = GdipCloneFontFamily(family, &cloned_family); + ok(stat == Ok, "GdipCloneFontFamily failed: %d\n", stat); + ok(family == cloned_family, "GdipCloneFontFamily returned new object\n"); + /* Cleanup */ stat = GdipDeleteFont(font); @@ -106,6 +110,13 @@ static void test_long_name(void) stat = GdipDeletePrivateFontCollection(&fonts); ok(stat == Ok, "GdipDeletePrivateFontCollection failed: %d\n", stat); + /* Cloned family survives after collection is deleted */ + stat = GdipGetFamilyName(cloned_family, family_name, LANG_NEUTRAL); + ok(stat == Ok, "GdipGetFamilyName failed: %d\n", stat); + + stat = GdipDeleteFontFamily(cloned_family); + ok(stat == Ok, "GdipDeleteFontFamily failed: %d\n", stat); + DELETE_FONTFILE(path); }

1 0

Alistair Leslie-Hughes : gdi32: Don't override FontSubstitutes on a DPI only change.
by Alexandre Julliard May 27, 2021

May 27, 2021

Module: wine Branch: master Commit: 7763efa347327868f6c8ba0c91f60f53a885688a URL: https://source.winehq.org/git/wine.git/?a=commit;h=7763efa347327868f6c8ba0c… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 27 15:50:48 2021 +1000 gdi32: Don't override FontSubstitutes on a DPI only change. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=36010 Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/font.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/font.c b/dlls/gdi32/font.c index 49775b7a806..c990fe5e233 100644 --- a/dlls/gdi32/font.c +++ b/dlls/gdi32/font.c @@ -2485,7 +2485,8 @@ static void update_codepage(void) add_font_list(hkey, &nls_update_font_list[i], screen_dpi); RegCloseKey(hkey); } - if (!RegCreateKeyW( HKEY_LOCAL_MACHINE, + /* Only update these if the Codepage changed. */ + if (strcmp( buf, cpbuf ) && !RegCreateKeyW( HKEY_LOCAL_MACHINE, L"Software\\Microsoft\\Windows NT\\CurrentVersion\\FontSubstitutes", &hkey )) { RegSetValueExA(hkey, "MS Shell Dlg", 0, REG_SZ, (const BYTE *)nls_update_font_list[i].shelldlg,

1 0

Ziqing Hui : windowscodecs/tests: Test CreateNewFrame for DDS encoder.
by Alexandre Julliard May 26, 2021

May 26, 2021

Module: wine Branch: master Commit: c798ae1af896ad5bb816ca3da784520d7c9d832d URL: https://source.winehq.org/git/wine.git/?a=commit;h=c798ae1af896ad5bb816ca3d… Author: Ziqing Hui <zhui(a)codeweavers.com> Date: Wed May 26 09:53:54 2021 +0800 windowscodecs/tests: Test CreateNewFrame for DDS encoder. Signed-off-by: Ziqing Hui <zhui(a)codeweavers.com> Signed-off-by: Esme Povirk <esme(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/tests/ddsformat.c | 51 ++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/dlls/windowscodecs/tests/ddsformat.c b/dlls/windowscodecs/tests/ddsformat.c index f369569104a..ecc5d0ec00d 100644 --- a/dlls/windowscodecs/tests/ddsformat.c +++ b/dlls/windowscodecs/tests/ddsformat.c @@ -1412,10 +1412,61 @@ end: release_encoder(encoder, dds_encoder, stream); } +static void test_dds_encoder_create_frame(void) +{ + WICDdsParameters params = { 4, 4, 1, 3, 1, DXGI_FORMAT_BC1_UNORM, + WICDdsTexture2D, WICDdsAlphaModePremultiplied }; + IWICBitmapFrameEncode *frame0 = NULL, *frame1 = NULL; + UINT array_index, mip_level, slice_index; + IWICDdsEncoder *dds_encoder = NULL; + IWICBitmapEncoder *encoder = NULL; + IWICStream *stream = NULL; + BYTE buffer[1024]; + HRESULT hr; + + hr = create_and_init_encoder(buffer, sizeof(buffer), &encoder, &dds_encoder, &stream); + if (hr != S_OK) goto end; + IWICDdsEncoder_SetParameters(dds_encoder, &params); + + hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frame0, NULL); + ok(hr == S_OK, "CreateNewFrame failed, hr %#x\n", hr); + hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frame1, NULL); + todo_wine + ok(hr == WINCODEC_ERR_WRONGSTATE, "CreateNewFrame got unexpected hr %#x\n", hr); + if (hr == S_OK) IWICBitmapFrameEncode_Release(frame1); + + IWICBitmapFrameEncode_Release(frame0); + hr = IWICBitmapEncoder_CreateNewFrame(encoder, &frame1, NULL); + todo_wine + ok(hr == WINCODEC_ERR_WRONGSTATE, "CreateNewFrame got unexpected hr %#x\n", hr); + if (hr == S_OK) IWICBitmapFrameEncode_Release(frame1); + + release_encoder(encoder, dds_encoder, stream); + + create_and_init_encoder(buffer, sizeof(buffer), &encoder, &dds_encoder, &stream); + IWICDdsEncoder_SetParameters(dds_encoder, &params); + hr = IWICDdsEncoder_CreateNewFrame(dds_encoder, &frame0, &array_index, &mip_level, &slice_index); + todo_wine + ok(hr == S_OK, "CreateNewFrame failed, hr %#x\n", hr); + if (hr == S_OK) IWICBitmapFrameEncode_Release(frame0); + release_encoder(encoder, dds_encoder, stream); + + create_and_init_encoder(buffer, sizeof(buffer), &encoder, &dds_encoder, &stream); + IWICDdsEncoder_SetParameters(dds_encoder, &params); + hr = IWICDdsEncoder_CreateNewFrame(dds_encoder, &frame0, NULL, NULL, NULL); + todo_wine + ok(hr == S_OK, "CreateNewFrame failed, hr %#x\n", hr); + if (hr == S_OK) IWICBitmapFrameEncode_Release(frame0); + +end: + release_encoder(encoder, dds_encoder, stream); +} + static void test_dds_encoder(void) { test_dds_encoder_initialize(); test_dds_encoder_params(); + test_dds_encoder_create_frame(); } START_TEST(ddsformat)

1 0

Jacek Caban : ntdll: Make get_machine_wow64_dir static.
by Alexandre Julliard May 26, 2021

May 26, 2021

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

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

May 26, 2021

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 May 26, 2021

May 26, 2021

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

Damjan Jovanovic : shell32: Use the paste_pidls() helper function for the CFSTR_SHELLIDLISTW format too.
by Alexandre Julliard May 26, 2021

May 26, 2021

Module: wine Branch: master Commit: 9bc7d41080f5e6805154b9d52a765f2be5d37279 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9bc7d41080f5e6805154b9d5… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 25 07:53:46 2021 +0200 shell32: Use the paste_pidls() helper function for the CFSTR_SHELLIDLISTW format too. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlview_cmenu.c | 76 ++++++++++---------------------------------- 1 file changed, 17 insertions(+), 59 deletions(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index dd03c64e654..ef11957e921 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -1182,15 +1182,15 @@ static HRESULT paste_pidls(ContextMenu *This, ITEMIDLIST **pidls, UINT count) return hr; } -static BOOL DoPaste(ContextMenu *This) +static HRESULT DoPaste(ContextMenu *This) { - BOOL bSuccess = TRUE; IDataObject * pda; HRESULT hr; TRACE("\n"); - if(SUCCEEDED(OleGetClipboard(&pda))) + hr = OleGetClipboard(&pda); + if(SUCCEEDED(hr)) { STGMEDIUM medium; FORMATETC formatetc; @@ -1204,68 +1204,29 @@ static BOOL DoPaste(ContextMenu *This) /* Get the pidls from IDataObject */ format_hr = IDataObject_GetData(pda,&formatetc,&medium); if(SUCCEEDED(format_hr)) - { + { LPITEMIDLIST * apidl; LPITEMIDLIST pidl; - IShellFolder *psfFrom = NULL, *psfDesktop; - int i; LPIDA lpcida = GlobalLock(medium.u.hGlobal); TRACE("cida=%p\n", lpcida); - - apidl = _ILCopyCidaToaPidl(&pidl, lpcida); - - for (i = 0; bSuccess && i < lpcida->cidl; i++) { - ITEMIDLIST *apidl_dir = NULL; - ITEMIDLIST *apidl_item; - - psfFrom = NULL; - /* bind to the source shellfolder */ - SHGetDesktopFolder(&psfDesktop); - if(psfDesktop) - { - apidl_dir = ILClone(apidl[i]); - ILRemoveLastID(apidl_dir); - apidl_item = ILFindLastID(apidl[i]); - IShellFolder_BindToObject(psfDesktop, apidl_dir, NULL, &IID_IShellFolder, (LPVOID*)&psfFrom); - IShellFolder_Release(psfDesktop); - } - - if (psfFrom) + if(lpcida) + { + apidl = _ILCopyCidaToaPidl(&pidl, lpcida); + if (apidl) { - /* get source and destination shellfolder */ - ISFHelper *psfhlpdst, *psfhlpsrc; - IShellFolder_QueryInterface(This->parent, &IID_ISFHelper, (void**)&psfhlpdst); - IShellFolder_QueryInterface(psfFrom, &IID_ISFHelper, (void**)&psfhlpsrc); - - /* do the copy/move */ - if (psfhlpdst && psfhlpsrc) - { - HRESULT hr = ISFHelper_CopyItems(psfhlpdst, psfFrom, 1, (LPCITEMIDLIST*)&apidl_item); - if (FAILED(hr)) - bSuccess = FALSE; - /* FIXME handle move - ISFHelper_DeleteItems(psfhlpsrc, 1, &apidl_item); - */ - } - if(psfhlpdst) ISFHelper_Release(psfhlpdst); - if(psfhlpsrc) ISFHelper_Release(psfhlpsrc); - IShellFolder_Release(psfFrom); + hr = paste_pidls(This, apidl, lpcida->cidl); + _ILFreeaPidl(apidl, lpcida->cidl); + SHFree(pidl); } else - bSuccess = FALSE; - SHFree(apidl_dir); + hr = HRESULT_FROM_WIN32(GetLastError()); + GlobalUnlock(medium.u.hGlobal); } - - _ILFreeaPidl(apidl, lpcida->cidl); - SHFree(pidl); - GlobalUnlock(medium.u.hGlobal); - - /* release the medium*/ + else + hr = HRESULT_FROM_WIN32(GetLastError()); ReleaseStgMedium(&medium); } - else - bSuccess = FALSE; if(FAILED(format_hr)) { @@ -1298,20 +1259,17 @@ static BOOL DoPaste(ContextMenu *This) else hr = HRESULT_FROM_WIN32(GetLastError()); ReleaseStgMedium(&medium); - bSuccess = SUCCEEDED(hr); } } if (FAILED(format_hr)) { ERR("there are no supported and retrievable clipboard formats\n"); - bSuccess = FALSE; + hr = format_hr; } IDataObject_Release(pda); } - else - bSuccess = FALSE; #if 0 HGLOBAL hMem; @@ -1336,7 +1294,7 @@ static BOOL DoPaste(ContextMenu *This) } CloseClipboard(); #endif - return bSuccess; + return hr; } static HRESULT WINAPI BackgroundMenu_InvokeCommand(

1 0

Damjan Jovanovic : shell32: Support the CF_HDROP format too when pasting from the context menu.
by Alexandre Julliard May 26, 2021

May 26, 2021

Module: wine Branch: master Commit: 91b0340170a60f7229cb9419ccb6b6f7d9adc692 URL: https://source.winehq.org/git/wine.git/?a=commit;h=91b0340170a60f7229cb9419… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 25 07:53:28 2021 +0200 shell32: Support the CF_HDROP format too when pasting from the context menu. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlview_cmenu.c | 95 +++++++++++++++++++++++++++++++++++++++++- dlls/shell32/tests/shlfolder.c | 10 +++++ 2 files changed, 104 insertions(+), 1 deletion(-) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 3d79f82a92e..dd03c64e654 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -1134,10 +1134,59 @@ static void DoNewFolder(ContextMenu *This, IShellView *view) } } +static HRESULT paste_pidls(ContextMenu *This, ITEMIDLIST **pidls, UINT count) +{ + IShellFolder *psfDesktop; + UINT i; + HRESULT hr = S_OK; + + /* bind to the source shellfolder */ + hr = SHGetDesktopFolder(&psfDesktop); + if (FAILED(hr)) + return hr; + + for (i = 0; SUCCEEDED(hr) && i < count; i++) { + ITEMIDLIST *pidl_dir = NULL; + ITEMIDLIST *pidl_item; + IShellFolder *psfFrom = NULL; + + pidl_dir = ILClone(pidls[i]); + ILRemoveLastID(pidl_dir); + pidl_item = ILFindLastID(pidls[i]); + hr = IShellFolder_BindToObject(psfDesktop, pidl_dir, NULL, &IID_IShellFolder, (LPVOID*)&psfFrom); + + if (psfFrom) + { + /* get source and destination shellfolder */ + ISFHelper *psfhlpdst, *psfhlpsrc; + hr = IShellFolder_QueryInterface(This->parent, &IID_ISFHelper, (void**)&psfhlpdst); + if (SUCCEEDED(hr)) + hr = IShellFolder_QueryInterface(psfFrom, &IID_ISFHelper, (void**)&psfhlpsrc); + + /* do the copy/move */ + if (psfhlpdst && psfhlpsrc) + { + hr = ISFHelper_CopyItems(psfhlpdst, psfFrom, 1, (LPCITEMIDLIST*)&pidl_item); + /* FIXME handle move + ISFHelper_DeleteItems(psfhlpsrc, 1, &pidl_item); + */ + } + if(psfhlpdst) ISFHelper_Release(psfhlpdst); + if(psfhlpsrc) ISFHelper_Release(psfhlpsrc); + IShellFolder_Release(psfFrom); + } + SHFree(pidl_dir); + } + + IShellFolder_Release(psfDesktop); + return hr; +} + static BOOL DoPaste(ContextMenu *This) { BOOL bSuccess = TRUE; IDataObject * pda; + HRESULT hr; TRACE("\n"); @@ -1145,6 +1194,7 @@ static BOOL DoPaste(ContextMenu *This) { STGMEDIUM medium; FORMATETC formatetc; + HRESULT format_hr; TRACE("pda=%p\n", pda); @@ -1152,7 +1202,8 @@ static BOOL DoPaste(ContextMenu *This) InitFormatEtc(formatetc, RegisterClipboardFormatW(CFSTR_SHELLIDLISTW), TYMED_HGLOBAL); /* Get the pidls from IDataObject */ - if(SUCCEEDED(IDataObject_GetData(pda,&formatetc,&medium))) + format_hr = IDataObject_GetData(pda,&formatetc,&medium); + if(SUCCEEDED(format_hr)) { LPITEMIDLIST * apidl; LPITEMIDLIST pidl; @@ -1215,6 +1266,48 @@ static BOOL DoPaste(ContextMenu *This) } else bSuccess = FALSE; + + if(FAILED(format_hr)) + { + InitFormatEtc(formatetc, CF_HDROP, TYMED_HGLOBAL); + format_hr = IDataObject_GetData(pda,&formatetc,&medium); + if(SUCCEEDED(format_hr)) + { + WCHAR path[MAX_PATH]; + UINT i, count; + ITEMIDLIST **pidls; + + TRACE("CF_HDROP=%p\n", medium.u.hGlobal); + count = DragQueryFileW(medium.u.hGlobal, -1, NULL, 0); + pidls = SHAlloc(count*sizeof(ITEMIDLIST**)); + if (pidls) + { + for (i = 0; i < count; i++) + { + DragQueryFileW(medium.u.hGlobal, i, path, ARRAY_SIZE(path)); + if ((pidls[i] = ILCreateFromPathW(path)) == NULL) + { + hr = E_FAIL; + break; + } + } + if (SUCCEEDED(hr)) + hr = paste_pidls(This, pidls, count); + _ILFreeaPidl(pidls, count); + } + else + hr = HRESULT_FROM_WIN32(GetLastError()); + ReleaseStgMedium(&medium); + bSuccess = SUCCEEDED(hr); + } + } + + if (FAILED(format_hr)) + { + ERR("there are no supported and retrievable clipboard formats\n"); + bSuccess = FALSE; + } + IDataObject_Release(pda); } else diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 8e92a0896b5..29fcd0b7754 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -4387,7 +4387,17 @@ static void test_contextmenu(IContextMenu *menu, BOOL background) { trace("Got ID %d, verb %s, string %s.\n", mii.wID, debugstr_a(buf), debugstr_a(mii.dwTypeData)); if (!strcmp(buf, "copy")) + { + CMINVOKECOMMANDINFO cmi; ok(mii.wID == 64 - 0x7000 + FCIDM_SHVIEW_COPY, "wrong menu wID %d\n", mii.wID); + memset(&cmi, 0, sizeof(CMINVOKECOMMANDINFO)); + cmi.cbSize = sizeof(CMINVOKECOMMANDINFO); + cmi.lpVerb = "copy"; + hr = IContextMenu_InvokeCommand(menu, &cmi); + ok(hr == S_OK, "got 0x%08x\n", hr); + ok(IsClipboardFormatAvailable(RegisterClipboardFormatA(CFSTR_SHELLIDLISTA)), "CFSTR_SHELLIDLISTA not available\n"); + ok(IsClipboardFormatAvailable(CF_HDROP), "CF_HDROP not available\n"); + } else if (!strcmp(buf, "paste")) ok(mii.wID == 64 - 0x7000 + FCIDM_SHVIEW_INSERT, "wrong menu wID %d\n", mii.wID); else if (!strcmp(buf, "properties"))

1 0

Damjan Jovanovic : shell32: Fix a lock leak.
by Alexandre Julliard May 26, 2021

May 26, 2021

Module: wine Branch: master Commit: 401de24b89d751f553b5c62c867da2956e9d4bc0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=401de24b89d751f553b5c62c… Author: Damjan Jovanovic <damjan.jov(a)gmail.com> Date: Tue May 25 07:53:08 2021 +0200 shell32: Fix a lock leak. Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shlview_cmenu.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c index 67f5ac80d84..3d79f82a92e 100644 --- a/dlls/shell32/shlview_cmenu.c +++ b/dlls/shell32/shlview_cmenu.c @@ -1208,6 +1208,7 @@ static BOOL DoPaste(ContextMenu *This) _ILFreeaPidl(apidl, lpcida->cidl); SHFree(pidl); + GlobalUnlock(medium.u.hGlobal); /* release the medium*/ ReleaseStgMedium(&medium);

1 0

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

May 26, 2021

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