October 2019 - Wine-Devel - list.winehq.org

[PATCH 1/5] quartz/filtergraph: Create filters on a separate thread if requested.
by Zebediah Figura Oct. 2, 2019

Oct. 2, 2019

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/filtergraph.c | 105 +++++++++++++++++++++++++++----- dlls/quartz/main.c | 4 +- dlls/quartz/quartz_private.h | 4 +- dlls/quartz/tests/filtergraph.c | 5 +- 4 files changed, 97 insertions(+), 21 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index d8db871505b..b4d0164fd3a 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -208,6 +208,9 @@ typedef struct _IFilterGraphImpl { LONG recursioncount; IUnknown *pSite; LONG version; + + HANDLE message_thread, message_thread_ret; + DWORD message_thread_id; } IFilterGraphImpl; struct enum_filters @@ -489,6 +492,13 @@ static ULONG WINAPI FilterGraphInner_Release(IUnknown *iface) CloseHandle(This->hEventCompletion); EventsQueue_Destroy(&This->evqueue); This->cs.DebugInfo->Spare[0] = 0; + if (This->message_thread) + { + PostThreadMessageW(This->message_thread_id, WM_USER + 1, 0, 0); + WaitForSingleObject(This->message_thread, INFINITE); + CloseHandle(This->message_thread); + CloseHandle(This->message_thread_ret); + } DeleteCriticalSection(&This->cs); CoTaskMemFree(This); } @@ -964,6 +974,63 @@ static HRESULT GetFilterInfo(IMoniker* pMoniker, VARIANT* pvar) return hr; } +struct filter_create_params +{ + HRESULT hr; + IMoniker *moniker; + IBaseFilter *filter; +}; + +static DWORD WINAPI message_thread_run(void *ctx) +{ + IFilterGraphImpl *graph = ctx; + MSG msg; + + CoInitializeEx(NULL, COINIT_MULTITHREADED); + + for (;;) + { + GetMessageW(&msg, NULL, 0, 0); + + if (!msg.hwnd && msg.message == WM_USER) + { + struct filter_create_params *params = (struct filter_create_params *)msg.wParam; + + params->hr = IMoniker_BindToObject(params->moniker, NULL, NULL, + &IID_IBaseFilter, (void **)&params->filter); + SetEvent(graph->message_thread_ret); + } + else if (!msg.hwnd && msg.message == WM_USER + 1) + { + break; + } + else + { + TranslateMessage(&msg); + DispatchMessageW(&msg); + } + } + + CoUninitialize(); + return 0; +} + +static HRESULT create_filter(IFilterGraphImpl *graph, IMoniker *moniker, IBaseFilter **filter) +{ + if (graph->message_thread) + { + struct filter_create_params params; + + params.moniker = moniker; + PostThreadMessageW(graph->message_thread_id, WM_USER, (WPARAM)&params, 0); + WaitForSingleObject(graph->message_thread_ret, INFINITE); + *filter = params.filter; + return params.hr; + } + else + return IMoniker_BindToObject(moniker, NULL, NULL, &IID_IBaseFilter, (void **)filter); +} + /* Attempt to connect one of the output pins on filter to sink. Helper for * FilterGraph2_Connect(). */ static HRESULT connect_output_pin(IFilterGraphImpl *graph, IBaseFilter *filter, IPin *sink) @@ -1164,7 +1231,7 @@ static HRESULT WINAPI FilterGraph2_Connect(IFilterGraph2 *iface, IPin *ppinOut, goto error; } - hr = IMoniker_BindToObject(pMoniker, NULL, NULL, &IID_IBaseFilter, (LPVOID*)&pfilter); + hr = create_filter(This, pMoniker, &pfilter); IMoniker_Release(pMoniker); if (FAILED(hr)) { WARN("Unable to create filter (%x), trying next one\n", hr); @@ -1497,7 +1564,7 @@ static HRESULT WINAPI FilterGraph2_Render(IFilterGraph2 *iface, IPin *ppinOut) goto error; } - hr = IMoniker_BindToObject(pMoniker, NULL, NULL, &IID_IBaseFilter, (LPVOID*)&pfilter); + hr = create_filter(This, pMoniker, &pfilter); IMoniker_Release(pMoniker); if (FAILED(hr)) { @@ -5565,15 +5632,12 @@ static const IUnknownVtbl IInner_VTable = FilterGraphInner_Release }; -/* This is the only function that actually creates a FilterGraph class... */ -HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) +static HRESULT filter_graph_common_create(IUnknown *outer, void **out, BOOL threaded) { IFilterGraphImpl *fimpl; HRESULT hr; - TRACE("(%p,%p)\n", pUnkOuter, ppObj); - - *ppObj = NULL; + *out = NULL; fimpl = CoTaskMemAlloc(sizeof(*fimpl)); fimpl->defaultclock = TRUE; @@ -5617,10 +5681,15 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) fimpl->recursioncount = 0; fimpl->version = 0; - if (pUnkOuter) - fimpl->outer_unk = pUnkOuter; + if (threaded) + { + fimpl->message_thread = CreateThread(NULL, 0, message_thread_run, fimpl, 0, &fimpl->message_thread_id); + fimpl->message_thread_ret = CreateEventW(NULL, FALSE, FALSE, NULL); + } else - fimpl->outer_unk = &fimpl->IUnknown_inner; + fimpl->message_thread = NULL; + + fimpl->outer_unk = outer ? outer : &fimpl->IUnknown_inner; /* create Filtermapper aggregated. */ hr = CoCreateInstance(&CLSID_FilterMapper2, fimpl->outer_unk, CLSCTX_INPROC_SERVER, @@ -5637,12 +5706,20 @@ HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) return hr; } - *ppObj = &fimpl->IUnknown_inner; + *out = &fimpl->IUnknown_inner; return S_OK; } -HRESULT FilterGraphNoThread_create(IUnknown *pUnkOuter, LPVOID *ppObj) +HRESULT filter_graph_create(IUnknown *outer, void **out) { - FIXME("CLSID_FilterGraphNoThread partially implemented - Forwarding to CLSID_FilterGraph\n"); - return FilterGraph_create(pUnkOuter, ppObj); + TRACE("outer %p, out %p.\n", outer, out); + + return filter_graph_common_create(outer, out, TRUE); +} + +HRESULT filter_graph_no_thread_create(IUnknown *outer, void **out) +{ + TRACE("outer %p, out %p.\n", outer, out); + + return filter_graph_common_create(outer, out, FALSE); } diff --git a/dlls/quartz/main.c b/dlls/quartz/main.c index 36ec59c4e03..9540fa92935 100644 --- a/dlls/quartz/main.c +++ b/dlls/quartz/main.c @@ -63,8 +63,8 @@ struct object_creation_info static const struct object_creation_info object_creation[] = { { &CLSID_SeekingPassThru, SeekingPassThru_create }, - { &CLSID_FilterGraph, FilterGraph_create }, - { &CLSID_FilterGraphNoThread, FilterGraphNoThread_create }, + { &CLSID_FilterGraph, filter_graph_create }, + { &CLSID_FilterGraphNoThread, filter_graph_no_thread_create }, { &CLSID_FilterMapper, FilterMapper_create }, { &CLSID_FilterMapper2, FilterMapper2_create }, { &CLSID_AsyncReader, AsyncReader_create }, diff --git a/dlls/quartz/quartz_private.h b/dlls/quartz/quartz_private.h index 353d1e5a577..1213aea352a 100644 --- a/dlls/quartz/quartz_private.h +++ b/dlls/quartz/quartz_private.h @@ -40,8 +40,8 @@ #define MEDIATIME_FROM_BYTES(x) ((LONGLONG)(x) * 10000000) #define BYTES_FROM_MEDIATIME(time) ((time) / 10000000) -HRESULT FilterGraph_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; -HRESULT FilterGraphNoThread_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; +HRESULT filter_graph_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN; +HRESULT filter_graph_no_thread_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN; HRESULT FilterMapper2_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT FilterMapper_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN; HRESULT AsyncReader_create(IUnknown * pUnkOuter, LPVOID * ppv) DECLSPEC_HIDDEN; diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index 2aca4a91c87..8141d928c61 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -760,10 +760,9 @@ static DWORD WINAPI call_RenderFile_multithread(LPVOID lParam) HRESULT hr; hr = IFilterGraph2_RenderFile(graph, filename, NULL); - ok(SUCCEEDED(hr), "RenderFile failed: %x\n", hr); + ok(hr == S_OK, "Got hr %#x.\n", hr); - if (SUCCEEDED(hr)) - rungraph(graph, TRUE); + rungraph(graph, TRUE); return 0; } -- 2.23.0

2 8

[PATCH v2] dmime/tests: Add a notification_type test
by Alistair Leslie-Hughes Oct. 2, 2019

Oct. 2, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- v2: - Remove unrequired code. - Corrected formatting. - Reduced indents. - Added more tests. dlls/dmime/tests/performance.c | 116 +++++++++++++++++++++++++++++++++ 1 file changed, 116 insertions(+) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index c2ca4cdf28..569315643c 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -366,6 +366,121 @@ static void test_COM(void) ok (refcount == 0, "refcount == %u, expected 0\n", refcount); } +static void test_notification_type(void) +{ + static unsigned char rifffile[8+4+8+16+8+256] = "RIFF\x24\x01\x00\x00WAVE" /* header: 4 ("WAVE") + (8 + 16) (format segment) + (8 + 256) (data segment) = 0x124 */ + "fmt \x10\x00\x00\x00\x01\x00\x20\x00\xAC\x44\x00\x00\x10\xB1\x02\x00\x04\x00\x10\x00" /* format segment: PCM, 2 chan, 44100 Hz, 16 bits */ + "data\x00\x01\x00\x00"; /* 256 byte data segment (silence) */ + + IDirectMusicPerformance8 *perf; + IDirectMusic *music = NULL; + IDirectMusicSegment8 *prime_segment8; + IDirectMusicSegment8 *segment8 = NULL; + IDirectMusicLoader8 *loader; + IDirectMusicAudioPath8 *path; + IDirectMusicSegmentState *state; + IDirectSound *dsound = NULL; + HRESULT hr; + DWORD result; + HANDLE messages; + DMUS_NOTIFICATION_PMSG *msg; + BOOL found_end = FALSE; + DMUS_OBJECTDESC desc = {0}; + + hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, + CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, (void**)&perf); + ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + + hr = IDirectMusicPerformance8_InitAudio(perf, &music, &dsound, NULL, DMUS_APATH_DYNAMIC_STEREO, 64, DMUS_AUDIOF_ALL, NULL); + ok(music != NULL, "Didn't get IDirectMusic pointer\n"); + ok(dsound != NULL, "Didn't get IDirectSound pointer\n"); + + hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicLoader8, (void**)&loader); + ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + + messages = CreateEventA( NULL, FALSE, FALSE, NULL ); + + hr = IDirectMusicPerformance8_AddNotificationType(perf, &GUID_NOTIFICATION_SEGMENT); + ok(hr == S_OK, "Failed: %08x\n", hr); + + hr = IDirectMusicPerformance8_SetNotificationHandle(perf, messages, 0); + ok(hr == S_OK, "Failed: %08x\n", hr); + + hr = IDirectMusicPerformance8_GetDefaultAudioPath(perf, &path); + ok(hr == S_OK, "Failed: %08x\n", hr); + ok(path != NULL, "Didn't get IDirectMusicAudioPath pointer\n"); + + desc.dwSize = sizeof(DMUS_OBJECTDESC); + desc.dwValidData = DMUS_OBJ_CLASS | DMUS_OBJ_MEMORY; + desc.guidClass = CLSID_DirectMusicSegment; + desc.pbMemData = rifffile; + desc.llMemLength = sizeof(rifffile); + hr = IDirectMusicLoader8_GetObject(loader, &desc, &IID_IDirectMusicSegment8, (void**)&prime_segment8); + ok(hr == S_OK, "Failed: %08x\n", hr); + ok(prime_segment8 != NULL, "Didn't get IDirectMusicSegment pointer\n"); + + hr = IDirectMusicSegment8_Download(prime_segment8, (IUnknown*)path); + ok(hr == S_OK, "Download failed: %08x\n", hr); + + hr = IDirectMusicPerformance8_PlaySegmentEx(perf, (IUnknown*)prime_segment8, + NULL, NULL, DMUS_SEGF_SECONDARY, 0, &state, NULL, (IUnknown*)path); + ok(hr == S_OK, "PlaySegmentEx failed: %08x\n", hr); + ok(state != NULL, "Didn't get IDirectMusicSegmentState pointer\n"); + + while (!found_end) { + result = WaitForSingleObject(messages, 500); + todo_wine ok(result == WAIT_OBJECT_0, "Failed: %d\n", result); + if (result != WAIT_OBJECT_0) + break; + + msg = NULL; + hr = IDirectMusicPerformance8_GetNotificationPMsg(perf, &msg); + ok(hr == S_OK, "Failed: %08x\n", hr); + ok(msg != NULL, "Unexpected NULL pointer\n"); + if (FAILED(hr) || !msg) + break; + + trace("Notification: %d\n", msg->dwNotificationOption); + + if (msg->dwNotificationOption == DMUS_NOTIFICATION_SEGEND) { + ok(msg->punkUser != NULL, "Unexpected NULL pointer\n"); + if (msg->punkUser) { + IDirectMusicSegmentState8 *segmentstate; + IDirectMusicSegment *segment; + + hr = IUnknown_QueryInterface(msg->punkUser, &IID_IDirectMusicSegmentState8, (void**)&segmentstate); + ok(hr == S_OK, "Failed: %08x\n", hr); + + hr = IDirectMusicSegmentState8_GetSegment(segmentstate, &segment); + ok(hr == S_OK, "Failed: %08x\n", hr); + + hr = IDirectMusicSegment_QueryInterface(segment, &IID_IDirectMusicSegment8, (void**)&segment8); + ok(hr == S_OK, "Failed: %08x\n", hr); + + found_end = TRUE; + + IDirectMusicSegment_Release(segment); + IDirectMusicSegmentState8_Release(segmentstate); + } + } + + IDirectMusicPerformance8_FreePMsg(perf, (DMUS_PMSG*)msg); + } + todo_wine ok(prime_segment8 == segment8, "Wrong end segment\n"); + todo_wine ok(found_end, "Didn't recieve DMUS_NOTIFICATION_SEGEND message\n"); + + CloseHandle(messages); + + if(segment8) + IDirectMusicSegment8_Release(segment8); + IDirectSound_Release(dsound); + IDirectMusicSegmentState_Release(state); + IDirectMusicAudioPath_Release(path); + IDirectMusicLoader8_Release(loader); + IDirectMusic_Release(music); + IDirectMusicPerformance8_Release(perf); +} + START_TEST( performance ) { HRESULT hr; @@ -384,6 +499,7 @@ START_TEST( performance ) test_COM(); test_createport(); + test_notification_type(); CoUninitialize(); } -- 2.17.1

