January 2020 - Wine-devel - list.winehq.org

[PATCH 1/3] qedit: Use wide character string literals.
by Zebediah Figura 15 Jan '20

15 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/qedit/mediadet.c | 10 +++------- dlls/qedit/nullrenderer.c | 4 +--- dlls/qedit/tests/mediadet.c | 14 ++++++-------- dlls/qedit/tests/nullrenderer.c | 19 ++++++++---------- dlls/qedit/tests/samplegrabber.c | 33 ++++++++++++++------------------ 5 files changed, 32 insertions(+), 48 deletions(-) diff --git a/dlls/qedit/mediadet.c b/dlls/qedit/mediadet.c index 1d70a86a5a..d5c01aff6b 100644 --- a/dlls/qedit/mediadet.c +++ b/dlls/qedit/mediadet.c @@ -340,8 +340,6 @@ static HRESULT WINAPI MediaDet_get_Filename(IMediaDet* iface, BSTR *pVal) /* From quartz, 2008/04/07 */ static HRESULT GetFilterInfo(IMoniker *pMoniker, GUID *pclsid, VARIANT *pvar) { - static const WCHAR wszClsidName[] = {'C','L','S','I','D',0}; - static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a','m','e',0}; IPropertyBag *pPropBagCat = NULL; HRESULT hr; @@ -352,7 +350,7 @@ static HRESULT GetFilterInfo(IMoniker *pMoniker, GUID *pclsid, VARIANT *pvar) (LPVOID *) &pPropBagCat); if (SUCCEEDED(hr)) - hr = IPropertyBag_Read(pPropBagCat, wszClsidName, pvar, NULL); + hr = IPropertyBag_Read(pPropBagCat, L"CLSID", pvar, NULL); if (SUCCEEDED(hr)) { @@ -362,7 +360,7 @@ static HRESULT GetFilterInfo(IMoniker *pMoniker, GUID *pclsid, VARIANT *pvar) } if (SUCCEEDED(hr)) - hr = IPropertyBag_Read(pPropBagCat, wszFriendlyName, pvar, NULL); + hr = IPropertyBag_Read(pPropBagCat, L"FriendlyName", pvar, NULL); if (SUCCEEDED(hr)) TRACE("Moniker = %s - %s\n", debugstr_guid(pclsid), debugstr_w(V_BSTR(pvar))); @@ -484,7 +482,6 @@ retry: static HRESULT WINAPI MediaDet_put_Filename(IMediaDet* iface, BSTR newVal) { - static const WCHAR reader[] = {'R','e','a','d','e','r',0}; MediaDetImpl *This = impl_from_IMediaDet(iface); IGraphBuilder *gb; IBaseFilter *bf; @@ -503,8 +500,7 @@ static HRESULT WINAPI MediaDet_put_Filename(IMediaDet* iface, BSTR newVal) if (FAILED(hr)) return hr; - hr = IGraphBuilder_AddSourceFilter(gb, newVal, reader, &bf); - if (FAILED(hr)) + if (FAILED(hr = IGraphBuilder_AddSourceFilter(gb, newVal, L"Reader", &bf))) { IGraphBuilder_Release(gb); return hr; diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index b3267d1ba1..575ecea89b 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -64,8 +64,6 @@ static const struct strmbase_renderer_ops renderer_ops = HRESULT NullRenderer_create(IUnknown *outer, void **out) { - static const WCHAR sink_name[] = {'I','n',0}; - HRESULT hr; NullRendererImpl *pNullRenderer; @@ -74,7 +72,7 @@ HRESULT NullRenderer_create(IUnknown *outer, void **out) pNullRenderer = CoTaskMemAlloc(sizeof(NullRendererImpl)); hr = strmbase_renderer_init(&pNullRenderer->renderer, outer, - &CLSID_NullRenderer, sink_name, &renderer_ops); + &CLSID_NullRenderer, L"In", &renderer_ops); if (FAILED(hr)) CoTaskMemFree(pNullRenderer); diff --git a/dlls/qedit/tests/mediadet.c b/dlls/qedit/tests/mediadet.c index 311d77bfa0..e52ee618dd 100644 --- a/dlls/qedit/tests/mediadet.c +++ b/dlls/qedit/tests/mediadet.c @@ -137,8 +137,6 @@ static WCHAR test_sound_avi_filename[MAX_PATH]; static BOOL unpack_avi_file(int id, WCHAR name[MAX_PATH]) { static WCHAR temp_path[MAX_PATH]; - static const WCHAR prefix[] = {'D','E','S',0}; - static const WCHAR avi[] = {'a','v','i',0}; HRSRC res; HGLOBAL data; char *mem; @@ -166,11 +164,11 @@ static BOOL unpack_avi_file(int id, WCHAR name[MAX_PATH]) return FALSE; /* We might end up relying on the extension here, so .TMP is no good. */ - if (!GetTempFileNameW(temp_path, prefix, 0, name)) + if (!GetTempFileNameW(temp_path, L"DES", 0, name)) return FALSE; DeleteFileW(name); - lstrcpyW(name + lstrlenW(name) - 3, avi); + wcscpy(name + wcslen(name) - 3, L"avi"); fh = CreateFileW(name, GENERIC_WRITE, 0, NULL, CREATE_NEW, FILE_ATTRIBUTE_NORMAL, NULL); @@ -272,8 +270,8 @@ static void test_mediadet(void) filename = NULL; hr = IMediaDet_get_Filename(pM, &filename); ok(hr == S_OK, "IMediaDet_get_Filename failed: %08x\n", hr); - ok(lstrcmpW(filename, test_avi_filename) == 0, - "IMediaDet_get_Filename\n"); + ok(!wcscmp(filename, test_avi_filename), "Expected filename %s, got %s.\n", + debugstr_w(test_avi_filename), debugstr_w(filename)); SysFreeString(filename); hr = IMediaDet_get_Filename(pM, NULL); @@ -344,8 +342,8 @@ static void test_mediadet(void) filename = NULL; hr = IMediaDet_get_Filename(pM, &filename); ok(hr == S_OK, "IMediaDet_get_Filename failed: %08x\n", hr); - ok(lstrcmpW(filename, test_sound_avi_filename) == 0, - "IMediaDet_get_Filename\n"); + ok(!wcscmp(filename, test_sound_avi_filename), "Expected filename %s, got %s.\n", + debugstr_w(test_sound_avi_filename), debugstr_w(filename)); SysFreeString(filename); /* I don't know if the stream order is deterministic. Just check diff --git a/dlls/qedit/tests/nullrenderer.c b/dlls/qedit/tests/nullrenderer.c index ab4cf54fa5..8f26e4716e 100644 --- a/dlls/qedit/tests/nullrenderer.c +++ b/dlls/qedit/tests/nullrenderer.c @@ -22,8 +22,6 @@ #include "dshow.h" #include "wine/test.h" -static const WCHAR sink_id[] = {'I','n',0}; - static IBaseFilter *create_null_renderer(void) { IBaseFilter *filter = NULL; @@ -79,7 +77,7 @@ static void test_interfaces(void) check_interface(filter, &IID_IReferenceClock, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); - IBaseFilter_FindPin(filter, sink_id, &pin); + IBaseFilter_FindPin(filter, L"In", &pin); check_interface(pin, &IID_IMemInputPin, TRUE); check_interface(pin, &IID_IPin, TRUE); @@ -187,20 +185,19 @@ static void test_enum_pins(void) static void test_find_pin(void) { - static const WCHAR input_pinW[] = {'i','n','p','u','t',' ','p','i','n',0}; IBaseFilter *filter = create_null_renderer(); IEnumPins *enum_pins; IPin *pin, *pin2; HRESULT hr; ULONG ref; - hr = IBaseFilter_FindPin(filter, input_pinW, &pin); + hr = IBaseFilter_FindPin(filter, L"input pin", &pin); ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); hr = IBaseFilter_EnumPins(filter, &enum_pins); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IBaseFilter_FindPin(filter, sink_id, &pin); + hr = IBaseFilter_FindPin(filter, L"In", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -223,7 +220,7 @@ static void test_pin_info(void) ULONG ref; IPin *pin; - hr = IBaseFilter_FindPin(filter, sink_id, &pin); + hr = IBaseFilter_FindPin(filter, L"In", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); ref = get_refcount(filter); ok(ref == 2, "Got unexpected refcount %d.\n", ref); @@ -234,7 +231,7 @@ static void test_pin_info(void) ok(hr == S_OK, "Got hr %#x.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); - ok(!lstrcmpW(info.achName, sink_id), "Got name %s.\n", wine_dbgstr_w(info.achName)); + ok(!wcscmp(info.achName, L"In"), "Got name %s.\n", wine_dbgstr_w(info.achName)); ref = get_refcount(filter); ok(ref == 3, "Got unexpected refcount %d.\n", ref); ref = get_refcount(pin); @@ -247,7 +244,7 @@ static void test_pin_info(void) hr = IPin_QueryId(pin, &id); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!lstrcmpW(id, sink_id), "Got id %s.\n", wine_dbgstr_w(id)); + ok(!wcscmp(id, L"In"), "Got id %s.\n", wine_dbgstr_w(id)); CoTaskMemFree(id); hr = IPin_QueryInternalConnections(pin, NULL, NULL); @@ -361,7 +358,7 @@ static void test_media_types(void) ULONG ref; IPin *pin; - IBaseFilter_FindPin(filter, sink_id, &pin); + IBaseFilter_FindPin(filter, L"In", &pin); hr = IPin_EnumMediaTypes(pin, &enummt); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -388,7 +385,7 @@ static void test_enum_media_types(void) HRESULT hr; IPin *pin; - IBaseFilter_FindPin(filter, sink_id, &pin); + IBaseFilter_FindPin(filter, L"In", &pin); hr = IPin_EnumMediaTypes(pin, &enum1); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/qedit/tests/samplegrabber.c b/dlls/qedit/tests/samplegrabber.c index 2fcfe100ce..545e0062b0 100644 --- a/dlls/qedit/tests/samplegrabber.c +++ b/dlls/qedit/tests/samplegrabber.c @@ -23,11 +23,6 @@ #include "qedit.h" #include "wine/test.h" -static const WCHAR sink_id[] = {'I','n',0}; -static const WCHAR source_id[] = {'O','u','t',0}; -static const WCHAR sink_name[] = {'I','n','p','u','t',0}; -static const WCHAR source_name[] = {'O','u','t','p','u','t',0}; - static IBaseFilter *create_sample_grabber(void) { IBaseFilter *filter = NULL; @@ -97,7 +92,7 @@ static void test_interfaces(void) check_interface(filter, &IID_ISeekingPassThru, FALSE); check_interface(filter, &IID_IVideoWindow, FALSE); - IBaseFilter_FindPin(filter, sink_id, &pin); + IBaseFilter_FindPin(filter, L"In", &pin); check_interface(pin, &IID_IMemInputPin, TRUE); check_interface(pin, &IID_IPin, TRUE); @@ -110,7 +105,7 @@ static void test_interfaces(void) IPin_Release(pin); - IBaseFilter_FindPin(filter, source_id, &pin); + IBaseFilter_FindPin(filter, L"Out", &pin); /* Queries for IMediaPosition or IMediaSeeking do not seem to increase the * reference count. */ @@ -263,15 +258,15 @@ static void test_find_pin(void) HRESULT hr; ULONG ref; - hr = IBaseFilter_FindPin(filter, sink_name, &pin); + hr = IBaseFilter_FindPin(filter, L"Input", &pin); ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); - hr = IBaseFilter_FindPin(filter, source_name, &pin); + hr = IBaseFilter_FindPin(filter, L"Output", &pin); ok(hr == VFW_E_NOT_FOUND, "Got hr %#x.\n", hr); hr = IBaseFilter_EnumPins(filter, &enum_pins); ok(hr == S_OK, "Got hr %#x.\n", hr); - hr = IBaseFilter_FindPin(filter, sink_id, &pin); + hr = IBaseFilter_FindPin(filter, L"In", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -279,7 +274,7 @@ static void test_find_pin(void) IPin_Release(pin2); IPin_Release(pin); - hr = IBaseFilter_FindPin(filter, source_id, &pin); + hr = IBaseFilter_FindPin(filter, L"Out", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IEnumPins_Next(enum_pins, 1, &pin2, NULL); ok(hr == S_OK, "Got hr %#x.\n", hr); @@ -303,14 +298,14 @@ static void test_pin_info(void) ULONG ref; IPin *pin; - hr = IBaseFilter_FindPin(filter, sink_id, &pin); + hr = IBaseFilter_FindPin(filter, L"In", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IPin_QueryPinInfo(pin, &info); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_INPUT, "Got direction %d.\n", info.dir); - todo_wine ok(!lstrcmpW(info.achName, sink_name), "Got name %s.\n", wine_dbgstr_w(info.achName)); + todo_wine ok(!wcscmp(info.achName, L"Input"), "Got name %s.\n", wine_dbgstr_w(info.achName)); IBaseFilter_Release(info.pFilter); hr = IPin_QueryDirection(pin, &dir); @@ -319,7 +314,7 @@ static void test_pin_info(void) hr = IPin_QueryId(pin, &id); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!lstrcmpW(id, sink_id), "Got id %s.\n", wine_dbgstr_w(id)); + ok(!wcscmp(id, L"In"), "Got id %s.\n", wine_dbgstr_w(id)); CoTaskMemFree(id); hr = IPin_QueryInternalConnections(pin, NULL, &count); @@ -327,14 +322,14 @@ static void test_pin_info(void) IPin_Release(pin); - hr = IBaseFilter_FindPin(filter, source_id, &pin); + hr = IBaseFilter_FindPin(filter, L"Out", &pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IPin_QueryPinInfo(pin, &info); ok(hr == S_OK, "Got hr %#x.\n", hr); ok(info.pFilter == filter, "Expected filter %p, got %p.\n", filter, info.pFilter); ok(info.dir == PINDIR_OUTPUT, "Got direction %d.\n", info.dir); - todo_wine ok(!lstrcmpW(info.achName, source_name), "Got name %s.\n", wine_dbgstr_w(info.achName)); + todo_wine ok(!wcscmp(info.achName, L"Output"), "Got name %s.\n", wine_dbgstr_w(info.achName)); IBaseFilter_Release(info.pFilter); hr = IPin_QueryDirection(pin, &dir); @@ -343,7 +338,7 @@ static void test_pin_info(void) hr = IPin_QueryId(pin, &id); ok(hr == S_OK, "Got hr %#x.\n", hr); - ok(!lstrcmpW(id, source_id), "Got id %s.\n", wine_dbgstr_w(id)); + ok(!wcscmp(id, L"Out"), "Got id %s.\n", wine_dbgstr_w(id)); CoTaskMemFree(id); hr = IPin_QueryInternalConnections(pin, NULL, &count); @@ -458,7 +453,7 @@ static void test_media_types(void) ULONG ref; IPin *pin; - IBaseFilter_FindPin(filter, sink_id, &pin); + IBaseFilter_FindPin(filter, L"In", &pin); hr = IPin_EnumMediaTypes(pin, &enummt); todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); @@ -469,7 +464,7 @@ static void test_media_types(void) IPin_Release(pin); - IBaseFilter_FindPin(filter, source_id, &pin); + IBaseFilter_FindPin(filter, L"Out", &pin); hr = IPin_EnumMediaTypes(pin, &enummt); todo_wine ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); -- 2.25.0

1 2

[PATCH] http.sys: Translate WSAEADDRINUSE to STATUS_SHARING_VIOLATION.
by Zebediah Figura 15 Jan '20

15 Jan '20

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/http.sys/http.c | 7 ++++++- dlls/httpapi/tests/httpapi.c | 6 ++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/dlls/http.sys/http.c b/dlls/http.sys/http.c index 91d81400e65..4259ca618f3 100644 --- a/dlls/http.sys/http.c +++ b/dlls/http.sys/http.c @@ -1104,10 +1104,15 @@ static NTSTATUS http_add_url(struct request_queue *queue, IRP *irp) addr.sin_addr.S_un.S_addr = INADDR_ANY; if (bind(s, (struct sockaddr *)&addr, sizeof(addr)) == -1) { - ERR("Failed to bind socket, error %u.\n", WSAGetLastError()); LeaveCriticalSection(&http_cs); closesocket(s); heap_free(url); + if (WSAGetLastError() == WSAEADDRINUSE) + { + WARN("Address %s is already in use.\n", debugstr_a(params->url)); + return STATUS_SHARING_VIOLATION; + } + ERR("Failed to bind socket, error %u.\n", WSAGetLastError()); return STATUS_UNSUCCESSFUL; } diff --git a/dlls/httpapi/tests/httpapi.c b/dlls/httpapi/tests/httpapi.c index ee585948abd..a52a3f6c344 100644 --- a/dlls/httpapi/tests/httpapi.c +++ b/dlls/httpapi/tests/httpapi.c @@ -113,8 +113,9 @@ static unsigned short add_url_v1(HANDLE queue) for (port = 50000; port < 51000; ++port) { swprintf(url, ARRAY_SIZE(url), L"http://localhost:%u/", port); - if ((ret = HttpAddUrl(queue, url, NULL)) != ERROR_SHARING_VIOLATION) + if (!(ret = HttpAddUrl(queue, url, NULL))) return port; + ok(ret == ERROR_SHARING_VIOLATION, "Failed to add %s, error %u.\n", debugstr_w(url), ret); } ok(0, "Failed to add url %s, error %u.\n", debugstr_w(url), ret); return 0; @@ -129,8 +130,9 @@ static ULONG add_url_v2(HTTP_URL_GROUP_ID group) for (port = 50010; port < 51000; ++port) { swprintf(url, ARRAY_SIZE(url), L"http://localhost:%u/", port); - if ((ret = pHttpAddUrlToUrlGroup(group, url, 0xdeadbeef, 0)) != ERROR_SHARING_VIOLATION) + if (!(ret = pHttpAddUrlToUrlGroup(group, url, 0xdeadbeef, 0))) return port; + ok(ret == ERROR_SHARING_VIOLATION, "Failed to add %s, error %u.\n", debugstr_w(url), ret); } ok(0, "Failed to add url %s, error %u.\n", debugstr_w(url), ret); return 0; -- 2.24.1

1 0

[PATCH] msctf: Always provide a context when from GetBase/Top.
by Derek Lesho 15 Jan '20

15 Jan '20

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48405 Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/msctf/documentmgr.c | 20 +++++++++++++++++--- dlls/msctf/tests/inputprocessor.c | 26 ++++++++++++++++++++++++-- 2 files changed, 41 insertions(+), 5 deletions(-) diff --git a/dlls/msctf/documentmgr.c b/dlls/msctf/documentmgr.c index 44856db632..37d55557f5 100644 --- a/dlls/msctf/documentmgr.c +++ b/dlls/msctf/documentmgr.c @@ -44,6 +44,7 @@ typedef struct tagDocumentMgr { /* Aggregation */ ITfCompartmentMgr *CompartmentMgr; + ITfContext* initialContext; ITfContext* contextStack[2]; /* limit of 2 contexts */ ITfThreadMgrEventSink* ThreadMgrSink; @@ -87,6 +88,8 @@ static void DocumentMgr_Destructor(DocumentMgr *This) ITfThreadMgr_Release(tm); } + if (This->initialContext) + ITfContext_Release(This->initialContext); if (This->contextStack[0]) ITfContext_Release(This->contextStack[0]); if (This->contextStack[1]) @@ -222,14 +225,21 @@ static HRESULT WINAPI DocumentMgr_Pop(ITfDocumentMgr *iface, DWORD dwFlags) static HRESULT WINAPI DocumentMgr_GetTop(ITfDocumentMgr *iface, ITfContext **ppic) { DocumentMgr *This = impl_from_ITfDocumentMgr(iface); + ITfContext *tgt; + TRACE("(%p)\n",This); if (!ppic) return E_INVALIDARG; if (This->contextStack[0]) - ITfContext_AddRef(This->contextStack[0]); + tgt = This->contextStack[0]; + else + tgt = This->initialContext; + + if (tgt) + ITfContext_AddRef(tgt); - *ppic = This->contextStack[0]; + *ppic = tgt; return S_OK; } @@ -245,8 +255,10 @@ static HRESULT WINAPI DocumentMgr_GetBase(ITfDocumentMgr *iface, ITfContext **pp if (This->contextStack[1]) tgt = This->contextStack[1]; - else + else if (This->contextStack[0]) tgt = This->contextStack[0]; + else + tgt = This->initialContext; if (tgt) ITfContext_AddRef(tgt); @@ -342,6 +354,7 @@ static const ITfSourceVtbl DocumentMgrSourceVtbl = HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink *ThreadMgrSink, ITfDocumentMgr **ppOut) { DocumentMgr *This; + DWORD cookie; This = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY,sizeof(DocumentMgr)); if (This == NULL) @@ -354,6 +367,7 @@ HRESULT DocumentMgr_Constructor(ITfThreadMgrEventSink *ThreadMgrSink, ITfDocumen list_init(&This->TransitoryExtensionSink); CompartmentMgr_Constructor((IUnknown*)&This->ITfDocumentMgr_iface, &IID_IUnknown, (IUnknown**)&This->CompartmentMgr); + Context_Constructor(processId,NULL,&This->ITfDocumentMgr_iface, &This->initialContext, &cookie); *ppOut = &This->ITfDocumentMgr_iface; TRACE("returning %p\n", *ppOut); diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 38c591ea40..52921ec7cd 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -1639,10 +1639,10 @@ static HRESULT TextEditSink_Constructor(ITfTextEditSink **ppOut) static void test_startSession(void) { HRESULT hr; - DWORD cnt; + DWORD cnt, initial_ctx_cnt; DWORD editCookie; ITfDocumentMgr *dmtest; - ITfContext *cxt,*cxt2,*cxt3,*cxtTest; + ITfContext *cxt,*cxt2,*cxt3,*cxtTest,*initial_ctx; ITextStoreACP *ts = NULL; TfClientId cid2 = 0; ITfThreadMgrEx *tmex; @@ -1684,6 +1684,23 @@ static void test_startSession(void) hr = ITfThreadMgr_CreateDocumentMgr(g_tm,&g_dm); ok(SUCCEEDED(hr),"CreateDocumentMgr failed\n"); + test_OnPushContext = SINK_EXPECTED; + test_OnInitDocumentMgr = SINK_EXPECTED; + + /* For some reason, even when the object isn't initialized, this yields a context */ + hr = ITfDocumentMgr_GetBase(g_dm, &initial_ctx); + ok(SUCCEEDED(hr), "GetBase Failed\n"); + hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); + ok(SUCCEEDED(hr), "GetTop Failed\n"); + ok(cxtTest == initial_ctx, "GetTop != GetBase\n"); + + ok(initial_ctx != NULL, "Expected initial context\n"); + initial_ctx_cnt = check_context_refcount(initial_ctx); + hr = ITfContext_GetDocumentMgr(initial_ctx,&dmtest); + ok(hr == S_OK, "ITfContext_GetDocumentMgr failed with %x\n",hr); + ok(dmtest == g_dm, "Wrong documentmgr\n"); + ITfDocumentMgr_Release(dmtest); + test_EnumDocumentMgr(g_tm,g_dm,NULL); hr = ITfThreadMgr_CreateDocumentMgr(g_tm,&dmtest); @@ -1740,6 +1757,7 @@ static void test_startSession(void) test_OnPushContext = SINK_EXPECTED; test_ACP_AdviseSink = SINK_EXPECTED; test_OnInitDocumentMgr = SINK_EXPECTED; + hr = ITfDocumentMgr_Push(g_dm, cxt); ok(SUCCEEDED(hr),"Push Failed\n"); ok(check_context_refcount(cxt) > cnt, "Ref count did not increase\n"); @@ -1749,6 +1767,9 @@ static void test_startSession(void) test_EnumContexts(g_dm, cxt); + /* the initial context is released with the document manager */ + ok(initial_ctx_cnt == check_context_refcount(initial_ctx), "Context ref count changed after documentmgr initialization\n"); + hr = ITfDocumentMgr_GetTop(g_dm, &cxtTest); ok(SUCCEEDED(hr),"GetTop Failed\n"); ok(cxtTest == cxt, "Wrong context on top\n"); @@ -1859,6 +1880,7 @@ static void test_startSession(void) ITfContext_Release(cxt); ITfContext_Release(cxt2); ITfContext_Release(cxt3); + ITfContext_Release(initial_ctx); ITextStoreACP_Release(ts); } -- 2.25.0

2 1

[PATCH] winex11.drv: Don't confine the pointer to any window when just checking for active grab.
by Gabriel Ivăncescu 15 Jan '20

15 Jan '20

Fixes a regression introduced by 74efb3e872aebf57a42d62b52e149ae26f320c9a, which caused some random pointer warping on a setup with multiple "workspaces" when switching between them and a full screen game that warped the mouse. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- As I understand, that commit was supposed to just check for a pointer grab, and temporarily "lock it" if it was free, while the pointer is warped via XWarpPointer. There's no need to confine it to root_window in this case, which causes issues with multiple workspaces apparently. It's not easy to reproduce reliably, but an example game to reproduce this with is SpellForce. Place the game in a Virtual Desktop that covers the entire screen on a different workspace (say, to the right of the current one). When entering a map, move the mouse in game to the left so it moves the map view. While this happens, quickly switch to the left workspace (with shortcuts), then the pointer will at seemingly random times warp to the right edge of the screen while you are in the new workspace (because the game's workspace is to the right). This patch, however, fixes that issue and many others that are hard to reproduce reliably, while switching workspaces from a fullscreen game. dlls/winex11.drv/mouse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c index 290732f..7f0edd9 100644 --- a/dlls/winex11.drv/mouse.c +++ b/dlls/winex11.drv/mouse.c @@ -1478,7 +1478,7 @@ BOOL CDECL X11DRV_SetCursorPos( INT x, INT y ) if (!clipping_cursor && XGrabPointer( data->display, root_window, False, PointerMotionMask | ButtonPressMask | ButtonReleaseMask, - GrabModeAsync, GrabModeAsync, root_window, None, CurrentTime ) != GrabSuccess) + GrabModeAsync, GrabModeAsync, None, None, CurrentTime ) != GrabSuccess) { WARN( "refusing to warp pointer to %u, %u without exclusive grab\n", pos.x, pos.y ); return FALSE; -- 2.21.0

2 3

[PATCH] explorerframe/tests: Remove some failing tests.
by Zebediah Figura 15 Jan '20

15 Jan '20

These fail on Windows 10 1607+ with nonsensical error codes. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/explorerframe/tests/nstc.c | 42 +++++++++------------------------ 1 file changed, 11 insertions(+), 31 deletions(-) diff --git a/dlls/explorerframe/tests/nstc.c b/dlls/explorerframe/tests/nstc.c index 44bdf317f2d..a48e3affefe 100644 --- a/dlls/explorerframe/tests/nstc.c +++ b/dlls/explorerframe/tests/nstc.c @@ -885,7 +885,7 @@ static void test_basics(void) ok(hr == S_OK || broken(hr == E_FAIL), "Got 0x%08x\n", hr); if(hr == S_OK) { - static const NSTCSTYLE styles_setable[] = + static const NSTCSTYLE styles[] = { NSTCS_HASEXPANDOS,NSTCS_HASLINES,NSTCS_SINGLECLICKEXPAND, NSTCS_FULLROWSELECT,NSTCS_HORIZONTALSCROLL, NSTCS_ROOTHASEXPANDO,NSTCS_SHOWSELECTIONALWAYS,NSTCS_NOINFOTIP, @@ -894,11 +894,6 @@ static void test_basics(void) NSTCS_TABSTOP,NSTCS_FAVORITESMODE,NSTCS_EMPTYTEXT,NSTCS_CHECKBOXES, NSTCS_ALLOWJUNCTIONS,NSTCS_SHOWTABSBUTTON,NSTCS_SHOWDELETEBUTTON, NSTCS_SHOWREFRESHBUTTON, 0}; - static const NSTCSTYLE styles_nonsetable[] = - { NSTCS_SPRINGEXPAND, NSTCS_RICHTOOLTIP, NSTCS_AUTOHSCROLL, - NSTCS_FADEINOUTEXPANDOS, - NSTCS_PARTIALCHECKBOXES, NSTCS_EXCLUSIONCHECKBOXES, - NSTCS_DIMMEDCHECKBOXES, NSTCS_NOINDENTCHECKS,0}; /* Set/GetControlStyle */ style = style2 = 0xdeadbeef; @@ -909,22 +904,12 @@ static void test_basics(void) hr = INameSpaceTreeControl2_SetControlStyle(pnstc2, 0, 0xFFFFFFF); ok(hr == S_OK, "Got 0x%08x\n", hr); - hr = INameSpaceTreeControl2_SetControlStyle(pnstc2, 0xFFFFFFFF, 0); - ok(hr == E_FAIL, "Got 0x%08x\n", hr); - hr = INameSpaceTreeControl2_SetControlStyle(pnstc2, 0xFFFFFFFF, 0xFFFFFFFF); - ok(hr == E_FAIL, "Got 0x%08x\n", hr); - tmp = 0; - for(i = 0; styles_setable[i] != 0; i++) - { - hr = INameSpaceTreeControl2_SetControlStyle(pnstc2, styles_setable[i], styles_setable[i]); - ok(hr == S_OK, "Got 0x%08x (%x)\n", hr, styles_setable[i]); - if(SUCCEEDED(hr)) tmp |= styles_setable[i]; - } - for(i = 0; styles_nonsetable[i] != 0; i++) + for(i = 0; styles[i] != 0; i++) { - hr = INameSpaceTreeControl2_SetControlStyle(pnstc2, styles_nonsetable[i], styles_nonsetable[i]); - ok(hr == E_FAIL, "Got 0x%08x (%x)\n", hr, styles_nonsetable[i]); + hr = INameSpaceTreeControl2_SetControlStyle(pnstc2, styles[i], styles[i]); + ok(hr == S_OK, "Got 0x%08x (%x)\n", hr, styles[i]); + if(SUCCEEDED(hr)) tmp |= styles[i]; } hr = INameSpaceTreeControl2_GetControlStyle(pnstc2, 0xFFFFFFFF, &style); @@ -933,23 +918,18 @@ static void test_basics(void) if(SUCCEEDED(hr)) { DWORD tmp2; - for(i = 0; styles_setable[i] != 0; i++) + for(i = 0; styles[i] != 0; i++) { - hr = INameSpaceTreeControl2_GetControlStyle(pnstc2, styles_setable[i], &tmp2); + hr = INameSpaceTreeControl2_GetControlStyle(pnstc2, styles[i], &tmp2); ok(hr == S_OK, "Got 0x%08x\n", hr); - ok(tmp2 == (style & styles_setable[i]), "Got %x\n", tmp2); + ok(tmp2 == (style & styles[i]), "Got %x\n", tmp2); } } - for(i = 0; styles_setable[i] != 0; i++) - { - hr = INameSpaceTreeControl2_SetControlStyle(pnstc2, styles_setable[i], 0); - ok(hr == S_OK, "Got 0x%08x (%x)\n", hr, styles_setable[i]); - } - for(i = 0; styles_nonsetable[i] != 0; i++) + for(i = 0; styles[i] != 0; i++) { - hr = INameSpaceTreeControl2_SetControlStyle(pnstc2, styles_nonsetable[i], 0); - ok(hr == E_FAIL, "Got 0x%08x (%x)\n", hr, styles_nonsetable[i]); + hr = INameSpaceTreeControl2_SetControlStyle(pnstc2, styles[i], 0); + ok(hr == S_OK, "Got 0x%08x (%x)\n", hr, styles[i]); } hr = INameSpaceTreeControl2_GetControlStyle(pnstc2, 0xFFFFFFFF, &style); ok(hr == S_OK, "Got 0x%08x\n", hr); -- 2.24.1

2 1

[PATCH resend] msctf: Clear the corresponding DocumentMgr pointers for Associated Focus Windows on destruction.
by Gabriel Ivăncescu 15 Jan '20

15 Jan '20

Fixes a regression introduced by d541087079a8770bb02bae830c56a6d3c0b6424e. AssociateFocus does not grab ownership of the Document Manager, but it does return it in the "prev" output parameter with an increased refcount. So, if the docmgr gets destroyed and AssociateFocus is called again, its "prev" parameter will refer to freed memory. Windows sets it to NULL in such case. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=48469 Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- v2: Added Wine-Bug. dlls/msctf/tests/inputprocessor.c | 15 +++++++++++++-- dlls/msctf/threadmgr.c | 14 ++++++++++++-- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/dlls/msctf/tests/inputprocessor.c b/dlls/msctf/tests/inputprocessor.c index 38c591e..f8ec492 100644 --- a/dlls/msctf/tests/inputprocessor.c +++ b/dlls/msctf/tests/inputprocessor.c @@ -2287,6 +2287,7 @@ static void test_AssociateFocus(void) ITfDocumentMgr *dm1, *dm2, *olddm, *dmcheck, *dmorig; HWND wnd1, wnd2, wnd3; HRESULT hr; + ULONG ref; ITfThreadMgr_GetFocus(g_tm, &dmorig); test_CurrentFocus = NULL; @@ -2428,10 +2429,20 @@ static void test_AssociateFocus(void) processPendingMessages(); SetFocus(wnd1); processPendingMessages(); - test_OnSetFocus = SINK_UNEXPECTED; + + hr = ITfThreadMgr_AssociateFocus(g_tm,wnd2,dm2,&olddm); + ok(SUCCEEDED(hr),"AssociateFocus failed\n"); + + /* Vista doesn't return NULL */ + if (olddm) ITfDocumentMgr_Release(olddm); + ref = ITfDocumentMgr_Release(dm2); + ok(ref == 0, "incorrect DocumentMgr ref %d\n", ref); + + hr = ITfThreadMgr_AssociateFocus(g_tm,wnd2,NULL,&olddm); + ok(SUCCEEDED(hr),"AssociateFocus failed\n"); + ok(olddm == NULL, "incorrect old DocumentMgr returned\n"); ITfDocumentMgr_Release(dm1); - ITfDocumentMgr_Release(dm2); test_CurrentFocus = dmorig; test_PrevFocus = FOCUS_IGNORE; diff --git a/dlls/msctf/threadmgr.c b/dlls/msctf/threadmgr.c index 2c208fb..77cf47c 100644 --- a/dlls/msctf/threadmgr.c +++ b/dlls/msctf/threadmgr.c @@ -1530,6 +1530,8 @@ void ThreadMgr_OnDocumentMgrDestruction(ITfThreadMgr *iface, ITfDocumentMgr *mgr { ThreadMgr *This = impl_from_ITfThreadMgrEx((ITfThreadMgrEx *)iface); struct list *cursor; + BOOL found = FALSE; + LIST_FOR_EACH(cursor, &This->CreatedDocumentMgrs) { DocumentMgrEntry *mgrentry = LIST_ENTRY(cursor,DocumentMgrEntry,entry); @@ -1537,8 +1539,16 @@ void ThreadMgr_OnDocumentMgrDestruction(ITfThreadMgr *iface, ITfDocumentMgr *mgr { list_remove(cursor); HeapFree(GetProcessHeap(),0,mgrentry); - return; + found = TRUE; + break; } } - FIXME("ITfDocumentMgr %p not found in this thread\n",mgr); + if (!found) FIXME("ITfDocumentMgr %p not found in this thread\n",mgr); + + LIST_FOR_EACH(cursor, &This->AssociatedFocusWindows) + { + AssociatedWindow *wnd = LIST_ENTRY(cursor,AssociatedWindow,entry); + if (wnd->docmgr == mgr) + wnd->docmgr = NULL; + } } -- 2.21.0

2 1

[PATCH] comdlg32/tests: Use GetTempPathA() instead of the current directory in test_extension().
by Zebediah Figura 15 Jan '20

15 Jan '20

For some reason, a previous test sets the current directory to C:\windows\system32\ on my Windows 10 machine, which prompts message boxes as the path is not writable. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/comdlg32/tests/filedlg.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/comdlg32/tests/filedlg.c b/dlls/comdlg32/tests/filedlg.c index bf4d1f22eb0..165b5cd8bdc 100644 --- a/dlls/comdlg32/tests/filedlg.c +++ b/dlls/comdlg32/tests/filedlg.c @@ -1051,7 +1051,7 @@ static void test_extension(void) { OPENFILENAMEA ofn = { OPENFILENAME_SIZE_VERSION_400A }; char filename[1024] = {0}; - char curdir[MAX_PATH]; + char dir[MAX_PATH]; unsigned int i; BOOL boolret; @@ -1070,14 +1070,14 @@ static void test_extension(void) NULL /* is a test, not an endmark! */ }; - boolret = GetCurrentDirectoryA(sizeof(curdir), curdir); + boolret = GetTempPathA(sizeof(dir), dir); ok(boolret, "Failed to get current dir err %d\n", GetLastError()); ofn.hwndOwner = NULL; ofn.lpstrFile = filename; ofn.nMaxFile = MAX_PATH; ofn.Flags = OFN_EXPLORER | OFN_ENABLEHOOK; - ofn.lpstrInitialDir = curdir; + ofn.lpstrInitialDir = dir; ofn.lpfnHook = test_extension_wndproc; ofn.nFileExtension = 0; -- 2.24.1

2 1

[PATCH 2/2] jscript/tests: Use wide char string literals in caller.c.
by Jacek Caban 15 Jan '20

15 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/tests/caller.c | 79 +++++++++++++------------------------ 1 file changed, 27 insertions(+), 52 deletions(-)

1 0

[PATCH 1/2] jscript/tests: Use wide char string literals in activex.c.
by Jacek Caban 15 Jan '20

15 Jan '20

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/tests/activex.c | 110 +++++++++++++---------------------- 1 file changed, 40 insertions(+), 70 deletions(-)

1 0

[PATCH] testbot/LogUtils: Tag new errors instead of filtering them.
by Francois Gouget 15 Jan '20

15 Jan '20

TagNewErrors() replaces GetNewLogErrors() and tags new errors in the provided error list instead of returning a new list containing only the new errors. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- testbot/bin/WineSendLog.pl | 28 +++++--- testbot/lib/WineTestBot/LogUtils.pm | 103 +++++++++++++++++----------- testbot/web/JobDetails.pl | 12 ++-- 3 files changed, 87 insertions(+), 56 deletions(-) diff --git a/testbot/bin/WineSendLog.pl b/testbot/bin/WineSendLog.pl index 1ec7db1bd..6704f9828 100755 --- a/testbot/bin/WineSendLog.pl +++ b/testbot/bin/WineSendLog.pl @@ -5,6 +5,7 @@ # site of the test results. # # Copyright 2009 Ge van Geldorp +# Copyright 2012-2020 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -218,7 +219,7 @@ EOF foreach my $GroupName (@$Groups) { print $Sendmail ($GroupName ? "\n$GroupName:\n" : "\n"); - print $Sendmail "$_\n" for (@{$Errors->{$GroupName}}); + print $Sendmail "$_\n" for (@{$Errors->{$GroupName}->{Errors}}); } } } @@ -251,7 +252,7 @@ EOF } } } - + print $Sendmail "\n--$PART_BOUNDARY--\n"; close($Sendmail); @@ -291,19 +292,19 @@ EOF # Skip if there are no errors next if (!$LogErrors->{Groups}); + my $AllNew; my $RefReportPath = $StepTask->GetFullFileName($StepTask->GetRefReportName($LogName)); - my ($NewGroups, $NewErrors, $_NewIndices) = GetNewLogErrors($RefReportPath, $LogErrors->{Groups}, $LogErrors->{Errors}); - if (!$NewGroups) + my $NewCount = TagNewErrors($RefReportPath, $LogErrors->{Groups}, $LogErrors->{Errors}); + if (!defined $NewCount) { # Test reports should have reference WineTest results and if not # reporting the errors as new would cause false positives. next if ($LogName =~ /\.report$/); # Build logs don't have reference logs so for them every error is new. - $NewGroups = $LogErrors->{Groups}; - $NewErrors = $LogErrors->{Errors}; + $AllNew = 1; } - if (!$NewGroups or !@$NewGroups) + elsif (!$NewCount) { # There is no new error next; @@ -311,10 +312,19 @@ EOF push @Messages, "\n=== ". GetTitle($StepTask, $LogName) ." ===\n"; - foreach my $GroupName (@$NewGroups) + foreach my $GroupName (@{$LogErrors->{Groups}}) { + my $Group = $LogErrors->{Errors}->{$GroupName}; + next if (!$AllNew and !$Group->{NewCount}); + push @Messages, ($GroupName ? "\n$GroupName:\n" : "\n"); - push @Messages, "$_\n" for (@{$NewErrors->{$GroupName}}); + foreach my $ErrIndex (0..@{$Group->{Errors}} - 1) + { + if ($AllNew or $Group->{IsNew}->[$ErrIndex]) + { + push @Messages, "$Group->{Errors}->[$ErrIndex]\n"; + } + } } } } diff --git a/testbot/lib/WineTestBot/LogUtils.pm b/testbot/lib/WineTestBot/LogUtils.pm index 1b9b1bfb6..3124e89ea 100644 --- a/testbot/lib/WineTestBot/LogUtils.pm +++ b/testbot/lib/WineTestBot/LogUtils.pm @@ -1,5 +1,5 @@ # -*- Mode: Perl; perl-indent-level: 2; indent-tabs-mode: nil -*- -# Copyright 2018 Francois Gouget +# Copyright 2018-2020 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -27,7 +27,7 @@ WineTestBot::LogUtils - Provides functions to parse task logs use Exporter 'import'; -our @EXPORT = qw(GetLogFileNames GetLogLabel GetLogErrors GetNewLogErrors +our @EXPORT = qw(GetLogFileNames GetLogLabel GetLogErrors TagNewErrors GetLogLineCategory GetReportLineCategory RenameReferenceLogs RenameTaskLogs ParseTaskLog ParseWineTestReport); @@ -713,7 +713,7 @@ sub _DumpErrors($$$) foreach my $GroupName (@$Groups) { print STDERR " [$GroupName]\n"; - print STDERR " [$_]\n" for (@{$Errors->{$GroupName}}); + print STDERR " [$_]\n" for (@{$Errors->{$GroupName}->{Errors}}); } } @@ -726,7 +726,7 @@ sub _AddErrorGroup($$$) if (!$Errors->{$GroupName}) { push @$Groups, $GroupName; - $Errors->{$GroupName} = []; + $Errors->{$GroupName} = {Errors => []}; } return $Errors->{$GroupName}; } @@ -789,7 +789,7 @@ sub GetLogErrors($) { $CurrentGroup = _AddErrorGroup($Groups, $Errors, $CurrentModule); } - push @$CurrentGroup, $Line; + push @{$CurrentGroup->{Errors}}, $Line; } close($LogFile); } @@ -797,7 +797,7 @@ sub GetLogErrors($) { $NoLog = 0; my $Group = _AddErrorGroup($Groups, $Errors, "TestBot errors"); - push @$Group, "Could not open '". basename($LogFileName) ."' for reading: $!"; + $Group->{Errors} = ["Could not open '". basename($LogFileName) ."' for reading: $!"]; } if (open(my $LogFile, "<", "$LogFileName.err")) @@ -815,7 +815,7 @@ sub GetLogErrors($) my $GroupName = $IsReport ? "Report errors" : "Task errors"; $CurrentGroup = _AddErrorGroup($Groups, $Errors, $GroupName); } - push @$CurrentGroup, $Line; + push @{$CurrentGroup->{Errors}}, $Line; } close($LogFile); } @@ -823,7 +823,7 @@ sub GetLogErrors($) { $NoLog = 0; my $Group = _AddErrorGroup($Groups, $Errors, "TestBot errors"); - push @$Group, "Could not open '". basename($LogFileName) .".err' for reading: $!"; + $Group->{Errors} = ["Could not open '". basename($LogFileName) .".err' for reading: $!"]; } return $NoLog ? (undef, undef) : ($Groups, $Errors); @@ -856,8 +856,9 @@ sub _DumpDiff($$) =item C<_GetLineKey()> -This is a helper for GetNewLogErrors(). It reformats the log lines so they can -meaningfully be compared to the reference log even if line numbers change, etc. +This is a helper for TagNewErrors(). It reformats the log lines so they +can meaningfully be compared to the reference log even if line numbers change, +etc. =back =cut @@ -888,63 +889,83 @@ sub _GetLineKey($) =pod =over 12 -=item C<GetNewLogErrors()> +=item C<TagNewErrors()> -Compares the specified errors to the reference log and returns only the ones -that are new. +Compares the specified errors to the reference report to identify new errors. -Returns a list of error groups containing new errors, a hashtable containing -the list of new errors for each group, and a hashtable containing the indices -of the new errors in the input errors list for each group. +Adds two fields to each error group: +=over + +=item NewCount +A count of the new errors. + +=item IsNew +An array where entries are set to true to identify new errors. + +=back + +Returns a global count of the new errors. Returns undef if there is no +reference log to identify the new errors. =back =cut -sub GetNewLogErrors($$$) +sub TagNewErrors($$$) { - my ($RefFileName, $Groups, $Errors) = @_; + my ($RefLogPath, $Groups, $Errors) = @_; - my (@NewGroups, %NewErrors, %NewIndices); - return (\@NewGroups, \%NewErrors, \%NewIndices) if (!$Groups or !@$Groups); + return 0 if (!$Groups or !@$Groups); - my ($RefGroups, $RefErrors) = GetLogErrors($RefFileName); - return (undef, undef) if (!$RefGroups); + my ($RefGroups, $RefErrors) = GetLogErrors($RefLogPath); + return undef if (!$RefGroups); + my $NewCount = 0; foreach my $GroupName (@$Groups) { + my $Group = $Errors->{$GroupName}; + $Group->{NewCount} = 0; + if ($RefErrors->{$GroupName}) { - my $Diff = Algorithm::Diff->new($RefErrors->{$GroupName}, - $Errors->{$GroupName}, + my $Diff = Algorithm::Diff->new($RefErrors->{$GroupName}->{Errors}, + $Group->{Errors}, { keyGen => \&_GetLineKey }); - my ($CurrentGroup, $CurrentIndices); + my $ErrIndex = 0; while ($Diff->Next()) { - # Skip if there are no new lines - next if ($Diff->Same() or !$Diff->Items(2)); - - if (!$CurrentGroup) + my $SameCount = $Diff->Same(); + if ($SameCount) + { + $ErrIndex += $SameCount; + } + else { - push @NewGroups, $GroupName; - $CurrentGroup = $NewErrors{$GroupName} = []; - $CurrentIndices = $NewIndices{$GroupName} = {}; + # Added lines are the new errors + my $AddedCount = $Diff->Items(2); + $Group->{NewCount} += $AddedCount; + foreach (1..$AddedCount) + { + $Group->{IsNew}->[$ErrIndex] = 1; + $ErrIndex++; + } } - push @$CurrentGroup, $Diff->Items(2); - $CurrentIndices->{$_} = 1 for ($Diff->Range(2)); } } else { - # This group did not have errors before, so every error is new - push @NewGroups, $GroupName; - $NewErrors{$GroupName} = $Errors->{$GroupName}; - $NewIndices{$GroupName} = {}; - my $Last = @{$Errors->{$GroupName}} - 1; - $NewIndices{$GroupName}->{$_} = 1 for (0..$Last); + $Group->{NewCount} = @{$Group->{Errors}}; + if ($Group->{NewCount}) + { + foreach my $ErrIndex (0..$Group->{NewCount} - 1) + { + $Group->{IsNew}->[$ErrIndex] = 1; + } + } } + $NewCount += $Group->{NewCount}; } - return (\@NewGroups, \%NewErrors, \%NewIndices); + return $NewCount; } 1; diff --git a/testbot/web/JobDetails.pl b/testbot/web/JobDetails.pl index 4d08a862c..ee4013a1b 100644 --- a/testbot/web/JobDetails.pl +++ b/testbot/web/JobDetails.pl @@ -2,7 +2,7 @@ # Job details page # # Copyright 2009 Ge van Geldorp -# Copyright 2012-2014,2017-2018 Francois Gouget +# Copyright 2012-2014,2017-2020 Francois Gouget # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -525,12 +525,11 @@ EOF } my $Summary = $LogSummaries->{$LogName}; - my $New; if ($LogName =~ /\.report$/) { - # Identify new errors in test reports + # For test reports try to identify the new errors my $RefReportPath = $StepTask->GetFullFileName($StepTask->GetRefReportName($LogName)); - (my $_NewGroups, my $_NewErrors, $New) = GetNewLogErrors($RefReportPath, $Summary->{Groups}, $Summary->{Errors}); + TagNewErrors($RefReportPath, $Summary->{Groups}, $Summary->{Errors}); } foreach my $GroupName (@{$Summary->{Groups}}) @@ -539,9 +538,10 @@ EOF print "<pre><code>"; my $ErrIndex = 0; - foreach my $Line (@{$Summary->{Errors}->{$GroupName}}) + my $Group = $Summary->{Errors}->{$GroupName}; + foreach my $Line (@{$Group->{Errors}}) { - if ($New and $New->{$GroupName}->{$ErrIndex}) + if ($Group->{IsNew}->[$ErrIndex]) { print "<span class='log-new'>", $self->escapeHTML($Line), "</span>\n"; } -- 2.20.1

1 0