April 2020 - Wine-Commits - list.winehq.org

Hans Leidekker : winhttp: Explicitly pass errors.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: 080dfbee311f2684280fafaa3f458f6bce6844bd URL: https://source.winehq.org/git/wine.git/?a=commit;h=080dfbee311f2684280fafaa… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Apr 7 10:22:04 2020 +0200 winhttp: Explicitly pass errors. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/cookie.c | 11 +- dlls/winhttp/net.c | 177 ++++++------- dlls/winhttp/request.c | 572 ++++++++++++++++++++--------------------- dlls/winhttp/session.c | 2 +- dlls/winhttp/winhttp_private.h | 16 +- 5 files changed, 385 insertions(+), 393 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=080dfbee311f2684280f…

1 0

Dmitry Timoshkov : include: Add dsclient.h.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: f2d2520832d188cffac1e9229efc65e96ce8fbd8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f2d2520832d188cffac1e922… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 7 18:13:51 2020 +0800 include: Add dsclient.h. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/Makefile.in | 1 + include/dsclient.h | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index 778818dca5..543d41811c 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -232,6 +232,7 @@ SOURCES = \ dplobby8.h \ dpnathlp.h \ drmexternals.idl \ + dsclient.h \ dsconf.h \ dsgetdc.h \ dshow.h \ diff --git a/include/dsclient.h b/include/dsclient.h new file mode 100644 index 0000000000..c19cf35e9b --- /dev/null +++ b/include/dsclient.h @@ -0,0 +1,61 @@ +/* + * Copyright 2020 Dmitry Timoshkov + * + * 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 __DSCLIENT_H_ +#define __DSCLIENT_H_ + +DEFINE_GUID(CLSID_DsDisplaySpecifier,0x1ab4a8c0,0x6a0b,0x11d2,0xad,0x49,0x00,0xc0,0x4f,0xa3,0x1a,0x86); +#define IID_IDsDisplaySpecifier CLSID_DsDisplaySpecifier + +#define DSECAF_NOTLISTED 0x00000001 + +typedef HRESULT (CALLBACK *LPDSENUMATTRIBUTES)(LPARAM, LPCWSTR, LPCWSTR, DWORD); + +#define DSCCIF_HASWIZARDDIALOG 0x00000001 +#define DSCCIF_HASWIZARDPRIMARYPAGE 0x00000002 + +typedef struct +{ + DWORD dwFlags; + CLSID clsidWizardDialog; + CLSID clsidWizardPrimaryPage; + DWORD cWizardExtensions; + CLSID aWizardExtensions[1]; +} DSCLASSCREATIONINFO, *LPDSCLASSCREATIONINFO; + +#undef INTERFACE +#define INTERFACE IDsDisplaySpecifier +DECLARE_INTERFACE_IID_(IDsDisplaySpecifier, IUnknown, "1ab4a8c0-6a0b-11d2-ad49-00c04fa31a86") +{ + STDMETHOD(QueryInterface)(THIS_ REFIID iid, void **obj) PURE; + STDMETHOD_(ULONG,AddRef)(THIS) PURE; + STDMETHOD_(ULONG,Release)(THIS) PURE; + STDMETHOD(SetServer)(THIS_ LPCWSTR server, LPCWSTR user, LPCWSTR password, DWORD flags) PURE; + STDMETHOD(SetLanguageID)(THIS_ LANGID lang) PURE; + STDMETHOD(GetDisplaySpecifier)(THIS_ LPCWSTR object, REFIID iid, void **obj) PURE; + STDMETHOD(GetIconLocation)(THIS_ LPCWSTR object, DWORD flags, LPWSTR buffer, INT size, INT *id) PURE; + STDMETHOD_(HICON,GetIcon)(THIS_ LPCWSTR object, DWORD flags, INT cx, INT cy) PURE; + STDMETHOD(GetFriendlyClassName)(THIS_ LPCWSTR object, LPWSTR buffer, INT size) PURE; + STDMETHOD(GetFriendlyAttributeName)(THIS_ LPCWSTR object, LPCWSTR name, LPWSTR buffer, UINT size) PURE; + STDMETHOD_(BOOL,IsClassContainer)(THIS_ LPCWSTR object, LPCWSTR path, DWORD flags) PURE; + STDMETHOD(GetClassCreationInfo)(THIS_ LPCWSTR object, LPDSCLASSCREATIONINFO *info) PURE; + STDMETHOD(EnumClassAttributes)(THIS_ LPCWSTR object, LPDSENUMATTRIBUTES cb, LPARAM param) PURE; + STDMETHOD_(ADSTYPE,GetAttributeADsType)(THIS_ LPCWSTR name) PURE; +}; + +#endif /* __DSCLIENT_H_ */

