July 2020 - Wine-commits - list.winehq.org

Zebediah Figura : ntdll/tests: Remove some unnecessary checks in test_query_logicalprocex().
by Alexandre Julliard 20 Jul '20

20 Jul '20

Module: wine Branch: master Commit: 17785690c047d507d8031aced658b716969e8668 URL: https://source.winehq.org/git/wine.git/?a=commit;h=17785690c047d507d8031ace… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 17 19:12:33 2020 -0500 ntdll/tests: Remove some unnecessary checks in test_query_logicalprocex(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 277 ++++++++++++++++++++++-------------------------- 1 file changed, 124 insertions(+), 153 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=17785690c047d507d803…

1 0

Zebediah Figura : ntdll/tests: Make info.c less verbose by default.
by Alexandre Julliard 20 Jul '20

20 Jul '20

Module: wine Branch: master Commit: ff9ce43c0127bd23d5aaf9cb6bbb28fcbe729fac URL: https://source.winehq.org/git/wine.git/?a=commit;h=ff9ce43c0127bd23d5aaf9cb… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 17 19:12:34 2020 -0500 ntdll/tests: Make info.c less verbose by default. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/tests/info.c | 230 +++++++++++------------------------------------- 1 file changed, 53 insertions(+), 177 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ff9ce43c0127bd23d5aa…

1 0

Alexandre Julliard : Wine release 5.13
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: website Branch: master Commit: 14bb02500b09e78e51359f2be65edf058d41458c URL: https://source.winehq.org/git/website.git/?a=commit;h=14bb02500b09e78e51359… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Jul 17 23:31:02 2020 +0200 Wine release 5.13 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020071701.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2020071701.xml b/news/en/2020071701.xml new file mode 100644 index 00000000..5cacdd6d --- /dev/null +++ b/news/en/2020071701.xml @@ -0,0 +1,16 @@ +<news> +<date>July 17, 2020</date> +<title>Wine 5.13 Released</title> +<body> + The Wine development release 5.13 is now available. + <a href="{$root}/announce/5.13">What's new</a> in this release: +<ul> + <li>Re-mapping of INI files to the registry.</li> + <li>System call thunks in NTDLL.</li> + <li>Reimplementation of floating point numbers printing.</li> + <li>Beginnings of a restructuration of the console support.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.13.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Jacek Caban : ntdll: Always use GNU _CI* functions implementation on clang.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 180f7cf412c486a4f2f769b44c0ccf1223226ee3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=180f7cf412c486a4f2f769b4… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri Jul 17 16:10:50 2020 +0200 ntdll: Always use GNU _CI* functions implementation on clang. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/misc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c index 6960b52dcb..4b7bb2296d 100644 --- a/dlls/ntdll/misc.c +++ b/dlls/ntdll/misc.c @@ -158,7 +158,7 @@ double CDECL tan( double d ) return unix_funcs->tan( d ); } -#if defined(__GNUC__) && defined(__i386__) +#if (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) #define FPU_DOUBLE(var) double var; \ __asm__ __volatile__( "fstpl %0;fwait" : "=m" (var) : ) @@ -220,7 +220,7 @@ LONGLONG CDECL _ftol(void) return (LONGLONG)x; } -#endif /* defined(__GNUC__) && defined(__i386__) */ +#endif /* (defined(__GNUC__) || defined(__clang__)) && defined(__i386__) */ static void NTDLL_mergesort( void *arr, void *barr, size_t elemsize, int(__cdecl *compar)(const void *, const void *),

1 0