2 1

[PATCH v2 1/4] kernel32/tests: Add tests for named pipes in PIPE_NOWAIT mode.
by Brendan Shanks Oct. 2, 2019

Oct. 2, 2019

Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> --- v2: Use overlapped I/O instead of threads, test nonblocking write and pending reads dlls/kernel32/tests/pipe.c | 134 +++++++++++++++++++++++++++++++++++++ 1 file changed, 134 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index f61d441303..95ad4e0e82 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3887,6 +3887,139 @@ static void test_wait_pipe(void) CloseHandle(ov.hEvent); } +static void test_nowait(void) +{ + HANDLE piperead, pipewrite, hFile; + OVERLAPPED ol, ol2; + DWORD read, write; + char readbuf[32768]; + static const char teststring[] = "bits"; + + /* CreateNamedPipe with PIPE_NOWAIT, and read from empty pipe */ + piperead = CreateNamedPipeA(PIPENAME, FILE_FLAG_OVERLAPPED | PIPE_ACCESS_DUPLEX, + /* dwPipeMode */ PIPE_TYPE_BYTE | PIPE_NOWAIT, + /* nMaxInstances */ 1, + /* nOutBufSize */ 512, + /* nInBufSize */ 512, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(piperead != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); + pipewrite = CreateFileA(PIPENAME, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + ok(pipewrite != INVALID_HANDLE_VALUE, "CreateFileA failed\n"); + memset(&ol, 0, sizeof(ol)); + ol.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + SetLastError(0xdeadbeef); + ok(ReadFile(piperead, readbuf, sizeof(readbuf), &read, &ol) == FALSE, "ReadFile should fail\n"); + todo_wine ok(GetLastError() == ERROR_NO_DATA, "got %d should be ERROR_NO_DATA\n", GetLastError()); + if (GetLastError() == ERROR_IO_PENDING) + CancelIo(piperead); + + /* test a small write/read */ + ok(WriteFile(pipewrite, teststring, sizeof(teststring), &write, NULL), "WriteFile should succeed\n"); + ok(ReadFile(piperead, readbuf, sizeof(readbuf), &read, &ol), "ReadFile should succeed\n"); + ok(read == write, "read/write bytes should match\n"); + ok(CloseHandle(ol.hEvent), "CloseHandle for the event failed\n"); + ok(CloseHandle(pipewrite), "CloseHandle for the write pipe failed\n"); + ok(CloseHandle(piperead), "CloseHandle for the read pipe failed\n"); + + + /* create write side with PIPE_NOWAIT, read side PIPE_WAIT, and test writes */ + pipewrite = CreateNamedPipeA(PIPENAME, FILE_FLAG_OVERLAPPED | PIPE_ACCESS_DUPLEX, + /* dwPipeMode */ PIPE_TYPE_BYTE | PIPE_NOWAIT, + /* nMaxInstances */ 1, + /* nOutBufSize */ 512, + /* nInBufSize */ 512, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(pipewrite != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); + piperead = CreateFileA(PIPENAME, GENERIC_READ, 0, NULL, OPEN_EXISTING, FILE_FLAG_OVERLAPPED, 0); + ok(piperead != INVALID_HANDLE_VALUE, "CreateFileA failed\n"); + memset(&ol, 0, sizeof(ol)); + ol.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + memset(&ol2, 0, sizeof(ol2)); + ol2.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + + /* write one byte larger than the buffer size, should fail */ + SetLastError(0xdeadbeef); + todo_wine ok(WriteFile(pipewrite, readbuf, 513, &write, &ol), "WriteFile should succeed\n"); + /* WriteFile only documents that 'write < sizeof(readbuf)' for this case, but Windows + * doesn't seem to do partial writes ('write == 0' always) + */ + ok(write < sizeof(readbuf), "WriteFile should fail to write the whole buffer\n"); + ok(write == 0, "WriteFile shouldn't do partial writes\n"); + if (GetLastError() == ERROR_IO_PENDING) + CancelIo(piperead); + + /* start overlapped read, then non-blocking write (smaller than buffer, then bigger than buffer) */ + SetLastError(0xdeadbeef); + todo_wine ok(ReadFile(piperead, readbuf, sizeof(readbuf), &read, &ol2) == FALSE, "ReadFile should fail\n"); + todo_wine ok(GetLastError() == ERROR_IO_PENDING, "got %d should be ERROR_IO_PENDING\n", GetLastError()); + ok(WriteFile(pipewrite, teststring, sizeof(teststring), &write, &ol), "WriteFile should succeed\n"); + ok(write == sizeof(teststring), "got %d, write should be %d\n", write, sizeof(teststring)); + ok(GetOverlappedResult(piperead, &ol2, &read, FALSE), "GetOverlappedResult should succeed\n"); + todo_wine ok(read == sizeof(teststring), "got %d, read should be %d\n", write, sizeof(teststring)); + + SetLastError(0xdeadbeef); + todo_wine ok(ReadFile(piperead, readbuf, sizeof(readbuf), &read, &ol2) == FALSE, "ReadFile should fail\n"); + todo_wine ok(GetLastError() == ERROR_IO_PENDING, "got %d should be ERROR_IO_PENDING\n", GetLastError()); + todo_wine ok(WriteFile(pipewrite, readbuf, 513, &write, &ol), "WriteFile should succeed\n"); + todo_wine ok(write == 513, "got %d, write should be %d\n", write, 513); + ok(GetOverlappedResult(piperead, &ol2, &read, FALSE), "GetOverlappedResult should succeed\n"); + todo_wine ok(read == 513, "got %d, read should be %d\n", write, 513); + if (GetOverlappedResult(piperead, &ol2, &read, FALSE) == FALSE) + CancelIo(piperead); + + /* write the exact buffer size, should succeed */ + SetLastError(0xdeadbeef); + todo_wine ok(WriteFile(pipewrite, readbuf, 512, &write, &ol), "WriteFile should succeed\n"); + todo_wine ok(write == 512, "WriteFile should write the whole buffer\n"); + if (GetLastError() == ERROR_IO_PENDING) + CancelIo(piperead); + + ok(CloseHandle(ol.hEvent), "CloseHandle for the event failed\n"); + ok(CloseHandle(ol2.hEvent), "CloseHandle for the event failed\n"); + ok(CloseHandle(pipewrite), "CloseHandle for the write pipe failed\n"); + ok(CloseHandle(piperead), "CloseHandle for the read pipe failed\n"); + + + /* CreateNamedPipe with PIPE_NOWAIT, test ConnectNamedPipe */ + pipewrite = CreateNamedPipeA(PIPENAME, FILE_FLAG_OVERLAPPED | PIPE_ACCESS_DUPLEX, + /* dwPipeMode */ PIPE_TYPE_BYTE | PIPE_NOWAIT, + /* nMaxInstances */ 1, + /* nOutBufSize */ 512, + /* nInBufSize */ 512, + /* nDefaultWait */ NMPWAIT_USE_DEFAULT_WAIT, + /* lpSecurityAttrib */ NULL); + ok(pipewrite != INVALID_HANDLE_VALUE, "CreateNamedPipe failed\n"); + memset(&ol, 0, sizeof(ol)); + ol.hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); + SetLastError(0xdeadbeef); + ok(ConnectNamedPipe(pipewrite, &ol) == FALSE, "ConnectNamedPipe should fail\n"); + todo_wine ok(GetLastError() == ERROR_PIPE_LISTENING, "got %d should be ERROR_PIPE_LISTENING\n", GetLastError()); + if (GetLastError() == ERROR_IO_PENDING) + CancelIo(pipewrite); + + /* connect and disconnect, then test ConnectNamedPipe again */ + hFile = CreateFileA(PIPENAME, GENERIC_READ | GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, 0); + ok(hFile != INVALID_HANDLE_VALUE, "CreateFileA failed\n"); + ok(CloseHandle(hFile), "CloseHandle failed\n"); + SetLastError(0xdeadbeef); + ok(ConnectNamedPipe(pipewrite,&ol) == FALSE, "ConnectNamedPipe should fail\n"); + ok(GetLastError() == ERROR_NO_DATA, "got %d should be ERROR_NO_DATA\n", GetLastError()); + if (GetLastError() == ERROR_IO_PENDING) + CancelIo(pipewrite); + + /* call DisconnectNamedPipe and test ConnectNamedPipe again */ + ok(DisconnectNamedPipe(pipewrite) == TRUE, "DisconnectNamedPipe should succeed\n"); + SetLastError(0xdeadbeef); + ok(ConnectNamedPipe(pipewrite,&ol) == FALSE, "ConnectNamedPipe should fail\n"); + todo_wine ok(GetLastError() == ERROR_PIPE_LISTENING, "got %d should be ERROR_PIPE_LISTENING\n", GetLastError()); + if (GetLastError() == ERROR_IO_PENDING) + CancelIo(pipewrite); + ok(CloseHandle(ol.hEvent), "CloseHandle for the event failed\n"); + ok(CloseHandle(pipewrite), "CloseHandle for the write pipe failed\n"); +} + START_TEST(pipe) { char **argv; @@ -3954,4 +4087,5 @@ START_TEST(pipe) test_namedpipe_session_id(); test_multiple_instances(); test_wait_pipe(); + test_nowait(); } -- 2.17.1

1 3

[PATCH] dmime/tests: Add a notification_type test
by Alistair Leslie-Hughes Oct. 2, 2019

Oct. 2, 2019

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/dmime/tests/performance.c | 127 +++++++++++++++++++++++++++++++++ 1 file changed, 127 insertions(+) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index c2ca4cdf28..1ecb804e26 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -366,6 +366,132 @@ static void test_COM(void) ok (refcount == 0, "refcount == %u, expected 0\n", refcount); } +static void test_notification_type(void) +{ + static unsigned char rifffile[8+4+8+16+8+256] = "RIFF\x24\x01\x00\x00WAVE" /* header: 4 ("WAVE") + (8 + 16) (format segment) + (8 + 256) (data segment) = 0x124 */ + "fmt \x10\x00\x00\x00\x01\x00\x20\x00\xAC\x44\x00\x00\x10\xB1\x02\x00\x04\x00\x10\x00" /* format segment: PCM, 2 chan, 44100 Hz, 16 bits */ + "data\x00\x01\x00\x00"; /* 256 byte data segment (silence) */ + + IDirectMusicPerformance8 *perf; + IDirectMusic *music = NULL; + IDirectMusicSegment8 *prime_segment8; + IDirectMusicSegment8 *segment8 = NULL; + IDirectMusicLoader8 *loader; + IDirectMusicAudioPath8 *path; + IDirectMusicSegmentState *state; + IDirectSound *dsound = NULL; + HRESULT hr; + DWORD result; + HANDLE messages; + DMUS_NOTIFICATION_PMSG *msg; + BOOL found_end = FALSE; + DMUS_OBJECTDESC desc = {0}; + + hr = CoCreateInstance(&CLSID_DirectMusicPerformance, NULL, + CLSCTX_INPROC_SERVER, &IID_IDirectMusicPerformance8, (void**)&perf); + ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + + hr = IDirectMusicPerformance8_InitAudio(perf, &music, &dsound, NULL, DMUS_APATH_DYNAMIC_STEREO, 64, DMUS_AUDIOF_ALL, NULL); + if (hr == DSERR_NODRIVER) + { + IDirectMusicPerformance8_Release(perf); + skip("No audio driver.\n"); + return; + } + ok(music != NULL, "Didn't get IDirectMusic pointer\n"); + + hr = CoCreateInstance(&CLSID_DirectMusicLoader, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusicLoader8, (void**)&loader); + ok(hr == S_OK, "CoCreateInstance failed: %08x\n", hr); + + messages = CreateEventA( NULL, FALSE, FALSE, NULL ); + + hr = IDirectMusicPerformance8_AddNotificationType(perf, &GUID_NOTIFICATION_SEGMENT); + ok(hr == S_OK, "Failed: %08x\n", hr); + + hr = IDirectMusicPerformance8_SetNotificationHandle(perf, messages, 0); + ok(hr == S_OK, "Failed: %08x\n", hr); + + hr = IDirectMusicPerformance8_GetDefaultAudioPath(perf, &path); + ok(hr == S_OK, "Failed: %08x\n", hr); + ok(path != NULL, "Didn't get IDirectMusicAudioPath pointer\n"); + + desc.dwSize = sizeof(DMUS_OBJECTDESC); + desc.dwValidData = DMUS_OBJ_CLASS | DMUS_OBJ_MEMORY; + desc.guidClass = CLSID_DirectMusicSegment; + desc.pbMemData = rifffile; + desc.llMemLength = sizeof(rifffile); + hr = IDirectMusicLoader8_GetObject(loader, &desc, &IID_IDirectMusicSegment8, (void**)&prime_segment8); + ok(hr == S_OK, "Failed: %08x\n", hr); + ok(prime_segment8 != NULL, "Didn't get IDirectMusicSegment pointer\n"); + + hr = IDirectMusicSegment8_Download(prime_segment8, (IUnknown*)path); + ok(hr == S_OK, "Download failed: %08x\n", hr); + + hr = IDirectMusicPerformance8_PlaySegmentEx(perf, (IUnknown*)prime_segment8, + NULL, NULL, DMUS_SEGF_SECONDARY, 0, &state, NULL, (IUnknown*)path); + ok(hr == S_OK, "PlaySegmentEx failed: %08x\n", hr); + ok(state != NULL, "Didn't get IDirectMusicSegmentState pointer\n"); + + while(!found_end) + { + result = WaitForSingleObject(messages, 500); + todo_wine ok(result == WAIT_OBJECT_0, "Failed: %d\n", result); + if(result == WAIT_OBJECT_0) + { + hr = IDirectMusicPerformance8_GetNotificationPMsg(perf, &msg); + ok(hr == S_OK, "Failed: %08x\n", hr); + if(hr == S_OK) + { + trace("Notification: %d\n", msg->dwNotificationOption); + + if(msg->dwNotificationOption == DMUS_NOTIFICATION_SEGEND) + { + if(msg->punkUser) + { + IDirectMusicSegmentState8 *segmentstate; + IDirectMusicSegment *segment; + + hr = IUnknown_QueryInterface(msg->punkUser, &IID_IDirectMusicSegmentState8, (void**)&segmentstate); + ok(hr == S_OK, "Failed: %08x\n", hr); + + hr = IDirectMusicSegmentState8_GetSegment(segmentstate, &segment); + ok(hr == S_OK, "Failed: %08x\n", hr); + + hr = IDirectMusicSegment_QueryInterface(segment, &IID_IDirectMusicSegment8, (void**)&segment8); + ok(hr == S_OK, "Failed: %08x\n", hr); + + found_end = TRUE; + + IDirectMusicSegment_Release(segment); + IDirectMusicSegmentState8_Release(segmentstate); + } + } + + if(msg) + IDirectMusicPerformance8_FreePMsg(perf, (DMUS_PMSG*)msg); + } + } + else + { + trace("WaitForSingleObject Failed: %d\n", result); + break; + } + } + todo_wine ok(prime_segment8 == segment8, "Wrong end segment\n"); + todo_wine ok(found_end, "Didn't recieve DMUS_NOTIFICATION_SEGEND message\n"); + + CloseHandle(messages); + + if(segment8) + IDirectMusicSegment8_Release(segment8); + IDirectSound_Release(dsound); + IDirectMusicSegmentState_Release(state); + IDirectMusicAudioPath_Release(path); + IDirectMusicLoader8_Release(loader); + IDirectMusic_Release(music); + IDirectMusicPerformance8_Release(perf); +} + START_TEST( performance ) { HRESULT hr; @@ -384,6 +510,7 @@ START_TEST( performance ) test_COM(); test_createport(); + test_notification_type(); CoUninitialize(); } -- 2.17.1

2 1

[PATCH v2] dmime: Always set a minimum timeout in IDirectMusicPerformance8::SetNotificationHandle
by Michael Stefaniuc Oct. 2, 2019

Oct. 2, 2019

From: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> --- v2: - Commit message rewording - One whitespace fix dlls/dmime/performance.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/dmime/performance.c b/dlls/dmime/performance.c index b7b4d01017..399b9b9919 100644 --- a/dlls/dmime/performance.c +++ b/dlls/dmime/performance.c @@ -519,12 +519,16 @@ static HRESULT WINAPI IDirectMusicPerformance8Impl_SetGraph(IDirectMusicPerforma static HRESULT WINAPI IDirectMusicPerformance8Impl_SetNotificationHandle(IDirectMusicPerformance8 *iface, HANDLE hNotification, REFERENCE_TIME rtMinimum) { - IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); + IDirectMusicPerformance8Impl *This = impl_from_IDirectMusicPerformance8(iface); - FIXME("(%p, %p, 0x%s): stub\n", This, hNotification, wine_dbgstr_longlong(rtMinimum)); - This->hNotification = hNotification; - if (rtMinimum) This->rtMinimum = rtMinimum; - return S_OK; + TRACE("(%p, %p, 0x%s)\n", This, hNotification, wine_dbgstr_longlong(rtMinimum)); + + This->hNotification = hNotification; + if (rtMinimum) + This->rtMinimum = rtMinimum; + else if (!This->rtMinimum) + This->rtMinimum = 20000000; /* 2 seconds */ + return S_OK; } static HRESULT WINAPI IDirectMusicPerformance8Impl_GetNotificationPMsg(IDirectMusicPerformance8 *iface, -- 2.20.1

1 0

[PATCH 1/3] d3dx9: Fix pitch passed to DXTn [de]compression functions.
by Matteo Bruni Oct. 2, 2019

Oct. 2, 2019

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47862 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- dlls/d3dx9_36/surface.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/surface.c b/dlls/d3dx9_36/surface.c index b47509aa38a..29325d5c0a2 100644 --- a/dlls/d3dx9_36/surface.c +++ b/dlls/d3dx9_36/surface.c @@ -1972,6 +1972,8 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, int i, int j, void *texel); unsigned int x, y; + src_pitch = src_pitch * srcformatdesc->block_width / srcformatdesc->block_byte_count; + src_uncompressed = heap_alloc(src_size.width * src_size.height * sizeof(DWORD)); if (!src_uncompressed) { @@ -2003,8 +2005,7 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, DWORD *ptr = &src_uncompressed[y * src_size.width]; for (x = 0; x < src_size.width; ++x) { - fetch_dxt_texel(src_pitch / sizeof(DWORD), src_memory, - x + src_rect->left, y + src_rect->top, ptr); + fetch_dxt_texel(src_pitch, src_memory, x + src_rect->left, y + src_rect->top, ptr); ++ptr; } } @@ -2080,7 +2081,8 @@ HRESULT WINAPI D3DXLoadSurfaceFromMemory(IDirect3DSurface9 *dst_surface, ERR("Unexpected destination compressed format %u.\n", surfdesc.Format); } tx_compress_dxtn(4, dst_size_aligned.width, dst_size_aligned.height, - dst_uncompressed, gl_format, lockrect.pBits, lockrect.Pitch); + dst_uncompressed, gl_format, lockrect.pBits, + lockrect.Pitch * destformatdesc->block_width / destformatdesc->block_byte_count); heap_free(dst_uncompressed); } } -- 2.21.0

