February 2017 - Wine-Commits

Bruno Jesus : configure: Make FreeBSD recognize struct __res_state for iphlpapi.
by Alexandre Julliard Feb. 9, 2017

Feb. 9, 2017

Module: wine Branch: master Commit: 2f447bb49c794058e71bf5bd43a3c53147260226 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f447bb49c794058e71bf5bd4… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Thu Feb 9 14:59:11 2017 -0200 configure: Make FreeBSD recognize struct __res_state for iphlpapi. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 8 +++++++- configure.ac | 8 +++++++- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 1cac4e0..a7e350e 100755 --- a/configure +++ b/configure @@ -16711,7 +16711,13 @@ _ACEOF fi -ac_fn_c_check_type "$LINENO" "struct __res_state" "ac_cv_type_struct___res_state" "#ifdef HAVE_RESOLV_H +ac_fn_c_check_type "$LINENO" "struct __res_state" "ac_cv_type_struct___res_state" "#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_RESOLV_H #include <resolv.h> #endif " diff --git a/configure.ac b/configure.ac index cae8d72..413bfc9 100644 --- a/configure.ac +++ b/configure.ac @@ -2347,7 +2347,13 @@ AC_CHECK_MEMBERS([struct sockaddr_in6.sin6_scope_id],,, dnl Check for struct __res_state AC_CHECK_TYPES([struct __res_state],,, -[#ifdef HAVE_RESOLV_H +[#ifdef HAVE_SYS_TYPES_H +#include <sys/types.h> +#endif +#ifdef HAVE_NETINET_IN_H +#include <netinet/in.h> +#endif +#ifdef HAVE_RESOLV_H #include <resolv.h> #endif])

1 0

Jacek Caban : maintainers: Update myself.
by Alexandre Julliard Feb. 9, 2017

Feb. 9, 2017

Module: wine Branch: master Commit: e28f2f4908024379593ca4802877287b50aa4205 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e28f2f4908024379593ca4802… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Thu Feb 9 15:47:49 2017 +0100 maintainers: Update myself. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- MAINTAINERS | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/MAINTAINERS b/MAINTAINERS index 738e1b7..878e210 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -134,12 +134,6 @@ F: dlls/hid/ F: dlls/hidclass.sys/ F: dlls/winehid.sys/ -HTML rendering (Gecko) -M: Jacek Caban <jacek(a)codeweavers.com> -F: dlls/ieframe/ -F: dlls/mshtml/ -F: dlls/shdocvw/ - Input methods M: Aric Stewart <aric(a)codeweavers.com> F: dlls/imm32/ @@ -242,10 +236,24 @@ Uniscribe M: Aric Stewart <aric(a)codeweavers.com> F: dlls/usp10/ +URL Moniker +M: Jacek Caban <jacek(a)codeweavers.com> +F: dlls/urlmon/ + +VBScript +M: Jacek Caban <jacek(a)codeweavers.com> +F: dlls/vbscript/ + Web Services M: Hans Leidekker <hans(a)codeweavers.com> F: dlls/webservices/ +WebBrowser control +M: Jacek Caban <jacek(a)codeweavers.com> +F: dlls/ieframe/ +F: dlls/mshtml/ +F: dlls/shdocvw/ + Windows Imaging Component M: Vincent Povirk <vincent(a)codeweavers.com> F: dlls/windowscodecs/ @@ -271,14 +279,14 @@ WinHTTP M: Hans Leidekker <hans(a)codeweavers.com> F: dlls/winhttp/ +WinINet +P: Jacek Caban <jacek(a)codeweavers.com> +F: dlls/wininet/ + WPcap M: André Hentschel <nerv(a)dawncrow.de> F: dlls/wpcap/ -VB Script -M: Jacek Caban <jacek(a)codeweavers.com> -F: dlls/vbscript/ - X11 Driver M: Alexandre Julliard <julliard(a)winehq.org> P: Vincent Povirk <vincent(a)codeweavers.com> @@ -294,6 +302,7 @@ M: Alexandre Julliard <julliard(a)winehq.org> P: Alex Henrie <alexhenrie24(a)gmail.com> P: Andrew Eikum <aeikum(a)codeweavers.com> P: Huw Davies <huw(a)codeweavers.com> +P: Jacek Caban <jacek(a)codeweavers.com> P: Sebastian Lackner <sebastian(a)fds-team.de> P: Vincent Povirk <vincent(a)codeweavers.com> P: Erich E. Hoover <erich.e.hoover(a)wine-staging.com>

