June 2019 - Wine-commits - list.winehq.org

Sven Baars : msvfw32: Fix copying of a BITMAPINFO structure (Valgrind).
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: eb69fa7e73f00238bd909985a2507c5ba46b6b78 URL: https://source.winehq.org/git/wine.git/?a=commit;h=eb69fa7e73f00238bd909985… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Jun 2 16:21:38 2019 +0200 msvfw32: Fix copying of a BITMAPINFO structure (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvfw32/msvideo_main.c | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/dlls/msvfw32/msvideo_main.c b/dlls/msvfw32/msvideo_main.c index fe140b2..346dbad 100644 --- a/dlls/msvfw32/msvideo_main.c +++ b/dlls/msvfw32/msvideo_main.c @@ -1506,6 +1506,28 @@ void VFWAPI ICSeqCompressFrameEnd(PCOMPVARS pc) clear_compvars(pc); } +static BITMAPINFO *copy_bitmapinfo(const BITMAPINFO *src) +{ + int num_colors; + unsigned int size; + BITMAPINFO *dst; + + if (src->bmiHeader.biClrUsed) + num_colors = min(src->bmiHeader.biClrUsed, 256); + else + num_colors = src->bmiHeader.biBitCount > 8 ? 0 : 1 << src->bmiHeader.biBitCount; + + size = FIELD_OFFSET(BITMAPINFO, bmiColors[num_colors]); + if (src->bmiHeader.biCompression == BI_BITFIELDS) + size += 3 * sizeof(DWORD); + + if (!(dst = heap_alloc(size))) + return NULL; + + memcpy(dst, src, size); + return dst; +} + /*********************************************************************** * ICSeqCompressFrameStart [MSVFW32.@] */ @@ -1517,11 +1539,9 @@ BOOL VFWAPI ICSeqCompressFrameStart(PCOMPVARS pc, LPBITMAPINFO lpbiIn) DWORD ret; ICCOMPRESS* icComp; - if (!(pc->lpbiIn = heap_alloc(sizeof(BITMAPINFO)))) + if (!(pc->lpbiIn = copy_bitmapinfo(lpbiIn))) return FALSE; - *pc->lpbiIn = *lpbiIn; - if (!(pc->lpState = heap_alloc(sizeof(ICCOMPRESS) + sizeof(*icComp->lpckid) + sizeof(*icComp->lpdwFlags)))) goto error;

1 0

