wine-commits April 2020

wine-commits@winehq.org

2 participants
1016 discussions

Zebediah Figura : devenum: Get rid of the MediaCatMoniker typedef.
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: 0fc7e99a1510277180a33cc12e67e1e5b1981c43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0fc7e99a1510277180a33cc1… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 11 10:49:41 2020 -0500 devenum: Get rid of the MediaCatMoniker typedef. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/devenum_private.h | 6 +++--- dlls/devenum/mediacatenum.c | 27 ++++++++++++++------------- dlls/devenum/parsedisplayname.c | 2 +- 3 files changed, 18 insertions(+), 17 deletions(-) diff --git a/dlls/devenum/devenum_private.h b/dlls/devenum/devenum_private.h index 0df964b72d..bdb5fb7b01 100644 --- a/dlls/devenum/devenum_private.h +++ b/dlls/devenum/devenum_private.h @@ -54,7 +54,7 @@ enum device_type DEVICE_DMO, }; -typedef struct +struct moniker { IMoniker IMoniker_iface; LONG ref; @@ -66,9 +66,9 @@ typedef struct WCHAR *name; /* for filters and codecs */ CLSID clsid; /* for DMOs */ }; -} MediaCatMoniker; +}; -MediaCatMoniker *moniker_create(void) DECLSPEC_HIDDEN; +struct moniker *moniker_create(void) DECLSPEC_HIDDEN; HRESULT enum_moniker_create(REFCLSID class, IEnumMoniker **enum_mon) DECLSPEC_HIDDEN; extern ICreateDevEnum devenum_factory DECLSPEC_HIDDEN; diff --git a/dlls/devenum/mediacatenum.c b/dlls/devenum/mediacatenum.c index 085bdaea69..fff40e4af3 100644 --- a/dlls/devenum/mediacatenum.c +++ b/dlls/devenum/mediacatenum.c @@ -319,7 +319,7 @@ static const IPropertyBagVtbl IPropertyBag_Vtbl = property_bag_Write, }; -static HRESULT property_bag_create(MediaCatMoniker *mon, IPropertyBag **ppBag) +static HRESULT property_bag_create(struct moniker *mon, IPropertyBag **ppBag) { RegPropBagImpl * rpb = CoTaskMemAlloc(sizeof(RegPropBagImpl)); if (!rpb) @@ -359,9 +359,9 @@ static HRESULT property_bag_create(MediaCatMoniker *mon, IPropertyBag **ppBag) } -static inline MediaCatMoniker *impl_from_IMoniker(IMoniker *iface) +static inline struct moniker *impl_from_IMoniker(IMoniker *iface) { - return CONTAINING_RECORD(iface, MediaCatMoniker, IMoniker_iface); + return CONTAINING_RECORD(iface, struct moniker, IMoniker_iface); } static HRESULT WINAPI moniker_QueryInterface(IMoniker *iface, REFIID riid, void **ppv) @@ -388,7 +388,7 @@ static HRESULT WINAPI moniker_QueryInterface(IMoniker *iface, REFIID riid, void static ULONG WINAPI moniker_AddRef(IMoniker *iface) { - MediaCatMoniker *This = impl_from_IMoniker(iface); + struct moniker *This = impl_from_IMoniker(iface); ULONG ref = InterlockedIncrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -398,7 +398,7 @@ static ULONG WINAPI moniker_AddRef(IMoniker *iface) static ULONG WINAPI moniker_Release(IMoniker *iface) { - MediaCatMoniker *This = impl_from_IMoniker(iface); + struct moniker *This = impl_from_IMoniker(iface); ULONG ref = InterlockedDecrement(&This->ref); TRACE("(%p) ref=%d\n", This, ref); @@ -413,7 +413,7 @@ static ULONG WINAPI moniker_Release(IMoniker *iface) static HRESULT WINAPI moniker_GetClassID(IMoniker *iface, CLSID *pClassID) { - MediaCatMoniker *This = impl_from_IMoniker(iface); + struct moniker *This = impl_from_IMoniker(iface); TRACE("(%p)->(%p)\n", This, pClassID); @@ -458,7 +458,7 @@ static HRESULT WINAPI moniker_GetSizeMax(IMoniker *iface, ULARGE_INTEGER *pcbSiz static HRESULT WINAPI moniker_BindToObject(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, REFIID riidResult, void **ppvResult) { - MediaCatMoniker *This = impl_from_IMoniker(iface); + struct moniker *This = impl_from_IMoniker(iface); IUnknown * pObj = NULL; IPropertyBag * pProp = NULL; CLSID clsID; @@ -527,7 +527,7 @@ static HRESULT WINAPI moniker_BindToObject(IMoniker *iface, IBindCtx *pbc, static HRESULT WINAPI moniker_BindToStorage(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, REFIID riid, void **ppvObj) { - MediaCatMoniker *This = impl_from_IMoniker(iface); + struct moniker *This = impl_from_IMoniker(iface); TRACE("(%p)->(%p, %p, %s, %p)\n", This, pbc, pmkToLeft, debugstr_guid(riid), ppvObj); @@ -681,7 +681,7 @@ static HRESULT WINAPI moniker_RelativePathTo(IMoniker *iface, IMoniker *pmkOther static HRESULT WINAPI moniker_GetDisplayName(IMoniker *iface, IBindCtx *pbc, IMoniker *pmkToLeft, LPOLESTR *ppszDisplayName) { - MediaCatMoniker *This = impl_from_IMoniker(iface); + struct moniker *This = impl_from_IMoniker(iface); WCHAR *buffer; TRACE("(%p)->(%p, %p, %p)\n", iface, pbc, pmkToLeft, ppszDisplayName); @@ -768,10 +768,11 @@ static const IMonikerVtbl IMoniker_Vtbl = moniker_IsSystemMoniker, }; -MediaCatMoniker *moniker_create(void) +struct moniker *moniker_create(void) { - MediaCatMoniker * pMoniker = NULL; - pMoniker = CoTaskMemAlloc(sizeof(MediaCatMoniker)); + struct moniker *pMoniker; + + pMoniker = CoTaskMemAlloc(sizeof(*pMoniker)); if (!pMoniker) return NULL; @@ -844,9 +845,9 @@ static HRESULT WINAPI enum_moniker_Next(IEnumMoniker *iface, ULONG celt, IMonike { EnumMonikerImpl *This = impl_from_IEnumMoniker(iface); WCHAR buffer[MAX_PATH + 1]; + struct moniker *pMoniker; LONG res; ULONG fetched = 0; - MediaCatMoniker * pMoniker; CLSID clsid; HRESULT hr; HKEY hkey; diff --git a/dlls/devenum/parsedisplayname.c b/dlls/devenum/parsedisplayname.c index f472e4c1be..ab0f7bf870 100644 --- a/dlls/devenum/parsedisplayname.c +++ b/dlls/devenum/parsedisplayname.c @@ -70,7 +70,7 @@ static HRESULT WINAPI devenum_parser_ParseDisplayName(IParseDisplayName *iface, { WCHAR buffer[MAX_PATH]; enum device_type type; - MediaCatMoniker *mon; + struct moniker *mon; CLSID class; TRACE("(%p, %s, %p, %p)\n", pbc, debugstr_w(name), eaten, ret);

1 0

Zebediah Figura : devenum: Get rid of the DEVENUM_ prefix on all method names.
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: 6a95f68396dad8a4c7680653b8e86d3e642b607f URL: https://source.winehq.org/git/wine.git/?a=commit;h=6a95f68396dad8a4c7680653… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 11 10:49:40 2020 -0500 devenum: Get rid of the DEVENUM_ prefix on all method names. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/createdevenum.c | 39 +++------ dlls/devenum/devenum_main.c | 4 +- dlls/devenum/devenum_private.h | 8 +- dlls/devenum/mediacatenum.c | 178 ++++++++++++++++++---------------------- dlls/devenum/parsedisplayname.c | 30 +++---- 5 files changed, 108 insertions(+), 151 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=6a95f68396dad8a4c768…

1 0

Zebediah Figura : devenum: Don't bother creating the category key for codecs if there are no codecs to register.
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: cbfd33300a075f91bb75b958914150ed234fe48e URL: https://source.winehq.org/git/wine.git/?a=commit;h=cbfd33300a075f91bb75b958… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sat Apr 11 10:49:39 2020 -0500 devenum: Don't bother creating the category key for codecs if there are no codecs to register. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/devenum/createdevenum.c | 56 -------------------------------------------- 1 file changed, 56 deletions(-) diff --git a/dlls/devenum/createdevenum.c b/dlls/devenum/createdevenum.c index 8e82fcdeac..eba93f0fa0 100644 --- a/dlls/devenum/createdevenum.c +++ b/dlls/devenum/createdevenum.c @@ -52,7 +52,6 @@ static const WCHAR wszFriendlyName[] = {'F','r','i','e','n','d','l','y','N','a', static const WCHAR wszFilterData[] = {'F','i','l','t','e','r','D','a','t','a',0}; static ULONG WINAPI DEVENUM_ICreateDevEnum_AddRef(ICreateDevEnum * iface); -static HRESULT DEVENUM_CreateAMCategoryKey(const CLSID * clsidCategory); /********************************************************************** * DEVENUM_ICreateDevEnum_QueryInterface (also IUnknown) @@ -429,9 +428,6 @@ static void register_legacy_filters(void) hr = HRESULT_FROM_WIN32(lRet); } - if (SUCCEEDED(hr)) - hr = DEVENUM_CreateAMCategoryKey(&CLSID_LegacyAmFilterCategory); - if (SUCCEEDED(hr)) { for (i = 0; i < dwFilterSubkeys; i++) @@ -517,10 +513,6 @@ static BOOL CALLBACK register_dsound_devices(GUID *guid, const WCHAR *desc, cons VARIANT var; HRESULT hr; - hr = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); - if (FAILED(hr)) - return FALSE; - if (guid) { WCHAR *name = heap_alloc(sizeof(defaultW) + lstrlenW(desc) * sizeof(WCHAR)); @@ -578,9 +570,6 @@ static void register_waveout_devices(void) VARIANT var; HRESULT hr; - hr = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); - if (FAILED(hr)) return; - count = waveOutGetNumDevs(); for (i = -1; i < count; i++) @@ -627,9 +616,6 @@ static void register_wavein_devices(void) VARIANT var; HRESULT hr; - hr = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); - if (FAILED(hr)) return; - count = waveInGetNumDevs(); for (i = 0; i < count; i++) @@ -671,9 +657,6 @@ static void register_midiout_devices(void) VARIANT var; HRESULT hr; - hr = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); - if (FAILED(hr)) return; - count = midiOutGetNumDevs(); for (i = -1; i < count; i++) @@ -724,9 +707,6 @@ static void register_vfw_codecs(void) int i = 0; HIC hic; - hr = DEVENUM_CreateAMCategoryKey(&CLSID_AudioRendererCategory); - if (FAILED(hr)) return; - while (ICInfo(ICTYPE_VIDEO, i++, &info)) { WCHAR name[5] = {LOBYTE(LOWORD(info.fccHandler)), HIBYTE(LOWORD(info.fccHandler)), @@ -784,10 +764,6 @@ static void register_avicap_devices(void) HRESULT hr; int i = 0; - hr = DEVENUM_CreateAMCategoryKey(&CLSID_VideoInputDeviceCategory); - if (FAILED(hr)) - return; - for (i = 0; i < 10; ++i) { if (!capGetDriverDescriptionW(i, friendlyname, ARRAY_SIZE(friendlyname), @@ -896,35 +872,3 @@ static const ICreateDevEnumVtbl ICreateDevEnum_Vtbl = * static CreateDevEnum instance */ ICreateDevEnum DEVENUM_CreateDevEnum = { &ICreateDevEnum_Vtbl }; - -/********************************************************************** - * DEVENUM_CreateAMCategoryKey (INTERNAL) - * - * Creates a registry key for a category at HKEY_CURRENT_USER\Software\ - * Microsoft\ActiveMovie\devenum\{clsid} - */ -static HRESULT DEVENUM_CreateAMCategoryKey(const CLSID * clsidCategory) -{ - WCHAR wszRegKey[MAX_PATH]; - HRESULT res = S_OK; - HKEY hkeyDummy = NULL; - - lstrcpyW(wszRegKey, wszActiveMovieKey); - - if (!StringFromGUID2(clsidCategory, wszRegKey + lstrlenW(wszRegKey), ARRAY_SIZE(wszRegKey) - lstrlenW(wszRegKey))) - res = E_INVALIDARG; - - if (SUCCEEDED(res)) - { - LONG lRes = RegCreateKeyW(HKEY_CURRENT_USER, wszRegKey, &hkeyDummy); - res = HRESULT_FROM_WIN32(lRes); - } - - if (hkeyDummy) - RegCloseKey(hkeyDummy); - - if (FAILED(res)) - ERR("Failed to create key HKEY_CURRENT_USER\\%s\n", debugstr_w(wszRegKey)); - - return res; -}

1 0

Hans Leidekker : secur32: Add application protocol stubs for macOS.
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: 341fe50c287b0f421de16aa138af724f559dd880 URL: https://source.winehq.org/git/wine.git/?a=commit;h=341fe50c287b0f421de16aa1… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Fri Apr 10 22:18:33 2020 +0200 secur32: Add application protocol stubs for macOS. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/secur32/schannel_macosx.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dlls/secur32/schannel_macosx.c b/dlls/secur32/schannel_macosx.c index f86a561cf8..d725c9d22c 100644 --- a/dlls/secur32/schannel_macosx.c +++ b/dlls/secur32/schannel_macosx.c @@ -1194,6 +1194,18 @@ void schan_imp_free_certificate_credentials(schan_credentials *c) { } +void schan_imp_set_application_protocols(schan_imp_session session, unsigned char *buffer, unsigned int buflen) +{ + FIXME("no support for application protocols on this platform\n"); +} + +SECURITY_STATUS schan_imp_get_application_protocol(schan_imp_session session, + SecPkgContext_ApplicationProtocol *protocol) +{ + FIXME("no support for application protocols on this platform\n"); + return SEC_E_UNSUPPORTED_FUNCTION; +} + BOOL schan_imp_init(void) { TRACE("()\n");

1 0

Thomas Faber : gdiplus/tests: Disable double-freeing test.
by Alexandre Julliard 13 Apr '20

13 Apr '20

Module: wine Branch: master Commit: 65c72c93ce258bb2aabdfd870a51a6e96fde388d URL: https://source.winehq.org/git/wine.git/?a=commit;h=65c72c93ce258bb2aabdfd87… Author: Thomas Faber <thomas.faber(a)reactos.org> Date: Sat Apr 11 16:53:18 2020 +0200 gdiplus/tests: Disable double-freeing test. Signed-off-by: Thomas Faber <thomas.faber(a)reactos.org> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/image.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/gdiplus/tests/image.c b/dlls/gdiplus/tests/image.c index 0b4ae3cd9c..145eadbfd3 100644 --- a/dlls/gdiplus/tests/image.c +++ b/dlls/gdiplus/tests/image.c @@ -3488,8 +3488,11 @@ static void test_dispose(void) stat = GdipDisposeImage(image); expect(Ok, stat); + if (0) { + /* Can crash with page heap or if the heap region is decommitted. */ stat = GdipDisposeImage(image); expect(ObjectBusy, stat); + } memset(invalid_image, 0, 256); stat = GdipDisposeImage((GpImage*)invalid_image);

1 0

Alexandre Julliard : Wine release 5.6
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: website Branch: master Commit: 9e12d35d78d24461ed3f0f41cbce08609d8589e7 URL: https://source.winehq.org/git/website.git/?a=commit;h=9e12d35d78d24461ed3f0… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 10 20:57:22 2020 +0200 Wine release 5.6 Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- news/en/2020041001.xml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/news/en/2020041001.xml b/news/en/2020041001.xml new file mode 100644 index 00000000..86a5be02 --- /dev/null +++ b/news/en/2020041001.xml @@ -0,0 +1,16 @@ +<news> +<date>April 10, 2020</date> +<title>Wine 5.6 Released</title> +<body> + The Wine development release 5.6 is now available. + <a href="{$root}/announce/5.6">What's new</a> in this release: +<ul> + <li>Still more Media Foundation work.</li> + <li>Improvements to Active Directory LDAP support.</li> + <li>A few more modules converted to PE.</li> + <li>Improvements to gdb proxy mode.</li> + <li>Various bug fixes.</li> +</ul> +The source is <a href="//dl.winehq.org/wine/source/5.x/wine-5.6.tar.xz">available now</a>. +Binary packages are in the process of being built, and will appear soon at their respective <a href="{$root}/download">download locations</a>. +</body></news>

1 0

Tag wine-5.6 : Alexandre Julliard : Release 5.6
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: refs/tags/wine-5.6 Tag: 1f6492dbfe010176af0fb7153e2b2d78c8667cb9 URL: https://source.winehq.org/git/wine.git/?a=tag;h=1f6492dbfe010176af0fb7153e2… Tagger: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 10 20:54:32 2020 +0200 Release 5.6

1 0

Alexandre Julliard : Release 5.6.
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: master Commit: 4cdb7ec8291c171176fb390f4cef1f88409a982f URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cdb7ec8291c171176fb390f… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri Apr 10 20:54:32 2020 +0200 Release 5.6. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- ANNOUNCE | 1148 +++++++++++++++++++++++++++++++------------------------------ AUTHORS | 3 + VERSION | 2 +- configure | 18 +- 4 files changed, 591 insertions(+), 580 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=4cdb7ec8291c171176fb…

1 0

Hans-Kristian Arntzen : dxgi: Implement dxgi_factory_CheckFeatureSupport().
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: master Commit: bbf2836a85046bf9af2dca3b3158250d79302324 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bbf2836a85046bf9af2dca3b… Author: Hans-Kristian Arntzen <post(a)arntzen-software.no> Date: Fri Apr 10 21:51:52 2020 +0430 dxgi: Implement dxgi_factory_CheckFeatureSupport(). Some d3d12 games gate their use of sync interval 0 on support for DXGI_FEATURE_PRESENT_ALLOW_TEARING. 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/dxgi/factory.c | 15 +++++++++++++-- dlls/dxgi/tests/dxgi.c | 10 +++++----- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 3f41df9e36..39c9e10f7a 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -445,10 +445,21 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumWarpAdapter(IWineDXGIFactory * static HRESULT STDMETHODCALLTYPE dxgi_factory_CheckFeatureSupport(IWineDXGIFactory *iface, DXGI_FEATURE feature, void *feature_data, UINT data_size) { - FIXME("iface %p, feature %#x, feature_data %p, data_size %u stub!\n", + TRACE("iface %p, feature %#x, feature_data %p, data_size %u.\n", iface, feature, feature_data, data_size); - return E_NOTIMPL; + switch (feature) + { + case DXGI_FEATURE_PRESENT_ALLOW_TEARING: + if (data_size != sizeof(BOOL)) + return DXGI_ERROR_INVALID_CALL; + *(BOOL *)feature_data = TRUE; + return S_OK; + + default: + WARN("Unsupported feature %#x.\n", feature); + return DXGI_ERROR_INVALID_CALL; + } } static const struct IWineDXGIFactoryVtbl dxgi_factory_vtbl = diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index cb6ef6c0ec..3887982634 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -6164,7 +6164,7 @@ static void test_factory_check_feature_support(void) } hr = IDXGIFactory5_CheckFeatureSupport(factory, 0x12345678, (void *)&data, sizeof(data)); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); /* Crashes on Windows. */ if (0) @@ -6174,15 +6174,15 @@ static void test_factory_check_feature_support(void) } hr = IDXGIFactory5_CheckFeatureSupport(factory, DXGI_FEATURE_PRESENT_ALLOW_TEARING, &data, sizeof(data) - 1); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = IDXGIFactory5_CheckFeatureSupport(factory, DXGI_FEATURE_PRESENT_ALLOW_TEARING, &data, sizeof(data) + 1); - todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); data = (BOOL)0xdeadbeef; hr = IDXGIFactory5_CheckFeatureSupport(factory, DXGI_FEATURE_PRESENT_ALLOW_TEARING, &data, sizeof(data)); - todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); - todo_wine ok(data == TRUE || data == FALSE, "Got unexpected data %#x.\n", data); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ok(data == TRUE || data == FALSE, "Got unexpected data %#x.\n", data); ref_count = IDXGIFactory5_Release(factory); ok(!ref_count, "Factory has %u references left.\n", ref_count);

1 0

Zhiyi Zhang : dxgi/tests: Add a test for IDXGIFactory5 feature support queries.
by Alexandre Julliard 10 Apr '20

10 Apr '20

Module: wine Branch: master Commit: 5928da917ddcbf7bfea5ae917f2cf73559c6e684 URL: https://source.winehq.org/git/wine.git/?a=commit;h=5928da917ddcbf7bfea5ae91… Author: Zhiyi Zhang <zzhang(a)codeweavers.com> Date: Fri Apr 10 21:51:51 2020 +0430 dxgi/tests: Add a test for IDXGIFactory5 feature support queries. 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/dxgi/tests/dxgi.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/dlls/dxgi/tests/dxgi.c b/dlls/dxgi/tests/dxgi.c index b5dcd5b0de..cb6ef6c0ec 100644 --- a/dlls/dxgi/tests/dxgi.c +++ b/dlls/dxgi/tests/dxgi.c @@ -6150,6 +6150,44 @@ static void test_cursor_clipping(IUnknown *device, BOOL is_d3d12) ok(refcount == !is_d3d12, "Got unexpected refcount %u.\n", refcount); } +static void test_factory_check_feature_support(void) +{ + IDXGIFactory5 *factory; + ULONG ref_count; + HRESULT hr; + BOOL data; + + if (FAILED(hr = CreateDXGIFactory(&IID_IDXGIFactory5, (void**)&factory))) + { + win_skip("IDXGIFactory5 is not available.\n"); + return; + } + + hr = IDXGIFactory5_CheckFeatureSupport(factory, 0x12345678, (void *)&data, sizeof(data)); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + /* Crashes on Windows. */ + if (0) + { + hr = IDXGIFactory5_CheckFeatureSupport(factory, DXGI_FEATURE_PRESENT_ALLOW_TEARING, NULL, sizeof(data)); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + } + + hr = IDXGIFactory5_CheckFeatureSupport(factory, DXGI_FEATURE_PRESENT_ALLOW_TEARING, &data, sizeof(data) - 1); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + hr = IDXGIFactory5_CheckFeatureSupport(factory, DXGI_FEATURE_PRESENT_ALLOW_TEARING, &data, sizeof(data) + 1); + todo_wine ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + + data = (BOOL)0xdeadbeef; + hr = IDXGIFactory5_CheckFeatureSupport(factory, DXGI_FEATURE_PRESENT_ALLOW_TEARING, &data, sizeof(data)); + todo_wine ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + todo_wine ok(data == TRUE || data == FALSE, "Got unexpected data %#x.\n", data); + + ref_count = IDXGIFactory5_Release(factory); + ok(!ref_count, "Factory has %u references left.\n", ref_count); +} + static void run_on_d3d10(void (*test_func)(IUnknown *device, BOOL is_d3d12)) { IDXGIDevice *device; @@ -6242,6 +6280,7 @@ START_TEST(dxgi) queue_test(test_output_desc); queue_test(test_object_wrapping); queue_test(test_multi_adapter); + queue_test(test_factory_check_feature_support); run_queued_tests();

1 0

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 April 2020