February 2022 - Wine-commits

Henri Verbeet : d2d1/tests: Declare "level" as D3D_FEATURE_LEVEL in create_d3d11_device().
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: a6b44a551f8e5aafb11a90e53447d0fbb102150f URL: https://source.winehq.org/git/wine.git/?a=commit;h=a6b44a551f8e5aafb11a90e5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Feb 3 19:40:08 2022 +0100 d2d1/tests: Declare "level" as D3D_FEATURE_LEVEL in create_d3d11_device(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/d2d1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 314d8b7ce60..003aad60505 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -824,7 +824,7 @@ static ID3D10Device1 *create_d3d10_device(void) static ID3D11Device *create_d3d11_device(void) { - DWORD level = D3D_FEATURE_LEVEL_11_0; + D3D_FEATURE_LEVEL level = D3D_FEATURE_LEVEL_11_0; ID3D11Device *device; if (SUCCEEDED(D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL,

1 0

Eric Pouech : d2d1/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: aa45100f4aa5af5c33404f1d67689f8621dc14f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa45100f4aa5af5c33404f1d… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 19:40:09 2022 +0100 d2d1/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/tests/Makefile.in | 1 - dlls/d2d1/tests/d2d1.c | 1341 +++++++++++++++++++++---------------------- 2 files changed, 666 insertions(+), 676 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=aa45100f4aa5af5c3340…

1 0

