May 2021 - Wine-Devel - list.winehq.org

[PATCH 2/7] winepulse: Simplify checks for stream being initialized.
by Jacek Caban May 21, 2021

May 21, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 37 ++++++++--------------------------- 1 file changed, 8 insertions(+), 29 deletions(-)

1 0

[PATCH 1/7] winepulse: Move pulse_get_position to unix lib.
by Jacek Caban May 21, 2021

May 21, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/winepulse.drv/mmdevdrv.c | 46 +++++++++-------------------------- dlls/winepulse.drv/pulse.c | 34 ++++++++++++++++++++++++++ dlls/winepulse.drv/unixlib.h | 1 + 3 files changed, 47 insertions(+), 34 deletions(-)

1 0

[PATCH] winegstreamer: Advertise support for fast forward and slow motion.
by Giovanni Mascellani May 21, 2021

May 21, 2021

Signed-off-by: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/winegstreamer/media_source.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/winegstreamer/media_source.c b/dlls/winegstreamer/media_source.c index 90efc9aaed2..3b7233ac2b5 100644 --- a/dlls/winegstreamer/media_source.c +++ b/dlls/winegstreamer/media_source.c @@ -933,7 +933,7 @@ static HRESULT WINAPI media_source_rate_support_GetSlowestRate(IMFRateSupport *i { TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); - *rate = direction == MFRATE_FORWARD ? 1.0f : -1.0f; + *rate = 0.0f; return S_OK; } @@ -942,14 +942,14 @@ static HRESULT WINAPI media_source_rate_support_GetFastestRate(IMFRateSupport *i { TRACE("%p, %d, %d, %p.\n", iface, direction, thin, rate); - *rate = direction == MFRATE_FORWARD ? 1.0f : -1.0f; + *rate = direction == MFRATE_FORWARD ? 1e6f : -1e6f; return S_OK; } static HRESULT WINAPI media_source_rate_support_IsRateSupported(IMFRateSupport *iface, BOOL thin, float rate, float *nearest_support_rate) { - const float supported_rate = rate >= 0.0f ? 1.0f : -1.0f; + const float supported_rate = max(min(rate, 1e6f), -1e6f); TRACE("%p, %d, %f, %p.\n", iface, thin, rate, nearest_support_rate); -- 2.31.1

1 0

[PATCH 2/2] msxml3: IVBSAXContentHandler::startElement() should also check *namespaceURI for NULL.
by Dmitry Timoshkov May 21, 2021

May 21, 2021

Like ISAXContentHandler::startElement() does. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msxml3/mxwriter.c | 4 ++-- dlls/msxml3/tests/saxreader.c | 4 ---- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/dlls/msxml3/mxwriter.c b/dlls/msxml3/mxwriter.c index ac3c0fa59c3..b1ca5a0ca41 100644 --- a/dlls/msxml3/mxwriter.c +++ b/dlls/msxml3/mxwriter.c @@ -2159,8 +2159,8 @@ static HRESULT WINAPI VBSAXContentHandler_startElement(IVBSAXContentHandler *ifa TRACE("(%p)->(%p %p %p %p)\n", This, namespaceURI, localName, QName, attrs); - if (!namespaceURI || !localName || !QName) - return E_POINTER; + if (!namespaceURI || !*namespaceURI || !localName || !QName) + return E_INVALIDARG; TRACE("(%s %s %s)\n", debugstr_w(*namespaceURI), debugstr_w(*localName), debugstr_w(*QName)); diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index f2016e3132d..e401aafc87d 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3852,7 +3852,6 @@ static void test_mxwriter_startendelement(void) bstr_ab = SysAllocString(L"a:b"); hr = IVBSAXContentHandler_startElement(vb_content, &bstr_null, &bstr_empty, &bstr_b, NULL); -todo_wine ok(hr == E_INVALIDARG, "got %08x\n", hr); hr = IVBSAXContentHandler_startElement(vb_content, &bstr_empty, &bstr_b, &bstr_empty, NULL); @@ -3862,7 +3861,6 @@ todo_wine hr = IMXWriter_get_output(writer, &dest); ok(hr == S_OK, "got %08x\n", hr); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); -todo_wine ok(!lstrcmpW(L"<>", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); @@ -3873,7 +3871,6 @@ todo_wine hr = IMXWriter_get_output(writer, &dest); ok(hr == S_OK, "got %08x\n", hr); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); -todo_wine ok(!lstrcmpW(L"<>", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); @@ -3899,7 +3896,6 @@ todo_wine hr = IMXWriter_get_output(writer, &dest); ok(hr == S_OK, "got %08x\n", hr); ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); -todo_wine ok(!lstrcmpW(L"<>", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); VariantClear(&dest); -- 2.31.1

2 1

[PATCH 1/2] msxml3/tests: Add some tests for IVBSAXContentHandler::startElement() and IVBSAXContentHandler::endElement().
by Dmitry Timoshkov May 21, 2021

May 21, 2021

These are mostly a copy of ISAXContentHandler::startElement() and ISAXContentHandler::endElement() tests. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> --- dlls/msxml3/tests/saxreader.c | 85 ++++++++++++++++++++++++++++++++++- 1 file changed, 84 insertions(+), 1 deletion(-) diff --git a/dlls/msxml3/tests/saxreader.c b/dlls/msxml3/tests/saxreader.c index 35d0e71545b..f2016e3132d 100644 --- a/dlls/msxml3/tests/saxreader.c +++ b/dlls/msxml3/tests/saxreader.c @@ -3824,8 +3824,10 @@ static void test_mxwriter_startendelement_batch2(const struct writer_startendele static void test_mxwriter_startendelement(void) { ISAXContentHandler *content; + IVBSAXContentHandler *vb_content; IMXWriter *writer; VARIANT dest; + BSTR bstr_null = NULL, bstr_empty, bstr_a, bstr_b, bstr_ab; HRESULT hr; test_mxwriter_startendelement_batch(writer_startendelement); @@ -3835,12 +3837,93 @@ static void test_mxwriter_startendelement(void) &IID_IMXWriter, (void**)&writer); ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); - hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IMXWriter_QueryInterface(writer, &IID_IVBSAXContentHandler, (void**)&vb_content); + ok(hr == S_OK, "got %08x\n", hr); + + hr = IVBSAXContentHandler_startDocument(vb_content); + ok(hr == S_OK, "got %08x\n", hr); + + bstr_empty = SysAllocString(L""); + bstr_a = SysAllocString(L"a"); + bstr_b = SysAllocString(L"b"); + bstr_ab = SysAllocString(L"a:b"); + + hr = IVBSAXContentHandler_startElement(vb_content, &bstr_null, &bstr_empty, &bstr_b, NULL); +todo_wine + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = IVBSAXContentHandler_startElement(vb_content, &bstr_empty, &bstr_b, &bstr_empty, NULL); + ok(hr == S_OK, "got %08x\n", hr); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + ok(hr == S_OK, "got %08x\n", hr); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); +todo_wine + ok(!lstrcmpW(L"<>", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + hr = IVBSAXContentHandler_startElement(vb_content, &bstr_empty, &bstr_empty, &bstr_b, NULL); + ok(hr == S_OK, "got %08x\n", hr); + + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + ok(hr == S_OK, "got %08x\n", hr); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); +todo_wine + ok(!lstrcmpW(L"<>", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + hr = IVBSAXContentHandler_endElement(vb_content, &bstr_null, &bstr_null, &bstr_b); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = IVBSAXContentHandler_endElement(vb_content, &bstr_null, &bstr_a, &bstr_b); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = IVBSAXContentHandler_endElement(vb_content, &bstr_a, &bstr_b, &bstr_null); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = IVBSAXContentHandler_endElement(vb_content, &bstr_empty, &bstr_null, &bstr_b); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = IVBSAXContentHandler_endElement(vb_content, &bstr_empty, &bstr_b, &bstr_null); + ok(hr == E_INVALIDARG, "got %08x\n", hr); + + hr = IVBSAXContentHandler_endElement(vb_content, &bstr_empty, &bstr_empty, &bstr_b); ok(hr == S_OK, "got %08x\n", hr); + V_VT(&dest) = VT_EMPTY; + hr = IMXWriter_get_output(writer, &dest); + ok(hr == S_OK, "got %08x\n", hr); + ok(V_VT(&dest) == VT_BSTR, "got %d\n", V_VT(&dest)); +todo_wine + ok(!lstrcmpW(L"<>", V_BSTR(&dest)), "got wrong content %s\n", wine_dbgstr_w(V_BSTR(&dest))); + VariantClear(&dest); + + SysFreeString(bstr_empty); + SysFreeString(bstr_a); + SysFreeString(bstr_b); + SysFreeString(bstr_ab); + + hr = IVBSAXContentHandler_endDocument(vb_content); + ok(hr == S_OK, "got %08x\n", hr); + + IVBSAXContentHandler_Release(vb_content); + IMXWriter_Release(writer); + + hr = CoCreateInstance(&CLSID_MXXMLWriter, NULL, CLSCTX_INPROC_SERVER, + &IID_IMXWriter, (void**)&writer); + ok(hr == S_OK, "Expected S_OK, got %08x\n", hr); + hr = IMXWriter_put_omitXMLDeclaration(writer, VARIANT_TRUE); ok(hr == S_OK, "got %08x\n", hr); + hr = IMXWriter_QueryInterface(writer, &IID_ISAXContentHandler, (void**)&content); + ok(hr == S_OK, "got %08x\n", hr); + hr = ISAXContentHandler_startDocument(content); ok(hr == S_OK, "got %08x\n", hr); -- 2.31.1

2 1

[PATCH] include/ddk: Update MEMORY_CACHING_TYPE*
by Serge Gautherie May 21, 2021

May 21, 2021

Signed-off-by: Serge Gautherie <winehq-git_serge_180711(a)gautherie.fr> --- include/ddk/wdm.h | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/include/ddk/wdm.h b/include/ddk/wdm.h index 447833c..2b988b0 100644 --- a/include/ddk/wdm.h +++ b/include/ddk/wdm.h @@ -1314,16 +1314,22 @@ typedef struct _KUSER_SHARED_DATA { #define SHARED_GLOBAL_FLAGS_QPC_BYPASS_A73_ERRATA 0x40 #define SHARED_GLOBAL_FLAGS_QPC_BYPASS_USE_RDTSCP 0x80 +typedef enum _MEMORY_CACHING_TYPE_ORIG { + MmFrameBufferCached = 2 +} MEMORY_CACHING_TYPE_ORIG; + typedef enum _MEMORY_CACHING_TYPE { - MmNonCached = 0, - MmCached = 1, - MmWriteCombined = 2, - MmHardwareCoherentCached = 3, - MmNonCachedUnordered = 4, - MmUSWCCached = 5, - MmMaximumCacheType = 6 + MmNonCached = FALSE, + MmCached = TRUE, + MmWriteCombined = MmFrameBufferCached, + MmHardwareCoherentCached, + MmNonCachedUnordered, + MmUSWCCached, + MmMaximumCacheType, + MmNotMapped = -1 } MEMORY_CACHING_TYPE; + typedef enum _MM_PAGE_PRIORITY { LowPagePriority, NormalPagePriority = 16, -- 2.10.0.windows.1

2 1

[PATCH v2 1/2] ws2_32/tests: Extend WSARecvMsg() tests a bit.
by Zebediah Figura May 21, 2021

May 21, 2021

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/tests/sock.c | 63 +++++++++++++++++++++++++++++++++++----- 1 file changed, 55 insertions(+), 8 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 8bec781ac6f..5cc0725752e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1769,6 +1769,16 @@ static void test_so_reuseaddr(void) #define IP_PKTINFO_LEN (sizeof(WSACMSGHDR) + WSA_CMSG_ALIGN(sizeof(struct in_pktinfo))) +static unsigned int got_ip_pktinfo_apc; + +static void WINAPI ip_pktinfo_apc(DWORD error, DWORD size, OVERLAPPED *overlapped, DWORD flags) +{ + ok(error == WSAEMSGSIZE, "got error %u\n", error); + ok(size == 6, "got size %u\n", size); + ok(!flags, "got flags %#x\n", flags); + ++got_ip_pktinfo_apc; +} + static void test_ip_pktinfo(void) { ULONG addresses[2] = {inet_addr("127.0.0.1"), htonl(INADDR_ANY)}; @@ -1858,14 +1868,20 @@ static void test_ip_pktinfo(void) ok(rc == sizeof(msg), "sendto() failed error: %d\n", WSAGetLastError()); ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); hdr.Control.len = 1; - rc=pWSARecvMsg(s1, &hdr, &dwSize, NULL, NULL); - err=WSAGetLastError(); - ok(rc == SOCKET_ERROR && err == WSAEMSGSIZE && (hdr.dwFlags & MSG_CTRUNC), - "WSARecvMsg() failed error: %d (ret: %d, flags: %d)\n", err, rc, hdr.dwFlags); + dwSize = 0xdeadbeef; + rc = pWSARecvMsg(s1, &hdr, &dwSize, NULL, NULL); + ok(rc == -1, "expected failure\n"); + ok(WSAGetLastError() == WSAEMSGSIZE, "got error %u\n", WSAGetLastError()); + todo_wine ok(dwSize == sizeof(msg), "got size %u\n", dwSize); + ok(hdr.dwFlags == MSG_CTRUNC, "got flags %#x\n", hdr.dwFlags); hdr.dwFlags = 0; /* Reset flags */ /* Perform another short control header test, this time with an overlapped receive */ hdr.Control.len = 1; + ov.Internal = 0xdead1; + ov.InternalHigh = 0xdead2; + ov.Offset = 0xdead3; + ov.OffsetHigh = 0xdead4; rc=pWSARecvMsg(s1, &hdr, NULL, &ov, NULL); err=WSAGetLastError(); ok(rc != 0 && err == WSA_IO_PENDING, "WSARecvMsg() failed error: %d\n", err); @@ -1874,14 +1890,45 @@ static void test_ip_pktinfo(void) ok(rc == sizeof(msg), "sendto() failed error: %d\n", WSAGetLastError()); ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); ok(!WaitForSingleObject(ov.hEvent, 100), "wait failed\n"); - dwFlags = 0; - WSAGetOverlappedResult(s1, &ov, NULL, FALSE, &dwFlags); - ok(dwFlags == 0, - "WSAGetOverlappedResult() returned unexpected flags %d!\n", dwFlags); + ok((NTSTATUS)ov.Internal == STATUS_BUFFER_OVERFLOW, "got status %#x\n", (NTSTATUS)ov.Internal); + todo_wine ok(ov.InternalHigh == sizeof(msg), "got size %Iu\n", ov.InternalHigh); + ok(ov.Offset == 0xdead3, "got Offset %Iu\n", ov.Offset); + ok(ov.OffsetHigh == 0xdead4, "got OffsetHigh %Iu\n", ov.OffsetHigh); + dwFlags = 0xdeadbeef; + rc = WSAGetOverlappedResult(s1, &ov, &dwSize, FALSE, &dwFlags); + ok(!rc, "expected failure\n"); + ok(WSAGetLastError() == WSAEMSGSIZE, "got error %u\n", WSAGetLastError()); + todo_wine ok(dwSize == sizeof(msg), "got size %u\n", dwSize); + todo_wine ok(dwFlags == 0xdeadbeef, "got flags %#x\n", dwFlags); ok(hdr.dwFlags == MSG_CTRUNC, "WSARecvMsg() overlapped operation set unexpected flags %d.\n", hdr.dwFlags); hdr.dwFlags = 0; /* Reset flags */ + /* And with an APC. */ + + SetLastError(0xdeadbeef); + rc = sendto(s2, msg, sizeof(msg), 0, (struct sockaddr *)&s2addr, sizeof(s2addr)); + ok(rc == sizeof(msg), "sendto() failed error: %d\n", WSAGetLastError()); + ok(GetLastError() == ERROR_SUCCESS, "Expected 0, got %d\n", GetLastError()); + hdr.Control.len = 1; + + ov.Internal = 0xdead1; + ov.InternalHigh = 0xdead2; + ov.Offset = 0xdead3; + ov.OffsetHigh = 0xdead4; + dwSize = 0xdeadbeef; + rc = pWSARecvMsg(s1, &hdr, NULL, &ov, ip_pktinfo_apc); + ok(rc == -1, "expected failure\n"); + todo_wine ok(WSAGetLastError() == ERROR_IO_PENDING, "got error %u\n", WSAGetLastError()); + + rc = SleepEx(1000, TRUE); + todo_wine ok(rc == WAIT_IO_COMPLETION, "got %d\n", rc); + todo_wine ok(got_ip_pktinfo_apc == 1, "apc was called %u times\n", got_ip_pktinfo_apc); + ok(hdr.dwFlags == MSG_CTRUNC, "got flags %#x\n", hdr.dwFlags); + got_ip_pktinfo_apc = 0; + + hdr.dwFlags = 0; /* Reset flags */ + /* * Setup an overlapped receive, send a packet, then wait for the packet to be retrieved * on the server end and check that the returned packet matches what was sent. -- 2.30.2

1 1

[PATCH] mstask/tests: Work around race conditions with the task scheduler process.
by Francois Gouget May 20, 2021

May 20, 2021

When a task is created the process scheduler locks and loads it. This can cause ITaskScheduler_Delete() to fail with a sharing violation if it is called at the wrong time. Just retry a bit later when that happens. This fixes failures mostly in Wine but also in Windows 10 from time to time in both task and task_scheduler. Signed-off-by: Francois Gouget <fgouget(a)icodeweavers.com> --- The failures are much less frequent on Windows but still happen: https://test.winehq.org/data/39263558a2088940aaacd6eda19ca23d40b63495/vista… https://test.winehq.org/data/092c7a09a5afde3f11b71b1816388e80d062e8ec/win20… I take that to mean that ITaskScheduler_Activate() is right to pass STGM_SHARE_DENY_WRITE to IPersistFile_Load(). So the reason for the lower falure frequency on Windows may have to do with Windows' coarser default scheduling granularity (15.6ms). But I suspect it's higher in Wine because of the wineserver ping-pong: * After creating the new task file the test gets blocked in some wineserver call. * The wineserver handles that call but also sends a notification of the new file to the task scheduler. Then the Linux scheduler preferentially gives the next time slice to the task scheduler rather than to the test (because the task scheduler was blocked for a long time?). * The task scheduler ends up making a call to the wineserver to lock the file and blocks. * After wineserver handles that call the Linux scheduler gives the next time slice to the test. * This lets the test continue until it calls DeleteFile() which fails due to the locking. This depends on many factors (cores) and timing which could also explain why the failure frequency is not exactly the same on debiant2 and cw-gtx560/cw-rx460. Interestingly, adding a Sleep(10) just before the calls to ITaskScheduler_Delete() helps in Wine (but makes no discernible difference in Windows). --- dlls/mstask/tests/task.c | 7 +++++-- dlls/mstask/tests/task_scheduler.c | 31 +++++++++++++++++++++++++----- 2 files changed, 31 insertions(+), 7 deletions(-) diff --git a/dlls/mstask/tests/task.c b/dlls/mstask/tests/task.c index a9957117e9b..0c7f85394ea 100644 --- a/dlls/mstask/tests/task.c +++ b/dlls/mstask/tests/task.c @@ -29,6 +29,9 @@ static ITaskScheduler *scheduler; static const WCHAR task_name[] = {'T','e','s','t','i','n','g',0}; static const WCHAR empty[] = {0}; +extern HRESULT taskscheduler_delete(ITaskScheduler*, const WCHAR*); + + static LPCWSTR path_resolve_name(LPCWSTR base_name) { static WCHAR buffer[MAX_PATH]; @@ -552,7 +555,7 @@ static void test_Run(void) HRESULT hr, status; /* cleanup after previous runs */ - ITaskScheduler_Delete(scheduler, wine_test_runW); + taskscheduler_delete(scheduler, wine_test_runW); hr = ITaskScheduler_NewWorkItem(scheduler, wine_test_runW, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); @@ -679,7 +682,7 @@ static void test_Run(void) else ITask_Release(task); - hr = ITaskScheduler_Delete(scheduler, wine_test_runW); + hr = taskscheduler_delete(scheduler, wine_test_runW); ok(hr == S_OK, "got %#x\n", hr); } diff --git a/dlls/mstask/tests/task_scheduler.c b/dlls/mstask/tests/task_scheduler.c index 5abee75e23c..fafad585f53 100644 --- a/dlls/mstask/tests/task_scheduler.c +++ b/dlls/mstask/tests/task_scheduler.c @@ -31,6 +31,27 @@ static ITaskScheduler *test_task_scheduler; static const WCHAR does_not_existW[] = {'\\','\\','d','o','e','s','_','n','o','t','_','e','x','i','s','t',0}; + +HRESULT taskscheduler_delete(ITaskScheduler *scheduler, const WCHAR *name) +{ + HRESULT hr; + int i = 0; + + while (1) + { + hr = ITaskScheduler_Delete(scheduler, name); + if (hr != HRESULT_FROM_WIN32(ERROR_SHARING_VIOLATION)) break; + if (++i == 5) break; + + /* The task scheduler locked the file to load the task (see + * ITaskScheduler_Activate()). It should be done soon. + */ + trace("Got a sharing violation deleting %s, retrying...\n", wine_dbgstr_w(name)); + Sleep(100); + } + return hr; +} + static void test_NewWorkItem(void) { HRESULT hres; @@ -225,7 +246,7 @@ static void test_Enum(void) ok(hr == S_OK, "got %#x\n", hr); /* cleanup after previous runs */ - ITaskScheduler_Delete(scheduler, Task1); + taskscheduler_delete(scheduler, Task1); hr = ITaskScheduler_NewWorkItem(scheduler, Task1, &CLSID_CTask, &IID_ITask, (IUnknown **)&task); ok(hr == S_OK, "got %#x\n", hr); @@ -291,7 +312,7 @@ static void test_Enum(void) IEnumWorkItems_Release(tasks); - hr = ITaskScheduler_Delete(scheduler, Task1); + hr = taskscheduler_delete(scheduler, Task1); ok(hr == S_OK, "got %#x\n", hr); ITaskScheduler_Release(scheduler); @@ -494,11 +515,11 @@ static void test_task_storage(void) test_save_task_curfile(task); - hr = ITaskScheduler_Delete(scheduler, Task1); + hr = taskscheduler_delete(scheduler, Task1); ok(hr == S_OK, "got %#x\n", hr); - hr = ITaskScheduler_Delete(scheduler, Task2); + hr = taskscheduler_delete(scheduler, Task2); ok(hr == S_OK, "got %#x\n", hr); - hr = ITaskScheduler_Delete(scheduler, Task3); + hr = taskscheduler_delete(scheduler, Task3); ok(hr == S_OK, "got %#x\n", hr); ITask_Release(task); -- 2.20.1

1 0

[PATCH v2] user32/tests: Fix the clipboard format id vs. atom table checks.
by Francois Gouget May 20, 2021

May 20, 2021

One cannot assume that a random integer has zero chance of being a valid atom. Reenable the GlobalFindAtomA() check in a todo_wine. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> --- v2: No need for todo_wine for the global atom length check. dlls/user32/tests/clipboard.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/user32/tests/clipboard.c b/dlls/user32/tests/clipboard.c index 2fceab6c0f6..d75e8fc3c32 100644 --- a/dlls/user32/tests/clipboard.c +++ b/dlls/user32/tests/clipboard.c @@ -391,29 +391,30 @@ static void test_RegisterClipboardFormatA(void) lstrcpyA(buf, "foo"); SetLastError(0xdeadbeef); len = GetAtomNameA((ATOM)format_id, buf, ARRAY_SIZE(buf)); - ok(len == 0, "GetAtomNameA should fail\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, "err %d\n", GetLastError()); + ok(len == 0 || lstrcmpA(buf, "my_cool_clipboard_format") != 0, + "format_id should not be a valid local atom\n"); + ok(len != 0 || GetLastError() == ERROR_INVALID_HANDLE, + "err %d\n", GetLastError()); -todo_wine -{ lstrcpyA(buf, "foo"); SetLastError(0xdeadbeef); len = GlobalGetAtomNameA((ATOM)format_id, buf, ARRAY_SIZE(buf)); - ok(len == 0, "GlobalGetAtomNameA should fail\n"); - ok(GetLastError() == ERROR_INVALID_HANDLE, "err %d\n", GetLastError()); -} + todo_wine ok(len == 0 || lstrcmpA(buf, "my_cool_clipboard_format") != 0, + "format_id should not be a valid global atom\n"); + ok(len != 0 || GetLastError() == ERROR_INVALID_HANDLE, + "err %d\n", GetLastError()); SetLastError(0xdeadbeef); atom_id = FindAtomA("my_cool_clipboard_format"); - ok(atom_id == 0, "FindAtomA should fail\n"); + ok(atom_id == 0, "FindAtomA should fail, but it returned %x (format_id=%x)\n", atom_id, format_id); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "err %d\n", GetLastError()); - if (0) + todo_wine { /* this relies on the clipboard and global atom table being different */ SetLastError(0xdeadbeef); atom_id = GlobalFindAtomA("my_cool_clipboard_format"); - ok(atom_id == 0, "GlobalFindAtomA should fail\n"); + ok(atom_id == 0, "GlobalFindAtomA should fail, but it returned %x (format_id=%x)\n", atom_id, format_id); ok(GetLastError() == ERROR_FILE_NOT_FOUND, "err %d\n", GetLastError()); } -- 2.20.1

1 0

[PATCH] schedsvc: Fix the spelling of a comment.
by Francois Gouget May 20, 2021

May 20, 2021

Signed-off-by: Francois Gouget <fgouget(a)free.fr> --- dlls/schedsvc/atsvc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/schedsvc/atsvc.c b/dlls/schedsvc/atsvc.c index 5a34b33e039..1625b43c888 100644 --- a/dlls/schedsvc/atsvc.c +++ b/dlls/schedsvc/atsvc.c @@ -828,7 +828,7 @@ static BOOL create_job(const WCHAR *job_name, const AT_INFO *info) if (!write_reserved_data(hfile)) goto failed; - /* Trigegrs */ + /* Triggers */ if (!write_trigger(hfile, info)) goto failed; -- 2.20.1

1 0