January 2018 - Wine-Commits

Wei Xie : wininet: Don't release connection too early.
by Alexandre Julliard Jan. 19, 2018

Jan. 19, 2018

Module: wine Branch: master Commit: 6d6dd78e5dad164d1b313599f9afa5f65481d29d URL: https://source.winehq.org/git/wine.git/?a=commit;h=6d6dd78e5dad164d1b313599… Author: Wei Xie <xiewei(a)linuxdeepin.com> Date: Fri Jan 19 15:29:54 2018 +0100 wininet: Don't release connection too early. Signed-off-by: Wei Xie <xiewei(a)linuxdeepin.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/http.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wininet/http.c b/dlls/wininet/http.c index b1c2d94..6716c80 100644 --- a/dlls/wininet/http.c +++ b/dlls/wininet/http.c @@ -5043,7 +5043,7 @@ static DWORD HTTP_HttpSendRequestW(http_request_t *request, LPCWSTR lpszHeaders, res = set_content_length(request); if(res != ERROR_SUCCESS) goto lend; - if(!request->contentLength) + if(!request->contentLength && !secure_proxy_connect) http_release_netconn(request, TRUE); if (!(request->hdr.dwFlags & INTERNET_FLAG_NO_AUTO_REDIRECT) && responseLen)

1 0

Andrey Gusev : winmm/tests: Fix memory leak.
by Alexandre Julliard Jan. 19, 2018

Jan. 19, 2018

Module: wine Branch: master Commit: 941d74a20ae941a5625983c57ad3c2c9e563721f URL: https://source.winehq.org/git/wine.git/?a=commit;h=941d74a20ae941a5625983c5… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Fri Jan 19 13:11:04 2018 +0200 winmm/tests: Fix memory leak. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winmm/tests/wave.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index a8a5e8d..2a12752 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -977,7 +977,10 @@ static void wave_out_test_device(UINT_PTR device) "waveOutGetDevCapsA(%s): MMSYSERR_NOERROR expected, got %s\n", dev_name(device),wave_out_error(rc)); if (rc!=MMSYSERR_NOERROR) + { + HeapFree(GetProcessHeap(), 0, nameA); return; + } trace(" %s: \"%s\" (%s) %d.%d (%d:%d)\n",dev_name(device),capsA.szPname, (nameA?nameA:"failed"),capsA.vDriverVersion >> 8,

1 0

Nikolay Sivov : oleaut32/tests: Use SafeArraySetIID() directly.
by Alexandre Julliard Jan. 19, 2018

Jan. 19, 2018

