November 2017 - Wine-commits

Huw Davies : ole32: Correctly track the number of inits when auto-joining the MTA.
by Alexandre Julliard 10 Nov '17

10 Nov '17

Module: wine Branch: master Commit: fef5871e289baee99e8a8b4bce74c5c0cb60d2cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=fef5871e289baee99e8a8b4bc… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Nov 10 12:56:05 2017 +0000 ole32: Correctly track the number of inits when auto-joining the MTA. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ole32/compobj.c | 70 +++++++++++++++++++++++--------------------- dlls/ole32/compobj_private.h | 4 +-- dlls/ole32/rpc.c | 9 +++--- dlls/ole32/tests/marshal.c | 8 ++++- 4 files changed, 51 insertions(+), 40 deletions(-) diff --git a/dlls/ole32/compobj.c b/dlls/ole32/compobj.c index 6fb07bf..d136ee6 100644 --- a/dlls/ole32/compobj.c +++ b/dlls/ole32/compobj.c @@ -1724,12 +1724,6 @@ HWND apartment_getwindow(const struct apartment *apt) return apt->win; } -void apartment_joinmta(void) -{ - apartment_addref(MTA); - COM_CurrentInfo()->apt = MTA; -} - static void COM_TlsDestroy(void) { struct oletls *info = NtCurrentTeb()->ReservedForOle; @@ -1834,6 +1828,40 @@ HRESULT WINAPI CoRevokeInitializeSpy(ULARGE_INTEGER cookie) return S_OK; } +HRESULT enter_apartment( struct oletls *info, DWORD model ) +{ + HRESULT hr = S_OK; + + if (!info->apt) + { + if (!apartment_get_or_create( model )) + return E_OUTOFMEMORY; + } + else if (!apartment_is_model( info->apt, model )) + { + WARN( "Attempt to change threading model of this apartment from %s to %s\n", + info->apt->multi_threaded ? "multi-threaded" : "apartment threaded", + model & COINIT_APARTMENTTHREADED ? "apartment threaded" : "multi-threaded" ); + return RPC_E_CHANGED_MODE; + } + else + hr = S_FALSE; + + info->inits++; + + return hr; +} + +void leave_apartment( struct oletls *info ) +{ + if (!--info->inits) + { + if (info->ole_inits) + WARN( "Uninitializing apartment while Ole is still initialized\n" ); + apartment_release( info->apt ); + info->apt = NULL; + } +} /****************************************************************************** * CoInitialize [OLE32.@] @@ -1892,8 +1920,7 @@ HRESULT WINAPI CoInitialize(LPVOID lpReserved) HRESULT WINAPI DECLSPEC_HOTPATCH CoInitializeEx(LPVOID lpReserved, DWORD dwCoInit) { struct oletls *info = COM_CurrentInfo(); - HRESULT hr = S_OK; - APARTMENT *apt; + HRESULT hr; TRACE("(%p, %x)\n", lpReserved, (int)dwCoInit); @@ -1922,24 +1949,7 @@ HRESULT WINAPI DECLSPEC_HOTPATCH CoInitializeEx(LPVOID lpReserved, DWORD dwCoIni if (info->spy) IInitializeSpy_PreInitialize(info->spy, dwCoInit, info->inits); - if (!(apt = info->apt)) - { - apt = apartment_get_or_create(dwCoInit); - if (!apt) return E_OUTOFMEMORY; - } - else if (!apartment_is_model(apt, dwCoInit)) - { - /* Changing the threading model after it's been set is illegal. If this warning is triggered by Wine - code then we are probably using the wrong threading model to implement that API. */ - ERR("Attempt to change threading model of this apartment from %s to %s\n", - apt->multi_threaded ? "multi-threaded" : "apartment threaded", - dwCoInit & COINIT_APARTMENTTHREADED ? "apartment threaded" : "multi-threaded"); - return RPC_E_CHANGED_MODE; - } - else - hr = S_FALSE; - - info->inits++; + hr = enter_apartment( info, dwCoInit ); if (info->spy) IInitializeSpy_PostInitialize(info->spy, hr, dwCoInit, info->inits); @@ -1986,13 +1996,7 @@ void WINAPI DECLSPEC_HOTPATCH CoUninitialize(void) return; } - if (!--info->inits) - { - if (info->ole_inits) - WARN("uninitializing apartment while Ole is still initialized\n"); - apartment_release(info->apt); - info->apt = NULL; - } + leave_apartment( info ); /* * Decrease the reference count. diff --git a/dlls/ole32/compobj_private.h b/dlls/ole32/compobj_private.h index fd88ed9..0f10a7c 100644 --- a/dlls/ole32/compobj_private.h +++ b/dlls/ole32/compobj_private.h @@ -244,8 +244,8 @@ static inline HRESULT apartment_getoxid(const struct apartment *apt, OXID *oxid) } HRESULT apartment_createwindowifneeded(struct apartment *apt) DECLSPEC_HIDDEN; HWND apartment_getwindow(const struct apartment *apt) DECLSPEC_HIDDEN; -void apartment_joinmta(void) DECLSPEC_HIDDEN; - +HRESULT enter_apartment(struct oletls *info, DWORD model) DECLSPEC_HIDDEN; +void leave_apartment(struct oletls *info) DECLSPEC_HIDDEN; /* DCOM messages used by the apartment window (not compatible with native) */ #define DM_EXECUTERPC (WM_USER + 0) /* WPARAM = 0, LPARAM = (struct dispatch_params *) */ diff --git a/dlls/ole32/rpc.c b/dlls/ole32/rpc.c index ec5dc59..8d8276e 100644 --- a/dlls/ole32/rpc.c +++ b/dlls/ole32/rpc.c @@ -1495,16 +1495,17 @@ static void __RPC_STUB dispatch_rpc(RPC_MESSAGE *msg) else { BOOL joined = FALSE; - if (!COM_CurrentInfo()->apt) + struct oletls *info = COM_CurrentInfo(); + + if (!info->apt) { - apartment_joinmta(); + enter_apartment(info, COINIT_MULTITHREADED); joined = TRUE; } RPC_ExecuteCall(params); if (joined) { - apartment_release(COM_CurrentInfo()->apt); - COM_CurrentInfo()->apt = NULL; + leave_apartment(info); } } diff --git a/dlls/ole32/tests/marshal.c b/dlls/ole32/tests/marshal.c index e43439c..12c46e9 100644 --- a/dlls/ole32/tests/marshal.c +++ b/dlls/ole32/tests/marshal.c @@ -2968,6 +2968,12 @@ static HRESULT WINAPI local_server_GetClassID(IPersist *iface, CLSID *clsid) hr = CoDisconnectObject((IUnknown *)iface, 0); ok(hr == S_OK, "got %08x\n", hr); + /* Initialize and uninitialize the apartment to show that we + * remain in the autojoined mta */ + hr = pCoInitializeEx( NULL, COINIT_MULTITHREADED ); + ok( hr == S_FALSE, "got %08x\n", hr ); + CoUninitialize(); + return S_OK; } @@ -3749,7 +3755,7 @@ START_TEST(marshal) argc = winetest_get_mainargs( &argv ); if (argc > 2 && (!strcmp(argv[2], "-Embedding"))) { - pCoInitializeEx(NULL, COINIT_APARTMENTTHREADED); + pCoInitializeEx(NULL, COINIT_MULTITHREADED); test_register_local_server(); CoUninitialize();

