October 2019 - Wine-commits

Piotr Caban : kernel32: Add write watch test on OVERLAPPED structure.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: 37d2b5843f6f3d5bb18b7bf9445c7019cf25a56d URL: https://source.winehq.org/git/wine.git/?a=commit;h=37d2b5843f6f3d5bb18b7bf9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Oct 3 20:54:32 2019 +0200 kernel32: Add write watch test on OVERLAPPED structure. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/virtual.c | 63 ++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 62 insertions(+), 1 deletion(-) diff --git a/dlls/kernel32/tests/virtual.c b/dlls/kernel32/tests/virtual.c index bde71b9c64..9a35bfe290 100644 --- a/dlls/kernel32/tests/virtual.c +++ b/dlls/kernel32/tests/virtual.c @@ -1602,7 +1602,7 @@ static void test_write_watch(void) DWORD ret, size, old_prot, num_bytes; MEMORY_BASIC_INFORMATION info; HANDLE readpipe, writepipe, file; - OVERLAPPED overlapped; + OVERLAPPED overlapped, *overlapped2; void *results[64]; ULONG_PTR count; ULONG i, pagesize; @@ -1906,6 +1906,67 @@ static void test_write_watch(void) ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); ok( count == 0, "wrong count %lu\n", count ); + /* OVERLAPPED structure write watch */ + memset( &overlapped, 0, sizeof(overlapped) ); + overlapped.hEvent = CreateEventA( NULL, TRUE, FALSE, NULL ); + + readpipe = CreateNamedPipeA( pipename, FILE_FLAG_OVERLAPPED | PIPE_ACCESS_INBOUND, + PIPE_TYPE_MESSAGE | PIPE_WAIT, 1, 1024, 1024, + NMPWAIT_USE_DEFAULT_WAIT, NULL ); + ok( readpipe != INVALID_HANDLE_VALUE, "CreateNamedPipeA failed %u\n", GetLastError() ); + + success = ConnectNamedPipe( readpipe, &overlapped ); + ok( !success, "ConnectNamedPipe unexpectedly succeeded\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %u\n", GetLastError() ); + + writepipe = CreateFileA( pipename, GENERIC_WRITE, 0, NULL, OPEN_EXISTING, 0, NULL ); + ok( writepipe != INVALID_HANDLE_VALUE, "CreateFileA failed %u\n", GetLastError() ); + + ret = WaitForSingleObject( overlapped.hEvent, 1000 ); + ok( ret == WAIT_OBJECT_0, "expected WAIT_OBJECT_0, got %u\n", ret ); + + memset( base, 0, size ); + overlapped2 = (OVERLAPPED*)(base + size - sizeof(*overlapped2)); + overlapped2->hEvent = CreateEventA( NULL, TRUE, FALSE, NULL ); + + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 16, "wrong count %lu\n", count ); + + success = ReadFile( readpipe, base, sizeof(testdata), NULL, overlapped2 ); + ok( !success, "ReadFile unexpectedly succeeded\n" ); + ok( GetLastError() == ERROR_IO_PENDING, "expected ERROR_IO_PENDING, got %u\n", GetLastError() ); + overlapped2->Internal = 0xdeadbeef; + + count = 64; + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 2, "wrong count %lu\n", count ); + + num_bytes = 0; + success = WriteFile( writepipe, testdata, sizeof(testdata), &num_bytes, NULL ); + ok( success, "WriteFile failed %u\n", GetLastError() ); + ok( num_bytes == sizeof(testdata), "wrong number of bytes written %u\n", num_bytes ); + + num_bytes = 0; + success = GetOverlappedResult( readpipe, overlapped2, &num_bytes, TRUE ); + ok( success, "GetOverlappedResult failed %u\n", GetLastError() ); + ok( num_bytes == sizeof(testdata), "wrong number of bytes read %u\n", num_bytes ); + ok( !memcmp( base, testdata, sizeof(testdata)), "didn't receive expected data\n" ); + + count = 64; + memset( results, 0, sizeof(results) ); + ret = pGetWriteWatch( WRITE_WATCH_FLAG_RESET, base, size, results, &count, &pagesize ); + ok( !ret, "GetWriteWatch failed %u\n", GetLastError() ); + ok( count == 2, "wrong count %lu\n", count ); + ok( results[0] == base, "wrong result %p\n", results[0] ); + + CloseHandle( readpipe ); + CloseHandle( writepipe ); + CloseHandle( overlapped.hEvent ); + CloseHandle( overlapped2->hEvent ); + /* some invalid parameter tests */ SetLastError( 0xdeadbeef );