Piotr Caban : comctl32: Compute border size from client and window rectangles.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 659b0d7017cc899a4858cc5d3bd3c63befdc180d URL: https://source.winehq.org/git/wine.git/?a=commit;h=659b0d7017cc899a4858cc5d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 17 16:17:24 2020 +0200 comctl32: Compute border size from client and window rectangles. Fixes toolbar size when WS_EX_DLGMODALFRAME is used. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 26 ++++++++++++++++++++++---- dlls/comctl32/toolbar.c | 22 ++++++++++++---------- 2 files changed, 34 insertions(+), 14 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index 3688394d71..f973d9cfff 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -434,18 +434,23 @@ static void basic_test(void) DestroyWindow(hToolbar); } -static void rebuild_toolbar(HWND *hToolbar) +static void rebuild_toolbar_ex(HWND *hToolbar, DWORD exstyle) { if (*hToolbar) DestroyWindow(*hToolbar); - *hToolbar = CreateWindowExA(0, TOOLBARCLASSNAMEA, NULL, WS_CHILD | WS_VISIBLE, 0, 0, 0, 0, - hMainWnd, (HMENU)5, GetModuleHandleA(NULL), NULL); + *hToolbar = CreateWindowExA(exstyle, TOOLBARCLASSNAMEA, NULL, WS_CHILD | WS_VISIBLE, + 0, 0, 0, 0, hMainWnd, (HMENU)5, GetModuleHandleA(NULL), NULL); ok(*hToolbar != NULL, "Toolbar creation problem\n"); ok(SendMessageA(*hToolbar, TB_BUTTONSTRUCTSIZE, sizeof(TBBUTTON), 0) == 0, "TB_BUTTONSTRUCTSIZE failed\n"); ok(SendMessageA(*hToolbar, TB_AUTOSIZE, 0, 0) == 0, "TB_AUTOSIZE failed\n"); ok(SendMessageA(*hToolbar, WM_SETFONT, (WPARAM)GetStockObject(SYSTEM_FONT), 0)==1, "WM_SETFONT\n"); } +static void rebuild_toolbar(HWND *hToolbar) +{ + rebuild_toolbar_ex(hToolbar, 0); +} + static void rebuild_toolbar_with_buttons(HWND *hToolbar) { TBBUTTON buttons[5]; @@ -1022,7 +1027,7 @@ static void tbsize_addbutton(tbsize_result_t *tbsr, int left, int top, int right static tbsize_result_t *tbsize_results; -#define tbsize_results_num 28 +#define tbsize_results_num 29 static void init_tbsize_results(void) { int fontheight = system_font_height(); @@ -1277,6 +1282,9 @@ static void init_tbsize_results(void) { tbsize_results[27] = init_tbsize_result(1, 0, 0, 672, 42, 67, 40); tbsize_addbutton(&tbsize_results[27], 0, 2, 40, 24); + + tbsize_results[28] = init_tbsize_result(1, 0, 0, 672, 42, 67, 40); + tbsize_addbutton(&tbsize_results[28], 0, 2, 23, 24); } static void free_tbsize_results(void) { @@ -1360,6 +1368,7 @@ static void test_sizes(void) int style; int i; int fontheight = system_font_height(); + RECT rect; init_tbsize_results(); @@ -1631,6 +1640,15 @@ static void test_sizes(void) SendMessageA(hToolbar, TB_AUTOSIZE, 0, 0 ); check_sizes(); + /* Toolbar with borders around client area */ + rebuild_toolbar_ex(&hToolbar, WS_EX_DLGMODALFRAME); + SetWindowLongA(hToolbar, GWL_STYLE, CCS_NODIVIDER | GetWindowLongA(hToolbar, GWL_STYLE)); + SendMessageA(hToolbar, TB_ADDBUTTONSA, 1, (LPARAM)buttons1); + check_sizes(); + GetClientRect(hToolbar, &rect); + ok(rect.top == 0, "rect.top = %d\n", rect.top); + ok(rect.bottom == 26, "rect.bottom = %d\n", rect.bottom); + free_tbsize_results(); DestroyWindow(hToolbar); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index b869cc4d7b..b2711a3eb8 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3069,7 +3069,7 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) if (!(infoPtr->dwStyle & CCS_NORESIZE)) { - RECT window_rect, parent_rect; + RECT window_rect, client_rect, parent_rect, border; UINT uPosFlags = SWP_NOZORDER | SWP_NOACTIVATE; HWND parent; INT x, y, cx, cy; @@ -3079,6 +3079,13 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) if (!parent || !infoPtr->bDoRedraw) return 0; + GetWindowRect(infoPtr->hwndSelf, &window_rect); + GetClientRect(infoPtr->hwndSelf, &client_rect); + border = window_rect; + MapWindowPoints(0, infoPtr->hwndSelf, (POINT *)&border, 2); + border.right -= border.left + client_rect.right - client_rect.left; + border.bottom -= border.top + client_rect.bottom - client_rect.top; + GetClientRect(parent, &parent_rect); x = parent_rect.left; @@ -3089,15 +3096,11 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) if ((infoPtr->dwStyle & CCS_BOTTOM) == CCS_NOMOVEY) { - GetWindowRect(infoPtr->hwndSelf, &window_rect); MapWindowPoints( 0, parent, (POINT *)&window_rect, 2 ); y = window_rect.top; } if ((infoPtr->dwStyle & CCS_BOTTOM) == CCS_BOTTOM) - { - GetWindowRect(infoPtr->hwndSelf, &window_rect); y = parent_rect.bottom - ( window_rect.bottom - window_rect.top); - } if (infoPtr->dwStyle & CCS_NOPARENTALIGN) uPosFlags |= SWP_NOMOVE; @@ -3105,11 +3108,10 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) if (!(infoPtr->dwStyle & CCS_NODIVIDER)) cy += GetSystemMetrics(SM_CYEDGE); - if (infoPtr->dwStyle & WS_BORDER) - { - cx += 2 * GetSystemMetrics(SM_CXBORDER); - cy += 2 * GetSystemMetrics(SM_CYBORDER); - } + x += border.left; + y += border.top; + cx += border.right; + cy += border.bottom; SetWindowPos(infoPtr->hwndSelf, NULL, x, y, cx, cy, uPosFlags); }