1 0

Matteo Bruni : d3dx10: Remove redundant header include.
by Alexandre Julliard 10 Nov '17

10 Nov '17

Module: wine Branch: master Commit: e35e3a50a840451bd7852096282249a5656b3921 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e35e3a50a840451bd78520962… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Nov 9 23:30:19 2017 +0100 d3dx10: Remove redundant header include. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_43/async.c | 1 - 1 file changed, 1 deletion(-) diff --git a/dlls/d3dx10_43/async.c b/dlls/d3dx10_43/async.c index c910b4a..25df663 100644 --- a/dlls/d3dx10_43/async.c +++ b/dlls/d3dx10_43/async.c @@ -20,7 +20,6 @@ #include "wine/port.h" #include "d3d10_1.h" #include "d3dx10.h" -#include "d3dx10core.h" #include "d3dcompiler.h" #include "wine/debug.h"

1 0

Matteo Bruni : d3dx10: Fix tracing of shader source data.
by Alexandre Julliard 10 Nov '17

10 Nov '17

Module: wine Branch: master Commit: e9e4805d923edf71bf28ffe3e6f2fae4b062cec0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9e4805d923edf71bf28ffe3e… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Fri Nov 10 00:58:43 2017 +0100 d3dx10: Fix tracing of shader source data. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx10_33/d3dx10_33.spec | 4 ++-- dlls/d3dx10_34/d3dx10_34.spec | 4 ++-- dlls/d3dx10_35/d3dx10_35.spec | 4 ++-- dlls/d3dx10_36/d3dx10_36.spec | 4 ++-- dlls/d3dx10_37/d3dx10_37.spec | 4 ++-- dlls/d3dx10_38/d3dx10_38.spec | 4 ++-- dlls/d3dx10_39/d3dx10_39.spec | 4 ++-- dlls/d3dx10_40/d3dx10_40.spec | 4 ++-- dlls/d3dx10_41/d3dx10_41.spec | 4 ++-- dlls/d3dx10_42/d3dx10_42.spec | 4 ++-- dlls/d3dx10_43/async.c | 7 ++++--- dlls/d3dx10_43/d3dx10_43.spec | 4 ++-- 12 files changed, 26 insertions(+), 25 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e9e4805d923edf71bf28f…

