October 2019 - Wine-commits

Paul Gofman : d3d9/tests: Factor out wait_query() function.
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: b9d0cec5f29816e105d3f7b0520b084e4f03c57c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b9d0cec5f29816e105d3f7b0… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Oct 23 19:44:57 2019 +0300 d3d9/tests: Factor out wait_query() function. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 67 +++++++++++------------------------------------- dlls/d3d9/tests/utils.h | 39 ++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+), 52 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 170ad57124..40ca639001 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -25,7 +25,7 @@ #define WINVER 0x0602 /* for CURSOR_SUPPRESSED */ #define COBJMACROS #include <d3d9.h> -#include "wine/test.h" +#include "utils.h" struct vec3 { @@ -5947,13 +5947,8 @@ static void test_occlusion_query(void) hr = IDirect3DQuery9_Issue(query, D3DISSUE_END); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - for (i = 0; i < 500; ++i) - { - if ((hr = IDirect3DQuery9_GetData(query, NULL, 0, D3DGETDATA_FLUSH)) != S_FALSE) - break; - Sleep(10); - } - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + wait_query(query); memset(&data, 0xff, sizeof(data)); hr = IDirect3DQuery9_GetData(query, &data, data_size, D3DGETDATA_FLUSH); @@ -6057,13 +6052,7 @@ static void test_occlusion_query(void) hr = IDirect3DQuery9_Issue(query, D3DISSUE_END); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - for (i = 0; i < 500; ++i) - { - if ((hr = IDirect3DQuery9_GetData(query, NULL, 0, D3DGETDATA_FLUSH)) != S_FALSE) - break; - Sleep(10); - } - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + wait_query(query); memset(&data, 0xff, sizeof(data)); hr = IDirect3DQuery9_GetData(query, &data, sizeof(data), D3DGETDATA_FLUSH); @@ -6085,13 +6074,7 @@ static void test_occlusion_query(void) hr = IDirect3DDevice9_EndScene(device); ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); - for (i = 0; i < 500; ++i) - { - if ((hr = IDirect3DQuery9_GetData(query, NULL, 0, D3DGETDATA_FLUSH)) == S_OK) - break; - Sleep(10); - } - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + wait_query(query); memset(&data, 0xff, sizeof(data)); hr = IDirect3DQuery9_GetData(query, &data, sizeof(data), D3DGETDATA_FLUSH); @@ -6119,8 +6102,8 @@ static void test_timestamp_query(void) 1.0f, -1.0f, 0.0f, }; IDirect3DQuery9 *query, *disjoint_query, *freq_query; - unsigned int data_size, i; IDirect3DDevice9 *device; + unsigned int data_size; IDirect3D9 *d3d9; ULONG refcount; HWND window; @@ -6183,14 +6166,8 @@ static void test_timestamp_query(void) ok(data_size == sizeof(UINT64), "Query data size is %u, 8 expected.\n", data_size); hr = IDirect3DQuery9_Issue(freq_query, D3DISSUE_END); - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - for (i = 0; i < 500; ++i) - { - if ((hr = IDirect3DQuery9_GetData(freq_query, NULL, 0, D3DGETDATA_FLUSH)) != S_FALSE) - break; - Sleep(10); - } - ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + + wait_query(freq_query); memset(freq, 0xff, sizeof(freq)); hr = IDirect3DQuery9_GetData(freq_query, freq, sizeof(DWORD), D3DGETDATA_FLUSH); @@ -6235,13 +6212,8 @@ static void test_timestamp_query(void) hr = IDirect3DQuery9_Issue(query, D3DISSUE_END); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - for (i = 0; i < 500; ++i) - { - if ((hr = IDirect3DQuery9_GetData(query, NULL, 0, D3DGETDATA_FLUSH)) != S_FALSE) - break; - Sleep(10); - } - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + wait_query(query); memset(timestamp, 0xff, sizeof(timestamp)); hr = IDirect3DQuery9_GetData(query, timestamp, sizeof(DWORD), D3DGETDATA_FLUSH); @@ -6259,13 +6231,8 @@ static void test_timestamp_query(void) hr = IDirect3DQuery9_Issue(disjoint_query, D3DISSUE_END); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - for (i = 0; i < 500; ++i) - { - if ((hr = IDirect3DQuery9_GetData(disjoint_query, NULL, 0, D3DGETDATA_FLUSH)) != S_FALSE) - break; - Sleep(10); - } - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + wait_query(disjoint_query); memset(disjoint, 0xff, sizeof(disjoint)); hr = IDirect3DQuery9_GetData(disjoint_query, disjoint, sizeof(WORD), D3DGETDATA_FLUSH); @@ -6287,13 +6254,9 @@ static void test_timestamp_query(void) hr = IDirect3DQuery9_Issue(query, D3DISSUE_END); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); - for (i = 0; i < 500; ++i) - { - if ((hr = IDirect3DQuery9_GetData(query, NULL, 0, D3DGETDATA_FLUSH)) != S_FALSE) - break; - Sleep(10); - } - ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + wait_query(query); + hr = IDirect3DQuery9_GetData(query, timestamp, sizeof(timestamp), D3DGETDATA_FLUSH); ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); diff --git a/dlls/d3d9/tests/utils.h b/dlls/d3d9/tests/utils.h new file mode 100644 index 0000000000..aa6a3227d6 --- /dev/null +++ b/dlls/d3d9/tests/utils.h @@ -0,0 +1,39 @@ +/* + * Copyright 2019 Paul Gofman + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifndef __WINE_D3D9_TESTS_UTILS_H +#define __WINE_D3D9_TESTS_UTILS_H + +#include "wine/test.h" + +#define wait_query(a) wait_query_(__FILE__, __LINE__, a) +static inline void wait_query_(const char *file, unsigned int line, IDirect3DQuery9 *query) +{ + unsigned int i; + HRESULT hr; + + for (i = 0; i < 500; ++i) + { + if ((hr = IDirect3DQuery9_GetData(query, NULL, 0, D3DGETDATA_FLUSH)) == S_OK) + break; + Sleep(10); + } + ok_(file, line)(hr == S_OK, "Got unexpected hr %#x.\n", hr); +} + +#endif

