wine-commits October 2019

wine-commits@winehq.org

2 participants
614 discussions

Andrew Eikum : mmdevapi/tests: Avoid race condition in capture test.
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: ba340e741ab888a567e3e78716a93da3bbc9c96f URL: https://source.winehq.org/git/wine.git/?a=commit;h=ba340e741ab888a567e3e787… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Thu Oct 24 11:28:12 2019 -0500 mmdevapi/tests: Avoid race condition in capture test. These tests depended on no data being put into the buffer between calls to Start() and GetBuffer(). Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47876 Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mmdevapi/tests/capture.c | 73 +++++++------------------------------------ 1 file changed, 11 insertions(+), 62 deletions(-) diff --git a/dlls/mmdevapi/tests/capture.c b/dlls/mmdevapi/tests/capture.c index 0fa9f0cab8..732776c401 100644 --- a/dlls/mmdevapi/tests/capture.c +++ b/dlls/mmdevapi/tests/capture.c @@ -95,45 +95,6 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) if (hr != S_OK) return; - frames = 0xabadcafe; - data = (void*)0xdeadf00d; - flags = 0xabadcafe; - pos = qpc = 0xdeadbeef; - hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); - ok(hr == AUDCLNT_S_BUFFER_EMPTY, "Initial IAudioCaptureClient_GetBuffer returns %08x\n", hr); - - /* should be empty right after start. Otherwise consume one packet */ - if(hr == S_OK){ - hr = IAudioCaptureClient_ReleaseBuffer(acc, frames); - ok(hr == S_OK, "Releasing buffer returns %08x\n", hr); - sum += frames; - - frames = 0xabadcafe; - data = (void*)0xdeadf00d; - flags = 0xabadcafe; - pos = qpc = 0xdeadbeef; - hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); - ok(hr == AUDCLNT_S_BUFFER_EMPTY, "Initial IAudioCaptureClient_GetBuffer returns %08x\n", hr); - } - - if(hr == AUDCLNT_S_BUFFER_EMPTY){ - ok(!frames, "frames changed to %u\n", frames); - ok(data == (void*)0xdeadf00d, "data changed to %p\n", data); - ok(flags == 0xabadcafe, "flags changed to %x\n", flags); - ok(pos == 0xdeadbeef, "position changed to %u\n", (UINT)pos); - ok(qpc == 0xdeadbeef, "timer changed to %u\n", (UINT)qpc); - - /* GetNextPacketSize yields 0 if no data is yet available - * it is not constantly period_size * SamplesPerSec */ - hr = IAudioCaptureClient_GetNextPacketSize(acc, &next); - ok(hr == S_OK, "IAudioCaptureClient_GetNextPacketSize returns %08x\n", hr); - ok(!next, "GetNextPacketSize %u\n", next); - } - - hr = IAudioCaptureClient_ReleaseBuffer(acc, frames); - ok(hr == S_OK, "Releasing buffer returns %08x\n", hr); - sum += frames; - ok(ResetEvent(handle), "ResetEvent\n"); hr = IAudioCaptureClient_GetNextPacketSize(acc, &next); @@ -169,6 +130,9 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) ok(hr == S_OK, "GetDevicePeriod failed: %08x\n", hr); period = MulDiv(period, wfx->nSamplesPerSec, 10000000); /* as in render.c */ + hr = IAudioClient_Start(ac); + ok(hr == S_OK, "Start on a stopped stream returns %08x\n", hr); + ok(WaitForSingleObject(handle, 1000) == WAIT_OBJECT_0, "Waiting on event handle failed!\n"); data = (void*)0xdeadf00d; @@ -375,37 +339,25 @@ static void test_capture(IAudioClient *ac, HANDLE handle, WAVEFORMATEX *wfx) ok(hr == S_OK, "Reset on a stopped stream returns %08x\n", hr); sum += pad - frames; - hr = IAudioClient_Start(ac); - ok(hr == S_OK, "Start on a stopped stream returns %08x\n", hr); - hr = IAudioClient_GetCurrentPadding(ac, &pad); ok(hr == S_OK, "GetCurrentPadding call returns %08x\n", hr); + ok(!pad, "reset GCP %u\n", pad); flags = 0xabadcafe; hr = IAudioCaptureClient_GetBuffer(acc, &data, &frames, &flags, &pos, &qpc); - ok(hr == AUDCLNT_S_BUFFER_EMPTY || /*PulseAudio*/hr == S_OK, + ok(hr == AUDCLNT_S_BUFFER_EMPTY, "Initial IAudioCaptureClient_GetBuffer returns %08x\n", hr); trace("Reset position %d pad %u flags %x, amount of frames locked: %u\n", hr==S_OK ? (UINT)pos : -1, pad, flags, frames); - if(hr == S_OK){ - /* Only PulseAudio goes here; despite snd_pcm_drop it manages - * to fill GetBufferSize with a single snd_pcm_read */ - trace("Test marked todo: only PulseAudio gets here\n"); - todo_wine ok(flags & AUDCLNT_BUFFERFLAGS_DATA_DISCONTINUITY, "expect DISCONTINUITY %x\n", flags); - /* Reset zeroes padding, not the position */ - ok(pos >= sum, "Position %u last %u\n", (UINT)pos, sum); - /*sum = pos; check after next GetBuffer */ + if(SUCCEEDED(hr)) + IAudioCaptureClient_ReleaseBuffer(acc, frames); - hr = IAudioCaptureClient_ReleaseBuffer(acc, frames); - ok(hr == S_OK, "Releasing buffer returns %08x\n", hr); - sum += frames; - } - else if(hr == AUDCLNT_S_BUFFER_EMPTY){ - ok(!pad, "reset GCP %u\n", pad); - Sleep(180); - } + hr = IAudioClient_Start(ac); + ok(hr == S_OK, "Start on a stopped stream returns %08x\n", hr); + + Sleep(180); hr = IAudioClient_GetCurrentPadding(ac, &pad); ok(hr == S_OK, "GetCurrentPadding call returns %08x\n", hr); @@ -583,9 +535,6 @@ static void test_audioclient(void) hr = IAudioClient_Stop(ac); ok(hr == S_FALSE, "Stop on a stopped stream returns %08x\n", hr); - hr = IAudioClient_Start(ac); - ok(hr == S_OK, "Start on a stopped stream returns %08x\n", hr); - test_capture(ac, handle, pwfx); cleanup:

