November 2019 - Wine-commits

Zebediah Figura : ucrtbase: Write the %hh prefix as a single char.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: 2a6171fce9246aff728071c96fa089b025d425f0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2a6171fce9246aff728071c9… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Jun 10 20:19:50 2019 -0400 ucrtbase: Write the %hh prefix as a single char. This fixes a crash in Planet Coaster on startup. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9445bed2981c5a68a57c749b9354649980a31c39) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msvcrt/scanf.h | 3 +++ dlls/ucrtbase/tests/scanf.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h index 0903d6909a..1058a7a911 100644 --- a/dlls/msvcrt/scanf.h +++ b/dlls/msvcrt/scanf.h @@ -309,6 +309,9 @@ _FUNCTION_ { if (I64_prefix) _SET_NUMBER_(LONGLONG); else if (l_prefix) _SET_NUMBER_(LONG); else if (h_prefix == 1) _SET_NUMBER_(short int); +#if _MSVCR_VER >= 140 + else if (h_prefix == 2) _SET_NUMBER_(char); +#endif else _SET_NUMBER_(int); } } diff --git a/dlls/ucrtbase/tests/scanf.c b/dlls/ucrtbase/tests/scanf.c index 7f44b7f1ad..bf886e7d61 100644 --- a/dlls/ucrtbase/tests/scanf.c +++ b/dlls/ucrtbase/tests/scanf.c @@ -188,7 +188,7 @@ static void test_sscanf(void) result = 0xdeadbeef; ret = vsscanf_wrapper(tests[i], "12345678", "%hhd", &result); ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]); - todo_wine ok(result == 0xdeadbe4e, "got wrong number %#x for flags %#x\n", result, tests[i]); + ok(result == 0xdeadbe4e, "got wrong number %#x for flags %#x\n", result, tests[i]); ret = vsscanf_wrapper(tests[i], "12345678901234", "%lld", &result64); ok(ret == 1, "sscanf returned %d for flags %#x\n", ret, tests[i]);

1 0

Jacek Caban : msxml3: Fix string length handling in I[VB]SAXContentHandler::characters.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: 04dce9bc0bd47d3cd120ee8128ceb160f28152bb URL: https://source.winehq.org/git/wine.git/?a=commit;h=04dce9bc0bd47d3cd120ee81… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Jun 18 16:55:40 2019 +0200 msxml3: Fix string length handling in I[VB]SAXContentHandler::characters. Windows crashes when -1 length is passed. Escaping should just copy embedded null bytes. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 73af53c4bca6cc56b4fccc8139cc564715c08e99) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msxml3/mxwriter.c | 10 +++--- dlls/msxml3/tests/saxreader.c | 72 ++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 76 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index 10be2508b2..a5bfdf1e99 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -498,10 +498,10 @@ static WCHAR *get_escaped_string(const WCHAR *str, escape_mode mode, int *len) WCHAR *ptr, *ret; /* default buffer size to something if length is unknown */ - conv_len = *len == -1 ? default_alloc : max(2**len, default_alloc); + conv_len = max(2**len, default_alloc); ptr = ret = heap_alloc(conv_len*sizeof(WCHAR)); - while (*str && p) + while (p) { if (ptr - ret > conv_len - grow_thresh) { @@ -539,10 +539,10 @@ static WCHAR *get_escaped_string(const WCHAR *str, escape_mode mode, int *len) } str++; - if (*len != -1) p--; + p--; } - if (*len != -1) *len = ptr-ret; + *len = ptr-ret; *++ptr = 0; return ret; @@ -2206,7 +2206,7 @@ static HRESULT WINAPI VBSAXContentHandler_characters(IVBSAXContentHandler *iface if (!chars) return E_POINTER; - return ISAXContentHandler_characters(&This->ISAXContentHandler_iface, *chars, -1); + return ISAXContentHandler_characters(&This->ISAXContentHandler_iface, *chars, SysStringLen(*chars)); } static HRESULT WINAPI VBSAXContentHandler_ignorableWhitespace(IVBSAXContentHandler *iface, BSTR *chars) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index eeef5b64c1..d1076f58ea 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3950,10 +3950,13 @@ static const struct writer_characters_t writer_characters[] = { static void test_mxwriter_characters(void) { static const WCHAR chardataW[] = {'T','E','S','T','C','H','A','R','D','A','T','A',' ','.',0}; + static const WCHAR embedded_nullbytes[] = {'a',0,'b',0,0,0,'c',0}; const struct writer_characters_t *table = writer_characters; + IVBSAXContentHandler *vb_content; ISAXContentHandler *content; IMXWriter *writer; VARIANT dest; + BSTR str; HRESULT hr; int i = 0; @@ -3964,6 +3967,9 @@ static void test_mxwriter_characters(void) hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); EXPECT_HR(hr, S_OK); + hr = IMXWriter_QueryInterface(writer, &IID_IVBSAXContentHandler, (void**)&vb_content); + EXPECT_HR(hr, S_OK); + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); EXPECT_HR(hr, S_OK); @@ -3976,6 +3982,10 @@ static void test_mxwriter_characters(void) hr = ISAXContentHandler_characters(content, chardataW, 0); EXPECT_HR(hr, S_OK); + str = _bstr_("VbChars"); + hr = IVBSAXContentHandler_characters(vb_content, &str); + EXPECT_HR(hr, S_OK); + hr = ISAXContentHandler_characters(content, chardataW, ARRAY_SIZE(chardataW) - 1); EXPECT_HR(hr, S_OK); @@ -3983,13 +3993,14 @@ static void test_mxwriter_characters(void) hr = IMXWriter_get_output(writer, &dest); EXPECT_HR(hr, S_OK); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); - ok(!lstrcmpW(_bstr_("TESTCHARDATA ."), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + ok(!lstrcmpW(_bstr_("VbCharsTESTCHARDATA ."), V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); hr = ISAXContentHandler_endDocument(content); EXPECT_HR(hr, S_OK); ISAXContentHandler_Release(content); + IVBSAXContentHandler_Release(vb_content); IMXWriter_Release(writer); /* try empty characters data to see if element is closed */ @@ -4025,6 +4036,65 @@ static void test_mxwriter_characters(void) ISAXContentHandler_Release(content); IMXWriter_Release(writer); + /* test embedded null bytes */ + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_startDocument(content); + EXPECT_HR(hr, S_OK); + + hr = ISAXContentHandler_characters(content, embedded_nullbytes, ARRAY_SIZE(embedded_nullbytes)); + EXPECT_HR(hr, S_OK); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(SysStringLen(V_BSTR(&dest)) == ARRAY_SIZE(embedded_nullbytes), "unexpected len %d\n", SysStringLen(V_BSTR(&dest))); + ok(!memcmp(V_BSTR(&dest), embedded_nullbytes, ARRAY_SIZE(embedded_nullbytes)), + "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + ISAXContentHandler_Release(content); + IMXWriter_Release(writer); + + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_QueryInterface(writer, &IID_IVBSAXContentHandler, (void**)&vb_content); + EXPECT_HR(hr, S_OK); + + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); + EXPECT_HR(hr, S_OK); + + hr = IVBSAXContentHandler_startDocument(vb_content); + EXPECT_HR(hr, S_OK); + + str = SysAllocStringLen(embedded_nullbytes, ARRAY_SIZE(embedded_nullbytes)); + hr = IVBSAXContentHandler_characters(vb_content, &str); + EXPECT_HR(hr, S_OK); + SysFreeString(str); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + EXPECT_HR(hr, S_OK); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); + ok(SysStringLen(V_BSTR(&dest)) == ARRAY_SIZE(embedded_nullbytes), "unexpected len %d\n", SysStringLen(V_BSTR(&dest))); + ok(!memcmp(V_BSTR(&dest), embedded_nullbytes, ARRAY_SIZE(embedded_nullbytes)), + "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + IVBSAXContentHandler_Release(vb_content); + IMXWriter_Release(writer); + /* batch tests */ while (table->clsid) {

1 0

Zhiyi Zhang : msctf: Add ITfContextOwnerCompositionServices stub.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: cc0b0b9fcf5c8893ed6f1690553894471f551bef URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc0b0b9fcf5c8893ed6f1690… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Wed Aug 14 16:36:48 2019 +0800 msctf: Add ITfContextOwnerCompositionServices stub. Fix crash at launch for games that use Unreal Engine 4. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit ef542fc7977240046cab18f0e7efd051e56f6661) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/msctf/context.c | 92 +++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 88 insertions(+), 4 deletions(-) diff --git a/dlls/msctf/context.c b/dlls/msctf/context.c index 452895c07e..dbe1391e51 100644 --- a/dlls/msctf/context.c +++ b/dlls/msctf/context.c @@ -45,7 +45,7 @@ typedef struct tagContext { ITfContext ITfContext_iface; ITfSource ITfSource_iface; /* const ITfContextCompositionVtbl *ContextCompositionVtbl; */ - /* const ITfContextOwnerCompositionServicesVtbl *ContextOwnerCompositionServicesVtbl; */ + ITfContextOwnerCompositionServices ITfContextOwnerCompositionServices_iface; /* const ITfContextOwnerServicesVtbl *ContextOwnerServicesVtbl; */ ITfInsertAtSelection ITfInsertAtSelection_iface; /* const ITfMouseTrackerVtbl *MouseTrackerVtbl; */ @@ -93,6 +93,11 @@ static inline Context *impl_from_ITfSource(ITfSource *iface) return CONTAINING_RECORD(iface, Context, ITfSource_iface); } +static inline Context *impl_from_ITfContextOwnerCompositionServices(ITfContextOwnerCompositionServices *iface) +{ + return CONTAINING_RECORD(iface, Context, ITfContextOwnerCompositionServices_iface); +} + static inline Context *impl_from_ITfInsertAtSelection(ITfInsertAtSelection *iface) { return CONTAINING_RECORD(iface, Context, ITfInsertAtSelection_iface); @@ -154,6 +159,10 @@ static HRESULT WINAPI Context_QueryInterface(ITfContext *iface, REFIID iid, LPVO { *ppvOut = &This->ITfSource_iface; } + else if (IsEqualIID(iid, &IID_ITfContextOwnerCompositionServices)) + { + *ppvOut = &This->ITfContextOwnerCompositionServices_iface; + } else if (IsEqualIID(iid, &IID_ITfInsertAtSelection)) { *ppvOut = &This->ITfInsertAtSelection_iface; @@ -530,6 +539,9 @@ static const ITfContextVtbl ContextVtbl = Context_CreateRangeBackup }; +/***************************************************** + * ITfSource functions + *****************************************************/ static HRESULT WINAPI ContextSource_QueryInterface(ITfSource *iface, REFIID iid, LPVOID *ppvOut) { Context *This = impl_from_ITfSource(iface); @@ -548,9 +560,6 @@ static ULONG WINAPI ContextSource_Release(ITfSource *iface) return ITfContext_Release(&This->ITfContext_iface); } -/***************************************************** - * ITfSource functions - *****************************************************/ static HRESULT WINAPI ContextSource_AdviseSink(ITfSource *iface, REFIID riid, IUnknown *punk, DWORD *pdwCookie) { @@ -589,6 +598,80 @@ static const ITfSourceVtbl ContextSourceVtbl = ContextSource_UnadviseSink }; +/***************************************************** + * ITfContextOwnerCompositionServices functions + *****************************************************/ +static HRESULT WINAPI ContextOwnerCompositionServices_QueryInterface(ITfContextOwnerCompositionServices *iface, + REFIID iid, LPVOID *ppvOut) +{ + Context *This = impl_from_ITfContextOwnerCompositionServices(iface); + return ITfContext_QueryInterface(&This->ITfContext_iface, iid, ppvOut); +} + +static ULONG WINAPI ContextOwnerCompositionServices_AddRef(ITfContextOwnerCompositionServices *iface) +{ + Context *This = impl_from_ITfContextOwnerCompositionServices(iface); + return ITfContext_AddRef(&This->ITfContext_iface); +} + +static ULONG WINAPI ContextOwnerCompositionServices_Release(ITfContextOwnerCompositionServices *iface) +{ + Context *This = impl_from_ITfContextOwnerCompositionServices(iface); + return ITfContext_Release(&This->ITfContext_iface); +} + +static HRESULT WINAPI ContextOwnerCompositionServices_StartComposition(ITfContextOwnerCompositionServices *iface, + TfEditCookie ecWrite, ITfRange *pCompositionRange, ITfCompositionSink *pSink, ITfComposition **ppComposition) +{ + Context *This = impl_from_ITfContextOwnerCompositionServices(iface); + FIXME("STUB:(%p) %#x %p %p %p\n", This, ecWrite, pCompositionRange, pSink, ppComposition); + return E_NOTIMPL; +} + +static HRESULT WINAPI ContextOwnerCompositionServices_EnumCompositions(ITfContextOwnerCompositionServices *iface, + IEnumITfCompositionView **ppEnum) +{ + Context *This = impl_from_ITfContextOwnerCompositionServices(iface); + FIXME("STUB:(%p) %p\n", This, ppEnum); + return E_NOTIMPL; +} + +static HRESULT WINAPI ContextOwnerCompositionServices_FindComposition(ITfContextOwnerCompositionServices *iface, + TfEditCookie ecRead, ITfRange *pTestRange, IEnumITfCompositionView **ppEnum) +{ + Context *This = impl_from_ITfContextOwnerCompositionServices(iface); + FIXME("STUB:(%p) %#x %p %p\n", This, ecRead, pTestRange, ppEnum); + return E_NOTIMPL; +} + +static HRESULT WINAPI ContextOwnerCompositionServices_TakeOwnership(ITfContextOwnerCompositionServices *iface, + TfEditCookie ecWrite, ITfCompositionView *pComposition, ITfCompositionSink *pSink, ITfComposition **ppComposition) +{ + Context *This = impl_from_ITfContextOwnerCompositionServices(iface); + FIXME("STUB:(%p) %#x %p %p %p\n", This, ecWrite, pComposition, pSink, ppComposition); + return E_NOTIMPL; +} + +static HRESULT WINAPI ContextOwnerCompositionServices_TerminateComposition(ITfContextOwnerCompositionServices *iface, + ITfCompositionView *pComposition) +{ + Context *This = impl_from_ITfContextOwnerCompositionServices(iface); + FIXME("STUB:(%p) %p\n", This, pComposition); + return E_NOTIMPL; +} + +static const ITfContextOwnerCompositionServicesVtbl ContextOwnerCompositionServicesVtbl = +{ + ContextOwnerCompositionServices_QueryInterface, + ContextOwnerCompositionServices_AddRef, + ContextOwnerCompositionServices_Release, + ContextOwnerCompositionServices_StartComposition, + ContextOwnerCompositionServices_EnumCompositions, + ContextOwnerCompositionServices_FindComposition, + ContextOwnerCompositionServices_TakeOwnership, + ContextOwnerCompositionServices_TerminateComposition +}; + /***************************************************** * ITfInsertAtSelection functions *****************************************************/ @@ -985,6 +1068,7 @@ HRESULT Context_Constructor(TfClientId tidOwner, IUnknown *punk, ITfDocumentMgr This->ITfContext_iface.lpVtbl= &ContextVtbl; This->ITfSource_iface.lpVtbl = &ContextSourceVtbl; + This->ITfContextOwnerCompositionServices_iface.lpVtbl = &ContextOwnerCompositionServicesVtbl; This->ITfInsertAtSelection_iface.lpVtbl = &InsertAtSelectionVtbl; This->ITfSourceSingle_iface.lpVtbl = &ContextSourceSingleVtbl; This->ITextStoreACPSink_iface.lpVtbl = &TextStoreACPSinkVtbl;

1 0

Sven Baars : wmp: Fix a crash in put_volume when basic_audio is NULL.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: 7d8a34d6a1c5ad11f088603fa2e165cfb78ea1ef URL: https://source.winehq.org/git/wine.git/?a=commit;h=7d8a34d6a1c5ad11f088603f… Author: Sven Baars <sven.wine(a)gmail.com> Date: Sat Aug 17 18:50:16 2019 +0200 wmp: Fix a crash in put_volume when basic_audio is NULL. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 9e8cf8082c3523957f6b19f49e820d910c16faa7) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/wmp/player.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c index 519ffa1d18..d578b0a16b 100644 --- a/dlls/wmp/player.c +++ b/dlls/wmp/player.c @@ -969,18 +969,18 @@ static HRESULT WINAPI WMPSettings_get_volume(IWMPSettings *iface, LONG *p) static HRESULT WINAPI WMPSettings_put_volume(IWMPSettings *iface, LONG v) { - HRESULT hres; WindowsMediaPlayer *This = impl_from_IWMPSettings(iface); TRACE("(%p)->(%d)\n", This, v); This->volume = v; - if (!This->filter_graph) { - hres = S_OK; - } else { - /* IBasicAudio - [-10000, 0], wmp - [0, 100] */ - v = 10000 * v / 100 - 10000; - hres = IBasicAudio_put_Volume(This->basic_audio, v); - } - return hres; + if (!This->filter_graph) + return S_OK; + + /* IBasicAudio - [-10000, 0], wmp - [0, 100] */ + v = 10000 * v / 100 - 10000; + if (!This->basic_audio) + return S_FALSE; + + return IBasicAudio_put_Volume(This->basic_audio, v); } static HRESULT WINAPI WMPSettings_getMode(IWMPSettings *iface, BSTR mode, VARIANT_BOOL *p)

1 0

Sven Baars : shell32: Fix an item identifier list leak (Valgrind).
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: 86b5e684a4d902fba60ca6d523840faac56931e0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=86b5e684a4d902fba60ca6d5… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri May 31 20:15:44 2019 +0200 shell32: Fix an item identifier list leak (Valgrind). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 0d0fa46553e17efd6f72b25aad3563e8c60b365d) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/shell32/brsfolder.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/shell32/brsfolder.c b/dlls/shell32/brsfolder.c index d771d0b5fb..d5b55d59ac 100644 --- a/dlls/shell32/brsfolder.c +++ b/dlls/shell32/brsfolder.c @@ -784,6 +784,8 @@ static BOOL BrsFolder_OnCreate( HWND hWnd, browse_info *info ) browsefolder_callback( info->lpBrowseInfo, hWnd, BFFM_INITIALIZED, 0 ); + ILFree(computer_pidl); + return TRUE; }

1 0

Sven Baars : user32: Fix some leaks on error path (Coverity).
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: f41154ce7f3ae0bd1954f9e65a9535404ed75913 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f41154ce7f3ae0bd1954f9e6… Author: Sven Baars <sven.wine(a)gmail.com> Date: Fri May 31 11:12:18 2019 +0200 user32: Fix some leaks on error path (Coverity). Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit 381c4e7b667555147ef24ee19fff2f766b7303c2) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/user32/rawinput.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/user32/rawinput.c b/dlls/user32/rawinput.c index b247c157dc..e304c82dea 100644 --- a/dlls/user32/rawinput.c +++ b/dlls/user32/rawinput.c @@ -141,6 +141,8 @@ static void find_hid_devices(void) if (!hid_devices) { ERR("Failed to allocate memory.\n"); + CloseHandle(file); + heap_free(path); goto done; } }

