wine-commits June 2018

wine-commits@winehq.org

1 participants
629 discussions

Zhiyi Zhang : comctl32/taskdialog: Fix buttons might disappear.
by Alexandre Julliard 25 Jun '18

25 Jun '18

Module: wine Branch: master Commit: 5d7fa27a2f6349dc460bf83c7d670e2458697f65 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5d7fa27a2f6349dc460bf83c… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Sun Jun 17 16:16:57 2018 +0800 comctl32/taskdialog: Fix buttons might disappear. In the old button layout algorithm, line count is added before adding button. This cause line count buffer overflow when the first button is very long. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/taskdialog.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/dlls/comctl32/taskdialog.c b/dlls/comctl32/taskdialog.c index 1a5fad1..33fb578 100644 --- a/dlls/comctl32/taskdialog.c +++ b/dlls/comctl32/taskdialog.c @@ -506,16 +506,15 @@ static void taskdialog_layout(struct taskdialog_info *dialog_info) x = h_spacing; for (i = 0, line_count = 0; i < dialog_info->button_count; i++) { - if (x + button_layout_infos[i].width + h_spacing >= dialog_width) + button_layout_infos[i].line = line_count; + x += button_layout_infos[i].width + h_spacing; + line_widths[line_count] += button_layout_infos[i].width + h_spacing; + + if ((i + 1 < dialog_info->button_count) && (x + button_layout_infos[i + 1].width + h_spacing >= dialog_width)) { x = h_spacing; line_count++; } - - button_layout_infos[i].line = line_count; - - x += button_layout_infos[i].width + h_spacing; - line_widths[line_count] += button_layout_infos[i].width + h_spacing; } line_count++;

1 0

Zebediah Figura : mp3dmod: Support COM aggregation.
by Alexandre Julliard 25 Jun '18

25 Jun '18