1 0

Zebediah Figura : quartz/tests: Skip tests if CLSID_NullRenderer is not available.
by Alexandre Julliard 10 Nov '17

10 Nov '17

Module: wine Branch: master Commit: a49aa45c2b1bbf64fa15541d034e73737acf637f URL: http://source.winehq.org/git/wine.git/?a=commit;h=a49aa45c2b1bbf64fa15541d0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 9 19:09:52 2017 -0600 quartz/tests: Skip tests if CLSID_NullRenderer is not available. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/avisplitter.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index 29782a9..874036d 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -387,9 +387,12 @@ static void test_filter_graph(void) hr = CoCreateInstance(&CLSID_NullRenderer, NULL, CLSCTX_INPROC_SERVER, &IID_IBaseFilter, (LPVOID*)&pnull); - ok(hr == S_OK, "Could not create null renderer: %08x\n", hr); - if (hr != S_OK) + if (hr == REGDB_E_CLASSNOTREG) + { + win_skip("Null renderer not registered, skipping\n"); break; + } + ok(hr == S_OK, "Could not create null renderer: %08x\n", hr); IBaseFilter_EnumPins(pnull, &nullenum); IEnumPins_Next(nullenum, 1, &nullpin, NULL);

1 0

Zebediah Figura : quartz/tests: Add test AVI and MPG files.
by Alexandre Julliard 10 Nov '17

10 Nov '17