3 4

[PATCH] winebus.sys: Make device_id string more similar to native.
by Piotr Caban Oct. 2, 2019

Oct. 2, 2019

Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> --- dlls/winebus.sys/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[PATCH] msvcrt: Fix the layout of threadlocaleinfostruct for ucrt
by Martin Storsjo Oct. 2, 2019

Oct. 2, 2019

In ucrt, this struct has a different layout, with only three fields exposed in headers (which can be used by inline functions). This fixes use of some ctype.h functions like e.g. _isdigit_l from applications that use ucrt (both with MSVC and mingw-w64). Signed-off-by: Martin Storsjo <martin(a)martin.st> --- dlls/msvcrt/msvcrt.h | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 552b48aa53..ccb8fec1af 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -163,8 +163,19 @@ typedef struct { } MSVCRT___lc_time_data; typedef struct MSVCRT_threadlocaleinfostruct { +#if _MSVCR_VER >= 140 + // In UCRT, only these three members are visible in user facing headers. + unsigned short *pctype; + int mb_cur_max; + unsigned int lc_codepage; + // Keep the rest of the struct (except for these members) below, that + // msvcrt internal code needs. +#endif + int refcount; +#if _MSVCR_VER < 140 unsigned int lc_codepage; +#endif unsigned int lc_collate_cp; MSVCRT_ulong lc_handle[6]; MSVCRT_LC_ID lc_id[6]; @@ -175,14 +186,18 @@ typedef struct MSVCRT_threadlocaleinfostruct { int *wrefcount; } lc_category[6]; int lc_clike; +#if _MSVCR_VER < 140 int mb_cur_max; +#endif int *lconv_intl_refcount; int *lconv_num_refcount; int *lconv_mon_refcount; struct MSVCRT_lconv *lconv; int *ctype1_refcount; unsigned short *ctype1; +#if _MSVCR_VER < 140 unsigned short *pctype; +#endif unsigned char *pclmap; unsigned char *pcumap; MSVCRT___lc_time_data *lc_time_curr; -- 2.17.1

2 1

[PATCH] ntdll: Only call wine handlers if they're in the same stack.
by Derek Lesho Oct. 2, 2019

Oct. 2, 2019

In Mortal Kombat 11, the game creates its own stack, with an address higher than the default wine stack. Because of this, when we unwind a C++ exception, we assume we are inside a wine frame, and we crash trying to unwind to it. Signed-off-by: Derek Lesho <dlesho(a)codeweavers.com> --- dlls/ntdll/signal_x86_64.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c index 427a4a0e05..8d6f351f4b 100644 --- a/dlls/ntdll/signal_x86_64.c +++ b/dlls/ntdll/signal_x86_64.c @@ -2427,12 +2427,21 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex UNWIND_HISTORY_TABLE table; DISPATCHER_CONTEXT dispatch; CONTEXT context; + MEMORY_BASIC_INFORMATION wine_frame_stack_info, current_stack_info; + int is_teb_frame_in_current_stack = 1; NTSTATUS status; context = *orig_context; dispatch.TargetIp = 0; dispatch.ContextRecord = &context; dispatch.HistoryTable = &table; + + if ( !(NtQueryVirtualMemory(NtCurrentProcess(), teb_frame, MemoryBasicInformation, &wine_frame_stack_info, sizeof(MEMORY_BASIC_INFORMATION), NULL)) && + !(NtQueryVirtualMemory(NtCurrentProcess(), (PVOID)context.Rsp, MemoryBasicInformation, &current_stack_info, sizeof(MEMORY_BASIC_INFORMATION), NULL))) + { + is_teb_frame_in_current_stack = wine_frame_stack_info.AllocationBase == current_stack_info.AllocationBase; + } + for (;;) { status = virtual_unwind( UNW_FLAG_EHANDLER, &dispatch, &context ); @@ -2478,7 +2487,7 @@ static NTSTATUS call_stack_handlers( EXCEPTION_RECORD *rec, CONTEXT *orig_contex } } /* hack: call wine handlers registered in the tib list */ - else while ((ULONG64)teb_frame < context.Rsp) + else if (is_teb_frame_in_current_stack) while ((ULONG64)teb_frame < context.Rsp) { TRACE( "found wine frame %p rsp %lx handler %p\n", teb_frame, context.Rsp, teb_frame->Handler ); -- 2.23.0

1 0

RFC: Limit addresses to 43 bits on 64-bit.
by Derek Lesho Oct. 2, 2019

Oct. 2, 2019

Mortal Kombat 11 allocates memory, with zero_bits set to 0, and applies a 43-bit mask on the pointer. This would have worked in Windows 7, as MSDN says that 43-bits was the maximum pointer size, but the game exhibits this same behavior in wine even when the windows version is set to 8+. This is probably not an issue on Windows, as the allocator may return a much lower address. --- dlls/ntdll/virtual.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c index 181dffe42e..437aef099e 100644 --- a/dlls/ntdll/virtual.c +++ b/dlls/ntdll/virtual.c @@ -132,7 +132,7 @@ static void *address_space_start = (void *)0x110000; /* keep DOS area clear * static const UINT page_shift = 12; static const UINT_PTR page_mask = 0xfff; static void *address_space_limit = (void *)0x7fffffff0000; -static void *user_space_limit = (void *)0x7fffffff0000; +static void *user_space_limit = (void *)0x7ffffff0000; static void *working_set_limit = (void *)0x7fffffff0000; static void *address_space_start = (void *)0x10000; #else @@ -2625,6 +2625,7 @@ void virtual_set_large_address_space(void) { IMAGE_NT_HEADERS *nt = RtlImageNtHeader( NtCurrentTeb()->Peb->ImageBaseAddress ); + if (is_win64) return; if (!(nt->FileHeader.Characteristics & IMAGE_FILE_LARGE_ADDRESS_AWARE)) return; /* no large address space on win9x */ if (NtCurrentTeb()->Peb->OSPlatformId != VER_PLATFORM_WIN32_NT) return; -- 2.23.0

1 0