wine-commits June 2019

wine-commits@winehq.org

1 participants
865 discussions

Nikolay Sivov : comctl32/trackbar: Do not consider window size when initializing fixed length thumb.
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: d5f8eb333c5c000a3ea986ea532c0ba030ebad88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=d5f8eb333c5c000a3ea986ea… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Jun 3 13:10:04 2019 +0300 comctl32/trackbar: Do not consider window size when initializing fixed length thumb. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47143 Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/trackbar.c | 18 +++++++++++++++++- dlls/comctl32/trackbar.c | 19 +++++++++++-------- 2 files changed, 28 insertions(+), 9 deletions(-) diff --git a/dlls/comctl32/tests/trackbar.c b/dlls/comctl32/tests/trackbar.c index 7f17e9e4b..eb54644 100644 --- a/dlls/comctl32/tests/trackbar.c +++ b/dlls/comctl32/tests/trackbar.c @@ -931,7 +931,7 @@ static void test_selection(void) static void test_thumb_length(void) { HWND hWndTrackbar; - int r; + int r, r2; hWndTrackbar = create_trackbar(defaultstyle, hWndParent); ok(hWndTrackbar != NULL, "Expected non NULL value\n"); @@ -963,6 +963,22 @@ static void test_thumb_length(void) ok_sequence(sequences, PARENT_SEQ_INDEX, parent_thumb_length_test_seq, "parent thumb length test sequence", TRUE); DestroyWindow(hWndTrackbar); + + /* Fixed thumb length does not depend on window size. */ + hWndTrackbar = CreateWindowA(TRACKBAR_CLASSA, "Trackbar Control", WS_VISIBLE | TBS_ENABLESELRANGE + | TBS_FIXEDLENGTH, 0, 0, 0, 0, hWndParent, NULL, GetModuleHandleA(NULL), NULL); + + r = SendMessageA(hWndTrackbar, TBM_GETTHUMBLENGTH, 0, 0); + + DestroyWindow(hWndTrackbar); + + hWndTrackbar = CreateWindowA(TRACKBAR_CLASSA, "Trackbar Control", WS_VISIBLE | TBS_ENABLESELRANGE + | TBS_FIXEDLENGTH, 0, 0, 200, 200, hWndParent, NULL, GetModuleHandleA(NULL), NULL); + + r2 = SendMessageA(hWndTrackbar, TBM_GETTHUMBLENGTH, 0, 0); + ok(r2 == r, "Unexpected thumb length %d.\n", r); + + DestroyWindow(hWndTrackbar); } static void test_tic_settings(void) diff --git a/dlls/comctl32/trackbar.c b/dlls/comctl32/trackbar.c index c3b9b27..de3f93e 100644 --- a/dlls/comctl32/trackbar.c +++ b/dlls/comctl32/trackbar.c @@ -1481,15 +1481,18 @@ TRACKBAR_InitializeThumb (TRACKBAR_INFO *infoPtr) infoPtr->uThumbLen = get_scaled_metric(infoPtr, infoPtr->dwStyle & TBS_ENABLESELRANGE ? 23 : 21); - GetClientRect(infoPtr->hwndSelf,&rect); - if (infoPtr->dwStyle & TBS_VERT) - client_size = rect.right - rect.left; - else - client_size = rect.bottom - rect.top; + if (!(infoPtr->dwStyle & TBS_FIXEDLENGTH)) + { + GetClientRect(infoPtr->hwndSelf, &rect); + if (infoPtr->dwStyle & TBS_VERT) + client_size = rect.right - rect.left; + else + client_size = rect.bottom - rect.top; - if (client_size < infoPtr->uThumbLen) - infoPtr->uThumbLen = client_size > get_scaled_metric(infoPtr, 9) ? - client_size - get_scaled_metric(infoPtr, 5) : get_scaled_metric(infoPtr, 4); + if (client_size < infoPtr->uThumbLen) + infoPtr->uThumbLen = client_size > get_scaled_metric(infoPtr, 9) ? + client_size - get_scaled_metric(infoPtr, 5) : get_scaled_metric(infoPtr, 4); + } TRACKBAR_CalcChannel (infoPtr); TRACKBAR_UpdateThumb (infoPtr);

1 0