1 0

Piotr Caban : comctl32: Offset client area when toolbar divider is present.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 378548581d8799e7f9453f93ed4a7d6faa0377a7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=378548581d8799e7f9453f93… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri Jul 17 16:17:29 2020 +0200 comctl32: Offset client area when toolbar divider is present. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/toolbar.c | 5 +++++ dlls/comctl32/toolbar.c | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dlls/comctl32/tests/toolbar.c b/dlls/comctl32/tests/toolbar.c index f973d9cfff..b1ac1cd8bf 100644 --- a/dlls/comctl32/tests/toolbar.c +++ b/dlls/comctl32/tests/toolbar.c @@ -1649,6 +1649,11 @@ static void test_sizes(void) ok(rect.top == 0, "rect.top = %d\n", rect.top); ok(rect.bottom == 26, "rect.bottom = %d\n", rect.bottom); + rebuild_toolbar_ex(&hToolbar, WS_EX_DLGMODALFRAME); + GetClientRect(hToolbar, &rect); + ok(rect.top == 0, "rect.top = %d\n", rect.top); + ok(rect.bottom == 26, "rect.bottom = %d\n", rect.bottom); + free_tbsize_results(); DestroyWindow(hToolbar); } diff --git a/dlls/comctl32/toolbar.c b/dlls/comctl32/toolbar.c index b2711a3eb8..c9ea56c078 100644 --- a/dlls/comctl32/toolbar.c +++ b/dlls/comctl32/toolbar.c @@ -3104,9 +3104,9 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr) if (infoPtr->dwStyle & CCS_NOPARENTALIGN) uPosFlags |= SWP_NOMOVE; - - if (!(infoPtr->dwStyle & CCS_NODIVIDER)) - cy += GetSystemMetrics(SM_CYEDGE); + + if (!(infoPtr->dwStyle & CCS_NOMOVEY) && !(infoPtr->dwStyle & CCS_NODIVIDER)) + y += GetSystemMetrics(SM_CYEDGE); x += border.left; y += border.top;

1 0

Gijs Vermeulen : qdvd: Add a stub dvd navigator filter.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 36d5ec90572ec4691ade99b97600a1ab54b3c9b7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=36d5ec90572ec4691ade99b9… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Jul 17 21:50:19 2020 +0200 qdvd: Add a stub dvd navigator filter. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qdvd/Makefile.in | 3 +- dlls/qdvd/navigator.c | 67 ++++++++++++++++ dlls/qdvd/qdvd_classes.idl | 7 ++ dlls/qdvd/qdvd_main.c | 3 + dlls/qdvd/qdvd_private.h | 1 + dlls/qdvd/tests/Makefile.in | 3 +- dlls/qdvd/tests/navigator.c | 191 ++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 273 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=36d5ec90572ec4691ade…