Module: wine Branch: master Commit: 4cc41fc5ce2839ae6caaede48ba4fb449e8a58c5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4cc41fc5ce2839ae6caaede4… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Fri Jan 19 11:53:32 2018 +0300 oleaut32/tests: Use SafeArraySetIID() directly. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/safearray.c | 117 ++++++++++++++-------------------------- 1 file changed, 41 insertions(+), 76 deletions(-) diff --git a/dlls/oleaut32/tests/safearray.c b/dlls/oleaut32/tests/safearray.c index 651a0c3..5ff29b3 100644 --- a/dlls/oleaut32/tests/safearray.c +++ b/dlls/oleaut32/tests/safearray.c @@ -47,8 +47,6 @@ static HMODULE hOleaut32; static HRESULT (WINAPI *pSafeArrayAllocDescriptorEx)(VARTYPE,UINT,SAFEARRAY**); static HRESULT (WINAPI *pSafeArrayCopyData)(SAFEARRAY*,SAFEARRAY*); -static HRESULT (WINAPI *pSafeArrayGetIID)(SAFEARRAY*,GUID*); -static HRESULT (WINAPI *pSafeArraySetIID)(SAFEARRAY*,REFGUID); static HRESULT (WINAPI *pSafeArrayGetVartype)(SAFEARRAY*,VARTYPE*); static HRESULT (WINAPI *pSafeArrayGetRecordInfo)(SAFEARRAY*,IRecordInfo**); static SAFEARRAY* (WINAPI *pSafeArrayCreateEx)(VARTYPE,UINT,SAFEARRAYBOUND*,LPVOID); @@ -686,24 +684,22 @@ static void test_safearray(void) hres = SafeArrayDestroyDescriptor(a); ok(hres == S_OK,"SADD with data in array failed with hres %x\n",hres); - /* IID functions */ - /* init a small stack safearray */ - if (pSafeArraySetIID) { - memset(&b, 0, sizeof(b)); - b.cDims = 1; - memset(&iid, 0x42, sizeof(IID)); - hres = pSafeArraySetIID(&b,&iid); - ok(hres == E_INVALIDARG,"SafeArraySetIID of non IID capable safearray did not return E_INVALIDARG, but %x\n",hres); - - hres = SafeArrayAllocDescriptor(1,&a); - ok(hres == S_OK,"SafeArrayAllocDescriptor should return S_OK, but got %x\n",hres); - ok((a->fFeatures & FADF_HAVEIID) == 0,"newly allocated descriptor with SAAD should not have FADF_HAVEIID\n"); - hres = pSafeArraySetIID(a,&iid); - ok(hres == E_INVALIDARG,"SafeArraySetIID of newly allocated descriptor with SAAD should return E_INVALIDARG, but got %x\n",hres); - - hres = SafeArrayDestroyDescriptor(a); - ok(hres == S_OK,"SADD failed with hres %x\n",hres); - } + /* IID functions */ + /* init a small stack safearray */ + memset(&b, 0, sizeof(b)); + b.cDims = 1; + memset(&iid, 0x42, sizeof(IID)); + hres = SafeArraySetIID(&b, &iid); + ok(hres == E_INVALIDARG, "Unexpected ret value %#x.\n", hres); + + hres = SafeArrayAllocDescriptor(1, &a); + ok(hres == S_OK, "Failed to allocate array descriptor, hr %#x.\n", hres); + ok((a->fFeatures & FADF_HAVEIID) == 0, "Unexpected features mask %#x.\n", a->fFeatures); + hres = SafeArraySetIID(a, &iid); + ok(hres == E_INVALIDARG, "Unexpected ret value %#x.\n", hres); + + hres = SafeArrayDestroyDescriptor(a); + ok(hres == S_OK,"SADD failed with hres %x\n",hres); if (!pSafeArrayAllocDescriptorEx) return; @@ -714,7 +710,7 @@ static void test_safearray(void) ok(hres == S_OK, "SafeArrayAllocDescriptorEx gave hres 0x%x\n", hres); ok(a->fFeatures == vttypes[i].expflags,"SAADE(%d) resulted with flags %x, expected %x\n", vttypes[i].vt, a->fFeatures, vttypes[i].expflags); if (a->fFeatures & FADF_HAVEIID) { - hres = pSafeArrayGetIID(a, &iid); + hres = SafeArrayGetIID(a, &iid); ok(hres == S_OK,"SAGIID failed for vt %d with hres %x\n", vttypes[i].vt,hres); switch (vttypes[i].vt) { case VT_UNKNOWN: @@ -730,7 +726,7 @@ static void test_safearray(void) break; } } else { - hres = pSafeArrayGetIID(a, &iid); + hres = SafeArrayGetIID(a, &iid); ok(hres == E_INVALIDARG,"SAGIID did not fail for vt %d with hres %x\n", vttypes[i].vt,hres); } if (a->fFeatures & FADF_RECORD) { @@ -751,13 +747,13 @@ static void test_safearray(void) } if (a->fFeatures & FADF_HAVEIID) { - hres = pSafeArraySetIID(a, &IID_IStorage); /* random IID */ + hres = SafeArraySetIID(a, &IID_IStorage); /* random IID */ ok(hres == S_OK,"SASIID failed with FADF_HAVEIID set for vt %d with %x\n", vttypes[i].vt, hres); - hres = pSafeArrayGetIID(a, &iid); + hres = SafeArrayGetIID(a, &iid); ok(hres == S_OK,"SAGIID failed with FADF_HAVEIID set for vt %d with %x\n", vttypes[i].vt, hres); ok(IsEqualGUID(&iid, &IID_IStorage),"returned iid is not IID_IStorage\n"); } else { - hres = pSafeArraySetIID(a, &IID_IStorage); /* random IID */ + hres = SafeArraySetIID(a, &IID_IStorage); /* random IID */ ok(hres == E_INVALIDARG,"SASIID did not failed with !FADF_HAVEIID set for vt %d with %x\n", vttypes[i].vt, hres); } hres = SafeArrayDestroyDescriptor(a); @@ -885,12 +881,8 @@ static void test_SafeArrayCreateLockDestroy(void) { ok((sa->fFeatures & FADF_HAVEIID) == 0, "Non interface type should not have FADF_HAVEIID\n"); - if (pSafeArraySetIID) - { - hres = pSafeArraySetIID(sa, &IID_IUnknown); - ok(hres == E_INVALIDARG, - "Non interface type allowed SetIID(), hres %x\n", hres); - } + hres = SafeArraySetIID(sa, &IID_IUnknown); + ok(hres == E_INVALIDARG, "Unexpected ret value %#x.\n", hres); if (vt != VT_RECORD) { VARTYPE aVt; @@ -908,12 +900,8 @@ static void test_SafeArrayCreateLockDestroy(void) else { ok(sa->fFeatures & FADF_HAVEIID, "Interface type should have FADF_HAVEIID\n"); - if (pSafeArraySetIID) - { - hres = pSafeArraySetIID(sa, &IID_IUnknown); - ok(hres == S_OK, - "Non interface type disallowed SetIID(), hres %x\n", hres); - } + hres = SafeArraySetIID(sa, &IID_IUnknown); + ok(hres == S_OK, "Failed to set array IID, hres %#x.\n", hres); ok((sa->fFeatures & FADF_HAVEVARTYPE) == 0, "Interface type %d should not have FADF_HAVEVARTYPE\n", vt); } @@ -1544,25 +1532,14 @@ static void test_SafeArrayCreateEx(void) if (sa) { GUID guid; - if (pSafeArrayGetIID) - { - hres = pSafeArrayGetIID(sa, &guid); - ok(hres == S_OK, "CreateEx (ITypeInfo) no IID hres 0x%x\n", hres); - if (hres == S_OK) - { - ok(IsEqualGUID(&guid, &IID_ITypeInfo), "CreateEx (ITypeInfo) bad IID\n"); - } - } - if (pSafeArraySetIID) - { - hres = pSafeArraySetIID(sa, &IID_IUnknown); - ok(hres == S_OK, "Failed to set IID, hres = %8x\n", hres); - if (hres == S_OK && pSafeArrayGetIID) - { - hres = pSafeArrayGetIID(sa, &guid); - ok(hres == S_OK && IsEqualGUID(&guid, &IID_IUnknown), "Set bad IID\n"); - } - } + + hres = SafeArrayGetIID(sa, &guid); + ok(hres == S_OK, "Failed to get array IID, hres %#x.\n", hres); + ok(IsEqualGUID(&guid, &IID_ITypeInfo), "CreateEx (ITypeInfo) bad IID\n"); + hres = SafeArraySetIID(sa, &IID_IUnknown); + ok(hres == S_OK, "Failed to set IID, hres = %8x\n", hres); + hres = SafeArrayGetIID(sa, &guid); + ok(hres == S_OK && IsEqualGUID(&guid, &IID_IUnknown), "Set bad IID\n"); hres = SafeArrayDestroy(sa); ok(hres == S_OK, "got 0x%08x\n", hres); } @@ -1573,15 +1550,10 @@ static void test_SafeArrayCreateEx(void) if (sa) { GUID guid; - if (pSafeArrayGetIID) - { - hres = pSafeArrayGetIID(sa, &guid); - ok(hres == S_OK, "CreateEx (NULL) no IID hres 0x%x\n", hres); - if (hres == S_OK) - { - ok(IsEqualGUID(&guid, &IID_IDispatch), "CreateEx (NULL) bad IID\n"); - } - } + + hres = SafeArrayGetIID(sa, &guid); + ok(hres == S_OK, "Failed to get array IID, hres %#x.\n", hres); + ok(IsEqualGUID(&guid, &IID_IDispatch), "CreateEx (NULL) bad IID\n"); hres = SafeArrayDestroy(sa); ok(hres == S_OK, "got 0x%08x\n", hres); } @@ -1592,15 +1564,10 @@ static void test_SafeArrayCreateEx(void) if (sa) { GUID guid; - if (pSafeArrayGetIID) - { - hres = pSafeArrayGetIID(sa, &guid); - ok(hres == S_OK, "CreateEx (NULL-Unk) no IID hres 0x%x\n", hres); - if (hres == S_OK) - { - ok(IsEqualGUID(&guid, &IID_IUnknown), "CreateEx (NULL-Unk) bad IID\n"); - } - } + + hres = SafeArrayGetIID(sa, &guid); + ok(hres == S_OK, "Failed to get array IID, hres %#x.\n", hres); + ok(IsEqualGUID(&guid, &IID_IUnknown), "CreateEx (NULL-Unk) bad IID\n"); hres = SafeArrayDestroy(sa); ok(hres == S_OK, "got 0x%08x\n", hres); } @@ -2125,8 +2092,6 @@ START_TEST(safearray) GETPTR(SafeArrayAllocDescriptorEx); GETPTR(SafeArrayCopyData); - GETPTR(SafeArrayGetIID); - GETPTR(SafeArraySetIID); GETPTR(SafeArrayGetVartype); GETPTR(SafeArrayCreateEx); GETPTR(SafeArrayCreateVector);

1 0

Józef Kucia : dxgi: Implement CreateDXGIFactory2().
by Alexandre Julliard Jan. 19, 2018

Jan. 19, 2018

Module: wine Branch: master Commit: e72db8de9568bc9dfd38f92fe9fd0737b37edefb URL: https://source.winehq.org/git/wine.git/?a=commit;h=e72db8de9568bc9dfd38f92f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 19 13:30:17 2018 +0100 dxgi: Implement CreateDXGIFactory2(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/dxgi.spec | 1 + dlls/dxgi/dxgi_main.c | 22 ++++++++++++++++------ include/dxgi1_3.idl | 6 ++++++ 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/dlls/dxgi/dxgi.spec b/dlls/dxgi/dxgi.spec index 3270a53..801e6a4 100644 --- a/dlls/dxgi/dxgi.spec +++ b/dlls/dxgi/dxgi.spec @@ -1,4 +1,5 @@ @ stdcall CreateDXGIFactory(ptr ptr) @ stdcall CreateDXGIFactory1(ptr ptr) +@ stdcall CreateDXGIFactory2(long ptr ptr) @ stdcall DXGID3D10CreateDevice(ptr ptr ptr long ptr long ptr) @ stdcall DXGID3D10RegisterLayers(ptr long) diff --git a/dlls/dxgi/dxgi_main.c b/dlls/dxgi/dxgi_main.c index 60ff3c1..36cf73b 100644 --- a/dlls/dxgi/dxgi_main.c +++ b/dlls/dxgi/dxgi_main.c @@ -56,18 +56,28 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) return TRUE; } -HRESULT WINAPI CreateDXGIFactory1(REFIID riid, void **factory) +HRESULT WINAPI CreateDXGIFactory2(UINT flags, REFIID iid, void **factory) { - TRACE("riid %s, factory %p\n", debugstr_guid(riid), factory); + TRACE("flags %#x, iid %s, factory %p.\n", flags, debugstr_guid(iid), factory); - return dxgi_factory_create(riid, factory, TRUE); + if (flags) + FIXME("Ignoring flags %#x.\n", flags); + + return dxgi_factory_create(iid, factory, TRUE); +} + +HRESULT WINAPI CreateDXGIFactory1(REFIID iid, void **factory) +{ + TRACE("iid %s, factory %p.\n", debugstr_guid(iid), factory); + + return dxgi_factory_create(iid, factory, TRUE); } -HRESULT WINAPI CreateDXGIFactory(REFIID riid, void **factory) +HRESULT WINAPI CreateDXGIFactory(REFIID iid, void **factory) { - TRACE("riid %s, factory %p\n", debugstr_guid(riid), factory); + TRACE("iid %s, factory %p.\n", debugstr_guid(iid), factory); - return dxgi_factory_create(riid, factory, FALSE); + return dxgi_factory_create(iid, factory, FALSE); } static BOOL get_layer(enum dxgi_device_layer_id id, struct dxgi_device_layer *layer) diff --git a/include/dxgi1_3.idl b/include/dxgi1_3.idl index 5ea20dd..b43ca23 100644 --- a/include/dxgi1_3.idl +++ b/include/dxgi1_3.idl @@ -223,3 +223,9 @@ interface IDXGIOutput3 : IDXGIOutput2 [out] UINT *flags ); } + +const UINT DXGI_CREATE_FACTORY_DEBUG = 0x1; + +[local] HRESULT __stdcall CreateDXGIFactory2(UINT flags, REFIID iid, void **factory); + +[local] HRESULT __stdcall DXGIGetDebugInterface1(UINT flags, REFIID iid, void **debug);

1 0

Henri Verbeet : winex11: Failing to create a context in X11DRV_wglCreateContextAttribsARB() is not an internal error.
by Alexandre Julliard Jan. 19, 2018

Jan. 19, 2018

Module: wine Branch: master Commit: 1246a27730e657f92146bfc4b8f0776ed0ccf2ae URL: https://source.winehq.org/git/wine.git/?a=commit;h=1246a27730e657f92146bfc4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Fri Jan 19 19:25:16 2018 +0100 winex11: Failing to create a context in X11DRV_wglCreateContextAttribsARB() is not an internal error. In particular, without WGL_WINE_query_renderer, the only way to determine whether a particular context version is supported or not is by attempting to create a context with that version. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winex11.drv/opengl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c index 5a7cfcc..e665286 100644 --- a/dlls/winex11.drv/opengl.c +++ b/dlls/winex11.drv/opengl.c @@ -2143,7 +2143,7 @@ static struct wgl_context *X11DRV_wglCreateContextAttribsARB( HDC hdc, struct wg if ((err = X11DRV_check_error()) || !ret->ctx) { /* In the future we should convert the GLX error to a win32 one here if needed */ - ERR("Context creation failed (error %x)\n", err); + WARN("Context creation failed (error %#x).\n", err); HeapFree( GetProcessHeap(), 0, ret ); ret = NULL; }

1 0

Dmitry Timoshkov : kerberos: Add stubs for SpInitialize and SpShutdown.
by Alexandre Julliard Jan. 19, 2018

Jan. 19, 2018

Module: wine Branch: master Commit: 5b6920bd8fdb16157d547e3aeb413a31e64d0deb URL: https://source.winehq.org/git/wine.git/?a=commit;h=5b6920bd8fdb16157d547e3a… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Thu Jan 18 23:51:20 2018 +0800 kerberos: Add stubs for SpInitialize and SpShutdown. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kerberos/krb5_ap.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/dlls/kerberos/krb5_ap.c b/dlls/kerberos/krb5_ap.c index 76a5a07..502b41e 100644 --- a/dlls/kerberos/krb5_ap.c +++ b/dlls/kerberos/krb5_ap.c @@ -144,6 +144,21 @@ static NTSTATUS NTAPI kerberos_LsaApCallPackageUntrusted(PLSA_CLIENT_REQUEST req return STATUS_NOT_IMPLEMENTED; } +static NTSTATUS NTAPI kerberos_SpInitialize(ULONG_PTR package_id, SECPKG_PARAMETERS *params, + LSA_SECPKG_FUNCTION_TABLE *lsa_function_table) +{ + FIXME("%lu,%p,%p: stub\n", package_id, params, lsa_function_table); + + return STATUS_SUCCESS; +} + +static NTSTATUS NTAPI kerberos_SpShutdown(void) +{ + TRACE("\n"); + + return STATUS_SUCCESS; +} + static NTSTATUS NTAPI kerberos_SpGetInfo(SecPkgInfoW *info) { static WCHAR kerberos_name_W[] = {'K','e','r','b','e','r','o','s',0}; @@ -178,8 +193,8 @@ static SECPKG_FUNCTION_TABLE kerberos_table = NULL, /* CallPackagePassthrough */ NULL, /* LogonUserEx */ NULL, /* LogonUserEx2 */ - NULL, /* Initialize */ - NULL, /* Shutdown */ + kerberos_SpInitialize, + kerberos_SpShutdown, kerberos_SpGetInfo, NULL, /* AcceptCredentials */ NULL, /* SpAcquireCredentialsHandle */

1 0

Józef Kucia : d3d10_1/tests: Introduce check_interface() helper function.
by Alexandre Julliard Jan. 19, 2018

Jan. 19, 2018

Module: wine Branch: master Commit: e0c7d9039f48e22a97b22631b6fe6823cf249532 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e0c7d9039f48e22a97b22631… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 19 13:30:12 2018 +0100 d3d10_1/tests: Introduce check_interface() helper function. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/tests/d3d10_1.c | 98 ++++++++++++++++++++------------------------ 1 file changed, 44 insertions(+), 54 deletions(-) diff --git a/dlls/d3d10_1/tests/d3d10_1.c b/dlls/d3d10_1/tests/d3d10_1.c index e1d6d4c..3e1a099 100644 --- a/dlls/d3d10_1/tests/d3d10_1.c +++ b/dlls/d3d10_1/tests/d3d10_1.c @@ -68,6 +68,31 @@ static ID3D10Device1 *create_device(const struct device_desc *desc) return NULL; } +#define check_interface(a, b, c, d) check_interface_(__LINE__, a, b, c, d) +static HRESULT check_interface_(unsigned int line, void *iface, REFIID iid, BOOL supported, BOOL is_broken) +{ + HRESULT hr, expected_hr, broken_hr; + IUnknown *unknown = iface, *out; + + if (supported) + { + expected_hr = S_OK; + broken_hr = E_NOINTERFACE; + } + else + { + expected_hr = E_NOINTERFACE; + broken_hr = S_OK; + } + + hr = IUnknown_QueryInterface(unknown, iid, (void **)&out); + ok_(__FILE__, line)(hr == expected_hr || broken(is_broken && hr == broken_hr), + "Got hr %#x, expected %#x.\n", hr, expected_hr); + if (SUCCEEDED(hr)) + IUnknown_Release(out); + return hr; +} + static void test_create_device(void) { D3D10_FEATURE_LEVEL1 feature_level, supported_feature_level; @@ -265,13 +290,14 @@ static void test_device_interfaces(void) continue; } - hr = ID3D10Device1_QueryInterface(device, &IID_IUnknown, (void **)&iface); - ok(SUCCEEDED(hr), "Device should implement IUnknown interface, hr %#x.\n", hr); - IUnknown_Release(iface); - - hr = ID3D10Device1_QueryInterface(device, &IID_IDXGIObject, (void **)&iface); - ok(SUCCEEDED(hr), "Device should implement IDXGIObject interface, hr %#x.\n", hr); - IUnknown_Release(iface); + check_interface(device, &IID_IUnknown, TRUE, FALSE); + check_interface(device, &IID_IDXGIObject, TRUE, FALSE); + check_interface(device, &IID_IDXGIDevice, TRUE, FALSE); + check_interface(device, &IID_IDXGIDevice1, TRUE, FALSE); + check_interface(device, &IID_ID3D10Multithread, TRUE, TRUE); /* Not available on all Windows versions. */ + check_interface(device, &IID_ID3D10Device, TRUE, FALSE); + check_interface(device, &IID_ID3D10InfoQueue, FALSE, FALSE); /* Non-debug mode. */ + check_interface(device, &IID_ID3D11Device, TRUE, TRUE); /* Not available on all Windows versions. */ hr = ID3D10Device1_QueryInterface(device, &IID_IDXGIDevice, (void **)&dxgi_device); ok(SUCCEEDED(hr), "Device should implement IDXGIDevice.\n"); @@ -288,27 +314,6 @@ static void test_device_interfaces(void) IDXGIAdapter_Release(dxgi_adapter); IDXGIDevice_Release(dxgi_device); - hr = ID3D10Device1_QueryInterface(device, &IID_IDXGIDevice1, (void **)&iface); - ok(SUCCEEDED(hr), "Device should implement IDXGIDevice1.\n"); - IUnknown_Release(iface); - - hr = ID3D10Device1_QueryInterface(device, &IID_ID3D10Multithread, (void **)&iface); - ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, - "Device should implement ID3D10Multithread interface, hr %#x.\n", hr); - if (SUCCEEDED(hr)) IUnknown_Release(iface); - - hr = ID3D10Device1_QueryInterface(device, &IID_ID3D10InfoQueue, (void **)&iface); - ok(hr == E_NOINTERFACE, "Found ID3D10InfoQueue interface in non-debug mode, hr %#x.\n", hr); - - hr = ID3D10Device1_QueryInterface(device, &IID_ID3D10Device, (void **)&iface); - ok(SUCCEEDED(hr), "Device should implement ID3D10Device interface, hr %#x.\n", hr); - IUnknown_Release(iface); - - hr = ID3D10Device1_QueryInterface(device, &IID_ID3D11Device, (void **)&iface); - ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, - "Device should implement ID3D11Device interface, hr %#x.\n", hr); - if (SUCCEEDED(hr)) IUnknown_Release(iface); - refcount = ID3D10Device1_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); } @@ -325,9 +330,8 @@ static void test_device_interfaces(void) continue; } - hr = ID3D10Device1_QueryInterface(device, &IID_ID3D10InfoQueue, (void **)&iface); - todo_wine ok(hr == S_OK, "Device should implement ID3D10InfoQueue interface, hr %#x.\n", hr); - if (SUCCEEDED(hr)) IUnknown_Release(iface); + todo_wine + check_interface(device, &IID_ID3D10InfoQueue, TRUE, FALSE); refcount = ID3D10Device1_Release(device); ok(!refcount, "Device has %u references left.\n", refcount); @@ -345,7 +349,6 @@ static void test_create_shader_resource_view(void) ID3D10Device *tmp_device; ID3D10Device1 *device; ID3D10Buffer *buffer; - IUnknown *iface; HRESULT hr; if (!(device = create_device(NULL))) @@ -387,13 +390,9 @@ static void test_create_shader_resource_view(void) ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", refcount, expected_refcount); ID3D10Device_Release(tmp_device); - hr = ID3D10ShaderResourceView1_QueryInterface(srview, &IID_ID3D10ShaderResourceView, (void **)&iface); - ok(SUCCEEDED(hr), "Shader resource view should implement ID3D10ShaderResourceView.\n"); - IUnknown_Release(iface); - hr = ID3D10ShaderResourceView1_QueryInterface(srview, &IID_ID3D11ShaderResourceView, (void **)&iface); - ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, - "Shader resource view should implement ID3D11ShaderResourceView.\n"); - if (SUCCEEDED(hr)) IUnknown_Release(iface); + check_interface(srview, &IID_ID3D10ShaderResourceView, TRUE, FALSE); + /* Not available on all Windows versions. */ + check_interface(srview, &IID_ID3D11ShaderResourceView, TRUE, TRUE); ID3D10ShaderResourceView1_Release(srview); ID3D10Buffer_Release(buffer); @@ -424,13 +423,9 @@ static void test_create_shader_resource_view(void) U(srv_desc).Texture2D.MostDetailedMip); ok(U(srv_desc).Texture2D.MipLevels == 10, "Got unexpected MipLevels %u.\n", U(srv_desc).Texture2D.MipLevels); - hr = ID3D10ShaderResourceView1_QueryInterface(srview, &IID_ID3D10ShaderResourceView, (void **)&iface); - ok(SUCCEEDED(hr), "Shader resource view should implement ID3D10ShaderResourceView.\n"); - IUnknown_Release(iface); - hr = ID3D10ShaderResourceView1_QueryInterface(srview, &IID_ID3D11ShaderResourceView, (void **)&iface); - ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, - "Shader resource view should implement ID3D11ShaderResourceView.\n"); - if (SUCCEEDED(hr)) IUnknown_Release(iface); + check_interface(srview, &IID_ID3D10ShaderResourceView, TRUE, FALSE); + /* Not available on all Windows versions. */ + check_interface(srview, &IID_ID3D11ShaderResourceView, TRUE, TRUE); ID3D10ShaderResourceView1_Release(srview); ID3D10Texture2D_Release(texture); @@ -536,7 +531,6 @@ static void test_create_blend_state(void) ID3D10Device1 *device; ID3D10Device *tmp; unsigned int i, j; - IUnknown *iface; HRESULT hr; if (!(device = create_device(NULL))) @@ -609,13 +603,9 @@ static void test_create_blend_state(void) obtained_desc.RenderTarget[0].RenderTargetWriteMask, i); } - hr = ID3D10BlendState1_QueryInterface(blend_state1, &IID_ID3D10BlendState, (void **)&iface); - ok(SUCCEEDED(hr), "Blend state should implement ID3D10BlendState.\n"); - IUnknown_Release(iface); - hr = ID3D10BlendState1_QueryInterface(blend_state1, &IID_ID3D11BlendState, (void **)&iface); - ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, - "Blend state should implement ID3D11BlendState.\n"); - if (SUCCEEDED(hr)) IUnknown_Release(iface); + check_interface(blend_state1, &IID_ID3D10BlendState, TRUE, FALSE); + /* Not available on all Windows versions. */ + check_interface(blend_state1, &IID_ID3D11BlendState, TRUE, TRUE); refcount = ID3D10BlendState1_Release(blend_state1); ok(refcount == 1, "Got unexpected refcount %u.\n", refcount);

1 0

Józef Kucia : dxgi: Update to IDXGIFactory2.
by Alexandre Julliard Jan. 19, 2018

Jan. 19, 2018

Module: wine Branch: master Commit: f99a548148bae4a8db904171a53793e5613c6010 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f99a548148bae4a8db904171… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 19 13:30:13 2018 +0100 dxgi: Update to IDXGIFactory2. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dxgi/adapter.c | 6 +- dlls/dxgi/device.c | 2 +- dlls/dxgi/dxgi_private.h | 5 +- dlls/dxgi/factory.c | 165 ++++++++++++++++++++++++++++++++++++++--------- dlls/dxgi/tests/device.c | 2 - 5 files changed, 141 insertions(+), 39 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f99a548148bae4a8db90…

1 0

Józef Kucia : dxgi: Update to IDXGISwapChain1.
by Alexandre Julliard Jan. 19, 2018

Jan. 19, 2018

Module: wine Branch: master Commit: 9e961e1fae3715d2f5de8598d1cc09a784452cfd URL: https://source.winehq.org/git/wine.git/?a=commit;h=9e961e1fae3715d2f5de8598… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 19 13:30:14 2018 +0100 dxgi: Update to IDXGISwapChain1. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10_1/tests/d3d10_1.c | 4 +- dlls/d3d11/tests/d3d11.c | 2 + dlls/dxgi/dxgi_private.h | 2 +- dlls/dxgi/swapchain.c | 238 +++++++++++++++++++++++++++++++++---------- dlls/dxgi/tests/device.c | 16 ++- 5 files changed, 207 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9e961e1fae3715d2f5de…

1 0

Józef Kucia : dxgi: Implement dxgi_factory_CreateSwapChainForHwnd().
by Alexandre Julliard Jan. 19, 2018

Jan. 19, 2018

Module: wine Branch: master Commit: 729baa8a91fdc45ed66e0f8230a38a769beea87d URL: https://source.winehq.org/git/wine.git/?a=commit;h=729baa8a91fdc45ed66e0f82… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jan 19 13:30:15 2018 +0100 dxgi: Implement dxgi_factory_CreateSwapChainForHwnd(). Signed-off-by: Józef Kucia <jkucia(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 | 151 ++++++++++++++++++++++++++++++----------------- dlls/dxgi/tests/device.c | 8 ++- 2 files changed, 105 insertions(+), 54 deletions(-) diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c index 106efb5..1d699f5 100644 --- a/dlls/dxgi/factory.c +++ b/dlls/dxgi/factory.c @@ -184,15 +184,90 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_GetWindowAssociation(IDXGIFactory2 static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory2 *iface, IUnknown *device, DXGI_SWAP_CHAIN_DESC *desc, IDXGISwapChain **swapchain) { + struct dxgi_factory *factory = impl_from_IDXGIFactory2(iface); + DXGI_SWAP_CHAIN_FULLSCREEN_DESC fullscreen_desc; + DXGI_SWAP_CHAIN_DESC1 swapchain_desc; + + TRACE("iface %p, device %p, desc %p, swapchain %p.\n", iface, device, desc, swapchain); + + if (!desc) + { + WARN("Invalid pointer.\n"); + return DXGI_ERROR_INVALID_CALL; + } + + swapchain_desc.Width = desc->BufferDesc.Width; + swapchain_desc.Height = desc->BufferDesc.Height; + swapchain_desc.Format = desc->BufferDesc.Format; + swapchain_desc.Stereo = FALSE; + swapchain_desc.SampleDesc = desc->SampleDesc; + swapchain_desc.BufferUsage = desc->BufferUsage; + swapchain_desc.BufferCount = desc->BufferCount; + swapchain_desc.Scaling = DXGI_SCALING_STRETCH; + swapchain_desc.SwapEffect = desc->SwapEffect; + swapchain_desc.AlphaMode = DXGI_ALPHA_MODE_IGNORE; + swapchain_desc.Flags = desc->Flags; + + fullscreen_desc.RefreshRate = desc->BufferDesc.RefreshRate; + fullscreen_desc.ScanlineOrdering = desc->BufferDesc.ScanlineOrdering; + fullscreen_desc.Scaling = desc->BufferDesc.Scaling; + fullscreen_desc.Windowed = desc->Windowed; + + return IDXGIFactory2_CreateSwapChainForHwnd(&factory->IDXGIFactory2_iface, + device, desc->OutputWindow, &swapchain_desc, &fullscreen_desc, NULL, + (IDXGISwapChain1 **)swapchain); +} + +static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSoftwareAdapter(IDXGIFactory2 *iface, + HMODULE swrast, IDXGIAdapter **adapter) +{ + FIXME("iface %p, swrast %p, adapter %p stub!\n", iface, swrast, adapter); + + return E_NOTIMPL; +} + +static BOOL STDMETHODCALLTYPE dxgi_factory_IsCurrent(IDXGIFactory2 *iface) +{ + FIXME("iface %p stub!\n", iface); + + return TRUE; +} + +static BOOL STDMETHODCALLTYPE dxgi_factory_IsWindowedStereoEnabled(IDXGIFactory2 *iface) +{ + FIXME("iface %p stub!\n", iface); + + return FALSE; +} + +static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IDXGIFactory2 *iface, + IUnknown *device, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, + const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, + IDXGIOutput *output, IDXGISwapChain1 **swapchain) +{ struct wined3d_swapchain *wined3d_swapchain; struct wined3d_swapchain_desc wined3d_desc; unsigned int min_buffer_count; IWineDXGIDevice *dxgi_device; HRESULT hr; - FIXME("iface %p, device %p, desc %p, swapchain %p partial stub!\n", iface, device, desc, swapchain); + FIXME("iface %p, device %p, window %p, swapchain_desc %p, fullscreen_desc %p, " + "output %p, swapchain %p partial stub!\n", + iface, device, window, swapchain_desc, fullscreen_desc, output, swapchain); - switch (desc->SwapEffect) + if (!device || !swapchain_desc || !swapchain) + { + WARN("Invalid pointer.\n"); + return DXGI_ERROR_INVALID_CALL; + } + + if (swapchain_desc->Stereo) + { + FIXME("Stereo swapchains are not supported.\n"); + return DXGI_ERROR_UNSUPPORTED; + } + + switch (swapchain_desc->SwapEffect) { case DXGI_SWAP_EFFECT_DISCARD: case DXGI_SWAP_EFFECT_SEQUENTIAL: @@ -205,42 +280,46 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory2 *ifa break; default: - WARN("Invalid swap effect %u used, returning DXGI_ERROR_INVALID_CALL.\n", desc->SwapEffect); + WARN("Invalid swap effect %u used.\n", swapchain_desc->SwapEffect); return DXGI_ERROR_INVALID_CALL; } - if (desc->BufferCount < min_buffer_count || desc->BufferCount > 16) + if (swapchain_desc->BufferCount < min_buffer_count || swapchain_desc->BufferCount > 16) { - WARN("BufferCount is %u, returning DXGI_ERROR_INVALID_CALL.\n", desc->BufferCount); + WARN("BufferCount is %u.\n", swapchain_desc->BufferCount); return DXGI_ERROR_INVALID_CALL; } - if (!desc->OutputWindow) + if (!window) { FIXME("No output window, should use factory output window.\n"); } - hr = IUnknown_QueryInterface(device, &IID_IWineDXGIDevice, (void **)&dxgi_device); - if (FAILED(hr)) + if (FAILED(hr = IUnknown_QueryInterface(device, &IID_IWineDXGIDevice, (void **)&dxgi_device))) { ERR("This is not the device we're looking for\n"); return hr; } - FIXME("Ignoring SwapEffect %#x.\n", desc->SwapEffect); - - wined3d_desc.backbuffer_width = desc->BufferDesc.Width; - wined3d_desc.backbuffer_height = desc->BufferDesc.Height; - wined3d_desc.backbuffer_format = wined3dformat_from_dxgi_format(desc->BufferDesc.Format); - wined3d_desc.backbuffer_count = desc->BufferCount; + if (swapchain_desc->Scaling != DXGI_SCALING_STRETCH) + FIXME("Ignoring scaling %#x.\n", swapchain_desc->Scaling); + if (swapchain_desc->SwapEffect) + FIXME("Ignoring swap effect %#x.\n", swapchain_desc->SwapEffect); + if (swapchain_desc->AlphaMode != DXGI_ALPHA_MODE_IGNORE) + FIXME("Ignoring alpha mode %#x.\n", swapchain_desc->AlphaMode); + + wined3d_desc.backbuffer_width = swapchain_desc->Width; + wined3d_desc.backbuffer_height = swapchain_desc->Height; + wined3d_desc.backbuffer_format = wined3dformat_from_dxgi_format(swapchain_desc->Format); + wined3d_desc.backbuffer_count = swapchain_desc->BufferCount; wined3d_sample_desc_from_dxgi(&wined3d_desc.multisample_type, - &wined3d_desc.multisample_quality, &desc->SampleDesc); + &wined3d_desc.multisample_quality, &swapchain_desc->SampleDesc); wined3d_desc.swap_effect = WINED3D_SWAP_EFFECT_DISCARD; - wined3d_desc.device_window = desc->OutputWindow; - wined3d_desc.windowed = desc->Windowed; + wined3d_desc.device_window = window; + wined3d_desc.windowed = fullscreen_desc ? fullscreen_desc->Windowed : TRUE; wined3d_desc.enable_auto_depth_stencil = FALSE; wined3d_desc.auto_depth_stencil_format = 0; - wined3d_desc.flags = wined3d_swapchain_flags_from_dxgi(desc->Flags); - wined3d_desc.refresh_rate = dxgi_rational_to_uint(&desc->BufferDesc.RefreshRate); + wined3d_desc.flags = wined3d_swapchain_flags_from_dxgi(swapchain_desc->Flags); + wined3d_desc.refresh_rate = fullscreen_desc ? dxgi_rational_to_uint(&fullscreen_desc->RefreshRate) : 0; wined3d_desc.swap_interval = WINED3DPRESENT_INTERVAL_DEFAULT; wined3d_desc.auto_restore_display_mode = TRUE; @@ -259,40 +338,6 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory2 *ifa return S_OK; } -static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSoftwareAdapter(IDXGIFactory2 *iface, - HMODULE swrast, IDXGIAdapter **adapter) -{ - FIXME("iface %p, swrast %p, adapter %p stub!\n", iface, swrast, adapter); - - return E_NOTIMPL; -} - -static BOOL STDMETHODCALLTYPE dxgi_factory_IsCurrent(IDXGIFactory2 *iface) -{ - FIXME("iface %p stub!\n", iface); - - return TRUE; -} - -static BOOL STDMETHODCALLTYPE dxgi_factory_IsWindowedStereoEnabled(IDXGIFactory2 *iface) -{ - FIXME("iface %p stub!\n", iface); - - return FALSE; -} - -static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForHwnd(IDXGIFactory2 *iface, - IUnknown *device, HWND window, const DXGI_SWAP_CHAIN_DESC1 *swapchain_desc, - const DXGI_SWAP_CHAIN_FULLSCREEN_DESC *fullscreen_desc, - IDXGIOutput *output, IDXGISwapChain1 **swapchain) -{ - FIXME("iface %p, device %p, window %p, swapchain_desc %p, fullscreen_desc %p, " - "output %p, swapchain %p stub!\n", - iface, device, window, swapchain_desc, fullscreen_desc, output, swapchain); - - return E_NOTIMPL; -} - static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChainForCoreWindow(IDXGIFactory2 *iface, IUnknown *device, IUnknown *window, const DXGI_SWAP_CHAIN_DESC1 *desc, IDXGIOutput *output, IDXGISwapChain1 **swapchain) diff --git a/dlls/dxgi/tests/device.c b/dlls/dxgi/tests/device.c index 7cfaea4..77b7cb7 100644 --- a/dlls/dxgi/tests/device.c +++ b/dlls/dxgi/tests/device.c @@ -932,8 +932,14 @@ static void test_create_swapchain(void) refcount = get_refcount((IUnknown *)device); ok(refcount == 2, "Got unexpected refcount %u.\n", refcount); + hr = IDXGIFactory_CreateSwapChain(factory, NULL, &creation_desc, &swapchain); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGIFactory_CreateSwapChain(factory, obj, NULL, &swapchain); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); + hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, NULL); + ok(hr == DXGI_ERROR_INVALID_CALL, "Got unexpected hr %#x.\n", hr); hr = IDXGIFactory_CreateSwapChain(factory, obj, &creation_desc, &swapchain); - ok(SUCCEEDED(hr), "CreateSwapChain failed, hr %#x.\n", hr); + ok(SUCCEEDED(hr), "Failed to create swapchain, hr %#x.\n", hr); refcount = get_refcount((IUnknown *)adapter); ok(refcount == expected_refcount, "Got refcount %u, expected %u.\n", refcount, expected_refcount);

1 0