1 0

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

25 Nov '19

Module: wine Branch: stable Commit: 191f5e03ae873dadb0321cd100e34a0309049921 URL: https://source.winehq.org/git/wine.git/?a=commit;h=191f5e03ae873dadb0321cd1… 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> (cherry picked from commit e5857da2736dafa11f560c36044dd2b2fbe815c6) Signed-off-by: Michael Stefaniuc <mstefani(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 5bcfa86f97..5b17b25a0b 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

Paul Gofman : ddraw/tests: Test restoring attached surface for ddraw4.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: 6b1406e11fda551a9ba5bab33b67ade77b33819f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6b1406e11fda551a9ba5bab3… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Aug 5 21:58:33 2019 +0300 ddraw/tests: Test restoring attached surface for ddraw4. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit da2fdc4cd35c261081521f7c486e99be7dbbe87e) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/tests/ddraw4.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index a42a433fad..ff48242b81 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -9038,11 +9038,12 @@ static void test_vb_writeonly(void) static void test_lost_device(void) { - IDirectDrawSurface4 *surface; + IDirectDrawSurface4 *surface, *back_buffer; DDSURFACEDESC2 surface_desc; HWND window1, window2; IDirectDraw4 *ddraw; ULONG refcount; + DDSCAPS2 caps; HRESULT hr; BOOL ret; @@ -9209,9 +9210,23 @@ static void test_lost_device(void) ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); hr = IDirectDrawSurface4_IsLost(surface); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + memset(&caps, 0, sizeof(caps)); + caps.dwCaps = DDSCAPS_FLIP; + + hr = IDirectDrawSurface4_GetAttachedSurface(surface, &caps, &back_buffer); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_Restore(surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_GetAttachedSurface(surface, &caps, &back_buffer); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface4_IsLost(back_buffer); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + IDirectDrawSurface4_Release(back_buffer); + IDirectDrawSurface4_Release(surface); refcount = IDirectDraw4_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount);

