December 2018 - Wine-devel - list.winehq.org

[PATCH] riched20: Remove redundant comparison.
by Andrey Gusev 13 Dec '18

13 Dec '18

Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> --- dlls/riched20/para.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/riched20/para.c b/dlls/riched20/para.c index 7781ff2dce..6eec6b5906 100644 --- a/dlls/riched20/para.c +++ b/dlls/riched20/para.c @@ -132,9 +132,7 @@ void add_marked_para(ME_TextEditor *editor, ME_DisplayItem *di) } else if (di->member.para.nCharOfs >= iter->member.para.nCharOfs) { - if (!iter->member.para.next_marked || - (iter->member.para.next_marked && - di->member.para.nCharOfs < iter->member.para.next_marked->member.para.nCharOfs)) + if (!iter->member.para.next_marked || di->member.para.nCharOfs < iter->member.para.next_marked->member.para.nCharOfs) { if (iter->member.para.next_marked) { -- 2.17.2

2 1

[PATCH] devenum: Avoid an invalid free (Valgrind).
by Zebediah Figura 13 Dec '18

13 Dec '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/devenum/mediacatenum.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 5fa2f008dc..efa69195eb 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -419,7 +419,8 @@ static ULONG WINAPI DEVENUM_IMediaCatMoniker_Release(IMoniker *iface) TRACE("(%p) ref=%d\n", This, ref); if (ref == 0) { - CoTaskMemFree(This->name); + if (This->type != DEVICE_DMO) + CoTaskMemFree(This->name); CoTaskMemFree(This); DEVENUM_UnlockModule(); } -- 2.19.2

2 2

[PATCH v2] po: Make tzres resources traslatable.
by Akihiro Sagawa 13 Dec '18

13 Dec '18

In v2, fix broken part. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/tzres/tzres.rc | 6 + po/ar.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/bg.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/ca.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/cs.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/da.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/de.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/el.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/en.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/en_US.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/eo.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/es.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/fa.po | 791 +++++++++++++++++++++++++++++++++++++++++++++++++ po/fi.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/fr.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/he.po | 800 ++++++++++++++++++++++++++++++++++++++++++++++++++ po/hi.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/hr.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/hu.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/it.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/ja.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/ko.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/lt.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/ml.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/nb_NO.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/nl.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/or.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/pa.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/pl.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/pt_BR.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/pt_PT.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/rm.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/ro.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/ru.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/sk.po | 802 ++++++++++++++++++++++++++++++++++++++++++++++++++ po/sl.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/sr_RS(a)cyrillic.po | 797 ++++++++++++++++++++++++++++++++++++++++++++++++++ po/sr_RS(a)latin.po | 797 ++++++++++++++++++++++++++++++++++++++++++++++++++ po/sv.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/te.po | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/th.po | 791 +++++++++++++++++++++++++++++++++++++++++++++++++ po/tr.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/uk.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/wa.po | 791 +++++++++++++++++++++++++++++++++++++++++++++++++ po/wine.pot | 788 +++++++++++++++++++++++++++++++++++++++++++++++++ po/zh_CN.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ po/zh_TW.po | 808 +++++++++++++++++++++++++++++++++++++++++++++++++++ 47 files changed, 36907 insertions(+)

2 2

[PATCH v3] ole32: Don't free handles that are just copied in the inproc case.
by Huw Davies 13 Dec '18

13 Dec '18

Based on a patch by Zebediah Figura. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46270 Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/ole32/usrmarshal.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 772bff5f5e..9f19b66d63 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -2036,11 +2036,29 @@ unsigned char * __RPC_USER STGMEDIUM_UserUnmarshal(ULONG *pFlags, unsigned char * which the first parameter is a ULONG. * This function is only intended to be called by the RPC runtime. */ -void __RPC_USER STGMEDIUM_UserFree(ULONG *pFlags, STGMEDIUM *pStgMedium) +void __RPC_USER STGMEDIUM_UserFree(ULONG *flags, STGMEDIUM *med) { - TRACE("(%s, %p\n", debugstr_user_flags(pFlags), pStgMedium); + TRACE("(%s, %p)\n", debugstr_user_flags(flags), med); - ReleaseStgMedium(pStgMedium); + switch (med->tymed) + { + case TYMED_NULL: + case TYMED_FILE: + case TYMED_ISTREAM: + case TYMED_ISTORAGE: + ReleaseStgMedium(med); + break; + case TYMED_HGLOBAL: + case TYMED_GDI: + case TYMED_MFPICT: + case TYMED_ENHMF: + if (LOWORD(*flags) == MSHCTX_INPROC) + med->tymed = TYMED_NULL; + ReleaseStgMedium(med); + break; + default: + RaiseException(DV_E_TYMED, 0, 0, NULL); + } } ULONG __RPC_USER ASYNC_STGMEDIUM_UserSize(ULONG *pFlags, ULONG StartingSize, ASYNC_STGMEDIUM *pStgMedium) -- 2.18.0

2 2

[PATCH] winex11.drv/window: Sync the window cursor before grabbing it
by Gabriel Ivăncescu 13 Dec '18

13 Dec '18

If a window changes the cursor (e.g. resizing cursor) and then sends the WM_SYSCOMMAND message to resize/move another window in response to something (e.g. a click), and the other window had a different cursor, XGrabPointer will switch the resizing cursor to the other window's cursor, until the mouse is moved, which then syncs back to the respective sizing/move cursor. This results in an annoying "flicker" of the cursor in such cases as it changes from resize cursor->prev cursor->resize cursor. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- This syncs the cursor so that the window's cursor becomes the sizing cursor (or whatever other cursor is current) before XGrabPointer. I'm experimenting with implementing the resizing grip in the autocomplete listbox exactly like on Windows (for post Wine 4.0) and discovered this in the process, since the resizing grip has to send the resize command to the listbox, but the listbox's cursor is not synced until the mouse is moved (without this patch). dlls/winex11.drv/window.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 7a3b340..4b5f9f9 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2159,6 +2159,7 @@ void CDECL X11DRV_SetCapture( HWND hwnd, UINT flags ) if (!(data = get_win_data( GetAncestor( hwnd, GA_ROOT )))) return; if (data->whole_window) { + sync_window_cursor( data->whole_window ); XFlush( gdi_display ); XGrabPointer( data->display, data->whole_window, False, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, -- 2.19.1

1 0

[PATCH v2] ole32: Call individual UserFree() functions in STGMEDIUM_UserFree().
by Zebediah Figura 13 Dec '18

13 Dec '18

Essentially written by Huw Davies. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46270 Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ole32/usrmarshal.c | 32 +++++++++++++++++++++++++++++--- 1 file changed, 29 insertions(+), 3 deletions(-) diff --git a/dlls/ole32/usrmarshal.c b/dlls/ole32/usrmarshal.c index 772bff5f5e..fafdcbb171 100644 --- a/dlls/ole32/usrmarshal.c +++ b/dlls/ole32/usrmarshal.c @@ -2036,11 +2036,37 @@ unsigned char * __RPC_USER STGMEDIUM_UserUnmarshal(ULONG *pFlags, unsigned char * which the first parameter is a ULONG. * This function is only intended to be called by the RPC runtime. */ -void __RPC_USER STGMEDIUM_UserFree(ULONG *pFlags, STGMEDIUM *pStgMedium) +void __RPC_USER STGMEDIUM_UserFree(ULONG *flags, STGMEDIUM *med) { - TRACE("(%s, %p\n", debugstr_user_flags(pFlags), pStgMedium); + TRACE("(%s, %p)\n", debugstr_user_flags(flags), med); - ReleaseStgMedium(pStgMedium); + switch(med->tymed) + { + case TYMED_NULL: + case TYMED_FILE: + case TYMED_ISTREAM: + case TYMED_ISTORAGE: + ReleaseStgMedium(med); + break; + case TYMED_HGLOBAL: + case TYMED_GDI: + case TYMED_MFPICT: + case TYMED_ENHMF: + if (LOWORD(*flags) == MSHCTX_INPROC) + { + if (med->pUnkForRelease) + { + IUnknown_Release(med->pUnkForRelease); + med->pUnkForRelease = NULL; + } + med->tymed = TYMED_NULL; + } + else + ReleaseStgMedium(med); + break; + default: + RaiseException(DV_E_TYMED, 0, 0, NULL); + } } ULONG __RPC_USER ASYNC_STGMEDIUM_UserSize(ULONG *pFlags, ULONG StartingSize, ASYNC_STGMEDIUM *pStgMedium) -- 2.14.1

2 1

[PATCH v3] Add .editorconfig file
by Eberhard Beilharz 13 Dec '18

13 Dec '18

This allows editors and IDEs to automatically adjust settings to the coding style prefered by Wine (cf. https://editorconfig.org/) Signed-off-by: Eberhard Beilharz <eb1(a)sil.org> --- .editorconfig | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000000..98cac822ec --- /dev/null +++ b/.editorconfig @@ -0,0 +1,11 @@ +root = true + +# Defaults +[*] +indent_style = space +indent_size = 4 +tab_width = 8 +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = false +max_line_length = 100 -- 2.19.2

1 0

[PATCH] ntdll/tests: Fix a memory leak (Valgrind).
by Zebediah Figura 13 Dec '18

13 Dec '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/tests/path.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/ntdll/tests/path.c b/dlls/ntdll/tests/path.c index 722ca99d2d..c8a5951b60 100644 --- a/dlls/ntdll/tests/path.c +++ b/dlls/ntdll/tests/path.c @@ -517,6 +517,7 @@ static void test_RtlDosPathNameToNtPathName_U(void) if (pRtlDosPathNameToNtPathName_U_WithStatus) { + RtlFreeUnicodeString(&nameW); status = pRtlDosPathNameToNtPathName_U_WithStatus(path, &nameW, &file_part, NULL); ok(status == tests[i].status || status == tests[i].alt_status, "%s: Expected status %#x, got %#x.\n", tests[i].dos, tests[i].status, status); -- 2.19.2

1 0

[PATCH] mp3dmod: Fix a memory leak (Valgrind).
by Zebediah Figura 13 Dec '18

13 Dec '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/mp3dmod/mp3dmod.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 90bcf664a2..c9da2b8a35 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -98,6 +98,7 @@ static ULONG WINAPI Unknown_Release(IUnknown *iface) if (!refcount) { + MoFreeMediaType(&This->outtype); mpg123_delete(This->mh); heap_free(This); } -- 2.19.2

1 0

[PATCH] devenum/tests: Fix some memory leaks (Valgrind).
by Zebediah Figura 13 Dec '18

13 Dec '18

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/devenum/tests/devenum.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 2a88b48ab8..10ca27a614 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -129,6 +129,7 @@ static void test_devenum(IBindCtx *bind_ctx) hr = IMoniker_BindToObject(moniker, bind_ctx, NULL, &IID_IUnknown, NULL); ok(hr == E_POINTER, "got %#x\n", hr); + VariantClear(&var); CoTaskMemFree(displayname); IPropertyBag_Release(prop_bag); IMoniker_Release(moniker); @@ -137,6 +138,7 @@ static void test_devenum(IBindCtx *bind_ctx) } } + IEnumMoniker_Release(enum_cat); ICreateDevEnum_Release(create_devenum); } @@ -466,6 +468,7 @@ static void test_codec(void) * enumerating them will destroy the key */ ok(!find_moniker(&CLSID_AudioRendererCategory, mon), "codec should not be registered\n"); + VariantClear(&var); hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); ok(hr == HRESULT_FROM_WIN32(ERROR_FILE_NOT_FOUND), "got %#x\n", hr); @@ -589,6 +592,7 @@ static void test_legacy_filter(void) ok(!lstrcmpW(buffer, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(buffer), wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); IPropertyBag_Release(prop_bag); hr = IFilterMapper_UnregisterFilter(mapper, CLSID_TestFilter); @@ -999,6 +1003,7 @@ static void test_vfw(void) ok(!lstrcmpW(name, V_BSTR(&var)), "expected %s, got %s\n", wine_dbgstr_w(name), wine_dbgstr_w(V_BSTR(&var))); + VariantClear(&var); IPropertyBag_Release(prop_bag); IMoniker_Release(mon); } -- 2.19.2

1 0