Dmitry Timoshkov : mshtml: Add IDisplayServices interface stub.
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: e1844f5b53d4dc19b3a264252a90587556c385c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e1844f5b53d4dc19b3a26425… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Mon Jun 3 11:54:32 2019 +0800 mshtml: Add IDisplayServices interface stub. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/htmldoc.c | 96 ++++++++++++++++++++++++++++++++++++++++++++ dlls/mshtml/mshtml_private.h | 1 + dlls/mshtml/tests/dom.c | 2 + 3 files changed, 99 insertions(+) diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 9dec890..3d82dd4 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -5014,6 +5014,99 @@ static const IMarkupContainerVtbl MarkupContainerVtbl = { MarkupContainer_OwningDoc }; +/********************************************************** + * IDisplayServices implementation + */ +static inline HTMLDocument *impl_from_IDisplayServices(IDisplayServices *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IDisplayServices_iface); +} + +static HRESULT WINAPI DisplayServices_QueryInterface(IDisplayServices *iface, REFIID riid, void **ppvObject) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + return htmldoc_query_interface(This, riid, ppvObject); +} + +static ULONG WINAPI DisplayServices_AddRef(IDisplayServices *iface) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + return htmldoc_addref(This); +} + +static ULONG WINAPI DisplayServices_Release(IDisplayServices *iface) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + return htmldoc_release(This); +} + +static HRESULT WINAPI DisplayServices_CreateDisplayPointer(IDisplayServices *iface, IDisplayPointer **ppDispPointer) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + FIXME("(%p)->(%p)\n", This, ppDispPointer); + return E_NOTIMPL; +} + +static HRESULT WINAPI DisplayServices_TransformRect(IDisplayServices *iface, + RECT *pRect, COORD_SYSTEM eSource, COORD_SYSTEM eDestination, IHTMLElement *pIElement) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + FIXME("(%p)->(%s,%d,%d,%p)\n", This, wine_dbgstr_rect(pRect), eSource, eDestination, pIElement); + return E_NOTIMPL; +} + +static HRESULT WINAPI DisplayServices_TransformPoint(IDisplayServices *iface, + POINT *pPoint, COORD_SYSTEM eSource, COORD_SYSTEM eDestination, IHTMLElement *pIElement) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + FIXME("(%p)->(%s,%d,%d,%p)\n", This, wine_dbgstr_point(pPoint), eSource, eDestination, pIElement); + return E_NOTIMPL; +} + +static HRESULT WINAPI DisplayServices_GetCaret(IDisplayServices *iface, IHTMLCaret **ppCaret) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + FIXME("(%p)->(%p)\n", This, ppCaret); + return E_NOTIMPL; +} + +static HRESULT WINAPI DisplayServices_GetComputedStyle(IDisplayServices *iface, + IMarkupPointer *pPointer, IHTMLComputedStyle **ppComputedStyle) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + FIXME("(%p)->(%p,%p)\n", This, pPointer, ppComputedStyle); + return E_NOTIMPL; +} + +static HRESULT WINAPI DisplayServices_ScrollRectIntoView(IDisplayServices *iface, + IHTMLElement *pIElement, RECT rect) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + FIXME("(%p)->(%p,%s)\n", This, pIElement, wine_dbgstr_rect(&rect)); + return E_NOTIMPL; +} + +static HRESULT WINAPI DisplayServices_HasFlowLayout(IDisplayServices *iface, + IHTMLElement *pIElement, BOOL *pfHasFlowLayout) +{ + HTMLDocument *This = impl_from_IDisplayServices(iface); + FIXME("(%p)->(%p,%p)\n", This, pIElement, pfHasFlowLayout); + return E_NOTIMPL; +} + +static const IDisplayServicesVtbl DisplayServicesVtbl = { + DisplayServices_QueryInterface, + DisplayServices_AddRef, + DisplayServices_Release, + DisplayServices_CreateDisplayPointer, + DisplayServices_TransformRect, + DisplayServices_TransformPoint, + DisplayServices_GetCaret, + DisplayServices_GetComputedStyle, + DisplayServices_ScrollRectIntoView, + DisplayServices_HasFlowLayout +}; + static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) { *ppv = NULL; @@ -5096,6 +5189,8 @@ static BOOL htmldoc_qi(HTMLDocument *This, REFIID riid, void **ppv) *ppv = &This->IMarkupServices_iface; else if(IsEqualGUID(&IID_IMarkupContainer, riid)) *ppv = &This->IMarkupContainer_iface; + else if(IsEqualGUID(&IID_IDisplayServices, riid)) + *ppv = &This->IDisplayServices_iface; else if(IsEqualGUID(&CLSID_CMarkup, riid)) { FIXME("(%p)->(CLSID_CMarkup %p)\n", This, ppv); *ppv = NULL; @@ -5145,6 +5240,7 @@ static void init_doc(HTMLDocument *doc, IUnknown *outer, IDispatchEx *dispex) doc->IProvideMultipleClassInfo_iface.lpVtbl = &ProvideMultipleClassInfoVtbl; doc->IMarkupServices_iface.lpVtbl = &MarkupServicesVtbl; doc->IMarkupContainer_iface.lpVtbl = &MarkupContainerVtbl; + doc->IDisplayServices_iface.lpVtbl = &DisplayServicesVtbl; doc->outer_unk = outer; doc->dispex = dispex; diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 7dc9367..8beea34 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -625,6 +625,7 @@ struct HTMLDocument { IProvideMultipleClassInfo IProvideMultipleClassInfo_iface; IMarkupServices IMarkupServices_iface; IMarkupContainer IMarkupContainer_iface; + IDisplayServices IDisplayServices_iface; IUnknown *outer_unk; IDispatchEx *dispex; diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index 8a08282..01c6191 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -173,6 +173,7 @@ static const IID * const doc_node_iids[] = { &IID_IHTMLDocument5, &IID_IDocumentSelector, &IID_IDispatchEx, + &IID_IDisplayServices, &IID_IConnectionPointContainer, &IID_IInternetHostSecurityManager, &IID_IMarkupContainer, @@ -191,6 +192,7 @@ static const IID * const doc_obj_iids[] = { &IID_IHTMLDocument5, &IID_IDocumentSelector, &IID_IDispatchEx, + &IID_IDisplayServices, &IID_IConnectionPointContainer, &IID_ICustomDoc, &IID_IMarkupContainer,

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

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

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

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

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

Sven Baars : msrle32: Fix a memory leak (Valgrind).
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: e5857da2736dafa11f560c36044dd2b2fbe815c6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e5857da2736dafa11f560c36… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sun Jun 2 16:21:37 2019 +0200 msrle32: Fix a memory leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msrle32/msrle32.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/msrle32/msrle32.c b/dlls/msrle32/msrle32.c index 5bcfa86..5b17b25 100644 --- a/dlls/msrle32/msrle32.c +++ b/dlls/msrle32/msrle32.c @@ -1544,6 +1544,11 @@ static LRESULT CompressEnd(CodecInfo *pi) pi->pCurFrame = NULL; pi->nPrevFrame = -1; pi->bCompress = FALSE; + + if (pi->palette_map != NULL) { + LocalFree(pi->palette_map); + pi->palette_map = NULL; + } } return ICERR_OK;

1 0

Alexandre Julliard : dswave: Build with msvcrt.
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: c7c0706b04ebe04ec97d59bf997179b228e1e4f9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c7c0706b04ebe04ec97d59bf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 3 10:46:38 2019 +0200 dswave: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dswave/Makefile.in | 2 ++ dlls/dswave/dswave_main.c | 2 -- dlls/dswave/dswave_private.h | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/dswave/Makefile.in b/dlls/dswave/Makefile.in index 9a08518..13a957d 100644 --- a/dlls/dswave/Makefile.in +++ b/dlls/dswave/Makefile.in @@ -1,6 +1,8 @@ MODULE = dswave.dll IMPORTS = dxguid uuid ole32 advapi32 +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ dmobject.c \ dswave.c \ diff --git a/dlls/dswave/dswave_main.c b/dlls/dswave/dswave_main.c index a136bb8..bb554de 100644 --- a/dlls/dswave/dswave_main.c +++ b/dlls/dswave/dswave_main.c @@ -17,8 +17,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" -#include "wine/port.h" #include <stdio.h> #include <stdarg.h> diff --git a/dlls/dswave/dswave_private.h b/dlls/dswave/dswave_private.h index 8dea3a9..3554cde 100644 --- a/dlls/dswave/dswave_private.h +++ b/dlls/dswave/dswave_private.h @@ -32,7 +32,6 @@ #include "wine/debug.h" #include "wine/list.h" -#include "wine/unicode.h" #include "winreg.h" #include "objbase.h"

1 0

Alexandre Julliard : dssenh: Build with msvcrt.
by Alexandre Julliard 03 Jun '19

03 Jun '19

Module: wine Branch: master Commit: 7054e7d40afcfcb36e081c9c61924d0b755ba009 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7054e7d40afcfcb36e081c9c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jun 3 10:46:24 2019 +0200 dssenh: Build with msvcrt. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dssenh/Makefile.in | 2 ++ dlls/dssenh/main.c | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/dssenh/Makefile.in b/dlls/dssenh/Makefile.in index 4580914..4f05bee 100644 --- a/dlls/dssenh/Makefile.in +++ b/dlls/dssenh/Makefile.in @@ -1,4 +1,6 @@ MODULE = dssenh.dll +EXTRADLLFLAGS = -mno-cygwin + C_SRCS = \ main.c diff --git a/dlls/dssenh/main.c b/dlls/dssenh/main.c index c638724..b60b344 100644 --- a/dlls/dssenh/main.c +++ b/dlls/dssenh/main.c @@ -16,7 +16,6 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ -#include "config.h" #include <stdarg.h>

1 0

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 June 2019