Eric Pouech : d3d10_1/tests: Build without -DWINE_NO_LONG_TYPES.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 557674695c877cde387d976ba856781574de49a6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=557674695c877cde387d976b… Author: Eric Pouech <eric.pouech(a)gmail.com> Date: Thu Feb 3 19:40:10 2022 +0100 d3d10_1/tests: Build without -DWINE_NO_LONG_TYPES. Signed-off-by: Eric Pouech <eric.pouech(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/tests/Makefile.in | 1 - dlls/d3d10_1/tests/d3d10_1.c | 104 ++++++++++++++++++++--------------------- 2 files changed, 52 insertions(+), 53 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=557674695c877cde387d…

1 0

Dmitry Timoshkov : user32/tests: Actually test ShowWindow() return value.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: cc91ba6da75ab82d249a5fea3b00abded5021585 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc91ba6da75ab82d249a5fea… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Feb 3 20:27:20 2022 +0300 user32/tests: Actually test ShowWindow() return value. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/win.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/win.c b/dlls/user32/tests/win.c index 5ce7eb02f1c..8ec6d8af064 100644 --- a/dlls/user32/tests/win.c +++ b/dlls/user32/tests/win.c @@ -7232,7 +7232,7 @@ static void test_ShowWindow(void) ok(EqualRect(&rc, &rcNonClient), "expected %s, got %s\n", wine_dbgstr_rect(&rcNonClient), wine_dbgstr_rect(&rc)); - ShowWindow(hwnd, SW_RESTORE); + ret = ShowWindow(hwnd, SW_RESTORE); ok(ret, "not expected ret: %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); @@ -7246,7 +7246,7 @@ static void test_ShowWindow(void) ok(EqualRect(&rcClient, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcClient), wine_dbgstr_rect(&rc)); - ShowWindow(hwnd, SW_MAXIMIZE); + ret = ShowWindow(hwnd, SW_MAXIMIZE); ok(ret, "not expected ret: %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n"); @@ -7264,7 +7264,7 @@ static void test_ShowWindow(void) ok(EqualRect(&rcResized, &rc), "expected %s, got %s\n", wine_dbgstr_rect(&rcResized), wine_dbgstr_rect(&rc)); - ShowWindow(hwnd, SW_RESTORE); + ret = ShowWindow(hwnd, SW_RESTORE); ok(ret, "not expected ret: %lu\n", ret); style = GetWindowLongA(hwnd, GWL_STYLE); ok(!(style & WS_DISABLED), "window should not be disabled\n");

1 0

Zebediah Figura : shell32: Move explorer window messages definitions to shell32_main.h.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 295285620aa2557115ea020009da5315a9190ad2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=295285620aa2557115ea0200… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 2 22:56:40 2022 -0600 shell32: Move explorer window messages definitions to shell32_main.h. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_main.h | 22 ++++++++++++++++++++++ dlls/shell32/undocshell.h | 25 ------------------------- 2 files changed, 22 insertions(+), 25 deletions(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index b98629298aa..ea8019a85e2 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -268,4 +268,26 @@ static inline WCHAR *strdupAtoW(const char *str) return ret; } +/* explorer ("cabinet") window messages */ +#define CWM_SETPATH (WM_USER + 2) +#define CWM_WANTIDLE (WM_USER + 3) +#define CWM_GETSETCURRENTINFO (WM_USER + 4) +#define CWM_SELECTITEM (WM_USER + 5) +#define CWM_SELECTITEMSTR (WM_USER + 6) +#define CWM_GETISHELLBROWSER (WM_USER + 7) +#define CWM_TESTPATH (WM_USER + 9) +#define CWM_STATECHANGE (WM_USER + 10) +#define CWM_GETPATH (WM_USER + 12) + +/* CWM_TESTPATH types */ +#define CWTP_ISEQUAL 0 +#define CWTP_ISCHILD 1 + +/* CWM_TESTPATH structure */ +typedef struct +{ + DWORD dwType; + ITEMIDLIST idl; +} CWTESTPATHSTRUCT; + #endif diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index e4ed7c3630a..881832c5185 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -61,31 +61,6 @@ LPVOID WINAPI SHLockShared( BOOL WINAPI SHUnlockShared(LPVOID pv); -/**************************************************************************** - * Cabinet Window Messages - */ - -#define CWM_SETPATH (WM_USER + 2) -#define CWM_WANTIDLE (WM_USER + 3) -#define CWM_GETSETCURRENTINFO (WM_USER + 4) -#define CWM_SELECTITEM (WM_USER + 5) -#define CWM_SELECTITEMSTR (WM_USER + 6) -#define CWM_GETISHELLBROWSER (WM_USER + 7) -#define CWM_TESTPATH (WM_USER + 9) -#define CWM_STATECHANGE (WM_USER + 10) -#define CWM_GETPATH (WM_USER + 12) - -/* CWM_TESTPATH types */ -#define CWTP_ISEQUAL 0 -#define CWTP_ISCHILD 1 - -/* CWM_TESTPATH structure */ -typedef struct -{ - DWORD dwType; - ITEMIDLIST idl; -} CWTESTPATHSTRUCT,* LPCWTESTPATHSTRUCT; - /**************************************************************************** * System Imagelist Routines */

1 0

Zebediah Figura : shell32: Move StrRetToStrN*() helpers to shell32_main.h.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 2d6a314ecf6d4bba3f266a8ef0c8c5813837059b URL: https://source.winehq.org/git/wine.git/?a=commit;h=2d6a314ecf6d4bba3f266a8e… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 2 22:56:41 2022 -0600 shell32: Move StrRetToStrN*() helpers to shell32_main.h. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/shell32/shell32_main.h | 3 +++ dlls/shell32/undocshell.h | 6 ------ 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/shell32/shell32_main.h b/dlls/shell32/shell32_main.h index ea8019a85e2..14011489e86 100644 --- a/dlls/shell32/shell32_main.h +++ b/dlls/shell32/shell32_main.h @@ -290,4 +290,7 @@ typedef struct ITEMIDLIST idl; } CWTESTPATHSTRUCT; +BOOL WINAPI StrRetToStrNA(char *, DWORD, STRRET *, const ITEMIDLIST *); +BOOL WINAPI StrRetToStrNW(WCHAR *, DWORD, STRRET *, const ITEMIDLIST *); + #endif diff --git a/dlls/shell32/undocshell.h b/dlls/shell32/undocshell.h index 881832c5185..61c2ff4069f 100644 --- a/dlls/shell32/undocshell.h +++ b/dlls/shell32/undocshell.h @@ -31,12 +31,6 @@ extern "C" { #endif /* defined(__cplusplus) */ -/* - string functions -*/ -BOOL WINAPI StrRetToStrNA(LPSTR,DWORD,LPSTRRET,const ITEMIDLIST*); -BOOL WINAPI StrRetToStrNW(LPWSTR,DWORD,LPSTRRET,const ITEMIDLIST*); - /**************************************************************************** * Memory Routines */

1 0

Zebediah Figura : quartz/tests: Test more interfaces exposed by the filter graph.
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 09cf9b8a13594bd9f344a5c1771536017b939c63 URL: https://source.winehq.org/git/wine.git/?a=commit;h=09cf9b8a13594bd9f344a5c1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 2 22:58:06 2022 -0600 quartz/tests: Test more interfaces exposed by the filter graph. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/tests/filtergraph.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/dlls/quartz/tests/filtergraph.c b/dlls/quartz/tests/filtergraph.c index bd086445a3b..98f7b30717d 100644 --- a/dlls/quartz/tests/filtergraph.c +++ b/dlls/quartz/tests/filtergraph.c @@ -98,23 +98,30 @@ static void test_interfaces(void) IFilterGraph2 *graph = create_graph(); check_interface(graph, &IID_IBasicAudio, TRUE); + check_interface(graph, &IID_IBasicVideo, TRUE); check_interface(graph, &IID_IBasicVideo2, TRUE); + check_interface(graph, &IID_IFilterGraph, TRUE); check_interface(graph, &IID_IFilterGraph2, TRUE); check_interface(graph, &IID_IFilterMapper, TRUE); + check_interface(graph, &IID_IFilterMapper2, TRUE); check_interface(graph, &IID_IFilterMapper3, TRUE); + check_interface(graph, &IID_IGraphBuilder, TRUE); check_interface(graph, &IID_IGraphConfig, TRUE); check_interface(graph, &IID_IGraphVersion, TRUE); check_interface(graph, &IID_IMediaControl, TRUE); check_interface(graph, &IID_IMediaEvent, TRUE); - check_interface(graph, &IID_IMediaFilter, TRUE); + check_interface(graph, &IID_IMediaEventEx, TRUE); check_interface(graph, &IID_IMediaEventSink, TRUE); + check_interface(graph, &IID_IMediaFilter, TRUE); check_interface(graph, &IID_IMediaPosition, TRUE); check_interface(graph, &IID_IMediaSeeking, TRUE); check_interface(graph, &IID_IObjectWithSite, TRUE); check_interface(graph, &IID_IVideoFrameStep, TRUE); check_interface(graph, &IID_IVideoWindow, TRUE); + check_interface(graph, &IID_IUnknown, TRUE); check_interface(graph, &IID_IBaseFilter, FALSE); + check_interface(graph, &IID_IDispatch, FALSE); IFilterGraph2_Release(graph); }

1 0

Zebediah Figura : quartz/filtergraph: Remove "#if 1" from CheckCircularConnection().
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: 9942693a8552b7b83ccb67fccec68755bb5451c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9942693a8552b7b83ccb67fc… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 2 22:58:07 2022 -0600 quartz/filtergraph: Remove "#if 1" from CheckCircularConnection(). Cycle detection is done by native quartz. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 4132ffa5b2f..aa646615428 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -776,7 +776,6 @@ static HRESULT WINAPI FilterGraph2_FindFilterByName(IFilterGraph2 *iface, */ static HRESULT CheckCircularConnection(struct filter_graph *This, IPin *out, IPin *in) { -#if 1 HRESULT hr; PIN_INFO info_out, info_in; @@ -841,10 +840,6 @@ out: if (FAILED(hr)) ERR("Checking filtergraph returned %08x, something's not right!\n", hr); return hr; -#else - /* Debugging filtergraphs not enabled */ - return S_OK; -#endif } static struct filter *find_sorted_filter(struct filter_graph *graph, IBaseFilter *iface)

1 0

Zebediah Figura : quartz/filtergraph: Remove redundant checks for pin direction from CheckCircularConnection().
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: ae9d64ed4cf1f1d80c5faee1b5a90a6d5739bc97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae9d64ed4cf1f1d80c5faee1… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 2 22:58:08 2022 -0600 quartz/filtergraph: Remove redundant checks for pin direction from CheckCircularConnection(). These are already checked in the callers. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index aa646615428..74f1adcb665 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -782,22 +782,12 @@ static HRESULT CheckCircularConnection(struct filter_graph *This, IPin *out, IPi hr = IPin_QueryPinInfo(out, &info_out); if (FAILED(hr)) return hr; - if (info_out.dir != PINDIR_OUTPUT) - { - IBaseFilter_Release(info_out.pFilter); - return VFW_E_CANNOT_CONNECT; - } hr = IPin_QueryPinInfo(in, &info_in); if (SUCCEEDED(hr)) IBaseFilter_Release(info_in.pFilter); if (FAILED(hr)) goto out; - if (info_in.dir != PINDIR_INPUT) - { - hr = VFW_E_CANNOT_CONNECT; - goto out; - } if (info_out.pFilter == info_in.pFilter) hr = VFW_E_CIRCULAR_GRAPH;

1 0

Zebediah Figura : quartz/filtergraph: Clean up CheckCircularConnection().
by Alexandre Julliard 03 Feb '22

03 Feb '22

Module: wine Branch: master Commit: e41b3529e394d53ffac0e8ac1e88749d8d942329 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e41b3529e394d53ffac0e8ac… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Feb 2 22:58:09 2022 -0600 quartz/filtergraph: Clean up CheckCircularConnection(). Use clearer variable names, and simplify the error handling. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/filtergraph.c | 91 ++++++++++++++++++++++++----------------------- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/dlls/quartz/filtergraph.c b/dlls/quartz/filtergraph.c index 74f1adcb665..0dccf2b7fb4 100644 --- a/dlls/quartz/filtergraph.c +++ b/dlls/quartz/filtergraph.c @@ -771,65 +771,66 @@ static HRESULT WINAPI FilterGraph2_FindFilterByName(IFilterGraph2 *iface, return VFW_E_NOT_FOUND; } -/* Don't allow a circular connection to form, return VFW_E_CIRCULAR_GRAPH if this would be the case. - * A circular connection will be formed if from the filter of the output pin, the input pin can be reached - */ -static HRESULT CheckCircularConnection(struct filter_graph *This, IPin *out, IPin *in) +static HRESULT check_cyclic_connection(IPin *source, IPin *sink) { + IPin *upstream_source, *upstream_sink; + PIN_INFO source_info, sink_info; + IEnumPins *enumpins; HRESULT hr; - PIN_INFO info_out, info_in; - hr = IPin_QueryPinInfo(out, &info_out); + hr = IPin_QueryPinInfo(sink, &sink_info); if (FAILED(hr)) + { + ERR("Failed to query pin, hr %#x.\n", hr); return hr; + } + IBaseFilter_Release(sink_info.pFilter); - hr = IPin_QueryPinInfo(in, &info_in); - if (SUCCEEDED(hr)) - IBaseFilter_Release(info_in.pFilter); + hr = IPin_QueryPinInfo(source, &source_info); if (FAILED(hr)) - goto out; + { + ERR("Failed to query pin, hr %#x.\n", hr); + return hr; + } - if (info_out.pFilter == info_in.pFilter) - hr = VFW_E_CIRCULAR_GRAPH; - else + if (sink_info.pFilter == source_info.pFilter) { - IEnumPins *enumpins; - IPin *test; + WARN("Cyclic connection detected; returning VFW_E_CIRCULAR_GRAPH.\n"); + IBaseFilter_Release(source_info.pFilter); + return VFW_E_CIRCULAR_GRAPH; + } - hr = IBaseFilter_EnumPins(info_out.pFilter, &enumpins); - if (FAILED(hr)) - goto out; + hr = IBaseFilter_EnumPins(source_info.pFilter, &enumpins); + if (FAILED(hr)) + { + ERR("Failed to enumerate pins, hr %#x.\n", hr); + IBaseFilter_Release(source_info.pFilter); + return hr; + } + + while ((hr = IEnumPins_Next(enumpins, 1, &upstream_sink, NULL)) == S_OK) + { + PIN_DIRECTION dir = PINDIR_OUTPUT; - IEnumPins_Reset(enumpins); - while ((hr = IEnumPins_Next(enumpins, 1, &test, NULL)) == S_OK) + IPin_QueryDirection(upstream_sink, &dir); + if (dir == PINDIR_INPUT && IPin_ConnectedTo(upstream_sink, &upstream_source) == S_OK) { - PIN_DIRECTION dir = PINDIR_OUTPUT; - IPin_QueryDirection(test, &dir); - if (dir == PINDIR_INPUT) + hr = check_cyclic_connection(upstream_source, sink); + IPin_Release(upstream_source); + if (FAILED(hr)) { - IPin *victim = NULL; - IPin_ConnectedTo(test, &victim); - if (victim) - { - hr = CheckCircularConnection(This, victim, in); - IPin_Release(victim); - if (FAILED(hr)) - { - IPin_Release(test); - break; - } - } + IPin_Release(upstream_sink); + IEnumPins_Release(enumpins); + IBaseFilter_Release(source_info.pFilter); + return hr; } - IPin_Release(test); } - IEnumPins_Release(enumpins); + IPin_Release(upstream_sink); } + IEnumPins_Release(enumpins); -out: - IBaseFilter_Release(info_out.pFilter); - if (FAILED(hr)) - ERR("Checking filtergraph returned %08x, something's not right!\n", hr); - return hr; + IBaseFilter_Release(source_info.pFilter); + return S_OK; } static struct filter *find_sorted_filter(struct filter_graph *graph, IBaseFilter *iface) @@ -855,7 +856,7 @@ static void sort_filter_recurse(struct filter_graph *graph, struct filter *filte TRACE("Sorting filter %p.\n", filter->filter); - /* Cyclic connections should be caught by CheckCircularConnection(). */ + /* Cyclic connections should be caught by check_cyclic_connection(). */ assert(!filter->sorting); filter->sorting = TRUE; @@ -935,13 +936,13 @@ static HRESULT WINAPI FilterGraph2_ConnectDirect(IFilterGraph2 *iface, IPin *ppi { if (dir == PINDIR_INPUT) { - hr = CheckCircularConnection(This, ppinOut, ppinIn); + hr = check_cyclic_connection(ppinOut, ppinIn); if (SUCCEEDED(hr)) hr = IPin_Connect(ppinOut, ppinIn, pmt); } else { - hr = CheckCircularConnection(This, ppinIn, ppinOut); + hr = check_cyclic_connection(ppinIn, ppinOut); if (SUCCEEDED(hr)) hr = IPin_Connect(ppinIn, ppinOut, pmt); }

1 0