Module: wine Branch: master Commit: 86c3d7293b721f99bd5e67c18fcbc926b23c85f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=86c3d7293b721f99bd5e67c18… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu Nov 9 19:09:53 2017 -0600 quartz/tests: Add test AVI and MPG files. Generated with ffmpeg using the following commands: ffmpeg -f lavfi -i smptebars -t 1 -r 1 -f avi -vcodec rawvideo -pix_fmt yuv420p -vf scale=32x24 test.avi ffmpeg -f lavfi -i smptebars -f lavfi -i "sine=frequency=1000" -t 0.04 -r 25 -f mpeg -vcodec mpeg1video -vf scale=32x24 -acodec mp2 test.mpg Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/Makefile.in | 3 +++ dlls/quartz/tests/avisplitter.c | 44 ++++++++++++++++++++++++++++++------ dlls/quartz/tests/filtergraph.c | 48 +++++++++++++++++++++++++++++++++++----- dlls/quartz/tests/rsrc.rc | 27 ++++++++++++++++++++++ dlls/quartz/tests/test.avi | Bin 0 -> 6938 bytes dlls/quartz/tests/test.mpg | Bin 0 -> 6144 bytes 6 files changed, 110 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/tests/Makefile.in b/dlls/quartz/tests/Makefile.in index ebded4b..2ff1b47 100644 --- a/dlls/quartz/tests/Makefile.in +++ b/dlls/quartz/tests/Makefile.in @@ -13,3 +13,6 @@ C_SRCS = \ videorenderer.c IDL_SRCS = fil_data.idl + +RC_SRCS = \ + rsrc.rc diff --git a/dlls/quartz/tests/avisplitter.c b/dlls/quartz/tests/avisplitter.c index 874036d..23167b5 100644 --- a/dlls/quartz/tests/avisplitter.c +++ b/dlls/quartz/tests/avisplitter.c @@ -270,8 +270,32 @@ static void test_filesourcefilter(void) } } -static const WCHAR wfile[] = {'t','e','s','t','.','a','v','i',0}; -static const char afile[] = "test.avi"; +static const WCHAR avifile[] = {'t','e','s','t','.','a','v','i',0}; + +static WCHAR *load_resource(const WCHAR *name) +{ + static WCHAR pathW[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + lstrcatW(pathW, name); + + file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", wine_dbgstr_w(pathW), + GetLastError()); + + res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); + + return pathW; +} static void test_filter_graph(void) { @@ -286,11 +310,14 @@ static void test_filter_graph(void) DWORD readbytes; FILTER_STATE state; - file = CreateFileW(wfile, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, + WCHAR *filename = load_resource(avifile); + + file = CreateFileW(filename, GENERIC_READ, FILE_SHARE_READ|FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, NULL); if (file == INVALID_HANDLE_VALUE) { - skip("Could not read test file \"%s\", skipping test\n", afile); + skip("Could not read test file \"%s\", skipping test\n", wine_dbgstr_w(filename)); + DeleteFileW(filename); return; } @@ -301,7 +328,8 @@ static void test_filter_graph(void) if (strncmp(buffer, "RIFF", 4) || strcmp(buffer + 8, "AVI ")) { skip("%s is not an avi riff file, not doing the avi splitter test\n", - afile); + wine_dbgstr_w(filename)); + DeleteFileW(filename); return; } @@ -331,10 +359,10 @@ static void test_filter_graph(void) if (hr != S_OK) goto fail; - hr = IFileSourceFilter_Load(pfile, wfile, NULL); + hr = IFileSourceFilter_Load(pfile, filename, NULL); if (hr != S_OK) { - trace("Could not load file\n"); + trace("Could not load file: %08x\n", hr); goto fail; } @@ -509,6 +537,8 @@ fail: IBaseFilter_Release(pavi); if (pfile) IFileSourceFilter_Release(pfile); + + DeleteFileW(filename); } START_TEST(avisplitter) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index f9c95ae..e66dc40 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -42,6 +42,31 @@ typedef struct TestFilterImpl static const WCHAR avifile[] = {'t','e','s','t','.','a','v','i',0}; static const WCHAR mpegfile[] = {'t','e','s','t','.','m','p','g',0}; +static WCHAR *load_resource(const WCHAR *name) +{ + static WCHAR pathW[MAX_PATH]; + DWORD written; + HANDLE file; + HRSRC res; + void *ptr; + + GetTempPathW(sizeof(pathW)/sizeof(WCHAR), pathW); + lstrcatW(pathW, name); + + file = CreateFileW(pathW, GENERIC_READ|GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, 0, 0); + ok(file != INVALID_HANDLE_VALUE, "file creation failed, at %s, error %d\n", wine_dbgstr_w(pathW), + GetLastError()); + + res = FindResourceW(NULL, name, (LPCWSTR)RT_RCDATA); + ok( res != 0, "couldn't find resource\n" ); + ptr = LockResource( LoadResource( GetModuleHandleA(NULL), res )); + WriteFile( file, ptr, SizeofResource( GetModuleHandleA(NULL), res ), &written, NULL ); + ok( written == SizeofResource( GetModuleHandleA(NULL), res ), "couldn't write resource\n" ); + CloseHandle( file ); + + return pathW; +} + static IGraphBuilder *pgraph; static int createfiltergraph(void) @@ -355,26 +380,39 @@ static void test_render_run(const WCHAR *file) HANDLE h; HRESULT hr; - h = CreateFileW(file, 0, 0, NULL, OPEN_EXISTING, 0, NULL); + WCHAR *filename = load_resource(file); + + h = CreateFileW(filename, 0, 0, NULL, OPEN_EXISTING, 0, NULL); if (h == INVALID_HANDLE_VALUE) { skip("Could not read test file %s, skipping test\n", wine_dbgstr_w(file)); + DeleteFileW(filename); return; } CloseHandle(h); if (!createfiltergraph()) + { + DeleteFileW(filename); return; + } - hr = IGraphBuilder_RenderFile(pgraph, file, NULL); - ok(hr == S_OK, "RenderFile returned: %x\n", hr); - rungraph(); + hr = IGraphBuilder_RenderFile(pgraph, filename, NULL); + if (hr == VFW_E_CANNOT_RENDER) + skip("%s: codec not supported; skipping test\n", wine_dbgstr_w(file)); + else + { + ok(hr == S_OK || hr == VFW_S_AUDIO_NOT_RENDERED, "RenderFile failed: %x\n", hr); + rungraph(); + } releasefiltergraph(); /* check reference leaks */ - h = CreateFileW(file, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); + h = CreateFileW(filename, GENERIC_READ, 0, NULL, OPEN_EXISTING, 0, NULL); ok(h != INVALID_HANDLE_VALUE, "CreateFile failed: err=%d\n", GetLastError()); CloseHandle(h); + + DeleteFileW(filename); } static DWORD WINAPI call_RenderFile_multithread(LPVOID lParam) diff --git a/dlls/quartz/tests/rsrc.rc b/dlls/quartz/tests/rsrc.rc new file mode 100644 index 0000000..9bea5be --- /dev/null +++ b/dlls/quartz/tests/rsrc.rc @@ -0,0 +1,27 @@ +/* + * Resource file for quartz tests. + * + * Copyright 2017 Zebediah Figura + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include "windef.h" + +/* @makedep: test.avi */ +test.avi RCDATA "test.avi" + +/* @makedep: test.mpg */ +test.mpg RCDATA "test.mpg" diff --git a/dlls/quartz/tests/test.avi b/dlls/quartz/tests/test.avi new file mode 100644 index 0000000..bec304d Binary files /dev/null and b/dlls/quartz/tests/test.avi differ diff --git a/dlls/quartz/tests/test.mpg b/dlls/quartz/tests/test.mpg new file mode 100644 index 0000000..7fe379a Binary files /dev/null and b/dlls/quartz/tests/test.mpg differ