1 0

Gijs Vermeulen : qdvd: Add a stub IDvdControl2 interface.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: b9261c0f7822edc9d4284a35a518eb4811cb3b2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9261c0f7822edc9d4284a35… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Fri Jul 17 21:50:20 2020 +0200 qdvd: Add a stub IDvdControl2 interface. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qdvd/navigator.c | 453 ++++++++++++++++++++++++++++++++++++++++++++ dlls/qdvd/tests/navigator.c | 2 +- 2 files changed, 454 insertions(+), 1 deletion(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b9261c0f7822edc9d428…

1 0

Zebediah Figura : quartz/tests: Add tests for DirectSound renderer filter state.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: 98390d9c2d2ce53239d3fa2d71c961e2c7ce5a84 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98390d9c2d2ce53239d3fa2d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 17 14:51:20 2020 -0500 quartz/tests: Add tests for DirectSound renderer filter state. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/dsoundrender.c | 233 +++++++++++++++++++++++++++++---------- 1 file changed, 176 insertions(+), 57 deletions(-) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index d5c18d389a..35f935bcad 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -20,6 +20,7 @@ */ #define COBJMACROS +#include <math.h> #include "dshow.h" #include "initguid.h" #include "dsound.h" @@ -674,8 +675,164 @@ static void test_allocator(IMemInputPin *input) IMemAllocator_Release(ret_allocator); } +struct frame_thread_params +{ + IMemInputPin *sink; + IMediaSample *sample; +}; + +static DWORD WINAPI frame_thread(void *arg) +{ + struct frame_thread_params *params = arg; + HRESULT hr; + + if (winetest_debug > 1) trace("%04x: Sending frame.\n", GetCurrentThreadId()); + hr = IMemInputPin_Receive(params->sink, params->sample); + if (winetest_debug > 1) trace("%04x: Returned %#x.\n", GetCurrentThreadId(), hr); + IMediaSample_Release(params->sample); + free(params); + return hr; +} + +static HRESULT send_frame(IMemInputPin *sink) +{ + struct frame_thread_params *params = malloc(sizeof(*params)); + REFERENCE_TIME start_time, end_time; + IMemAllocator *allocator; + unsigned short *words; + IMediaSample *sample; + unsigned int i; + HANDLE thread; + HRESULT hr; + BYTE *data; + DWORD ret; + + hr = IMemInputPin_GetAllocator(sink, &allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemAllocator_GetBuffer(allocator, &sample, NULL, NULL, 0); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaSample_GetPointer(sample, &data); + ok(hr == S_OK, "Got hr %#x.\n", hr); + words = (unsigned short *)data; + for (i = 0; i < 44100 * 2; i += 2) + words[i] = words[i+1] = sinf(i / 20.0f) * 0x7fff; + + hr = IMediaSample_SetActualDataLength(sample, 44100 * 4); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + start_time = 0; + end_time = start_time + 10000000; + hr = IMediaSample_SetTime(sample, &start_time, &end_time); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + params->sink = sink; + params->sample = sample; + thread = CreateThread(NULL, 0, frame_thread, params, 0, NULL); + ret = WaitForSingleObject(thread, 500); + todo_wine_if (ret) ok(!ret, "Wait failed.\n"); + GetExitCodeThread(thread, &ret); + CloseHandle(thread); + + IMemAllocator_Release(allocator); + return ret; +} + +static void test_filter_state(IMemInputPin *input, IFilterGraph2 *graph) +{ + IMediaControl *control; + OAFilterState state; + HRESULT hr; + + IFilterGraph2_QueryInterface(graph, &IID_IMediaControl, (void **)&control); + + hr = send_frame(input); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + /* The renderer is not fully paused until it receives a sample. The + * DirectSound renderer never blocks in Receive(), despite returning S_OK + * from ReceiveCanBlock(). Instead it holds on to each sample until its + * presentation time, then writes it into the buffer. This is more work + * than it's worth to emulate, so for now, we'll ignore this behaviour. */ + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + /* It's possible to queue multiple samples while paused. The number of + * samples that can be queued depends on the length of each sample, but + * it's not particularly clear how. */ + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + + hr = send_frame(input); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = send_frame(input); + ok(hr == VFW_E_WRONG_STATE, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(control); + ok(hr == S_FALSE, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == VFW_S_STATE_INTERMEDIATE, "Got hr %#x.\n", hr); + + hr = send_frame(input); + todo_wine ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 1000, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = send_frame(input); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = send_frame(input); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Run(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Pause(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_Stop(control); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMediaControl_GetState(control, 0, &state); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + /* The DirectSound renderer will silently refuse to transition to running + * if it hasn't finished pausing yet. Once it does it reports itself as + * completely paused. */ + + IMediaControl_Release(control); +} + static void test_connect_pin(void) { + ALLOCATOR_PROPERTIES req_props = {1, 4 * 44100, 1, 0}, ret_props; WAVEFORMATEX wfx = { .wFormatTag = WAVE_FORMAT_PCM, @@ -695,6 +852,7 @@ static void test_connect_pin(void) }; IBaseFilter *filter = create_dsound_render(); struct testfilter source; + IMemAllocator *allocator; IFilterGraph2 *graph; IMemInputPin *input; AM_MEDIA_TYPE mt; @@ -734,6 +892,22 @@ static void test_connect_pin(void) test_allocator(input); + hr = CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, + &IID_IMemAllocator, (void **)&allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemAllocator_SetProperties(allocator, &req_props, &ret_props); + ok(hr == S_OK, "Got hr %#x.\n", hr); + ok(!memcmp(&ret_props, &req_props, sizeof(req_props)), "Properties did not match.\n"); + hr = IMemInputPin_NotifyAllocator(input, allocator, TRUE); + ok(hr == S_OK, "Got hr %#x.\n", hr); + hr = IMemAllocator_Commit(allocator); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + hr = IMemInputPin_ReceiveCanBlock(input); + ok(hr == S_OK, "Got hr %#x.\n", hr); + + test_filter_state(input, graph); + hr = IFilterGraph2_Disconnect(graph, pin); ok(hr == S_OK, "Got hr %#x.\n", hr); hr = IFilterGraph2_Disconnect(graph, pin); @@ -749,6 +923,8 @@ static void test_connect_pin(void) hr = IPin_ConnectionMediaType(pin, &mt); ok(hr == VFW_E_NOT_CONNECTED, "Got hr %#x.\n", hr); + ref = IMemAllocator_Release(allocator); + ok(!ref, "Got outstanding refcount %d.\n", ref); IMemInputPin_Release(input); IPin_Release(pin); ref = IFilterGraph2_Release(graph); @@ -759,62 +935,6 @@ static void test_connect_pin(void) ok(!ref, "Got outstanding refcount %d.\n", ref); } -static void test_pin(IPin *pin) -{ - IMemInputPin *mpin = NULL; - - IPin_QueryInterface(pin, &IID_IMemInputPin, (void **)&mpin); - - ok(mpin != NULL, "No IMemInputPin found!\n"); - if (mpin) - { - ok(IMemInputPin_ReceiveCanBlock(mpin) == S_OK, "Receive can't block for pin!\n"); - ok(IMemInputPin_NotifyAllocator(mpin, NULL, 0) == E_POINTER, "NotifyAllocator likes a NULL pointer argument\n"); - IMemInputPin_Release(mpin); - } - /* TODO */ -} - -static void test_basefilter(void) -{ - IEnumPins *pin_enum = NULL; - IBaseFilter *base = create_dsound_render(); - IPin *pins[2]; - ULONG ref; - HRESULT hr; - - hr = IBaseFilter_EnumPins(base, NULL); - ok(hr == E_POINTER, "hr = %08x and not E_POINTER\n", hr); - - hr= IBaseFilter_EnumPins(base, &pin_enum); - ok(hr == S_OK, "hr = %08x and not S_OK\n", hr); - - hr = IEnumPins_Next(pin_enum, 1, NULL, NULL); - ok(hr == E_POINTER, "hr = %08x and not E_POINTER\n", hr); - - hr = IEnumPins_Next(pin_enum, 2, pins, NULL); - ok(hr == E_INVALIDARG, "hr = %08x and not E_INVALIDARG\n", hr); - - pins[0] = (void *)0xdead; - pins[1] = (void *)0xdeed; - - hr = IEnumPins_Next(pin_enum, 2, pins, &ref); - ok(hr == S_FALSE, "hr = %08x instead of S_FALSE\n", hr); - ok(pins[0] != (void *)0xdead && pins[0] != NULL, "pins[0] = %p\n", pins[0]); - if (pins[0] != (void *)0xdead && pins[0] != NULL) - { - test_pin(pins[0]); - IPin_Release(pins[0]); - } - - ok(pins[1] == (void *)0xdeed, "pins[1] = %p\n", pins[1]); - - ref = IEnumPins_Release(pin_enum); - ok(ref == 0, "ref is %u and not 0!\n", ref); - - IBaseFilter_Release(base); -} - static void test_unconnected_filter_state(void) { IBaseFilter *filter = create_dsound_render(); @@ -1016,7 +1136,6 @@ START_TEST(dsoundrender) test_unconnected_filter_state(); test_media_types(); test_connect_pin(); - test_basefilter(); CoUninitialize(); }

1 0

Zebediah Figura : quartz/dsoundrender: Do not send quality messages.
by Alexandre Julliard 17 Jul '20

17 Jul '20

Module: wine Branch: master Commit: f6f1983be8c332911bf45277650f9f401a56e7f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f6f1983be8c332911bf45277… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Fri Jul 17 14:51:21 2020 -0500 quartz/dsoundrender: Do not send quality messages. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 18 +----------------- dlls/quartz/tests/dsoundrender.c | 8 ++++++++ 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 225c1e07b9..fba206ecb6 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -360,23 +360,7 @@ static HRESULT WINAPI DSoundRender_DoRenderSample(struct strmbase_renderer *ifac cbSrcStream = IMediaSample_GetActualDataLength(pSample); TRACE("Sample data ptr = %p, size = %d\n", pbSrcStream, cbSrcStream); - hr = DSoundRender_SendSampleData(This, tStart, tStop, pbSrcStream, cbSrcStream); - if (This->renderer.filter.state == State_Running && This->renderer.filter.clock && tStart >= 0) { - REFERENCE_TIME jitter, now = 0; - Quality q; - IReferenceClock_GetTime(This->renderer.filter.clock, &now); - jitter = now - This->renderer.stream_start - tStart; - if (jitter <= -DSoundRenderer_Max_Fill) - jitter += DSoundRenderer_Max_Fill; - else if (jitter < 0) - jitter = 0; - q.Type = (jitter > 0 ? Famine : Flood); - q.Proportion = 1000; - q.Late = jitter; - q.TimeStamp = tStart; - IQualityControl_Notify((IQualityControl *)This->renderer.qcimpl, &This->renderer.filter.IBaseFilter_iface, q); - } - return hr; + return DSoundRender_SendSampleData(This, tStart, tStop, pbSrcStream, cbSrcStream); } static HRESULT WINAPI DSoundRender_CheckMediaType(struct strmbase_renderer *iface, const AM_MEDIA_TYPE * pmt) diff --git a/dlls/quartz/tests/dsoundrender.c b/dlls/quartz/tests/dsoundrender.c index 35f935bcad..0e7fed4c25 100644 --- a/dlls/quartz/tests/dsoundrender.c +++ b/dlls/quartz/tests/dsoundrender.c @@ -613,6 +613,13 @@ static const struct strmbase_filter_ops testfilter_ops = .filter_destroy = testfilter_destroy, }; +static HRESULT testsource_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) +{ + todo_wine_if (IsEqualGUID(iid, &IID_IQualityControl)) + ok(!IsEqualGUID(iid, &IID_IQualityControl), "Unexpected query for IQualityControl.\n"); + return E_NOINTERFACE; +} + static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, IMemInputPin *peer, IMemAllocator **allocator) { @@ -621,6 +628,7 @@ static HRESULT WINAPI testsource_DecideAllocator(struct strmbase_source *iface, static const struct strmbase_source_ops testsource_ops = { + .base.pin_query_interface = testsource_query_interface, .pfnAttemptConnection = BaseOutputPinImpl_AttemptConnection, .pfnDecideAllocator = testsource_DecideAllocator, };

1 0