1 0

Paul Gofman : ddraw/tests: Test restoring attached surface for ddraw2.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: dfa69cd6e328594bf3e32d129a0166a2e12deedf URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfa69cd6e328594bf3e32d12… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Aug 5 21:58:34 2019 +0300 ddraw/tests: Test restoring attached surface for ddraw2. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit d8812edc6584d434c4ffd68dc7a3a783623a3703) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/tests/ddraw2.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/tests/ddraw2.c b/dlls/ddraw/tests/ddraw2.c index 3aedadfe1e..953ece2b88 100644 --- a/dlls/ddraw/tests/ddraw2.c +++ b/dlls/ddraw/tests/ddraw2.c @@ -8005,11 +8005,12 @@ static void test_palette_alpha(void) static void test_lost_device(void) { - IDirectDrawSurface *surface; + IDirectDrawSurface *surface, *back_buffer; DDSURFACEDESC surface_desc; HWND window1, window2; IDirectDraw2 *ddraw; ULONG refcount; + DDSCAPS caps; HRESULT hr; BOOL ret; @@ -8147,6 +8148,19 @@ static void test_lost_device(void) hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + memset(&caps, 0, sizeof(caps)); + caps.dwCaps = DDSCAPS_FLIP; + + hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &back_buffer); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Restore(surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &back_buffer); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(back_buffer); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + IDirectDrawSurface_Release(back_buffer); + IDirectDrawSurface_Release(surface); refcount = IDirectDraw2_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount);