Tim Schumacher : dinput/linuxinput: Remap wheel axes to X, Y, and Z.
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: 5d51d8a25efcfd73687f5f59e817ee92824ca4ea URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d51d8a25efcfd73687f5f59… Author: Tim Schumacher <timschumi(a)gmx.de> Date: Sat Jun 1 13:49:51 2019 +0200 dinput/linuxinput: Remap wheel axes to X, Y, and Z. Signed-off-by: Tim Schumacher <timschumi(a)gmx.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dinput/joystick_linuxinput.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/dinput/joystick_linuxinput.c b/dlls/dinput/joystick_linuxinput.c index 8d80b34..fdfbc7f 100644 --- a/dlls/dinput/joystick_linuxinput.c +++ b/dlls/dinput/joystick_linuxinput.c @@ -502,14 +502,18 @@ static JoystickImpl *alloc_device(REFGUID rguid, IDirectInputImpl *dinput, unsig /* Count number of available axes - supported Axis & POVs */ for (i = 0; i < ABS_MAX; i++) { - if (i < WINE_JOYSTICK_MAX_AXES && + if (idx < WINE_JOYSTICK_MAX_AXES && + i < ABS_HAT0X && test_bit(newDevice->joydev->absbits, i)) { newDevice->generic.device_axis_count++; newDevice->dev_axes_to_di[i] = idx; newDevice->generic.props[idx].lDevMin = newDevice->joydev->axes[i].minimum; newDevice->generic.props[idx].lDevMax = newDevice->joydev->axes[i].maximum; - default_axis_map[idx] = i; + if (i >= 8 && i <= 10) /* If it's a wheel axis... */ + default_axis_map[idx] = i - 8; /* ... remap to X/Y/Z */ + else + default_axis_map[idx] = i; idx++; } else

1 0

Michael Stefaniuc : shell32: Don't cast from COM object to interface.
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: 245417571ab9f9a9715c4f349f7a2a0963a99220 URL: https://source.winehq.org/git/wine.git/?a=commit;h=245417571ab9f9a9715c4f34… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri May 31 23:14:53 2019 +0200 shell32: Don't cast from COM object to interface. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/dataobject.c | 2 +- dlls/shell32/shellole.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/shell32/dataobject.c b/dlls/shell32/dataobject.c index 3e718a3..5c0dbc6 100644 --- a/dlls/shell32/dataobject.c +++ b/dlls/shell32/dataobject.c @@ -187,7 +187,7 @@ LPENUMFORMATETC IEnumFORMATETC_Constructor(UINT cfmt, const FORMATETC afmt[]) } TRACE("(%p)->(%u,%p)\n",ef, cfmt, afmt); - return (LPENUMFORMATETC)ef; + return &ef->IEnumFORMATETC_iface; } diff --git a/dlls/shell32/shellole.c b/dlls/shell32/shellole.c index 3fe9680..1ab8f38 100644 --- a/dlls/shell32/shellole.c +++ b/dlls/shell32/shellole.c @@ -401,7 +401,7 @@ static IClassFactory * IDefClF_fnConstructor(LPFNCREATEINSTANCE lpfnCI, PLONG pc lpclf->riidInst = riidInst; TRACE("(%p)%s\n",lpclf, shdebugstr_guid(riidInst)); - return (LPCLASSFACTORY)lpclf; + return &lpclf->IClassFactory_iface; } /************************************************************************** * IDefClF_fnQueryInterface

1 0

Michael Stefaniuc : winemac.drv: Avoid casts from COM objects to interfaces.
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: 3e0857446132dc47f3a2e17c7f8a31c74c0b9a4f URL: https://source.winehq.org/git/wine.git/?a=commit;h=3e0857446132dc47f3a2e17c… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Wed May 29 22:47:28 2019 +0200 winemac.drv: Avoid casts from COM objects to interfaces. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Ken Thomases <ken(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemac.drv/dragdrop.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/dragdrop.c b/dlls/winemac.drv/dragdrop.c index e089018..c1f542f 100644 --- a/dlls/winemac.drv/dragdrop.c +++ b/dlls/winemac.drv/dragdrop.c @@ -60,8 +60,8 @@ static HRESULT WINAPI dddo_QueryInterface(IDataObject* iface, REFIID riid, LPVOI if (IsEqualIID(riid, &IID_IUnknown) || (IsEqualIID(riid, &IID_IDataObject))) { - *ppvObj = This; - IUnknown_AddRef((IUnknown*)This); + *ppvObj = iface; + IDataObject_AddRef(iface); return S_OK; }

1 0

Sven Baars : mmdevapi/tests: Use PropVariantClear after calling IPropertyStore_GetValue (Valgrind).
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: acea82ac74ebe92cf9aaf0f2184f17daa5030484 URL: https://source.winehq.org/git/wine.git/?a=commit;h=acea82ac74ebe92cf9aaf0f2… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Jun 2 12:01:23 2019 +0200 mmdevapi/tests: Use PropVariantClear after calling IPropertyStore_GetValue (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/propstore.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/mmdevapi/tests/propstore.c b/dlls/mmdevapi/tests/propstore.c index 02340ba..bbd4ffe 100644 --- a/dlls/mmdevapi/tests/propstore.c +++ b/dlls/mmdevapi/tests/propstore.c @@ -58,23 +58,26 @@ static void test_propertystore(IPropertyStore *store) { WideCharToMultiByte(CP_ACP, 0, pv.u.pwszVal, -1, temp, sizeof(temp)-1, NULL, NULL); trace("guid: %s\n", temp); - CoTaskMemFree(pv.u.pwszVal); + PropVariantClear(&pv); } pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_FriendlyName, &pv); ok(hr == S_OK, "Failed with %08x\n", hr); ok(pv.vt == VT_LPWSTR && pv.u.pwszVal, "FriendlyName value had wrong type: 0x%x or was NULL\n", pv.vt); + PropVariantClear(&pv); pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_Enabled, &pv); ok(hr == S_OK, "Failed with %08x\n", hr); ok(pv.vt == VT_EMPTY, "Key should not be found\n"); + PropVariantClear(&pv); pv.vt = VT_EMPTY; hr = IPropertyStore_GetValue(store, (const PROPERTYKEY*)&DEVPKEY_DeviceInterface_ClassGuid, &pv); ok(hr == S_OK, "Failed with %08x\n", hr); ok(pv.vt == VT_EMPTY, "Key should not be found\n"); + PropVariantClear(&pv); } static void test_deviceinterface(IPropertyStore *store) @@ -91,7 +94,7 @@ static void test_deviceinterface(IPropertyStore *store) ok(hr == S_OK, "GetValue failed: %08x\n", hr); ok(pv.vt == VT_LPWSTR, "Got wrong variant type: 0x%x\n", pv.vt); trace("device interface: %s\n", wine_dbgstr_w(pv.u.pwszVal)); - CoTaskMemFree(pv.u.pwszVal); + PropVariantClear(&pv); } static void test_getat(IPropertyStore *store)

1 0