1 0

Alexandre Julliard : patches: Update documentation to point to wine-devel instead of wine-patches.
by Alexandre Julliard 10 Nov '17

10 Nov '17

Module: tools Branch: master Commit: 2ac3b11f32c5db5128d893e907bb424a2fc29015 URL: http://source.winehq.org/git/tools.git/?a=commit;h=2ac3b11f32c5db5128d893e9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 10 16:38:21 2017 +0100 patches: Update documentation to point to wine-devel instead of wine-patches. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/doc/INSTALL.txt | 13 +++++-------- patches/expire | 2 +- patches/filter | 2 +- 3 files changed, 7 insertions(+), 10 deletions(-) diff --git a/patches/doc/INSTALL.txt b/patches/doc/INSTALL.txt index c1570ac..e1ef2b8 100644 --- a/patches/doc/INSTALL.txt +++ b/patches/doc/INSTALL.txt @@ -37,14 +37,13 @@ Apache setup: - Create the $HOME/opt/source/patches directory and copy patches.css there: mkdir $HOME/opt/source/patches cp patches.css $HOME/opt/source/patches -- Create the $HOME/patches and $HOME/patches/OLD directories where the patch - data will live: - mkdir -p $HOME/patches/OLD -- Arrange for the filter script to be fed the wine-patches emails. One way to - do so would be to subscribe the winehq user to the wine-patches mailing list +- Create the $HOME/patches directory where the patch data will live: + mkdir -p $HOME/patches +- Arrange for the filter script to be fed the wine-devel emails. One way to + do so would be to subscribe the winehq user to the wine-devel mailing list and to then add the following lines to the .procmailrc file: :0 - * ^List-Id: Wine Patch Submissions + * ^List-Id:.*wine-devel\.winehq\.org { :0 hbfw | $HOME/tools/patches/filter @@ -55,8 +54,6 @@ Apache setup: formail -ds procmail <mbox-file - Run update regularly to update the website: */5 * * * * $HOME/tools/patches/update -- Run expire regularly to delete old patches: - 0 0 * * * $HOME/tools/patches/expire -v $HOME/patches For integration with the WineTestBot, see the corresponding section in the WineTestBot documentation. diff --git a/patches/expire b/patches/expire index 305e7e5..513a5b1 100755 --- a/patches/expire +++ b/patches/expire @@ -345,7 +345,7 @@ asked to review the following Wine $patch_str: $patch_urls If you think that a patch is correct and can be committed, please send -a mail to wine-patches with your Signed-off-by header, as a reply to +a mail to wine-devel with your Signed-off-by header, as a reply to the original patch email. If you find some issues in a patch, please send a mail to the patch diff --git a/patches/filter b/patches/filter index 62e2a0d..7074d96 100755 --- a/patches/filter +++ b/patches/filter @@ -1,6 +1,6 @@ #!/usr/bin/perl -w # -# Reformat a wine-patches email so it can be put in a file that the patches +# Reformat a wine-devel email so it can be put in a file that the patches # site can link to. In particular this means only keeping the relevant # header fields and decoding / decompressing the patch. #

1 0

Alexandre Julliard : testbot: Update documentation to point to wine-devel instead of wine-patches.
by Alexandre Julliard 10 Nov '17

10 Nov '17