1 0

Akihiro Sagawa : d2d1: Improve bitmap creation DPI handling.
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: 9023c5a676423455d29f0b8679b1ccfb39279e0e URL: https://source.winehq.org/git/wine.git/?a=commit;h=9023c5a676423455d29f0b86… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Oct 24 17:58:48 2019 +0330 d2d1: Improve bitmap creation DPI handling. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/bitmap.c | 13 +++++++++++++ dlls/d2d1/tests/d2d1.c | 22 ++++++++-------------- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/d2d1/bitmap.c b/dlls/d2d1/bitmap.c index dc5ed9e6ad..bc958e50a1 100644 --- a/dlls/d2d1/bitmap.c +++ b/dlls/d2d1/bitmap.c @@ -313,6 +313,7 @@ HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size, UINT32 pitch, const D2D1_BITMAP_PROPERTIES1 *desc, struct d2d_bitmap **bitmap) { D3D10_SUBRESOURCE_DATA resource_data; + D2D1_BITMAP_PROPERTIES1 bitmap_desc; D3D10_TEXTURE2D_DESC texture_desc; ID3D10Texture2D *texture; HRESULT hr; @@ -324,6 +325,18 @@ HRESULT d2d_bitmap_create(struct d2d_device_context *context, D2D1_SIZE_U size, return D2DERR_UNSUPPORTED_PIXEL_FORMAT; } + if (desc->dpiX == 0.0f && desc->dpiY == 0.0f) + { + bitmap_desc = *desc; + bitmap_desc.dpiX = context->desc.dpiX; + bitmap_desc.dpiY = context->desc.dpiY; + desc = &bitmap_desc; + } + else if (desc->dpiX <= 0.0f || desc->dpiY <= 0.0f) + { + return E_INVALIDARG; + } + texture_desc.Width = size.width; texture_desc.Height = size.height; if (!texture_desc.Width || !texture_desc.Height) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index a71477be3b..0ed51c7f80 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -8169,9 +8169,8 @@ static void test_dpi(void) bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; bitmap_desc.colorContext = NULL; hr = ID2D1DeviceContext_CreateBitmapFromWicBitmap(device_context, wic_bitmap_src, &bitmap_desc, &bitmap); - todo_wine_if(FAILED(create_dpi_tests[i].hr)) - ok(hr == create_dpi_tests[i].hr, "Test %u: Got unexpected hr %#x, expected %#x.\n", - i, hr, create_dpi_tests[i].hr); + ok(hr == create_dpi_tests[i].hr, "Test %u: Got unexpected hr %#x, expected %#x.\n", + i, hr, create_dpi_tests[i].hr); IWICBitmapSource_Release(wic_bitmap_src); if (FAILED(hr)) @@ -8183,10 +8182,8 @@ static void test_dpi(void) if (bitmap_desc.dpiX == 0.0f && bitmap_desc.dpiY == 0.0f) { /* Bitmap DPI values are inherited at creation time. */ - todo_wine ok(dpi_x == init_dpi_x, "Test %u: Got unexpected dpi_x %.8e, expected %.8e.\n", - i, dpi_x, init_dpi_x); - todo_wine ok(dpi_y == init_dpi_y, "Test %u: Got unexpected dpi_y %.8e, expected %.8e.\n", - i, dpi_y, init_dpi_y); + ok(dpi_x == init_dpi_x, "Test %u: Got unexpected dpi_x %.8e, expected %.8e.\n", i, dpi_x, init_dpi_x); + ok(dpi_y == init_dpi_y, "Test %u: Got unexpected dpi_y %.8e, expected %.8e.\n", i, dpi_y, init_dpi_y); } else { @@ -8225,9 +8222,8 @@ static void test_dpi(void) bitmap_desc.bitmapOptions = D2D1_BITMAP_OPTIONS_TARGET | D2D1_BITMAP_OPTIONS_CANNOT_DRAW; bitmap_desc.colorContext = NULL; hr = ID2D1DeviceContext_CreateBitmap(device_context, size, NULL, 0, &bitmap_desc, &bitmap); - todo_wine_if(FAILED(create_dpi_tests[i].hr)) - ok(hr == create_dpi_tests[i].hr, "Test %u: Got unexpected hr %#x, expected %#x.\n", - i, hr, create_dpi_tests[i].hr); + ok(hr == create_dpi_tests[i].hr, "Test %u: Got unexpected hr %#x, expected %#x.\n", + i, hr, create_dpi_tests[i].hr); if (FAILED(hr)) continue; @@ -8238,10 +8234,8 @@ static void test_dpi(void) if (bitmap_desc.dpiX == 0.0f && bitmap_desc.dpiY == 0.0f) { /* Bitmap DPI values are inherited at creation time. */ - todo_wine ok(dpi_x == init_dpi_x, "Test %u: Got unexpected dpi_x %.8e, expected %.8e.\n", - i, dpi_x, init_dpi_x); - todo_wine ok(dpi_y == init_dpi_y, "Test %u: Got unexpected dpi_y %.8e, expected %.8e.\n", - i, dpi_y, init_dpi_y); + ok(dpi_x == init_dpi_x, "Test %u: Got unexpected dpi_x %.8e, expected %.8e.\n", i, dpi_x, init_dpi_x); + ok(dpi_y == init_dpi_y, "Test %u: Got unexpected dpi_y %.8e, expected %.8e.\n", i, dpi_y, init_dpi_y); } else {

1 0