1 0

Paul Gofman : wined3d: Issue texture barrier before using a texture attached to FBO.
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: a5551040f234090ff5ac60e7a4aaff2d76fc2ada URL: https://source.winehq.org/git/wine.git/?a=commit;h=a5551040f234090ff5ac60e7… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Oct 23 19:44:58 2019 +0300 wined3d: Issue texture barrier before using a texture attached to FBO. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45978 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 163 ++++++++++++++++++++++++++++++++++++++++- dlls/wined3d/adapter_gl.c | 7 ++ dlls/wined3d/context.c | 29 ++++++++ dlls/wined3d/wined3d_gl.h | 2 + dlls/wined3d/wined3d_private.h | 23 +++++- 5 files changed, 222 insertions(+), 2 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=a5551040f234090ff5ac…

1 0

Paul Gofman : wined3d: Do not allow resource to be bound as SRV and RTV at the same time.
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: 3f698b950f52bf731d397c04ad68d240d28d7e2b URL: https://source.winehq.org/git/wine.git/?a=commit;h=3f698b950f52bf731d397c04… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Wed Oct 23 19:44:59 2019 +0300 wined3d: Do not allow resource to be bound as SRV and RTV at the same time. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 223 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 35 +++++++ dlls/wined3d/stateblock.c | 1 + dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 260 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=3f698b950f52bf731d39…

1 0

Zebediah Figura : strmbase: Move strmbase_renderer_init() to avoid forward declarations.
by Alexandre Julliard 27 Oct '19

27 Oct '19