Module: tools Branch: master Commit: bc7d2a84263d536c8c0ba0d6f3c4580ff837c5aa URL: http://source.winehq.org/git/tools.git/?a=commit;h=bc7d2a84263d536c8c0ba0d6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Nov 10 16:38:34 2017 +0100 testbot: Update documentation to point to wine-devel instead of wine-patches. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/README | 2 +- testbot/bin/WinePatchesMLSubmit.pl | 2 +- testbot/doc/INSTALL.txt | 11 +++++------ testbot/lib/WineTestBot/Config.pm | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/testbot/README b/testbot/README index 3977c5d..8475abe 100644 --- a/testbot/README +++ b/testbot/README @@ -21,7 +21,7 @@ Windows machines. There are three ways this can happen: * Registered users can submit patches and binaries using the web site and have them run on the set of Windows machines of their choosing. -* Conformance test patches sent to the wine-patches mailing list are +* Conformance test patches sent to the wine-devel mailing list are run on the default set of Windows machines. Any failure is reported to the patch author and to the wine-devel mailing list. diff --git a/testbot/bin/WinePatchesMLSubmit.pl b/testbot/bin/WinePatchesMLSubmit.pl index 6dc39e8..65fe848 100755 --- a/testbot/bin/WinePatchesMLSubmit.pl +++ b/testbot/bin/WinePatchesMLSubmit.pl @@ -1,7 +1,7 @@ #!/usr/bin/perl -Tw # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- # -# This script expects to receive a wine-patches email on stdin and submits it +# This script expects to receive a wine-devel email on stdin and submits it # to WineTestBot for testing. It is meant to be called from a tool such as # procmail. # diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index 0b95656..9947150 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -89,17 +89,16 @@ Setup for Winetest updates: */10 * * * * $HOME/tools/testbot/bin/CheckForWinetestUpdate.pl 32 */10 * * * * $HOME/tools/testbot/bin/CheckForWinetestUpdate.pl 64 -Setup for wine-patches: +Setup for wine-devel: - A proper WineTestBot system should integrate with Wine's patches site. - An alternative is to interface directly with wine-patches as described in + An alternative is to interface directly with wine-devel as described in this section. - Arrange for the WinePatchesMLSubmit.pl script to be fed the - wine-patches emails. One way to do so would be to subscribe the - winehq user to the wine-patches mailing list and to then add the + wine-devel emails. One way to do so would be to subscribe the + winehq user to the wine-devel mailing list and to then add the following lines to the .procmailrc file: :0c: - * ^List-Id: Wine Patch Submissions - * ^TO wine-patches + * ^List-Id:.*wine-devel\.winehq\.org | $HOME/tools/testbot/bin/WinePatchesMLSubmit.pl - Or if you have a set of patches to test in the mbox format you can test with: diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index 4f38633..b0492a3 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -96,7 +96,7 @@ $BuildTimeout = 5 * 60; $ReconfigTimeout = 45 * 60; $ProjectName = "Wine"; -$PatchesMailingList = "wine-patches"; +$PatchesMailingList = "wine-devel"; $LDAPServer = undef; $LDAPBindDN = undef;

1 0

Alexandre Julliard : patches: Create an intermediate directory level for patches on the website.
by Alexandre Julliard 10 Nov '17

10 Nov '17

Module: tools Branch: master Commit: a36a95cfab9a1f984e2649f69e4d4218273600d7 URL: http://source.winehq.org/git/tools.git/?a=commit;h=a36a95cfab9a1f984e2649f6… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 8 18:21:48 2017 +0100 patches: Create an intermediate directory level for patches on the website. This avoids having hundreds of thousands of files in the same directory. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/update | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/patches/update b/patches/update index 87e640d..e4ede03 100755 --- a/patches/update +++ b/patches/update @@ -91,6 +91,7 @@ my $dir = $ARGV[0] || "$ENV{HOME}/patches"; my $dest = "/home/winehq/opt/source/patches"; my %patches; my %messages; +my %subdirs; sub format_author($) { @@ -218,6 +219,7 @@ foreach my $file (readdir DIR) $messages{$patch{"msgid"}} = \%patch; } $patches{$file} = \%patch; + if ($file =~ /^([0-9]+)[0-9]{4}$/) { $subdirs{$1} = 1; } } closedir DIR; @@ -449,5 +451,9 @@ print INDEX $sorter; print INDEX end_html; close INDEX; -!system "rsync", "-q", "-r", "--chmod=+r", "--exclude=OLD/", "$dir/", "$dest/data" or die "rsync failed: $?"; +foreach (keys %subdirs) +{ + !system "rsync", "-q", "-r", "--chmod=+r", "--include=$_*", "--exclude=*", "$dir/", "$dest/data/$_" or die "rsync failed: $?"; +} + rename "$dest/index.html.new", "$dest/index.html" or die "failed to update index.html";

1 0

Alexandre Julliard : patches: Expire replies along with their parent patch.
by Alexandre Julliard 10 Nov '17