1 0

Paul Gofman : ddraw/tests: Test restoring attached surface for ddraw1.
by Alexandre Julliard 25 Nov '19

25 Nov '19

Module: wine Branch: stable Commit: 14a0ed92fb1d464a4df9ec2ca73582a48621d34f URL: https://source.winehq.org/git/wine.git/?a=commit;h=14a0ed92fb1d464a4df9ec2c… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon Aug 5 21:58:35 2019 +0300 ddraw/tests: Test restoring attached surface for ddraw1. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> (cherry picked from commit aa6517cf875e6f94db85393391397d036b67b24b) Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- dlls/ddraw/tests/ddraw1.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/dlls/ddraw/tests/ddraw1.c b/dlls/ddraw/tests/ddraw1.c index 0757b75c43..2f1d6d1635 100644 --- a/dlls/ddraw/tests/ddraw1.c +++ b/dlls/ddraw/tests/ddraw1.c @@ -6735,11 +6735,12 @@ static void test_palette_alpha(void) static void test_lost_device(void) { - IDirectDrawSurface *surface; + IDirectDrawSurface *surface, *back_buffer; DDSURFACEDESC surface_desc; HWND window1, window2; IDirectDraw *ddraw; ULONG refcount; + DDSCAPS caps; HRESULT hr; BOOL ret; @@ -6877,6 +6878,19 @@ static void test_lost_device(void) hr = IDirectDrawSurface_Flip(surface, NULL, DDFLIP_WAIT); ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + memset(&caps, 0, sizeof(caps)); + caps.dwCaps = DDSCAPS_FLIP; + + hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &back_buffer); + ok(hr == DDERR_SURFACELOST, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_Restore(surface); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_GetAttachedSurface(surface, &caps, &back_buffer); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirectDrawSurface_IsLost(back_buffer); + ok(hr == DD_OK, "Got unexpected hr %#x.\n", hr); + IDirectDrawSurface_Release(back_buffer); + IDirectDrawSurface_Release(surface); refcount = IDirectDraw_Release(ddraw); ok(!refcount, "Got unexpected refcount %u.\n", refcount);

1 0