Module: wine Branch: master Commit: 1454a661e59f5845006af77382264aaf3d6aeebb URL: https://source.winehq.org/git/wine.git/?a=commit;h=1454a661e59f5845006af773… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 23 20:04:22 2019 -0500 strmbase: Move strmbase_renderer_init() to avoid forward declarations. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 70 +++++++++++++++++++++++------------------------- 1 file changed, 34 insertions(+), 36 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 86c4f7d1d7..81afc7c8d7 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -250,42 +250,6 @@ static const BaseInputPinFuncTable input_BaseInputFuncTable = .pfnReceive = BaseRenderer_Receive, }; -static const IBaseFilterVtbl strmbase_renderer_vtbl; - -HRESULT WINAPI strmbase_renderer_init(BaseRenderer *filter, IUnknown *outer, - const CLSID *clsid, const WCHAR *sink_name, const BaseRendererFuncTable *pBaseFuncsTable) -{ - HRESULT hr; - - memset(filter, 0, sizeof(*filter)); - strmbase_filter_init(&filter->filter, &strmbase_renderer_vtbl, outer, clsid, &filter_ops); - - filter->pFuncsTable = pBaseFuncsTable; - - strmbase_sink_init(&filter->sink, &BaseRenderer_InputPin_Vtbl, &filter->filter, - sink_name, &input_BaseInputFuncTable, NULL); - - hr = CreatePosPassThru(outer ? outer : (IUnknown *)&filter->filter.IBaseFilter_iface, TRUE, - &filter->sink.pin.IPin_iface, &filter->pPosition); - if (FAILED(hr)) - { - strmbase_sink_cleanup(&filter->sink); - strmbase_filter_cleanup(&filter->filter); - return hr; - } - - InitializeCriticalSection(&filter->csRenderLock); - filter->csRenderLock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": BaseRenderer.csRenderLock"); - filter->state_event = CreateEventW(NULL, TRUE, TRUE, NULL); - filter->advise_event = CreateEventW(NULL, FALSE, FALSE, NULL); - filter->flush_event = CreateEventW(NULL, TRUE, TRUE, NULL); - - QualityControlImpl_Create(&filter->sink.pin.IPin_iface, &filter->filter.IBaseFilter_iface, &filter->qcimpl); - filter->qcimpl->IQualityControl_iface.lpVtbl = &Renderer_QualityControl_Vtbl; - - return S_OK; -} - void strmbase_renderer_cleanup(BaseRenderer *filter) { if (filter->sink.pin.peer) @@ -595,3 +559,37 @@ HRESULT WINAPI BaseRendererImpl_ClearPendingSample(BaseRenderer *iface) } return S_OK; } + +HRESULT WINAPI strmbase_renderer_init(BaseRenderer *filter, IUnknown *outer, + const CLSID *clsid, const WCHAR *sink_name, const BaseRendererFuncTable *func_table) +{ + HRESULT hr; + + memset(filter, 0, sizeof(*filter)); + strmbase_filter_init(&filter->filter, &strmbase_renderer_vtbl, outer, clsid, &filter_ops); + + filter->pFuncsTable = func_table; + + strmbase_sink_init(&filter->sink, &BaseRenderer_InputPin_Vtbl, &filter->filter, + sink_name, &input_BaseInputFuncTable, NULL); + + hr = CreatePosPassThru(outer ? outer : (IUnknown *)&filter->filter.IBaseFilter_iface, + TRUE, &filter->sink.pin.IPin_iface, &filter->pPosition); + if (FAILED(hr)) + { + strmbase_sink_cleanup(&filter->sink); + strmbase_filter_cleanup(&filter->filter); + return hr; + } + + InitializeCriticalSection(&filter->csRenderLock); + filter->csRenderLock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": BaseRenderer.csRenderLock"); + filter->state_event = CreateEventW(NULL, TRUE, TRUE, NULL); + filter->advise_event = CreateEventW(NULL, FALSE, FALSE, NULL); + filter->flush_event = CreateEventW(NULL, TRUE, TRUE, NULL); + + QualityControlImpl_Create(&filter->sink.pin.IPin_iface, &filter->filter.IBaseFilter_iface, &filter->qcimpl); + filter->qcimpl->IQualityControl_iface.lpVtbl = &Renderer_QualityControl_Vtbl; + + return S_OK; +}

1 0

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

27 Oct '19

Module: wine Branch: master Commit: 487ea5df22a9b7f36cd14c887f682efe69d99363 URL: https://source.winehq.org/git/wine.git/?a=commit;h=487ea5df22a9b7f36cd14c88… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Oct 23 20:04:23 2019 -0500 strmbase: Get rid of the BaseRenderer typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/evr/evr.c | 12 ++++----- dlls/qedit/nullrenderer.c | 12 ++++----- dlls/quartz/dsoundrender.c | 49 ++++++++++++++++++------------------ dlls/quartz/videorenderer.c | 35 +++++++++++++------------- dlls/quartz/vmr9.c | 23 ++++++++--------- dlls/strmbase/renderer.c | 60 ++++++++++++++++++++++----------------------- include/wine/strmbase.h | 58 ++++++++++++++++++++----------------------- 7 files changed, 123 insertions(+), 126 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=487ea5df22a9b7f36cd1…

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

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: 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/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

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