Akihiro Sagawa : d2d1: Don't update device context DPI values when changing targets.
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: 9a808acbd5948af4ac807ac67f597959b39199fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=9a808acbd5948af4ac807ac6… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Oct 24 17:58:47 2019 +0330 d2d1: Don't update device context DPI values when changing targets. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/device.c | 8 +++----- dlls/d2d1/tests/d2d1.c | 16 ++++++++-------- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/dlls/d2d1/device.c b/dlls/d2d1/device.c index 98f06a281a..64b3041b2c 100644 --- a/dlls/d2d1/device.c +++ b/dlls/d2d1/device.c @@ -1940,9 +1940,7 @@ static void d2d_device_context_reset_target(struct d2d_device_context *context) ID2D1Bitmap1_Release(&context->target->ID2D1Bitmap1_iface); context->target = NULL; - context->desc.dpiX = 96.0f; - context->desc.dpiY = 96.0f; - + /* Note that DPI settings are kept. */ memset(&context->desc.pixelFormat, 0, sizeof(context->desc.pixelFormat)); memset(&context->pixel_size, 0, sizeof(context->pixel_size)); @@ -1983,8 +1981,6 @@ static void STDMETHODCALLTYPE d2d_device_context_SetTarget(ID2D1DeviceContext *i d2d_device_context_reset_target(context); /* Set sizes and pixel format. */ - context->desc.dpiX = bitmap_impl->dpi_x; - context->desc.dpiY = bitmap_impl->dpi_y; context->pixel_size = bitmap_impl->pixel_size; context->desc.pixelFormat = bitmap_impl->format; context->target = bitmap_impl; @@ -3771,6 +3767,8 @@ HRESULT d2d_d3d_create_render_target(ID2D1Device *device, IDXGISurface *surface, return hr; } + ID2D1DeviceContext_SetDpi(&object->ID2D1DeviceContext_iface, bitmap_desc.dpiX, bitmap_desc.dpiY); + if (surface) { bitmap_desc.pixelFormat = desc->pixelFormat; diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index d6b5055ed3..a71477be3b 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -8137,8 +8137,8 @@ static void test_dpi(void) /* Device context DPI values aren't updated by SetTarget. */ ID2D1DeviceContext_GetDpi(device_context, &dpi_x, &dpi_y); - todo_wine ok(dpi_x == dc_dpi_x, "Test %u: Got unexpected dpi_x %.8e, expected %.8e.\n", i, dpi_x, dc_dpi_x); - todo_wine ok(dpi_y == dc_dpi_y, "Test %u: Got unexpected dpi_y %.8e, expected %.8e.\n", i, dpi_y, dc_dpi_y); + ok(dpi_x == dc_dpi_x, "Test %u: Got unexpected dpi_x %.8e, expected %.8e.\n", i, dpi_x, dc_dpi_x); + ok(dpi_y == dc_dpi_y, "Test %u: Got unexpected dpi_y %.8e, expected %.8e.\n", i, dpi_y, dc_dpi_y); ID2D1Bitmap1_Release(bitmap); } @@ -8203,8 +8203,8 @@ static void test_dpi(void) /* Device context DPI values aren't updated by SetTarget. */ ID2D1DeviceContext_GetDpi(device_context, &dpi_x, &dpi_y); - todo_wine ok(dpi_x == dc_dpi_x, "Test %u: Got unexpected dpi_x %.8e, expected %.8e.\n", i, dpi_x, dc_dpi_x); - todo_wine ok(dpi_y == dc_dpi_y, "Test %u: Got unexpected dpi_y %.8e, expected %.8e.\n", i, dpi_y, dc_dpi_y); + ok(dpi_x == dc_dpi_x, "Test %u: Got unexpected dpi_x %.8e, expected %.8e.\n", i, dpi_x, dc_dpi_x); + ok(dpi_y == dc_dpi_y, "Test %u: Got unexpected dpi_y %.8e, expected %.8e.\n", i, dpi_y, dc_dpi_y); ID2D1Bitmap1_Release(bitmap); } @@ -8258,16 +8258,16 @@ static void test_dpi(void) /* Device context DPI values aren't updated by SetTarget. */ ID2D1DeviceContext_GetDpi(device_context, &dpi_x, &dpi_y); - todo_wine ok(dpi_x == dc_dpi_x, "Test %u: Got unexpected dpi_x %.8e, expected %.8e.\n", i, dpi_x, dc_dpi_x); - todo_wine ok(dpi_y == dc_dpi_y, "Test %u: Got unexpected dpi_y %.8e, expected %.8e.\n", i, dpi_y, dc_dpi_y); + ok(dpi_x == dc_dpi_x, "Test %u: Got unexpected dpi_x %.8e, expected %.8e.\n", i, dpi_x, dc_dpi_x); + ok(dpi_y == dc_dpi_y, "Test %u: Got unexpected dpi_y %.8e, expected %.8e.\n", i, dpi_y, dc_dpi_y); ID2D1Bitmap1_Release(bitmap); } ID2D1DeviceContext_SetTarget(device_context, NULL); ID2D1DeviceContext_GetDpi(device_context, &dpi_x, &dpi_y); - todo_wine ok(dpi_x == dc_dpi_x, "Got unexpected dpi_x %.8e, expected %.8e.\n", dpi_x, dc_dpi_x); - todo_wine ok(dpi_y == dc_dpi_y, "Got unexpected dpi_y %.8e, expected %.8e.\n", dpi_y, dc_dpi_y); + ok(dpi_x == dc_dpi_x, "Got unexpected dpi_x %.8e, expected %.8e.\n", dpi_x, dc_dpi_x); + ok(dpi_y == dc_dpi_y, "Got unexpected dpi_y %.8e, expected %.8e.\n", dpi_y, dc_dpi_y); ID2D1DeviceContext_Release(device_context); IDXGISurface_Release(surface);

1 0

Akihiro Sagawa : d2d1/tests: Add some DPI tests.
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: 44a3be917712f0961a196804b49d8398cfd13f40 URL: https://source.winehq.org/git/wine.git/?a=commit;h=44a3be917712f0961a196804… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Thu Oct 24 17:58:46 2019 +0330 d2d1/tests: Add some DPI tests. Signed-off-by: Akihiro Sagawa <sagawa.aki(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 232 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 232 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=44a3be917712f0961a19…

1 0