1 0

Alistair Leslie-Hughes : dmime/tests: Add a notification_type test.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: 15bf3eee2cf05ce98011458fc5e715f4524c4ebd URL: https://source.winehq.org/git/wine.git/?a=commit;h=15bf3eee2cf05ce98011458f… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Oct 3 08:42:42 2019 +0000 dmime/tests: Add a notification_type test. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmime/tests/performance.c | 117 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 117 insertions(+) diff --git a/dlls/dmime/tests/performance.c b/dlls/dmime/tests/performance.c index c2ca4cdf28..4433846f9b 100644 --- a/dlls/dmime/tests/performance.c +++ b/dlls/dmime/tests/performance.c @@ -366,6 +366,122 @@ 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 || + msg->dwNotificationOption == DMUS_NOTIFICATION_SEGALMOSTEND) { + 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 +500,7 @@ START_TEST( performance ) test_COM(); test_createport(); + test_notification_type(); CoUninitialize(); }

1 0

Zebediah Figura : quartz/filtergraph: Create filters on a separate thread if requested.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: 5994c8cc85022b4e9ad8eba0b1e64377e148a76a URL: https://source.winehq.org/git/wine.git/?a=commit;h=5994c8cc85022b4e9ad8eba0… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 2 22:01:06 2019 -0500 quartz/filtergraph: Create filters on a separate thread if requested. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- 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 f947327aaa..4dd3075463 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 36ec59c4e0..9540fa9293 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 353d1e5a57..1213aea352 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 6c357041f2..f93f355b60 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; }

1 0

Zebediah Figura : strmbase: Send WM_CLOSE instead of calling DestroyWindow() directly.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: 428c5b28e32a00d2a2662c21304d1ab09d23fcd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=428c5b28e32a00d2a2662c21… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 2 22:01:07 2019 -0500 strmbase: Send WM_CLOSE instead of calling DestroyWindow() directly. We are not guaranteed to destroy the filter on the same thread it was created on. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/window.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/strmbase/window.c b/dlls/strmbase/window.c index bf7a7a3c27..b7c0bae47b 100644 --- a/dlls/strmbase/window.c +++ b/dlls/strmbase/window.c @@ -141,7 +141,7 @@ HRESULT WINAPI BaseWindowImpl_DoneWithWindow(BaseWindow *This) ReleaseDC(This->hWnd, This->hDC); This->hDC = NULL; - DestroyWindow(This->hWnd); + SendMessageW(This->hWnd, WM_CLOSE, 0, 0); This->hWnd = NULL; return S_OK;

1 0