10 Nov '17

Module: tools Branch: master Commit: 1654c8a28e36627fba4097c7493663675c7a7e24 URL: http://source.winehq.org/git/tools.git/?a=commit;h=1654c8a28e36627fba4097c7… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Nov 8 21:08:44 2017 +0100 patches: Expire replies along with their parent patch. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/expire | 96 +++++++++++++++++++++++----------------------------------- 1 file changed, 38 insertions(+), 58 deletions(-) diff --git a/patches/expire b/patches/expire index cba6246..4dd8a1a 100755 --- a/patches/expire +++ b/patches/expire @@ -193,6 +193,21 @@ sub get_patch_state($) my $file = shift; my $status = "nil"; my $mtime = 0; + my ($subject, $msgid, $reply); + + return undef unless open PATCH, "<$dir/$file"; + while (<PATCH>) + { + if (/^Subject: (.*)$/) { $subject = $1; } + elsif (/^Message-Id: (.*)$/) { $msgid = $1; } + elsif (/^In-Reply-To: (.*)$/) { $reply = $1; } + last if (/^$/); + } + while (<PATCH>) + { + if (/^diff --git a\//) { $reply = undef; last; } + } + close PATCH; if (open STATUS, "<$dir/$file.status") { @@ -201,11 +216,8 @@ sub get_patch_state($) $mtime = (stat STATUS)[9] unless ($status eq "nil" || $status eq "pending"); close STATUS; } - if (!$mtime && $file !~ /^OLD\//) - { - $mtime = (stat "$dir/$file")[9]; - } - return ($status, $mtime); + $mtime ||= (stat "$dir/$file")[9]; + return ($subject, $msgid, $reply, $status, $mtime); } sub get_previous_state($) @@ -364,81 +376,49 @@ EOF # expire current patches +my %patches; + opendir DIR, $dir or die "cannot open '$dir': $!\n"; foreach my $file (sort readdir DIR) { next unless $file =~ /^[0-9]+$/; - my ($status, $mtime) = get_patch_state( $file ); + my ($subject, $msgid, $reply, $status, $mtime) = get_patch_state( $file ); my $prev_status = get_previous_state( $file ); my $limit = $status_expiry{$status} || 7; + my $expire = (($now - $mtime - 12*60*60) / (24*60*60) > $limit); notify_state_change( $file, $prev_status, $status ); - if (($now - $mtime - 12*60*60) / (24*60*60) > $limit) - { - if ($status eq "nil" || $status eq "pending") - { - # move to OLD - printf "rename $file -> OLD %s %s\n", $status, get_patch_subject( "$file" ) unless $quiet; - unless ($dry_run) - { - rename "$dir/$file", "$dir/OLD/$file"; - rename "$dir/$file.status", "$dir/OLD/$file.status"; - rename "$dir/$file.order", "$dir/OLD/$file.order"; - rename "$dir/$file.review", "$dir/OLD/$file.review"; - rename "$dir/$file.signoff", "$dir/OLD/$file.signoff"; - rename "$dir/$file.testbot", "$dir/OLD/$file.testbot"; - rename "$dir/$file.testfail", "$dir/OLD/$file.testfail"; - } - } - else - { - printf "unlink $file %s %s\n", $status, get_patch_subject( "$file" ) unless $quiet; - unless ($dry_run) - { - unlink "$dir/$file"; - unlink "$dir/$file.status"; - unlink "$dir/$file.order"; - unlink "$dir/$file.signoff"; - unlink "$dir/$file.review"; - unlink "$dir/$file.testbot"; - unlink "$dir/$file.testfail"; - unlink "$dir/OLD/$file.status"; - } - } - } + $patches{$msgid} = [ $file, $subject, $reply, $status, $expire ]; } closedir DIR; -# expire old patches whose status has changed - -opendir DIR, "$dir/OLD" or die "cannot open '$dir/OLD': $!\n"; -foreach my $file (sort readdir DIR) +foreach my $p (keys %patches) { - next unless $file =~ /^[0-9]+$/; - my ($status, $mtime) = get_patch_state( "OLD/$file" ); + my ($file, $subject, $reply, $status, $expire) = @{$patches{$p}}; + my $orig_status = $status; - if ($status eq "pending") + # for replies, inherit expire flag from top parent + while ($reply && $status eq "reply") { - # remove status file - printf "unlink OLD/$file.status\n" unless $quiet; - unlink "$dir/OLD/$file.status" unless $dry_run; + last unless defined $patches{$reply}; + (undef, undef, $reply, $status, $expire) = @{$patches{$reply}}; } - elsif ($status ne "nil") + + if ($expire) { - printf "unlink OLD/$file %s %s\n", $status, get_patch_subject( "OLD/$file" ) unless $quiet; + printf "unlink $file %s %s\n", $orig_status, $subject unless $quiet; unless ($dry_run) { - unlink "$dir/OLD/$file"; + unlink "$dir/$file"; + unlink "$dir/$file.status"; + unlink "$dir/$file.order"; + unlink "$dir/$file.review"; + unlink "$dir/$file.testbot"; + unlink "$dir/$file.testfail"; unlink "$dir/OLD/$file.status"; - unlink "$dir/OLD/$file.order"; - unlink "$dir/OLD/$file.review"; - unlink "$dir/OLD/$file.signoff"; - unlink "$dir/OLD/$file.testbot"; - unlink "$dir/OLD/$file.testfail"; } } } -closedir DIR; notify_reviewers();

