- Wine-Devel - list.winehq.org

[PATCH] quartz/tests: Relax some timings.
by Zebediah Figura June 13, 2020

June 13, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/tests/videorenderer.c | 2 +- dlls/quartz/tests/vmr9.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/quartz/tests/videorenderer.c b/dlls/quartz/tests/videorenderer.c index d603ea46edd..ab2b4f9e0d4 100644 --- a/dlls/quartz/tests/videorenderer.c +++ b/dlls/quartz/tests/videorenderer.c @@ -1082,7 +1082,7 @@ static void test_sample_time(IBaseFilter *filter, IPin *pin, IMemInputPin *input ok(hr == S_OK, "Got hr %#x.\n", hr); thread = send_frame_time(input, 2, 0x66); /* orange */ - ok(WaitForSingleObject(thread, 800) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 500) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = join_thread(thread); ok(hr == S_OK, "Got hr %#x.\n", hr); diff --git a/dlls/quartz/tests/vmr9.c b/dlls/quartz/tests/vmr9.c index a227a647f65..2641b7a04bb 100644 --- a/dlls/quartz/tests/vmr9.c +++ b/dlls/quartz/tests/vmr9.c @@ -1430,7 +1430,7 @@ static void test_sample_time(IPin *pin, IMemInputPin *input, IMediaControl *cont ok(hr == S_OK, "Got hr %#x.\n", hr); thread = send_frame_time(input, 2, 0x00ff00ff); /* magenta */ - ok(WaitForSingleObject(thread, 800) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); + ok(WaitForSingleObject(thread, 500) == WAIT_TIMEOUT, "Thread should block in Receive().\n"); hr = join_thread(thread); ok(hr == S_OK, "Got hr %#x.\n", hr); -- 2.27.0

2 1

[PATCH v3] winegstreamer: Also wait for EOS events when retrieving duration.
by Zebediah Figura June 13, 2020

June 13, 2020

From: Akihiro Sagawa <sagawa.aki(a)gmail.com> The mpegaudioparse element will not send a duration-changed message if no Xing or VBRI headers are present. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- v3: Make the commit message a bit more accurate. dlls/quartz/tests/mpegsplit.c | 8 ++++---- dlls/quartz/tests/rsrc.rc | 2 +- dlls/quartz/tests/test.mp3 | Bin 2349 -> 2157 bytes dlls/winegstreamer/gstdemux.c | 13 ++++++++++--- 4 files changed, 15 insertions(+), 8 deletions(-) diff --git a/dlls/quartz/tests/mpegsplit.c b/dlls/quartz/tests/mpegsplit.c index 9bfd7e3bb19..e407fe44eeb 100644 --- a/dlls/quartz/tests/mpegsplit.c +++ b/dlls/quartz/tests/mpegsplit.c @@ -523,13 +523,13 @@ static void test_media_types(void) { MPEG1WAVEFORMAT expect_wfx = { - {WAVE_FORMAT_MPEG, 1, 48000, 8000, 192, 0, sizeof(MPEG1WAVEFORMAT) - sizeof(WAVEFORMATEX)}, - ACM_MPEG_LAYER3, 64000, ACM_MPEG_SINGLECHANNEL, 0, 1, ACM_MPEG_PROTECTIONBIT | ACM_MPEG_ID_MPEG1, 0, 0 + {WAVE_FORMAT_MPEG, 1, 48000, 4000, 96, 0, sizeof(MPEG1WAVEFORMAT) - sizeof(WAVEFORMATEX)}, + ACM_MPEG_LAYER3, 32000, ACM_MPEG_SINGLECHANNEL, 4096, 1, ACM_MPEG_ORIGINALHOME | ACM_MPEG_PROTECTIONBIT | ACM_MPEG_ID_MPEG1, 0, 0 }; static const MPEGLAYER3WAVEFORMAT expect_mp3_wfx = { - {WAVE_FORMAT_MPEGLAYER3, 1, 48000, 8000, 1, 0, sizeof(MPEGLAYER3WAVEFORMAT) - sizeof(WAVEFORMATEX)}, - MPEGLAYER3_ID_MPEG, 0, 192, 1, 0 + {WAVE_FORMAT_MPEGLAYER3, 1, 48000, 4000, 1, 0, sizeof(MPEGLAYER3WAVEFORMAT) - sizeof(WAVEFORMATEX)}, + MPEGLAYER3_ID_MPEG, 0, 96, 1, 0 }; const WCHAR *filename = load_resource(L"test.mp3"); diff --git a/dlls/quartz/tests/rsrc.rc b/dlls/quartz/tests/rsrc.rc index 753415cf8de..d28c2bd6edc 100644 --- a/dlls/quartz/tests/rsrc.rc +++ b/dlls/quartz/tests/rsrc.rc @@ -28,7 +28,7 @@ test.avi RCDATA "test.avi" /* @makedep: test.mpg */ test.mpg RCDATA "test.mpg" -/* ffmpeg -f lavfi -i "sine=frequency=500" -t 0.5 -ar 48000 -b:a 32k -f mp3 -acodec mp3 test.mp3 */ +/* ffmpeg -f lavfi -i "sine=frequency=500" -t 0.5 -ar 48000 -b:a 32k -f mp3 -acodec mp3 -write_xing 0 test.mp3 */ /* @makedep: test.mp3 */ test.mp3 RCDATA "test.mp3" diff --git a/dlls/quartz/tests/test.mp3 b/dlls/quartz/tests/test.mp3 index 78d8dd2af62027147a3f169a8306b601ab37c3b6..b35e6b77d1315fa5b742085226ecd0cefbdf4896 100644 GIT binary patch literal 2157 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 OoI!mtOjxMC{oy|-dh)yg literal 2349 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 diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c index e7d8a0b98c6..b9c91245f82 100644 --- a/dlls/winegstreamer/gstdemux.c +++ b/dlls/winegstreamer/gstdemux.c @@ -79,7 +79,7 @@ struct gstdemux_source GstPad *their_src, *post_sink, *post_src, *my_sink; GstElement *flip; AM_MEDIA_TYPE mt; - HANDLE caps_event; + HANDLE caps_event, eos_event; GstSegment *segment; SourceSeeking seek; }; @@ -699,6 +699,8 @@ static gboolean event_sink(GstPad *pad, GstObject *parent, GstEvent *event) case GST_EVENT_EOS: if (pin->pin.pin.peer) IPin_EndOfStream(pin->pin.pin.peer); + else + SetEvent(pin->eos_event); return TRUE; case GST_EVENT_FLUSH_START: if (impl_from_strmbase_filter(pin->pin.pin.filter)->ignore_flush) { @@ -2129,6 +2131,7 @@ static void free_source_pin(struct gstdemux_source *pin) } gst_object_unref(pin->my_sink); CloseHandle(pin->caps_event); + CloseHandle(pin->eos_event); FreeMediaType(&pin->mt); gst_segment_free(pin->segment); @@ -2161,6 +2164,7 @@ static struct gstdemux_source *create_pin(struct gstdemux *filter, const WCHAR * strmbase_source_init(&pin->pin, &filter->filter, name, &source_ops); pin->caps_event = CreateEventW(NULL, FALSE, FALSE, NULL); + pin->eos_event = CreateEventW(NULL, FALSE, FALSE, NULL); pin->segment = gst_segment_new(); gst_segment_init(pin->segment, GST_FORMAT_TIME); pin->IQualityControl_iface.lpVtbl = &GSTOutPin_QualityControl_Vtbl; @@ -2561,7 +2565,8 @@ static BOOL mpeg_splitter_init_gst(struct gstdemux *filter) static const WCHAR source_name[] = {'A','u','d','i','o',0}; struct gstdemux_source *pin; GstElement *element; - HANDLE events[2]; + HANDLE events[3]; + DWORD res; int ret; if (!(element = gst_element_factory_make("mpegaudioparse", NULL))) @@ -2600,7 +2605,9 @@ static BOOL mpeg_splitter_init_gst(struct gstdemux *filter) events[0] = filter->duration_event; events[1] = filter->error_event; - if (WaitForMultipleObjects(2, events, FALSE, INFINITE)) + events[2] = pin->eos_event; + res = WaitForMultipleObjects(3, events, FALSE, INFINITE); + if (res == 1) return FALSE; pin->seek.llDuration = pin->seek.llStop = query_duration(pin->their_src); -- 2.27.0

2 1

[PATCH] include: Add xact3.h
by Vijay Kiran Kamuju June 13, 2020

June 13, 2020

Based on work by Ethan Lee and Alistair Leslie-Hughes Use the header file directly instead of idl file just like other directx headers like dsound.h Implementing idl file involves a lot of hacks. Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH] winhttp/tests: Add Websocket Tests
by Alistair Leslie-Hughes June 13, 2020

June 13, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> --- dlls/winhttp/tests/winhttp.c | 161 +++++++++++++++++++++++++++++++++++ 1 file changed, 161 insertions(+) diff --git a/dlls/winhttp/tests/winhttp.c b/dlls/winhttp/tests/winhttp.c index ab91940ebb..cbcadd7e03 100644 --- a/dlls/winhttp/tests/winhttp.c +++ b/dlls/winhttp/tests/winhttp.c @@ -37,6 +37,8 @@ DEFINE_GUID(GUID_NULL,0,0,0,0,0,0,0,0,0,0,0); +static HINTERNET (WINAPI *pWinHttpWebSocketCompleteUpgrade)(HINTERNET,DWORD_PTR); + static BOOL proxy_active(void) { WINHTTP_PROXY_INFO proxy_info; @@ -2205,6 +2207,13 @@ static const char passportauth[] = "WWW-Authenticate: Passport1.4\r\n" "\r\n"; +static const char switchprotocol[] = +"HTTP/1.1 101 Switching Protocols\r\n" +"Server: winetest\r\n" +"Cache-Control: private\r\n" +"Upgrade: websocket\r\n" +"Connection: Upgrade\r\n"; + static const char unauthorized[] = "Unauthorized"; static const char hello_world[] = "Hello World"; static const char auth_unseen[] = "Auth Unseen"; @@ -2217,6 +2226,47 @@ struct server_info #define BIG_BUFFER_LEN 0x2250 +static char *create_websocket_accept(const char *key) +{ + static char buffer[256]; + static const char serverkey[] = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"; + HCRYPTPROV provider; + BYTE hash_data[20]; + HCRYPTHASH hash; + unsigned int i, length; + static char sha1[41]; + BOOL ret; + + strcpy(buffer, key); + strcat(buffer, serverkey); + + ret = CryptAcquireContextW(&provider, NULL, NULL, PROV_RSA_FULL, CRYPT_VERIFYCONTEXT); + ok(ret, "Failed to acquire crypt context.\n"); + ret = CryptCreateHash(provider, CALG_SHA1, 0, 0, &hash); + ok(ret, "Failed to create hash.\n"); + + ret = CryptHashData(hash, (BYTE *)buffer, strlen(buffer), 0); + ok(ret, "Failed to hash data.\n"); + + i = sizeof(hash_data); + ret = CryptGetHashParam(hash, HP_HASHVAL, hash_data, &i, 0); + ok(ret, "Failed to get hash value.\n"); + ok(i == sizeof(hash_data), "Got unexpected hash size %u.\n", i); + + ret = CryptDestroyHash(hash); + ok(ret, "Failed to destroy hash.\n"); + ret = CryptReleaseContext(provider, 0); + ok(ret, "Failed to release crypt context.\n"); + + length = sizeof(sha1); + if (CryptBinaryToStringA( (BYTE*)hash_data, sizeof(hash_data), CRYPT_STRING_BASE64, sha1, &length)) + { + return sha1; + } + + return NULL; +} + static DWORD CALLBACK server_thread(LPVOID param) { struct server_info *si = param; @@ -2321,6 +2371,31 @@ static DWORD CALLBACK server_thread(LPVOID param) { send(c, multiauth, sizeof multiauth - 1, 0); } + if (strstr(buffer, "GET /switchwebsocket")) + { + char switchbuffer[128]; + char key[64]; + char *p; + char *pos = strstr(buffer, "Sec-WebSocket-Key: "); + if(pos) + { + memcpy(switchbuffer, switchprotocol, sizeof(switchprotocol)); + memcpy(key, pos+19, 24); + key[24] = 0; + + p = create_websocket_accept(key); + + strcat(switchbuffer, "Sec-WebSocket-Accept: "); + strcat(switchbuffer, p); + strcat(switchbuffer, "\r\n\r\n"); + + send(c, switchbuffer, strlen(switchbuffer), 0); + } + else + send(c, notokmsg, sizeof(notokmsg) - 1, 0); + + continue; + } if (strstr(buffer, "GET /largeauth")) { if (strstr(buffer, "Authorization: NTLM")) @@ -3039,6 +3114,88 @@ static void test_head_request(int port) WinHttpCloseHandle(ses); } +static void test_websocket_upgrade(int port) +{ + HINTERNET ses, con, req, websock; + char buf[128]; + DWORD size, len, count, status, index; + BOOL ret; + + if(!pWinHttpWebSocketCompleteUpgrade) + { + win_skip("WinHttpWebSocketCompleteUpgrade not supported.\n"); + return; + } + + ses = WinHttpOpen(L"winetest", WINHTTP_ACCESS_TYPE_NO_PROXY, NULL, NULL, 0); + ok(ses != NULL, "failed to open session %u\n", GetLastError()); + + con = WinHttpConnect(ses, L"localhost", port, 0); + ok(con != NULL, "failed to open a connection %u\n", GetLastError()); + + req = WinHttpOpenRequest(con, L"GET", L"/switchwebsocket", NULL, NULL, NULL, 0); + ok(req != NULL, "failed to open a request %u\n", GetLastError()); + + ret = WinHttpSetOption(req, WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET, NULL, 0); + todo_wine ok(ret, "failed to send request %u\n", GetLastError()); + + index = 0; + buf[0] = 0; + len = sizeof(buf); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, + L"Sec-WebSocket-Key", buf, &len, &index); + ok(GetLastError() == ERROR_WINHTTP_HEADER_NOT_FOUND, "Found Header\n"); + + ret = WinHttpSendRequest(req, WINHTTP_NO_ADDITIONAL_HEADERS, 0, NULL, 0, 0, 0); + ok(ret, "failed to send request %u\n", GetLastError()); + + index = 0; + buf[0] = 0; + len = sizeof(buf); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_CUSTOM | WINHTTP_QUERY_FLAG_REQUEST_HEADERS, + L"Sec-WebSocket-Key", buf, &len, &index); + todo_wine ok(ret, "failed to find header %u\n", GetLastError()); + + ret = WinHttpReceiveResponse(req, NULL); + todo_wine ok(ret, "failed to receive response %u\n", GetLastError()); + + count = 0xdeadbeef; + ret = WinHttpQueryDataAvailable(req, &count); + ok(ret, "failed to query data available %u\n", GetLastError()); + todo_wine ok(!count, "got %u\n", count); + + status = 0xdeadbeef; + size = sizeof(status); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, + NULL, &status, &size, NULL); + ok(ret, "failed to get status code %u\n", GetLastError()); + todo_wine ok(status == HTTP_STATUS_SWITCH_PROTOCOLS, "got %u\n", status); + + len = 0xdeadbeef; + size = sizeof(len); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_CONTENT_LENGTH | WINHTTP_QUERY_FLAG_NUMBER, + NULL, &len, &size, 0); + ok(!ret, "failed to get content-length header %u\n", GetLastError()); + + websock = pWinHttpWebSocketCompleteUpgrade(req, 0); + todo_wine ok(websock != NULL, "failed to upgrade scoket %u\n", GetLastError()); + + index = 0; + buf[0] = 0; + len = sizeof(buf); + ret = WinHttpQueryHeaders(req, WINHTTP_QUERY_CUSTOM, + L"Sec-WebSocket-Accept", buf, &len, &index); + todo_wine ok(ret, "failed to WinHttpQueryHeaders %u\n", GetLastError()); + + WinHttpCloseHandle(req); + + /* Send/Receive on websock */ + + WinHttpCloseHandle(websock); + WinHttpCloseHandle(con); + WinHttpCloseHandle(ses); +} + static void test_not_modified(int port) { BOOL ret; @@ -4710,6 +4867,7 @@ START_TEST (winhttp) struct server_info si; HANDLE thread; DWORD ret; + HMODULE mod = GetModuleHandleA("winhttp.dll"); test_WinHttpOpenRequest(); test_WinHttpSendRequest(); @@ -4744,12 +4902,15 @@ START_TEST (winhttp) return; } + pWinHttpWebSocketCompleteUpgrade = (void*)GetProcAddress(mod, "WinHttpWebSocketCompleteUpgrade"); + test_IWinHttpRequest(si.port); test_connection_info(si.port); test_basic_request(si.port, NULL, L"/basic"); test_no_headers(si.port); test_no_content(si.port); test_head_request(si.port); + test_websocket_upgrade(si.port); test_not_modified(si.port); test_basic_authentication(si.port); test_multi_authentication(si.port); -- 2.26.2

1 0

[PATCH] include: Correct the name of WAVEBANKMINIWAVEFORMAT.
by Vijay Kiran Kamuju June 13, 2020

June 13, 2020

Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

1 0

[PATCH 2/2] uuid: Add directmanipulation.h
by Vijay Kiran Kamuju June 13, 2020

June 13, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH 1/2] directmanipulation: Register the DirectManipulationManager and DirectManipulationSharedManager classes.
by Vijay Kiran Kamuju June 13, 2020

June 13, 2020

Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Vijay Kiran Kamuju <infyquest(a)gmail.com>

2 1

[PATCH v2] winegstreamer: Prevent hanging when loading a short MP3 file.
by Akihiro Sagawa June 13, 2020

June 13, 2020

In v2, fix the test failures in test_media_types(), quartz:mpegcplit. Zebediah, thanks for the review and inspecting quartz:filtergraph test failures. --- If Info tag[1] isn't present in the MP3 file, GStreamer trys to read some more frames from the file to estimate a duration. Then, it sends a duration-changed message to winegstreamer. However, it seems not to send the message if the file is too short to estimate the duration, e.g. 0.5 seconds. Winegstreamer gets stuck in this case. This patch removes Info tag from dlls/quartz/tests/test.mp3 and fixes the above issue by watching pad's EOS events. [1] http://gabriel.mp3-tech.org/mp3infotag.html Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> --- dlls/quartz/tests/mpegsplit.c | 8 ++++---- dlls/quartz/tests/rsrc.rc | 2 +- dlls/quartz/tests/test.mp3 | Bin 2349 -> 2157 bytes dlls/winegstreamer/gstdemux.c | 13 ++++++++++--- 4 files changed, 15 insertions(+), 8 deletions(-)

1 0

[PATCH] include: Correct the name of WAVEBANKMINIWAVEFORMAT.
by Zebediah Figura June 12, 2020

June 12, 2020

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- include/xact3wb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/xact3wb.h b/include/xact3wb.h index c68d7a30fad..81b1518930d 100644 --- a/include/xact3wb.h +++ b/include/xact3wb.h @@ -138,7 +138,7 @@ typedef struct WAVEBANKDATA DWORD dwEntryMetaDataElementSize; DWORD dwEntryNameElementSize; DWORD dwAlignment; - WAVEBANKMINIFORMAT CompactFormat; + WAVEBANKMINIWAVEFORMAT CompactFormat; FILETIME BuildTime; } WAVEBANKDATA, *LPWAVEBANKDATA; typedef const WAVEBANKDATA *LPCWAVEBANKDATA; -- 2.27.0

2 1

[PATCH 1/3] quartz/vmr9: Trace the arguments to IVMRWindowlessControl9::SetVideoPosition().
by Zebediah Figura June 12, 2020

June 12, 2020

From: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/quartz/vmr9.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 4ea3b483a75..776d927f2ab 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -1679,20 +1679,21 @@ static HRESULT WINAPI VMR9WindowlessControl_GetMaxIdealVideoSize(IVMRWindowlessC return E_NOTIMPL; } -static HRESULT WINAPI VMR9WindowlessControl_SetVideoPosition(IVMRWindowlessControl9 *iface, const RECT *source, const RECT *dest) +static HRESULT WINAPI VMR9WindowlessControl_SetVideoPosition(IVMRWindowlessControl9 *iface, + const RECT *src, const RECT *dst) { - struct quartz_vmr *This = impl_from_IVMRWindowlessControl9(iface); + struct quartz_vmr *filter = impl_from_IVMRWindowlessControl9(iface); - TRACE("(%p/%p)->(%p, %p)\n", iface, This, source, dest); + TRACE("filter %p, src %s, dst %s.\n", filter, wine_dbgstr_rect(src), wine_dbgstr_rect(dst)); - EnterCriticalSection(&This->renderer.filter.csFilter); + EnterCriticalSection(&filter->renderer.filter.csFilter); - if (source) - This->window.src = *source; - if (dest) - This->window.dst = *dest; + if (src) + filter->window.src = *src; + if (dst) + filter->window.dst = *dst; - LeaveCriticalSection(&This->renderer.filter.csFilter); + LeaveCriticalSection(&filter->renderer.filter.csFilter); return S_OK; } -- 2.27.0

2 3