Zebediah Figura : quartz/videorenderer: Create the window on the same thread as the filter.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: 3b5198c8283d891095612c1001edb5e5788d6059 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3b5198c8283d891095612c10… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 2 22:01:08 2019 -0500 quartz/videorenderer: Create the window on the same thread as the filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 2 +- dlls/quartz/videorenderer.c | 47 +---------------------------------------- 2 files changed, 2 insertions(+), 47 deletions(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index f93f355b60..b6e9f3ab0f 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -4095,7 +4095,7 @@ static void test_window_threading(void) if ((hwnd = get_renderer_hwnd(graph))) { tid = GetWindowThreadProcessId(hwnd, NULL); - todo_wine ok(tid == GetCurrentThreadId(), "Window should be created on main thread.\n"); + ok(tid == GetCurrentThreadId(), "Window should be created on main thread.\n"); } else skip("Could not find renderer window.\n"); diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 429b59bfe3..87ff9f59bf 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -45,11 +45,8 @@ typedef struct VideoRendererImpl IOverlay IOverlay_iface; BOOL init; - HANDLE hThread; - DWORD ThreadID; HANDLE hEvent; - BOOL ThreadResult; RECT SourceRect; RECT DestRect; RECT WindowPos; @@ -83,54 +80,15 @@ static inline VideoRendererImpl *impl_from_BaseControlVideo(BaseControlVideo *if return CONTAINING_RECORD(iface, VideoRendererImpl, baseControlVideo); } -static DWORD WINAPI MessageLoop(LPVOID lpParameter) -{ - VideoRendererImpl* This = lpParameter; - MSG msg; - BOOL fGotMessage; - - TRACE("Starting message loop\n"); - - if (FAILED(BaseWindowImpl_PrepareWindow(&This->baseControlWindow.baseWindow))) - { - This->ThreadResult = FALSE; - SetEvent(This->hEvent); - return 0; - } - - This->ThreadResult = TRUE; - SetEvent(This->hEvent); - - while ((fGotMessage = GetMessageW(&msg, NULL, 0, 0)) != 0 && fGotMessage != -1) - { - TranslateMessage(&msg); - DispatchMessageW(&msg); - } - - TRACE("End of message loop\n"); - - return msg.wParam; -} - static BOOL CreateRenderingSubsystem(VideoRendererImpl* This) { This->hEvent = CreateEventW(NULL, TRUE, FALSE, NULL); if (!This->hEvent) return FALSE; - This->hThread = CreateThread(NULL, 0, MessageLoop, This, 0, &This->ThreadID); - if (!This->hThread) - { - CloseHandle(This->hEvent); - return FALSE; - } - - WaitForSingleObject(This->hEvent, INFINITE); - - if (!This->ThreadResult) + if (FAILED(BaseWindowImpl_PrepareWindow(&This->baseControlWindow.baseWindow))) { CloseHandle(This->hEvent); - CloseHandle(This->hThread); return FALSE; } @@ -379,9 +337,6 @@ static void video_renderer_destroy(BaseRenderer *iface) BaseControlWindow_Destroy(&filter->baseControlWindow); BaseControlVideo_Destroy(&filter->baseControlVideo); - PostThreadMessageW(filter->ThreadID, WM_QUIT, 0, 0); - WaitForSingleObject(filter->hThread, INFINITE); - CloseHandle(filter->hThread); CloseHandle(filter->hEvent); strmbase_renderer_cleanup(&filter->renderer);

1 0

Zebediah Figura : quartz/vmr9: Create the window on the same thread as the filter.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: ff5644174e7e6e82e4f7575a95cf09e11bc52abd URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff5644174e7e6e82e4f7575a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 2 22:01:09 2019 -0500 quartz/vmr9: Create the window on the same thread as the filter. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/vmr9.c | 44 +------------------------------------------- 1 file changed, 1 insertion(+), 43 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 2c9c825b50..cc7ef69810 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -153,10 +153,6 @@ typedef struct LONG refCount; - HANDLE ack; - DWORD tid; - HANDLE hWndThread; - IDirect3DDevice9 *d3d9_dev; IDirect3D9 *d3d9_ptr; IDirect3DSurface9 **d3d9_surfaces; @@ -2238,7 +2234,6 @@ static ULONG WINAPI VMR9_ImagePresenter_Release(IVMRImagePresenter9 *iface) { DWORD i; TRACE("Destroying\n"); - CloseHandle(This->ack); IDirect3D9_Release(This->d3d9_ptr); TRACE("Number of surfaces: %u\n", This->num_surfaces); @@ -2476,32 +2471,6 @@ static HRESULT VMR9_SurfaceAllocator_SetAllocationSettings(VMR9DefaultAllocatorP return hr; } -static DWORD WINAPI MessageLoop(LPVOID lpParameter) -{ - MSG msg; - BOOL fGotMessage; - VMR9DefaultAllocatorPresenterImpl *This = lpParameter; - - TRACE("Starting message loop\n"); - - if (FAILED(BaseWindowImpl_PrepareWindow(&This->pVMR9->baseControlWindow.baseWindow))) - { - FIXME("Failed to prepare window\n"); - return FALSE; - } - - SetEvent(This->ack); - while ((fGotMessage = GetMessageW(&msg, NULL, 0, 0)) != 0 && fGotMessage != -1) - { - TranslateMessage(&msg); - DispatchMessageW(&msg); - } - - TRACE("End of message loop\n"); - - return 0; -} - static UINT d3d9_adapter_from_hwnd(IDirect3D9 *d3d9, HWND hwnd, HMONITOR *mon_out) { UINT d3d9_adapter; @@ -2533,14 +2502,9 @@ static BOOL CreateRenderingWindow(VMR9DefaultAllocatorPresenterImpl *This, VMR9A TRACE("(%p)->()\n", This); - This->hWndThread = CreateThread(NULL, 0, MessageLoop, This, 0, &This->tid); - if (!This->hWndThread) + if (FAILED(BaseWindowImpl_PrepareWindow(&This->pVMR9->baseControlWindow.baseWindow))) return FALSE; - WaitForSingleObject(This->ack, INFINITE); - - if (!This->pVMR9->baseControlWindow.baseWindow.hWnd) return FALSE; - /* Obtain a monitor and d3d9 device */ d3d9_adapter = d3d9_adapter_from_hwnd(This->d3d9_ptr, This->pVMR9->baseControlWindow.baseWindow.hWnd, &This->hMon); @@ -2617,10 +2581,6 @@ static HRESULT WINAPI VMR9_SurfaceAllocator_TerminateDevice(IVMRSurfaceAllocator return S_OK; } - SendMessageW(This->pVMR9->baseControlWindow.baseWindow.hWnd, WM_CLOSE, 0, 0); - PostThreadMessageW(This->tid, WM_QUIT, 0, 0); - WaitForSingleObject(This->hWndThread, INFINITE); - This->hWndThread = NULL; BaseWindowImpl_DoneWithWindow(&This->pVMR9->baseControlWindow.baseWindow); return S_OK; @@ -2839,8 +2799,6 @@ static HRESULT VMR9DefaultAllocatorPresenterImpl_create(struct quartz_vmr *paren This->hMon = 0; This->d3d9_vertex = NULL; This->num_surfaces = 0; - This->hWndThread = NULL; - This->ack = CreateEventW(NULL, 0, 0, NULL); This->SurfaceAllocatorNotify = NULL; This->reset = FALSE;

1 0

Vijay Kiran Kamuju : msvcrt: Implement %C format for strftime.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: 37624027797c1d4c858e44a7fc55bcd6feea8c00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=37624027797c1d4c858e44a7… Author: Vijay Kiran Kamuju <infyquest(a)gmail.com> Date: Wed Oct 2 22:11:38 2019 +0200 msvcrt: Implement %C format for strftime. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/tests/time.c | 5 +++++ dlls/msvcrt/time.c | 7 +++++++ dlls/ucrtbase/tests/misc.c | 4 ++++ 3 files changed, 16 insertions(+) diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c index 016c9775de..86799c900f 100644 --- a/dlls/msvcrt/tests/time.c +++ b/dlls/msvcrt/tests/time.c @@ -608,6 +608,11 @@ static void test_strftime(void) gmt_tm = p_gmtime(&gmt); ok(gmt_tm != NULL, "gmtime failed\n"); + errno = 0xdeadbeef; + retA = p_strftime(bufA, 256, "%C", gmt_tm); + ok(retA == 0, "expected 0, got %ld\n", retA); + ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno); + errno = 0xdeadbeef; retA = p_strftime(bufA, 256, "%D", gmt_tm); ok(retA == 0, "expected 0, got %ld\n", retA); diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c index 450663fd1f..b9fcde7978 100644 --- a/dlls/msvcrt/time.c +++ b/dlls/msvcrt/time.c @@ -1153,6 +1153,13 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f if(!strftime_str(str, &ret, max, time_data->str.names.mon[mstm->tm_mon])) return 0; break; +#if _MSVCR_VER>=140 + case 'C': + tmp = (1900+mstm->tm_year)/100; + if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 2, 0, 99)) + return 0; + break; +#endif case 'd': if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 0, 31)) return 0; diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index c58b631565..1ba4280a54 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -895,6 +895,10 @@ static void test_strftime(void) char bufA[256]; size_t retA; + retA = p_strftime(bufA, sizeof(bufA), "%C", &epoch); + ok(retA == 2, "expected 2, got %d\n", (int)retA); + ok(!strcmp(bufA, "19"), "got %s\n", bufA); + retA = p_strftime(bufA, sizeof(bufA), "%D", &epoch); ok(retA == 8, "expected 8, got %d\n", (int)retA); ok(!strcmp(bufA, "01/01/70"), "got %s\n", bufA);

1 0

Martin Storsjo : msvcrt: Fix the layout of threadlocaleinfostruct for ucrt.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: 56e6ce93b8b4c35ee4bef0b6be75c05ebf6d7763 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56e6ce93b8b4c35ee4bef0b6… Author: Martin Storsjo <martin(a)martin.st> Date: Wed Oct 2 23:12:32 2019 +0300 msvcrt: Fix the layout of threadlocaleinfostruct for ucrt. 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> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcrt/msvcrt.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 552b48aa53..6e0e338a20 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -163,8 +163,16 @@ typedef struct { } MSVCRT___lc_time_data; typedef struct MSVCRT_threadlocaleinfostruct { +#if _MSVCR_VER >= 140 + unsigned short *pctype; + int mb_cur_max; + unsigned int lc_codepage; +#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 +183,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;

1 0

Nikolay Sivov : mf: Subscribe to media stream events for current presentation.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: 41853aee79fcd71e7912c5cba9805cac55181aad URL: https://source.winehq.org/git/wine.git/?a=commit;h=41853aee79fcd71e7912c5cb… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 3 11:28:15 2019 +0300 mf: Subscribe to media stream events for current presentation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/session.c | 195 ++++++++++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 168 insertions(+), 27 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=41853aee79fcd71e7912…

1 0

Nikolay Sivov : mfplat: Unify event method traces format.
by Alexandre Julliard 03 Oct '19

03 Oct '19

Module: wine Branch: master Commit: 5ebf0b0b78ea4b47b8e4eb10beb035cd513d18ee URL: https://source.winehq.org/git/wine.git/?a=commit;h=5ebf0b0b78ea4b47b8e4eb10… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 3 11:28:16 2019 +0300 mfplat: Unify event method traces format. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 64 ++++++++++++++++++++++++++++-------------------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 30810daa44..6be9a194d4 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -5585,7 +5585,7 @@ HRESULT WINAPI MFCreateSourceResolver(IMFSourceResolver **resolver) return S_OK; } -typedef struct media_event +struct media_event { struct attributes attributes; IMFMediaEvent IMFMediaEvent_iface; @@ -5594,28 +5594,28 @@ typedef struct media_event GUID extended_type; HRESULT status; PROPVARIANT value; -} mfmediaevent; +}; -static inline mfmediaevent *impl_from_IMFMediaEvent(IMFMediaEvent *iface) +static inline struct media_event *impl_from_IMFMediaEvent(IMFMediaEvent *iface) { - return CONTAINING_RECORD(iface, mfmediaevent, IMFMediaEvent_iface); + return CONTAINING_RECORD(iface, struct media_event, IMFMediaEvent_iface); } static HRESULT WINAPI mfmediaevent_QueryInterface(IMFMediaEvent *iface, REFIID riid, void **out) { - mfmediaevent *This = impl_from_IMFMediaEvent(iface); + struct media_event *event = impl_from_IMFMediaEvent(iface); - TRACE("(%p)->(%s %p)\n", This, debugstr_guid(riid), out); + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), out); if(IsEqualGUID(riid, &IID_IUnknown) || IsEqualGUID(riid, &IID_IMFAttributes) || IsEqualGUID(riid, &IID_IMFMediaEvent)) { - *out = &This->IMFMediaEvent_iface; + *out = &event->IMFMediaEvent_iface; } else { - FIXME("(%s, %p)\n", debugstr_guid(riid), out); + FIXME("%s, %p.\n", debugstr_guid(riid), out); *out = NULL; return E_NOINTERFACE; } @@ -5626,29 +5626,29 @@ static HRESULT WINAPI mfmediaevent_QueryInterface(IMFMediaEvent *iface, REFIID r static ULONG WINAPI mfmediaevent_AddRef(IMFMediaEvent *iface) { - mfmediaevent *This = impl_from_IMFMediaEvent(iface); - ULONG ref = InterlockedIncrement(&This->attributes.ref); + struct media_event *event = impl_from_IMFMediaEvent(iface); + ULONG refcount = InterlockedIncrement(&event->attributes.ref); - TRACE("(%p) ref=%u\n", This, ref); + TRACE("%p, refcount %u.\n", iface, refcount); - return ref; + return refcount; } static ULONG WINAPI mfmediaevent_Release(IMFMediaEvent *iface) { struct media_event *event = impl_from_IMFMediaEvent(iface); - ULONG ref = InterlockedDecrement(&event->attributes.ref); + ULONG refcount = InterlockedDecrement(&event->attributes.ref); - TRACE("(%p) ref=%u\n", iface, ref); + TRACE("%p, refcount %u.\n", iface, refcount); - if (!ref) + if (!refcount) { clear_attributes_object(&event->attributes); PropVariantClear(&event->value); heap_free(event); } - return ref; + return refcount; } static HRESULT WINAPI mfmediaevent_GetItem(IMFMediaEvent *iface, REFGUID key, PROPVARIANT *value) @@ -5927,42 +5927,44 @@ static HRESULT WINAPI mfmediaevent_CopyAllItems(IMFMediaEvent *iface, IMFAttribu static HRESULT WINAPI mfmediaevent_GetType(IMFMediaEvent *iface, MediaEventType *type) { - mfmediaevent *This = impl_from_IMFMediaEvent(iface); + struct media_event *event = impl_from_IMFMediaEvent(iface); - TRACE("%p, %p\n", This, type); + TRACE("%p, %p.\n", iface, type); - *type = This->type; + *type = event->type; return S_OK; } static HRESULT WINAPI mfmediaevent_GetExtendedType(IMFMediaEvent *iface, GUID *extended_type) { - mfmediaevent *This = impl_from_IMFMediaEvent(iface); + struct media_event *event = impl_from_IMFMediaEvent(iface); - TRACE("%p, %p\n", This, extended_type); + TRACE("%p, %p.\n", iface, extended_type); - *extended_type = This->extended_type; + *extended_type = event->extended_type; return S_OK; } static HRESULT WINAPI mfmediaevent_GetStatus(IMFMediaEvent *iface, HRESULT *status) { - mfmediaevent *This = impl_from_IMFMediaEvent(iface); + struct media_event *event = impl_from_IMFMediaEvent(iface); - TRACE("%p, %p\n", This, status); + TRACE("%p, %p.\n", iface, status); - *status = This->status; + *status = event->status; return S_OK; } static HRESULT WINAPI mfmediaevent_GetValue(IMFMediaEvent *iface, PROPVARIANT *value) { - mfmediaevent *This = impl_from_IMFMediaEvent(iface); + struct media_event *event = impl_from_IMFMediaEvent(iface); + + TRACE("%p, %p.\n", iface, value); - PropVariantCopy(value, &This->value); + PropVariantCopy(value, &event->value); return S_OK; } @@ -6014,14 +6016,14 @@ static const IMFMediaEventVtbl mfmediaevent_vtbl = HRESULT WINAPI MFCreateMediaEvent(MediaEventType type, REFGUID extended_type, HRESULT status, const PROPVARIANT *value, IMFMediaEvent **event) { - mfmediaevent *object; + struct media_event *object; HRESULT hr; - TRACE("%s, %s, %08x, %s, %p\n", debugstr_eventid(type), debugstr_guid(extended_type), status, + TRACE("%s, %s, %#x, %s, %p.\n", debugstr_eventid(type), debugstr_guid(extended_type), status, debugstr_propvar(value), event); - object = HeapAlloc( GetProcessHeap(), 0, sizeof(*object) ); - if(!object) + object = heap_alloc(sizeof(*object)); + if (!object) return E_OUTOFMEMORY; if (FAILED(hr = init_attributes_object(&object->attributes, 0)))

1 0