1 0

Alexandre Julliard : patches: Also use References: header to build mail threads.
by Alexandre Julliard 10 Nov '17

10 Nov '17

Module: tools Branch: master Commit: 4e6b4b09d261b86ad0b0768849806294c8292e14 URL: http://source.winehq.org/git/tools.git/?a=commit;h=4e6b4b09d261b86ad0b07688… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Nov 9 12:32:44 2017 +0100 patches: Also use References: header to build mail threads. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- patches/update | 48 +++++++++++++++++++++++++++++++++--------------- 1 file changed, 33 insertions(+), 15 deletions(-) diff --git a/patches/update b/patches/update index e4ede03..ca4d2e5 100755 --- a/patches/update +++ b/patches/update @@ -154,6 +154,7 @@ foreach my $file (readdir DIR) elsif (/^From: (.*)$/) { $patch{"author"} = format_author($1); } elsif (/^Message-Id: (.*)$/) { $patch{"msgid"} = $1; } elsif (/^In-Reply-To: (.*)$/) { $patch{"reply"} = $1; } + elsif (/^References: (.*)$/) { @{$patch{"refs"}} = split /\s+/, $1; } last if (/^$/); } while (<PATCH>) @@ -225,24 +226,35 @@ closedir DIR; # build mail threads -foreach my $file (sort keys %patches) +sub assign_parent($); +sub assign_parent($) { - my $patch = $patches{$file}; - next if defined $patch->{"has_patch"}; - next unless defined $patch->{"reply"}; - next unless defined $messages{$patch->{"reply"}}; - my $parent = $messages{$patch->{"reply"}}; - # find top parent - while (!defined($parent->{"has_patch"}) && defined($parent->{"reply"})) + my $patch = shift; + + if (defined($patch->{"parent"})) { return $patch->{"parent"}; } + + return $patch if defined $patch->{"has_patch"}; + return $patch unless defined $patch->{"reply"}; + + foreach ($patch->{"reply"}, @{$patch->{"refs"}}) { - $parent = $messages{$parent->{"reply"}}; + next unless defined $messages{$_}; + my $parent = assign_parent( $messages{$_} ); + next unless $parent; + # add it to the parent's children + $patch->{"parent"} = $parent; + push @{$parent->{"children"}}, $patch; + push @{$parent->{"signoff"}}, @{$patch->{"signoff"}} if $patch->{"signoff"}; + return $parent; } - next unless defined $parent; - # add it to the parent's children and remove it from the list - $patch->{"parent"} = $parent; - push @{$parent->{"children"}}, $patch; - push @{$parent->{"signoff"}}, @{$patch->{"signoff"}} if $patch->{"signoff"}; - delete $patches{$file}; + return undef; +} + +foreach my $file (sort keys %patches) +{ + assign_parent( $patches{$file} ); + # remove patches that have a parent + delete $patches{$file} if $patches{$file}->{"parent"}; } my $row = 0; @@ -250,6 +262,12 @@ foreach my $file (sort { $patches{$b}->{"order"} <=> $patches{$a}->{"order"} } k { my $patch = $patches{$file}; + if (!defined $patch->{"has_patch"}) # skip non-patches + { + next if $patch->{"status"} eq "reply"; + next unless $patch->{"subject"} =~ /\[.*PATCH.*\]/; + } + printf INDEX "<tr class=\"%s %s\"><td class=\"id\">%s</td><td class=\"status\"><a href=\"#legend\">%s</a></td>", $row & 1 ? "odd" : "even", $patch->{"status"}, $file, $status_descr{$patch->{"status"}} || $patch->{"status"}; if (defined $patch->{"children"})

1 0