1 0

Francois Gouget : shdocvw: Add a __WINE_ALLOC_SIZE attribute to heap_alloc ().
by Alexandre Julliard Feb. 9, 2017

Feb. 9, 2017

Module: wine Branch: master Commit: f3d33f57a7e3aa5a36da24a3a5b567fea22868c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f3d33f57a7e3aa5a36da24a3a… Author: Francois Gouget <fgouget(a)free.fr> Date: Wed Feb 8 17:53:29 2017 +0100 shdocvw: Add a __WINE_ALLOC_SIZE attribute to heap_alloc(). Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shdocvw/shdocvw.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/shdocvw/shdocvw.h b/dlls/shdocvw/shdocvw.h index 341cdc5..a2736d8 100644 --- a/dlls/shdocvw/shdocvw.h +++ b/dlls/shdocvw/shdocvw.h @@ -53,7 +53,7 @@ static inline void SHDOCVW_UnlockModule(void) { InterlockedDecrement( &SHDOCVW_r /* memory allocation functions */ -static inline void *heap_alloc(size_t len) +static inline void* __WINE_ALLOC_SIZE(1) heap_alloc(size_t len) { return HeapAlloc(GetProcessHeap(), 0, len); }

1 0

Bruno Jesus : winemp3.acm: Ignore XING headers when parsing MP3 files.
by Alexandre Julliard Feb. 9, 2017

Feb. 9, 2017

Module: wine Branch: master Commit: 2253d1a9d3a36bc3dcdc05acc8bf47085b739c6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2253d1a9d3a36bc3dcdc05acc… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Feb 7 13:55:53 2017 -0200 winemp3.acm: Ignore XING headers when parsing MP3 files. Signed-off-by: Bruno Jesus <00cpxxx(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winemp3.acm/mpegl3.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/winemp3.acm/mpegl3.c b/dlls/winemp3.acm/mpegl3.c index 37993b4..28a1998 100644 --- a/dlls/winemp3.acm/mpegl3.c +++ b/dlls/winemp3.acm/mpegl3.c @@ -248,6 +248,13 @@ static LRESULT MPEG3_StreamOpen(PACMDRVSTREAMINSTANCE adsi) aad->convert = mp3_horse; aad->mh = mpg123_new(NULL,&err); mpg123_open_feed(aad->mh); + + /* mpg123 may find a XING header in the mp3 and use that information + * to ask for seeks in order to read specific frames in the file. + * We cannot allow that since the caller application is feeding us. + * This fixes problems for mp3 files encoded with LAME (bug 42361) + */ + mpg123_param(aad->mh, MPG123_ADD_FLAGS, MPG123_IGNORE_INFOFRAME, 0); } /* no encoding yet else if (adsi->pwfxSrc->wFormatTag == WAVE_FORMAT_PCM &&

1 0

Jactry Zeng : qcap: Avoid call LeaveCriticalSection() repeatedly.
by Alexandre Julliard Feb. 9, 2017

Feb. 9, 2017

Module: wine Branch: master Commit: 6530824ab31bf9af311f3f93e2d145b81f85de9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6530824ab31bf9af311f3f93e… Author: Jactry Zeng <jzeng(a)codeweavers.com> Date: Tue Feb 7 22:20:29 2017 +0800 qcap: Avoid call LeaveCriticalSection() repeatedly. Signed-off-by: Jactry Zeng <jzeng(a)codeweavers.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/v4l.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/qcap/v4l.c b/dlls/qcap/v4l.c index 54e0230..bc760bd 100644 --- a/dlls/qcap/v4l.c +++ b/dlls/qcap/v4l.c @@ -604,7 +604,12 @@ static DWORD WINAPI ReadThread(LPVOID lParam) hr = V4l_Prepare(capBox); if (FAILED(hr)) - goto fail; + { + ERR("Stop IFilterGraph: %x\n", hr); + capBox->thread = 0; + capBox->stopped = TRUE; + return 0; + } pOutput = CoTaskMemAlloc(capBox->width * capBox->height * capBox->bitDepth / 8); capBox->curframe = 0; @@ -641,27 +646,19 @@ static DWORD WINAPI ReadThread(LPVOID lParam) IMediaSample_Release(pSample); V4l_FreeFrame(capBox); } - LeaveCriticalSection(&capBox->CritSect); if (FAILED(hr) && hr != VFW_E_NOT_CONNECTED) { - ERR("Received error: %x\n", hr); - goto cfail; + TRACE("Return %x, stop IFilterGraph\n", hr); + V4l_Unprepare(capBox); + capBox->thread = 0; + capBox->stopped = TRUE; + break; } + LeaveCriticalSection(&capBox->CritSect); } - LeaveCriticalSection(&capBox->CritSect); - CoTaskMemFree(pOutput); - - return 0; -cfail: - CoTaskMemFree(pOutput); - V4l_Unprepare(capBox); LeaveCriticalSection(&capBox->CritSect); - -fail: - capBox->thread = 0; - capBox->stopped = TRUE; - FIXME("Stop IFilterGraph\n"); + CoTaskMemFree(pOutput); return 0; }

1 0

Nikolay Sivov : riched20: Return proper interface pointers.
by Alexandre Julliard Feb. 9, 2017

Feb. 9, 2017

Module: wine Branch: master Commit: 440b92131f6c7173b3bdcef71a6fb0796f729a85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=440b92131f6c7173b3bdcef71… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Feb 9 16:17:15 2017 +0300 riched20: Return proper interface pointers. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/clipboard.c | 4 ++-- dlls/riched20/tests/txtsrv.c | 2 +- dlls/riched20/txthost.c | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/riched20/clipboard.c b/dlls/riched20/clipboard.c index d4560db..578fb02 100644 --- a/dlls/riched20/clipboard.c +++ b/dlls/riched20/clipboard.c @@ -66,7 +66,7 @@ static HRESULT WINAPI EnumFormatImpl_QueryInterface(IEnumFORMATETC *iface, REFII if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IEnumFORMATETC)) { IEnumFORMATETC_AddRef(iface); - *ppvObj = This; + *ppvObj = &This->IEnumFORMATETC_iface; return S_OK; } *ppvObj = NULL; @@ -183,7 +183,7 @@ static HRESULT WINAPI DataObjectImpl_QueryInterface(IDataObject *iface, REFIID r if (IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IDataObject)) { IDataObject_AddRef(iface); - *ppvObj = This; + *ppvObj = &This->IDataObject_iface; return S_OK; } *ppvObj = NULL; diff --git a/dlls/riched20/tests/txtsrv.c b/dlls/riched20/tests/txtsrv.c index 4be3106..73ca7cd 100644 --- a/dlls/riched20/tests/txtsrv.c +++ b/dlls/riched20/tests/txtsrv.c @@ -99,7 +99,7 @@ static HRESULT WINAPI ITextHostImpl_QueryInterface(ITextHost *iface, ITextHostTestImpl *This = impl_from_ITextHost(iface); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, pIID_ITextHost)) { - *ppvObject = This; + *ppvObject = &This->ITextHost_iface; ITextHost_AddRef((ITextHost *)*ppvObject); return S_OK; } diff --git a/dlls/riched20/txthost.c b/dlls/riched20/txthost.c index b99c933..0e51ecf 100644 --- a/dlls/riched20/txthost.c +++ b/dlls/riched20/txthost.c @@ -76,7 +76,7 @@ static HRESULT WINAPI ITextHostImpl_QueryInterface(ITextHost *iface, REFIID riid ITextHostImpl *This = impl_from_ITextHost(iface); if (IsEqualIID(riid, &IID_IUnknown) || IsEqualIID(riid, &IID_ITextHost)) { - *ppvObject = This; + *ppvObject = &This->ITextHost_iface; ITextHost_AddRef((ITextHost *)*ppvObject); return S_OK; }

1 0

Józef Kucia : wined3d: Generate code for compute shaders.
by Alexandre Julliard Feb. 9, 2017

Feb. 9, 2017

Module: wine Branch: master Commit: 67b599987efee11f3d02cb531e2393b83c01e9ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=67b599987efee11f3d02cb531… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 9 12:00:33 2017 +0100 wined3d: Generate code for compute shaders. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/glsl_shader.c | 226 +++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 216 insertions(+), 10 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=67b599987efee11f3d02c…

1 0

Hugh McMaster : regedit: Refresh listview after import.
by Alexandre Julliard Feb. 9, 2017

Feb. 9, 2017

Module: wine Branch: master Commit: e23ca416bd873cb546a44950c406862677044831 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e23ca416bd873cb546a44950c… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Feb 9 11:12:03 2017 +0000 regedit: Refresh listview after import. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/framewnd.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/programs/regedit/framewnd.c b/programs/regedit/framewnd.c index fb29ffb..6b549d6 100644 --- a/programs/regedit/framewnd.c +++ b/programs/regedit/framewnd.c @@ -354,6 +354,8 @@ static BOOL ImportRegistryFile(HWND hWnd) { OPENFILENAMEW ofn; WCHAR title[128]; + HKEY root_key = NULL; + WCHAR *key_path; InitOpenFileName(hWnd, &ofn); ofn.Flags |= OFN_ENABLESIZING; @@ -371,6 +373,11 @@ static BOOL ImportRegistryFile(HWND hWnd) CheckCommDlgError(hWnd); } RefreshTreeView(g_pChildWnd->hTreeWnd); + + key_path = GetItemPath(g_pChildWnd->hTreeWnd, 0, &root_key); + RefreshListView(g_pChildWnd->hListWnd, root_key, key_path, NULL); + HeapFree(GetProcessHeap(), 0, key_path); + return TRUE; }

1 0

Hugh McMaster : regedit: Sort treeview children on refresh.
by Alexandre Julliard Feb. 9, 2017

Feb. 9, 2017

Module: wine Branch: master Commit: 7073e27fbd61c7d2eeff8e4e3ccf1dfa0eca581b URL: http://source.winehq.org/git/wine.git/?a=commit;h=7073e27fbd61c7d2eeff8e4e3… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Thu Feb 9 11:12:14 2017 +0000 regedit: Sort treeview children on refresh. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/regedit/treeview.c | 1 + 1 file changed, 1 insertion(+) diff --git a/programs/regedit/treeview.c b/programs/regedit/treeview.c index 9d9fa6d..d07399d 100644 --- a/programs/regedit/treeview.c +++ b/programs/regedit/treeview.c @@ -482,6 +482,7 @@ BOOL RefreshTreeView(HWND hwndTV) SendMessageW(hwndTV, WM_SETREDRAW, TRUE, 0); InvalidateRect(hwndTV, NULL, FALSE); + SendMessageW(hwndTV, TVM_SORTCHILDREN, TRUE, (LPARAM)hSelectedItem); SetCursor(hcursorOld); /* We reselect the currently selected node, this will prompt a refresh of the listview. */

1 0

Carlos Garnacho : winex11: Use XIAllDevices to select for XI_RawMotion.
by Alexandre Julliard Feb. 9, 2017

Feb. 9, 2017

Module: wine Branch: master Commit: 448433ae034841b47b79af1c652c1a7f45d2895f URL: http://source.winehq.org/git/wine.git/?a=commit;h=448433ae034841b47b79af1c6… Author: Carlos Garnacho <carlosg(a)gnome.org> Date: Wed Feb 8 01:50:31 2017 +0100 winex11: Use XIAllDevices to select for XI_RawMotion. Instead of selecting for XI2 events for every slave device individually, do it for XIAllDevices, and store the current device's relative X/Y valuators so they can be quickly looked up in the XI_RawMotion events received. Signed-off-by: Carlos Garnacho <carlosg(a)gnome.org> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/mouse.c | 185 +++++++++++++++++++++++++++++++--------------- dlls/winex11.drv/x11drv.h | 10 +++ 2 files changed, 137 insertions(+), 58 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=448433ae034841b47b79a…

1 0