Sven Baars : wininet/tests: Fix some test failures on Windows.
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: 8b2d3857136c50d56c706a7f880fc605b325e334 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8b2d3857136c50d56c706a7f… Author: Sven Baars <sven.wine(a)gmail.com> Date: Thu Oct 24 11:22:55 2019 +0200 wininet/tests: Fix some test failures on Windows. Signed-off-by: Sven Baars <sven.wine(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/urlcache.c | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/dlls/wininet/tests/urlcache.c b/dlls/wininet/tests/urlcache.c index c5e72ae82b..a38ed9bc5b 100644 --- a/dlls/wininet/tests/urlcache.c +++ b/dlls/wininet/tests/urlcache.c @@ -877,9 +877,8 @@ static void test_urlcacheW(void) "", {0}, {0} }, { - 0, {'C','o','o','k','i','e',':',' ','u','s','e','r','@','h','t','t','p', - ':','/','/','t',0x15b,0x107,'.','o','r','g','/',0}, - "Cookie: user@http://t\xc5\x9b\xc4\x87.org/", {0}, {0} + 0, {'C','o','o','k','i','e',':',' ','u','s','e','r','@','t','e','s','t','.','o','r','g','/',0}, + "Cookie: user(a)test.org/", {0}, {0} } }; static const FILETIME filetime_zero; @@ -893,24 +892,11 @@ static void test_urlcacheW(void) return; } - if(ie10_cache) { - if(!MultiByteToWideChar(CP_ACP, 0, urls[6].encoded_url, -1, - urls[6].url, ARRAY_SIZE(urls[6].url))) - urls[6].url[0] = 0; - - trace("converted url in test 6: %s\n", wine_dbgstr_w(urls[6].url)); - } - for(i=0; i<ARRAY_SIZE(urls); i++) { INTERNET_CACHE_ENTRY_INFOA *entry_infoA; INTERNET_CACHE_ENTRY_INFOW *entry_infoW; DWORD size; - if(!urls[i].url[0]) { - win_skip("No UTF16 version of url (%d)\n", i); - continue; - } - SetLastError(0xdeadbeef); ret = CreateUrlCacheEntryW(urls[i].url, 0, NULL, bufW, 0); if(urls[i].err != 0) { @@ -937,10 +923,6 @@ static void test_urlcacheW(void) ret = GetUrlCacheEntryInfoA(urls[i].encoded_url, NULL, &size); ok(!ret && GetLastError()==ERROR_INSUFFICIENT_BUFFER, "%d) GetLastError() = %d\n", i, GetLastError()); - if(!ret && GetLastError()!=ERROR_INSUFFICIENT_BUFFER) { - win_skip("ANSI version of url is incorrect\n"); - continue; - } entry_infoA = HeapAlloc(GetProcessHeap(), 0, size); ret = GetUrlCacheEntryInfoA(urls[i].encoded_url, entry_infoA, &size); ok(ret, "%d) GetUrlCacheEntryInfoA failed: %d\n", i, GetLastError());

1 0

Nikolay Sivov : shell32/tests: Relax some tests to fix failures on Win10.
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: 062c55bf1a8d469b1bc90696a4df400798f58b1a URL: https://source.winehq.org/git/wine.git/?a=commit;h=062c55bf1a8d469b1bc90696… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Oct 24 10:00:51 2019 +0300 shell32/tests: Relax some tests to fix failures on Win10. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/tests/shlfolder.c | 36 +++++++++++++++++------------------- 1 file changed, 17 insertions(+), 19 deletions(-) diff --git a/dlls/shell32/tests/shlfolder.c b/dlls/shell32/tests/shlfolder.c index 87e9141987..ebeaf4e20e 100644 --- a/dlls/shell32/tests/shlfolder.c +++ b/dlls/shell32/tests/shlfolder.c @@ -336,11 +336,11 @@ static void test_EnumObjects(IShellFolder *iFolder) /* Don't test for SFGAO_HASSUBFOLDER since we return real state and native cached */ static const ULONG attrs[5] = { - SFGAO_CAPABILITYMASK | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR, - SFGAO_CAPABILITYMASK | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR, - SFGAO_CAPABILITYMASK | SFGAO_FILESYSTEM, - SFGAO_CAPABILITYMASK | SFGAO_FILESYSTEM, - SFGAO_CAPABILITYMASK | SFGAO_FILESYSTEM, + SFGAO_DROPTARGET | SFGAO_CANLINK | SFGAO_CANCOPY | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR, + SFGAO_DROPTARGET | SFGAO_CANLINK | SFGAO_CANCOPY | SFGAO_FILESYSTEM | SFGAO_FOLDER | SFGAO_FILESYSANCESTOR, + SFGAO_DROPTARGET | SFGAO_CANLINK | SFGAO_CANCOPY | SFGAO_FILESYSTEM, + SFGAO_DROPTARGET | SFGAO_CANLINK | SFGAO_CANCOPY | SFGAO_FILESYSTEM, + SFGAO_DROPTARGET | SFGAO_CANLINK | SFGAO_CANCOPY | SFGAO_FILESYSTEM, }; static const ULONG full_attrs[5] = { @@ -380,30 +380,28 @@ static void test_EnumObjects(IShellFolder *iFolder) ok(hr == iResults[i][j], "Got %x expected [%d]-[%d]=%x\n", hr, i, j, iResults[i][j]); } - - for (i = 0; i < 5; i++) + for (i = 0; i < ARRAY_SIZE(attrs); ++i) { SFGAOF flags; -#define SFGAO_VISTA SFGAO_DROPTARGET | SFGAO_CANLINK | SFGAO_CANCOPY - /* Native returns all flags no matter what we ask for */ + flags = SFGAO_CANCOPY; hr = IShellFolder_GetAttributesOf(iFolder, 1, (LPCITEMIDLIST*)(idlArr + i), &flags); flags &= SFGAO_testfor; - ok(hr == S_OK, "GetAttributesOf returns %08x\n", hr); - ok(flags == (attrs[i]) || - flags == ((attrs[i] & ~SFGAO_CAPABILITYMASK) | SFGAO_VISTA), /* Vista and higher */ - "GetAttributesOf[%i] got %08x, expected %08x\n", i, flags, attrs[i]); + ok(hr == S_OK, "Failed to get item attributes, hr %#x.\n", hr); + ok((flags & attrs[i]) == attrs[i], "%i: unexpected attributes got %#x, expected %#x.\n", i, flags, attrs[i]); flags = SFGAO_testfor; hr = IShellFolder_GetAttributesOf(iFolder, 1, (LPCITEMIDLIST*)(idlArr + i), &flags); flags &= SFGAO_testfor; - ok(hr == S_OK, "GetAttributesOf returns %08x\n", hr); - ok(flags == attrs[i], "GetAttributesOf[%i] got %08x, expected %08x\n", i, flags, attrs[i]); + ok(hr == S_OK, "Failed to get item attributes, hr %#x.\n", hr); + ok(flags == (attrs[i] | SFGAO_CAPABILITYMASK), "%i: unexpected attributes got %#x, expected %#x.\n", + i, flags, attrs[i]); flags = ~0u; hr = IShellFolder_GetAttributesOf(iFolder, 1, (LPCITEMIDLIST*)(idlArr + i), &flags); - ok(hr == S_OK, "GetAttributesOf returns %08x\n", hr); - ok((flags & ~(SFGAO_HASSUBFOLDER|SFGAO_COMPRESSED)) == full_attrs[i], "%d: got %08x expected %08x\n", i, flags, full_attrs[i]); + ok(hr == S_OK, "Failed to get item attributes, hr %#x.\n", hr); + ok((flags & ~(SFGAO_HASSUBFOLDER|SFGAO_COMPRESSED)) == full_attrs[i], "%d: unexpected attributes %#x, expected %#x\n", + i, flags, full_attrs[i]); } for (i=0;i<5;i++) @@ -5263,7 +5261,7 @@ static void test_SHGetSetFolderCustomSettings(void) if (!pSHGetSetFolderCustomSettings) { - win_skip("SHGetSetFolderCustomSetting not exported by name (only by ordinal) for version XP/win2003\n"); + win_skip("SHGetSetFolderCustomSetting is not available.\n"); return; } @@ -5294,7 +5292,7 @@ static void test_SHGetSetFolderCustomSettings(void) todo_wine ok(!lstrcmpiW(iconpathW, fcs.pszIconFile), "Expected %s, got %s\n", wine_dbgstr_w(iconpathW), wine_dbgstr_w(fcs.pszIconFile)); hr = pSHGetSetFolderCustomSettings(&fcs, NULL, FCS_READ); - ok(hr == E_FAIL, "Expected E_FAIL, got %#x\n", hr); + ok(FAILED(hr), "Unexpected hr %#x.\n", hr); lstrcpyW(bufferW, pathW); lstrcatW(bufferW, desktop_iniW);

1 0

Zebediah Figura : strmbase/transform: Use base filter state change methods.
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: 2fcc7e7292228c2f13ca11a4e36b42f3229eda98 URL: https://source.winehq.org/git/wine.git/?a=commit;h=2fcc7e7292228c2f13ca11a4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 23 20:04:27 2019 -0500 strmbase/transform: Use base filter state change methods. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/transform.c | 111 +++++++++++++++++----------------------------- 1 file changed, 41 insertions(+), 70 deletions(-) diff --git a/dlls/strmbase/transform.c b/dlls/strmbase/transform.c index 3fd9d8bd6f..d0484a2543 100644 --- a/dlls/strmbase/transform.c +++ b/dlls/strmbase/transform.c @@ -155,10 +155,48 @@ static void transform_destroy(struct strmbase_filter *iface) CoTaskMemFree(filter); } +static HRESULT transform_init_stream(struct strmbase_filter *iface) +{ + TransformFilter *filter = impl_from_strmbase_filter(iface); + HRESULT hr = S_OK; + + EnterCriticalSection(&filter->csReceive); + + filter->sink.end_of_stream = FALSE; + if (filter->pFuncsTable->pfnStartStreaming) + hr = filter->pFuncsTable->pfnStartStreaming(filter); + if (SUCCEEDED(hr)) + hr = BaseOutputPinImpl_Active(&filter->source); + + LeaveCriticalSection(&filter->csReceive); + + return hr; +} + +static HRESULT transform_cleanup_stream(struct strmbase_filter *iface) +{ + TransformFilter *filter = impl_from_strmbase_filter(iface); + HRESULT hr = S_OK; + + EnterCriticalSection(&filter->csReceive); + + filter->sink.end_of_stream = FALSE; + if (filter->pFuncsTable->pfnStopStreaming) + hr = filter->pFuncsTable->pfnStopStreaming(filter); + if (SUCCEEDED(hr)) + hr = BaseOutputPinImpl_Inactive(&filter->source); + + LeaveCriticalSection(&filter->csReceive); + + return hr; +} + static const struct strmbase_filter_ops filter_ops = { .filter_get_pin = transform_get_pin, .filter_destroy = transform_destroy, + .filter_init_stream = transform_init_stream, + .filter_cleanup_stream = transform_cleanup_stream, }; static HRESULT sink_query_interface(struct strmbase_pin *iface, REFIID iid, void **out) @@ -207,73 +245,6 @@ static const struct strmbase_source_ops source_ops = .pfnDecideAllocator = BaseOutputPinImpl_DecideAllocator, }; -static HRESULT WINAPI TransformFilterImpl_Stop(IBaseFilter *iface) -{ - TransformFilter *This = impl_from_IBaseFilter(iface); - HRESULT hr = S_OK; - - TRACE("(%p/%p)\n", This, iface); - - EnterCriticalSection(&This->csReceive); - { - This->filter.state = State_Stopped; - if (This->pFuncsTable->pfnStopStreaming) - hr = This->pFuncsTable->pfnStopStreaming(This); - if (SUCCEEDED(hr)) - hr = BaseOutputPinImpl_Inactive(&This->source); - } - LeaveCriticalSection(&This->csReceive); - - return hr; -} - -static HRESULT WINAPI TransformFilterImpl_Pause(IBaseFilter *iface) -{ - TransformFilter *This = impl_from_IBaseFilter(iface); - HRESULT hr; - - TRACE("(%p/%p)->()\n", This, iface); - - EnterCriticalSection(&This->csReceive); - { - if (This->filter.state == State_Stopped) - hr = IBaseFilter_Run(iface, -1); - else - hr = S_OK; - - if (SUCCEEDED(hr)) - This->filter.state = State_Paused; - } - LeaveCriticalSection(&This->csReceive); - - return hr; -} - -static HRESULT WINAPI TransformFilterImpl_Run(IBaseFilter *iface, REFERENCE_TIME tStart) -{ - HRESULT hr = S_OK; - TransformFilter *This = impl_from_IBaseFilter(iface); - - TRACE("iface %p, start %s.\n", iface, debugstr_time(tStart)); - - EnterCriticalSection(&This->csReceive); - { - if (This->filter.state == State_Stopped) - { - This->sink.end_of_stream = FALSE; - if (This->pFuncsTable->pfnStartStreaming) - hr = This->pFuncsTable->pfnStartStreaming(This); - if (SUCCEEDED(hr)) - hr = BaseOutputPinImpl_Active(&This->source); - } - - if (SUCCEEDED(hr)) - This->filter.state = State_Running; - } - LeaveCriticalSection(&This->csReceive); - - return hr; -} static const IBaseFilterVtbl transform_vtbl = { @@ -281,9 +252,9 @@ static const IBaseFilterVtbl transform_vtbl = BaseFilterImpl_AddRef, BaseFilterImpl_Release, BaseFilterImpl_GetClassID, - TransformFilterImpl_Stop, - TransformFilterImpl_Pause, - TransformFilterImpl_Run, + BaseFilterImpl_Stop, + BaseFilterImpl_Pause, + BaseFilterImpl_Run, BaseFilterImpl_GetState, BaseFilterImpl_SetSyncSource, BaseFilterImpl_GetSyncSource,

1 0

Zebediah Figura : strmbase: Introduce filter state callbacks.
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: 7c8c0a1d2e995b1558bb96a2b2bf0cd969134efa URL: https://source.winehq.org/git/wine.git/?a=commit;h=7c8c0a1d2e995b1558bb96a2… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 23 20:04:26 2019 -0500 strmbase: Introduce filter state callbacks. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/filter.c | 64 +++++++++++++++++++++++++++++++++++-------------- include/wine/strmbase.h | 6 +++++ 2 files changed, 52 insertions(+), 18 deletions(-) diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index e1885cd935..ffe506d517 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -126,54 +126,82 @@ HRESULT WINAPI BaseFilterImpl_GetClassID(IBaseFilter * iface, CLSID * pClsid) HRESULT WINAPI BaseFilterImpl_Stop(IBaseFilter *iface) { struct strmbase_filter *filter = impl_from_IBaseFilter(iface); + HRESULT hr = S_OK; - TRACE("iface %p.\n", iface); + TRACE("filter %p.\n", filter); EnterCriticalSection(&filter->csFilter); - filter->state = State_Stopped; + + if (filter->state == State_Running && filter->ops->filter_stop_stream) + hr = filter->ops->filter_stop_stream(filter); + if (SUCCEEDED(hr) && filter->ops->filter_cleanup_stream) + hr = filter->ops->filter_cleanup_stream(filter); + if (SUCCEEDED(hr)) + filter->state = State_Stopped; + LeaveCriticalSection(&filter->csFilter); - return S_OK; + return hr; } HRESULT WINAPI BaseFilterImpl_Pause(IBaseFilter *iface) { struct strmbase_filter *filter = impl_from_IBaseFilter(iface); + HRESULT hr = S_OK; - TRACE("iface %p.\n", iface); + TRACE("filter %p.\n", filter); EnterCriticalSection(&filter->csFilter); - filter->state = State_Paused; + + if (filter->state == State_Stopped && filter->ops->filter_init_stream) + hr = filter->ops->filter_init_stream(filter); + else if (filter->state == State_Running && filter->ops->filter_stop_stream) + hr = filter->ops->filter_stop_stream(filter); + if (SUCCEEDED(hr)) + filter->state = State_Paused; + LeaveCriticalSection(&filter->csFilter); - return S_OK; + return hr; } HRESULT WINAPI BaseFilterImpl_Run(IBaseFilter *iface, REFERENCE_TIME start) { struct strmbase_filter *filter = impl_from_IBaseFilter(iface); + HRESULT hr = S_OK; - TRACE("iface %p, start %s.\n", iface, debugstr_time(start)); + TRACE("filter %p, start %s.\n", filter, debugstr_time(start)); EnterCriticalSection(&filter->csFilter); - filter->state = State_Running; + + if (filter->state == State_Stopped && filter->ops->filter_init_stream) + hr = filter->ops->filter_init_stream(filter); + if (SUCCEEDED(hr) && filter->ops->filter_start_stream) + hr = filter->ops->filter_start_stream(filter, start); + if (SUCCEEDED(hr)) + filter->state = State_Running; + LeaveCriticalSection(&filter->csFilter); - return S_OK; + return hr; } -HRESULT WINAPI BaseFilterImpl_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState ) +HRESULT WINAPI BaseFilterImpl_GetState(IBaseFilter *iface, DWORD timeout, FILTER_STATE *state) { - struct strmbase_filter *This = impl_from_IBaseFilter(iface); - TRACE("(%p)->(%d, %p)\n", This, dwMilliSecsTimeout, pState); + struct strmbase_filter *filter = impl_from_IBaseFilter(iface); + HRESULT hr = S_OK; - EnterCriticalSection(&This->csFilter); - { - *pState = This->state; - } - LeaveCriticalSection(&This->csFilter); + TRACE("filter %p, timeout %u, state %p.\n", filter, timeout, state); - return S_OK; + EnterCriticalSection(&filter->csFilter); + + if (filter->ops->filter_wait_state) + hr = filter->ops->filter_wait_state(filter, timeout); + *state = filter->state; + + LeaveCriticalSection(&filter->csFilter); + + return hr; } HRESULT WINAPI BaseFilterImpl_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 3f0883fcb6..a4920054e6 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -170,6 +170,12 @@ struct strmbase_filter_ops IPin *(*filter_get_pin)(struct strmbase_filter *iface, unsigned int index); void (*filter_destroy)(struct strmbase_filter *iface); HRESULT (*filter_query_interface)(struct strmbase_filter *iface, REFIID iid, void **out); + + HRESULT (*filter_init_stream)(struct strmbase_filter *iface); + HRESULT (*filter_start_stream)(struct strmbase_filter *iface, REFERENCE_TIME time); + HRESULT (*filter_stop_stream)(struct strmbase_filter *iface); + HRESULT (*filter_cleanup_stream)(struct strmbase_filter *iface); + HRESULT (*filter_wait_state)(struct strmbase_filter *iface, DWORD timeout); }; HRESULT WINAPI BaseFilterImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv);

1 0

Zebediah Figura : strmbase: Rename the "pFuncsTable" field of struct strmbase_filter to "ops".
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: f7232d4e2c25e44bfdc0f553bab8c0854f28667b URL: https://source.winehq.org/git/wine.git/?a=commit;h=f7232d4e2c25e44bfdc0f553… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 23 20:04:25 2019 -0500 strmbase: Rename the "pFuncsTable" field of struct strmbase_filter to "ops". Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/enumpins.c | 6 +++--- dlls/strmbase/filter.c | 12 ++++++------ include/wine/strmbase.h | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/dlls/strmbase/enumpins.c b/dlls/strmbase/enumpins.c index 222f61c2fc..5175158e96 100644 --- a/dlls/strmbase/enumpins.c +++ b/dlls/strmbase/enumpins.c @@ -59,7 +59,7 @@ HRESULT enum_pins_create(struct strmbase_filter *base, IEnumPins **out) IBaseFilter_AddRef(&base->IBaseFilter_iface); object->Version = base->pin_version; - while ((pin = base->pFuncsTable->filter_get_pin(base, object->count))) + while ((pin = base->ops->filter_get_pin(base, object->count))) ++object->count; TRACE("Created enumerator %p.\n", object); @@ -137,7 +137,7 @@ static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** for (i = 0; i < cPins; ++i) { - IPin *pin = This->base->pFuncsTable->filter_get_pin(This->base, This->uIndex + i); + IPin *pin = This->base->ops->filter_get_pin(This->base, This->uIndex + i); if (!pin) break; @@ -180,7 +180,7 @@ static HRESULT WINAPI IEnumPinsImpl_Reset(IEnumPins *iface) if (enum_pins->Version != enum_pins->base->pin_version) { enum_pins->count = 0; - while ((pin = enum_pins->base->pFuncsTable->filter_get_pin(enum_pins->base, enum_pins->count))) + while ((pin = enum_pins->base->ops->filter_get_pin(enum_pins->base, enum_pins->count))) ++enum_pins->count; } diff --git a/dlls/strmbase/filter.c b/dlls/strmbase/filter.c index c9d15e31c7..e1885cd935 100644 --- a/dlls/strmbase/filter.c +++ b/dlls/strmbase/filter.c @@ -36,8 +36,8 @@ static HRESULT WINAPI filter_inner_QueryInterface(IUnknown *iface, REFIID iid, v *out = NULL; - if (filter->pFuncsTable->filter_query_interface - && SUCCEEDED(hr = filter->pFuncsTable->filter_query_interface(filter, iid, out))) + if (filter->ops->filter_query_interface + && SUCCEEDED(hr = filter->ops->filter_query_interface(filter, iid, out))) { return hr; } @@ -78,7 +78,7 @@ static ULONG WINAPI filter_inner_Release(IUnknown *iface) TRACE("%p decreasing refcount to %u.\n", filter, refcount); if (!refcount) - filter->pFuncsTable->filter_destroy(filter); + filter->ops->filter_destroy(filter); return refcount; } @@ -229,7 +229,7 @@ HRESULT WINAPI BaseFilterImpl_FindPin(IBaseFilter *iface, const WCHAR *id, IPin TRACE("(%p)->(%s, %p)\n", This, debugstr_w(id), ret); - for (i = 0; (pin = This->pFuncsTable->filter_get_pin(This, i)); ++i) + for (i = 0; (pin = This->ops->filter_get_pin(This, i)); ++i) { hr = IPin_QueryPinInfo(pin, &info); if (FAILED(hr)) @@ -292,7 +292,7 @@ VOID WINAPI BaseFilterImpl_IncrementPinVersion(struct strmbase_filter *filter) } void strmbase_filter_init(struct strmbase_filter *filter, const IBaseFilterVtbl *vtbl, IUnknown *outer, - const CLSID *clsid, const struct strmbase_filter_ops *func_table) + const CLSID *clsid, const struct strmbase_filter_ops *ops) { memset(filter, 0, sizeof(*filter)); @@ -306,7 +306,7 @@ void strmbase_filter_init(struct strmbase_filter *filter, const IBaseFilterVtbl filter->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": strmbase_filter.csFilter"); filter->clsid = *clsid; filter->pin_version = 1; - filter->pFuncsTable = func_table; + filter->ops = ops; } void strmbase_filter_cleanup(struct strmbase_filter *This) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 791901077d..3f0883fcb6 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -162,7 +162,7 @@ struct strmbase_filter CLSID clsid; LONG pin_version; - const struct strmbase_filter_ops *pFuncsTable; + const struct strmbase_filter_ops *ops; }; struct strmbase_filter_ops

1 0

Zebediah Figura : strmbase: Get rid of the BaseRendererFuncTable typedef.
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: 0f8dbcdf803e82cb2eeeb083ea32046eda0ae065 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f8dbcdf803e82cb2eeeb083… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 23 20:04:24 2019 -0500 strmbase: Get rid of the BaseRendererFuncTable typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.c | 2 +- dlls/qedit/nullrenderer.c | 4 ++-- dlls/quartz/dsoundrender.c | 4 ++-- dlls/quartz/videorenderer.c | 4 ++-- dlls/quartz/vmr9.c | 4 ++-- dlls/strmbase/renderer.c | 4 ++-- include/wine/strmbase.h | 9 +++++---- 7 files changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c index b1721db027..acaa9927c1 100644 --- a/dlls/evr/evr.c +++ b/dlls/evr/evr.c @@ -61,7 +61,7 @@ static HRESULT WINAPI evr_CheckMediaType(struct strmbase_renderer *iface, const return E_NOTIMPL; } -static const BaseRendererFuncTable renderer_ops = +static const struct strmbase_renderer_ops renderer_ops = { .pfnCheckMediaType = evr_CheckMediaType, .pfnDoRenderSample = evr_DoRenderSample, diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c index b9bc3fec25..b3267d1ba1 100644 --- a/dlls/qedit/nullrenderer.c +++ b/dlls/qedit/nullrenderer.c @@ -55,7 +55,7 @@ static void null_renderer_destroy(struct strmbase_renderer *iface) CoTaskMemFree(filter); } -static const BaseRendererFuncTable RendererFuncTable = +static const struct strmbase_renderer_ops renderer_ops = { .pfnCheckMediaType = NullRenderer_CheckMediaType, .pfnDoRenderSample = NullRenderer_DoRenderSample, @@ -74,7 +74,7 @@ HRESULT NullRenderer_create(IUnknown *outer, void **out) pNullRenderer = CoTaskMemAlloc(sizeof(NullRendererImpl)); hr = strmbase_renderer_init(&pNullRenderer->renderer, outer, - &CLSID_NullRenderer, sink_name, &RendererFuncTable); + &CLSID_NullRenderer, sink_name, &renderer_ops); if (FAILED(hr)) CoTaskMemFree(pNullRenderer); diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 54b4c59903..ed257c373f 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -580,7 +580,7 @@ static HRESULT dsound_render_query_interface(struct strmbase_renderer *iface, RE return S_OK; } -static const BaseRendererFuncTable BaseFuncTable = +static const struct strmbase_renderer_ops renderer_ops = { .pfnCheckMediaType = DSoundRender_CheckMediaType, .pfnDoRenderSample = DSoundRender_DoRenderSample, @@ -611,7 +611,7 @@ HRESULT DSoundRender_create(IUnknown *outer, void **out) ZeroMemory(pDSoundRender, sizeof(DSoundRenderImpl)); hr = strmbase_renderer_init(&pDSoundRender->renderer, - outer, &CLSID_DSoundRender, sink_name, &BaseFuncTable); + outer, &CLSID_DSoundRender, sink_name, &renderer_ops); pDSoundRender->IBasicAudio_iface.lpVtbl = &IBasicAudio_Vtbl; pDSoundRender->IReferenceClock_iface.lpVtbl = &IReferenceClock_Vtbl; diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 0752a586bd..b21cc281b9 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -367,7 +367,7 @@ static BOOL WINAPI VideoRenderer_OnSize(BaseWindow *iface, LONG Width, LONG Heig return TRUE; } -static const BaseRendererFuncTable BaseFuncTable = +static const struct strmbase_renderer_ops renderer_ops = { .pfnCheckMediaType = VideoRenderer_CheckMediaType, .pfnDoRenderSample = VideoRenderer_DoRenderSample, @@ -760,7 +760,7 @@ HRESULT VideoRenderer_create(IUnknown *outer, void **out) pVideoRenderer->IOverlay_iface.lpVtbl = &overlay_vtbl; hr = strmbase_renderer_init(&pVideoRenderer->renderer, outer, - &CLSID_VideoRenderer, sink_name, &BaseFuncTable); + &CLSID_VideoRenderer, sink_name, &renderer_ops); if (FAILED(hr)) goto fail; diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index 6a039db99a..1a4f85c87c 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -555,7 +555,7 @@ static HRESULT vmr_pin_query_interface(struct strmbase_renderer *iface, REFIID i return S_OK; } -static const BaseRendererFuncTable BaseFuncTable = +static const struct strmbase_renderer_ops renderer_ops = { .pfnCheckMediaType = VMR9_CheckMediaType, .pfnDoRenderSample = VMR9_DoRenderSample, @@ -2229,7 +2229,7 @@ static HRESULT vmr_create(IUnknown *outer, void **out, const CLSID *clsid) pVMR->IVMRWindowlessControl9_iface.lpVtbl = &VMR9_WindowlessControl_Vtbl; pVMR->IOverlay_iface.lpVtbl = &overlay_vtbl; - hr = strmbase_renderer_init(&pVMR->renderer, outer, clsid, sink_name, &BaseFuncTable); + hr = strmbase_renderer_init(&pVMR->renderer, outer, clsid, sink_name, &renderer_ops); if (FAILED(hr)) goto fail; diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 8ff687e453..c75452aea6 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -561,14 +561,14 @@ HRESULT WINAPI BaseRendererImpl_ClearPendingSample(struct strmbase_renderer *ifa } HRESULT WINAPI strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer, - const CLSID *clsid, const WCHAR *sink_name, const BaseRendererFuncTable *func_table) + const CLSID *clsid, const WCHAR *sink_name, const struct strmbase_renderer_ops *ops) { HRESULT hr; memset(filter, 0, sizeof(*filter)); strmbase_filter_init(&filter->filter, &strmbase_renderer_vtbl, outer, clsid, &filter_ops); - filter->pFuncsTable = func_table; + filter->pFuncsTable = ops; strmbase_sink_init(&filter->sink, &BaseRenderer_InputPin_Vtbl, &filter->filter, sink_name, &input_BaseInputFuncTable, NULL); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 3c90223955..791901077d 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -527,7 +527,7 @@ struct strmbase_renderer IQualityControl *pQSink; struct QualityControlImpl *qcimpl; - const struct BaseRendererFuncTable *pFuncsTable; + const struct strmbase_renderer_ops *pFuncsTable; }; typedef HRESULT (WINAPI *BaseRenderer_CheckMediaType)(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt); @@ -541,7 +541,8 @@ typedef HRESULT (WINAPI *BaseRenderer_EndFlush) (struct strmbase_renderer *iface typedef HRESULT (WINAPI *BaseRenderer_BreakConnect) (struct strmbase_renderer *iface); typedef HRESULT (WINAPI *BaseRenderer_CompleteConnect) (struct strmbase_renderer *iface, IPin *peer); -typedef struct BaseRendererFuncTable { +struct strmbase_renderer_ops +{ BaseRenderer_CheckMediaType pfnCheckMediaType; BaseRenderer_DoRenderSample pfnDoRenderSample; void (*renderer_init_stream)(struct strmbase_renderer *iface); @@ -556,7 +557,7 @@ typedef struct BaseRendererFuncTable { void (*renderer_destroy)(struct strmbase_renderer *iface); HRESULT (*renderer_query_interface)(struct strmbase_renderer *iface, REFIID iid, void **out); HRESULT (*renderer_pin_query_interface)(struct strmbase_renderer *iface, REFIID iid, void **out); -} BaseRendererFuncTable; +}; HRESULT WINAPI BaseRendererImpl_BeginFlush(struct strmbase_renderer *filter); HRESULT WINAPI BaseRendererImpl_ClearPendingSample(struct strmbase_renderer *filter); @@ -565,7 +566,7 @@ HRESULT WINAPI BaseRendererImpl_EndFlush(struct strmbase_renderer *filter); HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *filter, IMediaSample *sample); HRESULT WINAPI strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer, - const CLSID *clsid, const WCHAR *sink_name, const BaseRendererFuncTable *func_table); + const CLSID *clsid, const WCHAR *sink_name, const struct strmbase_renderer_ops *ops); void strmbase_renderer_cleanup(struct strmbase_renderer *filter); /* Dll Functions */

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
62
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2019