1 0

Dmitry Timoshkov : dsuiext: Add IDsDisplaySpecifier stubs.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: 736cf6050de2b62f768f0bc4b9891995577b7397 URL: https://source.winehq.org/git/wine.git/?a=commit;h=736cf6050de2b62f768f0bc4… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Apr 7 18:14:01 2020 +0800 dsuiext: Add IDsDisplaySpecifier stubs. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 + configure.ac | 1 + dlls/dsuiext/Makefile.in | 10 ++ dlls/dsuiext/dsuiext.c | 328 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/dsuiext/dsuiext.idl | 25 ++++ dlls/dsuiext/dsuiext.spec | 9 ++ 6 files changed, 375 insertions(+) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=736cf6050de2b62f768f…

1 0

Nikolay Sivov : mf: Implement dynamic stream management methods in SAR.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: 56e03da60f372f795ca5e640f7605c2ed52d6e43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=56e03da60f372f795ca5e640… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 7 10:54:57 2020 +0300 mf: Implement dynamic stream management methods in SAR. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 46 ++++++++++++++++++++++++++++++++++++++-------- dlls/mf/tests/mf.c | 35 ++++++++++++++++++++++++++++++++++- 2 files changed, 72 insertions(+), 9 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 7acbd5d4cd..ca8800b06c 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -19,6 +19,7 @@ #define COBJMACROS #include "mfidl.h" +#include "mferror.h" #include "mf_private.h" #include "wine/debug.h" @@ -30,6 +31,8 @@ struct audio_renderer { IMFMediaSink IMFMediaSink_iface; LONG refcount; + BOOL is_shut_down; + CRITICAL_SECTION cs; }; static struct audio_renderer *impl_from_IMFMediaSink(IMFMediaSink *iface) @@ -70,7 +73,10 @@ static ULONG WINAPI audio_renderer_sink_Release(IMFMediaSink *iface) TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) + { + DeleteCriticalSection(&renderer->cs); heap_free(renderer); + } return refcount; } @@ -85,23 +91,37 @@ static HRESULT WINAPI audio_renderer_sink_GetCharacteristics(IMFMediaSink *iface static HRESULT WINAPI audio_renderer_sink_AddStreamSink(IMFMediaSink *iface, DWORD stream_sink_id, IMFMediaType *media_type, IMFStreamSink **stream_sink) { - FIXME("%p, %#x, %p, %p.\n", iface, stream_sink_id, media_type, stream_sink); + struct audio_renderer *renderer = impl_from_IMFMediaSink(iface); - return E_NOTIMPL; + TRACE("%p, %#x, %p, %p.\n", iface, stream_sink_id, media_type, stream_sink); + + return renderer->is_shut_down ? MF_E_SHUTDOWN : MF_E_STREAMSINKS_FIXED; } static HRESULT WINAPI audio_renderer_sink_RemoveStreamSink(IMFMediaSink *iface, DWORD stream_sink_id) { - FIXME("%p, %#x.\n", iface, stream_sink_id); + struct audio_renderer *renderer = impl_from_IMFMediaSink(iface); - return E_NOTIMPL; + TRACE("%p, %#x.\n", iface, stream_sink_id); + + return renderer->is_shut_down ? MF_E_SHUTDOWN : MF_E_STREAMSINKS_FIXED; } static HRESULT WINAPI audio_renderer_sink_GetStreamSinkCount(IMFMediaSink *iface, DWORD *count) { - FIXME("%p, %p.\n", iface, count); + struct audio_renderer *renderer = impl_from_IMFMediaSink(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, count); + + if (!count) + return E_POINTER; + + if (renderer->is_shut_down) + return MF_E_SHUTDOWN; + + *count = 1; + + return S_OK; } static HRESULT WINAPI audio_renderer_sink_GetStreamSinkByIndex(IMFMediaSink *iface, DWORD index, @@ -136,9 +156,18 @@ static HRESULT WINAPI audio_renderer_sink_GetPresentationClock(IMFMediaSink *ifa static HRESULT WINAPI audio_renderer_sink_Shutdown(IMFMediaSink *iface) { - FIXME("%p.\n", iface); + struct audio_renderer *renderer = impl_from_IMFMediaSink(iface); - return E_NOTIMPL; + TRACE("%p.\n", iface); + + if (renderer->is_shut_down) + return MF_E_SHUTDOWN; + + EnterCriticalSection(&renderer->cs); + renderer->is_shut_down = TRUE; + LeaveCriticalSection(&renderer->cs); + + return S_OK; } static const IMFMediaSinkVtbl audio_renderer_sink_vtbl = @@ -168,6 +197,7 @@ static HRESULT sar_create_object(IMFAttributes *attributes, void *user_context, renderer->IMFMediaSink_iface.lpVtbl = &audio_renderer_sink_vtbl; renderer->refcount = 1; + InitializeCriticalSection(&renderer->cs); *obj = (IUnknown *)&renderer->IMFMediaSink_iface; diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index 46024d3fba..578c5bcaf7 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2634,10 +2634,11 @@ static void test_sar(void) IMFPresentationTimeSource *time_source; IMFClockStateSink *state_sink; IMFMediaSink *sink, *sink2; + IMFStreamSink *stream_sink; IMFActivate *activate; MFCLOCK_STATE state; + DWORD flags, count; IMFClock *clock; - DWORD flags; HRESULT hr; hr = CoInitialize(NULL); @@ -2679,6 +2680,38 @@ if (SUCCEEDED(hr)) IMFPresentationTimeSource_Release(time_source); } + hr = IMFMediaSink_AddStreamSink(sink, 123, NULL, &stream_sink); + ok(hr == MF_E_STREAMSINKS_FIXED, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSink_RemoveStreamSink(sink, 0); + ok(hr == MF_E_STREAMSINKS_FIXED, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSink_GetStreamSinkCount(sink, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSink_GetStreamSinkCount(sink, &count); + ok(hr == S_OK, "Unexpected hr %#x.\n", hr); + ok(count == 1, "Unexpected count %u.\n", count); + + /* Shutdown */ + hr = IMFMediaSink_Shutdown(sink); + ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); + + hr = IMFMediaSink_Shutdown(sink); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSink_AddStreamSink(sink, 123, NULL, &stream_sink); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSink_RemoveStreamSink(sink, 0); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSink_GetStreamSinkCount(sink, NULL); + ok(hr == E_POINTER, "Unexpected hr %#x.\n", hr); + + hr = IMFMediaSink_GetStreamSinkCount(sink, &count); + ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); + IMFMediaSink_Release(sink); /* Activation */