Module: wine Branch: master Commit: 10e4eb8aca7d0278acb988df1a2871de9ce318b8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=10e4eb8aca7d0278acb988df… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Fri Jun 22 13:36:04 2018 -0500 mp3dmod: Support COM aggregation. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mp3dmod/mp3dmod.c | 80 ++++++++++++++++++++++++++++++++------------ dlls/mp3dmod/tests/mp3dmod.c | 57 +++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+), 21 deletions(-) diff --git a/dlls/mp3dmod/mp3dmod.c b/dlls/mp3dmod/mp3dmod.c index 4949780..90bcf66 100644 --- a/dlls/mp3dmod/mp3dmod.c +++ b/dlls/mp3dmod/mp3dmod.c @@ -43,7 +43,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(mp3dmod); static HINSTANCE mp3dmod_instance; struct mp3_decoder { + IUnknown IUnknown_inner; IMediaObject IMediaObject_iface; + IUnknown *outer; LONG ref; mpg123_handle *mh; DMO_MEDIA_TYPE outtype; @@ -51,33 +53,35 @@ struct mp3_decoder { REFERENCE_TIME timestamp; }; -static inline struct mp3_decoder *impl_from_IMediaObject(IMediaObject *iface) +static inline struct mp3_decoder *impl_from_IUnknown(IUnknown *iface) { - return CONTAINING_RECORD(iface, struct mp3_decoder, IMediaObject_iface); + return CONTAINING_RECORD(iface, struct mp3_decoder, IUnknown_inner); } -static HRESULT WINAPI MediaObject_QueryInterface(IMediaObject *iface, REFIID iid, void **ppv) +static HRESULT WINAPI Unknown_QueryInterface(IUnknown *iface, REFIID iid, void **obj) { - struct mp3_decoder *This = impl_from_IMediaObject(iface); + struct mp3_decoder *This = impl_from_IUnknown(iface); - TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(iid), ppv); + TRACE("(%p)->(%s, %p)\n", This, debugstr_guid(iid), obj); - if (IsEqualIID(iid, &IID_IUnknown) || IsEqualIID(iid, &IID_IMediaObject)) - *ppv = &This->IMediaObject_iface; + if (IsEqualGUID(iid, &IID_IUnknown)) + *obj = &This->IUnknown_inner; + else if (IsEqualGUID(iid, &IID_IMediaObject)) + *obj = &This->IMediaObject_iface; else { FIXME("no interface for %s\n", debugstr_guid(iid)); - *ppv = NULL; + *obj = NULL; return E_NOINTERFACE; } - IMediaObject_AddRef(iface); + IUnknown_AddRef((IUnknown *)*obj); return S_OK; } -static ULONG WINAPI MediaObject_AddRef(IMediaObject *iface) +static ULONG WINAPI Unknown_AddRef(IUnknown *iface) { - struct mp3_decoder *This = impl_from_IMediaObject(iface); + struct mp3_decoder *This = impl_from_IUnknown(iface); ULONG refcount = InterlockedIncrement(&This->ref); TRACE("(%p) AddRef from %d\n", This, refcount - 1); @@ -85,9 +89,9 @@ static ULONG WINAPI MediaObject_AddRef(IMediaObject *iface) return refcount; } -static ULONG WINAPI MediaObject_Release(IMediaObject *iface) +static ULONG WINAPI Unknown_Release(IUnknown *iface) { - struct mp3_decoder *This = impl_from_IMediaObject(iface); + struct mp3_decoder *This = impl_from_IUnknown(iface); ULONG refcount = InterlockedDecrement(&This->ref); TRACE("(%p) Release from %d\n", This, refcount + 1); @@ -100,6 +104,35 @@ static ULONG WINAPI MediaObject_Release(IMediaObject *iface) return refcount; } +static const IUnknownVtbl Unknown_vtbl = { + Unknown_QueryInterface, + Unknown_AddRef, + Unknown_Release, +}; + +static inline struct mp3_decoder *impl_from_IMediaObject(IMediaObject *iface) +{ + return CONTAINING_RECORD(iface, struct mp3_decoder, IMediaObject_iface); +} + +static HRESULT WINAPI MediaObject_QueryInterface(IMediaObject *iface, REFIID iid, void **obj) +{ + struct mp3_decoder *This = impl_from_IMediaObject(iface); + return IUnknown_QueryInterface(This->outer, iid, obj); +} + +static ULONG WINAPI MediaObject_AddRef(IMediaObject *iface) +{ + struct mp3_decoder *This = impl_from_IMediaObject(iface); + return IUnknown_AddRef(This->outer); +} + +static ULONG WINAPI MediaObject_Release(IMediaObject *iface) +{ + struct mp3_decoder *This = impl_from_IMediaObject(iface); + return IUnknown_Release(This->outer); +} + static HRESULT WINAPI MediaObject_GetStreamCount(IMediaObject *iface, DWORD *input, DWORD *output) { FIXME("(%p)->(%p, %p) stub!\n", iface, input, output); @@ -389,7 +422,7 @@ static HRESULT WINAPI MediaObject_Lock(IMediaObject *iface, LONG lock) return E_NOTIMPL; } -static const IMediaObjectVtbl IMediaObject_vtbl = { +static const IMediaObjectVtbl MediaObject_vtbl = { MediaObject_QueryInterface, MediaObject_AddRef, MediaObject_Release, @@ -416,23 +449,28 @@ static const IMediaObjectVtbl IMediaObject_vtbl = { MediaObject_Lock, }; -static HRESULT create_mp3_decoder(REFIID iid, void **obj) +static HRESULT create_mp3_decoder(IUnknown *outer, REFIID iid, void **obj) { struct mp3_decoder *This; + HRESULT hr; int err; if (!(This = heap_alloc_zero(sizeof(*This)))) return E_OUTOFMEMORY; - This->IMediaObject_iface.lpVtbl = &IMediaObject_vtbl; - This->ref = 0; + This->IUnknown_inner.lpVtbl = &Unknown_vtbl; + This->IMediaObject_iface.lpVtbl = &MediaObject_vtbl; + This->ref = 1; + This->outer = outer ? outer : &This->IUnknown_inner; mpg123_init(); This->mh = mpg123_new(NULL, &err); mpg123_open_feed(This->mh); mpg123_format_none(This->mh); - return IMediaObject_QueryInterface(&This->IMediaObject_iface, iid, obj); + hr = IUnknown_QueryInterface(&This->IUnknown_inner, iid, obj); + IUnknown_Release(&This->IUnknown_inner); + return hr; } static HRESULT WINAPI ClassFactory_QueryInterface(IClassFactory *iface, REFIID iid, void **obj) @@ -466,13 +504,13 @@ static HRESULT WINAPI ClassFactory_CreateInstance(IClassFactory *iface, IUnknown { TRACE("(%p, %s, %p)\n", outer, debugstr_guid(iid), obj); - if (outer) + if (outer && !IsEqualGUID(iid, &IID_IUnknown)) { *obj = NULL; - return CLASS_E_NOAGGREGATION; + return E_NOINTERFACE; } - return create_mp3_decoder(iid, obj); + return create_mp3_decoder(outer, iid, obj); } static HRESULT WINAPI ClassFactory_LockServer(IClassFactory *iface, BOOL lock) diff --git a/dlls/mp3dmod/tests/mp3dmod.c b/dlls/mp3dmod/tests/mp3dmod.c index 68c6b4d..75fd0e2 100644 --- a/dlls/mp3dmod/tests/mp3dmod.c +++ b/dlls/mp3dmod/tests/mp3dmod.c @@ -230,6 +230,62 @@ static void test_convert(void) IMediaObject_Release(dmo); } +static const GUID IID_test_outer = {0xdeadbeef,0,0,{0,0,0,0,0,0,0,0x66}}; + +static HRESULT WINAPI Outer_QueryInterface(IUnknown *iface, REFIID iid, void **obj) +{ + if (IsEqualGUID(iid, &IID_test_outer)) + { + *obj = (IUnknown *)0xdeadbeef; + return S_OK; + } + ok(0, "unexpected call %s\n", wine_dbgstr_guid(iid)); + return E_NOINTERFACE; +} + +static ULONG WINAPI Outer_AddRef(IUnknown *iface) +{ + return 2; +} + +static ULONG WINAPI Outer_Release(IUnknown *iface) +{ + return 1; +} + +static IUnknownVtbl Outer_vtbl = { + Outer_QueryInterface, + Outer_AddRef, + Outer_Release, +}; + +static IUnknown Outer = { &Outer_vtbl }; + +static void test_aggregation(void) +{ + IUnknown *unk, *unk2; + IMediaObject *dmo; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_CMP3DecMediaObject, &Outer, CLSCTX_INPROC_SERVER, + &IID_IUnknown, (void **)&unk); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IUnknown_QueryInterface(unk, &IID_IMediaObject, (void **)&dmo); + ok(hr == S_OK, "got %#x\n", hr); + + hr = IMediaObject_QueryInterface(dmo, &IID_test_outer, (void **)&unk2); + ok(hr == S_OK, "got %#x\n", hr); + ok(unk2 == (IUnknown *)0xdeadbeef, "got unk %p\n", unk2); + + IUnknown_Release(dmo); + IUnknown_Release(unk); + + hr = CoCreateInstance(&CLSID_CMP3DecMediaObject, &Outer, CLSCTX_INPROC_SERVER, + &IID_IMediaObject, (void **)&unk); + ok(hr == E_NOINTERFACE, "got %#x\n", hr); +} + START_TEST(mp3dmod) { IMediaObject *dmo; @@ -247,6 +303,7 @@ START_TEST(mp3dmod) IMediaObject_Release(dmo); test_convert(); + test_aggregation(); CoUninitialize(); }

1 0

Zebediah Figura : wine.inf: Register mp3dmod DMO.
by Alexandre Julliard 25 Jun '18

25 Jun '18

Module: wine Branch: master Commit: eeb40543cb7f76e01a1eda45d9530863a2e0445a URL: https://source.winehq.org/git/wine.git/?a=commit;h=eeb40543cb7f76e01a1eda45… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 24 17:22:29 2018 -0500 wine.inf: Register mp3dmod DMO. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- loader/wine.inf.in | 1 + 1 file changed, 1 insertion(+) diff --git a/loader/wine.inf.in b/loader/wine.inf.in index 861aa82..735d965 100644 --- a/loader/wine.inf.in +++ b/loader/wine.inf.in @@ -2508,6 +2508,7 @@ HKLM,%CurrentVersion%\Telephony\Country List\998,"SameAreaRule",,"G" 11,,cryptdlg.dll,1 11,,cryptnet.dll,1 11,,devenum.dll,1 +11,,mp3dmod.dll,1 11,,mscoree.dll,1 11,,mshtml.dll,1 11,,msisip.dll,1

1 0

Zebediah Figura : devenum: Implement enumerating DMOs.
by Alexandre Julliard 25 Jun '18

25 Jun '18

Module: wine Branch: master Commit: e119f245f1325f2a25252716bbfad7bba832697d URL: https://source.winehq.org/git/wine.git/?a=commit;h=e119f245f1325f2a25252716… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 24 17:20:30 2018 -0500 devenum: Implement enumerating DMOs. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/mediacatenum.c | 57 ++++++++++++++++++++++++++++++++++++-------- dlls/devenum/tests/devenum.c | 2 ++ 2 files changed, 49 insertions(+), 10 deletions(-) diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index c0efae0..c4338a2 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -36,6 +36,7 @@ typedef struct IEnumMoniker IEnumMoniker_iface; CLSID class; LONG ref; + IEnumDMO *dmo_enum; HKEY sw_key; DWORD sw_index; HKEY cm_key; @@ -845,6 +846,7 @@ static ULONG WINAPI DEVENUM_IEnumMoniker_Release(IEnumMoniker *iface) if (!ref) { + IEnumDMO_Release(This->dmo_enum); RegCloseKey(This->sw_key); RegCloseKey(This->cm_key); CoTaskMemFree(This); @@ -862,16 +864,31 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt, LONG res; ULONG fetched = 0; MediaCatMoniker * pMoniker; + WCHAR *name; + CLSID clsid; + HRESULT hr; HKEY hkey; TRACE("(%p)->(%d, %p, %p)\n", iface, celt, rgelt, pceltFetched); while (fetched < celt) { - /* FIXME: try PNP devices and DMOs first */ + /* FIXME: try PNP devices first */ + + /* try DMOs */ + if ((hr = IEnumDMO_Next(This->dmo_enum, 1, &clsid, &name, NULL)) == S_OK) + { + if (!(pMoniker = DEVENUM_IMediaCatMoniker_Construct())) + return E_OUTOFMEMORY; + pMoniker->type = DEVICE_DMO; + pMoniker->clsid = clsid; + + StringFromGUID2(&clsid, buffer, CHARS_IN_GUID); + StringFromGUID2(&This->class, buffer + CHARS_IN_GUID - 1, CHARS_IN_GUID); + } /* try DirectShow filters */ - if (!(res = RegEnumKeyW(This->sw_key, This->sw_index, buffer, sizeof(buffer)/sizeof(WCHAR)))) + else if (!(res = RegEnumKeyW(This->sw_key, This->sw_index, buffer, sizeof(buffer)/sizeof(WCHAR)))) { This->sw_index++; if ((res = RegOpenKeyExW(This->sw_key, buffer, 0, KEY_QUERY_VALUE, &hkey))) @@ -881,6 +898,13 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt, return E_OUTOFMEMORY; pMoniker->type = DEVICE_FILTER; + + if (!(pMoniker->name = CoTaskMemAlloc((strlenW(buffer) + 1) * sizeof(WCHAR)))) + { + IMoniker_Release(&pMoniker->IMoniker_iface); + return E_OUTOFMEMORY; + } + strcpyW(pMoniker->name, buffer); } /* then try codecs */ else if (!(res = RegEnumKeyW(This->cm_key, This->cm_index, buffer, sizeof(buffer)/sizeof(WCHAR)))) @@ -894,16 +918,17 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Next(IEnumMoniker *iface, ULONG celt, return E_OUTOFMEMORY; pMoniker->type = DEVICE_CODEC; + + if (!(pMoniker->name = CoTaskMemAlloc((strlenW(buffer) + 1) * sizeof(WCHAR)))) + { + IMoniker_Release(&pMoniker->IMoniker_iface); + return E_OUTOFMEMORY; + } + strcpyW(pMoniker->name, buffer); } else break; - if (!(pMoniker->name = CoTaskMemAlloc((strlenW(buffer) + 1) * sizeof(WCHAR)))) - { - IMoniker_Release(&pMoniker->IMoniker_iface); - return E_OUTOFMEMORY; - } - strcpyW(pMoniker->name, buffer); pMoniker->has_class = TRUE; pMoniker->class = This->class; @@ -930,10 +955,13 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Skip(IEnumMoniker *iface, ULONG celt) while (celt--) { - /* FIXME: try PNP devices and DMOs first */ + /* FIXME: try PNP devices first */ + /* try DMOs */ + if (IEnumDMO_Skip(This->dmo_enum, 1) == S_OK) + ; /* try DirectShow filters */ - if (RegEnumKeyW(This->sw_key, This->sw_index, NULL, 0) != ERROR_NO_MORE_ITEMS) + else if (RegEnumKeyW(This->sw_key, This->sw_index, NULL, 0) != ERROR_NO_MORE_ITEMS) { This->sw_index++; } @@ -955,6 +983,7 @@ static HRESULT WINAPI DEVENUM_IEnumMoniker_Reset(IEnumMoniker *iface) TRACE("(%p)->()\n", iface); + IEnumDMO_Reset(This->dmo_enum); This->sw_index = 0; This->cm_index = 0; @@ -986,6 +1015,7 @@ HRESULT create_EnumMoniker(REFCLSID class, IEnumMoniker **ppEnumMoniker) { EnumMonikerImpl * pEnumMoniker = CoTaskMemAlloc(sizeof(EnumMonikerImpl)); WCHAR buffer[78]; + HRESULT hr; if (!pEnumMoniker) return E_OUTOFMEMORY; @@ -1007,6 +1037,13 @@ HRESULT create_EnumMoniker(REFCLSID class, IEnumMoniker **ppEnumMoniker) if (RegOpenKeyExW(HKEY_CURRENT_USER, buffer, 0, KEY_ENUMERATE_SUB_KEYS, &pEnumMoniker->cm_key)) pEnumMoniker->cm_key = NULL; + hr = DMOEnum(class, 0, 0, NULL, 0, NULL, &pEnumMoniker->dmo_enum); + if (FAILED(hr)) + { + IEnumMoniker_Release(&pEnumMoniker->IEnumMoniker_iface); + return hr; + } + *ppEnumMoniker = &pEnumMoniker->IEnumMoniker_iface; DEVENUM_LockModule(); diff --git a/dlls/devenum/tests/devenum.c b/dlls/devenum/tests/devenum.c index 2f66907..6d4ce2d 100644 --- a/dlls/devenum/tests/devenum.c +++ b/dlls/devenum/tests/devenum.c @@ -525,6 +525,8 @@ static void test_dmo(void) { ok(hr == S_OK, "got %#x\n", hr); + ok(find_moniker(&CLSID_AudioRendererCategory, mon), "DMO should be registered\n"); + VariantClear(&var); hr = IPropertyBag_Read(prop_bag, friendly_name, &var, NULL); ok(hr == S_OK, "got %#x\n", hr);

1 0

Zebediah Figura : devenum: Implement parsing and reading DMO monikers.
by Alexandre Julliard 25 Jun '18

25 Jun '18

Module: wine Branch: master Commit: 0da4892b456ba1a01af3cc7d024aaa0bfef93063 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0da4892b456ba1a01af3cc7d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun Jun 24 17:20:29 2018 -0500 devenum: Implement parsing and reading DMO monikers. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/Makefile.in | 2 +- dlls/devenum/devenum_private.h | 10 ++++- dlls/devenum/mediacatenum.c | 97 ++++++++++++++++++++++++++++++----------- dlls/devenum/parsedisplayname.c | 52 ++++++++++++++++------ dlls/devenum/tests/Makefile.in | 2 +- dlls/devenum/tests/devenum.c | 64 +++++++++++++++++++++++++++ 6 files changed, 185 insertions(+), 42 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=0da4892b456ba1a01af3…

1 0

Alex Henrie : include: Add missing type declaration to CERT_EFSBLOB_VALUE_NAME.
by Alexandre Julliard 25 Jun '18

25 Jun '18

Module: wine Branch: master Commit: 62296c56c92517649197a56a64823f119ab266ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=62296c56c92517649197a56a… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 24 14:10:01 2018 -0600 include: Add missing type declaration to CERT_EFSBLOB_VALUE_NAME. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wincrypt.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/wincrypt.h b/include/wincrypt.h index 373acac..8e8c258 100644 --- a/include/wincrypt.h +++ b/include/wincrypt.h @@ -2216,7 +2216,7 @@ static const WCHAR CERT_EFSBLOB_REGPATH[] = {'S','o','f','t','w','a','r','e','\\','P','o','l','i','c','i','e','s','\\', 'M','i','c','r','o','s','o','f','t','\\','S','y','s','t','e','m','C','e','r', 't','i','f','i','c','a','t','e','s','\\','E','F','S',0 }; -static const CERT_EFSBLOB_VALUE_NAME[] = { 'E','F','S','B','l','o','b',0 }; +static const WCHAR CERT_EFSBLOB_VALUE_NAME[] = { 'E','F','S','B','l','o','b',0 }; #endif #if defined(__GNUC__)

1 0

Alex Henrie : include: Add definitions of SERVICES_*_DATABASEW for generic compilers.
by Alexandre Julliard 25 Jun '18

25 Jun '18

Module: wine Branch: master Commit: 568bb1b54547308bb9291c64ecb99c654be2c333 URL: https://source.winehq.org/git/wine.git/?a=commit;h=568bb1b54547308bb9291c64… Author: Alex Henrie <alexhenrie24(a)gmail.com> Date: Sun Jun 24 14:10:02 2018 -0600 include: Add definitions of SERVICES_*_DATABASEW for generic compilers. Signed-off-by: Alex Henrie <alexhenrie24(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/winsvc.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/include/winsvc.h b/include/winsvc.h index 7d768f5..9db35dd 100644 --- a/include/winsvc.h +++ b/include/winsvc.h @@ -39,6 +39,9 @@ extern "C" { #elif defined(_MSC_VER) # define SERVICES_ACTIVE_DATABASEW L"ServicesActive" # define SERVICES_FAILED_DATABASEW L"ServicesFailed" +#else +static const WCHAR SERVICES_ACTIVE_DATABASEW[] = { 'S','e','r','v','i','c','e','s','A','c','t','i','v','e',0 }; +static const WCHAR SERVICES_FAILED_DATABASEW[] = { 'S','e','r','v','i','c','e','s','F','a','i','l','e','d',0 }; #endif #define SERVICES_ACTIVE_DATABASE WINELIB_NAME_AW( SERVICES_ACTIVE_DATABASE )

1 0

Fabian Maurer : msvcrt: Use already existent oneexit_table functions for _onexit and _c_exit.
by Alexandre Julliard 25 Jun '18

25 Jun '18

Module: wine Branch: master Commit: 83f8b226948d40a81917a649b7ef83e2ea46a845 URL: https://source.winehq.org/git/wine.git/?a=commit;h=83f8b226948d40a81917a649… Author: Fabian Maurer <dark.shadow4(a)web.de> Date: Sat Jun 23 14:58:28 2018 +0200 msvcrt: Use already existent oneexit_table functions for _onexit and _c_exit. Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/exit.c | 201 +++++++++++++++++++++------------------------ dlls/ucrtbase/tests/misc.c | 56 ++++++++++++- 2 files changed, 149 insertions(+), 108 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=83f8b226948d40a81917…

1 0

Francois Gouget : testbot/web: Allow sumitting jobs to verify patches compile on Wine.
by Alexandre Julliard 25 Jun '18

25 Jun '18

Module: tools Branch: master Commit: 1714aea235ef48b8dd939ca2fd1a5802d4db7e2b URL: https://source.winehq.org/git/tools.git/?a=commit;h=1714aea235ef48b8dd939ca… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 21 15:02:41 2018 +0200 testbot/web: Allow sumitting jobs to verify patches compile on Wine. For now the Wine VMs are unchecked by default since all they do is a compilation check which is mostly redundant with the regular build step. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/web/Submit.pl | 43 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 42 insertions(+), 1 deletion(-) diff --git a/testbot/web/Submit.pl b/testbot/web/Submit.pl index afebc72..9fa252a 100644 --- a/testbot/web/Submit.pl +++ b/testbot/web/Submit.pl @@ -244,10 +244,14 @@ sub GenerateFields($) { $VMs->AddFilter("Type", ["win64"]); } - else + elsif ($self->{FileType} eq "exe32") { $VMs->AddFilter("Type", ["win32", "win64"]); } + else + { + $VMs->AddFilter("Type", ["win32", "win64", "wine"]); + } if ($self->{ShowAll}) { # All but the retired and deleted ones @@ -272,6 +276,10 @@ sub GenerateFields($) $Status = " [". $VM->Status ."]"; $Checked = undef; } + elsif ($VM->Type eq "wine") + { + $Checked = undef; + } if ($Checked and ($self->GetParam("Page") == 1 || $self->GetParam($FieldName))) { @@ -844,6 +852,39 @@ sub OnSubmit($) } } + if ($FileType eq "patchdlls") + { + my $Tasks; + my $VMs = CreateVMs(); + $VMs->AddFilter("Type", ["wine"]); + my $SortedKeys = $VMs->SortKeysBySortOrder($VMs->GetKeys()); + foreach my $VMKey (@$SortedKeys) + { + my $VM = $VMs->GetItem($VMKey); + my $FieldName = "vm_" . $self->CGI->escapeHTML($VMKey); + next if (!$self->GetParam($FieldName)); # skip unselected VMs + + if (!$Tasks) + { + # First create the Wine test step + my $WineStep = $Steps->Add(); + $WineStep->FileName($BaseName); + $WineStep->FileType($FileType); + $WineStep->InStaging(!1); + $WineStep->Type("build"); + $WineStep->DebugLevel($self->GetParam("DebugLevel")); + $WineStep->ReportSuccessfulTests(defined($self->GetParam("ReportSuccessfulTests"))); + $Tasks = $WineStep->Tasks; + } + + # Then add a task for this VM + my $Task = $Tasks->Add(); + $Task->VM($VM); + $Task->CmdLineArg("win32"); + $Task->Timeout($WineReconfigTimeout); + } + } + # Now save it all (or whatever's left to save) my ($ErrKey, $ErrProperty, $ErrMessage) = $Jobs->Save(); if (defined($ErrMessage))

1 0

Francois Gouget : testbot: Make sure the patches apply and compile in Wine.
by Alexandre Julliard 25 Jun '18

25 Jun '18

Module: tools Branch: master Commit: 74cb3e27ae1272e7ba963b79ef0c57d5a76f9dd0 URL: https://source.winehq.org/git/tools.git/?a=commit;h=74cb3e27ae1272e7ba963b7… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Jun 21 15:02:19 2018 +0200 testbot: Make sure the patches apply and compile in Wine. This adds the base infrastructure for later testing the patches on Wine. This adds a "wine" VM type which applies to all VMs that can compile and run Wine, regardless of the underlying operating system. Adapting to the underlying operating system is thus the responsibility of the VM-side scripts. This also updates GetPatchImpacts() to detect non-Wine scripts (such as TestBot patches) so the TestBot does not report them as bad patches for failing to apply on top of Wine. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- testbot/bin/CheckForWinetestUpdate.pl | 47 +++- testbot/bin/WineRunReconfig.pl | 36 +-- testbot/bin/WineRunWineTest.pl | 423 ++++++++++++++++++++++++++++ testbot/bin/build/WineReconfig.pl | 258 +++++++++++++++++ testbot/bin/build/WineTest.pl | 282 +++++++++++++++++++ testbot/ddl/update37.sql | 4 + testbot/ddl/winetestbot.sql | 2 +- testbot/lib/WineTestBot/Config.pm | 9 +- testbot/lib/WineTestBot/Engine/Scheduler.pm | 3 +- testbot/lib/WineTestBot/PatchUtils.pm | 80 +++++- testbot/lib/WineTestBot/Patches.pm | 213 +++++++------- testbot/lib/WineTestBot/PendingPatchSets.pm | 14 +- testbot/lib/WineTestBot/StepsTasks.pm | 2 +- testbot/lib/WineTestBot/Tasks.pm | 5 +- testbot/lib/WineTestBot/VMs.pm | 8 +- 15 files changed, 1234 insertions(+), 152 deletions(-) Diff: https://source.winehq.org/git/tools.git/?a=commitdiff;h=74cb3e27ae1272e7ba9…

1 0

← Newer
1
...
17
18
19
20
21
22
23
...
63
Older →

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 2018