1 0

Nikolay Sivov : mf: Add IMFMediaSink stub for SAR.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: 3fd039fa526103d54ed419e424fe25bb6aa826f1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3fd039fa526103d54ed419e4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Apr 7 10:54:56 2020 +0300 mf: Add IMFMediaSink stub for SAR. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mf/sar.c | 145 ++++++++++++++++++++++++++++++++++++++++++++++++++++- dlls/mf/tests/mf.c | 19 ++++--- 2 files changed, 152 insertions(+), 12 deletions(-) diff --git a/dlls/mf/sar.c b/dlls/mf/sar.c index 4f20472748..7acbd5d4cd 100644 --- a/dlls/mf/sar.c +++ b/dlls/mf/sar.c @@ -26,13 +26,154 @@ WINE_DEFAULT_DEBUG_CHANNEL(mfplat); -static HRESULT sar_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) +struct audio_renderer +{ + IMFMediaSink IMFMediaSink_iface; + LONG refcount; +}; + +static struct audio_renderer *impl_from_IMFMediaSink(IMFMediaSink *iface) +{ + return CONTAINING_RECORD(iface, struct audio_renderer, IMFMediaSink_iface); +} + +static HRESULT WINAPI audio_renderer_sink_QueryInterface(IMFMediaSink *iface, REFIID riid, void **obj) +{ + TRACE("%p, %s, %p.\n", iface, debugstr_guid(riid), obj); + + if (IsEqualIID(riid, &IID_IMFMediaSink) || + IsEqualIID(riid, &IID_IUnknown)) + { + *obj = iface; + IMFMediaSink_AddRef(iface); + return S_OK; + } + + WARN("Unsupported %s.\n", debugstr_guid(riid)); + *obj = NULL; + return E_NOINTERFACE; +} + +static ULONG WINAPI audio_renderer_sink_AddRef(IMFMediaSink *iface) +{ + struct audio_renderer *renderer = impl_from_IMFMediaSink(iface); + ULONG refcount = InterlockedIncrement(&renderer->refcount); + TRACE("%p, refcount %u.\n", iface, refcount); + return refcount; +} + +static ULONG WINAPI audio_renderer_sink_Release(IMFMediaSink *iface) +{ + struct audio_renderer *renderer = impl_from_IMFMediaSink(iface); + ULONG refcount = InterlockedDecrement(&renderer->refcount); + + TRACE("%p, refcount %u.\n", iface, refcount); + + if (!refcount) + heap_free(renderer); + + return refcount; +} + +static HRESULT WINAPI audio_renderer_sink_GetCharacteristics(IMFMediaSink *iface, DWORD *flags) +{ + FIXME("%p, %p.\n", iface, flags); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_renderer_sink_AddStreamSink(IMFMediaSink *iface, DWORD stream_sink_id, + IMFMediaType *media_type, IMFStreamSink **stream_sink) +{ + FIXME("%p, %#x, %p, %p.\n", iface, stream_sink_id, media_type, stream_sink); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_renderer_sink_RemoveStreamSink(IMFMediaSink *iface, DWORD stream_sink_id) +{ + FIXME("%p, %#x.\n", iface, stream_sink_id); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_renderer_sink_GetStreamSinkCount(IMFMediaSink *iface, DWORD *count) { - FIXME("%p, %p, %p.\n", attributes, user_context, obj); + FIXME("%p, %p.\n", iface, count); return E_NOTIMPL; } +static HRESULT WINAPI audio_renderer_sink_GetStreamSinkByIndex(IMFMediaSink *iface, DWORD index, + IMFStreamSink **stream) +{ + FIXME("%p, %u, %p.\n", iface, index, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_renderer_sink_GetStreamSinkById(IMFMediaSink *iface, DWORD stream_sink_id, + IMFStreamSink **stream) +{ + FIXME("%p, %#x, %p.\n", iface, stream_sink_id, stream); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_renderer_sink_SetPresentationClock(IMFMediaSink *iface, IMFPresentationClock *clock) +{ + FIXME("%p, %p.\n", iface, clock); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_renderer_sink_GetPresentationClock(IMFMediaSink *iface, IMFPresentationClock **clock) +{ + FIXME("%p, %p.\n", iface, clock); + + return E_NOTIMPL; +} + +static HRESULT WINAPI audio_renderer_sink_Shutdown(IMFMediaSink *iface) +{ + FIXME("%p.\n", iface); + + return E_NOTIMPL; +} + +static const IMFMediaSinkVtbl audio_renderer_sink_vtbl = +{ + audio_renderer_sink_QueryInterface, + audio_renderer_sink_AddRef, + audio_renderer_sink_Release, + audio_renderer_sink_GetCharacteristics, + audio_renderer_sink_AddStreamSink, + audio_renderer_sink_RemoveStreamSink, + audio_renderer_sink_GetStreamSinkCount, + audio_renderer_sink_GetStreamSinkByIndex, + audio_renderer_sink_GetStreamSinkById, + audio_renderer_sink_SetPresentationClock, + audio_renderer_sink_GetPresentationClock, + audio_renderer_sink_Shutdown, +}; + +static HRESULT sar_create_object(IMFAttributes *attributes, void *user_context, IUnknown **obj) +{ + struct audio_renderer *renderer; + + TRACE("%p, %p, %p.\n", attributes, user_context, obj); + + if (!(renderer = heap_alloc_zero(sizeof(*renderer)))) + return E_OUTOFMEMORY; + + renderer->IMFMediaSink_iface.lpVtbl = &audio_renderer_sink_vtbl; + renderer->refcount = 1; + + *obj = (IUnknown *)&renderer->IMFMediaSink_iface; + + return S_OK; +} + static void sar_shutdown_object(void *user_context, IUnknown *obj) { /* FIXME: shut down sink */ diff --git a/dlls/mf/tests/mf.c b/dlls/mf/tests/mf.c index dfbd928f60..46024d3fba 100644 --- a/dlls/mf/tests/mf.c +++ b/dlls/mf/tests/mf.c @@ -2650,15 +2650,14 @@ static void test_sar(void) CoUninitialize(); return; } - -todo_wine ok(hr == S_OK, "Failed to create renderer, hr %#x.\n", hr); -if (SUCCEEDED(hr)) -{ hr = IMFMediaSink_QueryInterface(sink, &IID_IMFPresentationTimeSource, (void **)&time_source); +todo_wine ok(hr == S_OK, "Failed to get time source interface, hr %#x.\n", hr); +if (SUCCEEDED(hr)) +{ hr = IMFPresentationTimeSource_GetUnderlyingClock(time_source, &clock); ok(hr == MF_E_NO_CLOCK, "Unexpected hr %#x.\n", hr); @@ -2679,31 +2678,30 @@ if (SUCCEEDED(hr)) IMFClockStateSink_Release(state_sink); IMFPresentationTimeSource_Release(time_source); - - IMFMediaSink_Release(sink); } + IMFMediaSink_Release(sink); + /* Activation */ hr = MFCreateAudioRendererActivate(&activate); ok(hr == S_OK, "Failed to create activation object, hr %#x.\n", hr); hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink); -todo_wine ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); -if (hr == S_OK) -{ hr = IMFActivate_ActivateObject(activate, &IID_IMFMediaSink, (void **)&sink2); ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); ok(sink == sink2, "Unexpected instance.\n"); IMFMediaSink_Release(sink2); hr = IMFMediaSink_GetCharacteristics(sink, &flags); +todo_wine ok(hr == S_OK, "Failed to get sink flags, hr %#x.\n", hr); hr = IMFActivate_ShutdownObject(activate); ok(hr == S_OK, "Failed to shut down, hr %#x.\n", hr); hr = IMFMediaSink_GetCharacteristics(sink, &flags); +todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); IMFMediaSink_Release(sink); @@ -2712,13 +2710,14 @@ if (hr == S_OK) ok(hr == S_OK, "Failed to activate, hr %#x.\n", hr); hr = IMFMediaSink_GetCharacteristics(sink, &flags); +todo_wine ok(hr == MF_E_SHUTDOWN, "Unexpected hr %#x.\n", hr); IMFMediaSink_Release(sink); hr = IMFActivate_DetachObject(activate); ok(hr == E_NOTIMPL, "Unexpected hr %#x.\n", hr); -} + IMFActivate_Release(activate); CoUninitialize();

1 0

Chip Davis : d2d1: Return enum constants directly in d2d_bitmap_brush_GetInterpolationMode() (Clang).
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: 69487dad1c60935502078fa6b38346b2e2e1689c URL: https://source.winehq.org/git/wine.git/?a=commit;h=69487dad1c60935502078fa6… Author: Chip Davis <cdavis(a)codeweavers.com> Date: Mon Apr 6 17:51:58 2020 -0500 d2d1: Return enum constants directly in d2d_bitmap_brush_GetInterpolationMode() (Clang). Signed-off-by: Chip Davis <cdavis(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d2d1/brush.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d2d1/brush.c b/dlls/d2d1/brush.c index cc557ea9ef..675fa52e72 100644 --- a/dlls/d2d1/brush.c +++ b/dlls/d2d1/brush.c @@ -1010,8 +1010,8 @@ static D2D1_BITMAP_INTERPOLATION_MODE STDMETHODCALLTYPE d2d_bitmap_brush_GetInte switch (brush->u.bitmap.interpolation_mode) { case D2D1_INTERPOLATION_MODE_NEAREST_NEIGHBOR: + return D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR; case D2D1_INTERPOLATION_MODE_LINEAR: - return brush->u.bitmap.interpolation_mode; default: return D2D1_BITMAP_INTERPOLATION_MODE_LINEAR; }

1 0

Zhiyi Zhang : d3d8/tests: Test cursor clipping.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: ed45092f85f49dff7df18d5af32664394fa9ffa3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ed45092f85f49dff7df18d5a… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Mon Apr 6 19:53:55 2020 +0800 d3d8/tests: Test cursor clipping. Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 85 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 25dea77b99..ead5f47bf1 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -75,6 +75,14 @@ static int get_refcount(IUnknown *object) return IUnknown_Release( object ); } +static void get_virtual_rect(RECT *rect) +{ + rect->left = GetSystemMetrics(SM_XVIRTUALSCREEN); + rect->top = GetSystemMetrics(SM_YVIRTUALSCREEN); + rect->right = rect->left + GetSystemMetrics(SM_CXVIRTUALSCREEN); + rect->bottom = rect->top + GetSystemMetrics(SM_CYVIRTUALSCREEN); +} + static HWND create_window(void) { RECT r = {0, 0, 640, 480}; @@ -10086,6 +10094,82 @@ static void test_creation_parameters(void) DestroyWindow(window); } +static void test_cursor_clipping(void) +{ + unsigned int adapter_idx, adapter_count, mode_idx; + D3DDISPLAYMODE mode, current_mode; + struct device_desc device_desc; + RECT virtual_rect, clip_rect; + IDirect3DDevice8 *device; + IDirect3D8 *d3d; + HWND window; + HRESULT hr; + + window = create_window(); + ok(!!window, "Failed to create a window.\n"); + d3d = Direct3DCreate8(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create a D3D object.\n"); + + device_desc.device_window = window; + device_desc.flags = CREATE_DEVICE_FULLSCREEN; + + adapter_count = IDirect3D8_GetAdapterCount(d3d); + for (adapter_idx = 0; adapter_idx < adapter_count; ++adapter_idx) + { + hr = IDirect3D8_GetAdapterDisplayMode(d3d, adapter_idx, &current_mode); + ok(hr == D3D_OK, "Adapter %u: GetAdapterDisplayMode failed, hr %#x.\n", adapter_idx, hr); + for (mode_idx = 0; SUCCEEDED(IDirect3D8_EnumAdapterModes(d3d, adapter_idx, mode_idx, &mode)); + ++mode_idx) + { + if (mode.Format != D3DFMT_X8R8G8B8) + continue; + if (mode.Width < 640 || mode.Height < 480) + continue; + if (mode.Width != current_mode.Width && mode.Height != current_mode.Height) + break; + } + ok(mode.Width != current_mode.Width && mode.Height != current_mode.Height, + "Adapter %u: Failed to find a different mode than %ux%u.\n", adapter_idx, + current_mode.Width, current_mode.Height); + + ok(ClipCursor(NULL), "Adapter %u: ClipCursor failed, error %#x.\n", adapter_idx, + GetLastError()); + get_virtual_rect(&virtual_rect); + ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, + GetLastError()); + ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", + adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); + + device_desc.adapter_ordinal = adapter_idx; + device_desc.width = mode.Width; + device_desc.height = mode.Height; + if (!(device = create_device(d3d, window, &device_desc))) + { + skip("Adapter %u: Failed to create a D3D device.\n", adapter_idx); + break; + } + flush_events(); + get_virtual_rect(&virtual_rect); + ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, + GetLastError()); + todo_wine_if(!EqualRect(&clip_rect, &virtual_rect)) + ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", + adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); + + IDirect3DDevice8_Release(device); + flush_events(); + get_virtual_rect(&virtual_rect); + ok(GetClipCursor(&clip_rect), "Adapter %u: GetClipCursor failed, error %#x.\n", adapter_idx, + GetLastError()); + todo_wine_if(!EqualRect(&clip_rect, &virtual_rect)) + ok(EqualRect(&clip_rect, &virtual_rect), "Adapter %u: Expect clip rect %s, got %s.\n", + adapter_idx, wine_dbgstr_rect(&virtual_rect), wine_dbgstr_rect(&clip_rect)); + } + + IDirect3D8_Release(d3d); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = GetModuleHandleA("d3d8.dll"); @@ -10204,6 +10288,7 @@ START_TEST(device) test_get_display_mode(); test_multi_adapter(); test_creation_parameters(); + test_cursor_clipping(); UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Alexandre Julliard : libwine: Make the dlopen() wrapper functions obsolete.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: b87256cd1db21a59484248a193b6ad12ca2853ca URL: https://source.winehq.org/git/wine.git/?a=commit;h=b87256cd1db21a59484248a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 22:44:00 2020 +0200 libwine: Make the dlopen() wrapper functions obsolete. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/library.h | 3 - libs/port/stubs.c | 22 ---- libs/wine/loader.c | 265 ++++++++++++++++++++++++++----------------------- libs/wine/wine.map | 6 +- 4 files changed, 143 insertions(+), 153 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=b87256cd1db21a594842…

1 0

Alexandre Julliard : wineconsole: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: 0f53fca321d7d366b2bbc0580b721e8b79ea82f7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f53fca321d7d366b2bbc058… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 22:43:43 2020 +0200 wineconsole: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/wineconsole/curses.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/programs/wineconsole/curses.c b/programs/wineconsole/curses.c index 6c35554d84..6fa669d150 100644 --- a/programs/wineconsole/curses.c +++ b/programs/wineconsole/curses.c @@ -53,7 +53,6 @@ #include <winnls.h> #include "winecon_private.h" -#include "wine/library.h" #include "wine/debug.h" #undef ERR #define ERR (-1) @@ -139,7 +138,7 @@ static BOOL WCCURSES_bind_libcurses(void) static const char ncname[] = SONAME_LIBCURSES; #endif - nc_handle = wine_dlopen(ncname, RTLD_NOW, NULL, 0); + nc_handle = dlopen(ncname, RTLD_NOW); if(!nc_handle) { WINE_MESSAGE("Wine cannot find the " CURSES_NAME " library (%s).\n", @@ -147,11 +146,11 @@ static BOOL WCCURSES_bind_libcurses(void) return FALSE; } -#define LOAD_FUNCPTR(f) \ - if((p_##f = wine_dlsym(nc_handle, #f, NULL, 0)) == NULL) \ - { \ - WINE_WARN("Can't find symbol %s\n", #f); \ - goto sym_not_found; \ +#define LOAD_FUNCPTR(f) \ + if((p_##f = dlsym(nc_handle, #f)) == NULL) \ + { \ + WINE_WARN("Can't find symbol %s\n", #f); \ + goto sym_not_found; \ } LOAD_FUNCPTR(curs_set) @@ -200,7 +199,7 @@ sym_not_found: "Wine cannot find certain functions that it needs inside the " CURSES_NAME "\nlibrary. To enable Wine to use " CURSES_NAME " please upgrade your " CURSES_NAME "\nlibraries\n"); - wine_dlclose(nc_handle, NULL, 0); + dlclose(nc_handle); nc_handle = NULL; return FALSE; }

1 0

Alexandre Julliard : winspool: Use standard dlopen() instead of the libwine wrappers.
by Alexandre Julliard April 7, 2020

April 7, 2020

Module: wine Branch: master Commit: 5016716f6eccf26faac6ca6634eb521e9288a53e URL: https://source.winehq.org/git/wine.git/?a=commit;h=5016716f6eccf26faac6ca66… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Apr 6 22:43:29 2020 +0200 winspool: Use standard dlopen() instead of the libwine wrappers. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winspool.drv/info.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/dlls/winspool.drv/info.c b/dlls/winspool.drv/info.c index 0065801d90..593f091c2d 100644 --- a/dlls/winspool.drv/info.c +++ b/dlls/winspool.drv/info.c @@ -107,7 +107,6 @@ #define NONAMELESSSTRUCT #define NONAMELESSUNION -#include "wine/library.h" #include "windef.h" #include "winbase.h" #include "winuser.h" @@ -887,13 +886,13 @@ static cups_ptype_t get_cups_printer_type( const cups_dest_t *dest ) static void load_cups(void) { - cupshandle = wine_dlopen( SONAME_LIBCUPS, RTLD_NOW, NULL, 0 ); + cupshandle = dlopen( SONAME_LIBCUPS, RTLD_NOW ); if (!cupshandle) return; TRACE("%p: %s loaded\n", cupshandle, SONAME_LIBCUPS); #define DO_FUNC(x) \ - p##x = wine_dlsym( cupshandle, #x, NULL, 0 ); \ + p##x = dlsym( cupshandle, #x ); \ if (!p##x) \ { \ ERR("failed to load symbol %s\n", #x); \ @@ -902,7 +901,7 @@ static void load_cups(void) } CUPS_FUNCS; #undef DO_FUNC -#define DO_FUNC(x) p##x = wine_dlsym( cupshandle, #x, NULL, 0 ) +#define DO_FUNC(x) p##x = dlsym( cupshandle, #x ) CUPS_OPT_FUNCS; #undef DO_FUNC }

1 0